From 4753dbf6f15d5b23d7cf9dce38dd2c64687b0b34 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 6 Oct 2022 11:48:12 +0200
Subject: [PATCH 001/227] Upgrading to Kotlin 1.7

---
 .../kotlin/observable/Observable.kt           |  3 +-
 .../iosMain/kotlin/navigation/Navigator.kt    | 20 +++++-----
 .../kotlin/scanner/ScanningState.kt           |  4 +-
 .../device/DefaultDeviceConnectionManager.kt  | 11 ++----
 .../datetime/timer/RecurringTimerTest.kt      |  2 +-
 gradle.properties                             |  6 ++-
 gradle/ext.gradle                             | 18 ++++-----
 resources/src/iosMain/kotlin/KalugaColor.kt   |  2 +-
 .../device/MockDeviceConnectionManager.kt     | 38 ++++++++++++-------
 9 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/architecture/src/commonMain/kotlin/observable/Observable.kt b/architecture/src/commonMain/kotlin/observable/Observable.kt
index fc4c45ed0..cbad22e80 100644
--- a/architecture/src/commonMain/kotlin/observable/Observable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observable.kt
@@ -97,10 +97,11 @@ open class ObservationDefault<R : T?, T>(
 ) : Observation<R, T?, Value<R>>(initialValue),
     ReadWriteProperty<Any?, R>,
     MutableDefaultInitialized<R, T?> {
+
     constructor(
         defaultValue: R,
         initialValue: Value<T?>
-    ) : this(Value(defaultValue), initialValue)
+    ) : this(Value<R>(defaultValue), initialValue)
 
     override fun getValue(thisRef: Any?, property: KProperty<*>): R = current
     override fun setValue(thisRef: Any?, property: KProperty<*>, value: R) {
diff --git a/architecture/src/iosMain/kotlin/navigation/Navigator.kt b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
index 9cc2ac9e8..ae4c04205 100644
--- a/architecture/src/iosMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
@@ -153,21 +153,19 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
 
     private fun embedNestedViewController(nestedSpec: NavigationSpec.Nested) {
         val parent = assertParent() ?: return
-        when (val type = nestedSpec.type) {
-            is NavigationSpec.Nested.Type.Replace -> {
-                parent.childViewControllers.map { it as UIViewController }.filter { it.view.tag.toLong() == type.tag }.forEach {
-                    it.willMoveToParentViewController(null)
-                    it.view.removeFromSuperview()
-                    it.removeFromParentViewController()
-                }
+        val type = nestedSpec.type
+        if (type is NavigationSpec.Nested.Type.Replace) {
+            parent.childViewControllers.map { it as UIViewController }.filter { it.view.tag.toLong() == type.tag }.forEach {
+                it.willMoveToParentViewController(null)
+                it.view.removeFromSuperview()
+                it.removeFromParentViewController()
             }
         }
 
         val child = nestedSpec.nested()
-        when (val type = nestedSpec.type) {
-            is NavigationSpec.Nested.Type.Replace -> {
-                child.view.tag = type.tag as NSInteger
-            }
+
+        if (type is NavigationSpec.Nested.Type.Replace) {
+            child.view.tag = type.tag as NSInteger
         }
         child.view.translatesAutoresizingMaskIntoConstraints = false
         parent.addChildViewController(child)
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
index c976b71d9..8fafcf011 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
@@ -151,7 +151,7 @@ sealed class ScanningStateImpl {
                 is ScanningState.Inactive -> {
                     scanner.startMonitoringPermissions()
                 }
-                is Active, is NoHardware -> {}
+                is ScanningState.Active, is ScanningState.NoHardware -> {}
             }
         }
 
@@ -160,7 +160,7 @@ sealed class ScanningStateImpl {
                 is ScanningState.Inactive -> {
                     scanner.stopMonitoringPermissions()
                 }
-                is Active, is NoHardware -> {}
+                is ScanningState.Active, is ScanningState.NoHardware -> {}
             }
         }
         abstract val scanner: Scanner
diff --git a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 79984a5df..e6c65f0b7 100644
--- a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -80,13 +80,10 @@ internal actual class DefaultDeviceConnectionManager(
         }
 
         override fun peripheral(peripheral: CBPeripheral, didUpdateNotificationStateForCharacteristic: CBCharacteristic, error: NSError?) {
-            when (val action = currentAction) {
-                is DeviceAction.Notification -> {
-                    if (action.characteristic.wrapper.uuid == didUpdateNotificationStateForCharacteristic.UUID) {
-                        launch {
-                            handleCurrentActionCompleted(succeeded = error == null)
-                        }
-                    }
+            val action = currentAction
+            if (action is DeviceAction.Notification && action.characteristic.wrapper.uuid == didUpdateNotificationStateForCharacteristic.UUID) {
+                launch {
+                    handleCurrentActionCompleted(succeeded = error == null)
                 }
             }
         }
diff --git a/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt b/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt
index bafb107f9..7feda2432 100644
--- a/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt
+++ b/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt
@@ -111,7 +111,7 @@ class RecurringTimerTest {
     /** Provides mock time ticks. */
     private class PredefinedTimeSource(val ticks: List<Duration>) : TimeSource {
         override fun markNow(): TimeMark =
-            object : TimeMark() {
+            object : TimeMark {
                 var index = 0
                 override fun elapsedNow(): Duration =
                     if (index < ticks.size) {
diff --git a/gradle.properties b/gradle.properties
index 11811e7e1..e9c1f92c2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,14 +5,16 @@ kotlin.mpp.stability.nowarn=true
 android.useAndroidX=true
 
 kaluga.androidGradlePluginVersion=7.3.0
-kaluga.kotlinVersion=1.6.10
+kaluga.kotlinVersion=1.7.20
 kaluga.googleServicesGradlePluginVersion=4.3.10
-kaluga.ktLintGradlePluginVersion=10.1.0
+kaluga.ktLintGradlePluginVersion=11.0.0
 org.gradle.jvmargs=-Xmx3048M -Dkotlin.daemon.jvm.options\="-Xmx3048M"
 
 #MPP
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
+# TODO: Disable
+kotlin.native.binary.memoryModel=strict
 kotlin.mpp.enableCInteropCommonization=true
 
 ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ##
diff --git a/gradle/ext.gradle b/gradle/ext.gradle
index aa62adb6b..bbfce4c85 100644
--- a/gradle/ext.gradle
+++ b/gradle/ext.gradle
@@ -23,14 +23,14 @@ String kotlinVersion = getProperty("kaluga.kotlinVersion")
 // set some global variables
 gradle.ext {
     kotlin_version = kotlinVersion
-    kotlinx_coroutines_version = '1.6.1-native-mt'
-    stately_version = '1.2.1'
-    stately_isolate_version = '1.2.1'
-    koin_version = '3.2.0-beta-1'
-    serialization_version = '1.3.2'
+    kotlinx_coroutines_version = '1.6.3-native-mt'
+    stately_version = '1.2.3'
+    stately_isolate_version = '1.2.3'
+    koin_version = '3.2.2'
+    serialization_version = '1.4.0'
     napier_version = '2.4.0'
     android_ble_scanner_version = '1.6.0'
-    library_version_base = '0.5.0'
+    library_version_base = '1.0.0'
     library_version = libraryVersionLocalProperties ?: "$library_version_base${System.properties.kaluga_branch_postfix}"
     android_min_sdk_version = 21
     android_compile_sdk_version = 33
@@ -50,10 +50,10 @@ gradle.ext {
     androidx_browser_version = "1.4.0"
     androidx_constraint_layout_version = "2.1.4"
 
-    androidx_compose_compiler_version = "1.1.1"
+    androidx_compose_compiler_version = "1.3.2"
     androidx_compose_version = "1.2.1"
-    androidx_activity_compose_version = "1.5.1"
-    androidx_navigation_compose_version = "2.5.1"
+    androidx_activity_compose_version = "1.6.0"
+    androidx_navigation_compose_version = "2.5.2"
 
     material_version = "1.6.1"
     material_components_adapter_version = "1.1.17"
diff --git a/resources/src/iosMain/kotlin/KalugaColor.kt b/resources/src/iosMain/kotlin/KalugaColor.kt
index ecb18a5e3..704d0dfbe 100644
--- a/resources/src/iosMain/kotlin/KalugaColor.kt
+++ b/resources/src/iosMain/kotlin/KalugaColor.kt
@@ -31,7 +31,7 @@ actual val KalugaColor.green: Double get() = CGColorGetComponents(uiColor.CGColo
 actual val KalugaColor.blueInt: Int get() = (blue * 255.0).toInt()
 actual val KalugaColor.blue: Double get() = CGColorGetComponents(uiColor.CGColor)?.get(2)?.toDouble() ?: 0.0
 actual val KalugaColor.greenInt: Int get() = (green * 255.0).toInt()
-actual val KalugaColor.alpha: Double get() = CGColorGetAlpha(uiColor.CGColor)?.toDouble()
+actual val KalugaColor.alpha: Double get() = CGColorGetAlpha(uiColor.CGColor).toDouble()
 actual val KalugaColor.alphaInt: Int get() = (alpha * 255.0).toInt()
 
 actual fun colorFrom(red: Double, green: Double, blue: Double, alpha: Double): KalugaColor = KalugaColor(UIColor.colorWithRed(red as CGFloat, green as CGFloat, blue as CGFloat, alpha as CGFloat))
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
index 59af7351b..eb5d7869b 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
@@ -178,22 +178,32 @@ class MockDeviceConnectionManager(
     override suspend fun performAction(action: DeviceAction): Unit = performActionMock.call(action)
 
     suspend fun handleCurrentAction() {
-        when (val action = currentAction) {
-            is DeviceAction.Read.Characteristic -> handleUpdatedCharacteristic(action.characteristic.uuid, willActionSucceed) {
-                debug("Mock Read: ${action.characteristic.uuid} value ${action.characteristic.wrapper.value?.asBytes?.toHexString()}")
-            }
-            is DeviceAction.Read.Descriptor -> handleUpdatedDescriptor(action.descriptor.uuid, willActionSucceed)
-            is DeviceAction.Write.Characteristic -> {
-                (action.characteristic.wrapper as MockCharacteristicWrapper).updateMockValue(action.newValue)
-                handleUpdatedCharacteristic(action.characteristic.uuid, willActionSucceed) {
-                    debug("Mock Write: ${action.characteristic.uuid} value ${action.characteristic.wrapper.value?.asBytes?.toHexString()}")
+        currentAction?.let { action ->
+            when (action) {
+                is DeviceAction.Read.Characteristic -> handleUpdatedCharacteristic(
+                    action.characteristic.uuid,
+                    willActionSucceed
+                ) {
+                    debug("Mock Read: ${action.characteristic.uuid} value ${action.characteristic.wrapper.value?.asBytes?.toHexString()}")
                 }
+                is DeviceAction.Read.Descriptor -> handleUpdatedDescriptor(
+                    action.descriptor.uuid,
+                    willActionSucceed
+                )
+                is DeviceAction.Write.Characteristic -> {
+                    (action.characteristic.wrapper as MockCharacteristicWrapper).updateMockValue(
+                        action.newValue
+                    )
+                    handleUpdatedCharacteristic(action.characteristic.uuid, willActionSucceed) {
+                        debug("Mock Write: ${action.characteristic.uuid} value ${action.characteristic.wrapper.value?.asBytes?.toHexString()}")
+                    }
+                }
+                is DeviceAction.Write.Descriptor -> {
+                    (action.descriptor.wrapper as MockDescriptorWrapper).updateMockValue(action.newValue)
+                    handleUpdatedDescriptor(action.descriptor.uuid, willActionSucceed)
+                }
+                is DeviceAction.Notification -> handleCurrentActionCompleted(willActionSucceed)
             }
-            is DeviceAction.Write.Descriptor -> {
-                (action.descriptor.wrapper as MockDescriptorWrapper).updateMockValue(action.newValue)
-                handleUpdatedDescriptor(action.descriptor.uuid, willActionSucceed)
-            }
-            is DeviceAction.Notification -> handleCurrentActionCompleted(willActionSucceed)
         }
     }
 

From b00872a753157dd743d14622cf60fd7ee201faf0 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 7 Oct 2022 17:49:56 +0200
Subject: [PATCH 002/227] WIP gradle migration to kts

---
 .github/workflows/emulator.yaml               |   2 +-
 DEVELOP.md                                    |   4 +-
 adding-a-new-module/template/build.gradle.kts |   2 +-
 alerts/build.gradle.kts                       |  16 +-
 architecture-compose/build.gradle.kts         |   2 +-
 architecture/build.gradle.kts                 |   2 +-
 base-permissions/build.gradle.kts             |   2 +-
 base/build.gradle.kts                         |   2 +-
 beacons/build.gradle.kts                      |   2 +-
 bluetooth-permissions/build.gradle.kts        |   2 +-
 bluetooth/build.gradle.kts                    |   2 +-
 build.gradle                                  |  69 -------
 build.gradle.kts                              |  73 ++++++++
 buildSrc/build.gradle.kts                     |  16 ++
 buildSrc/settings/gradle.kts                  |  54 ++++++
 buildSrc/src/main/kotlin/AndroidCommon.kt     | 107 +++++++++++
 buildSrc/src/main/kotlin/Component.kt         | 142 ++++++++++++++
 buildSrc/src/main/kotlin/Dependencies.kt      | 164 ++++++++++++++++
 buildSrc/src/main/kotlin/GitBranch.kt         |  52 +++++
 buildSrc/src/main/kotlin/Library.kt           | 138 ++++++++++++++
 calendar-permissions/build.gradle.kts         |   2 +-
 camera-permissions/build.gradle.kts           |   2 +-
 contacts-permissions/build.gradle.kts         |   2 +-
 convention-plugins/build.gradle.kts           |   2 +-
 date-time-picker/build.gradle.kts             |   2 +-
 date-time/build.gradle.kts                    |   2 +-
 example/android/build.gradle                  |   2 +-
 example/android/proguard-rules.pro            |   2 +-
 .../ios/Supporting Files/settings.gradle.kts  |   2 +-
 example/shared/build.gradle.kts               |   2 +-
 gradle/android_common.gradle                  | 112 -----------
 gradle/android_common.gradle.kts              | 128 +++++++++++++
 gradle/android_compose.gradle                 |  42 -----
 gradle/android_compose.gradle.kts             |  49 +++++
 gradle/component.gradle                       | 177 ------------------
 gradle/component.gradle.kts                   |  55 ++++++
 gradle/componentskt.gradle.kts                |  28 +--
 gradle/ext.gradle                             | 140 --------------
 gradle/ext.gradle.kts                         | 157 ++++++++++++++++
 gradle/gitBranch.gradle.kts                   |  62 +++---
 gradle/newModule.gradle.kts                   |   2 +-
 gradle/publish.gradle                         |  33 ----
 gradle/publish.gradle.kts                     |  32 ++++
 gradle/publishable_component.gradle           |   3 -
 gradle/publishable_component.gradle.kts       |   3 +
 hud/build.gradle.kts                          |   2 +-
 keyboard/build.gradle.kts                     |   2 +-
 links/build.gradle.kts                        |   2 +-
 location-permissions/build.gradle.kts         |   2 +-
 location/build.gradle.kts                     |   2 +-
 logging/build.gradle.kts                      |   2 +-
 microphone-permissions/build.gradle.kts       |   2 +-
 notifications-permissions/build.gradle.kts    |   2 +-
 permissions/build.gradle.kts                  |   2 +-
 resources/build.gradle.kts                    |   2 +-
 review/build.gradle.kts                       |   2 +-
 scientific/build.gradle.kts                   |   2 +-
 settings.gradle.kts                           |   2 +-
 storage-permissions/build.gradle.kts          |   2 +-
 system/build.gradle.kts                       |   2 +-
 test-utils-alerts/build.gradle.kts            |   2 +-
 test-utils-architecture/build.gradle.kts      |   2 +-
 test-utils-base/build.gradle.kts              |   2 +-
 test-utils-bluetooth/build.gradle.kts         |   2 +-
 test-utils-hud/build.gradle.kts               |   2 +-
 test-utils-keyboard/build.gradle.kts          |   2 +-
 test-utils-koin/build.gradle.kts              |   2 +-
 test-utils-location/build.gradle.kts          |   2 +-
 test-utils-permissions/build.gradle.kts       |   2 +-
 test-utils-resources/build.gradle.kts         |   2 +-
 test-utils/build.gradle.kts                   |   2 +-
 71 files changed, 1270 insertions(+), 678 deletions(-)
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/settings/gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/AndroidCommon.kt
 create mode 100644 buildSrc/src/main/kotlin/Component.kt
 create mode 100644 buildSrc/src/main/kotlin/Dependencies.kt
 create mode 100644 buildSrc/src/main/kotlin/GitBranch.kt
 create mode 100644 buildSrc/src/main/kotlin/Library.kt
 delete mode 100644 gradle/android_common.gradle
 create mode 100644 gradle/android_common.gradle.kts
 delete mode 100644 gradle/android_compose.gradle
 create mode 100644 gradle/android_compose.gradle.kts
 delete mode 100644 gradle/component.gradle
 create mode 100644 gradle/component.gradle.kts
 delete mode 100644 gradle/ext.gradle
 create mode 100644 gradle/ext.gradle.kts
 delete mode 100644 gradle/publish.gradle
 create mode 100644 gradle/publish.gradle.kts
 delete mode 100644 gradle/publishable_component.gradle
 create mode 100644 gradle/publishable_component.gradle.kts

diff --git a/.github/workflows/emulator.yaml b/.github/workflows/emulator.yaml
index 66f5a8305..bf2c94cb4 100644
--- a/.github/workflows/emulator.yaml
+++ b/.github/workflows/emulator.yaml
@@ -1,4 +1,4 @@
-#### for keeping up to date with settings.gradle.kts see instructions in `test:` job
+#### for keeping up to date with settings.build.gradle.kts see instructions in `test:` job
 name: Android Emulator tests
 on: pull_request
 env:
diff --git a/DEVELOP.md b/DEVELOP.md
index 665935e71..fdca1ea6f 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -1,6 +1,6 @@
 ## Build instructions
 
-This project uses Android Studio. You might need a canary version at times. Check [gradle/ext.gradle](gradle/ext.gradle) to see which Android gradle plugin is used, as this determines compatability with Android Studio versions. You can check the [Android Gradle plugin release notes](https://developer.android.com/studio/releases/gradle-plugin), the [Android Studio release notes](https://developer.android.com/studio/releases) and the [Android Studio Preview Release Updates](https://androidstudio.googleblog.com/) pages to see which version to use.
+This project uses Android Studio. You might need a canary version at times. Check [gradle/ext.gradle](gradle/ext.gradle.kts) to see which Android gradle plugin is used, as this determines compatability with Android Studio versions. You can check the [Android Gradle plugin release notes](https://developer.android.com/studio/releases/gradle-plugin), the [Android Studio release notes](https://developer.android.com/studio/releases) and the [Android Studio Preview Release Updates](https://androidstudio.googleblog.com/) pages to see which version to use.
 
 You can also check the Kotlin version, and if needed align this with the Kotlin plugin version for Android Studio under `Android Studio` -> `Preferences` -> `Languages & Frameworks` -> `Kotlin`.
 
@@ -133,7 +133,7 @@ Projects publishing to Sonatype's release repository need to be manually closed
 
 #### Increase version after publishing
 
-In case this has not been done yet, bump the version at [gradle/ext.gradle](gradle/ext.gradle) in the `develop` branch to start the next development iteration.
+In case this has not been done yet, bump the version at [gradle/ext.gradle](gradle/ext.gradle.kts) in the `develop` branch to start the next development iteration.
 
 ```sh
 library_version = 'X.X.X'
diff --git a/adding-a-new-module/template/build.gradle.kts b/adding-a-new-module/template/build.gradle.kts
index ac6377ed6..151b61933 100644
--- a/adding-a-new-module/template/build.gradle.kts
+++ b/adding-a-new-module/template/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/alerts/build.gradle.kts b/alerts/build.gradle.kts
index 0fa0baf1f..b66f5c421 100644
--- a/alerts/build.gradle.kts
+++ b/alerts/build.gradle.kts
@@ -6,26 +6,24 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+group = Library.group
+version = Library.version
 
 dependencies {
 
     val ext = (gradle as ExtensionAware).extra
+    val androidx_fragment_version: String by ext
 
-    implementation("androidx.fragment:fragment:${ext["androidx_fragment_version"]}")
-    debugImplementation("androidx.fragment:fragment-ktx:${ext["androidx_fragment_version"]}")
+    implementation(Dependencies.AndroidX.Fragment.notation)
+    testImplementation(Dependencies.AndroidX.FragmentKtx.notation)
 }
 
+commonComponent()
+
 kotlin {
     sourceSets {
         getByName("commonMain") {
             dependencies {
-                val ext = (gradle as ExtensionAware).extra
                 implementation(project(":architecture", ""))
                 implementation(project(":base", ""))
                 implementation(project(":resources", ""))
diff --git a/architecture-compose/build.gradle.kts b/architecture-compose/build.gradle.kts
index a40fd2716..6490880b1 100644
--- a/architecture-compose/build.gradle.kts
+++ b/architecture-compose/build.gradle.kts
@@ -31,7 +31,7 @@ ext["component_type"] = ext["component_type_compose"]
 val path_prefix = if (file("../gradle/componentskt.gradle.kts").exists())
     ".." else "../.."
 
-apply(from = "$path_prefix/gradle/android_compose.gradle")
+apply(from = "$path_prefix/gradle/android_compose.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts
index 573aa292e..d1aa553cf 100644
--- a/architecture/build.gradle.kts
+++ b/architecture/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/base-permissions/build.gradle.kts b/base-permissions/build.gradle.kts
index b315673eb..a75815832 100644
--- a/base-permissions/build.gradle.kts
+++ b/base-permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index f7856c4ee..eea324c02 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/beacons/build.gradle.kts b/beacons/build.gradle.kts
index c8d72f613..ff11a0d7c 100644
--- a/beacons/build.gradle.kts
+++ b/beacons/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/bluetooth-permissions/build.gradle.kts b/bluetooth-permissions/build.gradle.kts
index ac76bebd8..459b1b9a1 100644
--- a/bluetooth-permissions/build.gradle.kts
+++ b/bluetooth-permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts
index f602bfe03..1793ae034 100644
--- a/bluetooth/build.gradle.kts
+++ b/bluetooth/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 0844df4cf..000000000
--- a/build.gradle
+++ /dev/null
@@ -1,69 +0,0 @@
-buildscript {
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        // mostly migrated to new style plugin declarations, but some cross plugin interaction still requires this
-        classpath "com.android.tools.build:gradle:${project.'kaluga.androidGradlePluginVersion'}"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${project.'kaluga.kotlinVersion'}"
-    }
-}
-
-plugins {
-    id "convention.publication"
-    id 'org.jlleitschuh.gradle.ktlint'
-    id 'org.jlleitschuh.gradle.ktlint-idea'
-    id 'org.jetbrains.kotlin.multiplatform' apply false
-    id 'org.jetbrains.kotlinx.binary-compatibility-validator'
-}
-
-// TODO: To be removed once we will migrate to kotlin version 1.6.20
-// https://youtrack.jetbrains.com/issue/KT-49109#focus=Comments-27-5667134.0-0
-rootProject.plugins.withType(Class.forName("org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin")) {
-    rootProject.extensions.getByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.class).nodeVersion = "16.13.2"
-}
-
-allprojects {
-    repositories {
-        mavenCentral()
-        google()
-        // only enable temporarily if needed:
-        / * mavenLocal() */
-    }
-
-    tasks.withType(Test) {
-        testLogging {
-            events "standardOut", "started", "passed", "skipped", "failed"
-        }
-        testLogging.exceptionFormat = 'full'
-    }
-
-    tasks.withType(org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask).configureEach {
-        it.workerMaxHeapSize.set("512m")
-    }
-}
-
-apiValidation {
-
-    subprojects.forEach {
-        def name = it.name
-
-        ignoredClasses += ["com.splendo.kaluga.${name}.BuildConfig".toString()]
-        ignoredClasses += ["com.splendo.kaluga.${name.replaceAll('-', ".")}.BuildConfig".toString()]
-        ignoredClasses += ["com.splendo.kaluga.${name.replaceAll('-', "")}.BuildConfig".toString()]
-        ignoredClasses += ["com.splendo.kaluga.permissions.${name.replaceAll("-permissions", "")}.BuildConfig".toString()]
-    }
-
-    ignoredClasses += ['com.splendo.kaluga.permissions.BuildConfig']
-    ignoredClasses += ['com.splendo.kaluga.test.BuildConfig']
-    ignoredClasses += ['com.splendo.kaluga.datetime.timer.BuildConfig']
-}
-
-apply from:"gradle/ext.gradle"
-apply from:"gradle/newModule.gradle.kts"
-apply from:"gradle/copyReports.gradle.kts"
-
-group 'com.splendo.kaluga'
-version gradle.ext.library_version
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 000000000..77f56ba5a
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,73 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
+
+buildscript {
+
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        // mostly migrated to new style plugin declarations, but some cross plugin interaction still requires this
+        classpath("com.android.tools.build:gradle:${project.extra["kaluga.androidGradlePluginVersion"]}")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.extra["kaluga.kotlinVersion"]}")
+    }
+}
+
+plugins {
+    id("convention.publication")
+    id("org.jlleitschuh.gradle.ktlint")
+    id("org.jlleitschuh.gradle.ktlint-idea")
+    id("org.jetbrains.kotlin.multiplatform") apply false
+    id("org.jetbrains.kotlinx.binary-compatibility-validator")
+}
+
+// TODO: To be removed once we will migrate to kotlin version 1.6.20
+// https://youtrack.jetbrains.com/issue/KT-49109#focus=Comments-27-5667134.0-0
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin>() {
+    rootProject.extensions.getByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java).nodeVersion = "16.13.2"
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+        google()
+        // only enable temporarily if needed:
+        /* mavenLocal() */
+    }
+
+    tasks.withType<Test>() {
+        testLogging {
+            events = setOf(TestLogEvent.STANDARD_OUT, TestLogEvent.STARTED, TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
+        }
+        testLogging.exceptionFormat = TestExceptionFormat.FULL
+    }
+
+    tasks.withType<org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask>().configureEach {
+        // it.workerMaxHeapSize.set("512m")
+    }
+}
+
+apiValidation {
+
+    subprojects.forEach {
+        val name = it.name
+
+        ignoredClasses.add("com.splendo.kaluga.${name}.BuildConfig".toString())
+        ignoredClasses.add("com.splendo.kaluga.${name.replace("-", ".")}.BuildConfig".toString())
+        ignoredClasses.add("com.splendo.kaluga.${name.replace("-", "")}.BuildConfig".toString())
+        ignoredClasses.add("com.splendo.kaluga.permissions.${name.replace("-permissions", "")}.BuildConfig".toString())
+    }
+
+    ignoredClasses.add("com.splendo.kaluga.permissions.BuildConfig")
+    ignoredClasses.add("com.splendo.kaluga.test.BuildConfig")
+    ignoredClasses.add("com.splendo.kaluga.datetime.timer.BuildConfig")
+}
+
+apply(from = "gradle/ext.gradle.kts")
+apply(from = "gradle/newModule.gradle.kts")
+apply(from = "gradle/copyReports.gradle.kts")
+
+group = "com.splendo.kaluga"
+version = Library.version
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 000000000..caa676a5b
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    `java-gradle-plugin`
+    `kotlin-dsl`
+    `kotlin-dsl-precompiled-script-plugins`
+}
+
+repositories {
+    gradlePluginPortal() // To use 'maven-publish' and 'signing' plugins in our own plugin
+    google()
+}
+
+dependencies {
+    // mostly migrated to new style plugin declarations, but some cross plugin interaction still requires this
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
+    implementation("com.android.tools.build:gradle:7.3.0")
+}
diff --git a/buildSrc/settings/gradle.kts b/buildSrc/settings/gradle.kts
new file mode 100644
index 000000000..39e6b7b2a
--- /dev/null
+++ b/buildSrc/settings/gradle.kts
@@ -0,0 +1,54 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+pluginManagement {
+
+    repositories {
+        gradlePluginPortal()
+        google()
+    }
+
+    // resolutionStrategy {
+    //     eachPlugin {
+    //
+    //         val kalugaAndroidGradlePluginVersion =
+    //             settings.extra["kaluga.androidGradlePluginVersion"]
+    //         val kalugaKotlinVersion = settings.extra["kaluga.kotlinVersion"]
+    //         val kalugaKtLintGradlePluginVersion = settings.extra["kaluga.ktLintGradlePluginVersion"]
+    //         val kalugaGoogleServicesGradlePluginVersion = settings.extra["kaluga.googleServicesGradlePluginVersion"]
+    //         val kalugaBinaryCompatibilityValidatorVersion = settings.extra["kaluga.binaryCompatibilityValidatorVersion"]
+    //
+    //         when (requested.id.id) {
+    //             "org.jetbrains.kotlin.multiplatform",
+    //             "org.jetbrains.kotlin.plugin.serialization",
+    //             "org.jetbrains.kotlin.android",
+    //             "org.jetbrains.kotlin.kapt",
+    //             -> useVersion("$kalugaKotlinVersion")
+    //             "com.android.library",
+    //             "com.android.application",
+    //             -> useVersion("$kalugaAndroidGradlePluginVersion")
+    //             "org.jlleitschuh.gradle.ktlint",
+    //             "org.jlleitschuh.gradle.ktlint-idea",
+    //             -> useVersion("$kalugaKtLintGradlePluginVersion")
+    //             "com.google.gms:google-services"
+    //             -> useVersion("com.google.gms:google-services:$kalugaGoogleServicesGradlePluginVersion")
+    //             "org.jetbrains.kotlinx.binary-compatibility-validator"
+    //             -> useVersion("$kalugaBinaryCompatibilityValidatorVersion")
+    //         }
+    //     }
+    // }
+}
diff --git a/buildSrc/src/main/kotlin/AndroidCommon.kt b/buildSrc/src/main/kotlin/AndroidCommon.kt
new file mode 100644
index 000000000..f9483a29f
--- /dev/null
+++ b/buildSrc/src/main/kotlin/AndroidCommon.kt
@@ -0,0 +1,107 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Action
+import org.gradle.api.JavaVersion
+import org.gradle.kotlin.dsl.dependencies
+
+enum class ComponentType {
+    DEFAULT,
+    COMPOSE,
+    APP,
+    COMPOSE_APP
+}
+
+fun org.gradle.api.Project.commonAndroidComponent(type: ComponentType = ComponentType.DEFAULT) {
+    val action = object : Action<LibraryExtension> {
+        override fun execute(t: LibraryExtension) {
+            t.androidCommon(type)
+        }
+    }
+    (this as org.gradle.api.plugins.ExtensionAware).extensions.configure("android", action)
+    dependencies {
+
+    }
+}
+
+fun LibraryExtension.androidCommon(componentType: ComponentType = ComponentType.DEFAULT) {
+    compileSdk = Library.Android.compileSdk
+    buildToolsVersion = Library.Android.buildTools
+
+    defaultConfig {
+        minSdk = Library.Android.minSdk
+        targetSdk = Library.Android.targetSdk
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+        }
+    }
+
+    when (componentType) {
+        ComponentType.APP,
+        ComponentType.COMPOSE_APP -> {
+            println("Android sourcesets for this project module are configured using defaults (for an app)")
+        }
+        ComponentType.COMPOSE,
+        ComponentType.DEFAULT -> {
+            println("Android sourcesets for this project module are configured as a library")
+            sourceSets {
+                getByName("main") {
+                    manifest.srcFile("src/androidLibMain/AndroidManifest.xml")
+                    res.srcDir("src/androidLibMain/res")
+                    if (componentType == ComponentType.COMPOSE) {
+                        java.srcDir("src/androidLibMain/kotlin")
+                    }
+                }
+                getByName("androidTest") {
+                    manifest.srcFile("src/androidLibAndroidTest/AndroidManifest.xml")
+                    java.srcDir("src/androidLibAndroidTest/kotlin")
+                    res.srcDir("src/androidLibAndroidTest/res")
+                }
+
+                getByName("test") {
+                    java.srcDir("src/androidLibUnitTest/kotlin")
+                }
+            }
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    when (componentType) {
+        ComponentType.COMPOSE,
+        ComponentType.COMPOSE_APP -> {
+            println("This project module is a Compose only module")
+            buildFeatures {
+                compose = true
+            }
+            composeOptions {
+                kotlinCompilerExtensionVersion = Library.Android.composeCompiler
+            }
+        }
+        ComponentType.DEFAULT,
+        ComponentType.APP -> {}
+    }
+}
diff --git a/buildSrc/src/main/kotlin/Component.kt b/buildSrc/src/main/kotlin/Component.kt
new file mode 100644
index 000000000..e7b31703b
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Component.kt
@@ -0,0 +1,142 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import org.gradle.api.Action
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
+
+fun org.gradle.api.Project.commonComponent() {
+    val action = object : Action<KotlinMultiplatformExtension> {
+        override fun execute(t: KotlinMultiplatformExtension) {
+            t.commonMultiplatformComponent()
+        }
+    }
+    (this as org.gradle.api.plugins.ExtensionAware).extensions.configure("kotlin", action)
+}
+
+fun KotlinMultiplatformExtension.commonMultiplatformComponent() {
+    targets {
+        configureEach {
+            compilations.configureEach {
+                (kotlinOptions as? KotlinJvmOptions)?.jvmTarget = "1.8"
+            }
+        }
+    }
+
+    android("androidLib").publishAllLibraryVariants()
+    val target: KotlinNativeTarget.() -> Unit =
+        {
+            binaries {
+                getTest("DEBUG").apply {
+                    freeCompilerArgs = freeCompilerArgs + listOf("-e", "com.splendo.kaluga.test.base.mainBackground")
+                }
+            }
+        }
+    Library.IOS.targets.forEach { iosTarget ->
+        when (iosTarget) {
+            IOSTarget.X64 -> iosX64(target).applyTestDevice()
+            IOSTarget.Arm64 -> iosArm64(target)
+            IOSTarget.SimulatorArm64 -> iosSimulatorArm64(target).applyTestDevice()
+        }
+    }
+
+    jvm()
+    js(KotlinJsCompilerType.IR) {
+        nodejs()
+        compilations.configureEach {
+            kotlinOptions {
+                metaInfo = true
+                sourceMap = true
+                moduleKind = "umd"
+            }
+        }
+    }
+
+    val commonMain = sourceSets.maybeCreate("commonMain").apply {
+        dependencies {
+            implement(Dependencies.KotlinX.Coroutines.Core)
+        }
+    }
+
+    val commonTest = sourceSets.maybeCreate("commonTest").apply {
+        dependencies {
+            implementation(kotlin("test"))
+            implementation(kotlin("test-common"))
+            implementation(kotlin("test-annotations-common"))
+        }
+    }
+
+    val jvmMain = sourceSets.maybeCreate("jvmMain").apply {
+        dependencies {
+            implementation(kotlin("stdlib"))
+            implement(Dependencies.KotlinX.Coroutines.Swing)
+        }
+    }
+
+    val jvmTest = sourceSets.maybeCreate("jvmTest").apply {
+        dependsOn(commonTest)
+        dependencies {
+            implementation(kotlin("test"))
+            implementation(kotlin("test-junit"))
+        }
+    }
+
+    val jsMain = sourceSets.maybeCreate("jsMain").apply {
+        dependencies {
+            implementation(kotlin("stdlib-js"))
+            implement(Dependencies.KotlinX.Coroutines.Js)
+        }
+    }
+
+    val jsTest = sourceSets.maybeCreate("jsTest").apply {
+        dependencies {
+            implementation(kotlin("test-js"))
+        }
+    }
+
+    val iosMain = sourceSets.maybeCreate("iosMain").apply {
+        dependsOn(commonMain)
+    }
+
+    val iosTest = sourceSets.maybeCreate("iosTest").apply {
+        dependsOn(commonTest)
+    }
+
+    sourceSets.all {
+        languageSettings {
+            optIn("kotlinx.coroutines.DelicateCoroutinesApi")
+            optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+            optIn("kotlinx.coroutines.ObsoleteCoroutinesApi")
+            optIn("kotlinx.coroutines.InternalCoroutinesApi")
+            optIn("kotlinx.coroutines.FlowPreview")
+            optIn("kotlin.ExperimentalUnsignedTypes")
+            optIn("kotlin.ExperimentalStdlibApi")
+            optIn("kotlin.time.ExperimentalTime")
+            optIn("kotlin.ExperimentalStdlibApi")
+            enableLanguageFeature("InlineClasses")
+        }
+    }
+}
+
+fun KotlinNativeTargetWithSimulatorTests.applyTestDevice() {
+    testRuns.all {
+        deviceId = Library.IOS.TestRunnerDeviceId
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
new file mode 100644
index 000000000..3142a2f1d
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -0,0 +1,164 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
+
+data class Dependency(private val group: String, private val name: String, private val version: String? = null) {
+    val notation = "$group:$name${version?.let { ":$it" } ?: ""}"
+}
+
+fun KotlinDependencyHandler.expose(dependency: Dependency) = api(dependency.notation)
+fun KotlinDependencyHandler.implement(dependency: Dependency) = implementation(dependency.notation)
+
+object Dependencies {
+
+    object KotlinX {
+        object Coroutines {
+            private const val version = "1.6.3-native-mt"
+            private const val group = "org.jetbrains.kotlinx"
+            val Core = Dependency(group, "kotlinx-coroutines-core", version)
+            val Swing = Dependency(group, "kotlinx-coroutines-swing", version)
+            val Js = Dependency(group, "kotlinx-coroutines-js", version)
+        }
+
+        object Serialization {
+            private const val version =  "1.4.0"
+            private const val group = "org.jetbrains.kotlinx"
+            val Core = Dependency(group, "kotlinx-serialization-core", version)
+            val Json = Dependency(group, "kotlinx-serialization-json", version)
+        }
+    }
+
+    object Android {
+        internal const val groupBase = "com.google.android"
+        private const val materialBase = "$groupBase.material"
+
+        val Material = Dependency(materialBase, "material", "1.6.1")
+        val MaterialComposeThemeAdapter = Dependency(materialBase, "compose-theme-adapter", "1.1.17")
+
+        object Play {
+            private const val group = "$groupBase.play"
+            val Core = Dependency(group, "core", "1.10.3")
+            val Ktx = Dependency(group, "core-ktx", "1.8.1")
+        }
+        object PlayServices {
+            private const val group = "$groupBase.gms"
+            private const val version = "20.0.0"
+            val Location = Dependency(group, "play-services-location", version)
+        }
+    }
+
+    object AndroidX {
+
+        private const val groupBase = "androidx"
+        private const val fragmentGroup = "$groupBase.fragment"
+        private const val fragmentVersion = "1.5.3"
+
+        object Activity {
+            private const val group = "$groupBase.activity"
+            val Compose = Dependency(group, "activity-compose", "1.6.0")
+        }
+        val AppCompat = Dependency("$groupBase.appcompat", "appcompat", "1.5.1")
+        val ArchCore = Dependency("$groupBase.arch.core", "core-testing", "2.1.0")
+        val Browser = Dependency("$groupBase.browser", "browser", "1.4.0")
+        object Compose {
+            private const val version = "1.2.1"
+            private const val composeGroupBase = "$groupBase.compose"
+
+            val Foundation = Dependency("$composeGroupBase.foundation", "foundation", version)
+            val Material = Dependency("$composeGroupBase.material", "material", version)
+            val UI = Dependency("$composeGroupBase.ui", "ui", version)
+            val UITooling = Dependency("$composeGroupBase.ui", "ui-tooling", version)
+        }
+        val ConstraintLayout = Dependency("$groupBase.constraintlayout", "constraintlayout", "2.1.4")
+        val Core = Dependency("$groupBase.core", "core", "1.9.0")
+        val Fragment = Dependency(fragmentGroup, "fragment", fragmentVersion)
+        val FragmentKtx = Dependency(fragmentGroup, "fragment-ktx", fragmentVersion)
+        object Lifecycle {
+            private const val group = "$groupBase.lifecycle"
+            private const val version = "2.5.1"
+
+            val LiveData = Dependency(group, "lifecycle-livedata-ktx", version)
+            val Runtime = Dependency(group, "lifecycle-runtime-ktx", version)
+            val Service = Dependency(group, "lifecycle-service", version)
+            val ViewModel = Dependency(group, "lifecycle-viewmodel-ktx", version)
+            val ViewModelCompose = Dependency(group, "lifecycle-viewmodel-compose", "2.5.1")
+        }
+        object Navigation {
+            private const val group = "$groupBase.navigation"
+            private const val version = "2.5.2"
+
+            val Compose = Dependency(group, "navigation-compose", version)
+        }
+        object Test {
+            private const val group = "$groupBase.test"
+            private const val versionPostfix = ""
+            private const val version = "1.4.0$versionPostfix"
+            private const val espressoVersion = "3.4.0$versionPostfix"
+            private const val junitVersion = "1.1.3$versionPostfix"
+            private const val uiAutomatorVersion = "2.2.0"
+
+            val Core = Dependency(group, "core", version)
+            val CoreKtx = Dependency(group, "core-ktx", version)
+            val Espresso = Dependency("$group.espresso", "espresso-core", version)
+            val JUnit = Dependency("$group.ext", "junit", junitVersion)
+            val Rules = Dependency(group, "rules", version)
+            val Runner = Dependency(group, "runner", version)
+            val UIAutomator = Dependency("$group.uiautomator", "uiautomator", uiAutomatorVersion)
+        }
+    }
+
+    val BLEScanner = Dependency("no.nordicsemi.android.support.v18", "scanner", "1.6.0")
+
+    object Koin {
+        private const val group = "io.insert-koin"
+        private const val version = "3.2.2"
+        val Android = Dependency(group, "koin-android", version)
+        val Core = Dependency(group, "koin-core", version)
+    }
+
+    val Napier = Dependency("io.github.aakira", "napier", "2.4.0")
+
+    object Stately {
+        private const val group = "co.touchlab"
+        private const val version = "1.2.3"
+        private const val isolateVersion = "1.2.3"
+        val Common = Dependency(group, "stately-common", version)
+        val Concurrency = Dependency(group, "stately-concurrency", version)
+        val Isolate = Dependency(group, "stately-isolate", isolateVersion)
+        val IsoCollections = Dependency(group, "stately-iso-collections", isolateVersion)
+    }
+
+    val JUnit = Dependency("junit", "junit", "4.13.2")
+
+    object Mockito {
+        private const val group = "org.mockito"
+        private const val version = "3.11.2"
+
+        val Android = Dependency(group, "mockito-android", version)
+        val Core = Dependency(group, "mockito-core", version)
+    }
+
+    object ByteBuddy {
+        private const val group = "net.bytebuddy"
+        private const val version = "1.11.3"
+
+        val Android = Dependency(group, "byte-buddy-android", version)
+        val Agent = Dependency(group, "byte-buddy-agent", version)
+    }
+}
diff --git a/buildSrc/src/main/kotlin/GitBranch.kt b/buildSrc/src/main/kotlin/GitBranch.kt
new file mode 100644
index 000000000..96cce8d6d
--- /dev/null
+++ b/buildSrc/src/main/kotlin/GitBranch.kt
@@ -0,0 +1,52 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import org.slf4j.LoggerFactory
+
+object GitBranch {
+ private val logger = LoggerFactory.getLogger(this::class.java)
+ val BITRISE_GIT_BRANCH = java.lang.System.getenv("BITRISE_GIT_BRANCH")
+ val kaluga_branch = System.getProperty("kaluga_branch")
+ val MAVEN_CENTRAL_RELEASE = System.getenv("MAVEN_CENTRAL_RELEASE")
+ val release = MAVEN_CENTRAL_RELEASE?.toLowerCase()?.trim() == "true"
+ val branchFromGit = run {
+  try {
+   val process = ProcessBuilder().command("git rev-parse --abbrev-ref HEAD".split(" ")).start()
+   process.inputStream.bufferedReader().readText()
+  } catch (e: Exception) {
+   logger.info("Unable to determine current branch through git CLI: ${e.message}")
+   "unknown"
+  }
+ }
+
+ // favour user definition of kaluga_branch (if present), otherwise take it from GIT branch:
+ // - if running on CI: favour bitrise's branch detection
+ // - else: try to get it via the `git` CLI.
+ val branch = (kaluga_branch ?: BITRISE_GIT_BRANCH ?: branchFromGit ).replace('/', '-').trim().toLowerCase().also {
+  if (it == "HEAD") {
+   logger.warn("Unable to determine current branch: Project is checked out with detached head!")
+  }
+ }
+
+ val kalugaBranchPostfix = (when(branch) {
+  "master", "main", "develop" -> ""
+  else -> "-"+branch
+ } + if (!release) "-SNAPSHOT" else "").also {
+
+  println("decided branch: '$branch' to postfix '$it', isRelease: $release (from: BITRISE_GIT_BRANCH env: $BITRISE_GIT_BRANCH, kaluga_branch property: $kaluga_branch , MAVEN_CENTRAL_RELEASE env: $MAVEN_CENTRAL_RELEASE , git cli: $branchFromGit)")
+ }
+}
diff --git a/buildSrc/src/main/kotlin/Library.kt b/buildSrc/src/main/kotlin/Library.kt
new file mode 100644
index 000000000..f5bb8870f
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Library.kt
@@ -0,0 +1,138 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import java.io.File
+import java.io.FileInputStream
+import java.util.*
+
+object Library {
+
+    private val props = Properties()
+    private const val baseVersion = "1.0.0"
+    val version: String by lazy {
+        println("------Properties" + props.entries.joinToString(" ") { (key, value) -> "$key to $value" })
+        val libraryVersionLocalProperties: String? = props["kaluga.libraryVersion"] as? String
+        (libraryVersionLocalProperties ?: "$baseVersion${GitBranch.kalugaBranchPostfix}").also {
+            println("Library version $it")
+        }
+    }
+    const val group = "com.splendo.kaluga"
+
+    init {
+        val propFile = File("../local.properties")
+        if (propFile.exists()) {
+            val inputStream = FileInputStream(propFile.absolutePath)
+            props.load(inputStream)
+        }
+    }
+
+    object Android {
+        const val minSdk = 21
+        const val compileSdk = 33
+        const val targetSdk = 33
+        const val buildTools = "33.0.0"
+        const val composeCompiler = "1.3.2"
+    }
+
+    object IOS {
+        // based on https://github.com/Kotlin/xcode-compat/blob/d677a43edc46c50888bca0a7890a81f976a42809/xcode-compat/src/main/kotlin/org/jetbrains/kotlin/xcodecompat/XcodeCompatPlugin.kt#L16
+        val sdkName = System.getenv("SDK_NAME") ?: "unknown"
+        val isRealIOSDevice = sdkName.startsWith("iphoneos").also {
+            println("Run on real ios device: $it from sdk: $sdkName")
+        }
+
+        // Run on IntelliJ
+        val ideaActive = (System.getProperty("idea.active") == "true").also {
+            println("Run on IntelliJ: $it")
+        }
+
+        // Run on apple silicon
+        val isAppleSilicon = (System.getProperty("os.arch") == "aarch64").also {
+            println("Run on apple silicon: $it")
+        }
+
+        val targets = when {
+            !ideaActive -> IOSTarget.values().toSet()
+            isRealIOSDevice -> setOf(IOSTarget.Arm64)
+            isAppleSilicon -> setOf(IOSTarget.SimulatorArm64)
+            else -> setOf(IOSTarget.X64)
+        }.also { targets ->
+            println("Run on ios targets: ${targets.joinToString(" ") { it.name }}")
+        }
+
+        val TestRunnerDeviceId by lazy {
+            if (System.getenv().containsKey("IOS_TEST_RUNNER_DEVICE_ID")) {
+                System.getenv()["IOS_TEST_RUNNER_DEVICE_ID"].also {
+                    println("System env IOS_TEST_RUNNER_DEVICE_ID set to ${System.getenv()["IOS_TEST_RUNNER_DEVICE_ID"]}, using $it")
+                }!!
+            } else {
+                // load some more from local.properties or set defaults.
+                val iosTestRunnerDeviceIdLocalProperty: String? =
+                    props["kaluga.iosTestRunnerDeviceIdLocalProperty"] as? String
+                iosTestRunnerDeviceIdLocalProperty?.also {
+                    println("local.properties read (kaluga.iosTestRunnerDeviceIdLocalProperty=$iosTestRunnerDeviceIdLocalProperty, using $it)")
+                }
+                    ?: "iPhone 14".also {
+                        println("local.properties not found, using default value ($it)")
+                    }
+            }
+        }
+    }
+
+    val exampleEmbeddingMethod by lazy {
+        if (System.getenv().containsKey("EXAMPLE_EMBEDDING_METHOD")) {
+            System.getenv()["EXAMPLE_EMBEDDING_METHOD"].also {
+                println("System env EXAMPLE_EMBEDDING_METHOD set to ${System.getenv()["EXAMPLE_EMBEDDING_METHOD"]}, using $it")
+            }!!
+        } else {
+            val exampleEmbeddingMethodLocalProperties = props["kaluga.exampleEmbeddingMethod"] as? String
+            (exampleEmbeddingMethodLocalProperties ?: "composite").also {
+                println("local.properties read (kaluga.exampleEmbeddingMethod=$exampleEmbeddingMethodLocalProperties, using $it)")
+            }
+        }
+    }
+
+    val exampleMavenRepo by lazy {
+        if (System.getenv().containsKey("EXAMPLE_MAVEN_REPO")) {
+            System.getenv()["EXAMPLE_MAVEN_REPO"].also {
+                println("System env EXAMPLE_MAVEN_REPO set to ${System.getenv()["EXAMPLE_MAVEN_REPO"]}, using $it")
+            }!!
+        } else {
+            // load some more from local.properties or set defaults.
+            val exampleMavenRepoLocalProperties: String? =
+                props["kaluga.exampleMavenRepo"] as? String
+            exampleMavenRepoLocalProperties?.also {
+                println("local.properties read (kaluga.exampleMavenRepo=$exampleMavenRepoLocalProperties, using $it)")
+            }
+                ?: "local".also {
+                    println("local.properties not found, using default value ($it)")
+                }
+        }
+    }
+
+    val connectCheckExpansion = (System.getenv().containsKey("CONNECTED_CHECK_EXPANSION") or System.getenv().containsKey("CI")).also {
+        if (it) {
+            println("Adding extra dependend task to connected checks of similarly named modules (CONNECTED_CHECK_EXPANSION env present: ${ System.getenv().containsKey("CONNECTED_CHECK_EXPANSION") })")
+        }
+    }
+}
+
+enum class IOSTarget {
+    X64,
+    Arm64,
+    SimulatorArm64
+}
diff --git a/calendar-permissions/build.gradle.kts b/calendar-permissions/build.gradle.kts
index 90d5840d9..7135eda09 100644
--- a/calendar-permissions/build.gradle.kts
+++ b/calendar-permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/camera-permissions/build.gradle.kts b/camera-permissions/build.gradle.kts
index 90d5840d9..7135eda09 100644
--- a/camera-permissions/build.gradle.kts
+++ b/camera-permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/contacts-permissions/build.gradle.kts b/contacts-permissions/build.gradle.kts
index 90d5840d9..7135eda09 100644
--- a/contacts-permissions/build.gradle.kts
+++ b/contacts-permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/convention-plugins/build.gradle.kts b/convention-plugins/build.gradle.kts
index ca6517939..56578aa20 100644
--- a/convention-plugins/build.gradle.kts
+++ b/convention-plugins/build.gradle.kts
@@ -16,7 +16,7 @@
  */
 
 plugins {
-    `kotlin-dsl` // Is needed to turn our build logic written in Kotlin into Gralde Plugin
+    `kotlin-dsl` // Is needed to turn our build logic written in Kotlin into Gradle Plugin
 }
 
 repositories {
diff --git a/date-time-picker/build.gradle.kts b/date-time-picker/build.gradle.kts
index 8d2245b72..e6144a36b 100644
--- a/date-time-picker/build.gradle.kts
+++ b/date-time-picker/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/date-time/build.gradle.kts b/date-time/build.gradle.kts
index 6aac0e821..601c3c95c 100644
--- a/date-time/build.gradle.kts
+++ b/date-time/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 50c9a5d74..9d15f9d28 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -64,7 +64,7 @@ kotlin {
 
 gradle.ext.component_type = gradle.ext.component_type_composeApp
 
-apply from: "../../gradle/android_compose.gradle"
+apply from: "../../gradle/android_compose.gradle.kts"
 
 gradle.ext.component_type = gradle.ext.component_type_default
 
diff --git a/example/android/proguard-rules.pro b/example/android/proguard-rules.pro
index 2f9dc5a47..e3345f14a 100644
--- a/example/android/proguard-rules.pro
+++ b/example/android/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
+# proguardFiles setting in build.build.gradle.kts.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/example/ios/Supporting Files/settings.gradle.kts b/example/ios/Supporting Files/settings.gradle.kts
index 24a4da1ff..0d17cfa52 100644
--- a/example/ios/Supporting Files/settings.gradle.kts	
+++ b/example/ios/Supporting Files/settings.gradle.kts	
@@ -39,7 +39,7 @@ pluginManagement {
 }
 
 includeBuild("../../../convention-plugins")
-apply("../../../gradle/ext.gradle")
+apply("../../../gradle/ext.gradle.kts")
 
 val ext = (gradle as ExtensionAware).extra
 
diff --git a/example/shared/build.gradle.kts b/example/shared/build.gradle.kts
index c2855329f..be70d1e5e 100644
--- a/example/shared/build.gradle.kts
+++ b/example/shared/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-apply(from = "../../gradle/component.gradle")
+apply(from = "../../gradle/component.gradle.kts")
 
 kotlin {
     sourceSets {
diff --git a/gradle/android_common.gradle b/gradle/android_common.gradle
deleted file mode 100644
index 3a9f30d8a..000000000
--- a/gradle/android_common.gradle
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-repositories {
-    mavenCentral()
-}
-
-android {
-
-    compileSdkVersion gradle.android_compile_sdk_version
-    buildToolsVersion gradle.android_build_tools_version
-
-    defaultConfig {
-        minSdkVersion gradle.android_min_sdk_version
-        targetSdkVersion gradle.android_target_sdk_version
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-
-    if (!gradle.ext.component_type.toLowerCase().contains("app")) {
-        logger.lifecycle("Android sourcesets for this project module are configured as a library")
-        sourceSets {
-            main {
-                manifest.srcFile 'src/androidLibMain/AndroidManifest.xml'
-                res.srcDir 'src/androidLibMain/res'
-                if (gradle.component_type.contains("compose")) {
-                    java.srcDir 'src/androidLibMain/kotlin'
-                }
-            }
-            androidTest {
-                manifest.srcFile 'src/androidLibAndroidTest/AndroidManifest.xml'
-                java.srcDir 'src/androidLibAndroidTest/kotlin'
-                res.srcDir 'src/androidLibAndroidTest/res'
-            }
-
-
-            test {
-                java.srcDir 'src/androidLibUnitTest/kotlin'
-            }
-
-        }
-    } else {
-        logger.lifecycle("Android sourcesets for this project module are configured using defaults (for an app)")
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs += ['-XXLanguage:+InlineClasses', '-Xjvm-default=all']
-    }
-
-    if (gradle.component_type.contains("compose")) {
-        logger.lifecycle("This project module is a Compose only module")
-        buildFeatures {
-            compose = true
-        }
-        composeOptions {
-            kotlinCompilerExtensionVersion = "$gradle.androidx_compose_compiler_version"
-        }
-    }
-
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$gradle.kotlinx_coroutines_version"
-    implementation("androidx.appcompat:appcompat:$gradle.androidx_appcompat_version") {
-        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
-    }
-
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation "org.mockito:mockito-core:$gradle.mockito_version"
-    testImplementation 'org.jetbrains.kotlin:kotlin-test'
-    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit'
-
-    androidTestImplementation "org.mockito:mockito-android:$gradle.mockito_version"
-    androidTestImplementation "net.bytebuddy:byte-buddy-android:$gradle.bytebuddy_version!!"
-    androidTestImplementation "net.bytebuddy:byte-buddy-agent:$gradle.bytebuddy_version!!"
-
-    androidTestImplementation "androidx.test:core:$gradle.androidx_test_version"
-    androidTestImplementation "androidx.test:core-ktx:$gradle.androidx_test_version"
-    androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
-    androidTestImplementation "androidx.test:rules:$gradle.androidx_test_version"
-    androidTestImplementation "androidx.test.ext:junit:$gradle.androidx_test_junit_version"
-    androidTestImplementation "androidx.test:runner:$gradle.androidx_test_version"
-    androidTestImplementation "androidx.test.espresso:espresso-core:$gradle.androidx_test_espresso_version"
-    androidTestImplementation 'org.jetbrains.kotlin:kotlin-test'
-    androidTestImplementation 'org.jetbrains.kotlin:kotlin-test-junit'
-}
diff --git a/gradle/android_common.gradle.kts b/gradle/android_common.gradle.kts
new file mode 100644
index 000000000..cd1769b81
--- /dev/null
+++ b/gradle/android_common.gradle.kts
@@ -0,0 +1,128 @@
+/*
+ Copyright 2020 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+repositories {
+    mavenCentral()
+}
+
+android {
+
+    val android_compile_sdk_version: Int by extra
+    val android_min_sdk_version: Int by extra
+    val android_target_sdk_version: Int by extra
+    val android_build_tools_version: String by extra
+
+    compileSdk = android_compile_sdk_version
+    buildToolsVersion = android_build_tools_version
+
+    defaultConfig {
+        minSdk = android_min_sdk_version
+        targetSdk = android_target_sdk_version
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled = false
+        }
+    }
+
+    val component_type: String by extra
+    if (!component_type.toLowerCase().contains("app")) {
+        logger.lifecycle("Android sourcesets for this project module are configured as a library")
+        sourceSets {
+            main {
+                manifest.srcFile "src/androidLibMain/AndroidManifest.xml"
+                res.srcDir "src/androidLibMain/res"
+                if (component_type.contains("compose")) {
+                    java.srcDir = "src/androidLibMain/kotlin"
+                }
+            }
+            androidTest {
+                manifest.srcFile = "src/androidLibAndroidTest/AndroidManifest.xml"
+                java.srcDir = "src/androidLibAndroidTest/kotlin"
+                res.srcDir = "src/androidLibAndroidTest/res"
+            }
+
+
+            test {
+                java.srcDir = "src/androidLibUnitTest/kotlin"
+            }
+
+        }
+    } else {
+        logger.lifecycle("Android sourcesets for this project module are configured using defaults (for an app)")
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs += ['-XXLanguage:+InlineClasses', '-Xjvm-default=all']
+    }
+
+    if (component_type.contains("compose")) {
+        logger.lifecycle("This project module is a Compose only module")
+        buildFeatures {
+            compose = true
+        }
+        composeOptions {
+            val androidx_compose_compiler_version: String by extra
+            kotlinCompilerExtensionVersion = androidx_compose_compiler_version
+        }
+    }
+
+}
+
+dependencies {
+    val kotlinx_coroutines_version: String by extra
+    val androidx_appcompat_version: String by extra
+
+    val junit_version: String by extra
+    val mockito_version: String by extra
+    val bytebuddy_version: String by extra
+    val androidx_test_version: String by extra
+    val androidx_test_uiautomator_version: String by extra
+    val androidx_test_junit_version: String by extra
+    val androidx_test_espresso_version: String by extra
+
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version")
+    implementation("androidx.appcompat:appcompat:$androidx_appcompat_version")
+
+    testImplementation("junit:junit:$junit_version")
+    testImplementation("org.mockito:mockito-core:$mockito_version")
+    testImplementation("org.jetbrains.kotlin:kotlin-test"
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
+
+    androidTestImplementation("org.mockito:mockito-android:$mockito_version")
+    androidTestImplementation("net.bytebuddy:byte-buddy-android:$bytebuddy_version!!")
+    androidTestImplementation("net.bytebuddy:byte-buddy-agent:$bytebuddy_version!!")
+
+    androidTestImplementation("androidx.test:core:$androidx_test_version")
+    androidTestImplementation("androidx.test:core-ktx:$androidx_test_version")
+    androidTestImplementation("androidx.test.uiautomator:uiautomator:$androidx_test_uiautomator_version")
+    androidTestImplementation("androidx.test:rules:$androidx_test_version")
+    androidTestImplementation("androidx.test.ext:junit:$androidx_test_junit_version")
+    androidTestImplementation("androidx.test:runner:$androidx_test_version")
+    androidTestImplementation("androidx.test.espresso:espresso-core:$androidx_test_espresso_version")
+    androidTestImplementation("org.jetbrains.kotlin:kotlin-test")
+    androidTestImplementation("org.jetbrains.kotlin:kotlin-test-junit")
+}
diff --git a/gradle/android_compose.gradle b/gradle/android_compose.gradle
deleted file mode 100644
index afc504759..000000000
--- a/gradle/android_compose.gradle
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-// if the include is made from the example project shared module we need to go up one more directory
-String path_prefix = file("../gradle/componentskt.gradle.kts").exists() ? ".." : "../.."
-
-apply from: "$path_prefix/gradle/android_common.gradle"
-
-dependencies {
-    implementation("androidx.compose.foundation:foundation:$gradle.androidx_compose_version")
-    implementation("androidx.compose.ui:ui:$gradle.androidx_compose_version")
-    implementation("androidx.compose.ui:ui-tooling:$gradle.androidx_compose_version")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$gradle.androidx_lifecycle_viewmodel_compose_version")
-    implementation("androidx.activity:activity-compose:$gradle.androidx_activity_compose_version")
-
-}
-
-kotlin {
-    sourceSets.all {
-        languageSettings {
-            optIn 'androidx.compose.material.ExperimentalMaterialApi'
-        }
-    }
-}
-
-if (!gradle.ext.component_type.toLowerCase().contains("app")) {
-    apply from: "$path_prefix/gradle/publish.gradle"
-}
diff --git a/gradle/android_compose.gradle.kts b/gradle/android_compose.gradle.kts
new file mode 100644
index 000000000..dfbbc115e
--- /dev/null
+++ b/gradle/android_compose.gradle.kts
@@ -0,0 +1,49 @@
+/*
+ Copyright 2021 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+// if the include is made from the example project shared module we need to go up one more directory
+val path_prefix = if (file("../gradle/android_common.gradle.kts").exists()) ".." else "../.."
+
+apply("$path_prefix/gradle/android_common.gradle.kts")
+
+dependencies {
+    val ext = (gradle as ExtensionAware).extra
+    val androidx_compose_version: String by ext
+    val androidx_lifecycle_viewmodel_compose_version: String by ext
+    val androidx_activity_compose_version: String by ext
+
+    implementation("androidx.compose.foundation:foundation:$androidx_compose_version")
+    implementation("androidx.compose.ui:ui:$androidx_compose_version")
+    implementation("androidx.compose.ui:ui-tooling:$androidx_compose_version")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$androidx_lifecycle_viewmodel_compose_version")
+    implementation("androidx.activity:activity-compose:$androidx_activity_compose_version")
+
+}
+
+kotlin {
+    sourceSets.all {
+        languageSettings {
+            optIn("androidx.compose.material.ExperimentalMaterialApi")
+        }
+    }
+}
+
+val ext = (gradle as ExtensionAware).extra
+val component_type: String by ext
+if (!component_type.toLowerCase().contains("app")) {
+    apply("$path_prefix/gradle/publish.gradle.kts")
+}
diff --git a/gradle/component.gradle b/gradle/component.gradle
deleted file mode 100644
index 152150330..000000000
--- a/gradle/component.gradle
+++ /dev/null
@@ -1,177 +0,0 @@
-repositories {
-    google()
-    mavenCentral()
-}
-
-// if the include is made from the example project shared module we need to go up one more directory
-String path_prefix = file("../gradle/componentskt.gradle.kts").exists() ? ".." : "../.."
-
-kotlin {
-
-    targets {
-        configure([]) {
-            tasks.getByName(compilations.test.compileKotlinTaskName).kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
-
-    android("androidLib") {
-        publishAllLibraryVariants()
-    }
-
-    gradle.ext.ios_targets.each {
-        "$it" {
-            binaries {
-                // Use this entry point to turn the thread tests are run to a background thread instead of the main thread
-                // This better allows testing the main dispatcher, and testing cross thread access
-                binaries.getTest("DEBUG").freeCompilerArgs += ["-e", "com.splendo.kaluga.test.base.mainBackground"]
-            }
-        }
-    }
-
-    jvm()
-    js(IR) {
-        // Disable JS browser tests for now
-        // See https://github.com/splendo/kaluga/issues/97
-        // browser()
-        nodejs()
-        configure([compilations.main, compilations.test]) {
-            tasks.getByName(compileKotlinTaskName).kotlinOptions {
-                metaInfo = true
-                sourceMap = true
-                moduleKind = 'umd'
-            }
-        }
-    }
-
-    sourceSets {
-
-        commonMain {
-            dependencies {
-                implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${gradle.kotlinx_coroutines_version}!!"
-            }
-        }
-
-        commonTest {
-            dependencies {
-                implementation kotlin('test')
-                implementation kotlin("test-common")
-                implementation kotlin("test-annotations-common")
-            }
-        }
-
-        jvmMain {
-            dependencies {
-                implementation kotlin("stdlib")
-                implementation "org.jetbrains.kotlinx:kotlinx-coroutines-swing:$gradle.kotlinx_coroutines_version"
-            }
-        }
-
-        jvmTest {
-            dependsOn commonTest
-            dependencies {
-                implementation kotlin("test")
-                implementation kotlin("test-junit")
-            }
-        }
-
-        jsMain {
-            dependencies {
-                implementation kotlin('stdlib-js')
-                implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$gradle.kotlinx_coroutines_version"
-            }
-        }
-
-        jsTest {
-            dependencies {
-                implementation kotlin('test-js')
-            }
-        }
-
-        iosMain {
-            dependsOn(commonMain)
-        }
-
-        iosTest {
-            dependsOn(commonTest)
-        }
-
-        gradle.ext.ios_targets.each {
-            "${it}Main" {
-                dependsOn(iosMain)
-            }
-            "${it}Test" {
-                dependsOn(iosTest)
-            }
-        }
-
-        sourceSets.all {
-            languageSettings {
-                optIn 'kotlinx.coroutines.DelicateCoroutinesApi'
-                optIn 'kotlinx.coroutines.ExperimentalCoroutinesApi'
-                optIn 'kotlinx.coroutines.ObsoleteCoroutinesApi'
-                optIn 'kotlinx.coroutines.InternalCoroutinesApi'
-                optIn 'kotlinx.coroutines.FlowPreview'
-                optIn 'kotlin.ExperimentalUnsignedTypes'
-                optIn 'kotlin.ExperimentalStdlibApi'
-                optIn 'kotlin.time.ExperimentalTime'
-                optIn 'kotlin.ExperimentalStdlibApi'
-                enableLanguageFeature("InlineClasses")
-            }
-        }
-
-        // Android dependencies must be declared below outside of the kotlin block
-
-    }
-}
-
-apply from: "$path_prefix/gradle/android_common.gradle"
-
-android {
-
-    testOptions {
-        unitTests.returnDefaultValues = true
-    }
-
-    packagingOptions {
-        exclude 'META-INF/kotlinx-coroutines-core.kotlin_module'
-        exclude 'META-INF/shared_debug.kotlin_module'
-        exclude 'META-INF/kotlinx-serialization-runtime.kotlin_module'
-        exclude 'META-INF/AL2.0'
-        exclude 'META-INF/LGPL2.1'
-        // bytebuddy 🤡
-        exclude 'win32-x86-64/attach_hotspot_windows.dll'
-        exclude 'win32-x86/attach_hotspot_windows.dll'
-        //
-        exclude 'META-INF/licenses/ASM'
-    }
-}
-
-task printConfigurations {
-    doLast {
-        configurations.each { println it }
-    }
-}
-
-afterEvaluate {
-    gradle.ext.ios_targets.each { target ->
-        if (tasks.getNames().contains("linkDebugTest${target.capitalize()}"))
-            // creating copy task for the target
-            tasks.create(name: "copy${target.capitalize()}TestResources", type: Copy) {
-                from file('src/iosTest/resources/.')
-                into file("$buildDir/bin/$target/debugTest")
-            }
-
-            // apply copy task to the target
-            tasks.named("linkDebugTest${target.capitalize()}").configure {
-                dependsOn("copy${target.capitalize()}TestResources")
-            }
-    }
-}
-
-ktlint {
-    disabledRules=["no-wildcard-imports","filename","import-ordering"]
-}
-
-apply from: "$path_prefix/gradle/componentskt.gradle.kts"
diff --git a/gradle/component.gradle.kts b/gradle/component.gradle.kts
new file mode 100644
index 000000000..a6dcf40b1
--- /dev/null
+++ b/gradle/component.gradle.kts
@@ -0,0 +1,55 @@
+repositories {
+    google()
+    mavenCentral()
+}
+
+// apply("$path_prefix/gradle/android_common.gradle.kts")
+//
+// android {
+//
+//     testOptions {
+//         unitTests.returnDefaultValues = true
+//     }
+//
+//     packagingOptions {
+//         resources.excludes.add("META-INF/kotlinx-coroutines-core.kotlin_module")
+//         resources.excludes.add("META-INF/shared_debug.kotlin_module")
+//         resources.excludes.add("META-INF/kotlinx-serialization-runtime.kotlin_module")
+//         resources.excludes.add("META-INF/AL2.0")
+//         resources.excludes.add("META-INF/LGPL2.1")
+//         // bytebuddy 🤡
+//         resources.excludes.add("win32-x86-64/attach_hotspot_windows.dll")
+//         resources.excludes.add("win32-x86/attach_hotspot_windows.dll")
+//         //
+//         resources.excludes.add("META-INF/licenses/ASM")
+//     }
+// }
+//
+// task printConfigurations {
+//     doLast {
+//         configurations.each { println(it) }
+//     }
+// }
+//
+// afterEvaluate {
+//     val ios_targets: List<String> by extra
+//     ios_targets.each { target ->
+//         if (tasks.getNames().contains("linkDebugTest${target.capitalize()}"))
+//             // creating copy task for the target
+//             tasks.create(name = "copy${target.capitalize()}TestResources", type = Copy) {
+//                 from(file('src/iosTest/resources/.'))
+//                 into(file("$buildDir/bin/$target/debugTest"))
+//             }
+//
+//             // apply copy task to the target
+//             tasks.named("linkDebugTest${target.capitalize()}").configure {
+//                 dependsOn("copy${target.capitalize()}TestResources")
+//             }
+//     }
+// }
+//
+// ktlint {
+//     disabledRules = listOf("no-wildcard-imports","filename","import-ordering")
+// }
+
+// apply(from = "$path_prefix/gradle/componentskt.gradle.kts")
diff --git a/gradle/componentskt.gradle.kts b/gradle/componentskt.gradle.kts
index 582a803ea..adf45d9b1 100644
--- a/gradle/componentskt.gradle.kts
+++ b/gradle/componentskt.gradle.kts
@@ -19,17 +19,17 @@
 
 import kotlin.text.*
 
-if ((gradle as ExtensionAware).extra["connect_check_expansion"] == true) {
-
-    val mymodules = project.parent?.subprojects?.filter {
-        it.name.startsWith("${project.name}-") || it.name.endsWith("-${project.name}")
-    }
-
-    mymodules?.forEach() { module ->
-        afterEvaluate {
-            logger.info("[connect_check_expansion] :${project.name}:connectedDebugAndroidTest dependsOn:${module.name}:connectedDebugAndroidTest")
-            tasks.getByPath("connectedDebugAndroidTest")
-                .dependsOn(":${module.name}:connectedDebugAndroidTest")
-        }
-    }
-}
+// if ((gradle as ExtensionAware).extra["connect_check_expansion"] == true) {
+//
+//     val mymodules = project.parent?.subprojects?.filter {
+//         it.name.startsWith("${project.name}-") || it.name.endsWith("-${project.name}")
+//     }
+//
+//     mymodules?.forEach() { module ->
+//         afterEvaluate {
+//             logger.info("[connect_check_expansion] :${project.name}:connectedDebugAndroidTest dependsOn:${module.name}:connectedDebugAndroidTest")
+//             tasks.getByPath("connectedDebugAndroidTest")
+//                 .dependsOn(":${module.name}:connectedDebugAndroidTest")
+//         }
+//     }
+// }
diff --git a/gradle/ext.gradle b/gradle/ext.gradle
deleted file mode 100644
index bbfce4c85..000000000
--- a/gradle/ext.gradle
+++ /dev/null
@@ -1,140 +0,0 @@
-println "tasks: $gradle.startParameter.taskNames"
-
-// if the include is made from the example project shared module we need to go up a few directories
-// and depending on when we are included, we can be in the `gradle` folder or not.
-String path_prefix =
-        file("componentskt.gradle.kts").exists() ? "" :
-                file("gradle/componentskt.gradle.kts").exists() ? "gradle/" : "../../../gradle/"
-def f2 = file("${path_prefix}gitBranch.gradle.kts")
-
-apply from: f2.path
-
-def props = new Properties()
-def propFile = file("../local.properties")
-if (propFile.exists()) {
-    propFile.withInputStream { props.load(it) }
-}
-
-String libraryVersionLocalProperties = props["kaluga.libraryVersion"]
-String exampleEmbeddingMethodLocalProperties = props["kaluga.exampleEmbeddingMethod"]
-String exampleMavenRepoLocalProperties = props["kaluga.exampleMavenRepo"]
-String kotlinVersion = getProperty("kaluga.kotlinVersion")
-
-// set some global variables
-gradle.ext {
-    kotlin_version = kotlinVersion
-    kotlinx_coroutines_version = '1.6.3-native-mt'
-    stately_version = '1.2.3'
-    stately_isolate_version = '1.2.3'
-    koin_version = '3.2.2'
-    serialization_version = '1.4.0'
-    napier_version = '2.4.0'
-    android_ble_scanner_version = '1.6.0'
-    library_version_base = '1.0.0'
-    library_version = libraryVersionLocalProperties ?: "$library_version_base${System.properties.kaluga_branch_postfix}"
-    android_min_sdk_version = 21
-    android_compile_sdk_version = 33
-    android_target_sdk_version = 33
-    android_build_tools_version = "33.0.0"
-
-    play_services_version = "20.0.0"
-    play_core_version = "1.10.3"
-    play_core_ktx_version = "1.8.1"
-
-    androidx_appcompat_version = "1.5.1"
-    androidx_fragment_version = "1.5.3"
-    androidx_core_version = "1.9.0"
-    androidx_lifecycle_version = "2.5.1"
-    androidx_lifecycle_viewmodel_compose_version = "2.5.1"
-    androidx_arch_core_testing_version = "2.1.0"
-    androidx_browser_version = "1.4.0"
-    androidx_constraint_layout_version = "2.1.4"
-
-    androidx_compose_compiler_version = "1.3.2"
-    androidx_compose_version = "1.2.1"
-    androidx_activity_compose_version = "1.6.0"
-    androidx_navigation_compose_version = "2.5.2"
-
-    material_version = "1.6.1"
-    material_components_adapter_version = "1.1.17"
-
-    // sub packages of test have different versions, but alpha/beta/rc releases are harmonized
-    androidx_test_version_postfix = ""
-    androidx_test_version = "1.4.0$androidx_test_version_postfix"
-    androidx_test_espresso_version = "3.4.0$androidx_test_version_postfix"
-    androidx_test_junit_version = "1.1.3$androidx_test_version_postfix"
-
-    // mockito and bytebuddy need to be upgraded in lockstep
-    mockito_version = "3.11.2"
-    bytebuddy_version = "1.11.3"
-
-    // Javascript
-    js_bigdecimal_version="1.0.26"
-
-    // used/modified at runtime.
-    component_type_default = "default"
-    component_type_compose = "compose"
-    component_type_app = "app"
-    component_type_composeApp = "composeApp"
-    component_type = component_type_default
-}
-
-if (System.env.containsKey("EXAMPLE_EMBEDDING_METHOD")) {
-    gradle.ext.example_embedding_method = System.env.EXAMPLE_EMBEDDING_METHOD
-    logger.lifecycle "System env EXAMPLE_EMBEDDING_METHOD set to $System.env.EXAMPLE_EMBEDDING_METHOD, using $gradle.ext.example_embedding_method"
-} else {
-    gradle.ext.example_embedding_method = exampleEmbeddingMethodLocalProperties ?: "composite"
-    logger.lifecycle "local.properties read (kaluga.exampleEmbeddingMethod=$exampleEmbeddingMethodLocalProperties, using $gradle.ext.example_embedding_method)"
-}
-
-if (System.env.containsKey("EXAMPLE_MAVEN_REPO")) {
-    gradle.ext.example_maven_repo = System.env.EXAMPLE_MAVEN_REPO
-    logger.lifecycle "System env EXAMPLE_MAVEN_REPO set to $System.env.EXAMPLE_MAVEN_REPO, using $gradle.ext.example_maven_repo"
-} else {
-    // load some more from local.properties or set defaults.
-    if (exampleMavenRepoLocalProperties) {
-        gradle.ext.example_maven_repo = exampleMavenRepoLocalProperties
-        logger.lifecycle "local.properties read (kaluga.exampleMavenRepo=$exampleMavenRepoLocalProperties, using $gradle.ext.example_maven_repo)"
-    } else {
-        gradle.ext.example_maven_repo = "local"
-        logger.lifecycle "local.properties not found, using default value ($gradle.ext.example_maven_repo)"
-    }
-}
-
-def CONNECTED_CHECK_EXPANSION = System.env.containsKey("CONNECTED_CHECK_EXPANSION")
-gradle.ext.connect_check_expansion = CONNECTED_CHECK_EXPANSION | System.env.containsKey("CI")
-
-if (gradle.ext.connect_check_expansion)
-    logger.lifecycle "Adding extra dependend task to connected checks of similarly named modules (CONNECTED_CHECK_EXPANSION env present: $CONNECTED_CHECK_EXPANSION)"
-
-// based on https://github.com/Kotlin/xcode-compat/blob/d677a43edc46c50888bca0a7890a81f976a42809/xcode-compat/src/main/kotlin/org/jetbrains/kotlin/xcodecompat/XcodeCompatPlugin.kt#L16
-def sdkName = System.getenv("SDK_NAME") ?: "unknown"
-gradle.ext.is_real_ios_device = sdkName.startsWith("iphoneos")
-logger.lifecycle "Run on real ios device: $gradle.ext.is_real_ios_device from sdk: $sdkName"
-
-// Run on IntelliJ
-def ideaActive = System.getProperty("idea.active") == "true"
-gradle.ext.idea_active = ideaActive
-logger.lifecycle "Run on IntelliJ: $gradle.ext.idea_active"
-
-// Run on apple silicon
-def isAppleSilicon = System.getProperty("os.arch") == "aarch64"
-gradle.ext.is_apple_silicon = isAppleSilicon
-logger.lifecycle "Run on apple silicon: $gradle.ext.is_apple_silicon"
-
-def iosX64 = "iosX64"
-def iosArm64 = "iosArm64"
-def iosSimulatorArm64 = "iosSimulatorArm64"
-def allIosTargets = [iosX64, iosArm64, iosSimulatorArm64]
-if (!gradle.ext.idea_active) {
-    gradle.ext.ios_targets = allIosTargets
-} else {
-    if (gradle.ext.is_real_ios_device) {
-        gradle.ext.ios_targets = [iosArm64]
-    } else if (gradle.ext.is_apple_silicon) {
-        gradle.ext.ios_targets = [iosSimulatorArm64]
-    } else {
-        gradle.ext.ios_targets = [iosX64]
-    }
-}
-logger.lifecycle "Run on ios targets: $gradle.ext.ios_targets"
diff --git a/gradle/ext.gradle.kts b/gradle/ext.gradle.kts
new file mode 100644
index 000000000..decfe47c5
--- /dev/null
+++ b/gradle/ext.gradle.kts
@@ -0,0 +1,157 @@
+// import java.util.Properties
+// import java.io.*
+//
+// println("tasks: $gradle.startParameter.taskNames")
+//
+// // if the include is made from the example project shared module we need to go up a few directories
+// // and depending on when we are included, we can be in the `gradle` folder or not.
+// val path_prefix = when {
+//     file("componentskt.gradle.kts").exists() -> ""
+//     file("gradle/componentskt.gradle.kts").exists() -> "gradle/"
+//     else -> "../../../gradle/"
+// }
+// val f2 = file("${path_prefix}gitBranch.gradle.kts")
+//
+// apply(from = f2.path)
+// val systemProperties = System.getProperties()
+//
+// val props = Properties()
+// val propFile = file("../local.properties")
+// if (propFile.exists()) {
+//     val inputStream = FileInputStream(propFile.absolutePath)
+//     props.load(inputStream)
+// }
+//
+// val libraryVersionLocalProperties: String? = props["kaluga.libraryVersion"] as? String
+// val exampleEmbeddingMethodLocalProperties: String? = props["kaluga.exampleEmbeddingMethod"] as? String
+// val exampleMavenRepoLocalProperties: String? = props["kaluga.exampleMavenRepo"] as? String
+// val kotlinVersion: String = extra["kaluga.kotlinVersion"] as String
+//
+// // set some global variables
+// val ext = (gradle as ExtensionAware).extra
+// ext.apply {
+//     set("kotlin_version", kotlinVersion)
+//     set("kotlinx_coroutines_version", "1.6.3-native-mt")
+//     set("stately_version", "1.2.3")
+//     set("stately_isolate_version", "1.2.3")
+//     set("koin_version", "3.2.2")
+//     set("serialization_version", "1.4.0")
+//     set("napier_version", "2.4.0")
+//     set("android_ble_scanner_version", "1.6.0")
+//     val library_version_base = "1.0.0"
+//     set("library_version_base", library_version_base)
+//     set("library_version", libraryVersionLocalProperties ?: "$library_version_base${systemProperties["kaluga_branch_postfix"]}")
+//     set("android_min_sdk_version", 21)
+//     set("android_compile_sdk_version", 33)
+//     set("android_target_sdk_version", 33)
+//     set("android_build_tools_version", "33.0.0")
+//
+//     set("play_services_version", "20.0.0")
+//     set("play_core_version", "1.10.3")
+//     set("play_core_ktx_version", "1.8.1")
+//
+//     set("androidx_appcompat_version", "1.5.1")
+//     set("androidx_fragment_version", "1.5.3")
+//     set("androidx_core_version", "1.9.0")
+//     set("androidx_lifecycle_version", "2.5.1")
+//     set("androidx_lifecycle_viewmodel_compose_version", "2.5.1")
+//     set("androidx_arch_core_testing_version", "2.1.0")
+//     set("androidx_browser_version", "1.4.0")
+//     set("androidx_constraint_layout_version", "2.1.4")
+//
+//     set("androidx_compose_compiler_version", "1.3.2")
+//     set("androidx_compose_version", "1.2.1")
+//     set("androidx_activity_compose_version", "1.6.0")
+//     set("androidx_navigation_compose_version", "2.5.2")
+//
+//     set("material_version", "1.6.1")
+//     set("material_components_adapter_version", "1.1.17")
+//
+//     // sub packages of test have different versions, but alpha/beta/rc releases are harmonized
+//     set("junit_version", "4.13.2")
+//
+//     val androidx_test_version_postfix = ""
+//     set("androidx_test_version_postfix", androidx_test_version_postfix)
+//     set("androidx_test_version", "1.4.0$androidx_test_version_postfix")
+//     set("androidx_test_espresso_version", "3.4.0$androidx_test_version_postfix")
+//     set("androidx_test_junit_version", "1.1.3$androidx_test_version_postfix")
+//     set("androidx_test_uiautomator_version", "2.2.0")
+//
+//     // mockito and bytebuddy need to be upgraded in lockstep
+//     set("mockito_version", "3.11.2")
+//     set("bytebuddy_version", "1.11.3")
+//
+//     // Javascript
+//     set("js_bigdecimal_version", "1.0.26")
+//
+//     // used/modified at runtime.
+//     val component_type_default = "default"
+//     set("component_type_default", component_type_default)
+//     set("component_type_compose", "compose")
+//     set("component_type_app", "app")
+//     set("component_type_composeApp", "composeApp")
+//     set("component_type", component_type_default)
+// }
+//
+// if (System.getenv().containsKey("EXAMPLE_EMBEDDING_METHOD")) {
+//     ext.set("example_embedding_method", System.getenv()["EXAMPLE_EMBEDDING_METHOD"])
+//     logger.lifecycle("System env EXAMPLE_EMBEDDING_METHOD set to ${System.getenv()["EXAMPLE_EMBEDDING_METHOD"]}, using ${ext["example_embedding_method"]}")
+// } else {
+//     ext.set("example_embedding_method", exampleEmbeddingMethodLocalProperties ?: "composite")
+//     logger.lifecycle("local.properties read (kaluga.exampleEmbeddingMethod=$exampleEmbeddingMethodLocalProperties, using ${ext["example_embedding_method"]})")
+// }
+//
+// if (System.getenv().containsKey("EXAMPLE_MAVEN_REPO")) {
+//     ext.set("example_maven_repo", System.getenv()["EXAMPLE_MAVEN_REPO"])
+//     logger.lifecycle("System env EXAMPLE_MAVEN_REPO set to ${System.getenv()["EXAMPLE_MAVEN_REPO"]}, using ${ext["example_maven_repo"]}")
+// } else {
+//     // load some more from local.properties or set defaults.
+//     if (exampleMavenRepoLocalProperties != null) {
+//         ext.set("example_maven_repo", exampleMavenRepoLocalProperties)
+//         logger.lifecycle("local.properties read (kaluga.exampleMavenRepo=$exampleMavenRepoLocalProperties, using ${ext["example_maven_repo"]})")
+//     } else {
+//         ext.set("example_maven_repo", "local")
+//         logger.lifecycle("local.properties not found, using default value (${ext["example_maven_repo"]})")
+//     }
+// }
+//
+// val CONNECTED_CHECK_EXPANSION = System.getenv().containsKey("CONNECTED_CHECK_EXPANSION")
+// ext.set("connect_check_expansion", CONNECTED_CHECK_EXPANSION or System.getenv().containsKey("CI"))
+//
+// val connect_check_expansion: Boolean by ext
+// if (connect_check_expansion)
+//     logger.lifecycle("Adding extra dependend task to connected checks of similarly named modules (CONNECTED_CHECK_EXPANSION env present: $CONNECTED_CHECK_EXPANSION)")
+//
+// // based on https://github.com/Kotlin/xcode-compat/blob/d677a43edc46c50888bca0a7890a81f976a42809/xcode-compat/src/main/kotlin/org/jetbrains/kotlin/xcodecompat/XcodeCompatPlugin.kt#L16
+// val sdkName = System.getenv("SDK_NAME") ?: "unknown"
+// ext.set("is_real_ios_device", sdkName.startsWith("iphoneos"))
+// logger.lifecycle("Run on real ios device: ${ext["is_real_ios_device"]} from sdk: $sdkName")
+//
+// // Run on IntelliJ
+// val ideaActive = System.getProperty("idea.active") == "true"
+// ext.set("idea_active", ideaActive)
+// logger.lifecycle("Run on IntelliJ: ${ext["idea_active"]}")
+//
+// // Run on apple silicon
+// val isAppleSilicon = System.getProperty("os.arch") == "aarch64"
+// ext.set("is_apple_silicon", isAppleSilicon)
+// logger.lifecycle("Run on apple silicon: ${ext["is_apple_silicon"]}")
+//
+// val iosX64 = "iosX64"
+// val iosArm64 = "iosArm64"
+// val iosSimulatorArm64 = "iosSimulatorArm64"
+// val allIosTargets = listOf(iosX64, iosArm64, iosSimulatorArm64)
+// val idea_active: Boolean by ext
+// val is_real_ios_device: Boolean by ext
+// val is_apple_silicon: Boolean by ext
+//
+// ext.set(
+//     "ios_targets",
+//     when {
+//         !idea_active -> allIosTargets
+//         is_real_ios_device -> listOf(iosArm64)
+//         is_apple_silicon -> listOf(iosSimulatorArm64)
+//         else -> listOf(iosX64)
+//     }
+// )
+// logger.lifecycle("Run on ios targets: ${ext["ios_targets"]}")
diff --git a/gradle/gitBranch.gradle.kts b/gradle/gitBranch.gradle.kts
index eb5946265..0f3e7e864 100644
--- a/gradle/gitBranch.gradle.kts
+++ b/gradle/gitBranch.gradle.kts
@@ -14,34 +14,34 @@
     limitations under the License.
 
  */
-import org.codehaus.groovy.runtime.ProcessGroovyMethods
-
-val BITRISE_GIT_BRANCH = System.getenv("BITRISE_GIT_BRANCH")
-val kaluga_branch = System.getProperty("kaluga_branch")
-val MAVEN_CENTRAL_RELEASE = System.getenv("MAVEN_CENTRAL_RELEASE")
-val release = MAVEN_CENTRAL_RELEASE?.toLowerCase()?.trim() == "true"
-val branchFromGit = run {
-    try {
-        ProcessGroovyMethods.getText(ProcessGroovyMethods.execute("git rev-parse --abbrev-ref HEAD"))
-    } catch (e: Exception) {
-        logger.info("Unable to determine current branch through git CLI: ${e.message}")
-        "unknown"
-    }
-}
-
-// favour user definition of kaluga_branch (if present), otherwise take it from GIT branch:
-// - if running on CI: favour bitrise's branch detection
-// - else: try to get it via the `git` CLI.
-val branch = (kaluga_branch ?: BITRISE_GIT_BRANCH ?: branchFromGit ).replace('/', '-').trim().toLowerCase().also {
-        if (it == "HEAD")
-            logger.warn("Unable to determine current branch: Project is checked out with detached head!")
-    }
-
-val kaluga_branch_postfix = when(branch) {
-    "master", "main", "develop" -> ""
-    else -> "-"+branch
-} + if (!release) "-SNAPSHOT" else ""
-
-logger.lifecycle("decided branch: '$branch' to postfix '$kaluga_branch_postfix', isRelease: $release (from: BITRISE_GIT_BRANCH env: $BITRISE_GIT_BRANCH, kaluga_branch property: $kaluga_branch , MAVEN_CENTRAL_RELEASE env: $MAVEN_CENTRAL_RELEASE , git cli: $branchFromGit)")
-
-System.setProperty("kaluga_branch_postfix", kaluga_branch_postfix)
+// import org.codehaus.groovy.runtime.ProcessGroovyMethods
+//
+// val BITRISE_GIT_BRANCH = System.getenv("BITRISE_GIT_BRANCH")
+// val kaluga_branch = System.getProperty("kaluga_branch")
+// val MAVEN_CENTRAL_RELEASE = System.getenv("MAVEN_CENTRAL_RELEASE")
+// val release = MAVEN_CENTRAL_RELEASE?.toLowerCase()?.trim() == "true"
+// val branchFromGit = run {
+//     try {
+//         ProcessGroovyMethods.getText(ProcessGroovyMethods.execute("git rev-parse --abbrev-ref HEAD"))
+//     } catch (e: Exception) {
+//         logger.info("Unable to determine current branch through git CLI: ${e.message}")
+//         "unknown"
+//     }
+// }
+//
+// // favour user definition of kaluga_branch (if present), otherwise take it from GIT branch:
+// // - if running on CI: favour bitrise's branch detection
+// // - else: try to get it via the `git` CLI.
+// val branch = (kaluga_branch ?: BITRISE_GIT_BRANCH ?: branchFromGit ).replace('/', '-').trim().toLowerCase().also {
+//         if (it == "HEAD")
+//             logger.warn("Unable to determine current branch: Project is checked out with detached head!")
+//     }
+//
+// val kaluga_branch_postfix = when(branch) {
+//     "master", "main", "develop" -> ""
+//     else -> "-"+branch
+// } + if (!release) "-SNAPSHOT" else ""
+//
+// logger.lifecycle("decided branch: '$branch' to postfix '$kaluga_branch_postfix', isRelease: $release (from: BITRISE_GIT_BRANCH env: $BITRISE_GIT_BRANCH, kaluga_branch property: $kaluga_branch , MAVEN_CENTRAL_RELEASE env: $MAVEN_CENTRAL_RELEASE , git cli: $branchFromGit)")
+//
+// System.setProperty("kaluga_branch_postfix", kaluga_branch_postfix)
diff --git a/gradle/newModule.gradle.kts b/gradle/newModule.gradle.kts
index 619fd06e1..0afa01508 100644
--- a/gradle/newModule.gradle.kts
+++ b/gradle/newModule.gradle.kts
@@ -24,7 +24,7 @@ abstract class NewModule : DefaultTask() {
         const val VALID_MODULE_NAME_REGEX = "^[^\\dA-Z-][a-z]+[a-z-]*\\Z"
         const val VALID_PACKAGE_NAME = "^[a-z]+(\\.[a-z]+)*\\Z"
         const val TEMPLATE_PATH = "adding-a-new-module/template"
-        const val BUILD_GRADLE_KTS = "build.gradle.kts"
+        const val BUILD_GRADLE_KTS = "build.build.gradle.kts.kts"
         val CREATE_DIRS = listOf(
             "androidLibAndroidTest" to listOf("kotlin/TestActivity.kt", "AndroidManifest.xml"),
             "androidLibMain" to listOf("AndroidManifest.xml"),
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
deleted file mode 100644
index ab3e503f8..000000000
--- a/gradle/publish.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-
-String type = gradle.ext.component_type
-
-afterEvaluate {
-    publishing {
-        publications {
-            logger.lifecycle("This project module will be published as: $gradle.ext.component_type")
-            if (type.contains("compose")) {
-                release(MavenPublication) {
-                    from components.release
-
-                    artifactId = project.name
-                    groupId = "com.splendo.kaluga"
-                    version = gradle.ext.library_version
-                }
-                // Creates a Maven publication called “debug”.
-                debug(MavenPublication) {
-                    from components.debug
-
-                    artifactId = project.name
-                    groupId = "com.splendo.kaluga"
-                    version = gradle.ext.library_version
-                }
-            } else {
-                kotlinMultiplatform { publication ->
-                    artifactId = project.name
-                    groupId = "com.splendo.kaluga"
-                    version = gradle.ext.library_version
-                }
-            }
-        }
-    }
-}
diff --git a/gradle/publish.gradle.kts b/gradle/publish.gradle.kts
new file mode 100644
index 000000000..5e688d7ad
--- /dev/null
+++ b/gradle/publish.gradle.kts
@@ -0,0 +1,32 @@
+afterEvaluate {
+    // publishing {
+    //     publications {
+    //         val component_type: String by extra
+    //         val library_version: String by extra
+    //         logger.lifecycle("This project module will be published as: $component_type")
+    //         if (type.contains("compose")) {
+    //             release(MavenPublication) {
+    //                 from(components.release)
+    //
+    //                 artifactId = project.name
+    //                 groupId = "com.splendo.kaluga"
+    //                 version = library_version
+    //             }
+    //             // Creates a Maven publication called “debug”.
+    //             debug(MavenPublication) {
+    //                 from(components.debug)
+    //
+    //                 artifactId = project.name
+    //                 groupId = "com.splendo.kaluga"
+    //                 version = library_version
+    //             }
+    //         } else {
+    //             kotlinMultiplatform { publication ->
+    //                 artifactId = project.name
+    //                 groupId = "com.splendo.kaluga"
+    //                 version = library_version
+    //             }
+    //         }
+    //     }
+    // }
+}
diff --git a/gradle/publishable_component.gradle b/gradle/publishable_component.gradle
deleted file mode 100644
index ea4571356..000000000
--- a/gradle/publishable_component.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-apply from: "../gradle/component.gradle"
-apply from: "../gradle/jacoco.gradle"
-apply from: "../gradle/publish.gradle"
diff --git a/gradle/publishable_component.gradle.kts b/gradle/publishable_component.gradle.kts
new file mode 100644
index 000000000..130f6e847
--- /dev/null
+++ b/gradle/publishable_component.gradle.kts
@@ -0,0 +1,3 @@
+apply(from = "../gradle/component.gradle.kts")
+apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/publish.gradle.kts")
diff --git a/hud/build.gradle.kts b/hud/build.gradle.kts
index d8114e8a8..6c6b33fbf 100644
--- a/hud/build.gradle.kts
+++ b/hud/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/keyboard/build.gradle.kts b/keyboard/build.gradle.kts
index 69ac0ba34..60b3092ab 100644
--- a/keyboard/build.gradle.kts
+++ b/keyboard/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/links/build.gradle.kts b/links/build.gradle.kts
index ab346a126..11d8e6fc1 100644
--- a/links/build.gradle.kts
+++ b/links/build.gradle.kts
@@ -26,7 +26,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/location-permissions/build.gradle.kts b/location-permissions/build.gradle.kts
index 90d5840d9..7135eda09 100644
--- a/location-permissions/build.gradle.kts
+++ b/location-permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/location/build.gradle.kts b/location/build.gradle.kts
index 642a74528..9710fc232 100644
--- a/location/build.gradle.kts
+++ b/location/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
index effc9e9cc..8685d502a 100644
--- a/logging/build.gradle.kts
+++ b/logging/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/microphone-permissions/build.gradle.kts b/microphone-permissions/build.gradle.kts
index 90d5840d9..7135eda09 100644
--- a/microphone-permissions/build.gradle.kts
+++ b/microphone-permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/notifications-permissions/build.gradle.kts b/notifications-permissions/build.gradle.kts
index 90d5840d9..7135eda09 100644
--- a/notifications-permissions/build.gradle.kts
+++ b/notifications-permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/permissions/build.gradle.kts b/permissions/build.gradle.kts
index 0c746620f..d8be8917b 100644
--- a/permissions/build.gradle.kts
+++ b/permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts
index 44368a2d2..5e705248b 100644
--- a/resources/build.gradle.kts
+++ b/resources/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/review/build.gradle.kts b/review/build.gradle.kts
index 877d673d0..69842b7c7 100644
--- a/review/build.gradle.kts
+++ b/review/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/scientific/build.gradle.kts b/scientific/build.gradle.kts
index 42a73f62c..68e1d7415 100644
--- a/scientific/build.gradle.kts
+++ b/scientific/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5a29f0e16..040d0154b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,7 +44,7 @@ pluginManagement {
     }
 }
 
-apply("gradle/ext.gradle")
+apply("gradle/ext.gradle.kts")
 includeBuild("convention-plugins")
 
 rootProject.name = "Kaluga"
diff --git a/storage-permissions/build.gradle.kts b/storage-permissions/build.gradle.kts
index 90d5840d9..7135eda09 100644
--- a/storage-permissions/build.gradle.kts
+++ b/storage-permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/system/build.gradle.kts b/system/build.gradle.kts
index a95221eab..1d02e0dda 100644
--- a/system/build.gradle.kts
+++ b/system/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils-alerts/build.gradle.kts b/test-utils-alerts/build.gradle.kts
index fb32638f8..758be76a9 100644
--- a/test-utils-alerts/build.gradle.kts
+++ b/test-utils-alerts/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils-architecture/build.gradle.kts b/test-utils-architecture/build.gradle.kts
index 109f1e24d..869b0f540 100644
--- a/test-utils-architecture/build.gradle.kts
+++ b/test-utils-architecture/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils-base/build.gradle.kts b/test-utils-base/build.gradle.kts
index 0502733c4..bea107930 100644
--- a/test-utils-base/build.gradle.kts
+++ b/test-utils-base/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils-bluetooth/build.gradle.kts b/test-utils-bluetooth/build.gradle.kts
index 9431a27ac..514bee8f4 100644
--- a/test-utils-bluetooth/build.gradle.kts
+++ b/test-utils-bluetooth/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils-hud/build.gradle.kts b/test-utils-hud/build.gradle.kts
index ad563fdf2..15a0d34a8 100644
--- a/test-utils-hud/build.gradle.kts
+++ b/test-utils-hud/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils-keyboard/build.gradle.kts b/test-utils-keyboard/build.gradle.kts
index 4bb39b2a1..2f6d6ce4d 100644
--- a/test-utils-keyboard/build.gradle.kts
+++ b/test-utils-keyboard/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils-koin/build.gradle.kts b/test-utils-koin/build.gradle.kts
index 4e1c0c01a..226c3a650 100644
--- a/test-utils-koin/build.gradle.kts
+++ b/test-utils-koin/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils-location/build.gradle.kts b/test-utils-location/build.gradle.kts
index 8f2d270c3..3e32bc3fb 100644
--- a/test-utils-location/build.gradle.kts
+++ b/test-utils-location/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils-permissions/build.gradle.kts b/test-utils-permissions/build.gradle.kts
index ff8dcd066..2f087c8af 100644
--- a/test-utils-permissions/build.gradle.kts
+++ b/test-utils-permissions/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils-resources/build.gradle.kts b/test-utils-resources/build.gradle.kts
index 444fa0e33..c31e0e675 100644
--- a/test-utils-resources/build.gradle.kts
+++ b/test-utils-resources/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index 181ed6ccd..fe43c23dc 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 val ext = (gradle as ExtensionAware).extra
 
-apply(from = "../gradle/publishable_component.gradle")
+apply(from = "../gradle/publishable_component.gradle.kts")
 
 group = "com.splendo.kaluga"
 version = ext["library_version"]!!

From aea0787b0de3d9fc256bad04d4327e0ce69c0dcd Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 10 Oct 2022 09:35:48 +0200
Subject: [PATCH 003/227] Gradle migration continued

---
 alerts/build.gradle.kts                       |  13 +-
 architecture-compose/build.gradle.kts         |  21 +--
 architecture/build.gradle.kts                 |  21 +--
 base-permissions/build.gradle.kts             |  13 +-
 base/build.gradle.kts                         |  19 +--
 .../kotlin/text/NumberFormatterTest.kt        |   4 +-
 beacons/build.gradle.kts                      |   7 +-
 bluetooth-permissions/build.gradle.kts        |  15 +-
 bluetooth/build.gradle.kts                    |  13 +-
 build.gradle.kts                              |   1 -
 buildSrc/build.gradle.kts                     |  17 +-
 buildSrc/src/main/kotlin/Accessors.kt         |  55 ++++++
 buildSrc/src/main/kotlin/AndroidCommon.kt     |  96 ++++++-----
 buildSrc/src/main/kotlin/AndroidCompose.kt    |  43 +++++
 buildSrc/src/main/kotlin/Component.kt         | 131 ++++++++++++---
 buildSrc/src/main/kotlin/Dependencies.kt      |  28 +++-
 buildSrc/src/main/kotlin/GitBranch.kt         |   9 +-
 buildSrc/src/main/kotlin/Library.kt           |  65 ++++----
 buildSrc/src/main/kotlin/Publish.kt           |  56 +++++++
 .../src/main/kotlin/PublishableComponent.kt   |  23 +++
 calendar-permissions/build.gradle.kts         |  13 +-
 camera-permissions/build.gradle.kts           |  15 +-
 contacts-permissions/build.gradle.kts         |  15 +-
 date-time-picker/build.gradle.kts             |  16 +-
 date-time/build.gradle.kts                    |   8 +-
 gradle/android_common.gradle.kts              | 128 --------------
 gradle/android_compose.gradle.kts             |  49 ------
 gradle/component.gradle.kts                   |  55 ------
 gradle/componentskt.gradle.kts                |  35 ----
 gradle/ext.gradle.kts                         | 157 ------------------
 gradle/gitBranch.gradle.kts                   |  47 ------
 gradle/publish.gradle.kts                     |  32 ----
 gradle/publishable_component.gradle.kts       |   3 -
 gradle/wrapper/gradle-wrapper.properties      |   5 +-
 hud/build.gradle.kts                          |  14 +-
 keyboard-compose/build.gradle.kts             |  21 +--
 keyboard/build.gradle.kts                     |   7 +-
 links/build.gradle.kts                        |  10 +-
 location-permissions/build.gradle.kts         |  13 +-
 location/build.gradle.kts                     |  12 +-
 logging/build.gradle.kts                      |  18 +-
 microphone-permissions/build.gradle.kts       |  15 +-
 notifications-permissions/build.gradle.kts    |  15 +-
 permissions/build.gradle.kts                  |   9 +-
 resources-compose/build.gradle.kts            |  25 +--
 resources/build.gradle.kts                    |  16 +-
 review/build.gradle.kts                       |  15 +-
 scientific/build.gradle.kts                   |  17 +-
 settings.gradle.kts                           |   1 -
 storage-permissions/build.gradle.kts          |  15 +-
 system/build.gradle.kts                       |  13 +-
 test-utils-alerts/build.gradle.kts            |   9 +-
 test-utils-architecture/build.gradle.kts      |   9 +-
 test-utils-base/build.gradle.kts              |  22 +--
 test-utils-bluetooth/build.gradle.kts         |   9 +-
 test-utils-hud/build.gradle.kts               |   9 +-
 test-utils-keyboard/build.gradle.kts          |   9 +-
 test-utils-koin/build.gradle.kts              |  11 +-
 test-utils-location/build.gradle.kts          |   9 +-
 test-utils-permissions/build.gradle.kts       |   9 +-
 test-utils-resources/build.gradle.kts         |   9 +-
 test-utils/build.gradle.kts                   |   9 +-
 62 files changed, 519 insertions(+), 1059 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/Accessors.kt
 create mode 100644 buildSrc/src/main/kotlin/AndroidCompose.kt
 create mode 100644 buildSrc/src/main/kotlin/Publish.kt
 create mode 100644 buildSrc/src/main/kotlin/PublishableComponent.kt
 delete mode 100644 gradle/android_common.gradle.kts
 delete mode 100644 gradle/android_compose.gradle.kts
 delete mode 100644 gradle/component.gradle.kts
 delete mode 100644 gradle/componentskt.gradle.kts
 delete mode 100644 gradle/ext.gradle.kts
 delete mode 100644 gradle/gitBranch.gradle.kts
 delete mode 100644 gradle/publish.gradle.kts
 delete mode 100644 gradle/publishable_component.gradle.kts

diff --git a/alerts/build.gradle.kts b/alerts/build.gradle.kts
index b66f5c421..09602afd9 100644
--- a/alerts/build.gradle.kts
+++ b/alerts/build.gradle.kts
@@ -6,19 +6,12 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-group = Library.group
-version = Library.version
-
 dependencies {
-
-    val ext = (gradle as ExtensionAware).extra
-    val androidx_fragment_version: String by ext
-
-    implementation(Dependencies.AndroidX.Fragment.notation)
-    testImplementation(Dependencies.AndroidX.FragmentKtx.notation)
+    implement(Dependencies.AndroidX.Fragment)
+    implementForTest(Dependencies.AndroidX.FragmentKtx)
 }
 
-commonComponent()
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/architecture-compose/build.gradle.kts b/architecture-compose/build.gradle.kts
index 6490880b1..1b311bbdb 100644
--- a/architecture-compose/build.gradle.kts
+++ b/architecture-compose/build.gradle.kts
@@ -24,25 +24,12 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-ext["component_type"] = ext["component_type_compose"]
-
-// if the include is made from the example project shared module we need to go up one more directory
-val path_prefix = if (file("../gradle/componentskt.gradle.kts").exists())
-    ".." else "../.."
-
-apply(from = "$path_prefix/gradle/android_compose.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-ext["component_type"] = ext["component_type_default"]
+composeAndroidComponent()
 
 dependencies {
     api(project(":base"))
     api(project(":architecture"))
-    val ext = (gradle as ExtensionAware).extra
-    implementation("androidx.compose.material:material:" + ext["androidx_compose_version"])
-    implementation("androidx.navigation:navigation-compose:" + ext["androidx_navigation_compose_version"])
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${ext["kotlinx_coroutines_version"]}!!")
+    implement(Dependencies.AndroidX.Compose.Material)
+    implement(Dependencies.AndroidX.Navigation.Compose)
+    implement(Dependencies.KotlinX.Coroutines.Core)
 }
diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts
index d1aa553cf..b539bf767 100644
--- a/architecture/build.gradle.kts
+++ b/architecture/build.gradle.kts
@@ -7,12 +7,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 dependencies {
     val ext = (gradle as ExtensionAware).extra
@@ -20,11 +15,11 @@ dependencies {
     val androidx_lifecycle_version: String by ext
     val androidx_browser_version: String by ext
 
-    api("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
-    api("androidx.lifecycle:lifecycle-runtime-ktx:$androidx_lifecycle_version")
-    api("androidx.lifecycle:lifecycle-viewmodel-ktx:$androidx_lifecycle_version")
-    api("androidx.lifecycle:lifecycle-livedata-ktx:$androidx_lifecycle_version")
-    implementation("androidx.browser:browser:$androidx_browser_version")
+    api("org.jetbrains.kotlin:kotlin-reflect:${Library.kotlinVersion}")
+    expose(Dependencies.AndroidX.Lifecycle.Runtime)
+    expose(Dependencies.AndroidX.Lifecycle.ViewModel)
+    expose(Dependencies.AndroidX.Lifecycle.LiveData)
+    implement(Dependencies.AndroidX.Browser)
 }
 
 kotlin {
@@ -35,8 +30,8 @@ kotlin {
         getByName("commonMain") {
             dependencies {
                 implementation(project(":base", ""))
-                api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serialization_version")
-                api("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version")
+                expose(Dependencies.KotlinX.Serialization.Core)
+                expose(Dependencies.KotlinX.Serialization.Json)
             }
         }
 
diff --git a/base-permissions/build.gradle.kts b/base-permissions/build.gradle.kts
index a75815832..23ee29621 100644
--- a/base-permissions/build.gradle.kts
+++ b/base-permissions/build.gradle.kts
@@ -6,18 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-val kotlinx_coroutines_version = ext["kotlinx_coroutines_version"]!!
-
-dependencies {
-    val play_services_version = (gradle as ExtensionAware).extra["play_services_version"]
-    implementation("com.google.android.gms:play-services-location:$play_services_version")
-}
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index eea324c02..f965cef72 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -6,12 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 kotlin {
     sourceSets {
@@ -21,17 +16,17 @@ kotlin {
         getByName("commonMain") {
             dependencies {
                 implementation(project(":logging", ""))
-                api("co.touchlab:stately-common:${ext["stately_version"]}")
-                api("co.touchlab:stately-isolate:${ext["stately_isolate_version"]}")
-                api("co.touchlab:stately-iso-collections:${ext["stately_isolate_version"]}")
-                api("co.touchlab:stately-concurrency:${ext["stately_version"]}")
+                expose(Dependencies.Stately.Common)
+                expose(Dependencies.Stately.Isolate)
+                expose(Dependencies.Stately.IsoCollections)
+                expose(Dependencies.Stately.Concurrency)
             }
         }
         getByName("jsMain") {
             dependencies {
-                implementation(kotlin("stdlib-common", "${ext["kotlin_version"]}"))
+                implementation(kotlin("stdlib-common", Library.kotlinVersion))
                 // JavaScript BigDecimal lib based on native BigInt
-                implementation(npm("@splendo/bigdecimal", "${ext["js_bigdecimal_version"]}"))
+                implementation(npm("@splendo/bigdecimal", "1.0.26"))
             }
         }
         getByName("jsTest") {
diff --git a/base/src/commonTest/kotlin/text/NumberFormatterTest.kt b/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
index a32421d73..5bba4ea05 100644
--- a/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
@@ -4,9 +4,9 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/beacons/build.gradle.kts b/beacons/build.gradle.kts
index ff11a0d7c..b9d2292be 100644
--- a/beacons/build.gradle.kts
+++ b/beacons/build.gradle.kts
@@ -6,12 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/bluetooth-permissions/build.gradle.kts b/bluetooth-permissions/build.gradle.kts
index 459b1b9a1..ce7e10c83 100644
--- a/bluetooth-permissions/build.gradle.kts
+++ b/bluetooth-permissions/build.gradle.kts
@@ -6,24 +6,11 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-val kotlinx_coroutines_version = ext["kotlinx_coroutines_version"]!!
-
-dependencies {
-    val play_services_version = (gradle as ExtensionAware).extra["play_services_version"]
-    implementation("com.google.android.gms:play-services-location:$play_services_version")
-}
+publishableComponent()
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
                 api(project(":base-permissions", ""))
             }
diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts
index 1793ae034..837d47951 100644
--- a/bluetooth/build.gradle.kts
+++ b/bluetooth/build.gradle.kts
@@ -6,16 +6,10 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 dependencies {
-    val ext = (gradle as ExtensionAware).extra
-    implementation("no.nordicsemi.android.support.v18:scanner:${ext["android_ble_scanner_version"]}")
+    implement(Dependencies.BLEScanner)
     implementation(project(":location", ""))
 }
 
@@ -23,9 +17,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                val ext = (gradle as ExtensionAware).extra
                 api(project(":bluetooth-permissions", ""))
-                implementation("co.touchlab:stately-concurrency:${ext["stately_version"]}")
+                implement(Dependencies.Stately.Concurrency)
             }
         }
         commonTest {
diff --git a/build.gradle.kts b/build.gradle.kts
index 77f56ba5a..471734431 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -65,7 +65,6 @@ apiValidation {
     ignoredClasses.add("com.splendo.kaluga.datetime.timer.BuildConfig")
 }
 
-apply(from = "gradle/ext.gradle.kts")
 apply(from = "gradle/newModule.gradle.kts")
 apply(from = "gradle/copyReports.gradle.kts")
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index caa676a5b..d22264d20 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,16 +1,29 @@
+import org.jetbrains.kotlin.konan.file.File
+import org.jetbrains.kotlin.konan.properties.loadProperties
+
 plugins {
     `java-gradle-plugin`
     `kotlin-dsl`
     `kotlin-dsl-precompiled-script-plugins`
+    `maven-publish`
 }
 
 repositories {
     gradlePluginPortal() // To use 'maven-publish' and 'signing' plugins in our own plugin
     google()
+    mavenCentral()
 }
 
 dependencies {
+
+    val properties = File("${rootDir.absolutePath}/../gradle.properties").loadProperties()
+    val kotlinVersion = properties["kaluga.kotlinVersion"] as String
+    val androidGradleVersion = properties["kaluga.androidGradlePluginVersion"] as String
+    val ktLintVersion = properties["kaluga.ktLintGradlePluginVersion"] as String
+    logger.lifecycle("Kotlin version $kotlinVersion")
+
     // mostly migrated to new style plugin declarations, but some cross plugin interaction still requires this
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
-    implementation("com.android.tools.build:gradle:7.3.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+    implementation("com.android.tools.build:gradle:$androidGradleVersion")
+    implementation("org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:$ktLintVersion")
 }
diff --git a/buildSrc/src/main/kotlin/Accessors.kt b/buildSrc/src/main/kotlin/Accessors.kt
new file mode 100644
index 000000000..ae5f0538e
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Accessors.kt
@@ -0,0 +1,55 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Action
+import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+
+fun Project.android(action: LibraryExtension.() -> Unit) {
+    configureAction("android", action)
+}
+
+fun Project.kotlinAndroid(action: KotlinAndroidProjectExtension.() -> Unit) {
+    configureAction("kotlin", action)
+}
+
+fun Project.kotlinMultiplatform(action: KotlinMultiplatformExtension.() -> Unit) {
+    configureAction("kotlin", action)
+}
+
+fun Project.ktlint(action: org.jlleitschuh.gradle.ktlint.KtlintExtension.() -> Unit) {
+    configureAction("ktlint", action)
+}
+
+fun Project.publishing(action: org.gradle.api.publish.PublishingExtension.() -> Unit) {
+    configureAction("publishing", action)
+}
+
+fun LibraryExtension.kotlinOptions(action: org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions.() -> Unit) {
+    (this as org.gradle.api.plugins.ExtensionAware).configureAction("kotlinOptions", action)
+}
+
+private inline fun <reified T : Any> org.gradle.api.plugins.ExtensionAware.configureAction(fieldName: String, crossinline action: T.() -> Unit) {
+    val optionsAction = object : Action<T> {
+        override fun execute(t: T) {
+            t.action()
+        }
+    }
+    extensions.configure(fieldName, optionsAction)
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/AndroidCommon.kt b/buildSrc/src/main/kotlin/AndroidCommon.kt
index f9483a29f..365e527c1 100644
--- a/buildSrc/src/main/kotlin/AndroidCommon.kt
+++ b/buildSrc/src/main/kotlin/AndroidCommon.kt
@@ -16,30 +16,40 @@
  */
 
 import com.android.build.gradle.LibraryExtension
-import org.gradle.api.Action
 import org.gradle.api.JavaVersion
 import org.gradle.kotlin.dsl.dependencies
 
-enum class ComponentType {
-    DEFAULT,
-    COMPOSE,
-    APP,
-    COMPOSE_APP
-}
-
-fun org.gradle.api.Project.commonAndroidComponent(type: ComponentType = ComponentType.DEFAULT) {
-    val action = object : Action<LibraryExtension> {
-        override fun execute(t: LibraryExtension) {
-            t.androidCommon(type)
-        }
+fun org.gradle.api.Project.commonAndroidComponent(type: ComponentType = ComponentType.Default()) {
+    android {
+        androidCommon(this@commonAndroidComponent, type)
     }
-    (this as org.gradle.api.plugins.ExtensionAware).extensions.configure("android", action)
-    dependencies {
 
+    dependencies {
+        implement(Dependencies.KotlinX.Coroutines.Android)
+        implement(Dependencies.AndroidX.AppCompat)
+
+        implementForTest(Dependencies.JUnit)
+        implementForTest(Dependencies.Mockito.Core)
+        implementForTest(Dependencies.Kotlin.Test)
+        implementForTest(Dependencies.Kotlin.JUnit)
+
+        implementForAndroidTest(Dependencies.Mockito.Android)
+        implementForAndroidTest(Dependencies.ByteBuddy.Android)
+        implementForAndroidTest(Dependencies.ByteBuddy.Agent)
+
+        implementForAndroidTest(Dependencies.AndroidX.Test.Core)
+        implementForAndroidTest(Dependencies.AndroidX.Test.CoreKtx)
+        implementForAndroidTest(Dependencies.AndroidX.Test.UIAutomator)
+        implementForAndroidTest(Dependencies.AndroidX.Test.Rules)
+        implementForAndroidTest(Dependencies.AndroidX.Test.JUnit)
+        implementForAndroidTest(Dependencies.AndroidX.Test.Runner)
+        implementForAndroidTest(Dependencies.AndroidX.Test.Espresso)
+        implementForAndroidTest(Dependencies.Kotlin.Test)
+        implementForAndroidTest(Dependencies.Kotlin.JUnit)
     }
 }
 
-fun LibraryExtension.androidCommon(componentType: ComponentType = ComponentType.DEFAULT) {
+fun LibraryExtension.androidCommon(project: org.gradle.api.Project, componentType: ComponentType = ComponentType.Default()) {
     compileSdk = Library.Android.compileSdk
     buildToolsVersion = Library.Android.buildTools
 
@@ -56,31 +66,26 @@ fun LibraryExtension.androidCommon(componentType: ComponentType = ComponentType.
         }
     }
 
-    when (componentType) {
-        ComponentType.APP,
-        ComponentType.COMPOSE_APP -> {
-            println("Android sourcesets for this project module are configured using defaults (for an app)")
-        }
-        ComponentType.COMPOSE,
-        ComponentType.DEFAULT -> {
-            println("Android sourcesets for this project module are configured as a library")
-            sourceSets {
-                getByName("main") {
-                    manifest.srcFile("src/androidLibMain/AndroidManifest.xml")
-                    res.srcDir("src/androidLibMain/res")
-                    if (componentType == ComponentType.COMPOSE) {
-                        java.srcDir("src/androidLibMain/kotlin")
-                    }
-                }
-                getByName("androidTest") {
-                    manifest.srcFile("src/androidLibAndroidTest/AndroidManifest.xml")
-                    java.srcDir("src/androidLibAndroidTest/kotlin")
-                    res.srcDir("src/androidLibAndroidTest/res")
+    if (componentType.isApp) {
+        project.logger.lifecycle("Android sourcesets for this project module are configured using defaults (for an app)")
+    } else {
+        project.logger.lifecycle("Android sourcesets for this project module are configured as a library")
+        sourceSets {
+            getByName("main") {
+                manifest.srcFile("src/androidLibMain/AndroidManifest.xml")
+                res.srcDir("src/androidLibMain/res")
+                if (componentType is ComponentType.Compose) {
+                    java.srcDir("src/androidLibMain/kotlin")
                 }
+            }
+            getByName("androidTest") {
+                manifest.srcFile("src/androidLibAndroidTest/AndroidManifest.xml")
+                java.srcDir("src/androidLibAndroidTest/kotlin")
+                res.srcDir("src/androidLibAndroidTest/res")
+            }
 
-                getByName("test") {
-                    java.srcDir("src/androidLibUnitTest/kotlin")
-                }
+            getByName("test") {
+                java.srcDir("src/androidLibUnitTest/kotlin")
             }
         }
     }
@@ -90,10 +95,14 @@ fun LibraryExtension.androidCommon(componentType: ComponentType = ComponentType.
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs = freeCompilerArgs + listOf("-XXLanguage:+InlineClasses", "-Xjvm-default=all")
+    }
+
     when (componentType) {
-        ComponentType.COMPOSE,
-        ComponentType.COMPOSE_APP -> {
-            println("This project module is a Compose only module")
+        is ComponentType.Compose -> {
+            project.logger.lifecycle("This project module is a Compose only module")
             buildFeatures {
                 compose = true
             }
@@ -101,7 +110,6 @@ fun LibraryExtension.androidCommon(componentType: ComponentType = ComponentType.
                 kotlinCompilerExtensionVersion = Library.Android.composeCompiler
             }
         }
-        ComponentType.DEFAULT,
-        ComponentType.APP -> {}
+        is ComponentType.Default-> {}
     }
 }
diff --git a/buildSrc/src/main/kotlin/AndroidCompose.kt b/buildSrc/src/main/kotlin/AndroidCompose.kt
new file mode 100644
index 000000000..2f3997033
--- /dev/null
+++ b/buildSrc/src/main/kotlin/AndroidCompose.kt
@@ -0,0 +1,43 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import org.gradle.kotlin.dsl.dependencies
+
+fun org.gradle.api.Project.composeAndroidComponent(type: ComponentType.Compose = ComponentType.Compose()) {
+    group = Library.group
+    version = Library.version
+    commonAndroidComponent(type)
+    dependencies {
+        implement(Dependencies.AndroidX.Compose.Foundation)
+        implement(Dependencies.AndroidX.Compose.UI)
+        implement(Dependencies.AndroidX.Compose.UITooling)
+        implement(Dependencies.AndroidX.Lifecycle.ViewModelCompose)
+        implement(Dependencies.AndroidX.Activity.Compose)
+    }
+
+    kotlinAndroid {
+        sourceSets.all {
+            languageSettings {
+                optIn("androidx.compose.material.ExperimentalMaterialApi")
+            }
+        }
+    }
+
+    if (!type.isApp) {
+        publish(type)
+    }
+}
diff --git a/buildSrc/src/main/kotlin/Component.kt b/buildSrc/src/main/kotlin/Component.kt
index e7b31703b..e2c5c0813 100644
--- a/buildSrc/src/main/kotlin/Component.kt
+++ b/buildSrc/src/main/kotlin/Component.kt
@@ -15,23 +15,73 @@
 
  */
 
-import org.gradle.api.Action
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Project
+import org.gradle.api.tasks.Copy
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
+import org.jetbrains.kotlin.konan.file.File
 
-fun org.gradle.api.Project.commonComponent() {
-    val action = object : Action<KotlinMultiplatformExtension> {
-        override fun execute(t: KotlinMultiplatformExtension) {
-            t.commonMultiplatformComponent()
+sealed class ComponentType {
+    abstract val isApp: Boolean
+
+    data class Default(override val isApp: Boolean = false) : ComponentType()
+    data class Compose(override val isApp: Boolean = false) : ComponentType()
+}
+
+fun Project.commonComponent() {
+    group = Library.group
+    version = Library.version
+    kotlinMultiplatform {
+        commonMultiplatformComponent(this@commonComponent)
+    }
+
+    commonAndroidComponent()
+    android {
+        commonMultiplatformComponentAndroid(this@commonComponent)
+    }
+
+    task("printConfigurations") {
+        doLast {
+            configurations.all { println(this) }
+        }
+    }
+
+    afterEvaluate {
+        Library.IOS.targets.forEach {
+            val targetName = it.sourceSetName
+            if (tasks.names.contains("linkDebugTest${targetName.capitalize() }")) {
+                // creating copy task for the target
+                val copyTask = tasks.create("copy${targetName.capitalize() }TestResources", Copy::class.java) {
+                    from(File("src/iosTest/resources/."))
+                    into(File("$buildDir/bin/$targetName/debugTest"))
+                }
+
+                // apply copy task to the target
+                tasks.named("linkDebugTest${targetName.capitalize()}") {
+                    dependsOn(copyTask)
+                }
+            }
+        }
+    }
+
+    ktlint { disabledRules.set(listOf("no-wildcard-imports", "filename", "import-ordering")) }
+
+    if (Library.connectCheckExpansion) {
+        parent?.subprojects?.filter {
+            it.name.startsWith("${project.name}-") || it.name.endsWith("-${project.name}")
+        }?.forEach {
+            logger.info("[connect_check_expansion] :${project.name}:connectedDebugAndroidTest dependsOn:${name}:connectedDebugAndroidTest")
+             tasks.getByPath("connectedDebugAndroidTest")
+                 .dependsOn(":${name}:connectedDebugAndroidTest")
         }
     }
-    (this as org.gradle.api.plugins.ExtensionAware).extensions.configure("kotlin", action)
 }
 
-fun KotlinMultiplatformExtension.commonMultiplatformComponent() {
+fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Project) {
     targets {
         configureEach {
             compilations.configureEach {
@@ -49,16 +99,20 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent() {
                 }
             }
         }
-    Library.IOS.targets.forEach { iosTarget ->
+    val targets = currentProject.Library.IOS.targets
+    targets.forEach { iosTarget ->
         when (iosTarget) {
-            IOSTarget.X64 -> iosX64(target).applyTestDevice()
+            IOSTarget.X64 -> iosX64(target).applyTestDevice(currentProject)
             IOSTarget.Arm64 -> iosArm64(target)
-            IOSTarget.SimulatorArm64 -> iosSimulatorArm64(target).applyTestDevice()
+            IOSTarget.SimulatorArm64 -> iosSimulatorArm64(target).applyTestDevice(currentProject)
         }
     }
 
     jvm()
     js(KotlinJsCompilerType.IR) {
+        // Disable JS browser tests for now
+        // See https://github.com/splendo/kaluga/issues/97
+        // browser()
         nodejs()
         compilations.configureEach {
             kotlinOptions {
@@ -69,13 +123,13 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent() {
         }
     }
 
-    val commonMain = sourceSets.maybeCreate("commonMain").apply {
+    val commonMain = sourceSets.getByName("commonMain").apply {
         dependencies {
             implement(Dependencies.KotlinX.Coroutines.Core)
         }
     }
 
-    val commonTest = sourceSets.maybeCreate("commonTest").apply {
+    val commonTest = sourceSets.getByName("commonTest").apply {
         dependencies {
             implementation(kotlin("test"))
             implementation(kotlin("test-common"))
@@ -83,14 +137,14 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent() {
         }
     }
 
-    val jvmMain = sourceSets.maybeCreate("jvmMain").apply {
+    val jvmMain = sourceSets.getByName("jvmMain").apply {
         dependencies {
             implementation(kotlin("stdlib"))
             implement(Dependencies.KotlinX.Coroutines.Swing)
         }
     }
 
-    val jvmTest = sourceSets.maybeCreate("jvmTest").apply {
+    val jvmTest = sourceSets.getByName("jvmTest").apply {
         dependsOn(commonTest)
         dependencies {
             implementation(kotlin("test"))
@@ -98,14 +152,14 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent() {
         }
     }
 
-    val jsMain = sourceSets.maybeCreate("jsMain").apply {
+    val jsMain = sourceSets.getByName("jsMain").apply {
         dependencies {
             implementation(kotlin("stdlib-js"))
             implement(Dependencies.KotlinX.Coroutines.Js)
         }
     }
 
-    val jsTest = sourceSets.maybeCreate("jsTest").apply {
+    val jsTest = sourceSets.getByName("jsTest").apply {
         dependencies {
             implementation(kotlin("test-js"))
         }
@@ -119,6 +173,17 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent() {
         dependsOn(commonTest)
     }
 
+    targets.forEach {
+        val sourceSetName = it.sourceSetName
+
+        sourceSets.getByName("${sourceSetName}Main").apply {
+            dependsOn(iosMain)
+        }
+        sourceSets.getByName("${sourceSetName}Test").apply {
+            dependsOn(iosTest)
+        }
+    }
+
     sourceSets.all {
         languageSettings {
             optIn("kotlinx.coroutines.DelicateCoroutinesApi")
@@ -135,8 +200,36 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent() {
     }
 }
 
-fun KotlinNativeTargetWithSimulatorTests.applyTestDevice() {
+fun LibraryExtension.commonMultiplatformComponentAndroid(project: Project) {
+    testOptions {
+        unitTests.isReturnDefaultValues = true
+    }
+
+    packagingOptions {
+        resources.excludes.addAll(
+            listOf(
+                "META-INF/kotlinx-coroutines-core.kotlin_module",
+                "META-INF/shared_debug.kotlin_module",
+                "META-INF/kotlinx-serialization-runtime.kotlin_module",
+                "META-INF/AL2.0",
+                "META-INF/LGPL2.1",
+                // bytebuddy 🤡
+                "win32-x86-64/attach_hotspot_windows.dll",
+                "win32-x86/attach_hotspot_windows.dll",
+                "META-INF/licenses/ASM"
+            )
+        )
+    }
+}
+
+fun KotlinNativeTargetWithSimulatorTests.applyTestDevice(project: Project) {
     testRuns.all {
-        deviceId = Library.IOS.TestRunnerDeviceId
+        deviceId = project.Library.IOS.TestRunnerDeviceId
     }
-}
\ No newline at end of file
+}
+
+val IOSTarget.sourceSetName: String get() = when (this) {
+    IOSTarget.X64 -> "iosX64"
+    IOSTarget.Arm64 -> "iosArm64"
+    IOSTarget.SimulatorArm64 -> "iosSimulatorArm64"
+}
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 3142a2f1d..c3c6c3dd6 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -25,15 +25,41 @@ data class Dependency(private val group: String, private val name: String, priva
 fun KotlinDependencyHandler.expose(dependency: Dependency) = api(dependency.notation)
 fun KotlinDependencyHandler.implement(dependency: Dependency) = implementation(dependency.notation)
 
+fun DependencyHandler.expose(dependency: Dependency) {
+    add("api", dependency.notation)
+}
+fun DependencyHandler.implement(dependency: Dependency) {
+    add("implementation", dependency.notation)
+}
+fun DependencyHandler.implementForDebug(dependency: Dependency) {
+    add("debugImplementation", dependency.notation)
+}
+fun DependencyHandler.implementForTest(dependency: Dependency) {
+    add("testImplementation", dependency.notation)
+}
+fun DependencyHandler.implementForAndroidTest(dependency: Dependency) {
+    add("androidTestImplementation", dependency.notation)
+}
+
 object Dependencies {
 
+    object Kotlin {
+        private const val group = "org.jetbrains.kotlin"
+        val Test = Dependency(group, "kotlin-test")
+        val JUnit = Dependency(group, "kotlin-test-junit")
+    }
+
     object KotlinX {
         object Coroutines {
             private const val version = "1.6.3-native-mt"
             private const val group = "org.jetbrains.kotlinx"
+            val Android = Dependency(group, "kotlinx-coroutines-android", version)
             val Core = Dependency(group, "kotlinx-coroutines-core", version)
             val Swing = Dependency(group, "kotlinx-coroutines-swing", version)
             val Js = Dependency(group, "kotlinx-coroutines-js", version)
+            val PlayServices = Dependency(group, "kotlinx-coroutines-play-services", version)
+            val Test = Dependency(group, "kotlinx-coroutines-test", version)
+            val Debug = Dependency(group, "kotlinx-coroutines-debug", version)
         }
 
         object Serialization {
@@ -54,7 +80,7 @@ object Dependencies {
         object Play {
             private const val group = "$groupBase.play"
             val Core = Dependency(group, "core", "1.10.3")
-            val Ktx = Dependency(group, "core-ktx", "1.8.1")
+            val CoreKtx = Dependency(group, "core-ktx", "1.8.1")
         }
         object PlayServices {
             private const val group = "$groupBase.gms"
diff --git a/buildSrc/src/main/kotlin/GitBranch.kt b/buildSrc/src/main/kotlin/GitBranch.kt
index 96cce8d6d..2005ec957 100644
--- a/buildSrc/src/main/kotlin/GitBranch.kt
+++ b/buildSrc/src/main/kotlin/GitBranch.kt
@@ -15,10 +15,11 @@
 
  */
 
-import org.slf4j.LoggerFactory
+import org.gradle.api.Project
 
-object GitBranch {
- private val logger = LoggerFactory.getLogger(this::class.java)
+data class GitBranch(val branch: String, val kalugaBranchPostfix: String)
+
+val Project.GitBranch: GitBranch get() {
  val BITRISE_GIT_BRANCH = java.lang.System.getenv("BITRISE_GIT_BRANCH")
  val kaluga_branch = System.getProperty("kaluga_branch")
  val MAVEN_CENTRAL_RELEASE = System.getenv("MAVEN_CENTRAL_RELEASE")
@@ -49,4 +50,6 @@ object GitBranch {
 
   println("decided branch: '$branch' to postfix '$it', isRelease: $release (from: BITRISE_GIT_BRANCH env: $BITRISE_GIT_BRANCH, kaluga_branch property: $kaluga_branch , MAVEN_CENTRAL_RELEASE env: $MAVEN_CENTRAL_RELEASE , git cli: $branchFromGit)")
  }
+
+ return GitBranch(branch, kalugaBranchPostfix)
 }
diff --git a/buildSrc/src/main/kotlin/Library.kt b/buildSrc/src/main/kotlin/Library.kt
index f5bb8870f..72556cc8b 100644
--- a/buildSrc/src/main/kotlin/Library.kt
+++ b/buildSrc/src/main/kotlin/Library.kt
@@ -15,29 +15,33 @@
 
  */
 
-import java.io.File
-import java.io.FileInputStream
-import java.util.*
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.extra
+import org.gradle.api.logging.Logger
+import org.jetbrains.kotlin.konan.file.File
+import org.jetbrains.kotlin.konan.properties.loadProperties
+import org.jetbrains.kotlin.konan.properties.Properties
+import java.io.IOException
 
-object Library {
+private val libraries: MutableMap<Project, Library> = mutableMapOf()
 
-    private val props = Properties()
-    private const val baseVersion = "1.0.0"
+val Project.Library get() = libraries.getOrPut(this) { Library(this) }
+
+class Library(project: Project) {
+
+    private val props: Properties = File("${project.rootProject.buildDir.absolutePath}/../local.properties").loadProperties()
+    private val logger = project.logger
+    private val baseVersion = "1.0.0"
+    val group = "com.splendo.kaluga"
     val version: String by lazy {
-        println("------Properties" + props.entries.joinToString(" ") { (key, value) -> "$key to $value" })
         val libraryVersionLocalProperties: String? = props["kaluga.libraryVersion"] as? String
-        (libraryVersionLocalProperties ?: "$baseVersion${GitBranch.kalugaBranchPostfix}").also {
+        (libraryVersionLocalProperties ?: "$baseVersion${project.GitBranch.kalugaBranchPostfix}").also {
             println("Library version $it")
         }
     }
-    const val group = "com.splendo.kaluga"
-
-    init {
-        val propFile = File("../local.properties")
-        if (propFile.exists()) {
-            val inputStream = FileInputStream(propFile.absolutePath)
-            props.load(inputStream)
-        }
+    val kotlinVersion = project.extra["kaluga.kotlinVersion"] as? String ?: kotlin.run {
+        logger.lifecycle("Missing kotlin version")
+        throw IOException("Provide kaluga.kotlinVersion in your gradle.properties")
     }
 
     object Android {
@@ -48,21 +52,21 @@ object Library {
         const val composeCompiler = "1.3.2"
     }
 
-    object IOS {
+    class IOSLibrary(props: Properties, logger: Logger) {
         // based on https://github.com/Kotlin/xcode-compat/blob/d677a43edc46c50888bca0a7890a81f976a42809/xcode-compat/src/main/kotlin/org/jetbrains/kotlin/xcodecompat/XcodeCompatPlugin.kt#L16
         val sdkName = System.getenv("SDK_NAME") ?: "unknown"
         val isRealIOSDevice = sdkName.startsWith("iphoneos").also {
-            println("Run on real ios device: $it from sdk: $sdkName")
+            logger.lifecycle("Run on real ios device: $it from sdk: $sdkName")
         }
 
         // Run on IntelliJ
         val ideaActive = (System.getProperty("idea.active") == "true").also {
-            println("Run on IntelliJ: $it")
+            logger.lifecycle("Run on IntelliJ: $it")
         }
 
         // Run on apple silicon
         val isAppleSilicon = (System.getProperty("os.arch") == "aarch64").also {
-            println("Run on apple silicon: $it")
+            logger.lifecycle("Run on apple silicon: $it")
         }
 
         val targets = when {
@@ -71,37 +75,38 @@ object Library {
             isAppleSilicon -> setOf(IOSTarget.SimulatorArm64)
             else -> setOf(IOSTarget.X64)
         }.also { targets ->
-            println("Run on ios targets: ${targets.joinToString(" ") { it.name }}")
+            logger.lifecycle("Run on ios targets: ${targets.joinToString(" ") { it.name }}")
         }
 
         val TestRunnerDeviceId by lazy {
             if (System.getenv().containsKey("IOS_TEST_RUNNER_DEVICE_ID")) {
                 System.getenv()["IOS_TEST_RUNNER_DEVICE_ID"].also {
-                    println("System env IOS_TEST_RUNNER_DEVICE_ID set to ${System.getenv()["IOS_TEST_RUNNER_DEVICE_ID"]}, using $it")
+                    logger.lifecycle("System env IOS_TEST_RUNNER_DEVICE_ID set to ${System.getenv()["IOS_TEST_RUNNER_DEVICE_ID"]}, using $it")
                 }!!
             } else {
                 // load some more from local.properties or set defaults.
                 val iosTestRunnerDeviceIdLocalProperty: String? =
                     props["kaluga.iosTestRunnerDeviceIdLocalProperty"] as? String
                 iosTestRunnerDeviceIdLocalProperty?.also {
-                    println("local.properties read (kaluga.iosTestRunnerDeviceIdLocalProperty=$iosTestRunnerDeviceIdLocalProperty, using $it)")
+                    logger.lifecycle("local.properties read (kaluga.iosTestRunnerDeviceIdLocalProperty=$iosTestRunnerDeviceIdLocalProperty, using $it)")
                 }
                     ?: "iPhone 14".also {
-                        println("local.properties not found, using default value ($it)")
+                        logger.lifecycle("local.properties not found, using default value ($it)")
                     }
             }
         }
     }
+    val IOS = IOSLibrary(props, logger)
 
     val exampleEmbeddingMethod by lazy {
         if (System.getenv().containsKey("EXAMPLE_EMBEDDING_METHOD")) {
             System.getenv()["EXAMPLE_EMBEDDING_METHOD"].also {
-                println("System env EXAMPLE_EMBEDDING_METHOD set to ${System.getenv()["EXAMPLE_EMBEDDING_METHOD"]}, using $it")
+                logger.lifecycle("System env EXAMPLE_EMBEDDING_METHOD set to ${System.getenv()["EXAMPLE_EMBEDDING_METHOD"]}, using $it")
             }!!
         } else {
             val exampleEmbeddingMethodLocalProperties = props["kaluga.exampleEmbeddingMethod"] as? String
             (exampleEmbeddingMethodLocalProperties ?: "composite").also {
-                println("local.properties read (kaluga.exampleEmbeddingMethod=$exampleEmbeddingMethodLocalProperties, using $it)")
+                logger.lifecycle("local.properties read (kaluga.exampleEmbeddingMethod=$exampleEmbeddingMethodLocalProperties, using $it)")
             }
         }
     }
@@ -109,24 +114,24 @@ object Library {
     val exampleMavenRepo by lazy {
         if (System.getenv().containsKey("EXAMPLE_MAVEN_REPO")) {
             System.getenv()["EXAMPLE_MAVEN_REPO"].also {
-                println("System env EXAMPLE_MAVEN_REPO set to ${System.getenv()["EXAMPLE_MAVEN_REPO"]}, using $it")
+                logger.lifecycle("System env EXAMPLE_MAVEN_REPO set to ${System.getenv()["EXAMPLE_MAVEN_REPO"]}, using $it")
             }!!
         } else {
             // load some more from local.properties or set defaults.
             val exampleMavenRepoLocalProperties: String? =
                 props["kaluga.exampleMavenRepo"] as? String
             exampleMavenRepoLocalProperties?.also {
-                println("local.properties read (kaluga.exampleMavenRepo=$exampleMavenRepoLocalProperties, using $it)")
+                logger.lifecycle("local.properties read (kaluga.exampleMavenRepo=$exampleMavenRepoLocalProperties, using $it)")
             }
                 ?: "local".also {
-                    println("local.properties not found, using default value ($it)")
+                    logger.lifecycle("local.properties not found, using default value ($it)")
                 }
         }
     }
 
     val connectCheckExpansion = (System.getenv().containsKey("CONNECTED_CHECK_EXPANSION") or System.getenv().containsKey("CI")).also {
         if (it) {
-            println("Adding extra dependend task to connected checks of similarly named modules (CONNECTED_CHECK_EXPANSION env present: ${ System.getenv().containsKey("CONNECTED_CHECK_EXPANSION") })")
+            logger.lifecycle("Adding extra dependend task to connected checks of similarly named modules (CONNECTED_CHECK_EXPANSION env present: ${ System.getenv().containsKey("CONNECTED_CHECK_EXPANSION") })")
         }
     }
 }
diff --git a/buildSrc/src/main/kotlin/Publish.kt b/buildSrc/src/main/kotlin/Publish.kt
new file mode 100644
index 000000000..909e636a4
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Publish.kt
@@ -0,0 +1,56 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import org.gradle.api.Project
+import org.gradle.api.publish.maven.MavenPublication
+
+fun Project.publish(componentType: ComponentType = ComponentType.Default()) {
+    afterEvaluate {
+        publishing {
+            publications {
+                logger.lifecycle("This project module will be published as: $componentType")
+                when (componentType) {
+                    is ComponentType.Compose -> {
+                        create("release", MavenPublication::class.java) {
+                            from(components.getByName("release"))
+
+                            artifactId = name
+                            groupId = Library.group
+                            version = Library.version
+                        }
+                        create("debug", MavenPublication::class.java) {
+                            from(components.getByName("debug"))
+
+                            artifactId = name
+                            groupId = Library.group
+                            version = Library.version
+                        }
+                    }
+                    is ComponentType.Default -> {
+                        getByName("kotlinMultiplatform") {
+                            (this as MavenPublication).let {
+                                artifactId = name
+                                groupId = Library.group
+                                version = Library.version
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/PublishableComponent.kt b/buildSrc/src/main/kotlin/PublishableComponent.kt
new file mode 100644
index 000000000..c713fd46c
--- /dev/null
+++ b/buildSrc/src/main/kotlin/PublishableComponent.kt
@@ -0,0 +1,23 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import org.gradle.api.Project
+
+fun Project.publishableComponent() {
+    commonComponent()
+    publish()
+}
\ No newline at end of file
diff --git a/calendar-permissions/build.gradle.kts b/calendar-permissions/build.gradle.kts
index 7135eda09..cbf121810 100644
--- a/calendar-permissions/build.gradle.kts
+++ b/calendar-permissions/build.gradle.kts
@@ -6,18 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-val kotlinx_coroutines_version = ext["kotlinx_coroutines_version"]!!
-
-dependencies {
-    val play_services_version = (gradle as ExtensionAware).extra["play_services_version"]
-    implementation("com.google.android.gms:play-services-location:$play_services_version")
-}
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/camera-permissions/build.gradle.kts b/camera-permissions/build.gradle.kts
index 7135eda09..e149787d0 100644
--- a/camera-permissions/build.gradle.kts
+++ b/camera-permissions/build.gradle.kts
@@ -6,24 +6,11 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-val kotlinx_coroutines_version = ext["kotlinx_coroutines_version"]!!
-
-dependencies {
-    val play_services_version = (gradle as ExtensionAware).extra["play_services_version"]
-    implementation("com.google.android.gms:play-services-location:$play_services_version")
-}
+publishableComponent()
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
                 api(project(":base-permissions", ""))
             }
diff --git a/contacts-permissions/build.gradle.kts b/contacts-permissions/build.gradle.kts
index 7135eda09..e149787d0 100644
--- a/contacts-permissions/build.gradle.kts
+++ b/contacts-permissions/build.gradle.kts
@@ -6,24 +6,11 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-val kotlinx_coroutines_version = ext["kotlinx_coroutines_version"]!!
-
-dependencies {
-    val play_services_version = (gradle as ExtensionAware).extra["play_services_version"]
-    implementation("com.google.android.gms:play-services-location:$play_services_version")
-}
+publishableComponent()
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
                 api(project(":base-permissions", ""))
             }
diff --git a/date-time-picker/build.gradle.kts b/date-time-picker/build.gradle.kts
index e6144a36b..b00b0eb02 100644
--- a/date-time-picker/build.gradle.kts
+++ b/date-time-picker/build.gradle.kts
@@ -6,26 +6,12 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies {
-
-    val ext = (gradle as ExtensionAware).extra
-
-    implementation("androidx.fragment:fragment:${ext["androidx_fragment_version"]}")
-    debugImplementation("androidx.fragment:fragment-ktx:${ext["androidx_fragment_version"]}")
-}
+publishableComponent()
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
             dependencies {
-                val ext = (gradle as ExtensionAware).extra
                 implementation(project(":architecture", ""))
                 implementation(project(":base", ""))
             }
diff --git a/date-time/build.gradle.kts b/date-time/build.gradle.kts
index 601c3c95c..d18e64f74 100644
--- a/date-time/build.gradle.kts
+++ b/date-time/build.gradle.kts
@@ -6,18 +6,12 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
             dependencies {
-                val ext = (gradle as ExtensionAware).extra
                 implementation(project(":base", ""))
             }
         }
diff --git a/gradle/android_common.gradle.kts b/gradle/android_common.gradle.kts
deleted file mode 100644
index cd1769b81..000000000
--- a/gradle/android_common.gradle.kts
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-repositories {
-    mavenCentral()
-}
-
-android {
-
-    val android_compile_sdk_version: Int by extra
-    val android_min_sdk_version: Int by extra
-    val android_target_sdk_version: Int by extra
-    val android_build_tools_version: String by extra
-
-    compileSdk = android_compile_sdk_version
-    buildToolsVersion = android_build_tools_version
-
-    defaultConfig {
-        minSdk = android_min_sdk_version
-        targetSdk = android_target_sdk_version
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled = false
-        }
-    }
-
-    val component_type: String by extra
-    if (!component_type.toLowerCase().contains("app")) {
-        logger.lifecycle("Android sourcesets for this project module are configured as a library")
-        sourceSets {
-            main {
-                manifest.srcFile "src/androidLibMain/AndroidManifest.xml"
-                res.srcDir "src/androidLibMain/res"
-                if (component_type.contains("compose")) {
-                    java.srcDir = "src/androidLibMain/kotlin"
-                }
-            }
-            androidTest {
-                manifest.srcFile = "src/androidLibAndroidTest/AndroidManifest.xml"
-                java.srcDir = "src/androidLibAndroidTest/kotlin"
-                res.srcDir = "src/androidLibAndroidTest/res"
-            }
-
-
-            test {
-                java.srcDir = "src/androidLibUnitTest/kotlin"
-            }
-
-        }
-    } else {
-        logger.lifecycle("Android sourcesets for this project module are configured using defaults (for an app)")
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs += ['-XXLanguage:+InlineClasses', '-Xjvm-default=all']
-    }
-
-    if (component_type.contains("compose")) {
-        logger.lifecycle("This project module is a Compose only module")
-        buildFeatures {
-            compose = true
-        }
-        composeOptions {
-            val androidx_compose_compiler_version: String by extra
-            kotlinCompilerExtensionVersion = androidx_compose_compiler_version
-        }
-    }
-
-}
-
-dependencies {
-    val kotlinx_coroutines_version: String by extra
-    val androidx_appcompat_version: String by extra
-
-    val junit_version: String by extra
-    val mockito_version: String by extra
-    val bytebuddy_version: String by extra
-    val androidx_test_version: String by extra
-    val androidx_test_uiautomator_version: String by extra
-    val androidx_test_junit_version: String by extra
-    val androidx_test_espresso_version: String by extra
-
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version")
-    implementation("androidx.appcompat:appcompat:$androidx_appcompat_version")
-
-    testImplementation("junit:junit:$junit_version")
-    testImplementation("org.mockito:mockito-core:$mockito_version")
-    testImplementation("org.jetbrains.kotlin:kotlin-test"
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
-
-    androidTestImplementation("org.mockito:mockito-android:$mockito_version")
-    androidTestImplementation("net.bytebuddy:byte-buddy-android:$bytebuddy_version!!")
-    androidTestImplementation("net.bytebuddy:byte-buddy-agent:$bytebuddy_version!!")
-
-    androidTestImplementation("androidx.test:core:$androidx_test_version")
-    androidTestImplementation("androidx.test:core-ktx:$androidx_test_version")
-    androidTestImplementation("androidx.test.uiautomator:uiautomator:$androidx_test_uiautomator_version")
-    androidTestImplementation("androidx.test:rules:$androidx_test_version")
-    androidTestImplementation("androidx.test.ext:junit:$androidx_test_junit_version")
-    androidTestImplementation("androidx.test:runner:$androidx_test_version")
-    androidTestImplementation("androidx.test.espresso:espresso-core:$androidx_test_espresso_version")
-    androidTestImplementation("org.jetbrains.kotlin:kotlin-test")
-    androidTestImplementation("org.jetbrains.kotlin:kotlin-test-junit")
-}
diff --git a/gradle/android_compose.gradle.kts b/gradle/android_compose.gradle.kts
deleted file mode 100644
index dfbbc115e..000000000
--- a/gradle/android_compose.gradle.kts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-// if the include is made from the example project shared module we need to go up one more directory
-val path_prefix = if (file("../gradle/android_common.gradle.kts").exists()) ".." else "../.."
-
-apply("$path_prefix/gradle/android_common.gradle.kts")
-
-dependencies {
-    val ext = (gradle as ExtensionAware).extra
-    val androidx_compose_version: String by ext
-    val androidx_lifecycle_viewmodel_compose_version: String by ext
-    val androidx_activity_compose_version: String by ext
-
-    implementation("androidx.compose.foundation:foundation:$androidx_compose_version")
-    implementation("androidx.compose.ui:ui:$androidx_compose_version")
-    implementation("androidx.compose.ui:ui-tooling:$androidx_compose_version")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$androidx_lifecycle_viewmodel_compose_version")
-    implementation("androidx.activity:activity-compose:$androidx_activity_compose_version")
-
-}
-
-kotlin {
-    sourceSets.all {
-        languageSettings {
-            optIn("androidx.compose.material.ExperimentalMaterialApi")
-        }
-    }
-}
-
-val ext = (gradle as ExtensionAware).extra
-val component_type: String by ext
-if (!component_type.toLowerCase().contains("app")) {
-    apply("$path_prefix/gradle/publish.gradle.kts")
-}
diff --git a/gradle/component.gradle.kts b/gradle/component.gradle.kts
deleted file mode 100644
index a6dcf40b1..000000000
--- a/gradle/component.gradle.kts
+++ /dev/null
@@ -1,55 +0,0 @@
-repositories {
-    google()
-    mavenCentral()
-}
-
-// apply("$path_prefix/gradle/android_common.gradle.kts")
-//
-// android {
-//
-//     testOptions {
-//         unitTests.returnDefaultValues = true
-//     }
-//
-//     packagingOptions {
-//         resources.excludes.add("META-INF/kotlinx-coroutines-core.kotlin_module")
-//         resources.excludes.add("META-INF/shared_debug.kotlin_module")
-//         resources.excludes.add("META-INF/kotlinx-serialization-runtime.kotlin_module")
-//         resources.excludes.add("META-INF/AL2.0")
-//         resources.excludes.add("META-INF/LGPL2.1")
-//         // bytebuddy 🤡
-//         resources.excludes.add("win32-x86-64/attach_hotspot_windows.dll")
-//         resources.excludes.add("win32-x86/attach_hotspot_windows.dll")
-//         //
-//         resources.excludes.add("META-INF/licenses/ASM")
-//     }
-// }
-//
-// task printConfigurations {
-//     doLast {
-//         configurations.each { println(it) }
-//     }
-// }
-//
-// afterEvaluate {
-//     val ios_targets: List<String> by extra
-//     ios_targets.each { target ->
-//         if (tasks.getNames().contains("linkDebugTest${target.capitalize()}"))
-//             // creating copy task for the target
-//             tasks.create(name = "copy${target.capitalize()}TestResources", type = Copy) {
-//                 from(file('src/iosTest/resources/.'))
-//                 into(file("$buildDir/bin/$target/debugTest"))
-//             }
-//
-//             // apply copy task to the target
-//             tasks.named("linkDebugTest${target.capitalize()}").configure {
-//                 dependsOn("copy${target.capitalize()}TestResources")
-//             }
-//     }
-// }
-//
-// ktlint {
-//     disabledRules = listOf("no-wildcard-imports","filename","import-ordering")
-// }
-
-// apply(from = "$path_prefix/gradle/componentskt.gradle.kts")
diff --git a/gradle/componentskt.gradle.kts b/gradle/componentskt.gradle.kts
deleted file mode 100644
index adf45d9b1..000000000
--- a/gradle/componentskt.gradle.kts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-// in preparation for a full port to kts, new functionality can go here if it's in kts
-
-import kotlin.text.*
-
-// if ((gradle as ExtensionAware).extra["connect_check_expansion"] == true) {
-//
-//     val mymodules = project.parent?.subprojects?.filter {
-//         it.name.startsWith("${project.name}-") || it.name.endsWith("-${project.name}")
-//     }
-//
-//     mymodules?.forEach() { module ->
-//         afterEvaluate {
-//             logger.info("[connect_check_expansion] :${project.name}:connectedDebugAndroidTest dependsOn:${module.name}:connectedDebugAndroidTest")
-//             tasks.getByPath("connectedDebugAndroidTest")
-//                 .dependsOn(":${module.name}:connectedDebugAndroidTest")
-//         }
-//     }
-// }
diff --git a/gradle/ext.gradle.kts b/gradle/ext.gradle.kts
deleted file mode 100644
index decfe47c5..000000000
--- a/gradle/ext.gradle.kts
+++ /dev/null
@@ -1,157 +0,0 @@
-// import java.util.Properties
-// import java.io.*
-//
-// println("tasks: $gradle.startParameter.taskNames")
-//
-// // if the include is made from the example project shared module we need to go up a few directories
-// // and depending on when we are included, we can be in the `gradle` folder or not.
-// val path_prefix = when {
-//     file("componentskt.gradle.kts").exists() -> ""
-//     file("gradle/componentskt.gradle.kts").exists() -> "gradle/"
-//     else -> "../../../gradle/"
-// }
-// val f2 = file("${path_prefix}gitBranch.gradle.kts")
-//
-// apply(from = f2.path)
-// val systemProperties = System.getProperties()
-//
-// val props = Properties()
-// val propFile = file("../local.properties")
-// if (propFile.exists()) {
-//     val inputStream = FileInputStream(propFile.absolutePath)
-//     props.load(inputStream)
-// }
-//
-// val libraryVersionLocalProperties: String? = props["kaluga.libraryVersion"] as? String
-// val exampleEmbeddingMethodLocalProperties: String? = props["kaluga.exampleEmbeddingMethod"] as? String
-// val exampleMavenRepoLocalProperties: String? = props["kaluga.exampleMavenRepo"] as? String
-// val kotlinVersion: String = extra["kaluga.kotlinVersion"] as String
-//
-// // set some global variables
-// val ext = (gradle as ExtensionAware).extra
-// ext.apply {
-//     set("kotlin_version", kotlinVersion)
-//     set("kotlinx_coroutines_version", "1.6.3-native-mt")
-//     set("stately_version", "1.2.3")
-//     set("stately_isolate_version", "1.2.3")
-//     set("koin_version", "3.2.2")
-//     set("serialization_version", "1.4.0")
-//     set("napier_version", "2.4.0")
-//     set("android_ble_scanner_version", "1.6.0")
-//     val library_version_base = "1.0.0"
-//     set("library_version_base", library_version_base)
-//     set("library_version", libraryVersionLocalProperties ?: "$library_version_base${systemProperties["kaluga_branch_postfix"]}")
-//     set("android_min_sdk_version", 21)
-//     set("android_compile_sdk_version", 33)
-//     set("android_target_sdk_version", 33)
-//     set("android_build_tools_version", "33.0.0")
-//
-//     set("play_services_version", "20.0.0")
-//     set("play_core_version", "1.10.3")
-//     set("play_core_ktx_version", "1.8.1")
-//
-//     set("androidx_appcompat_version", "1.5.1")
-//     set("androidx_fragment_version", "1.5.3")
-//     set("androidx_core_version", "1.9.0")
-//     set("androidx_lifecycle_version", "2.5.1")
-//     set("androidx_lifecycle_viewmodel_compose_version", "2.5.1")
-//     set("androidx_arch_core_testing_version", "2.1.0")
-//     set("androidx_browser_version", "1.4.0")
-//     set("androidx_constraint_layout_version", "2.1.4")
-//
-//     set("androidx_compose_compiler_version", "1.3.2")
-//     set("androidx_compose_version", "1.2.1")
-//     set("androidx_activity_compose_version", "1.6.0")
-//     set("androidx_navigation_compose_version", "2.5.2")
-//
-//     set("material_version", "1.6.1")
-//     set("material_components_adapter_version", "1.1.17")
-//
-//     // sub packages of test have different versions, but alpha/beta/rc releases are harmonized
-//     set("junit_version", "4.13.2")
-//
-//     val androidx_test_version_postfix = ""
-//     set("androidx_test_version_postfix", androidx_test_version_postfix)
-//     set("androidx_test_version", "1.4.0$androidx_test_version_postfix")
-//     set("androidx_test_espresso_version", "3.4.0$androidx_test_version_postfix")
-//     set("androidx_test_junit_version", "1.1.3$androidx_test_version_postfix")
-//     set("androidx_test_uiautomator_version", "2.2.0")
-//
-//     // mockito and bytebuddy need to be upgraded in lockstep
-//     set("mockito_version", "3.11.2")
-//     set("bytebuddy_version", "1.11.3")
-//
-//     // Javascript
-//     set("js_bigdecimal_version", "1.0.26")
-//
-//     // used/modified at runtime.
-//     val component_type_default = "default"
-//     set("component_type_default", component_type_default)
-//     set("component_type_compose", "compose")
-//     set("component_type_app", "app")
-//     set("component_type_composeApp", "composeApp")
-//     set("component_type", component_type_default)
-// }
-//
-// if (System.getenv().containsKey("EXAMPLE_EMBEDDING_METHOD")) {
-//     ext.set("example_embedding_method", System.getenv()["EXAMPLE_EMBEDDING_METHOD"])
-//     logger.lifecycle("System env EXAMPLE_EMBEDDING_METHOD set to ${System.getenv()["EXAMPLE_EMBEDDING_METHOD"]}, using ${ext["example_embedding_method"]}")
-// } else {
-//     ext.set("example_embedding_method", exampleEmbeddingMethodLocalProperties ?: "composite")
-//     logger.lifecycle("local.properties read (kaluga.exampleEmbeddingMethod=$exampleEmbeddingMethodLocalProperties, using ${ext["example_embedding_method"]})")
-// }
-//
-// if (System.getenv().containsKey("EXAMPLE_MAVEN_REPO")) {
-//     ext.set("example_maven_repo", System.getenv()["EXAMPLE_MAVEN_REPO"])
-//     logger.lifecycle("System env EXAMPLE_MAVEN_REPO set to ${System.getenv()["EXAMPLE_MAVEN_REPO"]}, using ${ext["example_maven_repo"]}")
-// } else {
-//     // load some more from local.properties or set defaults.
-//     if (exampleMavenRepoLocalProperties != null) {
-//         ext.set("example_maven_repo", exampleMavenRepoLocalProperties)
-//         logger.lifecycle("local.properties read (kaluga.exampleMavenRepo=$exampleMavenRepoLocalProperties, using ${ext["example_maven_repo"]})")
-//     } else {
-//         ext.set("example_maven_repo", "local")
-//         logger.lifecycle("local.properties not found, using default value (${ext["example_maven_repo"]})")
-//     }
-// }
-//
-// val CONNECTED_CHECK_EXPANSION = System.getenv().containsKey("CONNECTED_CHECK_EXPANSION")
-// ext.set("connect_check_expansion", CONNECTED_CHECK_EXPANSION or System.getenv().containsKey("CI"))
-//
-// val connect_check_expansion: Boolean by ext
-// if (connect_check_expansion)
-//     logger.lifecycle("Adding extra dependend task to connected checks of similarly named modules (CONNECTED_CHECK_EXPANSION env present: $CONNECTED_CHECK_EXPANSION)")
-//
-// // based on https://github.com/Kotlin/xcode-compat/blob/d677a43edc46c50888bca0a7890a81f976a42809/xcode-compat/src/main/kotlin/org/jetbrains/kotlin/xcodecompat/XcodeCompatPlugin.kt#L16
-// val sdkName = System.getenv("SDK_NAME") ?: "unknown"
-// ext.set("is_real_ios_device", sdkName.startsWith("iphoneos"))
-// logger.lifecycle("Run on real ios device: ${ext["is_real_ios_device"]} from sdk: $sdkName")
-//
-// // Run on IntelliJ
-// val ideaActive = System.getProperty("idea.active") == "true"
-// ext.set("idea_active", ideaActive)
-// logger.lifecycle("Run on IntelliJ: ${ext["idea_active"]}")
-//
-// // Run on apple silicon
-// val isAppleSilicon = System.getProperty("os.arch") == "aarch64"
-// ext.set("is_apple_silicon", isAppleSilicon)
-// logger.lifecycle("Run on apple silicon: ${ext["is_apple_silicon"]}")
-//
-// val iosX64 = "iosX64"
-// val iosArm64 = "iosArm64"
-// val iosSimulatorArm64 = "iosSimulatorArm64"
-// val allIosTargets = listOf(iosX64, iosArm64, iosSimulatorArm64)
-// val idea_active: Boolean by ext
-// val is_real_ios_device: Boolean by ext
-// val is_apple_silicon: Boolean by ext
-//
-// ext.set(
-//     "ios_targets",
-//     when {
-//         !idea_active -> allIosTargets
-//         is_real_ios_device -> listOf(iosArm64)
-//         is_apple_silicon -> listOf(iosSimulatorArm64)
-//         else -> listOf(iosX64)
-//     }
-// )
-// logger.lifecycle("Run on ios targets: ${ext["ios_targets"]}")
diff --git a/gradle/gitBranch.gradle.kts b/gradle/gitBranch.gradle.kts
deleted file mode 100644
index 0f3e7e864..000000000
--- a/gradle/gitBranch.gradle.kts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-// import org.codehaus.groovy.runtime.ProcessGroovyMethods
-//
-// val BITRISE_GIT_BRANCH = System.getenv("BITRISE_GIT_BRANCH")
-// val kaluga_branch = System.getProperty("kaluga_branch")
-// val MAVEN_CENTRAL_RELEASE = System.getenv("MAVEN_CENTRAL_RELEASE")
-// val release = MAVEN_CENTRAL_RELEASE?.toLowerCase()?.trim() == "true"
-// val branchFromGit = run {
-//     try {
-//         ProcessGroovyMethods.getText(ProcessGroovyMethods.execute("git rev-parse --abbrev-ref HEAD"))
-//     } catch (e: Exception) {
-//         logger.info("Unable to determine current branch through git CLI: ${e.message}")
-//         "unknown"
-//     }
-// }
-//
-// // favour user definition of kaluga_branch (if present), otherwise take it from GIT branch:
-// // - if running on CI: favour bitrise's branch detection
-// // - else: try to get it via the `git` CLI.
-// val branch = (kaluga_branch ?: BITRISE_GIT_BRANCH ?: branchFromGit ).replace('/', '-').trim().toLowerCase().also {
-//         if (it == "HEAD")
-//             logger.warn("Unable to determine current branch: Project is checked out with detached head!")
-//     }
-//
-// val kaluga_branch_postfix = when(branch) {
-//     "master", "main", "develop" -> ""
-//     else -> "-"+branch
-// } + if (!release) "-SNAPSHOT" else ""
-//
-// logger.lifecycle("decided branch: '$branch' to postfix '$kaluga_branch_postfix', isRelease: $release (from: BITRISE_GIT_BRANCH env: $BITRISE_GIT_BRANCH, kaluga_branch property: $kaluga_branch , MAVEN_CENTRAL_RELEASE env: $MAVEN_CENTRAL_RELEASE , git cli: $branchFromGit)")
-//
-// System.setProperty("kaluga_branch_postfix", kaluga_branch_postfix)
diff --git a/gradle/publish.gradle.kts b/gradle/publish.gradle.kts
deleted file mode 100644
index 5e688d7ad..000000000
--- a/gradle/publish.gradle.kts
+++ /dev/null
@@ -1,32 +0,0 @@
-afterEvaluate {
-    // publishing {
-    //     publications {
-    //         val component_type: String by extra
-    //         val library_version: String by extra
-    //         logger.lifecycle("This project module will be published as: $component_type")
-    //         if (type.contains("compose")) {
-    //             release(MavenPublication) {
-    //                 from(components.release)
-    //
-    //                 artifactId = project.name
-    //                 groupId = "com.splendo.kaluga"
-    //                 version = library_version
-    //             }
-    //             // Creates a Maven publication called “debug”.
-    //             debug(MavenPublication) {
-    //                 from(components.debug)
-    //
-    //                 artifactId = project.name
-    //                 groupId = "com.splendo.kaluga"
-    //                 version = library_version
-    //             }
-    //         } else {
-    //             kotlinMultiplatform { publication ->
-    //                 artifactId = project.name
-    //                 groupId = "com.splendo.kaluga"
-    //                 version = library_version
-    //             }
-    //         }
-    //     }
-    // }
-}
diff --git a/gradle/publishable_component.gradle.kts b/gradle/publishable_component.gradle.kts
deleted file mode 100644
index 130f6e847..000000000
--- a/gradle/publishable_component.gradle.kts
+++ /dev/null
@@ -1,3 +0,0 @@
-apply(from = "../gradle/component.gradle.kts")
-apply(from = "../gradle/jacoco.gradle")
-apply(from = "../gradle/publish.gradle.kts")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661ee..1855ed1e9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Oct 10 09:58:47 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/hud/build.gradle.kts b/hud/build.gradle.kts
index 6c6b33fbf..bc017b374 100644
--- a/hud/build.gradle.kts
+++ b/hud/build.gradle.kts
@@ -6,25 +6,17 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 dependencies {
-
-    val ext = (gradle as ExtensionAware).extra
-    implementation("androidx.fragment:fragment:${ext["androidx_fragment_version"]}")
-    debugImplementation("androidx.fragment:fragment-ktx:${ext["androidx_fragment_version"]}")
+    implement(Dependencies.AndroidX.Fragment)
+    implementForDebug(Dependencies.AndroidX.FragmentKtx)
 }
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
             dependencies {
-                val ext = (gradle as ExtensionAware).extra
                 implementation(project(":architecture", ""))
                 implementation(project(":base", ""))
             }
diff --git a/keyboard-compose/build.gradle.kts b/keyboard-compose/build.gradle.kts
index 7b626d1cc..31e426241 100644
--- a/keyboard-compose/build.gradle.kts
+++ b/keyboard-compose/build.gradle.kts
@@ -6,25 +6,12 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-ext["component_type"] = ext["component_type_compose"]
-
-// if the include is made from the example project shared module we need to go up one more directory
-val path_prefix = if (file("../gradle/componentskt.gradle.kts").exists())
-    ".." else "../.."
-
-apply(from = "$path_prefix/gradle/android_compose.gradle")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-ext["component_type"] = ext["component_type_default"]
+composeAndroidComponent()
 
 dependencies {
     implementation(project(":base"))
     api(project(":keyboard"))
-    val ext = (gradle as ExtensionAware).extra
-    implementation("androidx.compose.ui:ui:" + ext["androidx_compose_version"])
-    implementation("androidx.compose.ui:ui-tooling:" + ext["androidx_compose_version"])
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${ext["kotlinx_coroutines_version"]}!!")
+    implement(Dependencies.AndroidX.Compose.UI)
+    implement(Dependencies.AndroidX.Compose.UITooling)
+    implement(Dependencies.KotlinX.Coroutines.Core)
 }
diff --git a/keyboard/build.gradle.kts b/keyboard/build.gradle.kts
index 60b3092ab..a4b76534b 100644
--- a/keyboard/build.gradle.kts
+++ b/keyboard/build.gradle.kts
@@ -6,12 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/links/build.gradle.kts b/links/build.gradle.kts
index 11d8e6fc1..047717774 100644
--- a/links/build.gradle.kts
+++ b/links/build.gradle.kts
@@ -24,22 +24,16 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                val ext = (gradle as ExtensionAware).extra
                 implementation(project(":base", ""))
                 implementation(project(":logging", ""))
                 implementation(project(":architecture", ""))
-                api("org.jetbrains.kotlinx:kotlinx-serialization-core:${ext["serialization_version"]}")
+                expose(Dependencies.KotlinX.Serialization.Core)
             }
         }
         commonTest {
diff --git a/location-permissions/build.gradle.kts b/location-permissions/build.gradle.kts
index 7135eda09..83a274afd 100644
--- a/location-permissions/build.gradle.kts
+++ b/location-permissions/build.gradle.kts
@@ -6,24 +6,15 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-val kotlinx_coroutines_version = ext["kotlinx_coroutines_version"]!!
+publishableComponent()
 
 dependencies {
-    val play_services_version = (gradle as ExtensionAware).extra["play_services_version"]
-    implementation("com.google.android.gms:play-services-location:$play_services_version")
+    implement(Dependencies.Android.PlayServices.Location)
 }
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
                 api(project(":base-permissions", ""))
             }
diff --git a/location/build.gradle.kts b/location/build.gradle.kts
index 9710fc232..cd8654057 100644
--- a/location/build.gradle.kts
+++ b/location/build.gradle.kts
@@ -6,17 +6,11 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 dependencies {
-    val play_services_version = (gradle as ExtensionAware).extra["play_services_version"]
-    implementation("com.google.android.gms:play-services-location:$play_services_version")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.9")
+    implement(Dependencies.Android.PlayServices.Location)
+    implement(Dependencies.KotlinX.Coroutines.PlayServices)
 }
 
 kotlin {
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
index 8685d502a..b06cc6050 100644
--- a/logging/build.gradle.kts
+++ b/logging/build.gradle.kts
@@ -6,28 +6,20 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 kotlin {
     sourceSets {
         commonMain {
-            val ext = (gradle as ExtensionAware).extra
             dependencies {
-                implementation("io.github.aakira:napier:${ext["napier_version"]}")
-                implementation("co.touchlab:stately-concurrency:${ext["stately_version"]}")
+                implement(Dependencies.Napier)
+                implement(Dependencies.Stately.Concurrency)
             }
         }
         commonTest {
             dependencies {
-                val ext = (gradle as ExtensionAware).extra
-                // Stately Isolite is in flux and not part of the current statelyVersion. Upgrade this when tracked properly
-                implementation("co.touchlab:stately-isolate:${ext["stately_isolate_version"]}")
-                implementation("co.touchlab:stately-iso-collections:${ext["stately_isolate_version"]}")
+                implement(Dependencies.Stately.Isolate)
+                implement(Dependencies.Stately.IsoCollections)
                 api(project(":test-utils-base", ""))
             }
         }
diff --git a/microphone-permissions/build.gradle.kts b/microphone-permissions/build.gradle.kts
index 7135eda09..e149787d0 100644
--- a/microphone-permissions/build.gradle.kts
+++ b/microphone-permissions/build.gradle.kts
@@ -6,24 +6,11 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-val kotlinx_coroutines_version = ext["kotlinx_coroutines_version"]!!
-
-dependencies {
-    val play_services_version = (gradle as ExtensionAware).extra["play_services_version"]
-    implementation("com.google.android.gms:play-services-location:$play_services_version")
-}
+publishableComponent()
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
                 api(project(":base-permissions", ""))
             }
diff --git a/notifications-permissions/build.gradle.kts b/notifications-permissions/build.gradle.kts
index 7135eda09..e149787d0 100644
--- a/notifications-permissions/build.gradle.kts
+++ b/notifications-permissions/build.gradle.kts
@@ -6,24 +6,11 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-val kotlinx_coroutines_version = ext["kotlinx_coroutines_version"]!!
-
-dependencies {
-    val play_services_version = (gradle as ExtensionAware).extra["play_services_version"]
-    implementation("com.google.android.gms:play-services-location:$play_services_version")
-}
+publishableComponent()
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
                 api(project(":base-permissions", ""))
             }
diff --git a/permissions/build.gradle.kts b/permissions/build.gradle.kts
index d8be8917b..286ea1998 100644
--- a/permissions/build.gradle.kts
+++ b/permissions/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/resources-compose/build.gradle.kts b/resources-compose/build.gradle.kts
index 507a00414..ecc878677 100644
--- a/resources-compose/build.gradle.kts
+++ b/resources-compose/build.gradle.kts
@@ -23,27 +23,14 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-ext["component_type"] = ext["component_type_compose"]
-
-// if the include is made from the example project shared module we need to go up one more directory
-val path_prefix = if (file("../gradle/componentskt.gradle.kts").exists())
-    ".." else "../.."
-
-apply(from = "$path_prefix/gradle/android_compose.gradle")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-ext["component_type"] = ext["component_type_default"]
+composeAndroidComponent()
 
 dependencies {
     implementation(project(":base"))
     api(project(":resources"))
-    val ext = (gradle as ExtensionAware).extra
-    implementation("androidx.compose.foundation:foundation:" + ext["androidx_compose_version"])
-    implementation("androidx.compose.material:material:" + ext["androidx_compose_version"])
-    implementation("androidx.compose.ui:ui:" + ext["androidx_compose_version"])
-    implementation("androidx.compose.ui:ui-tooling:" + ext["androidx_compose_version"])
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${ext["kotlinx_coroutines_version"]}!!")
+    implement(Dependencies.AndroidX.Compose.Foundation)
+    implement(Dependencies.AndroidX.Compose.Material)
+    implement(Dependencies.AndroidX.Compose.UI)
+    implement(Dependencies.AndroidX.Compose.UITooling)
+    implement(Dependencies.KotlinX.Coroutines.Core)
 }
diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts
index 5e705248b..309e4eb81 100644
--- a/resources/build.gradle.kts
+++ b/resources/build.gradle.kts
@@ -7,26 +7,16 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies {}
+publishableComponent()
 
 kotlin {
     sourceSets {
-        val ext = (gradle as ExtensionAware).extra
-        val serialization_version: String by ext
-
         getByName("commonMain") {
             dependencies {
                 implementation(project(":base", ""))
                 implementation(project(":logging", ""))
-                api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serialization_version")
-                api("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version")
+                expose(Dependencies.KotlinX.Serialization.Core)
+                expose(Dependencies.KotlinX.Serialization.Json)
             }
         }
 
diff --git a/review/build.gradle.kts b/review/build.gradle.kts
index 69842b7c7..5c3b98ab1 100644
--- a/review/build.gradle.kts
+++ b/review/build.gradle.kts
@@ -6,20 +6,11 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
+publishableComponent()
 
 dependencies {
-    val ext = (gradle as ExtensionAware).extra
-    val play_core_version: String by ext
-    val play_core_ktx_version: String by ext
-
-    implementation("com.google.android.play:core:$play_core_version")
-    implementation("com.google.android.play:core-ktx:$play_core_ktx_version")
+    implement(Dependencies.Android.Play.Core)
+    implement(Dependencies.Android.Play.CoreKtx)
 }
 
 kotlin {
diff --git a/scientific/build.gradle.kts b/scientific/build.gradle.kts
index 68e1d7415..2cd1a9c5c 100644
--- a/scientific/build.gradle.kts
+++ b/scientific/build.gradle.kts
@@ -7,26 +7,15 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
-
-        val ext = (gradle as ExtensionAware).extra
-        val serialization_version: String by ext
-
         commonMain {
             dependencies {
                 implementation(project(":base"))
-                api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serialization_version")
-                api("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version")
+                expose(Dependencies.KotlinX.Serialization.Core)
+                expose(Dependencies.KotlinX.Serialization.Json)
             }
         }
         commonTest {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 040d0154b..ffe9c4d52 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,7 +44,6 @@ pluginManagement {
     }
 }
 
-apply("gradle/ext.gradle.kts")
 includeBuild("convention-plugins")
 
 rootProject.name = "Kaluga"
diff --git a/storage-permissions/build.gradle.kts b/storage-permissions/build.gradle.kts
index 7135eda09..e149787d0 100644
--- a/storage-permissions/build.gradle.kts
+++ b/storage-permissions/build.gradle.kts
@@ -6,24 +6,11 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-val kotlinx_coroutines_version = ext["kotlinx_coroutines_version"]!!
-
-dependencies {
-    val play_services_version = (gradle as ExtensionAware).extra["play_services_version"]
-    implementation("com.google.android.gms:play-services-location:$play_services_version")
-}
+publishableComponent()
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
                 api(project(":base-permissions", ""))
             }
diff --git a/system/build.gradle.kts b/system/build.gradle.kts
index 1d02e0dda..5c23021ea 100644
--- a/system/build.gradle.kts
+++ b/system/build.gradle.kts
@@ -6,20 +6,9 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-dependencies {
-    implementation(project(mapOf("path" to ":base")))
-}
+publishableComponent()
 
 kotlin {
-
-    val ext = (gradle as ExtensionAware).extra
-
     sourceSets {
         commonMain {
             dependencies {
diff --git a/test-utils-alerts/build.gradle.kts b/test-utils-alerts/build.gradle.kts
index 758be76a9..d7be158f8 100644
--- a/test-utils-alerts/build.gradle.kts
+++ b/test-utils-alerts/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/test-utils-architecture/build.gradle.kts b/test-utils-architecture/build.gradle.kts
index 869b0f540..ea94dc000 100644
--- a/test-utils-architecture/build.gradle.kts
+++ b/test-utils-architecture/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/test-utils-base/build.gradle.kts b/test-utils-base/build.gradle.kts
index bea107930..4e93e3911 100644
--- a/test-utils-base/build.gradle.kts
+++ b/test-utils-base/build.gradle.kts
@@ -6,17 +6,10 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-val androidx_arch_core_testing_version = ext["androidx_arch_core_testing_version"]!!
+publishableComponent()
 
 dependencies {
-    api("androidx.arch.core:core-testing:$androidx_arch_core_testing_version")
+    expose(Dependencies.AndroidX.ArchCore)
 }
 
 kotlin {
@@ -44,11 +37,9 @@ kotlin {
         }
 
         getByName("jvmMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-test:" + ext["kotlinx_coroutines_version"])
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-debug:" + ext["kotlinx_coroutines_version"])
+                expose(Dependencies.KotlinX.Coroutines.Test)
+                expose(Dependencies.KotlinX.Coroutines.Debug)
             }
         }
     }
@@ -56,8 +47,7 @@ kotlin {
 
 android {
     dependencies {
-        val ext = (gradle as ExtensionAware).extra
-        api("org.jetbrains.kotlinx:kotlinx-coroutines-test:" + ext["kotlinx_coroutines_version"])
-        api("org.jetbrains.kotlinx:kotlinx-coroutines-debug:" + ext["kotlinx_coroutines_version"])
+        expose(Dependencies.KotlinX.Coroutines.Test)
+        expose(Dependencies.KotlinX.Coroutines.Debug)
     }
 }
diff --git a/test-utils-bluetooth/build.gradle.kts b/test-utils-bluetooth/build.gradle.kts
index 514bee8f4..1957a9301 100644
--- a/test-utils-bluetooth/build.gradle.kts
+++ b/test-utils-bluetooth/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/test-utils-hud/build.gradle.kts b/test-utils-hud/build.gradle.kts
index 15a0d34a8..869b33505 100644
--- a/test-utils-hud/build.gradle.kts
+++ b/test-utils-hud/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/test-utils-keyboard/build.gradle.kts b/test-utils-keyboard/build.gradle.kts
index 2f6d6ce4d..47a59bf69 100644
--- a/test-utils-keyboard/build.gradle.kts
+++ b/test-utils-keyboard/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/test-utils-koin/build.gradle.kts b/test-utils-koin/build.gradle.kts
index 226c3a650..90c147628 100644
--- a/test-utils-koin/build.gradle.kts
+++ b/test-utils-koin/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
@@ -22,7 +15,7 @@ kotlin {
             dependencies {
                 api(project(":test-utils-base"))
                 api(project(":test-utils-architecture"))
-                api("io.insert-koin:koin-core:" + ext["koin_version"])
+                expose(Dependencies.Koin.Core)
             }
         }
         commonTest {
diff --git a/test-utils-location/build.gradle.kts b/test-utils-location/build.gradle.kts
index 3e32bc3fb..bdca0d829 100644
--- a/test-utils-location/build.gradle.kts
+++ b/test-utils-location/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/test-utils-permissions/build.gradle.kts b/test-utils-permissions/build.gradle.kts
index 2f087c8af..245297644 100644
--- a/test-utils-permissions/build.gradle.kts
+++ b/test-utils-permissions/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/test-utils-resources/build.gradle.kts b/test-utils-resources/build.gradle.kts
index c31e0e675..210f27579 100644
--- a/test-utils-resources/build.gradle.kts
+++ b/test-utils-resources/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index fe43c23dc..c2ec54e44 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -6,14 +6,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
-
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies { }
+publishableComponent()
 
 kotlin {
     sourceSets {

From d0defdfbc3250b1e5fd521271e9dc0fa6527eb54 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 4 Nov 2022 10:50:29 +0100
Subject: [PATCH 004/227] Fixes to get compilation working

---
 adding-a-new-module/template/build.gradle.kts   | 17 +++++------------
 .../iosTest/kotlin/observable/ThreadingTest.kt  |  2 --
 build.gradle.kts                                |  8 ++++----
 buildSrc/src/main/kotlin/Component.kt           |  4 ++--
 buildSrc/src/main/kotlin/Dependencies.kt        |  2 +-
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/adding-a-new-module/template/build.gradle.kts b/adding-a-new-module/template/build.gradle.kts
index 151b61933..a9a3c2b9b 100644
--- a/adding-a-new-module/template/build.gradle.kts
+++ b/adding-a-new-module/template/build.gradle.kts
@@ -6,19 +6,12 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-val ext = (gradle as ExtensionAware).extra
+/* Multiplatform component */
+publishableComponent()
+/* Compose component */
+composeAndroidComponent()
 
-apply(from = "../gradle/publishable_component.gradle.kts")
-
-group = "com.splendo.kaluga"
-version = ext["library_version"]!!
-
-dependencies {
-    /* Uncomment these lines if you are using fragments
-    val ext = (gradle as ExtensionAware).extra
-    androidTestImplementation("androidx.fragment:fragment-ktx:${ext["androidx_fragment_version"]}")
-    */
-}
+dependencies { }
 
 kotlin {
     sourceSets {
diff --git a/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt b/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
index 1d4ad918e..b6c4b6212 100644
--- a/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
+++ b/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
@@ -85,7 +85,6 @@ class ThreadingTest {
         val observer: (Value?) -> Unit = { }
         val disposable = s.observe(observer)
         assertNotFrozen(value)
-        assertNotFrozen(observer)
 
         withContext(Dispatchers.Default) {
             // due to the context switch the subject itself is frozen
@@ -98,7 +97,6 @@ class ThreadingTest {
             disposable2.dispose()
         }
 
-        assertNotFrozen(observer)
         disposable.dispose()
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index 471734431..04ad7a695 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -44,8 +44,8 @@ allprojects {
         testLogging.exceptionFormat = TestExceptionFormat.FULL
     }
 
-    tasks.withType<org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask>().configureEach {
-        // it.workerMaxHeapSize.set("512m")
+    tasks.withType<BaseKtLintCheckTask>().configureEach {
+        workerMaxHeapSize.set("512m")
     }
 }
 
@@ -54,7 +54,7 @@ apiValidation {
     subprojects.forEach {
         val name = it.name
 
-        ignoredClasses.add("com.splendo.kaluga.${name}.BuildConfig".toString())
+        ignoredClasses.add("com.splendo.kaluga.$name.BuildConfig".toString())
         ignoredClasses.add("com.splendo.kaluga.${name.replace("-", ".")}.BuildConfig".toString())
         ignoredClasses.add("com.splendo.kaluga.${name.replace("-", "")}.BuildConfig".toString())
         ignoredClasses.add("com.splendo.kaluga.permissions.${name.replace("-permissions", "")}.BuildConfig".toString())
@@ -68,5 +68,5 @@ apiValidation {
 apply(from = "gradle/newModule.gradle.kts")
 apply(from = "gradle/copyReports.gradle.kts")
 
-group = "com.splendo.kaluga"
+group = Library.group
 version = Library.version
diff --git a/buildSrc/src/main/kotlin/Component.kt b/buildSrc/src/main/kotlin/Component.kt
index e2c5c0813..f0899920e 100644
--- a/buildSrc/src/main/kotlin/Component.kt
+++ b/buildSrc/src/main/kotlin/Component.kt
@@ -56,8 +56,8 @@ fun Project.commonComponent() {
             if (tasks.names.contains("linkDebugTest${targetName.capitalize() }")) {
                 // creating copy task for the target
                 val copyTask = tasks.create("copy${targetName.capitalize() }TestResources", Copy::class.java) {
-                    from(File("src/iosTest/resources/."))
-                    into(File("$buildDir/bin/$targetName/debugTest"))
+                    from("src/iosTest/resources/.")
+                    into("$buildDir/bin/$targetName/debugTest")
                 }
 
                 // apply copy task to the target
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index c3c6c3dd6..506a7dd18 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -56,7 +56,7 @@ object Dependencies {
             val Android = Dependency(group, "kotlinx-coroutines-android", version)
             val Core = Dependency(group, "kotlinx-coroutines-core", version)
             val Swing = Dependency(group, "kotlinx-coroutines-swing", version)
-            val Js = Dependency(group, "kotlinx-coroutines-js", version)
+            val Js = Dependency(group, "kotlinx-coroutines-core-js", version)
             val PlayServices = Dependency(group, "kotlinx-coroutines-play-services", version)
             val Test = Dependency(group, "kotlinx-coroutines-test", version)
             val Debug = Dependency(group, "kotlinx-coroutines-debug", version)

From 7790d7d1c07315026c92758186a74e208129f5e3 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 10 Oct 2022 15:15:36 +0200
Subject: [PATCH 005/227] Move to composite builds

---
 .github/workflows/emulator.yaml               |  2 +-
 build.gradle.kts                              |  1 +
 .../build.gradle.kts                          |  7 ++++++
 .../settings/gradle.kts                       |  0
 .../src/main/kotlin/Accessors.kt              |  0
 .../src/main/kotlin/AndroidCommon.kt          |  0
 .../src/main/kotlin/AndroidCompose.kt         |  0
 .../src/main/kotlin/Component.kt              |  0
 .../src/main/kotlin/Dependencies.kt           |  8 +++---
 .../src/main/kotlin/GitBranch.kt              |  0
 .../src/main/kotlin/Library.kt                |  0
 .../main/kotlin/LibraryComponentsPlugin.kt    | 25 +++++++++++++++++++
 .../src/main/kotlin/Publish.kt                |  0
 .../src/main/kotlin/PublishableComponent.kt   |  0
 settings.gradle.kts                           |  1 +
 15 files changed, 39 insertions(+), 5 deletions(-)
 rename {buildSrc => kaluga-library-components}/build.gradle.kts (86%)
 rename {buildSrc => kaluga-library-components}/settings/gradle.kts (100%)
 rename {buildSrc => kaluga-library-components}/src/main/kotlin/Accessors.kt (100%)
 rename {buildSrc => kaluga-library-components}/src/main/kotlin/AndroidCommon.kt (100%)
 rename {buildSrc => kaluga-library-components}/src/main/kotlin/AndroidCompose.kt (100%)
 rename {buildSrc => kaluga-library-components}/src/main/kotlin/Component.kt (100%)
 rename {buildSrc => kaluga-library-components}/src/main/kotlin/Dependencies.kt (97%)
 rename {buildSrc => kaluga-library-components}/src/main/kotlin/GitBranch.kt (100%)
 rename {buildSrc => kaluga-library-components}/src/main/kotlin/Library.kt (100%)
 create mode 100644 kaluga-library-components/src/main/kotlin/LibraryComponentsPlugin.kt
 rename {buildSrc => kaluga-library-components}/src/main/kotlin/Publish.kt (100%)
 rename {buildSrc => kaluga-library-components}/src/main/kotlin/PublishableComponent.kt (100%)

diff --git a/.github/workflows/emulator.yaml b/.github/workflows/emulator.yaml
index bf2c94cb4..66f5a8305 100644
--- a/.github/workflows/emulator.yaml
+++ b/.github/workflows/emulator.yaml
@@ -1,4 +1,4 @@
-#### for keeping up to date with settings.build.gradle.kts see instructions in `test:` job
+#### for keeping up to date with settings.gradle.kts see instructions in `test:` job
 name: Android Emulator tests
 on: pull_request
 env:
diff --git a/build.gradle.kts b/build.gradle.kts
index 04ad7a695..8c7ea7583 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,6 +16,7 @@ buildscript {
 }
 
 plugins {
+    id("kaluga-library-components")
     id("convention.publication")
     id("org.jlleitschuh.gradle.ktlint")
     id("org.jlleitschuh.gradle.ktlint-idea")
diff --git a/buildSrc/build.gradle.kts b/kaluga-library-components/build.gradle.kts
similarity index 86%
rename from buildSrc/build.gradle.kts
rename to kaluga-library-components/build.gradle.kts
index d22264d20..2f2e91698 100644
--- a/buildSrc/build.gradle.kts
+++ b/kaluga-library-components/build.gradle.kts
@@ -14,6 +14,13 @@ repositories {
     mavenCentral()
 }
 
+gradlePlugin {
+    plugins.register("kaluga-library-components") {
+        id = "kaluga-library-components"
+        implementationClass = "LibraryComponentsPlugin"
+    }
+}
+
 dependencies {
 
     val properties = File("${rootDir.absolutePath}/../gradle.properties").loadProperties()
diff --git a/buildSrc/settings/gradle.kts b/kaluga-library-components/settings/gradle.kts
similarity index 100%
rename from buildSrc/settings/gradle.kts
rename to kaluga-library-components/settings/gradle.kts
diff --git a/buildSrc/src/main/kotlin/Accessors.kt b/kaluga-library-components/src/main/kotlin/Accessors.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/Accessors.kt
rename to kaluga-library-components/src/main/kotlin/Accessors.kt
diff --git a/buildSrc/src/main/kotlin/AndroidCommon.kt b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/AndroidCommon.kt
rename to kaluga-library-components/src/main/kotlin/AndroidCommon.kt
diff --git a/buildSrc/src/main/kotlin/AndroidCompose.kt b/kaluga-library-components/src/main/kotlin/AndroidCompose.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/AndroidCompose.kt
rename to kaluga-library-components/src/main/kotlin/AndroidCompose.kt
diff --git a/buildSrc/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/Component.kt
rename to kaluga-library-components/src/main/kotlin/Component.kt
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/Dependencies.kt
rename to kaluga-library-components/src/main/kotlin/Dependencies.kt
index 506a7dd18..9548006d6 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -141,7 +141,7 @@ object Dependencies {
 
             val Core = Dependency(group, "core", version)
             val CoreKtx = Dependency(group, "core-ktx", version)
-            val Espresso = Dependency("$group.espresso", "espresso-core", version)
+            val Espresso = Dependency("$group.espresso", "espresso-core", espressoVersion)
             val JUnit = Dependency("$group.ext", "junit", junitVersion)
             val Rules = Dependency(group, "rules", version)
             val Runner = Dependency(group, "runner", version)
@@ -158,7 +158,7 @@ object Dependencies {
         val Core = Dependency(group, "koin-core", version)
     }
 
-    val Napier = Dependency("io.github.aakira", "napier", "2.4.0")
+    val Napier = Dependency("io.github.aakira", "napier", "2.6.1")
 
     object Stately {
         private const val group = "co.touchlab"
@@ -174,7 +174,7 @@ object Dependencies {
 
     object Mockito {
         private const val group = "org.mockito"
-        private const val version = "3.11.2"
+        private const val version = "4.8.1"
 
         val Android = Dependency(group, "mockito-android", version)
         val Core = Dependency(group, "mockito-core", version)
@@ -182,7 +182,7 @@ object Dependencies {
 
     object ByteBuddy {
         private const val group = "net.bytebuddy"
-        private const val version = "1.11.3"
+        private const val version = "1.12.16"
 
         val Android = Dependency(group, "byte-buddy-android", version)
         val Agent = Dependency(group, "byte-buddy-agent", version)
diff --git a/buildSrc/src/main/kotlin/GitBranch.kt b/kaluga-library-components/src/main/kotlin/GitBranch.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/GitBranch.kt
rename to kaluga-library-components/src/main/kotlin/GitBranch.kt
diff --git a/buildSrc/src/main/kotlin/Library.kt b/kaluga-library-components/src/main/kotlin/Library.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/Library.kt
rename to kaluga-library-components/src/main/kotlin/Library.kt
diff --git a/kaluga-library-components/src/main/kotlin/LibraryComponentsPlugin.kt b/kaluga-library-components/src/main/kotlin/LibraryComponentsPlugin.kt
new file mode 100644
index 000000000..dc23d9d2f
--- /dev/null
+++ b/kaluga-library-components/src/main/kotlin/LibraryComponentsPlugin.kt
@@ -0,0 +1,25 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class LibraryComponentsPlugin: Plugin<Project> {
+    override fun apply(target: Project) {
+        // no-op
+    }
+}
diff --git a/buildSrc/src/main/kotlin/Publish.kt b/kaluga-library-components/src/main/kotlin/Publish.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/Publish.kt
rename to kaluga-library-components/src/main/kotlin/Publish.kt
diff --git a/buildSrc/src/main/kotlin/PublishableComponent.kt b/kaluga-library-components/src/main/kotlin/PublishableComponent.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/PublishableComponent.kt
rename to kaluga-library-components/src/main/kotlin/PublishableComponent.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ffe9c4d52..cf929ef1d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,6 +44,7 @@ pluginManagement {
     }
 }
 
+includeBuild("kaluga-library-components")
 includeBuild("convention-plugins")
 
 rootProject.name = "Kaluga"

From 07da66b3ba949488b8f20d9894e17c4751f92a1c Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 4 Nov 2022 11:00:28 +0100
Subject: [PATCH 006/227] Moving to new memory model

---
 alerts/src/commonMain/kotlin/Alerts.kt        | 12 +--
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  2 +-
 .../kotlin/observable/Disposable.kt           | 67 +++++++-------
 .../kotlin/observable/Observable.kt           | 24 ++---
 .../kotlin/viewmodel/LifecycleViewModel.kt    | 10 +--
 .../kotlin/observable/ObservableBaseTest.kt   | 26 +++---
 .../kotlin/observable/ReadOnlyPropertyTest.kt |  7 +-
 .../kotlin/observable/SimpleDisposable.kt     |  3 -
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  8 +-
 .../viewmodel/ViewModelLifecycleManager.kt    | 10 ++-
 .../kotlin/observable/ThreadingTest.kt        |  5 --
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  2 +-
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  2 +-
 .../src/commonMain/kotlin/Permission.kt       | 87 ++++++++++++++-----
 .../iosMain/kotlin/IOSPermissionsHelper.kt    |  8 +-
 .../kotlin/PermissionRefreshScheduler.kt      | 34 +++-----
 .../iosMain/kotlin/av/AVPermissionHelper.kt   | 11 +--
 .../kotlin/PermissionRefreshSchedulerTest.kt  | 17 ++--
 base/build.gradle.kts                         |  4 -
 .../kotlin/AtomicReferenceDelegate.kt         | 37 --------
 .../commonMain/kotlin/flow/BaseFlowable.kt    | 13 ++-
 .../commonMain/kotlin/flow/ColdFlowable.kt    | 11 ++-
 .../commonMain/kotlin/state/KalugaState.kt    | 42 +++++----
 base/src/commonMain/kotlin/utils/TimeZone.kt  |  2 -
 .../commonTest/kotlin/AtomicReferenceTest.kt  |  1 -
 base/src/iosMain/kotlin/GCScheduler.kt        | 12 ++-
 beacons/src/commonMain/kotlin/Beacons.kt      |  6 +-
 .../src/commonMain/kotlin/Permission.kt       | 28 +++++-
 bluetooth/build.gradle.kts                    |  1 -
 bluetooth/src/commonMain/kotlin/Bluetooth.kt  |  5 +-
 .../src/commonMain/kotlin/Characteristic.kt   |  6 +-
 .../device/DefaultDeviceConnectionManager.kt  | 16 ++--
 .../src/commonMain/kotlin/scanner/Scanner.kt  | 12 +--
 .../src/iosMain/kotlin/BluetoothBuilder.kt    |  2 +-
 .../src/iosMain/kotlin/BluetoothMonitor.kt    | 10 +--
 .../device/DefaultDeviceConnectionManager.kt  | 70 +++++++++------
 .../src/iosMain/kotlin/scanner/Scanner.kt     | 48 +++++-----
 .../src/commonMain/kotlin/Permission.kt       | 23 ++++-
 .../kotlin/CalendarPermissionManager.kt       | 11 +--
 .../src/commonMain/kotlin/Permission.kt       | 23 ++++-
 .../src/commonMain/kotlin/Permission.kt       | 23 ++++-
 .../kotlin/ContactsPermissionManager.kt       | 11 +--
 .../src/commonMain/kotlin/DateTimePicker.kt   | 10 +--
 .../kotlin/bluetooth/KNBluetoothFramework.kt  |  1 -
 gradle.properties                             |  2 -
 hud/src/commonMain/kotlin/HUD.kt              |  8 +-
 hud/src/iosTest/kotlin/IOSHUDTests.kt         |  9 --
 .../src/main/kotlin/Dependencies.kt           | 12 +--
 .../src/commonMain/kotlin/Permission.kt       | 23 ++++-
 .../kotlin/MainCLLocationManagerAccessor.kt   |  8 +-
 .../kotlin/location/LocationManager.kt        | 19 ++--
 .../kotlin/location/LocationManager.kt        | 11 +--
 .../kotlin/location/LocationStateRepo.kt      |  2 -
 .../kotlin/location/LocationManager.kt        | 10 ---
 logging/build.gradle.kts                      |  3 -
 logging/src/commonMain/kotlin/NapierLogger.kt |  2 -
 logging/src/commonTest/kotlin/LoggerMock.kt   | 41 ++++++---
 logging/src/iosMain/kotlin/log.kt             |  9 +-
 .../src/commonMain/kotlin/Permission.kt       | 23 ++++-
 .../src/commonMain/kotlin/Permission.kt       | 24 ++++-
 .../kotlin/NotificationsPermissionManager.kt  | 10 +--
 .../src/iosMain/kotlin/uikit/ButtonStyle.kt   |  1 -
 .../iosMain/kotlin/uikit/UILinkTapGesture.kt  |  1 -
 .../kotlin/uikit/UILinkTextViewDelegate.kt    |  1 -
 .../kotlin/unit/AccelerationUnit.kt           |  3 -
 .../kotlin/unit/AmountOfSubstanceUnit.kt      |  2 -
 .../kotlin/unit/ElectricChargeUnit.kt         |  2 -
 .../src/commonMain/kotlin/unit/SpeedUnit.kt   |  3 -
 .../src/commonMain/kotlin/Permission.kt       | 29 ++++++-
 .../kotlin/StoragePermissionManager.kt        |  6 +-
 .../system/network/state/NetworkStateRepo.kt  | 14 ++-
 .../system/network/NetworkManager.kt          |  8 +-
 .../commonMain/kotlin/MockAlertPresenter.kt   | 18 +---
 .../src/commonMain/kotlin/ViewModelTest.kt    | 17 ++--
 .../kotlin/UIThreadViewModelTestTest.kt       |  9 +-
 .../src/commonMain/kotlin/FlowTest.kt         | 30 ++-----
 .../src/commonMain/kotlin/assertions.kt       | 38 --------
 .../src/commonMain/kotlin/mock/MockMethod.kt  | 15 ++--
 .../kotlin/testBlockingAndCancelScope.kt      |  9 +-
 .../commonMain/kotlin/ui_thread_testing.kt    | 12 +--
 .../kotlin/MockDeviceWrapper.kt               |  3 +-
 .../device/MockDeviceConnectionManager.kt     | 10 +--
 .../commonMain/kotlin/scanner/MockScanner.kt  |  3 +-
 .../kotlin/IOSMockCharacteristicWrapper.kt    |  6 +-
 .../kotlin/IOSMockDescriptorWrapper.kt        |  6 +-
 .../src/commonMain/kotlin/MockHUD.kt          | 12 +--
 .../src/commonMain/kotlin/MockFocusHandler.kt | 10 +--
 .../commonMain/kotlin/MockKeyboardManager.kt  | 11 +--
 .../src/commonMain/kotlin/KoinUIThreadTest.kt |  4 +-
 .../kotlin/KoinUIThreadViewModelTest.kt       |  8 +-
 .../commonMain/kotlin/MockLocationManager.kt  |  3 +-
 .../kotlin/MockLocationStateRepoBuilder.kt    |  3 +-
 .../kotlin/MockPermissionManager.kt           |  3 +-
 .../kotlin/MockPermissionsBuilder.kt          | 19 ++--
 test-utils/src/commonMain/kotlin/legacy.kt    | 12 +--
 95 files changed, 615 insertions(+), 695 deletions(-)
 delete mode 100644 base/src/commonMain/kotlin/AtomicReferenceDelegate.kt
 delete mode 100644 test-utils-base/src/commonMain/kotlin/assertions.kt

diff --git a/alerts/src/commonMain/kotlin/Alerts.kt b/alerts/src/commonMain/kotlin/Alerts.kt
index 60c1c0e9d..26dc6b8ab 100644
--- a/alerts/src/commonMain/kotlin/Alerts.kt
+++ b/alerts/src/commonMain/kotlin/Alerts.kt
@@ -18,11 +18,11 @@ Copyright 2019 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.alerts
 
-import co.touchlab.stately.concurrency.Lock
-import co.touchlab.stately.concurrency.withLock
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlin.coroutines.resume
 
 typealias AlertActionHandler = () -> Unit
@@ -137,7 +137,7 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
         private var actions: MutableList<Alert.Action> = mutableListOf()
         private var textInputAction: Alert.TextInputAction? = null
         private var style: Alert.Style = Alert.Style.ALERT
-        internal val lock = Lock()
+        internal val lock = Mutex()
 
         /**
          * Sets the [title] displayed in the alert
@@ -321,7 +321,7 @@ expect class AlertPresenter : BaseAlertPresenter {
  * @param initialize The block to construct an Alert
  * @return The built alert interface object
  */
-fun BaseAlertPresenter.Builder.buildAlert(
+suspend fun BaseAlertPresenter.Builder.buildAlert(
     coroutineScope: CoroutineScope,
     initialize: BaseAlertPresenter.Builder.() -> Unit
 ): BaseAlertPresenter = lock.withLock {
@@ -338,7 +338,7 @@ fun BaseAlertPresenter.Builder.buildAlert(
  * @param initialize The block to construct an Alert
  * @return The built alert interface object
  */
-fun BaseAlertPresenter.Builder.buildActionSheet(
+suspend fun BaseAlertPresenter.Builder.buildActionSheet(
     coroutineScope: CoroutineScope,
     initialize: BaseAlertPresenter.Builder.() -> Unit
 ): BaseAlertPresenter = lock.withLock {
@@ -355,7 +355,7 @@ fun BaseAlertPresenter.Builder.buildActionSheet(
  * @param initialize The block to construct an Alert
  * @return The built alert interface object
  */
-fun BaseAlertPresenter.Builder.buildAlertWithInput(
+suspend fun BaseAlertPresenter.Builder.buildAlertWithInput(
     coroutineScope: CoroutineScope,
     initialize: BaseAlertPresenter.Builder.() -> Unit
 ): BaseAlertPresenter = lock.withLock {
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
index 239124465..70f8532dd 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -21,7 +21,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.viewModelScope
 
-actual open class LifecycleViewModel internal actual constructor(allowFreezing: Boolean) : androidx.lifecycle.ViewModel() {
+actual open class LifecycleViewModel internal actual constructor() : androidx.lifecycle.ViewModel() {
 
     actual val coroutineScope = viewModelScope
 
diff --git a/architecture/src/commonMain/kotlin/observable/Disposable.kt b/architecture/src/commonMain/kotlin/observable/Disposable.kt
index 66f8fb567..3665c9b0b 100644
--- a/architecture/src/commonMain/kotlin/observable/Disposable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Disposable.kt
@@ -18,10 +18,8 @@
 @file:JvmName("DisposableCommonKt")
 package com.splendo.kaluga.architecture.observable
 
-import co.touchlab.stately.collections.sharedMutableListOf
-import co.touchlab.stately.concurrency.AtomicBoolean
-import co.touchlab.stately.ensureNeverFrozen
-import co.touchlab.stately.isFrozen
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
 import kotlin.jvm.JvmName
 
 typealias DisposeHandler = () -> Unit
@@ -39,12 +37,12 @@ interface Disposable {
     /**
      * Disposes the associated object
      */
-    fun dispose()
+    suspend fun dispose()
 
     /**
      * Adds this disposable to a [DisposeBag]
      */
-    fun addTo(disposeBag: DisposeBag)
+    suspend fun addTo(disposeBag: DisposeBag)
 }
 
 expect class SimpleDisposable(onDispose: DisposeHandler) : BaseSimpleDisposable
@@ -55,20 +53,19 @@ expect class SimpleDisposable(onDispose: DisposeHandler) : BaseSimpleDisposable
  */
 abstract class BaseSimpleDisposable(onDispose: DisposeHandler) : Disposable {
 
-    private val _isDisposed = AtomicBoolean(false)
-    val isDisposed
-        get() = _isDisposed.value
-
+    private val disposal = Semaphore(1)
     private var disposeHandler: DisposeHandler? = onDispose
 
     /**
      * Disposes the associated object
      */
-    override fun dispose() {
-        if (_isDisposed.compareAndSet(expected = false, new = true)) {
-            disposeHandler?.invoke()
-            if (!disposeHandler.isFrozen) disposeHandler = null
-            afterDispose()
+    override suspend fun dispose() {
+        disposal.withPermit {
+            disposeHandler?.let {
+                it.invoke()
+                disposeHandler = null
+                afterDispose()
+            }
         }
     }
 
@@ -77,7 +74,7 @@ abstract class BaseSimpleDisposable(onDispose: DisposeHandler) : Disposable {
     /**
      * Adds this disposable to a [DisposeBag]
      */
-    override fun addTo(disposeBag: DisposeBag) {
+    override suspend fun addTo(disposeBag: DisposeBag) {
         disposeBag.add(this)
     }
 }
@@ -85,33 +82,31 @@ abstract class BaseSimpleDisposable(onDispose: DisposeHandler) : Disposable {
 /**
  * Container for multiple [Disposable]. Allows nested [DisposeBag].
  */
-class DisposeBag(allowFreezing: Boolean = false) : Disposable {
-
-    constructor() : this(false)
+class DisposeBag : Disposable {
 
-    private val disposables: MutableList<Disposable> = if (allowFreezing) sharedMutableListOf() else mutableListOf()
-    private val nestedBags: MutableList<DisposeBag> = if (allowFreezing) sharedMutableListOf() else mutableListOf()
-
-    init {
-        if (!allowFreezing)
-            ensureNeverFrozen() // if our DisposeBag gets frozen we cannot dispose properly so this is generally unwanted
-    }
+    private val addingOperation = Semaphore(1)
+    private val disposables: MutableList<Disposable> = mutableListOf()
+    private val nestedBags: MutableList<DisposeBag> = mutableListOf()
 
     /**
      * Adds a nested [DisposeBag]
      */
-    fun add(disposeBag: DisposeBag) {
-        nestedBags.add(disposeBag)
+    suspend fun add(disposeBag: DisposeBag) {
+        addingOperation.withPermit {
+            nestedBags.add(disposeBag)
+        }
     }
 
     /**
      * Adds a [Disposable] to this [DisposeBag]
      */
-    fun add(disposable: Disposable) {
-        disposables.add(disposable)
+    suspend fun add(disposable: Disposable) {
+        addingOperation.withPermit {
+            disposables.add(disposable)
+        }
     }
 
-    override fun addTo(disposeBag: DisposeBag) {
+    override suspend fun addTo(disposeBag: DisposeBag) {
         disposeBag.add(this)
     }
 
@@ -119,10 +114,14 @@ class DisposeBag(allowFreezing: Boolean = false) : Disposable {
      * Disposes all [Disposable]s and nested [DisposeBag]s added to this [DisposeBag].
      * Added elements can only be disposed once
      */
-    override fun dispose() {
+    override suspend fun dispose() {
         disposables.forEach { it.dispose() }
-        disposables.clear()
+        addingOperation.withPermit {
+            disposables.clear()
+        }
         nestedBags.forEach { it.dispose() }
-        nestedBags.clear()
+        addingOperation.withPermit {
+            nestedBags.clear()
+        }
     }
 }
diff --git a/architecture/src/commonMain/kotlin/observable/Observable.kt b/architecture/src/commonMain/kotlin/observable/Observable.kt
index cbad22e80..419ba060e 100644
--- a/architecture/src/commonMain/kotlin/observable/Observable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observable.kt
@@ -17,9 +17,6 @@
 
 package com.splendo.kaluga.architecture.observable
 
-import co.touchlab.stately.concurrency.AtomicBoolean
-import co.touchlab.stately.concurrency.AtomicReference
-import co.touchlab.stately.isFrozen
 import com.splendo.kaluga.architecture.observable.ObservableOptional.Nothing
 import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
 import com.splendo.kaluga.base.KalugaThread
@@ -192,14 +189,14 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
     var onFirstObservation: (() -> Unit)? = null
         set(value) {
             // if an observation took place before this field was set, invoke immediately
-            if (firstObservation.value) {
+            if (firstObservation) {
                 value?.invoke()
             } else {
                 field = value
             }
         }
 
-    private val firstObservation = AtomicBoolean(false)
+    private var firstObservation = false
 
     var beforeObservedValueGet: ((OO) -> ObservableOptional<T>)? = null
 
@@ -221,8 +218,6 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
             field = value
         }
 
-    private val backingAtomicReference = AtomicReference<ObservableOptional<R>?>(null)
-
     /**
      *  set the value of this Observable from a suspended context.
      */
@@ -242,16 +237,10 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
      */
     private fun setValueUnconfined(value: ObservableOptional<T>): ObservableOptional<T> {
         val v = value.asResult(defaultValue)
-        val before = backingAtomicReference.get() ?: backingInternalValue
+        val before = backingInternalValue
 
         if (before != v) {
-            // TODO: since our context is supposed to be single thread, we could use a @ThreadLocal similar to tracking observers
-            // This would only need to freeze the current result, or if possible a copy of it
-
-            if (!this@Observation.isFrozen) // if the parent is frozen we can no longer update this reference
-                backingInternalValue = v
-            else // if it's frozen use an atomic value
-                backingAtomicReference.set(v)
+            backingInternalValue = v
 
             val result = (v as? Value<*>)?.value as R
 
@@ -264,12 +253,13 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
     }
 
     private fun getValue(): OO {
-        if (firstObservation.compareAndSet(expected = false, new = true)) {
+        if (!firstObservation) {
+            firstObservation = true
             onFirstObservation?.invoke()
         }
 
         return handleOnMain {
-            backingAtomicReference.get() ?: backingInternalValue ?: error("unexpected null")
+            backingInternalValue ?: error("unexpected null")
         } as OO
     }
 
diff --git a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
index 5525f5b31..8fea273d1 100644
--- a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -27,18 +27,18 @@ import kotlinx.coroutines.cancelChildren
     message = "ViewModel was renamed as the name didn't match it's function.",
     replaceWith = ReplaceWith("LifecycleViewModel")
 )
-open class ViewModel(allowFreezing: Boolean = false) : LifecycleViewModel(allowFreezing)
+open class ViewModel : LifecycleViewModel()
 
 @Deprecated(
     message = "BaseViewModel was renamed as the name didn't match it's function.",
     replaceWith = ReplaceWith("BaseLifecycleViewModel")
 )
-open class BaseViewModel(allowFreezing: Boolean = false) : BaseLifecycleViewModel(allowFreezing)
+open class BaseViewModel : BaseLifecycleViewModel()
 
 /**
  * Simple ViewModel class
  */
-expect open class LifecycleViewModel internal constructor(allowFreezing: Boolean = false) {
+expect open class LifecycleViewModel internal constructor() {
     /**
      * [CoroutineScope] of the ViewModel
      */
@@ -53,7 +53,7 @@ expect open class LifecycleViewModel internal constructor(allowFreezing: Boolean
 /**
  * Default [LifecycleViewModel] implementation respecting the Lifecycle of the presenting view
  */
-open class BaseLifecycleViewModel(allowFreezing: Boolean = false) : LifecycleViewModel(allowFreezing) {
+open class BaseLifecycleViewModel : LifecycleViewModel() {
 
     private val resumedJobs = SupervisorJob()
 
@@ -88,4 +88,4 @@ open class BaseLifecycleViewModel(allowFreezing: Boolean = false) : LifecycleVie
  * Default [LifecycleViewModel] allowing navigation
  * @param navigator The [Navigator] handling navigation
  */
-open class NavigatingViewModel<A : NavigationAction<*>>(val navigator: Navigator<A>, allowFreezing: Boolean = false) : BaseViewModel(allowFreezing)
+open class NavigatingViewModel<A : NavigationAction<*>>(val navigator: Navigator<A>) : BaseLifecycleViewModel()
diff --git a/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt b/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
index 7e5425bec..9819c9e54 100644
--- a/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
+++ b/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
@@ -17,8 +17,6 @@
 
 package com.splendo.kaluga.architecture.observable
 
-import co.touchlab.stately.concurrency.AtomicReference
-import co.touchlab.stately.freeze
 import com.splendo.kaluga.architecture.observable.ObservableOptional.Nothing
 import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
 import com.splendo.kaluga.base.runBlocking
@@ -201,24 +199,24 @@ abstract class ObservableBaseTest : BaseTest() {
             assertEquals(initialExpected.value, property)
         }
 
-        val observedValue = AtomicReference<R?>(unusedValue)
-        val disposable = observable.observe { observedValue.set(it) }
+        var observedValue: R? = unusedValue
+        val disposable = observable.observe { observedValue = it }
 
-        var observedInitializedValue: AtomicReference<R>? = null
+        var observedInitializedValue: R? = null
         var disposableInitialized: Disposable? = null
         if (observable is Initialized<*, *>) {
-            observedInitializedValue = AtomicReference(unusedValue)
+            observedInitializedValue = unusedValue
             disposableInitialized = (observable as Initialized<R, T>).observeInitialized { observedInitializedValue.set(it) }
         }
 
         when (initialExpected) {
-            is Nothing<*> -> assertEquals(null, observedValue.get())
-            is Value<*> -> assertEquals(initialExpected.value, observedValue.get())
+            is Nothing<*> -> assertEquals(null, observedValue)
+            is Value<*> -> assertEquals(initialExpected.value, observedValue)
         }
 
         if (observedInitializedValue != null) {
             assertTrue(initialExpected is Value<*>)
-            assertEquals(initialExpected.value as R, observedInitializedValue.get())
+            assertEquals(initialExpected.value as R, observedInitializedValue)
         }
 
         semaphore.release()
@@ -227,7 +225,7 @@ abstract class ObservableBaseTest : BaseTest() {
 
             val lastUpdate = count == updates.size - 1
 
-            val observedBefore = observedValue.get()
+            val observedBefore = observedValue
 
             if (lastUpdate) {
                 disposable.dispose()
@@ -247,15 +245,15 @@ abstract class ObservableBaseTest : BaseTest() {
             }
 
             if (lastUpdate || expected !is Value<*>) // TODO <-- sus
-                assertEquals(observedBefore, observedValue.get())
+                assertEquals(observedBefore, observedValue)
             else
-                assertEquals(expected.value, observedValue.get())
+                assertEquals(expected.value, observedValue)
 
             if (!lastUpdate && observedInitializedValue != null) {
                 assertTrue(expected is Value<*>)
-                assertEquals(expected.value, observedInitializedValue.get())
+                assertEquals(expected.value, observedInitializedValue)
             } else if (observedInitializedValue != null) {
-                assertEquals(observedBefore, observedInitializedValue.get())
+                assertEquals(observedBefore, observedInitializedValue)
             }
 
             semaphore.release()
diff --git a/architecture/src/commonTest/kotlin/observable/ReadOnlyPropertyTest.kt b/architecture/src/commonTest/kotlin/observable/ReadOnlyPropertyTest.kt
index 5c7cc7d61..819542012 100644
--- a/architecture/src/commonTest/kotlin/observable/ReadOnlyPropertyTest.kt
+++ b/architecture/src/commonTest/kotlin/observable/ReadOnlyPropertyTest.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.architecture.observable
 
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.base.runBlocking
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlin.properties.ReadOnlyProperty
@@ -35,8 +34,8 @@ class ReadOnlyPropertyTest : ObservableBaseTest() {
 
         val observable = ro.toDefaultObservable("default")
 
-        val observed = AtomicReference("nothing yet")
-        observable.observeInitialized { observed.set(it) }
+        var observed = "nothing yet"
+        observable.observeInitialized { observed = it }
 
         testStringDefaultObservable(
             observable = observable,
@@ -44,7 +43,7 @@ class ReadOnlyPropertyTest : ObservableBaseTest() {
             shortDelayAfterUpdate = false,
             {
                 nullableString.value = "new"
-                assertEquals("default", observed.get(), "the property will only report the new value upon read")
+                assertEquals("default", observed, "the property will only report the new value upon read")
                 "new"
             }, // when we actually read the property to test this, the new value will propagate
             {
diff --git a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
index d575e276e..2161caa35 100644
--- a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
@@ -42,7 +42,4 @@ actual fun <R : T, T, OO : ObservableOptional<R>> observers(observation: Observa
     return observersForObservation[observation] as? List<(R) -> Unit> ?: emptyList()
 }
 
-// Use this to have a thread local reference on iOS that does not get frozen
-// TODO: this can be further improved by using a WeakRef
-@ThreadLocal
 private val observersForObservation = mutableMapOf<Observation<*, *, *>, MutableList<(Any?)->Unit>>()
diff --git a/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt
index ad4da39e4..e3ed57336 100644
--- a/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -21,14 +21,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
-import kotlin.native.concurrent.ensureNeverFrozen
 
-actual open class LifecycleViewModel internal actual constructor(val allowFreezing: Boolean) {
-
-    init {
-        if (!allowFreezing)
-            ensureNeverFrozen()
-    }
+actual open class LifecycleViewModel internal actual constructor() {
 
     private val lifecycleJob = SupervisorJob()
 
diff --git a/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt b/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
index c5ccead87..657fb55d9 100644
--- a/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
+++ b/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
@@ -33,9 +33,9 @@ import platform.UIKit.willMoveToParentViewController
  * This convenience class is the result of [BaseLifecycleViewModel.addLifecycleManager].
  * Invoke [unbind] to unbind the Lifecycle from its bound [UIViewController]
  */
-class LifecycleManager internal constructor(allowFreezing: Boolean, clearViewModel: () -> Unit) {
+class LifecycleManager internal constructor(clearViewModel: () -> Unit) {
 
-    internal val disposeBag: DisposeBag = DisposeBag(allowFreezing)
+    internal val disposeBag: DisposeBag = DisposeBag()
     private var onUnbind: (() -> Unit)? = clearViewModel
 
     /**
@@ -55,7 +55,7 @@ typealias onLifeCycleChanged = () -> List<Disposable>
 
 internal class ViewModelLifecycleManager<VM : BaseLifecycleViewModel>(private val viewModel: VM, private val onLifecycle: onLifeCycleChanged) : UIViewController(null, null) {
 
-    internal val lifecycleManager = LifecycleManager(viewModel.allowFreezing) {
+    internal val lifecycleManager = LifecycleManager {
         viewModel.clear()
         willMoveToParentViewController(null)
         view.removeFromSuperview()
@@ -66,7 +66,9 @@ internal class ViewModelLifecycleManager<VM : BaseLifecycleViewModel>(private va
         super.viewDidAppear(animated)
 
         viewModel.didResume()
-        onLifecycle().forEach { lifecycleManager.disposeBag.add(it) }
+        onLifecycle().forEach {
+            lifecycleManager.disposeBag.add(it)
+        }
     }
 
     override fun viewDidDisappear(animated: Boolean) {
diff --git a/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt b/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
index b6c4b6212..c23e2c733 100644
--- a/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
+++ b/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.architecture.observable
 
-import co.touchlab.stately.ensureNeverFrozen
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.test.base.assertFrozen
 import com.splendo.kaluga.test.base.assertNotFrozen
@@ -36,10 +35,6 @@ class ThreadingTest {
         assertNotFrozen(s)
         val value = Value()
 
-        // provide early failure for debugging test
-        value.ensureNeverFrozen()
-        s.ensureNeverFrozen()
-
         assertNotFrozen(value)
         assertNotFrozen(s)
         s.set(value)
diff --git a/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt
index b7434570d..67858ad66 100644
--- a/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -22,7 +22,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 
-actual open class LifecycleViewModel internal actual constructor(allowFreezing: Boolean) {
+actual open class LifecycleViewModel internal actual constructor() {
 
     private val lifecycleJob = SupervisorJob()
 
diff --git a/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt
index b7434570d..67858ad66 100644
--- a/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -22,7 +22,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 
-actual open class LifecycleViewModel internal actual constructor(allowFreezing: Boolean) {
+actual open class LifecycleViewModel internal actual constructor() {
 
     private val lifecycleJob = SupervisorJob()
 
diff --git a/base-permissions/src/commonMain/kotlin/Permission.kt b/base-permissions/src/commonMain/kotlin/Permission.kt
index f50c909f5..e5d009917 100644
--- a/base-permissions/src/commonMain/kotlin/Permission.kt
+++ b/base-permissions/src/commonMain/kotlin/Permission.kt
@@ -17,16 +17,16 @@
 
 package com.splendo.kaluga.permissions.base
 
-import co.touchlab.stately.collections.IsoMutableMap
 import com.splendo.kaluga.base.singleThreadDispatcher
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext
-import kotlin.native.concurrent.SharedImmutable
 import kotlin.reflect.KClass
 import kotlin.reflect.KClassifier
 
@@ -48,50 +48,88 @@ interface BasePermissionsBuilder<P : Permission>
  * Closure that takes permission and coroutine contexts and creates [PermissionStateRepo].
  * Each platform registers [PermissionStateRepoBuilder] in the register permission helper method.
  */
-private interface PermissionStateRepoBuilder<P : Permission> {
+interface PermissionStateRepoBuilder<P : Permission> {
     fun create(permission: P, coroutineContext: CoroutineContext): BasePermissionStateRepo<P>
 }
 
 expect class PermissionContext
 expect val defaultPermissionContext: PermissionContext
 
+class PermissionsBuilderError(message: String) : Error(message)
+
 /**
  * Builder for providing the proper [PermissionManager] for each [Permission]
  * @param context [PermissionContext] an additional parameter platform can pass to the [PermissionsBuilder]. [NSBundle] on iOS and [Contect] on Andoid.
  */
 open class PermissionsBuilder(val context: PermissionContext = defaultPermissionContext) {
 
-    private val builders = IsoMutableMap<KClassifier, BasePermissionsBuilder<*>>()
-    private val repoBuilders = IsoMutableMap<KClassifier, PermissionStateRepoBuilder<*>>()
+    private val buildersLock = Mutex()
+    private val builders = mutableMapOf<KClassifier, BasePermissionsBuilder<*>>()
+    private val repoBuildersLock = Mutex()
+    private val repoBuilders = mutableMapOf<KClassifier, PermissionStateRepoBuilder<*>>()
+
+    suspend inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> register(builder: B): B = register(P::class, builder)
+    suspend fun <P : Permission, B : BasePermissionsBuilder<P>> register(permission: KClass<P>, builder: B): B = buildersLock.withLock {
+        if (builders[permission] == null) {
+            builders[permission] = builder
+            builder
+        } else {
+            throw PermissionsBuilderError("Builder for $permission was already registered")
+        }
+    }
 
-    inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> register(builder: B): B = register(P::class, builder)
-    fun <P : Permission, B : BasePermissionsBuilder<P>> register(permission: KClass<P>, builder: B): B {
-        builders[permission] = builder
-        return builder
+    suspend inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(builder: B): BasePermissionsBuilder<P> = registerOrGet(P::class, builder)
+    suspend fun <P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(permission: KClass<P>, builder: B): BasePermissionsBuilder<P> = buildersLock.withLock {
+        builders.getOrPut(permission::class) { builder } as BasePermissionsBuilder<P>
+    }
+
+    suspend fun <P : Permission> unregister(permission: P) {
+        buildersLock.withLock {
+            builders.remove(permission::class)
+        }
     }
 
     operator fun <P : Permission> get(permission: P): BasePermissionsBuilder<P> =
-        builders[permission::class] as? BasePermissionsBuilder<P> ?: throw Error("The Builder for $permission was not registered")
-
-    inline fun <reified P : Permission> registerPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
-    fun <P : Permission> registerPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) {
-        repoBuilders[permission] = object : PermissionStateRepoBuilder<P> {
-            override fun create(
-                permission: P,
-                coroutineContext: CoroutineContext
-            ): BasePermissionStateRepo<P> {
-                return permissionStateRepoBuilder(permission, coroutineContext)
+        builders[permission::class] as? BasePermissionsBuilder<P> ?: throw PermissionsBuilderError("The Builder for $permission was not registered")
+
+    suspend inline fun <reified P : Permission> registerPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
+    suspend fun <P : Permission> registerPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) {
+        repoBuildersLock.withLock {
+            if (repoBuilders[permission] == null) {
+                createPermissionStateRepoBuilder(permissionStateRepoBuilder).also { repoBuilders[permission] = it }
+            } else {
+                throw PermissionsBuilderError("Builder for $permission PermissionStateRepo was already registered")
             }
         }
     }
 
+    suspend inline fun <reified P : Permission> registerOrGetPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerOrGetPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
+    suspend fun <P : Permission> registerOrGetPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = repoBuildersLock.withLock {
+        repoBuilders.getOrPut(permission) { createPermissionStateRepoBuilder(permissionStateRepoBuilder) } as PermissionStateRepoBuilder<P>
+    }
+
+
+    suspend fun <P : Permission> unregisterPermissionStateRepoBuilder(permission: P) {
+        repoBuildersLock.withLock {
+            repoBuilders.remove(permission::class)
+        }
+    }
+
     fun <P : Permission> createPermissionStateRepo(permission: P, coroutineContext: CoroutineContext): BasePermissionStateRepo<*> =
         (repoBuilders[permission::class] as? PermissionStateRepoBuilder<P>)?.let {
             it.create(permission, coroutineContext)
-        } ?: throw Error("Permission state repo factory was not registered for $permission")
+        } ?: throw PermissionsBuilderError("Permission state repo factory was not registered for $permission")
+
+    private inline fun <P : Permission> createPermissionStateRepoBuilder(crossinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>): PermissionStateRepoBuilder<P> = object : PermissionStateRepoBuilder<P> {
+        override fun create(
+            permission: P,
+            coroutineContext: CoroutineContext
+        ): BasePermissionStateRepo<P> {
+            return permissionStateRepoBuilder(permission, coroutineContext)
+        }
+    }
 }
 
-@SharedImmutable // NOTE: replace with a limited parallelism dispatcher view when available
 private val defaultPermissionDispatcher by lazy {
     singleThreadDispatcher("Permissions")
 }
@@ -106,10 +144,11 @@ class Permissions(
     private val coroutineContext: CoroutineContext = defaultPermissionDispatcher,
 ) {
 
-    private val permissionStateRepos: IsoMutableMap<Permission, BasePermissionStateRepo<*>> = IsoMutableMap()
+    private val permissionStateRepos = mutableMapOf<Permission, BasePermissionStateRepo<*>>()
 
-    private fun <P : Permission> permissionStateRepo(permission: P) =
-        (permissionStateRepos[permission] ?: builder.createPermissionStateRepo(permission, coroutineContext + CoroutineName(permission.name)).also { permissionStateRepos[permission] = it }) as BasePermissionStateRepo<P>
+    private fun <P : Permission> permissionStateRepo(permission: P): BasePermissionStateRepo<P> = permissionStateRepos.getOrPut(permission) {
+        builder.createPermissionStateRepo(permission, coroutineContext + CoroutineName(permission.name))
+    } as BasePermissionStateRepo<P>
 
     /**
      * Gets a [Flow] of [PermissionState] for a given [Permission]
diff --git a/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt b/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt
index 7d1649c7b..731ee75a8 100644
--- a/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt
+++ b/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt
@@ -26,6 +26,7 @@ import com.splendo.kaluga.permissions.base.IOSPermissionsHelper.AuthorizationSta
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.SendChannel
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.withLock
 import platform.Foundation.NSBundle
 
 /**
@@ -75,10 +76,9 @@ class IOSPermissionsHelper {
 
 fun AuthorizationStatusHandler.requestAuthorizationStatus(timerHelper: PermissionRefreshScheduler? = null, coroutineScope: CoroutineScope, request: suspend () -> AuthorizationStatus) {
     coroutineScope.launch {
-        timerHelper?.isWaiting?.value = true
-        val newStatus = request()
-        timerHelper?.isWaiting?.value = false
-        status(newStatus)
+        timerHelper?.waitingLock?.withLock {
+            request()
+        }?.let { status(it) }
     }
 }
 
diff --git a/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt b/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt
index 2326b2844..5fd2695a5 100644
--- a/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt
+++ b/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt
@@ -17,8 +17,6 @@
 
 package com.splendo.kaluga.permissions.base
 
-import co.touchlab.stately.concurrency.AtomicBoolean
-import co.touchlab.stately.concurrency.AtomicReference
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
@@ -60,10 +58,10 @@ class PermissionRefreshScheduler(
         }
     }
 
-    private val lastPermission: AtomicReference<IOSPermissionsHelper.AuthorizationStatus?> = AtomicReference(null)
-    val isWaiting = AtomicBoolean(false)
-    private val timerState: AtomicReference<TimerJobState> = AtomicReference(TimerJobState.TimerNotRunning)
-    private val timerLock = Mutex()
+    private var lastPermission: IOSPermissionsHelper.AuthorizationStatus? = null
+    val waitingLock = Mutex()
+    private var timerState: TimerJobState = TimerJobState.TimerNotRunning
+    private val lock = Mutex()
 
     /**
      * Starts monitoring for changes to the permission
@@ -76,18 +74,16 @@ class PermissionRefreshScheduler(
     }
 
     private suspend fun launchTimerJob(interval: Duration) {
-        timerLock.withLock {
-            val timerJobState = timerState.get()
+        lock.withLock {
+            val timerJobState = timerState
             if (timerJobState is TimerJobState.TimerNotRunning) {
-                this.timerState.set(
-                    timerJobState.startTimer(interval, this) {
+                this.timerState = timerJobState.startTimer(interval, this) {
                         val status = currentAuthorizationStatusProvider.provide()
-                        if (!isWaiting.value && lastPermission.get() != status) {
-                            updateLastPermission()
+                        if (!waitingLock.isLocked && lastPermission != status) {
+                            lastPermission = currentAuthorizationStatusProvider.provide()
                             onPermissionChangedFlow.status(status)
                         }
                     }
-                )
             }
         }
     }
@@ -97,17 +93,13 @@ class PermissionRefreshScheduler(
      */
     fun stopMonitoring() {
         launch {
-            timerLock.withLock {
-                val timerJobState = timerState.get()
+            lock.withLock {
+                val timerJobState = timerState
                 if (timerJobState is TimerJobState.TimerRunning) {
-                    this@PermissionRefreshScheduler.timerState.set(timerJobState.stopTimer())
+                    this@PermissionRefreshScheduler.timerState = timerJobState.stopTimer()
                 }
+                lastPermission = null
             }
         }
-        lastPermission.set(null)
-    }
-
-    private suspend fun updateLastPermission() {
-        lastPermission.set(currentAuthorizationStatusProvider.provide())
     }
 }
diff --git a/base-permissions/src/iosMain/kotlin/av/AVPermissionHelper.kt b/base-permissions/src/iosMain/kotlin/av/AVPermissionHelper.kt
index 2bda0137f..106f86e08 100644
--- a/base-permissions/src/iosMain/kotlin/av/AVPermissionHelper.kt
+++ b/base-permissions/src/iosMain/kotlin/av/AVPermissionHelper.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.permissions.base.av
 
-import co.touchlab.stately.freeze
 import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.AuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.CurrentAuthorizationStatusProvider
@@ -63,14 +62,12 @@ class AVPermissionHelper(
             val mediaType = type.avMediaType
             onPermissionChangedFlow.requestAuthorizationStatus(timerHelper, coroutineScope) {
                 val deferred = CompletableDeferred<Boolean>()
-                val callback = { allowed: Boolean ->
+                AVCaptureDevice.requestAccessForMediaType(
+                    mediaType
+                ) { allowed ->
                     deferred.complete(allowed)
                     Unit
-                }.freeze()
-                AVCaptureDevice.requestAccessForMediaType(
-                    mediaType,
-                    callback
-                )
+                }
                 if (deferred.await()) IOSPermissionsHelper.AuthorizationStatus.Authorized else IOSPermissionsHelper.AuthorizationStatus.Denied
             }
         } else {
diff --git a/base-permissions/src/iosTest/kotlin/PermissionRefreshSchedulerTest.kt b/base-permissions/src/iosTest/kotlin/PermissionRefreshSchedulerTest.kt
index f24128222..ecba50ade 100644
--- a/base-permissions/src/iosTest/kotlin/PermissionRefreshSchedulerTest.kt
+++ b/base-permissions/src/iosTest/kotlin/PermissionRefreshSchedulerTest.kt
@@ -17,8 +17,6 @@
 
 package com.splendo.kaluga.permissions.base
 
-import co.touchlab.stately.concurrency.AtomicReference
-import co.touchlab.stately.concurrency.value
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.test.base.BaseTest
 import kotlinx.coroutines.delay
@@ -32,11 +30,10 @@ class PermissionRefreshSchedulerTest : BaseTest() {
 
     @Test
     fun testStartMonitoring() = runBlocking {
-        val authorization: AtomicReference<IOSPermissionsHelper.AuthorizationStatus> =
-            AtomicReference(IOSPermissionsHelper.AuthorizationStatus.NotDetermined)
+        var authorization = IOSPermissionsHelper.AuthorizationStatus.NotDetermined
         val authorizationProvider = object : CurrentAuthorizationStatusProvider {
             override suspend fun provide(): IOSPermissionsHelper.AuthorizationStatus {
-                return authorization.value
+                return authorization
             }
         }
 
@@ -55,24 +52,24 @@ class PermissionRefreshSchedulerTest : BaseTest() {
         delay(50)
         assertNull(onPermissionChangedFlow.value)
 
-        authorization.set(IOSPermissionsHelper.AuthorizationStatus.Authorized)
+        authorization = IOSPermissionsHelper.AuthorizationStatus.Authorized
         delay(60)
         assertEquals(
             IOSPermissionsHelper.AuthorizationStatus.Authorized,
             onPermissionChangedFlow.value
         )
 
-        timerHelper.isWaiting.value = true
-        authorization.set(IOSPermissionsHelper.AuthorizationStatus.Denied)
+        timerHelper.waitingLock.lock()
+        authorization = IOSPermissionsHelper.AuthorizationStatus.Denied
         onPermissionChangedFlow.value = null
         delay(60)
         assertNull(onPermissionChangedFlow.value)
 
-        timerHelper.isWaiting.value = false
+        timerHelper.waitingLock.unlock()
         delay(50)
         assertEquals(IOSPermissionsHelper.AuthorizationStatus.Denied, onPermissionChangedFlow.value)
 
-        authorization.set(IOSPermissionsHelper.AuthorizationStatus.Authorized)
+        authorization = IOSPermissionsHelper.AuthorizationStatus.Authorized
         onPermissionChangedFlow.value = null
         timerHelper.stopMonitoring()
         delay(50)
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index f965cef72..491c72910 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -16,10 +16,6 @@ kotlin {
         getByName("commonMain") {
             dependencies {
                 implementation(project(":logging", ""))
-                expose(Dependencies.Stately.Common)
-                expose(Dependencies.Stately.Isolate)
-                expose(Dependencies.Stately.IsoCollections)
-                expose(Dependencies.Stately.Concurrency)
             }
         }
         getByName("jsMain") {
diff --git a/base/src/commonMain/kotlin/AtomicReferenceDelegate.kt b/base/src/commonMain/kotlin/AtomicReferenceDelegate.kt
deleted file mode 100644
index bb3e14964..000000000
--- a/base/src/commonMain/kotlin/AtomicReferenceDelegate.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.base
-
-import co.touchlab.stately.concurrency.AtomicReference
-import kotlin.reflect.KProperty
-
-/**
- * Multiplatform [AtomicReference] property wrapper.
- *
- * Example:
- * ```
- * val atomicJobRef: Job? by AtomicReferenceDelegate()
- * atomicJobRef = Job()
- * atomicJobRef = null
- * ```
- */
-class AtomicReferenceDelegate<T>(initialValue: T? = null) {
-    private val reference = AtomicReference(initialValue)
-    operator fun getValue(thisRef: Any?, property: KProperty<*>) = reference.get()
-    operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T?) = reference.set(value)
-}
diff --git a/base/src/commonMain/kotlin/flow/BaseFlowable.kt b/base/src/commonMain/kotlin/flow/BaseFlowable.kt
index f4b4d7564..058f9a482 100644
--- a/base/src/commonMain/kotlin/flow/BaseFlowable.kt
+++ b/base/src/commonMain/kotlin/flow/BaseFlowable.kt
@@ -18,7 +18,6 @@ Copyright 2019 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.flow
 
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.logging.warn
 import kotlinx.coroutines.channels.BroadcastChannel
 import kotlinx.coroutines.channels.ConflatedBroadcastChannel
@@ -35,9 +34,9 @@ import kotlinx.coroutines.flow.first
 @Deprecated("This Channel based implementation is deprecated in favor of SharedFlow or StateFlow")
 abstract class BaseFlowable<T>(private val channelFactory: () -> BroadcastChannel<T> = { ConflatedBroadcastChannel() }) : Flowable<T> {
 
-    private val channel: AtomicReference<BroadcastChannel<T>?> = AtomicReference(null)
+    private var channel: BroadcastChannel<T>? = null
     protected fun ensureChannel(): BroadcastChannel<T> {
-        return channel.get() ?: channelFactory().also { channel.set(it) }
+        return channel ?: channelFactory().also { channel = it }
     }
 
     override fun flow(flowConfig: FlowConfig): Flow<T> {
@@ -48,17 +47,17 @@ abstract class BaseFlowable<T>(private val channelFactory: () -> BroadcastChanne
     }
 
     override suspend fun set(value: T) {
-        channel.get()?.send(value) ?: warn("'$value' offered to Flowable but there is no channel active")
+        channel?.send(value) ?: warn("'$value' offered to Flowable but there is no channel active")
     }
 
     override fun cancelFlows() {
-        channel.get()?.let {
+        channel?.let {
             it.close()
-            channel.compareAndSet(it, null)
+            channel = null
         }
     }
 
     // Note: if the channel is buffered, this could be wrong.
     // Since Flowable is deprecated this will not be fixed
-    protected suspend fun currentValue(): T? = channel.get()?.asFlow()?.first()
+    protected suspend fun currentValue(): T? = channel?.asFlow()?.first()
 }
diff --git a/base/src/commonMain/kotlin/flow/ColdFlowable.kt b/base/src/commonMain/kotlin/flow/ColdFlowable.kt
index a5c86bec8..624e68dba 100644
--- a/base/src/commonMain/kotlin/flow/ColdFlowable.kt
+++ b/base/src/commonMain/kotlin/flow/ColdFlowable.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.base.flow
 
-import co.touchlab.stately.concurrency.AtomicInt
 import com.splendo.kaluga.flow.BaseFlowable
 import com.splendo.kaluga.flow.FlowConfig
 import kotlinx.coroutines.channels.BroadcastChannel
@@ -41,22 +40,22 @@ import kotlinx.coroutines.sync.withLock
 class ColdFlowable<T>(private val initialize: suspend () -> T, private val deinitialize: suspend (T) -> Unit, channelFactory: () -> BroadcastChannel<T> = { ConflatedBroadcastChannel() }) : BaseFlowable<T>(channelFactory) {
 
     private val counterMutex = Mutex()
-    private var flowingCounter = AtomicInt(0)
+    private var flowingCounter = 0
 
     override fun flow(flowConfig: FlowConfig): Flow<T> {
         return super.flow(flowConfig)
             .onStart {
                 counterMutex.withLock {
-                    val count = flowingCounter.incrementAndGet()
-                    if (count == 1) {
+                    flowingCounter++
+                    if (flowingCounter == 1) {
                         set(initialize())
                     }
                 }
             }
             .onCompletion {
                 counterMutex.withLock {
-                    val count = flowingCounter.decrementAndGet()
-                    if (count == 0) {
+                    flowingCounter--
+                    if (flowingCounter == 0) {
                         val finalValue = currentValue()
                         cancelFlows()
                         finalValue?.let {
diff --git a/base/src/commonMain/kotlin/state/KalugaState.kt b/base/src/commonMain/kotlin/state/KalugaState.kt
index 72f79a1e7..450514936 100644
--- a/base/src/commonMain/kotlin/state/KalugaState.kt
+++ b/base/src/commonMain/kotlin/state/KalugaState.kt
@@ -17,7 +17,6 @@ Copyright 2019 Splendo Consulting B.V. The Netherlands
 */
 package com.splendo.kaluga.state
 
-import co.touchlab.stately.concurrency.AtomicBoolean
 import com.splendo.kaluga.base.flow.SharedFlowCollectionEvent.FirstCollection
 import com.splendo.kaluga.base.flow.SharedFlowCollectionEvent.LaterCollections
 import com.splendo.kaluga.base.flow.SharedFlowCollectionEvent.NoMoreCollections
@@ -40,13 +39,13 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.sync.withPermit
 import kotlin.coroutines.CoroutineContext
-import kotlin.native.concurrent.SharedImmutable
 import kotlin.reflect.KClass
 
-@SharedImmutable
 private val remain: suspend() -> KalugaState = { error("This should never be called. It's only used to indicate the state should remain the same") }
 
 /**
@@ -152,10 +151,12 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
     @Deprecated(message = "StateRepo itself is now a Flow", replaceWith = ReplaceWith("StateRepo"))
     fun flow(): Flow<S> = mutableFlow.asSharedFlow()
 
-    private val initialized = AtomicBoolean(false)
+    private val initializedMutex = Mutex()
+    private var initialized = false
 
-    internal open suspend fun initialize(initialValue: S? = null): S =
-        if (initialized.compareAndSet(false, true))
+    internal open suspend fun initialize(initialValue: S? = null): S = initializedMutex.withLock {
+        if (!initialized) {
+            initialized = true
             (initialValue ?: initialValue()).also { value ->
                 mutableFlow.emit(value)
                 stateMutex.release() // release the initial permit held
@@ -164,8 +165,10 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
                 // State machines that need initialization should rely on having an initialization state rather than using this method.
                 value.initialState()
             }
-        else
+        } else {
             state()
+        }
+    }
 
     /**
      * Gets the initial value of the repo
@@ -348,17 +351,20 @@ abstract class BaseHotStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
 
     abstract val lazyMutableSharedFlow: Lazy<F>
 
-    // guards once only initialization across threads
-    private val initialized = AtomicBoolean(false)
+    private val lock = Mutex()
+    private var initialized = false
 
     override val mutableFlow: F
         get() {
             val isInitialized = lazyMutableSharedFlow.isInitialized()
             val flow = lazyMutableSharedFlow.value
-            if (!isInitialized && initialized.compareAndSet(expected = false, new = true))
-                launch(coroutineContext) {
+            launch(coroutineContext) {
+                if (lock.withLock {
+                        (!isInitialized && !initialized).also { if (it) initialized = true }
+                    }) {
                     initialize()
                 }
+            }
             return flow
         }
 }
@@ -377,8 +383,8 @@ abstract class BaseColdStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
     context: CoroutineContext = Dispatchers.Main.immediate
 ) : StateRepo<S, F>(context) {
 
-    // guards once only initialization across threads
-    private val initialized = AtomicBoolean(false)
+    private val lock = Mutex()
+    private var initialized = false
 
     abstract val lazyMutableFlow: Lazy<F>
 
@@ -386,8 +392,14 @@ abstract class BaseColdStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
         get() {
             val isInitialized = lazyMutableFlow.isInitialized()
             val flow = lazyMutableFlow.value
-            if (!isInitialized && initialized.compareAndSet(expected = false, new = true)) {
-                launch(coroutineContext) {
+            launch(coroutineContext) {
+                if (lock.withLock {
+                        (!isInitialized && !initialized).also {
+                            if (it) initialized = true
+                        }
+                    }
+                )
+                {
                     flow.onCollectionEvent { event ->
                         when (event) {
                             NoMoreCollections -> noMoreCollections().also { it.finalState() }
diff --git a/base/src/commonMain/kotlin/utils/TimeZone.kt b/base/src/commonMain/kotlin/utils/TimeZone.kt
index a92866afb..51b972cf5 100644
--- a/base/src/commonMain/kotlin/utils/TimeZone.kt
+++ b/base/src/commonMain/kotlin/utils/TimeZone.kt
@@ -19,7 +19,6 @@ package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate.Companion.now
 import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
-import kotlin.native.concurrent.ThreadLocal
 
 /**
  * Style for writing the name of a [TimeZone]
@@ -30,7 +29,6 @@ enum class TimeZoneNameStyle {
     Long
 }
 
-@ThreadLocal // one instance per thread is preferred over a non-lazy initialization, since timezones are heavy to instantiate
 val TimeZone.Companion.utc: TimeZone by lazy { TimeZone.get("UTC")!! }
 
 expect class TimeZone {
diff --git a/base/src/commonTest/kotlin/AtomicReferenceTest.kt b/base/src/commonTest/kotlin/AtomicReferenceTest.kt
index ea478ab65..30b4a9b22 100644
--- a/base/src/commonTest/kotlin/AtomicReferenceTest.kt
+++ b/base/src/commonTest/kotlin/AtomicReferenceTest.kt
@@ -15,7 +15,6 @@
 
  */
 
-import com.splendo.kaluga.base.AtomicReferenceDelegate
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
diff --git a/base/src/iosMain/kotlin/GCScheduler.kt b/base/src/iosMain/kotlin/GCScheduler.kt
index 53c89af29..9c00ee80f 100644
--- a/base/src/iosMain/kotlin/GCScheduler.kt
+++ b/base/src/iosMain/kotlin/GCScheduler.kt
@@ -17,18 +17,16 @@
 
 package com.splendo.kaluga.base
 
-import co.touchlab.stately.concurrency.AtomicBoolean
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
-import kotlin.native.concurrent.ThreadLocal
+import kotlinx.coroutines.sync.Mutex
 import kotlin.native.internal.GC
 
-@SharedImmutable
-private val isCollecting: AtomicBoolean = AtomicBoolean(false)
 
-@ThreadLocal
 object GCScheduler {
 
+    private val collectingMutex = Mutex()
+
     /**
      * Schedules the Garbage Collector only if no other garbage collection is active.
      * This is useful in case calling the Garbage collector could trigger another call to [GC.collect].
@@ -42,9 +40,9 @@ object GCScheduler {
      * This is useful in case calling the Garbage collector could trigger another call to [GC.collect].
      */
     fun collectIfNotCollecting() {
-        if (isCollecting.compareAndSet(expected = false, new = true)) {
+        if (collectingMutex.tryLock()) {
             GC.collect()
-            isCollecting.value = false
+            collectingMutex.unlock()
         }
     }
 }
diff --git a/beacons/src/commonMain/kotlin/Beacons.kt b/beacons/src/commonMain/kotlin/Beacons.kt
index 14fe7fbd6..cf72c9fd3 100644
--- a/beacons/src/commonMain/kotlin/Beacons.kt
+++ b/beacons/src/commonMain/kotlin/Beacons.kt
@@ -17,8 +17,6 @@
 
 package com.splendo.kaluga.bluetooth.beacons
 
-import co.touchlab.stately.collections.IsoMutableMap
-import com.splendo.kaluga.base.AtomicReferenceDelegate
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.bluetooth.BluetoothService
 import com.splendo.kaluga.bluetooth.device.Device
@@ -38,7 +36,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 private typealias BeaconJob = Pair<BeaconInfo, Job>
-private typealias BeaconsMap = IsoMutableMap<BeaconID, BeaconJob>
+private typealias BeaconsMap = MutableMap<BeaconID, BeaconJob>
 
 class Beacons(
     private val bluetooth: BluetoothService,
@@ -47,7 +45,7 @@ class Beacons(
 
     private companion object { const val TAG = "Beacons" }
 
-    private val cache = BeaconsMap()
+    private val cache = mutableMapOf<BeaconID, BeaconJob>()
     private val cacheJob = Job()
     private val coroutineScope = CoroutineScope(Dispatchers.Default + cacheJob)
     private var monitoringJob: Job? by AtomicReferenceDelegate()
diff --git a/bluetooth-permissions/src/commonMain/kotlin/Permission.kt b/bluetooth-permissions/src/commonMain/kotlin/Permission.kt
index f3ae4579c..6c65f6654 100644
--- a/bluetooth-permissions/src/commonMain/kotlin/Permission.kt
+++ b/bluetooth-permissions/src/commonMain/kotlin/Permission.kt
@@ -32,7 +32,7 @@ object BluetoothPermission : Permission() {
     override val name: String = "Bluetooth"
 }
 
-fun PermissionsBuilder.registerBluetoothPermission(
+suspend fun PermissionsBuilder.registerBluetoothPermission(
     bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -46,7 +46,7 @@ fun PermissionsBuilder.registerBluetoothPermission(
         )
     }
 
-fun PermissionsBuilder.registerBluetoothPermission(
+suspend fun PermissionsBuilder.registerBluetoothPermission(
     bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
     stateRepoBuilder: (BaseBluetoothPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<BluetoothPermission>
 ) = bluetoothPermissionManagerBuilderBuilder(context).also {
@@ -55,3 +55,27 @@ fun PermissionsBuilder.registerBluetoothPermission(
         stateRepoBuilder(it, coroutineContext)
     }
 }
+
+suspend fun PermissionsBuilder.registerBluetoothPermissionIfNotRegistered(
+    bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
+    monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
+    settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
+) =
+    registerBluetoothPermissionIfNotRegistered(bluetoothPermissionManagerBuilderBuilder) { baseBluetoothPermissionManagerBuilder, coroutineContext ->
+        BluetoothPermissionStateRepo(
+            baseBluetoothPermissionManagerBuilder,
+            monitoringInterval,
+            settings,
+            coroutineContext
+        )
+    }
+
+suspend fun PermissionsBuilder.registerBluetoothPermissionIfNotRegistered(
+    bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
+    stateRepoBuilder: (BaseBluetoothPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<BluetoothPermission>
+) = bluetoothPermissionManagerBuilderBuilder(context).also {
+    registerOrGet(it)
+    registerOrGetPermissionStateRepoBuilder<BluetoothPermission> { _, coroutineContext ->
+        stateRepoBuilder(it, coroutineContext)
+    }
+}
diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts
index 837d47951..66d0a479a 100644
--- a/bluetooth/build.gradle.kts
+++ b/bluetooth/build.gradle.kts
@@ -18,7 +18,6 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":bluetooth-permissions", ""))
-                implement(Dependencies.Stately.Concurrency)
             }
         }
         commonTest {
diff --git a/bluetooth/src/commonMain/kotlin/Bluetooth.kt b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
index 04b7bf0a7..7b415715c 100644
--- a/bluetooth/src/commonMain/kotlin/Bluetooth.kt
+++ b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.bluetooth
 
-import co.touchlab.stately.collections.sharedMutableListOf
 import com.splendo.kaluga.base.flow.filterOnlyImportant
 import com.splendo.kaluga.base.singleThreadDispatcher
 import com.splendo.kaluga.bluetooth.device.BaseAdvertisementData
@@ -50,9 +49,7 @@ import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.transformLatest
 import kotlin.coroutines.CoroutineContext
 import kotlin.jvm.JvmName
-import kotlin.native.concurrent.SharedImmutable
 
-@SharedImmutable // NOTE: replace with a limited parallelism dispatcher view when available
 private val defaultBluetoothDispatcher by lazy {
     singleThreadDispatcher("Bluetooth")
 }
@@ -240,7 +237,7 @@ fun Flow<Device?>.mtu() = state().map { state ->
 }.distinctUntilChanged()
 
 fun Flow<Device?>.distance(environmentalFactor: Double = 2.0, averageOver: Int = 5): Flow<Double> {
-    val lastNResults = sharedMutableListOf<Double>()
+    val lastNResults = mutableListOf<Double>()
     return this.info().map { deviceInfo ->
         while (lastNResults.size >= averageOver) {
             lastNResults.removeAt(0)
diff --git a/bluetooth/src/commonMain/kotlin/Characteristic.kt b/bluetooth/src/commonMain/kotlin/Characteristic.kt
index 61cded0c8..d431fc716 100644
--- a/bluetooth/src/commonMain/kotlin/Characteristic.kt
+++ b/bluetooth/src/commonMain/kotlin/Characteristic.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.bluetooth
 
-import co.touchlab.stately.concurrency.AtomicBoolean
 import com.splendo.kaluga.bluetooth.device.DeviceAction
 import com.splendo.kaluga.bluetooth.device.DeviceConnectionManager
 import com.splendo.kaluga.logging.Logger
@@ -38,10 +37,7 @@ open class Characteristic(
 ) {
 
     private val isBusy = MutableStateFlow(false)
-    private val _isNotifying = AtomicBoolean(false)
-    var isNotifying: Boolean
-        get() = _isNotifying.value
-        set(value) { _isNotifying.value = value }
+    var isNotifying: Boolean = false
 
     /**
      * Enables notification or indication for this [Characteristic].
diff --git a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
index ccbe21dd7..bcea97016 100644
--- a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -17,9 +17,6 @@
 
 package com.splendo.kaluga.bluetooth.device
 
-import co.touchlab.stately.collections.sharedMutableMapOf
-import co.touchlab.stately.concurrency.AtomicReference
-import co.touchlab.stately.concurrency.value
 import com.splendo.kaluga.bluetooth.Characteristic
 import com.splendo.kaluga.bluetooth.Descriptor
 import com.splendo.kaluga.bluetooth.Service
@@ -98,11 +95,8 @@ abstract class BaseDeviceConnectionManager(
     private val logTag = "Bluetooth Device ${deviceWrapper.identifier.stringValue}"
     private val logger = settings.logger
 
-    private val _currentAction = AtomicReference<DeviceAction?>(null)
-    protected var currentAction: DeviceAction?
-        get() = _currentAction.get()
-        set(value) { _currentAction.set(value) }
-    protected val notifyingCharacteristics = sharedMutableMapOf<String, Characteristic>()
+    protected var currentAction: DeviceAction? = null
+    protected val notifyingCharacteristics = mutableMapOf<String, Characteristic>()
 
     private val eventChannel = Channel<DeviceConnectionManager.Event>(UNLIMITED)
     override val events: Flow<DeviceConnectionManager.Event> = eventChannel.receiveAsFlow()
@@ -155,10 +149,10 @@ abstract class BaseDeviceConnectionManager(
     fun createService(wrapper: ServiceWrapper): Service = Service(wrapper, ::emitEvent, logTag, logger)
 
     override fun handleDisconnect(onDisconnect: (suspend () -> Unit)?) {
-        val currentAction = _currentAction
+        val currentAction = this.currentAction
         val notifyingCharacteristics = this.notifyingCharacteristics
         val clean = suspend {
-            currentAction.value = null
+            this.currentAction = null
             notifyingCharacteristics.clear()
             onDisconnect?.invoke()
             Unit
@@ -182,7 +176,7 @@ abstract class BaseDeviceConnectionManager(
 
     open fun handleCurrentActionCompleted(succeeded: Boolean) {
         val currentAction = this.currentAction
-        _currentAction.value = null
+        this.currentAction = null
         if (currentAction != null) {
             if (succeeded)
                 logger.info(logTag) { "Completed $currentAction successfully" }
diff --git a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
index 3ba6d4caa..3810d3db8 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.bluetooth.scanner
 
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.base.flow.filterOnlyImportant
 import com.splendo.kaluga.bluetooth.BluetoothMonitor
 import com.splendo.kaluga.bluetooth.UUID
@@ -118,15 +117,8 @@ abstract class BaseScanner constructor(
     protected open val permissionsFlow: Flow<List<PermissionState<*>>> get() = bluetoothPermissionRepo.filterOnlyImportant().map { listOf(it) }
     protected open val enabledFlow: Flow<List<Boolean>> get() = (bluetoothEnabledMonitor?.isEnabled ?: flowOf(false)).map { listOf(it) }
 
-    private val _monitoringPermissionsJob = AtomicReference<Job?>(null)
-    private var monitoringPermissionsJob: Job?
-        get() = _monitoringPermissionsJob.get()
-        set(value) { _monitoringPermissionsJob.set(value) }
-
-    private val _monitoringBluetoothEnabledJob = AtomicReference<Job?>(null)
-    private var monitoringBluetoothEnabledJob: Job?
-        get() = _monitoringBluetoothEnabledJob.get()
-        set(value) { _monitoringBluetoothEnabledJob.set(value) }
+    private var monitoringPermissionsJob: Job? = null
+    private var monitoringBluetoothEnabledJob: Job? = null
 
     override fun startMonitoringPermissions() {
         logger.debug(LOG_TAG) { "Start monitoring permissions" }
diff --git a/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
index 35e112e25..c057f30b8 100644
--- a/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
@@ -11,7 +11,7 @@ import kotlin.coroutines.CoroutineContext
 
 actual class BluetoothBuilder(
     private val bundle: NSBundle = NSBundle.mainBundle,
-    private val permissionsBuilder: (CoroutineContext) -> Permissions = { context ->
+    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
             PermissionsBuilder(bundle).apply {
                 registerBluetoothPermission()
diff --git a/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
index b1b05e58c..6b893a1b9 100644
--- a/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
@@ -17,8 +17,6 @@
 
 package com.splendo.kaluga.bluetooth
 
-import co.touchlab.stately.concurrency.AtomicReference
-import co.touchlab.stately.concurrency.value
 import com.splendo.kaluga.base.monitor.DefaultServiceMonitor
 import com.splendo.kaluga.base.monitor.ServiceMonitor
 import platform.CoreBluetooth.CBCentralManager
@@ -47,14 +45,14 @@ class DefaultBluetoothMonitor internal constructor(
         }
     }
 
-    private val centralManager = AtomicReference<CBCentralManager?>(null)
+    private var centralManager: CBCentralManager? = null
 
     private val centralManagerDelegate = CentralManagerDelegate(::updateState)
     override val isServiceEnabled: Boolean
         get() = initializeCentralManagerIfNotInitialized().state == CBManagerStatePoweredOn
 
-    private fun initializeCentralManagerIfNotInitialized(): CBCentralManager = centralManager.value ?: centralManagerBuilder().apply {
-        centralManager.set(this)
+    private fun initializeCentralManagerIfNotInitialized(): CBCentralManager = centralManager ?: centralManagerBuilder().apply {
+        centralManager = this
     }
 
     override fun monitoringDidStart() {
@@ -63,6 +61,6 @@ class DefaultBluetoothMonitor internal constructor(
     }
 
     override fun monitoringDidStop() {
-        centralManager.value?.delegate = null
+        centralManager?.delegate = null
     }
 }
diff --git a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
index e6c65f0b7..c2db6d850 100644
--- a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.bluetooth.device
 
-import co.touchlab.stately.collections.sharedMutableListOf
 import com.splendo.kaluga.base.toNSData
 import com.splendo.kaluga.base.typedList
 import com.splendo.kaluga.bluetooth.DefaultServiceWrapper
@@ -25,6 +24,8 @@ import com.splendo.kaluga.bluetooth.uuidString
 import com.splendo.kaluga.logging.debug
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import platform.CoreBluetooth.CBCentralManager
 import platform.CoreBluetooth.CBCharacteristic
 import platform.CoreBluetooth.CBCharacteristicWriteWithResponse
@@ -69,8 +70,9 @@ internal actual class DefaultDeviceConnectionManager(
         private const val TAG = "IOS Bluetooth DeviceConnectionManager"
     }
 
-    private val discoveringServices = sharedMutableListOf<CBUUID>()
-    private val discoveringCharacteristics = sharedMutableListOf<CBUUID>()
+    private val discoveringMutext = Mutex()
+    private val discoveringServices = mutableListOf<CBUUID>()
+    private val discoveringCharacteristics = mutableListOf<CBUUID>()
 
     @Suppress("CONFLICTING_OVERLOADS")
     private val peripheralDelegate = object : NSObject(), CBPeripheralDelegateProtocol {
@@ -136,9 +138,11 @@ internal actual class DefaultDeviceConnectionManager(
     }
 
     override suspend fun discoverServices() {
-        discoveringServices.clear()
-        discoveringCharacteristics.clear()
-        peripheral.discoverServices(null)
+        discoveringMutext.withLock {
+            discoveringServices.clear()
+            discoveringCharacteristics.clear()
+            peripheral.discoverServices(null)
+        }
     }
 
     override suspend fun disconnect() {
@@ -200,31 +204,43 @@ internal actual class DefaultDeviceConnectionManager(
         handleUpdatedDescriptor(descriptor.UUID, succeeded = error == null)
     }
 
-    private fun didDiscoverServices() {
-        discoveringServices.addAll(
-            peripheral.services?.typedList<CBService>()?.map {
-                peripheral.discoverCharacteristics(emptyList<CBUUID>(), it)
-                it.UUID
-            } ?: emptyList()
-        )
+    private suspend fun didDiscoverServices() {
+        launch {
+            discoveringMutext.withLock {
+                discoveringServices.addAll(
+                    peripheral.services?.typedList<CBService>()?.map {
+                        peripheral.discoverCharacteristics(emptyList<CBUUID>(), it)
+                        it.UUID
+                    } ?: emptyList()
+                )
+            }
 
-        checkScanComplete()
+            checkScanComplete()
+        }
     }
 
     private fun didDiscoverCharacteristic(forService: CBService) {
-        discoveringServices.remove(forService.UUID)
-        discoveringCharacteristics.addAll(
-            forService.characteristics?.typedList<CBCharacteristic>()?.map {
-                peripheral.discoverDescriptorsForCharacteristic(it)
-                it.UUID
-            } ?: emptyList()
-        )
-        checkScanComplete()
-    }
-
-    private fun didDiscoverDescriptors(forCharacteristic: CBCharacteristic) {
-        discoveringCharacteristics.remove(forCharacteristic.UUID)
-        checkScanComplete()
+        launch {
+            discoveringMutext.withLock {
+                discoveringServices.remove(forService.UUID)
+                discoveringCharacteristics.addAll(
+                    forService.characteristics?.typedList<CBCharacteristic>()?.map {
+                        peripheral.discoverDescriptorsForCharacteristic(it)
+                        it.UUID
+                    } ?: emptyList()
+                )
+            }
+            checkScanComplete()
+        }
+    }
+
+    private suspend fun didDiscoverDescriptors(forCharacteristic: CBCharacteristic) {
+        launch {
+            discoveringMutext.withLock {
+                discoveringCharacteristics.remove(forCharacteristic.UUID)
+            }
+            checkScanComplete()
+        }
     }
 
     private fun checkScanComplete() {
diff --git a/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt b/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt
index 7f44201f1..b1db0b2d3 100644
--- a/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt
@@ -17,8 +17,6 @@
 
 package com.splendo.kaluga.bluetooth.scanner
 
-import co.touchlab.stately.collections.sharedMutableListOf
-import co.touchlab.stately.collections.sharedMutableSetOf
 import com.splendo.kaluga.base.typedMap
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
@@ -29,6 +27,8 @@ import com.splendo.kaluga.bluetooth.device.DefaultCBPeripheralWrapper
 import com.splendo.kaluga.bluetooth.device.DefaultDeviceConnectionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import platform.CoreBluetooth.CBCentralManager
 import platform.CoreBluetooth.CBCentralManagerDelegateProtocol
 import platform.CoreBluetooth.CBCentralManagerOptionShowPowerAlertKey
@@ -91,23 +91,27 @@ actual class DefaultScanner internal constructor(
     private val scanQueue = dispatch_queue_create("ScannerScanning", null)
     private val pairedDevicesQueue = dispatch_queue_create("ScannerPairedDevices", null)
     override val isSupported: Boolean = true
-    private val centralManagers = sharedMutableListOf<CBCentralManager>()
-    private val discoveringDelegates = sharedMutableListOf<CBCentralManagerDelegateProtocol>()
-    private val activeDelegates = sharedMutableSetOf<CBCentralManagerDelegateProtocol>()
+    private val centralManagersLock = Mutex()
+    private val centralManagers = mutableListOf<CBCentralManager>()
+    private val discoveringDelegates = mutableListOf<CBCentralManagerDelegateProtocol>()
+    private val activeDelegates = mutableSetOf<CBCentralManagerDelegateProtocol>()
     override val bluetoothEnabledMonitor: BluetoothMonitor = BluetoothMonitor.Builder { CBCentralManager(null, enabledQueue, emptyMap<Any?, Any>()) }.create()
 
     private suspend fun scan(filter: UUID? = null) {
-        val centralManager = CBCentralManager(null, scanQueue)
-        centralManagers.add(centralManager)
-        val awaitPoweredOn = EmptyCompletableDeferred()
-        val delegate = PoweredOnCBCentralManagerDelegate(this, awaitPoweredOn)
-        discoveringDelegates.add(delegate)
-        centralManager.delegate = delegate
-        awaitPoweredOn.await()
-        centralManager.scanForPeripheralsWithServices(
-            filter?.let { listOf(filter) },
-            scanSettings.parse()
-        )
+        centralManagersLock.withLock {
+            val centralManager = CBCentralManager(null, scanQueue)
+            centralManagers.add(centralManager)
+
+            val awaitPoweredOn = EmptyCompletableDeferred()
+            val delegate = PoweredOnCBCentralManagerDelegate(this, awaitPoweredOn)
+            discoveringDelegates.add(delegate)
+            centralManager.delegate = delegate
+            awaitPoweredOn.await()
+            centralManager.scanForPeripheralsWithServices(
+                filter?.let { listOf(filter) },
+                scanSettings.parse()
+            )
+        }
     }
 
     override suspend fun didStartScanning(filter: Set<UUID>) {
@@ -119,13 +123,15 @@ actual class DefaultScanner internal constructor(
     }
 
     override suspend fun didStopScanning() {
-        centralManagers.forEach { centralManager ->
-            if (centralManager.state == CBCentralManagerStatePoweredOn) {
-                centralManager.stopScan()
+        centralManagersLock.withLock {
+            centralManagers.forEach { centralManager ->
+                if (centralManager.state == CBCentralManagerStatePoweredOn) {
+                    centralManager.stopScan()
+                }
             }
+            discoveringDelegates.clear()
+            centralManagers.clear()
         }
-        discoveringDelegates.clear()
-        centralManagers.clear()
     }
 
     override fun generateEnableSensorsActions(): List<EnableSensorAction> {
diff --git a/calendar-permissions/src/commonMain/kotlin/Permission.kt b/calendar-permissions/src/commonMain/kotlin/Permission.kt
index 8e4e38e75..533c053b4 100644
--- a/calendar-permissions/src/commonMain/kotlin/Permission.kt
+++ b/calendar-permissions/src/commonMain/kotlin/Permission.kt
@@ -33,7 +33,7 @@ data class CalendarPermission(val allowWrite: Boolean = false) : Permission() {
     override val name: String = "Calendar - ${if (allowWrite) "ReadWrite" else "ReadOnly"}"
 }
 
-fun PermissionsBuilder.registerCalendarPermission(
+suspend fun PermissionsBuilder.registerCalendarPermission(
     calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -42,7 +42,7 @@ fun PermissionsBuilder.registerCalendarPermission(
         CalendarPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-fun PermissionsBuilder.registerCalendarPermission(
+suspend fun PermissionsBuilder.registerCalendarPermission(
     calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
     calendarPermissionStateRepoBuilder: (CalendarPermission, BaseCalendarPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CalendarPermission>
 ) = calendarPermissionManagerBuilderBuilder(context).also {
@@ -51,3 +51,22 @@ fun PermissionsBuilder.registerCalendarPermission(
         calendarPermissionStateRepoBuilder(permission, it, coroutineContext)
     }
 }
+
+suspend fun PermissionsBuilder.registerCalendarPermissionIfNotRegistered(
+    calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
+    monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
+    settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
+) =
+    registerCalendarPermissionIfNotRegistered(calendarPermissionManagerBuilderBuilder) { permission, builder, coroutineContext ->
+        CalendarPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
+    }
+
+suspend fun PermissionsBuilder.registerCalendarPermissionIfNotRegistered(
+    calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
+    calendarPermissionStateRepoBuilder: (CalendarPermission, BaseCalendarPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CalendarPermission>
+) = calendarPermissionManagerBuilderBuilder(context).also {
+    registerOrGet(it)
+    registerOrGetPermissionStateRepoBuilder<CalendarPermission> { permission, coroutineContext ->
+        calendarPermissionStateRepoBuilder(permission, it, coroutineContext)
+    }
+}
diff --git a/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt b/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
index f3cd86fa4..5c109a805 100644
--- a/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
+++ b/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.permissions.calendar
 
-import co.touchlab.stately.freeze
 import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
@@ -62,14 +61,12 @@ actual class DefaultCalendarPermissionManager(
         if (IOSPermissionsHelper.missingDeclarationsInPList(bundle, NSCalendarsUsageDescription).isEmpty()) {
             permissionHandler.requestAuthorizationStatus(timerHelper, CoroutineScope(coroutineContext)) {
                 val deferred = CompletableDeferred<Boolean>()
-                val callback = { success: Boolean, error: NSError? ->
+                eventStore.requestAccessToEntityType(
+                    EKEntityType.EKEntityTypeEvent
+                ) { success, error ->
                     error?.let { deferred.completeExceptionally(Throwable(it.localizedDescription)) } ?: deferred.complete(success)
                     Unit
-                }.freeze()
-                eventStore.requestAccessToEntityType(
-                    EKEntityType.EKEntityTypeEvent,
-                    callback
-                )
+                }
 
                 try {
                     if (deferred.await())
diff --git a/camera-permissions/src/commonMain/kotlin/Permission.kt b/camera-permissions/src/commonMain/kotlin/Permission.kt
index af1fd2f1b..0e246df2e 100644
--- a/camera-permissions/src/commonMain/kotlin/Permission.kt
+++ b/camera-permissions/src/commonMain/kotlin/Permission.kt
@@ -32,7 +32,7 @@ object CameraPermission : Permission() {
     override val name: String = "Camera"
 }
 
-fun PermissionsBuilder.registerCameraPermission(
+suspend fun PermissionsBuilder.registerCameraPermission(
     cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -41,7 +41,7 @@ fun PermissionsBuilder.registerCameraPermission(
         CameraPermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
     }
 
-fun PermissionsBuilder.registerCameraPermission(
+suspend fun PermissionsBuilder.registerCameraPermission(
     cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
     cameraPermissionStateRepoBuilder: (BaseCameraPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CameraPermission>
 ) = cameraPermissionManagerBuilderBuilder(context).also {
@@ -50,3 +50,22 @@ fun PermissionsBuilder.registerCameraPermission(
         cameraPermissionStateRepoBuilder(it, coroutineContext)
     }
 }
+
+suspend fun PermissionsBuilder.registerCameraPermissionIfNotRegistered(
+    cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
+    monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
+    settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
+) =
+    registerCameraPermissionIfNotRegistered(cameraPermissionManagerBuilderBuilder) { builder, coroutineContext ->
+        CameraPermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
+    }
+
+suspend fun PermissionsBuilder.registerCameraPermissionIfNotRegistered(
+    cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
+    cameraPermissionStateRepoBuilder: (BaseCameraPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CameraPermission>
+) = cameraPermissionManagerBuilderBuilder(context).also {
+    registerOrGet(it)
+    registerOrGetPermissionStateRepoBuilder<CameraPermission> { _, coroutineContext ->
+        cameraPermissionStateRepoBuilder(it, coroutineContext)
+    }
+}
diff --git a/contacts-permissions/src/commonMain/kotlin/Permission.kt b/contacts-permissions/src/commonMain/kotlin/Permission.kt
index b1d0f8f17..a03679546 100644
--- a/contacts-permissions/src/commonMain/kotlin/Permission.kt
+++ b/contacts-permissions/src/commonMain/kotlin/Permission.kt
@@ -33,7 +33,7 @@ data class ContactsPermission(val allowWrite: Boolean = false) : Permission() {
     override val name: String = "Contacts - ${if (allowWrite) "ReadWrite" else "ReadOnly"}"
 }
 
-fun PermissionsBuilder.registerContactsPermission(
+suspend fun PermissionsBuilder.registerContactsPermission(
     contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -42,7 +42,7 @@ fun PermissionsBuilder.registerContactsPermission(
         ContactsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-fun PermissionsBuilder.registerContactsPermission(
+suspend fun PermissionsBuilder.registerContactsPermission(
     contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
     contactsPermissionStateRepoBuilder: (ContactsPermission, BaseContactsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<ContactsPermission>
 ) = contactsPermissionManagerBuilderBuilder(context).also {
@@ -51,3 +51,22 @@ fun PermissionsBuilder.registerContactsPermission(
         contactsPermissionStateRepoBuilder(permission, it, coroutineContext)
     }
 }
+
+suspend fun PermissionsBuilder.registerContactsPermissionIfNotRegistered(
+    contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
+    monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
+    settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
+) =
+    registerContactsPermissionIfNotRegistered(contactsPermissionManagerBuilderBuilder) { permission, builder, coroutineContext ->
+        ContactsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
+    }
+
+suspend fun PermissionsBuilder.registerContactsPermissionIfNotRegistered(
+    contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
+    contactsPermissionStateRepoBuilder: (ContactsPermission, BaseContactsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<ContactsPermission>
+) = contactsPermissionManagerBuilderBuilder(context).also {
+    registerOrGet(it)
+    registerOrGetPermissionStateRepoBuilder<ContactsPermission> { permission, coroutineContext ->
+        contactsPermissionStateRepoBuilder(permission, it, coroutineContext)
+    }
+}
diff --git a/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt b/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
index 90530a3b1..df9135897 100644
--- a/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
+++ b/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.permissions.contacts
 
-import co.touchlab.stately.freeze
 import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
@@ -62,14 +61,12 @@ actual class DefaultContactsPermissionManager(
         if (IOSPermissionsHelper.missingDeclarationsInPList(bundle, NSContactsUsageDescription).isEmpty()) {
             permissionHandler.requestAuthorizationStatus(timerHelper, CoroutineScope(coroutineContext)) {
                 val deferred = CompletableDeferred<Boolean>()
-                val callback = { success: Boolean, error: NSError? ->
+                contactStore.requestAccessForEntityType(
+                    CNEntityType.CNEntityTypeContacts
+                ) { success, error ->
                     error?.let { deferred.completeExceptionally(Throwable(it.localizedDescription)) } ?: deferred.complete(success)
                     Unit
-                }.freeze()
-                contactStore.requestAccessForEntityType(
-                    CNEntityType.CNEntityTypeContacts,
-                    callback
-                )
+                }
 
                 try {
                     if (deferred.await())
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index c240b716e..2f0b3cd35 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -18,8 +18,6 @@ Copyright 2020 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.datetimepicker
 
-import co.touchlab.stately.concurrency.Lock
-import co.touchlab.stately.concurrency.withLock
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
@@ -27,6 +25,8 @@ import com.splendo.kaluga.base.utils.Locale
 import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlin.coroutines.resume
 
 data class DateTimePicker(
@@ -108,7 +108,7 @@ abstract class BaseDateTimePickerPresenter(private val dateTimePicker: DateTimeP
         private var locale: Locale = defaultLocale
         private var selectedDate: KalugaDate = DefaultKalugaDate.epoch()
         private var type: DateTimePicker.Type = DateTimePicker.Type.TimeType
-        internal val lock = Lock()
+        internal val lock = Mutex()
 
         /**
          * Sets the [message] displayed in the DateTimePicker
@@ -221,7 +221,7 @@ expect class DateTimePickerPresenter : BaseDateTimePickerPresenter {
  * @param initialize The block to construct an Alert
  * @return The built alert interface object
  */
-fun BaseDateTimePickerPresenter.Builder.buildDatePicker(
+suspend fun BaseDateTimePickerPresenter.Builder.buildDatePicker(
     coroutineScope: CoroutineScope,
     earliestDate: KalugaDate? = null,
     latestDate: KalugaDate? = null,
@@ -240,7 +240,7 @@ fun BaseDateTimePickerPresenter.Builder.buildDatePicker(
  * @param initialize The block to construct an Alert
  * @return The built alert interface object
  */
-fun BaseDateTimePickerPresenter.Builder.buildTimePicker(coroutineScope: CoroutineScope, initialize: BaseDateTimePickerPresenter.Builder.() -> Unit): BaseDateTimePickerPresenter = lock.withLock {
+suspend fun BaseDateTimePickerPresenter.Builder.buildTimePicker(coroutineScope: CoroutineScope, initialize: BaseDateTimePickerPresenter.Builder.() -> Unit): BaseDateTimePickerPresenter = lock.withLock {
     reset()
     setType(DateTimePicker.Type.TimeType)
     initialize()
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt
index 7cfc52e20..791f0b0dc 100644
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt
+++ b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt
@@ -24,7 +24,6 @@ import com.splendo.kaluga.bluetooth.scanner.BaseScanner
 import kotlinx.coroutines.MainScope
 import permissions.KNPermissionsFramework
 
-@kotlin.native.concurrent.ThreadLocal
 object KNBluetoothFramework {
     val mainScope = MainScope()
     val bluetooth = BluetoothBuilder().create(
diff --git a/gradle.properties b/gradle.properties
index e9c1f92c2..c02400535 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,8 +13,6 @@ org.gradle.jvmargs=-Xmx3048M -Dkotlin.daemon.jvm.options\="-Xmx3048M"
 #MPP
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
-# TODO: Disable
-kotlin.native.binary.memoryModel=strict
 kotlin.mpp.enableCInteropCommonization=true
 
 ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ##
diff --git a/hud/src/commonMain/kotlin/HUD.kt b/hud/src/commonMain/kotlin/HUD.kt
index c8910659c..60c1e0bd0 100644
--- a/hud/src/commonMain/kotlin/HUD.kt
+++ b/hud/src/commonMain/kotlin/HUD.kt
@@ -18,13 +18,13 @@ Copyright 2019 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.hud
 
-import co.touchlab.stately.concurrency.Lock
-import co.touchlab.stately.concurrency.withLock
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 
 /**
  * Style of the Loading Indicator
@@ -46,7 +46,7 @@ abstract class BaseHUD(coroutineScope: CoroutineScope) : CoroutineScope by corou
      */
     abstract class Builder : LifecycleSubscribableMarker {
 
-        internal val lock = Lock()
+        internal val lock = Mutex()
 
         /** The style of the loading indicator */
         internal var style: HUDStyle = HUDStyle.SYSTEM
@@ -142,7 +142,7 @@ suspend fun <T> BaseHUD.presentDuring(animated: Boolean = true, block: suspend B
  * @param coroutineScope The [CoroutineScope] managing the HUD lifecycle.
  * @param initialize Method for initializing the [HUD.Builder]
  */
-fun BaseHUD.Builder.build(coroutineScope: CoroutineScope, initialize: BaseHUD.Builder.() -> Unit = { }): BaseHUD = lock.withLock {
+suspend fun BaseHUD.Builder.build(coroutineScope: CoroutineScope, initialize: BaseHUD.Builder.() -> Unit = { }): BaseHUD = lock.withLock {
     clear()
     initialize()
     return create(HudConfig(style, title), coroutineScope)
diff --git a/hud/src/iosTest/kotlin/IOSHUDTests.kt b/hud/src/iosTest/kotlin/IOSHUDTests.kt
index 7f6a275c0..dec6a3d00 100644
--- a/hud/src/iosTest/kotlin/IOSHUDTests.kt
+++ b/hud/src/iosTest/kotlin/IOSHUDTests.kt
@@ -22,7 +22,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.runBlocking
 import platform.UIKit.UIViewController
-import kotlin.native.concurrent.ensureNeverFrozen
 import kotlin.test.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertNull
@@ -42,10 +41,6 @@ class IOSHUDTests : HUDTests<IOSHUDTests.IOSHUDTestContext>() {
 
     class HUDViewController : UIViewController(null, null) {
 
-        init {
-            this.ensureNeverFrozen()
-        }
-
         var mockPresentingHUD: MockPresentingHUD? = null
 
         override fun presentedViewController(): UIViewController? {
@@ -69,10 +64,6 @@ class IOSHUDTests : HUDTests<IOSHUDTests.IOSHUDTestContext>() {
 
     class MockPresentingHUD(val hudViewController: UIViewController) : UIViewController(null, null) {
 
-        init {
-            this.ensureNeverFrozen()
-        }
-
         var parent: UIViewController? = null
 
         override fun presentingViewController(): UIViewController? {
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index 9548006d6..8b93445eb 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -51,7 +51,7 @@ object Dependencies {
 
     object KotlinX {
         object Coroutines {
-            private const val version = "1.6.3-native-mt"
+            private const val version = "1.6.4"
             private const val group = "org.jetbrains.kotlinx"
             val Android = Dependency(group, "kotlinx-coroutines-android", version)
             val Core = Dependency(group, "kotlinx-coroutines-core", version)
@@ -160,16 +160,6 @@ object Dependencies {
 
     val Napier = Dependency("io.github.aakira", "napier", "2.6.1")
 
-    object Stately {
-        private const val group = "co.touchlab"
-        private const val version = "1.2.3"
-        private const val isolateVersion = "1.2.3"
-        val Common = Dependency(group, "stately-common", version)
-        val Concurrency = Dependency(group, "stately-concurrency", version)
-        val Isolate = Dependency(group, "stately-isolate", isolateVersion)
-        val IsoCollections = Dependency(group, "stately-iso-collections", isolateVersion)
-    }
-
     val JUnit = Dependency("junit", "junit", "4.13.2")
 
     object Mockito {
diff --git a/location-permissions/src/commonMain/kotlin/Permission.kt b/location-permissions/src/commonMain/kotlin/Permission.kt
index e1d48c7c8..2865ff967 100644
--- a/location-permissions/src/commonMain/kotlin/Permission.kt
+++ b/location-permissions/src/commonMain/kotlin/Permission.kt
@@ -35,7 +35,7 @@ data class LocationPermission(val background: Boolean = false, val precise: Bool
     override val name: String = listOfNotNull(if (background) "Background" else null, "Location", "-", if (precise) "Precise" else "Coarse").joinToString(" ")
 }
 
-fun PermissionsBuilder.registerLocationPermission(
+suspend fun PermissionsBuilder.registerLocationPermission(
     locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -44,7 +44,7 @@ fun PermissionsBuilder.registerLocationPermission(
         LocationPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-fun PermissionsBuilder.registerLocationPermission(
+suspend fun PermissionsBuilder.registerLocationPermission(
     locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
     locationPermissionStateRepoBuilder: (LocationPermission, BaseLocationPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<LocationPermission>
 ) = locationPermissionManagerBuilderBuilder(context).also {
@@ -53,3 +53,22 @@ fun PermissionsBuilder.registerLocationPermission(
         locationPermissionStateRepoBuilder(permission, it, coroutineContext)
     }
 }
+
+suspend fun PermissionsBuilder.registerLocationPermissionIfNotRegistered(
+    locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
+    monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
+    settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
+) =
+    registerLocationPermissionIfNotRegistered(locationPermissionManagerBuilderBuilder) { permission, builder, coroutineContext ->
+        LocationPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
+    }
+
+suspend fun PermissionsBuilder.registerLocationPermissionIfNotRegistered(
+    locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
+    locationPermissionStateRepoBuilder: (LocationPermission, BaseLocationPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<LocationPermission>
+) = locationPermissionManagerBuilderBuilder(context).also {
+    registerOrGet(it)
+    registerOrGetPermissionStateRepoBuilder<LocationPermission> { permission, coroutineContext ->
+        locationPermissionStateRepoBuilder(permission, it, coroutineContext)
+    }
+}
diff --git a/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt b/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt
index 506efe09b..84f5e23ed 100644
--- a/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt
+++ b/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt
@@ -17,8 +17,6 @@
 
 package com.splendo.kaluga.permissions.location
 
-import co.touchlab.stately.concurrency.AtomicReference
-import co.touchlab.stately.concurrency.value
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import platform.CoreLocation.CLLocationManager
@@ -29,10 +27,10 @@ import platform.CoreLocation.CLLocationManager
  */
 class MainCLLocationManagerAccessor(private val onInit: CLLocationManager.() -> Unit) {
 
-    private val locationManager = AtomicReference<CLLocationManager?>(null)
+    private var locationManager: CLLocationManager? = null
 
-    private fun createLocationManagerIfNotCreated(): CLLocationManager = locationManager.value ?: CLLocationManager().apply {
-        locationManager.set(this)
+    private fun createLocationManagerIfNotCreated(): CLLocationManager = locationManager ?: CLLocationManager().apply {
+        locationManager = this
         onInit()
     }
 
diff --git a/location/src/androidLibMain/kotlin/location/LocationManager.kt b/location/src/androidLibMain/kotlin/location/LocationManager.kt
index 0245b8c3f..e10a08597 100644
--- a/location/src/androidLibMain/kotlin/location/LocationManager.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationManager.kt
@@ -20,7 +20,6 @@ package com.splendo.kaluga.location
 import android.content.Context
 import android.content.Intent
 import android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.base.ApplicationHolder
 import com.splendo.kaluga.base.monitor.EnableServiceActivity
 import com.splendo.kaluga.permissions.base.PermissionContext
@@ -31,6 +30,8 @@ import com.splendo.kaluga.permissions.location.registerLocationPermission
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlin.coroutines.CoroutineContext
 
 actual class DefaultLocationManager(
@@ -56,18 +57,19 @@ actual class DefaultLocationManager(
     }
 
     override val locationMonitor: LocationMonitor = LocationMonitor.Builder(context, locationManager).create()
-    private val monitoringLocationJob: AtomicReference<Job?> = AtomicReference(null)
+    private val monitoringMutex = Mutex()
+    private var monitoringLocationJob: Job? = null
 
     override suspend fun requestEnableLocation() {
         EnableServiceActivity.showEnableServiceActivity(context, hashCode().toString(), Intent(ACTION_LOCATION_SOURCE_SETTINGS)).await()
     }
 
     override suspend fun startMonitoringLocation() {
-        if (monitoringLocationJob.get() != null) return // optimization to skip making a job
+        monitoringMutex.withLock {
+            if (monitoringLocationJob != null) return // optimization to skip making a job
 
-        val job = Job(this.coroutineContext[Job])
-
-        if (monitoringLocationJob.compareAndSet(null, job)) {
+            val job = Job(this.coroutineContext[Job])
+            monitoringLocationJob = job
             locationProvider.startMonitoringLocation(locationPermission)
             launch(job) {
                 locationProvider.location(locationPermission).collect {
@@ -78,8 +80,9 @@ actual class DefaultLocationManager(
     }
 
     override suspend fun stopMonitoringLocation() {
-        monitoringLocationJob.get()?.let {
-            if (monitoringLocationJob.compareAndSet(it, null)) {
+        monitoringMutex.withLock {
+            monitoringLocationJob?.let {
+                monitoringLocationJob = it
                 locationProvider.stopMonitoringLocation(locationPermission)
                 it.cancel()
             }
diff --git a/location/src/commonMain/kotlin/location/LocationManager.kt b/location/src/commonMain/kotlin/location/LocationManager.kt
index 8d46c6d30..460f72b3e 100644
--- a/location/src/commonMain/kotlin/location/LocationManager.kt
+++ b/location/src/commonMain/kotlin/location/LocationManager.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.location
 
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.base.flow.filterOnlyImportant
 import com.splendo.kaluga.logging.Logger
 import com.splendo.kaluga.logging.RestrictedLogLevel
@@ -100,14 +99,8 @@ abstract class BaseLocationManager(
 
     abstract val locationMonitor: LocationMonitor
 
-    private val _monitoringPermissionsJob: AtomicReference<Job?> = AtomicReference(null)
-    private var monitoringPermissionsJob: Job?
-        get() = _monitoringPermissionsJob.get()
-        set(value) { _monitoringPermissionsJob.set(value) }
-    private val _monitoringLocationEnabledJob: AtomicReference<Job?> = AtomicReference(null)
-    private var monitoringLocationEnabledJob: Job?
-        get() = _monitoringLocationEnabledJob.get()
-        set(value) { _monitoringLocationEnabledJob.set(value) }
+    private var monitoringPermissionsJob: Job? = null
+    private var monitoringLocationEnabledJob: Job? = null
 
     override fun startMonitoringPermissions() {
         logger.debug(LOG_TAG) { "Start monitoring permission" }
diff --git a/location/src/commonMain/kotlin/location/LocationStateRepo.kt b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
index b88b5f46e..bbdf047d9 100644
--- a/location/src/commonMain/kotlin/location/LocationStateRepo.kt
+++ b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
@@ -32,11 +32,9 @@ import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
-import kotlin.native.concurrent.SharedImmutable
 
 typealias LocationStateFlowRepo = StateRepo<LocationState, MutableStateFlow<LocationState>>
 
-@SharedImmutable // NOTE: replace with a limited parallelism dispatcher view when available
 private val defaultLocationDispatcher by lazy {
     singleThreadDispatcher("Location")
 }
diff --git a/location/src/iosMain/kotlin/location/LocationManager.kt b/location/src/iosMain/kotlin/location/LocationManager.kt
index cf632c054..079454385 100644
--- a/location/src/iosMain/kotlin/location/LocationManager.kt
+++ b/location/src/iosMain/kotlin/location/LocationManager.kt
@@ -17,14 +17,12 @@
 
 package com.splendo.kaluga.location
 
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.location.LocationPermission
 import com.splendo.kaluga.permissions.location.MainCLLocationManagerAccessor
 import com.splendo.kaluga.permissions.location.registerLocationPermission
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import platform.CoreLocation.CLLocation
@@ -87,11 +85,6 @@ actual class DefaultLocationManager(
         locationUpdateDelegate = Delegate(sharedLocations)
     }
 
-    private var _isMonitoringLocationJob = AtomicReference<Job?>(null)
-    var isMonitoringLocationJob: Job?
-        get() = _isMonitoringLocationJob.get()
-        set(value) { _isMonitoringLocationJob.set(value) }
-
     override suspend fun requestEnableLocation() {
         // No access to UIApplication.openSettingsURLString
         // We have to fallback to alert then?
@@ -106,9 +99,6 @@ actual class DefaultLocationManager(
     }
 
     override suspend fun stopMonitoringLocation() {
-        isMonitoringLocationJob?.cancel()
-        isMonitoringLocationJob = null
-
         launch {
             locationManager.updateLocationManager {
                 stopUpdatingLocation()
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
index b06cc6050..81b3548ed 100644
--- a/logging/build.gradle.kts
+++ b/logging/build.gradle.kts
@@ -13,13 +13,10 @@ kotlin {
         commonMain {
             dependencies {
                 implement(Dependencies.Napier)
-                implement(Dependencies.Stately.Concurrency)
             }
         }
         commonTest {
             dependencies {
-                implement(Dependencies.Stately.Isolate)
-                implement(Dependencies.Stately.IsoCollections)
                 api(project(":test-utils-base", ""))
             }
         }
diff --git a/logging/src/commonMain/kotlin/NapierLogger.kt b/logging/src/commonMain/kotlin/NapierLogger.kt
index 9590c9432..21914d717 100644
--- a/logging/src/commonMain/kotlin/NapierLogger.kt
+++ b/logging/src/commonMain/kotlin/NapierLogger.kt
@@ -16,12 +16,10 @@
  */
 package com.splendo.kaluga.logging
 
-import kotlin.native.concurrent.SharedImmutable
 import com.splendo.kaluga.logging.LogLevel as KalugaLogLevel
 import io.github.aakira.napier.Antilog as NapierLog
 import io.github.aakira.napier.LogLevel as NapierLogLevel
 
-@SharedImmutable
 val logLevel = arrayOf(
     NapierLogLevel.VERBOSE,
     NapierLogLevel.DEBUG,
diff --git a/logging/src/commonTest/kotlin/LoggerMock.kt b/logging/src/commonTest/kotlin/LoggerMock.kt
index 1cae1a5ec..016c59b97 100644
--- a/logging/src/commonTest/kotlin/LoggerMock.kt
+++ b/logging/src/commonTest/kotlin/LoggerMock.kt
@@ -18,26 +18,39 @@ Copyright 2019 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.logging
 
-import co.touchlab.stately.collections.IsoMutableList
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 
-class LoggerMock : Logger {
+class LoggerMock(private val coroutineScope: CoroutineScope) : Logger {
 
-    val throwableList = IsoMutableList<Throwable?>()
-    val messageList = IsoMutableList<String?>()
-    val tagList = IsoMutableList<String?>()
-    val levelList = IsoMutableList<LogLevel?>()
+    private val mutex = Mutex()
+    val throwableList = mutableListOf<Throwable?>()
+    val messageList = mutableListOf<String?>()
+    val tagList = mutableListOf<String?>()
+    val levelList = mutableListOf<LogLevel?>()
 
     fun clear() {
-        levelList.clear()
-        messageList.clear()
-        tagList.clear()
-        throwableList.clear()
+        coroutineScope.launch {
+            mutex.withLock {
+                levelList.clear()
+                messageList.clear()
+                tagList.clear()
+                throwableList.clear()
+            }
+        }
     }
 
     override fun log(level: LogLevel, tag: String?, throwable: Throwable?, message: (() -> String)?) {
-        levelList.add(level)
-        tagList.add(tag)
-        throwableList.add(throwable)
-        messageList.add(message?.invoke())
+
+        coroutineScope.launch {
+            mutex.withLock {
+                levelList.add(level)
+                tagList.add(tag)
+                throwableList.add(throwable)
+                messageList.add(message?.invoke())
+            }
+        }
     }
 }
diff --git a/logging/src/iosMain/kotlin/log.kt b/logging/src/iosMain/kotlin/log.kt
index d7707a47c..e5f2d5a32 100644
--- a/logging/src/iosMain/kotlin/log.kt
+++ b/logging/src/iosMain/kotlin/log.kt
@@ -17,15 +17,8 @@
 
 package com.splendo.kaluga.logging
 
-import co.touchlab.stately.concurrency.value
 import io.github.aakira.napier.DebugAntilog
-import kotlin.native.concurrent.SharedImmutable
 
-@SharedImmutable
 actual val defaultLogger: Logger = NapierLogger(DebugAntilog())
 
-@SharedImmutable
-private val _logger = co.touchlab.stately.concurrency.AtomicReference(defaultLogger)
-actual var logger
-    get() = _logger.value
-    set(value) { _logger.value = value }
+actual var logger = defaultLogger
diff --git a/microphone-permissions/src/commonMain/kotlin/Permission.kt b/microphone-permissions/src/commonMain/kotlin/Permission.kt
index a681fd067..9c0418e99 100644
--- a/microphone-permissions/src/commonMain/kotlin/Permission.kt
+++ b/microphone-permissions/src/commonMain/kotlin/Permission.kt
@@ -32,7 +32,7 @@ object MicrophonePermission : Permission() {
     override val name: String = "Microphone"
 }
 
-fun PermissionsBuilder.registerMicrophonePermission(
+suspend fun PermissionsBuilder.registerMicrophonePermission(
     microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -41,7 +41,7 @@ fun PermissionsBuilder.registerMicrophonePermission(
         MicrophonePermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
     }
 
-fun PermissionsBuilder.registerMicrophonePermission(
+suspend fun PermissionsBuilder.registerMicrophonePermission(
     microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
     microphonePermissionStateRepoBuilder: (BaseMicrophonePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<MicrophonePermission>
 ) = microphonePermissionManagerBuilderBuilder(context).also {
@@ -50,3 +50,22 @@ fun PermissionsBuilder.registerMicrophonePermission(
         microphonePermissionStateRepoBuilder(it, coroutineContext)
     }
 }
+
+suspend fun PermissionsBuilder.registerMicrophonePermissionIfNotRegistered(
+    microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
+    monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
+    settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
+) =
+    registerMicrophonePermissionIfNotRegistered(microphonePermissionManagerBuilderBuilder) { builder, coroutineContext ->
+        MicrophonePermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
+    }
+
+suspend fun PermissionsBuilder.registerMicrophonePermissionIfNotRegistered(
+    microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
+    microphonePermissionStateRepoBuilder: (BaseMicrophonePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<MicrophonePermission>
+) = microphonePermissionManagerBuilderBuilder(context).also {
+    registerOrGet(it)
+    registerOrGetPermissionStateRepoBuilder<MicrophonePermission> { _, coroutineContext ->
+        microphonePermissionStateRepoBuilder(it, coroutineContext)
+    }
+}
diff --git a/notifications-permissions/src/commonMain/kotlin/Permission.kt b/notifications-permissions/src/commonMain/kotlin/Permission.kt
index 1858b7e23..f37efc3a1 100644
--- a/notifications-permissions/src/commonMain/kotlin/Permission.kt
+++ b/notifications-permissions/src/commonMain/kotlin/Permission.kt
@@ -33,7 +33,7 @@ data class NotificationsPermission(val options: NotificationOptions? = null) : P
     override val name: String = "Notifications - ${options?.toString().orEmpty().ifEmpty { "Without Options" }}"
 }
 
-fun PermissionsBuilder.registerNotificationsPermission(
+suspend fun PermissionsBuilder.registerNotificationsPermission(
     notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -42,7 +42,7 @@ fun PermissionsBuilder.registerNotificationsPermission(
         NotificationsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-fun PermissionsBuilder.registerNotificationsPermission(
+suspend fun PermissionsBuilder.registerNotificationsPermission(
     notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
     notificationsPermissionStateRepoBuilder: (NotificationsPermission, BaseNotificationsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<NotificationsPermission>
 ) = notificationsPermissionManagerBuilderBuilder(context).also {
@@ -51,3 +51,23 @@ fun PermissionsBuilder.registerNotificationsPermission(
         notificationsPermissionStateRepoBuilder(permission, it, coroutineContext)
     }
 }
+
+suspend fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
+    notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
+    monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
+    settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
+) =
+    registerNotificationsPermissionIfNotRegistered(notificationsPermissionManagerBuilderBuilder) { permission, builder, coroutineContext ->
+        NotificationsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
+    }
+
+suspend fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
+    notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
+    notificationsPermissionStateRepoBuilder: (NotificationsPermission, BaseNotificationsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<NotificationsPermission>
+) = notificationsPermissionManagerBuilderBuilder(context).also {
+    registerOrGet(it)
+    registerOrGetPermissionStateRepoBuilder<NotificationsPermission> { permission, coroutineContext ->
+        notificationsPermissionStateRepoBuilder(permission, it, coroutineContext)
+    }
+}
+
diff --git a/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt b/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
index ddeb77866..50d68197a 100644
--- a/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
+++ b/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.permissions.notifications
 
-import co.touchlab.stately.freeze
 import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
@@ -54,13 +53,10 @@ actual class DefaultNotificationsPermissionManager(
             val authorizationStatus = CompletableDeferred<IOSPermissionsHelper.AuthorizationStatus>()
             val notificationCenter = notificationCenter
             coroutineScope.launch {
-                val deferred = CompletableDeferred<UNNotificationSettings?>()
-                val callback = { setting: UNNotificationSettings? ->
-                    deferred.complete(setting)
+                notificationCenter.getNotificationSettingsWithCompletionHandler { setting ->
+                    authorizationStatus.complete(setting?.authorizationStatus?.toAuthorizationStatus() ?: IOSPermissionsHelper.AuthorizationStatus.NotDetermined)
                     Unit
-                }.freeze()
-                notificationCenter.getNotificationSettingsWithCompletionHandler(callback)
-                authorizationStatus.complete(deferred.await()?.authorizationStatus?.toAuthorizationStatus() ?: IOSPermissionsHelper.AuthorizationStatus.NotDetermined)
+                }
             }
             return authorizationStatus.await()
         }
diff --git a/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt b/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
index 870d34a54..570459d32 100644
--- a/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
@@ -44,7 +44,6 @@ import platform.objc.sel_registerName
 
 class UIControlClosure(private val action: () -> Unit) : NSObject() {
 
-    @ThreadLocal
     object Registry {
         val registeredUIControl = NSMapTable(NSPointerFunctionsWeakMemory, NSPointerFunctionsStrongMemory, 0)
     }
diff --git a/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt b/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt
index 2cf519099..7b59273a2 100644
--- a/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt
+++ b/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt
@@ -53,7 +53,6 @@ import kotlin.math.min
 
 class UILinkTapGesture(private val label: UILabel, private val urlRanges: List<Pair<CValue<NSRange>, NSURL>>) : NSObject() {
 
-    @ThreadLocal
     object Registry {
         val registeredGestures = NSMapTable(NSPointerFunctionsWeakMemory, NSPointerFunctionsStrongMemory, 0)
     }
diff --git a/resources/src/iosMain/kotlin/uikit/UILinkTextViewDelegate.kt b/resources/src/iosMain/kotlin/uikit/UILinkTextViewDelegate.kt
index b28eed0b7..9050eebf5 100644
--- a/resources/src/iosMain/kotlin/uikit/UILinkTextViewDelegate.kt
+++ b/resources/src/iosMain/kotlin/uikit/UILinkTextViewDelegate.kt
@@ -32,7 +32,6 @@ import platform.darwin.NSObject
 
 class UILinkTextViewDelegate : NSObject(), UITextViewDelegateProtocol {
 
-    @ThreadLocal
     object Registry {
         val registeredDelegates = NSMapTable(NSPointerFunctionsWeakMemory, NSPointerFunctionsStrongMemory, 0)
     }
diff --git a/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt b/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt
index 6d02cf349..84241bbe5 100644
--- a/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt
@@ -22,7 +22,6 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.convert
 import com.splendo.kaluga.scientific.invoke
 import kotlinx.serialization.Serializable
-import kotlin.native.concurrent.ThreadLocal
 
 val MetricAccelerationUnits: Set<MetricAcceleration> get() = MetricSpeedUnits.flatMap { speed ->
     TimeUnits.map { speed per it }
@@ -70,7 +69,5 @@ data class ImperialAcceleration(
 infix fun MetricSpeed.per(time: Time) = MetricAcceleration(this, time)
 infix fun ImperialSpeed.per(time: Time) = ImperialAcceleration(this, time)
 
-@ThreadLocal
 val MetricStandardGravityAcceleration = 9.80665(Meter per Second per Second)
-@ThreadLocal
 val ImperialStandardGravityAcceleration = MetricStandardGravityAcceleration.convert(Foot per Second per Second)
diff --git a/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt b/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
index 6eced7448..6ea353920 100644
--- a/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
@@ -21,7 +21,6 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
-import kotlin.native.concurrent.ThreadLocal
 
 val AmountOfSubstanceUnits: Set<AmountOfSubstance> get() = setOf(
     Mole,
@@ -70,5 +69,4 @@ object Megamole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.Metr
 @Serializable
 object Gigamole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Giga(Mole)
 
-@ThreadLocal
 val AvogadroConstant = 6.02214076e23.toDecimal()
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
index 3c25ca9db..2cb10d255 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
@@ -21,7 +21,6 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.invoke
 import kotlinx.serialization.Serializable
-import kotlin.native.concurrent.ThreadLocal
 
 val ElectricChargeUnits: Set<ElectricCharge> get() = setOf(
     Coulomb,
@@ -75,5 +74,4 @@ object Megacoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.Metr
 @Serializable
 object Gigacoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Giga(Coulomb)
 
-@ThreadLocal
 val elementaryCharge = 1.602176634e-19(Coulomb)
diff --git a/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt b/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
index 0856da0fd..18242c689 100644
--- a/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
@@ -22,7 +22,6 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.convert
 import com.splendo.kaluga.scientific.invoke
 import kotlinx.serialization.Serializable
-import kotlin.native.concurrent.ThreadLocal
 
 val MetricSpeedUnits: Set<MetricSpeed> get() = MetricLengthUnits.flatMap { length ->
     TimeUnits.map { MetricSpeed(length, it) }
@@ -57,7 +56,5 @@ data class ImperialSpeed(override val distance: ImperialLength, override val per
 infix fun MetricLength.per(time: Time) = MetricSpeed(this, time)
 infix fun ImperialLength.per(time: Time) = ImperialSpeed(this, time)
 
-@ThreadLocal
 val MetricSpeedOfLight = 299792458(Meter per Second)
-@ThreadLocal
 val ImperialSpeedOfLight = MetricSpeedOfLight.convert(Foot per Second)
diff --git a/storage-permissions/src/commonMain/kotlin/Permission.kt b/storage-permissions/src/commonMain/kotlin/Permission.kt
index 316f417e5..7a127361c 100644
--- a/storage-permissions/src/commonMain/kotlin/Permission.kt
+++ b/storage-permissions/src/commonMain/kotlin/Permission.kt
@@ -34,7 +34,7 @@ data class StoragePermission(val allowWrite: Boolean = false) : Permission() {
     override val name: String = "Storage - ${if (allowWrite) "ReadWrite" else "ReadOnly"}"
 }
 
-fun PermissionsBuilder.registerStoragePermission(
+suspend fun PermissionsBuilder.registerStoragePermission(
     storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -49,7 +49,7 @@ fun PermissionsBuilder.registerStoragePermission(
         )
     }
 
-fun PermissionsBuilder.registerStoragePermission(
+suspend fun PermissionsBuilder.registerStoragePermission(
     storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
     storagePermissionStateRepoBuilder: (StoragePermission, BaseStoragePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<StoragePermission>
 ) = storagePermissionManagerBuilderBuilder(context).also {
@@ -58,3 +58,28 @@ fun PermissionsBuilder.registerStoragePermission(
         storagePermissionStateRepoBuilder(permission, it, coroutineContext)
     }
 }
+
+suspend fun PermissionsBuilder.registerStoragePermissionIfNotRegistered(
+    storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
+    monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
+    settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
+) =
+    registerStoragePermissionIfNotRegistered(storagePermissionManagerBuilderBuilder) { storagePermission, baseStoragePermissionManagerBuilder, coroutineContext ->
+        StoragePermissionStateRepo(
+            storagePermission,
+            baseStoragePermissionManagerBuilder,
+            monitoringInterval,
+            settings,
+            coroutineContext
+        )
+    }
+
+suspend fun PermissionsBuilder.registerStoragePermissionIfNotRegistered(
+    storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
+    storagePermissionStateRepoBuilder: (StoragePermission, BaseStoragePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<StoragePermission>
+) = storagePermissionManagerBuilderBuilder(context).also {
+    registerOrGet(it)
+    registerOrGetPermissionStateRepoBuilder<StoragePermission> { permission, coroutineContext ->
+        storagePermissionStateRepoBuilder(permission, it, coroutineContext)
+    }
+}
diff --git a/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt b/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt
index 4608c70ec..53ca90fd5 100644
--- a/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt
+++ b/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.permissions.storage
 
-import co.touchlab.stately.freeze
 import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
@@ -59,11 +58,10 @@ actual class DefaultStoragePermissionManager(
         if (IOSPermissionsHelper.missingDeclarationsInPList(bundle, NSPhotoLibraryUsageDescription).isEmpty()) {
             permissionHandler.requestAuthorizationStatus(timerHelper, CoroutineScope(coroutineContext)) {
                 val deferred = CompletableDeferred<PHAuthorizationStatus>()
-                val callback = { status: PHAuthorizationStatus ->
+                PHPhotoLibrary.requestAuthorization  { status ->
                     deferred.complete(status)
                     Unit
-                }.freeze()
-                PHPhotoLibrary.requestAuthorization(callback)
+                }
 
                 deferred.await().toAuthorizationStatus()
             }
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
index 4bf428b15..824b21094 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.system.network.state
 
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.state.ColdStateRepo
 import com.splendo.kaluga.system.network.BaseNetworkManager
@@ -35,22 +34,19 @@ open class NetworkStateRepo(
         fun create(): NetworkStateRepo
     }
 
-    private val _lastKnownNetwork = AtomicReference<Network>(Network.Unknown.WithoutLastNetwork(Network.Unknown.Reason.NOT_CLEAR))
-    internal var lastKnownNetwork: Network
-        get() = _lastKnownNetwork.get()
-        set(value) { _lastKnownNetwork.set(value) }
+    internal var lastKnownNetwork: Network = Network.Unknown.WithoutLastNetwork(Network.Unknown.Reason.NOT_CLEAR)
 
-    private val _networkManager = AtomicReference<BaseNetworkManager?>(null)
+    private var _networkManager: BaseNetworkManager? = null
     internal var networkManager: BaseNetworkManager?
-        get() = _networkManager.get()
+        get() = _networkManager
         set(value) {
-            _networkManager.get()?.let {
+            _networkManager?.let {
                 if (value == null) {
                     it.dispose()
                 }
             }
 
-            _networkManager.set(value)
+            _networkManager = value
         }
 
     override suspend fun deinitialize(state: NetworkState) {
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
index a8c753861..e8d2ddf82 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
+++ b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.system.network
 
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.base.IOSVersion
 import com.splendo.kaluga.logging.debug
 import kotlinx.cinterop.COpaquePointer
@@ -121,10 +120,7 @@ actual class NetworkManager internal constructor(
         override val onNetworkStateChange: NetworkStateChange
     ) : AppleNetworkManager {
 
-        private var _reachability = AtomicReference<SCNetworkReachabilityRef?>(null)
-        private var reachability: SCNetworkReachabilityRef?
-            get() = _reachability.get()
-            set(value) = _reachability.set(value)
+        private var reachability: SCNetworkReachabilityRef? = SCNetworkReachabilityCreateWithName(null, "www.appleiphonecell.com")
 
         private val onNetworkStateChanged: SCNetworkReachabilityCallBack = staticCFunction { _: SCNetworkReachabilityRef?, flags: SCNetworkReachabilityFlags, info: COpaquePointer? ->
             if (info == null) {
@@ -136,8 +132,6 @@ actual class NetworkManager internal constructor(
         }
 
         init {
-            reachability = SCNetworkReachabilityCreateWithName(null, "www.appleiphonecell.com")
-
             val context = nativeHeap.alloc<SCNetworkReachabilityContext>()
             context.info = StableRef.create(this@SCNetworkManager).asCPointer()
 
diff --git a/test-utils-alerts/src/commonMain/kotlin/MockAlertPresenter.kt b/test-utils-alerts/src/commonMain/kotlin/MockAlertPresenter.kt
index 07b2892ef..5ea1922ab 100644
--- a/test-utils-alerts/src/commonMain/kotlin/MockAlertPresenter.kt
+++ b/test-utils-alerts/src/commonMain/kotlin/MockAlertPresenter.kt
@@ -16,9 +16,6 @@
  */
 package com.splendo.kaluga.test.alerts
 
-import co.touchlab.stately.collections.IsoMutableList
-import co.touchlab.stately.concurrency.AtomicBoolean
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.alerts.Alert
 import com.splendo.kaluga.alerts.BaseAlertPresenter
 import com.splendo.kaluga.test.base.mock.call
@@ -42,7 +39,7 @@ class MockAlertPresenter(val alert: Alert, setupMocks: Boolean = true) : BaseAle
         /**
          * The [MockAlertPresenter] created by this builder
          */
-        val builtAlerts = IsoMutableList<MockAlertPresenter>()
+        val builtAlerts = mutableListOf<MockAlertPresenter>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for the [create] function
@@ -64,19 +61,12 @@ class MockAlertPresenter(val alert: Alert, setupMocks: Boolean = true) : BaseAle
         private fun createAlertFromAlert(alert: Alert, coroutineScope: CoroutineScope): MockAlertPresenter = createMock.call(alert, coroutineScope)
     }
 
-    private var _isPresented = AtomicBoolean(false)
-
     /**
      * `true` if the [MockAlertPresenter] is currently being presented
      */
-    var isPresented
-        get() = _isPresented.value
-        private set(value) { _isPresented.value = value }
-
-    private var _afterHandler = AtomicReference<((Alert.Action?) -> Unit)?>(null)
-    private var afterHandler: ((Alert.Action?) -> Unit)?
-        get() = _afterHandler.get()
-        set(value) = _afterHandler.set(value)
+    var isPresented = false
+
+    private var afterHandler: ((Alert.Action?) -> Unit)? = null
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for the [showAsync] function
diff --git a/test-utils-architecture/src/commonMain/kotlin/ViewModelTest.kt b/test-utils-architecture/src/commonMain/kotlin/ViewModelTest.kt
index fb32b0cab..3feae2a24 100644
--- a/test-utils-architecture/src/commonMain/kotlin/ViewModelTest.kt
+++ b/test-utils-architecture/src/commonMain/kotlin/ViewModelTest.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.test.architecture
 
-import co.touchlab.stately.ensureNeverFrozen
 import com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel
 import com.splendo.kaluga.test.base.BaseTest
 import com.splendo.kaluga.test.base.BaseUIThreadTest
@@ -25,11 +24,7 @@ import com.splendo.kaluga.test.base.UIThreadTest
 import kotlinx.coroutines.CoroutineScope
 import kotlin.test.BeforeTest
 
-abstract class ViewModelTest<VM : LifecycleViewModel>(allowFreezing: Boolean = false) : BaseTest() {
-
-    init {
-        if (!allowFreezing) ensureNeverFrozen()
-    }
+abstract class ViewModelTest<VM : LifecycleViewModel> : BaseTest() {
 
     lateinit var viewModel: VM
 
@@ -43,7 +38,7 @@ abstract class ViewModelTest<VM : LifecycleViewModel>(allowFreezing: Boolean = f
 }
 
 abstract class SimpleUIThreadViewModelTest<VM : LifecycleViewModel> :
-    UIThreadViewModelTest<UIThreadViewModelTest.ViewModelTestContext<VM>, VM>(allowFreezing = true) {
+    UIThreadViewModelTest<UIThreadViewModelTest.ViewModelTestContext<VM>, VM>() {
 
     override val createTestContext: suspend (CoroutineScope) -> ViewModelTestContext<VM> =
         { LazyViewModelTestContext(it, ::createViewModel) }
@@ -54,8 +49,8 @@ abstract class SimpleUIThreadViewModelTest<VM : LifecycleViewModel> :
 /**
  * A [UIThreadTest] that takes a [ViewModelTestContext]
  */
-abstract class UIThreadViewModelTest<VMC : UIThreadViewModelTest.ViewModelTestContext<VM>, VM : LifecycleViewModel>(allowFreezing: Boolean = false) :
-    UIThreadTest<VMC>(allowFreezing) {
+abstract class UIThreadViewModelTest<VMC : UIThreadViewModelTest.ViewModelTestContext<VM>, VM : LifecycleViewModel>() :
+    UIThreadTest<VMC>() {
 
     /**
      * [ViewModelTestContext] that lazily creates the view model
@@ -73,8 +68,8 @@ abstract class UIThreadViewModelTest<VMC : UIThreadViewModelTest.ViewModelTestCo
 /**
  * A [BaseUIThreadTest] that takes a [ViewModelTestContext]
  */
-abstract class BaseUIThreadViewModelTest<C, VMC : BaseUIThreadViewModelTest.ViewModelTestContext<VM>, VM : LifecycleViewModel>(allowFreezing: Boolean = false) :
-    BaseUIThreadTest<C, VMC>(allowFreezing) {
+abstract class BaseUIThreadViewModelTest<C, VMC : BaseUIThreadViewModelTest.ViewModelTestContext<VM>, VM : LifecycleViewModel>() :
+    BaseUIThreadTest<C, VMC>() {
 
     /**
      * [ViewModelTestContext] that lazily creates the view model
diff --git a/test-utils-architecture/src/commonTest/kotlin/UIThreadViewModelTestTest.kt b/test-utils-architecture/src/commonTest/kotlin/UIThreadViewModelTestTest.kt
index db64ffaff..85a3a1fb3 100644
--- a/test-utils-architecture/src/commonTest/kotlin/UIThreadViewModelTestTest.kt
+++ b/test-utils-architecture/src/commonTest/kotlin/UIThreadViewModelTestTest.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.test.architecture
 
-import co.touchlab.stately.concurrency.AtomicBoolean
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedSubject
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
@@ -35,7 +34,7 @@ import kotlin.test.fail
 class LazyUIThreadViewModelTestTest : UIThreadViewModelTest<LazyUIThreadViewModelTestTest.CustomLazyViewModelTestContext, LazyUIThreadViewModelTestTest.ViewModel>() {
 
     companion object {
-        val isDisposed = AtomicBoolean(false)
+        var isDisposed = false
     }
 
     class ViewModel : BaseLifecycleViewModel() {
@@ -46,7 +45,7 @@ class LazyUIThreadViewModelTestTest : UIThreadViewModelTest<LazyUIThreadViewMode
         LazyViewModelTestContext<ViewModel>(coroutineScope, { ViewModel() }) {
 
         override fun dispose() {
-            isDisposed.value = true
+            isDisposed = true
         }
     }
 
@@ -73,12 +72,12 @@ class LazyUIThreadViewModelTestTest : UIThreadViewModelTest<LazyUIThreadViewMode
 
     @BeforeTest
     fun resetDisposed() {
-        isDisposed.value = false
+        isDisposed = false
     }
 
     @AfterTest
     fun testDisposed() {
-        assertTrue(isDisposed.value)
+        assertTrue(isDisposed)
     }
 }
 
diff --git a/test-utils-base/src/commonMain/kotlin/FlowTest.kt b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
index cdefda80f..dc98f501d 100644
--- a/test-utils-base/src/commonMain/kotlin/FlowTest.kt
+++ b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
@@ -18,9 +18,6 @@ Copyright 2019 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.test.base
 
-import co.touchlab.stately.concurrency.AtomicLong
-import co.touchlab.stately.ensureNeverFrozen
-import co.touchlab.stately.freeze
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
@@ -33,9 +30,8 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlin.native.concurrent.SharedImmutable
-import kotlin.native.concurrent.ThreadLocal
 import kotlin.test.AfterTest
+import kotlin.time.Duration.Companion.seconds
 
 typealias TestBlock<TC, T> = suspend TC.(T) -> Unit
 typealias ActionBlock = suspend() -> Unit
@@ -77,7 +73,6 @@ Context for each tests needs to be created and kept on the main thread for iOS.
 Since the class itself is created in the test thread
 */
 
-@ThreadLocal // thread local on native, global on non-native, but still accessed from only the main thread.
 val contextMap = mutableMapOf<Long, TestContext>()
 
 private suspend fun <TC : TestContext> testContext(cookie: Long, testContext: suspend () -> TC): TC {
@@ -86,17 +81,12 @@ private suspend fun <TC : TestContext> testContext(cookie: Long, testContext: su
     return contextMap[cookie] as TC
 }
 
-@SharedImmutable
-private val cookieTin = AtomicLong(0L)
+private var cookieTin = 0L
 
 abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: CoroutineScope = MainScope()) : BaseUIThreadTest<C, TC>(), CoroutineScope by scope {
 
     // used for thread local map access to store the testContext
-    private val cookie = cookieTin.incrementAndGet()
-
-    init {
-        ensureNeverFrozen()
-    }
+    private val cookie = ++cookieTin
 
     abstract val flowFromTestContext: suspend TC.() -> F
 
@@ -131,7 +121,7 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
         testChannel = Channel(Channel.UNLIMITED)
     }
 
-    protected val waitForTestToSucceed = 6000L * 10
+    protected val waitForTestToSucceed = 60.seconds
 
     private suspend fun awaitTestBlocks() {
 
@@ -177,16 +167,13 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
 
                 val f =
                     if (createFlowInMainScope) {
-                        flow.freeze()
-                        scope.freeze()
                         withContext(Dispatchers.Main.immediate) {
-                            (flow(testContext(cookie) { createTestContextWithConfiguration(configuration, scope) })).freeze()
+                            (flow(testContext(cookie) { createTestContextWithConfiguration(configuration, scope) }))
                         }
                     } else {
-                        createTestContextWithConfiguration.freeze()
                         flow(
                             withContext(Dispatchers.Main.immediate) {
-                                (testContext(cookie) { createTestContextWithConfiguration(configuration, scope) }).freeze()
+                                (testContext(cookie) { createTestContextWithConfiguration(configuration, scope) })
                             }
                         )
                     }
@@ -205,7 +192,6 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
 
     @Suppress("SuspendFunctionOnCoroutineScope")
     private suspend fun startFlow(configuration: C, flow: F) {
-        this.ensureNeverFrozen()
         debug("launch flow scope...")
         val testChannel = testChannel
         val started = EmptyCompletableDeferred()
@@ -213,7 +199,6 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
         val scope = scope
         val createTestContextWithConfiguration = createTestContextWithConfiguration
         val cookie = cookie
-        createTestContextWithConfiguration.freeze()
         try {
             job = launch(Dispatchers.Main.immediate) {
                 started.complete()
@@ -257,7 +242,6 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
         val createTestContextWithConfiguration = createTestContextWithConfiguration
         val scope = scope
         require(lateConfiguration != null) { "Only use mainAction from inside `testWith` methods" }
-        createTestContextWithConfiguration.freeze()
         val configuration = lateConfiguration!!
         withContext(Dispatchers.Main.immediate) {
             debug("in main scope for mainAction")
@@ -276,10 +260,8 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
     var firstTestBlock = true
 
     suspend fun test(skip: Int = 0, test: TestBlock<TC, T>) {
-        test.freeze()
         if (firstTestBlock) {
             firstTestBlock = false
-            tests.ensureNeverFrozen()
             debug("first test offered, starting collection")
             require(lateflow != null && lateConfiguration != null) { "Only use test from inside `testWith` methods" }
             startFlow(lateConfiguration!!, lateflow!!)
diff --git a/test-utils-base/src/commonMain/kotlin/assertions.kt b/test-utils-base/src/commonMain/kotlin/assertions.kt
deleted file mode 100644
index 177c2c470..000000000
--- a/test-utils-base/src/commonMain/kotlin/assertions.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.test.base
-
-import co.touchlab.stately.isFrozen
-import kotlin.native.concurrent.SharedImmutable
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
-
-@SharedImmutable
-private val WARNING = "Checking if a Boolean is frozen, did you accidentally add `.isFrozen` in your assert? If intentional add `allowBoolean = true`."
-
-fun assertFrozen(any: Any, message: String? = null, allowBoolean: Boolean = false) {
-    if (!allowBoolean && any is Boolean)
-        error(WARNING)
-    assertTrue(any.isFrozen, message)
-}
-
-fun assertNotFrozen(any: Any, message: String? = null, suppressWarning: Boolean = false) {
-    if (!suppressWarning && any is Boolean)
-        error(WARNING)
-    assertFalse(any.isFrozen, message)
-}
diff --git a/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt b/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
index bf5a5c6f4..b91a47220 100644
--- a/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
+++ b/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
@@ -17,9 +17,6 @@
 
 package com.splendo.kaluga.test.base.mock
 
-import co.touchlab.stately.collections.IsoMutableList
-import co.touchlab.stately.collections.IsoMutableMap
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.test.base.mock.answer.Answer
 import com.splendo.kaluga.test.base.mock.answer.BaseAnswer
 import com.splendo.kaluga.test.base.mock.answer.SuspendedAnswer
@@ -58,7 +55,7 @@ sealed class BaseMethodMock<
         > {
 
         abstract val matchers: M
-        protected val answer = AtomicReference<A?>(null)
+        protected var answer: A? = null
 
         protected abstract fun createAnswer(result: (V) -> R): A
 
@@ -67,7 +64,7 @@ sealed class BaseMethodMock<
          * @param answer The [BaseAnswer] [A] to provide the answer for this stub.
          */
         fun doAnswer(answer: A) {
-            this.answer.set(answer)
+            this.answer = answer
         }
 
         /**
@@ -89,8 +86,8 @@ sealed class BaseMethodMock<
         fun doThrow(throwable: Throwable) = doExecute { throw throwable }
     }
 
-    private val stubs: IsoMutableMap<M, S> = IsoMutableMap()
-    private val callParameters: IsoMutableList<V> = IsoMutableList()
+    private val stubs = mutableMapOf<M, S>()
+    private val callParameters = mutableListOf<V>()
     protected abstract val ParametersSpec: W
 
     protected abstract fun createStub(matcher: M): S
@@ -211,7 +208,7 @@ class MethodMock<M : ParametersSpec.Matchers,
          * @param values the values with which to call the stub.
          */
         fun call(values: V): R {
-            val answer = this.answer.get() ?: fail { "No Answer set for this stub" }
+            val answer = this.answer ?: fail { "No Answer set for this stub" }
             return answer.call(values)
         }
     }
@@ -249,7 +246,7 @@ class SuspendMethodMock<
          * @param values the values with which to call the stub.
          */
         suspend fun call(values: V): R {
-            val answer = this.answer.get() ?: fail { "No Answer set for this stub" }
+            val answer = this.answer ?: fail { "No Answer set for this stub" }
             return answer.call(values)
         }
 
diff --git a/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt b/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt
index 036a0a9a4..7b4a57abd 100644
--- a/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt
+++ b/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt
@@ -17,29 +17,24 @@
 
 package com.splendo.kaluga.test.base
 
-import co.touchlab.stately.freeze
 import com.splendo.kaluga.base.runBlocking
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
-class DeliberateCancellationException(val result: Any?, freeze: Boolean) :
+class DeliberateCancellationException(val result: Any?) :
     kotlinx.coroutines.CancellationException("Scope canceled deliberately by testAndCancelScope") {
-    init {
-        if (freeze) freeze()
-    }
 }
 
 inline fun <reified T> testBlockingAndCancelScope(
     context: CoroutineContext = EmptyCoroutineContext,
-    freezeResult: Boolean = true,
     crossinline block: suspend CoroutineScope.() -> T
 ): T {
 
     try {
         return runBlocking(context) {
-            block().also { cancel(DeliberateCancellationException(it, freezeResult)) }
+            block().also { cancel(DeliberateCancellationException(it)) }
         }
     } catch (e: Throwable) {
         if (e is DeliberateCancellationException && e.result is T)
diff --git a/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt b/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
index 817feb5ee..5c161d43d 100644
--- a/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
+++ b/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
@@ -17,8 +17,6 @@
 
 package com.splendo.kaluga.test.base
 
-import co.touchlab.stately.ensureNeverFrozen
-import co.touchlab.stately.freeze
 import com.splendo.kaluga.base.runBlocking
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
@@ -42,7 +40,7 @@ open class SimpleUIThreadTest : UIThreadTest<SimpleUIThreadTest.SimpleTestContex
  * as it eases dealing with immutability and allows a shared context.
  *
  */
-abstract class UIThreadTest<TC : UIThreadTest.TestContext>(allowFreezing: Boolean = false) : BaseUIThreadTest<Unit, TC>(allowFreezing) {
+abstract class UIThreadTest<TC : UIThreadTest.TestContext> : BaseUIThreadTest<Unit, TC>() {
     interface TestContext : BaseUIThreadTest.TestContext
 
     class EmptyTestContext private constructor() : TestContext {
@@ -90,11 +88,7 @@ abstract class UIThreadTest<TC : UIThreadTest.TestContext>(allowFreezing: Boolea
  * as it eases dealing with immutability and allows a shared context.
  *
  */
-abstract class BaseUIThreadTest<C, TC : BaseUIThreadTest.TestContext>(allowFreezing: Boolean = false) : BaseTest() {
-
-    init {
-        if (!allowFreezing) ensureNeverFrozen()
-    }
+abstract class BaseUIThreadTest<C, TC : BaseUIThreadTest.TestContext>() : BaseTest() {
 
     interface TestContext {
         fun dispose() {}
@@ -143,8 +137,6 @@ abstract class BaseUIThreadTest<C, TC : BaseUIThreadTest.TestContext>(allowFreez
                     testContext.dispose()
                 }
             }
-            createTestContextWithConfiguration.freeze()
-            test.freeze()
 
             if (cancelScopeAfterTest)
                 testBlockingAndCancelScope(Dispatchers.Main) { test(this) }
diff --git a/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt b/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt
index f56a2c4ba..355499399 100644
--- a/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt
+++ b/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt
@@ -20,7 +20,6 @@ package com.splendo.kaluga.test.bluetooth
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGattCallback
 import android.content.Context
-import co.touchlab.stately.collections.sharedMutableListOf
 import com.splendo.kaluga.bluetooth.device.BluetoothGattWrapper
 import com.splendo.kaluga.bluetooth.device.DeviceWrapper
 import com.splendo.kaluga.bluetooth.device.Identifier
@@ -35,7 +34,7 @@ class MockDeviceWrapper(
     setupMocks: Boolean = true
 ) : DeviceWrapper {
 
-    val gattWrappers = sharedMutableListOf<MockBluetoothGattWrapper>()
+    val gattWrappers = mutableListOf<MockBluetoothGattWrapper>()
     val connectGattMock = ::connectGatt.mock()
     val removeBondMock = ::removeBond.mock()
     val createBondMock = ::createBond.mock()
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
index eb5d7869b..badf1001c 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
@@ -17,8 +17,6 @@
 
 package com.splendo.kaluga.test.bluetooth.device
 
-import co.touchlab.stately.collections.sharedMutableListOf
-import co.touchlab.stately.concurrency.AtomicBoolean
 import com.splendo.kaluga.base.utils.toHexString
 import com.splendo.kaluga.bluetooth.asBytes
 import com.splendo.kaluga.bluetooth.device.BaseDeviceConnectionManager
@@ -60,7 +58,7 @@ class MockDeviceConnectionManager(
         /**
          * List of created [MockDeviceConnectionManager]
          */
-        val createdDeviceConnectionManager = sharedMutableListOf<MockDeviceConnectionManager>()
+        val createdDeviceConnectionManager = mutableListOf<MockDeviceConnectionManager>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
@@ -86,14 +84,10 @@ class MockDeviceConnectionManager(
         }
     }
 
-    private val _willActionSucceed = AtomicBoolean(initialWillActionSucceed)
-
     /**
      * Configure whether a [DeviceAction] will succeed
      */
-    var willActionSucceed: Boolean
-        get() = _willActionSucceed.value
-        set(value) { _willActionSucceed.value = value }
+    var willActionSucceed: Boolean = initialWillActionSucceed
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [getCurrentState]
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
index 30b289681..53e0966e0 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.test.bluetooth.scanner
 
-import co.touchlab.stately.collections.sharedMutableListOf
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.device.Identifier
 import com.splendo.kaluga.bluetooth.scanner.BaseScanner
@@ -93,7 +92,7 @@ class MockBaseScanner(
         /**
          * List of created [MockScanner]
          */
-        val createdScanners = sharedMutableListOf<MockBaseScanner>()
+        val createdScanners = mutableListOf<MockBaseScanner>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-bluetooth/src/iosMain/kotlin/IOSMockCharacteristicWrapper.kt b/test-utils-bluetooth/src/iosMain/kotlin/IOSMockCharacteristicWrapper.kt
index e35deafd8..178f61a01 100644
--- a/test-utils-bluetooth/src/iosMain/kotlin/IOSMockCharacteristicWrapper.kt
+++ b/test-utils-bluetooth/src/iosMain/kotlin/IOSMockCharacteristicWrapper.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.test.bluetooth
 
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.base.toNSData
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
@@ -37,10 +36,7 @@ class IOSMockCharacteristicWrapper(
     val isWriteCompleted = CompletableDeferred<NSData>()
     val isNotificationCompleted = CompletableDeferred<Boolean>()
 
-    val _value = AtomicReference<NSData?>(null)
-    override var value: NSData?
-        get() = _value.get()
-        set(value) { _value.set(value) }
+    override var value: NSData? = null
 
     override val descriptors: List<DescriptorWrapper> = descriptorUUIDs
         .map(::IOSMockDescriptorWrapper)
diff --git a/test-utils-bluetooth/src/iosMain/kotlin/IOSMockDescriptorWrapper.kt b/test-utils-bluetooth/src/iosMain/kotlin/IOSMockDescriptorWrapper.kt
index 592b6a6e7..472405232 100644
--- a/test-utils-bluetooth/src/iosMain/kotlin/IOSMockDescriptorWrapper.kt
+++ b/test-utils-bluetooth/src/iosMain/kotlin/IOSMockDescriptorWrapper.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.test.bluetooth
 
-import co.touchlab.stately.concurrency.AtomicReference
 import com.splendo.kaluga.base.toNSData
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
@@ -35,10 +34,7 @@ class IOSMockDescriptorWrapper(override val uuid: CBUUID = CBUUID()) : MockDescr
         this.value = value?.toNSData()
     }
 
-    private val _value = AtomicReference<NSData?>(null)
-    override var value: NSData?
-        get() = _value.get()
-        set(value) { _value.set(value) }
+    override var value: NSData? = null
 
     override fun readValue(peripheral: CBPeripheral) {
         isReadCompleted.complete()
diff --git a/test-utils-hud/src/commonMain/kotlin/MockHUD.kt b/test-utils-hud/src/commonMain/kotlin/MockHUD.kt
index ab14554a0..f7c5ff48e 100644
--- a/test-utils-hud/src/commonMain/kotlin/MockHUD.kt
+++ b/test-utils-hud/src/commonMain/kotlin/MockHUD.kt
@@ -17,8 +17,6 @@
 
 package com.splendo.kaluga.test.hud
 
-import co.touchlab.stately.collections.IsoMutableList
-import co.touchlab.stately.concurrency.AtomicBoolean
 import com.splendo.kaluga.hud.BaseHUD
 import com.splendo.kaluga.hud.HudConfig
 import com.splendo.kaluga.test.base.mock.call
@@ -47,7 +45,7 @@ class MockHUD(
         /**
          * List of build [MockHUD]
          */
-        val builtHUDs = IsoMutableList<MockHUD>()
+        val builtHUDs = mutableListOf<MockHUD>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
@@ -69,16 +67,10 @@ class MockHUD(
         }
     }
 
-    private val _isVisible = AtomicBoolean(false)
-
     /**
      * If `true` the HUD is currently being displayed
      */
-    override var isVisible: Boolean
-        get() = _isVisible.value
-        private set(value) {
-            _isVisible.value = value
-        }
+    override var isVisible: Boolean = false
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [present]
diff --git a/test-utils-keyboard/src/commonMain/kotlin/MockFocusHandler.kt b/test-utils-keyboard/src/commonMain/kotlin/MockFocusHandler.kt
index 1d72fe5e2..67570307e 100644
--- a/test-utils-keyboard/src/commonMain/kotlin/MockFocusHandler.kt
+++ b/test-utils-keyboard/src/commonMain/kotlin/MockFocusHandler.kt
@@ -17,20 +17,18 @@
 
 package com.splendo.kaluga.test.keyboard
 
-import co.touchlab.stately.concurrency.AtomicBoolean
 import com.splendo.kaluga.keyboard.FocusHandler
 
 open class BaseMockFocusHandler {
-    private val _isFocused = AtomicBoolean(false)
-    val isFocused: Boolean
-        get() = _isFocused.value
+    var isFocused: Boolean = false
+        private set
 
     protected fun giveFocus() {
-        _isFocused.value = true
+        isFocused = true
     }
 
     protected fun removeFocus() {
-        _isFocused.value = false
+        isFocused = false
     }
 }
 
diff --git a/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt b/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt
index 2ea38df57..d01faef82 100644
--- a/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt
+++ b/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt
@@ -17,9 +17,6 @@
 
 package com.splendo.kaluga.test.keyboard
 
-import co.touchlab.stately.collections.IsoMutableList
-import co.touchlab.stately.concurrency.AtomicReference
-import co.touchlab.stately.concurrency.value
 import com.splendo.kaluga.keyboard.BaseKeyboardManager
 import com.splendo.kaluga.keyboard.FocusHandler
 import com.splendo.kaluga.test.base.mock.call
@@ -42,7 +39,7 @@ class MockKeyboardManager(setupMocks: Boolean = true) : BaseKeyboardManager {
         /**
          * List of created [MockKeyboardManager]
          */
-        val builtKeyboardManagers = IsoMutableList<MockKeyboardManager>()
+        val builtKeyboardManagers = mutableListOf<MockKeyboardManager>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
@@ -62,14 +59,10 @@ class MockKeyboardManager(setupMocks: Boolean = true) : BaseKeyboardManager {
         override fun create(coroutineScope: CoroutineScope): MockKeyboardManager = createMock.call(coroutineScope)
     }
 
-    val _focusHandler = AtomicReference<FocusHandler?>(null)
-
     /**
      * Gets the current [FocusHandler]
      */
-    var focusHandler: FocusHandler?
-        get() = _focusHandler.value
-        private set(value) = _focusHandler.set(value)
+    var focusHandler: FocusHandler? = null
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [show]
diff --git a/test-utils-koin/src/commonMain/kotlin/KoinUIThreadTest.kt b/test-utils-koin/src/commonMain/kotlin/KoinUIThreadTest.kt
index 55d6eddb5..dcb8bf033 100644
--- a/test-utils-koin/src/commonMain/kotlin/KoinUIThreadTest.kt
+++ b/test-utils-koin/src/commonMain/kotlin/KoinUIThreadTest.kt
@@ -26,7 +26,7 @@ import org.koin.core.context.stopKoin
 import org.koin.core.module.Module
 import org.koin.dsl.KoinAppDeclaration
 
-abstract class KoinUIThreadTest<TC : KoinUIThreadTest.KoinTestContext>(allowFreezing: Boolean = false) : BaseKoinUIThreadTest<Unit, TC>(allowFreezing) {
+abstract class KoinUIThreadTest<TC : KoinUIThreadTest.KoinTestContext> : BaseKoinUIThreadTest<Unit, TC>() {
 
     open class KoinTestContext(
         appDeclaration: KoinAppDeclaration? = null,
@@ -51,7 +51,7 @@ abstract class KoinUIThreadTest<TC : KoinUIThreadTest.KoinTestContext>(allowFree
     fun testOnUIThread(cancelScopeAfterTest: Boolean = false, block: suspend TC.() -> Unit) = testOnUIThread(Unit, cancelScopeAfterTest, block)
 }
 
-abstract class BaseKoinUIThreadTest<C, TC : BaseKoinUIThreadTest.KoinTestContext>(allowFreezing: Boolean = false) : BaseUIThreadTest<C, TC>(allowFreezing) {
+abstract class BaseKoinUIThreadTest<C, TC : BaseKoinUIThreadTest.KoinTestContext> : BaseUIThreadTest<C, TC>() {
 
     open class KoinTestContext(
         appDeclaration: KoinAppDeclaration? = null,
diff --git a/test-utils-koin/src/commonMain/kotlin/KoinUIThreadViewModelTest.kt b/test-utils-koin/src/commonMain/kotlin/KoinUIThreadViewModelTest.kt
index 9cb8d7226..2fc455db1 100644
--- a/test-utils-koin/src/commonMain/kotlin/KoinUIThreadViewModelTest.kt
+++ b/test-utils-koin/src/commonMain/kotlin/KoinUIThreadViewModelTest.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.test.architecture.UIThreadViewModelTest
 import org.koin.core.module.Module
 import org.koin.dsl.KoinAppDeclaration
 
-abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : LifecycleViewModel>(allowFreezing: Boolean = false) :
-    KoinUIThreadTest<KVMC>(allowFreezing) {
+abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : LifecycleViewModel> :
+    KoinUIThreadTest<KVMC>() {
 
     abstract class KoinViewModelTestContext<VM : LifecycleViewModel>(
         appDeclaration: KoinAppDeclaration? = null,
@@ -39,8 +39,8 @@ abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinVi
     }
 }
 
-abstract class BaseKoinUIThreadViewModelTest<C, KVMC : BaseKoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : LifecycleViewModel>(allowFreezing: Boolean = false) :
-    BaseKoinUIThreadTest<C, KVMC>(allowFreezing) {
+abstract class BaseKoinUIThreadViewModelTest<C, KVMC : BaseKoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : LifecycleViewModel> :
+    BaseKoinUIThreadTest<C, KVMC>() {
 
     abstract class KoinViewModelTestContext<VM : LifecycleViewModel>(
         appDeclaration: KoinAppDeclaration? = null,
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt b/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
index 27b40601c..05796d071 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.test.location
 
-import co.touchlab.stately.collections.sharedMutableListOf
 import com.splendo.kaluga.location.BaseLocationManager
 import com.splendo.kaluga.location.Location
 import com.splendo.kaluga.location.LocationManager
@@ -78,7 +77,7 @@ class MockBaseLocationManager(
         /**
          * Ths list of build [MockBaseLocationManager]
          */
-        val builtLocationManagers = sharedMutableListOf<MockBaseLocationManager>()
+        val builtLocationManagers = mutableListOf<MockBaseLocationManager>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt b/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
index 81737b21b..1755fec3a 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.test.location
 
-import co.touchlab.stately.collections.IsoMutableList
 import com.splendo.kaluga.location.BaseLocationManager
 import com.splendo.kaluga.location.LocationStateRepo
 import com.splendo.kaluga.permissions.base.Permissions
@@ -42,7 +41,7 @@ class MockLocationStateRepoBuilder<LMB : BaseLocationManager.Builder>(
     /**
      * List of build [LocationStateRepo]
      */
-    val builtLocationStateRepo = IsoMutableList<LocationStateRepo>()
+    val builtLocationStateRepo = mutableListOf<LocationStateRepo>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-permissions/src/commonMain/kotlin/MockPermissionManager.kt b/test-utils-permissions/src/commonMain/kotlin/MockPermissionManager.kt
index 20d27b4a7..973592c01 100644
--- a/test-utils-permissions/src/commonMain/kotlin/MockPermissionManager.kt
+++ b/test-utils-permissions/src/commonMain/kotlin/MockPermissionManager.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.test.permissions
 
-import co.touchlab.stately.collections.sharedMutableListOf
 import com.splendo.kaluga.logging.debug
 import com.splendo.kaluga.permissions.base.BasePermissionManager
 import com.splendo.kaluga.permissions.base.Permission
@@ -58,7 +57,7 @@ class MockPermissionManager<P : Permission>(
         /**
          * List of built [MockPermissionManager]
          */
-        val createdManagers = sharedMutableListOf<MockPermissionManager<P>>()
+        val createdManagers = mutableListOf<MockPermissionManager<P>>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-permissions/src/commonMain/kotlin/MockPermissionsBuilder.kt b/test-utils-permissions/src/commonMain/kotlin/MockPermissionsBuilder.kt
index 85f83138c..98292b568 100644
--- a/test-utils-permissions/src/commonMain/kotlin/MockPermissionsBuilder.kt
+++ b/test-utils-permissions/src/commonMain/kotlin/MockPermissionsBuilder.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.test.permissions
 
-import co.touchlab.stately.collections.IsoMutableList
 import com.splendo.kaluga.permissions.base.BasePermissionStateRepo
 import com.splendo.kaluga.permissions.base.BasePermissionsBuilder
 import com.splendo.kaluga.permissions.base.Permission
@@ -55,7 +54,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [CameraPermission]
      */
-    val buildCameraStateRepos = IsoMutableList<MockBasePermissionStateRepo<CameraPermission>>()
+    val buildCameraStateRepos = mutableListOf<MockBasePermissionStateRepo<CameraPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [CameraPermission]
@@ -66,7 +65,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [ContactsPermission]
      */
-    val buildContactsStateRepos = IsoMutableList<MockBasePermissionStateRepo<ContactsPermission>>()
+    val buildContactsStateRepos = mutableListOf<MockBasePermissionStateRepo<ContactsPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [ContactsPermission]
@@ -77,7 +76,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [MicrophonePermission]
      */
-    val buildMicrophoneStateRepos = IsoMutableList<MockBasePermissionStateRepo<MicrophonePermission>>()
+    val buildMicrophoneStateRepos = mutableListOf<MockBasePermissionStateRepo<MicrophonePermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [MicrophonePermission]
@@ -88,7 +87,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [NotificationsPermission]
      */
-    val buildNotificationsStateRepos = IsoMutableList<MockBasePermissionStateRepo<NotificationsPermission>>()
+    val buildNotificationsStateRepos = mutableListOf<MockBasePermissionStateRepo<NotificationsPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [NotificationsPermission]
@@ -99,7 +98,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [BluetoothPermission]
      */
-    val buildBluetoothStateRepos = IsoMutableList<MockBasePermissionStateRepo<BluetoothPermission>>()
+    val buildBluetoothStateRepos = mutableListOf<MockBasePermissionStateRepo<BluetoothPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [BluetoothPermission]
@@ -110,7 +109,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [LocationPermission]
      */
-    val buildLocationStateRepos = IsoMutableList<MockBasePermissionStateRepo<LocationPermission>>()
+    val buildLocationStateRepos = mutableListOf<MockBasePermissionStateRepo<LocationPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [LocationPermission]
@@ -121,7 +120,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [CalendarPermission]
      */
-    val buildCalendarStateRepos = IsoMutableList<MockBasePermissionStateRepo<CalendarPermission>>()
+    val buildCalendarStateRepos = mutableListOf<MockBasePermissionStateRepo<CalendarPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [CalendarPermission]
@@ -132,7 +131,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [StoragePermission]
      */
-    val buildStorageStateRepos = IsoMutableList<MockBasePermissionStateRepo<StoragePermission>>()
+    val buildStorageStateRepos = mutableListOf<MockBasePermissionStateRepo<StoragePermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [StoragePermission]
@@ -195,7 +194,7 @@ class MockPermissionsBuilder(
     /**
      * Registers all [MockPermissionManager] and [MockPermissionStateRepo]
      */
-    fun registerAllPermissionsBuilders() {
+    suspend fun registerAllPermissionsBuilders() {
         register(MockBasePermissionsBuilder<BluetoothPermission>())
         registerPermissionStateRepoBuilder(::bluetoothStateRepoBuilder)
         register(MockBasePermissionsBuilder<LocationPermission>())
diff --git a/test-utils/src/commonMain/kotlin/legacy.kt b/test-utils/src/commonMain/kotlin/legacy.kt
index 8ebe26df5..d0613752e 100644
--- a/test-utils/src/commonMain/kotlin/legacy.kt
+++ b/test-utils/src/commonMain/kotlin/legacy.kt
@@ -41,7 +41,7 @@ open class SimpleUIThreadTest : UIThreadTest<SimpleUIThreadTest.SimpleTestContex
     override val createTestContext: suspend (CoroutineScope) -> SimpleTestContext = { SimpleTestContext(it) }
 }
 @Deprecated("Moved to test-utils-base", ReplaceWith("UIThreadTest", "com.splendo.kaluga.test.base.UIThreadTest"))
-abstract class UIThreadTest<TC : UIThreadTest.TestContext>(allowFreezing: Boolean = false) : com.splendo.kaluga.test.base.UIThreadTest<TC>(allowFreezing) {
+abstract class UIThreadTest<TC : UIThreadTest.TestContext> : com.splendo.kaluga.test.base.UIThreadTest<TC>() {
     @Deprecated("Moved to test-utils-base", ReplaceWith("TestContext", "com.splendo.kaluga.test.base.UIThreadTest.TestContext"))
     interface TestContext : com.splendo.kaluga.test.base.UIThreadTest.TestContext
 }
@@ -62,7 +62,7 @@ abstract class BaseFlowTest<TC : UIThreadTest.TestContext, T, F : Flow<T>> : com
 }
 
 @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinUIThreadTest", "com.splendo.kaluga.test.koin.KoinUIThreadTest"))
-abstract class KoinUIThreadTest<TC : KoinUIThreadTest.KoinTestContext>(allowFreezing: Boolean = false) : com.splendo.kaluga.test.koin.KoinUIThreadTest<TC>(allowFreezing) {
+abstract class KoinUIThreadTest<TC : KoinUIThreadTest.KoinTestContext> : com.splendo.kaluga.test.koin.KoinUIThreadTest<TC>() {
     @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinUIThreadTest.KoinTestContext", "com.splendo.kaluga.test.koin.KoinUIThreadTest"))
     open class KoinTestContext(
         appDeclaration: KoinAppDeclaration? = null,
@@ -89,8 +89,8 @@ abstract class KoinFlowTest<TC : KoinUIThreadTest.KoinTestContext, T, F : Flow<T
 }
 
 @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinUIThreadViewModelTest", "com.splendo.kaluga.test.koin.KoinUIThreadViewModelTest"))
-abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : ViewModel>(allowFreezing: Boolean = false) :
-    KoinUIThreadTest<KVMC>(allowFreezing) {
+abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : ViewModel> :
+    KoinUIThreadTest<KVMC>() {
 
     @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinViewModelTestContext", "com.splendo.kaluga.test.koin.KoinUIThreadViewModelTest"))
     abstract class KoinViewModelTestContext<VM : ViewModel>(
@@ -106,10 +106,6 @@ abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinVi
     }
 }
 
-@Deprecated("Moved to test-utils-base", ReplaceWith("assertFrozen(any, message, allowBoolean)", "com.splendo.kaluga.test.base.assertFrozen"))
-fun assertFrozen(any: Any, message: String? = null, allowBoolean: Boolean = false) = com.splendo.kaluga.test.base.assertFrozen(any, message, allowBoolean)
-@Deprecated("Moved to test-utils-base", ReplaceWith("assertNotFrozen(any, message, suppressWarning)", "com.splendo.kaluga.test.base.assertNotFrozen"))
-fun assertNotFrozen(any: Any, message: String? = null, suppressWarning: Boolean = false) = com.splendo.kaluga.test.base.assertNotFrozen(any, message, suppressWarning)
 @Deprecated("Moved to test-utils-base", ReplaceWith("awaitAllBlocking(deferreds)", "com.splendo.kaluga.test.base.awaitAllBlocking"))
 fun <T> awaitAllBlocking(vararg deferreds: Deferred<T>): List<T> = com.splendo.kaluga.test.base.awaitAllBlocking(*deferreds)
 @Deprecated("Moved to test-utils-base", ReplaceWith("captureFor(duration)", "com.splendo.kaluga.test.base.captureFor"))

From a83791c6bface144157b830cb5b3298dad70cb54 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 2 Nov 2022 15:02:34 +0100
Subject: [PATCH 007/227] New memory model continued

---
 adding-a-new-module/README.md                 |   2 +-
 .../kotlin/AndroidAlertPresenterTest.kt       |   3 +-
 .../androidLibMain/kotlin/AlertPresenter.kt   |   4 +-
 alerts/src/commonMain/kotlin/Alerts.kt        | 258 +++++++++---------
 alerts/src/iosMain/kotlin/AlertPresenter.kt   |   2 +-
 alerts/src/jsMain/kotlin/AlertPresenter.kt    |   4 +-
 alerts/src/jvmMain/kotlin/AlertPresenter.kt   |   4 +-
 .../kotlin/observable/Observables.kt          |   2 +-
 .../kotlin/observable/ObservableBaseTest.kt   |  10 +-
 .../viewmodel/ViewModelLifecycleManager.kt    |  12 +-
 .../kotlin/observable/ThreadingTest.kt        |  28 +-
 .../kotlin/AndroidPermissionsManagerTest.kt   |  26 +-
 .../src/commonMain/kotlin/Permission.kt       |   1 -
 .../kotlin/PermissionRefreshScheduler.kt      |  10 +-
 .../commonMain/kotlin/state/KalugaState.kt    |  12 +-
 .../commonTest/kotlin/AtomicReferenceTest.kt  |  36 ---
 base/src/iosMain/kotlin/GCScheduler.kt        |   1 -
 beacons/src/commonMain/kotlin/Beacons.kt      |   8 +-
 .../src/commonTest/kotlin/BeaconFlowTest.kt   |   6 +-
 .../src/commonTest/kotlin/BeaconLostTest.kt   |   3 +-
 .../androidLibMain/kotlin/BluetoothBuilder.kt |  10 +-
 bluetooth/src/commonMain/kotlin/Bluetooth.kt  |   2 +-
 .../device/DefaultDeviceConnectionManager.kt  |   1 +
 .../kotlin/scanner/ScanningStateRepo.kt       |   4 +-
 .../commonTest/kotlin/BluetoothFlowTest.kt    |   5 +-
 .../src/iosMain/kotlin/BluetoothBuilder.kt    |   4 +-
 .../device/DefaultDeviceConnectionManager.kt  |   4 +-
 .../src/jsMain/kotlin/BluetoothBuilder.kt     |   6 +-
 .../src/jvmMain/kotlin/BluetoothBuilder.kt    |   6 +-
 .../kotlin/CalendarPermissionManager.kt       |   3 +-
 .../kotlin/ContactsPermissionManager.kt       |   3 +-
 .../AndroidDateTimePickerPresenterTest.kt     |   3 +-
 .../kotlin/DateTimePickerPresenter.kt         |   5 +-
 .../src/commonMain/kotlin/DateTimePicker.kt   | 155 +++++------
 .../iosMain/kotlin/DateTimePickerPresenter.kt |   6 +-
 .../jsMain/kotlin/DateTimePickerPresenter.kt  |   4 +-
 .../jvmMain/kotlin/DateTimePickerPresenter.kt |   4 +-
 .../com/splendo/kaluga/example/di/Modules.kt  |   3 +-
 .../kotlin/beacons/KNBeaconsFramework.kt      |   3 +-
 .../kotlin/AndroidHUDTests.kt                 |   3 +-
 hud/src/commonMain/kotlin/HUD.kt              |  33 +--
 hud/src/commonMain/kotlin/HudConfig.kt        |  24 +-
 .../kotlin/location/LocationManager.kt        |   6 +-
 .../kotlin/location/LocationStateRepo.kt      |   4 +-
 .../kotlin/location/LocationStateTest.kt      |  23 +-
 .../kotlin/location/LocationManager.kt        |   6 +-
 location/src/jsMain/kotlin/LocationManager.kt |   6 +-
 .../src/jvmMain/kotlin/LocationManager.kt     |   6 +-
 logging/src/commonTest/kotlin/LogTest.kt      | 167 +++++++-----
 logging/src/commonTest/kotlin/LoggerMock.kt   |   1 -
 .../src/commonMain/kotlin/Permission.kt       |   1 -
 .../kotlin/NotificationsPermissionManager.kt  |  13 +-
 .../kotlin/registerAllPermissions.kt          |   2 +-
 .../kotlin/stylable/GradientStyle.kt          |   2 +-
 .../kotlin/StoragePermissionManager.kt        |   2 +-
 .../commonMain/kotlin/MockAlertPresenter.kt   |   2 +-
 .../src/commonMain/kotlin/mock/MockMethod.kt  |   8 +-
 .../kotlin/testBlockingAndCancelScope.kt      |   3 +-
 .../src/iosMain/kotlin/mainBackground.kt      |   3 +-
 .../kotlin/MockLocationStateRepoBuilder.kt    |   6 +-
 test-utils/src/commonMain/kotlin/legacy.kt    |   5 +-
 61 files changed, 481 insertions(+), 508 deletions(-)
 delete mode 100644 base/src/commonTest/kotlin/AtomicReferenceTest.kt

diff --git a/adding-a-new-module/README.md b/adding-a-new-module/README.md
index 350e5620e..691540d16 100644
--- a/adding-a-new-module/README.md
+++ b/adding-a-new-module/README.md
@@ -87,7 +87,7 @@ Add unit tests which should run on a device or emulator
 Example:
 
 ```kotlin
-const val DEFAULT_TIMEOUT = 20_000L
+val DEFAULT_TIMEOUT = 20.seconds.inWholeMilliseconds
 
 fun UiDevice.assertTextAppears(text: String) {
     assertNotNull(this.wait(Until.findObject(By.text(text)), DEFAULT_TIMEOUT))
diff --git a/alerts/src/androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt b/alerts/src/androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt
index d216dc65e..83304e37d 100644
--- a/alerts/src/androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt
+++ b/alerts/src/androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt
@@ -36,6 +36,7 @@ import kotlin.test.Ignore
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
 
 class AndroidAlertPresenterTest : AlertPresenterTests() {
 
@@ -54,7 +55,7 @@ class AndroidAlertPresenterTest : AlertPresenterTests() {
     override val builder get() = activity!!.viewModel.alertBuilder
 
     companion object {
-        const val DEFAULT_TIMEOUT = 20_000L
+        val DEFAULT_TIMEOUT = 20.seconds.inWholeMilliseconds
     }
 
     @Test
diff --git a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
index 9215dabb3..6d6043ec4 100644
--- a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
@@ -46,8 +46,8 @@ actual class AlertPresenter(
     actual class Builder(
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
     ) : BaseAlertPresenter.Builder(), LifecycleSubscribable by lifecycleManagerObserver {
-        actual override fun create(coroutineScope: CoroutineScope) =
-            AlertPresenter(createAlert(), lifecycleManagerObserver, coroutineScope)
+        actual override fun create(alert: Alert, coroutineScope: CoroutineScope) =
+            AlertPresenter(alert, lifecycleManagerObserver, coroutineScope)
     }
 
     private companion object {
diff --git a/alerts/src/commonMain/kotlin/Alerts.kt b/alerts/src/commonMain/kotlin/Alerts.kt
index 26dc6b8ab..4b7f08b73 100644
--- a/alerts/src/commonMain/kotlin/Alerts.kt
+++ b/alerts/src/commonMain/kotlin/Alerts.kt
@@ -21,8 +21,6 @@ package com.splendo.kaluga.alerts
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlin.coroutines.resume
 
 typealias AlertActionHandler = () -> Unit
@@ -52,92 +50,13 @@ data class Alert(
     }
 
     /**
-     * An action that represents a button in the alert
-     *
-     * @property title The title of the action's button
-     * @property style The style that is applied to the action's button
-     * @property handler The block to execute when the user taps a button
-     */
-    data class Action(
-        val title: String,
-        val style: Style = Style.DEFAULT,
-        val handler: AlertActionHandler = {}
-    ) {
-        enum class Style(val value: Int) {
-            DEFAULT(0),
-            POSITIVE(DEFAULT.value),
-            DESTRUCTIVE(1),
-            NEUTRAL(DESTRUCTIVE.value),
-            CANCEL(2),
-            NEGATIVE(CANCEL.value)
-        }
-    }
-
-    /**
-     * An action that represents an input field in the alert and its initial state
-     *
-     * @param text The initial text of the input field
-     * @param placeholder The hint of the input field
-     * @param textObserver The block to execute when the user edits the text in the input field
-     */
-    data class TextInputAction(
-        val text: String?,
-        val placeholder: String?,
-        val textObserver: AlertTextObserver
-    )
-}
-
-/**
- * Interface that defines actions that can be applied to the alert.
- */
-interface AlertActions {
-    /**
-     * Presents an alert
-     *
-     * @param animated Pass `true` to animate the presentation
-     * @param completion The block to execute after the presentation finishes
-     */
-    fun showAsync(animated: Boolean = true, completion: () -> Unit = {})
-
-    /**
-     * Presents an alert and suspends
-     *
-     * @param animated
-     * @return The action that was performed by button click
-     *         or `null` if the alert was cancelled by pressing back (on Android)
-     */
-    suspend fun show(animated: Boolean = true): Alert.Action?
-
-    /**
-     * Dismisses the alert, which was presented previously
-     *
-     * @param animated Pass `true` to animate the transition
-     */
-    fun dismiss(animated: Boolean = true)
-}
-
-/**
- * Abstract alert presenter, used to show and dismiss given [Alert]
- * @see [AlertPresenter]
- *
- * @property alert The alert to present (and dismiss if needed)
- */
-abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
-
-    /**
-     * Abstract alert builder class, used to create an [Alert].
-     * The resulting Alert that can be shown and dismissed using an [AlertPresenter].
-     *
-     * @see [AlertPresenter.Builder]
+     * Builder class for creating an [Alert]
      */
-    abstract class Builder : LifecycleSubscribableMarker {
-
+    class Builder(private var style: Style = Style.ALERT) {
         private var title: String? = null
         private var message: String? = null
-        private var actions: MutableList<Alert.Action> = mutableListOf()
-        private var textInputAction: Alert.TextInputAction? = null
-        private var style: Alert.Style = Alert.Style.ALERT
-        internal val lock = Mutex()
+        private var actions: MutableList<Action> = mutableListOf()
+        private var textInputAction: TextInputAction? = null
 
         /**
          * Sets the [title] displayed in the alert
@@ -161,7 +80,7 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
          * @param handler The block to execute after user taps a button
          */
         fun setPositiveButton(title: String, handler: AlertActionHandler = {}) = apply {
-            addAction(Alert.Action(title, Alert.Action.Style.POSITIVE, handler))
+            addAction(Action(title, Action.Style.POSITIVE, handler))
         }
 
         /**
@@ -172,7 +91,7 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
          * @param handler The block to execute after user taps a button
          */
         fun setNegativeButton(title: String, handler: AlertActionHandler = {}) = apply {
-            addAction(Alert.Action(title, Alert.Action.Style.NEGATIVE, handler))
+            addAction(Action(title, Action.Style.NEGATIVE, handler))
         }
 
         /**
@@ -183,7 +102,7 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
          * @param handler The block to execute after user taps a button
          */
         fun setNeutralButton(title: String, handler: AlertActionHandler = {}) = apply {
-            addAction(Alert.Action(title, Alert.Action.Style.NEUTRAL, handler))
+            addAction(Action(title, Action.Style.NEUTRAL, handler))
         }
 
         /**
@@ -198,7 +117,7 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
             placeholder: String?,
             textObserver: AlertTextObserver
         ) = apply {
-            setTextInputAction(Alert.TextInputAction(text, placeholder, textObserver))
+            setTextInputAction(TextInputAction(text, placeholder, textObserver))
         }
 
         /**
@@ -206,56 +125,45 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
          *
          * @param actions The list of action objects
          */
-        fun addActions(actions: List<Alert.Action>) = apply { this.actions.addAll(actions) }
+        fun addActions(actions: List<Action>) = apply { this.actions.addAll(actions) }
 
         /**
          * Adds a list of [actions] to the alert
          *
          * @param actions The list of action objects
          */
-        fun addActions(vararg actions: Alert.Action) = apply { this.actions.addAll(actions) }
+        fun addActions(vararg actions: Action) = apply { this.actions.addAll(actions) }
 
         /**
          * Sets a style of the alert
          *
          * @param style The style of an alert
          */
-        internal fun setStyle(style: Alert.Style) = apply { this.style = style }
+        internal fun setStyle(style: Style) = apply { this.style = style }
 
         /**
          * Adds an [action] to the alert
          *
          * @param action The action object
          */
-        private fun addAction(action: Alert.Action) = apply { this.actions.add(action) }
+        private fun addAction(action: Action) = apply { this.actions.add(action) }
 
         /**
          * Adds an [Alert.TextInputAction] to the alert
          *
          * @param action The action object
          */
-        private fun setTextInputAction(action: Alert.TextInputAction) =
+        private fun setTextInputAction(action: TextInputAction) =
             apply { this.textInputAction = action }
 
-        /**
-         * Reset builder into initial state
-         */
-        internal fun reset() = apply {
-            this.title = null
-            this.message = null
-            this.actions = mutableListOf()
-            this.textInputAction = null
-            this.style = Alert.Style.ALERT
-        }
-
         /**
          * Creates an alert based on [title], [message], [actions] and [textInputAction] properties
          *
          * @return The alert object
          * @throws IllegalArgumentException in case missing title and/or message or actions
          */
-        protected fun createAlert(): Alert {
-            if (style == Alert.Style.ALERT) {
+        fun build(): Alert {
+            if (style == Style.ALERT) {
                 require(title != null || message != null) { "Please set title and/or message for the Alert" }
             } // Action sheet on iOS can be without title and message
 
@@ -263,14 +171,97 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
 
             return Alert(title, message, actions, textInputAction, style)
         }
+    }
+
+    /**
+     * An action that represents a button in the alert
+     *
+     * @property title The title of the action's button
+     * @property style The style that is applied to the action's button
+     * @property handler The block to execute when the user taps a button
+     */
+    data class Action(
+        val title: String,
+        val style: Style = Style.DEFAULT,
+        val handler: AlertActionHandler = {}
+    ) {
+        enum class Style(val value: Int) {
+            DEFAULT(0),
+            POSITIVE(DEFAULT.value),
+            DESTRUCTIVE(1),
+            NEUTRAL(DESTRUCTIVE.value),
+            CANCEL(2),
+            NEGATIVE(CANCEL.value)
+        }
+    }
+
+    /**
+     * An action that represents an input field in the alert and its initial state
+     *
+     * @param text The initial text of the input field
+     * @param placeholder The hint of the input field
+     * @param textObserver The block to execute when the user edits the text in the input field
+     */
+    data class TextInputAction(
+        val text: String?,
+        val placeholder: String?,
+        val textObserver: AlertTextObserver
+    )
+}
+
+/**
+ * Interface that defines actions that can be applied to the alert.
+ */
+interface AlertActions {
+    /**
+     * Presents an alert
+     *
+     * @param animated Pass `true` to animate the presentation
+     * @param completion The block to execute after the presentation finishes
+     */
+    fun showAsync(animated: Boolean = true, completion: () -> Unit = {})
+
+    /**
+     * Presents an alert and suspends
+     *
+     * @param animated
+     * @return The action that was performed by button click
+     *         or `null` if the alert was cancelled by pressing back (on Android)
+     */
+    suspend fun show(animated: Boolean = true): Alert.Action?
+
+    /**
+     * Dismisses the alert, which was presented previously
+     *
+     * @param animated Pass `true` to animate the transition
+     */
+    fun dismiss(animated: Boolean = true)
+}
+
+/**
+ * Abstract alert presenter, used to show and dismiss given [Alert]
+ * @see [AlertPresenter]
+ *
+ * @property alert The alert to present (and dismiss if needed)
+ */
+abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
+
+    /**
+     * Abstract alert builder class, used to create an [Alert].
+     * The resulting Alert that can be shown and dismissed using an [AlertPresenter].
+     *
+     * @see [AlertPresenter.Builder]
+     */
+    abstract class Builder : LifecycleSubscribableMarker {
 
         /**
          * Creates the [BaseAlertPresenter] described by this builder.
          *
+         * @param alert The [Alert] to be presented by the built presenter.
          * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
          * @return The [BaseAlertPresenter] described by this builder.
          */
-        abstract fun create(coroutineScope: CoroutineScope): BaseAlertPresenter
+        abstract fun create(alert: Alert, coroutineScope: CoroutineScope): BaseAlertPresenter
     }
 
     override fun showAsync(animated: Boolean, completion: () -> Unit) {
@@ -307,10 +298,11 @@ expect class AlertPresenter : BaseAlertPresenter {
         /**
          * Creates an [AlertPresenter]
          *
+         * @param alert The [Alert] to be presented with the built presenter.
          * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
          * @return The created [AlertPresenter]
          */
-        override fun create(coroutineScope: CoroutineScope): AlertPresenter
+        override fun create(alert: Alert, coroutineScope: CoroutineScope): AlertPresenter
     }
 }
 
@@ -321,15 +313,15 @@ expect class AlertPresenter : BaseAlertPresenter {
  * @param initialize The block to construct an Alert
  * @return The built alert interface object
  */
-suspend fun BaseAlertPresenter.Builder.buildAlert(
+fun BaseAlertPresenter.Builder.buildAlert(
     coroutineScope: CoroutineScope,
-    initialize: BaseAlertPresenter.Builder.() -> Unit
-): BaseAlertPresenter = lock.withLock {
-    reset()
-    setStyle(Alert.Style.ALERT)
-    initialize()
-    return create(coroutineScope)
-}
+    initialize: Alert.Builder.() -> Unit
+): BaseAlertPresenter = create(
+    Alert.Builder(Alert.Style.ALERT).apply {
+        initialize()
+    }.build(),
+    coroutineScope
+)
 
 /**
  * Builds an alert of type [Alert.Style.ACTION_LIST] using DSL syntax (thread safe)
@@ -338,15 +330,15 @@ suspend fun BaseAlertPresenter.Builder.buildAlert(
  * @param initialize The block to construct an Alert
  * @return The built alert interface object
  */
-suspend fun BaseAlertPresenter.Builder.buildActionSheet(
+fun BaseAlertPresenter.Builder.buildActionSheet(
     coroutineScope: CoroutineScope,
-    initialize: BaseAlertPresenter.Builder.() -> Unit
-): BaseAlertPresenter = lock.withLock {
-    reset()
-    setStyle(Alert.Style.ACTION_LIST)
-    initialize()
-    return create(coroutineScope)
-}
+    initialize: Alert.Builder.() -> Unit
+): BaseAlertPresenter = create(
+    Alert.Builder(Alert.Style.ACTION_LIST).apply {
+        initialize()
+    }.build(),
+    coroutineScope
+)
 
 /**
  * Builds an alert of type [Alert.Style.TEXT_INPUT] using DSL syntax (thread safe)
@@ -355,12 +347,12 @@ suspend fun BaseAlertPresenter.Builder.buildActionSheet(
  * @param initialize The block to construct an Alert
  * @return The built alert interface object
  */
-suspend fun BaseAlertPresenter.Builder.buildAlertWithInput(
+fun BaseAlertPresenter.Builder.buildAlertWithInput(
     coroutineScope: CoroutineScope,
-    initialize: BaseAlertPresenter.Builder.() -> Unit
-): BaseAlertPresenter = lock.withLock {
-    reset()
-    setStyle(Alert.Style.TEXT_INPUT)
-    initialize()
-    return create(coroutineScope)
-}
+    initialize: Alert.Builder.() -> Unit
+): BaseAlertPresenter = create(
+    Alert.Builder(Alert.Style.TEXT_INPUT).apply {
+        initialize()
+    }.build(),
+    coroutineScope
+)
diff --git a/alerts/src/iosMain/kotlin/AlertPresenter.kt b/alerts/src/iosMain/kotlin/AlertPresenter.kt
index d2363b9c6..3d87fd164 100644
--- a/alerts/src/iosMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/iosMain/kotlin/AlertPresenter.kt
@@ -75,7 +75,7 @@ actual class AlertPresenter(
     }
 
     actual class Builder(private val viewController: UIViewController) : BaseAlertPresenter.Builder() {
-        actual override fun create(coroutineScope: CoroutineScope) = AlertPresenter(createAlert(), viewController)
+        actual override fun create(alert: Alert, coroutineScope: CoroutineScope) = AlertPresenter(alert, viewController)
     }
 
     override fun dismissAlert(animated: Boolean) {
diff --git a/alerts/src/jsMain/kotlin/AlertPresenter.kt b/alerts/src/jsMain/kotlin/AlertPresenter.kt
index ed075a3b3..281ff6107 100644
--- a/alerts/src/jsMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/jsMain/kotlin/AlertPresenter.kt
@@ -26,8 +26,8 @@ actual class AlertPresenter(
 
     actual class Builder : BaseAlertPresenter.Builder() {
 
-        actual override fun create(coroutineScope: CoroutineScope): AlertPresenter {
-            return AlertPresenter(createAlert())
+        actual override fun create(alert: Alert, coroutineScope: CoroutineScope): AlertPresenter {
+            return AlertPresenter(alert)
         }
     }
 
diff --git a/alerts/src/jvmMain/kotlin/AlertPresenter.kt b/alerts/src/jvmMain/kotlin/AlertPresenter.kt
index ed075a3b3..281ff6107 100644
--- a/alerts/src/jvmMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/jvmMain/kotlin/AlertPresenter.kt
@@ -26,8 +26,8 @@ actual class AlertPresenter(
 
     actual class Builder : BaseAlertPresenter.Builder() {
 
-        actual override fun create(coroutineScope: CoroutineScope): AlertPresenter {
-            return AlertPresenter(createAlert())
+        actual override fun create(alert: Alert, coroutineScope: CoroutineScope): AlertPresenter {
+            return AlertPresenter(alert)
         }
     }
 
diff --git a/architecture/src/commonMain/kotlin/observable/Observables.kt b/architecture/src/commonMain/kotlin/observable/Observables.kt
index c9fcfcd06..aca239e07 100644
--- a/architecture/src/commonMain/kotlin/observable/Observables.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observables.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.architecture.observable
 
-import com.splendo.kaluga.architecture.observable.ObservableOptional.*
+import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
 import com.splendo.kaluga.base.flow.HotFlowable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
diff --git a/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt b/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
index 9819c9e54..1b7ed7772 100644
--- a/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
+++ b/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
@@ -158,9 +158,9 @@ abstract class ObservableBaseTest : BaseTest() {
         *updates.map { it.asUpdate() }.toTypedArray()
     )
 
-    private val updateSemaphore = AtomicReference<Semaphore?>(null)
+    private var updateSemaphore: Semaphore? = null
     suspend fun waitForUpdate() {
-        updateSemaphore.get()?.acquire() ?: error("call testObservable to collect your flowOfWithDelays instead of doing this directly")
+        updateSemaphore?.acquire() ?: error("call testObservable to collect your flowOfWithDelays instead of doing this directly")
     }
 
     suspend fun <R : T, T, OO : ObservableOptional<R>, O : BasicObservable<R, T, OO>> testObservable(
@@ -171,8 +171,8 @@ abstract class ObservableBaseTest : BaseTest() {
         vararg updates: (O) -> ObservableOptional<R>
     ) {
         val permits = updates.size + 1 // +1 for initial state
-        val semaphore = Semaphore(permits).freeze()
-        updateSemaphore.set(semaphore)
+        val semaphore = Semaphore(permits)
+        updateSemaphore = semaphore
         repeat(permits) { semaphore.acquire() }
 
         val observableOptional by observable
@@ -206,7 +206,7 @@ abstract class ObservableBaseTest : BaseTest() {
         var disposableInitialized: Disposable? = null
         if (observable is Initialized<*, *>) {
             observedInitializedValue = unusedValue
-            disposableInitialized = (observable as Initialized<R, T>).observeInitialized { observedInitializedValue.set(it) }
+            disposableInitialized = (observable as Initialized<R, T>).observeInitialized { observedInitializedValue = it }
         }
 
         when (initialExpected) {
diff --git a/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt b/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
index 657fb55d9..0ee29847b 100644
--- a/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
+++ b/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
@@ -19,6 +19,8 @@ package com.splendo.kaluga.architecture.viewmodel
 
 import com.splendo.kaluga.architecture.observable.Disposable
 import com.splendo.kaluga.architecture.observable.DisposeBag
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import platform.UIKit.UIViewController
 import platform.UIKit.addChildViewController
 import platform.UIKit.addSubview
@@ -66,8 +68,10 @@ internal class ViewModelLifecycleManager<VM : BaseLifecycleViewModel>(private va
         super.viewDidAppear(animated)
 
         viewModel.didResume()
-        onLifecycle().forEach {
-            lifecycleManager.disposeBag.add(it)
+        MainScope().launch {
+            onLifecycle().forEach {
+                lifecycleManager.disposeBag.add(it)
+            }
         }
     }
 
@@ -75,7 +79,9 @@ internal class ViewModelLifecycleManager<VM : BaseLifecycleViewModel>(private va
         super.viewDidDisappear(animated)
 
         viewModel.didPause()
-        lifecycleManager.disposeBag.dispose()
+        MainScope().launch {
+            lifecycleManager.disposeBag.dispose()
+        }
     }
 }
 
diff --git a/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt b/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
index c23e2c733..ed34ed6a7 100644
--- a/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
+++ b/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
@@ -18,8 +18,6 @@
 package com.splendo.kaluga.architecture.observable
 
 import com.splendo.kaluga.base.runBlocking
-import com.splendo.kaluga.test.base.assertFrozen
-import com.splendo.kaluga.test.base.assertNotFrozen
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlin.test.Test
@@ -32,32 +30,19 @@ class ThreadingTest {
     @Test
     fun testThreadingMainOnly() = runBlocking(Dispatchers.Main) {
         val s = subjectOf<Value?>(null)
-        assertNotFrozen(s)
         val value = Value()
 
-        assertNotFrozen(value)
-        assertNotFrozen(s)
         s.set(value)
         assertEquals(value, s.currentOrNull)
-
-        // still nothing should be frozen
-        assertNotFrozen(value)
-        assertNotFrozen(s)
-
         assertEquals(value, s.stateFlow.value)
-        assertNotFrozen(value) // using StateFlow from the same thread should not freeze the value
-        assertNotFrozen(s) // the subject itself is also not frozen
     }
 
     @Test
     fun testThreadingDefaultThenMain() = runBlocking(Dispatchers.Default) {
         val s = subjectOf<Value?>(null)
         withContext(Dispatchers.Main) {
-            assertFrozen(s) // due to the context switch the subject itself is frozen
             val value = Value()
-            assertNotFrozen(value) // of course not
             s.set(value)
-            assertFrozen(value) // due to the context switch the var inside subject is frozen
         }
     }
 
@@ -65,29 +50,22 @@ class ThreadingTest {
     fun testThreadingMainThenDefault() = runBlocking(Dispatchers.Main) {
         val s = subjectOf<Value?>(null)
         val value = Value()
-        s.stateFlow.value = value
-        assertNotFrozen(value)
+        s.set(value)
         withContext(Dispatchers.Default) {
-            assertFrozen(s) // due to the context switch the subject itself is frozen
-            assertFrozen(value)
+            assertEquals(value, s.currentOrNull)
+            assertEquals(value, s.stateFlow.value)
         }
     }
 
     @Test
     fun testThreadingMainThenDefaultObservers() = runBlocking(Dispatchers.Main) {
         val s = subjectOf<Value?>(null)
-        val value = Value()
         val observer: (Value?) -> Unit = { }
         val disposable = s.observe(observer)
-        assertNotFrozen(value)
 
         withContext(Dispatchers.Default) {
-            // due to the context switch the subject itself is frozen
-            assertFrozen(s)
-            assertFrozen(value)
             val observer2: (Value?) -> Unit = { }
             val disposable2 = s.observe(observer2)
-            assertFrozen(observer2)
 
             disposable2.dispose()
         }
diff --git a/base-permissions/src/androidLibTest/kotlin/AndroidPermissionsManagerTest.kt b/base-permissions/src/androidLibTest/kotlin/AndroidPermissionsManagerTest.kt
index 0b5fe91aa..8dfaf2adf 100644
--- a/base-permissions/src/androidLibTest/kotlin/AndroidPermissionsManagerTest.kt
+++ b/base-permissions/src/androidLibTest/kotlin/AndroidPermissionsManagerTest.kt
@@ -24,7 +24,8 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.test.base.BaseTest
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.yield
 import org.junit.Test
 import org.mockito.ArgumentMatchers
@@ -64,11 +65,26 @@ class AndroidPermissionsManagerTest : BaseTest() {
     @BeforeTest
     override fun beforeTest() {
         super.beforeTest()
-        MockitoAnnotations.initMocks(this)
+        MockitoAnnotations.openMocks(this)
 
         `when`(context.packageManager).thenReturn(packageManager)
         `when`(context.packageName).thenReturn(packageName)
-        `when`(packageManager.getPackageInfo(Mockito.eq(packageName), Mockito.eq(PackageManager.GET_PERMISSIONS))).thenReturn(packageInfo)
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+            `when`(
+                packageManager.getPackageInfo(
+                    Mockito.eq(packageName),
+                    Mockito.eq(PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS.toLong()))
+                )
+            )
+        } else {
+            @Suppress("DEPRECATION")
+            `when`(
+                packageManager.getPackageInfo(
+                    Mockito.eq(packageName),
+                    Mockito.eq(PackageManager.GET_PERMISSIONS)
+                )
+            )
+        }.thenReturn(packageInfo)
         AndroidPermissionsManager.permissionsStates.clear()
     }
 
@@ -78,7 +94,7 @@ class AndroidPermissionsManagerTest : BaseTest() {
     }
 
     @Test
-    fun testMissingDeclaration() = runBlockingTest {
+    fun testMissingDeclaration() = runTest(UnconfinedTestDispatcher()) {
         val onPermissionChanged = MockPermissionStateHandler()
         androidPermissionsManager = AndroidPermissionsManager(context, permissions, this, onPermissionChanged = onPermissionChanged)
         packageInfo.requestedPermissions = emptyArray()
@@ -88,7 +104,7 @@ class AndroidPermissionsManagerTest : BaseTest() {
     }
 
     @Test
-    fun testRequestPermissions() = runBlockingTest {
+    fun testRequestPermissions() = runTest(UnconfinedTestDispatcher()) {
         val onPermissionChangedFlow = MockPermissionStateHandler()
         androidPermissionsManager = AndroidPermissionsManager(context, permissions, this, onPermissionChanged = onPermissionChangedFlow)
         packageInfo.requestedPermissions = permissions
diff --git a/base-permissions/src/commonMain/kotlin/Permission.kt b/base-permissions/src/commonMain/kotlin/Permission.kt
index e5d009917..1997c1139 100644
--- a/base-permissions/src/commonMain/kotlin/Permission.kt
+++ b/base-permissions/src/commonMain/kotlin/Permission.kt
@@ -108,7 +108,6 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
         repoBuilders.getOrPut(permission) { createPermissionStateRepoBuilder(permissionStateRepoBuilder) } as PermissionStateRepoBuilder<P>
     }
 
-
     suspend fun <P : Permission> unregisterPermissionStateRepoBuilder(permission: P) {
         repoBuildersLock.withLock {
             repoBuilders.remove(permission::class)
diff --git a/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt b/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt
index 5fd2695a5..aaa7f2600 100644
--- a/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt
+++ b/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt
@@ -78,12 +78,12 @@ class PermissionRefreshScheduler(
             val timerJobState = timerState
             if (timerJobState is TimerJobState.TimerNotRunning) {
                 this.timerState = timerJobState.startTimer(interval, this) {
-                        val status = currentAuthorizationStatusProvider.provide()
-                        if (!waitingLock.isLocked && lastPermission != status) {
-                            lastPermission = currentAuthorizationStatusProvider.provide()
-                            onPermissionChangedFlow.status(status)
-                        }
+                    val status = currentAuthorizationStatusProvider.provide()
+                    if (!waitingLock.isLocked && lastPermission != status) {
+                        lastPermission = currentAuthorizationStatusProvider.provide()
+                        onPermissionChangedFlow.status(status)
                     }
+                }
             }
         }
     }
diff --git a/base/src/commonMain/kotlin/state/KalugaState.kt b/base/src/commonMain/kotlin/state/KalugaState.kt
index 450514936..5633e7bce 100644
--- a/base/src/commonMain/kotlin/state/KalugaState.kt
+++ b/base/src/commonMain/kotlin/state/KalugaState.kt
@@ -359,9 +359,11 @@ abstract class BaseHotStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
             val isInitialized = lazyMutableSharedFlow.isInitialized()
             val flow = lazyMutableSharedFlow.value
             launch(coroutineContext) {
-                if (lock.withLock {
+                if (
+                    lock.withLock {
                         (!isInitialized && !initialized).also { if (it) initialized = true }
-                    }) {
+                    }
+                ) {
                     initialize()
                 }
             }
@@ -393,13 +395,13 @@ abstract class BaseColdStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
             val isInitialized = lazyMutableFlow.isInitialized()
             val flow = lazyMutableFlow.value
             launch(coroutineContext) {
-                if (lock.withLock {
+                if (
+                    lock.withLock {
                         (!isInitialized && !initialized).also {
                             if (it) initialized = true
                         }
                     }
-                )
-                {
+                ) {
                     flow.onCollectionEvent { event ->
                         when (event) {
                             NoMoreCollections -> noMoreCollections().also { it.finalState() }
diff --git a/base/src/commonTest/kotlin/AtomicReferenceTest.kt b/base/src/commonTest/kotlin/AtomicReferenceTest.kt
deleted file mode 100644
index 30b4a9b22..000000000
--- a/base/src/commonTest/kotlin/AtomicReferenceTest.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertNull
-
-class AtomicReferenceTest {
-
-    @Test
-    fun testAtomicReferenceDelegate() {
-
-        data class Class(val property: Int)
-
-        var reference: Class? by AtomicReferenceDelegate(Class(0))
-        assertEquals(0, reference?.property)
-        reference = Class(1)
-        assertEquals(1, reference?.property)
-        reference = null
-        assertNull(reference)
-    }
-}
diff --git a/base/src/iosMain/kotlin/GCScheduler.kt b/base/src/iosMain/kotlin/GCScheduler.kt
index 9c00ee80f..0a655635c 100644
--- a/base/src/iosMain/kotlin/GCScheduler.kt
+++ b/base/src/iosMain/kotlin/GCScheduler.kt
@@ -22,7 +22,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlin.native.internal.GC
 
-
 object GCScheduler {
 
     private val collectingMutex = Mutex()
diff --git a/beacons/src/commonMain/kotlin/Beacons.kt b/beacons/src/commonMain/kotlin/Beacons.kt
index cf72c9fd3..9b2d8964d 100644
--- a/beacons/src/commonMain/kotlin/Beacons.kt
+++ b/beacons/src/commonMain/kotlin/Beacons.kt
@@ -34,13 +34,15 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
 private typealias BeaconJob = Pair<BeaconInfo, Job>
 private typealias BeaconsMap = MutableMap<BeaconID, BeaconJob>
 
 class Beacons(
     private val bluetooth: BluetoothService,
-    private val timeoutMs: Long = 10_000,
+    private val timeout: Duration = 10.seconds,
 ) {
 
     private companion object { const val TAG = "Beacons" }
@@ -48,7 +50,7 @@ class Beacons(
     private val cache = mutableMapOf<BeaconID, BeaconJob>()
     private val cacheJob = Job()
     private val coroutineScope = CoroutineScope(Dispatchers.Default + cacheJob)
-    private var monitoringJob: Job? by AtomicReferenceDelegate()
+    private var monitoringJob: Job? = null
 
     private val _beacons = MutableStateFlow(emptySet<BeaconInfo>())
     val beacons: StateFlow<Set<BeaconInfo>>
@@ -92,7 +94,7 @@ class Beacons(
             }
             cache[beacon.beaconID] = beacon to coroutineScope.launch {
                 debug(TAG, "[Added] $beacon")
-                delay(beacon.lastSeen.millisecondSinceEpoch + timeoutMs - DefaultKalugaDate.now().millisecondSinceEpoch)
+                delay(beacon.lastSeen.millisecondSinceEpoch + timeout.inWholeMilliseconds - DefaultKalugaDate.now().millisecondSinceEpoch)
                 debug(TAG, "[Lost] $beacon")
                 cache.remove(beacon.beaconID)
                 updateList()
diff --git a/beacons/src/commonTest/kotlin/BeaconFlowTest.kt b/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
index 55509481f..474c989b5 100644
--- a/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
@@ -20,13 +20,15 @@ package com.splendo.kaluga.bluetooth.beacons
 import com.splendo.kaluga.bluetooth.device.Device
 import com.splendo.kaluga.test.base.SimpleFlowTest
 import kotlinx.coroutines.CoroutineScope
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
 abstract class BeaconFlowTest(
-    timeoutMs: Long = 3_000
+    timeout: Duration = 3.seconds
 ) : SimpleFlowTest<Set<BeaconInfo>>() {
 
     private val bluetooth = BluetoothMock(scope)
-    private val beacons = Beacons(bluetooth, timeoutMs = timeoutMs)
+    private val beacons = Beacons(bluetooth, timeout = timeout)
 
     override val flow = suspend { beacons.beacons }
 
diff --git a/beacons/src/commonTest/kotlin/BeaconLostTest.kt b/beacons/src/commonTest/kotlin/BeaconLostTest.kt
index b0703479f..d3aa02703 100644
--- a/beacons/src/commonTest/kotlin/BeaconLostTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconLostTest.kt
@@ -22,8 +22,9 @@ import kotlinx.coroutines.delay
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
 
-class BeaconLostTest : BeaconFlowTest(timeoutMs = 2_000) {
+class BeaconLostTest : BeaconFlowTest(timeout = 2.seconds) {
 
     @Test
     fun testLostOnTimeout() = testWithFlow {
diff --git a/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt
index 4223453be..c4b40d3e3 100644
--- a/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt
@@ -8,17 +8,17 @@ import com.splendo.kaluga.bluetooth.scanner.DefaultScanner
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
-import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermission
-import com.splendo.kaluga.permissions.location.registerLocationPermission
+import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNotRegistered
+import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
 import kotlin.coroutines.CoroutineContext
 
 actual class BluetoothBuilder(
     private val applicationContext: Context = ApplicationHolder.applicationContext,
-    private val permissionsBuilder: (CoroutineContext) -> Permissions = { context ->
+    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
             PermissionsBuilder(PermissionContext(applicationContext)).apply {
-                registerBluetoothPermission()
-                registerLocationPermission()
+                registerBluetoothPermissionIfNotRegistered()
+                registerLocationPermissionIfNotRegistered()
             },
             coroutineContext = context
         )
diff --git a/bluetooth/src/commonMain/kotlin/Bluetooth.kt b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
index 7b415715c..74a22fa4e 100644
--- a/bluetooth/src/commonMain/kotlin/Bluetooth.kt
+++ b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
@@ -64,7 +64,7 @@ interface BluetoothService {
 }
 
 class Bluetooth internal constructor(
-    scannerSettingsBuilder: (CoroutineContext) -> BaseScanner.Settings,
+    scannerSettingsBuilder: suspend (CoroutineContext) -> BaseScanner.Settings,
     connectionSettings: ConnectionSettings,
     scannerBuilder: BaseScanner.Builder,
     coroutineContext: CoroutineContext,
diff --git a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
index bcea97016..75540831a 100644
--- a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -150,6 +150,7 @@ abstract class BaseDeviceConnectionManager(
 
     override fun handleDisconnect(onDisconnect: (suspend () -> Unit)?) {
         val currentAction = this.currentAction
+        currentAction?.completedSuccessfully?.cancel()
         val notifyingCharacteristics = this.notifyingCharacteristics
         val clean = suspend {
             this.currentAction = null
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
index 9402245fd..3af108290 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
@@ -59,7 +59,7 @@ abstract class BaseScanningStateRepo(
 )
 
 open class ScanningStateImplRepo(
-    createScanner: () -> Scanner,
+    createScanner: suspend () -> Scanner,
     private val createDevice: (Identifier, DeviceInfoImpl, DeviceWrapper, BaseDeviceConnectionManager.Builder) -> Device,
     coroutineContext: CoroutineContext
 ) : BaseScanningStateRepo(
@@ -138,7 +138,7 @@ open class ScanningStateImplRepo(
 }
 
 class ScanningStateRepo(
-    settingsBuilder: (CoroutineContext) -> BaseScanner.Settings,
+    settingsBuilder: suspend (CoroutineContext) -> BaseScanner.Settings,
     builder: BaseScanner.Builder,
     createDevice: (Identifier, DeviceInfoImpl, DeviceWrapper, BaseDeviceConnectionManager.Builder) -> Device,
     coroutineContext: CoroutineContext,
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothFlowTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothFlowTest.kt
index 47a242696..4de81a1a4 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothFlowTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothFlowTest.kt
@@ -148,9 +148,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
 
         val permissionsBuilder: MockPermissionsBuilder = MockPermissionsBuilder(
             initialActiveState = configuration.initialPermissionState
-        ).apply {
-            registerAllPermissionsBuilders()
-        }
+        )
 
         val permissionStateRepo get() = permissionsBuilder.buildBluetoothStateRepos.first()
 
@@ -159,6 +157,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
 
         val bluetooth = Bluetooth(
             { scannerContext ->
+                permissionsBuilder.registerAllPermissionsBuilders()
                 BaseScanner.Settings(
                     Permissions(
                         permissionsBuilder,
diff --git a/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
index c057f30b8..92d5ce2e5 100644
--- a/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
@@ -5,7 +5,7 @@ import com.splendo.kaluga.bluetooth.scanner.BaseScanner
 import com.splendo.kaluga.bluetooth.scanner.DefaultScanner
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
-import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermission
+import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNotRegistered
 import platform.Foundation.NSBundle
 import kotlin.coroutines.CoroutineContext
 
@@ -14,7 +14,7 @@ actual class BluetoothBuilder(
     private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
             PermissionsBuilder(bundle).apply {
-                registerBluetoothPermission()
+                registerBluetoothPermissionIfNotRegistered()
             },
             context
         )
diff --git a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
index c2db6d850..b81a75686 100644
--- a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -204,7 +204,7 @@ internal actual class DefaultDeviceConnectionManager(
         handleUpdatedDescriptor(descriptor.UUID, succeeded = error == null)
     }
 
-    private suspend fun didDiscoverServices() {
+    private fun didDiscoverServices() {
         launch {
             discoveringMutext.withLock {
                 discoveringServices.addAll(
@@ -234,7 +234,7 @@ internal actual class DefaultDeviceConnectionManager(
         }
     }
 
-    private suspend fun didDiscoverDescriptors(forCharacteristic: CBCharacteristic) {
+    private fun didDiscoverDescriptors(forCharacteristic: CBCharacteristic) {
         launch {
             discoveringMutext.withLock {
                 discoveringCharacteristics.remove(forCharacteristic.UUID)
diff --git a/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt
index ef957e53e..bcf292f32 100644
--- a/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt
@@ -5,14 +5,14 @@ import com.splendo.kaluga.bluetooth.scanner.BaseScanner
 import com.splendo.kaluga.bluetooth.scanner.DefaultScanner
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
-import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermission
+import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNotRegistered
 import kotlin.coroutines.CoroutineContext
 
 actual class BluetoothBuilder(
-    private val permissionsBuilder: (CoroutineContext) -> Permissions = { context ->
+    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
             PermissionsBuilder().apply {
-                registerBluetoothPermission()
+                registerBluetoothPermissionIfNotRegistered()
             },
             context
         )
diff --git a/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt
index ef957e53e..bcf292f32 100644
--- a/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt
@@ -5,14 +5,14 @@ import com.splendo.kaluga.bluetooth.scanner.BaseScanner
 import com.splendo.kaluga.bluetooth.scanner.DefaultScanner
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
-import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermission
+import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNotRegistered
 import kotlin.coroutines.CoroutineContext
 
 actual class BluetoothBuilder(
-    private val permissionsBuilder: (CoroutineContext) -> Permissions = { context ->
+    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
             PermissionsBuilder().apply {
-                registerBluetoothPermission()
+                registerBluetoothPermissionIfNotRegistered()
             },
             context
         )
diff --git a/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt b/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
index 5c109a805..edfd4d7c0 100644
--- a/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
+++ b/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
@@ -18,9 +18,9 @@
 package com.splendo.kaluga.permissions.calendar
 
 import com.splendo.kaluga.logging.error
-import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
 import com.splendo.kaluga.permissions.base.CurrentAuthorizationStatusProvider
+import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.IOSPermissionsHelper
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionRefreshScheduler
@@ -35,7 +35,6 @@ import platform.EventKit.EKAuthorizationStatusRestricted
 import platform.EventKit.EKEntityType
 import platform.EventKit.EKEventStore
 import platform.Foundation.NSBundle
-import platform.Foundation.NSError
 import kotlin.time.Duration
 
 const val NSCalendarsUsageDescription = "NSCalendarsUsageDescription"
diff --git a/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt b/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
index df9135897..b4e3c0785 100644
--- a/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
+++ b/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
@@ -18,9 +18,9 @@
 package com.splendo.kaluga.permissions.contacts
 
 import com.splendo.kaluga.logging.error
-import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
 import com.splendo.kaluga.permissions.base.CurrentAuthorizationStatusProvider
+import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.IOSPermissionsHelper
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionRefreshScheduler
@@ -35,7 +35,6 @@ import platform.Contacts.CNAuthorizationStatusRestricted
 import platform.Contacts.CNContactStore
 import platform.Contacts.CNEntityType
 import platform.Foundation.NSBundle
-import platform.Foundation.NSError
 import kotlin.time.Duration
 
 const val NSContactsUsageDescription = "NSContactsUsageDescription"
diff --git a/date-time-picker/src/androidLibAndroidTest/kotlin/AndroidDateTimePickerPresenterTest.kt b/date-time-picker/src/androidLibAndroidTest/kotlin/AndroidDateTimePickerPresenterTest.kt
index 82e4f3aaa..6f996c5e4 100644
--- a/date-time-picker/src/androidLibAndroidTest/kotlin/AndroidDateTimePickerPresenterTest.kt
+++ b/date-time-picker/src/androidLibAndroidTest/kotlin/AndroidDateTimePickerPresenterTest.kt
@@ -37,6 +37,7 @@ import kotlin.test.Ignore
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
 
 class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
 
@@ -55,7 +56,7 @@ class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
     override val builder get() = activity!!.viewModel.dateTimePickerBuilder
 
     companion object {
-        const val DEFAULT_TIMEOUT = 20_000L
+        val DEFAULT_TIMEOUT = 20.seconds.inWholeMilliseconds
     }
 
     @Test
diff --git a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
index 93d4fbb68..d3bed6c38 100644
--- a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
@@ -45,7 +45,10 @@ actual class DateTimePickerPresenter(
         private val themeResourceId: Int = 0,
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
     ) : BaseDateTimePickerPresenter.Builder(), LifecycleSubscribable by lifecycleManagerObserver {
-        actual override fun create(coroutineScope: CoroutineScope) = DateTimePickerPresenter(createDateTimePicker(), themeResourceId, lifecycleManagerObserver, coroutineScope)
+        actual override fun create(
+            dateTimePicker: DateTimePicker,
+            coroutineScope: CoroutineScope
+        ) = DateTimePickerPresenter(dateTimePicker, themeResourceId, lifecycleManagerObserver, coroutineScope)
     }
 
     private sealed class DialogPresentation {
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 2f0b3cd35..974bc4a69 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -25,8 +25,6 @@ import com.splendo.kaluga.base.utils.Locale
 import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlin.coroutines.resume
 
 data class DateTimePicker(
@@ -56,59 +54,13 @@ data class DateTimePicker(
          */
         object TimeType : Type()
     }
-}
-
-/**
- * Interface that defines actions that can be applied to the alert.
- */
-interface DateTimePickerActions {
-    /**
-     * Presents an DateTimePicker
-     *
-     * @param animated Pass `true` to animate the presentation
-     * @param completion The callback invoked when a Date is selected or the dialog is cancelled
-     */
-    fun showAsync(animated: Boolean = true, completion: (KalugaDate?) -> Unit = {})
-
-    /**
-     * Presents an DateTimePicker and suspends
-     *
-     * @param animated
-     * @return The [KalugaDate] that was selected or `null` if the DateTimePicker was cancelled
-     */
-    suspend fun show(animated: Boolean = true): KalugaDate?
-
-    /**
-     * Dismisses the DateTimePicker, which was presented previously
-     *
-     * @param animated Pass `true` to animate the transition
-     */
-    fun dismiss(animated: Boolean)
-}
-
-/**
- * Abstract DateTimePicker presenter, used to show and dismiss given [DateTimePicker]
- * @see [DateTimePickerPresenter]
- *
- * @property dateTimePicker The alert to present (and dismiss if needed)
- */
-abstract class BaseDateTimePickerPresenter(private val dateTimePicker: DateTimePicker) : DateTimePickerActions {
-
-    /**
-     * Abstract alert builder class, used to create an [DateTimePicker].
-     * The resulting DateTimePicker that can be shown and dismissed using an [DateTimePickerPresenter].
-     *
-     * @see [DateTimePickerPresenter.Builder]
-     */
-    abstract class Builder : LifecycleSubscribableMarker {
 
+    class Builder(private var type: Type = Type.TimeType) {
         private var message: String? = null
         private var cancelButtonTitle: String = ""
         private var confirmButtonTitle: String = ""
         private var locale: Locale = defaultLocale
         private var selectedDate: KalugaDate = DefaultKalugaDate.epoch()
-        private var type: DateTimePicker.Type = DateTimePicker.Type.TimeType
-        internal val lock = Mutex()
 
         /**
          * Sets the [message] displayed in the DateTimePicker
@@ -139,39 +91,74 @@ abstract class BaseDateTimePickerPresenter(private val dateTimePicker: DateTimeP
          *
          * @param type The style of an alert
          */
-        internal fun setType(type: DateTimePicker.Type) = apply { this.type = type }
-
-        /**
-         * Reset builder into initial state
-         */
-        internal fun reset() = apply {
-            this.message = null
-            this.cancelButtonTitle = ""
-            this.confirmButtonTitle = ""
-            this.locale = defaultLocale
-            this.selectedDate = DefaultKalugaDate.epoch()
-            this.type = DateTimePicker.Type.TimeType
-        }
+        internal fun setType(type: Type) = apply { this.type = type }
 
         /**
-         * Creates a DataTimePicker
+         * Creates a [DateTimePicker]
          *
-         * @return The DateTimePicker object
+         * @return The [DateTimePicker] object
          * @throws IllegalArgumentException in case missing cancel or confirm titles
          */
-        protected fun createDateTimePicker(): DateTimePicker {
+        fun build(): DateTimePicker {
             require(cancelButtonTitle.isNotEmpty() && confirmButtonTitle.isNotEmpty()) { "Please set Cancel and Confirm Titles" }
 
             return DateTimePicker(message, cancelButtonTitle, confirmButtonTitle, type, locale, selectedDate)
         }
+    }
+}
+
+/**
+ * Interface that defines actions that can be applied to the alert.
+ */
+interface DateTimePickerActions {
+    /**
+     * Presents an DateTimePicker
+     *
+     * @param animated Pass `true` to animate the presentation
+     * @param completion The callback invoked when a Date is selected or the dialog is cancelled
+     */
+    fun showAsync(animated: Boolean = true, completion: (KalugaDate?) -> Unit = {})
+
+    /**
+     * Presents an DateTimePicker and suspends
+     *
+     * @param animated
+     * @return The [KalugaDate] that was selected or `null` if the DateTimePicker was cancelled
+     */
+    suspend fun show(animated: Boolean = true): KalugaDate?
+
+    /**
+     * Dismisses the DateTimePicker, which was presented previously
+     *
+     * @param animated Pass `true` to animate the transition
+     */
+    fun dismiss(animated: Boolean)
+}
+
+/**
+ * Abstract DateTimePicker presenter, used to show and dismiss given [DateTimePicker]
+ * @see [DateTimePickerPresenter]
+ *
+ * @property dateTimePicker The alert to present (and dismiss if needed)
+ */
+abstract class BaseDateTimePickerPresenter(private val dateTimePicker: DateTimePicker) : DateTimePickerActions {
+
+    /**
+     * Abstract alert builder class, used to create an [DateTimePicker].
+     * The resulting DateTimePicker that can be shown and dismissed using an [DateTimePickerPresenter].
+     *
+     * @see [DateTimePickerPresenter.Builder]
+     */
+    abstract class Builder : LifecycleSubscribableMarker {
 
         /**
          * Creates the [BaseDateTimePickerPresenter] described by this builder.
          *
+         * @param dateTimePicker The [DateTimePicker] to be presented with the built presenter
          * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
          * @return The [BaseDateTimePickerPresenter] described by this builder.
          */
-        abstract fun create(coroutineScope: CoroutineScope): BaseDateTimePickerPresenter
+        abstract fun create(dateTimePicker: DateTimePicker, coroutineScope: CoroutineScope): BaseDateTimePickerPresenter
     }
 
     override fun showAsync(animated: Boolean, completion: (KalugaDate?) -> Unit) {
@@ -207,10 +194,11 @@ expect class DateTimePickerPresenter : BaseDateTimePickerPresenter {
         /**
          * Creates DateTimePickerPresenter object
          *
+         * @param dateTimePicker The [DateTimePicker] to be presented with the built presenter.
          * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
          * @return The DateTimePickerPresenter object
          */
-        override fun create(coroutineScope: CoroutineScope): DateTimePickerPresenter
+        override fun create(dateTimePicker: DateTimePicker, coroutineScope: CoroutineScope): DateTimePickerPresenter
     }
 }
 
@@ -218,20 +206,20 @@ expect class DateTimePickerPresenter : BaseDateTimePickerPresenter {
  * Builds an alert using DSL syntax (thread safe)
  *
  * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
- * @param initialize The block to construct an Alert
+ * @param initialize The block to construct an [DateTimePicker]
  * @return The built alert interface object
  */
-suspend fun BaseDateTimePickerPresenter.Builder.buildDatePicker(
+fun BaseDateTimePickerPresenter.Builder.buildDatePicker(
     coroutineScope: CoroutineScope,
     earliestDate: KalugaDate? = null,
     latestDate: KalugaDate? = null,
-    initialize: BaseDateTimePickerPresenter.Builder.() -> Unit
-): BaseDateTimePickerPresenter = lock.withLock {
-    reset()
-    setType(DateTimePicker.Type.DateType(earliestDate, latestDate))
-    initialize()
-    return create(coroutineScope)
-}
+    initialize: DateTimePicker.Builder.() -> Unit
+): BaseDateTimePickerPresenter = create(
+    DateTimePicker.Builder(DateTimePicker.Type.DateType(earliestDate, latestDate)).apply {
+        initialize()
+    }.build(),
+    coroutineScope
+)
 
 /**
  * Builds an alert using DSL syntax (thread safe)
@@ -240,9 +228,12 @@ suspend fun BaseDateTimePickerPresenter.Builder.buildDatePicker(
  * @param initialize The block to construct an Alert
  * @return The built alert interface object
  */
-suspend fun BaseDateTimePickerPresenter.Builder.buildTimePicker(coroutineScope: CoroutineScope, initialize: BaseDateTimePickerPresenter.Builder.() -> Unit): BaseDateTimePickerPresenter = lock.withLock {
-    reset()
-    setType(DateTimePicker.Type.TimeType)
-    initialize()
-    return create(coroutineScope)
-}
+fun BaseDateTimePickerPresenter.Builder.buildTimePicker(
+    coroutineScope: CoroutineScope,
+    initialize: DateTimePicker.Builder.() -> Unit
+): BaseDateTimePickerPresenter = create(
+    DateTimePicker.Builder(DateTimePicker.Type.TimeType).apply {
+        initialize()
+    }.build(),
+    coroutineScope
+)
diff --git a/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
index ee1f7b492..fee0dc399 100644
--- a/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
@@ -156,8 +156,10 @@ actual class DateTimePickerPresenter(
     }
 
     actual class Builder(private val viewController: UIViewController) : BaseDateTimePickerPresenter.Builder() {
-        actual override fun create(coroutineScope: CoroutineScope) =
-            DateTimePickerPresenter(createDateTimePicker(), viewController)
+        actual override fun create(
+            dateTimePicker: DateTimePicker,
+            coroutineScope: CoroutineScope
+        ) = DateTimePickerPresenter(dateTimePicker, viewController)
     }
 
     override fun dismissDateTimePicker(animated: Boolean) {
diff --git a/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt
index fb8c4e791..53f834c8c 100644
--- a/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt
@@ -27,8 +27,8 @@ actual class DateTimePickerPresenter(
 
     actual class Builder : BaseDateTimePickerPresenter.Builder() {
 
-        actual override fun create(coroutineScope: CoroutineScope): DateTimePickerPresenter {
-            return DateTimePickerPresenter(createDateTimePicker())
+        actual override fun create(dateTimePicker: DateTimePicker, coroutineScope: CoroutineScope): DateTimePickerPresenter {
+            return DateTimePickerPresenter(dateTimePicker)
         }
     }
 
diff --git a/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt
index 26e82477f..ed9e7b7bf 100644
--- a/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt
@@ -26,8 +26,8 @@ actual class DateTimePickerPresenter(
 
     actual class Builder : BaseDateTimePickerPresenter.Builder() {
 
-        actual override fun create(coroutineScope: CoroutineScope): DateTimePickerPresenter {
-            return DateTimePickerPresenter(createDateTimePicker())
+        actual override fun create(dateTimePicker: DateTimePicker, coroutineScope: CoroutineScope): DateTimePickerPresenter {
+            return DateTimePickerPresenter(dateTimePicker)
         }
     }
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt b/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
index 7a20aa8d9..025e57dea 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
@@ -79,6 +79,7 @@ import com.splendo.kaluga.permissions.registerAllPermissions
 import com.splendo.kaluga.resources.StyledStringBuilder
 import com.splendo.kaluga.review.ReviewManager
 import com.splendo.kaluga.system.network.state.NetworkStateRepoBuilder
+import kotlin.time.Duration.Companion.minutes
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 
@@ -99,7 +100,7 @@ val utilitiesModule = module {
     single {
         BluetoothBuilder().create({ BaseScanner.Settings(get()) })
     }
-    single { Beacons(get<Bluetooth>(), timeoutMs = 60_000) }
+    single { Beacons(get<Bluetooth>(), timeout = 1.minutes) }
 }
 
 val viewModelModule = module {
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt
index e00f0884c..fe4e4166a 100644
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt
+++ b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.bluetooth.BluetoothBuilder
 import com.splendo.kaluga.bluetooth.beacons.Beacons
 import com.splendo.kaluga.bluetooth.device.ConnectionSettings
 import com.splendo.kaluga.bluetooth.scanner.BaseScanner
+import kotlin.time.Duration.Companion.minutes
 import kotlinx.coroutines.MainScope
 import permissions.KNPermissionsFramework
 
@@ -33,6 +34,6 @@ class KNBeaconsFramework {
             ConnectionSettings(),
             singleThreadDispatcher("Bluetooth")
         ),
-        timeoutMs = 60_000
+        timeout = 1.minutes
     )
 }
diff --git a/hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt b/hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt
index 656bc4b11..a221be9c4 100644
--- a/hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt
+++ b/hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt
@@ -42,8 +42,9 @@ import kotlin.test.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
 
-const val DEFAULT_TIMEOUT = 20_000L
+val DEFAULT_TIMEOUT = 20.seconds.inWholeMilliseconds
 
 fun UiDevice.assertTextAppears(text: String) {
     waitForIdle()
diff --git a/hud/src/commonMain/kotlin/HUD.kt b/hud/src/commonMain/kotlin/HUD.kt
index 60c1e0bd0..983938e7f 100644
--- a/hud/src/commonMain/kotlin/HUD.kt
+++ b/hud/src/commonMain/kotlin/HUD.kt
@@ -23,8 +23,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 
 /**
  * Style of the Loading Indicator
@@ -46,26 +44,6 @@ abstract class BaseHUD(coroutineScope: CoroutineScope) : CoroutineScope by corou
      */
     abstract class Builder : LifecycleSubscribableMarker {
 
-        internal val lock = Mutex()
-
-        /** The style of the loading indicator */
-        internal var style: HUDStyle = HUDStyle.SYSTEM
-
-        /** Sets the style for the loading indicator */
-        fun setStyle(style: HUDStyle) = apply { this.style = style }
-
-        /** The title of the loading indicator */
-        internal var title: String? = null
-
-        /** Set the title for the loading indicator */
-        fun setTitle(title: String?) = apply { this.title = title }
-
-        /** Sets default style and empty title */
-        internal fun clear() {
-            setStyle(HUDStyle.SYSTEM)
-            setTitle(null)
-        }
-
         /** */
         /**
          * Builds a [BaseHUD] based on some [HudConfig].
@@ -142,8 +120,9 @@ suspend fun <T> BaseHUD.presentDuring(animated: Boolean = true, block: suspend B
  * @param coroutineScope The [CoroutineScope] managing the HUD lifecycle.
  * @param initialize Method for initializing the [HUD.Builder]
  */
-suspend fun BaseHUD.Builder.build(coroutineScope: CoroutineScope, initialize: BaseHUD.Builder.() -> Unit = { }): BaseHUD = lock.withLock {
-    clear()
-    initialize()
-    return create(HudConfig(style, title), coroutineScope)
-}
+fun BaseHUD.Builder.build(coroutineScope: CoroutineScope, initialize: HudConfig.Builder.() -> Unit = { }): BaseHUD = create(
+    HudConfig.Builder().apply {
+        initialize()
+    }.build(),
+    coroutineScope
+)
diff --git a/hud/src/commonMain/kotlin/HudConfig.kt b/hud/src/commonMain/kotlin/HudConfig.kt
index 409029297..c5fbfaa6f 100644
--- a/hud/src/commonMain/kotlin/HudConfig.kt
+++ b/hud/src/commonMain/kotlin/HudConfig.kt
@@ -23,4 +23,26 @@ data class HudConfig(
     val style: HUDStyle = HUDStyle.SYSTEM,
     /** Optional title of the HUD */
     val title: String? = null
-)
+) {
+
+    class Builder {
+        /** The style of the loading indicator */
+        internal var style: HUDStyle = HUDStyle.SYSTEM
+
+        /** Sets the style for the loading indicator */
+        fun setStyle(style: HUDStyle) = apply { this.style = style }
+
+        /** The title of the loading indicator */
+        internal var title: String? = null
+
+        /** Set the title for the loading indicator */
+        fun setTitle(title: String?) = apply { this.title = title }
+
+        /**
+         * Creates a [HudConfig]
+         *
+         * @return The [HudConfig] created
+         */
+        fun build(): HudConfig = HudConfig(style, title)
+    }
+}
diff --git a/location/src/androidLibMain/kotlin/location/LocationManager.kt b/location/src/androidLibMain/kotlin/location/LocationManager.kt
index e10a08597..fab305c9b 100644
--- a/location/src/androidLibMain/kotlin/location/LocationManager.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationManager.kt
@@ -26,7 +26,7 @@ import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.location.LocationPermission
-import com.splendo.kaluga.permissions.location.registerLocationPermission
+import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -92,9 +92,9 @@ actual class DefaultLocationManager(
 
 actual class LocationStateRepoBuilder(
     private val context: Context = ApplicationHolder.applicationContext,
-    private val permissionsBuilder: (CoroutineContext) -> Permissions = { coroutineContext ->
+    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { coroutineContext ->
         Permissions(
-            PermissionsBuilder(PermissionContext(context)).apply { registerLocationPermission() },
+            PermissionsBuilder(PermissionContext(context)).apply { registerLocationPermissionIfNotRegistered() },
             coroutineContext
         )
     }
diff --git a/location/src/commonMain/kotlin/location/LocationStateRepo.kt b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
index bbdf047d9..188b45322 100644
--- a/location/src/commonMain/kotlin/location/LocationStateRepo.kt
+++ b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
@@ -64,7 +64,7 @@ abstract class BaseLocationStateRepo(
 )
 
 open class LocationStateImplRepo(
-    createLocationManager: () -> LocationManager,
+    createLocationManager: suspend () -> LocationManager,
     coroutineContext: CoroutineContext = Dispatchers.Main.immediate
 ) : BaseLocationStateRepo(
     createNotInitializedState = { LocationStateImpl.NotInitialized },
@@ -135,7 +135,7 @@ open class LocationStateImplRepo(
  * @param locationManagerBuilder The [BaseLocationManager.Builder] to create the [LocationManager] managing the location state.
  */
 class LocationStateRepo(
-    settingsBuilder: (CoroutineContext) -> BaseLocationManager.Settings,
+    settingsBuilder: suspend (CoroutineContext) -> BaseLocationManager.Settings,
     builder: BaseLocationManager.Builder,
     coroutineContext: CoroutineContext
 ) : LocationStateImplRepo(
diff --git a/location/src/commonTest/kotlin/location/LocationStateTest.kt b/location/src/commonTest/kotlin/location/LocationStateTest.kt
index f9a56f328..56701931a 100644
--- a/location/src/commonTest/kotlin/location/LocationStateTest.kt
+++ b/location/src/commonTest/kotlin/location/LocationStateTest.kt
@@ -72,18 +72,19 @@ class LocationStateTest :
         TestContext {
         val permissionsBuilder: MockPermissionsBuilder = MockPermissionsBuilder(
             initialActiveState = configuration.initialPermissionState
-        ).apply {
-            registerAllPermissionsBuilders()
-        }
-        val permissions = Permissions(
-            permissionsBuilder,
-            coroutineContext = coroutineScope.coroutineContext
-        ).apply {
-            // Make sure permissionState has been created as it may break the tests otherwise
-            get(configuration.locationPermission)
-        }
+        )
+
         val locationStateRepoBuilder = MockLocationStateRepoBuilder(
-            permissions,
+            {
+                permissionsBuilder.registerAllPermissionsBuilders()
+                Permissions(
+                    permissionsBuilder,
+                    coroutineContext = coroutineScope.coroutineContext
+                ).apply {
+                    // Make sure permissionState has been created as it may break the tests otherwise
+                    get(configuration.locationPermission)
+                }
+            },
             MockBaseLocationManager.Builder(configuration.locationEnabled)
         )
 
diff --git a/location/src/iosMain/kotlin/location/LocationManager.kt b/location/src/iosMain/kotlin/location/LocationManager.kt
index 079454385..c7e7099cd 100644
--- a/location/src/iosMain/kotlin/location/LocationManager.kt
+++ b/location/src/iosMain/kotlin/location/LocationManager.kt
@@ -21,7 +21,7 @@ import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.location.LocationPermission
 import com.splendo.kaluga.permissions.location.MainCLLocationManagerAccessor
-import com.splendo.kaluga.permissions.location.registerLocationPermission
+import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
@@ -110,10 +110,10 @@ actual class DefaultLocationManager(
 
 actual class LocationStateRepoBuilder(
     private val bundle: NSBundle = NSBundle.mainBundle,
-    private val permissionsBuilder: (CoroutineContext) -> Permissions = { context ->
+    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
             PermissionsBuilder(bundle).apply {
-                registerLocationPermission()
+                registerLocationPermissionIfNotRegistered()
             },
             context
         )
diff --git a/location/src/jsMain/kotlin/LocationManager.kt b/location/src/jsMain/kotlin/LocationManager.kt
index 55debc6e7..687a7f3a8 100644
--- a/location/src/jsMain/kotlin/LocationManager.kt
+++ b/location/src/jsMain/kotlin/LocationManager.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.location
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.location.LocationPermission
-import com.splendo.kaluga.permissions.location.registerLocationPermission
+import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
 import kotlinx.coroutines.CoroutineScope
 import kotlin.coroutines.CoroutineContext
 
@@ -54,9 +54,9 @@ actual class DefaultLocationManager(
 }
 
 actual class LocationStateRepoBuilder(
-    private val permissionsBuilder: (CoroutineContext) -> Permissions = { context ->
+    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
-            PermissionsBuilder().apply { registerLocationPermission() },
+            PermissionsBuilder().apply { registerLocationPermissionIfNotRegistered() },
             context
         )
     }
diff --git a/location/src/jvmMain/kotlin/LocationManager.kt b/location/src/jvmMain/kotlin/LocationManager.kt
index 55debc6e7..687a7f3a8 100644
--- a/location/src/jvmMain/kotlin/LocationManager.kt
+++ b/location/src/jvmMain/kotlin/LocationManager.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.location
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.location.LocationPermission
-import com.splendo.kaluga.permissions.location.registerLocationPermission
+import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
 import kotlinx.coroutines.CoroutineScope
 import kotlin.coroutines.CoroutineContext
 
@@ -54,9 +54,9 @@ actual class DefaultLocationManager(
 }
 
 actual class LocationStateRepoBuilder(
-    private val permissionsBuilder: (CoroutineContext) -> Permissions = { context ->
+    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
-            PermissionsBuilder().apply { registerLocationPermission() },
+            PermissionsBuilder().apply { registerLocationPermissionIfNotRegistered() },
             context
         )
     }
diff --git a/logging/src/commonTest/kotlin/LogTest.kt b/logging/src/commonTest/kotlin/LogTest.kt
index d4b9b57f2..506f39a46 100644
--- a/logging/src/commonTest/kotlin/LogTest.kt
+++ b/logging/src/commonTest/kotlin/LogTest.kt
@@ -18,51 +18,87 @@ Copyright 2019 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.logging
 
-import kotlin.test.AfterTest
-import kotlin.test.BeforeTest
+import com.splendo.kaluga.test.base.UIThreadTest
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.yield
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class LogTest {
+class LogTest : UIThreadTest<LogTest.Context>() {
 
-    private val mockLogger = LoggerMock()
-    @BeforeTest
-    fun setMockLogger() {
-        logger = mockLogger
-    }
+    class Context(scope: CoroutineScope) : TestContext {
+        val mockLogger = LoggerMock(scope)
 
-    @AfterTest
-    fun resetMockLogger() {
-        resetLogger()
-    }
+        init {
+            logger = mockLogger
+        }
 
-    private fun assertLog(
-        logLevel: LogLevel,
-        tag: String? = null,
-        throwable: Exception? = null,
-        message: String? = null
-    ) {
-
-        listOf(
-            mockLogger.tagList.size,
-            mockLogger.levelList.size,
-            mockLogger.throwableList.size,
-            mockLogger.messageList.size,
-            mockLogger.levelList.size
-        ).forEach {
-            assertEquals(1, it)
+        suspend fun assertLog(
+            logLevel: LogLevel,
+            tag: String? = null,
+            throwable: Exception? = null,
+            message: String? = null
+        ) {
+            yield()
+            listOf(
+                mockLogger.tagList.size,
+                mockLogger.levelList.size,
+                mockLogger.throwableList.size,
+                mockLogger.messageList.size,
+                mockLogger.levelList.size
+            ).forEach {
+                assertEquals(1, it)
+            }
+
+            assertEquals(logLevel, mockLogger.levelList[0])
+            assertEquals(tag, mockLogger.tagList[0])
+            assertEquals(throwable, mockLogger.throwableList[0])
+            assertEquals(message, mockLogger.messageList[0])
+
+            mockLogger.clear()
         }
 
-        assertEquals(logLevel, mockLogger.levelList[0])
-        assertEquals(tag, mockLogger.tagList[0])
-        assertEquals(throwable, mockLogger.throwableList[0])
-        assertEquals(message, mockLogger.messageList[0])
+        suspend fun test(
+            logLevel: LogLevel,
+            method1: (tag: String?, message: String) -> Unit,
+            method2: (message: String) -> Unit,
+            method3: (tag: String?, throwable: Throwable) -> Unit,
+            method4: (throwable: Throwable) -> Unit,
+            method5: (tag: String?, message: () -> String) -> Unit,
+            method6: (message: () -> String) -> Unit,
+            method7: (tag: String?, throwable: Throwable?, message: () -> String) -> Unit,
+        ) {
+            val tag = logLevel.name.lowercase()
+                .replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
+            val message = logLevel.name.uppercase()
+            val throwable = RuntimeException(logLevel.name.lowercase())
+
+            method1(tag, message)
+            assertLog(logLevel, tag, message = message)
+            method2.invoke(message)
+            assertLog(logLevel, message = message)
+            method3(tag, throwable)
+            assertLog(logLevel, tag = tag, throwable = throwable)
+            method4(throwable)
+            assertLog(logLevel, throwable = throwable)
+            method5(tag) { message }
+            assertLog(logLevel, tag = tag, message = message)
+            method6 { message }
+            assertLog(logLevel, message = message)
+            method7(tag, throwable) { message }
+            assertLog(logLevel, tag, throwable, message)
+        }
 
-        mockLogger.clear()
+        override fun dispose() {
+            super.dispose()
+            resetLogger()
+        }
     }
 
+    override val createTestContext: suspend (scope: CoroutineScope) -> Context = { Context(it) }
+
     @Test
-    fun testTransformer() {
+    fun testTransformer() = testOnUIThread {
         val exception = RuntimeException("original exception for testing")
         val wrappedException = RuntimeException("wrapped exception for testing", exception)
         val nullPointerException = NullPointerException()
@@ -71,9 +107,14 @@ class LogTest {
             TransformLogger(
                 logger,
                 transformLogLevel = { LogLevel.ERROR },
-                transformTag = { it?.toUpperCase() ?: "NULL" },
+                transformTag = { it?.uppercase() ?: "NULL" },
                 transformThrowable = { it?.let { wrappedException } ?: nullPointerException },
-                transformMessage = { it?.toLowerCase()?.capitalize() ?: "Null" }
+                transformMessage = {
+                    it
+                        ?.lowercase()
+                        ?.replaceFirstChar { firstChar -> if (firstChar.isLowerCase()) firstChar.titlecase() else firstChar.toString() }
+                        ?: "Null"
+                }
             )
         }
 
@@ -84,45 +125,15 @@ class LogTest {
         assertLog(LogLevel.ERROR, "NULL", nullPointerException, "Message")
 
         resetLogger()
-        setMockLogger()
+        logger = mockLogger
         debug("tAg", exception) { "mEsSaGe" }
         assertLog(LogLevel.DEBUG, "tAg", exception, "mEsSaGe")
         resetLogger()
         debug("we can still log")
     }
 
-    fun test(
-        logLevel: LogLevel,
-        method1: (tag: String?, message: String) -> Unit,
-        method2: (message: String) -> Unit,
-        method3: (tag: String?, throwable: Throwable) -> Unit,
-        method4: (throwable: Throwable) -> Unit,
-        method5: (tag: String?, message: () -> String) -> Unit,
-        method6: (message: () -> String) -> Unit,
-        method7: (tag: String?, throwable: Throwable?, message: () -> String) -> Unit,
-    ) {
-        val tag = logLevel.name.toLowerCase().capitalize()
-        val message = logLevel.name.toUpperCase()
-        val throwable = RuntimeException(logLevel.name.toLowerCase())
-
-        method1(tag, message)
-        assertLog(logLevel, tag, message = message)
-        method2.invoke(message)
-        assertLog(logLevel, message = message)
-        method3(tag, throwable)
-        assertLog(logLevel, tag = tag, throwable = throwable)
-        method4(throwable)
-        assertLog(logLevel, throwable = throwable)
-        method5(tag) { message }
-        assertLog(logLevel, tag = tag, message = message)
-        method6 { message }
-        assertLog(logLevel, message = message)
-        method7(tag, throwable) { message }
-        assertLog(logLevel, tag, throwable, message)
-    }
-
     @Test
-    fun testDebug() =
+    fun testDebug() = testOnUIThread {
         test(
             logLevel = LogLevel.DEBUG,
             method1 = ::debug,
@@ -133,9 +144,10 @@ class LogTest {
             method6 = ::debug,
             method7 = ::debug
         )
+    }
 
     @Test
-    fun testD() =
+    fun testD() = testOnUIThread {
         test(
             logLevel = LogLevel.DEBUG,
             method1 = ::d,
@@ -146,9 +158,10 @@ class LogTest {
             method6 = ::d,
             method7 = ::d
         )
+    }
 
     @Test
-    fun testInfo() =
+    fun testInfo() = testOnUIThread {
         test(
             logLevel = LogLevel.INFO,
             method1 = ::info,
@@ -159,9 +172,10 @@ class LogTest {
             method6 = ::info,
             method7 = ::info
         )
+    }
 
     @Test
-    fun testI() =
+    fun testI() = testOnUIThread {
         test(
             logLevel = LogLevel.INFO,
             method1 = ::i,
@@ -172,9 +186,10 @@ class LogTest {
             method6 = ::i,
             method7 = ::i
         )
+    }
 
     @Test
-    fun testWarn() =
+    fun testWarn() = testOnUIThread {
         test(
             logLevel = LogLevel.WARN,
             method1 = ::warn,
@@ -185,9 +200,10 @@ class LogTest {
             method6 = ::warn,
             method7 = ::warn
         )
+    }
 
     @Test
-    fun testW() =
+    fun testW() = testOnUIThread {
         test(
             logLevel = LogLevel.WARN,
             method1 = ::w,
@@ -198,9 +214,10 @@ class LogTest {
             method6 = ::w,
             method7 = ::w
         )
+    }
 
     @Test
-    fun testError() =
+    fun testError() = testOnUIThread {
         test(
             logLevel = LogLevel.ERROR,
             method1 = ::error,
@@ -211,9 +228,10 @@ class LogTest {
             method6 = ::error,
             method7 = ::error
         )
+    }
 
     @Test
-    fun testE() =
+    fun testE() = testOnUIThread {
         test(
             logLevel = LogLevel.ERROR,
             method1 = ::e,
@@ -224,4 +242,5 @@ class LogTest {
             method6 = ::e,
             method7 = ::e
         )
+    }
 }
diff --git a/logging/src/commonTest/kotlin/LoggerMock.kt b/logging/src/commonTest/kotlin/LoggerMock.kt
index 016c59b97..5ddeb8468 100644
--- a/logging/src/commonTest/kotlin/LoggerMock.kt
+++ b/logging/src/commonTest/kotlin/LoggerMock.kt
@@ -43,7 +43,6 @@ class LoggerMock(private val coroutineScope: CoroutineScope) : Logger {
     }
 
     override fun log(level: LogLevel, tag: String?, throwable: Throwable?, message: (() -> String)?) {
-
         coroutineScope.launch {
             mutex.withLock {
                 levelList.add(level)
diff --git a/notifications-permissions/src/commonMain/kotlin/Permission.kt b/notifications-permissions/src/commonMain/kotlin/Permission.kt
index f37efc3a1..a9ef213d8 100644
--- a/notifications-permissions/src/commonMain/kotlin/Permission.kt
+++ b/notifications-permissions/src/commonMain/kotlin/Permission.kt
@@ -70,4 +70,3 @@ suspend fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
         notificationsPermissionStateRepoBuilder(permission, it, coroutineContext)
     }
 }
-
diff --git a/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt b/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
index 50d68197a..72d711ab8 100644
--- a/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
+++ b/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
@@ -18,9 +18,9 @@
 package com.splendo.kaluga.permissions.notifications
 
 import com.splendo.kaluga.logging.error
-import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
 import com.splendo.kaluga.permissions.base.CurrentAuthorizationStatusProvider
+import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.IOSPermissionsHelper
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionRefreshScheduler
@@ -36,7 +36,6 @@ import platform.UserNotifications.UNAuthorizationStatusAuthorized
 import platform.UserNotifications.UNAuthorizationStatusDenied
 import platform.UserNotifications.UNAuthorizationStatusNotDetermined
 import platform.UserNotifications.UNAuthorizationStatusProvisional
-import platform.UserNotifications.UNNotificationSettings
 import platform.UserNotifications.UNUserNotificationCenter
 import kotlin.time.Duration
 
@@ -71,14 +70,12 @@ actual class DefaultNotificationsPermissionManager(
     override fun requestPermissionDidStart() {
         permissionHandler.requestAuthorizationStatus(timerHelper, CoroutineScope(coroutineContext)) {
             val deferred = CompletableDeferred<Boolean>()
-            val callback = { authorization: Boolean, error: NSError? ->
+            notificationCenter.requestAuthorizationWithOptions(
+                permission.options?.options ?: UNAuthorizationOptionNone
+            ) { authorization: Boolean, error: NSError? ->
                 error?.let { deferred.completeExceptionally(Throwable(error.localizedDescription)) } ?: run { deferred.complete(authorization) }
                 Unit
-            }.freeze()
-            notificationCenter.requestAuthorizationWithOptions(
-                permission.options?.options ?: UNAuthorizationOptionNone,
-                callback
-            )
+            }
 
             try {
                 if (deferred.await())
diff --git a/permissions/src/commonMain/kotlin/registerAllPermissions.kt b/permissions/src/commonMain/kotlin/registerAllPermissions.kt
index e3990bab0..a5bc71753 100644
--- a/permissions/src/commonMain/kotlin/registerAllPermissions.kt
+++ b/permissions/src/commonMain/kotlin/registerAllPermissions.kt
@@ -29,7 +29,7 @@ import com.splendo.kaluga.permissions.notifications.registerNotificationsPermiss
 import com.splendo.kaluga.permissions.storage.registerStoragePermission
 import kotlin.time.Duration
 
-fun PermissionsBuilder.registerAllPermissions(
+suspend fun PermissionsBuilder.registerAllPermissions(
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
 ) {
diff --git a/resources/src/commonMain/kotlin/stylable/GradientStyle.kt b/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
index 5eb026eac..fac8ee338 100644
--- a/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
@@ -24,7 +24,7 @@ sealed class GradientStyle(val colorPoints: List<ColorPoint>) {
     data class ColorPoint(val color: KalugaColor, val offset: Float)
     data class CenterPoint(val x: Float, val y: Float)
 
-    class Linear private constructor (colorPoints: List<ColorPoint>, val orientation: Orientation) : GradientStyle(colorPoints) {
+    class Linear private constructor(colorPoints: List<ColorPoint>, val orientation: Orientation) : GradientStyle(colorPoints) {
         enum class Orientation {
             BOTTOM_LEFT_TOP_RIGHT,
             BOTTOM_TOP,
diff --git a/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt b/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt
index 53ca90fd5..ab07b9f85 100644
--- a/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt
+++ b/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt
@@ -58,7 +58,7 @@ actual class DefaultStoragePermissionManager(
         if (IOSPermissionsHelper.missingDeclarationsInPList(bundle, NSPhotoLibraryUsageDescription).isEmpty()) {
             permissionHandler.requestAuthorizationStatus(timerHelper, CoroutineScope(coroutineContext)) {
                 val deferred = CompletableDeferred<PHAuthorizationStatus>()
-                PHPhotoLibrary.requestAuthorization  { status ->
+                PHPhotoLibrary.requestAuthorization { status ->
                     deferred.complete(status)
                     Unit
                 }
diff --git a/test-utils-alerts/src/commonMain/kotlin/MockAlertPresenter.kt b/test-utils-alerts/src/commonMain/kotlin/MockAlertPresenter.kt
index 5ea1922ab..4ff310e0b 100644
--- a/test-utils-alerts/src/commonMain/kotlin/MockAlertPresenter.kt
+++ b/test-utils-alerts/src/commonMain/kotlin/MockAlertPresenter.kt
@@ -57,7 +57,7 @@ class MockAlertPresenter(val alert: Alert, setupMocks: Boolean = true) : BaseAle
             }
         }
 
-        override fun create(coroutineScope: CoroutineScope): BaseAlertPresenter = createAlertFromAlert(createAlert(), coroutineScope)
+        override fun create(alert: Alert, coroutineScope: CoroutineScope): BaseAlertPresenter = createAlertFromAlert(alert, coroutineScope)
         private fun createAlertFromAlert(alert: Alert, coroutineScope: CoroutineScope): MockAlertPresenter = createMock.call(alert, coroutineScope)
     }
 
diff --git a/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt b/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
index b91a47220..9786e63e5 100644
--- a/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
+++ b/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
@@ -1,18 +1,18 @@
 /*
  Copyright 2022 Splendo Consulting B.V. The Netherlands
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.test.base.mock
diff --git a/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt b/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt
index 7b4a57abd..4f16907df 100644
--- a/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt
+++ b/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt
@@ -24,8 +24,7 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
 class DeliberateCancellationException(val result: Any?) :
-    kotlinx.coroutines.CancellationException("Scope canceled deliberately by testAndCancelScope") {
-}
+    kotlinx.coroutines.CancellationException("Scope canceled deliberately by testAndCancelScope")
 
 inline fun <reified T> testBlockingAndCancelScope(
     context: CoroutineContext = EmptyCoroutineContext,
diff --git a/test-utils-base/src/iosMain/kotlin/mainBackground.kt b/test-utils-base/src/iosMain/kotlin/mainBackground.kt
index df4d54be8..84ef3eeec 100644
--- a/test-utils-base/src/iosMain/kotlin/mainBackground.kt
+++ b/test-utils-base/src/iosMain/kotlin/mainBackground.kt
@@ -21,14 +21,13 @@ import com.splendo.kaluga.logging.debug
 import platform.CoreFoundation.CFRunLoopRun
 import kotlin.native.concurrent.TransferMode
 import kotlin.native.concurrent.Worker
-import kotlin.native.concurrent.freeze
 import kotlin.native.internal.test.testLauncherEntryPoint
 import kotlin.system.exitProcess
 
 fun mainBackground(args: Array<String>) {
     debug("using background thread for iOS tests")
     val worker = Worker.start(name = "kaluga-test-background")
-    worker.execute(TransferMode.SAFE, { args.freeze() }) {
+    worker.execute(TransferMode.SAFE, { args }) {
         val result = testLauncherEntryPoint(it)
         exitProcess(result)
     }
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt b/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
index 1755fec3a..93ebaae32 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
@@ -28,12 +28,12 @@ import kotlin.coroutines.CoroutineContext
 
 /**
  * Mock implementation of [LocationStateRepo.Builder]
- * @param permissions The [Permissions] to request permissions from
+ * @param permissionsBuilder Builds the [Permissions] to request permissions from
  * @param locationManagerBuilder The [BaseLocationManager.Builder] for building the location manager
  * @param setupMocks If `true` sets up [createMock] to automatically create a [LocationStateRepo]
  */
 class MockLocationStateRepoBuilder<LMB : BaseLocationManager.Builder>(
-    private val permissions: Permissions,
+    private val permissionsBuilder: suspend () -> Permissions,
     val locationManagerBuilder: LMB,
     setupMocks: Boolean = true
 ) : LocationStateRepo.Builder {
@@ -53,7 +53,7 @@ class MockLocationStateRepoBuilder<LMB : BaseLocationManager.Builder>(
             createMock.on()
                 .doExecute { (locationPermission, settingsBuilder, coroutineContext) ->
                     LocationStateRepo(
-                        { settingsBuilder(locationPermission, permissions) },
+                        { settingsBuilder(locationPermission, permissionsBuilder()) },
                         locationManagerBuilder,
                         coroutineContext
                     ).also {
diff --git a/test-utils/src/commonMain/kotlin/legacy.kt b/test-utils/src/commonMain/kotlin/legacy.kt
index d0613752e..e5d454b8a 100644
--- a/test-utils/src/commonMain/kotlin/legacy.kt
+++ b/test-utils/src/commonMain/kotlin/legacy.kt
@@ -110,9 +110,8 @@ abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinVi
 fun <T> awaitAllBlocking(vararg deferreds: Deferred<T>): List<T> = com.splendo.kaluga.test.base.awaitAllBlocking(*deferreds)
 @Deprecated("Moved to test-utils-base", ReplaceWith("captureFor(duration)", "com.splendo.kaluga.test.base.captureFor"))
 suspend fun <T> Flow<T>.captureFor(duration: Duration): List<T> = this.captureFor(duration)
-@Deprecated("Moved to test-utils-base", ReplaceWith("testBlockingAndCancelScope(context, freezeResult, block)", "com.splendo.kaluga.test.base.testBlockingAndCancelScope"))
+@Deprecated("Moved to test-utils-base", ReplaceWith("testBlockingAndCancelScope(context, block)", "com.splendo.kaluga.test.base.testBlockingAndCancelScope"))
 inline fun <reified T> testBlockingAndCancelScope(
     context: CoroutineContext = EmptyCoroutineContext,
-    freezeResult: Boolean = true,
     crossinline block: suspend CoroutineScope.() -> T
-) = com.splendo.kaluga.test.base.testBlockingAndCancelScope(context, freezeResult, block)
+) = com.splendo.kaluga.test.base.testBlockingAndCancelScope(context, block)

From ba83af52ea6080ec127210792fcc561d0456dcce Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 4 Nov 2022 11:24:45 +0100
Subject: [PATCH 008/227] API update

---
 alerts/api/androidLib/alerts.api              | 38 +++++++++++--------
 alerts/api/jvm/alerts.api                     | 38 +++++++++++--------
 architecture/api/androidLib/architecture.api  | 31 +++++----------
 architecture/api/jvm/architecture.api         | 31 +++++----------
 .../api/androidLib/base-permissions.api       | 16 +++++++-
 base-permissions/api/jvm/base-permissions.api | 16 +++++++-
 base/api/androidLib/base.api                  | 10 +----
 base/api/jvm/base.api                         |  8 ----
 beacons/api/androidLib/beacons.api            |  2 +-
 beacons/api/jvm/beacons.api                   |  2 +-
 .../api/androidLib/bluetooth-permissions.api  | 12 ++++--
 .../api/jvm/bluetooth-permissions.api         | 12 ++++--
 bluetooth/api/androidLib/bluetooth.api        | 10 ++---
 bluetooth/api/jvm/bluetooth.api               | 10 ++---
 .../api/androidLib/calendar-permissions.api   | 12 ++++--
 .../api/jvm/calendar-permissions.api          | 12 ++++--
 .../api/androidLib/camera-permissions.api     | 12 ++++--
 .../api/jvm/camera-permissions.api            | 12 ++++--
 .../api/androidLib/contacts-permissions.api   | 12 ++++--
 .../api/jvm/contacts-permissions.api          | 12 ++++--
 .../api/androidLib/date-time-picker.api       | 24 +++++++-----
 date-time-picker/api/jvm/date-time-picker.api | 24 +++++++-----
 hud/api/androidLib/hud.api                    |  9 ++++-
 hud/api/jvm/hud.api                           |  9 ++++-
 .../api/androidLib/location-permissions.api   | 12 ++++--
 .../api/jvm/location-permissions.api          | 12 ++++--
 location/api/androidLib/location.api          | 10 ++---
 location/api/jvm/location.api                 | 10 ++---
 .../api/androidLib/microphone-permissions.api | 12 ++++--
 .../api/jvm/microphone-permissions.api        | 12 ++++--
 .../androidLib/notifications-permissions.api  | 12 ++++--
 .../api/jvm/notifications-permissions.api     | 12 ++++--
 permissions/api/androidLib/permissions.api    |  4 +-
 permissions/api/jvm/permissions.api           |  4 +-
 .../api/androidLib/storage-permissions.api    | 12 ++++--
 .../api/jvm/storage-permissions.api           | 12 ++++--
 .../api/androidLib/test-utils-alerts.api      |  5 ++-
 .../api/jvm/test-utils-alerts.api             |  5 ++-
 .../androidLib/test-utils-architecture.api    |  6 ---
 .../api/jvm/test-utils-architecture.api       |  6 ---
 .../api/androidLib/test-utils-base.api        | 18 ++-------
 test-utils-base/api/jvm/test-utils-base.api   | 18 ++-------
 .../api/androidLib/test-utils-bluetooth.api   |  6 +--
 .../api/jvm/test-utils-bluetooth.api          |  4 +-
 .../api/androidLib/test-utils-hud.api         |  3 +-
 test-utils-hud/api/jvm/test-utils-hud.api     |  3 +-
 .../api/androidLib/test-utils-keyboard.api    |  4 +-
 .../api/jvm/test-utils-keyboard.api           |  4 +-
 .../api/androidLib/test-utils-koin.api        |  8 ----
 test-utils-koin/api/jvm/test-utils-koin.api   |  8 ----
 .../api/androidLib/test-utils-location.api    |  8 ++--
 .../api/jvm/test-utils-location.api           |  8 ++--
 .../api/androidLib/test-utils-permissions.api | 20 +++++-----
 .../api/jvm/test-utils-permissions.api        | 20 +++++-----
 test-utils/api/androidLib/test-utils.api      | 10 -----
 test-utils/api/jvm/test-utils.api             | 10 -----
 56 files changed, 347 insertions(+), 325 deletions(-)

diff --git a/alerts/api/androidLib/alerts.api b/alerts/api/androidLib/alerts.api
index d865d736f..dc725ffc2 100644
--- a/alerts/api/androidLib/alerts.api
+++ b/alerts/api/androidLib/alerts.api
@@ -46,6 +46,25 @@ public final class com/splendo/kaluga/alerts/Alert$Action$Style : java/lang/Enum
 	public static fun values ()[Lcom/splendo/kaluga/alerts/Alert$Action$Style;
 }
 
+public final class com/splendo/kaluga/alerts/Alert$Builder {
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/alerts/Alert$Style;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/alerts/Alert$Style;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun addActions (Ljava/util/List;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun addActions ([Lcom/splendo/kaluga/alerts/Alert$Action;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun build ()Lcom/splendo/kaluga/alerts/Alert;
+	public final fun setMessage (Ljava/lang/String;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun setNegativeButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public static synthetic fun setNegativeButton$default (Lcom/splendo/kaluga/alerts/Alert$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun setNeutralButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public static synthetic fun setNeutralButton$default (Lcom/splendo/kaluga/alerts/Alert$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun setPositiveButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public static synthetic fun setPositiveButton$default (Lcom/splendo/kaluga/alerts/Alert$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun setTextInput (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public static synthetic fun setTextInput$default (Lcom/splendo/kaluga/alerts/Alert$Builder;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun setTitle (Ljava/lang/String;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+}
+
 public final class com/splendo/kaluga/alerts/Alert$Style : java/lang/Enum {
 	public static final field ACTION_LIST Lcom/splendo/kaluga/alerts/Alert$Style;
 	public static final field ALERT Lcom/splendo/kaluga/alerts/Alert$Style;
@@ -88,8 +107,8 @@ public final class com/splendo/kaluga/alerts/AlertPresenter$Builder : com/splend
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/AlertPresenter;
-	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
+	public fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/AlertPresenter;
+	public synthetic fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
 	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
 	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
 	public fun unsubscribe ()V
@@ -118,19 +137,6 @@ public abstract class com/splendo/kaluga/alerts/BaseAlertPresenter : com/splendo
 
 public abstract class com/splendo/kaluga/alerts/BaseAlertPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
 	public fun <init> ()V
-	public final fun addActions (Ljava/util/List;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun addActions ([Lcom/splendo/kaluga/alerts/Alert$Action;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public abstract fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
-	protected final fun createAlert ()Lcom/splendo/kaluga/alerts/Alert;
-	public final fun setMessage (Ljava/lang/String;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun setNegativeButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public static synthetic fun setNegativeButton$default (Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun setNeutralButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public static synthetic fun setNeutralButton$default (Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun setPositiveButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public static synthetic fun setPositiveButton$default (Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun setTextInput (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public static synthetic fun setTextInput$default (Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun setTitle (Ljava/lang/String;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
+	public abstract fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
 }
 
diff --git a/alerts/api/jvm/alerts.api b/alerts/api/jvm/alerts.api
index d454aa9e5..525ae6b10 100644
--- a/alerts/api/jvm/alerts.api
+++ b/alerts/api/jvm/alerts.api
@@ -46,6 +46,25 @@ public final class com/splendo/kaluga/alerts/Alert$Action$Style : java/lang/Enum
 	public static fun values ()[Lcom/splendo/kaluga/alerts/Alert$Action$Style;
 }
 
+public final class com/splendo/kaluga/alerts/Alert$Builder {
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/alerts/Alert$Style;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/alerts/Alert$Style;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun addActions (Ljava/util/List;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun addActions ([Lcom/splendo/kaluga/alerts/Alert$Action;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun build ()Lcom/splendo/kaluga/alerts/Alert;
+	public final fun setMessage (Ljava/lang/String;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun setNegativeButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public static synthetic fun setNegativeButton$default (Lcom/splendo/kaluga/alerts/Alert$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun setNeutralButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public static synthetic fun setNeutralButton$default (Lcom/splendo/kaluga/alerts/Alert$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun setPositiveButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public static synthetic fun setPositiveButton$default (Lcom/splendo/kaluga/alerts/Alert$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun setTextInput (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public static synthetic fun setTextInput$default (Lcom/splendo/kaluga/alerts/Alert$Builder;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+	public final fun setTitle (Ljava/lang/String;)Lcom/splendo/kaluga/alerts/Alert$Builder;
+}
+
 public final class com/splendo/kaluga/alerts/Alert$Style : java/lang/Enum {
 	public static final field ACTION_LIST Lcom/splendo/kaluga/alerts/Alert$Style;
 	public static final field ALERT Lcom/splendo/kaluga/alerts/Alert$Style;
@@ -90,8 +109,8 @@ public final class com/splendo/kaluga/alerts/AlertPresenter : com/splendo/kaluga
 
 public final class com/splendo/kaluga/alerts/AlertPresenter$Builder : com/splendo/kaluga/alerts/BaseAlertPresenter$Builder {
 	public fun <init> ()V
-	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/AlertPresenter;
-	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
+	public fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/AlertPresenter;
+	public synthetic fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
 }
 
 public final class com/splendo/kaluga/alerts/AlertsKt {
@@ -113,19 +132,6 @@ public abstract class com/splendo/kaluga/alerts/BaseAlertPresenter : com/splendo
 
 public abstract class com/splendo/kaluga/alerts/BaseAlertPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
 	public fun <init> ()V
-	public final fun addActions (Ljava/util/List;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun addActions ([Lcom/splendo/kaluga/alerts/Alert$Action;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public abstract fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
-	protected final fun createAlert ()Lcom/splendo/kaluga/alerts/Alert;
-	public final fun setMessage (Ljava/lang/String;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun setNegativeButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public static synthetic fun setNegativeButton$default (Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun setNeutralButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public static synthetic fun setNeutralButton$default (Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun setPositiveButton (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public static synthetic fun setPositiveButton$default (Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun setTextInput (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public static synthetic fun setTextInput$default (Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
-	public final fun setTitle (Ljava/lang/String;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;
+	public abstract fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
 }
 
diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index d93bda323..ea3093f16 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -1360,10 +1360,9 @@ public abstract class com/splendo/kaluga/architecture/observable/BaseObservable
 
 public abstract class com/splendo/kaluga/architecture/observable/BaseSimpleDisposable : com/splendo/kaluga/architecture/observable/Disposable {
 	public fun <init> (Lkotlin/jvm/functions/Function0;)V
-	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
+	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected fun afterDispose ()V
-	public fun dispose ()V
-	public final fun isDisposed ()Z
+	public fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract class com/splendo/kaluga/architecture/observable/BaseSubject : com/splendo/kaluga/architecture/observable/AbstractBaseSubject {
@@ -1419,18 +1418,16 @@ public abstract interface class com/splendo/kaluga/architecture/observable/Defau
 }
 
 public abstract interface class com/splendo/kaluga/architecture/observable/Disposable {
-	public abstract fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
-	public abstract fun dispose ()V
+	public abstract fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/architecture/observable/DisposeBag : com/splendo/kaluga/architecture/observable/Disposable {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun add (Lcom/splendo/kaluga/architecture/observable/Disposable;)V
-	public final fun add (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
-	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
-	public fun dispose ()V
+	public final fun add (Lcom/splendo/kaluga/architecture/observable/Disposable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun add (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/architecture/observable/FlowInitializedObservable : com/splendo/kaluga/architecture/observable/BaseInitializedObservable {
@@ -1760,8 +1757,6 @@ public abstract interface class com/splendo/kaluga/architecture/observable/WithS
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun didPause ()V
 	public final fun didResume ()V
 	protected fun onPause ()V
@@ -1770,8 +1765,6 @@ public class com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel :
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract class com/splendo/kaluga/architecture/viewmodel/KalugaViewModelActivity : androidx/appcompat/app/AppCompatActivity {
@@ -1804,7 +1797,6 @@ public final class com/splendo/kaluga/architecture/viewmodel/KalugaViewModelLife
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel : androidx/lifecycle/ViewModel {
-	public fun <init> ()V
 	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
 	protected fun onCleared ()V
 }
@@ -1814,15 +1806,12 @@ public final class com/splendo/kaluga/architecture/viewmodel/LifecycleViewModelK
 	public static final fun bind (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/fragment/app/Fragment;)Z
 }
 
-public class com/splendo/kaluga/architecture/viewmodel/NavigatingViewModel : com/splendo/kaluga/architecture/viewmodel/BaseViewModel {
-	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;Z)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+public class com/splendo/kaluga/architecture/viewmodel/NavigatingViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;)V
 	public final fun getNavigator ()Lcom/splendo/kaluga/architecture/navigation/Navigator;
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/ViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
diff --git a/architecture/api/jvm/architecture.api b/architecture/api/jvm/architecture.api
index a3f73463a..0e78abd77 100644
--- a/architecture/api/jvm/architecture.api
+++ b/architecture/api/jvm/architecture.api
@@ -622,10 +622,9 @@ public abstract class com/splendo/kaluga/architecture/observable/BaseObservable
 
 public abstract class com/splendo/kaluga/architecture/observable/BaseSimpleDisposable : com/splendo/kaluga/architecture/observable/Disposable {
 	public fun <init> (Lkotlin/jvm/functions/Function0;)V
-	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
+	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected fun afterDispose ()V
-	public fun dispose ()V
-	public final fun isDisposed ()Z
+	public fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract class com/splendo/kaluga/architecture/observable/BaseSubject : com/splendo/kaluga/architecture/observable/AbstractBaseSubject {
@@ -675,18 +674,16 @@ public abstract interface class com/splendo/kaluga/architecture/observable/Defau
 }
 
 public abstract interface class com/splendo/kaluga/architecture/observable/Disposable {
-	public abstract fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
-	public abstract fun dispose ()V
+	public abstract fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/architecture/observable/DisposeBag : com/splendo/kaluga/architecture/observable/Disposable {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun add (Lcom/splendo/kaluga/architecture/observable/Disposable;)V
-	public final fun add (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
-	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
-	public fun dispose ()V
+	public final fun add (Lcom/splendo/kaluga/architecture/observable/Disposable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun add (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/architecture/observable/FlowInitializedObservable : com/splendo/kaluga/architecture/observable/BaseInitializedObservable {
@@ -1015,8 +1012,6 @@ public abstract interface class com/splendo/kaluga/architecture/observable/WithS
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun didPause ()V
 	public final fun didResume ()V
 	protected fun onPause ()V
@@ -1025,26 +1020,20 @@ public class com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel :
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
-	public fun <init> ()V
 	public final fun clear ()V
 	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
 	protected fun onCleared ()V
 }
 
-public class com/splendo/kaluga/architecture/viewmodel/NavigatingViewModel : com/splendo/kaluga/architecture/viewmodel/BaseViewModel {
-	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;Z)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+public class com/splendo/kaluga/architecture/viewmodel/NavigatingViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;)V
 	public final fun getNavigator ()Lcom/splendo/kaluga/architecture/navigation/Navigator;
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/ViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
diff --git a/base-permissions/api/androidLib/base-permissions.api b/base-permissions/api/androidLib/base-permissions.api
index 32e86932f..7b8b7d750 100644
--- a/base-permissions/api/androidLib/base-permissions.api
+++ b/base-permissions/api/androidLib/base-permissions.api
@@ -267,6 +267,10 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateRepo$Compa
 	public final fun getDefaultMonitoringInterval-UwyO8pc ()J
 }
 
+public abstract interface class com/splendo/kaluga/permissions/base/PermissionStateRepoBuilder {
+	public abstract fun create (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/permissions/base/BasePermissionStateRepo;
+}
+
 public final class com/splendo/kaluga/permissions/base/Permissions {
 	public fun <init> (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -294,7 +298,15 @@ public class com/splendo/kaluga/permissions/base/PermissionsBuilder {
 	public final fun createPermissionStateRepo (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/permissions/base/BasePermissionStateRepo;
 	public final fun get (Lcom/splendo/kaluga/permissions/base/Permission;)Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;
 	public final fun getContext ()Lcom/splendo/kaluga/permissions/base/PermissionContext;
-	public final fun register (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;)Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;
-	public final fun registerPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)V
+	public final fun register (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun registerOrGet (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun registerOrGetPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun registerPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun unregister (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun unregisterPermissionStateRepoBuilder (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class com/splendo/kaluga/permissions/base/PermissionsBuilderError : java/lang/Error {
+	public fun <init> (Ljava/lang/String;)V
 }
 
diff --git a/base-permissions/api/jvm/base-permissions.api b/base-permissions/api/jvm/base-permissions.api
index 78f03389f..e7049f2e4 100644
--- a/base-permissions/api/jvm/base-permissions.api
+++ b/base-permissions/api/jvm/base-permissions.api
@@ -311,6 +311,10 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateRepo$Compa
 	public final fun getDefaultMonitoringInterval-UwyO8pc ()J
 }
 
+public abstract interface class com/splendo/kaluga/permissions/base/PermissionStateRepoBuilder {
+	public abstract fun create (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/permissions/base/BasePermissionStateRepo;
+}
+
 public final class com/splendo/kaluga/permissions/base/Permissions {
 	public fun <init> (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -326,7 +330,15 @@ public class com/splendo/kaluga/permissions/base/PermissionsBuilder {
 	public final fun createPermissionStateRepo (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/permissions/base/BasePermissionStateRepo;
 	public final fun get (Lcom/splendo/kaluga/permissions/base/Permission;)Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;
 	public final fun getContext ()Lcom/splendo/kaluga/permissions/base/PermissionContext;
-	public final fun register (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;)Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;
-	public final fun registerPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)V
+	public final fun register (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun registerOrGet (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun registerOrGetPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun registerPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun unregister (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun unregisterPermissionStateRepoBuilder (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class com/splendo/kaluga/permissions/base/PermissionsBuilderError : java/lang/Error {
+	public fun <init> (Ljava/lang/String;)V
 }
 
diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index 07a9c0c0f..f68375283 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -9,14 +9,6 @@ public final class com/splendo/kaluga/base/ApplicationHolder$Companion {
 	public final fun setApplication (Landroid/app/Application;)V
 }
 
-public final class com/splendo/kaluga/base/AtomicReferenceDelegate {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Object;)V
-	public synthetic fun <init> (Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-	public final fun setValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
-}
-
 public final class com/splendo/kaluga/base/KalugaThread {
 	public static final field Companion Lcom/splendo/kaluga/base/KalugaThread$Companion;
 	public fun <init> (Ljava/lang/Thread;)V
@@ -1001,7 +993,9 @@ public abstract class com/splendo/kaluga/state/HotStateRepo : com/splendo/kaluga
 
 public abstract interface class com/splendo/kaluga/state/KalugaState {
 	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun finalState$suspendImpl (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun initialState$suspendImpl (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index 168de0bed..ffa73bc04 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -1,11 +1,3 @@
-public final class com/splendo/kaluga/base/AtomicReferenceDelegate {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/Object;)V
-	public synthetic fun <init> (Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-	public final fun setValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
-}
-
 public final class com/splendo/kaluga/base/KalugaThread {
 	public static final field Companion Lcom/splendo/kaluga/base/KalugaThread$Companion;
 	public fun <init> (Ljava/lang/Thread;)V
diff --git a/beacons/api/androidLib/beacons.api b/beacons/api/androidLib/beacons.api
index 1832b5cb8..874a396c9 100644
--- a/beacons/api/androidLib/beacons.api
+++ b/beacons/api/androidLib/beacons.api
@@ -29,8 +29,8 @@ public final class com/splendo/kaluga/bluetooth/beacons/BeaconInfoKt {
 
 public final class com/splendo/kaluga/bluetooth/beacons/Beacons {
 	public static final field TAG Ljava/lang/String;
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;J)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JLkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getBeacons ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun isAnyInRange (Ljava/util/List;)Lkotlinx/coroutines/flow/Flow;
 	public final fun isMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/beacons/api/jvm/beacons.api b/beacons/api/jvm/beacons.api
index 38b1efc74..28f7788ff 100644
--- a/beacons/api/jvm/beacons.api
+++ b/beacons/api/jvm/beacons.api
@@ -29,8 +29,8 @@ public final class com/splendo/kaluga/bluetooth/beacons/BeaconInfoKt {
 
 public final class com/splendo/kaluga/bluetooth/beacons/Beacons {
 	public static final field TAG Ljava/lang/String;
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;J)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JLkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getBeacons ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun isAnyInRange (Ljava/util/List;)Lkotlinx/coroutines/flow/Flow;
 	public final fun isMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/bluetooth-permissions/api/androidLib/bluetooth-permissions.api b/bluetooth-permissions/api/androidLib/bluetooth-permissions.api
index c28f77cae..5d63b610f 100644
--- a/bluetooth-permissions/api/androidLib/bluetooth-permissions.api
+++ b/bluetooth-permissions/api/androidLib/bluetooth-permissions.api
@@ -25,9 +25,13 @@ public final class com/splendo/kaluga/permissions/bluetooth/DefaultBluetoothPerm
 }
 
 public final class com/splendo/kaluga/permissions/bluetooth/PermissionKt {
-	public static final fun registerBluetoothPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
-	public static synthetic fun registerBluetoothPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
-	public static final fun registerBluetoothPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
-	public static synthetic fun registerBluetoothPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static final fun registerBluetoothPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerBluetoothPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerBluetoothPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerBluetoothPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerBluetoothPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerBluetoothPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerBluetoothPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerBluetoothPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/bluetooth-permissions/api/jvm/bluetooth-permissions.api b/bluetooth-permissions/api/jvm/bluetooth-permissions.api
index 37a3ae408..d675140ad 100644
--- a/bluetooth-permissions/api/jvm/bluetooth-permissions.api
+++ b/bluetooth-permissions/api/jvm/bluetooth-permissions.api
@@ -28,9 +28,13 @@ public final class com/splendo/kaluga/permissions/bluetooth/DefaultBluetoothPerm
 }
 
 public final class com/splendo/kaluga/permissions/bluetooth/PermissionKt {
-	public static final fun registerBluetoothPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
-	public static synthetic fun registerBluetoothPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
-	public static final fun registerBluetoothPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
-	public static synthetic fun registerBluetoothPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static final fun registerBluetoothPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerBluetoothPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerBluetoothPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerBluetoothPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerBluetoothPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerBluetoothPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerBluetoothPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerBluetoothPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/bluetooth/api/androidLib/bluetooth.api b/bluetooth/api/androidLib/bluetooth.api
index 9ee60f1f4..89872a138 100644
--- a/bluetooth/api/androidLib/bluetooth.api
+++ b/bluetooth/api/androidLib/bluetooth.api
@@ -39,8 +39,8 @@ public final class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Stopped : com
 
 public final class com/splendo/kaluga/bluetooth/BluetoothBuilder : com/splendo/kaluga/bluetooth/Bluetooth$Builder {
 	public fun <init> ()V
-	public fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;)V
-	public synthetic fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;)V
+	public synthetic fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
 }
 
@@ -293,7 +293,7 @@ public abstract class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionMa
 	protected final fun getCurrentAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 	public final fun getDeviceWrapper ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
 	public fun getEvents ()Lkotlinx/coroutines/flow/Flow;
-	protected final fun getNotifyingCharacteristics ()Lco/touchlab/stately/collections/IsoMutableMap;
+	protected final fun getNotifyingCharacteristics ()Ljava/util/Map;
 	public synthetic fun getRssi ()Lkotlinx/coroutines/flow/Flow;
 	public fun getRssi ()Lkotlinx/coroutines/flow/SharedFlow;
 	public fun handleConnect ()V
@@ -1195,10 +1195,10 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Permit
 }
 
 public class com/splendo/kaluga/bluetooth/scanner/ScanningStateImplRepo : com/splendo/kaluga/bluetooth/scanner/BaseScanningStateRepo {
-	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function4;Lkotlin/coroutines/CoroutineContext;)V
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/coroutines/CoroutineContext;)V
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateRepo : com/splendo/kaluga/bluetooth/scanner/ScanningStateImplRepo {
-	public fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;Lkotlin/jvm/functions/Function4;Lkotlin/coroutines/CoroutineContext;)V
+	public fun <init> (Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;Lkotlin/jvm/functions/Function4;Lkotlin/coroutines/CoroutineContext;)V
 }
 
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index 71d809511..3538ffc3e 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -42,8 +42,8 @@ public final class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Stopped : com
 
 public final class com/splendo/kaluga/bluetooth/BluetoothBuilder : com/splendo/kaluga/bluetooth/Bluetooth$Builder {
 	public fun <init> ()V
-	public fun <init> (Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lkotlin/jvm/functions/Function2;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
 }
 
@@ -255,7 +255,7 @@ public abstract class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionMa
 	protected final fun getCurrentAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 	public final fun getDeviceWrapper ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
 	public fun getEvents ()Lkotlinx/coroutines/flow/Flow;
-	protected final fun getNotifyingCharacteristics ()Lco/touchlab/stately/collections/IsoMutableMap;
+	protected final fun getNotifyingCharacteristics ()Ljava/util/Map;
 	public synthetic fun getRssi ()Lkotlinx/coroutines/flow/Flow;
 	public fun getRssi ()Lkotlinx/coroutines/flow/SharedFlow;
 	public fun handleConnect ()V
@@ -1315,10 +1315,10 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Permit
 }
 
 public class com/splendo/kaluga/bluetooth/scanner/ScanningStateImplRepo : com/splendo/kaluga/bluetooth/scanner/BaseScanningStateRepo {
-	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function4;Lkotlin/coroutines/CoroutineContext;)V
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/coroutines/CoroutineContext;)V
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateRepo : com/splendo/kaluga/bluetooth/scanner/ScanningStateImplRepo {
-	public fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;Lkotlin/jvm/functions/Function4;Lkotlin/coroutines/CoroutineContext;)V
+	public fun <init> (Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;Lkotlin/jvm/functions/Function4;Lkotlin/coroutines/CoroutineContext;)V
 }
 
diff --git a/calendar-permissions/api/androidLib/calendar-permissions.api b/calendar-permissions/api/androidLib/calendar-permissions.api
index 7bb7cd64c..f24800078 100644
--- a/calendar-permissions/api/androidLib/calendar-permissions.api
+++ b/calendar-permissions/api/androidLib/calendar-permissions.api
@@ -34,9 +34,13 @@ public final class com/splendo/kaluga/permissions/calendar/DefaultCalendarPermis
 }
 
 public final class com/splendo/kaluga/permissions/calendar/PermissionKt {
-	public static final fun registerCalendarPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
-	public static synthetic fun registerCalendarPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
-	public static final fun registerCalendarPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
-	public static synthetic fun registerCalendarPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static final fun registerCalendarPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCalendarPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCalendarPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCalendarPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCalendarPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCalendarPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCalendarPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCalendarPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/calendar-permissions/api/jvm/calendar-permissions.api b/calendar-permissions/api/jvm/calendar-permissions.api
index 93f9e3f34..c519e3c56 100644
--- a/calendar-permissions/api/jvm/calendar-permissions.api
+++ b/calendar-permissions/api/jvm/calendar-permissions.api
@@ -37,9 +37,13 @@ public final class com/splendo/kaluga/permissions/calendar/DefaultCalendarPermis
 }
 
 public final class com/splendo/kaluga/permissions/calendar/PermissionKt {
-	public static final fun registerCalendarPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
-	public static synthetic fun registerCalendarPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
-	public static final fun registerCalendarPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
-	public static synthetic fun registerCalendarPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static final fun registerCalendarPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCalendarPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCalendarPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCalendarPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCalendarPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCalendarPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCalendarPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCalendarPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/camera-permissions/api/androidLib/camera-permissions.api b/camera-permissions/api/androidLib/camera-permissions.api
index c8801154a..18e3b739d 100644
--- a/camera-permissions/api/androidLib/camera-permissions.api
+++ b/camera-permissions/api/androidLib/camera-permissions.api
@@ -25,9 +25,13 @@ public final class com/splendo/kaluga/permissions/camera/DefaultCameraPermission
 }
 
 public final class com/splendo/kaluga/permissions/camera/PermissionKt {
-	public static final fun registerCameraPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
-	public static synthetic fun registerCameraPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
-	public static final fun registerCameraPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
-	public static synthetic fun registerCameraPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static final fun registerCameraPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCameraPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCameraPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCameraPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCameraPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCameraPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCameraPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCameraPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/camera-permissions/api/jvm/camera-permissions.api b/camera-permissions/api/jvm/camera-permissions.api
index c60f8f42d..7a0799b4a 100644
--- a/camera-permissions/api/jvm/camera-permissions.api
+++ b/camera-permissions/api/jvm/camera-permissions.api
@@ -28,9 +28,13 @@ public final class com/splendo/kaluga/permissions/camera/DefaultCameraPermission
 }
 
 public final class com/splendo/kaluga/permissions/camera/PermissionKt {
-	public static final fun registerCameraPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
-	public static synthetic fun registerCameraPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
-	public static final fun registerCameraPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
-	public static synthetic fun registerCameraPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static final fun registerCameraPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCameraPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCameraPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCameraPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCameraPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCameraPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCameraPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerCameraPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/contacts-permissions/api/androidLib/contacts-permissions.api b/contacts-permissions/api/androidLib/contacts-permissions.api
index 19d9af11f..b52e79285 100644
--- a/contacts-permissions/api/androidLib/contacts-permissions.api
+++ b/contacts-permissions/api/androidLib/contacts-permissions.api
@@ -34,9 +34,13 @@ public final class com/splendo/kaluga/permissions/contacts/DefaultContactsPermis
 }
 
 public final class com/splendo/kaluga/permissions/contacts/PermissionKt {
-	public static final fun registerContactsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
-	public static synthetic fun registerContactsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
-	public static final fun registerContactsPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
-	public static synthetic fun registerContactsPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static final fun registerContactsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerContactsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerContactsPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerContactsPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerContactsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerContactsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerContactsPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerContactsPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/contacts-permissions/api/jvm/contacts-permissions.api b/contacts-permissions/api/jvm/contacts-permissions.api
index 2973d3cc8..bc2a3b513 100644
--- a/contacts-permissions/api/jvm/contacts-permissions.api
+++ b/contacts-permissions/api/jvm/contacts-permissions.api
@@ -37,9 +37,13 @@ public final class com/splendo/kaluga/permissions/contacts/DefaultContactsPermis
 }
 
 public final class com/splendo/kaluga/permissions/contacts/PermissionKt {
-	public static final fun registerContactsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
-	public static synthetic fun registerContactsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
-	public static final fun registerContactsPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
-	public static synthetic fun registerContactsPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static final fun registerContactsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerContactsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerContactsPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerContactsPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerContactsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerContactsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerContactsPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerContactsPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/date-time-picker/api/androidLib/date-time-picker.api b/date-time-picker/api/androidLib/date-time-picker.api
index 2a6488f0c..7b1d6874c 100644
--- a/date-time-picker/api/androidLib/date-time-picker.api
+++ b/date-time-picker/api/androidLib/date-time-picker.api
@@ -11,13 +11,7 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 
 public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
 	public fun <init> ()V
-	public abstract fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
-	protected final fun createDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
-	public final fun setCancelButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder;
-	public final fun setConfirmButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder;
-	public final fun setLocale (Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder;
-	public final fun setMessage (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder;
-	public final fun setSelectedDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder;
+	public abstract fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
 }
 
 public final class com/splendo/kaluga/datetimepicker/DateTimePicker {
@@ -41,6 +35,18 @@ public final class com/splendo/kaluga/datetimepicker/DateTimePicker {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/splendo/kaluga/datetimepicker/DateTimePicker$Builder {
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun build ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	public final fun setCancelButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+	public final fun setConfirmButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+	public final fun setLocale (Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+	public final fun setMessage (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+	public final fun setSelectedDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+}
+
 public abstract class com/splendo/kaluga/datetimepicker/DateTimePicker$Type {
 }
 
@@ -80,8 +86,8 @@ public final class com/splendo/kaluga/datetimepicker/DateTimePickerPresenter$Bui
 	public fun <init> ()V
 	public fun <init> (ILcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;)V
 	public synthetic fun <init> (ILcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
-	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/DateTimePickerPresenter;
+	public synthetic fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
+	public fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/DateTimePickerPresenter;
 	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
 	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
 	public fun unsubscribe ()V
diff --git a/date-time-picker/api/jvm/date-time-picker.api b/date-time-picker/api/jvm/date-time-picker.api
index befd156eb..2a0fd0189 100644
--- a/date-time-picker/api/jvm/date-time-picker.api
+++ b/date-time-picker/api/jvm/date-time-picker.api
@@ -11,13 +11,7 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 
 public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
 	public fun <init> ()V
-	public abstract fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
-	protected final fun createDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
-	public final fun setCancelButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder;
-	public final fun setConfirmButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder;
-	public final fun setLocale (Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder;
-	public final fun setMessage (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder;
-	public final fun setSelectedDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder;
+	public abstract fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
 }
 
 public final class com/splendo/kaluga/datetimepicker/DateTimePicker {
@@ -41,6 +35,18 @@ public final class com/splendo/kaluga/datetimepicker/DateTimePicker {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/splendo/kaluga/datetimepicker/DateTimePicker$Builder {
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun build ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	public final fun setCancelButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+	public final fun setConfirmButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+	public final fun setLocale (Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+	public final fun setMessage (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+	public final fun setSelectedDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+}
+
 public abstract class com/splendo/kaluga/datetimepicker/DateTimePicker$Type {
 }
 
@@ -82,7 +88,7 @@ public final class com/splendo/kaluga/datetimepicker/DateTimePickerPresenter : c
 
 public final class com/splendo/kaluga/datetimepicker/DateTimePickerPresenter$Builder : com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder {
 	public fun <init> ()V
-	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
-	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/DateTimePickerPresenter;
+	public synthetic fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
+	public fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/DateTimePickerPresenter;
 }
 
diff --git a/hud/api/androidLib/hud.api b/hud/api/androidLib/hud.api
index ef8ff2005..c2be6f212 100644
--- a/hud/api/androidLib/hud.api
+++ b/hud/api/androidLib/hud.api
@@ -16,8 +16,6 @@ public abstract class com/splendo/kaluga/hud/BaseHUD : kotlinx/coroutines/Corout
 public abstract class com/splendo/kaluga/hud/BaseHUD$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
 	public fun <init> ()V
 	public abstract fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/hud/BaseHUD;
-	public final fun setStyle (Lcom/splendo/kaluga/hud/HUDStyle;)Lcom/splendo/kaluga/hud/BaseHUD$Builder;
-	public final fun setTitle (Ljava/lang/String;)Lcom/splendo/kaluga/hud/BaseHUD$Builder;
 }
 
 public final class com/splendo/kaluga/hud/HUD : com/splendo/kaluga/hud/BaseHUD {
@@ -72,3 +70,10 @@ public final class com/splendo/kaluga/hud/HudConfig {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/splendo/kaluga/hud/HudConfig$Builder {
+	public fun <init> ()V
+	public final fun build ()Lcom/splendo/kaluga/hud/HudConfig;
+	public final fun setStyle (Lcom/splendo/kaluga/hud/HUDStyle;)Lcom/splendo/kaluga/hud/HudConfig$Builder;
+	public final fun setTitle (Ljava/lang/String;)Lcom/splendo/kaluga/hud/HudConfig$Builder;
+}
+
diff --git a/hud/api/jvm/hud.api b/hud/api/jvm/hud.api
index 18f0a666f..596c8a70c 100644
--- a/hud/api/jvm/hud.api
+++ b/hud/api/jvm/hud.api
@@ -12,8 +12,6 @@ public abstract class com/splendo/kaluga/hud/BaseHUD : kotlinx/coroutines/Corout
 public abstract class com/splendo/kaluga/hud/BaseHUD$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
 	public fun <init> ()V
 	public abstract fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/hud/BaseHUD;
-	public final fun setStyle (Lcom/splendo/kaluga/hud/HUDStyle;)Lcom/splendo/kaluga/hud/BaseHUD$Builder;
-	public final fun setTitle (Ljava/lang/String;)Lcom/splendo/kaluga/hud/BaseHUD$Builder;
 }
 
 public final class com/splendo/kaluga/hud/HUD : com/splendo/kaluga/hud/BaseHUD {
@@ -63,3 +61,10 @@ public final class com/splendo/kaluga/hud/HudConfig {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/splendo/kaluga/hud/HudConfig$Builder {
+	public fun <init> ()V
+	public final fun build ()Lcom/splendo/kaluga/hud/HudConfig;
+	public final fun setStyle (Lcom/splendo/kaluga/hud/HUDStyle;)Lcom/splendo/kaluga/hud/HudConfig$Builder;
+	public final fun setTitle (Ljava/lang/String;)Lcom/splendo/kaluga/hud/HudConfig$Builder;
+}
+
diff --git a/location-permissions/api/androidLib/location-permissions.api b/location-permissions/api/androidLib/location-permissions.api
index a457b760f..6231a107d 100644
--- a/location-permissions/api/androidLib/location-permissions.api
+++ b/location-permissions/api/androidLib/location-permissions.api
@@ -36,9 +36,13 @@ public final class com/splendo/kaluga/permissions/location/LocationPermissionSta
 }
 
 public final class com/splendo/kaluga/permissions/location/PermissionKt {
-	public static final fun registerLocationPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
-	public static synthetic fun registerLocationPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
-	public static final fun registerLocationPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
-	public static synthetic fun registerLocationPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static final fun registerLocationPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerLocationPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerLocationPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerLocationPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerLocationPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerLocationPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerLocationPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerLocationPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/location-permissions/api/jvm/location-permissions.api b/location-permissions/api/jvm/location-permissions.api
index cadf3f6eb..f336a04df 100644
--- a/location-permissions/api/jvm/location-permissions.api
+++ b/location-permissions/api/jvm/location-permissions.api
@@ -39,9 +39,13 @@ public final class com/splendo/kaluga/permissions/location/LocationPermissionSta
 }
 
 public final class com/splendo/kaluga/permissions/location/PermissionKt {
-	public static final fun registerLocationPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
-	public static synthetic fun registerLocationPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
-	public static final fun registerLocationPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
-	public static synthetic fun registerLocationPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static final fun registerLocationPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerLocationPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerLocationPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerLocationPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerLocationPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerLocationPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerLocationPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerLocationPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/location/api/androidLib/location.api b/location/api/androidLib/location.api
index 9c275cfd5..f7264932f 100644
--- a/location/api/androidLib/location.api
+++ b/location/api/androidLib/location.api
@@ -443,8 +443,8 @@ public final class com/splendo/kaluga/location/LocationStateImpl$PermittedHandle
 }
 
 public class com/splendo/kaluga/location/LocationStateImplRepo : com/splendo/kaluga/location/BaseLocationStateRepo {
-	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public final class com/splendo/kaluga/location/LocationStateKt {
@@ -453,7 +453,7 @@ public final class com/splendo/kaluga/location/LocationStateKt {
 }
 
 public final class com/splendo/kaluga/location/LocationStateRepo : com/splendo/kaluga/location/LocationStateImplRepo {
-	public fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
+	public fun <init> (Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
 }
 
 public abstract interface class com/splendo/kaluga/location/LocationStateRepo$Builder {
@@ -463,8 +463,8 @@ public abstract interface class com/splendo/kaluga/location/LocationStateRepo$Bu
 
 public final class com/splendo/kaluga/location/LocationStateRepoBuilder : com/splendo/kaluga/location/LocationStateRepo$Builder {
 	public fun <init> ()V
-	public fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;)V
+	public synthetic fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
 }
 
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index e1da9fb39..1980faeb4 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -473,8 +473,8 @@ public final class com/splendo/kaluga/location/LocationStateImpl$PermittedHandle
 }
 
 public class com/splendo/kaluga/location/LocationStateImplRepo : com/splendo/kaluga/location/BaseLocationStateRepo {
-	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public final class com/splendo/kaluga/location/LocationStateKt {
@@ -483,7 +483,7 @@ public final class com/splendo/kaluga/location/LocationStateKt {
 }
 
 public final class com/splendo/kaluga/location/LocationStateRepo : com/splendo/kaluga/location/LocationStateImplRepo {
-	public fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
+	public fun <init> (Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
 }
 
 public abstract interface class com/splendo/kaluga/location/LocationStateRepo$Builder {
@@ -496,8 +496,8 @@ public final class com/splendo/kaluga/location/LocationStateRepo$Builder$Default
 
 public final class com/splendo/kaluga/location/LocationStateRepoBuilder : com/splendo/kaluga/location/LocationStateRepo$Builder {
 	public fun <init> ()V
-	public fun <init> (Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lkotlin/jvm/functions/Function2;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
 }
 
diff --git a/microphone-permissions/api/androidLib/microphone-permissions.api b/microphone-permissions/api/androidLib/microphone-permissions.api
index 7837168b8..11bfce5a7 100644
--- a/microphone-permissions/api/androidLib/microphone-permissions.api
+++ b/microphone-permissions/api/androidLib/microphone-permissions.api
@@ -25,9 +25,13 @@ public final class com/splendo/kaluga/permissions/microphone/MicrophonePermissio
 }
 
 public final class com/splendo/kaluga/permissions/microphone/PermissionKt {
-	public static final fun registerMicrophonePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
-	public static synthetic fun registerMicrophonePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
-	public static final fun registerMicrophonePermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
-	public static synthetic fun registerMicrophonePermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static final fun registerMicrophonePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerMicrophonePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerMicrophonePermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerMicrophonePermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerMicrophonePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerMicrophonePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerMicrophonePermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerMicrophonePermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/microphone-permissions/api/jvm/microphone-permissions.api b/microphone-permissions/api/jvm/microphone-permissions.api
index e0c07d1ef..0dee42186 100644
--- a/microphone-permissions/api/jvm/microphone-permissions.api
+++ b/microphone-permissions/api/jvm/microphone-permissions.api
@@ -28,9 +28,13 @@ public final class com/splendo/kaluga/permissions/microphone/MicrophonePermissio
 }
 
 public final class com/splendo/kaluga/permissions/microphone/PermissionKt {
-	public static final fun registerMicrophonePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
-	public static synthetic fun registerMicrophonePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
-	public static final fun registerMicrophonePermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
-	public static synthetic fun registerMicrophonePermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static final fun registerMicrophonePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerMicrophonePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerMicrophonePermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerMicrophonePermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerMicrophonePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerMicrophonePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerMicrophonePermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerMicrophonePermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/notifications-permissions/api/androidLib/notifications-permissions.api b/notifications-permissions/api/androidLib/notifications-permissions.api
index bb479759b..07871ee96 100644
--- a/notifications-permissions/api/androidLib/notifications-permissions.api
+++ b/notifications-permissions/api/androidLib/notifications-permissions.api
@@ -38,9 +38,13 @@ public final class com/splendo/kaluga/permissions/notifications/NotificationsPer
 }
 
 public final class com/splendo/kaluga/permissions/notifications/PermissionKt {
-	public static final fun registerNotificationsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
-	public static synthetic fun registerNotificationsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
-	public static final fun registerNotificationsPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
-	public static synthetic fun registerNotificationsPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static final fun registerNotificationsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerNotificationsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerNotificationsPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerNotificationsPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerNotificationsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerNotificationsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerNotificationsPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerNotificationsPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/notifications-permissions/api/jvm/notifications-permissions.api b/notifications-permissions/api/jvm/notifications-permissions.api
index 38c90684f..1fa58a542 100644
--- a/notifications-permissions/api/jvm/notifications-permissions.api
+++ b/notifications-permissions/api/jvm/notifications-permissions.api
@@ -41,9 +41,13 @@ public final class com/splendo/kaluga/permissions/notifications/NotificationsPer
 }
 
 public final class com/splendo/kaluga/permissions/notifications/PermissionKt {
-	public static final fun registerNotificationsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
-	public static synthetic fun registerNotificationsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
-	public static final fun registerNotificationsPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
-	public static synthetic fun registerNotificationsPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static final fun registerNotificationsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerNotificationsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerNotificationsPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerNotificationsPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerNotificationsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerNotificationsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerNotificationsPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerNotificationsPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/permissions/api/androidLib/permissions.api b/permissions/api/androidLib/permissions.api
index 0aa4131f6..e31d48e29 100644
--- a/permissions/api/androidLib/permissions.api
+++ b/permissions/api/androidLib/permissions.api
@@ -1,5 +1,5 @@
 public final class com/splendo/kaluga/permissions/RegisterAllPermissionsKt {
-	public static final fun registerAllPermissions-8Mi8wO0 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)V
-	public static synthetic fun registerAllPermissions-8Mi8wO0$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)V
+	public static final fun registerAllPermissions-dWUq8MI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerAllPermissions-dWUq8MI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/permissions/api/jvm/permissions.api b/permissions/api/jvm/permissions.api
index 0aa4131f6..e31d48e29 100644
--- a/permissions/api/jvm/permissions.api
+++ b/permissions/api/jvm/permissions.api
@@ -1,5 +1,5 @@
 public final class com/splendo/kaluga/permissions/RegisterAllPermissionsKt {
-	public static final fun registerAllPermissions-8Mi8wO0 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)V
-	public static synthetic fun registerAllPermissions-8Mi8wO0$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)V
+	public static final fun registerAllPermissions-dWUq8MI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerAllPermissions-dWUq8MI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/storage-permissions/api/androidLib/storage-permissions.api b/storage-permissions/api/androidLib/storage-permissions.api
index 98257be06..92c791b14 100644
--- a/storage-permissions/api/androidLib/storage-permissions.api
+++ b/storage-permissions/api/androidLib/storage-permissions.api
@@ -8,10 +8,14 @@ public final class com/splendo/kaluga/permissions/storage/DefaultStoragePermissi
 }
 
 public final class com/splendo/kaluga/permissions/storage/PermissionKt {
-	public static final fun registerStoragePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
-	public static synthetic fun registerStoragePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
-	public static final fun registerStoragePermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
-	public static synthetic fun registerStoragePermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static final fun registerStoragePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerStoragePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerStoragePermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerStoragePermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerStoragePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerStoragePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerStoragePermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerStoragePermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/permissions/storage/StoragePermission : com/splendo/kaluga/permissions/base/Permission {
diff --git a/storage-permissions/api/jvm/storage-permissions.api b/storage-permissions/api/jvm/storage-permissions.api
index 98b1dfba8..6b9655f38 100644
--- a/storage-permissions/api/jvm/storage-permissions.api
+++ b/storage-permissions/api/jvm/storage-permissions.api
@@ -11,10 +11,14 @@ public final class com/splendo/kaluga/permissions/storage/DefaultStoragePermissi
 }
 
 public final class com/splendo/kaluga/permissions/storage/PermissionKt {
-	public static final fun registerStoragePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
-	public static synthetic fun registerStoragePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
-	public static final fun registerStoragePermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
-	public static synthetic fun registerStoragePermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static final fun registerStoragePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerStoragePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerStoragePermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerStoragePermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerStoragePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerStoragePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerStoragePermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerStoragePermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/permissions/storage/StoragePermission : com/splendo/kaluga/permissions/base/Permission {
diff --git a/test-utils-alerts/api/androidLib/test-utils-alerts.api b/test-utils-alerts/api/androidLib/test-utils-alerts.api
index 10bb047de..711352b67 100644
--- a/test-utils-alerts/api/androidLib/test-utils-alerts.api
+++ b/test-utils-alerts/api/androidLib/test-utils-alerts.api
@@ -14,6 +14,7 @@ public final class com/splendo/kaluga/test/alerts/MockAlertPresenter : com/splen
 	public final fun getDismissMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getShowAsyncMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun isPresented ()Z
+	public final fun setPresented (Z)V
 	public fun showAsync (ZLkotlin/jvm/functions/Function0;)V
 }
 
@@ -21,8 +22,8 @@ public final class com/splendo/kaluga/test/alerts/MockAlertPresenter$Builder : c
 	public fun <init> ()V
 	public fun <init> (Z)V
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
-	public final fun getBuiltAlerts ()Lco/touchlab/stately/collections/IsoMutableList;
+	public fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
+	public final fun getBuiltAlerts ()Ljava/util/List;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
diff --git a/test-utils-alerts/api/jvm/test-utils-alerts.api b/test-utils-alerts/api/jvm/test-utils-alerts.api
index a5b683884..ccb45d0cc 100644
--- a/test-utils-alerts/api/jvm/test-utils-alerts.api
+++ b/test-utils-alerts/api/jvm/test-utils-alerts.api
@@ -7,6 +7,7 @@ public final class com/splendo/kaluga/test/alerts/MockAlertPresenter : com/splen
 	public final fun getDismissMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getShowAsyncMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun isPresented ()Z
+	public final fun setPresented (Z)V
 	public fun showAsync (ZLkotlin/jvm/functions/Function0;)V
 }
 
@@ -14,8 +15,8 @@ public final class com/splendo/kaluga/test/alerts/MockAlertPresenter$Builder : c
 	public fun <init> ()V
 	public fun <init> (Z)V
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
-	public final fun getBuiltAlerts ()Lco/touchlab/stately/collections/IsoMutableList;
+	public fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
+	public final fun getBuiltAlerts ()Ljava/util/List;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
diff --git a/test-utils-architecture/api/androidLib/test-utils-architecture.api b/test-utils-architecture/api/androidLib/test-utils-architecture.api
index 3259b7a4b..9fa11fed1 100644
--- a/test-utils-architecture/api/androidLib/test-utils-architecture.api
+++ b/test-utils-architecture/api/androidLib/test-utils-architecture.api
@@ -1,7 +1,5 @@
 public abstract class com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest : com/splendo/kaluga/test/base/BaseUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public class com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest$LazyViewModelTestContext : com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest$ViewModelTestContext, kotlinx/coroutines/CoroutineScope {
@@ -43,8 +41,6 @@ public abstract class com/splendo/kaluga/test/architecture/SimpleUIThreadViewMod
 
 public abstract class com/splendo/kaluga/test/architecture/UIThreadViewModelTest : com/splendo/kaluga/test/base/UIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public class com/splendo/kaluga/test/architecture/UIThreadViewModelTest$LazyViewModelTestContext : com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest$LazyViewModelTestContext, com/splendo/kaluga/test/architecture/UIThreadViewModelTest$ViewModelTestContext {
@@ -57,8 +53,6 @@ public abstract interface class com/splendo/kaluga/test/architecture/UIThreadVie
 public abstract class com/splendo/kaluga/test/architecture/ViewModelTest : com/splendo/kaluga/test/base/BaseTest {
 	public field viewModel Lcom/splendo/kaluga/architecture/viewmodel/LifecycleViewModel;
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun beforeTest ()V
 	protected abstract fun createViewModel ()Lcom/splendo/kaluga/architecture/viewmodel/LifecycleViewModel;
 	public final fun getViewModel ()Lcom/splendo/kaluga/architecture/viewmodel/LifecycleViewModel;
diff --git a/test-utils-architecture/api/jvm/test-utils-architecture.api b/test-utils-architecture/api/jvm/test-utils-architecture.api
index ba53aa9d8..fc7c6fb24 100644
--- a/test-utils-architecture/api/jvm/test-utils-architecture.api
+++ b/test-utils-architecture/api/jvm/test-utils-architecture.api
@@ -1,7 +1,5 @@
 public abstract class com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest : com/splendo/kaluga/test/base/BaseUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public class com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest$LazyViewModelTestContext : com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest$ViewModelTestContext, kotlinx/coroutines/CoroutineScope {
@@ -33,8 +31,6 @@ public abstract class com/splendo/kaluga/test/architecture/SimpleUIThreadViewMod
 
 public abstract class com/splendo/kaluga/test/architecture/UIThreadViewModelTest : com/splendo/kaluga/test/base/UIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public class com/splendo/kaluga/test/architecture/UIThreadViewModelTest$LazyViewModelTestContext : com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest$LazyViewModelTestContext, com/splendo/kaluga/test/architecture/UIThreadViewModelTest$ViewModelTestContext {
@@ -51,8 +47,6 @@ public final class com/splendo/kaluga/test/architecture/UIThreadViewModelTest$Vi
 public abstract class com/splendo/kaluga/test/architecture/ViewModelTest : com/splendo/kaluga/test/base/BaseTest {
 	public field viewModel Lcom/splendo/kaluga/architecture/viewmodel/LifecycleViewModel;
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun beforeTest ()V
 	protected abstract fun createViewModel ()Lcom/splendo/kaluga/architecture/viewmodel/LifecycleViewModel;
 	public final fun getViewModel ()Lcom/splendo/kaluga/architecture/viewmodel/LifecycleViewModel;
diff --git a/test-utils-base/api/androidLib/test-utils-base.api b/test-utils-base/api/androidLib/test-utils-base.api
index bf4c5a3f2..7d4959f6e 100644
--- a/test-utils-base/api/androidLib/test-utils-base.api
+++ b/test-utils-base/api/androidLib/test-utils-base.api
@@ -1,10 +1,3 @@
-public final class com/splendo/kaluga/test/base/AssertionsKt {
-	public static final fun assertFrozen (Ljava/lang/Object;Ljava/lang/String;Z)V
-	public static synthetic fun assertFrozen$default (Ljava/lang/Object;Ljava/lang/String;ZILjava/lang/Object;)V
-	public static final fun assertNotFrozen (Ljava/lang/Object;Ljava/lang/String;Z)V
-	public static synthetic fun assertNotFrozen$default (Ljava/lang/Object;Ljava/lang/String;ZILjava/lang/Object;)V
-}
-
 public final class com/splendo/kaluga/test/base/AwaitAllBlockingKt {
 	public static final fun awaitAllBlocking ([Lkotlinx/coroutines/Deferred;)Ljava/util/List;
 }
@@ -21,7 +14,7 @@ public abstract class com/splendo/kaluga/test/base/BaseFlowTest : com/splendo/ka
 	public abstract fun getFlowFromTestContext ()Lkotlin/jvm/functions/Function2;
 	public final fun getJob ()Lkotlinx/coroutines/Job;
 	public final fun getScope ()Lkotlinx/coroutines/CoroutineScope;
-	protected final fun getWaitForTestToSucceed ()J
+	protected final fun getWaitForTestToSucceed-UwyO8pc ()J
 	public final fun mainAction (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun resetFlow (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun setFirstTestBlock (Z)V
@@ -41,8 +34,6 @@ public class com/splendo/kaluga/test/base/BaseTest {
 
 public abstract class com/splendo/kaluga/test/base/BaseUIThreadTest : com/splendo/kaluga/test/base/BaseTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public abstract fun getCreateTestContextWithConfiguration ()Lkotlin/jvm/functions/Function3;
 	public final fun testOnUIThread (Ljava/lang/Object;ZLkotlin/jvm/functions/Function2;)V
 	public static synthetic fun testOnUIThread$default (Lcom/splendo/kaluga/test/base/BaseUIThreadTest;Ljava/lang/Object;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
@@ -68,7 +59,7 @@ public final class com/splendo/kaluga/test/base/BuildConfig {
 }
 
 public final class com/splendo/kaluga/test/base/DeliberateCancellationException : java/util/concurrent/CancellationException {
-	public fun <init> (Ljava/lang/Object;Z)V
+	public fun <init> (Ljava/lang/Object;)V
 	public final fun getResult ()Ljava/lang/Object;
 }
 
@@ -114,8 +105,6 @@ public final class com/splendo/kaluga/test/base/SimpleUIThreadTest$SimpleTestCon
 
 public abstract class com/splendo/kaluga/test/base/UIThreadTest : com/splendo/kaluga/test/base/BaseUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public abstract fun getCreateTestContext ()Lkotlin/jvm/functions/Function2;
 	public fun getCreateTestContextWithConfiguration ()Lkotlin/jvm/functions/Function3;
 	public final fun testOnUIThread (ZLkotlin/jvm/functions/Function2;)V
@@ -157,8 +146,9 @@ public abstract class com/splendo/kaluga/test/base/mock/BaseMethodMock$Stub {
 	public final fun doExecute (Lkotlin/jvm/functions/Function1;)V
 	public final fun doReturn (Ljava/lang/Object;)V
 	public final fun doThrow (Ljava/lang/Throwable;)V
-	protected final fun getAnswer ()Ljava/util/concurrent/atomic/AtomicReference;
+	protected final fun getAnswer ()Lcom/splendo/kaluga/test/base/mock/answer/BaseAnswer;
 	public abstract fun getMatchers ()Lcom/splendo/kaluga/test/base/mock/parameters/ParametersSpec$Matchers;
+	protected final fun setAnswer (Lcom/splendo/kaluga/test/base/mock/answer/BaseAnswer;)V
 }
 
 public final class com/splendo/kaluga/test/base/mock/CallKt {
diff --git a/test-utils-base/api/jvm/test-utils-base.api b/test-utils-base/api/jvm/test-utils-base.api
index 5e5e0fada..a7b7d5bcf 100644
--- a/test-utils-base/api/jvm/test-utils-base.api
+++ b/test-utils-base/api/jvm/test-utils-base.api
@@ -1,10 +1,3 @@
-public final class com/splendo/kaluga/test/base/AssertionsKt {
-	public static final fun assertFrozen (Ljava/lang/Object;Ljava/lang/String;Z)V
-	public static synthetic fun assertFrozen$default (Ljava/lang/Object;Ljava/lang/String;ZILjava/lang/Object;)V
-	public static final fun assertNotFrozen (Ljava/lang/Object;Ljava/lang/String;Z)V
-	public static synthetic fun assertNotFrozen$default (Ljava/lang/Object;Ljava/lang/String;ZILjava/lang/Object;)V
-}
-
 public final class com/splendo/kaluga/test/base/AwaitAllBlockingKt {
 	public static final fun awaitAllBlocking ([Lkotlinx/coroutines/Deferred;)Ljava/util/List;
 }
@@ -21,7 +14,7 @@ public abstract class com/splendo/kaluga/test/base/BaseFlowTest : com/splendo/ka
 	public abstract fun getFlowFromTestContext ()Lkotlin/jvm/functions/Function2;
 	public final fun getJob ()Lkotlinx/coroutines/Job;
 	public final fun getScope ()Lkotlinx/coroutines/CoroutineScope;
-	protected final fun getWaitForTestToSucceed ()J
+	protected final fun getWaitForTestToSucceed-UwyO8pc ()J
 	public final fun mainAction (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun resetFlow (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun setFirstTestBlock (Z)V
@@ -40,8 +33,6 @@ public class com/splendo/kaluga/test/base/BaseTest {
 
 public abstract class com/splendo/kaluga/test/base/BaseUIThreadTest : com/splendo/kaluga/test/base/BaseTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public abstract fun getCreateTestContextWithConfiguration ()Lkotlin/jvm/functions/Function3;
 	public final fun testOnUIThread (Ljava/lang/Object;ZLkotlin/jvm/functions/Function2;)V
 	public static synthetic fun testOnUIThread$default (Lcom/splendo/kaluga/test/base/BaseUIThreadTest;Ljava/lang/Object;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
@@ -65,7 +56,7 @@ public final class com/splendo/kaluga/test/base/BaseUIThreadTest$TestContext$Def
 }
 
 public final class com/splendo/kaluga/test/base/DeliberateCancellationException : java/util/concurrent/CancellationException {
-	public fun <init> (Ljava/lang/Object;Z)V
+	public fun <init> (Ljava/lang/Object;)V
 	public final fun getResult ()Ljava/lang/Object;
 }
 
@@ -112,8 +103,6 @@ public final class com/splendo/kaluga/test/base/SimpleUIThreadTest$SimpleTestCon
 
 public abstract class com/splendo/kaluga/test/base/UIThreadTest : com/splendo/kaluga/test/base/BaseUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public abstract fun getCreateTestContext ()Lkotlin/jvm/functions/Function2;
 	public fun getCreateTestContextWithConfiguration ()Lkotlin/jvm/functions/Function3;
 	public final fun testOnUIThread (ZLkotlin/jvm/functions/Function2;)V
@@ -160,8 +149,9 @@ public abstract class com/splendo/kaluga/test/base/mock/BaseMethodMock$Stub {
 	public final fun doExecute (Lkotlin/jvm/functions/Function1;)V
 	public final fun doReturn (Ljava/lang/Object;)V
 	public final fun doThrow (Ljava/lang/Throwable;)V
-	protected final fun getAnswer ()Ljava/util/concurrent/atomic/AtomicReference;
+	protected final fun getAnswer ()Lcom/splendo/kaluga/test/base/mock/answer/BaseAnswer;
 	public abstract fun getMatchers ()Lcom/splendo/kaluga/test/base/mock/parameters/ParametersSpec$Matchers;
+	protected final fun setAnswer (Lcom/splendo/kaluga/test/base/mock/answer/BaseAnswer;)V
 }
 
 public final class com/splendo/kaluga/test/base/mock/CallKt {
diff --git a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
index 5fec133eb..a29e51e17 100644
--- a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
@@ -140,7 +140,7 @@ public final class com/splendo/kaluga/test/bluetooth/MockDeviceWrapper : com/spl
 	public final fun getConnectGattMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getCreateBondMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public fun getDevice ()Landroid/bluetooth/BluetoothDevice;
-	public final fun getGattWrappers ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getGattWrappers ()Ljava/util/List;
 	public fun getIdentifier ()Ljava/lang/String;
 	public fun getName ()Ljava/lang/String;
 	public final fun getRemoveBondMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
@@ -280,7 +280,7 @@ public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnection
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedDeviceConnectionManager ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getCreatedDeviceConnectionManager ()Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner : com/splendo/kaluga/bluetooth/scanner/BaseScanner {
@@ -311,7 +311,7 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner$Bui
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedScanners ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getCreatedScanners ()Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanner : com/splendo/kaluga/bluetooth/scanner/Scanner {
diff --git a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
index 69ec1c9fe..422e2d921 100644
--- a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
@@ -188,7 +188,7 @@ public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnection
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedDeviceConnectionManager ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getCreatedDeviceConnectionManager ()Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner : com/splendo/kaluga/bluetooth/scanner/BaseScanner {
@@ -219,7 +219,7 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner$Bui
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedScanners ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getCreatedScanners ()Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanner : com/splendo/kaluga/bluetooth/scanner/Scanner {
diff --git a/test-utils-hud/api/androidLib/test-utils-hud.api b/test-utils-hud/api/androidLib/test-utils-hud.api
index dac3a9d29..2dc8365d1 100644
--- a/test-utils-hud/api/androidLib/test-utils-hud.api
+++ b/test-utils-hud/api/androidLib/test-utils-hud.api
@@ -14,6 +14,7 @@ public final class com/splendo/kaluga/test/hud/MockHUD : com/splendo/kaluga/hud/
 	public final fun getPresentMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public fun isVisible ()Z
 	public fun present (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun setVisible (Z)V
 }
 
 public final class com/splendo/kaluga/test/hud/MockHUD$Builder : com/splendo/kaluga/hud/BaseHUD$Builder {
@@ -22,7 +23,7 @@ public final class com/splendo/kaluga/test/hud/MockHUD$Builder : com/splendo/kal
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/hud/BaseHUD;
 	public fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/hud/MockHUD;
-	public final fun getBuiltHUDs ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuiltHUDs ()Ljava/util/List;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
diff --git a/test-utils-hud/api/jvm/test-utils-hud.api b/test-utils-hud/api/jvm/test-utils-hud.api
index a728e57cb..0a9134f6c 100644
--- a/test-utils-hud/api/jvm/test-utils-hud.api
+++ b/test-utils-hud/api/jvm/test-utils-hud.api
@@ -7,6 +7,7 @@ public final class com/splendo/kaluga/test/hud/MockHUD : com/splendo/kaluga/hud/
 	public final fun getPresentMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public fun isVisible ()Z
 	public fun present (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun setVisible (Z)V
 }
 
 public final class com/splendo/kaluga/test/hud/MockHUD$Builder : com/splendo/kaluga/hud/BaseHUD$Builder {
@@ -15,7 +16,7 @@ public final class com/splendo/kaluga/test/hud/MockHUD$Builder : com/splendo/kal
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/hud/BaseHUD;
 	public fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/hud/MockHUD;
-	public final fun getBuiltHUDs ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuiltHUDs ()Ljava/util/List;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
diff --git a/test-utils-keyboard/api/androidLib/test-utils-keyboard.api b/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
index 5cec3ad42..6372a48e3 100644
--- a/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
+++ b/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
@@ -26,8 +26,8 @@ public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager : com/sp
 	public final fun getFocusHandler ()Lcom/splendo/kaluga/keyboard/FocusHandler;
 	public final fun getHideMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getShowMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun get_focusHandler ()Ljava/util/concurrent/atomic/AtomicReference;
 	public fun hide ()V
+	public final fun setFocusHandler (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
 	public fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
 }
 
@@ -37,7 +37,7 @@ public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager$Builder
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
 	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/keyboard/MockKeyboardManager;
-	public final fun getBuiltKeyboardManagers ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuiltKeyboardManagers ()Ljava/util/List;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
diff --git a/test-utils-keyboard/api/jvm/test-utils-keyboard.api b/test-utils-keyboard/api/jvm/test-utils-keyboard.api
index a55dcc374..b14aa4de8 100644
--- a/test-utils-keyboard/api/jvm/test-utils-keyboard.api
+++ b/test-utils-keyboard/api/jvm/test-utils-keyboard.api
@@ -18,8 +18,8 @@ public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager : com/sp
 	public final fun getFocusHandler ()Lcom/splendo/kaluga/keyboard/FocusHandler;
 	public final fun getHideMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getShowMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun get_focusHandler ()Ljava/util/concurrent/atomic/AtomicReference;
 	public fun hide ()V
+	public final fun setFocusHandler (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
 	public fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
 }
 
@@ -29,7 +29,7 @@ public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager$Builder
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
 	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/keyboard/MockKeyboardManager;
-	public final fun getBuiltKeyboardManagers ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuiltKeyboardManagers ()Ljava/util/List;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
diff --git a/test-utils-koin/api/androidLib/test-utils-koin.api b/test-utils-koin/api/androidLib/test-utils-koin.api
index fae78bb49..91f812a2a 100644
--- a/test-utils-koin/api/androidLib/test-utils-koin.api
+++ b/test-utils-koin/api/androidLib/test-utils-koin.api
@@ -4,8 +4,6 @@ public abstract class com/splendo/kaluga/test/koin/BaseKoinFlowTest : com/splend
 
 public abstract class com/splendo/kaluga/test/koin/BaseKoinUIThreadTest : com/splendo/kaluga/test/base/BaseUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public class com/splendo/kaluga/test/koin/BaseKoinUIThreadTest$KoinTestContext : com/splendo/kaluga/test/base/BaseUIThreadTest$TestContext, org/koin/core/component/KoinComponent {
@@ -19,8 +17,6 @@ public class com/splendo/kaluga/test/koin/BaseKoinUIThreadTest$KoinTestContext :
 
 public abstract class com/splendo/kaluga/test/koin/BaseKoinUIThreadViewModelTest : com/splendo/kaluga/test/koin/BaseKoinUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract class com/splendo/kaluga/test/koin/BaseKoinUIThreadViewModelTest$KoinViewModelTestContext : com/splendo/kaluga/test/koin/BaseKoinUIThreadTest$KoinTestContext, com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest$ViewModelTestContext {
@@ -46,8 +42,6 @@ public abstract class com/splendo/kaluga/test/koin/KoinFlowTest : com/splendo/ka
 
 public abstract class com/splendo/kaluga/test/koin/KoinUIThreadTest : com/splendo/kaluga/test/koin/BaseKoinUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public abstract fun getCreateTestContext ()Lkotlin/jvm/functions/Function2;
 	public fun getCreateTestContextWithConfiguration ()Lkotlin/jvm/functions/Function3;
 	public final fun testOnUIThread (ZLkotlin/jvm/functions/Function2;)V
@@ -63,8 +57,6 @@ public class com/splendo/kaluga/test/koin/KoinUIThreadTest$KoinTestContext : com
 
 public abstract class com/splendo/kaluga/test/koin/KoinUIThreadViewModelTest : com/splendo/kaluga/test/koin/KoinUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract class com/splendo/kaluga/test/koin/KoinUIThreadViewModelTest$KoinViewModelTestContext : com/splendo/kaluga/test/koin/KoinUIThreadTest$KoinTestContext, com/splendo/kaluga/test/architecture/UIThreadViewModelTest$ViewModelTestContext {
diff --git a/test-utils-koin/api/jvm/test-utils-koin.api b/test-utils-koin/api/jvm/test-utils-koin.api
index 4af8c3676..049e5a3c3 100644
--- a/test-utils-koin/api/jvm/test-utils-koin.api
+++ b/test-utils-koin/api/jvm/test-utils-koin.api
@@ -4,8 +4,6 @@ public abstract class com/splendo/kaluga/test/koin/BaseKoinFlowTest : com/splend
 
 public abstract class com/splendo/kaluga/test/koin/BaseKoinUIThreadTest : com/splendo/kaluga/test/base/BaseUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public class com/splendo/kaluga/test/koin/BaseKoinUIThreadTest$KoinTestContext : com/splendo/kaluga/test/base/BaseUIThreadTest$TestContext, org/koin/core/component/KoinComponent {
@@ -19,8 +17,6 @@ public class com/splendo/kaluga/test/koin/BaseKoinUIThreadTest$KoinTestContext :
 
 public abstract class com/splendo/kaluga/test/koin/BaseKoinUIThreadViewModelTest : com/splendo/kaluga/test/koin/BaseKoinUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract class com/splendo/kaluga/test/koin/BaseKoinUIThreadViewModelTest$KoinViewModelTestContext : com/splendo/kaluga/test/koin/BaseKoinUIThreadTest$KoinTestContext, com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest$ViewModelTestContext {
@@ -39,8 +35,6 @@ public abstract class com/splendo/kaluga/test/koin/KoinFlowTest : com/splendo/ka
 
 public abstract class com/splendo/kaluga/test/koin/KoinUIThreadTest : com/splendo/kaluga/test/koin/BaseKoinUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public abstract fun getCreateTestContext ()Lkotlin/jvm/functions/Function2;
 	public fun getCreateTestContextWithConfiguration ()Lkotlin/jvm/functions/Function3;
 	public final fun testOnUIThread (ZLkotlin/jvm/functions/Function2;)V
@@ -56,8 +50,6 @@ public class com/splendo/kaluga/test/koin/KoinUIThreadTest$KoinTestContext : com
 
 public abstract class com/splendo/kaluga/test/koin/KoinUIThreadViewModelTest : com/splendo/kaluga/test/koin/KoinUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract class com/splendo/kaluga/test/koin/KoinUIThreadViewModelTest$KoinViewModelTestContext : com/splendo/kaluga/test/koin/KoinUIThreadTest$KoinTestContext, com/splendo/kaluga/test/architecture/UIThreadViewModelTest$ViewModelTestContext {
diff --git a/test-utils-location/api/androidLib/test-utils-location.api b/test-utils-location/api/androidLib/test-utils-location.api
index 8da3ddcdc..e4e480ee4 100644
--- a/test-utils-location/api/androidLib/test-utils-location.api
+++ b/test-utils-location/api/androidLib/test-utils-location.api
@@ -30,7 +30,7 @@ public final class com/splendo/kaluga/test/location/MockBaseLocationManager$Buil
 	public fun <init> (ZZ)V
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/location/BaseLocationManager;
-	public final fun getBuiltLocationManagers ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuiltLocationManagers ()Ljava/util/List;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getInitialLocationEnabled ()Z
 }
@@ -144,10 +144,10 @@ public final class com/splendo/kaluga/test/location/MockLocationState$PermittedH
 }
 
 public final class com/splendo/kaluga/test/location/MockLocationStateRepoBuilder : com/splendo/kaluga/location/LocationStateRepo$Builder {
-	public fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Z)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Z)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
-	public final fun getBuiltLocationStateRepo ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuiltLocationStateRepo ()Ljava/util/List;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getLocationManagerBuilder ()Lcom/splendo/kaluga/location/BaseLocationManager$Builder;
 }
diff --git a/test-utils-location/api/jvm/test-utils-location.api b/test-utils-location/api/jvm/test-utils-location.api
index a109ee728..32fef185c 100644
--- a/test-utils-location/api/jvm/test-utils-location.api
+++ b/test-utils-location/api/jvm/test-utils-location.api
@@ -23,7 +23,7 @@ public final class com/splendo/kaluga/test/location/MockBaseLocationManager$Buil
 	public fun <init> (ZZ)V
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/location/BaseLocationManager;
-	public final fun getBuiltLocationManagers ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuiltLocationManagers ()Ljava/util/List;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getInitialLocationEnabled ()Z
 }
@@ -155,10 +155,10 @@ public final class com/splendo/kaluga/test/location/MockLocationState$PermittedH
 }
 
 public final class com/splendo/kaluga/test/location/MockLocationStateRepoBuilder : com/splendo/kaluga/location/LocationStateRepo$Builder {
-	public fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Z)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Z)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
-	public final fun getBuiltLocationStateRepo ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuiltLocationStateRepo ()Ljava/util/List;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getLocationManagerBuilder ()Lcom/splendo/kaluga/location/BaseLocationManager$Builder;
 }
diff --git a/test-utils-permissions/api/androidLib/test-utils-permissions.api b/test-utils-permissions/api/androidLib/test-utils-permissions.api
index 68ef3e17b..6d5d913c4 100644
--- a/test-utils-permissions/api/androidLib/test-utils-permissions.api
+++ b/test-utils-permissions/api/androidLib/test-utils-permissions.api
@@ -45,7 +45,7 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionManager$Bui
 	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun create (Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/permissions/MockPermissionManager;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedManagers ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getCreatedManagers ()Ljava/util/List;
 	public final fun getInitialState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
 	public final fun getMonitoringInterval-UwyO8pc ()J
 	public final fun getPermission ()Lcom/splendo/kaluga/permissions/base/Permission;
@@ -114,14 +114,14 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionsBuilder :
 	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;Z)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getBluetoothStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getBuildBluetoothStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildCalendarStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildCameraStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildContactsStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildLocationStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildMicrophoneStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildNotificationsStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildStorageStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuildBluetoothStateRepos ()Ljava/util/List;
+	public final fun getBuildCalendarStateRepos ()Ljava/util/List;
+	public final fun getBuildCameraStateRepos ()Ljava/util/List;
+	public final fun getBuildContactsStateRepos ()Ljava/util/List;
+	public final fun getBuildLocationStateRepos ()Ljava/util/List;
+	public final fun getBuildMicrophoneStateRepos ()Ljava/util/List;
+	public final fun getBuildNotificationsStateRepos ()Ljava/util/List;
+	public final fun getBuildStorageStateRepos ()Ljava/util/List;
 	public final fun getCalendarStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getCameraStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getContactsStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
@@ -129,6 +129,6 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionsBuilder :
 	public final fun getMicrophoneStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getNotificationsStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getStorageStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun registerAllPermissionsBuilders ()V
+	public final fun registerAllPermissionsBuilders (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
diff --git a/test-utils-permissions/api/jvm/test-utils-permissions.api b/test-utils-permissions/api/jvm/test-utils-permissions.api
index 1ca3d0343..b0d79d054 100644
--- a/test-utils-permissions/api/jvm/test-utils-permissions.api
+++ b/test-utils-permissions/api/jvm/test-utils-permissions.api
@@ -34,7 +34,7 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionManager$Bui
 	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun create (Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/permissions/MockPermissionManager;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedManagers ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getCreatedManagers ()Ljava/util/List;
 	public final fun getInitialState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
 	public final fun getMonitoringInterval-UwyO8pc ()J
 	public final fun getPermission ()Lcom/splendo/kaluga/permissions/base/Permission;
@@ -121,14 +121,14 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionsBuilder :
 	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;Z)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getBluetoothStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getBuildBluetoothStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildCalendarStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildCameraStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildContactsStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildLocationStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildMicrophoneStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildNotificationsStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildStorageStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuildBluetoothStateRepos ()Ljava/util/List;
+	public final fun getBuildCalendarStateRepos ()Ljava/util/List;
+	public final fun getBuildCameraStateRepos ()Ljava/util/List;
+	public final fun getBuildContactsStateRepos ()Ljava/util/List;
+	public final fun getBuildLocationStateRepos ()Ljava/util/List;
+	public final fun getBuildMicrophoneStateRepos ()Ljava/util/List;
+	public final fun getBuildNotificationsStateRepos ()Ljava/util/List;
+	public final fun getBuildStorageStateRepos ()Ljava/util/List;
 	public final fun getCalendarStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getCameraStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getContactsStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
@@ -136,7 +136,7 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionsBuilder :
 	public final fun getMicrophoneStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getNotificationsStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getStorageStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun registerAllPermissionsBuilders ()V
+	public final fun registerAllPermissionsBuilders (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/test/permissions/MockPermissionsContextKt {
diff --git a/test-utils/api/androidLib/test-utils.api b/test-utils/api/androidLib/test-utils.api
index a29084463..d246a8527 100644
--- a/test-utils/api/androidLib/test-utils.api
+++ b/test-utils/api/androidLib/test-utils.api
@@ -13,8 +13,6 @@ public abstract class com/splendo/kaluga/test/KoinFlowTest : com/splendo/kaluga/
 
 public abstract class com/splendo/kaluga/test/KoinUIThreadTest : com/splendo/kaluga/test/koin/KoinUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public class com/splendo/kaluga/test/KoinUIThreadTest$KoinTestContext : com/splendo/kaluga/test/koin/KoinUIThreadTest$KoinTestContext {
@@ -24,8 +22,6 @@ public class com/splendo/kaluga/test/KoinUIThreadTest$KoinTestContext : com/sple
 
 public abstract class com/splendo/kaluga/test/KoinUIThreadViewModelTest : com/splendo/kaluga/test/KoinUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract class com/splendo/kaluga/test/KoinUIThreadViewModelTest$KoinViewModelTestContext : com/splendo/kaluga/test/KoinUIThreadTest$KoinTestContext, com/splendo/kaluga/test/architecture/UIThreadViewModelTest$ViewModelTestContext {
@@ -36,10 +32,6 @@ public abstract class com/splendo/kaluga/test/KoinUIThreadViewModelTest$KoinView
 }
 
 public final class com/splendo/kaluga/test/LegacyKt {
-	public static final fun assertFrozen (Ljava/lang/Object;Ljava/lang/String;Z)V
-	public static synthetic fun assertFrozen$default (Ljava/lang/Object;Ljava/lang/String;ZILjava/lang/Object;)V
-	public static final fun assertNotFrozen (Ljava/lang/Object;Ljava/lang/String;Z)V
-	public static synthetic fun assertNotFrozen$default (Ljava/lang/Object;Ljava/lang/String;ZILjava/lang/Object;)V
 	public static final fun awaitAllBlocking ([Lkotlinx/coroutines/Deferred;)Ljava/util/List;
 	public static final fun captureFor-8Mi8wO0 (Lkotlinx/coroutines/flow/Flow;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
@@ -56,8 +48,6 @@ public final class com/splendo/kaluga/test/SimpleUIThreadTest$SimpleTestContext
 
 public abstract class com/splendo/kaluga/test/UIThreadTest : com/splendo/kaluga/test/base/UIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract interface class com/splendo/kaluga/test/UIThreadTest$TestContext : com/splendo/kaluga/test/base/UIThreadTest$TestContext {
diff --git a/test-utils/api/jvm/test-utils.api b/test-utils/api/jvm/test-utils.api
index 3b75d675e..a8d4922a1 100644
--- a/test-utils/api/jvm/test-utils.api
+++ b/test-utils/api/jvm/test-utils.api
@@ -13,8 +13,6 @@ public abstract class com/splendo/kaluga/test/KoinFlowTest : com/splendo/kaluga/
 
 public abstract class com/splendo/kaluga/test/KoinUIThreadTest : com/splendo/kaluga/test/koin/KoinUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public class com/splendo/kaluga/test/KoinUIThreadTest$KoinTestContext : com/splendo/kaluga/test/koin/KoinUIThreadTest$KoinTestContext {
@@ -24,8 +22,6 @@ public class com/splendo/kaluga/test/KoinUIThreadTest$KoinTestContext : com/sple
 
 public abstract class com/splendo/kaluga/test/KoinUIThreadViewModelTest : com/splendo/kaluga/test/KoinUIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract class com/splendo/kaluga/test/KoinUIThreadViewModelTest$KoinViewModelTestContext : com/splendo/kaluga/test/KoinUIThreadTest$KoinTestContext, com/splendo/kaluga/test/architecture/UIThreadViewModelTest$ViewModelTestContext {
@@ -36,10 +32,6 @@ public abstract class com/splendo/kaluga/test/KoinUIThreadViewModelTest$KoinView
 }
 
 public final class com/splendo/kaluga/test/LegacyKt {
-	public static final fun assertFrozen (Ljava/lang/Object;Ljava/lang/String;Z)V
-	public static synthetic fun assertFrozen$default (Ljava/lang/Object;Ljava/lang/String;ZILjava/lang/Object;)V
-	public static final fun assertNotFrozen (Ljava/lang/Object;Ljava/lang/String;Z)V
-	public static synthetic fun assertNotFrozen$default (Ljava/lang/Object;Ljava/lang/String;ZILjava/lang/Object;)V
 	public static final fun awaitAllBlocking ([Lkotlinx/coroutines/Deferred;)Ljava/util/List;
 	public static final fun captureFor-8Mi8wO0 (Lkotlinx/coroutines/flow/Flow;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
@@ -57,8 +49,6 @@ public final class com/splendo/kaluga/test/SimpleUIThreadTest$SimpleTestContext
 
 public abstract class com/splendo/kaluga/test/UIThreadTest : com/splendo/kaluga/test/base/UIThreadTest {
 	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract interface class com/splendo/kaluga/test/UIThreadTest$TestContext : com/splendo/kaluga/test/base/UIThreadTest$TestContext {

From c378a4da2863f0eed41553bc4fbca512f09bb69c Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 4 Nov 2022 11:25:17 +0100
Subject: [PATCH 009/227] Fixes to get compilation working

---
 .../kotlin/AlertsViewModel.kt                  |  2 +-
 .../commonTest/kotlin/AlertPresenterTests.kt   |  2 +-
 alerts/src/commonTest/kotlin/AlertsTest.kt     | 18 ++++++++++++++++++
 .../kotlin/TestActivity.kt                     |  2 +-
 .../androidLibAndroidTest/AndroidManifest.xml  |  2 +-
 .../kotlin/TestActivity.kt                     |  2 +-
 .../GetOrPutAndRemoveOnDestroyFromCacheTest.kt |  2 +-
 .../kotlin/lifecycle/LifecycleManagerTest.kt   |  2 +-
 .../navigation/AndroidNavigationBundleTest.kt  |  2 +-
 .../src/androidLibMain/AndroidManifest.xml     |  2 +-
 .../lifecycle/LifecycleManagerObserver.kt      |  2 +-
 .../kotlin/lifecycle/LifecycleSubscribable.kt  |  2 +-
 .../getOrPutAndRemoveOnDestroyFromCache.kt     |  2 +-
 .../kotlin/navigation/IntentFlag.kt            |  2 +-
 .../kotlin/navigation/NavigationBundle.kt      |  2 +-
 .../kotlin/navigation/NavigationSpec.kt        |  2 +-
 .../kotlin/navigation/Navigator.kt             |  2 +-
 .../kotlin/observable/Disposable.kt            |  2 +-
 .../viewmodel/KalugaViewModelActivity.kt       |  2 +-
 .../viewmodel/KalugaViewModelDialogFragment.kt |  2 +-
 .../viewmodel/KalugaViewModelFragment.kt       |  2 +-
 .../KalugaViewModelLifecycleObserver.kt        |  2 +-
 .../kotlin/viewmodel/LifecycleViewModel.kt     |  2 +-
 .../lifecycle/LifecycleManagerObserverTests.kt |  2 +-
 .../kotlin/navigation/NavigationBundle.kt      |  2 +-
 .../kotlin/navigation/NavigationBundleSpec.kt  |  2 +-
 .../commonMain/kotlin/navigation/Navigator.kt  |  2 +-
 .../commonMain/kotlin/observable/Disposable.kt |  2 +-
 .../commonMain/kotlin/observable/Observable.kt |  2 +-
 .../kotlin/viewmodel/LifecycleViewModel.kt     |  2 +-
 .../kotlin/navigation/MockSpecRow.kt           |  2 +-
 .../kotlin/navigation/NavigationBundleTest.kt  |  2 +-
 .../kotlin/observable/ObservableBaseTest.kt    |  2 +-
 .../kotlin/navigation/NavigationSpec.kt        |  2 +-
 .../src/iosMain/kotlin/navigation/Navigator.kt |  2 +-
 .../kotlin/observable/SimpleDisposable.kt      |  2 +-
 .../kotlin/viewmodel/LifecycleViewModel.kt     |  2 +-
 .../viewmodel/ViewModelLifecycleManager.kt     |  2 +-
 .../src/jsMain/kotlin/navigation/Navigator.kt  |  2 +-
 .../kotlin/viewmodel/LifecycleViewModel.kt     |  2 +-
 .../src/jvmMain/kotlin/navigation/Navigator.kt |  2 +-
 .../kotlin/observable/SimpleDisposable.kt      |  2 +-
 .../kotlin/viewmodel/LifecycleViewModel.kt     |  2 +-
 .../kotlin/text/DateFormatterTest.kt           |  2 +-
 .../kotlin/text/KalugaDateFormatter.kt         |  2 +-
 .../kotlin/text/NumberFormatter.kt             | 11 +++++------
 .../androidLibMain/kotlin/text/StringUtils.kt  | 10 +++++-----
 .../androidLibMain/kotlin/utils/KalugaDate.kt  |  2 +-
 base/src/androidLibMain/kotlin/utils/Locale.kt |  2 +-
 .../androidLibMain/kotlin/utils/TimeZone.kt    |  2 +-
 .../kotlin/text/DateFormatterTest.kt           |  2 +-
 base/src/commonMain/kotlin/text/DateTime.kt    | 10 +++++-----
 base/src/commonMain/kotlin/text/FixedString.kt | 10 +++++-----
 base/src/commonMain/kotlin/text/Flags.kt       |  2 +-
 .../commonMain/kotlin/text/FormatSpecifier.kt  | 10 +++++-----
 .../src/commonMain/kotlin/text/FormatString.kt | 10 +++++-----
 .../kotlin/text/KalugaDateFormatter.kt         |  2 +-
 .../commonMain/kotlin/text/NumberFormatter.kt  |  2 +-
 .../kotlin/text/RegularFormatCharacter.kt      | 10 +++++-----
 .../commonMain/kotlin/text/StringFormatter.kt  | 10 +++++-----
 .../kotlin/text/StringFormatterException.kt    | 10 +++++-----
 base/src/commonMain/kotlin/text/StringUtils.kt | 10 +++++-----
 base/src/commonMain/kotlin/utils/ByteUtils.kt  | 10 +++++-----
 base/src/commonMain/kotlin/utils/KalugaDate.kt |  2 +-
 base/src/commonMain/kotlin/utils/Locale.kt     |  2 +-
 base/src/commonMain/kotlin/utils/TimeZone.kt   |  2 +-
 base/src/commonMain/kotlin/utils/UnitSystem.kt |  2 +-
 .../commonTest/kotlin/flow/ColdFlowableTest.kt |  2 +-
 .../commonTest/kotlin/flow/HotFlowableTest.kt  |  2 +-
 .../kotlin/text/DateFormatterTest.kt           |  2 +-
 .../kotlin/text/NumberFormatterTest.kt         |  7 ++++---
 .../kotlin/text/StringFormatterTest.kt         | 10 +++++-----
 .../kotlin/utils/ByOrdinalOrDefaultTest.kt     | 10 +++++-----
 base/src/commonTest/kotlin/utils/DateTest.kt   | 10 +++++-----
 base/src/commonTest/kotlin/utils/LocaleTest.kt |  2 +-
 .../commonTest/kotlin/utils/UnitSystemTest.kt  |  2 +-
 base/src/iosMain/kotlin/GCScheduler.kt         |  2 +-
 .../iosMain/kotlin/text/KalugaDateFormatter.kt |  2 +-
 .../src/iosMain/kotlin/text/NumberFormatter.kt |  2 +-
 base/src/iosMain/kotlin/text/StringUtils.kt    |  2 +-
 base/src/iosMain/kotlin/utils/KalugaDate.kt    | 10 +++++-----
 base/src/iosMain/kotlin/utils/Locale.kt        |  2 +-
 base/src/iosMain/kotlin/utils/TimeZone.kt      |  2 +-
 base/src/iosTest/kotlin/DateFormatterTest.kt   |  2 +-
 base/src/iosTest/kotlin/IOSVersionTest.kt      |  2 +-
 .../jsMain/kotlin/text/KalugaDateFormatter.kt  |  2 +-
 base/src/jsMain/kotlin/text/NumberFormatter.kt | 10 +++++-----
 base/src/jsMain/kotlin/text/StringUtils.kt     | 10 +++++-----
 base/src/jsMain/kotlin/utils/KalugaDate.kt     |  2 +-
 base/src/jsMain/kotlin/utils/Locale.kt         |  2 +-
 base/src/jsMain/kotlin/utils/TimeZone.kt       |  2 +-
 .../jsTest/kotlin/text/DateFormatterTest.kt    |  2 +-
 .../jvmMain/kotlin/text/KalugaDateFormatter.kt |  2 +-
 .../src/jvmMain/kotlin/text/NumberFormatter.kt | 10 +++++-----
 base/src/jvmMain/kotlin/text/StringUtils.kt    | 10 +++++-----
 base/src/jvmMain/kotlin/utils/KalugaDate.kt    |  2 +-
 base/src/jvmMain/kotlin/utils/Locale.kt        |  2 +-
 base/src/jvmMain/kotlin/utils/TimeZone.kt      |  2 +-
 .../jvmTest/kotlin/text/DateFormatterTest.kt   |  2 +-
 beacons/src/commonMain/kotlin/BeaconInfo.kt    |  2 +-
 beacons/src/commonMain/kotlin/Beacons.kt       |  2 +-
 beacons/src/commonMain/kotlin/Eddystone.kt     |  2 +-
 .../src/commonTest/kotlin/BeaconUnpackTest.kt  |  2 +-
 .../src/iosMain/kotlin/device/DeviceWrapper.kt |  2 +-
 .../kotlin/DateTimePickerViewModel.kt          |  2 +-
 .../kotlin/DateTimePickerPresenter.kt          |  2 +-
 .../src/commonMain/kotlin/DateTimePicker.kt    |  2 +-
 .../kotlin/DateTimePickerPresenterTests.kt     |  2 +-
 .../iosMain/kotlin/DateTimePickerPresenter.kt  |  2 +-
 .../jsMain/kotlin/DateTimePickerPresenter.kt   |  2 +-
 .../jvmMain/kotlin/DateTimePickerPresenter.kt  |  2 +-
 .../kaluga/example/beacons/BeaconsActivity.kt  |  2 +-
 .../kaluga/example/beacons/BeaconsAdapter.kt   |  2 +-
 .../kaluga/example/beacons/BeaconsBinding.kt   |  2 +-
 .../example/bluetooth/BluetoothActivity.kt     |  2 +-
 .../example/bluetooth/BluetoothAdapter.kt      |  2 +-
 .../BluetoothCharacteristicAdapter.kt          |  2 +-
 .../bluetooth/BluetoothDescriptorAdapter.kt    |  2 +-
 .../example/bluetooth/BluetoothMoreActivity.kt |  2 +-
 .../bluetooth/BluetoothServiceAdapter.kt       |  2 +-
 .../location/LocationBackgroundService.kt      |  2 +-
 .../permissions/PermissionsDemoListActivity.kt |  2 +-
 .../architecture/KNArchitectureFramework.kt    |  2 +-
 .../kotlin/beacons/KNBeaconsFramework.kt       |  2 +-
 .../kotlin/bluetooth/KNBluetoothFramework.kt   |  2 +-
 .../kotlin/viewmodel/ExampleViewModel.kt       |  2 +-
 .../ArchitectureDetailsViewModel.kt            |  2 +-
 .../architecture/ArchitectureInputViewModel.kt |  2 +-
 .../beacons/BeaconsListBeaconViewModel.kt      |  2 +-
 .../viewmodel/beacons/BeaconsListViewModel.kt  |  2 +-
 .../BluetoothCharacteristicViewModel.kt        |  2 +-
 .../bluetooth/BluetoothDescriptorViewModel.kt  |  2 +-
 .../BluetoothDeviceDetailViewModel.kt          |  2 +-
 .../bluetooth/BluetoothListDeviceViewModel.kt  |  2 +-
 .../bluetooth/BluetoothListViewModel.kt        |  2 +-
 .../bluetooth/BluetoothServiceViewModel.kt     |  2 +-
 .../featureList/FeatureListViewModel.kt        |  2 +-
 .../kotlin/viewmodel/info/InfoViewModel.kt     |  2 +-
 .../viewmodel/keyboard/KeyboardViewModel.kt    |  2 +-
 .../viewmodel/location/LocationViewModel.kt    |  2 +-
 .../permissions/PermissionViewModel.kt         |  2 +-
 .../permissions/PermissionsListViewModel.kt    |  2 +-
 .../kotlin/HudViewModel.kt                     |  2 +-
 hud/src/jsMain/kotlin/HUD.kt                   |  2 +-
 hud/src/jvmMain/kotlin/HUD.kt                  |  2 +-
 .../ActivityKeyboardManagerBuilderTest.kt      |  2 +-
 .../kotlin/AndroidKeyboardManagerTests.kt      |  2 +-
 .../commonTest/kotlin/KeyboardManagerTests.kt  |  2 +-
 links/build.gradle.kts                         |  2 +-
 .../kaluga/links/AndroidLinksHandlerTest.kt    |  2 +-
 links/src/androidLibMain/AndroidManifest.xml   |  2 +-
 .../links/manager/PlatformLinksHandler.kt      |  2 +-
 .../links/manager/DefaultLinksManager.kt       |  2 +-
 .../kaluga/links/manager/LinksHandler.kt       |  2 +-
 .../kaluga/links/manager/LinksManager.kt       |  2 +-
 .../com/splendo/kaluga/links/utils/decoders.kt |  2 +-
 .../links/manager/DefaultLinksManagerTest.kt   |  2 +-
 .../kaluga/links/manager/MockLinksManager.kt   |  2 +-
 .../kaluga/links/utils/LinksDecoderTest.kt     |  2 +-
 .../links/manager/PlatformLinksHandler.kt      |  2 +-
 .../kaluga/links/IosLinksHandlerTest.kt        |  2 +-
 .../links/manager/PlatformLinksHandler.kt      |  2 +-
 .../kaluga/links/PlatformLinksManagerTest.kt   |  2 +-
 .../links/manager/PlatformLinksHandler.kt      |  2 +-
 .../kaluga/links/PlatformLinksManagerTest.kt   |  2 +-
 .../iosMain/kotlin/location/LocationMonitor.kt | 10 +++++-----
 logging/src/androidLibMain/kotlin/log.kt       |  2 +-
 logging/src/commonMain/kotlin/NapierLogger.kt  |  2 +-
 logging/src/iosMain/kotlin/log.kt              |  2 +-
 logging/src/jsMain/kotlin/log.kt               | 10 +++++-----
 .../kotlin/TestActivity.kt                     |  2 +-
 .../kotlin/AndroidStringsTest.kt               |  2 +-
 .../src/androidLibMain/kotlin/DarkMode.kt      | 10 +++++-----
 resources/src/androidLibMain/kotlin/Font.kt    | 10 +++++-----
 resources/src/androidLibMain/kotlin/Image.kt   |  2 +-
 .../src/androidLibMain/kotlin/KalugaColor.kt   | 10 +++++-----
 .../src/androidLibMain/kotlin/Resources.kt     | 10 +++++-----
 resources/src/commonMain/kotlin/DarkMode.kt    | 10 +++++-----
 resources/src/commonMain/kotlin/Font.kt        |  2 +-
 resources/src/commonMain/kotlin/Image.kt       | 10 +++++-----
 resources/src/commonMain/kotlin/KalugaColor.kt | 10 +++++-----
 resources/src/commonMain/kotlin/Resources.kt   | 10 +++++-----
 .../src/commonTest/kotlin/StringsTests.kt      |  2 +-
 resources/src/iosMain/kotlin/DarkMode.kt       | 10 +++++-----
 resources/src/iosMain/kotlin/Font.kt           | 10 +++++-----
 resources/src/iosMain/kotlin/Image.kt          | 10 +++++-----
 resources/src/iosMain/kotlin/KalugaColor.kt    |  2 +-
 resources/src/iosMain/kotlin/Resources.kt      | 10 +++++-----
 resources/src/iosTest/kotlin/IOSStringsTest.kt |  2 +-
 resources/src/jsMain/kotlin/DarkMode.kt        | 10 +++++-----
 resources/src/jsMain/kotlin/Font.kt            | 10 +++++-----
 resources/src/jsMain/kotlin/Image.kt           |  2 +-
 resources/src/jsMain/kotlin/KalugaColor.kt     | 10 +++++-----
 resources/src/jsMain/kotlin/Resources.kt       | 10 +++++-----
 resources/src/jvmMain/kotlin/DarkMode.kt       | 10 +++++-----
 resources/src/jvmMain/kotlin/Font.kt           | 11 ++++++-----
 resources/src/jvmMain/kotlin/Image.kt          | 10 +++++-----
 resources/src/jvmMain/kotlin/KalugaColor.kt    | 10 +++++-----
 resources/src/jvmMain/kotlin/Resources.kt      | 10 +++++-----
 .../src/commonMain/kotlin/ScientificArray.kt   | 10 +++++-----
 .../kotlin/converter/area/convertToVolume.kt   | 10 +++++-----
 .../convertFromSpecificEnergy.kt               | 10 +++++-----
 .../convertToSpecificEnergy.kt                 | 10 +++++-----
 .../kotlin/converter/length/convertToVolume.kt | 10 +++++-----
 ...nvertFromIonizingRadiationEquivalentDose.kt | 10 +++++-----
 ...convertToIonizingRadiationEquivalentDose.kt | 10 +++++-----
 .../volume/convertToVolumetricFlow.kt          | 10 +++++-----
 .../volumetricFlow/convertToVolume.kt          | 10 +++++-----
 .../src/commonMain/kotlin/unit/ActionUnit.kt   | 10 +++++-----
 .../kotlin/unit/AmountOfSubstanceUnit.kt       | 10 +++++-----
 .../src/commonMain/kotlin/unit/AngleUnit.kt    | 10 +++++-----
 .../kotlin/unit/AngularAcceleration.kt         | 10 +++++-----
 .../kotlin/unit/CatalysticActivityUnit.kt      | 10 +++++-----
 .../kotlin/unit/ElectricCapacitanceUnit.kt     | 10 +++++-----
 .../kotlin/unit/ElectricConductanceUnit.kt     | 10 +++++-----
 .../kotlin/unit/ElectricCurrentUnit.kt         | 10 +++++-----
 .../kotlin/unit/ElectricResistanceUnit.kt      | 10 +++++-----
 .../commonMain/kotlin/unit/HeatCapacityUnit.kt | 10 +++++-----
 .../commonMain/kotlin/unit/IlluminanceUnit.kt  | 10 +++++-----
 .../kotlin/unit/LinearMassDensityUnit.kt       | 10 +++++-----
 .../kotlin/unit/LuminousExposureUnits.kt       | 10 +++++-----
 .../commonMain/kotlin/unit/LuminousFluxUnit.kt | 10 +++++-----
 .../commonMain/kotlin/unit/MagneticFluxUnit.kt | 10 +++++-----
 .../kotlin/unit/MagneticInductionUnit.kt       | 10 +++++-----
 .../commonMain/kotlin/unit/MassFlowRateUnit.kt | 10 +++++-----
 .../commonMain/kotlin/unit/MolarEnergyUnit.kt  | 10 +++++-----
 .../commonMain/kotlin/unit/MolarVolumeUnit.kt  | 10 +++++-----
 .../src/commonMain/kotlin/unit/MolarityUnit.kt | 10 +++++-----
 .../kotlin/unit/SpecificVolumeUnit.kt          | 10 +++++-----
 .../kotlin/unit/ThermalResistanceUnit.kt       | 10 +++++-----
 .../src/commonMain/kotlin/unit/VoltageUnit.kt  | 10 +++++-----
 .../kotlin/unit/VolumetricFluxUnit.kt          | 10 +++++-----
 .../src/commonMain/kotlin/unit/YankUnit.kt     | 10 +++++-----
 .../kaluga/system/network/NetworkManager.kt    |  2 +-
 .../system/network/NetworkManagerBuilder.kt    |  2 +-
 .../network/state/NetworkStateRepoBuilder.kt   |  2 +-
 .../system/network/BaseNetworkManager.kt       |  2 +-
 .../splendo/kaluga/system/network/Network.kt   |  2 +-
 .../system/network/state/NetworkState.kt       |  2 +-
 .../system/network/state/NetworkStateRepo.kt   |  2 +-
 .../network/state/NetworkStateRepoBuilder.kt   |  2 +-
 .../system/network/MockNetworkManager.kt       |  2 +-
 .../network/MockNetworkStateRepoBuilder.kt     |  2 +-
 .../kaluga/system/network/NetworkStateTest.kt  |  2 +-
 .../system/network/NetworkManager.kt           |  2 +-
 .../system/network/NetworkManagerBuilder.kt    |  2 +-
 .../network/state/NetworkStateRepoBuilder.kt   |  2 +-
 .../system/network/NetworkManagerBuilder.kt    |  2 +-
 .../network/state/NetworkStateRepoBuilder.kt   |  2 +-
 .../system/network/NetworkManagerBuilder.kt    |  2 +-
 .../network/state/NetworkStateRepoBuilder.kt   |  2 +-
 .../kotlin/TestBaseInstrumentationTest.kt      |  2 +-
 .../kotlin/mock/android/MockContext.kt         | 10 +++++-----
 .../kotlin/TestBaseUnitTest.kt                 |  2 +-
 .../src/commonMain/kotlin/awaitAllBlocking.kt  |  2 +-
 .../src/commonMain/kotlin/ui_thread_testing.kt |  2 +-
 .../src/commonTest/kotlin/FlowTestTest.kt      |  2 +-
 .../src/commonTest/kotlin/UIThreadTestTest.kt  |  2 +-
 .../src/iosMain/kotlin/mainBackground.kt       |  2 +-
 .../src/commonMain/kotlin/MockLocationState.kt |  8 ++++----
 260 files changed, 592 insertions(+), 573 deletions(-)

diff --git a/alerts/src/androidLibAndroidTest/kotlin/AlertsViewModel.kt b/alerts/src/androidLibAndroidTest/kotlin/AlertsViewModel.kt
index a34ce1ae4..bc82afe34 100644
--- a/alerts/src/androidLibAndroidTest/kotlin/AlertsViewModel.kt
+++ b/alerts/src/androidLibAndroidTest/kotlin/AlertsViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/alerts/src/commonTest/kotlin/AlertPresenterTests.kt b/alerts/src/commonTest/kotlin/AlertPresenterTests.kt
index bd9815028..ebc75e5d3 100644
--- a/alerts/src/commonTest/kotlin/AlertPresenterTests.kt
+++ b/alerts/src/commonTest/kotlin/AlertPresenterTests.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2020 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/alerts/src/commonTest/kotlin/AlertsTest.kt b/alerts/src/commonTest/kotlin/AlertsTest.kt
index f05a1a40b..2b8c96f61 100644
--- a/alerts/src/commonTest/kotlin/AlertsTest.kt
+++ b/alerts/src/commonTest/kotlin/AlertsTest.kt
@@ -1,3 +1,21 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
 package com.splendo.kaluga.test
 
 import com.splendo.kaluga.alerts.Alert
diff --git a/architecture-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt b/architecture-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt
index ffc2f7078..5ceb48b68 100644
--- a/architecture-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt
+++ b/architecture-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibAndroidTest/AndroidManifest.xml b/architecture/src/androidLibAndroidTest/AndroidManifest.xml
index 6df5694e1..b2367acb9 100644
--- a/architecture/src/androidLibAndroidTest/AndroidManifest.xml
+++ b/architecture/src/androidLibAndroidTest/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2020 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibAndroidTest/kotlin/TestActivity.kt b/architecture/src/androidLibAndroidTest/kotlin/TestActivity.kt
index 72ae68303..dbc5ef884 100644
--- a/architecture/src/androidLibAndroidTest/kotlin/TestActivity.kt
+++ b/architecture/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibAndroidTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt b/architecture/src/androidLibAndroidTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt
index 4fb5a88bb..9e5202e51 100644
--- a/architecture/src/androidLibAndroidTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt
+++ b/architecture/src/androidLibAndroidTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibAndroidTest/kotlin/lifecycle/LifecycleManagerTest.kt b/architecture/src/androidLibAndroidTest/kotlin/lifecycle/LifecycleManagerTest.kt
index 5daabc6ca..ce5550d66 100644
--- a/architecture/src/androidLibAndroidTest/kotlin/lifecycle/LifecycleManagerTest.kt
+++ b/architecture/src/androidLibAndroidTest/kotlin/lifecycle/LifecycleManagerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibAndroidTest/kotlin/navigation/AndroidNavigationBundleTest.kt b/architecture/src/androidLibAndroidTest/kotlin/navigation/AndroidNavigationBundleTest.kt
index c66642248..1e79e146b 100644
--- a/architecture/src/androidLibAndroidTest/kotlin/navigation/AndroidNavigationBundleTest.kt
+++ b/architecture/src/androidLibAndroidTest/kotlin/navigation/AndroidNavigationBundleTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/AndroidManifest.xml b/architecture/src/androidLibMain/AndroidManifest.xml
index cba6a0b34..2e34cb129 100644
--- a/architecture/src/androidLibMain/AndroidManifest.xml
+++ b/architecture/src/androidLibMain/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2020 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
index 77ee5b43d..c8c41bc3c 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt
index e14f0810e..018968f6d 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt b/architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt
index e8e9f1e55..57f195ab8 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/navigation/IntentFlag.kt b/architecture/src/androidLibMain/kotlin/navigation/IntentFlag.kt
index 2ee9533c8..e7a747dec 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/IntentFlag.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/IntentFlag.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
index 65ef8620a..6193a39df 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
index 68416d7f4..25113c022 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index fb81499f1..83da65992 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/observable/Disposable.kt b/architecture/src/androidLibMain/kotlin/observable/Disposable.kt
index 00994bea8..f32c378d5 100644
--- a/architecture/src/androidLibMain/kotlin/observable/Disposable.kt
+++ b/architecture/src/androidLibMain/kotlin/observable/Disposable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelActivity.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelActivity.kt
index 4b3826867..f6e6b73be 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelActivity.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt
index ff5bfd5f0..cde1ef316 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelFragment.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelFragment.kt
index 5ffa5ae88..4de01afd2 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelFragment.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelFragment.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
index 845f93ad9..015099683 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
index 70f8532dd..8aa7b9066 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt b/architecture/src/androidLibTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt
index 60ea37978..61a58713a 100644
--- a/architecture/src/androidLibTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt
+++ b/architecture/src/androidLibTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt b/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
index 209497a8a..8c183872b 100644
--- a/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
+++ b/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt b/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
index 5fd48955c..faa459555 100644
--- a/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
+++ b/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonMain/kotlin/navigation/Navigator.kt b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
index 9bbce8d2d..a9dcf75df 100644
--- a/architecture/src/commonMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonMain/kotlin/observable/Disposable.kt b/architecture/src/commonMain/kotlin/observable/Disposable.kt
index 3665c9b0b..321c84d98 100644
--- a/architecture/src/commonMain/kotlin/observable/Disposable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Disposable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonMain/kotlin/observable/Observable.kt b/architecture/src/commonMain/kotlin/observable/Observable.kt
index 419ba060e..580b7a84e 100644
--- a/architecture/src/commonMain/kotlin/observable/Observable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
index 8fea273d1..73b1938df 100644
--- a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonTest/kotlin/navigation/MockSpecRow.kt b/architecture/src/commonTest/kotlin/navigation/MockSpecRow.kt
index 4970cf2dc..b8aa89a8d 100644
--- a/architecture/src/commonTest/kotlin/navigation/MockSpecRow.kt
+++ b/architecture/src/commonTest/kotlin/navigation/MockSpecRow.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt b/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt
index 2a2e65888..9fc0e2dd5 100644
--- a/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt
+++ b/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt b/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
index 1b7ed7772..772222ac8 100644
--- a/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
+++ b/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/iosMain/kotlin/navigation/NavigationSpec.kt b/architecture/src/iosMain/kotlin/navigation/NavigationSpec.kt
index 8f8a01e22..0954f120e 100644
--- a/architecture/src/iosMain/kotlin/navigation/NavigationSpec.kt
+++ b/architecture/src/iosMain/kotlin/navigation/NavigationSpec.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/iosMain/kotlin/navigation/Navigator.kt b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
index ae4c04205..baea583f0 100644
--- a/architecture/src/iosMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
index 2161caa35..a69ab3879 100644
--- a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt
index e3ed57336..843b1cb25 100644
--- a/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt b/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
index 0ee29847b..f46a59991 100644
--- a/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
+++ b/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/jsMain/kotlin/navigation/Navigator.kt b/architecture/src/jsMain/kotlin/navigation/Navigator.kt
index 323a76425..aae9a2d8d 100644
--- a/architecture/src/jsMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/jsMain/kotlin/navigation/Navigator.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt
index 67858ad66..55c63fdc9 100644
--- a/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/jvmMain/kotlin/navigation/Navigator.kt b/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
index 323a76425..aae9a2d8d 100644
--- a/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt
index 98cdb6308..c7da67726 100644
--- a/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt
index 67858ad66..55c63fdc9 100644
--- a/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibAndroidTest/kotlin/text/DateFormatterTest.kt b/base/src/androidLibAndroidTest/kotlin/text/DateFormatterTest.kt
index a72df2a95..50094c766 100644
--- a/base/src/androidLibAndroidTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/androidLibAndroidTest/kotlin/text/DateFormatterTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt b/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
index 9aa43ac01..9a6df3ff0 100644
--- a/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibMain/kotlin/text/NumberFormatter.kt b/base/src/androidLibMain/kotlin/text/NumberFormatter.kt
index 885ef3461..765217837 100644
--- a/base/src/androidLibMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/androidLibMain/kotlin/text/NumberFormatter.kt
@@ -1,20 +1,19 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
- */
 
+ */
 package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.Locale
diff --git a/base/src/androidLibMain/kotlin/text/StringUtils.kt b/base/src/androidLibMain/kotlin/text/StringUtils.kt
index 768e11db6..7a7714310 100644
--- a/base/src/androidLibMain/kotlin/text/StringUtils.kt
+++ b/base/src/androidLibMain/kotlin/text/StringUtils.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
index 6bc6db8ac..5ea93a1fe 100644
--- a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibMain/kotlin/utils/Locale.kt b/base/src/androidLibMain/kotlin/utils/Locale.kt
index 3ce8a3e2c..9cf685a1a 100644
--- a/base/src/androidLibMain/kotlin/utils/Locale.kt
+++ b/base/src/androidLibMain/kotlin/utils/Locale.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibMain/kotlin/utils/TimeZone.kt b/base/src/androidLibMain/kotlin/utils/TimeZone.kt
index 831fa87c7..14d33a68f 100644
--- a/base/src/androidLibMain/kotlin/utils/TimeZone.kt
+++ b/base/src/androidLibMain/kotlin/utils/TimeZone.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibTest/kotlin/text/DateFormatterTest.kt b/base/src/androidLibTest/kotlin/text/DateFormatterTest.kt
index 75287198b..343c50cd2 100644
--- a/base/src/androidLibTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/androidLibTest/kotlin/text/DateFormatterTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/text/DateTime.kt b/base/src/commonMain/kotlin/text/DateTime.kt
index 5d56b6172..2d951e4ff 100644
--- a/base/src/commonMain/kotlin/text/DateTime.kt
+++ b/base/src/commonMain/kotlin/text/DateTime.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/commonMain/kotlin/text/FixedString.kt b/base/src/commonMain/kotlin/text/FixedString.kt
index 030c72a86..a9473c098 100644
--- a/base/src/commonMain/kotlin/text/FixedString.kt
+++ b/base/src/commonMain/kotlin/text/FixedString.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/commonMain/kotlin/text/Flags.kt b/base/src/commonMain/kotlin/text/Flags.kt
index 4ad32045b..13ba43460 100644
--- a/base/src/commonMain/kotlin/text/Flags.kt
+++ b/base/src/commonMain/kotlin/text/Flags.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/text/FormatSpecifier.kt b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
index 08b42576c..5cc433f19 100644
--- a/base/src/commonMain/kotlin/text/FormatSpecifier.kt
+++ b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/commonMain/kotlin/text/FormatString.kt b/base/src/commonMain/kotlin/text/FormatString.kt
index 28e848bdc..b063d0c6f 100644
--- a/base/src/commonMain/kotlin/text/FormatString.kt
+++ b/base/src/commonMain/kotlin/text/FormatString.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt b/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
index 240f15a0a..4e16e2b2b 100644
--- a/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/text/NumberFormatter.kt b/base/src/commonMain/kotlin/text/NumberFormatter.kt
index 46bdce4d8..807fd46fb 100644
--- a/base/src/commonMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/commonMain/kotlin/text/NumberFormatter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/text/RegularFormatCharacter.kt b/base/src/commonMain/kotlin/text/RegularFormatCharacter.kt
index 2d7274024..5fa7b54b1 100644
--- a/base/src/commonMain/kotlin/text/RegularFormatCharacter.kt
+++ b/base/src/commonMain/kotlin/text/RegularFormatCharacter.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/commonMain/kotlin/text/StringFormatter.kt b/base/src/commonMain/kotlin/text/StringFormatter.kt
index 8d2703047..50102bd31 100644
--- a/base/src/commonMain/kotlin/text/StringFormatter.kt
+++ b/base/src/commonMain/kotlin/text/StringFormatter.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/commonMain/kotlin/text/StringFormatterException.kt b/base/src/commonMain/kotlin/text/StringFormatterException.kt
index 1e414339c..6b8c6c15b 100644
--- a/base/src/commonMain/kotlin/text/StringFormatterException.kt
+++ b/base/src/commonMain/kotlin/text/StringFormatterException.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/commonMain/kotlin/text/StringUtils.kt b/base/src/commonMain/kotlin/text/StringUtils.kt
index fa171fd61..4beaea0f0 100644
--- a/base/src/commonMain/kotlin/text/StringUtils.kt
+++ b/base/src/commonMain/kotlin/text/StringUtils.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/commonMain/kotlin/utils/ByteUtils.kt b/base/src/commonMain/kotlin/utils/ByteUtils.kt
index d28755817..68321162b 100644
--- a/base/src/commonMain/kotlin/utils/ByteUtils.kt
+++ b/base/src/commonMain/kotlin/utils/ByteUtils.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.utils
diff --git a/base/src/commonMain/kotlin/utils/KalugaDate.kt b/base/src/commonMain/kotlin/utils/KalugaDate.kt
index ababc7192..5b4a7fe35 100644
--- a/base/src/commonMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaDate.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/Locale.kt b/base/src/commonMain/kotlin/utils/Locale.kt
index 528d3b137..1fc53b593 100644
--- a/base/src/commonMain/kotlin/utils/Locale.kt
+++ b/base/src/commonMain/kotlin/utils/Locale.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/TimeZone.kt b/base/src/commonMain/kotlin/utils/TimeZone.kt
index 51b972cf5..53882c355 100644
--- a/base/src/commonMain/kotlin/utils/TimeZone.kt
+++ b/base/src/commonMain/kotlin/utils/TimeZone.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/UnitSystem.kt b/base/src/commonMain/kotlin/utils/UnitSystem.kt
index c00729964..2e25984eb 100644
--- a/base/src/commonMain/kotlin/utils/UnitSystem.kt
+++ b/base/src/commonMain/kotlin/utils/UnitSystem.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/flow/ColdFlowableTest.kt b/base/src/commonTest/kotlin/flow/ColdFlowableTest.kt
index 05eb2e5c9..af93195c8 100644
--- a/base/src/commonTest/kotlin/flow/ColdFlowableTest.kt
+++ b/base/src/commonTest/kotlin/flow/ColdFlowableTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/flow/HotFlowableTest.kt b/base/src/commonTest/kotlin/flow/HotFlowableTest.kt
index 74cd31d71..65f41c3a4 100644
--- a/base/src/commonTest/kotlin/flow/HotFlowableTest.kt
+++ b/base/src/commonTest/kotlin/flow/HotFlowableTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/text/DateFormatterTest.kt b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
index 3ed883c6e..d4ec7f83f 100644
--- a/base/src/commonTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/text/NumberFormatterTest.kt b/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
index 5bba4ea05..1a6e2bf6e 100644
--- a/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
@@ -1,6 +1,6 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
@@ -12,8 +12,9 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
+
 package com.splendo.kaluga.base.test.text
 
 import com.splendo.kaluga.base.text.NumberFormatStyle
diff --git a/base/src/commonTest/kotlin/text/StringFormatterTest.kt b/base/src/commonTest/kotlin/text/StringFormatterTest.kt
index b13779628..57b5e5e7a 100644
--- a/base/src/commonTest/kotlin/text/StringFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/StringFormatterTest.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.test.text
diff --git a/base/src/commonTest/kotlin/utils/ByOrdinalOrDefaultTest.kt b/base/src/commonTest/kotlin/utils/ByOrdinalOrDefaultTest.kt
index e42b09c3e..d27231d12 100644
--- a/base/src/commonTest/kotlin/utils/ByOrdinalOrDefaultTest.kt
+++ b/base/src/commonTest/kotlin/utils/ByOrdinalOrDefaultTest.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.test.utils
diff --git a/base/src/commonTest/kotlin/utils/DateTest.kt b/base/src/commonTest/kotlin/utils/DateTest.kt
index 4c4346622..9d6014cab 100644
--- a/base/src/commonTest/kotlin/utils/DateTest.kt
+++ b/base/src/commonTest/kotlin/utils/DateTest.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.test.utils
diff --git a/base/src/commonTest/kotlin/utils/LocaleTest.kt b/base/src/commonTest/kotlin/utils/LocaleTest.kt
index 84c2ef3ac..9e96389c3 100644
--- a/base/src/commonTest/kotlin/utils/LocaleTest.kt
+++ b/base/src/commonTest/kotlin/utils/LocaleTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/utils/UnitSystemTest.kt b/base/src/commonTest/kotlin/utils/UnitSystemTest.kt
index 6e8166c9b..17aeae915 100644
--- a/base/src/commonTest/kotlin/utils/UnitSystemTest.kt
+++ b/base/src/commonTest/kotlin/utils/UnitSystemTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/GCScheduler.kt b/base/src/iosMain/kotlin/GCScheduler.kt
index 0a655635c..267f73e52 100644
--- a/base/src/iosMain/kotlin/GCScheduler.kt
+++ b/base/src/iosMain/kotlin/GCScheduler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt b/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
index c8fd944af..13e42e103 100644
--- a/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/text/NumberFormatter.kt b/base/src/iosMain/kotlin/text/NumberFormatter.kt
index e43b25392..7100d5fb7 100644
--- a/base/src/iosMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/iosMain/kotlin/text/NumberFormatter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/text/StringUtils.kt b/base/src/iosMain/kotlin/text/StringUtils.kt
index 3098f759c..d5e7dfcdf 100644
--- a/base/src/iosMain/kotlin/text/StringUtils.kt
+++ b/base/src/iosMain/kotlin/text/StringUtils.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/utils/KalugaDate.kt b/base/src/iosMain/kotlin/utils/KalugaDate.kt
index d16951a6a..c49aa1b1f 100644
--- a/base/src/iosMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaDate.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.utils
diff --git a/base/src/iosMain/kotlin/utils/Locale.kt b/base/src/iosMain/kotlin/utils/Locale.kt
index dea49bcb4..e6f78e7dc 100644
--- a/base/src/iosMain/kotlin/utils/Locale.kt
+++ b/base/src/iosMain/kotlin/utils/Locale.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/utils/TimeZone.kt b/base/src/iosMain/kotlin/utils/TimeZone.kt
index 82818d24c..6daddfeff 100644
--- a/base/src/iosMain/kotlin/utils/TimeZone.kt
+++ b/base/src/iosMain/kotlin/utils/TimeZone.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/iosTest/kotlin/DateFormatterTest.kt b/base/src/iosTest/kotlin/DateFormatterTest.kt
index a72df2a95..50094c766 100644
--- a/base/src/iosTest/kotlin/DateFormatterTest.kt
+++ b/base/src/iosTest/kotlin/DateFormatterTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/iosTest/kotlin/IOSVersionTest.kt b/base/src/iosTest/kotlin/IOSVersionTest.kt
index c13224734..48ff7a094 100644
--- a/base/src/iosTest/kotlin/IOSVersionTest.kt
+++ b/base/src/iosTest/kotlin/IOSVersionTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt b/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
index f92fe4303..67a9f2ca5 100644
--- a/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jsMain/kotlin/text/NumberFormatter.kt b/base/src/jsMain/kotlin/text/NumberFormatter.kt
index 65821886c..3192bd49a 100644
--- a/base/src/jsMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/jsMain/kotlin/text/NumberFormatter.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/jsMain/kotlin/text/StringUtils.kt b/base/src/jsMain/kotlin/text/StringUtils.kt
index 2a28ca51e..8c8fcc07b 100644
--- a/base/src/jsMain/kotlin/text/StringUtils.kt
+++ b/base/src/jsMain/kotlin/text/StringUtils.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/jsMain/kotlin/utils/KalugaDate.kt b/base/src/jsMain/kotlin/utils/KalugaDate.kt
index 8d1356ae9..2f5cee373 100644
--- a/base/src/jsMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaDate.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jsMain/kotlin/utils/Locale.kt b/base/src/jsMain/kotlin/utils/Locale.kt
index 9b601025c..7a4ddf02e 100644
--- a/base/src/jsMain/kotlin/utils/Locale.kt
+++ b/base/src/jsMain/kotlin/utils/Locale.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jsMain/kotlin/utils/TimeZone.kt b/base/src/jsMain/kotlin/utils/TimeZone.kt
index f77016636..8ce3b4087 100644
--- a/base/src/jsMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jsMain/kotlin/utils/TimeZone.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jsTest/kotlin/text/DateFormatterTest.kt b/base/src/jsTest/kotlin/text/DateFormatterTest.kt
index 32d48a787..a2b8247a4 100644
--- a/base/src/jsTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/jsTest/kotlin/text/DateFormatterTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt b/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
index 9ed9b1980..1557691ea 100644
--- a/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jvmMain/kotlin/text/NumberFormatter.kt b/base/src/jvmMain/kotlin/text/NumberFormatter.kt
index f0c07ea6f..44d779a8b 100644
--- a/base/src/jvmMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/jvmMain/kotlin/text/NumberFormatter.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/jvmMain/kotlin/text/StringUtils.kt b/base/src/jvmMain/kotlin/text/StringUtils.kt
index 768e11db6..7a7714310 100644
--- a/base/src/jvmMain/kotlin/text/StringUtils.kt
+++ b/base/src/jvmMain/kotlin/text/StringUtils.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.base.text
diff --git a/base/src/jvmMain/kotlin/utils/KalugaDate.kt b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
index ff0658fe0..92b080d69 100644
--- a/base/src/jvmMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jvmMain/kotlin/utils/Locale.kt b/base/src/jvmMain/kotlin/utils/Locale.kt
index 147aa0ac4..ef2d4e541 100644
--- a/base/src/jvmMain/kotlin/utils/Locale.kt
+++ b/base/src/jvmMain/kotlin/utils/Locale.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jvmMain/kotlin/utils/TimeZone.kt b/base/src/jvmMain/kotlin/utils/TimeZone.kt
index 831fa87c7..14d33a68f 100644
--- a/base/src/jvmMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jvmMain/kotlin/utils/TimeZone.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jvmTest/kotlin/text/DateFormatterTest.kt b/base/src/jvmTest/kotlin/text/DateFormatterTest.kt
index 32d48a787..a2b8247a4 100644
--- a/base/src/jvmTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/jvmTest/kotlin/text/DateFormatterTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/beacons/src/commonMain/kotlin/BeaconInfo.kt b/beacons/src/commonMain/kotlin/BeaconInfo.kt
index 888a42c0f..56e0f261a 100644
--- a/beacons/src/commonMain/kotlin/BeaconInfo.kt
+++ b/beacons/src/commonMain/kotlin/BeaconInfo.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/beacons/src/commonMain/kotlin/Beacons.kt b/beacons/src/commonMain/kotlin/Beacons.kt
index 9b2d8964d..4cb6a1c6f 100644
--- a/beacons/src/commonMain/kotlin/Beacons.kt
+++ b/beacons/src/commonMain/kotlin/Beacons.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/beacons/src/commonMain/kotlin/Eddystone.kt b/beacons/src/commonMain/kotlin/Eddystone.kt
index 373af39bc..c099488a8 100644
--- a/beacons/src/commonMain/kotlin/Eddystone.kt
+++ b/beacons/src/commonMain/kotlin/Eddystone.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/beacons/src/commonTest/kotlin/BeaconUnpackTest.kt b/beacons/src/commonTest/kotlin/BeaconUnpackTest.kt
index 2c6844e03..b94ded4b0 100644
--- a/beacons/src/commonTest/kotlin/BeaconUnpackTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconUnpackTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/iosMain/kotlin/device/DeviceWrapper.kt b/bluetooth/src/iosMain/kotlin/device/DeviceWrapper.kt
index 52209e629..031a2a8e1 100644
--- a/bluetooth/src/iosMain/kotlin/device/DeviceWrapper.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DeviceWrapper.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/date-time-picker/src/androidLibAndroidTest/kotlin/DateTimePickerViewModel.kt b/date-time-picker/src/androidLibAndroidTest/kotlin/DateTimePickerViewModel.kt
index 0f6353a56..edbd8829d 100644
--- a/date-time-picker/src/androidLibAndroidTest/kotlin/DateTimePickerViewModel.kt
+++ b/date-time-picker/src/androidLibAndroidTest/kotlin/DateTimePickerViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
index d3bed6c38..07cf592ad 100644
--- a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 974bc4a69..24d35ff75 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2020 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/date-time-picker/src/commonTest/kotlin/DateTimePickerPresenterTests.kt b/date-time-picker/src/commonTest/kotlin/DateTimePickerPresenterTests.kt
index 42e330008..40b11775c 100644
--- a/date-time-picker/src/commonTest/kotlin/DateTimePickerPresenterTests.kt
+++ b/date-time-picker/src/commonTest/kotlin/DateTimePickerPresenterTests.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2020 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
index fee0dc399..240d0d916 100644
--- a/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2020 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt
index 53f834c8c..dbecca829 100644
--- a/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2020 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt
index ed9e7b7bf..791ea86cb 100644
--- a/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2020 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt
index 440d46f49..b1d59b78b 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
index efedcb307..1c76de087 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt b/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
index 799281e7d..74e5ad859 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
index 4502387ac..d07256ba2 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
index d1eca3594..5010367be 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
index f35df9e2e..a0b9e6322 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
index cf97781b6..e59ee3b49 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
index 76f2854d3..22b422dfd 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
index 5c5ce6ba3..46711f70e 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
index 503a36f06..d7cd3d96e 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
index 35737b556..48fdd892b 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt
index fa0fb3792..a719db1ec 100644
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt
+++ b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt
index fe4e4166a..579ad06ea 100644
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt
+++ b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt
index 791f0b0dc..9e55dda3e 100644
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt
+++ b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt
index 122bf8e3f..0d04f4d26 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt
index 09b3027c7..89e7ca1ad 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt
index fcf42858e..98dec51f7 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt
index 5555b3d3c..de8408407 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
index 9a6557120..4f752265f 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
index fcc6ca36e..9e7ee26a8 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
index ddbd0eac6..513be4486 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
index d13d7383b..68a08b032 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
index c702f6072..f4d98b64a 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
index a4d51fa62..3f87cdc8c 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt
index e1fa77b8e..ec7e7bb66 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt
index 56f9a5af6..08f4211b8 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt
index a3205fdc4..843592790 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt
index 7da1fb48d..c177e9aa4 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt
index 5483800e2..936f18a68 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
index f9a6a3310..4f799c3d7 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
index 5031166c5..baf3c65b7 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/hud/src/androidLibAndroidTest/kotlin/HudViewModel.kt b/hud/src/androidLibAndroidTest/kotlin/HudViewModel.kt
index e7811b742..9f5b54c6e 100644
--- a/hud/src/androidLibAndroidTest/kotlin/HudViewModel.kt
+++ b/hud/src/androidLibAndroidTest/kotlin/HudViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/hud/src/jsMain/kotlin/HUD.kt b/hud/src/jsMain/kotlin/HUD.kt
index ca26074b5..952aa1fea 100644
--- a/hud/src/jsMain/kotlin/HUD.kt
+++ b/hud/src/jsMain/kotlin/HUD.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/hud/src/jvmMain/kotlin/HUD.kt b/hud/src/jvmMain/kotlin/HUD.kt
index ca26074b5..952aa1fea 100644
--- a/hud/src/jvmMain/kotlin/HUD.kt
+++ b/hud/src/jvmMain/kotlin/HUD.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/keyboard/src/androidLibAndroidTest/kotlin/ActivityKeyboardManagerBuilderTest.kt b/keyboard/src/androidLibAndroidTest/kotlin/ActivityKeyboardManagerBuilderTest.kt
index a7e809fca..05ecb98bc 100644
--- a/keyboard/src/androidLibAndroidTest/kotlin/ActivityKeyboardManagerBuilderTest.kt
+++ b/keyboard/src/androidLibAndroidTest/kotlin/ActivityKeyboardManagerBuilderTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt b/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt
index a366ab959..0dfb8d86a 100644
--- a/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt
+++ b/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
diff --git a/keyboard/src/commonTest/kotlin/KeyboardManagerTests.kt b/keyboard/src/commonTest/kotlin/KeyboardManagerTests.kt
index 9d98b9a7f..a987a7f2d 100644
--- a/keyboard/src/commonTest/kotlin/KeyboardManagerTests.kt
+++ b/keyboard/src/commonTest/kotlin/KeyboardManagerTests.kt
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
diff --git a/links/build.gradle.kts b/links/build.gradle.kts
index 047717774..f544a17ee 100644
--- a/links/build.gradle.kts
+++ b/links/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt b/links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt
index 9385c3acb..593f936db 100644
--- a/links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt
+++ b/links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/androidLibMain/AndroidManifest.xml b/links/src/androidLibMain/AndroidManifest.xml
index 68749ee8f..a49b23659 100644
--- a/links/src/androidLibMain/AndroidManifest.xml
+++ b/links/src/androidLibMain/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2020 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt b/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
index b37108a88..f2bf4df02 100644
--- a/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
+++ b/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManager.kt b/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManager.kt
index 31fa3f4ee..ac46ff2be 100644
--- a/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManager.kt
+++ b/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksHandler.kt b/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksHandler.kt
index ce1db4b73..e6cdda6e1 100644
--- a/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksHandler.kt
+++ b/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksManager.kt b/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksManager.kt
index ddfcb793e..88fc5355b 100644
--- a/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksManager.kt
+++ b/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt b/links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt
index 77b5293c8..b8737bccd 100644
--- a/links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt
+++ b/links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManagerTest.kt b/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManagerTest.kt
index aef2373f6..02c5258d9 100644
--- a/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManagerTest.kt
+++ b/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManagerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/MockLinksManager.kt b/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/MockLinksManager.kt
index 5a5a1ca4f..1a2019eb8 100644
--- a/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/MockLinksManager.kt
+++ b/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/MockLinksManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/commonTest/kotlin/com/splendo/kaluga/links/utils/LinksDecoderTest.kt b/links/src/commonTest/kotlin/com/splendo/kaluga/links/utils/LinksDecoderTest.kt
index d88378f8b..f355b9260 100644
--- a/links/src/commonTest/kotlin/com/splendo/kaluga/links/utils/LinksDecoderTest.kt
+++ b/links/src/commonTest/kotlin/com/splendo/kaluga/links/utils/LinksDecoderTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt b/links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
index 64640e714..9dff56faa 100644
--- a/links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
+++ b/links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/iosTest/kotlin/com/splendo/kaluga/links/IosLinksHandlerTest.kt b/links/src/iosTest/kotlin/com/splendo/kaluga/links/IosLinksHandlerTest.kt
index c66af278e..3f876460f 100644
--- a/links/src/iosTest/kotlin/com/splendo/kaluga/links/IosLinksHandlerTest.kt
+++ b/links/src/iosTest/kotlin/com/splendo/kaluga/links/IosLinksHandlerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/jsMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt b/links/src/jsMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
index 8c52c46e2..4820b07d9 100644
--- a/links/src/jsMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
+++ b/links/src/jsMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/jsTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt b/links/src/jsTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
index 274c4ce6d..129418bfe 100644
--- a/links/src/jsTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
+++ b/links/src/jsTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/jvmMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt b/links/src/jvmMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
index 8c52c46e2..4820b07d9 100644
--- a/links/src/jvmMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
+++ b/links/src/jvmMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/jvmTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt b/links/src/jvmTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
index 274c4ce6d..129418bfe 100644
--- a/links/src/jvmTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
+++ b/links/src/jvmTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/location/src/iosMain/kotlin/location/LocationMonitor.kt b/location/src/iosMain/kotlin/location/LocationMonitor.kt
index 83d7d5877..cedbfb60f 100644
--- a/location/src/iosMain/kotlin/location/LocationMonitor.kt
+++ b/location/src/iosMain/kotlin/location/LocationMonitor.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.location
diff --git a/logging/src/androidLibMain/kotlin/log.kt b/logging/src/androidLibMain/kotlin/log.kt
index 7768d926c..e5d5f3b6d 100644
--- a/logging/src/androidLibMain/kotlin/log.kt
+++ b/logging/src/androidLibMain/kotlin/log.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/logging/src/commonMain/kotlin/NapierLogger.kt b/logging/src/commonMain/kotlin/NapierLogger.kt
index 21914d717..da995ef3a 100644
--- a/logging/src/commonMain/kotlin/NapierLogger.kt
+++ b/logging/src/commonMain/kotlin/NapierLogger.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/logging/src/iosMain/kotlin/log.kt b/logging/src/iosMain/kotlin/log.kt
index e5f2d5a32..6bbd0dbdd 100644
--- a/logging/src/iosMain/kotlin/log.kt
+++ b/logging/src/iosMain/kotlin/log.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/logging/src/jsMain/kotlin/log.kt b/logging/src/jsMain/kotlin/log.kt
index c0f515a18..8d6d3823d 100644
--- a/logging/src/jsMain/kotlin/log.kt
+++ b/logging/src/jsMain/kotlin/log.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.logging
diff --git a/resources-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt b/resources-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt
index 2a8c57cb5..8c20560b3 100644
--- a/resources-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt
+++ b/resources-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/androidLibAndroidTest/kotlin/AndroidStringsTest.kt b/resources/src/androidLibAndroidTest/kotlin/AndroidStringsTest.kt
index 961b52ede..07560303d 100644
--- a/resources/src/androidLibAndroidTest/kotlin/AndroidStringsTest.kt
+++ b/resources/src/androidLibAndroidTest/kotlin/AndroidStringsTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/androidLibMain/kotlin/DarkMode.kt b/resources/src/androidLibMain/kotlin/DarkMode.kt
index 6398a613f..3ef4ba3fb 100644
--- a/resources/src/androidLibMain/kotlin/DarkMode.kt
+++ b/resources/src/androidLibMain/kotlin/DarkMode.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/androidLibMain/kotlin/Font.kt b/resources/src/androidLibMain/kotlin/Font.kt
index 3eae1951a..52ccde9c7 100644
--- a/resources/src/androidLibMain/kotlin/Font.kt
+++ b/resources/src/androidLibMain/kotlin/Font.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 @file:JvmName("AndroidFont")
diff --git a/resources/src/androidLibMain/kotlin/Image.kt b/resources/src/androidLibMain/kotlin/Image.kt
index a87adaffe..fe43a00c0 100644
--- a/resources/src/androidLibMain/kotlin/Image.kt
+++ b/resources/src/androidLibMain/kotlin/Image.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/androidLibMain/kotlin/KalugaColor.kt b/resources/src/androidLibMain/kotlin/KalugaColor.kt
index 844b99d32..c44cb10ce 100644
--- a/resources/src/androidLibMain/kotlin/KalugaColor.kt
+++ b/resources/src/androidLibMain/kotlin/KalugaColor.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 @file:JvmName("AndroidKalugaColor")
diff --git a/resources/src/androidLibMain/kotlin/Resources.kt b/resources/src/androidLibMain/kotlin/Resources.kt
index ae0d1a55c..0b4c33f47 100644
--- a/resources/src/androidLibMain/kotlin/Resources.kt
+++ b/resources/src/androidLibMain/kotlin/Resources.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/commonMain/kotlin/DarkMode.kt b/resources/src/commonMain/kotlin/DarkMode.kt
index e34732162..390bcad3e 100644
--- a/resources/src/commonMain/kotlin/DarkMode.kt
+++ b/resources/src/commonMain/kotlin/DarkMode.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/commonMain/kotlin/Font.kt b/resources/src/commonMain/kotlin/Font.kt
index c04531bf6..2a0ec490e 100644
--- a/resources/src/commonMain/kotlin/Font.kt
+++ b/resources/src/commonMain/kotlin/Font.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/Image.kt b/resources/src/commonMain/kotlin/Image.kt
index bdf27fdf1..35847b25a 100644
--- a/resources/src/commonMain/kotlin/Image.kt
+++ b/resources/src/commonMain/kotlin/Image.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/commonMain/kotlin/KalugaColor.kt b/resources/src/commonMain/kotlin/KalugaColor.kt
index a01821abb..1aff5349d 100644
--- a/resources/src/commonMain/kotlin/KalugaColor.kt
+++ b/resources/src/commonMain/kotlin/KalugaColor.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 @file:JvmName("ColorCommonKt")
diff --git a/resources/src/commonMain/kotlin/Resources.kt b/resources/src/commonMain/kotlin/Resources.kt
index 8b820fe64..82dfb5362 100644
--- a/resources/src/commonMain/kotlin/Resources.kt
+++ b/resources/src/commonMain/kotlin/Resources.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/commonTest/kotlin/StringsTests.kt b/resources/src/commonTest/kotlin/StringsTests.kt
index 1c7ac9ec3..eb52bd70b 100644
--- a/resources/src/commonTest/kotlin/StringsTests.kt
+++ b/resources/src/commonTest/kotlin/StringsTests.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/iosMain/kotlin/DarkMode.kt b/resources/src/iosMain/kotlin/DarkMode.kt
index c92dd6d85..5d314b467 100644
--- a/resources/src/iosMain/kotlin/DarkMode.kt
+++ b/resources/src/iosMain/kotlin/DarkMode.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/iosMain/kotlin/Font.kt b/resources/src/iosMain/kotlin/Font.kt
index b67e58be3..5cc9d1256 100644
--- a/resources/src/iosMain/kotlin/Font.kt
+++ b/resources/src/iosMain/kotlin/Font.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/iosMain/kotlin/Image.kt b/resources/src/iosMain/kotlin/Image.kt
index 3197591ad..7f8965531 100644
--- a/resources/src/iosMain/kotlin/Image.kt
+++ b/resources/src/iosMain/kotlin/Image.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/iosMain/kotlin/KalugaColor.kt b/resources/src/iosMain/kotlin/KalugaColor.kt
index 704d0dfbe..66effdcc8 100644
--- a/resources/src/iosMain/kotlin/KalugaColor.kt
+++ b/resources/src/iosMain/kotlin/KalugaColor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/iosMain/kotlin/Resources.kt b/resources/src/iosMain/kotlin/Resources.kt
index f5d8928c5..846ed08bf 100644
--- a/resources/src/iosMain/kotlin/Resources.kt
+++ b/resources/src/iosMain/kotlin/Resources.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/iosTest/kotlin/IOSStringsTest.kt b/resources/src/iosTest/kotlin/IOSStringsTest.kt
index 187b6e492..e7b973edf 100644
--- a/resources/src/iosTest/kotlin/IOSStringsTest.kt
+++ b/resources/src/iosTest/kotlin/IOSStringsTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/jsMain/kotlin/DarkMode.kt b/resources/src/jsMain/kotlin/DarkMode.kt
index 2526e6c9d..c929546ea 100644
--- a/resources/src/jsMain/kotlin/DarkMode.kt
+++ b/resources/src/jsMain/kotlin/DarkMode.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/jsMain/kotlin/Font.kt b/resources/src/jsMain/kotlin/Font.kt
index e5ce8d8f6..c52e00c38 100644
--- a/resources/src/jsMain/kotlin/Font.kt
+++ b/resources/src/jsMain/kotlin/Font.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/jsMain/kotlin/Image.kt b/resources/src/jsMain/kotlin/Image.kt
index 431fb32c0..0aade4664 100644
--- a/resources/src/jsMain/kotlin/Image.kt
+++ b/resources/src/jsMain/kotlin/Image.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/jsMain/kotlin/KalugaColor.kt b/resources/src/jsMain/kotlin/KalugaColor.kt
index 6f36575ed..d2c322d46 100644
--- a/resources/src/jsMain/kotlin/KalugaColor.kt
+++ b/resources/src/jsMain/kotlin/KalugaColor.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/jsMain/kotlin/Resources.kt b/resources/src/jsMain/kotlin/Resources.kt
index 68ecf6f8e..90f1fc0a5 100644
--- a/resources/src/jsMain/kotlin/Resources.kt
+++ b/resources/src/jsMain/kotlin/Resources.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/jvmMain/kotlin/DarkMode.kt b/resources/src/jvmMain/kotlin/DarkMode.kt
index 2526e6c9d..c929546ea 100644
--- a/resources/src/jvmMain/kotlin/DarkMode.kt
+++ b/resources/src/jvmMain/kotlin/DarkMode.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/jvmMain/kotlin/Font.kt b/resources/src/jvmMain/kotlin/Font.kt
index 0e3bf7568..57c77abd4 100644
--- a/resources/src/jvmMain/kotlin/Font.kt
+++ b/resources/src/jvmMain/kotlin/Font.kt
@@ -1,19 +1,20 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
+
 @file:JvmName("JvmFont")
 package com.splendo.kaluga.resources
 
diff --git a/resources/src/jvmMain/kotlin/Image.kt b/resources/src/jvmMain/kotlin/Image.kt
index 729a88738..0aade4664 100644
--- a/resources/src/jvmMain/kotlin/Image.kt
+++ b/resources/src/jvmMain/kotlin/Image.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/resources/src/jvmMain/kotlin/KalugaColor.kt b/resources/src/jvmMain/kotlin/KalugaColor.kt
index 83254c5a0..10a90d4b4 100644
--- a/resources/src/jvmMain/kotlin/KalugaColor.kt
+++ b/resources/src/jvmMain/kotlin/KalugaColor.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 @file:JvmName("JvmKalugaColor")
diff --git a/resources/src/jvmMain/kotlin/Resources.kt b/resources/src/jvmMain/kotlin/Resources.kt
index 68ecf6f8e..90f1fc0a5 100644
--- a/resources/src/jvmMain/kotlin/Resources.kt
+++ b/resources/src/jvmMain/kotlin/Resources.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.resources
diff --git a/scientific/src/commonMain/kotlin/ScientificArray.kt b/scientific/src/commonMain/kotlin/ScientificArray.kt
index cfac2ea21..cbd34b19e 100644
--- a/scientific/src/commonMain/kotlin/ScientificArray.kt
+++ b/scientific/src/commonMain/kotlin/ScientificArray.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/area/convertToVolume.kt
index c91810716..fa86ca3b5 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToVolume.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.converter.area
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertFromSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertFromSpecificEnergy.kt
index d8a885a50..37e94896b 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertFromSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertFromSpecificEnergy.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.converter.ionizingRadiationEquivalentDose
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToSpecificEnergy.kt
index 729c792fe..31ee008dc 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToSpecificEnergy.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.converter.ionizingRadiationEquivalentDose
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/length/convertToVolume.kt
index 07c690055..edc9669d8 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToVolume.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.converter.length
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromIonizingRadiationEquivalentDose.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromIonizingRadiationEquivalentDose.kt
index fb1b47ce5..795e2b591 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromIonizingRadiationEquivalentDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromIonizingRadiationEquivalentDose.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.converter.specificEnergy
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToIonizingRadiationEquivalentDose.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToIonizingRadiationEquivalentDose.kt
index f9b13c2fb..f9b70eaaf 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToIonizingRadiationEquivalentDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToIonizingRadiationEquivalentDose.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.converter.specificEnergy
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertToVolumetricFlow.kt b/scientific/src/commonMain/kotlin/converter/volume/convertToVolumetricFlow.kt
index 0ed9e455c..712d376fc 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertToVolumetricFlow.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertToVolumetricFlow.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.converter.volume
diff --git a/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToVolume.kt
index 7e73f8b0e..04e5a976f 100644
--- a/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToVolume.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.converter.volumetricFlow
diff --git a/scientific/src/commonMain/kotlin/unit/ActionUnit.kt b/scientific/src/commonMain/kotlin/unit/ActionUnit.kt
index 23e3a969e..84cc44fb4 100644
--- a/scientific/src/commonMain/kotlin/unit/ActionUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ActionUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt b/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
index 6ea353920..7aefb5222 100644
--- a/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/AngleUnit.kt b/scientific/src/commonMain/kotlin/unit/AngleUnit.kt
index e19d85aa0..f29bbf30f 100644
--- a/scientific/src/commonMain/kotlin/unit/AngleUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AngleUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt b/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt
index 0993114f0..887bf2b8b 100644
--- a/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt b/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt
index 319e8059d..983e51c05 100644
--- a/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt
index f5948bd2a..b7b87119a 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt
index bc5cf84ee..3b30061d3 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt
index 15d21703a..36de8e1e8 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt
index ffe4d5ee7..7af5e5993 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt b/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
index c9bda775e..2ecbb30d9 100644
--- a/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt b/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt
index f165802e7..0a3ccf3c7 100644
--- a/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt b/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt
index b5e170bf5..c4533dad8 100644
--- a/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt b/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt
index 24d76984e..b377b62a8 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt
index 457aef18e..27689937f 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt b/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt
index 4a9af6883..df876ab3c 100644
--- a/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt b/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt
index fb7fdeda3..4679990f0 100644
--- a/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt b/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt
index 6b9c9af18..a0830146f 100644
--- a/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
index fd436462e..60ff48578 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt
index d3d6f6955..887fcef51 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt
index b9fece26b..723b2c7f4 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt
index 0ba97fc1e..051ba9f52 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
index 758e44cdf..bac262e0b 100644
--- a/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt b/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt
index 52ed05db5..5b0b4e4b1 100644
--- a/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt
index b3b638e07..188541b7a 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/scientific/src/commonMain/kotlin/unit/YankUnit.kt b/scientific/src/commonMain/kotlin/unit/YankUnit.kt
index d58912a3e..c645ccc4a 100644
--- a/scientific/src/commonMain/kotlin/unit/YankUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/YankUnit.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.scientific.unit
diff --git a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
index f0bd4a541..3a179e14a 100644
--- a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
+++ b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
index c086d5851..2634a4372 100644
--- a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
+++ b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
index f7218a9c2..e84b4ee90 100644
--- a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/BaseNetworkManager.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/BaseNetworkManager.kt
index 47604001a..864b26bb9 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/BaseNetworkManager.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/BaseNetworkManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/Network.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/Network.kt
index 93ee509af..c6159d1e6 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/Network.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/Network.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
index 5e2f21735..67c09dd22 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
index 824b21094..a9f92e62d 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
index 7cfcdf4c2..8a5420650 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkManager.kt b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkManager.kt
index 49ce7f90e..f82303474 100644
--- a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkManager.kt
+++ b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkStateRepoBuilder.kt b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkStateRepoBuilder.kt
index 8522e8a6f..fe263b56d 100644
--- a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkStateRepoBuilder.kt
+++ b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkStateRepoBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt
index cb50c16ed..0ea41976f 100644
--- a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt
+++ b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
index e8d2ddf82..a1e461e03 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
+++ b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManagerBuilder.kt b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManagerBuilder.kt
index a9057352f..df17b71f9 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManagerBuilder.kt
+++ b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManagerBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/state/NetworkStateRepoBuilder.kt
index e1322b306..c0fe87c46 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/state/NetworkStateRepoBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt b/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
index 0f658b045..fbec3dfbf 100644
--- a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
+++ b/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
index f9a8ebec7..fa0138457 100644
--- a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt b/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
index 0f658b045..fbec3dfbf 100644
--- a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
+++ b/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
index f9a8ebec7..fa0138457 100644
--- a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/androidLibAndroidTest/kotlin/TestBaseInstrumentationTest.kt b/test-utils-base/src/androidLibAndroidTest/kotlin/TestBaseInstrumentationTest.kt
index 7ec2ebe64..39b0d4030 100644
--- a/test-utils-base/src/androidLibAndroidTest/kotlin/TestBaseInstrumentationTest.kt
+++ b/test-utils-base/src/androidLibAndroidTest/kotlin/TestBaseInstrumentationTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/androidLibMain/kotlin/mock/android/MockContext.kt b/test-utils-base/src/androidLibMain/kotlin/mock/android/MockContext.kt
index 961d706e1..c5d017ed4 100644
--- a/test-utils-base/src/androidLibMain/kotlin/mock/android/MockContext.kt
+++ b/test-utils-base/src/androidLibMain/kotlin/mock/android/MockContext.kt
@@ -1,18 +1,18 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
- 
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.test.base.mock.android
diff --git a/test-utils-base/src/androidLibUnitTest/kotlin/TestBaseUnitTest.kt b/test-utils-base/src/androidLibUnitTest/kotlin/TestBaseUnitTest.kt
index 70240fb1b..490b8afc2 100644
--- a/test-utils-base/src/androidLibUnitTest/kotlin/TestBaseUnitTest.kt
+++ b/test-utils-base/src/androidLibUnitTest/kotlin/TestBaseUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/commonMain/kotlin/awaitAllBlocking.kt b/test-utils-base/src/commonMain/kotlin/awaitAllBlocking.kt
index 8a602d1b6..8039b7aa6 100644
--- a/test-utils-base/src/commonMain/kotlin/awaitAllBlocking.kt
+++ b/test-utils-base/src/commonMain/kotlin/awaitAllBlocking.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt b/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
index 5c161d43d..a7e7b6f6c 100644
--- a/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
+++ b/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/commonTest/kotlin/FlowTestTest.kt b/test-utils-base/src/commonTest/kotlin/FlowTestTest.kt
index ba4275d39..d33c1102a 100644
--- a/test-utils-base/src/commonTest/kotlin/FlowTestTest.kt
+++ b/test-utils-base/src/commonTest/kotlin/FlowTestTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/commonTest/kotlin/UIThreadTestTest.kt b/test-utils-base/src/commonTest/kotlin/UIThreadTestTest.kt
index 83107c9bd..db0c410e9 100644
--- a/test-utils-base/src/commonTest/kotlin/UIThreadTestTest.kt
+++ b/test-utils-base/src/commonTest/kotlin/UIThreadTestTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/iosMain/kotlin/mainBackground.kt b/test-utils-base/src/iosMain/kotlin/mainBackground.kt
index 84ef3eeec..36e2a7b82 100644
--- a/test-utils-base/src/iosMain/kotlin/mainBackground.kt
+++ b/test-utils-base/src/iosMain/kotlin/mainBackground.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2020 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationState.kt b/test-utils-location/src/commonMain/kotlin/MockLocationState.kt
index 25e1bc153..83c5d2279 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationState.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationState.kt
@@ -1,18 +1,18 @@
 /*
  Copyright 2022 Splendo Consulting B.V. The Netherlands
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.test.location

From c01e9925508c7efba4156e27db328ca825f9d0cd Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 4 Nov 2022 11:29:46 +0100
Subject: [PATCH 010/227] Tracked copyright texts

There where some trailing spaces issues. Also updated all to update to current year
---
 NOTICE                                                          | 2 +-
 .../androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt   | 2 +-
 alerts/src/androidLibMain/kotlin/AlertPresenter.kt              | 2 +-
 alerts/src/commonMain/kotlin/Alerts.kt                          | 2 +-
 alerts/src/iosMain/kotlin/AlertPresenter.kt                     | 2 +-
 alerts/src/jsMain/kotlin/AlertPresenter.kt                      | 2 +-
 alerts/src/jvmMain/kotlin/AlertPresenter.kt                     | 2 +-
 architecture-compose/build.gradle.kts                           | 2 +-
 .../src/androidLibAndroidTest/AndroidManifest.xml               | 2 +-
 architecture-compose/src/androidLibMain/AndroidManifest.xml     | 2 +-
 .../kaluga/architecture/compose/navigation/CombinedNavigator.kt | 2 +-
 .../kaluga/architecture/compose/navigation/NavGraphBuilder.kt   | 2 +-
 .../com/splendo/kaluga/architecture/compose/navigation/Route.kt | 2 +-
 .../com/splendo/kaluga/architecture/compose/observables.kt      | 2 +-
 .../compose/viewModel/KalugaViewModelComposeActivity.kt         | 2 +-
 .../com/splendo/kaluga/architecture/compose/RouteTests.kt       | 2 +-
 .../kotlin/observation/ObservationLiveDataTest.kt               | 2 +-
 architecture/src/androidLibMain/kotlin/observable/Observable.kt | 2 +-
 .../commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt  | 2 +-
 architecture/src/commonMain/kotlin/observable/Observables.kt    | 2 +-
 architecture/src/commonTest/kotlin/observable/FlowTest.kt       | 2 +-
 .../src/commonTest/kotlin/observable/ReadOnlyPropertyTest.kt    | 2 +-
 .../src/commonTest/kotlin/observable/ReadWritePropertyTest.kt   | 2 +-
 architecture/src/iosMain/kotlin/observable/Observable.kt        | 2 +-
 architecture/src/iosTest/kotlin/observable/ThreadingTest.kt     | 2 +-
 architecture/src/jsMain/kotlin/observable/Observable.kt         | 2 +-
 architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt   | 2 +-
 architecture/src/jvmMain/kotlin/observable/Observable.kt        | 2 +-
 .../src/androidLibMain/kotlin/AndroidPermissionsManager.kt      | 2 +-
 base-permissions/src/androidLibMain/kotlin/PermissionContext.kt | 2 +-
 .../src/androidLibMain/kotlin/PermissionsActivity.kt            | 2 +-
 base-permissions/src/commonMain/kotlin/PermissionManager.kt     | 2 +-
 base-permissions/src/commonMain/kotlin/PermissionState.kt       | 2 +-
 base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt     | 2 +-
 base-permissions/src/iosMain/kotlin/PermissionContext.kt        | 2 +-
 base-permissions/src/jsMain/kotlin/PermissionContext.kt         | 2 +-
 base-permissions/src/jvmMain/kotlin/PermissionContext.kt        | 2 +-
 base/src/androidLibMain/kotlin/ApplicationHolder.kt             | 2 +-
 base/src/androidLibMain/kotlin/MainQueueDispatcher.kt           | 2 +-
 base/src/androidLibMain/kotlin/runBlocking.kt                   | 2 +-
 base/src/androidLibMain/kotlin/runOnMain.kt                     | 2 +-
 base/src/androidLibMain/kotlin/utils/Decimal.kt                 | 2 +-
 base/src/androidLibMain/kotlin/utils/Serializable.kt            | 2 +-
 base/src/commonMain/kotlin/MainQueueDispatcher.kt               | 2 +-
 base/src/commonMain/kotlin/flow/BaseFlowable.kt                 | 2 +-
 base/src/commonMain/kotlin/flow/FlowConfig.kt                   | 2 +-
 base/src/commonMain/kotlin/flow/Flowable.kt                     | 2 +-
 base/src/commonMain/kotlin/flow/flow.kt                         | 2 +-
 base/src/commonMain/kotlin/monitor/ServiceMonitor.kt            | 2 +-
 base/src/commonMain/kotlin/runBlocking.kt                       | 2 +-
 base/src/commonMain/kotlin/runOnMain.kt                         | 2 +-
 base/src/commonMain/kotlin/state/KalugaState.kt                 | 2 +-
 base/src/commonMain/kotlin/utils/ApplyIf.kt                     | 2 +-
 base/src/commonMain/kotlin/utils/ContainsAny.kt                 | 2 +-
 base/src/commonMain/kotlin/utils/Decimal.kt                     | 2 +-
 base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt    | 2 +-
 base/src/commonMain/kotlin/utils/Enum+byOrdinalOrDefault.kt     | 2 +-
 base/src/commonMain/kotlin/utils/Int.kt                         | 2 +-
 base/src/commonMain/kotlin/utils/Serializable.kt                | 2 +-
 base/src/commonMain/kotlin/utils/firstInstance.kt               | 2 +-
 base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt         | 2 +-
 base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt       | 2 +-
 base/src/commonTest/kotlin/state/ColdStateRepoTest.kt           | 2 +-
 base/src/commonTest/kotlin/state/ReplayBufferStateRepoTest.kt   | 2 +-
 base/src/commonTest/kotlin/state/StateRepoTest.kt               | 2 +-
 base/src/commonTest/kotlin/utils/ByteUtilsTest.kt               | 2 +-
 base/src/commonTest/kotlin/utils/ContainsAnyTests.kt            | 2 +-
 base/src/commonTest/kotlin/utils/DecimalTest.kt                 | 2 +-
 base/src/iosMain/kotlin/MainQueueDispatcher.kt                  | 2 +-
 base/src/iosMain/kotlin/runBlocking.kt                          | 2 +-
 base/src/iosMain/kotlin/runOnMain.kt                            | 2 +-
 base/src/iosMain/kotlin/utils/Decimal.kt                        | 2 +-
 base/src/iosMain/kotlin/utils/Serializable.kt                   | 2 +-
 base/src/jsMain/kotlin/MainQueueDispatcher.kt                   | 2 +-
 base/src/jsMain/kotlin/runBlocking.kt                           | 2 +-
 base/src/jsMain/kotlin/runOnMain.kt                             | 2 +-
 base/src/jsMain/kotlin/utils/BigDecimal.kt                      | 2 +-
 base/src/jsMain/kotlin/utils/Decimal.kt                         | 2 +-
 base/src/jsMain/kotlin/utils/Serializable.kt                    | 2 +-
 base/src/jvmMain/kotlin/MainQueueDispatcher.kt                  | 2 +-
 base/src/jvmMain/kotlin/runBlocking.kt                          | 2 +-
 base/src/jvmMain/kotlin/runOnMain.kt                            | 2 +-
 base/src/jvmMain/kotlin/utils/Decimal.kt                        | 2 +-
 base/src/jvmMain/kotlin/utils/Serializable.kt                   | 2 +-
 beacons/src/androidLibAndroidTest/kotlin/TestActivity.kt        | 2 +-
 beacons/src/commonTest/kotlin/BeaconDiscoveredTest.kt           | 2 +-
 beacons/src/commonTest/kotlin/BeaconFlowTest.kt                 | 2 +-
 beacons/src/commonTest/kotlin/BeaconLostTest.kt                 | 2 +-
 beacons/src/commonTest/kotlin/BeaconMock.kt                     | 2 +-
 beacons/src/commonTest/kotlin/BeaconUpdateTest.kt               | 2 +-
 beacons/src/commonTest/kotlin/BluetoothMock.kt                  | 2 +-
 .../src/commonMain/kotlin/BluetoothPermission.kt                | 2 +-
 .../src/iosMain/kotlin/BluetoothPermissionManager.kt            | 2 +-
 .../src/jvmMain/kotlin/BluetoothPermissionManager.kt            | 2 +-
 bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt         | 2 +-
 bluetooth/src/androidLibMain/kotlin/Value.kt                    | 2 +-
 bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt             | 2 +-
 bluetooth/src/commonMain/kotlin/Value.kt                        | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothAdvertisementTest.kt   | 2 +-
 .../kotlin/BluetoothCharacteristicNotificationTest.kt           | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothCharacteristicTest.kt  | 2 +-
 .../src/commonTest/kotlin/BluetoothCharacteristicValueTest.kt   | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothCharacteristicsTest.kt | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothDescriptorTest.kt      | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothDescriptorValueTest.kt | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothDescriptorsTest.kt     | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothDeviceTest.kt          | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothDevicesTest.kt         | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothDistanceTest.kt        | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothPairedDevicesTest.kt   | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothRssiTest.kt            | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothScanTest.kt            | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothServiceTest.kt         | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothServicesTest.kt        | 2 +-
 bluetooth/src/commonTest/kotlin/BluetoothUUIDTest.kt            | 2 +-
 bluetooth/src/commonTest/kotlin/device/DeviceTest.kt            | 2 +-
 bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt                | 2 +-
 bluetooth/src/iosMain/kotlin/Value.kt                           | 2 +-
 bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt                 | 2 +-
 bluetooth/src/jsMain/kotlin/Value.kt                            | 2 +-
 bluetooth/src/jsMain/kotlin/device/DeviceWrapper.kt             | 2 +-
 bluetooth/src/jsMain/kotlin/wrappers.kt                         | 2 +-
 bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt                | 2 +-
 bluetooth/src/jvmMain/kotlin/Value.kt                           | 2 +-
 bluetooth/src/jvmMain/kotlin/device/DeviceWrapper.kt            | 2 +-
 bluetooth/src/jvmMain/kotlin/wrappers.kt                        | 2 +-
 convention-plugins/build.gradle.kts                             | 2 +-
 .../src/main/kotlin/convention.publication.gradle.kts           | 2 +-
 .../kotlin/AndroidDateTimePickerPresenterTest.kt                | 2 +-
 .../kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt  | 2 +-
 .../kotlin/com/splendo/kaluga/datetime/timer/Timer.kt           | 2 +-
 .../com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt     | 2 +-
 .../src/main/java/com/splendo/kaluga/example/ExampleActivity.kt | 2 +-
 .../main/java/com/splendo/kaluga/example/ExampleApplication.kt  | 2 +-
 .../java/com/splendo/kaluga/example/FeaturesListFragment.kt     | 2 +-
 .../src/main/java/com/splendo/kaluga/example/InfoFragment.kt    | 2 +-
 .../java/com/splendo/kaluga/example/alerts/AlertsActivity.kt    | 2 +-
 .../kaluga/example/architecture/ArchitectureDetailsActivity.kt  | 2 +-
 .../kaluga/example/architecture/ArchitectureInputActivity.kt    | 2 +-
 .../src/main/java/com/splendo/kaluga/example/di/Modules.kt      | 2 +-
 .../splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt  | 2 +-
 .../main/java/com/splendo/kaluga/example/link/LinksActivity.kt  | 2 +-
 .../java/com/splendo/kaluga/example/loading/LoadingActivity.kt  | 2 +-
 .../com/splendo/kaluga/example/location/LocationActivity.kt     | 2 +-
 .../kaluga/example/platformspecific/PlatformSpecificActivity.kt | 2 +-
 .../platformspecific/compose/bottomSheet/BottomSheetActivity.kt | 2 +-
 .../compose/bottomSheet/ui/BottomSheetLayout.kt                 | 2 +-
 .../compose/bottomSheet/ui/BottomSheetParentLayout.kt           | 2 +-
 .../compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt    | 2 +-
 .../compose/bottomSheet/ui/BottomSheetSubPageLayout.kt          | 2 +-
 .../compose/bottomSheet/viewModel/NavigationMappers.kt          | 2 +-
 .../platformspecific/compose/contacts/ContactsActivity.kt       | 2 +-
 .../compose/contacts/ui/ContactDetailsLayout.kt                 | 2 +-
 .../platformspecific/compose/contacts/ui/ContactsLayout.kt      | 2 +-
 .../platformspecific/compose/contacts/ui/ContactsListLayout.kt  | 2 +-
 .../compose/contacts/viewModel/NavigationMappers.kt             | 2 +-
 .../java/com/splendo/kaluga/example/resources/ButtonActivity.kt | 2 +-
 .../java/com/splendo/kaluga/example/resources/ColorActivity.kt  | 2 +-
 .../java/com/splendo/kaluga/example/resources/LabelActivity.kt  | 2 +-
 .../java/com/splendo/kaluga/example/system/SystemActivity.kt    | 2 +-
 .../splendo/kaluga/example/system/fragments/NetworkFragment.kt  | 2 +-
 .../main/java/com/splendo/kaluga/example/view/ItemDecoration.kt | 2 +-
 example/android/src/main/res/layout/activity_link.xml           | 2 +-
 example/android/src/main/res/layout/activity_system.xml         | 2 +-
 example/android/src/main/res/layout/fragment_network.xml        | 2 +-
 example/android/src/main/res/values/dimens.xml                  | 2 +-
 example/ios/Demo/Alerts/AlertsViewController.swift              | 2 +-
 example/ios/Demo/AppDelegate.swift                              | 2 +-
 .../Demo/Architecture/ArchitectureDetailsViewController.swift   | 2 +-
 .../ios/Demo/Architecture/ArchitectureInputViewController.swift | 2 +-
 example/ios/Demo/Beacons/BeaconsViewCell.swift                  | 2 +-
 example/ios/Demo/Beacons/BeaconsViewController.swift            | 2 +-
 .../Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift   | 2 +-
 example/ios/Demo/Bluetooth/BluetoothViewController.swift        | 2 +-
 .../ios/Demo/DateTimePicker/DateTimePickerViewController.swift  | 2 +-
 example/ios/Demo/ExampleViewController.swift                    | 2 +-
 example/ios/Demo/FeaturesList/FeaturesListViewController.swift  | 2 +-
 example/ios/Demo/Helpers/UIControl+Closure.swift                | 2 +-
 example/ios/Demo/Info/InfoViewController.swift                  | 2 +-
 .../Demo/KeyboardManager/KeyboardManagerViewController.swift    | 2 +-
 example/ios/Demo/Links/LinksViewController.swift                | 2 +-
 example/ios/Demo/LoadingIndicator/ActivityViewController.swift  | 2 +-
 example/ios/Demo/LoadingIndicator/LoadingViewController.swift   | 2 +-
 example/ios/Demo/Location/LocationViewController.swift          | 2 +-
 example/ios/Demo/Permissions/PermissionListViewController.swift | 2 +-
 example/ios/Demo/Permissions/PermissionViewController.swift     | 2 +-
 example/ios/Demo/Resources/ButtonViewController.swift           | 2 +-
 example/ios/Demo/Resources/ColorViewController.swift            | 2 +-
 example/ios/Demo/Resources/LabelViewController.swift            | 2 +-
 example/ios/Demo/Resources/ResourcesListViewController.swift    | 2 +-
 example/ios/Demo/System/Network/NetworkViewController.swift     | 2 +-
 example/ios/Demo/System/SystemViewController.swift              | 2 +-
 .../FittingWidthAutomaticHeightCollectionViewFlowLayout.swift   | 2 +-
 example/ios/DemoTests/DemoTests.swift                           | 2 +-
 example/ios/DemoUITests/DemoUITests.swift                       | 2 +-
 .../src/commonMain/kotlin/KotlinNativeFramework.kt              | 2 +-
 .../compose/bottomSheet/BottomSheetParentSubPageViewModel.kt    | 2 +-
 .../compose/bottomSheet/BottomSheetParentViewModel.kt           | 2 +-
 .../compose/bottomSheet/BottomSheetSubPageViewModel.kt          | 2 +-
 .../compose/bottomSheet/BottomSheetViewModel.kt                 | 2 +-
 .../platformspecific/compose/contacts/model/ContactDetails.kt   | 2 +-
 .../compose/contacts/viewModel/ContactDetailsViewModel.kt       | 2 +-
 .../compose/contacts/viewModel/ContactsListViewModel.kt         | 2 +-
 .../example/shared/viewmodel/featureList/PlatformSpecific.kt    | 2 +-
 example/shared/src/commonMain/kotlin/AlertViewModel.kt          | 2 +-
 example/shared/src/commonMain/kotlin/HelloShared.kt             | 2 +-
 example/shared/src/commonMain/kotlin/HudViewModel.kt            | 2 +-
 .../commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt | 2 +-
 .../src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt      | 2 +-
 .../commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt    | 2 +-
 .../src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt | 2 +-
 .../src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt | 2 +-
 .../src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt   | 2 +-
 .../kotlin/viewmodel/system/network/NetworkViewModel.kt         | 2 +-
 .../example/shared/viewmodel/featureList/PlatformSpecific.kt    | 2 +-
 .../example/shared/viewmodel/featureList/PlatformSpecific.kt    | 2 +-
 .../example/shared/viewmodel/featureList/PlatformSpecific.kt    | 2 +-
 gradle/newModule.gradle.kts                                     | 2 +-
 hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt         | 2 +-
 hud/src/androidLibAndroidTest/kotlin/TestActivity.kt            | 2 +-
 hud/src/androidLibMain/kotlin/HUD.kt                            | 2 +-
 hud/src/commonMain/kotlin/HUD.kt                                | 2 +-
 hud/src/commonMain/kotlin/HudConfig.kt                          | 2 +-
 hud/src/commonTest/kotlin/HUDTests.kt                           | 2 +-
 hud/src/iosMain/kotlin/HUD.kt                                   | 2 +-
 hud/src/iosTest/kotlin/IOSHUDTests.kt                           | 2 +-
 keyboard/src/androidLibAndroidTest/kotlin/TestActivity.kt       | 2 +-
 keyboard/src/androidLibMain/kotlin/FocusHandler.kt              | 2 +-
 keyboard/src/androidLibMain/kotlin/KeyboardManager.kt           | 2 +-
 keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt           | 2 +-
 keyboard/src/iosMain/kotlin/FocusHandler.kt                     | 2 +-
 keyboard/src/iosMain/kotlin/KeyboardManager.kt                  | 2 +-
 keyboard/src/jsMain/kotlin/FocusHandler.kt                      | 2 +-
 keyboard/src/jsMain/kotlin/KeyboardManager.kt                   | 2 +-
 keyboard/src/jvmMain/kotlin/FocusHandler.kt                     | 2 +-
 keyboard/src/jvmMain/kotlin/KeyboardManager.kt                  | 2 +-
 .../kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt | 2 +-
 .../kotlin/com/splendo/kaluga/links/LinksBuilder.kt             | 2 +-
 links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt   | 2 +-
 .../src/commonTest/kotlin/com/splendo/kaluga/links/LinksTest.kt | 2 +-
 .../src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt | 2 +-
 .../kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt | 2 +-
 .../src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt  | 2 +-
 .../kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt | 2 +-
 .../src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt | 2 +-
 .../kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt | 2 +-
 .../androidLibMain/kotlin/location/GoogleLocationProvider.kt    | 2 +-
 .../src/androidLibMain/kotlin/location/LocationExtensions.kt    | 2 +-
 location/src/androidLibMain/kotlin/location/LocationMonitor.kt  | 2 +-
 location/src/androidLibMain/kotlin/location/LocationProvider.kt | 2 +-
 location/src/commonMain/kotlin/location/Location.kt             | 2 +-
 location/src/commonMain/kotlin/location/LocationMonitor.kt      | 2 +-
 location/src/iosMain/kotlin/location/CLLocationExtensions.kt    | 2 +-
 location/src/jsMain/kotlin/LocationMonitor.kt                   | 2 +-
 location/src/jvmMain/kotlin/LocationMonitor.kt                  | 2 +-
 logging/src/commonMain/kotlin/LogLevel.kt                       | 2 +-
 logging/src/commonMain/kotlin/Logger.kt                         | 2 +-
 logging/src/commonMain/kotlin/log.kt                            | 2 +-
 logging/src/commonTest/kotlin/LogTest.kt                        | 2 +-
 logging/src/commonTest/kotlin/LoggerMock.kt                     | 2 +-
 logging/src/jvmMain/kotlin/log.kt                               | 2 +-
 resources-compose/build.gradle.kts                              | 2 +-
 resources-compose/src/androidLibAndroidTest/AndroidManifest.xml | 2 +-
 resources-compose/src/androidLibMain/AndroidManifest.xml        | 2 +-
 resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt  | 2 +-
 resources-compose/src/androidLibMain/kotlin/Color.kt            | 2 +-
 resources-compose/src/androidLibMain/kotlin/GradientStyle.kt    | 2 +-
 resources-compose/src/androidLibMain/kotlin/KalugaButton.kt     | 2 +-
 resources-compose/src/androidLibMain/kotlin/KalugaLabel.kt      | 2 +-
 .../src/androidLibMain/kotlin/RoundedCornerRadiusShape.kt       | 2 +-
 resources-compose/src/androidLibMain/kotlin/TextAlignment.kt    | 2 +-
 resources/src/androidLibAndroidTest/kotlin/TestActivity.kt      | 2 +-
 resources/src/androidLibMain/kotlin/PixelUtils.kt               | 2 +-
 resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt     | 2 +-
 resources/src/androidLibMain/kotlin/view/Button.kt              | 2 +-
 resources/src/commonMain/kotlin/ColorBlending.kt                | 2 +-
 resources/src/commonMain/kotlin/DefaultColors.kt                | 2 +-
 resources/src/commonMain/kotlin/HSLColor.kt                     | 2 +-
 resources/src/commonMain/kotlin/StyledString.kt                 | 2 +-
 resources/src/commonMain/kotlin/stylable/BackgroundStyle.kt     | 2 +-
 resources/src/commonMain/kotlin/stylable/ButtonStyle.kt         | 2 +-
 resources/src/commonMain/kotlin/stylable/GradientStyle.kt       | 2 +-
 resources/src/commonMain/kotlin/stylable/TextAlignment.kt       | 2 +-
 resources/src/commonMain/kotlin/stylable/TextStyle.kt           | 2 +-
 resources/src/commonMain/kotlin/view/KalugaButton.kt            | 2 +-
 resources/src/commonMain/kotlin/view/KalugaLabel.kt             | 2 +-
 resources/src/iosMain/kotlin/StyledString.kt                    | 2 +-
 resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt           | 2 +-
 resources/src/iosMain/kotlin/uikit/ButtonStyle.kt               | 2 +-
 resources/src/iosMain/kotlin/uikit/TextAlignment.kt             | 2 +-
 resources/src/iosMain/kotlin/uikit/TextStyle.kt                 | 2 +-
 resources/src/jsMain/kotlin/StyledString.kt                     | 2 +-
 resources/src/jvmMain/kotlin/StyledString.kt                    | 2 +-
 review/src/androidLibAndroidTest/kotlin/TestActivity.kt         | 2 +-
 review/src/androidLibMain/kotlin/ReviewManager.kt               | 2 +-
 review/src/commonMain/kotlin/ReviewManager.kt                   | 2 +-
 review/src/iosMain/kotlin/ReviewManager.kt                      | 2 +-
 review/src/jsMain/kotlin/ReviewManager.kt                       | 2 +-
 review/src/jvmMain/kotlin/ReviewManager.kt                      | 2 +-
 scientific/src/androidLibAndroidTest/kotlin/TestActivity.kt     | 2 +-
 scientific/src/commonMain/kotlin/PhysicalQuantity.kt            | 2 +-
 scientific/src/commonMain/kotlin/ScientificValue.kt             | 2 +-
 .../kotlin/converter/acceleration/convertFromForceAndMass.kt    | 2 +-
 .../kotlin/converter/acceleration/convertFromJoltAndTime.kt     | 2 +-
 .../kotlin/converter/acceleration/convertFromSpeedAndTime.kt    | 2 +-
 .../commonMain/kotlin/converter/acceleration/convertToForce.kt  | 2 +-
 .../commonMain/kotlin/converter/acceleration/convertToJolt.kt   | 2 +-
 .../commonMain/kotlin/converter/acceleration/convertToSpeed.kt  | 2 +-
 .../commonMain/kotlin/converter/acceleration/convertToTime.kt   | 2 +-
 .../kotlin/converter/action/convertFromEnergyAndTime.kt         | 2 +-
 .../src/commonMain/kotlin/converter/action/convertToEnergy.kt   | 2 +-
 .../src/commonMain/kotlin/converter/action/convertToTime.kt     | 2 +-
 .../converter/amountOfSubstance/convertFromCatalysisAndTime.kt  | 2 +-
 .../amountOfSubstance/convertFromEnergyAndMolarEnergy.kt        | 2 +-
 .../converter/amountOfSubstance/convertFromMolalityAndWeight.kt | 2 +-
 .../converter/amountOfSubstance/convertFromMolarityAndVolume.kt | 2 +-
 .../amountOfSubstance/convertFromVolumeAndMolarVolume.kt        | 2 +-
 .../amountOfSubstance/convertFromWeightAndMolarMass.kt          | 2 +-
 .../converter/amountOfSubstance/convertToCatalysticActivity.kt  | 2 +-
 .../kotlin/converter/amountOfSubstance/convertToEnergy.kt       | 2 +-
 .../kotlin/converter/amountOfSubstance/convertToMolality.kt     | 2 +-
 .../kotlin/converter/amountOfSubstance/convertToMolarity.kt     | 2 +-
 .../converter/amountOfSubstance/convertToRadioactivity.kt       | 2 +-
 .../kotlin/converter/amountOfSubstance/convertToTime.kt         | 2 +-
 .../kotlin/converter/amountOfSubstance/convertToVolume.kt       | 2 +-
 .../kotlin/converter/amountOfSubstance/convertToWeight.kt       | 2 +-
 .../kotlin/converter/angle/convertFromAngularVelocityAndTime.kt | 2 +-
 .../kotlin/converter/angle/convertToAngularVelocity.kt          | 2 +-
 .../src/commonMain/kotlin/converter/angle/convertToTime.kt      | 2 +-
 .../angularAcceleration/convertFromAngularVelocityAndTime.kt    | 2 +-
 .../converter/angularAcceleration/convertToAngularVelocity.kt   | 2 +-
 .../kotlin/converter/angularVelocity/convertFromAngleAndTime.kt | 2 +-
 .../angularVelocity/convertFromAngularAccelerationAndTime.kt    | 2 +-
 .../kotlin/converter/angularVelocity/convertToAngle.kt          | 2 +-
 .../converter/angularVelocity/convertToAngularAcceleration.kt   | 2 +-
 .../kotlin/converter/angularVelocity/convertToTime.kt           | 2 +-
 .../kotlin/converter/area/convertFromEnergyAndSurfaceTension.kt | 2 +-
 .../kotlin/converter/area/convertFromForceAndPressure.kt        | 2 +-
 .../src/commonMain/kotlin/converter/area/convertFromLength.kt   | 2 +-
 .../converter/area/convertFromLinearMassDensityAndDensity.kt    | 2 +-
 .../area/convertFromLinearMassDensityAndSpecificVolume.kt       | 2 +-
 .../area/convertFromLuminousEnergyAndLuminousExposure.kt        | 2 +-
 .../converter/area/convertFromLuminousFluxAndIlluminance.kt     | 2 +-
 .../converter/area/convertFromLuminousIntensityAndLuminance.kt  | 2 +-
 .../converter/area/convertFromMagneticFluxAndInduction.kt       | 2 +-
 .../converter/area/convertFromMomentumAndDynamicViscosity.kt    | 2 +-
 .../kotlin/converter/area/convertFromVolumeAndLength.kt         | 2 +-
 .../kotlin/converter/area/convertFromVolumetricFlowAndFlux.kt   | 2 +-
 .../kotlin/converter/area/convertFromWeightAndAreaDensity.kt    | 2 +-
 .../src/commonMain/kotlin/converter/area/convertToEnergy.kt     | 2 +-
 .../src/commonMain/kotlin/converter/area/convertToForce.kt      | 2 +-
 .../src/commonMain/kotlin/converter/area/convertToLength.kt     | 2 +-
 .../kotlin/converter/area/convertToLinearMassDensity.kt         | 2 +-
 .../commonMain/kotlin/converter/area/convertToLuminousEnergy.kt | 2 +-
 .../commonMain/kotlin/converter/area/convertToLuminousFlux.kt   | 2 +-
 .../kotlin/converter/area/convertToLuminousIntensity.kt         | 2 +-
 .../commonMain/kotlin/converter/area/convertToMagneticFlux.kt   | 2 +-
 .../src/commonMain/kotlin/converter/area/convertToMomentum.kt   | 2 +-
 .../commonMain/kotlin/converter/area/convertToSpecificVolume.kt | 2 +-
 .../commonMain/kotlin/converter/area/convertToVolumetricFlow.kt | 2 +-
 .../src/commonMain/kotlin/converter/area/convertToWeight.kt     | 2 +-
 .../kotlin/converter/areaDensity/convertFromDensityAndLength.kt | 2 +-
 .../converter/areaDensity/convertFromLengthAndSpecificVolume.kt | 2 +-
 .../areaDensity/convertFromLinearMassDensityAndLength.kt        | 2 +-
 .../kotlin/converter/areaDensity/convertFromWeightAndArea.kt    | 2 +-
 .../commonMain/kotlin/converter/areaDensity/convertToDensity.kt | 2 +-
 .../commonMain/kotlin/converter/areaDensity/convertToLength.kt  | 2 +-
 .../kotlin/converter/areaDensity/convertToLinearMassDensity.kt  | 2 +-
 .../commonMain/kotlin/converter/areaDensity/convertToWeight.kt  | 2 +-
 .../catalysticActivity/convertFromAmountOfSubstanceAndTime.kt   | 2 +-
 .../converter/catalysticActivity/convertToAmountOfSubstance.kt  | 2 +-
 .../commonMain/kotlin/converter/decimal/convertToFrequency.kt   | 2 +-
 .../kotlin/converter/decimal/convertToRadioactivity.kt          | 2 +-
 .../src/commonMain/kotlin/converter/decimal/convertToTime.kt    | 2 +-
 .../kotlin/converter/density/convertFromAreaDensityAndLength.kt | 2 +-
 .../converter/density/convertFromLinearMassDensityAndArea.kt    | 2 +-
 .../converter/density/convertFromMolarMassAndMolarVolume.kt     | 2 +-
 .../kotlin/converter/density/convertFromMolarityAndMolality.kt  | 2 +-
 .../kotlin/converter/density/convertFromMolarityAndMolarMass.kt | 2 +-
 .../kotlin/converter/density/convertFromSpecificVolume.kt       | 2 +-
 .../kotlin/converter/density/convertFromWeightAndVolume.kt      | 2 +-
 .../commonMain/kotlin/converter/density/convertToAreaDensity.kt | 2 +-
 .../kotlin/converter/density/convertToLinearMassDensity.kt      | 2 +-
 .../commonMain/kotlin/converter/density/convertToMolarMass.kt   | 2 +-
 .../commonMain/kotlin/converter/density/convertToMolarity.kt    | 2 +-
 .../kotlin/converter/density/convertToSpecificVolume.kt         | 2 +-
 .../src/commonMain/kotlin/converter/density/convertToWeight.kt  | 2 +-
 .../converter/dynamicViscosity/convertFromMomentumAndArea.kt    | 2 +-
 .../converter/dynamicViscosity/convertFromPressureAndTime.kt    | 2 +-
 .../kotlin/converter/dynamicViscosity/convertToMomentum.kt      | 2 +-
 .../kotlin/converter/dynamicViscosity/convertToPressure.kt      | 2 +-
 .../kotlin/converter/dynamicViscosity/convertToTime.kt          | 2 +-
 .../electricCapacitance/convertFromElectricChargeAndVoltage.kt  | 2 +-
 .../convertFromElectricConductanceAndFrequency.kt               | 2 +-
 .../electricCapacitance/convertFromTimeAndElectricResistance.kt | 2 +-
 .../converter/electricCapacitance/convertToElectricCharge.kt    | 2 +-
 .../electricCapacitance/convertToElectricConductance.kt         | 2 +-
 .../kotlin/converter/electricCapacitance/convertToTime.kt       | 2 +-
 .../electricCharge/convertFromElectricCapacitanceAndVoltage.kt  | 2 +-
 .../electricCharge/convertFromElectricCurrentAndTime.kt         | 2 +-
 .../converter/electricCharge/convertFromEnergyAndVoltage.kt     | 2 +-
 .../convertFromMagneticFluxAndElectricResistance.kt             | 2 +-
 .../converter/electricCharge/convertToElectricCapacitance.kt    | 2 +-
 .../kotlin/converter/electricCharge/convertToElectricCurrent.kt | 2 +-
 .../kotlin/converter/electricCharge/convertToEnergy.kt          | 2 +-
 .../kotlin/converter/electricCharge/convertToMagneticFlux.kt    | 2 +-
 .../commonMain/kotlin/converter/electricCharge/convertToTime.kt | 2 +-
 .../kotlin/converter/electricCharge/convertToVoltage.kt         | 2 +-
 .../convertFromElectricCapacitanceAndFrequency.kt               | 2 +-
 .../electricConductance/convertFromElectricCurrentAndVoltage.kt | 2 +-
 .../electricConductance/convertFromElectricResistance.kt        | 2 +-
 .../electricConductance/convertToElectricCapacitance.kt         | 2 +-
 .../converter/electricConductance/convertToElectricCurrent.kt   | 2 +-
 .../electricConductance/convertToElectricResistance.kt          | 2 +-
 .../kotlin/converter/electricConductance/convertToFrequency.kt  | 2 +-
 .../electricCurrent/convertFromElectricChargeAndTime.kt         | 2 +-
 .../electricCurrent/convertFromEnergyAndMagneticFlux.kt         | 2 +-
 .../convertFromMagneticFluxAndElectricInductance.kt             | 2 +-
 .../converter/electricCurrent/convertFromPowerAndVoltage.kt     | 2 +-
 .../electricCurrent/convertFromVoltageAndElectricConductance.kt | 2 +-
 .../electricCurrent/convertFromVoltageAndElectricResistance.kt  | 2 +-
 .../kotlin/converter/electricCurrent/convertToElectricCharge.kt | 2 +-
 .../converter/electricCurrent/convertToElectricConductance.kt   | 2 +-
 .../kotlin/converter/electricCurrent/convertToEnergy.kt         | 2 +-
 .../kotlin/converter/electricCurrent/convertToMagneticFlux.kt   | 2 +-
 .../kotlin/converter/electricCurrent/convertToPower.kt          | 2 +-
 .../kotlin/converter/electricCurrent/convertToVoltage.kt        | 2 +-
 .../convertFromElectricResistanceAndFrequency.kt                | 2 +-
 .../electricInductance/convertFromElectricResistanceAndTime.kt  | 2 +-
 .../convertFromMagneticFluxAndElectricCurrent.kt                | 2 +-
 .../converter/electricInductance/convertToElectricResistance.kt | 2 +-
 .../converter/electricInductance/convertToMagneticFlux.kt       | 2 +-
 .../kotlin/converter/electricInductance/convertToTime.kt        | 2 +-
 .../electricResistance/convertFromElectricConductance.kt        | 2 +-
 .../convertFromElectricInductanceAndFrequency.kt                | 2 +-
 .../electricResistance/convertFromElectricInductanceAndTime.kt  | 2 +-
 .../convertFromMagneticFluxAndElectricCharge.kt                 | 2 +-
 .../electricResistance/convertFromTimeAndElectricCapacitance.kt | 2 +-
 .../electricResistance/convertFromVoltageAndElectricCurrent.kt  | 2 +-
 .../electricResistance/convertToElectricConductance.kt          | 2 +-
 .../converter/electricResistance/convertToElectricInductance.kt | 2 +-
 .../kotlin/converter/electricResistance/convertToFrequency.kt   | 2 +-
 .../converter/electricResistance/convertToMagneticFlux.kt       | 2 +-
 .../kotlin/converter/electricResistance/convertToTime.kt        | 2 +-
 .../kotlin/converter/electricResistance/convertToVoltage.kt     | 2 +-
 .../kotlin/converter/energy/convertFromActionAndTime.kt         | 2 +-
 .../converter/energy/convertFromElectricChargeAndVoltage.kt     | 2 +-
 .../kotlin/converter/energy/convertFromForceAndDistance.kt      | 2 +-
 .../converter/energy/convertFromHeatCapacityAndTemperature.kt   | 2 +-
 .../energy/convertFromIonizingRadiationAbsorbedDoseAndWeight.kt | 2 +-
 .../convertFromIonizingRadiationEquivalentDoseAndWeight.kt      | 2 +-
 .../energy/convertFromMagneticFluxAndElectricCurrent.kt         | 2 +-
 .../energy/convertFromMolarEnergyAndAmountOfSubstance.kt        | 2 +-
 .../kotlin/converter/energy/convertFromPowerAndTime.kt          | 2 +-
 .../kotlin/converter/energy/convertFromPressureAndVolume.kt     | 2 +-
 .../converter/energy/convertFromSpecificEnergyAndWeight.kt      | 2 +-
 .../kotlin/converter/energy/convertFromSurfaceTensionAndArea.kt | 2 +-
 .../src/commonMain/kotlin/converter/energy/convertToAction.kt   | 2 +-
 .../kotlin/converter/energy/convertToAmountOfSubstance.kt       | 2 +-
 .../src/commonMain/kotlin/converter/energy/convertToArea.kt     | 2 +-
 .../kotlin/converter/energy/convertToElectricCharge.kt          | 2 +-
 .../kotlin/converter/energy/convertToElectricCurrent.kt         | 2 +-
 .../src/commonMain/kotlin/converter/energy/convertToForce.kt    | 2 +-
 .../commonMain/kotlin/converter/energy/convertToHeatCapacity.kt | 2 +-
 .../converter/energy/convertToIonizingRadiationAbsorbedDose.kt  | 2 +-
 .../energy/convertToIonizingRadiationEquivalentDose.kt          | 2 +-
 .../src/commonMain/kotlin/converter/energy/convertToLength.kt   | 2 +-
 .../commonMain/kotlin/converter/energy/convertToMagneticFlux.kt | 2 +-
 .../commonMain/kotlin/converter/energy/convertToMolarEnergy.kt  | 2 +-
 .../src/commonMain/kotlin/converter/energy/convertToPower.kt    | 2 +-
 .../src/commonMain/kotlin/converter/energy/convertToPressure.kt | 2 +-
 .../kotlin/converter/energy/convertToSpecificEnergy.kt          | 2 +-
 .../kotlin/converter/energy/convertToSurfaceTension.kt          | 2 +-
 .../commonMain/kotlin/converter/energy/convertToTemperature.kt  | 2 +-
 .../src/commonMain/kotlin/converter/energy/convertToTime.kt     | 2 +-
 .../src/commonMain/kotlin/converter/energy/convertToVoltage.kt  | 2 +-
 .../src/commonMain/kotlin/converter/energy/convertToVolume.kt   | 2 +-
 .../src/commonMain/kotlin/converter/energy/convertToWeight.kt   | 2 +-
 .../kotlin/converter/force/convertFromEnergyAndLength.kt        | 2 +-
 .../kotlin/converter/force/convertFromMomentumAndTime.kt        | 2 +-
 .../kotlin/converter/force/convertFromPowerAndSpeed.kt          | 2 +-
 .../kotlin/converter/force/convertFromPressureAndArea.kt        | 2 +-
 .../converter/force/convertFromSurfaceTensionAndLength.kt       | 2 +-
 .../kotlin/converter/force/convertFromWeightAndAcceleration.kt  | 2 +-
 .../commonMain/kotlin/converter/force/convertFromYankAndTime.kt | 2 +-
 .../commonMain/kotlin/converter/force/convertToAcceleration.kt  | 2 +-
 .../src/commonMain/kotlin/converter/force/convertToArea.kt      | 2 +-
 .../src/commonMain/kotlin/converter/force/convertToEnergy.kt    | 2 +-
 .../src/commonMain/kotlin/converter/force/convertToLength.kt    | 2 +-
 .../src/commonMain/kotlin/converter/force/convertToMomentum.kt  | 2 +-
 .../src/commonMain/kotlin/converter/force/convertToPower.kt     | 2 +-
 .../src/commonMain/kotlin/converter/force/convertToPressure.kt  | 2 +-
 .../kotlin/converter/force/convertToSurfaceTension.kt           | 2 +-
 .../src/commonMain/kotlin/converter/force/convertToTime.kt      | 2 +-
 .../src/commonMain/kotlin/converter/force/convertToWeight.kt    | 2 +-
 .../src/commonMain/kotlin/converter/force/convertToYank.kt      | 2 +-
 .../frequency/convertFromElectricResistanceAndInductance.kt     | 2 +-
 .../frequency/convertFromElectricalConductanceAndCapacity.kt    | 2 +-
 .../commonMain/kotlin/converter/frequency/convertFromTime.kt    | 2 +-
 .../commonMain/kotlin/converter/frequency/convertToDecimal.kt   | 2 +-
 .../kotlin/converter/frequency/convertToElectricConductance.kt  | 2 +-
 .../kotlin/converter/frequency/convertToElectricResistance.kt   | 2 +-
 .../src/commonMain/kotlin/converter/frequency/convertToTime.kt  | 2 +-
 .../converter/heatCapacity/convertFromEnergyAndTemperature.kt   | 2 +-
 .../heatCapacity/convertFromWeightAndSpecificHeatCapacity.kt    | 2 +-
 .../commonMain/kotlin/converter/heatCapacity/convertToEnergy.kt | 2 +-
 .../converter/heatCapacity/convertToSpecificHeatCapacity.kt     | 2 +-
 .../commonMain/kotlin/converter/heatCapacity/convertToWeight.kt | 2 +-
 .../converter/illuminance/convertFromLuminanceAndSolidAngle.kt  | 2 +-
 .../converter/illuminance/convertFromLuminousExposureAndTime.kt | 2 +-
 .../converter/illuminance/convertFromLuminousFluxAndArea.kt     | 2 +-
 .../kotlin/converter/illuminance/convertToLuminance.kt          | 2 +-
 .../kotlin/converter/illuminance/convertToLuminousExposure.kt   | 2 +-
 .../kotlin/converter/illuminance/convertToLuminousFlux.kt       | 2 +-
 .../kotlin/converter/illuminance/convertToSolidAngle.kt         | 2 +-
 .../ionizingRadiationAbsorbedDose/convertFromEnergyAndWeight.kt | 2 +-
 .../ionizingRadiationAbsorbedDose/convertFromSpecificEnergy.kt  | 2 +-
 .../converter/ionizingRadiationAbsorbedDose/convertToEnergy.kt  | 2 +-
 .../ionizingRadiationAbsorbedDose/convertToSpecificEnergy.kt    | 2 +-
 .../convertFromEnergyAndWeight.kt                               | 2 +-
 .../ionizingRadiationEquivalentDose/convertToEnergy.kt          | 2 +-
 .../kotlin/converter/jolt/convertFromAccelerationAndTime.kt     | 2 +-
 .../commonMain/kotlin/converter/jolt/convertFromYankAndMass.kt  | 2 +-
 .../commonMain/kotlin/converter/jolt/convertToAcceleration.kt   | 2 +-
 .../src/commonMain/kotlin/converter/jolt/convertToYank.kt       | 2 +-
 .../kotlin/converter/length/convertFromAreaAndLength.kt         | 2 +-
 .../kotlin/converter/length/convertFromAreaDensityAndDensity.kt | 2 +-
 .../converter/length/convertFromAreaDensityAndSpecificVolume.kt | 2 +-
 .../kotlin/converter/length/convertFromEnergyAndForce.kt        | 2 +-
 .../converter/length/convertFromForceAndSurfaceTension.kt       | 2 +-
 .../converter/length/convertFromLinearMassDensityAndDensity.kt  | 2 +-
 .../kotlin/converter/length/convertFromSpeedAndTime.kt          | 2 +-
 .../kotlin/converter/length/convertFromVolumeAndArea.kt         | 2 +-
 .../converter/length/convertFromWeightAndLinearMassDensity.kt   | 2 +-
 .../src/commonMain/kotlin/converter/length/convertToArea.kt     | 2 +-
 .../commonMain/kotlin/converter/length/convertToAreaDensity.kt  | 2 +-
 .../src/commonMain/kotlin/converter/length/convertToEnergy.kt   | 2 +-
 .../src/commonMain/kotlin/converter/length/convertToForce.kt    | 2 +-
 .../kotlin/converter/length/convertToLinearMassDensity.kt       | 2 +-
 .../kotlin/converter/length/convertToSpecificVolume.kt          | 2 +-
 .../src/commonMain/kotlin/converter/length/convertToSpeed.kt    | 2 +-
 .../src/commonMain/kotlin/converter/length/convertToTime.kt     | 2 +-
 .../src/commonMain/kotlin/converter/length/convertToWeight.kt   | 2 +-
 .../linearMassDensity/convertFromAreaAndSpecificVolume.kt       | 2 +-
 .../linearMassDensity/convertFromAreaDensityAndLength.kt        | 2 +-
 .../converter/linearMassDensity/convertFromDensityAndLength.kt  | 2 +-
 .../converter/linearMassDensity/convertFromWeightAndArea.kt     | 2 +-
 .../kotlin/converter/linearMassDensity/convertToArea.kt         | 2 +-
 .../kotlin/converter/linearMassDensity/convertToAreaDensity.kt  | 2 +-
 .../kotlin/converter/linearMassDensity/convertToDensity.kt      | 2 +-
 .../kotlin/converter/linearMassDensity/convertToLength.kt       | 2 +-
 .../kotlin/converter/linearMassDensity/convertToWeight.kt       | 2 +-
 .../converter/luminance/convertFromIlluminanceAndSolidAngle.kt  | 2 +-
 .../converter/luminance/convertFromLuminousIntensityAndArea.kt  | 2 +-
 .../kotlin/converter/luminance/convertToIlluminance.kt          | 2 +-
 .../kotlin/converter/luminance/convertToLuminousIntensity.kt    | 2 +-
 .../luminousEnergy/convertFromLuminousExposureAndArea.kt        | 2 +-
 .../converter/luminousEnergy/convertFromLuminousFluxAndTime.kt  | 2 +-
 .../commonMain/kotlin/converter/luminousEnergy/convertToArea.kt | 2 +-
 .../converter/luminousEnergy/convertToLuminousExposure.kt       | 2 +-
 .../kotlin/converter/luminousEnergy/convertToLuminousFlux.kt    | 2 +-
 .../commonMain/kotlin/converter/luminousEnergy/convertToTime.kt | 2 +-
 .../converter/luminousExposure/convertFromIlluminanceAndTime.kt | 2 +-
 .../luminousExposure/convertFromLuminousEnergyAndArea.kt        | 2 +-
 .../kotlin/converter/luminousExposure/convertToIlluminance.kt   | 2 +-
 .../converter/luminousExposure/convertToLuminousEnergy.kt       | 2 +-
 .../kotlin/converter/luminousExposure/convertToTime.kt          | 2 +-
 .../converter/luminousFlux/convertFromIlluminanceAndArea.kt     | 2 +-
 .../converter/luminousFlux/convertFromLuminousEnergyAndTime.kt  | 2 +-
 .../luminousFlux/convertFromLuminousIntensityAndSolidAngle.kt   | 2 +-
 .../commonMain/kotlin/converter/luminousFlux/convertToArea.kt   | 2 +-
 .../kotlin/converter/luminousFlux/convertToIlluminance.kt       | 2 +-
 .../kotlin/converter/luminousFlux/convertToLuminousEnergy.kt    | 2 +-
 .../kotlin/converter/luminousFlux/convertToLuminousIntensity.kt | 2 +-
 .../kotlin/converter/luminousFlux/convertToSolidAngle.kt        | 2 +-
 .../converter/luminousIntensity/convertFromLuminanceAndArea.kt  | 2 +-
 .../luminousIntensity/convertFromLuminousFluxAndSolidAngle.kt   | 2 +-
 .../kotlin/converter/luminousIntensity/convertToArea.kt         | 2 +-
 .../kotlin/converter/luminousIntensity/convertToLuminance.kt    | 2 +-
 .../kotlin/converter/luminousIntensity/convertToLuminousFlux.kt | 2 +-
 .../magneticFlux/convertFromElectricInductanceAndCurrent.kt     | 2 +-
 .../magneticFlux/convertFromElectricResistanceAndCharge.kt      | 2 +-
 .../magneticFlux/convertFromEnergyAndElectricCurrent.kt         | 2 +-
 .../magneticFlux/convertFromMagneticInductionAndArea.kt         | 2 +-
 .../kotlin/converter/magneticFlux/convertFromVoltageAndTime.kt  | 2 +-
 .../commonMain/kotlin/converter/magneticFlux/convertToArea.kt   | 2 +-
 .../kotlin/converter/magneticFlux/convertToElectricCharge.kt    | 2 +-
 .../kotlin/converter/magneticFlux/convertToElectricCurrent.kt   | 2 +-
 .../converter/magneticFlux/convertToElectricInductance.kt       | 2 +-
 .../converter/magneticFlux/convertToElectricResistance.kt       | 2 +-
 .../commonMain/kotlin/converter/magneticFlux/convertToEnergy.kt | 2 +-
 .../kotlin/converter/magneticFlux/convertToMagneticInduction.kt | 2 +-
 .../commonMain/kotlin/converter/magneticFlux/convertToTime.kt   | 2 +-
 .../kotlin/converter/magneticFlux/convertToVoltage.kt           | 2 +-
 .../magneticInduction/convertFromMagneticFluxAndArea.kt         | 2 +-
 .../kotlin/converter/magneticInduction/convertToMagneticFlux.kt | 2 +-
 .../kotlin/converter/massFlowRate/convertFromWeightAndArea.kt   | 2 +-
 .../commonMain/kotlin/converter/massFlowRate/convertToWeight.kt | 2 +-
 .../converter/molality/convertFromAmountOfSubstanceAndWeight.kt | 2 +-
 .../kotlin/converter/molality/convertFromMolarMass.kt           | 2 +-
 .../kotlin/converter/molality/convertFromMolarityAndDensity.kt  | 2 +-
 .../converter/molality/convertFromMolarityAndSpecificVolume.kt  | 2 +-
 .../molality/convertFromSpecificEnergyAndMolarEnergy.kt         | 2 +-
 .../molality/convertFromSpecificVolumeAndMolarVolume.kt         | 2 +-
 .../kotlin/converter/molality/convertToAmountOfSubstance.kt     | 2 +-
 .../commonMain/kotlin/converter/molality/convertToMolarMass.kt  | 2 +-
 .../commonMain/kotlin/converter/molality/convertToMolarity.kt   | 2 +-
 .../kotlin/converter/molality/convertToSpecificEnergy.kt        | 2 +-
 .../kotlin/converter/molality/convertToSpecificVolume.kt        | 2 +-
 .../molarEnergy/convertFromEnergyAndAmountOfSubstance.kt        | 2 +-
 .../molarEnergy/convertFromSpecificEnergyAndMolality.kt         | 2 +-
 .../molarEnergy/convertFromSpecificEnergyAndMolarMass.kt        | 2 +-
 .../commonMain/kotlin/converter/molarEnergy/convertToEnergy.kt  | 2 +-
 .../kotlin/converter/molarEnergy/convertToMolarEnergy.kt        | 2 +-
 .../kotlin/converter/molarEnergy/convertToSpecificEnergy.kt     | 2 +-
 .../converter/molarMass/convertFromDensityAndMolarVolume.kt     | 2 +-
 .../kotlin/converter/molarMass/convertFromDensityAndMolarity.kt | 2 +-
 .../kotlin/converter/molarMass/convertFromMolality.kt           | 2 +-
 .../molarMass/convertFromMolarEnergyAndSpecificEnergy.kt        | 2 +-
 .../molarMass/convertFromMolarVolumeAndSpecificVolume.kt        | 2 +-
 .../molarMass/convertFromWeightAndAmountOfSubstance.kt          | 2 +-
 .../commonMain/kotlin/converter/molarMass/convertToDensity.kt   | 2 +-
 .../commonMain/kotlin/converter/molarMass/convertToMolality.kt  | 2 +-
 .../kotlin/converter/molarMass/convertToMolarEnergy.kt          | 2 +-
 .../kotlin/converter/molarMass/convertToMolarVolume.kt          | 2 +-
 .../commonMain/kotlin/converter/molarMass/convertToWeight.kt    | 2 +-
 .../converter/molarVolume/convertFromMolarMassAndDensity.kt     | 2 +-
 .../kotlin/converter/molarVolume/convertFromMolarity.kt         | 2 +-
 .../molarVolume/convertFromSpecificVolumeAndMolality.kt         | 2 +-
 .../molarVolume/convertFromSpecificVolumeAndMolarMass.kt        | 2 +-
 .../molarVolume/convertFromVolumeAndAmountOfSubstance.kt        | 2 +-
 .../kotlin/converter/molarVolume/convertToMolarMass.kt          | 2 +-
 .../kotlin/converter/molarVolume/convertToMolarity.kt           | 2 +-
 .../kotlin/converter/molarVolume/convertToSpecificVolume.kt     | 2 +-
 .../commonMain/kotlin/converter/molarVolume/convertToVolume.kt  | 2 +-
 .../converter/molarity/convertFromAmountOfSubstanceAndVolume.kt | 2 +-
 .../kotlin/converter/molarity/convertFromDensityAndMolality.kt  | 2 +-
 .../kotlin/converter/molarity/convertFromDensityAndMolarMass.kt | 2 +-
 .../converter/molarity/convertFromMolalityAndSpecificVolume.kt  | 2 +-
 .../kotlin/converter/molarity/convertFromMolarVolume.kt         | 2 +-
 .../kotlin/converter/molarity/convertToAmountOfSubstance.kt     | 2 +-
 .../commonMain/kotlin/converter/molarity/convertToDensity.kt    | 2 +-
 .../commonMain/kotlin/converter/molarity/convertToMolality.kt   | 2 +-
 .../kotlin/converter/molarity/convertToMolarVolume.kt           | 2 +-
 .../converter/momentum/convertFromDynamicViscosityAndArea.kt    | 2 +-
 .../kotlin/converter/momentum/convertFromForceAndTime.kt        | 2 +-
 .../kotlin/converter/momentum/convertFromMassAndSpeed.kt        | 2 +-
 .../src/commonMain/kotlin/converter/momentum/convertToArea.kt   | 2 +-
 .../kotlin/converter/momentum/convertToDynamicViscosity.kt      | 2 +-
 .../src/commonMain/kotlin/converter/momentum/convertToForce.kt  | 2 +-
 .../src/commonMain/kotlin/converter/momentum/convertToSpeed.kt  | 2 +-
 .../src/commonMain/kotlin/converter/momentum/convertToWeight.kt | 2 +-
 .../kotlin/converter/power/convertFromEnergyAndTime.kt          | 2 +-
 .../kotlin/converter/power/convertFromForceAndSpeed.kt          | 2 +-
 .../power/convertFromTemperatureAndThermalResistance.kt         | 2 +-
 .../converter/power/convertFromVoltageAndElectricCurrent.kt     | 2 +-
 .../kotlin/converter/power/convertToElectricCurrent.kt          | 2 +-
 .../src/commonMain/kotlin/converter/power/convertToEnergy.kt    | 2 +-
 .../src/commonMain/kotlin/converter/power/convertToForce.kt     | 2 +-
 .../src/commonMain/kotlin/converter/power/convertToSpeed.kt     | 2 +-
 .../commonMain/kotlin/converter/power/convertToTemperature.kt   | 2 +-
 .../src/commonMain/kotlin/converter/power/convertToVoltage.kt   | 2 +-
 .../converter/pressure/convertFromDynamicViscosityAndTime.kt    | 2 +-
 .../kotlin/converter/pressure/convertFromEnergyAndVolume.kt     | 2 +-
 .../kotlin/converter/pressure/convertFromForceAndArea.kt        | 2 +-
 .../kotlin/converter/pressure/convertToDynamicViscosity.kt      | 2 +-
 .../src/commonMain/kotlin/converter/pressure/convertToEnergy.kt | 2 +-
 .../src/commonMain/kotlin/converter/pressure/convertToForce.kt  | 2 +-
 .../radioactivity/convertFromAmountOfSubstanceAndTime.kt        | 2 +-
 .../kotlin/converter/radioactivity/convertFromTime.kt           | 2 +-
 .../kotlin/converter/radioactivity/convertToDecimal.kt          | 2 +-
 .../converter/solidAngle/convertFromIlluminanceAndLuminance.kt  | 2 +-
 .../converter/solidAngle/convertFromLuminousFluxAndIntensity.kt | 2 +-
 .../kotlin/converter/solidAngle/convertToIlluminance.kt         | 2 +-
 .../kotlin/converter/solidAngle/convertToLuminousFlux.kt        | 2 +-
 .../converter/specificEnergy/convertFromEnergyAndWeight.kt      | 2 +-
 .../specificEnergy/convertFromIonizingRadiationAbsorbedDose.kt  | 2 +-
 .../specificEnergy/convertFromMolarEnergyAndMolality.kt         | 2 +-
 .../specificEnergy/convertFromMolarEnergyAndMolarMass.kt        | 2 +-
 .../convertFromSpecificHeatCapacityAndTemperature.kt            | 2 +-
 .../kotlin/converter/specificEnergy/convertToEnergy.kt          | 2 +-
 .../specificEnergy/convertToIonizingRadiationAbsorbedDose.kt    | 2 +-
 .../kotlin/converter/specificEnergy/convertToMolality.kt        | 2 +-
 .../kotlin/converter/specificEnergy/convertToMolarEnergy.kt     | 2 +-
 .../converter/specificEnergy/convertToSpecificHeatCapacity.kt   | 2 +-
 .../kotlin/converter/specificEnergy/convertToTemperature.kt     | 2 +-
 .../specificHeatCapacity/convertFromHeatCapacityAndWeight.kt    | 2 +-
 .../convertFromSpecificEnergyAndTemperature.kt                  | 2 +-
 .../converter/specificHeatCapacity/convertToHeatCapacity.kt     | 2 +-
 .../converter/specificHeatCapacity/convertToSpecificEnergy.kt   | 2 +-
 .../specificVolume/convertFromAreaAndLinearMassDensity.kt       | 2 +-
 .../kotlin/converter/specificVolume/convertFromDensity.kt       | 2 +-
 .../converter/specificVolume/convertFromLengthAndAreaDensity.kt | 2 +-
 .../specificVolume/convertFromMolalityAndMolarVolume.kt         | 2 +-
 .../converter/specificVolume/convertFromMolalityAndMolarity.kt  | 2 +-
 .../specificVolume/convertFromMolarVolumeAndMolarMass.kt        | 2 +-
 .../converter/specificVolume/convertFromVolumeAndWeight.kt      | 2 +-
 .../commonMain/kotlin/converter/specificVolume/convertToArea.kt | 2 +-
 .../kotlin/converter/specificVolume/convertToDensity.kt         | 2 +-
 .../kotlin/converter/specificVolume/convertToLength.kt          | 2 +-
 .../kotlin/converter/specificVolume/convertToMolality.kt        | 2 +-
 .../kotlin/converter/specificVolume/convertToMolarVolume.kt     | 2 +-
 .../kotlin/converter/specificVolume/convertToVolume.kt          | 2 +-
 .../kotlin/converter/speed/convertFromAccelerationAndTime.kt    | 2 +-
 .../kotlin/converter/speed/convertFromLengthAndTime.kt          | 2 +-
 .../kotlin/converter/speed/convertFromMomentumAndWeight.kt      | 2 +-
 .../kotlin/converter/speed/convertFromPowerAndForce.kt          | 2 +-
 .../commonMain/kotlin/converter/speed/convertToAcceleration.kt  | 2 +-
 .../src/commonMain/kotlin/converter/speed/convertToLength.kt    | 2 +-
 .../src/commonMain/kotlin/converter/speed/convertToMomentum.kt  | 2 +-
 .../src/commonMain/kotlin/converter/speed/convertToPower.kt     | 2 +-
 .../src/commonMain/kotlin/converter/speed/convertToTime.kt      | 2 +-
 .../kotlin/converter/surfaceTension/convertFromEnergyAndArea.kt | 2 +-
 .../converter/surfaceTension/convertFromForceAndLength.kt       | 2 +-
 .../kotlin/converter/surfaceTension/convertToEnergy.kt          | 2 +-
 .../kotlin/converter/surfaceTension/convertToForce.kt           | 2 +-
 .../src/commonMain/kotlin/converter/temperature/convertDelta.kt | 2 +-
 .../converter/temperature/convertFromEnergyAndHeatCapacity.kt   | 2 +-
 .../convertFromSpecificEnergyAndSpecificHeatCapacity.kt         | 2 +-
 .../temperature/convertFromThermalResistanceAndPower.kt         | 2 +-
 .../commonMain/kotlin/converter/temperature/convertToEnergy.kt  | 2 +-
 .../commonMain/kotlin/converter/temperature/convertToPower.kt   | 2 +-
 .../kotlin/converter/temperature/convertToSpecificEnergy.kt     | 2 +-
 .../kotlin/converter/temperature/convertToThermalResistance.kt  | 2 +-
 .../thermalResistance/convertFromTemperatureAndPower.kt         | 2 +-
 .../kotlin/converter/thermalResistance/convertToTemperature.kt  | 2 +-
 .../kotlin/converter/time/convertFromAccelerationAndJolt.kt     | 2 +-
 .../kotlin/converter/time/convertFromActionAndEnergy.kt         | 2 +-
 .../time/convertFromAmountOfSubstanceAndCatalysticActivity.kt   | 2 +-
 .../kotlin/converter/time/convertFromAngleAndAngularVelocity.kt | 2 +-
 .../converter/time/convertFromAngularVelocityAndAcceleration.kt | 2 +-
 .../kotlin/converter/time/convertFromChargeAndCurrent.kt        | 2 +-
 .../converter/time/convertFromDynamicViscosityAndPressure.kt    | 2 +-
 .../time/convertFromElectricCapacitanceAndResistance.kt         | 2 +-
 .../time/convertFromElectricInductanceAndResistance.kt          | 2 +-
 .../kotlin/converter/time/convertFromEnergyAndPower.kt          | 2 +-
 .../commonMain/kotlin/converter/time/convertFromForceAndYank.kt | 2 +-
 .../commonMain/kotlin/converter/time/convertFromFrequency.kt    | 2 +-
 .../kotlin/converter/time/convertFromLengthAndSpeed.kt          | 2 +-
 .../converter/time/convertFromLuminousEnergyAndLuminousFlux.kt  | 2 +-
 .../converter/time/convertFromLuminousExposureAndIlluminance.kt | 2 +-
 .../kotlin/converter/time/convertFromMagneticFluxAndVoltage.kt  | 2 +-
 .../kotlin/converter/time/convertFromRadioactivity.kt           | 2 +-
 .../kotlin/converter/time/convertFromSpeedAndAcceleration.kt    | 2 +-
 .../kotlin/converter/time/convertFromWeightAndMassFlowRate.kt   | 2 +-
 .../commonMain/kotlin/converter/time/convertToAcceleration.kt   | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToAction.kt     | 2 +-
 .../kotlin/converter/time/convertToAmountOfSubstance.kt         | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToAngle.kt      | 2 +-
 .../kotlin/converter/time/convertToAngularVelocity.kt           | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToDecimal.kt    | 2 +-
 .../kotlin/converter/time/convertToDynamicViscosity.kt          | 2 +-
 .../kotlin/converter/time/convertToElectricCapacitance.kt       | 2 +-
 .../commonMain/kotlin/converter/time/convertToElectricCharge.kt | 2 +-
 .../kotlin/converter/time/convertToElectricInductance.kt        | 2 +-
 .../kotlin/converter/time/convertToElectricResistance.kt        | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToEnergy.kt     | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToForce.kt      | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToFrequency.kt  | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToLength.kt     | 2 +-
 .../commonMain/kotlin/converter/time/convertToLuminousEnergy.kt | 2 +-
 .../kotlin/converter/time/convertToLuminousExposure.kt          | 2 +-
 .../commonMain/kotlin/converter/time/convertToMagneticFlux.kt   | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToMomentum.kt   | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToSpeed.kt      | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToVolume.kt     | 2 +-
 .../src/commonMain/kotlin/converter/time/convertToWeight.kt     | 2 +-
 .../voltage/convertFromElectricChargeAndCapacitance.kt          | 2 +-
 .../voltage/convertFromElectricCurrentAndConductance.kt         | 2 +-
 .../voltage/convertFromElectricCurrentAndResistance.kt          | 2 +-
 .../converter/voltage/convertFromEnergyAndElectricCharge.kt     | 2 +-
 .../kotlin/converter/voltage/convertFromMagneticFluxAndTime.kt  | 2 +-
 .../converter/voltage/convertFromPowerAndElectricCurrent.kt     | 2 +-
 .../kotlin/converter/voltage/convertToElectricCharge.kt         | 2 +-
 .../kotlin/converter/voltage/convertToElectricCurrent.kt        | 2 +-
 .../kotlin/converter/voltage/convertToElectricResistance.kt     | 2 +-
 .../src/commonMain/kotlin/converter/voltage/convertToEnergy.kt  | 2 +-
 .../kotlin/converter/voltage/convertToMagneticFlux.kt           | 2 +-
 .../src/commonMain/kotlin/converter/voltage/convertToPower.kt   | 2 +-
 .../converter/volume/convertFromAmountOfSubstanceAndMolarity.kt | 2 +-
 .../kotlin/converter/volume/convertFromAreaAndLength.kt         | 2 +-
 .../kotlin/converter/volume/convertFromEnergyAndPressure.kt     | 2 +-
 .../volume/convertFromMolarVolumeAndAmountOfSubstance.kt        | 2 +-
 .../converter/volume/convertFromSpecificVolumeAndWeight.kt      | 2 +-
 .../kotlin/converter/volume/convertFromVolumetricFlowAndTime.kt | 2 +-
 .../kotlin/converter/volume/convertFromWeightAndDensity.kt      | 2 +-
 .../kotlin/converter/volume/convertToAmountOfSubstance.kt       | 2 +-
 .../src/commonMain/kotlin/converter/volume/convertToArea.kt     | 2 +-
 .../src/commonMain/kotlin/converter/volume/convertToEnergy.kt   | 2 +-
 .../src/commonMain/kotlin/converter/volume/convertToLength.kt   | 2 +-
 .../commonMain/kotlin/converter/volume/convertToMolarVolume.kt  | 2 +-
 .../kotlin/converter/volume/convertToSpecificVolume.kt          | 2 +-
 .../src/commonMain/kotlin/converter/volume/convertToWeight.kt   | 2 +-
 .../kotlin/converter/volumetricFlow/convertFromVolumeAndTime.kt | 2 +-
 .../volumetricFlow/convertFromVolumetricFluxAndArea.kt          | 2 +-
 .../commonMain/kotlin/converter/volumetricFlow/convertToArea.kt | 2 +-
 .../kotlin/converter/volumetricFlow/convertToVolumetricFlux.kt  | 2 +-
 .../volumetricFlux/convertFromVolumetricFlowAndArea.kt          | 2 +-
 .../kotlin/converter/volumetricFlux/convertToVolumetricFlow.kt  | 2 +-
 .../converter/weight/convertFromAmountOfSubstanceAndMolality.kt | 2 +-
 .../kotlin/converter/weight/convertFromAreaDensityAndArea.kt    | 2 +-
 .../kotlin/converter/weight/convertFromDensityAndVolume.kt      | 2 +-
 .../weight/convertFromEnergyAndIonizingRadiationAbsorbedDose.kt | 2 +-
 .../convertFromEnergyAndIonizingRadiationEquivalentDose.kt      | 2 +-
 .../converter/weight/convertFromEnergyAndSpecificEnergy.kt      | 2 +-
 .../kotlin/converter/weight/convertFromForceAndAcceleration.kt  | 2 +-
 .../weight/convertFromHeatCapacityAndSpecificHeatCapacity.kt    | 2 +-
 .../converter/weight/convertFromLinearMassDensityAndLength.kt   | 2 +-
 .../kotlin/converter/weight/convertFromMassFlowRateAndTime.kt   | 2 +-
 .../weight/convertFromMolarMassAndAmountOfSubstance.kt          | 2 +-
 .../kotlin/converter/weight/convertFromMomentumAndSpeed.kt      | 2 +-
 .../converter/weight/convertFromVolumeAndSpecificVolume.kt      | 2 +-
 .../kotlin/converter/weight/convertFromYankAndJolt.kt           | 2 +-
 .../kotlin/converter/weight/convertToAmountOfSubstance.kt       | 2 +-
 .../src/commonMain/kotlin/converter/weight/convertToArea.kt     | 2 +-
 .../commonMain/kotlin/converter/weight/convertToAreaDensity.kt  | 2 +-
 .../src/commonMain/kotlin/converter/weight/convertToDensity.kt  | 2 +-
 .../src/commonMain/kotlin/converter/weight/convertToEnergy.kt   | 2 +-
 .../src/commonMain/kotlin/converter/weight/convertToForce.kt    | 2 +-
 .../commonMain/kotlin/converter/weight/convertToHeatCapacity.kt | 2 +-
 .../src/commonMain/kotlin/converter/weight/convertToLength.kt   | 2 +-
 .../kotlin/converter/weight/convertToLinearMassDensity.kt       | 2 +-
 .../commonMain/kotlin/converter/weight/convertToMassFlowRate.kt | 2 +-
 .../commonMain/kotlin/converter/weight/convertToMolarMass.kt    | 2 +-
 .../src/commonMain/kotlin/converter/weight/convertToMomentum.kt | 2 +-
 .../src/commonMain/kotlin/converter/weight/convertToTime.kt     | 2 +-
 .../src/commonMain/kotlin/converter/weight/convertToVolume.kt   | 2 +-
 .../src/commonMain/kotlin/converter/weight/convertToYank.kt     | 2 +-
 .../commonMain/kotlin/converter/yank/convertFromForceAndTime.kt | 2 +-
 .../commonMain/kotlin/converter/yank/convertFromMassAndJolt.kt  | 2 +-
 .../src/commonMain/kotlin/converter/yank/convertToForce.kt      | 2 +-
 .../src/commonMain/kotlin/converter/yank/convertToJolt.kt       | 2 +-
 .../src/commonMain/kotlin/converter/yank/convertToWeight.kt     | 2 +-
 scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt       | 2 +-
 scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt    | 2 +-
 scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt        | 2 +-
 scientific/src/commonMain/kotlin/unit/AreaUnit.kt               | 2 +-
 scientific/src/commonMain/kotlin/unit/DensityUnit.kt            | 2 +-
 scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt   | 2 +-
 scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt     | 2 +-
 scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt | 2 +-
 scientific/src/commonMain/kotlin/unit/EnergyUnit.kt             | 2 +-
 scientific/src/commonMain/kotlin/unit/ForceUnit.kt              | 2 +-
 scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt          | 2 +-
 .../commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt | 2 +-
 .../kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt          | 2 +-
 scientific/src/commonMain/kotlin/unit/JoltUnit.kt               | 2 +-
 scientific/src/commonMain/kotlin/unit/LengthUnit.kt             | 2 +-
 scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt          | 2 +-
 scientific/src/commonMain/kotlin/unit/LuminousEnergyUnit.kt     | 2 +-
 scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt  | 2 +-
 scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt      | 2 +-
 scientific/src/commonMain/kotlin/unit/MolalityUnit.kt           | 2 +-
 scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt          | 2 +-
 scientific/src/commonMain/kotlin/unit/MomentumUnit.kt           | 2 +-
 scientific/src/commonMain/kotlin/unit/PowerUnit.kt              | 2 +-
 scientific/src/commonMain/kotlin/unit/PressureUnit.kt           | 2 +-
 scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt      | 2 +-
 scientific/src/commonMain/kotlin/unit/ScientificUnit.kt         | 2 +-
 scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt         | 2 +-
 scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt     | 2 +-
 .../src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt      | 2 +-
 scientific/src/commonMain/kotlin/unit/SpeedUnit.kt              | 2 +-
 scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt     | 2 +-
 scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt        | 2 +-
 scientific/src/commonMain/kotlin/unit/TimeUnit.kt               | 2 +-
 scientific/src/commonMain/kotlin/unit/VolumeUnit.kt             | 2 +-
 scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt     | 2 +-
 scientific/src/commonMain/kotlin/unit/WeightUnit.kt             | 2 +-
 scientific/src/commonTest/kotlin/ScientificArrayTest.kt         | 2 +-
 scientific/src/commonTest/kotlin/ScientificValueTest.kt         | 2 +-
 scientific/src/commonTest/kotlin/Utils.kt                       | 2 +-
 scientific/src/commonTest/kotlin/unit/AccelerationUnitTest.kt   | 2 +-
 scientific/src/commonTest/kotlin/unit/ActionUnitTest.kt         | 2 +-
 .../src/commonTest/kotlin/unit/AmountOfSubstanceUnitTest.kt     | 2 +-
 scientific/src/commonTest/kotlin/unit/AngleUnitTest.kt          | 2 +-
 .../src/commonTest/kotlin/unit/AngularAccelerationUnitTest.kt   | 2 +-
 .../src/commonTest/kotlin/unit/AngularVelocityUnitTest.kt       | 2 +-
 scientific/src/commonTest/kotlin/unit/AreaDensityUnitTest.kt    | 2 +-
 scientific/src/commonTest/kotlin/unit/AreaUnitTest.kt           | 2 +-
 .../src/commonTest/kotlin/unit/CatalysticActivityUnitTest.kt    | 2 +-
 scientific/src/commonTest/kotlin/unit/DensityUnitTest.kt        | 2 +-
 scientific/src/commonTest/kotlin/unit/DynamicViscosityTest.kt   | 2 +-
 .../src/commonTest/kotlin/unit/ElectricCapacitanceUnitTest.kt   | 2 +-
 scientific/src/commonTest/kotlin/unit/ElectricChargeUnitTest.kt | 2 +-
 .../src/commonTest/kotlin/unit/ElectricConductanceUnitTest.kt   | 2 +-
 .../src/commonTest/kotlin/unit/ElectricCurrentUnitTest.kt       | 2 +-
 .../src/commonTest/kotlin/unit/ElectricInductanceUnitTest.kt    | 2 +-
 .../src/commonTest/kotlin/unit/ElectricResistanceUnitTest.kt    | 2 +-
 scientific/src/commonTest/kotlin/unit/EnergyUnitTest.kt         | 2 +-
 scientific/src/commonTest/kotlin/unit/ForceUnitTest.kt          | 2 +-
 scientific/src/commonTest/kotlin/unit/FrequencyUnitTest.kt      | 2 +-
 scientific/src/commonTest/kotlin/unit/HeatCapacityUnitTest.kt   | 2 +-
 scientific/src/commonTest/kotlin/unit/IlluminanceUnitTest.kt    | 2 +-
 .../kotlin/unit/IonizingRadiationAbsorbedDoseUnitTest.kt        | 2 +-
 .../kotlin/unit/IonizingRadiationEquivalentDoseUnitTest.kt      | 2 +-
 scientific/src/commonTest/kotlin/unit/JoltUnitTest.kt           | 2 +-
 scientific/src/commonTest/kotlin/unit/LengthUnitTest.kt         | 2 +-
 .../src/commonTest/kotlin/unit/LinearMassDensityUnitTest.kt     | 2 +-
 scientific/src/commonTest/kotlin/unit/LuminanceUnitTest.kt      | 2 +-
 scientific/src/commonTest/kotlin/unit/LuminousEnergyUnitTest.kt | 2 +-
 .../src/commonTest/kotlin/unit/LuminousExposureUnitTest.kt      | 2 +-
 scientific/src/commonTest/kotlin/unit/LuminusFluxUnitTest.kt    | 2 +-
 .../src/commonTest/kotlin/unit/LuminusIntensityUnitTest.kt      | 2 +-
 scientific/src/commonTest/kotlin/unit/MagneticFluxUnitTest.kt   | 2 +-
 .../src/commonTest/kotlin/unit/MagneticInductionUnitTest.kt     | 2 +-
 scientific/src/commonTest/kotlin/unit/MassFlowRateUnitTest.kt   | 2 +-
 scientific/src/commonTest/kotlin/unit/MolalityUnitTest.kt       | 2 +-
 scientific/src/commonTest/kotlin/unit/MolarEnergyUnitTest.kt    | 2 +-
 scientific/src/commonTest/kotlin/unit/MolarMassUnitTest.kt      | 2 +-
 scientific/src/commonTest/kotlin/unit/MolarVolumeUnitTest.kt    | 2 +-
 scientific/src/commonTest/kotlin/unit/MolarityUnitTest.kt       | 2 +-
 scientific/src/commonTest/kotlin/unit/MomentumUnitTest.kt       | 2 +-
 scientific/src/commonTest/kotlin/unit/PowerUnitTest.kt          | 2 +-
 scientific/src/commonTest/kotlin/unit/PressureUnitTest.kt       | 2 +-
 scientific/src/commonTest/kotlin/unit/RadioActivityUnitTest.kt  | 2 +-
 scientific/src/commonTest/kotlin/unit/ScientificUnitTest.kt     | 2 +-
 scientific/src/commonTest/kotlin/unit/SolidAngleUnitTest.kt     | 2 +-
 scientific/src/commonTest/kotlin/unit/SpecificEnergyUnitTest.kt | 2 +-
 .../src/commonTest/kotlin/unit/SpecificHeatCapacityUnitTest.kt  | 2 +-
 scientific/src/commonTest/kotlin/unit/SpecificVolumeUnitTest.kt | 2 +-
 scientific/src/commonTest/kotlin/unit/SpeedUnitTest.kt          | 2 +-
 scientific/src/commonTest/kotlin/unit/SurfaceTensionUnitTest.kt | 2 +-
 scientific/src/commonTest/kotlin/unit/TemperatureUnitTest.kt    | 2 +-
 .../src/commonTest/kotlin/unit/ThermalResistanceUnitTest.kt     | 2 +-
 scientific/src/commonTest/kotlin/unit/TimeUnitTest.kt           | 2 +-
 scientific/src/commonTest/kotlin/unit/VoltageUnitTest.kt        | 2 +-
 scientific/src/commonTest/kotlin/unit/VolumeUnitTest.kt         | 2 +-
 scientific/src/commonTest/kotlin/unit/VolumetricFlowUnitTest.kt | 2 +-
 scientific/src/commonTest/kotlin/unit/VolumetricFluxUnitTest.kt | 2 +-
 scientific/src/commonTest/kotlin/unit/WeightUnitTest.kt         | 2 +-
 scientific/src/commonTest/kotlin/unit/YankUnitTest.kt           | 2 +-
 .../src/commonTest/kotlin/unit/assertScientificConversion.kt    | 2 +-
 test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt      | 2 +-
 test-utils-base/src/commonMain/kotlin/BaseTest.kt               | 2 +-
 test-utils-base/src/commonMain/kotlin/FlowTest.kt               | 2 +-
 test-utils-base/src/commonMain/kotlin/flowExtensions.kt         | 2 +-
 .../src/commonMain/kotlin/testBlockingAndCancelScope.kt         | 2 +-
 test-utils-base/src/commonTest/kotlin/SimpleFlowTestTest.kt     | 2 +-
 .../src/commonTest/kotlin/TestBlockingAndCancelScopeTest.kt     | 2 +-
 test-utils-base/src/iosMain/kotlin/BaseTest.kt                  | 2 +-
 test-utils-base/src/jsMain/kotlin/BaseTest.kt                   | 2 +-
 test-utils-base/src/jvmMain/kotlin/BaseTest.kt                  | 2 +-
 .../src/commonMain/kotlin/device/MockAdvertisementData.kt       | 2 +-
 .../src/commonMain/kotlin/device/MockDeviceConnectionManager.kt | 2 +-
 .../src/commonMain/kotlin/scanner/MockScanner.kt                | 2 +-
 946 files changed, 946 insertions(+), 946 deletions(-)

diff --git a/NOTICE b/NOTICE
index f293bc349..ea4b7d28d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/alerts/src/androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt b/alerts/src/androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt
index 83304e37d..b015be281 100644
--- a/alerts/src/androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt
+++ b/alerts/src/androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
index 6d6043ec4..4e37a257b 100644
--- a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/alerts/src/commonMain/kotlin/Alerts.kt b/alerts/src/commonMain/kotlin/Alerts.kt
index 4b7f08b73..33e2d2b7c 100644
--- a/alerts/src/commonMain/kotlin/Alerts.kt
+++ b/alerts/src/commonMain/kotlin/Alerts.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/alerts/src/iosMain/kotlin/AlertPresenter.kt b/alerts/src/iosMain/kotlin/AlertPresenter.kt
index 3d87fd164..b416c4187 100644
--- a/alerts/src/iosMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/iosMain/kotlin/AlertPresenter.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/alerts/src/jsMain/kotlin/AlertPresenter.kt b/alerts/src/jsMain/kotlin/AlertPresenter.kt
index 281ff6107..8bc9a8f44 100644
--- a/alerts/src/jsMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/jsMain/kotlin/AlertPresenter.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/alerts/src/jvmMain/kotlin/AlertPresenter.kt b/alerts/src/jvmMain/kotlin/AlertPresenter.kt
index 281ff6107..8bc9a8f44 100644
--- a/alerts/src/jvmMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/jvmMain/kotlin/AlertPresenter.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/architecture-compose/build.gradle.kts b/architecture-compose/build.gradle.kts
index 1b311bbdb..642dda560 100644
--- a/architecture-compose/build.gradle.kts
+++ b/architecture-compose/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture-compose/src/androidLibAndroidTest/AndroidManifest.xml b/architecture-compose/src/androidLibAndroidTest/AndroidManifest.xml
index 0fdb72725..1e3bb4393 100644
--- a/architecture-compose/src/androidLibAndroidTest/AndroidManifest.xml
+++ b/architecture-compose/src/androidLibAndroidTest/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2021 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/architecture-compose/src/androidLibMain/AndroidManifest.xml b/architecture-compose/src/androidLibMain/AndroidManifest.xml
index 79b11e3e0..7c0cc6dcc 100644
--- a/architecture-compose/src/androidLibMain/AndroidManifest.xml
+++ b/architecture-compose/src/androidLibMain/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2021 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt
index 9fc5507f0..8aab5cf6e 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt
index 2b6e6187b..7b6c4ac3c 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
index ef280330b..2de890d34 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/observables.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/observables.kt
index 80245f98f..df67ecff3 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/observables.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/observables.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
index f5081da69..c9e3187f2 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture-compose/src/androidLibUnitTest/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt b/architecture-compose/src/androidLibUnitTest/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
index 04ea0fcd4..9c6bfb258 100644
--- a/architecture-compose/src/androidLibUnitTest/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
+++ b/architecture-compose/src/androidLibUnitTest/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibAndroidTest/kotlin/observation/ObservationLiveDataTest.kt b/architecture/src/androidLibAndroidTest/kotlin/observation/ObservationLiveDataTest.kt
index d4b65b4b4..cea65c88c 100644
--- a/architecture/src/androidLibAndroidTest/kotlin/observation/ObservationLiveDataTest.kt
+++ b/architecture/src/androidLibAndroidTest/kotlin/observation/ObservationLiveDataTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/androidLibMain/kotlin/observable/Observable.kt b/architecture/src/androidLibMain/kotlin/observable/Observable.kt
index 5b9cd7466..f31992501 100644
--- a/architecture/src/androidLibMain/kotlin/observable/Observable.kt
+++ b/architecture/src/androidLibMain/kotlin/observable/Observable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt b/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
index 36af6e5f1..df8acd897 100644
--- a/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
+++ b/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonMain/kotlin/observable/Observables.kt b/architecture/src/commonMain/kotlin/observable/Observables.kt
index aca239e07..1ee85834d 100644
--- a/architecture/src/commonMain/kotlin/observable/Observables.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observables.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonTest/kotlin/observable/FlowTest.kt b/architecture/src/commonTest/kotlin/observable/FlowTest.kt
index 2e7794b09..57c96d5c5 100644
--- a/architecture/src/commonTest/kotlin/observable/FlowTest.kt
+++ b/architecture/src/commonTest/kotlin/observable/FlowTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonTest/kotlin/observable/ReadOnlyPropertyTest.kt b/architecture/src/commonTest/kotlin/observable/ReadOnlyPropertyTest.kt
index 819542012..110cc34af 100644
--- a/architecture/src/commonTest/kotlin/observable/ReadOnlyPropertyTest.kt
+++ b/architecture/src/commonTest/kotlin/observable/ReadOnlyPropertyTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/commonTest/kotlin/observable/ReadWritePropertyTest.kt b/architecture/src/commonTest/kotlin/observable/ReadWritePropertyTest.kt
index 7e7942328..5508d04e2 100644
--- a/architecture/src/commonTest/kotlin/observable/ReadWritePropertyTest.kt
+++ b/architecture/src/commonTest/kotlin/observable/ReadWritePropertyTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/iosMain/kotlin/observable/Observable.kt b/architecture/src/iosMain/kotlin/observable/Observable.kt
index 2f38cd718..8baa31313 100644
--- a/architecture/src/iosMain/kotlin/observable/Observable.kt
+++ b/architecture/src/iosMain/kotlin/observable/Observable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt b/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
index ed34ed6a7..a69371f73 100644
--- a/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
+++ b/architecture/src/iosTest/kotlin/observable/ThreadingTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/jsMain/kotlin/observable/Observable.kt b/architecture/src/jsMain/kotlin/observable/Observable.kt
index 2f38cd718..8baa31313 100644
--- a/architecture/src/jsMain/kotlin/observable/Observable.kt
+++ b/architecture/src/jsMain/kotlin/observable/Observable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt
index 6c148fac3..c7da67726 100644
--- a/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/architecture/src/jvmMain/kotlin/observable/Observable.kt b/architecture/src/jvmMain/kotlin/observable/Observable.kt
index 2f38cd718..8baa31313 100644
--- a/architecture/src/jvmMain/kotlin/observable/Observable.kt
+++ b/architecture/src/jvmMain/kotlin/observable/Observable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt b/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt
index d2fac1aae..dbe2e686c 100644
--- a/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt
+++ b/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base-permissions/src/androidLibMain/kotlin/PermissionContext.kt b/base-permissions/src/androidLibMain/kotlin/PermissionContext.kt
index 20db9c6b2..112bb4bd4 100644
--- a/base-permissions/src/androidLibMain/kotlin/PermissionContext.kt
+++ b/base-permissions/src/androidLibMain/kotlin/PermissionContext.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base-permissions/src/androidLibMain/kotlin/PermissionsActivity.kt b/base-permissions/src/androidLibMain/kotlin/PermissionsActivity.kt
index 566fb70d2..a1d6f2838 100644
--- a/base-permissions/src/androidLibMain/kotlin/PermissionsActivity.kt
+++ b/base-permissions/src/androidLibMain/kotlin/PermissionsActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base-permissions/src/commonMain/kotlin/PermissionManager.kt b/base-permissions/src/commonMain/kotlin/PermissionManager.kt
index 47802223b..ff02c4d3d 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionManager.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionManager.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base-permissions/src/commonMain/kotlin/PermissionState.kt b/base-permissions/src/commonMain/kotlin/PermissionState.kt
index 42fcfd95e..711a72f80 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionState.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionState.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt b/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt
index 731ee75a8..6a9c284a1 100644
--- a/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt
+++ b/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base-permissions/src/iosMain/kotlin/PermissionContext.kt b/base-permissions/src/iosMain/kotlin/PermissionContext.kt
index 83e52b0b7..8afc58a8e 100644
--- a/base-permissions/src/iosMain/kotlin/PermissionContext.kt
+++ b/base-permissions/src/iosMain/kotlin/PermissionContext.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base-permissions/src/jsMain/kotlin/PermissionContext.kt b/base-permissions/src/jsMain/kotlin/PermissionContext.kt
index c188d62f5..c40eadaa9 100644
--- a/base-permissions/src/jsMain/kotlin/PermissionContext.kt
+++ b/base-permissions/src/jsMain/kotlin/PermissionContext.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base-permissions/src/jvmMain/kotlin/PermissionContext.kt b/base-permissions/src/jvmMain/kotlin/PermissionContext.kt
index c188d62f5..c40eadaa9 100644
--- a/base-permissions/src/jvmMain/kotlin/PermissionContext.kt
+++ b/base-permissions/src/jvmMain/kotlin/PermissionContext.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibMain/kotlin/ApplicationHolder.kt b/base/src/androidLibMain/kotlin/ApplicationHolder.kt
index 0e6085bc4..7df656670 100644
--- a/base/src/androidLibMain/kotlin/ApplicationHolder.kt
+++ b/base/src/androidLibMain/kotlin/ApplicationHolder.kt
@@ -5,7 +5,7 @@ import android.content.Context
 
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibMain/kotlin/MainQueueDispatcher.kt b/base/src/androidLibMain/kotlin/MainQueueDispatcher.kt
index 3f063486b..14c9cb9ef 100644
--- a/base/src/androidLibMain/kotlin/MainQueueDispatcher.kt
+++ b/base/src/androidLibMain/kotlin/MainQueueDispatcher.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.Dispatchers
 
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibMain/kotlin/runBlocking.kt b/base/src/androidLibMain/kotlin/runBlocking.kt
index 48432a4d5..e105e89c2 100644
--- a/base/src/androidLibMain/kotlin/runBlocking.kt
+++ b/base/src/androidLibMain/kotlin/runBlocking.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibMain/kotlin/runOnMain.kt b/base/src/androidLibMain/kotlin/runOnMain.kt
index 79ef71938..a7634e1ee 100644
--- a/base/src/androidLibMain/kotlin/runOnMain.kt
+++ b/base/src/androidLibMain/kotlin/runOnMain.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibMain/kotlin/utils/Decimal.kt b/base/src/androidLibMain/kotlin/utils/Decimal.kt
index 732fdf518..b1cbbbf4d 100644
--- a/base/src/androidLibMain/kotlin/utils/Decimal.kt
+++ b/base/src/androidLibMain/kotlin/utils/Decimal.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/androidLibMain/kotlin/utils/Serializable.kt b/base/src/androidLibMain/kotlin/utils/Serializable.kt
index de9021637..3a6850f11 100644
--- a/base/src/androidLibMain/kotlin/utils/Serializable.kt
+++ b/base/src/androidLibMain/kotlin/utils/Serializable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/MainQueueDispatcher.kt b/base/src/commonMain/kotlin/MainQueueDispatcher.kt
index f3778b960..ef850d5a8 100644
--- a/base/src/commonMain/kotlin/MainQueueDispatcher.kt
+++ b/base/src/commonMain/kotlin/MainQueueDispatcher.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/flow/BaseFlowable.kt b/base/src/commonMain/kotlin/flow/BaseFlowable.kt
index 058f9a482..bb838f26f 100644
--- a/base/src/commonMain/kotlin/flow/BaseFlowable.kt
+++ b/base/src/commonMain/kotlin/flow/BaseFlowable.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/flow/FlowConfig.kt b/base/src/commonMain/kotlin/flow/FlowConfig.kt
index 9e9b93ed6..4c455898e 100644
--- a/base/src/commonMain/kotlin/flow/FlowConfig.kt
+++ b/base/src/commonMain/kotlin/flow/FlowConfig.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/flow/Flowable.kt b/base/src/commonMain/kotlin/flow/Flowable.kt
index d12b26a7b..dcf9bd69f 100644
--- a/base/src/commonMain/kotlin/flow/Flowable.kt
+++ b/base/src/commonMain/kotlin/flow/Flowable.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/flow/flow.kt b/base/src/commonMain/kotlin/flow/flow.kt
index 8544cd0c4..a3678558f 100644
--- a/base/src/commonMain/kotlin/flow/flow.kt
+++ b/base/src/commonMain/kotlin/flow/flow.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/monitor/ServiceMonitor.kt b/base/src/commonMain/kotlin/monitor/ServiceMonitor.kt
index c214f274a..3f317f96a 100644
--- a/base/src/commonMain/kotlin/monitor/ServiceMonitor.kt
+++ b/base/src/commonMain/kotlin/monitor/ServiceMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/runBlocking.kt b/base/src/commonMain/kotlin/runBlocking.kt
index cc9d044af..354a69a69 100644
--- a/base/src/commonMain/kotlin/runBlocking.kt
+++ b/base/src/commonMain/kotlin/runBlocking.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/runOnMain.kt b/base/src/commonMain/kotlin/runOnMain.kt
index 1455cc23f..056f78108 100644
--- a/base/src/commonMain/kotlin/runOnMain.kt
+++ b/base/src/commonMain/kotlin/runOnMain.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/state/KalugaState.kt b/base/src/commonMain/kotlin/state/KalugaState.kt
index 5633e7bce..fca9bd1c1 100644
--- a/base/src/commonMain/kotlin/state/KalugaState.kt
+++ b/base/src/commonMain/kotlin/state/KalugaState.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/ApplyIf.kt b/base/src/commonMain/kotlin/utils/ApplyIf.kt
index 1148599e1..7f72cd789 100644
--- a/base/src/commonMain/kotlin/utils/ApplyIf.kt
+++ b/base/src/commonMain/kotlin/utils/ApplyIf.kt
@@ -1,7 +1,7 @@
 package com.splendo.kaluga.base.utils
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/ContainsAny.kt b/base/src/commonMain/kotlin/utils/ContainsAny.kt
index f9b350f79..298d19f70 100644
--- a/base/src/commonMain/kotlin/utils/ContainsAny.kt
+++ b/base/src/commonMain/kotlin/utils/ContainsAny.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index 07c2dc9fd..441209404 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt b/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt
index cdfdd6936..2c461ba6c 100644
--- a/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt
+++ b/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt
@@ -1,7 +1,7 @@
 package com.splendo.kaluga.base.utils
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/Enum+byOrdinalOrDefault.kt b/base/src/commonMain/kotlin/utils/Enum+byOrdinalOrDefault.kt
index 011e1ae58..b3e10973a 100644
--- a/base/src/commonMain/kotlin/utils/Enum+byOrdinalOrDefault.kt
+++ b/base/src/commonMain/kotlin/utils/Enum+byOrdinalOrDefault.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/Int.kt b/base/src/commonMain/kotlin/utils/Int.kt
index 6a8e31816..aa7a8389e 100644
--- a/base/src/commonMain/kotlin/utils/Int.kt
+++ b/base/src/commonMain/kotlin/utils/Int.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/Serializable.kt b/base/src/commonMain/kotlin/utils/Serializable.kt
index 55a341add..0dde0e837 100644
--- a/base/src/commonMain/kotlin/utils/Serializable.kt
+++ b/base/src/commonMain/kotlin/utils/Serializable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonMain/kotlin/utils/firstInstance.kt b/base/src/commonMain/kotlin/utils/firstInstance.kt
index 1e3545366..66bc9fd05 100644
--- a/base/src/commonMain/kotlin/utils/firstInstance.kt
+++ b/base/src/commonMain/kotlin/utils/firstInstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt b/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt
index bafdacd9b..ac886593c 100644
--- a/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt
+++ b/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt b/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt
index 7c3ba8237..5305b0e04 100644
--- a/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt b/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
index aebb851d1..416bdef64 100644
--- a/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/state/ReplayBufferStateRepoTest.kt b/base/src/commonTest/kotlin/state/ReplayBufferStateRepoTest.kt
index 66e963d4f..43461babd 100644
--- a/base/src/commonTest/kotlin/state/ReplayBufferStateRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/ReplayBufferStateRepoTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/state/StateRepoTest.kt b/base/src/commonTest/kotlin/state/StateRepoTest.kt
index 242e43c58..20cadc895 100644
--- a/base/src/commonTest/kotlin/state/StateRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/StateRepoTest.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/utils/ByteUtilsTest.kt b/base/src/commonTest/kotlin/utils/ByteUtilsTest.kt
index d2f7d447f..c53e463cd 100644
--- a/base/src/commonTest/kotlin/utils/ByteUtilsTest.kt
+++ b/base/src/commonTest/kotlin/utils/ByteUtilsTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/utils/ContainsAnyTests.kt b/base/src/commonTest/kotlin/utils/ContainsAnyTests.kt
index ad9346054..aaac133de 100644
--- a/base/src/commonTest/kotlin/utils/ContainsAnyTests.kt
+++ b/base/src/commonTest/kotlin/utils/ContainsAnyTests.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/commonTest/kotlin/utils/DecimalTest.kt b/base/src/commonTest/kotlin/utils/DecimalTest.kt
index 720956b50..946202699 100644
--- a/base/src/commonTest/kotlin/utils/DecimalTest.kt
+++ b/base/src/commonTest/kotlin/utils/DecimalTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/MainQueueDispatcher.kt b/base/src/iosMain/kotlin/MainQueueDispatcher.kt
index 4208b1d77..3be2ea83d 100644
--- a/base/src/iosMain/kotlin/MainQueueDispatcher.kt
+++ b/base/src/iosMain/kotlin/MainQueueDispatcher.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/runBlocking.kt b/base/src/iosMain/kotlin/runBlocking.kt
index 48432a4d5..e105e89c2 100644
--- a/base/src/iosMain/kotlin/runBlocking.kt
+++ b/base/src/iosMain/kotlin/runBlocking.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/runOnMain.kt b/base/src/iosMain/kotlin/runOnMain.kt
index 4d6398806..4cb51e67f 100644
--- a/base/src/iosMain/kotlin/runOnMain.kt
+++ b/base/src/iosMain/kotlin/runOnMain.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/utils/Decimal.kt b/base/src/iosMain/kotlin/utils/Decimal.kt
index 390c81689..495c7be5d 100644
--- a/base/src/iosMain/kotlin/utils/Decimal.kt
+++ b/base/src/iosMain/kotlin/utils/Decimal.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/iosMain/kotlin/utils/Serializable.kt b/base/src/iosMain/kotlin/utils/Serializable.kt
index c82490695..f44b6e8d2 100644
--- a/base/src/iosMain/kotlin/utils/Serializable.kt
+++ b/base/src/iosMain/kotlin/utils/Serializable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jsMain/kotlin/MainQueueDispatcher.kt b/base/src/jsMain/kotlin/MainQueueDispatcher.kt
index dbbf2a9d6..c1509f5ab 100644
--- a/base/src/jsMain/kotlin/MainQueueDispatcher.kt
+++ b/base/src/jsMain/kotlin/MainQueueDispatcher.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.Dispatchers
 
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/jsMain/kotlin/runBlocking.kt b/base/src/jsMain/kotlin/runBlocking.kt
index 9d24e64c1..50a475b61 100644
--- a/base/src/jsMain/kotlin/runBlocking.kt
+++ b/base/src/jsMain/kotlin/runBlocking.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/jsMain/kotlin/runOnMain.kt b/base/src/jsMain/kotlin/runOnMain.kt
index fe3f9e5de..185d51cc7 100644
--- a/base/src/jsMain/kotlin/runOnMain.kt
+++ b/base/src/jsMain/kotlin/runOnMain.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/jsMain/kotlin/utils/BigDecimal.kt b/base/src/jsMain/kotlin/utils/BigDecimal.kt
index cea0c6dd6..72aee66fe 100644
--- a/base/src/jsMain/kotlin/utils/BigDecimal.kt
+++ b/base/src/jsMain/kotlin/utils/BigDecimal.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index 9a7e6e606..e7d463575 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jsMain/kotlin/utils/Serializable.kt b/base/src/jsMain/kotlin/utils/Serializable.kt
index c82490695..f44b6e8d2 100644
--- a/base/src/jsMain/kotlin/utils/Serializable.kt
+++ b/base/src/jsMain/kotlin/utils/Serializable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jvmMain/kotlin/MainQueueDispatcher.kt b/base/src/jvmMain/kotlin/MainQueueDispatcher.kt
index dbbf2a9d6..c1509f5ab 100644
--- a/base/src/jvmMain/kotlin/MainQueueDispatcher.kt
+++ b/base/src/jvmMain/kotlin/MainQueueDispatcher.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.Dispatchers
 
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/jvmMain/kotlin/runBlocking.kt b/base/src/jvmMain/kotlin/runBlocking.kt
index 48432a4d5..e105e89c2 100644
--- a/base/src/jvmMain/kotlin/runBlocking.kt
+++ b/base/src/jvmMain/kotlin/runBlocking.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/jvmMain/kotlin/runOnMain.kt b/base/src/jvmMain/kotlin/runOnMain.kt
index 58e7d31a8..7fcd861e0 100644
--- a/base/src/jvmMain/kotlin/runOnMain.kt
+++ b/base/src/jvmMain/kotlin/runOnMain.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/base/src/jvmMain/kotlin/utils/Decimal.kt b/base/src/jvmMain/kotlin/utils/Decimal.kt
index 0badee944..107ebb991 100644
--- a/base/src/jvmMain/kotlin/utils/Decimal.kt
+++ b/base/src/jvmMain/kotlin/utils/Decimal.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/base/src/jvmMain/kotlin/utils/Serializable.kt b/base/src/jvmMain/kotlin/utils/Serializable.kt
index 42f85652e..796d53d9d 100644
--- a/base/src/jvmMain/kotlin/utils/Serializable.kt
+++ b/base/src/jvmMain/kotlin/utils/Serializable.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/beacons/src/androidLibAndroidTest/kotlin/TestActivity.kt b/beacons/src/androidLibAndroidTest/kotlin/TestActivity.kt
index 18d1b02a6..a1b157170 100644
--- a/beacons/src/androidLibAndroidTest/kotlin/TestActivity.kt
+++ b/beacons/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/beacons/src/commonTest/kotlin/BeaconDiscoveredTest.kt b/beacons/src/commonTest/kotlin/BeaconDiscoveredTest.kt
index e3d20f938..9a7d74eed 100644
--- a/beacons/src/commonTest/kotlin/BeaconDiscoveredTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconDiscoveredTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/beacons/src/commonTest/kotlin/BeaconFlowTest.kt b/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
index 474c989b5..7ab6816d6 100644
--- a/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/beacons/src/commonTest/kotlin/BeaconLostTest.kt b/beacons/src/commonTest/kotlin/BeaconLostTest.kt
index d3aa02703..6e2f8ec5c 100644
--- a/beacons/src/commonTest/kotlin/BeaconLostTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconLostTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/beacons/src/commonTest/kotlin/BeaconMock.kt b/beacons/src/commonTest/kotlin/BeaconMock.kt
index f280bf15e..706ef6633 100644
--- a/beacons/src/commonTest/kotlin/BeaconMock.kt
+++ b/beacons/src/commonTest/kotlin/BeaconMock.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/beacons/src/commonTest/kotlin/BeaconUpdateTest.kt b/beacons/src/commonTest/kotlin/BeaconUpdateTest.kt
index dc5624417..a7ead5986 100644
--- a/beacons/src/commonTest/kotlin/BeaconUpdateTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconUpdateTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/beacons/src/commonTest/kotlin/BluetoothMock.kt b/beacons/src/commonTest/kotlin/BluetoothMock.kt
index f9523c207..5f9424146 100644
--- a/beacons/src/commonTest/kotlin/BluetoothMock.kt
+++ b/beacons/src/commonTest/kotlin/BluetoothMock.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth-permissions/src/commonMain/kotlin/BluetoothPermission.kt b/bluetooth-permissions/src/commonMain/kotlin/BluetoothPermission.kt
index c8c647fbf..ac7a5b722 100644
--- a/bluetooth-permissions/src/commonMain/kotlin/BluetoothPermission.kt
+++ b/bluetooth-permissions/src/commonMain/kotlin/BluetoothPermission.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/bluetooth-permissions/src/iosMain/kotlin/BluetoothPermissionManager.kt b/bluetooth-permissions/src/iosMain/kotlin/BluetoothPermissionManager.kt
index 2d832bf02..53db7cbb6 100644
--- a/bluetooth-permissions/src/iosMain/kotlin/BluetoothPermissionManager.kt
+++ b/bluetooth-permissions/src/iosMain/kotlin/BluetoothPermissionManager.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/bluetooth-permissions/src/jvmMain/kotlin/BluetoothPermissionManager.kt b/bluetooth-permissions/src/jvmMain/kotlin/BluetoothPermissionManager.kt
index eaf233c84..1e60ef67e 100644
--- a/bluetooth-permissions/src/jvmMain/kotlin/BluetoothPermissionManager.kt
+++ b/bluetooth-permissions/src/jvmMain/kotlin/BluetoothPermissionManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt
index d184a75b6..c7995817b 100644
--- a/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/androidLibMain/kotlin/Value.kt b/bluetooth/src/androidLibMain/kotlin/Value.kt
index caaa6341d..194c95a27 100644
--- a/bluetooth/src/androidLibMain/kotlin/Value.kt
+++ b/bluetooth/src/androidLibMain/kotlin/Value.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt
index 7468a675d..588460e7e 100644
--- a/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonMain/kotlin/Value.kt b/bluetooth/src/commonMain/kotlin/Value.kt
index 922634526..f9893c06f 100644
--- a/bluetooth/src/commonMain/kotlin/Value.kt
+++ b/bluetooth/src/commonMain/kotlin/Value.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothAdvertisementTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothAdvertisementTest.kt
index ce9dcd530..e683c773a 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothAdvertisementTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothAdvertisementTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicNotificationTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicNotificationTest.kt
index 90d10b1c8..db1e5d3a3 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicNotificationTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicNotificationTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicTest.kt
index 996aa84da..a44902255 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicValueTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicValueTest.kt
index ac9ac6ad8..4750e619c 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicValueTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicValueTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicsTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicsTest.kt
index f9bb4f7b6..ca9a6ae82 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicsTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicsTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothDescriptorTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothDescriptorTest.kt
index c80c3b774..e5bd884b7 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothDescriptorTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothDescriptorTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothDescriptorValueTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothDescriptorValueTest.kt
index 03f0bae5f..e324d8afc 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothDescriptorValueTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothDescriptorValueTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothDescriptorsTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothDescriptorsTest.kt
index 9b260b1a1..0fae8b916 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothDescriptorsTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothDescriptorsTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothDeviceTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothDeviceTest.kt
index 34d357970..b08f72f2f 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothDeviceTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothDeviceTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothDevicesTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothDevicesTest.kt
index dfc0bfbde..10570421e 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothDevicesTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothDevicesTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothDistanceTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothDistanceTest.kt
index 5865f4e43..7a0bcddf1 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothDistanceTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothDistanceTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothPairedDevicesTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothPairedDevicesTest.kt
index 580349b3c..217ef62d0 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothPairedDevicesTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothPairedDevicesTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothRssiTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothRssiTest.kt
index 0c40df2d3..4c13ccd88 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothRssiTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothRssiTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothScanTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothScanTest.kt
index a4c9cf04e..2dc7618f5 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothScanTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothScanTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothServiceTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothServiceTest.kt
index b996b3b7c..12b2ae736 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothServiceTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothServiceTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothServicesTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothServicesTest.kt
index 8389cdf23..5ebe42275 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothServicesTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothServicesTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothUUIDTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothUUIDTest.kt
index c7faff167..9e13c605d 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothUUIDTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothUUIDTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/commonTest/kotlin/device/DeviceTest.kt b/bluetooth/src/commonTest/kotlin/device/DeviceTest.kt
index 016f8f8d4..782b4a5f5 100644
--- a/bluetooth/src/commonTest/kotlin/device/DeviceTest.kt
+++ b/bluetooth/src/commonTest/kotlin/device/DeviceTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
index 6b893a1b9..145db3b15 100644
--- a/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/iosMain/kotlin/Value.kt b/bluetooth/src/iosMain/kotlin/Value.kt
index 593b190fb..03e116da1 100644
--- a/bluetooth/src/iosMain/kotlin/Value.kt
+++ b/bluetooth/src/iosMain/kotlin/Value.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt
index ba3caf8fa..59f406826 100644
--- a/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/jsMain/kotlin/Value.kt b/bluetooth/src/jsMain/kotlin/Value.kt
index caaa6341d..194c95a27 100644
--- a/bluetooth/src/jsMain/kotlin/Value.kt
+++ b/bluetooth/src/jsMain/kotlin/Value.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/jsMain/kotlin/device/DeviceWrapper.kt b/bluetooth/src/jsMain/kotlin/device/DeviceWrapper.kt
index f26e83909..113003307 100644
--- a/bluetooth/src/jsMain/kotlin/device/DeviceWrapper.kt
+++ b/bluetooth/src/jsMain/kotlin/device/DeviceWrapper.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/jsMain/kotlin/wrappers.kt b/bluetooth/src/jsMain/kotlin/wrappers.kt
index c2113cc92..f625dbfa2 100644
--- a/bluetooth/src/jsMain/kotlin/wrappers.kt
+++ b/bluetooth/src/jsMain/kotlin/wrappers.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt
index ba3caf8fa..59f406826 100644
--- a/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/jvmMain/kotlin/Value.kt b/bluetooth/src/jvmMain/kotlin/Value.kt
index caaa6341d..194c95a27 100644
--- a/bluetooth/src/jvmMain/kotlin/Value.kt
+++ b/bluetooth/src/jvmMain/kotlin/Value.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/jvmMain/kotlin/device/DeviceWrapper.kt b/bluetooth/src/jvmMain/kotlin/device/DeviceWrapper.kt
index f26e83909..113003307 100644
--- a/bluetooth/src/jvmMain/kotlin/device/DeviceWrapper.kt
+++ b/bluetooth/src/jvmMain/kotlin/device/DeviceWrapper.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/bluetooth/src/jvmMain/kotlin/wrappers.kt b/bluetooth/src/jvmMain/kotlin/wrappers.kt
index c2113cc92..f625dbfa2 100644
--- a/bluetooth/src/jvmMain/kotlin/wrappers.kt
+++ b/bluetooth/src/jvmMain/kotlin/wrappers.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/convention-plugins/build.gradle.kts b/convention-plugins/build.gradle.kts
index 56578aa20..4855f3a85 100644
--- a/convention-plugins/build.gradle.kts
+++ b/convention-plugins/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/convention-plugins/src/main/kotlin/convention.publication.gradle.kts b/convention-plugins/src/main/kotlin/convention.publication.gradle.kts
index fabdd9335..6a902b94b 100644
--- a/convention-plugins/src/main/kotlin/convention.publication.gradle.kts
+++ b/convention-plugins/src/main/kotlin/convention.publication.gradle.kts
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/date-time-picker/src/androidLibAndroidTest/kotlin/AndroidDateTimePickerPresenterTest.kt b/date-time-picker/src/androidLibAndroidTest/kotlin/AndroidDateTimePickerPresenterTest.kt
index 6f996c5e4..01f68e4f7 100644
--- a/date-time-picker/src/androidLibAndroidTest/kotlin/AndroidDateTimePickerPresenterTest.kt
+++ b/date-time-picker/src/androidLibAndroidTest/kotlin/AndroidDateTimePickerPresenterTest.kt
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
index e7028e63d..be40262ff 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
index 3258a73c3..38ad6bb98 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt b/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt
index 7feda2432..72b5f7913 100644
--- a/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt
+++ b/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
index 3fa0df9a9..2145a4a03 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt b/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
index 49508dd50..4b3b334fe 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
index 292c65eba..9132c61e1 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
index ea9955a37..0520e4b2f 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
index 1802f310a..6b6656944 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
index 61461a3ac..879360e98 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
index 8415c1920..b4e3f51fa 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt b/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
index 025e57dea..f367f3c64 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
index 03f5616ee..15ffc09e7 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
index bb88136ad..485777505 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
index 00ce85ea7..1e6ea8bcf 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
index 61ba1731d..0ef45e6d2 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
index 7959af867..a8a03b3ac 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/BottomSheetActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/BottomSheetActivity.kt
index 88018c94d..9f9b90ab8 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/BottomSheetActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/BottomSheetActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt
index 2295d5e90..6e39059d1 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt
index d4831c087..eb7709a5b 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
index 99cbc0f99..60444ce59 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt
index c4ff4c8c6..1740c02dc 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt
index 8eeb466b7..e217f4693 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ContactsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ContactsActivity.kt
index 6cae19f6e..1533bfd85 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ContactsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ContactsActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt
index 5ddc05a5e..8d0b5b5e3 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt
index ecef2a853..6e73d12e3 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt
index 350fb5559..e482f6250 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt
index 7c4d7bf6a..37e501068 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
index 5f0d0f95d..9a38060f6 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Splendo Consulting B.V. The Netherlands
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
index c9e6138e8..105ffca09 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Splendo Consulting B.V. The Netherlands
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
index 43784f1b3..9addfb939 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Splendo Consulting B.V. The Netherlands
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
index d0ed42a86..293f385b3 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
index afb7a6d50..3535caea9 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt b/example/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt
index 4412a7e84..b7398e774 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Splendo Consulting B.V. The Netherlands
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/res/layout/activity_link.xml b/example/android/src/main/res/layout/activity_link.xml
index d5fecd2fd..99c88fc0b 100644
--- a/example/android/src/main/res/layout/activity_link.xml
+++ b/example/android/src/main/res/layout/activity_link.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2021 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/res/layout/activity_system.xml b/example/android/src/main/res/layout/activity_system.xml
index bf9c61779..bfd4af551 100644
--- a/example/android/src/main/res/layout/activity_system.xml
+++ b/example/android/src/main/res/layout/activity_system.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2021 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/res/layout/fragment_network.xml b/example/android/src/main/res/layout/fragment_network.xml
index f8beef0b6..35562c4b0 100644
--- a/example/android/src/main/res/layout/fragment_network.xml
+++ b/example/android/src/main/res/layout/fragment_network.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2021 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/example/android/src/main/res/values/dimens.xml b/example/android/src/main/res/values/dimens.xml
index 23b103234..7bcd2253b 100644
--- a/example/android/src/main/res/values/dimens.xml
+++ b/example/android/src/main/res/values/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2021 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Alerts/AlertsViewController.swift b/example/ios/Demo/Alerts/AlertsViewController.swift
index 44828430a..743ea8f06 100644
--- a/example/ios/Demo/Alerts/AlertsViewController.swift
+++ b/example/ios/Demo/Alerts/AlertsViewController.swift
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/AppDelegate.swift b/example/ios/Demo/AppDelegate.swift
index 95007e553..b1b416e18 100644
--- a/example/ios/Demo/AppDelegate.swift
+++ b/example/ios/Demo/AppDelegate.swift
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift b/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
index 2d0af6eca..577b793ef 100644
--- a/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Architecture/ArchitectureInputViewController.swift b/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
index b50c38538..d9762d316 100644
--- a/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Beacons/BeaconsViewCell.swift b/example/ios/Demo/Beacons/BeaconsViewCell.swift
index ec3468e95..829f8565d 100644
--- a/example/ios/Demo/Beacons/BeaconsViewCell.swift
+++ b/example/ios/Demo/Beacons/BeaconsViewCell.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright 2021 Splendo Consulting B.V. The Netherlands
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Beacons/BeaconsViewController.swift b/example/ios/Demo/Beacons/BeaconsViewController.swift
index d50d2f1b1..678e5786a 100644
--- a/example/ios/Demo/Beacons/BeaconsViewController.swift
+++ b/example/ios/Demo/Beacons/BeaconsViewController.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright 2021 Splendo Consulting B.V. The Netherlands
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift b/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
index dade37ebd..e6b178457 100644
--- a/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
+++ b/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Bluetooth/BluetoothViewController.swift b/example/ios/Demo/Bluetooth/BluetoothViewController.swift
index f4195727b..1e60a04b4 100644
--- a/example/ios/Demo/Bluetooth/BluetoothViewController.swift
+++ b/example/ios/Demo/Bluetooth/BluetoothViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift b/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
index b95eb0b30..d32da17ed 100644
--- a/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
+++ b/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/ExampleViewController.swift b/example/ios/Demo/ExampleViewController.swift
index 02dbb9538..6b0be8f80 100644
--- a/example/ios/Demo/ExampleViewController.swift
+++ b/example/ios/Demo/ExampleViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
index 9b3fcde4d..1f6f19df9 100644
--- a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Helpers/UIControl+Closure.swift b/example/ios/Demo/Helpers/UIControl+Closure.swift
index ff193ceb3..de3718ea9 100644
--- a/example/ios/Demo/Helpers/UIControl+Closure.swift
+++ b/example/ios/Demo/Helpers/UIControl+Closure.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Info/InfoViewController.swift b/example/ios/Demo/Info/InfoViewController.swift
index 2ea9da2bd..e0f6825a8 100644
--- a/example/ios/Demo/Info/InfoViewController.swift
+++ b/example/ios/Demo/Info/InfoViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
index 4b95b01a0..3b973ab9b 100644
--- a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
+++ b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Links/LinksViewController.swift b/example/ios/Demo/Links/LinksViewController.swift
index 8b252da5d..9f14309e3 100644
--- a/example/ios/Demo/Links/LinksViewController.swift
+++ b/example/ios/Demo/Links/LinksViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/LoadingIndicator/ActivityViewController.swift b/example/ios/Demo/LoadingIndicator/ActivityViewController.swift
index 02e2d7f22..045eea92b 100644
--- a/example/ios/Demo/LoadingIndicator/ActivityViewController.swift
+++ b/example/ios/Demo/LoadingIndicator/ActivityViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/LoadingIndicator/LoadingViewController.swift b/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
index 56e2f94a7..8c2412492 100644
--- a/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
+++ b/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Location/LocationViewController.swift b/example/ios/Demo/Location/LocationViewController.swift
index 75b7fdb96..a2632b8af 100644
--- a/example/ios/Demo/Location/LocationViewController.swift
+++ b/example/ios/Demo/Location/LocationViewController.swift
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Permissions/PermissionListViewController.swift b/example/ios/Demo/Permissions/PermissionListViewController.swift
index 6c597bfa5..08b634940 100644
--- a/example/ios/Demo/Permissions/PermissionListViewController.swift
+++ b/example/ios/Demo/Permissions/PermissionListViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Permissions/PermissionViewController.swift b/example/ios/Demo/Permissions/PermissionViewController.swift
index ebe37e7d6..29ce5c847 100644
--- a/example/ios/Demo/Permissions/PermissionViewController.swift
+++ b/example/ios/Demo/Permissions/PermissionViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Resources/ButtonViewController.swift b/example/ios/Demo/Resources/ButtonViewController.swift
index d37ffc11f..68871ce6f 100644
--- a/example/ios/Demo/Resources/ButtonViewController.swift
+++ b/example/ios/Demo/Resources/ButtonViewController.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright 2021 Splendo Consulting B.V. The Netherlands
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
 // 
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Resources/ColorViewController.swift b/example/ios/Demo/Resources/ColorViewController.swift
index 650c97d11..4f2ce7a2f 100644
--- a/example/ios/Demo/Resources/ColorViewController.swift
+++ b/example/ios/Demo/Resources/ColorViewController.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright 2021 Splendo Consulting B.V. The Netherlands
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
 // 
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Resources/LabelViewController.swift b/example/ios/Demo/Resources/LabelViewController.swift
index a7ea95f68..055c3ba09 100644
--- a/example/ios/Demo/Resources/LabelViewController.swift
+++ b/example/ios/Demo/Resources/LabelViewController.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright 2021 Splendo Consulting B.V. The Netherlands
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
 // 
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/Resources/ResourcesListViewController.swift b/example/ios/Demo/Resources/ResourcesListViewController.swift
index 8dfc14672..906c7c6e7 100644
--- a/example/ios/Demo/Resources/ResourcesListViewController.swift
+++ b/example/ios/Demo/Resources/ResourcesListViewController.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright 2021 Splendo Consulting B.V. The Netherlands
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
 // 
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/System/Network/NetworkViewController.swift b/example/ios/Demo/System/Network/NetworkViewController.swift
index 693477508..a3c6c7cef 100644
--- a/example/ios/Demo/System/Network/NetworkViewController.swift
+++ b/example/ios/Demo/System/Network/NetworkViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/System/SystemViewController.swift b/example/ios/Demo/System/SystemViewController.swift
index 3f1a57ee4..9945dfd0d 100644
--- a/example/ios/Demo/System/SystemViewController.swift
+++ b/example/ios/Demo/System/SystemViewController.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift b/example/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
index b130f74db..81fa29aa4 100644
--- a/example/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
+++ b/example/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/ios/DemoTests/DemoTests.swift b/example/ios/DemoTests/DemoTests.swift
index ba18e086b..2aa6b9b30 100644
--- a/example/ios/DemoTests/DemoTests.swift
+++ b/example/ios/DemoTests/DemoTests.swift
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/ios/DemoUITests/DemoUITests.swift b/example/ios/DemoUITests/DemoUITests.swift
index af63caa53..85a5ce551 100644
--- a/example/ios/DemoUITests/DemoUITests.swift
+++ b/example/ios/DemoUITests/DemoUITests.swift
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/KotlinNativeFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/KotlinNativeFramework.kt
index 51cb090c9..07fbb39f8 100644
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/KotlinNativeFramework.kt
+++ b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/KotlinNativeFramework.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentSubPageViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentSubPageViewModel.kt
index f1bfdc05a..12f9b5f96 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentSubPageViewModel.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentSubPageViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentViewModel.kt
index c17b2beba..337e623dc 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentViewModel.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetSubPageViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetSubPageViewModel.kt
index 75547450d..07ed302ca 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetSubPageViewModel.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetSubPageViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetViewModel.kt
index a1a227038..bec596366 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetViewModel.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/model/ContactDetails.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/model/ContactDetails.kt
index 0b2e33700..3357616aa 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/model/ContactDetails.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/model/ContactDetails.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt
index fb89a3c98..a2fd6c778 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt
index a5efcb96c..356a18d40 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
index 9a5bd2304..8d35888bc 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/AlertViewModel.kt b/example/shared/src/commonMain/kotlin/AlertViewModel.kt
index 8df6539d7..597593330 100644
--- a/example/shared/src/commonMain/kotlin/AlertViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/AlertViewModel.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/HelloShared.kt b/example/shared/src/commonMain/kotlin/HelloShared.kt
index 03656d76a..725690c56 100644
--- a/example/shared/src/commonMain/kotlin/HelloShared.kt
+++ b/example/shared/src/commonMain/kotlin/HelloShared.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/HudViewModel.kt b/example/shared/src/commonMain/kotlin/HudViewModel.kt
index 729f65ddb..35f2cbbf3 100644
--- a/example/shared/src/commonMain/kotlin/HudViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/HudViewModel.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt b/example/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt
index 4fea38b36..3852fd997 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt
index 4ab42b44d..f11a4c15c 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt
index e178808a7..82651eee9 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt
index d14206a3c..bf184ac0f 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt
index 4cb28f4c6..1e8fda99b 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt
index f52fec64f..1dd8689b2 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt
index e8d4fa6a0..f79552975 100644
--- a/example/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
index a8703de5e..f00fd3397 100644
--- a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
index a8703de5e..f00fd3397 100644
--- a/example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
+++ b/example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/example/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/example/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
index a8703de5e..f00fd3397 100644
--- a/example/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
+++ b/example/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/gradle/newModule.gradle.kts b/gradle/newModule.gradle.kts
index 0afa01508..40acfb3aa 100644
--- a/gradle/newModule.gradle.kts
+++ b/gradle/newModule.gradle.kts
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt b/hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt
index a221be9c4..fd9706621 100644
--- a/hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt
+++ b/hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/hud/src/androidLibAndroidTest/kotlin/TestActivity.kt b/hud/src/androidLibAndroidTest/kotlin/TestActivity.kt
index 5ebc49b54..e98aafe7c 100644
--- a/hud/src/androidLibAndroidTest/kotlin/TestActivity.kt
+++ b/hud/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/hud/src/androidLibMain/kotlin/HUD.kt b/hud/src/androidLibMain/kotlin/HUD.kt
index f52108dcd..3bdcc6c08 100644
--- a/hud/src/androidLibMain/kotlin/HUD.kt
+++ b/hud/src/androidLibMain/kotlin/HUD.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/hud/src/commonMain/kotlin/HUD.kt b/hud/src/commonMain/kotlin/HUD.kt
index 983938e7f..985c29434 100644
--- a/hud/src/commonMain/kotlin/HUD.kt
+++ b/hud/src/commonMain/kotlin/HUD.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/hud/src/commonMain/kotlin/HudConfig.kt b/hud/src/commonMain/kotlin/HudConfig.kt
index c5fbfaa6f..2b2cfb0e3 100644
--- a/hud/src/commonMain/kotlin/HudConfig.kt
+++ b/hud/src/commonMain/kotlin/HudConfig.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/hud/src/commonTest/kotlin/HUDTests.kt b/hud/src/commonTest/kotlin/HUDTests.kt
index 39642edad..a6969abc0 100644
--- a/hud/src/commonTest/kotlin/HUDTests.kt
+++ b/hud/src/commonTest/kotlin/HUDTests.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/hud/src/iosMain/kotlin/HUD.kt b/hud/src/iosMain/kotlin/HUD.kt
index 2b11db3ef..b30fcdd85 100644
--- a/hud/src/iosMain/kotlin/HUD.kt
+++ b/hud/src/iosMain/kotlin/HUD.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/hud/src/iosTest/kotlin/IOSHUDTests.kt b/hud/src/iosTest/kotlin/IOSHUDTests.kt
index dec6a3d00..8024574d5 100644
--- a/hud/src/iosTest/kotlin/IOSHUDTests.kt
+++ b/hud/src/iosTest/kotlin/IOSHUDTests.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/keyboard/src/androidLibAndroidTest/kotlin/TestActivity.kt b/keyboard/src/androidLibAndroidTest/kotlin/TestActivity.kt
index 2d940cb49..d8529aa17 100644
--- a/keyboard/src/androidLibAndroidTest/kotlin/TestActivity.kt
+++ b/keyboard/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/keyboard/src/androidLibMain/kotlin/FocusHandler.kt b/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
index 4d0bd0da6..2f9bb8410 100644
--- a/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
+++ b/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
index fb3b072d0..3fb0bbbbb 100644
--- a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
index 5e00b8d0a..c118dcb49 100644
--- a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
+++ b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/keyboard/src/iosMain/kotlin/FocusHandler.kt b/keyboard/src/iosMain/kotlin/FocusHandler.kt
index e624f63fc..145757b73 100644
--- a/keyboard/src/iosMain/kotlin/FocusHandler.kt
+++ b/keyboard/src/iosMain/kotlin/FocusHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/keyboard/src/iosMain/kotlin/KeyboardManager.kt b/keyboard/src/iosMain/kotlin/KeyboardManager.kt
index 1a21c19da..4f0d605a6 100644
--- a/keyboard/src/iosMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/iosMain/kotlin/KeyboardManager.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/keyboard/src/jsMain/kotlin/FocusHandler.kt b/keyboard/src/jsMain/kotlin/FocusHandler.kt
index 584599b79..28e5a9b54 100644
--- a/keyboard/src/jsMain/kotlin/FocusHandler.kt
+++ b/keyboard/src/jsMain/kotlin/FocusHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/keyboard/src/jsMain/kotlin/KeyboardManager.kt b/keyboard/src/jsMain/kotlin/KeyboardManager.kt
index 79bbe6e33..5c5d33ceb 100644
--- a/keyboard/src/jsMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/jsMain/kotlin/KeyboardManager.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/keyboard/src/jvmMain/kotlin/FocusHandler.kt b/keyboard/src/jvmMain/kotlin/FocusHandler.kt
index 584599b79..28e5a9b54 100644
--- a/keyboard/src/jvmMain/kotlin/FocusHandler.kt
+++ b/keyboard/src/jvmMain/kotlin/FocusHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/keyboard/src/jvmMain/kotlin/KeyboardManager.kt b/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
index 79bbe6e33..5c5d33ceb 100644
--- a/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt b/links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
index da10937f5..6d03bb404 100644
--- a/links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
+++ b/links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
index dae1ca54a..6bde20685 100644
--- a/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt b/links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt
index 67f282070..46f6cd1a7 100644
--- a/links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt
+++ b/links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/commonTest/kotlin/com/splendo/kaluga/links/LinksTest.kt b/links/src/commonTest/kotlin/com/splendo/kaluga/links/LinksTest.kt
index 816e2460e..c8f028510 100644
--- a/links/src/commonTest/kotlin/com/splendo/kaluga/links/LinksTest.kt
+++ b/links/src/commonTest/kotlin/com/splendo/kaluga/links/LinksTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
index dae1ca54a..6bde20685 100644
--- a/links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/iosTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt b/links/src/iosTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
index b2d6fd7bc..054c92bb4 100644
--- a/links/src/iosTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
+++ b/links/src/iosTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
index bda8f8038..1aef408b1 100644
--- a/links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/jsTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt b/links/src/jsTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
index 7b1839d5e..71322576f 100644
--- a/links/src/jsTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
+++ b/links/src/jsTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
index bda8f8038..1aef408b1 100644
--- a/links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/jvmTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt b/links/src/jvmTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
index fd1b7095c..0c7ef5744 100644
--- a/links/src/jvmTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
+++ b/links/src/jvmTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
index 70ffc40a1..af5c92b00 100644
--- a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/location/src/androidLibMain/kotlin/location/LocationExtensions.kt b/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
index 7b508c56b..f6d9f0e88 100644
--- a/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/location/src/androidLibMain/kotlin/location/LocationMonitor.kt b/location/src/androidLibMain/kotlin/location/LocationMonitor.kt
index 01f9e0857..2dff4d429 100644
--- a/location/src/androidLibMain/kotlin/location/LocationMonitor.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/location/src/androidLibMain/kotlin/location/LocationProvider.kt b/location/src/androidLibMain/kotlin/location/LocationProvider.kt
index 3ca0735c2..4130c1116 100644
--- a/location/src/androidLibMain/kotlin/location/LocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationProvider.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/location/src/commonMain/kotlin/location/Location.kt b/location/src/commonMain/kotlin/location/Location.kt
index b018ef70e..66af16e57 100644
--- a/location/src/commonMain/kotlin/location/Location.kt
+++ b/location/src/commonMain/kotlin/location/Location.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/location/src/commonMain/kotlin/location/LocationMonitor.kt b/location/src/commonMain/kotlin/location/LocationMonitor.kt
index 4ce43667b..69a4fa4a4 100644
--- a/location/src/commonMain/kotlin/location/LocationMonitor.kt
+++ b/location/src/commonMain/kotlin/location/LocationMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/location/src/iosMain/kotlin/location/CLLocationExtensions.kt b/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
index c1c59abeb..61b3904d6 100644
--- a/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
+++ b/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/location/src/jsMain/kotlin/LocationMonitor.kt b/location/src/jsMain/kotlin/LocationMonitor.kt
index 936fcd2e9..5d38daa8d 100644
--- a/location/src/jsMain/kotlin/LocationMonitor.kt
+++ b/location/src/jsMain/kotlin/LocationMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/location/src/jvmMain/kotlin/LocationMonitor.kt b/location/src/jvmMain/kotlin/LocationMonitor.kt
index 936fcd2e9..5d38daa8d 100644
--- a/location/src/jvmMain/kotlin/LocationMonitor.kt
+++ b/location/src/jvmMain/kotlin/LocationMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/logging/src/commonMain/kotlin/LogLevel.kt b/logging/src/commonMain/kotlin/LogLevel.kt
index 116954c0c..5b7e1d13e 100644
--- a/logging/src/commonMain/kotlin/LogLevel.kt
+++ b/logging/src/commonMain/kotlin/LogLevel.kt
@@ -1,7 +1,7 @@
 package com.splendo.kaluga.logging
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/logging/src/commonMain/kotlin/Logger.kt b/logging/src/commonMain/kotlin/Logger.kt
index 5c9a29a55..e40528289 100644
--- a/logging/src/commonMain/kotlin/Logger.kt
+++ b/logging/src/commonMain/kotlin/Logger.kt
@@ -1,7 +1,7 @@
 package com.splendo.kaluga.logging
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/logging/src/commonMain/kotlin/log.kt b/logging/src/commonMain/kotlin/log.kt
index 7926ddb34..6a2f8c76e 100644
--- a/logging/src/commonMain/kotlin/log.kt
+++ b/logging/src/commonMain/kotlin/log.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/logging/src/commonTest/kotlin/LogTest.kt b/logging/src/commonTest/kotlin/LogTest.kt
index 506f39a46..32058bc34 100644
--- a/logging/src/commonTest/kotlin/LogTest.kt
+++ b/logging/src/commonTest/kotlin/LogTest.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/logging/src/commonTest/kotlin/LoggerMock.kt b/logging/src/commonTest/kotlin/LoggerMock.kt
index 5ddeb8468..c9d3c31fd 100644
--- a/logging/src/commonTest/kotlin/LoggerMock.kt
+++ b/logging/src/commonTest/kotlin/LoggerMock.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/logging/src/jvmMain/kotlin/log.kt b/logging/src/jvmMain/kotlin/log.kt
index b1b4e30e1..98ba03d97 100644
--- a/logging/src/jvmMain/kotlin/log.kt
+++ b/logging/src/jvmMain/kotlin/log.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2019 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/resources-compose/build.gradle.kts b/resources-compose/build.gradle.kts
index ecc878677..629e35eb8 100644
--- a/resources-compose/build.gradle.kts
+++ b/resources-compose/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources-compose/src/androidLibAndroidTest/AndroidManifest.xml b/resources-compose/src/androidLibAndroidTest/AndroidManifest.xml
index 9416ea4df..5376e938c 100644
--- a/resources-compose/src/androidLibAndroidTest/AndroidManifest.xml
+++ b/resources-compose/src/androidLibAndroidTest/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2021 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/resources-compose/src/androidLibMain/AndroidManifest.xml b/resources-compose/src/androidLibMain/AndroidManifest.xml
index 90ed0e540..2e485bd38 100644
--- a/resources-compose/src/androidLibMain/AndroidManifest.xml
+++ b/resources-compose/src/androidLibMain/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2021 Splendo Consulting B.V. The Netherlands
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt b/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
index ecfce5076..c8b179b89 100644
--- a/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
+++ b/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources-compose/src/androidLibMain/kotlin/Color.kt b/resources-compose/src/androidLibMain/kotlin/Color.kt
index 9dcddf279..91d6e46e8 100644
--- a/resources-compose/src/androidLibMain/kotlin/Color.kt
+++ b/resources-compose/src/androidLibMain/kotlin/Color.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources-compose/src/androidLibMain/kotlin/GradientStyle.kt b/resources-compose/src/androidLibMain/kotlin/GradientStyle.kt
index f6b930f17..8d2d4775c 100644
--- a/resources-compose/src/androidLibMain/kotlin/GradientStyle.kt
+++ b/resources-compose/src/androidLibMain/kotlin/GradientStyle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt b/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
index 93175e580..558345349 100644
--- a/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
+++ b/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources-compose/src/androidLibMain/kotlin/KalugaLabel.kt b/resources-compose/src/androidLibMain/kotlin/KalugaLabel.kt
index b7bb480e9..19b80661d 100644
--- a/resources-compose/src/androidLibMain/kotlin/KalugaLabel.kt
+++ b/resources-compose/src/androidLibMain/kotlin/KalugaLabel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources-compose/src/androidLibMain/kotlin/RoundedCornerRadiusShape.kt b/resources-compose/src/androidLibMain/kotlin/RoundedCornerRadiusShape.kt
index 8a46980b4..48b4b1100 100644
--- a/resources-compose/src/androidLibMain/kotlin/RoundedCornerRadiusShape.kt
+++ b/resources-compose/src/androidLibMain/kotlin/RoundedCornerRadiusShape.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources-compose/src/androidLibMain/kotlin/TextAlignment.kt b/resources-compose/src/androidLibMain/kotlin/TextAlignment.kt
index 1d1ffbddc..b1dcbddf5 100644
--- a/resources-compose/src/androidLibMain/kotlin/TextAlignment.kt
+++ b/resources-compose/src/androidLibMain/kotlin/TextAlignment.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/androidLibAndroidTest/kotlin/TestActivity.kt b/resources/src/androidLibAndroidTest/kotlin/TestActivity.kt
index f017a00df..f9f95efe1 100644
--- a/resources/src/androidLibAndroidTest/kotlin/TestActivity.kt
+++ b/resources/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/resources/src/androidLibMain/kotlin/PixelUtils.kt b/resources/src/androidLibMain/kotlin/PixelUtils.kt
index bd07dc4dc..16a7d3800 100644
--- a/resources/src/androidLibMain/kotlin/PixelUtils.kt
+++ b/resources/src/androidLibMain/kotlin/PixelUtils.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt b/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt
index d3c8bbd28..7f6b5c477 100644
--- a/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt
+++ b/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/androidLibMain/kotlin/view/Button.kt b/resources/src/androidLibMain/kotlin/view/Button.kt
index 2bc9b690e..dab11e1de 100644
--- a/resources/src/androidLibMain/kotlin/view/Button.kt
+++ b/resources/src/androidLibMain/kotlin/view/Button.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/ColorBlending.kt b/resources/src/commonMain/kotlin/ColorBlending.kt
index b3bee05f1..b77ec5e21 100644
--- a/resources/src/commonMain/kotlin/ColorBlending.kt
+++ b/resources/src/commonMain/kotlin/ColorBlending.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/DefaultColors.kt b/resources/src/commonMain/kotlin/DefaultColors.kt
index bb76858a8..235f01d20 100644
--- a/resources/src/commonMain/kotlin/DefaultColors.kt
+++ b/resources/src/commonMain/kotlin/DefaultColors.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Splendo Consulting B.V. The Netherlands
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/HSLColor.kt b/resources/src/commonMain/kotlin/HSLColor.kt
index 438c36553..215a33f29 100644
--- a/resources/src/commonMain/kotlin/HSLColor.kt
+++ b/resources/src/commonMain/kotlin/HSLColor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/StyledString.kt b/resources/src/commonMain/kotlin/StyledString.kt
index 141393b28..d01ac0e8e 100644
--- a/resources/src/commonMain/kotlin/StyledString.kt
+++ b/resources/src/commonMain/kotlin/StyledString.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/stylable/BackgroundStyle.kt b/resources/src/commonMain/kotlin/stylable/BackgroundStyle.kt
index 0527f145b..f8559c257 100644
--- a/resources/src/commonMain/kotlin/stylable/BackgroundStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/BackgroundStyle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/stylable/ButtonStyle.kt b/resources/src/commonMain/kotlin/stylable/ButtonStyle.kt
index d50c4fb37..581121f70 100644
--- a/resources/src/commonMain/kotlin/stylable/ButtonStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/ButtonStyle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/stylable/GradientStyle.kt b/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
index fac8ee338..7588d04ee 100644
--- a/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/stylable/TextAlignment.kt b/resources/src/commonMain/kotlin/stylable/TextAlignment.kt
index 8f687ffd8..590aa5d92 100644
--- a/resources/src/commonMain/kotlin/stylable/TextAlignment.kt
+++ b/resources/src/commonMain/kotlin/stylable/TextAlignment.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/stylable/TextStyle.kt b/resources/src/commonMain/kotlin/stylable/TextStyle.kt
index 0d81600fa..f0171b141 100644
--- a/resources/src/commonMain/kotlin/stylable/TextStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/TextStyle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/view/KalugaButton.kt b/resources/src/commonMain/kotlin/view/KalugaButton.kt
index 6d50ab104..278978555 100644
--- a/resources/src/commonMain/kotlin/view/KalugaButton.kt
+++ b/resources/src/commonMain/kotlin/view/KalugaButton.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/commonMain/kotlin/view/KalugaLabel.kt b/resources/src/commonMain/kotlin/view/KalugaLabel.kt
index dc6ad5fa8..e94afd96c 100644
--- a/resources/src/commonMain/kotlin/view/KalugaLabel.kt
+++ b/resources/src/commonMain/kotlin/view/KalugaLabel.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/iosMain/kotlin/StyledString.kt b/resources/src/iosMain/kotlin/StyledString.kt
index 7567373f1..da223db40 100644
--- a/resources/src/iosMain/kotlin/StyledString.kt
+++ b/resources/src/iosMain/kotlin/StyledString.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt b/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
index ecdf4fbc0..f55aa2deb 100644
--- a/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt b/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
index 570459d32..1ef858f96 100644
--- a/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/iosMain/kotlin/uikit/TextAlignment.kt b/resources/src/iosMain/kotlin/uikit/TextAlignment.kt
index 657c88177..1e943ff78 100644
--- a/resources/src/iosMain/kotlin/uikit/TextAlignment.kt
+++ b/resources/src/iosMain/kotlin/uikit/TextAlignment.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/iosMain/kotlin/uikit/TextStyle.kt b/resources/src/iosMain/kotlin/uikit/TextStyle.kt
index b735e1d82..24f05b71d 100644
--- a/resources/src/iosMain/kotlin/uikit/TextStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/TextStyle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/jsMain/kotlin/StyledString.kt b/resources/src/jsMain/kotlin/StyledString.kt
index bb1440884..86509eb30 100644
--- a/resources/src/jsMain/kotlin/StyledString.kt
+++ b/resources/src/jsMain/kotlin/StyledString.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/resources/src/jvmMain/kotlin/StyledString.kt b/resources/src/jvmMain/kotlin/StyledString.kt
index bb1440884..86509eb30 100644
--- a/resources/src/jvmMain/kotlin/StyledString.kt
+++ b/resources/src/jvmMain/kotlin/StyledString.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/review/src/androidLibAndroidTest/kotlin/TestActivity.kt b/review/src/androidLibAndroidTest/kotlin/TestActivity.kt
index 2b58325f1..cafd26601 100644
--- a/review/src/androidLibAndroidTest/kotlin/TestActivity.kt
+++ b/review/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -2,7 +2,7 @@ package com.splendo.kaluga.review
 
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/review/src/androidLibMain/kotlin/ReviewManager.kt b/review/src/androidLibMain/kotlin/ReviewManager.kt
index 8a326624d..e29b38bec 100644
--- a/review/src/androidLibMain/kotlin/ReviewManager.kt
+++ b/review/src/androidLibMain/kotlin/ReviewManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/review/src/commonMain/kotlin/ReviewManager.kt b/review/src/commonMain/kotlin/ReviewManager.kt
index 082edbd71..223e9bae5 100644
--- a/review/src/commonMain/kotlin/ReviewManager.kt
+++ b/review/src/commonMain/kotlin/ReviewManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/review/src/iosMain/kotlin/ReviewManager.kt b/review/src/iosMain/kotlin/ReviewManager.kt
index 75c8fb588..34644417c 100644
--- a/review/src/iosMain/kotlin/ReviewManager.kt
+++ b/review/src/iosMain/kotlin/ReviewManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/review/src/jsMain/kotlin/ReviewManager.kt b/review/src/jsMain/kotlin/ReviewManager.kt
index 153950b8d..c10a9cab2 100644
--- a/review/src/jsMain/kotlin/ReviewManager.kt
+++ b/review/src/jsMain/kotlin/ReviewManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/review/src/jvmMain/kotlin/ReviewManager.kt b/review/src/jvmMain/kotlin/ReviewManager.kt
index 1cbac1d36..d95af22a6 100644
--- a/review/src/jvmMain/kotlin/ReviewManager.kt
+++ b/review/src/jvmMain/kotlin/ReviewManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/androidLibAndroidTest/kotlin/TestActivity.kt b/scientific/src/androidLibAndroidTest/kotlin/TestActivity.kt
index f57a18101..6b1225c96 100644
--- a/scientific/src/androidLibAndroidTest/kotlin/TestActivity.kt
+++ b/scientific/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/PhysicalQuantity.kt b/scientific/src/commonMain/kotlin/PhysicalQuantity.kt
index 5d8e115ef..d5fb53dcd 100644
--- a/scientific/src/commonMain/kotlin/PhysicalQuantity.kt
+++ b/scientific/src/commonMain/kotlin/PhysicalQuantity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/ScientificValue.kt b/scientific/src/commonMain/kotlin/ScientificValue.kt
index 3a2ef31be..24b2d771f 100644
--- a/scientific/src/commonMain/kotlin/ScientificValue.kt
+++ b/scientific/src/commonMain/kotlin/ScientificValue.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/acceleration/convertFromForceAndMass.kt b/scientific/src/commonMain/kotlin/converter/acceleration/convertFromForceAndMass.kt
index d5ee10fe7..eec730b33 100644
--- a/scientific/src/commonMain/kotlin/converter/acceleration/convertFromForceAndMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/acceleration/convertFromForceAndMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/acceleration/convertFromJoltAndTime.kt b/scientific/src/commonMain/kotlin/converter/acceleration/convertFromJoltAndTime.kt
index c9cb0c929..0cfc697af 100644
--- a/scientific/src/commonMain/kotlin/converter/acceleration/convertFromJoltAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/acceleration/convertFromJoltAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/acceleration/convertFromSpeedAndTime.kt b/scientific/src/commonMain/kotlin/converter/acceleration/convertFromSpeedAndTime.kt
index c62fc3f3a..0e1f6fc05 100644
--- a/scientific/src/commonMain/kotlin/converter/acceleration/convertFromSpeedAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/acceleration/convertFromSpeedAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/acceleration/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/acceleration/convertToForce.kt
index 0808eb03a..88eb0cdaf 100644
--- a/scientific/src/commonMain/kotlin/converter/acceleration/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/acceleration/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/acceleration/convertToJolt.kt b/scientific/src/commonMain/kotlin/converter/acceleration/convertToJolt.kt
index e210580c5..32ec41f87 100644
--- a/scientific/src/commonMain/kotlin/converter/acceleration/convertToJolt.kt
+++ b/scientific/src/commonMain/kotlin/converter/acceleration/convertToJolt.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/acceleration/convertToSpeed.kt b/scientific/src/commonMain/kotlin/converter/acceleration/convertToSpeed.kt
index 29308ef57..c137ae6f1 100644
--- a/scientific/src/commonMain/kotlin/converter/acceleration/convertToSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/acceleration/convertToSpeed.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/acceleration/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/acceleration/convertToTime.kt
index d6b534d9a..d7c3a8d32 100644
--- a/scientific/src/commonMain/kotlin/converter/acceleration/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/acceleration/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/action/convertFromEnergyAndTime.kt b/scientific/src/commonMain/kotlin/converter/action/convertFromEnergyAndTime.kt
index c3f4755b6..c1f37b2f9 100644
--- a/scientific/src/commonMain/kotlin/converter/action/convertFromEnergyAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/action/convertFromEnergyAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/action/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/action/convertToEnergy.kt
index 7a401b241..12e2e9064 100644
--- a/scientific/src/commonMain/kotlin/converter/action/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/action/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/action/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/action/convertToTime.kt
index d62af8c78..9e193e608 100644
--- a/scientific/src/commonMain/kotlin/converter/action/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/action/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromCatalysisAndTime.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromCatalysisAndTime.kt
index 84f2c753f..bbf181602 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromCatalysisAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromCatalysisAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromEnergyAndMolarEnergy.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromEnergyAndMolarEnergy.kt
index c9485c500..f4e75e21b 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromEnergyAndMolarEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromEnergyAndMolarEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromMolalityAndWeight.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromMolalityAndWeight.kt
index d2722f384..e4b0712ad 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromMolalityAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromMolalityAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromMolarityAndVolume.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromMolarityAndVolume.kt
index 4365d7ba7..077e4b313 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromMolarityAndVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromMolarityAndVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromVolumeAndMolarVolume.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromVolumeAndMolarVolume.kt
index 7d69c0ba3..abf17de95 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromVolumeAndMolarVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromVolumeAndMolarVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromWeightAndMolarMass.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromWeightAndMolarMass.kt
index 1b192b23d..08aa8acf4 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromWeightAndMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertFromWeightAndMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToCatalysticActivity.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToCatalysticActivity.kt
index 157e136a1..909f7c53b 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToCatalysticActivity.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToCatalysticActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToEnergy.kt
index 8b1cbcf73..f20f38197 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToMolality.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToMolality.kt
index 574a5b9a7..2b9066782 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToMolarity.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToMolarity.kt
index c94fe4cab..c21b4afdb 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToMolarity.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToMolarity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToRadioactivity.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToRadioactivity.kt
index e163090c8..561167fc7 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToRadioactivity.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToRadioactivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToTime.kt
index 7ab82431c..1d71aec97 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToVolume.kt
index 7ac01549d..0802bbf0c 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToWeight.kt
index 14a42d69d..08b8527cd 100644
--- a/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/amountOfSubstance/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/angle/convertFromAngularVelocityAndTime.kt b/scientific/src/commonMain/kotlin/converter/angle/convertFromAngularVelocityAndTime.kt
index b33563860..06de6656a 100644
--- a/scientific/src/commonMain/kotlin/converter/angle/convertFromAngularVelocityAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/angle/convertFromAngularVelocityAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/angle/convertToAngularVelocity.kt b/scientific/src/commonMain/kotlin/converter/angle/convertToAngularVelocity.kt
index 8d4939b16..6d7b9e7cc 100644
--- a/scientific/src/commonMain/kotlin/converter/angle/convertToAngularVelocity.kt
+++ b/scientific/src/commonMain/kotlin/converter/angle/convertToAngularVelocity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/angle/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/angle/convertToTime.kt
index e7ccb4e08..12ae9a1d2 100644
--- a/scientific/src/commonMain/kotlin/converter/angle/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/angle/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/angularAcceleration/convertFromAngularVelocityAndTime.kt b/scientific/src/commonMain/kotlin/converter/angularAcceleration/convertFromAngularVelocityAndTime.kt
index 2536cc0b0..44c257b7d 100644
--- a/scientific/src/commonMain/kotlin/converter/angularAcceleration/convertFromAngularVelocityAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/angularAcceleration/convertFromAngularVelocityAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/angularAcceleration/convertToAngularVelocity.kt b/scientific/src/commonMain/kotlin/converter/angularAcceleration/convertToAngularVelocity.kt
index 037e60ae6..a042cd2c7 100644
--- a/scientific/src/commonMain/kotlin/converter/angularAcceleration/convertToAngularVelocity.kt
+++ b/scientific/src/commonMain/kotlin/converter/angularAcceleration/convertToAngularVelocity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/angularVelocity/convertFromAngleAndTime.kt b/scientific/src/commonMain/kotlin/converter/angularVelocity/convertFromAngleAndTime.kt
index 8bfbb3290..92c72caad 100644
--- a/scientific/src/commonMain/kotlin/converter/angularVelocity/convertFromAngleAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/angularVelocity/convertFromAngleAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/angularVelocity/convertFromAngularAccelerationAndTime.kt b/scientific/src/commonMain/kotlin/converter/angularVelocity/convertFromAngularAccelerationAndTime.kt
index 96d178df5..c60671623 100644
--- a/scientific/src/commonMain/kotlin/converter/angularVelocity/convertFromAngularAccelerationAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/angularVelocity/convertFromAngularAccelerationAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToAngle.kt b/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToAngle.kt
index 1bc341761..1b9a5b0bb 100644
--- a/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToAngle.kt
+++ b/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToAngle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToAngularAcceleration.kt b/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToAngularAcceleration.kt
index 0007c6833..a6d70611c 100644
--- a/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToAngularAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToAngularAcceleration.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToTime.kt
index 05cb0f5d8..abac9a90c 100644
--- a/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/angularVelocity/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromEnergyAndSurfaceTension.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromEnergyAndSurfaceTension.kt
index 8ab5cda74..0ff86ea13 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromEnergyAndSurfaceTension.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromEnergyAndSurfaceTension.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromForceAndPressure.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromForceAndPressure.kt
index dba30a08a..f6d2096ae 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromForceAndPressure.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromForceAndPressure.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromLength.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromLength.kt
index 1cb8f43a6..ee120343e 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromLinearMassDensityAndDensity.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromLinearMassDensityAndDensity.kt
index 03f12bf9b..c997c5b94 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromLinearMassDensityAndDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromLinearMassDensityAndDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromLinearMassDensityAndSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromLinearMassDensityAndSpecificVolume.kt
index 317113e99..92b9f5457 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromLinearMassDensityAndSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromLinearMassDensityAndSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousEnergyAndLuminousExposure.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousEnergyAndLuminousExposure.kt
index 353780bb1..294820d67 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousEnergyAndLuminousExposure.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousEnergyAndLuminousExposure.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousFluxAndIlluminance.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousFluxAndIlluminance.kt
index 7c4698cf3..120e53ad3 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousFluxAndIlluminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousFluxAndIlluminance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousIntensityAndLuminance.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousIntensityAndLuminance.kt
index 198c6976f..806856e12 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousIntensityAndLuminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromLuminousIntensityAndLuminance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromMagneticFluxAndInduction.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromMagneticFluxAndInduction.kt
index e8b309368..682d1541b 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromMagneticFluxAndInduction.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromMagneticFluxAndInduction.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromMomentumAndDynamicViscosity.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromMomentumAndDynamicViscosity.kt
index 7fe600774..07288daa7 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromMomentumAndDynamicViscosity.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromMomentumAndDynamicViscosity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromVolumeAndLength.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromVolumeAndLength.kt
index d60c7530e..c9b336d8b 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromVolumeAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromVolumeAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromVolumetricFlowAndFlux.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromVolumetricFlowAndFlux.kt
index 9f6106418..ab9b93c4f 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromVolumetricFlowAndFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromVolumetricFlowAndFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertFromWeightAndAreaDensity.kt b/scientific/src/commonMain/kotlin/converter/area/convertFromWeightAndAreaDensity.kt
index 6f72a62c9..0db8157dd 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertFromWeightAndAreaDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertFromWeightAndAreaDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/area/convertToEnergy.kt
index a7f5aa495..9c6e7e412 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt
index 8f214b337..ca6908ee7 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/area/convertToLength.kt
index e6a205d0e..6a4caf4d5 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToLinearMassDensity.kt b/scientific/src/commonMain/kotlin/converter/area/convertToLinearMassDensity.kt
index 3836b2d0c..4e5ff5522 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToLinearMassDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToLinearMassDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToLuminousEnergy.kt b/scientific/src/commonMain/kotlin/converter/area/convertToLuminousEnergy.kt
index 693dad731..9c3124a00 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToLuminousEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToLuminousEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToLuminousFlux.kt b/scientific/src/commonMain/kotlin/converter/area/convertToLuminousFlux.kt
index 3f5e4ac96..fb5e7ee1e 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToLuminousFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToLuminousFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToLuminousIntensity.kt b/scientific/src/commonMain/kotlin/converter/area/convertToLuminousIntensity.kt
index 8af233fe0..bcc9e64d1 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToLuminousIntensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToLuminousIntensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/area/convertToMagneticFlux.kt
index 10184fc91..8a507c495 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToMagneticFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToMomentum.kt b/scientific/src/commonMain/kotlin/converter/area/convertToMomentum.kt
index 33561f21f..b79ff5698 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToMomentum.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToMomentum.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/area/convertToSpecificVolume.kt
index e210c5cd6..2718f0093 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToVolumetricFlow.kt b/scientific/src/commonMain/kotlin/converter/area/convertToVolumetricFlow.kt
index 6e3854ffb..6e3da13fd 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToVolumetricFlow.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToVolumetricFlow.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/area/convertToWeight.kt
index 828ebc230..519a8deda 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromDensityAndLength.kt b/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromDensityAndLength.kt
index f9e4eba8f..91114074d 100644
--- a/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromDensityAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromDensityAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromLengthAndSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromLengthAndSpecificVolume.kt
index 41a1bae19..77ed1fe93 100644
--- a/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromLengthAndSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromLengthAndSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromLinearMassDensityAndLength.kt b/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromLinearMassDensityAndLength.kt
index 13c57e5a6..19d66f234 100644
--- a/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromLinearMassDensityAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromLinearMassDensityAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromWeightAndArea.kt b/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromWeightAndArea.kt
index 9f2306ac1..ba2d395b2 100644
--- a/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromWeightAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/areaDensity/convertFromWeightAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/areaDensity/convertToDensity.kt b/scientific/src/commonMain/kotlin/converter/areaDensity/convertToDensity.kt
index 42be24d74..89778b528 100644
--- a/scientific/src/commonMain/kotlin/converter/areaDensity/convertToDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/areaDensity/convertToDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/areaDensity/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/areaDensity/convertToLength.kt
index a14861dd0..996e6e276 100644
--- a/scientific/src/commonMain/kotlin/converter/areaDensity/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/areaDensity/convertToLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/areaDensity/convertToLinearMassDensity.kt b/scientific/src/commonMain/kotlin/converter/areaDensity/convertToLinearMassDensity.kt
index 2ac9fce0f..8f5173e6d 100644
--- a/scientific/src/commonMain/kotlin/converter/areaDensity/convertToLinearMassDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/areaDensity/convertToLinearMassDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/areaDensity/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/areaDensity/convertToWeight.kt
index 0a10ea3b3..feab1fa00 100644
--- a/scientific/src/commonMain/kotlin/converter/areaDensity/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/areaDensity/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/catalysticActivity/convertFromAmountOfSubstanceAndTime.kt b/scientific/src/commonMain/kotlin/converter/catalysticActivity/convertFromAmountOfSubstanceAndTime.kt
index d5a85378d..20da7c70b 100644
--- a/scientific/src/commonMain/kotlin/converter/catalysticActivity/convertFromAmountOfSubstanceAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/catalysticActivity/convertFromAmountOfSubstanceAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/catalysticActivity/convertToAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/catalysticActivity/convertToAmountOfSubstance.kt
index daccd6324..8628c1fef 100644
--- a/scientific/src/commonMain/kotlin/converter/catalysticActivity/convertToAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/catalysticActivity/convertToAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/decimal/convertToFrequency.kt b/scientific/src/commonMain/kotlin/converter/decimal/convertToFrequency.kt
index 117eb1353..d8fc0e074 100644
--- a/scientific/src/commonMain/kotlin/converter/decimal/convertToFrequency.kt
+++ b/scientific/src/commonMain/kotlin/converter/decimal/convertToFrequency.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/decimal/convertToRadioactivity.kt b/scientific/src/commonMain/kotlin/converter/decimal/convertToRadioactivity.kt
index 6d5f4e8be..dd058e293 100644
--- a/scientific/src/commonMain/kotlin/converter/decimal/convertToRadioactivity.kt
+++ b/scientific/src/commonMain/kotlin/converter/decimal/convertToRadioactivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/decimal/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/decimal/convertToTime.kt
index 30f60571a..020a0c217 100644
--- a/scientific/src/commonMain/kotlin/converter/decimal/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/decimal/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertFromAreaDensityAndLength.kt b/scientific/src/commonMain/kotlin/converter/density/convertFromAreaDensityAndLength.kt
index de01dc623..bae8fa4cb 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertFromAreaDensityAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertFromAreaDensityAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertFromLinearMassDensityAndArea.kt b/scientific/src/commonMain/kotlin/converter/density/convertFromLinearMassDensityAndArea.kt
index 7a0866471..7d21fb94a 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertFromLinearMassDensityAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertFromLinearMassDensityAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertFromMolarMassAndMolarVolume.kt b/scientific/src/commonMain/kotlin/converter/density/convertFromMolarMassAndMolarVolume.kt
index bad2b6f41..c4b7c1911 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertFromMolarMassAndMolarVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertFromMolarMassAndMolarVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertFromMolarityAndMolality.kt b/scientific/src/commonMain/kotlin/converter/density/convertFromMolarityAndMolality.kt
index 80c8d18a0..4cac86fc3 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertFromMolarityAndMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertFromMolarityAndMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertFromMolarityAndMolarMass.kt b/scientific/src/commonMain/kotlin/converter/density/convertFromMolarityAndMolarMass.kt
index 4ec854292..8a2b8a65f 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertFromMolarityAndMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertFromMolarityAndMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertFromSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/density/convertFromSpecificVolume.kt
index 23773b54c..938bb1c3e 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertFromSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertFromSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertFromWeightAndVolume.kt b/scientific/src/commonMain/kotlin/converter/density/convertFromWeightAndVolume.kt
index 39ac5ca24..e9448fa2a 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertFromWeightAndVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertFromWeightAndVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertToAreaDensity.kt b/scientific/src/commonMain/kotlin/converter/density/convertToAreaDensity.kt
index 3a82fd8e5..9dbfb9973 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertToAreaDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertToAreaDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertToLinearMassDensity.kt b/scientific/src/commonMain/kotlin/converter/density/convertToLinearMassDensity.kt
index 115cb66e1..7e8349b21 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertToLinearMassDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertToLinearMassDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertToMolarMass.kt b/scientific/src/commonMain/kotlin/converter/density/convertToMolarMass.kt
index 8bcb65c05..ca1cdf783 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertToMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertToMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertToMolarity.kt b/scientific/src/commonMain/kotlin/converter/density/convertToMolarity.kt
index a09204ce5..19e1f77a5 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertToMolarity.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertToMolarity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertToSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/density/convertToSpecificVolume.kt
index 1a3b58a9b..0147f26e5 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertToSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertToSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/density/convertToWeight.kt
index 2ac7694f7..04e07e5bb 100644
--- a/scientific/src/commonMain/kotlin/converter/density/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/density/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromMomentumAndArea.kt b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromMomentumAndArea.kt
index 0bf5b8118..2d46aa7ef 100644
--- a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromMomentumAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromMomentumAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromPressureAndTime.kt b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromPressureAndTime.kt
index 8db7ba3c5..fd4bc36b3 100644
--- a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromPressureAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromPressureAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToMomentum.kt b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToMomentum.kt
index 67f5a1065..63e4af1a0 100644
--- a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToMomentum.kt
+++ b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToMomentum.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToPressure.kt b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToPressure.kt
index 1b556b4f7..706e28c0c 100644
--- a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToPressure.kt
+++ b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToPressure.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToTime.kt
index dbf3f2696..1b2a01593 100644
--- a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromElectricChargeAndVoltage.kt b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromElectricChargeAndVoltage.kt
index a1111377b..352c2884f 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromElectricChargeAndVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromElectricChargeAndVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromElectricConductanceAndFrequency.kt b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromElectricConductanceAndFrequency.kt
index 5f32df80c..70508c092 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromElectricConductanceAndFrequency.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromElectricConductanceAndFrequency.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromTimeAndElectricResistance.kt b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromTimeAndElectricResistance.kt
index b15fedde8..90b958b65 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromTimeAndElectricResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertFromTimeAndElectricResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToElectricCharge.kt b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToElectricCharge.kt
index 7e64759e5..48a5a6af3 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToElectricCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToElectricCharge.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToElectricConductance.kt b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToElectricConductance.kt
index 30e8a1340..6e23399d8 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToElectricConductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToElectricConductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToTime.kt
index 7cc34802f..8ca42ebf5 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCapacitance/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromElectricCapacitanceAndVoltage.kt b/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromElectricCapacitanceAndVoltage.kt
index d75ec48f1..0caec82b5 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromElectricCapacitanceAndVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromElectricCapacitanceAndVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromElectricCurrentAndTime.kt b/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromElectricCurrentAndTime.kt
index c6ece48ca..4ec1902e2 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromElectricCurrentAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromElectricCurrentAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromEnergyAndVoltage.kt b/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromEnergyAndVoltage.kt
index db3ede941..0753fa919 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromEnergyAndVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromEnergyAndVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromMagneticFluxAndElectricResistance.kt b/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromMagneticFluxAndElectricResistance.kt
index 64d47ae26..9ffc42436 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromMagneticFluxAndElectricResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCharge/convertFromMagneticFluxAndElectricResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToElectricCapacitance.kt b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToElectricCapacitance.kt
index 48cc137dc..5b548d800 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToElectricCapacitance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToElectricCapacitance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToElectricCurrent.kt
index 6b1502f3b..a6bbbb0cc 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToEnergy.kt
index 9937f21c5..2716b323d 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToMagneticFlux.kt
index 58b2e51b3..f7f01518a 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToMagneticFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToTime.kt
index 0b31b8c39..75b56bcdd 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToVoltage.kt b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToVoltage.kt
index 23d2c0ea3..b834db38c 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCharge/convertToVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCharge/convertToVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricCapacitanceAndFrequency.kt b/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricCapacitanceAndFrequency.kt
index 08fbc060a..7759f6dea 100644
--- a/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricCapacitanceAndFrequency.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricCapacitanceAndFrequency.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricCurrentAndVoltage.kt b/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricCurrentAndVoltage.kt
index c3b3ef7b2..839f4065e 100644
--- a/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricCurrentAndVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricCurrentAndVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricResistance.kt b/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricResistance.kt
index b34bb5aef..30cd26b4f 100644
--- a/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricConductance/convertFromElectricResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricCapacitance.kt b/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricCapacitance.kt
index 0ca92e5a7..7eba7e898 100644
--- a/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricCapacitance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricCapacitance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricCurrent.kt
index 59e4ed93f..107d25d28 100644
--- a/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricResistance.kt b/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricResistance.kt
index cdc7ba9de..612c14087 100644
--- a/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricConductance/convertToElectricResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricConductance/convertToFrequency.kt b/scientific/src/commonMain/kotlin/converter/electricConductance/convertToFrequency.kt
index 9234f807f..18c680476 100644
--- a/scientific/src/commonMain/kotlin/converter/electricConductance/convertToFrequency.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricConductance/convertToFrequency.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromElectricChargeAndTime.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromElectricChargeAndTime.kt
index 59169c7f3..127afb60b 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromElectricChargeAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromElectricChargeAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromEnergyAndMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromEnergyAndMagneticFlux.kt
index 3f184a331..0939dbed9 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromEnergyAndMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromEnergyAndMagneticFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromMagneticFluxAndElectricInductance.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromMagneticFluxAndElectricInductance.kt
index c6ffd83fb..c189514c2 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromMagneticFluxAndElectricInductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromMagneticFluxAndElectricInductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromPowerAndVoltage.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromPowerAndVoltage.kt
index b92eca3e3..9e5f09cda 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromPowerAndVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromPowerAndVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromVoltageAndElectricConductance.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromVoltageAndElectricConductance.kt
index 3a4fb3ee0..15ab0e6af 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromVoltageAndElectricConductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromVoltageAndElectricConductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromVoltageAndElectricResistance.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromVoltageAndElectricResistance.kt
index 172cd7974..00dd400e2 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromVoltageAndElectricResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertFromVoltageAndElectricResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToElectricCharge.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToElectricCharge.kt
index 5553beb4f..3874575c1 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToElectricCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToElectricCharge.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToElectricConductance.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToElectricConductance.kt
index 148d96186..0c66fab05 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToElectricConductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToElectricConductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToEnergy.kt
index 6abfb2f7b..5ec8f8a4e 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToMagneticFlux.kt
index 7c2e0b957..a5a21ecbd 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToMagneticFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToPower.kt
index 2df8a4ed3..b8b9829d6 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToPower.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToVoltage.kt b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToVoltage.kt
index 8fb563375..8c5b82238 100644
--- a/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricCurrent/convertToVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromElectricResistanceAndFrequency.kt b/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromElectricResistanceAndFrequency.kt
index e64f50565..b08a21d04 100644
--- a/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromElectricResistanceAndFrequency.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromElectricResistanceAndFrequency.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromElectricResistanceAndTime.kt b/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromElectricResistanceAndTime.kt
index b1835e849..7771792b8 100644
--- a/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromElectricResistanceAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromElectricResistanceAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromMagneticFluxAndElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromMagneticFluxAndElectricCurrent.kt
index f12cddb58..b82b81ff5 100644
--- a/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromMagneticFluxAndElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricInductance/convertFromMagneticFluxAndElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricInductance/convertToElectricResistance.kt b/scientific/src/commonMain/kotlin/converter/electricInductance/convertToElectricResistance.kt
index 4be987bbf..63ab4950e 100644
--- a/scientific/src/commonMain/kotlin/converter/electricInductance/convertToElectricResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricInductance/convertToElectricResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricInductance/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/electricInductance/convertToMagneticFlux.kt
index 1e61ae50d..f7c30b6f8 100644
--- a/scientific/src/commonMain/kotlin/converter/electricInductance/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricInductance/convertToMagneticFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricInductance/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/electricInductance/convertToTime.kt
index 0d5f9eb1d..f8a2a5006 100644
--- a/scientific/src/commonMain/kotlin/converter/electricInductance/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricInductance/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricConductance.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricConductance.kt
index a0f81da84..689756987 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricConductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricConductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricInductanceAndFrequency.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricInductanceAndFrequency.kt
index 723c5bf16..06a5a376b 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricInductanceAndFrequency.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricInductanceAndFrequency.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricInductanceAndTime.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricInductanceAndTime.kt
index a02447e7d..583f442eb 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricInductanceAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromElectricInductanceAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromMagneticFluxAndElectricCharge.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromMagneticFluxAndElectricCharge.kt
index de6fca565..8ecb77dc3 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromMagneticFluxAndElectricCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromMagneticFluxAndElectricCharge.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromTimeAndElectricCapacitance.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromTimeAndElectricCapacitance.kt
index f8483aa09..bc7402c8b 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromTimeAndElectricCapacitance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromTimeAndElectricCapacitance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromVoltageAndElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromVoltageAndElectricCurrent.kt
index bb3bf0b7c..bce89da5f 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromVoltageAndElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertFromVoltageAndElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToElectricConductance.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToElectricConductance.kt
index 53110b0d5..fa0e002ef 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToElectricConductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToElectricConductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToElectricInductance.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToElectricInductance.kt
index f27130cdd..f59e4cd6b 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToElectricInductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToElectricInductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToFrequency.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToFrequency.kt
index 941b112fa..6f6694ce6 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToFrequency.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToFrequency.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToMagneticFlux.kt
index c2fa451c9..2fc00d537 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToMagneticFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToTime.kt
index 72efd536d..dc49ad1a8 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToVoltage.kt b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToVoltage.kt
index b2b368bbc..e006385f5 100644
--- a/scientific/src/commonMain/kotlin/converter/electricResistance/convertToVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/electricResistance/convertToVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromActionAndTime.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromActionAndTime.kt
index 4821f586f..3084221e6 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromActionAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromActionAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromElectricChargeAndVoltage.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromElectricChargeAndVoltage.kt
index 7f7fa5c60..17fa338b1 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromElectricChargeAndVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromElectricChargeAndVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromForceAndDistance.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromForceAndDistance.kt
index 705d1e1ec..ddfca4744 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromForceAndDistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromForceAndDistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromHeatCapacityAndTemperature.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromHeatCapacityAndTemperature.kt
index 7d0f0203f..7919e0ce4 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromHeatCapacityAndTemperature.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromHeatCapacityAndTemperature.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromIonizingRadiationAbsorbedDoseAndWeight.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromIonizingRadiationAbsorbedDoseAndWeight.kt
index 9dc2db768..e6c8ee760 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromIonizingRadiationAbsorbedDoseAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromIonizingRadiationAbsorbedDoseAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromIonizingRadiationEquivalentDoseAndWeight.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromIonizingRadiationEquivalentDoseAndWeight.kt
index d9b2934a0..6e462fc2b 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromIonizingRadiationEquivalentDoseAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromIonizingRadiationEquivalentDoseAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromMagneticFluxAndElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromMagneticFluxAndElectricCurrent.kt
index 34e9e2b6e..97f1b1847 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromMagneticFluxAndElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromMagneticFluxAndElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromMolarEnergyAndAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromMolarEnergyAndAmountOfSubstance.kt
index bebdd9552..61bd4c6b3 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromMolarEnergyAndAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromMolarEnergyAndAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromPowerAndTime.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromPowerAndTime.kt
index e079156e6..423b19d8e 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromPowerAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromPowerAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromPressureAndVolume.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromPressureAndVolume.kt
index 824584529..ddfb9c649 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromPressureAndVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromPressureAndVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromSpecificEnergyAndWeight.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromSpecificEnergyAndWeight.kt
index 4e077463c..a91eae1f5 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromSpecificEnergyAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromSpecificEnergyAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertFromSurfaceTensionAndArea.kt b/scientific/src/commonMain/kotlin/converter/energy/convertFromSurfaceTensionAndArea.kt
index c146f8593..26e3591ac 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertFromSurfaceTensionAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertFromSurfaceTensionAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToAction.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToAction.kt
index f6a1bb6fe..392d283f2 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToAction.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToAction.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToAmountOfSubstance.kt
index 9cb78ac7d..e23a428a5 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt
index 354ac314e..08cc6f1e9 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt
index 74429147d..e522a81aa 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt
index c1b2e2d60..bb41cf0ea 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt
index 8d25ddb63..2f78dff70 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToHeatCapacity.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToHeatCapacity.kt
index 703ce4af0..740b2d0a2 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToHeatCapacity.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToHeatCapacity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt
index 18b432484..9429501d7 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt
index 1295f6dc3..5a33dca98 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt
index 158781285..900853716 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt
index 8ae98cedc..3b030f1a1 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToMolarEnergy.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToMolarEnergy.kt
index c30cd84d4..ea1ea09a1 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToMolarEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToMolarEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt
index 2597f8b59..2529c918d 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt
index 9f804902d..85dd535dc 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToSpecificEnergy.kt
index 589f10989..c14a7ff12 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToSpecificEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt
index d18661a48..c9a30bc2d 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToTemperature.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToTemperature.kt
index 8b6e501f0..e136ab9a8 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToTemperature.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToTemperature.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt
index 3be3159c4..00e113b30 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt
index 263e7e4c6..b97512eb9 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt
index eba7eac02..2d366ee50 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt
index 0082fe700..3f7800a87 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertFromEnergyAndLength.kt b/scientific/src/commonMain/kotlin/converter/force/convertFromEnergyAndLength.kt
index 3ed76621d..a93cbe80e 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertFromEnergyAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertFromEnergyAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertFromMomentumAndTime.kt b/scientific/src/commonMain/kotlin/converter/force/convertFromMomentumAndTime.kt
index b4544d20a..fe03d6f22 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertFromMomentumAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertFromMomentumAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertFromPowerAndSpeed.kt b/scientific/src/commonMain/kotlin/converter/force/convertFromPowerAndSpeed.kt
index 1a31c038c..0e45bc577 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertFromPowerAndSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertFromPowerAndSpeed.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertFromPressureAndArea.kt b/scientific/src/commonMain/kotlin/converter/force/convertFromPressureAndArea.kt
index 26fc9330e..e3df08551 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertFromPressureAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertFromPressureAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertFromSurfaceTensionAndLength.kt b/scientific/src/commonMain/kotlin/converter/force/convertFromSurfaceTensionAndLength.kt
index 76a0338e6..9571997f9 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertFromSurfaceTensionAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertFromSurfaceTensionAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertFromWeightAndAcceleration.kt b/scientific/src/commonMain/kotlin/converter/force/convertFromWeightAndAcceleration.kt
index 4aad2157c..968be1574 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertFromWeightAndAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertFromWeightAndAcceleration.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertFromYankAndTime.kt b/scientific/src/commonMain/kotlin/converter/force/convertFromYankAndTime.kt
index f4874382b..0635f4fc8 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertFromYankAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertFromYankAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt b/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt
index 0f3362501..d6a350be1 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt
index 637d599bd..33f9b2ba3 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt
index df36f7941..e483ef8d1 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/force/convertToLength.kt
index ad3f992bb..7871380f6 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToMomentum.kt b/scientific/src/commonMain/kotlin/converter/force/convertToMomentum.kt
index f91554ce0..394f6f2d3 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToMomentum.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToMomentum.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt
index 0fb1f4efa..b36c108d7 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt b/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt
index 4d6c5de63..e24d36636 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToSurfaceTension.kt b/scientific/src/commonMain/kotlin/converter/force/convertToSurfaceTension.kt
index 8139db2c2..724b1218a 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToSurfaceTension.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToSurfaceTension.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/force/convertToTime.kt
index 12f3a66be..37ab62b03 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/force/convertToWeight.kt
index 5f66b6fec..c484c9cf8 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToYank.kt b/scientific/src/commonMain/kotlin/converter/force/convertToYank.kt
index 765d4172b..69756723e 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToYank.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToYank.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/frequency/convertFromElectricResistanceAndInductance.kt b/scientific/src/commonMain/kotlin/converter/frequency/convertFromElectricResistanceAndInductance.kt
index befe09ee6..1230c9128 100644
--- a/scientific/src/commonMain/kotlin/converter/frequency/convertFromElectricResistanceAndInductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/frequency/convertFromElectricResistanceAndInductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/frequency/convertFromElectricalConductanceAndCapacity.kt b/scientific/src/commonMain/kotlin/converter/frequency/convertFromElectricalConductanceAndCapacity.kt
index d3ab458cd..914342ec7 100644
--- a/scientific/src/commonMain/kotlin/converter/frequency/convertFromElectricalConductanceAndCapacity.kt
+++ b/scientific/src/commonMain/kotlin/converter/frequency/convertFromElectricalConductanceAndCapacity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/frequency/convertFromTime.kt b/scientific/src/commonMain/kotlin/converter/frequency/convertFromTime.kt
index 418bbf6da..601b6b1f7 100644
--- a/scientific/src/commonMain/kotlin/converter/frequency/convertFromTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/frequency/convertFromTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/frequency/convertToDecimal.kt b/scientific/src/commonMain/kotlin/converter/frequency/convertToDecimal.kt
index 181c0555b..c2c775287 100644
--- a/scientific/src/commonMain/kotlin/converter/frequency/convertToDecimal.kt
+++ b/scientific/src/commonMain/kotlin/converter/frequency/convertToDecimal.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/frequency/convertToElectricConductance.kt b/scientific/src/commonMain/kotlin/converter/frequency/convertToElectricConductance.kt
index 59dff5fb1..f80c512b8 100644
--- a/scientific/src/commonMain/kotlin/converter/frequency/convertToElectricConductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/frequency/convertToElectricConductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/frequency/convertToElectricResistance.kt b/scientific/src/commonMain/kotlin/converter/frequency/convertToElectricResistance.kt
index 18bba7381..704dd5a2c 100644
--- a/scientific/src/commonMain/kotlin/converter/frequency/convertToElectricResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/frequency/convertToElectricResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/frequency/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/frequency/convertToTime.kt
index 80d3a2fc8..950e85f90 100644
--- a/scientific/src/commonMain/kotlin/converter/frequency/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/frequency/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/heatCapacity/convertFromEnergyAndTemperature.kt b/scientific/src/commonMain/kotlin/converter/heatCapacity/convertFromEnergyAndTemperature.kt
index 8291fd083..d3f6f7ebe 100644
--- a/scientific/src/commonMain/kotlin/converter/heatCapacity/convertFromEnergyAndTemperature.kt
+++ b/scientific/src/commonMain/kotlin/converter/heatCapacity/convertFromEnergyAndTemperature.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/heatCapacity/convertFromWeightAndSpecificHeatCapacity.kt b/scientific/src/commonMain/kotlin/converter/heatCapacity/convertFromWeightAndSpecificHeatCapacity.kt
index 0005be7a1..2f0289cd5 100644
--- a/scientific/src/commonMain/kotlin/converter/heatCapacity/convertFromWeightAndSpecificHeatCapacity.kt
+++ b/scientific/src/commonMain/kotlin/converter/heatCapacity/convertFromWeightAndSpecificHeatCapacity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToEnergy.kt
index a497b19f0..f2824cf66 100644
--- a/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToSpecificHeatCapacity.kt b/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToSpecificHeatCapacity.kt
index eadc21fbe..22eba0f96 100644
--- a/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToSpecificHeatCapacity.kt
+++ b/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToSpecificHeatCapacity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToWeight.kt
index 6e01fe27e..6330bc5f4 100644
--- a/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/heatCapacity/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminanceAndSolidAngle.kt b/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminanceAndSolidAngle.kt
index 6f664753a..b8ae03cf4 100644
--- a/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminanceAndSolidAngle.kt
+++ b/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminanceAndSolidAngle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminousExposureAndTime.kt b/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminousExposureAndTime.kt
index 35948ce53..307eb0fc5 100644
--- a/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminousExposureAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminousExposureAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminousFluxAndArea.kt b/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminousFluxAndArea.kt
index ce780036b..bd9574f0a 100644
--- a/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminousFluxAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/illuminance/convertFromLuminousFluxAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt b/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt
index c3c484991..b14e85ef6 100644
--- a/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminousExposure.kt b/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminousExposure.kt
index 77b88b770..12c9b4dc9 100644
--- a/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminousExposure.kt
+++ b/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminousExposure.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminousFlux.kt b/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminousFlux.kt
index b69efd8a3..4402da622 100644
--- a/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminousFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminousFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/illuminance/convertToSolidAngle.kt b/scientific/src/commonMain/kotlin/converter/illuminance/convertToSolidAngle.kt
index 29da8ad6e..6a8f32e48 100644
--- a/scientific/src/commonMain/kotlin/converter/illuminance/convertToSolidAngle.kt
+++ b/scientific/src/commonMain/kotlin/converter/illuminance/convertToSolidAngle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertFromEnergyAndWeight.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertFromEnergyAndWeight.kt
index 043cd3ba7..2dc40c7d5 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertFromEnergyAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertFromEnergyAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertFromSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertFromSpecificEnergy.kt
index 4df43ed37..731a9d291 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertFromSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertFromSpecificEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToEnergy.kt
index d17941b6a..0f0823f98 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToSpecificEnergy.kt
index d2bb27bfb..d3e7db99d 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToSpecificEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertFromEnergyAndWeight.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertFromEnergyAndWeight.kt
index d949e35c2..6bdc51e58 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertFromEnergyAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertFromEnergyAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToEnergy.kt
index 04293ee60..8456f42dc 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/jolt/convertFromAccelerationAndTime.kt b/scientific/src/commonMain/kotlin/converter/jolt/convertFromAccelerationAndTime.kt
index a8fe9dcc8..087f14b20 100644
--- a/scientific/src/commonMain/kotlin/converter/jolt/convertFromAccelerationAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/jolt/convertFromAccelerationAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/jolt/convertFromYankAndMass.kt b/scientific/src/commonMain/kotlin/converter/jolt/convertFromYankAndMass.kt
index 95d311c5f..ae36d0aed 100644
--- a/scientific/src/commonMain/kotlin/converter/jolt/convertFromYankAndMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/jolt/convertFromYankAndMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/jolt/convertToAcceleration.kt b/scientific/src/commonMain/kotlin/converter/jolt/convertToAcceleration.kt
index f09e44b12..cb806cc84 100644
--- a/scientific/src/commonMain/kotlin/converter/jolt/convertToAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/jolt/convertToAcceleration.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/jolt/convertToYank.kt b/scientific/src/commonMain/kotlin/converter/jolt/convertToYank.kt
index b2ff3f234..2a1e46f12 100644
--- a/scientific/src/commonMain/kotlin/converter/jolt/convertToYank.kt
+++ b/scientific/src/commonMain/kotlin/converter/jolt/convertToYank.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertFromAreaAndLength.kt b/scientific/src/commonMain/kotlin/converter/length/convertFromAreaAndLength.kt
index 1746dae04..55d3da2e5 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertFromAreaAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertFromAreaAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertFromAreaDensityAndDensity.kt b/scientific/src/commonMain/kotlin/converter/length/convertFromAreaDensityAndDensity.kt
index 016af2403..a9dbb7b63 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertFromAreaDensityAndDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertFromAreaDensityAndDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertFromAreaDensityAndSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/length/convertFromAreaDensityAndSpecificVolume.kt
index 7861311a4..bd4130272 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertFromAreaDensityAndSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertFromAreaDensityAndSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertFromEnergyAndForce.kt b/scientific/src/commonMain/kotlin/converter/length/convertFromEnergyAndForce.kt
index ba211b329..9ce865d41 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertFromEnergyAndForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertFromEnergyAndForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertFromForceAndSurfaceTension.kt b/scientific/src/commonMain/kotlin/converter/length/convertFromForceAndSurfaceTension.kt
index fab3b3f75..822f6f084 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertFromForceAndSurfaceTension.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertFromForceAndSurfaceTension.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertFromLinearMassDensityAndDensity.kt b/scientific/src/commonMain/kotlin/converter/length/convertFromLinearMassDensityAndDensity.kt
index 3a9cdffd4..a2603ffb2 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertFromLinearMassDensityAndDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertFromLinearMassDensityAndDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertFromSpeedAndTime.kt b/scientific/src/commonMain/kotlin/converter/length/convertFromSpeedAndTime.kt
index e709b068b..79c8d2d55 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertFromSpeedAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertFromSpeedAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertFromVolumeAndArea.kt b/scientific/src/commonMain/kotlin/converter/length/convertFromVolumeAndArea.kt
index 6f4dac156..eaa6aca3c 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertFromVolumeAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertFromVolumeAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertFromWeightAndLinearMassDensity.kt b/scientific/src/commonMain/kotlin/converter/length/convertFromWeightAndLinearMassDensity.kt
index d9e4559a6..c27e53b7b 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertFromWeightAndLinearMassDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertFromWeightAndLinearMassDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/length/convertToArea.kt
index 4ffd6dc9b..94689159e 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToAreaDensity.kt b/scientific/src/commonMain/kotlin/converter/length/convertToAreaDensity.kt
index 584d317d8..89a65a5b8 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToAreaDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToAreaDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt
index 0679b0e0d..b4d779458 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/length/convertToForce.kt
index 984e90041..f04dc7ccc 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToLinearMassDensity.kt b/scientific/src/commonMain/kotlin/converter/length/convertToLinearMassDensity.kt
index c610672d7..eae609cc8 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToLinearMassDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToLinearMassDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/length/convertToSpecificVolume.kt
index f52970151..c6e9b83bc 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToSpeed.kt b/scientific/src/commonMain/kotlin/converter/length/convertToSpeed.kt
index 4d4cd0495..fbcfc8500 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToSpeed.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/length/convertToTime.kt
index 62396023d..e36c799fc 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/length/convertToWeight.kt
index cdfed5ae3..a63864715 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromAreaAndSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromAreaAndSpecificVolume.kt
index 8b722929c..c807bd8cc 100644
--- a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromAreaAndSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromAreaAndSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromAreaDensityAndLength.kt b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromAreaDensityAndLength.kt
index 4548991a8..ff0fa5806 100644
--- a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromAreaDensityAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromAreaDensityAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromDensityAndLength.kt b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromDensityAndLength.kt
index 7da22ef3a..c3f4ebc73 100644
--- a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromDensityAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromDensityAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromWeightAndArea.kt b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromWeightAndArea.kt
index fadfa20eb..466f6c17b 100644
--- a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromWeightAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertFromWeightAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToArea.kt
index fdad2cb83..1d1f33d34 100644
--- a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToAreaDensity.kt b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToAreaDensity.kt
index 927c6757a..53bd6d793 100644
--- a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToAreaDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToAreaDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToDensity.kt b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToDensity.kt
index 648d7b414..75514ddc6 100644
--- a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToLength.kt
index c3ad455bc..77d5de476 100644
--- a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToWeight.kt
index 0787bbce2..9f081e31e 100644
--- a/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/linearMassDensity/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminance/convertFromIlluminanceAndSolidAngle.kt b/scientific/src/commonMain/kotlin/converter/luminance/convertFromIlluminanceAndSolidAngle.kt
index 81622a823..3f995df5a 100644
--- a/scientific/src/commonMain/kotlin/converter/luminance/convertFromIlluminanceAndSolidAngle.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminance/convertFromIlluminanceAndSolidAngle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminance/convertFromLuminousIntensityAndArea.kt b/scientific/src/commonMain/kotlin/converter/luminance/convertFromLuminousIntensityAndArea.kt
index 8a47bff32..173e094aa 100644
--- a/scientific/src/commonMain/kotlin/converter/luminance/convertFromLuminousIntensityAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminance/convertFromLuminousIntensityAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminance/convertToIlluminance.kt b/scientific/src/commonMain/kotlin/converter/luminance/convertToIlluminance.kt
index cd73b1fcc..27b3573fc 100644
--- a/scientific/src/commonMain/kotlin/converter/luminance/convertToIlluminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminance/convertToIlluminance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminance/convertToLuminousIntensity.kt b/scientific/src/commonMain/kotlin/converter/luminance/convertToLuminousIntensity.kt
index 53c33e817..5786fe5ee 100644
--- a/scientific/src/commonMain/kotlin/converter/luminance/convertToLuminousIntensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminance/convertToLuminousIntensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertFromLuminousExposureAndArea.kt b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertFromLuminousExposureAndArea.kt
index f9c8aa00a..cbd6d1af3 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertFromLuminousExposureAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertFromLuminousExposureAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertFromLuminousFluxAndTime.kt b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertFromLuminousFluxAndTime.kt
index a8df68c18..10d07b7fb 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertFromLuminousFluxAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertFromLuminousFluxAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToArea.kt
index ecfae57af..7f0b08dfb 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToLuminousExposure.kt b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToLuminousExposure.kt
index e7fa3b5b9..ea835b906 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToLuminousExposure.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToLuminousExposure.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToLuminousFlux.kt b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToLuminousFlux.kt
index ae13e7564..b0f2dbf9c 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToLuminousFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToLuminousFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToTime.kt
index 6fd8384df..3bc1c8554 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousEnergy/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousExposure/convertFromIlluminanceAndTime.kt b/scientific/src/commonMain/kotlin/converter/luminousExposure/convertFromIlluminanceAndTime.kt
index cc49e9770..2c5e93d2b 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousExposure/convertFromIlluminanceAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousExposure/convertFromIlluminanceAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousExposure/convertFromLuminousEnergyAndArea.kt b/scientific/src/commonMain/kotlin/converter/luminousExposure/convertFromLuminousEnergyAndArea.kt
index 230d0e37b..c34ddd5d0 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousExposure/convertFromLuminousEnergyAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousExposure/convertFromLuminousEnergyAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToIlluminance.kt b/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToIlluminance.kt
index 10d358505..7c9ea9066 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToIlluminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToIlluminance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToLuminousEnergy.kt b/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToLuminousEnergy.kt
index 7a5be6904..6d0833052 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToLuminousEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToLuminousEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToTime.kt
index a1e156c28..157e59e4d 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousExposure/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromIlluminanceAndArea.kt b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromIlluminanceAndArea.kt
index 8569ba8b5..f33f7fc2b 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromIlluminanceAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromIlluminanceAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromLuminousEnergyAndTime.kt b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromLuminousEnergyAndTime.kt
index 073348082..1f96e448a 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromLuminousEnergyAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromLuminousEnergyAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromLuminousIntensityAndSolidAngle.kt b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromLuminousIntensityAndSolidAngle.kt
index 69393c658..5ee18e342 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromLuminousIntensityAndSolidAngle.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertFromLuminousIntensityAndSolidAngle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt
index ad1426bb9..285dd37d4 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToIlluminance.kt b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToIlluminance.kt
index 80945464d..02ff3a25f 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToIlluminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToIlluminance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToLuminousEnergy.kt b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToLuminousEnergy.kt
index 5ff039a89..5fecde86e 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToLuminousEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToLuminousEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToLuminousIntensity.kt b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToLuminousIntensity.kt
index 98d04de16..4cb832966 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToLuminousIntensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToLuminousIntensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToSolidAngle.kt b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToSolidAngle.kt
index 259e6679a..970c435c7 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToSolidAngle.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToSolidAngle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertFromLuminanceAndArea.kt b/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertFromLuminanceAndArea.kt
index ea7959cfc..111086cb9 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertFromLuminanceAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertFromLuminanceAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertFromLuminousFluxAndSolidAngle.kt b/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertFromLuminousFluxAndSolidAngle.kt
index 110c8316c..a65113b98 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertFromLuminousFluxAndSolidAngle.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertFromLuminousFluxAndSolidAngle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToArea.kt
index 5ae49d437..889362645 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToLuminance.kt b/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToLuminance.kt
index 62c8af122..29110a0b3 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToLuminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToLuminance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToLuminousFlux.kt b/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToLuminousFlux.kt
index 0a4f4fbd4..c228e4ae2 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToLuminousFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousIntensity/convertToLuminousFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromElectricInductanceAndCurrent.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromElectricInductanceAndCurrent.kt
index 74d038530..de1c95388 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromElectricInductanceAndCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromElectricInductanceAndCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromElectricResistanceAndCharge.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromElectricResistanceAndCharge.kt
index eb45817a8..4b876698a 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromElectricResistanceAndCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromElectricResistanceAndCharge.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromEnergyAndElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromEnergyAndElectricCurrent.kt
index 93279c7ae..74faf4e9d 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromEnergyAndElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromEnergyAndElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromMagneticInductionAndArea.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromMagneticInductionAndArea.kt
index 80e066557..07cf72683 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromMagneticInductionAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromMagneticInductionAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromVoltageAndTime.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromVoltageAndTime.kt
index dc118caec..373dcba99 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromVoltageAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertFromVoltageAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToArea.kt
index 317ba2483..f3ce44749 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricCharge.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricCharge.kt
index 103f1c193..ca2c3c30e 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricCharge.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricCurrent.kt
index eab6f24fe..5fd5805ba 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricInductance.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricInductance.kt
index 5ea1d532c..c6712796f 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricInductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricInductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricResistance.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricResistance.kt
index 2451890d5..0da304dfb 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToElectricResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToEnergy.kt
index 4a7c4e2c1..0167c508d 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToMagneticInduction.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToMagneticInduction.kt
index 9477bf510..db7d43a90 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToMagneticInduction.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToMagneticInduction.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToTime.kt
index 6ef2c047a..d3626186e 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToVoltage.kt b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToVoltage.kt
index 7adc3f242..08acf8e6f 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticFlux/convertToVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticInduction/convertFromMagneticFluxAndArea.kt b/scientific/src/commonMain/kotlin/converter/magneticInduction/convertFromMagneticFluxAndArea.kt
index e11f71505..c03eab7c9 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticInduction/convertFromMagneticFluxAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticInduction/convertFromMagneticFluxAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/magneticInduction/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/magneticInduction/convertToMagneticFlux.kt
index 4e8b616c7..f5bfa0ad8 100644
--- a/scientific/src/commonMain/kotlin/converter/magneticInduction/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/magneticInduction/convertToMagneticFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/massFlowRate/convertFromWeightAndArea.kt b/scientific/src/commonMain/kotlin/converter/massFlowRate/convertFromWeightAndArea.kt
index 7ab456880..5a632428c 100644
--- a/scientific/src/commonMain/kotlin/converter/massFlowRate/convertFromWeightAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/massFlowRate/convertFromWeightAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/massFlowRate/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/massFlowRate/convertToWeight.kt
index d0efe843d..d6806058c 100644
--- a/scientific/src/commonMain/kotlin/converter/massFlowRate/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/massFlowRate/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertFromAmountOfSubstanceAndWeight.kt b/scientific/src/commonMain/kotlin/converter/molality/convertFromAmountOfSubstanceAndWeight.kt
index 13131e35a..c57a25069 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertFromAmountOfSubstanceAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertFromAmountOfSubstanceAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarMass.kt b/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarMass.kt
index 6148e9458..138646fd4 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarityAndDensity.kt b/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarityAndDensity.kt
index 9c0fc0931..7343187ae 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarityAndDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarityAndDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarityAndSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarityAndSpecificVolume.kt
index d90b8c7ee..3692c3a44 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarityAndSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertFromMolarityAndSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertFromSpecificEnergyAndMolarEnergy.kt b/scientific/src/commonMain/kotlin/converter/molality/convertFromSpecificEnergyAndMolarEnergy.kt
index 9acf8e7fb..913431ab9 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertFromSpecificEnergyAndMolarEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertFromSpecificEnergyAndMolarEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertFromSpecificVolumeAndMolarVolume.kt b/scientific/src/commonMain/kotlin/converter/molality/convertFromSpecificVolumeAndMolarVolume.kt
index a0db002e7..91d329ff9 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertFromSpecificVolumeAndMolarVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertFromSpecificVolumeAndMolarVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertToAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/molality/convertToAmountOfSubstance.kt
index d42e22969..9b25601bf 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertToAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertToAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertToMolarMass.kt b/scientific/src/commonMain/kotlin/converter/molality/convertToMolarMass.kt
index ee0833e9b..923e39c3b 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertToMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertToMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertToMolarity.kt b/scientific/src/commonMain/kotlin/converter/molality/convertToMolarity.kt
index eecbf6bf5..d56a697c1 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertToMolarity.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertToMolarity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificEnergy.kt
index 20515ac3a..6d08cd1c8 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificVolume.kt
index df41f29d3..05779ea2d 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromEnergyAndAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromEnergyAndAmountOfSubstance.kt
index dd20839e6..af8b79d26 100644
--- a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromEnergyAndAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromEnergyAndAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromSpecificEnergyAndMolality.kt b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromSpecificEnergyAndMolality.kt
index bb3ecf786..62da476f0 100644
--- a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromSpecificEnergyAndMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromSpecificEnergyAndMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromSpecificEnergyAndMolarMass.kt b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromSpecificEnergyAndMolarMass.kt
index f19129844..0810089ab 100644
--- a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromSpecificEnergyAndMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertFromSpecificEnergyAndMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToEnergy.kt
index 24601ce9b..42089df10 100644
--- a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarEnergy.kt b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarEnergy.kt
index 4abd1b241..7c3e3c7ff 100644
--- a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToSpecificEnergy.kt
index 1d918a298..59585748d 100644
--- a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToSpecificEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromDensityAndMolarVolume.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromDensityAndMolarVolume.kt
index 4bbf5ea15..e2dc5d354 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromDensityAndMolarVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromDensityAndMolarVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromDensityAndMolarity.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromDensityAndMolarity.kt
index 025f100de..d142bc26f 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromDensityAndMolarity.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromDensityAndMolarity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolality.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolality.kt
index b0227a377..c0145f450 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolarEnergyAndSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolarEnergyAndSpecificEnergy.kt
index cf816a7e6..bbc82df09 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolarEnergyAndSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolarEnergyAndSpecificEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolarVolumeAndSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolarVolumeAndSpecificVolume.kt
index cc42f275b..1858ace55 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolarVolumeAndSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromMolarVolumeAndSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromWeightAndAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromWeightAndAmountOfSubstance.kt
index 224585f1f..2d4e89774 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertFromWeightAndAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertFromWeightAndAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertToDensity.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertToDensity.kt
index 5a031f748..f578a518b 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertToDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertToDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolality.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolality.kt
index 7a73f8f32..fb2d5ffea 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolarEnergy.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolarEnergy.kt
index 8f4a38dd0..72a562691 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolarEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolarEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolarVolume.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolarVolume.kt
index 8023b98aa..2d5bd3843 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolarVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertToMolarVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarMass/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/molarMass/convertToWeight.kt
index 9400e96db..ef2ef4a35 100644
--- a/scientific/src/commonMain/kotlin/converter/molarMass/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarMass/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromMolarMassAndDensity.kt b/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromMolarMassAndDensity.kt
index a156ede6c..729f27524 100644
--- a/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromMolarMassAndDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromMolarMassAndDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromMolarity.kt b/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromMolarity.kt
index 5b8790401..10b6f83e0 100644
--- a/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromMolarity.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromMolarity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromSpecificVolumeAndMolality.kt b/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromSpecificVolumeAndMolality.kt
index 4f2d94af2..27765ccfb 100644
--- a/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromSpecificVolumeAndMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromSpecificVolumeAndMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromSpecificVolumeAndMolarMass.kt b/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromSpecificVolumeAndMolarMass.kt
index 1658ca0bd..5b0ead619 100644
--- a/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromSpecificVolumeAndMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromSpecificVolumeAndMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromVolumeAndAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromVolumeAndAmountOfSubstance.kt
index 98db2f8e1..6f17c4cd3 100644
--- a/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromVolumeAndAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarVolume/convertFromVolumeAndAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarVolume/convertToMolarMass.kt b/scientific/src/commonMain/kotlin/converter/molarVolume/convertToMolarMass.kt
index 695ebdd5a..717f5b67e 100644
--- a/scientific/src/commonMain/kotlin/converter/molarVolume/convertToMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarVolume/convertToMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarVolume/convertToMolarity.kt b/scientific/src/commonMain/kotlin/converter/molarVolume/convertToMolarity.kt
index 95e6ad81c..af7a4486d 100644
--- a/scientific/src/commonMain/kotlin/converter/molarVolume/convertToMolarity.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarVolume/convertToMolarity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarVolume/convertToSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/molarVolume/convertToSpecificVolume.kt
index e15ba033f..03773505b 100644
--- a/scientific/src/commonMain/kotlin/converter/molarVolume/convertToSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarVolume/convertToSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarVolume/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/molarVolume/convertToVolume.kt
index a57cdcb81..ac1c03f31 100644
--- a/scientific/src/commonMain/kotlin/converter/molarVolume/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarVolume/convertToVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarity/convertFromAmountOfSubstanceAndVolume.kt b/scientific/src/commonMain/kotlin/converter/molarity/convertFromAmountOfSubstanceAndVolume.kt
index e32ed66c7..7f519e632 100644
--- a/scientific/src/commonMain/kotlin/converter/molarity/convertFromAmountOfSubstanceAndVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarity/convertFromAmountOfSubstanceAndVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarity/convertFromDensityAndMolality.kt b/scientific/src/commonMain/kotlin/converter/molarity/convertFromDensityAndMolality.kt
index 640924109..c56e06fb8 100644
--- a/scientific/src/commonMain/kotlin/converter/molarity/convertFromDensityAndMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarity/convertFromDensityAndMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarity/convertFromDensityAndMolarMass.kt b/scientific/src/commonMain/kotlin/converter/molarity/convertFromDensityAndMolarMass.kt
index 267cc0fc2..e74174724 100644
--- a/scientific/src/commonMain/kotlin/converter/molarity/convertFromDensityAndMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarity/convertFromDensityAndMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarity/convertFromMolalityAndSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/molarity/convertFromMolalityAndSpecificVolume.kt
index 37835842e..56359d9fe 100644
--- a/scientific/src/commonMain/kotlin/converter/molarity/convertFromMolalityAndSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarity/convertFromMolalityAndSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarity/convertFromMolarVolume.kt b/scientific/src/commonMain/kotlin/converter/molarity/convertFromMolarVolume.kt
index a212c9c62..329c475ad 100644
--- a/scientific/src/commonMain/kotlin/converter/molarity/convertFromMolarVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarity/convertFromMolarVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarity/convertToAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/molarity/convertToAmountOfSubstance.kt
index 95a2703ae..f47b654eb 100644
--- a/scientific/src/commonMain/kotlin/converter/molarity/convertToAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarity/convertToAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarity/convertToDensity.kt b/scientific/src/commonMain/kotlin/converter/molarity/convertToDensity.kt
index d28cc0d38..9d21a2566 100644
--- a/scientific/src/commonMain/kotlin/converter/molarity/convertToDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarity/convertToDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarity/convertToMolality.kt b/scientific/src/commonMain/kotlin/converter/molarity/convertToMolality.kt
index dc3367554..b4e060a66 100644
--- a/scientific/src/commonMain/kotlin/converter/molarity/convertToMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarity/convertToMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/molarity/convertToMolarVolume.kt b/scientific/src/commonMain/kotlin/converter/molarity/convertToMolarVolume.kt
index f002bf036..20173f061 100644
--- a/scientific/src/commonMain/kotlin/converter/molarity/convertToMolarVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarity/convertToMolarVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/momentum/convertFromDynamicViscosityAndArea.kt b/scientific/src/commonMain/kotlin/converter/momentum/convertFromDynamicViscosityAndArea.kt
index e45f04c61..21a1df525 100644
--- a/scientific/src/commonMain/kotlin/converter/momentum/convertFromDynamicViscosityAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/momentum/convertFromDynamicViscosityAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/momentum/convertFromForceAndTime.kt b/scientific/src/commonMain/kotlin/converter/momentum/convertFromForceAndTime.kt
index b040c157b..ec7e6bfc0 100644
--- a/scientific/src/commonMain/kotlin/converter/momentum/convertFromForceAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/momentum/convertFromForceAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/momentum/convertFromMassAndSpeed.kt b/scientific/src/commonMain/kotlin/converter/momentum/convertFromMassAndSpeed.kt
index 804bd88ad..5e826a2b9 100644
--- a/scientific/src/commonMain/kotlin/converter/momentum/convertFromMassAndSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/momentum/convertFromMassAndSpeed.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/momentum/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/momentum/convertToArea.kt
index 85263a35e..a593ee52d 100644
--- a/scientific/src/commonMain/kotlin/converter/momentum/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/momentum/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/momentum/convertToDynamicViscosity.kt b/scientific/src/commonMain/kotlin/converter/momentum/convertToDynamicViscosity.kt
index 2e8aa254c..b37c9d637 100644
--- a/scientific/src/commonMain/kotlin/converter/momentum/convertToDynamicViscosity.kt
+++ b/scientific/src/commonMain/kotlin/converter/momentum/convertToDynamicViscosity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/momentum/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/momentum/convertToForce.kt
index a91639d2b..9ee819bcd 100644
--- a/scientific/src/commonMain/kotlin/converter/momentum/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/momentum/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/momentum/convertToSpeed.kt b/scientific/src/commonMain/kotlin/converter/momentum/convertToSpeed.kt
index 32f324227..17e5467fb 100644
--- a/scientific/src/commonMain/kotlin/converter/momentum/convertToSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/momentum/convertToSpeed.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/momentum/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/momentum/convertToWeight.kt
index 3da363a08..c50004b0a 100644
--- a/scientific/src/commonMain/kotlin/converter/momentum/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/momentum/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertFromEnergyAndTime.kt b/scientific/src/commonMain/kotlin/converter/power/convertFromEnergyAndTime.kt
index a470b4862..842324bf0 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertFromEnergyAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertFromEnergyAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertFromForceAndSpeed.kt b/scientific/src/commonMain/kotlin/converter/power/convertFromForceAndSpeed.kt
index 67c740bd7..e1581c965 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertFromForceAndSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertFromForceAndSpeed.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertFromTemperatureAndThermalResistance.kt b/scientific/src/commonMain/kotlin/converter/power/convertFromTemperatureAndThermalResistance.kt
index 94bb3c4fd..4b7d39adc 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertFromTemperatureAndThermalResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertFromTemperatureAndThermalResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertFromVoltageAndElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/power/convertFromVoltageAndElectricCurrent.kt
index 92d864d8d..3633eef72 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertFromVoltageAndElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertFromVoltageAndElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertToElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/power/convertToElectricCurrent.kt
index 57a962a9f..817b2b1f8 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertToElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertToElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/power/convertToEnergy.kt
index 8938b3ce2..e271904af 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/power/convertToForce.kt
index 400de9426..6aef4b46b 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt b/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt
index c238d035d..5b068dc13 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertToTemperature.kt b/scientific/src/commonMain/kotlin/converter/power/convertToTemperature.kt
index d7e38b838..cabd035f7 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertToTemperature.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertToTemperature.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertToVoltage.kt b/scientific/src/commonMain/kotlin/converter/power/convertToVoltage.kt
index f8498f649..7f920fc76 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertToVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertToVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/pressure/convertFromDynamicViscosityAndTime.kt b/scientific/src/commonMain/kotlin/converter/pressure/convertFromDynamicViscosityAndTime.kt
index 91d13b2ff..e06370b03 100644
--- a/scientific/src/commonMain/kotlin/converter/pressure/convertFromDynamicViscosityAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/pressure/convertFromDynamicViscosityAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/pressure/convertFromEnergyAndVolume.kt b/scientific/src/commonMain/kotlin/converter/pressure/convertFromEnergyAndVolume.kt
index 09f41e2af..492109626 100644
--- a/scientific/src/commonMain/kotlin/converter/pressure/convertFromEnergyAndVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/pressure/convertFromEnergyAndVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/pressure/convertFromForceAndArea.kt b/scientific/src/commonMain/kotlin/converter/pressure/convertFromForceAndArea.kt
index aeae00e07..c98004f22 100644
--- a/scientific/src/commonMain/kotlin/converter/pressure/convertFromForceAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/pressure/convertFromForceAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/pressure/convertToDynamicViscosity.kt b/scientific/src/commonMain/kotlin/converter/pressure/convertToDynamicViscosity.kt
index 478955a1f..f1fc9b918 100644
--- a/scientific/src/commonMain/kotlin/converter/pressure/convertToDynamicViscosity.kt
+++ b/scientific/src/commonMain/kotlin/converter/pressure/convertToDynamicViscosity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt
index 8e89ccd28..6b319cb72 100644
--- a/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt
index b71b9bea0..f39a3d79b 100644
--- a/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/radioactivity/convertFromAmountOfSubstanceAndTime.kt b/scientific/src/commonMain/kotlin/converter/radioactivity/convertFromAmountOfSubstanceAndTime.kt
index 0145d77f9..4e8ecf6f5 100644
--- a/scientific/src/commonMain/kotlin/converter/radioactivity/convertFromAmountOfSubstanceAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/radioactivity/convertFromAmountOfSubstanceAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/radioactivity/convertFromTime.kt b/scientific/src/commonMain/kotlin/converter/radioactivity/convertFromTime.kt
index b0b5a9ad4..f1e0c9e8a 100644
--- a/scientific/src/commonMain/kotlin/converter/radioactivity/convertFromTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/radioactivity/convertFromTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/radioactivity/convertToDecimal.kt b/scientific/src/commonMain/kotlin/converter/radioactivity/convertToDecimal.kt
index 7d7d389cd..7ee798c9e 100644
--- a/scientific/src/commonMain/kotlin/converter/radioactivity/convertToDecimal.kt
+++ b/scientific/src/commonMain/kotlin/converter/radioactivity/convertToDecimal.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/solidAngle/convertFromIlluminanceAndLuminance.kt b/scientific/src/commonMain/kotlin/converter/solidAngle/convertFromIlluminanceAndLuminance.kt
index 0522fdd1e..bfc2375ef 100644
--- a/scientific/src/commonMain/kotlin/converter/solidAngle/convertFromIlluminanceAndLuminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/solidAngle/convertFromIlluminanceAndLuminance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/solidAngle/convertFromLuminousFluxAndIntensity.kt b/scientific/src/commonMain/kotlin/converter/solidAngle/convertFromLuminousFluxAndIntensity.kt
index efcfd0208..911013e05 100644
--- a/scientific/src/commonMain/kotlin/converter/solidAngle/convertFromLuminousFluxAndIntensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/solidAngle/convertFromLuminousFluxAndIntensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/solidAngle/convertToIlluminance.kt b/scientific/src/commonMain/kotlin/converter/solidAngle/convertToIlluminance.kt
index 084ea1fef..3dae0db1f 100644
--- a/scientific/src/commonMain/kotlin/converter/solidAngle/convertToIlluminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/solidAngle/convertToIlluminance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/solidAngle/convertToLuminousFlux.kt b/scientific/src/commonMain/kotlin/converter/solidAngle/convertToLuminousFlux.kt
index 61504c6c0..319a67bb3 100644
--- a/scientific/src/commonMain/kotlin/converter/solidAngle/convertToLuminousFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/solidAngle/convertToLuminousFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromEnergyAndWeight.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromEnergyAndWeight.kt
index 17575305a..ee89e476d 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromEnergyAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromEnergyAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromIonizingRadiationAbsorbedDose.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromIonizingRadiationAbsorbedDose.kt
index eae8fbc8e..114972c56 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromIonizingRadiationAbsorbedDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromIonizingRadiationAbsorbedDose.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromMolarEnergyAndMolality.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromMolarEnergyAndMolality.kt
index 5fe4fe96c..bb383e5d1 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromMolarEnergyAndMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromMolarEnergyAndMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromMolarEnergyAndMolarMass.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromMolarEnergyAndMolarMass.kt
index 4d29bd5e1..43367b591 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromMolarEnergyAndMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromMolarEnergyAndMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromSpecificHeatCapacityAndTemperature.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromSpecificHeatCapacityAndTemperature.kt
index b5c5a3bc9..9eddd8a09 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromSpecificHeatCapacityAndTemperature.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromSpecificHeatCapacityAndTemperature.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToEnergy.kt
index b45a3eb22..ab9d73175 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToIonizingRadiationAbsorbedDose.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToIonizingRadiationAbsorbedDose.kt
index 61a002a58..9b98e4bf3 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToIonizingRadiationAbsorbedDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToIonizingRadiationAbsorbedDose.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToMolality.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToMolality.kt
index f477228be..66f8b16b7 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToMolarEnergy.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToMolarEnergy.kt
index 07e2d3ae5..9774ee616 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToMolarEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToMolarEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToSpecificHeatCapacity.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToSpecificHeatCapacity.kt
index 644a8015f..8247406fd 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToSpecificHeatCapacity.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToSpecificHeatCapacity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToTemperature.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToTemperature.kt
index 20b4ce104..d2450fce9 100644
--- a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToTemperature.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToTemperature.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertFromHeatCapacityAndWeight.kt b/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertFromHeatCapacityAndWeight.kt
index fcedfdbb8..d4841c8f1 100644
--- a/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertFromHeatCapacityAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertFromHeatCapacityAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertFromSpecificEnergyAndTemperature.kt b/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertFromSpecificEnergyAndTemperature.kt
index 212fe08f1..fbc476229 100644
--- a/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertFromSpecificEnergyAndTemperature.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertFromSpecificEnergyAndTemperature.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertToHeatCapacity.kt b/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertToHeatCapacity.kt
index 8f0213cd0..91cef2eff 100644
--- a/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertToHeatCapacity.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertToHeatCapacity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertToSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertToSpecificEnergy.kt
index f9d2a82fe..3a362a610 100644
--- a/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertToSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificHeatCapacity/convertToSpecificEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromAreaAndLinearMassDensity.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromAreaAndLinearMassDensity.kt
index fe4e263a7..bb556b8a1 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromAreaAndLinearMassDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromAreaAndLinearMassDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromDensity.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromDensity.kt
index 016fe6f59..e355258d0 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromLengthAndAreaDensity.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromLengthAndAreaDensity.kt
index 02bf6ea4d..521ca6ad3 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromLengthAndAreaDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromLengthAndAreaDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolalityAndMolarVolume.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolalityAndMolarVolume.kt
index 8c9eb5ee7..fbe5b42ee 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolalityAndMolarVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolalityAndMolarVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolalityAndMolarity.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolalityAndMolarity.kt
index 2ba4aa95a..ebed26a0f 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolalityAndMolarity.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolalityAndMolarity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolarVolumeAndMolarMass.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolarVolumeAndMolarMass.kt
index 4d26713f8..2a164bfa1 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolarVolumeAndMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromMolarVolumeAndMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromVolumeAndWeight.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromVolumeAndWeight.kt
index 88f1cb488..1d59895f9 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromVolumeAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertFromVolumeAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToArea.kt
index a17252666..160d059a4 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToDensity.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToDensity.kt
index a735d82fb..adf2ea8a3 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToLength.kt
index e2397d70d..ea5cb02f9 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToMolality.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToMolality.kt
index bbc88dee0..35dcd0313 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToMolarVolume.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToMolarVolume.kt
index a4d2d2db3..fa79ba495 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToMolarVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToMolarVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToVolume.kt
index f2a9fa278..89a97d063 100644
--- a/scientific/src/commonMain/kotlin/converter/specificVolume/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/specificVolume/convertToVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertFromAccelerationAndTime.kt b/scientific/src/commonMain/kotlin/converter/speed/convertFromAccelerationAndTime.kt
index eeea35f7c..88562080d 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertFromAccelerationAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertFromAccelerationAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertFromLengthAndTime.kt b/scientific/src/commonMain/kotlin/converter/speed/convertFromLengthAndTime.kt
index 1092d9748..28eb42b25 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertFromLengthAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertFromLengthAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertFromMomentumAndWeight.kt b/scientific/src/commonMain/kotlin/converter/speed/convertFromMomentumAndWeight.kt
index 9db930935..bbfb0fd26 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertFromMomentumAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertFromMomentumAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertFromPowerAndForce.kt b/scientific/src/commonMain/kotlin/converter/speed/convertFromPowerAndForce.kt
index c4b3d9b7c..508f512f4 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertFromPowerAndForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertFromPowerAndForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertToAcceleration.kt b/scientific/src/commonMain/kotlin/converter/speed/convertToAcceleration.kt
index bff1e1c07..896423f4d 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertToAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertToAcceleration.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/speed/convertToLength.kt
index d83a7dbc5..abf169993 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertToLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertToMomentum.kt b/scientific/src/commonMain/kotlin/converter/speed/convertToMomentum.kt
index 7337ff749..f0cc4a995 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertToMomentum.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertToMomentum.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt
index 34cd15c09..48f93ba6d 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/speed/convertToTime.kt
index 9843f9ed5..1f3dc89e7 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/surfaceTension/convertFromEnergyAndArea.kt b/scientific/src/commonMain/kotlin/converter/surfaceTension/convertFromEnergyAndArea.kt
index 585f68814..3df776abe 100644
--- a/scientific/src/commonMain/kotlin/converter/surfaceTension/convertFromEnergyAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/surfaceTension/convertFromEnergyAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/surfaceTension/convertFromForceAndLength.kt b/scientific/src/commonMain/kotlin/converter/surfaceTension/convertFromForceAndLength.kt
index 6a8be5eb2..1f9ec9bcb 100644
--- a/scientific/src/commonMain/kotlin/converter/surfaceTension/convertFromForceAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/surfaceTension/convertFromForceAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/surfaceTension/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/surfaceTension/convertToEnergy.kt
index f71bf107e..b85a370de 100644
--- a/scientific/src/commonMain/kotlin/converter/surfaceTension/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/surfaceTension/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/surfaceTension/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/surfaceTension/convertToForce.kt
index e4507a3c9..2124e865e 100644
--- a/scientific/src/commonMain/kotlin/converter/surfaceTension/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/surfaceTension/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/temperature/convertDelta.kt b/scientific/src/commonMain/kotlin/converter/temperature/convertDelta.kt
index f5ae1a796..426772c39 100644
--- a/scientific/src/commonMain/kotlin/converter/temperature/convertDelta.kt
+++ b/scientific/src/commonMain/kotlin/converter/temperature/convertDelta.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/temperature/convertFromEnergyAndHeatCapacity.kt b/scientific/src/commonMain/kotlin/converter/temperature/convertFromEnergyAndHeatCapacity.kt
index 2d13d6647..99baca985 100644
--- a/scientific/src/commonMain/kotlin/converter/temperature/convertFromEnergyAndHeatCapacity.kt
+++ b/scientific/src/commonMain/kotlin/converter/temperature/convertFromEnergyAndHeatCapacity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/temperature/convertFromSpecificEnergyAndSpecificHeatCapacity.kt b/scientific/src/commonMain/kotlin/converter/temperature/convertFromSpecificEnergyAndSpecificHeatCapacity.kt
index 993a97bf2..98b0e5298 100644
--- a/scientific/src/commonMain/kotlin/converter/temperature/convertFromSpecificEnergyAndSpecificHeatCapacity.kt
+++ b/scientific/src/commonMain/kotlin/converter/temperature/convertFromSpecificEnergyAndSpecificHeatCapacity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/temperature/convertFromThermalResistanceAndPower.kt b/scientific/src/commonMain/kotlin/converter/temperature/convertFromThermalResistanceAndPower.kt
index e389b8df7..f65237b1f 100644
--- a/scientific/src/commonMain/kotlin/converter/temperature/convertFromThermalResistanceAndPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/temperature/convertFromThermalResistanceAndPower.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/temperature/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/temperature/convertToEnergy.kt
index 40b4abeb4..cbd1c9f02 100644
--- a/scientific/src/commonMain/kotlin/converter/temperature/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/temperature/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/temperature/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/temperature/convertToPower.kt
index 88b864ac9..6d7994408 100644
--- a/scientific/src/commonMain/kotlin/converter/temperature/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/temperature/convertToPower.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/temperature/convertToSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/temperature/convertToSpecificEnergy.kt
index 24c69d535..9cd634460 100644
--- a/scientific/src/commonMain/kotlin/converter/temperature/convertToSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/temperature/convertToSpecificEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/temperature/convertToThermalResistance.kt b/scientific/src/commonMain/kotlin/converter/temperature/convertToThermalResistance.kt
index 0b9621630..91252871b 100644
--- a/scientific/src/commonMain/kotlin/converter/temperature/convertToThermalResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/temperature/convertToThermalResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/thermalResistance/convertFromTemperatureAndPower.kt b/scientific/src/commonMain/kotlin/converter/thermalResistance/convertFromTemperatureAndPower.kt
index 8aa4d381c..fc02f9159 100644
--- a/scientific/src/commonMain/kotlin/converter/thermalResistance/convertFromTemperatureAndPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/thermalResistance/convertFromTemperatureAndPower.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/thermalResistance/convertToTemperature.kt b/scientific/src/commonMain/kotlin/converter/thermalResistance/convertToTemperature.kt
index 05d1d9377..b6ea21afc 100644
--- a/scientific/src/commonMain/kotlin/converter/thermalResistance/convertToTemperature.kt
+++ b/scientific/src/commonMain/kotlin/converter/thermalResistance/convertToTemperature.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromAccelerationAndJolt.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromAccelerationAndJolt.kt
index ed5950c5a..c93edb2fe 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromAccelerationAndJolt.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromAccelerationAndJolt.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromActionAndEnergy.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromActionAndEnergy.kt
index de1e29bfd..aa169bd2c 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromActionAndEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromActionAndEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromAmountOfSubstanceAndCatalysticActivity.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromAmountOfSubstanceAndCatalysticActivity.kt
index c1d57d561..876871ceb 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromAmountOfSubstanceAndCatalysticActivity.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromAmountOfSubstanceAndCatalysticActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromAngleAndAngularVelocity.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromAngleAndAngularVelocity.kt
index 034cf3955..4e82aa2b1 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromAngleAndAngularVelocity.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromAngleAndAngularVelocity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromAngularVelocityAndAcceleration.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromAngularVelocityAndAcceleration.kt
index de48c9c3d..036d0985e 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromAngularVelocityAndAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromAngularVelocityAndAcceleration.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromChargeAndCurrent.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromChargeAndCurrent.kt
index cc536eaa0..31f7d035a 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromChargeAndCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromChargeAndCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromDynamicViscosityAndPressure.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromDynamicViscosityAndPressure.kt
index 4b13e325d..55d7f3300 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromDynamicViscosityAndPressure.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromDynamicViscosityAndPressure.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromElectricCapacitanceAndResistance.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromElectricCapacitanceAndResistance.kt
index af604d79b..26bf9f424 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromElectricCapacitanceAndResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromElectricCapacitanceAndResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromElectricInductanceAndResistance.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromElectricInductanceAndResistance.kt
index e7dc5e71e..47a639c56 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromElectricInductanceAndResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromElectricInductanceAndResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromEnergyAndPower.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromEnergyAndPower.kt
index 35b87e791..4f63691d8 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromEnergyAndPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromEnergyAndPower.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromForceAndYank.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromForceAndYank.kt
index c5b18b6d4..d30dfeade 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromForceAndYank.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromForceAndYank.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromFrequency.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromFrequency.kt
index b30ec4254..f7f872a0e 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromFrequency.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromFrequency.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromLengthAndSpeed.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromLengthAndSpeed.kt
index ff5887820..87232b013 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromLengthAndSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromLengthAndSpeed.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromLuminousEnergyAndLuminousFlux.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromLuminousEnergyAndLuminousFlux.kt
index 9dc59969a..266d73b2e 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromLuminousEnergyAndLuminousFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromLuminousEnergyAndLuminousFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromLuminousExposureAndIlluminance.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromLuminousExposureAndIlluminance.kt
index 2daafebc5..acfe94f3f 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromLuminousExposureAndIlluminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromLuminousExposureAndIlluminance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromMagneticFluxAndVoltage.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromMagneticFluxAndVoltage.kt
index 5003d5024..b1c1956f2 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromMagneticFluxAndVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromMagneticFluxAndVoltage.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromRadioactivity.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromRadioactivity.kt
index 64f32a374..7d6f4e71d 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromRadioactivity.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromRadioactivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromSpeedAndAcceleration.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromSpeedAndAcceleration.kt
index 8762767bd..4426db66d 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromSpeedAndAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromSpeedAndAcceleration.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromWeightAndMassFlowRate.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromWeightAndMassFlowRate.kt
index ae59220ed..2361cda81 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertFromWeightAndMassFlowRate.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromWeightAndMassFlowRate.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToAcceleration.kt b/scientific/src/commonMain/kotlin/converter/time/convertToAcceleration.kt
index 28f4d5d93..195c6766c 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToAcceleration.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToAction.kt b/scientific/src/commonMain/kotlin/converter/time/convertToAction.kt
index 8737a0e36..86c117b97 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToAction.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToAction.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/time/convertToAmountOfSubstance.kt
index c0e694297..322fcdeae 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToAngle.kt b/scientific/src/commonMain/kotlin/converter/time/convertToAngle.kt
index 2ef8f979e..268ff145a 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToAngle.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToAngle.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToAngularVelocity.kt b/scientific/src/commonMain/kotlin/converter/time/convertToAngularVelocity.kt
index 48ffce4af..68fe8cb4d 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToAngularVelocity.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToAngularVelocity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToDecimal.kt b/scientific/src/commonMain/kotlin/converter/time/convertToDecimal.kt
index 68f1ce061..2c55b7995 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToDecimal.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToDecimal.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToDynamicViscosity.kt b/scientific/src/commonMain/kotlin/converter/time/convertToDynamicViscosity.kt
index 4752b81e5..fef3be59d 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToDynamicViscosity.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToDynamicViscosity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToElectricCapacitance.kt b/scientific/src/commonMain/kotlin/converter/time/convertToElectricCapacitance.kt
index 6bef76b22..b07e1f8e7 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToElectricCapacitance.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToElectricCapacitance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToElectricCharge.kt b/scientific/src/commonMain/kotlin/converter/time/convertToElectricCharge.kt
index ab91448a3..8b9b44fd6 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToElectricCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToElectricCharge.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToElectricInductance.kt b/scientific/src/commonMain/kotlin/converter/time/convertToElectricInductance.kt
index 3fa8cd727..dc9901276 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToElectricInductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToElectricInductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToElectricResistance.kt b/scientific/src/commonMain/kotlin/converter/time/convertToElectricResistance.kt
index 45a4a0af3..05e44c86a 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToElectricResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToElectricResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/time/convertToEnergy.kt
index 33cb5692e..2a50b3950 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/time/convertToForce.kt
index e72ec7618..f0f360c10 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToFrequency.kt b/scientific/src/commonMain/kotlin/converter/time/convertToFrequency.kt
index e13d6e805..988f05b8d 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToFrequency.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToFrequency.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/time/convertToLength.kt
index 1db6d5049..743ef2028 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToLuminousEnergy.kt b/scientific/src/commonMain/kotlin/converter/time/convertToLuminousEnergy.kt
index 4ce020d23..19612728b 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToLuminousEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToLuminousEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToLuminousExposure.kt b/scientific/src/commonMain/kotlin/converter/time/convertToLuminousExposure.kt
index 0da0ba384..db751f17d 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToLuminousExposure.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToLuminousExposure.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/time/convertToMagneticFlux.kt
index 5985ea3cb..adc6ca84f 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToMagneticFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToMomentum.kt b/scientific/src/commonMain/kotlin/converter/time/convertToMomentum.kt
index f4585ef0d..7ca7e338b 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToMomentum.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToMomentum.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToSpeed.kt b/scientific/src/commonMain/kotlin/converter/time/convertToSpeed.kt
index 0cf40d655..f1379aca9 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToSpeed.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/time/convertToVolume.kt
index 33309c704..3c45d236f 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/time/convertToWeight.kt
index 36a314ea2..408e2bd4f 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricChargeAndCapacitance.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricChargeAndCapacitance.kt
index 39575e098..6d6db4816 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricChargeAndCapacitance.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricChargeAndCapacitance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricCurrentAndConductance.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricCurrentAndConductance.kt
index 8de9a4064..f412dedc2 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricCurrentAndConductance.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricCurrentAndConductance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricCurrentAndResistance.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricCurrentAndResistance.kt
index e36d306ce..563c82d8b 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricCurrentAndResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertFromElectricCurrentAndResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertFromEnergyAndElectricCharge.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertFromEnergyAndElectricCharge.kt
index 4b0a328a6..bafa51930 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertFromEnergyAndElectricCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertFromEnergyAndElectricCharge.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertFromMagneticFluxAndTime.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertFromMagneticFluxAndTime.kt
index f95ed3aa7..8048d1fe0 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertFromMagneticFluxAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertFromMagneticFluxAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertFromPowerAndElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertFromPowerAndElectricCurrent.kt
index 24c7a998a..0f3e8765e 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertFromPowerAndElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertFromPowerAndElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricCharge.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricCharge.kt
index 4699d7977..1873b62a9 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricCharge.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricCurrent.kt
index 5ef62ca25..6d0f3ab00 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricCurrent.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricResistance.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricResistance.kt
index fcec40dbd..f25d9f1eb 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricResistance.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertToElectricResistance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertToEnergy.kt
index b037f773a..01f1e9257 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertToMagneticFlux.kt
index 699c9f7e5..b52730551 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertToMagneticFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/voltage/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/voltage/convertToPower.kt
index f92a09b03..7b618bd95 100644
--- a/scientific/src/commonMain/kotlin/converter/voltage/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/voltage/convertToPower.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertFromAmountOfSubstanceAndMolarity.kt b/scientific/src/commonMain/kotlin/converter/volume/convertFromAmountOfSubstanceAndMolarity.kt
index 929ccdd1f..b34acf0fe 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertFromAmountOfSubstanceAndMolarity.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertFromAmountOfSubstanceAndMolarity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertFromAreaAndLength.kt b/scientific/src/commonMain/kotlin/converter/volume/convertFromAreaAndLength.kt
index a7ceee85f..d53f51341 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertFromAreaAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertFromAreaAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertFromEnergyAndPressure.kt b/scientific/src/commonMain/kotlin/converter/volume/convertFromEnergyAndPressure.kt
index 908b9e5b1..9119b02eb 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertFromEnergyAndPressure.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertFromEnergyAndPressure.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertFromMolarVolumeAndAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/volume/convertFromMolarVolumeAndAmountOfSubstance.kt
index 03987bd17..2593f8c01 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertFromMolarVolumeAndAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertFromMolarVolumeAndAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertFromSpecificVolumeAndWeight.kt b/scientific/src/commonMain/kotlin/converter/volume/convertFromSpecificVolumeAndWeight.kt
index 87aa73235..4b17f0261 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertFromSpecificVolumeAndWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertFromSpecificVolumeAndWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertFromVolumetricFlowAndTime.kt b/scientific/src/commonMain/kotlin/converter/volume/convertFromVolumetricFlowAndTime.kt
index d0dff692e..662327a1a 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertFromVolumetricFlowAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertFromVolumetricFlowAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertFromWeightAndDensity.kt b/scientific/src/commonMain/kotlin/converter/volume/convertFromWeightAndDensity.kt
index 33df5238c..fc77a33eb 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertFromWeightAndDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertFromWeightAndDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertToAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/volume/convertToAmountOfSubstance.kt
index 7f9b376d6..843f4e649 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertToAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertToAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/volume/convertToArea.kt
index e00cb70ef..fceabaf71 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt
index 43c44bf2f..ebd243f7a 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/volume/convertToLength.kt
index 3e864e0b1..87508020e 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertToLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertToMolarVolume.kt b/scientific/src/commonMain/kotlin/converter/volume/convertToMolarVolume.kt
index e52e25752..08dd67b61 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertToMolarVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertToMolarVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertToSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/volume/convertToSpecificVolume.kt
index 1ef1d6841..a40518a30 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertToSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertToSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/volume/convertToWeight.kt
index e6184b5d4..2279ab689 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertFromVolumeAndTime.kt b/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertFromVolumeAndTime.kt
index 11935a55c..d993d56e7 100644
--- a/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertFromVolumeAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertFromVolumeAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertFromVolumetricFluxAndArea.kt b/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertFromVolumetricFluxAndArea.kt
index 1b4885dfa..781652945 100644
--- a/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertFromVolumetricFluxAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertFromVolumetricFluxAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToArea.kt
index 7d3d6ff45..3831551e2 100644
--- a/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToVolumetricFlux.kt b/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToVolumetricFlux.kt
index e58b4f949..d8201a8cc 100644
--- a/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToVolumetricFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/volumetricFlow/convertToVolumetricFlux.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volumetricFlux/convertFromVolumetricFlowAndArea.kt b/scientific/src/commonMain/kotlin/converter/volumetricFlux/convertFromVolumetricFlowAndArea.kt
index 57a253f61..0b9ea3ac3 100644
--- a/scientific/src/commonMain/kotlin/converter/volumetricFlux/convertFromVolumetricFlowAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/volumetricFlux/convertFromVolumetricFlowAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/volumetricFlux/convertToVolumetricFlow.kt b/scientific/src/commonMain/kotlin/converter/volumetricFlux/convertToVolumetricFlow.kt
index 0076d92d7..4e18efa43 100644
--- a/scientific/src/commonMain/kotlin/converter/volumetricFlux/convertToVolumetricFlow.kt
+++ b/scientific/src/commonMain/kotlin/converter/volumetricFlux/convertToVolumetricFlow.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromAmountOfSubstanceAndMolality.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromAmountOfSubstanceAndMolality.kt
index 19df6758e..2fe95a1fe 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromAmountOfSubstanceAndMolality.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromAmountOfSubstanceAndMolality.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromAreaDensityAndArea.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromAreaDensityAndArea.kt
index 8edc8f0c2..501e8b8b2 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromAreaDensityAndArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromAreaDensityAndArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromDensityAndVolume.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromDensityAndVolume.kt
index 1d3853887..6c316d944 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromDensityAndVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromDensityAndVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndIonizingRadiationAbsorbedDose.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndIonizingRadiationAbsorbedDose.kt
index c22c3dffb..cf09c1cbb 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndIonizingRadiationAbsorbedDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndIonizingRadiationAbsorbedDose.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndIonizingRadiationEquivalentDose.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndIonizingRadiationEquivalentDose.kt
index f4db500be..c0f7a86ca 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndIonizingRadiationEquivalentDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndIonizingRadiationEquivalentDose.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndSpecificEnergy.kt
index a3169343c..89b5be21f 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromEnergyAndSpecificEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromForceAndAcceleration.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromForceAndAcceleration.kt
index 779cc4551..5959ff7f5 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromForceAndAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromForceAndAcceleration.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromHeatCapacityAndSpecificHeatCapacity.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromHeatCapacityAndSpecificHeatCapacity.kt
index 701be7baa..28915bbcc 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromHeatCapacityAndSpecificHeatCapacity.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromHeatCapacityAndSpecificHeatCapacity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromLinearMassDensityAndLength.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromLinearMassDensityAndLength.kt
index 39145b6d6..3511534e2 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromLinearMassDensityAndLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromLinearMassDensityAndLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromMassFlowRateAndTime.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromMassFlowRateAndTime.kt
index 0e53e3d7b..8de21a280 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromMassFlowRateAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromMassFlowRateAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromMolarMassAndAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromMolarMassAndAmountOfSubstance.kt
index 492c93751..afa402867 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromMolarMassAndAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromMolarMassAndAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromMomentumAndSpeed.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromMomentumAndSpeed.kt
index 65a7e9b75..b2b42f55d 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromMomentumAndSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromMomentumAndSpeed.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromVolumeAndSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromVolumeAndSpecificVolume.kt
index 1e87daa0a..4279f3442 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromVolumeAndSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromVolumeAndSpecificVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertFromYankAndJolt.kt b/scientific/src/commonMain/kotlin/converter/weight/convertFromYankAndJolt.kt
index f086a2f95..2f47bc5f9 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertFromYankAndJolt.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertFromYankAndJolt.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToAmountOfSubstance.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToAmountOfSubstance.kt
index c2ba11fb7..d70005732 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToAmountOfSubstance.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToAmountOfSubstance.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToArea.kt
index ebceb0c29..d01666841 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToArea.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToAreaDensity.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToAreaDensity.kt
index 82cca5ff0..3366335c9 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToAreaDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToAreaDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToDensity.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToDensity.kt
index cb0ce8a71..09a06d77a 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToEnergy.kt
index 4e52a2cdb..010877dfb 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToEnergy.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToForce.kt
index 04dfb9de2..a03f88092 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToHeatCapacity.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToHeatCapacity.kt
index 18e926cb8..f9a32cbca 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToHeatCapacity.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToHeatCapacity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToLength.kt
index 689e1e3f6..a8f7fb2f9 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToLength.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToLinearMassDensity.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToLinearMassDensity.kt
index 90caf7c14..03ad423ba 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToLinearMassDensity.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToLinearMassDensity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToMassFlowRate.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToMassFlowRate.kt
index d1d18b2b1..6bef8b44b 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToMassFlowRate.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToMassFlowRate.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToMolarMass.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToMolarMass.kt
index 583de7d82..95c2886dd 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToMolarMass.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToMomentum.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToMomentum.kt
index 1c38b6cc1..19bac0d95 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToMomentum.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToMomentum.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToTime.kt
index ec852c588..f3944c276 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToVolume.kt
index f3694560f..77b39cd49 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToVolume.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToYank.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToYank.kt
index 9535103f7..cbeb00885 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToYank.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToYank.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/yank/convertFromForceAndTime.kt b/scientific/src/commonMain/kotlin/converter/yank/convertFromForceAndTime.kt
index 8f61c2c3e..67512e496 100644
--- a/scientific/src/commonMain/kotlin/converter/yank/convertFromForceAndTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/yank/convertFromForceAndTime.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/yank/convertFromMassAndJolt.kt b/scientific/src/commonMain/kotlin/converter/yank/convertFromMassAndJolt.kt
index af0da8254..4def1c8cb 100644
--- a/scientific/src/commonMain/kotlin/converter/yank/convertFromMassAndJolt.kt
+++ b/scientific/src/commonMain/kotlin/converter/yank/convertFromMassAndJolt.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/yank/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/yank/convertToForce.kt
index 394c2f328..f3693edf4 100644
--- a/scientific/src/commonMain/kotlin/converter/yank/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/yank/convertToForce.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/yank/convertToJolt.kt b/scientific/src/commonMain/kotlin/converter/yank/convertToJolt.kt
index d24ea7357..d1b6982ea 100644
--- a/scientific/src/commonMain/kotlin/converter/yank/convertToJolt.kt
+++ b/scientific/src/commonMain/kotlin/converter/yank/convertToJolt.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/converter/yank/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/yank/convertToWeight.kt
index 9599af2da..9cfb8083d 100644
--- a/scientific/src/commonMain/kotlin/converter/yank/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/yank/convertToWeight.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt b/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt
index 84241bbe5..704eee3a9 100644
--- a/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt b/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt
index 4bcbeeb67..27fe2f5d2 100644
--- a/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt b/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
index 6cb2fbcc8..d5452217f 100644
--- a/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/AreaUnit.kt b/scientific/src/commonMain/kotlin/unit/AreaUnit.kt
index b4e6515f9..b49e6cb7e 100644
--- a/scientific/src/commonMain/kotlin/unit/AreaUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AreaUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/DensityUnit.kt b/scientific/src/commonMain/kotlin/unit/DensityUnit.kt
index a131c3683..dd09d79a0 100644
--- a/scientific/src/commonMain/kotlin/unit/DensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/DensityUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt b/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt
index e4685844e..c20f7dc12 100644
--- a/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
index 2cb10d255..ba623c227 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt
index 0754dcc1f..0e8d3be7a 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt
index 1978d6a74..dfe9d57b7 100644
--- a/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/ForceUnit.kt b/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
index 4a781f735..e10202c84 100644
--- a/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt b/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt
index 4160e8990..7fc9d6b21 100644
--- a/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt b/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt
index 5011b2284..36ea0c641 100644
--- a/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt b/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt
index 8609ae675..f2271a7c2 100644
--- a/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/JoltUnit.kt b/scientific/src/commonMain/kotlin/unit/JoltUnit.kt
index 2325c8aa9..11dd6f9ed 100644
--- a/scientific/src/commonMain/kotlin/unit/JoltUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/JoltUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/LengthUnit.kt b/scientific/src/commonMain/kotlin/unit/LengthUnit.kt
index 1882e3f45..82c764c24 100644
--- a/scientific/src/commonMain/kotlin/unit/LengthUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LengthUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt
index 769c7ffb9..3e1b49d9e 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousEnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminousEnergyUnit.kt
index 4d2379398..fe2a051ba 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousEnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousEnergyUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt
index d254abd9e..20f305b3d 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt b/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt
index 91f335552..a8de6f5f0 100644
--- a/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt
+++ b/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt b/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt
index ff8d50f90..c95ae2866 100644
--- a/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt
index acac9b5f8..ac9b08bc6 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt b/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt
index 63a602ef3..5eb946382 100644
--- a/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/PowerUnit.kt b/scientific/src/commonMain/kotlin/unit/PowerUnit.kt
index a30cb959e..0da75067e 100644
--- a/scientific/src/commonMain/kotlin/unit/PowerUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/PowerUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/PressureUnit.kt b/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
index be433f32e..adfef1a65 100644
--- a/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt b/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt
index 2c076b4af..697dae359 100644
--- a/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt b/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt
index ffe1dea9b..f7314182a 100644
--- a/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt b/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt
index 47aa9b536..80f15ba36 100644
--- a/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
index 9353627db..ee2ca21c2 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
index 5fb5ef351..f768231eb 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt b/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
index 18242c689..7aa0a6f21 100644
--- a/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt b/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt
index 76d11e469..2b1728e54 100644
--- a/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt b/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt
index bc725512e..6a8727f2a 100644
--- a/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/TimeUnit.kt b/scientific/src/commonMain/kotlin/unit/TimeUnit.kt
index 17dbfaf4a..e4b568bc1 100644
--- a/scientific/src/commonMain/kotlin/unit/TimeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/TimeUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
index a4a16a4c2..a1380d6b2 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt
index 04d9232a9..73d58f4d2 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonMain/kotlin/unit/WeightUnit.kt b/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
index 525bea18d..1330c5a9b 100644
--- a/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/ScientificArrayTest.kt b/scientific/src/commonTest/kotlin/ScientificArrayTest.kt
index 9419f0f53..140efdb08 100644
--- a/scientific/src/commonTest/kotlin/ScientificArrayTest.kt
+++ b/scientific/src/commonTest/kotlin/ScientificArrayTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/ScientificValueTest.kt b/scientific/src/commonTest/kotlin/ScientificValueTest.kt
index 58963ea61..41a5b051f 100644
--- a/scientific/src/commonTest/kotlin/ScientificValueTest.kt
+++ b/scientific/src/commonTest/kotlin/ScientificValueTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/Utils.kt b/scientific/src/commonTest/kotlin/Utils.kt
index ab18052c1..0e3f1467e 100644
--- a/scientific/src/commonTest/kotlin/Utils.kt
+++ b/scientific/src/commonTest/kotlin/Utils.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/AccelerationUnitTest.kt b/scientific/src/commonTest/kotlin/unit/AccelerationUnitTest.kt
index 872306db6..d91243e42 100644
--- a/scientific/src/commonTest/kotlin/unit/AccelerationUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/AccelerationUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/ActionUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ActionUnitTest.kt
index 3362d5b95..78e23ef4a 100644
--- a/scientific/src/commonTest/kotlin/unit/ActionUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ActionUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/AmountOfSubstanceUnitTest.kt b/scientific/src/commonTest/kotlin/unit/AmountOfSubstanceUnitTest.kt
index ab753057b..65c66b659 100644
--- a/scientific/src/commonTest/kotlin/unit/AmountOfSubstanceUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/AmountOfSubstanceUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/AngleUnitTest.kt b/scientific/src/commonTest/kotlin/unit/AngleUnitTest.kt
index f3ca35f2c..28383057f 100644
--- a/scientific/src/commonTest/kotlin/unit/AngleUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/AngleUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/AngularAccelerationUnitTest.kt b/scientific/src/commonTest/kotlin/unit/AngularAccelerationUnitTest.kt
index e64b7a888..19cd6f36f 100644
--- a/scientific/src/commonTest/kotlin/unit/AngularAccelerationUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/AngularAccelerationUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/AngularVelocityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/AngularVelocityUnitTest.kt
index a8a628b0d..cfe4ac1b4 100644
--- a/scientific/src/commonTest/kotlin/unit/AngularVelocityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/AngularVelocityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/AreaDensityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/AreaDensityUnitTest.kt
index d70ec06af..2330aee25 100644
--- a/scientific/src/commonTest/kotlin/unit/AreaDensityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/AreaDensityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/AreaUnitTest.kt b/scientific/src/commonTest/kotlin/unit/AreaUnitTest.kt
index 589bf1176..2205574fc 100644
--- a/scientific/src/commonTest/kotlin/unit/AreaUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/AreaUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/CatalysticActivityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/CatalysticActivityUnitTest.kt
index d18e25b4d..0f7d70902 100644
--- a/scientific/src/commonTest/kotlin/unit/CatalysticActivityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/CatalysticActivityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/DensityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/DensityUnitTest.kt
index 5e54d3c1d..514a667c0 100644
--- a/scientific/src/commonTest/kotlin/unit/DensityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/DensityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/DynamicViscosityTest.kt b/scientific/src/commonTest/kotlin/unit/DynamicViscosityTest.kt
index cab93e45a..0b3c21523 100644
--- a/scientific/src/commonTest/kotlin/unit/DynamicViscosityTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/DynamicViscosityTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/ElectricCapacitanceUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ElectricCapacitanceUnitTest.kt
index bc2206811..20aea73a3 100644
--- a/scientific/src/commonTest/kotlin/unit/ElectricCapacitanceUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ElectricCapacitanceUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/ElectricChargeUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ElectricChargeUnitTest.kt
index 0605eb093..a80415032 100644
--- a/scientific/src/commonTest/kotlin/unit/ElectricChargeUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ElectricChargeUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/ElectricConductanceUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ElectricConductanceUnitTest.kt
index f09cd66b7..48c15a83a 100644
--- a/scientific/src/commonTest/kotlin/unit/ElectricConductanceUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ElectricConductanceUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/ElectricCurrentUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ElectricCurrentUnitTest.kt
index cdee10e0e..93e1b79fb 100644
--- a/scientific/src/commonTest/kotlin/unit/ElectricCurrentUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ElectricCurrentUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/ElectricInductanceUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ElectricInductanceUnitTest.kt
index 562807228..4105f57f8 100644
--- a/scientific/src/commonTest/kotlin/unit/ElectricInductanceUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ElectricInductanceUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/ElectricResistanceUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ElectricResistanceUnitTest.kt
index 8f77a344b..181b22ee4 100644
--- a/scientific/src/commonTest/kotlin/unit/ElectricResistanceUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ElectricResistanceUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/EnergyUnitTest.kt b/scientific/src/commonTest/kotlin/unit/EnergyUnitTest.kt
index 0d776dfd2..fcf261447 100644
--- a/scientific/src/commonTest/kotlin/unit/EnergyUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/EnergyUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/ForceUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ForceUnitTest.kt
index 87d90bc25..5376ef352 100644
--- a/scientific/src/commonTest/kotlin/unit/ForceUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ForceUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/FrequencyUnitTest.kt b/scientific/src/commonTest/kotlin/unit/FrequencyUnitTest.kt
index ed2a94d89..be5655f86 100644
--- a/scientific/src/commonTest/kotlin/unit/FrequencyUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/FrequencyUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/HeatCapacityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/HeatCapacityUnitTest.kt
index 31accc3bd..783faded0 100644
--- a/scientific/src/commonTest/kotlin/unit/HeatCapacityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/HeatCapacityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/IlluminanceUnitTest.kt b/scientific/src/commonTest/kotlin/unit/IlluminanceUnitTest.kt
index eb1fa7b03..73b94cd6d 100644
--- a/scientific/src/commonTest/kotlin/unit/IlluminanceUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/IlluminanceUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/IonizingRadiationAbsorbedDoseUnitTest.kt b/scientific/src/commonTest/kotlin/unit/IonizingRadiationAbsorbedDoseUnitTest.kt
index 398ea7fd1..5e0ee257d 100644
--- a/scientific/src/commonTest/kotlin/unit/IonizingRadiationAbsorbedDoseUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/IonizingRadiationAbsorbedDoseUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/IonizingRadiationEquivalentDoseUnitTest.kt b/scientific/src/commonTest/kotlin/unit/IonizingRadiationEquivalentDoseUnitTest.kt
index dedb9861c..79471c39e 100644
--- a/scientific/src/commonTest/kotlin/unit/IonizingRadiationEquivalentDoseUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/IonizingRadiationEquivalentDoseUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/JoltUnitTest.kt b/scientific/src/commonTest/kotlin/unit/JoltUnitTest.kt
index 8949e3242..c42202fb0 100644
--- a/scientific/src/commonTest/kotlin/unit/JoltUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/JoltUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/LengthUnitTest.kt b/scientific/src/commonTest/kotlin/unit/LengthUnitTest.kt
index 373eb7666..4b2b32777 100644
--- a/scientific/src/commonTest/kotlin/unit/LengthUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/LengthUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/LinearMassDensityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/LinearMassDensityUnitTest.kt
index faad69e08..d435ad504 100644
--- a/scientific/src/commonTest/kotlin/unit/LinearMassDensityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/LinearMassDensityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/LuminanceUnitTest.kt b/scientific/src/commonTest/kotlin/unit/LuminanceUnitTest.kt
index 013a5608d..59ca0ec61 100644
--- a/scientific/src/commonTest/kotlin/unit/LuminanceUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/LuminanceUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/LuminousEnergyUnitTest.kt b/scientific/src/commonTest/kotlin/unit/LuminousEnergyUnitTest.kt
index b251b36ed..83633578c 100644
--- a/scientific/src/commonTest/kotlin/unit/LuminousEnergyUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/LuminousEnergyUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/LuminousExposureUnitTest.kt b/scientific/src/commonTest/kotlin/unit/LuminousExposureUnitTest.kt
index 83dbdbb57..47e576fd6 100644
--- a/scientific/src/commonTest/kotlin/unit/LuminousExposureUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/LuminousExposureUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/LuminusFluxUnitTest.kt b/scientific/src/commonTest/kotlin/unit/LuminusFluxUnitTest.kt
index 86aae3187..4afa4920d 100644
--- a/scientific/src/commonTest/kotlin/unit/LuminusFluxUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/LuminusFluxUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/LuminusIntensityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/LuminusIntensityUnitTest.kt
index fdbdbd9b9..d16c350fc 100644
--- a/scientific/src/commonTest/kotlin/unit/LuminusIntensityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/LuminusIntensityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/MagneticFluxUnitTest.kt b/scientific/src/commonTest/kotlin/unit/MagneticFluxUnitTest.kt
index 95c4de68e..2f611710b 100644
--- a/scientific/src/commonTest/kotlin/unit/MagneticFluxUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/MagneticFluxUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/MagneticInductionUnitTest.kt b/scientific/src/commonTest/kotlin/unit/MagneticInductionUnitTest.kt
index a4643aca9..0cb513ba8 100644
--- a/scientific/src/commonTest/kotlin/unit/MagneticInductionUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/MagneticInductionUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/MassFlowRateUnitTest.kt b/scientific/src/commonTest/kotlin/unit/MassFlowRateUnitTest.kt
index 5820cdbda..2143f7732 100644
--- a/scientific/src/commonTest/kotlin/unit/MassFlowRateUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/MassFlowRateUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/MolalityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/MolalityUnitTest.kt
index c213792c5..7e0e8e230 100644
--- a/scientific/src/commonTest/kotlin/unit/MolalityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/MolalityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/MolarEnergyUnitTest.kt b/scientific/src/commonTest/kotlin/unit/MolarEnergyUnitTest.kt
index 4337938f3..c2d97e094 100644
--- a/scientific/src/commonTest/kotlin/unit/MolarEnergyUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/MolarEnergyUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/MolarMassUnitTest.kt b/scientific/src/commonTest/kotlin/unit/MolarMassUnitTest.kt
index ef9aa4ca2..1d15673ff 100644
--- a/scientific/src/commonTest/kotlin/unit/MolarMassUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/MolarMassUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/MolarVolumeUnitTest.kt b/scientific/src/commonTest/kotlin/unit/MolarVolumeUnitTest.kt
index 8a3b30b69..34834adda 100644
--- a/scientific/src/commonTest/kotlin/unit/MolarVolumeUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/MolarVolumeUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/MolarityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/MolarityUnitTest.kt
index 19f5e1579..b30a8e534 100644
--- a/scientific/src/commonTest/kotlin/unit/MolarityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/MolarityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/MomentumUnitTest.kt b/scientific/src/commonTest/kotlin/unit/MomentumUnitTest.kt
index 36edd51ee..ba5f34559 100644
--- a/scientific/src/commonTest/kotlin/unit/MomentumUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/MomentumUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/PowerUnitTest.kt b/scientific/src/commonTest/kotlin/unit/PowerUnitTest.kt
index ce6fe0b8f..a6d18a19e 100644
--- a/scientific/src/commonTest/kotlin/unit/PowerUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/PowerUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/PressureUnitTest.kt b/scientific/src/commonTest/kotlin/unit/PressureUnitTest.kt
index acffaf715..9e137e6c5 100644
--- a/scientific/src/commonTest/kotlin/unit/PressureUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/PressureUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/RadioActivityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/RadioActivityUnitTest.kt
index af9082262..65cc80f35 100644
--- a/scientific/src/commonTest/kotlin/unit/RadioActivityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/RadioActivityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/ScientificUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ScientificUnitTest.kt
index 7aa4e298f..ebbfea1c3 100644
--- a/scientific/src/commonTest/kotlin/unit/ScientificUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ScientificUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/SolidAngleUnitTest.kt b/scientific/src/commonTest/kotlin/unit/SolidAngleUnitTest.kt
index ab1fd4536..dc6f70edb 100644
--- a/scientific/src/commonTest/kotlin/unit/SolidAngleUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/SolidAngleUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/SpecificEnergyUnitTest.kt b/scientific/src/commonTest/kotlin/unit/SpecificEnergyUnitTest.kt
index 73bb713ec..e8f98612e 100644
--- a/scientific/src/commonTest/kotlin/unit/SpecificEnergyUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/SpecificEnergyUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/SpecificHeatCapacityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/SpecificHeatCapacityUnitTest.kt
index bc4f00b5f..3e36e0385 100644
--- a/scientific/src/commonTest/kotlin/unit/SpecificHeatCapacityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/SpecificHeatCapacityUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/SpecificVolumeUnitTest.kt b/scientific/src/commonTest/kotlin/unit/SpecificVolumeUnitTest.kt
index 6f8633c6a..7f1ea3013 100644
--- a/scientific/src/commonTest/kotlin/unit/SpecificVolumeUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/SpecificVolumeUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/SpeedUnitTest.kt b/scientific/src/commonTest/kotlin/unit/SpeedUnitTest.kt
index 6aa535d3c..0ff4bfdf9 100644
--- a/scientific/src/commonTest/kotlin/unit/SpeedUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/SpeedUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/SurfaceTensionUnitTest.kt b/scientific/src/commonTest/kotlin/unit/SurfaceTensionUnitTest.kt
index 30558103c..2984c0044 100644
--- a/scientific/src/commonTest/kotlin/unit/SurfaceTensionUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/SurfaceTensionUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/TemperatureUnitTest.kt b/scientific/src/commonTest/kotlin/unit/TemperatureUnitTest.kt
index 91491dd0d..02ff19ec6 100644
--- a/scientific/src/commonTest/kotlin/unit/TemperatureUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/TemperatureUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/ThermalResistanceUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ThermalResistanceUnitTest.kt
index a4325979e..0161581fa 100644
--- a/scientific/src/commonTest/kotlin/unit/ThermalResistanceUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ThermalResistanceUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/TimeUnitTest.kt b/scientific/src/commonTest/kotlin/unit/TimeUnitTest.kt
index 5875349aa..793ffd95a 100644
--- a/scientific/src/commonTest/kotlin/unit/TimeUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/TimeUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/VoltageUnitTest.kt b/scientific/src/commonTest/kotlin/unit/VoltageUnitTest.kt
index e11333478..469b78ac0 100644
--- a/scientific/src/commonTest/kotlin/unit/VoltageUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/VoltageUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/VolumeUnitTest.kt b/scientific/src/commonTest/kotlin/unit/VolumeUnitTest.kt
index c3ac14dbe..f8f351b9a 100644
--- a/scientific/src/commonTest/kotlin/unit/VolumeUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/VolumeUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/VolumetricFlowUnitTest.kt b/scientific/src/commonTest/kotlin/unit/VolumetricFlowUnitTest.kt
index 959b0934d..21788f49e 100644
--- a/scientific/src/commonTest/kotlin/unit/VolumetricFlowUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/VolumetricFlowUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/VolumetricFluxUnitTest.kt b/scientific/src/commonTest/kotlin/unit/VolumetricFluxUnitTest.kt
index 53d7990a6..b41f794a2 100644
--- a/scientific/src/commonTest/kotlin/unit/VolumetricFluxUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/VolumetricFluxUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/WeightUnitTest.kt b/scientific/src/commonTest/kotlin/unit/WeightUnitTest.kt
index 035a76764..1a44a05dd 100644
--- a/scientific/src/commonTest/kotlin/unit/WeightUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/WeightUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/YankUnitTest.kt b/scientific/src/commonTest/kotlin/unit/YankUnitTest.kt
index ea572db70..a58c505e7 100644
--- a/scientific/src/commonTest/kotlin/unit/YankUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/YankUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/scientific/src/commonTest/kotlin/unit/assertScientificConversion.kt b/scientific/src/commonTest/kotlin/unit/assertScientificConversion.kt
index 612e75c06..4b0c3874c 100644
--- a/scientific/src/commonTest/kotlin/unit/assertScientificConversion.kt
+++ b/scientific/src/commonTest/kotlin/unit/assertScientificConversion.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt b/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt
index 14c8d26d4..ebdea57af 100644
--- a/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt
+++ b/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/commonMain/kotlin/BaseTest.kt b/test-utils-base/src/commonMain/kotlin/BaseTest.kt
index 769a3bf9b..c16782d5c 100644
--- a/test-utils-base/src/commonMain/kotlin/BaseTest.kt
+++ b/test-utils-base/src/commonMain/kotlin/BaseTest.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/commonMain/kotlin/FlowTest.kt b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
index dc98f501d..f72dbc6e8 100644
--- a/test-utils-base/src/commonMain/kotlin/FlowTest.kt
+++ b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/commonMain/kotlin/flowExtensions.kt b/test-utils-base/src/commonMain/kotlin/flowExtensions.kt
index 38c3db8fd..6722c65c6 100644
--- a/test-utils-base/src/commonMain/kotlin/flowExtensions.kt
+++ b/test-utils-base/src/commonMain/kotlin/flowExtensions.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt b/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt
index 4f16907df..d29748d38 100644
--- a/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt
+++ b/test-utils-base/src/commonMain/kotlin/testBlockingAndCancelScope.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/commonTest/kotlin/SimpleFlowTestTest.kt b/test-utils-base/src/commonTest/kotlin/SimpleFlowTestTest.kt
index 7d3dcd9fd..0adb247ac 100644
--- a/test-utils-base/src/commonTest/kotlin/SimpleFlowTestTest.kt
+++ b/test-utils-base/src/commonTest/kotlin/SimpleFlowTestTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/commonTest/kotlin/TestBlockingAndCancelScopeTest.kt b/test-utils-base/src/commonTest/kotlin/TestBlockingAndCancelScopeTest.kt
index 1ae079d08..8ce54ee18 100644
--- a/test-utils-base/src/commonTest/kotlin/TestBlockingAndCancelScopeTest.kt
+++ b/test-utils-base/src/commonTest/kotlin/TestBlockingAndCancelScopeTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/iosMain/kotlin/BaseTest.kt b/test-utils-base/src/iosMain/kotlin/BaseTest.kt
index a7d556a2e..b4434a266 100644
--- a/test-utils-base/src/iosMain/kotlin/BaseTest.kt
+++ b/test-utils-base/src/iosMain/kotlin/BaseTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/jsMain/kotlin/BaseTest.kt b/test-utils-base/src/jsMain/kotlin/BaseTest.kt
index c08a7bdf0..fe131951c 100644
--- a/test-utils-base/src/jsMain/kotlin/BaseTest.kt
+++ b/test-utils-base/src/jsMain/kotlin/BaseTest.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test-utils-base/src/jvmMain/kotlin/BaseTest.kt b/test-utils-base/src/jvmMain/kotlin/BaseTest.kt
index 61636695d..b042bd993 100644
--- a/test-utils-base/src/jvmMain/kotlin/BaseTest.kt
+++ b/test-utils-base/src/jvmMain/kotlin/BaseTest.kt
@@ -1,6 +1,6 @@
 /*
 
-Copyright 2019 Splendo Consulting B.V. The Netherlands
+Copyright 2022 Splendo Consulting B.V. The Netherlands
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/device/MockAdvertisementData.kt b/test-utils-bluetooth/src/commonMain/kotlin/device/MockAdvertisementData.kt
index e79f3ac73..767fec6d8 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/device/MockAdvertisementData.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/device/MockAdvertisementData.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
index badf1001c..bc73ec401 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
index 53e0966e0..bdbda2c83 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2021 Splendo Consulting B.V. The Netherlands
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

From e72cb676f754439bf671db901c7f6b7148beac82 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 4 Nov 2022 11:34:00 +0100
Subject: [PATCH 011/227] Fixing warnings

---
 .../KalugaViewModelLifecycleObserver.kt       |  1 +
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  2 +-
 .../kotlin/navigation/NavigationBundle.kt     |  1 +
 .../kotlin/observable/Observable.kt           |  8 ++-
 .../kotlin/observable/Observables.kt          |  4 ++
 .../iosMain/kotlin/navigation/Navigator.kt    |  7 ++-
 .../kotlin/observable/SimpleDisposable.kt     |  1 +
 .../src/commonMain/kotlin/Permission.kt       | 10 ++--
 .../commonMain/kotlin/PermissionStateRepo.kt  |  1 +
 .../androidLibMain/kotlin/utils/Decimal.kt    |  1 +
 .../commonMain/kotlin/flow/BaseFlowable.kt    |  1 +
 .../commonMain/kotlin/flow/ColdFlowable.kt    |  1 +
 base/src/commonMain/kotlin/flow/FlowConfig.kt |  1 +
 base/src/commonMain/kotlin/flow/Flowable.kt   |  1 +
 .../src/commonMain/kotlin/flow/HotFlowable.kt |  1 +
 .../commonMain/kotlin/state/KalugaState.kt    |  5 +-
 base/src/commonMain/kotlin/text/Flags.kt      |  1 +
 base/src/commonMain/kotlin/utils/Decimal.kt   |  3 ++
 .../kotlin/text/NumberFormatterTest.kt        |  2 +-
 .../iosMain/kotlin/text/NumberFormatter.kt    | 47 ++++++++--------
 base/src/iosMain/kotlin/text/StringUtils.kt   |  2 +
 .../src/iosMain/kotlin/utils/DataTypeUtils.kt |  3 +-
 base/src/iosMain/kotlin/utils/Decimal.kt      |  8 +--
 base/src/iosMain/kotlin/utils/KalugaDate.kt   | 15 +++---
 base/src/jsMain/kotlin/utils/Decimal.kt       |  3 ++
 base/src/jvmMain/kotlin/utils/Decimal.kt      |  2 +
 bluetooth/src/commonMain/kotlin/UUID.kt       |  1 +
 bluetooth/src/jsMain/kotlin/UUID.kt           |  2 +
 bluetooth/src/jvmMain/kotlin/UUID.kt          |  2 +
 .../iosMain/kotlin/DateTimePickerPresenter.kt | 28 +++++-----
 .../kaluga/datetime/timer/RecurringTimer.kt   |  2 +-
 links/build.gradle.kts                        |  6 +++
 .../splendo/kaluga/links/utils/decoders.kt    |  2 +-
 .../links/manager/PlatformLinksHandler.kt     | 10 ++--
 resources/src/iosMain/kotlin/KalugaColor.kt   |  3 +-
 resources/src/iosMain/kotlin/StyledString.kt  | 23 ++++----
 .../iosMain/kotlin/uikit/BackgroundStyle.kt   | 53 +++++++++----------
 .../src/iosMain/kotlin/uikit/ButtonStyle.kt   |  3 +-
 .../src/iosMain/kotlin/uikit/TextStyle.kt     |  7 ++-
 .../iosMain/kotlin/uikit/UILinkTapGesture.kt  |  7 ++-
 .../src/commonMain/kotlin/FlowTest.kt         |  1 +
 .../kotlin/scanner/MockScanningState.kt       |  2 +-
 .../kotlin/MockPermissionStateRepo.kt         |  1 +
 test-utils/src/commonMain/kotlin/legacy.kt    |  8 +--
 44 files changed, 166 insertions(+), 127 deletions(-)

diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
index 015099683..920a9a660 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
@@ -46,6 +46,7 @@ class KalugaViewModelLifecycleObserver<VM : BaseLifecycleViewModel> internal con
 ) : DefaultLifecycleObserver {
 
     private val lifecycleSubscribables: List<LifecycleSubscribable> by lazy {
+        @Suppress("UNCHECKED_CAST")
         viewModel::class.memberProperties
             .filter { it !is KMutableProperty1 }
             .mapNotNull { it as? KProperty1<VM, Any?> }
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
index 8aa7b9066..84fa66e1d 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -44,7 +44,7 @@ fun <VM : BaseLifecycleViewModel> VM.bind(activity: AppCompatActivity) {
  * @return `true` if the ViewModel could be bound to the [Fragment].
  */
 fun <VM : BaseLifecycleViewModel> VM.bind(fragment: Fragment): Boolean {
-    val fragmentManager = fragment.fragmentManager ?: return false
+    val fragmentManager = fragment.parentFragmentManager
     fragment.lifecycle.addObserver(KalugaViewModelLifecycleObserver(this, fragment.activity, fragment.viewLifecycleOwner, fragmentManager))
     return true
 }
diff --git a/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt b/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
index 8c183872b..419777d01 100644
--- a/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
+++ b/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
@@ -193,6 +193,7 @@ class NavigationBundle<R : NavigationBundleSpecRow<*>> internal constructor(val
      * @return The value for the [row] according to its type
      * @throws [NavigationBundleGetError] if the [row] does not match the [spec]
      */
+    @Suppress("UNCHECKED_CAST")
     fun <V, S : NavigationBundleSpecRow<V>> get(row: S): V {
         row as? R ?: throw NavigationBundleGetError()
         val value = values[row] as? NavigationBundleValue<V> ?: throw NavigationBundleGetError()
diff --git a/architecture/src/commonMain/kotlin/observable/Observable.kt b/architecture/src/commonMain/kotlin/observable/Observable.kt
index 580b7a84e..f5b8acad1 100644
--- a/architecture/src/commonMain/kotlin/observable/Observable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observable.kt
@@ -43,6 +43,7 @@ inline fun <reified R : T, T> ObservableOptional<T>.resultValueOrDefault(default
 fun <R : T, T> ObservableOptional<T>.asResult(defaultValue: Value<R>?): ObservableOptional<R> =
     try {
         if (this is Value<*> && (this.value != null || defaultValue == null))
+            @Suppress("UNCHECKED_CAST")
             Value(this.value as R)
         else
             defaultValue ?: Nothing()
@@ -120,6 +121,7 @@ open class ObservationDefault<R : T?, T>(
         get() = this
 
     override fun observeInitialized(onNext: (R) -> Unit): Disposable {
+        @Suppress("UNCHECKED_CAST")
         return observe { onNext(it as R) }
     }
 }
@@ -170,6 +172,7 @@ open class ObservationInitialized<T>(
     }
 
     override fun observeInitialized(onNext: (T) -> Unit): Disposable {
+        @Suppress("UNCHECKED_CAST")
         return observe { onNext(it as T) }
     }
 
@@ -258,6 +261,7 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
             onFirstObservation?.invoke()
         }
 
+        @Suppress("UNCHECKED_CAST")
         return handleOnMain {
             backingInternalValue ?: error("unexpected null")
         } as OO
@@ -270,8 +274,8 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
      * @param onNext Function to be called each time the value of the Observable changes
      * @return [Disposable] that removes the observing function when disposed
      */
+    @Suppress("UNCHECKED_CAST")
     override fun observe(onNext: (R?) -> Unit): Disposable = handleOnMain {
-        @Suppress("UNCHECKED_CAST") // OO<T> should be guaranteed
         // send the value before adding
         val lastResult = currentObserved
         onNext((lastResult as? Value<*>)?.value as R)
@@ -289,6 +293,7 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
     }
 
     val currentObserved: OO
+        @Suppress("UNCHECKED_CAST")
         get() = observedValue as OO
 
     @Suppress("UNCHECKED_CAST")
@@ -492,6 +497,7 @@ abstract class AbstractBaseSubject<R : T, T, OO : ObservableOptional<R>>(
 
     override fun bind(coroutineScope: CoroutineScope, context: CoroutineContext) {
         coroutineScope.launch(context) {
+            @Suppress("UNCHECKED_CAST")
             stateFlowToBind().collect { set(it as T) }
         }
     }
diff --git a/architecture/src/commonMain/kotlin/observable/Observables.kt b/architecture/src/commonMain/kotlin/observable/Observables.kt
index 1ee85834d..2d541a59e 100644
--- a/architecture/src/commonMain/kotlin/observable/Observables.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observables.kt
@@ -15,6 +15,8 @@
 
  */
 
+@file:Suppress("DEPRECATION")
+
 package com.splendo.kaluga.architecture.observable
 
 import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
@@ -278,6 +280,7 @@ fun <R : T, T> readOnlyPropertyObservableHelper(readOnlyProperty: ReadOnlyProper
         if (new != current.valueOrNull)
             Value(new)
         else
+            @Suppress("UNCHECKED_CAST")
             current as ObservableOptional<T>
     }
 }
@@ -333,6 +336,7 @@ class ReadWritePropertyObservableHelper<R : T, T>(
             if (new != current.valueOrNull)
                 Value(new)
             else
+                @Suppress("UNCHECKED_CAST")
                 current as ObservableOptional<T>
         }
     }
diff --git a/architecture/src/iosMain/kotlin/navigation/Navigator.kt b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
index baea583f0..260578141 100644
--- a/architecture/src/iosMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
@@ -55,7 +55,6 @@ import platform.UIKit.removeFromParentViewController
 import platform.UIKit.removeFromSuperview
 import platform.UIKit.translatesAutoresizingMaskIntoConstraints
 import platform.UIKit.willMoveToParentViewController
-import platform.darwin.NSInteger
 import platform.darwin.NSObject
 import kotlin.native.ref.WeakReference
 
@@ -165,7 +164,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
         val child = nestedSpec.nested()
 
         if (type is NavigationSpec.Nested.Type.Replace) {
-            child.view.tag = type.tag as NSInteger
+            child.view.tag = type.tag
         }
         child.view.translatesAutoresizingMaskIntoConstraints = false
         parent.addChildViewController(child)
@@ -177,7 +176,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
             NSLayoutAttributeBottom
         ).map { attribute ->
             CGFloat
-            NSLayoutConstraint.constraintWithItem(child.view, attribute, NSLayoutRelationEqual, nestedSpec.containerView, attribute, 1.0 as CGFloat, 0.0 as CGFloat)
+            NSLayoutConstraint.constraintWithItem(child.view, attribute, NSLayoutRelationEqual, nestedSpec.containerView, attribute, 1.0, 0.0)
         }
         constraints.forEach { nestedSpec.containerView.addConstraint(it) }
         child.didMoveToParentViewController(parent)
@@ -235,7 +234,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
         browserVc.additionalTrailingNavigationBarButtonItems = appearance.trailingNavigationBarButtonItems
         browserVc.shouldShowFileExtensions = appearance.showFileExtensions
         browserVc.customActions = appearance.customActions
-        browserVc.defaultDocumentAspectRatio = appearance.documentAspectRatio as CGFloat
+        browserVc.defaultDocumentAspectRatio = appearance.documentAspectRatio
         browserVc.localizedCreateDocumentActionTitle = appearance.createTitle
 
         browserVc.delegate = browserSpec.delegate
diff --git a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
index a69ab3879..c0378d8f3 100644
--- a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
@@ -28,6 +28,7 @@ actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : Ba
 
 actual fun <R : T, T, OO : ObservableOptional<R>> addObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
     val observers = observersForObservation.getOrPut(observation) { mutableListOf() }
+    @Suppress("UNCHECKED_CAST")
     observers.add(observer as (Any?) -> Unit)
 }
 
diff --git a/base-permissions/src/commonMain/kotlin/Permission.kt b/base-permissions/src/commonMain/kotlin/Permission.kt
index 1997c1139..968bfcada 100644
--- a/base-permissions/src/commonMain/kotlin/Permission.kt
+++ b/base-permissions/src/commonMain/kotlin/Permission.kt
@@ -79,6 +79,7 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
     }
 
     suspend inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(builder: B): BasePermissionsBuilder<P> = registerOrGet(P::class, builder)
+    @Suppress("UNCHECKED_CAST")
     suspend fun <P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(permission: KClass<P>, builder: B): BasePermissionsBuilder<P> = buildersLock.withLock {
         builders.getOrPut(permission::class) { builder } as BasePermissionsBuilder<P>
     }
@@ -89,6 +90,7 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     operator fun <P : Permission> get(permission: P): BasePermissionsBuilder<P> =
         builders[permission::class] as? BasePermissionsBuilder<P> ?: throw PermissionsBuilderError("The Builder for $permission was not registered")
 
@@ -104,6 +106,7 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
     }
 
     suspend inline fun <reified P : Permission> registerOrGetPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerOrGetPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
+    @Suppress("UNCHECKED_CAST")
     suspend fun <P : Permission> registerOrGetPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = repoBuildersLock.withLock {
         repoBuilders.getOrPut(permission) { createPermissionStateRepoBuilder(permissionStateRepoBuilder) } as PermissionStateRepoBuilder<P>
     }
@@ -114,10 +117,10 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     fun <P : Permission> createPermissionStateRepo(permission: P, coroutineContext: CoroutineContext): BasePermissionStateRepo<*> =
-        (repoBuilders[permission::class] as? PermissionStateRepoBuilder<P>)?.let {
-            it.create(permission, coroutineContext)
-        } ?: throw PermissionsBuilderError("Permission state repo factory was not registered for $permission")
+        (repoBuilders[permission::class] as? PermissionStateRepoBuilder<P>)?.create(permission, coroutineContext)
+            ?: throw PermissionsBuilderError("Permission state repo factory was not registered for $permission")
 
     private inline fun <P : Permission> createPermissionStateRepoBuilder(crossinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>): PermissionStateRepoBuilder<P> = object : PermissionStateRepoBuilder<P> {
         override fun create(
@@ -145,6 +148,7 @@ class Permissions(
 
     private val permissionStateRepos = mutableMapOf<Permission, BasePermissionStateRepo<*>>()
 
+    @Suppress("UNCHECKED_CAST")
     private fun <P : Permission> permissionStateRepo(permission: P): BasePermissionStateRepo<P> = permissionStateRepos.getOrPut(permission) {
         builder.createPermissionStateRepo(permission, coroutineContext + CoroutineName(permission.name))
     } as BasePermissionStateRepo<P>
diff --git a/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt b/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt
index e77c9088e..39f59465a 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt
@@ -61,6 +61,7 @@ open class PermissionStateRepo<P : Permission>(
 ) : BasePermissionStateRepo<P>(
     createUninitializedState = { PermissionStateImpl.Uninitialized() },
     createInitializingState = { state ->
+        @Suppress("UNCHECKED_CAST")
         when (val stateImpl = state as PermissionStateImpl.Inactive<P>) {
             is PermissionStateImpl.Uninitialized -> {
                 val permissionManager = createPermissionManager(CoroutineScope(coroutineContext + CoroutineName("PermissionManager")))
diff --git a/base/src/androidLibMain/kotlin/utils/Decimal.kt b/base/src/androidLibMain/kotlin/utils/Decimal.kt
index b1cbbbf4d..5e934c4f3 100644
--- a/base/src/androidLibMain/kotlin/utils/Decimal.kt
+++ b/base/src/androidLibMain/kotlin/utils/Decimal.kt
@@ -16,6 +16,7 @@
  */
 
 @file:JvmName("DecimalAndroid")
+@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.base.utils.RoundingMode.RoundDown
diff --git a/base/src/commonMain/kotlin/flow/BaseFlowable.kt b/base/src/commonMain/kotlin/flow/BaseFlowable.kt
index bb838f26f..faf34b6d7 100644
--- a/base/src/commonMain/kotlin/flow/BaseFlowable.kt
+++ b/base/src/commonMain/kotlin/flow/BaseFlowable.kt
@@ -32,6 +32,7 @@ import kotlinx.coroutines.flow.first
  * @param channelFactory Factory for generating a [BroadcastChannel] on which the data is flown
  */
 @Deprecated("This Channel based implementation is deprecated in favor of SharedFlow or StateFlow")
+@Suppress("DEPRECATION")
 abstract class BaseFlowable<T>(private val channelFactory: () -> BroadcastChannel<T> = { ConflatedBroadcastChannel() }) : Flowable<T> {
 
     private var channel: BroadcastChannel<T>? = null
diff --git a/base/src/commonMain/kotlin/flow/ColdFlowable.kt b/base/src/commonMain/kotlin/flow/ColdFlowable.kt
index 624e68dba..f4d8368bd 100644
--- a/base/src/commonMain/kotlin/flow/ColdFlowable.kt
+++ b/base/src/commonMain/kotlin/flow/ColdFlowable.kt
@@ -15,6 +15,7 @@
 
  */
 
+@file:Suppress("DEPRECATION")
 package com.splendo.kaluga.base.flow
 
 import com.splendo.kaluga.flow.BaseFlowable
diff --git a/base/src/commonMain/kotlin/flow/FlowConfig.kt b/base/src/commonMain/kotlin/flow/FlowConfig.kt
index 4c455898e..2534632b3 100644
--- a/base/src/commonMain/kotlin/flow/FlowConfig.kt
+++ b/base/src/commonMain/kotlin/flow/FlowConfig.kt
@@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.conflate
 typealias FlowModifier = (Flow<*>) -> Unit
 
 @Deprecated("Flowable is deprecated")
+@Suppress("DEPRECATION")
 sealed class FlowConfig(val config: FlowModifier) {
 
     object None : FlowConfig({})
diff --git a/base/src/commonMain/kotlin/flow/Flowable.kt b/base/src/commonMain/kotlin/flow/Flowable.kt
index dcf9bd69f..157b8e8e1 100644
--- a/base/src/commonMain/kotlin/flow/Flowable.kt
+++ b/base/src/commonMain/kotlin/flow/Flowable.kt
@@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.Flow
  * @param T the type of the values emitted by the flowable.
  */
 @Deprecated("Use MutableSharedFlow or MutableStateFlow, with onCollectionEvent", replaceWith = ReplaceWith("MutableSharedFlow"))
+@Suppress("DEPRECATION")
 interface Flowable<T> {
 
     /**
diff --git a/base/src/commonMain/kotlin/flow/HotFlowable.kt b/base/src/commonMain/kotlin/flow/HotFlowable.kt
index 7368811ae..775d4b6e1 100644
--- a/base/src/commonMain/kotlin/flow/HotFlowable.kt
+++ b/base/src/commonMain/kotlin/flow/HotFlowable.kt
@@ -15,6 +15,7 @@
 
  */
 
+@file:Suppress("DEPRECATION")
 package com.splendo.kaluga.base.flow
 
 import com.splendo.kaluga.flow.BaseFlowable
diff --git a/base/src/commonMain/kotlin/state/KalugaState.kt b/base/src/commonMain/kotlin/state/KalugaState.kt
index fca9bd1c1..87a9eb64d 100644
--- a/base/src/commonMain/kotlin/state/KalugaState.kt
+++ b/base/src/commonMain/kotlin/state/KalugaState.kt
@@ -163,6 +163,7 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
                 // The mutex is already released above to let the state initialize afterwards, to avoid changeState mutex deadlocks
                 // However releasing the above mutex might have already changed the state to a new state before initialState runs.
                 // State machines that need initialization should rely on having an initialization state rather than using this method.
+                @Suppress("DEPRECATION")
                 value.initialState()
             }
         } else {
@@ -190,6 +191,7 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
         //
         // The replay cache instantiation is somewhat heavy but there is no method to get only the the last entry in the cache
         // if no or a small replayCache is used it is not so bad. Also is a StateFlow is used, this problem does not occur.
+        @Suppress("UNCHECKED_CAST")
         return (mutableFlow as? StateFlow<S>)?.value ?: mutableFlow.replayCache.lastOrNull() ?: mutableFlow.first()
     }
 
@@ -278,6 +280,7 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
         takeAndChangeState(action)
     }
 
+    @Suppress("UNCHECKED_CAST")
     private suspend inline fun <K : S> doTakeAndChangeState(remainIfStateNot: KClass<K>?, crossinline action: suspend(K) -> suspend () -> S): S = coroutineScope { // scope around the mutex so asynchronously scheduled coroutines that also use this method can run before the scope completed without deadlocks
         initialize()
         stateMutex.withPermit {
@@ -287,7 +290,6 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
                     val beforeState = state()
                     // There are only two methods calling this private method.
                     // either K is the same as S (no `remainIfStateNot` parameter), or we do the isInstance check
-                    @Suppress("UNCHECKED_CAST")
                     val transition = // if remainIfNot was passes, only execute action if the beforeState matches
                         when {
                             remainIfStateNot == null || remainIfStateNot.isInstance(beforeState) -> action(beforeState as K)
@@ -403,6 +405,7 @@ abstract class BaseColdStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
                     }
                 ) {
                     flow.onCollectionEvent { event ->
+                        @Suppress("DEPRECATION")
                         when (event) {
                             NoMoreCollections -> noMoreCollections().also { it.finalState() }
                             FirstCollection -> firstCollection()
diff --git a/base/src/commonMain/kotlin/text/Flags.kt b/base/src/commonMain/kotlin/text/Flags.kt
index 13ba43460..fd414e3ba 100644
--- a/base/src/commonMain/kotlin/text/Flags.kt
+++ b/base/src/commonMain/kotlin/text/Flags.kt
@@ -50,6 +50,7 @@ enum class Flag(val char: Char) {
     }
 }
 
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 fun Set<Flag>.toString(): String {
     val sb = StringBuilder()
     this.forEach {
diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index 441209404..c3cec452c 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -14,6 +14,9 @@
     limitations under the License.
 
  */
+
+@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+
 package com.splendo.kaluga.base.utils
 
 expect class Decimal : Comparable<Decimal>
diff --git a/base/src/commonTest/kotlin/text/NumberFormatterTest.kt b/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
index 1a6e2bf6e..57d27e0c3 100644
--- a/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
@@ -43,7 +43,7 @@ class NumberFormatterTest : BaseTest() {
     }
 
     @Test
-    fun tesParseDecimal() {
+    fun testParseDecimal() {
         val formatters = createFormatters(NumberFormatStyle.Decimal())
 
         assertEquals(2.4, formatters.usFormatter.parse("2.4"))
diff --git a/base/src/iosMain/kotlin/text/NumberFormatter.kt b/base/src/iosMain/kotlin/text/NumberFormatter.kt
index 7100d5fb7..718e649da 100644
--- a/base/src/iosMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/iosMain/kotlin/text/NumberFormatter.kt
@@ -31,7 +31,6 @@ import platform.Foundation.NSNumberFormatterRoundHalfEven
 import platform.Foundation.NSNumberFormatterRoundUp
 import platform.Foundation.NSNumberFormatterScientificStyle
 import platform.Foundation.numberWithInt
-import platform.darwin.NSUInteger
 
 actual class NumberFormatter actual constructor(actual val locale: Locale, style: NumberFormatStyle) {
 
@@ -41,33 +40,33 @@ actual class NumberFormatter actual constructor(actual val locale: Locale, style
         when (style) {
             is NumberFormatStyle.Integer -> {
                 numberStyle = NSNumberFormatterDecimalStyle
-                minimumIntegerDigits = style.minDigits.toULong() as NSUInteger
-                maximumIntegerDigits = style.maxDigits.toULong() as NSUInteger
-                minimumFractionDigits = 0.toULong() as NSUInteger
-                maximumFractionDigits = 0.toULong() as NSUInteger
+                minimumIntegerDigits = style.minDigits.toULong()
+                maximumIntegerDigits = style.maxDigits.toULong()
+                minimumFractionDigits = 0.toULong()
+                maximumFractionDigits = 0.toULong()
             }
             is NumberFormatStyle.Decimal -> {
                 numberStyle = NSNumberFormatterDecimalStyle
-                minimumIntegerDigits = style.minIntegerDigits.toULong() as NSUInteger
-                maximumIntegerDigits = style.maxIntegerDigits.toULong() as NSUInteger
-                minimumFractionDigits = style.minFractionDigits.toULong() as NSUInteger
-                maximumFractionDigits = style.maxFractionDigits.toULong() as NSUInteger
+                minimumIntegerDigits = style.minIntegerDigits.toULong()
+                maximumIntegerDigits = style.maxIntegerDigits.toULong()
+                minimumFractionDigits = style.minFractionDigits.toULong()
+                maximumFractionDigits = style.maxFractionDigits.toULong()
             }
             is NumberFormatStyle.Percentage -> {
                 numberStyle = NSNumberFormatterPercentStyle
-                minimumIntegerDigits = style.minIntegerDigits.toULong() as NSUInteger
-                maximumIntegerDigits = style.maxIntegerDigits.toULong() as NSUInteger
-                minimumFractionDigits = style.minFractionDigits.toULong() as NSUInteger
-                maximumFractionDigits = style.maxFractionDigits.toULong() as NSUInteger
+                minimumIntegerDigits = style.minIntegerDigits.toULong()
+                maximumIntegerDigits = style.maxIntegerDigits.toULong()
+                minimumFractionDigits = style.minFractionDigits.toULong()
+                maximumFractionDigits = style.maxFractionDigits.toULong()
             }
             is NumberFormatStyle.Permillage -> {
                 numberStyle = NSNumberFormatterPercentStyle
                 positiveFormat = positiveFormat.replace('%', '‰')
                 negativeFormat = negativeFormat.replace('%', '‰')
-                minimumIntegerDigits = style.minIntegerDigits.toULong() as NSUInteger
-                maximumIntegerDigits = style.maxIntegerDigits.toULong() as NSUInteger
-                minimumFractionDigits = style.minFractionDigits.toULong() as NSUInteger
-                maximumFractionDigits = style.maxFractionDigits.toULong() as NSUInteger
+                minimumIntegerDigits = style.minIntegerDigits.toULong()
+                maximumIntegerDigits = style.maxIntegerDigits.toULong()
+                minimumFractionDigits = style.minFractionDigits.toULong()
+                maximumFractionDigits = style.maxFractionDigits.toULong()
             }
             is NumberFormatStyle.Scientific -> {
                 numberStyle = NSNumberFormatterScientificStyle
@@ -79,13 +78,13 @@ actual class NumberFormatter actual constructor(actual val locale: Locale, style
                 style.currencyCode?.let { currencyCode ->
                     this.currencyCode = currencyCode
                 }
-                minimumIntegerDigits = style.minIntegerDigits.toULong() as NSUInteger
-                maximumIntegerDigits = style.maxIntegerDigits.toULong() as NSUInteger
+                minimumIntegerDigits = style.minIntegerDigits.toULong()
+                maximumIntegerDigits = style.maxIntegerDigits.toULong()
                 style.minFractionDigits?.let {
-                    minimumFractionDigits = it.toULong() as NSUInteger
+                    minimumFractionDigits = it.toULong()
                 }
                 style.maxFractionDigits?.let {
-                    maximumFractionDigits = it.toULong() as NSUInteger
+                    maximumFractionDigits = it.toULong()
                 }
             }
             is NumberFormatStyle.Pattern -> {
@@ -170,17 +169,19 @@ actual class NumberFormatter actual constructor(actual val locale: Locale, style
     actual var groupingSize: Int
         get() = formatter.groupingSize.toInt()
         set(value) {
-            formatter.groupingSize = value.toULong() as NSUInteger
-            formatter.secondaryGroupingSize = value.toULong() as NSUInteger
+            formatter.groupingSize = value.toULong()
+            formatter.secondaryGroupingSize = value.toULong()
         }
     actual var multiplier: Int
         get() = formatter.multiplier?.intValue ?: 1
         set(value) { formatter.multiplier = NSNumber.numberWithInt(value) }
 
+    @Suppress("CAST_NEVER_SUCCEEDS") // Should succeed just fine
     actual fun format(number: Number): String {
         return (formatter.stringFromNumber(number as NSNumber) ?: "")
     }
 
+    @Suppress("CAST_NEVER_SUCCEEDS") // Should succeed just fine
     actual fun parse(string: String): Number? {
         return formatter.numberFromString(string) as? Number
     }
diff --git a/base/src/iosMain/kotlin/text/StringUtils.kt b/base/src/iosMain/kotlin/text/StringUtils.kt
index d5e7dfcdf..669fa9249 100644
--- a/base/src/iosMain/kotlin/text/StringUtils.kt
+++ b/base/src/iosMain/kotlin/text/StringUtils.kt
@@ -15,6 +15,8 @@
 
  */
 
+@file:Suppress("CAST_NEVER_SUCCEEDS")
+
 package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.Locale
diff --git a/base/src/iosMain/kotlin/utils/DataTypeUtils.kt b/base/src/iosMain/kotlin/utils/DataTypeUtils.kt
index 8d70ef825..4708c69cc 100644
--- a/base/src/iosMain/kotlin/utils/DataTypeUtils.kt
+++ b/base/src/iosMain/kotlin/utils/DataTypeUtils.kt
@@ -25,7 +25,6 @@ import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.reinterpret
 import platform.Foundation.NSData
 import platform.Foundation.create
-import platform.darwin.NSUInteger
 
 /**
  * Converts a [NSData] to its corresponding [ByteArray]
@@ -42,7 +41,7 @@ fun NSData.toByteArray(): ByteArray {
  * @return Th [NSData] corresponding to this [ByteArray]
  */
 fun ByteArray.toNSData(): NSData = memScoped {
-    return NSData.create(bytes = allocArrayOf(this@toNSData), length = this@toNSData.size.toULong() as NSUInteger)
+    return NSData.create(bytes = allocArrayOf(this@toNSData), length = this@toNSData.size.toULong())
 }
 
 /**
diff --git a/base/src/iosMain/kotlin/utils/Decimal.kt b/base/src/iosMain/kotlin/utils/Decimal.kt
index 495c7be5d..05894c9b9 100644
--- a/base/src/iosMain/kotlin/utils/Decimal.kt
+++ b/base/src/iosMain/kotlin/utils/Decimal.kt
@@ -20,7 +20,6 @@ package com.splendo.kaluga.base.utils
 import platform.Foundation.NSDecimalNumber
 import platform.Foundation.NSDecimalNumberHandler
 import platform.Foundation.NSRoundingMode
-import platform.darwin.NSUInteger
 import kotlin.math.absoluteValue
 
 actual data class Decimal(val nsDecimal: NSDecimalNumber) : Comparable<Decimal> {
@@ -154,14 +153,14 @@ actual fun Decimal.times(value: Decimal, scale: Int, roundingMode: RoundingMode)
 actual infix fun Decimal.pow(n: Int): Decimal = if (n < 0)
     1.toDecimal() / pow(n.absoluteValue)
 else
-    copy(nsDecimal = nsDecimal.decimalNumberByRaisingToPower(n.toULong() as NSUInteger))
+    copy(nsDecimal = nsDecimal.decimalNumberByRaisingToPower(n.toULong()))
 
 actual fun Decimal.pow(n: Int, scale: Int): Decimal = if (n < 0)
     1.toDecimal() / pow(n.absoluteValue, scale)
 else
     copy(
         nsDecimal = nsDecimal.decimalNumberByRaisingToPower(
-            n.toULong() as NSUInteger,
+            n.toULong(),
             NSDecimalNumberHandler(
                 roundingMode = NSRoundingMode.NSRoundPlain,
                 scale = scale.toShort(),
@@ -181,7 +180,7 @@ actual fun Decimal.pow(
 else
     copy(
         nsDecimal = nsDecimal.decimalNumberByRaisingToPower(
-            n.toULong() as NSUInteger,
+            n.toULong(),
             withBehavior = NSDecimalNumberHandler(
                 roundingMode = roundingMode.nsRoundingMode,
                 scale = scale.toShort(),
@@ -198,6 +197,7 @@ actual fun String.toDecimal() = Decimal(NSDecimalNumber(this))
 
 actual fun Decimal.toDouble() = nsDecimal.toString().toDouble()
 actual fun Decimal.toInt() = nsDecimal.intValue
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 actual fun Decimal.toString() = nsDecimal.stringValue
 
 actual fun Decimal.round(scale: Int, roundingMode: RoundingMode) = copy(
diff --git a/base/src/iosMain/kotlin/utils/KalugaDate.kt b/base/src/iosMain/kotlin/utils/KalugaDate.kt
index c49aa1b1f..8b5933348 100644
--- a/base/src/iosMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaDate.kt
@@ -21,7 +21,6 @@ import kotlinx.cinterop.useContents
 import platform.Foundation.NSCalendar
 import platform.Foundation.NSCalendarMatchNextTimePreservingSmallerUnits
 import platform.Foundation.NSCalendarMatchPreviousTimePreservingSmallerUnits
-import platform.Foundation.NSCalendarOptions
 import platform.Foundation.NSCalendarSearchBackwards
 import platform.Foundation.NSCalendarUnit
 import platform.Foundation.NSCalendarUnitDay
@@ -40,8 +39,6 @@ import platform.Foundation.compare
 import platform.Foundation.dateWithTimeIntervalSince1970
 import platform.Foundation.dateWithTimeIntervalSinceNow
 import platform.Foundation.timeIntervalSince1970
-import platform.darwin.NSInteger
-import platform.darwin.NSUInteger
 import kotlin.math.round
 
 actual typealias KalugaDateHolder = NSDate
@@ -101,7 +98,7 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
         set(value) { updateDateForComponent(NSCalendarUnitWeekday, value) }
     override var firstWeekDay: Int
         get() = (calendar.firstWeekday.toInt())
-        set(value) { calendar.firstWeekday = value.toULong() as NSUInteger }
+        set(value) { calendar.firstWeekday = value.toULong() }
 
     override var hour: Int
         get() = calendar.component(NSCalendarUnitHour, fromDate = date).toInt()
@@ -126,9 +123,9 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
     override fun copy(): KalugaDate = DefaultKalugaDate(calendar.copy() as NSCalendar, date.copy() as NSDate)
 
     override fun equals(other: Any?): Boolean {
-        return (other as? DefaultKalugaDate)?.let { other ->
+        return if (other is DefaultKalugaDate) {
             calendar.calendarIdentifier == other.calendar.calendarIdentifier && millisecondSinceEpoch == other.millisecondSinceEpoch && this.calendar.timeZone == other.calendar.timeZone
-        } ?: false
+        } else false
     }
 
     override fun hashCode(): Int {
@@ -166,14 +163,14 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
                 NSCalendarMatchPreviousTimePreservingSmallerUnits or NSCalendarSearchBackwards
             else
                 NSCalendarMatchNextTimePreservingSmallerUnits
-            calendar.dateBySettingUnit(component, value.toLong() as NSInteger, date, calendarOptions)
+            calendar.dateBySettingUnit(component, value.toLong(), date, calendarOptions)
         } else {
             val previousValue = calendar.component(component, this.date)
             calendar.dateByAddingUnit(
                 component,
-                (value - previousValue).toLong() as NSInteger,
+                (value - previousValue),
                 date,
-                0UL as NSCalendarOptions
+                0UL
             )
         }?.let {
             date = it
diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index e7d463575..92b573a87 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -14,6 +14,9 @@
     limitations under the License.
 
  */
+
+@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+
 package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.base.utils.RoundingMode.RoundDown
diff --git a/base/src/jvmMain/kotlin/utils/Decimal.kt b/base/src/jvmMain/kotlin/utils/Decimal.kt
index 107ebb991..13bb2f28f 100644
--- a/base/src/jvmMain/kotlin/utils/Decimal.kt
+++ b/base/src/jvmMain/kotlin/utils/Decimal.kt
@@ -16,6 +16,8 @@
  */
 
 @file:JvmName("DecimalJVM")
+@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+
 package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.base.utils.RoundingMode.RoundDown
diff --git a/bluetooth/src/commonMain/kotlin/UUID.kt b/bluetooth/src/commonMain/kotlin/UUID.kt
index fb980c6c2..b4ee56490 100644
--- a/bluetooth/src/commonMain/kotlin/UUID.kt
+++ b/bluetooth/src/commonMain/kotlin/UUID.kt
@@ -16,6 +16,7 @@
  */
 
 @file:JvmName("CommonUUID")
+@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 
 package com.splendo.kaluga.bluetooth
 
diff --git a/bluetooth/src/jsMain/kotlin/UUID.kt b/bluetooth/src/jsMain/kotlin/UUID.kt
index d2ddea8bb..1abdd41e0 100644
--- a/bluetooth/src/jsMain/kotlin/UUID.kt
+++ b/bluetooth/src/jsMain/kotlin/UUID.kt
@@ -15,6 +15,8 @@
 
  */
 
+@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+
 package com.splendo.kaluga.bluetooth
 
 actual data class UUID(val uuidString: String)
diff --git a/bluetooth/src/jvmMain/kotlin/UUID.kt b/bluetooth/src/jvmMain/kotlin/UUID.kt
index d2ddea8bb..1abdd41e0 100644
--- a/bluetooth/src/jvmMain/kotlin/UUID.kt
+++ b/bluetooth/src/jvmMain/kotlin/UUID.kt
@@ -15,6 +15,8 @@
 
  */
 
+@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+
 package com.splendo.kaluga.bluetooth
 
 actual data class UUID(val uuidString: String)
diff --git a/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
index 240d0d916..5e564db8f 100644
--- a/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
@@ -23,10 +23,8 @@ import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
 import kotlinx.cinterop.ObjCAction
 import kotlinx.coroutines.CoroutineScope
-import platform.CoreGraphics.CGFloat
 import platform.Foundation.NSCalendar
 import platform.Foundation.NSDate
-import platform.Foundation.NSTimeInterval
 import platform.Foundation.dateWithTimeIntervalSince1970
 import platform.Foundation.timeIntervalSince1970
 import platform.UIKit.UIButton
@@ -69,13 +67,13 @@ actual class DateTimePickerPresenter(
             super.viewDidLoad()
             val containerView = UIView().apply {
                 backgroundColor = UIColor.systemBackgroundColor
-                layer.cornerRadius = 15.0 as CGFloat
+                layer.cornerRadius = 15.0
                 view.addSubview(this)
                 translatesAutoresizingMaskIntoConstraints = false
                 centerXAnchor.constraintEqualToAnchor(view.centerXAnchor).active = true
                 centerYAnchor.constraintEqualToAnchor(view.centerYAnchor).active = true
-                leadingAnchor.constraintGreaterThanOrEqualToAnchor(view.leadingAnchor, 20.0 as CGFloat).active = true
-                trailingAnchor.constraintLessThanOrEqualToAnchor(view.trailingAnchor, -20.0 as CGFloat).active = true
+                leadingAnchor.constraintGreaterThanOrEqualToAnchor(view.leadingAnchor, 20.0).active = true
+                trailingAnchor.constraintLessThanOrEqualToAnchor(view.trailingAnchor, -20.0).active = true
             }
 
             datePickerView = UIDatePicker().apply {
@@ -83,17 +81,17 @@ actual class DateTimePickerPresenter(
                     this.locale = datePicker.locale.nsLocale
                     this.timeZone = datePicker.selectedDate.timeZone.timeZone
                 }
-                date = NSDate.dateWithTimeIntervalSince1970((datePicker.selectedDate.millisecondSinceEpoch.toDouble() / 1000.0) as NSTimeInterval)
+                date = NSDate.dateWithTimeIntervalSince1970((datePicker.selectedDate.millisecondSinceEpoch.toDouble() / 1000.0))
                 locale = datePicker.locale.nsLocale
                 timeZone = datePicker.selectedDate.timeZone.timeZone
                 datePickerMode = when (val type = datePicker.type) {
                     is DateTimePicker.Type.TimeType -> UIDatePickerMode.UIDatePickerModeTime
                     is DateTimePicker.Type.DateType -> {
                         type.latestDate?.let {
-                            maximumDate = NSDate.dateWithTimeIntervalSince1970((it.millisecondSinceEpoch.toDouble() / 1000.0) as NSTimeInterval)
+                            maximumDate = NSDate.dateWithTimeIntervalSince1970((it.millisecondSinceEpoch.toDouble() / 1000.0))
                         }
                         type.earliestDate?.let {
-                            minimumDate = NSDate.dateWithTimeIntervalSince1970((it.millisecondSinceEpoch.toDouble() / 1000.0) as NSTimeInterval)
+                            minimumDate = NSDate.dateWithTimeIntervalSince1970((it.millisecondSinceEpoch.toDouble() / 1000.0))
                         }
                         UIDatePickerMode.UIDatePickerModeDate
                     }
@@ -109,9 +107,9 @@ actual class DateTimePickerPresenter(
 
                 containerView.addSubview(this)
                 translatesAutoresizingMaskIntoConstraints = false
-                leadingAnchor.constraintEqualToAnchor(containerView.leadingAnchor, 10.0 as CGFloat).active = true
-                trailingAnchor.constraintEqualToAnchor(containerView.trailingAnchor, -10.0 as CGFloat).active = true
-                bottomAnchor.constraintEqualToAnchor(containerView.bottomAnchor, -10.0 as CGFloat).active = true
+                leadingAnchor.constraintEqualToAnchor(containerView.leadingAnchor, 10.0).active = true
+                trailingAnchor.constraintEqualToAnchor(containerView.trailingAnchor, -10.0).active = true
+                bottomAnchor.constraintEqualToAnchor(containerView.bottomAnchor, -10.0).active = true
             }
 
             val topAnchor = datePicker.message?.let {
@@ -121,21 +119,21 @@ actual class DateTimePickerPresenter(
                     translatesAutoresizingMaskIntoConstraints = false
                     bottomAnchor.constraintEqualToAnchor(
                         datePickerView.topAnchor,
-                        -15.0 as CGFloat
+                        -15.0
                     ).active = true
                     containerView.leadingAnchor.constraintEqualToAnchor(
                         leadingAnchor,
-                        -20.0 as CGFloat
+                        -20.0
                     ).active = true
                     containerView.trailingAnchor.constraintEqualToAnchor(
                         trailingAnchor,
-                        20.0 as CGFloat
+                        20.0
                     ).active = true
                     bottomAnchor
                 }.topAnchor
             } ?: datePickerView.topAnchor
 
-            topAnchor.constraintEqualToAnchor(containerView.topAnchor, 10.0 as CGFloat).active = true
+            topAnchor.constraintEqualToAnchor(containerView.topAnchor, 10.0).active = true
 
             UIButton().apply {
                 addTarget(this@DateTimePickerViewController, sel_registerName("onSelected"), UIControlEventTouchUpInside)
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
index be40262ff..9eda42346 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
@@ -48,7 +48,7 @@ class RecurringTimer(
     override val duration: Duration,
     interval: Duration = 100.milliseconds,
     timeSource: TimeSource = TimeSource.Monotonic,
-    delayFunction: DelayFunction = { duration -> delay(duration) },
+    delayFunction: DelayFunction = { delayDuration -> delay(delayDuration) },
     coroutineScope: CoroutineScope = MainScope()
 ) : ControllableTimer {
     private val stateRepo = TimerStateRepo(duration, interval, timeSource, delayFunction, coroutineScope)
diff --git a/links/build.gradle.kts b/links/build.gradle.kts
index f544a17ee..f58002f77 100644
--- a/links/build.gradle.kts
+++ b/links/build.gradle.kts
@@ -28,6 +28,12 @@ publishableComponent()
 
 kotlin {
     sourceSets {
+        sourceSets.all {
+            languageSettings {
+                optIn("kotlinx.serialization.ExperimentalSerializationApi")
+            }
+        }
+
         commonMain {
             dependencies {
                 implementation(project(":base", ""))
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt b/links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt
index b8737bccd..7ca8d45f7 100644
--- a/links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt
+++ b/links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt
@@ -36,7 +36,7 @@ class LinksDecoder(
 ) : AbstractDecoder() {
     private var elementIndex = 0
 
-    override val serializersModule: SerializersModule = EmptySerializersModule
+    override val serializersModule: SerializersModule = EmptySerializersModule()
 
     override fun decodeElementIndex(descriptor: SerialDescriptor): Int {
         if (elementIndex == descriptor.elementsCount) return CompositeDecoder.DECODE_DONE
diff --git a/links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt b/links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
index 9dff56faa..29ca969f1 100644
--- a/links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
+++ b/links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
@@ -25,14 +25,12 @@ import platform.Foundation.NSURLRequest
 
 actual class PlatformLinksHandler : LinksHandler {
     override fun isValid(url: String): Boolean {
-        val _url = NSURL.URLWithString(url) ?: return false
-        return NSURLConnection.canHandleRequest(NSURLRequest.requestWithURL(_url))
+        val nsUrl = NSURL.URLWithString(url) ?: return false
+        return NSURLConnection.canHandleRequest(NSURLRequest.requestWithURL(nsUrl))
     }
 
     override fun extractQueryAsList(url: String): List<Any> {
-        val url = NSURLComponents(url)
-        val queryItems = url.queryItems as List<NSURLQueryItem>? ?: return emptyList()
-
-        return queryItems.mapNotNull { it.value }
+        val components = NSURLComponents(url)
+        return components.queryItems.orEmpty().mapNotNull { (it as? NSURLQueryItem)?.value }
     }
 }
diff --git a/resources/src/iosMain/kotlin/KalugaColor.kt b/resources/src/iosMain/kotlin/KalugaColor.kt
index 66effdcc8..6db6aa1b2 100644
--- a/resources/src/iosMain/kotlin/KalugaColor.kt
+++ b/resources/src/iosMain/kotlin/KalugaColor.kt
@@ -20,7 +20,6 @@ package com.splendo.kaluga.resources
 import kotlinx.cinterop.get
 import platform.CoreGraphics.CGColorGetAlpha
 import platform.CoreGraphics.CGColorGetComponents
-import platform.CoreGraphics.CGFloat
 import platform.UIKit.UIColor
 
 actual data class KalugaColor(val uiColor: UIColor)
@@ -34,7 +33,7 @@ actual val KalugaColor.greenInt: Int get() = (green * 255.0).toInt()
 actual val KalugaColor.alpha: Double get() = CGColorGetAlpha(uiColor.CGColor).toDouble()
 actual val KalugaColor.alphaInt: Int get() = (alpha * 255.0).toInt()
 
-actual fun colorFrom(red: Double, green: Double, blue: Double, alpha: Double): KalugaColor = KalugaColor(UIColor.colorWithRed(red as CGFloat, green as CGFloat, blue as CGFloat, alpha as CGFloat))
+actual fun colorFrom(red: Double, green: Double, blue: Double, alpha: Double): KalugaColor = KalugaColor(UIColor.colorWithRed(red, green, blue, alpha))
 actual fun colorFrom(redInt: Int, greenInt: Int, blueInt: Int, alphaInt: Int): KalugaColor {
     return colorFrom(redInt.toDouble() / 255.0, greenInt.toDouble() / 255.0, blueInt.toDouble() / 255.0, alphaInt.toDouble() / 255.0)
 }
diff --git a/resources/src/iosMain/kotlin/StyledString.kt b/resources/src/iosMain/kotlin/StyledString.kt
index da223db40..1a9637806 100644
--- a/resources/src/iosMain/kotlin/StyledString.kt
+++ b/resources/src/iosMain/kotlin/StyledString.kt
@@ -23,7 +23,6 @@ import com.splendo.kaluga.resources.uikit.nsTextAlignment
 import kotlinx.cinterop.CValue
 import kotlinx.cinterop.convert
 import kotlinx.cinterop.useContents
-import platform.CoreGraphics.CGFloat
 import platform.CoreGraphics.CGSizeMake
 import platform.Foundation.NSAttributedString
 import platform.Foundation.NSAttributedStringKey
@@ -84,26 +83,26 @@ actual class StyledStringBuilder constructor(string: String, private val default
             "NSStrokeWidth" to -1.0 * width
         )
         is StringStyleAttribute.CharacterStyleAttribute.SuperScript -> {
-            val offset = defaultTextStyle.font.fontWithSize(defaultTextStyle.size.toDouble() as CGFloat).ascender / 2.0
+            val offset = defaultTextStyle.font.fontWithSize(defaultTextStyle.size.toDouble()).ascender / 2.0
             mapOf("NSBaselineOffset" to offset)
         }
         is StringStyleAttribute.CharacterStyleAttribute.SubScript -> {
-            val offset = defaultTextStyle.font.fontWithSize(defaultTextStyle.size.toDouble() as CGFloat).ascender / 2.0
+            val offset = defaultTextStyle.font.fontWithSize(defaultTextStyle.size.toDouble()).ascender / 2.0
             mapOf("NSBaselineOffset" to (-1.0 * offset))
         }
         is StringStyleAttribute.CharacterStyleAttribute.Underline -> mapOf("NSUnderline" to NSUnderlineStyleSingle)
         is StringStyleAttribute.CharacterStyleAttribute.Strikethrough -> mapOf("NSStrikethrough" to NSUnderlineStyleSingle)
-        is StringStyleAttribute.CharacterStyleAttribute.Font -> mapOf("NSFont" to font.fontWithSize(size.toDouble() as CGFloat))
+        is StringStyleAttribute.CharacterStyleAttribute.Font -> mapOf("NSFont" to font.fontWithSize(size.toDouble()))
         is StringStyleAttribute.CharacterStyleAttribute.TextStyle -> mapOf(
-            "NSFont" to textStyle.font.fontWithSize(textStyle.size.toDouble() as CGFloat),
+            "NSFont" to textStyle.font.fontWithSize(textStyle.size.toDouble()),
             "NSColor" to textStyle.color.uiColor
         )
         is StringStyleAttribute.CharacterStyleAttribute.Kerning -> mapOf("NSKern" to kern * defaultTextStyle.size)
         is StringStyleAttribute.CharacterStyleAttribute.Shadow -> mapOf(
             "NSShadow" to NSShadow().apply {
                 shadowColor = color.uiColor
-                shadowBlurRadius = blurRadius.toDouble() as CGFloat
-                shadowOffset = CGSizeMake(xOffset.toDouble() as CGFloat, yOffset.toDouble() as CGFloat)
+                shadowBlurRadius = blurRadius.toDouble()
+                shadowOffset = CGSizeMake(xOffset.toDouble(), yOffset.toDouble())
             }
         )
     }
@@ -154,13 +153,13 @@ actual class StyledStringBuilder constructor(string: String, private val default
         rangesToUpdate.forEach { (range, paragraphStyle) ->
             when (this) {
                 is StringStyleAttribute.ParagraphStyleAttribute.LeadingIndent -> {
-                    paragraphStyle.setHeadIndent(indent.toDouble() as CGFloat)
-                    paragraphStyle.setFirstLineHeadIndent(firstLineIndent.toDouble() as CGFloat)
+                    paragraphStyle.setHeadIndent(indent.toDouble())
+                    paragraphStyle.setFirstLineHeadIndent(firstLineIndent.toDouble())
                 }
                 is StringStyleAttribute.ParagraphStyleAttribute.LineSpacing -> {
-                    paragraphStyle.setLineSpacing(spacing.toDouble() as CGFloat)
-                    paragraphStyle.setParagraphSpacing(paragraphSpacing.toDouble() as CGFloat)
-                    paragraphStyle.setParagraphSpacingBefore(paragraphSpacingBefore.toDouble() as CGFloat)
+                    paragraphStyle.setLineSpacing(spacing.toDouble())
+                    paragraphStyle.setParagraphSpacing(paragraphSpacing.toDouble())
+                    paragraphStyle.setParagraphSpacingBefore(paragraphSpacingBefore.toDouble())
                 }
                 is StringStyleAttribute.ParagraphStyleAttribute.Alignment -> {
                     paragraphStyle.setAlignment(alignment.nsTextAlignment)
diff --git a/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt b/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
index f55aa2deb..fc961816a 100644
--- a/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
@@ -23,7 +23,6 @@ import kotlinx.cinterop.CValue
 import kotlinx.cinterop.useContents
 import platform.CoreFoundation.CFRetain
 import platform.CoreGraphics.CGColorRef
-import platform.CoreGraphics.CGFloat
 import platform.CoreGraphics.CGPathRef
 import platform.CoreGraphics.CGPointMake
 import platform.CoreGraphics.CGRect
@@ -68,8 +67,8 @@ private fun pathForShape(shape: BackgroundStyle.Shape, bounds: CValue<CGRect>):
                 }
             },
             CGSizeMake(
-                shape.cornerRadiusX.toDouble() as CGFloat,
-                shape.cornerRadiusY.toDouble() as CGFloat
+                shape.cornerRadiusX.toDouble(),
+                shape.cornerRadiusY.toDouble()
             )
         )
         is BackgroundStyle.Shape.Oval -> UIBezierPath.bezierPathWithOvalInRect(bounds)
@@ -112,36 +111,36 @@ private fun CAGradientLayer.applyGradientStyle(
         type = kCAGradientLayerAxial
         val startAndEndPoint = when (gradientStyle.orientation) {
             GradientStyle.Linear.Orientation.TOP_LEFT_BOTTOM_RIGHT -> Pair(
-                CGPointMake(0.0 as CGFloat, 0.0 as CGFloat),
-                CGPointMake(1.0 as CGFloat, 1.0 as CGFloat)
+                CGPointMake(0.0, 0.0),
+                CGPointMake(1.0, 1.0)
             )
             GradientStyle.Linear.Orientation.TOP_RIGHT_BOTTOM_LEFT -> Pair(
-                CGPointMake(1.0 as CGFloat, 0.0 as CGFloat),
-                CGPointMake(0.0 as CGFloat, 0.0 as CGFloat)
+                CGPointMake(1.0, 0.0),
+                CGPointMake(0.0, 0.0)
             )
             GradientStyle.Linear.Orientation.TOP_BOTTOM -> Pair(
-                CGPointMake(0.5 as CGFloat, 0.0 as CGFloat),
-                CGPointMake(0.5 as CGFloat, 1.0 as CGFloat)
+                CGPointMake(0.5, 0.0),
+                CGPointMake(0.5, 1.0)
             )
             GradientStyle.Linear.Orientation.LEFT_RIGHT -> Pair(
-                CGPointMake(0.0 as CGFloat, 0.5 as CGFloat),
-                CGPointMake(1.0 as CGFloat, 0.5 as CGFloat)
+                CGPointMake(0.0, 0.5),
+                CGPointMake(1.0, 0.5)
             )
             GradientStyle.Linear.Orientation.BOTTOM_LEFT_TOP_RIGHT -> Pair(
-                CGPointMake(0.0 as CGFloat, 1.0 as CGFloat),
-                CGPointMake(1.0 as CGFloat, 0.0 as CGFloat)
+                CGPointMake(0.0, 1.0),
+                CGPointMake(1.0, 0.0)
             )
             GradientStyle.Linear.Orientation.BOTTOM_RIGHT_TOP_LEFT -> Pair(
-                CGPointMake(1.0 as CGFloat, 1.0 as CGFloat),
-                CGPointMake(0.0 as CGFloat, 0.0 as CGFloat)
+                CGPointMake(1.0, 1.0),
+                CGPointMake(0.0, 0.0)
             )
             GradientStyle.Linear.Orientation.BOTTOM_TOP -> Pair(
-                CGPointMake(0.5 as CGFloat, 1.0 as CGFloat),
-                CGPointMake(0.5 as CGFloat, 0.0 as CGFloat)
+                CGPointMake(0.5, 1.0),
+                CGPointMake(0.5, 0.0)
             )
             GradientStyle.Linear.Orientation.RIGHT_LEFT -> Pair(
-                CGPointMake(1.0 as CGFloat, 0.5 as CGFloat),
-                CGPointMake(0.0 as CGFloat, 0.5 as CGFloat)
+                CGPointMake(1.0, 0.5),
+                CGPointMake(0.0, 0.5)
             )
         }
         startPoint = startAndEndPoint.first
@@ -150,18 +149,18 @@ private fun CAGradientLayer.applyGradientStyle(
     is GradientStyle.Radial -> {
         type = kCAGradientLayerRadial
         startPoint = CGPointMake(
-            gradientStyle.centerPoint.x.toDouble() as CGFloat,
-            gradientStyle.centerPoint.y.toDouble() as CGFloat
+            gradientStyle.centerPoint.x.toDouble(),
+            gradientStyle.centerPoint.y.toDouble()
         )
         endPoint = CGPointMake(
-            gradientStyle.centerPoint.x.toDouble() as CGFloat + (gradientStyle.radius / bounds.useContents { size.width }),
-            gradientStyle.centerPoint.y.toDouble() as CGFloat + (gradientStyle.radius / bounds.useContents { size.height })
+            gradientStyle.centerPoint.x.toDouble() + (gradientStyle.radius / bounds.useContents { size.width }),
+            gradientStyle.centerPoint.y.toDouble() + (gradientStyle.radius / bounds.useContents { size.height })
         )
     }
     is GradientStyle.Angular -> {
         type = kCAGradientLayerConic
-        startPoint = CGPointMake(gradientStyle.centerPoint.x.toDouble() as CGFloat, gradientStyle.centerPoint.y.toDouble() as CGFloat)
-        endPoint = CGPointMake(1.0 as CGFloat, gradientStyle.centerPoint.y.toDouble() as CGFloat)
+        startPoint = CGPointMake(gradientStyle.centerPoint.x.toDouble(), gradientStyle.centerPoint.y.toDouble())
+        endPoint = CGPointMake(1.0, gradientStyle.centerPoint.y.toDouble())
     }
 }
 
@@ -176,11 +175,11 @@ private fun CALayer.applyStroke(
             this.path = path
             when (strokeStyle) {
                 is BackgroundStyle.StrokeStyle.Stroke -> {
-                    lineWidth = strokeStyle.width.toDouble() as CGFloat
+                    lineWidth = strokeStyle.width.toDouble()
                     strokeColor = strokeStyle.color.uiColor.CGColor
                 }
                 is BackgroundStyle.StrokeStyle.None -> {
-                    lineWidth = 0.0 as CGFloat
+                    lineWidth = 0.0
                     strokeColor = UIColor.clearColor.CGColor
                 }
             }
diff --git a/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt b/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
index 1ef858f96..fee39d574 100644
--- a/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
@@ -22,7 +22,6 @@ import com.splendo.kaluga.resources.stylable.ButtonStyle
 import com.splendo.kaluga.resources.view.KalugaButton
 import kotlinx.cinterop.ObjCAction
 import kotlinx.cinterop.useContents
-import platform.CoreGraphics.CGFloat
 import platform.CoreGraphics.CGSizeMake
 import platform.Foundation.NSMapTable
 import platform.Foundation.NSPointerFunctionsStrongMemory
@@ -67,7 +66,7 @@ fun UIButton.bindButton(button: KalugaButton) {
 }
 
 fun UIButton.applyStyle(buttonStyle: ButtonStyle) {
-    setFont(buttonStyle.font.fontWithSize(buttonStyle.textSize.toDouble() as CGFloat))
+    setFont(buttonStyle.font.fontWithSize(buttonStyle.textSize.toDouble()))
     setContentHorizontalAlignment(buttonStyle.textAlignment.contentHorizontalAlignment)
     applyButtonStateStyle(buttonStyle.defaultStyle, UIControlStateNormal)
     applyButtonStateStyle(buttonStyle.pressedStyle, UIControlStateHighlighted)
diff --git a/resources/src/iosMain/kotlin/uikit/TextStyle.kt b/resources/src/iosMain/kotlin/uikit/TextStyle.kt
index 24f05b71d..ab0cba3ed 100644
--- a/resources/src/iosMain/kotlin/uikit/TextStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/TextStyle.kt
@@ -20,7 +20,6 @@ package com.splendo.kaluga.resources.uikit
 import com.splendo.kaluga.resources.stylable.TextStyle
 import com.splendo.kaluga.resources.urlRanges
 import com.splendo.kaluga.resources.view.KalugaLabel
-import platform.CoreGraphics.CGFloat
 import platform.Foundation.NSMutableAttributedString
 import platform.Foundation.addAttributes
 import platform.Foundation.create
@@ -91,20 +90,20 @@ fun UITextView.bindTextView(label: KalugaLabel) {
 }
 
 fun UILabel.applyTextStyle(textStyle: TextStyle) {
-    setFont(textStyle.font.fontWithSize(textStyle.size.toDouble() as CGFloat))
+    setFont(textStyle.font.fontWithSize(textStyle.size.toDouble()))
     textColor = textStyle.color.uiColor
     textAlignment = textStyle.alignment.nsTextAlignment
     numberOfLines = 0
 }
 
 fun UITextView.applyTextStyle(textStyle: TextStyle) {
-    setFont(textStyle.font.fontWithSize(textStyle.size.toDouble() as CGFloat))
+    setFont(textStyle.font.fontWithSize(textStyle.size.toDouble()))
     textColor = textStyle.color.uiColor
     textAlignment = textStyle.alignment.nsTextAlignment
 }
 
 fun UITextField.applyTextStyle(textStyle: TextStyle) {
-    setFont(textStyle.font.fontWithSize(textStyle.size.toDouble() as CGFloat))
+    setFont(textStyle.font.fontWithSize(textStyle.size.toDouble()))
     textColor = textStyle.color.uiColor
     textAlignment = textStyle.alignment.nsTextAlignment
 }
diff --git a/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt b/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt
index 7b59273a2..40a21c62a 100644
--- a/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt
+++ b/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt
@@ -20,7 +20,6 @@ import kotlinx.cinterop.CValue
 import kotlinx.cinterop.ObjCAction
 import kotlinx.cinterop.convert
 import kotlinx.cinterop.useContents
-import platform.CoreGraphics.CGFloat
 import platform.CoreGraphics.CGPointMake
 import platform.CoreGraphics.CGRect
 import platform.CoreGraphics.CGRectContainsPoint
@@ -99,7 +98,7 @@ class UILinkTapGesture(private val label: UILabel, private val urlRanges: List<P
         }
         val textContainer = NSTextContainer(labelSize).apply {
             // Configure textContainer
-            lineFragmentPadding = 0.0 as CGFloat
+            lineFragmentPadding = 0.0
             lineBreakMode = label.lineBreakMode.convert()
             maximumNumberOfLines = label.numberOfLines.convert()
             this.size
@@ -117,8 +116,8 @@ class UILinkTapGesture(private val label: UILabel, private val urlRanges: List<P
         val locationOfTouchInLabel = gesture.locationInView(label)
         val textBoundingBox = layoutManager.usedRectForTextContainer(textContainer)
         val textContainerOffset = CGPointMake(
-            (- textBoundingBox.useContents { origin.x }) as CGFloat,
-            (- textBoundingBox.useContents { origin.y }) as CGFloat
+            (- textBoundingBox.useContents { origin.x }),
+            (- textBoundingBox.useContents { origin.y })
         ).useContents { this }
         val locationOfTouchInTextContainer = CGPointMake(
             locationOfTouchInLabel.useContents { x } - textContainerOffset.x,
diff --git a/test-utils-base/src/commonMain/kotlin/FlowTest.kt b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
index f72dbc6e8..4360c822a 100644
--- a/test-utils-base/src/commonMain/kotlin/FlowTest.kt
+++ b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
@@ -75,6 +75,7 @@ Since the class itself is created in the test thread
 
 val contextMap = mutableMapOf<Long, TestContext>()
 
+@Suppress("UNCHECKED_CAST")
 private suspend fun <TC : TestContext> testContext(cookie: Long, testContext: suspend () -> TC): TC {
     if (!contextMap.containsKey(cookie))
         contextMap[cookie] = testContext()
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt
index 66facc2ca..735de073b 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt
@@ -95,7 +95,7 @@ sealed class MockScanningState {
 
         val revokePermission: suspend () -> NoBluetooth.MissingPermissions get() = permittedHandler.revokePermission
 
-        fun pairedDevices(filter: Set<UUID>): List<Identifier> = emptyList()
+        open fun pairedDevices(filter: Set<UUID>): List<Identifier> = emptyList()
 
         class Idle(
             override val discovered: ScanningState.Discovered
diff --git a/test-utils-permissions/src/commonMain/kotlin/MockPermissionStateRepo.kt b/test-utils-permissions/src/commonMain/kotlin/MockPermissionStateRepo.kt
index 5f9677b4d..f4aa003e4 100644
--- a/test-utils-permissions/src/commonMain/kotlin/MockPermissionStateRepo.kt
+++ b/test-utils-permissions/src/commonMain/kotlin/MockPermissionStateRepo.kt
@@ -31,6 +31,7 @@ import kotlin.time.Duration
 /**
  * Mock implementation of [BasePermissionStateRepo]
  */
+@Suppress("UNCHECKED_CAST")
 class MockBasePermissionStateRepo<P : Permission>(
     val permission: P,
     createInitializingState: () -> MockPermissionState.Uninitialized<P>,
diff --git a/test-utils/src/commonMain/kotlin/legacy.kt b/test-utils/src/commonMain/kotlin/legacy.kt
index e5d454b8a..a0984bad8 100644
--- a/test-utils/src/commonMain/kotlin/legacy.kt
+++ b/test-utils/src/commonMain/kotlin/legacy.kt
@@ -13,10 +13,11 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
+@file:Suppress("DEPRECATION")
 
 package com.splendo.kaluga.test
 
-import com.splendo.kaluga.architecture.viewmodel.ViewModel
+import com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel
 import com.splendo.kaluga.test.architecture.UIThreadViewModelTest
 import com.splendo.kaluga.test.base.captureFor
 import kotlinx.coroutines.CoroutineScope
@@ -82,6 +83,7 @@ abstract class KoinFlowTest<TC : KoinUIThreadTest.KoinTestContext, T, F : Flow<T
         }
     }
 
+    @Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
     fun testWithFlow(block: KoinFlowTestBlock<TC, T, F>) =
         super.testWithFlowAndTestContext(Unit, createFlowInMainScope = false, retainContextAfterTest = false) {
             block(this@KoinFlowTest, it)
@@ -89,11 +91,11 @@ abstract class KoinFlowTest<TC : KoinUIThreadTest.KoinTestContext, T, F : Flow<T
 }
 
 @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinUIThreadViewModelTest", "com.splendo.kaluga.test.koin.KoinUIThreadViewModelTest"))
-abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : ViewModel> :
+abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : LifecycleViewModel> :
     KoinUIThreadTest<KVMC>() {
 
     @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinViewModelTestContext", "com.splendo.kaluga.test.koin.KoinUIThreadViewModelTest"))
-    abstract class KoinViewModelTestContext<VM : ViewModel>(
+    abstract class KoinViewModelTestContext<VM : LifecycleViewModel>(
         appDeclaration: KoinAppDeclaration? = null,
         koinModules: List<Module>
     ) : KoinUIThreadTest.KoinTestContext(appDeclaration, koinModules),

From a67f6669b6b18ee7c078a3055238321bc828484f Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 8 Nov 2022 13:11:35 +0100
Subject: [PATCH 012/227] Fixed publishing

---
 kaluga-library-components/src/main/kotlin/Publish.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kaluga-library-components/src/main/kotlin/Publish.kt b/kaluga-library-components/src/main/kotlin/Publish.kt
index 909e636a4..d3f15eb35 100644
--- a/kaluga-library-components/src/main/kotlin/Publish.kt
+++ b/kaluga-library-components/src/main/kotlin/Publish.kt
@@ -28,14 +28,14 @@ fun Project.publish(componentType: ComponentType = ComponentType.Default()) {
                         create("release", MavenPublication::class.java) {
                             from(components.getByName("release"))
 
-                            artifactId = name
+                            artifactId = project.name
                             groupId = Library.group
                             version = Library.version
                         }
                         create("debug", MavenPublication::class.java) {
                             from(components.getByName("debug"))
 
-                            artifactId = name
+                            artifactId = project.name
                             groupId = Library.group
                             version = Library.version
                         }
@@ -43,7 +43,7 @@ fun Project.publish(componentType: ComponentType = ComponentType.Default()) {
                     is ComponentType.Default -> {
                         getByName("kotlinMultiplatform") {
                             (this as MavenPublication).let {
-                                artifactId = name
+                                artifactId = project.name
                                 groupId = Library.group
                                 version = Library.version
                             }

From e853ae1b0848e53758336ab1ffa48f504e3c52e7 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 11 Nov 2022 16:16:36 +0100
Subject: [PATCH 013/227] Updated systems library to be consistent with other
 KalugaStates

Also fixed some naming conflicts in other modules
---
 README.md                                     |   3 +-
 bluetooth/api/androidLib/bluetooth.api        |  12 +-
 bluetooth/api/jvm/bluetooth.api               |  18 +-
 .../androidLibMain/kotlin/BluetoothBuilder.kt |   2 +-
 bluetooth/src/commonMain/kotlin/Bluetooth.kt  |  17 +-
 .../src/iosMain/kotlin/BluetoothBuilder.kt    |   2 +-
 .../src/jsMain/kotlin/BluetoothBuilder.kt     |   2 +-
 .../src/jvmMain/kotlin/BluetoothBuilder.kt    |   2 +-
 example/android/proguard-rules.pro            |   2 +-
 gradle/newModule.gradle.kts                   |   2 +-
 links/api/androidLib/links.api                |  10 +-
 links/api/jvm/links.api                       |  10 +-
 .../com/splendo/kaluga/links/LinksBuilder.kt  |   2 +-
 .../kotlin/com/splendo/kaluga/links/Links.kt  |  10 +-
 .../kaluga/links/manager/MockLinksManager.kt  |   3 +-
 .../com/splendo/kaluga/links/LinksBuilder.kt  |   2 +-
 .../com/splendo/kaluga/links/LinksBuilder.kt  |   2 +-
 .../com/splendo/kaluga/links/LinksBuilder.kt  |   2 +-
 location/api/androidLib/location.api          |  12 +-
 location/api/jvm/location.api                 |  18 +-
 .../kotlin/location/LocationManager.kt        |   2 +-
 .../kotlin/location/LocationStateRepo.kt      |  19 +-
 .../kotlin/location/LocationManager.kt        |   2 +-
 location/src/jsMain/kotlin/LocationManager.kt |   2 +-
 .../src/jvmMain/kotlin/LocationManager.kt     |   2 +-
 permissions/api/androidLib/permissions.api    |   2 +
 permissions/api/jvm/permissions.api           |   2 +
 settings.gradle.kts                           |   1 +
 system/api/androidLib/system.api              | 292 +++++++++-----
 system/api/jvm/system.api                     | 370 ++++++++++++++----
 system/build.gradle.kts                       |   2 +-
 .../kaluga/system/network/NetworkManager.kt   | 117 +++---
 .../system/network/NetworkManagerBuilder.kt   |  30 --
 .../network/state/NetworkStateRepoBuilder.kt  |   8 +-
 .../{Network.kt => NetworkConnectionType.kt}  |  23 +-
 ...aseNetworkManager.kt => NetworkManager.kt} |  17 +-
 .../system/network/state/NetworkState.kt      | 140 ++++---
 .../system/network/state/NetworkStateRepo.kt  | 186 ++++-----
 .../network/state/NetworkStateRepoBuilder.kt  |  13 +-
 .../system/network/BaseNetworkStateTest.kt    |  51 +++
 .../system/network/MockNetworkManager.kt      |  31 --
 .../network/MockNetworkStateRepoBuilder.kt    |  47 ---
 .../kaluga/system/network/NetworkStateTest.kt | 258 ++++--------
 .../kaluga/system/network/OnlineTest.kt       |  50 +++
 .../system/network/NetworkManager.kt          |  91 +++--
 .../network/state/NetworkStateRepoBuilder.kt  |   9 +-
 .../kaluga/system/network/NetworkManager.kt}  |  19 +-
 .../network/state/NetworkStateRepoBuilder.kt  |   7 +-
 .../kaluga/system/network/NetworkManager.kt}  |  19 +-
 .../network/state/NetworkStateRepoBuilder.kt  |   7 +-
 .../api/androidLib/test-utils-bluetooth.api   |   2 +-
 .../api/jvm/test-utils-bluetooth.api          |   2 +-
 .../src/commonMain/kotlin/MockHUD.kt          |   2 +-
 test-utils-location/README.md                 |   2 +-
 .../api/androidLib/test-utils-location.api    |   2 +-
 .../api/jvm/test-utils-location.api           |   2 +-
 .../commonMain/kotlin/MockLocationManager.kt  |   4 +-
 .../kotlin/MockLocationStateRepoBuilder.kt    |   7 +-
 .../api/androidLib/test-utils-system.api      | 124 ++++++
 .../api/jvm/test-utils-system.api             | 135 +++++++
 test-utils-system/build.gradle.kts            |  23 ++
 .../androidLibAndroidTest/AndroidManifest.xml |   6 +
 .../kotlin/TestActivity.kt                    |  14 +-
 .../src/androidLibMain/AndroidManifest.xml    |   2 +
 .../kotlin/network/MockNetworkManager.kt      |  81 ++++
 .../kotlin/network/MockNetworkState.kt        |  73 ++++
 .../network/MockNetworkStateRepoBuilder.kt    |  59 +++
 test-utils/build.gradle.kts                   |   1 +
 68 files changed, 1675 insertions(+), 818 deletions(-)
 delete mode 100644 system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
 rename system/src/commonMain/kotlin/com/splendo/kaluga/system/network/{Network.kt => NetworkConnectionType.kt} (55%)
 rename system/src/commonMain/kotlin/com/splendo/kaluga/system/network/{BaseNetworkManager.kt => NetworkManager.kt} (68%)
 create mode 100644 system/src/commonTest/kotlin/com/splendo/kaluga/system/network/BaseNetworkStateTest.kt
 delete mode 100644 system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkManager.kt
 delete mode 100644 system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkStateRepoBuilder.kt
 create mode 100644 system/src/commonTest/kotlin/com/splendo/kaluga/system/network/OnlineTest.kt
 rename system/src/{jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt => jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt} (58%)
 rename system/src/{jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt => jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt} (58%)
 create mode 100644 test-utils-system/api/androidLib/test-utils-system.api
 create mode 100644 test-utils-system/api/jvm/test-utils-system.api
 create mode 100644 test-utils-system/build.gradle.kts
 create mode 100644 test-utils-system/src/androidLibAndroidTest/AndroidManifest.xml
 rename system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManagerBuilder.kt => test-utils-system/src/androidLibAndroidTest/kotlin/TestActivity.kt (70%)
 create mode 100644 test-utils-system/src/androidLibMain/AndroidManifest.xml
 create mode 100644 test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
 create mode 100644 test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
 create mode 100644 test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt

diff --git a/README.md b/README.md
index aba90dba7..053d80ada 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ Module | Usage | Artifact Name
 [resources](resources/) | Provides shared Strings, Images, Colors and Fonts | com.splendo.kaluga.resources
 [review](review/) | Used for requesting the user to review the app | com.splendo.kaluga.review
 [scientific](scientific/) | Scientific units and conversions | com.splendo.kaluga.scientific
-[system](system/) | System APIs such as network, audio, battery  | com.splendo.kaluga.system
+[system](system/) | System APIs such as network, audio, battery | com.splendo.kaluga.system
 [test-utils](test-utils/) | Enables easier testing of Kaluga components | com.splendo.kaluga.test-utils
 [test-utils-base](test-utils-base/) | Enables easier testing of Kaluga components | com.splendo.kaluga.test-utils-base
 [test-utils-alerts](test-utils-alerts/) | Enables easier testing of Alerts module | com.splendo.kaluga.test-utils-alerts
@@ -137,6 +137,7 @@ Module | Usage | Artifact Name
 [test-utils-location](test-utils-location/) | Enables easier testing of Location module | com.splendo.kaluga.test-utils-location
 [test-utils-permissions](test-utils-permissions/) | Enables easier testing of Permissions modules | com.splendo.kaluga.test-utils-permissions
 [test-utils-resources](test-utils-resources/) | Enables easier testing of Resources module | com.splendo.kaluga.test-utils-resources
+[test-utils-system](test-utils-system/) | Enables easier testing of System module | com.splendo.kaluga.test-utils-system
 
 ### Friends of kaluga
 
diff --git a/bluetooth/api/androidLib/bluetooth.api b/bluetooth/api/androidLib/bluetooth.api
index 89872a138..123995971 100644
--- a/bluetooth/api/androidLib/bluetooth.api
+++ b/bluetooth/api/androidLib/bluetooth.api
@@ -10,6 +10,11 @@ public abstract class com/splendo/kaluga/bluetooth/Attribute : kotlinx/coroutine
 	public final fun writeValue ([B)Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 }
 
+public abstract interface class com/splendo/kaluga/bluetooth/BaseBluetoothBuilder {
+	public abstract fun create (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
+	public static synthetic fun create$default (Lcom/splendo/kaluga/bluetooth/BaseBluetoothBuilder;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
+}
+
 public final class com/splendo/kaluga/bluetooth/Bluetooth : com/splendo/kaluga/bluetooth/BluetoothService, kotlinx/coroutines/CoroutineScope {
 	public fun devices ()Lkotlinx/coroutines/flow/Flow;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
@@ -20,11 +25,6 @@ public final class com/splendo/kaluga/bluetooth/Bluetooth : com/splendo/kaluga/b
 	public fun stopScanning ()V
 }
 
-public abstract interface class com/splendo/kaluga/bluetooth/Bluetooth$Builder {
-	public abstract fun create (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
-	public static synthetic fun create$default (Lcom/splendo/kaluga/bluetooth/Bluetooth$Builder;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
-}
-
 public abstract class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode {
 }
 
@@ -37,7 +37,7 @@ public final class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Stopped : com
 	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Stopped;
 }
 
-public final class com/splendo/kaluga/bluetooth/BluetoothBuilder : com/splendo/kaluga/bluetooth/Bluetooth$Builder {
+public final class com/splendo/kaluga/bluetooth/BluetoothBuilder : com/splendo/kaluga/bluetooth/BaseBluetoothBuilder {
 	public fun <init> ()V
 	public fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;)V
 	public synthetic fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index 3538ffc3e..e85285737 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -10,6 +10,14 @@ public abstract class com/splendo/kaluga/bluetooth/Attribute : kotlinx/coroutine
 	public final fun writeValue ([B)Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 }
 
+public abstract interface class com/splendo/kaluga/bluetooth/BaseBluetoothBuilder {
+	public abstract fun create (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
+}
+
+public final class com/splendo/kaluga/bluetooth/BaseBluetoothBuilder$DefaultImpls {
+	public static synthetic fun create$default (Lcom/splendo/kaluga/bluetooth/BaseBluetoothBuilder;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
+}
+
 public final class com/splendo/kaluga/bluetooth/Bluetooth : com/splendo/kaluga/bluetooth/BluetoothService, kotlinx/coroutines/CoroutineScope {
 	public fun devices ()Lkotlinx/coroutines/flow/Flow;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
@@ -20,14 +28,6 @@ public final class com/splendo/kaluga/bluetooth/Bluetooth : com/splendo/kaluga/b
 	public fun stopScanning ()V
 }
 
-public abstract interface class com/splendo/kaluga/bluetooth/Bluetooth$Builder {
-	public abstract fun create (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
-}
-
-public final class com/splendo/kaluga/bluetooth/Bluetooth$Builder$DefaultImpls {
-	public static synthetic fun create$default (Lcom/splendo/kaluga/bluetooth/Bluetooth$Builder;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
-}
-
 public abstract class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode {
 }
 
@@ -40,7 +40,7 @@ public final class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Stopped : com
 	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Stopped;
 }
 
-public final class com/splendo/kaluga/bluetooth/BluetoothBuilder : com/splendo/kaluga/bluetooth/Bluetooth$Builder {
+public final class com/splendo/kaluga/bluetooth/BluetoothBuilder : com/splendo/kaluga/bluetooth/BaseBluetoothBuilder {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/jvm/functions/Function2;)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt
index c4b40d3e3..989c81af6 100644
--- a/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt
@@ -24,7 +24,7 @@ actual class BluetoothBuilder(
         )
     },
     private val scannerBuilder: BaseScanner.Builder = DefaultScanner.Builder(applicationContext = applicationContext)
-) : Bluetooth.Builder {
+) : BaseBluetoothBuilder {
 
     override fun create(
         scannerSettingsBuilder: (Permissions) -> BaseScanner.Settings,
diff --git a/bluetooth/src/commonMain/kotlin/Bluetooth.kt b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
index 74a22fa4e..0841663da 100644
--- a/bluetooth/src/commonMain/kotlin/Bluetooth.kt
+++ b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
@@ -70,14 +70,6 @@ class Bluetooth internal constructor(
     coroutineContext: CoroutineContext,
 ) : BluetoothService, CoroutineScope by CoroutineScope(coroutineContext + CoroutineName("Bluetooth")) {
 
-    interface Builder {
-        fun create(
-            scannerSettingsBuilder: (Permissions) -> BaseScanner.Settings = { BaseScanner.Settings(it) },
-            connectionSettings: ConnectionSettings = ConnectionSettings(),
-            coroutineContext: CoroutineContext = defaultBluetoothDispatcher,
-        ): Bluetooth
-    }
-
     internal val scanningStateRepo = ScanningStateRepo(
         scannerSettingsBuilder,
         scannerBuilder,
@@ -168,7 +160,14 @@ class Bluetooth internal constructor(
         .mapLatest { it is ScanningState.Enabled }
 }
 
-expect class BluetoothBuilder : Bluetooth.Builder
+interface BaseBluetoothBuilder {
+    fun create(
+        scannerSettingsBuilder: (Permissions) -> BaseScanner.Settings = { BaseScanner.Settings(it) },
+        connectionSettings: ConnectionSettings = ConnectionSettings(),
+        coroutineContext: CoroutineContext = defaultBluetoothDispatcher,
+    ): Bluetooth
+}
+expect class BluetoothBuilder : BaseBluetoothBuilder
 
 operator fun Flow<List<Device>>.get(identifier: Identifier): Flow<Device?> {
     return this.map { devices ->
diff --git a/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
index 92d5ce2e5..71c3e9ee1 100644
--- a/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
@@ -20,7 +20,7 @@ actual class BluetoothBuilder(
         )
     },
     private val scannerBuilder: DefaultScanner.Builder = DefaultScanner.Builder()
-) : Bluetooth.Builder {
+) : BaseBluetoothBuilder {
 
     override fun create(
         scannerSettingsBuilder: (Permissions) -> BaseScanner.Settings,
diff --git a/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt
index bcf292f32..5514dbb68 100644
--- a/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt
@@ -17,7 +17,7 @@ actual class BluetoothBuilder(
             context
         )
     }
-) : Bluetooth.Builder {
+) : BaseBluetoothBuilder {
 
     override fun create(
         scannerSettingsBuilder: (Permissions) -> BaseScanner.Settings,
diff --git a/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt
index bcf292f32..5514dbb68 100644
--- a/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt
@@ -17,7 +17,7 @@ actual class BluetoothBuilder(
             context
         )
     }
-) : Bluetooth.Builder {
+) : BaseBluetoothBuilder {
 
     override fun create(
         scannerSettingsBuilder: (Permissions) -> BaseScanner.Settings,
diff --git a/example/android/proguard-rules.pro b/example/android/proguard-rules.pro
index e3345f14a..2f9dc5a47 100644
--- a/example/android/proguard-rules.pro
+++ b/example/android/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.build.gradle.kts.kts.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/gradle/newModule.gradle.kts b/gradle/newModule.gradle.kts
index 40acfb3aa..7eae8eb50 100644
--- a/gradle/newModule.gradle.kts
+++ b/gradle/newModule.gradle.kts
@@ -24,7 +24,7 @@ abstract class NewModule : DefaultTask() {
         const val VALID_MODULE_NAME_REGEX = "^[^\\dA-Z-][a-z]+[a-z-]*\\Z"
         const val VALID_PACKAGE_NAME = "^[a-z]+(\\.[a-z]+)*\\Z"
         const val TEMPLATE_PATH = "adding-a-new-module/template"
-        const val BUILD_GRADLE_KTS = "build.build.gradle.kts.kts"
+        const val BUILD_GRADLE_KTS = "build.gradle.kts"
         val CREATE_DIRS = listOf(
             "androidLibAndroidTest" to listOf("kotlin/TestActivity.kt", "AndroidManifest.xml"),
             "androidLibMain" to listOf("AndroidManifest.xml"),
diff --git a/links/api/androidLib/links.api b/links/api/androidLib/links.api
index c8df5d58f..fc20da307 100644
--- a/links/api/androidLib/links.api
+++ b/links/api/androidLib/links.api
@@ -1,14 +1,14 @@
+public abstract interface class com/splendo/kaluga/links/BaseLinksBuilder {
+	public abstract fun create ()Lcom/splendo/kaluga/links/Links;
+}
+
 public final class com/splendo/kaluga/links/Links {
 	public fun <init> (Lcom/splendo/kaluga/links/manager/LinksManager$Builder;)V
 	public final fun handleIncomingLink (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public final fun validateLink (Ljava/lang/String;)Ljava/lang/String;
 }
 
-public abstract interface class com/splendo/kaluga/links/Links$Builder {
-	public abstract fun create ()Lcom/splendo/kaluga/links/Links;
-}
-
-public final class com/splendo/kaluga/links/LinksBuilder : com/splendo/kaluga/links/Links$Builder {
+public final class com/splendo/kaluga/links/LinksBuilder : com/splendo/kaluga/links/BaseLinksBuilder {
 	public fun <init> ()V
 	public fun create ()Lcom/splendo/kaluga/links/Links;
 }
diff --git a/links/api/jvm/links.api b/links/api/jvm/links.api
index c8df5d58f..fc20da307 100644
--- a/links/api/jvm/links.api
+++ b/links/api/jvm/links.api
@@ -1,14 +1,14 @@
+public abstract interface class com/splendo/kaluga/links/BaseLinksBuilder {
+	public abstract fun create ()Lcom/splendo/kaluga/links/Links;
+}
+
 public final class com/splendo/kaluga/links/Links {
 	public fun <init> (Lcom/splendo/kaluga/links/manager/LinksManager$Builder;)V
 	public final fun handleIncomingLink (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public final fun validateLink (Ljava/lang/String;)Ljava/lang/String;
 }
 
-public abstract interface class com/splendo/kaluga/links/Links$Builder {
-	public abstract fun create ()Lcom/splendo/kaluga/links/Links;
-}
-
-public final class com/splendo/kaluga/links/LinksBuilder : com/splendo/kaluga/links/Links$Builder {
+public final class com/splendo/kaluga/links/LinksBuilder : com/splendo/kaluga/links/BaseLinksBuilder {
 	public fun <init> ()V
 	public fun create ()Lcom/splendo/kaluga/links/Links;
 }
diff --git a/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
index 6bde20685..e79f403e7 100644
--- a/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
@@ -19,7 +19,7 @@ package com.splendo.kaluga.links
 
 import com.splendo.kaluga.links.manager.LinksManagerBuilder
 
-actual class LinksBuilder : Links.Builder {
+actual class LinksBuilder : BaseLinksBuilder {
     override fun create(): Links =
         Links(LinksManagerBuilder())
 }
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt b/links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt
index 46f6cd1a7..8e20f6917 100644
--- a/links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt
+++ b/links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt
@@ -24,10 +24,6 @@ class Links(
     linksManagerBuilder: LinksManager.Builder
 ) {
 
-    interface Builder {
-        fun create(): Links
-    }
-
     internal var linksManager: LinksManager = linksManagerBuilder.create()
 
     /**
@@ -50,4 +46,8 @@ class Links(
     }
 }
 
-expect class LinksBuilder constructor() : Links.Builder
+interface BaseLinksBuilder {
+    fun create(): Links
+}
+
+expect class LinksBuilder constructor() : BaseLinksBuilder
diff --git a/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/MockLinksManager.kt b/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/MockLinksManager.kt
index 1a2019eb8..90334ee18 100644
--- a/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/MockLinksManager.kt
+++ b/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/MockLinksManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.links.manager
 
+import com.splendo.kaluga.links.BaseLinksBuilder
 import com.splendo.kaluga.links.Links
 import kotlinx.serialization.KSerializer
 
@@ -43,7 +44,7 @@ class MockLinksManagerBuilder : LinksManager.Builder {
     }
 }
 
-class MockLinksBuilder : Links.Builder {
+class MockLinksBuilder : BaseLinksBuilder {
     override fun create(): Links {
         return Links(MockLinksManagerBuilder())
     }
diff --git a/links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
index 6bde20685..e79f403e7 100644
--- a/links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
@@ -19,7 +19,7 @@ package com.splendo.kaluga.links
 
 import com.splendo.kaluga.links.manager.LinksManagerBuilder
 
-actual class LinksBuilder : Links.Builder {
+actual class LinksBuilder : BaseLinksBuilder {
     override fun create(): Links =
         Links(LinksManagerBuilder())
 }
diff --git a/links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
index 1aef408b1..7156687e9 100644
--- a/links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.links
 
-actual class LinksBuilder : Links.Builder {
+actual class LinksBuilder : BaseLinksBuilder {
     override fun create(): Links {
         TODO("Not yet implemented")
     }
diff --git a/links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
index 1aef408b1..7156687e9 100644
--- a/links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.links
 
-actual class LinksBuilder : Links.Builder {
+actual class LinksBuilder : BaseLinksBuilder {
     override fun create(): Links {
         TODO("Not yet implemented")
     }
diff --git a/location/api/androidLib/location.api b/location/api/androidLib/location.api
index f7264932f..825fd9fb3 100644
--- a/location/api/androidLib/location.api
+++ b/location/api/androidLib/location.api
@@ -50,6 +50,11 @@ public abstract class com/splendo/kaluga/location/BaseLocationStateRepo : com/sp
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
+public abstract interface class com/splendo/kaluga/location/BaseLocationStateRepoBuilder {
+	public abstract fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
+	public static synthetic fun create$default (Lcom/splendo/kaluga/location/BaseLocationStateRepoBuilder;Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateRepo;
+}
+
 public final class com/splendo/kaluga/location/DMSCoordinate {
 	public static final field Companion Lcom/splendo/kaluga/location/DMSCoordinate$Companion;
 	public fun <init> (IIDLcom/splendo/kaluga/location/DMSCoordinate$WindDirection;)V
@@ -456,12 +461,7 @@ public final class com/splendo/kaluga/location/LocationStateRepo : com/splendo/k
 	public fun <init> (Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
 }
 
-public abstract interface class com/splendo/kaluga/location/LocationStateRepo$Builder {
-	public abstract fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
-	public static synthetic fun create$default (Lcom/splendo/kaluga/location/LocationStateRepo$Builder;Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateRepo;
-}
-
-public final class com/splendo/kaluga/location/LocationStateRepoBuilder : com/splendo/kaluga/location/LocationStateRepo$Builder {
+public final class com/splendo/kaluga/location/LocationStateRepoBuilder : com/splendo/kaluga/location/BaseLocationStateRepoBuilder {
 	public fun <init> ()V
 	public fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;)V
 	public synthetic fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index 1980faeb4..2045ca3ab 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -50,6 +50,14 @@ public abstract class com/splendo/kaluga/location/BaseLocationStateRepo : com/sp
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
+public abstract interface class com/splendo/kaluga/location/BaseLocationStateRepoBuilder {
+	public abstract fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
+}
+
+public final class com/splendo/kaluga/location/BaseLocationStateRepoBuilder$DefaultImpls {
+	public static synthetic fun create$default (Lcom/splendo/kaluga/location/BaseLocationStateRepoBuilder;Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateRepo;
+}
+
 public final class com/splendo/kaluga/location/DMSCoordinate {
 	public static final field Companion Lcom/splendo/kaluga/location/DMSCoordinate$Companion;
 	public fun <init> (IIDLcom/splendo/kaluga/location/DMSCoordinate$WindDirection;)V
@@ -486,15 +494,7 @@ public final class com/splendo/kaluga/location/LocationStateRepo : com/splendo/k
 	public fun <init> (Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
 }
 
-public abstract interface class com/splendo/kaluga/location/LocationStateRepo$Builder {
-	public abstract fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
-}
-
-public final class com/splendo/kaluga/location/LocationStateRepo$Builder$DefaultImpls {
-	public static synthetic fun create$default (Lcom/splendo/kaluga/location/LocationStateRepo$Builder;Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateRepo;
-}
-
-public final class com/splendo/kaluga/location/LocationStateRepoBuilder : com/splendo/kaluga/location/LocationStateRepo$Builder {
+public final class com/splendo/kaluga/location/LocationStateRepoBuilder : com/splendo/kaluga/location/BaseLocationStateRepoBuilder {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/jvm/functions/Function2;)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/location/src/androidLibMain/kotlin/location/LocationManager.kt b/location/src/androidLibMain/kotlin/location/LocationManager.kt
index fab305c9b..d6e2638b7 100644
--- a/location/src/androidLibMain/kotlin/location/LocationManager.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationManager.kt
@@ -98,7 +98,7 @@ actual class LocationStateRepoBuilder(
             coroutineContext
         )
     }
-) : LocationStateRepo.Builder {
+) : BaseLocationStateRepoBuilder {
 
     override fun create(
         locationPermission: LocationPermission,
diff --git a/location/src/commonMain/kotlin/location/LocationStateRepo.kt b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
index 188b45322..cc3b9485e 100644
--- a/location/src/commonMain/kotlin/location/LocationStateRepo.kt
+++ b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
@@ -146,14 +146,13 @@ class LocationStateRepo(
         )
     },
     coroutineContext = coroutineContext,
-) {
-    interface Builder {
-        fun create(
-            locationPermission: LocationPermission,
-            settingsBuilder: (LocationPermission, Permissions) -> BaseLocationManager.Settings = { permission, permissions -> BaseLocationManager.Settings(permission, permissions) },
-            coroutineContext: CoroutineContext = defaultLocationDispatcher
-        ): LocationStateRepo
-    }
-}
+)
 
-expect class LocationStateRepoBuilder : LocationStateRepo.Builder
+interface BaseLocationStateRepoBuilder {
+    fun create(
+        locationPermission: LocationPermission,
+        settingsBuilder: (LocationPermission, Permissions) -> BaseLocationManager.Settings = { permission, permissions -> BaseLocationManager.Settings(permission, permissions) },
+        coroutineContext: CoroutineContext = defaultLocationDispatcher
+    ): LocationStateRepo
+}
+expect class LocationStateRepoBuilder : BaseLocationStateRepoBuilder
diff --git a/location/src/iosMain/kotlin/location/LocationManager.kt b/location/src/iosMain/kotlin/location/LocationManager.kt
index c7e7099cd..24e8140cc 100644
--- a/location/src/iosMain/kotlin/location/LocationManager.kt
+++ b/location/src/iosMain/kotlin/location/LocationManager.kt
@@ -118,7 +118,7 @@ actual class LocationStateRepoBuilder(
             context
         )
     }
-) : LocationStateRepo.Builder {
+) : BaseLocationStateRepoBuilder {
 
     override fun create(
         locationPermission: LocationPermission,
diff --git a/location/src/jsMain/kotlin/LocationManager.kt b/location/src/jsMain/kotlin/LocationManager.kt
index 687a7f3a8..98f5a71f8 100644
--- a/location/src/jsMain/kotlin/LocationManager.kt
+++ b/location/src/jsMain/kotlin/LocationManager.kt
@@ -60,7 +60,7 @@ actual class LocationStateRepoBuilder(
             context
         )
     }
-) : LocationStateRepo.Builder {
+) : BaseLocationStateRepoBuilder {
 
     override fun create(
         locationPermission: LocationPermission,
diff --git a/location/src/jvmMain/kotlin/LocationManager.kt b/location/src/jvmMain/kotlin/LocationManager.kt
index 687a7f3a8..98f5a71f8 100644
--- a/location/src/jvmMain/kotlin/LocationManager.kt
+++ b/location/src/jvmMain/kotlin/LocationManager.kt
@@ -60,7 +60,7 @@ actual class LocationStateRepoBuilder(
             context
         )
     }
-) : LocationStateRepo.Builder {
+) : BaseLocationStateRepoBuilder {
 
     override fun create(
         locationPermission: LocationPermission,
diff --git a/permissions/api/androidLib/permissions.api b/permissions/api/androidLib/permissions.api
index e31d48e29..6b76e3be2 100644
--- a/permissions/api/androidLib/permissions.api
+++ b/permissions/api/androidLib/permissions.api
@@ -1,5 +1,7 @@
 public final class com/splendo/kaluga/permissions/RegisterAllPermissionsKt {
 	public static final fun registerAllPermissions-dWUq8MI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun registerAllPermissions-dWUq8MI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerAllPermissionsNotRegistered-dWUq8MI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerAllPermissionsNotRegistered-dWUq8MI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/permissions/api/jvm/permissions.api b/permissions/api/jvm/permissions.api
index e31d48e29..6b76e3be2 100644
--- a/permissions/api/jvm/permissions.api
+++ b/permissions/api/jvm/permissions.api
@@ -1,5 +1,7 @@
 public final class com/splendo/kaluga/permissions/RegisterAllPermissionsKt {
 	public static final fun registerAllPermissions-dWUq8MI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun registerAllPermissions-dWUq8MI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerAllPermissionsNotRegistered-dWUq8MI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerAllPermissionsNotRegistered-dWUq8MI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cf929ef1d..44c16d8db 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -92,3 +92,4 @@ include(":test-utils-koin")
 include(":test-utils-location")
 include(":test-utils-permissions")
 include(":test-utils-resources")
+include(":test-utils-system")
diff --git a/system/api/androidLib/system.api b/system/api/androidLib/system.api
index fdc789bec..af7c4cf39 100644
--- a/system/api/androidLib/system.api
+++ b/system/api/androidLib/system.api
@@ -1,162 +1,278 @@
-public abstract interface class com/splendo/kaluga/system/network/BaseNetworkManager {
-	public abstract fun dispose ()V
-	public abstract fun getOnNetworkStateChange ()Lkotlin/jvm/functions/Function1;
+public abstract class com/splendo/kaluga/system/network/BaseNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
+	public fun <init> ()V
 }
 
 public abstract interface class com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
-	public abstract fun create (Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+	public abstract fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+}
+
+public final class com/splendo/kaluga/system/network/DefaultNetworkManager : com/splendo/kaluga/system/network/BaseNetworkManager {
+	public fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
+	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class com/splendo/kaluga/system/network/DefaultNetworkManager$Builder : com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
+	public fun <init> (Landroid/content/Context;)V
+	public fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+}
+
+public abstract class com/splendo/kaluga/system/network/NetworkConnectionType {
 }
 
-public abstract class com/splendo/kaluga/system/network/Network {
+public abstract class com/splendo/kaluga/system/network/NetworkConnectionType$Known : com/splendo/kaluga/system/network/NetworkConnectionType {
 }
 
-public abstract class com/splendo/kaluga/system/network/Network$Known : com/splendo/kaluga/system/network/Network {
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent : com/splendo/kaluga/system/network/NetworkConnectionType$Known {
+	public static final field INSTANCE Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
 }
 
-public final class com/splendo/kaluga/system/network/Network$Known$Absent : com/splendo/kaluga/system/network/Network$Known {
-	public static final field INSTANCE Lcom/splendo/kaluga/system/network/Network$Known$Absent;
+public abstract class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available : com/splendo/kaluga/system/network/NetworkConnectionType$Known, com/splendo/kaluga/system/network/ReachableNetworkConnection {
 }
 
-public final class com/splendo/kaluga/system/network/Network$Known$Cellular : com/splendo/kaluga/system/network/Network$Known, com/splendo/kaluga/system/network/ReachableNetworkConnection {
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular : com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available {
 	public fun <init> ()V
 	public fun <init> (Z)V
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Z
-	public final fun copy (Z)Lcom/splendo/kaluga/system/network/Network$Known$Cellular;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/Network$Known$Cellular;ZILjava/lang/Object;)Lcom/splendo/kaluga/system/network/Network$Known$Cellular;
+	public final fun copy (Z)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;ZILjava/lang/Object;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun hashCode ()I
 	public fun isExpensive ()Z
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/Network$Known$Wifi : com/splendo/kaluga/system/network/Network$Known, com/splendo/kaluga/system/network/ReachableNetworkConnection {
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Wifi : com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available {
 	public fun <init> ()V
 	public fun <init> (Z)V
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Z
-	public final fun copy (Z)Lcom/splendo/kaluga/system/network/Network$Known$Wifi;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/Network$Known$Wifi;ZILjava/lang/Object;)Lcom/splendo/kaluga/system/network/Network$Known$Wifi;
+	public final fun copy (Z)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Wifi;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Wifi;ZILjava/lang/Object;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Wifi;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun hashCode ()I
 	public fun isExpensive ()Z
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/system/network/Network$Unknown : com/splendo/kaluga/system/network/Network {
-	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getReason ()Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
+public abstract class com/splendo/kaluga/system/network/NetworkConnectionType$Unknown : com/splendo/kaluga/system/network/NetworkConnectionType {
+	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getReason ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
 }
 
-public final class com/splendo/kaluga/system/network/Network$Unknown$Reason : java/lang/Enum {
-	public static final field CONNECTING Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
-	public static final field LOSING Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
-	public static final field NOT_CLEAR Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
-	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
-	public static fun values ()[Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason : java/lang/Enum {
+	public static final field CONNECTING Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public static final field LOSING Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public static final field NOT_CLEAR Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public static fun values ()[Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
 }
 
-public final class com/splendo/kaluga/system/network/Network$Unknown$WithLastNetwork : com/splendo/kaluga/system/network/Network$Unknown {
-	public fun <init> (Lcom/splendo/kaluga/system/network/Network$Known;Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;)V
-	public final fun getLastKnownNetwork ()Lcom/splendo/kaluga/system/network/Network$Known;
-	public fun getReason ()Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithLastNetwork : com/splendo/kaluga/system/network/NetworkConnectionType$Unknown {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithLastNetwork;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithLastNetwork;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithLastNetwork;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getLastKnown ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public fun getReason ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/Network$Unknown$WithoutLastNetwork : com/splendo/kaluga/system/network/Network$Unknown {
-	public fun <init> (Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;)V
-	public fun getReason ()Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithoutLastNetwork : com/splendo/kaluga/system/network/NetworkConnectionType$Unknown {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithoutLastNetwork;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithoutLastNetwork;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithoutLastNetwork;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getReason ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/NetworkManager : com/splendo/kaluga/system/network/BaseNetworkManager {
-	public fun dispose ()V
-	public fun getOnNetworkStateChange ()Lkotlin/jvm/functions/Function1;
+public final class com/splendo/kaluga/system/network/NetworkConnectionTypeKt {
+	public static final fun unknown (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
 }
 
-public final class com/splendo/kaluga/system/network/NetworkManagerBuilder : com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
-	public fun <init> ()V
-	public fun <init> (Landroid/content/Context;)V
-	public synthetic fun <init> (Landroid/content/Context;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun create (Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/system/network/BaseNetworkManager;
-}
-
-public final class com/splendo/kaluga/system/network/NetworkManagerKt {
-	public static final fun NetworkManager (Landroid/content/Context;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/system/network/NetworkManager;
+public abstract interface class com/splendo/kaluga/system/network/NetworkManager {
+	public abstract fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
+	public abstract fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class com/splendo/kaluga/system/network/ReachableNetworkConnection {
 	public abstract fun isExpensive ()Z
 }
 
-public abstract class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/state/KalugaState {
-	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/Network;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network;
+public abstract class com/splendo/kaluga/system/network/state/BaseNetworkStateRepo : com/splendo/kaluga/state/ColdStateFlowRepo {
+	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
+	public abstract fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+	public static synthetic fun create$default (Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/state/KalugaState {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Active : com/splendo/kaluga/system/network/state/NetworkState {
+	public abstract fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Available : com/splendo/kaluga/system/network/state/NetworkState$Known {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
+	public abstract fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Deinitialized : com/splendo/kaluga/system/network/state/NetworkState$Inactive {
+	public abstract fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public abstract fun getReinitialize ()Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Inactive : com/splendo/kaluga/base/flow/SpecialFlowValue$NotImportant, com/splendo/kaluga/system/network/state/NetworkState {
 }
 
-public final class com/splendo/kaluga/system/network/state/NetworkState$Available : com/splendo/kaluga/system/network/state/NetworkState {
-	public fun <init> (Lcom/splendo/kaluga/system/network/Network$Known;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/Network$Known;
-	public final fun copy (Lcom/splendo/kaluga/system/network/Network$Known;)Lcom/splendo/kaluga/system/network/state/NetworkState$Available;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkState$Available;Lcom/splendo/kaluga/system/network/Network$Known;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkState$Available;
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Initialized : com/splendo/kaluga/system/network/state/NetworkState$Active {
+	public abstract fun available (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)Lkotlin/jvm/functions/Function1;
+	public abstract fun unknown (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Initializing : com/splendo/kaluga/base/flow/SpecialFlowValue$NotImportant, com/splendo/kaluga/system/network/state/NetworkState$Active {
+	public abstract fun initialized (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Known : com/splendo/kaluga/system/network/state/NetworkState$Initialized {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$NotInitialized : com/splendo/kaluga/system/network/state/NetworkState$Inactive {
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Unavailable : com/splendo/kaluga/system/network/state/NetworkState$Known {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Unknown : com/splendo/kaluga/system/network/state/NetworkState$Initialized {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
+	public abstract fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+}
+
+public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+}
+
+public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Active : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/state/HandleAfterNewStateIsSet, com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun afterNewStateIsSet (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
+	public abstract fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Available : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Available {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
+	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/system/network/state/NetworkState$Deinitialized {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAvailableWithCellular ()Lkotlin/jvm/functions/Function1;
-	public final fun getAvailableWithWifi ()Lkotlin/jvm/functions/Function1;
-	public fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network$Known;
-	public synthetic fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network;
-	public final fun getUnavailable ()Lkotlin/jvm/functions/Function1;
-	public final fun getUnknownWithLastNetwork ()Lkotlin/jvm/functions/Function3;
-	public final fun getUnknownWithoutLastNetwork ()Lkotlin/jvm/functions/Function2;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/state/NetworkState$Unavailable : com/splendo/kaluga/system/network/state/NetworkState {
-	public fun <init> (Lcom/splendo/kaluga/system/network/Network$Known;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/Network$Known;
-	public final fun copy (Lcom/splendo/kaluga/system/network/Network$Known;)Lcom/splendo/kaluga/system/network/state/NetworkState$Unavailable;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkState$Unavailable;Lcom/splendo/kaluga/system/network/Network$Known;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkState$Unavailable;
+public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized : com/splendo/kaluga/system/network/state/NetworkStateImpl$Active {
+	public final fun available (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)Lkotlin/jvm/functions/Function1;
+	public final fun unknown (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing : com/splendo/kaluga/system/network/state/NetworkStateImpl$Active, com/splendo/kaluga/system/network/state/NetworkState$Initializing {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public fun hashCode ()I
+	public fun initialized (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lkotlin/jvm/functions/Function1;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$NotInitialized : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/system/network/state/NetworkState$NotInitialized {
+	public static final field INSTANCE Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$NotInitialized;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun startInitializing (Lcom/splendo/kaluga/system/network/NetworkManager;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unavailable {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkManager;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAvailableWithCellular ()Lkotlin/jvm/functions/Function1;
-	public final fun getAvailableWithWifi ()Lkotlin/jvm/functions/Function1;
-	public fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network$Known;
-	public synthetic fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network;
-	public final fun getUnknownWithLastNetwork ()Lkotlin/jvm/functions/Function3;
-	public final fun getUnknownWithoutLastNetwork ()Lkotlin/jvm/functions/Function2;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/state/NetworkState$Unknown : com/splendo/kaluga/system/network/state/NetworkState {
-	public fun <init> (Lcom/splendo/kaluga/system/network/Network$Unknown;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/Network$Unknown;
-	public final fun copy (Lcom/splendo/kaluga/system/network/Network$Unknown;)Lcom/splendo/kaluga/system/network/state/NetworkState$Unknown;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkState$Unknown;Lcom/splendo/kaluga/system/network/Network$Unknown;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkState$Unknown;
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unknown {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
+	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAvailableWithCellular ()Lkotlin/jvm/functions/Function1;
-	public final fun getAvailableWithWifi ()Lkotlin/jvm/functions/Function1;
-	public fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network$Unknown;
-	public synthetic fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network;
-	public final fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public class com/splendo/kaluga/system/network/state/NetworkStateRepo : com/splendo/kaluga/state/ColdStateRepo {
-	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;)V
-	public synthetic fun deinitialize (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun deinitialize (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	protected final fun onNetworkStateChange (Lcom/splendo/kaluga/system/network/Network;)V
+public class com/splendo/kaluga/system/network/state/NetworkStateImplRepo : com/splendo/kaluga/system/network/state/BaseNetworkStateRepo {
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
 }
 
-public abstract interface class com/splendo/kaluga/system/network/state/NetworkStateRepo$Builder {
-	public abstract fun create ()Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+public class com/splendo/kaluga/system/network/state/NetworkStateRepo : com/splendo/kaluga/system/network/state/NetworkStateImplRepo {
+	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
 }
 
-public final class com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder : com/splendo/kaluga/system/network/state/NetworkStateRepo$Builder {
+public final class com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder : com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
 	public fun <init> ()V
 	public fun <init> (Landroid/content/Context;)V
 	public synthetic fun <init> (Landroid/content/Context;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun create ()Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+	public fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
 }
 
 public final class com/splendo/kaluga/system/network/state/NetworkStateRepoKt {
diff --git a/system/api/jvm/system.api b/system/api/jvm/system.api
index b73607cc9..e55fcafcc 100644
--- a/system/api/jvm/system.api
+++ b/system/api/jvm/system.api
@@ -1,156 +1,364 @@
-public abstract interface class com/splendo/kaluga/system/network/BaseNetworkManager {
-	public abstract fun dispose ()V
-	public abstract fun getOnNetworkStateChange ()Lkotlin/jvm/functions/Function1;
+public abstract class com/splendo/kaluga/system/network/BaseNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
+	public fun <init> ()V
 }
 
 public abstract interface class com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
-	public abstract fun create (Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+	public abstract fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+}
+
+public final class com/splendo/kaluga/system/network/DefaultNetworkManager : com/splendo/kaluga/system/network/BaseNetworkManager {
+	public fun <init> ()V
+	public fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
+	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class com/splendo/kaluga/system/network/DefaultNetworkManager$Builder : com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
+	public fun <init> ()V
+	public fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
 }
 
-public abstract class com/splendo/kaluga/system/network/Network {
+public abstract class com/splendo/kaluga/system/network/NetworkConnectionType {
 }
 
-public abstract class com/splendo/kaluga/system/network/Network$Known : com/splendo/kaluga/system/network/Network {
+public abstract class com/splendo/kaluga/system/network/NetworkConnectionType$Known : com/splendo/kaluga/system/network/NetworkConnectionType {
 }
 
-public final class com/splendo/kaluga/system/network/Network$Known$Absent : com/splendo/kaluga/system/network/Network$Known {
-	public static final field INSTANCE Lcom/splendo/kaluga/system/network/Network$Known$Absent;
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent : com/splendo/kaluga/system/network/NetworkConnectionType$Known {
+	public static final field INSTANCE Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
 }
 
-public final class com/splendo/kaluga/system/network/Network$Known$Cellular : com/splendo/kaluga/system/network/Network$Known, com/splendo/kaluga/system/network/ReachableNetworkConnection {
+public abstract class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available : com/splendo/kaluga/system/network/NetworkConnectionType$Known, com/splendo/kaluga/system/network/ReachableNetworkConnection {
+}
+
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular : com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available {
 	public fun <init> ()V
 	public fun <init> (Z)V
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Z
-	public final fun copy (Z)Lcom/splendo/kaluga/system/network/Network$Known$Cellular;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/Network$Known$Cellular;ZILjava/lang/Object;)Lcom/splendo/kaluga/system/network/Network$Known$Cellular;
+	public final fun copy (Z)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;ZILjava/lang/Object;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun hashCode ()I
 	public fun isExpensive ()Z
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/Network$Known$Wifi : com/splendo/kaluga/system/network/Network$Known, com/splendo/kaluga/system/network/ReachableNetworkConnection {
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Wifi : com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available {
 	public fun <init> ()V
 	public fun <init> (Z)V
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Z
-	public final fun copy (Z)Lcom/splendo/kaluga/system/network/Network$Known$Wifi;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/Network$Known$Wifi;ZILjava/lang/Object;)Lcom/splendo/kaluga/system/network/Network$Known$Wifi;
+	public final fun copy (Z)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Wifi;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Wifi;ZILjava/lang/Object;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Wifi;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun hashCode ()I
 	public fun isExpensive ()Z
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/system/network/Network$Unknown : com/splendo/kaluga/system/network/Network {
-	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getReason ()Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
+public abstract class com/splendo/kaluga/system/network/NetworkConnectionType$Unknown : com/splendo/kaluga/system/network/NetworkConnectionType {
+	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getReason ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
 }
 
-public final class com/splendo/kaluga/system/network/Network$Unknown$Reason : java/lang/Enum {
-	public static final field CONNECTING Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
-	public static final field LOSING Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
-	public static final field NOT_CLEAR Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
-	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
-	public static fun values ()[Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason : java/lang/Enum {
+	public static final field CONNECTING Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public static final field LOSING Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public static final field NOT_CLEAR Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public static fun values ()[Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
 }
 
-public final class com/splendo/kaluga/system/network/Network$Unknown$WithLastNetwork : com/splendo/kaluga/system/network/Network$Unknown {
-	public fun <init> (Lcom/splendo/kaluga/system/network/Network$Known;Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;)V
-	public final fun getLastKnownNetwork ()Lcom/splendo/kaluga/system/network/Network$Known;
-	public fun getReason ()Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithLastNetwork : com/splendo/kaluga/system/network/NetworkConnectionType$Unknown {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithLastNetwork;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithLastNetwork;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithLastNetwork;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getLastKnown ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public fun getReason ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/Network$Unknown$WithoutLastNetwork : com/splendo/kaluga/system/network/Network$Unknown {
-	public fun <init> (Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;)V
-	public fun getReason ()Lcom/splendo/kaluga/system/network/Network$Unknown$Reason;
+public final class com/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithoutLastNetwork : com/splendo/kaluga/system/network/NetworkConnectionType$Unknown {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithoutLastNetwork;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithoutLastNetwork;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$WithoutLastNetwork;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getReason ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/NetworkManager {
-	public fun <init> ()V
+public final class com/splendo/kaluga/system/network/NetworkConnectionTypeKt {
+	public static final fun unknown (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
 }
 
-public final class com/splendo/kaluga/system/network/NetworkManagerBuilder : com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
-	public fun <init> ()V
-	public fun create (Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+public abstract interface class com/splendo/kaluga/system/network/NetworkManager {
+	public abstract fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
+	public abstract fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class com/splendo/kaluga/system/network/ReachableNetworkConnection {
 	public abstract fun isExpensive ()Z
 }
 
-public abstract class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/state/KalugaState {
-	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/Network;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+public abstract class com/splendo/kaluga/system/network/state/BaseNetworkStateRepo : com/splendo/kaluga/state/ColdStateFlowRepo {
+	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
+	public abstract fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+}
+
+public final class com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder$DefaultImpls {
+	public static synthetic fun create$default (Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/state/KalugaState {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Active : com/splendo/kaluga/system/network/state/NetworkState {
+	public abstract fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$Active$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$Active;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Available : com/splendo/kaluga/system/network/state/NetworkState$Known {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
+	public abstract fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$Available$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState$Available;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState$Available;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$Available;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Deinitialized : com/splendo/kaluga/system/network/state/NetworkState$Inactive {
+	public abstract fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public abstract fun getReinitialize ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$Deinitialized$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$Deinitialized;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Inactive : com/splendo/kaluga/base/flow/SpecialFlowValue$NotImportant, com/splendo/kaluga/system/network/state/NetworkState {
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$Inactive$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$Inactive;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Initialized : com/splendo/kaluga/system/network/state/NetworkState$Active {
+	public abstract fun available (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)Lkotlin/jvm/functions/Function1;
+	public abstract fun unknown (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$Initialized$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$Initialized;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Initializing : com/splendo/kaluga/base/flow/SpecialFlowValue$NotImportant, com/splendo/kaluga/system/network/state/NetworkState$Active {
+	public abstract fun initialized (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$Initializing$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$Initializing;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Known : com/splendo/kaluga/system/network/state/NetworkState$Initialized {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$Known$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState$Known;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState$Known;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$Known;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$NotInitialized : com/splendo/kaluga/system/network/state/NetworkState$Inactive {
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$NotInitialized$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState$NotInitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState$NotInitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$NotInitialized;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Unavailable : com/splendo/kaluga/system/network/state/NetworkState$Known {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$Unavailable$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState$Unavailable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState$Unavailable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$Unavailable;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Unknown : com/splendo/kaluga/system/network/state/NetworkState$Initialized {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
+	public abstract fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkState$Unknown$DefaultImpls {
+	public static fun finalState (Lcom/splendo/kaluga/system/network/state/NetworkState$Unknown;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun initialState (Lcom/splendo/kaluga/system/network/state/NetworkState$Unknown;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$Unknown;)Lkotlin/jvm/functions/Function1;
+}
+
+public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+}
+
+public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Active : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/state/HandleAfterNewStateIsSet, com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun afterNewStateIsSet (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
+	public abstract fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Available : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Available {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
+	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;
+	public fun equals (Ljava/lang/Object;)Z
 	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+	public fun hashCode ()I
 	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
+	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/state/NetworkState$Available : com/splendo/kaluga/system/network/state/NetworkState {
-	public fun <init> (Lcom/splendo/kaluga/system/network/Network$Known;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/Network$Known;
-	public final fun copy (Lcom/splendo/kaluga/system/network/Network$Known;)Lcom/splendo/kaluga/system/network/state/NetworkState$Available;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkState$Available;Lcom/splendo/kaluga/system/network/Network$Known;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkState$Available;
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/system/network/state/NetworkState$Deinitialized {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAvailableWithCellular ()Lkotlin/jvm/functions/Function1;
-	public final fun getAvailableWithWifi ()Lkotlin/jvm/functions/Function1;
-	public fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network$Known;
-	public synthetic fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network;
-	public final fun getUnavailable ()Lkotlin/jvm/functions/Function1;
-	public final fun getUnknownWithLastNetwork ()Lkotlin/jvm/functions/Function3;
-	public final fun getUnknownWithoutLastNetwork ()Lkotlin/jvm/functions/Function2;
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
+	public fun hashCode ()I
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized : com/splendo/kaluga/system/network/state/NetworkStateImpl$Active {
+	public final fun available (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)Lkotlin/jvm/functions/Function1;
+	public final fun unknown (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing : com/splendo/kaluga/system/network/state/NetworkStateImpl$Active, com/splendo/kaluga/system/network/state/NetworkState$Initializing {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
 	public fun hashCode ()I
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun initialized (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lkotlin/jvm/functions/Function1;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/state/NetworkState$Unavailable : com/splendo/kaluga/system/network/state/NetworkState {
-	public fun <init> (Lcom/splendo/kaluga/system/network/Network$Known;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/Network$Known;
-	public final fun copy (Lcom/splendo/kaluga/system/network/Network$Known;)Lcom/splendo/kaluga/system/network/state/NetworkState$Unavailable;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkState$Unavailable;Lcom/splendo/kaluga/system/network/Network$Known;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkState$Unavailable;
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$NotInitialized : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/system/network/state/NetworkState$NotInitialized {
+	public static final field INSTANCE Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$NotInitialized;
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+	public final fun startInitializing (Lcom/splendo/kaluga/system/network/NetworkManager;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unavailable {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkManager;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAvailableWithCellular ()Lkotlin/jvm/functions/Function1;
-	public final fun getAvailableWithWifi ()Lkotlin/jvm/functions/Function1;
-	public fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network$Known;
-	public synthetic fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network;
-	public final fun getUnknownWithLastNetwork ()Lkotlin/jvm/functions/Function3;
-	public final fun getUnknownWithoutLastNetwork ()Lkotlin/jvm/functions/Function2;
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
 	public fun hashCode ()I
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/system/network/state/NetworkState$Unknown : com/splendo/kaluga/system/network/state/NetworkState {
-	public fun <init> (Lcom/splendo/kaluga/system/network/Network$Unknown;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/Network$Unknown;
-	public final fun copy (Lcom/splendo/kaluga/system/network/Network$Unknown;)Lcom/splendo/kaluga/system/network/state/NetworkState$Unknown;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkState$Unknown;Lcom/splendo/kaluga/system/network/Network$Unknown;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkState$Unknown;
+public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unknown {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
+	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAvailableWithCellular ()Lkotlin/jvm/functions/Function1;
-	public final fun getAvailableWithWifi ()Lkotlin/jvm/functions/Function1;
-	public fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network$Unknown;
-	public synthetic fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network;
-	public final fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
+	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
 
-public class com/splendo/kaluga/system/network/state/NetworkStateRepo : com/splendo/kaluga/state/ColdStateRepo {
-	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;)V
-	public synthetic fun deinitialize (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun deinitialize (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	protected final fun onNetworkStateChange (Lcom/splendo/kaluga/system/network/Network;)V
+public class com/splendo/kaluga/system/network/state/NetworkStateImplRepo : com/splendo/kaluga/system/network/state/BaseNetworkStateRepo {
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
 }
 
-public abstract interface class com/splendo/kaluga/system/network/state/NetworkStateRepo$Builder {
-	public abstract fun create ()Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+public class com/splendo/kaluga/system/network/state/NetworkStateRepo : com/splendo/kaluga/system/network/state/NetworkStateImplRepo {
+	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
 }
 
-public final class com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder : com/splendo/kaluga/system/network/state/NetworkStateRepo$Builder {
+public final class com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder : com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
 	public fun <init> ()V
-	public fun create ()Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+	public fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
 }
 
 public final class com/splendo/kaluga/system/network/state/NetworkStateRepoKt {
diff --git a/system/build.gradle.kts b/system/build.gradle.kts
index 5c23021ea..54f576471 100644
--- a/system/build.gradle.kts
+++ b/system/build.gradle.kts
@@ -19,7 +19,7 @@ kotlin {
 
         commonTest {
             dependencies {
-                implementation(project(":test-utils-base", ""))
+                implementation(project(":test-utils-system", ""))
             }
         }
     }
diff --git a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
index 3a179e14a..355c36115 100644
--- a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
+++ b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
@@ -25,128 +25,133 @@ import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Build
 import androidx.annotation.RequiresApi
-
-fun NetworkManager(context: Context, onNetworkStateChange: NetworkStateChange): NetworkManager {
-    val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-    val androidNetworkManager = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        NetworkManager.AndroidConnectivityCallbackManager(
-            connectivityManager,
-            onNetworkStateChange
-        )
-    } else {
-        @Suppress("DEPRECATION")
-        NetworkManager.AndroidConnectivityReceiverManager(
-            connectivityManager,
-            onNetworkStateChange,
-            context
-        )
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.receiveAsFlow
+
+actual class DefaultNetworkManager internal constructor(
+    private val androidNetworkManager: AndroidNetworkManager
+) : BaseNetworkManager() {
+
+    override val network: Flow<NetworkConnectionType> get() = androidNetworkManager.network
+    override suspend fun startMonitoring() = androidNetworkManager.startMonitoring()
+    override suspend fun stopMonitoring() = androidNetworkManager.stopMonitoring()
+
+    class Builder(private val context: Context) : BaseNetworkManager.Builder {
+        override fun create(): BaseNetworkManager {
+            val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            val androidNetworkManager = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                AndroidConnectivityCallbackManager(
+                    connectivityManager
+                )
+            } else {
+                @Suppress("DEPRECATION")
+                AndroidConnectivityReceiverManager(
+                    connectivityManager,
+                    context
+                )
+            }
+            return DefaultNetworkManager(androidNetworkManager)
+        }
     }
-    return NetworkManager(androidNetworkManager)
-}
 
-actual class NetworkManager internal constructor(
-    androidNetworkManager: AndroidNetworkManager
-) : BaseNetworkManager by androidNetworkManager {
-
-    internal interface AndroidNetworkManager : BaseNetworkManager
+    internal interface AndroidNetworkManager : NetworkManager
 
     @RequiresApi(Build.VERSION_CODES.N)
     internal class AndroidConnectivityCallbackManager(
-        private val connectivityManager: ConnectivityManager,
-        override val onNetworkStateChange: NetworkStateChange
+        private val connectivityManager: ConnectivityManager
     ) : AndroidNetworkManager {
 
+        private val networkChannel = Channel<NetworkConnectionType>(Channel.UNLIMITED)
+        override val network: Flow<NetworkConnectionType> = networkChannel.receiveAsFlow()
         private val networkHandler = object : ConnectivityManager.NetworkCallback() {
 
             override fun onAvailable(network: android.net.Network) {
                 super.onAvailable(network)
                 val networkType = determineNetworkType()
 
-                onNetworkStateChange(networkType)
+                networkChannel.trySend(networkType)
             }
 
             override fun onUnavailable() {
                 super.onUnavailable()
-                onNetworkStateChange(Network.Known.Absent)
+                networkChannel.trySend(NetworkConnectionType.Known.Absent)
             }
 
             override fun onLosing(network: android.net.Network, maxMsToLive: Int) {
                 super.onLosing(network, maxMsToLive)
-                onNetworkStateChange(
-                    Network.Unknown.WithoutLastNetwork(
-                        Network.Unknown.Reason.LOSING
+                networkChannel.trySend(
+                    NetworkConnectionType.Unknown.WithoutLastNetwork(
+                        NetworkConnectionType.Unknown.Reason.LOSING
                     )
                 )
             }
 
             override fun onLost(network: android.net.Network) {
                 super.onLost(network)
-                onNetworkStateChange(Network.Known.Absent)
+                networkChannel.trySend(NetworkConnectionType.Known.Absent)
             }
         }
 
-        init {
+        override suspend fun startMonitoring() {
             connectivityManager.registerDefaultNetworkCallback(networkHandler)
         }
 
-        private fun determineNetworkType(): Network {
+        override suspend fun stopMonitoring() {
+            connectivityManager.unregisterNetworkCallback(networkHandler)
+        }
+
+        private fun determineNetworkType(): NetworkConnectionType {
             val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
             val isCellularDataEnabled = capabilities?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ?: false
             val isWifiEnabled = capabilities?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ?: false
 
             return when {
                 isWifiEnabled -> {
-                    Network.Known.Wifi()
+                    NetworkConnectionType.Known.Wifi()
                 }
                 isCellularDataEnabled -> {
-                    Network.Known.Cellular()
+                    NetworkConnectionType.Known.Cellular()
                 }
                 else -> {
-                    Network.Known.Absent
+                    NetworkConnectionType.Known.Absent
                 }
             }
         }
-
-        override fun dispose() {
-            connectivityManager.unregisterNetworkCallback(networkHandler)
-        }
     }
 
     @Suppress("DEPRECATION")
     @Deprecated("Deprecated on Android")
     internal class AndroidConnectivityReceiverManager(
         private val connectivityManager: ConnectivityManager,
-        override val onNetworkStateChange: NetworkStateChange,
         private val context: Context
     ) : AndroidNetworkManager {
 
+        private val networkChannel = Channel<NetworkConnectionType>(Channel.UNLIMITED)
+        override val network: Flow<NetworkConnectionType> = networkChannel.receiveAsFlow()
         private val networkHandler = object : BroadcastReceiver() {
             override fun onReceive(c: Context, intent: Intent) {
-                val networkInfo = connectivityManager.activeNetworkInfo
-                if (networkInfo?.isConnectedOrConnecting == true) {
-                    val networkType = determineNetworkType()
-                    onNetworkStateChange(networkType)
-                } else {
-                    onNetworkStateChange(Network.Known.Absent)
-                }
+                networkChannel.trySend(determineNetworkType())
             }
         }
 
-        init {
+        override suspend fun startMonitoring() {
             context.registerReceiver(networkHandler, IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION))
+            networkChannel.trySend(determineNetworkType())
+        }
+
+        override suspend fun stopMonitoring() {
+            context.unregisterReceiver(networkHandler)
         }
 
-        private fun determineNetworkType(): Network {
+        private fun determineNetworkType(): NetworkConnectionType {
             val isMetered = connectivityManager.isActiveNetworkMetered
             return when {
-                (!isMetered && connectivityManager.isDefaultNetworkActive) -> Network.Known.Wifi()
-                isMetered -> Network.Known.Cellular()
-                else -> Network.Known.Absent
+                connectivityManager.activeNetworkInfo?.isConnectedOrConnecting != true -> NetworkConnectionType.Known.Absent
+                (!isMetered && connectivityManager.isDefaultNetworkActive) -> NetworkConnectionType.Known.Wifi()
+                isMetered -> NetworkConnectionType.Known.Cellular()
+                else -> NetworkConnectionType.Known.Absent
             }
         }
-
-        override fun dispose() {
-            context.unregisterReceiver(networkHandler)
-        }
     }
 }
diff --git a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
deleted file mode 100644
index 2634a4372..000000000
--- a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.system.network
-
-import android.content.Context
-import com.splendo.kaluga.base.ApplicationHolder
-
-actual class NetworkManagerBuilder(
-    private val context: Context = ApplicationHolder.applicationContext
-) : BaseNetworkManager.Builder {
-
-    override fun create(onNetworkStateChange: NetworkStateChange): BaseNetworkManager {
-        return NetworkManager(context, onNetworkStateChange)
-    }
-}
diff --git a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
index e84b4ee90..36f1ef382 100644
--- a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
@@ -19,12 +19,12 @@ package com.splendo.kaluga.system.network.state
 
 import android.content.Context
 import com.splendo.kaluga.base.ApplicationHolder
-import com.splendo.kaluga.system.network.NetworkManagerBuilder
+import com.splendo.kaluga.system.network.DefaultNetworkManager
+import kotlin.coroutines.CoroutineContext
 
 actual class NetworkStateRepoBuilder(
     private val context: Context = ApplicationHolder.applicationContext,
-) : NetworkStateRepo.Builder {
+) : BaseNetworkStateRepoBuilder {
 
-    override fun create(): NetworkStateRepo =
-        NetworkStateRepo(NetworkManagerBuilder(context))
+    override fun create(coroutineContext: CoroutineContext): NetworkStateRepo = NetworkStateRepo(DefaultNetworkManager.Builder(context), coroutineContext)
 }
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/Network.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkConnectionType.kt
similarity index 55%
rename from system/src/commonMain/kotlin/com/splendo/kaluga/system/network/Network.kt
rename to system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkConnectionType.kt
index c6159d1e6..bbf7ed383 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/Network.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkConnectionType.kt
@@ -21,22 +21,29 @@ interface ReachableNetworkConnection {
     val isExpensive: Boolean
 }
 
-sealed class Network {
-    sealed class Unknown(open val reason: Reason) : Network() {
+sealed class NetworkConnectionType {
+    sealed class Unknown(open val reason: Reason) : NetworkConnectionType() {
         enum class Reason {
             CONNECTING,
             LOSING,
             NOT_CLEAR
         }
-        class WithoutLastNetwork(override val reason: Reason) : Unknown(reason)
-        class WithLastNetwork(
-            val lastKnownNetwork: Network.Known,
+        data class WithoutLastNetwork(override val reason: Reason) : Unknown(reason)
+        data class WithLastNetwork(
+            val lastKnown: Known,
             override val reason: Reason
         ) : Unknown(reason)
     }
-    sealed class Known : Network() {
-        data class Cellular(override val isExpensive: Boolean = true) : Known(), ReachableNetworkConnection
-        data class Wifi(override val isExpensive: Boolean = false) : Known(), ReachableNetworkConnection
+    sealed class Known : NetworkConnectionType() {
+        sealed class Available : Known(), ReachableNetworkConnection
+        data class Cellular(override val isExpensive: Boolean = true) : Available()
+        data class Wifi(override val isExpensive: Boolean = false) : Available()
         object Absent : Known()
     }
 }
+
+fun NetworkConnectionType.unknown(reason: NetworkConnectionType.Unknown.Reason) = when (this) {
+    is NetworkConnectionType.Known -> NetworkConnectionType.Unknown.WithLastNetwork(this, reason)
+    is NetworkConnectionType.Unknown.WithLastNetwork -> NetworkConnectionType.Unknown.WithLastNetwork(this.lastKnown, reason)
+    is NetworkConnectionType.Unknown.WithoutLastNetwork -> NetworkConnectionType.Unknown.WithoutLastNetwork(reason)
+}
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/BaseNetworkManager.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
similarity index 68%
rename from system/src/commonMain/kotlin/com/splendo/kaluga/system/network/BaseNetworkManager.kt
rename to system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
index 864b26bb9..fc602367a 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/BaseNetworkManager.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
@@ -17,17 +17,18 @@
 
 package com.splendo.kaluga.system.network
 
-typealias NetworkStateChange = (Network) -> Unit
+import kotlinx.coroutines.flow.Flow
 
-interface BaseNetworkManager {
-    val onNetworkStateChange: NetworkStateChange
+interface NetworkManager {
+    val network: Flow<NetworkConnectionType>
+    suspend fun startMonitoring()
+    suspend fun stopMonitoring()
+}
 
+abstract class BaseNetworkManager : NetworkManager {
     interface Builder {
-        fun create(onNetworkStateChange: NetworkStateChange): BaseNetworkManager
+        fun create(): BaseNetworkManager
     }
-
-    fun dispose()
 }
 
-expect class NetworkManagerBuilder
-expect class NetworkManager
+expect class DefaultNetworkManager : BaseNetworkManager
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
index 67c09dd22..d1ec59baf 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
@@ -17,72 +17,124 @@
 
 package com.splendo.kaluga.system.network.state
 
+import com.splendo.kaluga.base.flow.SpecialFlowValue
+import com.splendo.kaluga.state.HandleAfterNewStateIsSet
+import com.splendo.kaluga.state.HandleBeforeOldStateIsRemoved
 import com.splendo.kaluga.state.KalugaState
-import com.splendo.kaluga.system.network.Network
+import com.splendo.kaluga.system.network.NetworkConnectionType
+import com.splendo.kaluga.system.network.NetworkManager
+import com.splendo.kaluga.system.network.unknown
 
-sealed class NetworkState(
-    open val networkType: Network,
-) : KalugaState {
+sealed interface NetworkState : KalugaState {
 
-    data class Unknown(
-        override val networkType: Network.Unknown
-    ) : NetworkState(networkType) {
+    val networkConnectionType: NetworkConnectionType
 
-        val availableWithWifi: suspend () -> Available = {
-            Available(Network.Known.Wifi())
-        }
+    sealed interface Inactive : NetworkState, SpecialFlowValue.NotImportant
+    interface NotInitialized : Inactive
 
-        val availableWithCellular: suspend () -> Available = {
-            Available(Network.Known.Cellular())
-        }
+    interface Deinitialized : Inactive {
+        val previousNetworkConnectionType: NetworkConnectionType
+        val reinitialize: suspend () -> Initializing
+    }
 
-        val unavailable: suspend () -> Unavailable = {
-            Unavailable(Network.Known.Absent)
-        }
+    sealed interface Active : NetworkState {
+        val deinitialize: suspend () -> Deinitialized
     }
-    data class Available(
-        override val networkType: Network.Known,
-    ) : NetworkState(networkType) {
 
-        val unknownWithLastNetwork: suspend (network: Network.Known, reason: Network.Unknown.Reason) -> Unknown = { network, reason ->
-            Unknown(Network.Unknown.WithLastNetwork(network, reason))
-        }
+    interface Initializing : Active, SpecialFlowValue.NotImportant {
+        fun initialized(networkType: NetworkConnectionType): suspend () -> Initialized
+    }
 
-        val unknownWithoutLastNetwork: suspend (reason: Network.Unknown.Reason) -> Unknown = {
-            Unknown(Network.Unknown.WithoutLastNetwork(it))
-        }
+    sealed interface Initialized : Active {
+        fun available(available: NetworkConnectionType.Known.Available): suspend () -> Available
+        fun unknown(reason: NetworkConnectionType.Unknown.Reason): suspend () -> Unknown
+    }
 
-        val availableWithWifi: suspend () -> Available = {
-            Available(Network.Known.Wifi())
-        }
+    interface Unknown : Initialized {
+        override val networkConnectionType: NetworkConnectionType.Unknown
+        val unavailable: suspend () -> Unavailable
+    }
 
-        val availableWithCellular: suspend () -> Available = {
-            Available(Network.Known.Cellular())
-        }
+    sealed interface Known : Initialized {
+        override val networkConnectionType: NetworkConnectionType.Known
+    }
+
+    interface Available : Known {
+        override val networkConnectionType: NetworkConnectionType.Known.Available
+        val unavailable: suspend () -> Unavailable
+    }
 
-        val unavailable: suspend () -> Unavailable = {
-            Unavailable(Network.Known.Absent)
+    interface Unavailable : Known {
+        override val networkConnectionType: NetworkConnectionType.Known.Absent
+    }
+}
+
+sealed class NetworkStateImpl {
+    abstract val networkConnectionType: NetworkConnectionType
+
+    object NotInitialized : NetworkStateImpl(), NetworkState.NotInitialized {
+        override val networkConnectionType: NetworkConnectionType = NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+        fun startInitializing(networkManager: NetworkManager): suspend () -> NetworkState.Initializing = {
+            Initializing(networkConnectionType, networkManager)
         }
     }
 
-    data class Unavailable(
-        override val networkType: Network.Known,
-    ) : NetworkState(networkType) {
+    data class Deinitialized(override val previousNetworkConnectionType: NetworkConnectionType, val networkManager: NetworkManager) : NetworkStateImpl(), NetworkState.Deinitialized {
+        override val reinitialize: suspend () -> NetworkState.Initializing = { Initializing(previousNetworkConnectionType, networkManager) }
+        override val networkConnectionType: NetworkConnectionType = previousNetworkConnectionType.unknown(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+    }
+
+    sealed class Active : NetworkStateImpl(), HandleBeforeOldStateIsRemoved<NetworkState>, HandleAfterNewStateIsSet<NetworkState> {
+        abstract val networkManager: NetworkManager
+        val deinitialize: suspend () -> Deinitialized = { Deinitialized(networkConnectionType, networkManager) }
 
-        val availableWithWifi: suspend () -> Available = {
-            Available(Network.Known.Wifi())
+        override suspend fun beforeOldStateIsRemoved(oldState: NetworkState) {
+            when (oldState) {
+                is NetworkState.Inactive -> networkManager.startMonitoring()
+                is NetworkState.Active -> {}
+            }
         }
 
-        val availableWithCellular: suspend () -> Available = {
-            Available(Network.Known.Cellular())
+        override suspend fun afterNewStateIsSet(newState: NetworkState) {
+            when (newState) {
+                is NetworkState.Inactive -> networkManager.stopMonitoring()
+                is NetworkState.Active -> {}
+            }
         }
+    }
 
-        val unknownWithLastNetwork: suspend (network: Network.Known, reason: Network.Unknown.Reason) -> Unknown = { network, reason ->
-            Unknown(Network.Unknown.WithLastNetwork(network, reason))
+    data class Initializing(override val networkConnectionType: NetworkConnectionType, override val networkManager: NetworkManager) : Active(), NetworkState.Initializing {
+        override fun initialized(networkType: NetworkConnectionType): suspend () -> NetworkState.Initialized = {
+            when (networkType) {
+                is NetworkConnectionType.Unknown -> Unknown(networkType, networkManager)
+                is NetworkConnectionType.Known.Available -> Available(networkType, networkManager)
+                is NetworkConnectionType.Known.Absent -> Unavailable(networkManager)
+            }
         }
+    }
 
-        val unknownWithoutLastNetwork: suspend (reason: Network.Unknown.Reason) -> Unknown = {
-            Unknown(Network.Unknown.WithoutLastNetwork(it))
+    sealed class Initialized : Active() {
+        fun available(available: NetworkConnectionType.Known.Available) = suspend { Available(available, networkManager) }
+        fun unknown(reason: NetworkConnectionType.Unknown.Reason): suspend () -> NetworkState.Unknown = {
+            Unknown(
+                networkConnectionType.unknown(reason),
+                networkManager
+            )
         }
     }
+
+    data class Unknown(override val networkConnectionType: NetworkConnectionType.Unknown, override val networkManager: NetworkManager) : Initialized(), NetworkState.Unknown {
+        override val unavailable: suspend () -> NetworkState.Unavailable = { Unavailable(networkManager) }
+    }
+
+    data class Available(
+        override val networkConnectionType: NetworkConnectionType.Known.Available,
+        override val networkManager: NetworkManager
+    ) : Initialized(), NetworkState.Available {
+        override val unavailable: suspend () -> NetworkState.Unavailable = { Unavailable(networkManager) }
+    }
+
+    data class Unavailable(override val networkManager: NetworkManager) : Initialized(), NetworkState.Unavailable {
+        override val networkConnectionType: NetworkConnectionType.Known.Absent = NetworkConnectionType.Known.Absent
+    }
 }
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
index a9f92e62d..3264bb0d4 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
@@ -17,103 +17,97 @@
 
 package com.splendo.kaluga.system.network.state
 
-import com.splendo.kaluga.base.runBlocking
-import com.splendo.kaluga.state.ColdStateRepo
+import com.splendo.kaluga.base.flow.filterOnlyImportant
+import com.splendo.kaluga.state.ColdStateFlowRepo
+import com.splendo.kaluga.state.StateRepo
 import com.splendo.kaluga.system.network.BaseNetworkManager
-import com.splendo.kaluga.system.network.Network
+import com.splendo.kaluga.system.network.NetworkConnectionType
+import com.splendo.kaluga.system.network.NetworkManager
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapLatest
-
-open class NetworkStateRepo(
-    private val networkManagerBuilder: BaseNetworkManager.Builder,
-) : ColdStateRepo<NetworkState>() {
-
-    interface Builder {
-        fun create(): NetworkStateRepo
-    }
-
-    internal var lastKnownNetwork: Network = Network.Unknown.WithoutLastNetwork(Network.Unknown.Reason.NOT_CLEAR)
-
-    private var _networkManager: BaseNetworkManager? = null
-    internal var networkManager: BaseNetworkManager?
-        get() = _networkManager
-        set(value) {
-            _networkManager?.let {
-                if (value == null) {
-                    it.dispose()
-                }
+import kotlinx.coroutines.launch
+import kotlin.coroutines.CoroutineContext
+
+typealias NetworkStateFlowRepo = StateRepo<NetworkState, MutableStateFlow<NetworkState>>
+
+abstract class BaseNetworkStateRepo(
+    createNotInitializedState: () -> NetworkState.NotInitialized,
+    createInitializingState: suspend ColdStateFlowRepo<NetworkState>.(NetworkState.Inactive) -> suspend () -> NetworkState,
+    createDeinitializingState: suspend ColdStateFlowRepo<NetworkState>.(NetworkState.Active) -> suspend () -> NetworkState.Deinitialized,
+    coroutineContext: CoroutineContext
+) : ColdStateFlowRepo<NetworkState>(
+    coroutineContext = coroutineContext,
+    initChangeStateWithRepo = { state, repo ->
+        when (state) {
+            is NetworkState.Inactive -> {
+                repo.createInitializingState(state)
             }
-
-            _networkManager = value
+            is NetworkState.Active -> state.remain()
         }
-
-    override suspend fun deinitialize(state: NetworkState) {
-        lastKnownNetwork = state.networkType
-        networkManager = null
-    }
-
-    override suspend fun initialValue(): NetworkState {
-        networkManager = networkManagerBuilder.create(::onNetworkStateChange)
-
-        return when (val network = lastKnownNetwork) {
-            is Network.Unknown.WithoutLastNetwork -> NetworkState.Unknown(
-                Network.Unknown.WithoutLastNetwork(network.reason)
-            )
-            is Network.Unknown.WithLastNetwork -> NetworkState.Unknown(
-                Network.Unknown.WithLastNetwork(network.lastKnownNetwork, network.reason)
-            )
-            is Network.Known.Cellular -> NetworkState.Unknown(
-                Network.Unknown.WithoutLastNetwork(Network.Unknown.Reason.NOT_CLEAR)
-            )
-            is Network.Known.Wifi -> NetworkState.Unknown(
-                Network.Unknown.WithoutLastNetwork(Network.Unknown.Reason.NOT_CLEAR)
-            )
-            Network.Known.Absent -> NetworkState.Unknown(
-                Network.Unknown.WithoutLastNetwork(Network.Unknown.Reason.NOT_CLEAR)
-            )
+    },
+    deinitChangeStateWithRepo = { state, repo ->
+        when (state) {
+            is NetworkState.Active -> repo.createDeinitializingState(state)
+            is NetworkState.Inactive -> state.remain()
         }
-    }
-
-    protected fun onNetworkStateChange(network: Network) {
-        runBlocking {
-            takeAndChangeState { state: NetworkState ->
-                when (state) {
-                    is NetworkState.Available -> {
-                        when (network) {
-                            is Network.Unknown.WithoutLastNetwork -> {
-                                { state.unknownWithoutLastNetwork(network.reason) }
-                            }
-                            is Network.Unknown.WithLastNetwork -> {
-                                { state.unknownWithLastNetwork(network.lastKnownNetwork, network.reason) }
-                            }
-                            is Network.Known.Cellular -> state.availableWithCellular
-                            is Network.Known.Wifi -> state.availableWithWifi
-                            Network.Known.Absent -> state.unavailable
+    },
+    firstState = createNotInitializedState
+)
+
+open class NetworkStateImplRepo(
+    createNetworkManager: suspend () -> NetworkManager,
+    coroutineContext: CoroutineContext
+) : BaseNetworkStateRepo(
+    createNotInitializedState = { NetworkStateImpl.NotInitialized },
+    createInitializingState = { state ->
+        when (state) {
+            is NetworkStateImpl.NotInitialized -> {
+                val manager = createNetworkManager()
+                (this as NetworkStateImplRepo).startMonitoringNetworkManager(manager)
+                state.startInitializing(manager)
+            }
+            is NetworkStateImpl.Deinitialized -> {
+                (this as NetworkStateImplRepo).startMonitoringNetworkManager(state.networkManager)
+                state.reinitialize
+            }
+            else -> state.remain()
+        }
+    },
+    createDeinitializingState = { state ->
+        (this as NetworkStateImplRepo).superVisorJob.cancelChildren()
+        state.deinitialize
+    },
+    coroutineContext = coroutineContext
+) {
+    private val superVisorJob = SupervisorJob(coroutineContext[Job])
+    private fun startMonitoringNetworkManager(manager: NetworkManager) {
+        CoroutineScope(coroutineContext + superVisorJob).launch {
+            manager.network.collect { networkType ->
+                takeAndChangeState { networkState ->
+                    when (networkState) {
+                        is NetworkState.Initializing -> networkState.initialized(networkType)
+                        is NetworkState.Available -> when (networkType) {
+                            is NetworkConnectionType.Known.Available -> networkState.available(networkType)
+                            is NetworkConnectionType.Known.Absent -> networkState.unavailable
+                            is NetworkConnectionType.Unknown -> networkState.unknown(networkType.reason)
                         }
-                    }
-                    is NetworkState.Unavailable -> {
-                        when (network) {
-                            is Network.Unknown.WithoutLastNetwork -> {
-                                { state.unknownWithoutLastNetwork(network.reason) }
-                            }
-                            is Network.Unknown.WithLastNetwork -> {
-                                { state.unknownWithLastNetwork(network.lastKnownNetwork, network.reason) }
-                            }
-                            is Network.Known.Cellular -> state.availableWithCellular
-                            is Network.Known.Wifi -> state.availableWithWifi
-                            Network.Known.Absent -> state.remain()
+                        is NetworkState.Unavailable -> when (networkType) {
+                            is NetworkConnectionType.Known.Available -> networkState.available(networkType)
+                            is NetworkConnectionType.Known.Absent -> networkState.remain()
+                            is NetworkConnectionType.Unknown -> networkState.unknown(networkType.reason)
                         }
-                    }
-                    is NetworkState.Unknown -> {
-                        when (network) {
-                            is Network.Unknown.WithoutLastNetwork -> state.remain()
-                            is Network.Unknown.WithLastNetwork -> state.remain()
-                            is Network.Known.Cellular -> state.availableWithCellular
-                            is Network.Known.Wifi -> state.availableWithWifi
-                            Network.Known.Absent -> state.unavailable
+                        is NetworkState.Unknown -> when (networkType) {
+                            is NetworkConnectionType.Known.Available -> networkState.available(networkType)
+                            is NetworkConnectionType.Known.Absent -> networkState.unavailable
+                            is NetworkConnectionType.Unknown -> networkState.unknown(networkType.reason)
                         }
+                        is NetworkState.Deinitialized, is NetworkState.NotInitialized -> networkState.remain()
                     }
                 }
             }
@@ -121,12 +115,22 @@ open class NetworkStateRepo(
     }
 }
 
-fun Flow<NetworkState>.network(): Flow<Network> {
-    return map { it.networkType }.distinctUntilChanged()
+open class NetworkStateRepo(
+    private val networkManagerBuilder: BaseNetworkManager.Builder,
+    coroutineContext: CoroutineContext,
+) : NetworkStateImplRepo(
+    createNetworkManager = {
+        networkManagerBuilder.create()
+    },
+    coroutineContext
+)
+
+fun Flow<NetworkState>.network(): Flow<NetworkConnectionType> {
+    return filterOnlyImportant().map { it.networkConnectionType }.distinctUntilChanged()
 }
 
 fun Flow<NetworkState>.online(): Flow<Boolean> {
-    return network().mapLatest {
-        it is Network.Known.Wifi || it is Network.Known.Cellular
+    return network().map {
+        it is NetworkConnectionType.Known.Wifi || it is NetworkConnectionType.Known.Cellular
     }
 }
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
index 8a5420650..d80cf1331 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
@@ -17,4 +17,15 @@
 
 package com.splendo.kaluga.system.network.state
 
-expect class NetworkStateRepoBuilder : NetworkStateRepo.Builder
+import com.splendo.kaluga.base.singleThreadDispatcher
+import kotlin.coroutines.CoroutineContext
+
+private val defaultNetworkDispatcher by lazy {
+    singleThreadDispatcher("Location")
+}
+
+interface BaseNetworkStateRepoBuilder {
+    fun create(coroutineContext: CoroutineContext = defaultNetworkDispatcher): NetworkStateRepo
+}
+
+expect class NetworkStateRepoBuilder : BaseNetworkStateRepoBuilder
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/BaseNetworkStateTest.kt b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/BaseNetworkStateTest.kt
new file mode 100644
index 000000000..eab4ad48c
--- /dev/null
+++ b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/BaseNetworkStateTest.kt
@@ -0,0 +1,51 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.system.network
+
+import com.splendo.kaluga.test.base.BaseFlowTest
+import com.splendo.kaluga.test.system.network.MockBaseNetworkManager
+import com.splendo.kaluga.test.system.network.MockNetworkStateRepoBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+
+abstract class BaseNetworkStateTest<T, F : Flow<T>> : BaseFlowTest<BaseNetworkStateTest.Configuration, BaseNetworkStateTest.Context, T, F>() {
+
+    data class Configuration(
+        val initialNetworkConnectionType: NetworkConnectionType
+    )
+
+    class Context(configuration: Configuration, coroutineScope: CoroutineScope) : TestContext {
+        val networkManagerBuilder = MockBaseNetworkManager.Builder(configuration.initialNetworkConnectionType)
+        val networkStateRepoBuilder = MockNetworkStateRepoBuilder(networkManagerBuilder)
+        val networkStateRepo = networkStateRepoBuilder.create(coroutineScope.coroutineContext)
+        val networkManager get() = networkManagerBuilder.builtNetworkManagers.first() as MockBaseNetworkManager
+    }
+
+    override val createTestContextWithConfiguration: suspend (configuration: Configuration, scope: CoroutineScope) -> Context =
+        { configuration, scope -> Context(configuration, scope) }
+
+    protected fun testNetworkState(
+        initialNetworkConnectionType: NetworkConnectionType,
+        test: suspend BaseFlowTest<Configuration, Context, T, F>.(F) -> Unit
+    ) {
+        testWithFlowAndTestContext(
+            Configuration(initialNetworkConnectionType),
+            blockWithContext = test
+        )
+    }
+}
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkManager.kt b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkManager.kt
deleted file mode 100644
index f82303474..000000000
--- a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkManager.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.system.network
-
-class MockNetworkManager(
-    override val onNetworkStateChange: NetworkStateChange
-) : BaseNetworkManager {
-
-    override fun dispose() = Unit
-}
-
-class MockNetworkManagerBuilder : BaseNetworkManager.Builder {
-
-    override fun create(onNetworkStateChange: NetworkStateChange): BaseNetworkManager =
-        MockNetworkManager(onNetworkStateChange)
-}
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkStateRepoBuilder.kt b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkStateRepoBuilder.kt
deleted file mode 100644
index fe263b56d..000000000
--- a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/MockNetworkStateRepoBuilder.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.system.network
-
-import com.splendo.kaluga.system.network.state.NetworkStateRepo
-
-class MockNetworkStateRepoBuilder : NetworkStateRepo.Builder {
-
-    val networkStateRepo = MockNetworkStateRepo(MockNetworkManagerBuilder())
-
-    override fun create(): NetworkStateRepo = networkStateRepo
-}
-
-class MockNetworkStateRepo(networkManagerBuilder: BaseNetworkManager.Builder) : NetworkStateRepo(networkManagerBuilder) {
-
-    fun simulateNetworkStateChange(network: Network) {
-        onNetworkStateChange(network)
-    }
-}
-
-fun MockNetworkStateRepo.simulateOnlineStateChange(online: Boolean) {
-    val newNetworkState = if (online) Network.Known.Wifi() else Network.Known.Absent
-    simulateNetworkStateChange(newNetworkState)
-}
-
-fun MockNetworkStateRepoBuilder.simulateOnlineStateChange(online: Boolean) {
-    networkStateRepo.simulateOnlineStateChange(online)
-}
-
-fun MockNetworkStateRepoBuilder.simulateNetworkStateChange(network: Network) {
-    networkStateRepo.simulateNetworkStateChange(network)
-}
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt
index 0ea41976f..0e0171920 100644
--- a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt
+++ b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt
@@ -17,270 +17,180 @@
 
 package com.splendo.kaluga.system.network
 
+import com.splendo.kaluga.base.flow.filterOnlyImportant
 import com.splendo.kaluga.system.network.state.NetworkState
 import com.splendo.kaluga.system.network.state.NetworkStateRepo
-import com.splendo.kaluga.system.network.state.online
-import com.splendo.kaluga.test.base.FlowTest
-import com.splendo.kaluga.test.base.FlowTestBlock
-import kotlinx.coroutines.flow.first
+import com.splendo.kaluga.test.base.mock.verify
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.yield
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
+import kotlin.test.assertIs
 
-class NetworkStateTest : FlowTest<NetworkState, NetworkStateRepo>() {
+class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>() {
 
-    override val flow = suspend { MockNetworkStateRepoBuilder().create() }
+    override val flowFromTestContext: suspend Context.() -> NetworkStateRepo =
+        { networkStateRepo }
 
-    private fun testNetworkState(test: FlowTestBlock<NetworkState, NetworkStateRepo>) {
-        testWithFlow(test)
-    }
-
-    @Test
-    fun testInitialValueUnknown() = testNetworkState {
-        assertInitialValue(this)
-    }
+    override val filter: (Flow<NetworkState>) -> Flow<NetworkState> = { it.filterOnlyImportant() }
 
     @Test
-    fun testNetworkStateChanged() = testNetworkState { networkStateRepo ->
-        assertInitialValue(this)
+    fun testInitialValueUnknown() = testNetworkState(NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)) {
+        assertInitialValue()
 
         action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Wifi())
+            resetFlow()
         }
 
+        mainAction {
+            networkManager.stopMonitoringMock.verify()
+        }
+    }
+
+    @Test
+    fun testNetworkStateChanged() = testNetworkState(NetworkConnectionType.Known.Wifi()) {
         test {
-            assertTrue { it is NetworkState.Available }
-            assertEquals(Network.Known.Wifi(), it.networkType)
+            assertIs<NetworkState.Available>(it)
+            assertEquals(NetworkConnectionType.Known.Wifi(), it.networkConnectionType)
         }
 
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Absent)
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Absent
         }
 
         test {
-            assertTrue { it is NetworkState.Unavailable }
-            assertEquals(Network.Known.Absent, it.networkType)
+            assertIs<NetworkState.Unavailable>(it)
+            assertEquals(NetworkConnectionType.Known.Absent, it.networkConnectionType)
         }
 
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Cellular())
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Cellular()
         }
 
         test {
-            assertTrue { it is NetworkState.Available }
-            assertEquals(Network.Known.Cellular(), it.networkType)
+            assertIs<NetworkState.Available>(it)
+            assertEquals(NetworkConnectionType.Known.Cellular(), it.networkConnectionType)
         }
     }
 
     @Test
-    fun testAvailableTransition() = testNetworkState { networkStateRepo ->
-        assertInitialValue(this)
-
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Wifi())
-        }
-
+    fun testAvailableTransition() = testNetworkState(NetworkConnectionType.Known.Wifi()) {
         test {
-            assertTrue { it is NetworkState.Available }
-            assertTrue { it.networkType is Network.Known.Wifi }
+            assertIs<NetworkState.Available>(it)
+            assertEquals(NetworkConnectionType.Known.Wifi(), it.networkConnectionType)
         }
 
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(
-                Network.Unknown.WithLastNetwork(
-                    Network.Known.Wifi(),
-                    Network.Unknown.Reason.NOT_CLEAR
-                )
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Unknown.WithLastNetwork(
+                NetworkConnectionType.Known.Wifi(),
+                NetworkConnectionType.Unknown.Reason.LOSING
             )
         }
 
         test {
-            assertTrue { it.networkType is Network.Unknown.WithLastNetwork }
-            assertTrue { (it.networkType as Network.Unknown.WithLastNetwork).lastKnownNetwork is Network.Known.Wifi }
+            assertEquals(NetworkConnectionType.Unknown.WithLastNetwork(NetworkConnectionType.Known.Wifi(), NetworkConnectionType.Unknown.Reason.LOSING), it.networkConnectionType)
         }
 
-        resetStateTo<NetworkState.Available>(networkStateRepo, Network.Known.Wifi(), this)
-
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Cellular())
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Wifi()
+            yield()
+            networkManager.network.value = NetworkConnectionType.Known.Cellular()
         }
 
-        test {
-            assertTrue { it is NetworkState.Available }
-            assertTrue { it.networkType is Network.Known.Cellular }
+        test(1) {
+            assertIs<NetworkState.Available>(it)
+            assertEquals(NetworkConnectionType.Known.Cellular(), it.networkConnectionType)
         }
 
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Absent)
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Absent
         }
 
         test {
-            assertTrue { it is NetworkState.Unavailable }
-            assertTrue { it.networkType is Network.Known.Absent }
+            assertIs<NetworkState.Unavailable>(it)
         }
     }
 
     @Test
-    fun testUnavailableTransition() = testNetworkState { networkStateRepo ->
-        assertInitialValue(this)
-
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Absent)
-        }
-
+    fun testUnavailableTransition() = testNetworkState(NetworkConnectionType.Known.Absent) {
         test {
-            assertTrue { it is NetworkState.Unavailable }
-            assertTrue { it.networkType is Network.Known.Absent }
+            assertIs<NetworkState.Unavailable>(it)
         }
 
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Cellular())
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Cellular()
         }
 
         test {
-            assertTrue { it.networkType is Network.Known.Cellular }
+            assertEquals(NetworkConnectionType.Known.Cellular(), it.networkConnectionType)
         }
 
-        resetStateTo<NetworkState.Unavailable>(networkStateRepo, Network.Known.Absent, this)
-
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Wifi())
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Absent
+            yield()
+            networkManager.network.value = NetworkConnectionType.Known.Wifi()
         }
 
-        test {
-            assertTrue { it is NetworkState.Available }
-            assertTrue { it.networkType is Network.Known.Wifi }
+        test(1) {
+            assertIs<NetworkState.Available>(it)
+            assertEquals(NetworkConnectionType.Known.Wifi(), it.networkConnectionType)
         }
     }
 
     @Test
-    fun testUnknownTransition() = testNetworkState { networkStateRepo ->
-        networkStateRepo.lastKnownNetwork = Network.Unknown.WithoutLastNetwork(
-            Network.Unknown.Reason.NOT_CLEAR
-        )
-
+    fun testUnknownTransition() = testNetworkState(NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)) {
         test {
-            assertTrue { it is NetworkState.Unknown }
-            assertTrue { it.networkType is Network.Unknown.WithoutLastNetwork }
+            assertIs<NetworkState.Unknown>(it)
+            assertEquals(NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR), it.networkConnectionType)
         }
 
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Cellular())
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Cellular()
         }
 
         test {
-            assertTrue { it.networkType is Network.Known.Cellular }
+            assertEquals(NetworkConnectionType.Known.Cellular(), it.networkConnectionType)
         }
 
-        resetStateTo<NetworkState.Unknown>(
-            networkStateRepo,
-            Network.Unknown.WithoutLastNetwork(
-                Network.Unknown.Reason.NOT_CLEAR
-            ),
-            this
-        )
-
         action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Wifi())
+            resetFlow()
         }
 
-        test {
-            assertTrue { it is NetworkState.Available }
-            assertTrue { it.networkType is Network.Known.Wifi }
-        }
-
-        resetStateTo<NetworkState.Unknown>(
-            networkStateRepo,
-            Network.Unknown.WithoutLastNetwork(
-                Network.Unknown.Reason.NOT_CLEAR
-            ),
-            this
-        )
-
-        action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(Network.Known.Absent)
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Wifi()
         }
 
         test {
-            assertTrue { it is NetworkState.Unavailable }
-            assertTrue { it.networkType is Network.Known.Absent }
+            assertIs<NetworkState.Available>(it)
+            assertEquals(NetworkConnectionType.Known.Wifi(), it.networkConnectionType)
         }
-    }
-
-    @Test
-    fun test_online_convenience_method_is_online() = testNetworkState { networkStateRepo ->
-        val mockNetworkStateRepo = networkStateRepo as MockNetworkStateRepo
 
         action {
-            mockNetworkStateRepo.simulateNetworkStateChange(Network.Known.Wifi())
-        }
-        test {
-            val isOnline = networkStateRepo.online().first()
-            assertTrue { isOnline }
+            resetFlow()
         }
 
-        action {
-            networkStateRepo.simulateNetworkStateChange(Network.Known.Cellular())
-        }
         test {
-            val isOnline = networkStateRepo.online().first()
-            assertTrue { isOnline }
+            assertIs<NetworkState.Available>(it)
+            assertEquals(NetworkConnectionType.Known.Wifi(), it.networkConnectionType)
         }
-    }
-
-    @Test
-    fun test_online_convenience_method_is_not_online() = testNetworkState { networkStateRepo ->
-        val mockNetworkStateRepo = networkStateRepo as MockNetworkStateRepo
 
-        action {
-            mockNetworkStateRepo.simulateNetworkStateChange(
-                Network.Unknown.WithLastNetwork(
-                    lastKnownNetwork = Network.Known.Absent,
-                    reason = Network.Unknown.Reason.NOT_CLEAR
-                )
-            )
-        }
-        test {
-            val isOnline = networkStateRepo.online().first()
-            assertFalse { isOnline }
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Absent
         }
 
-        action {
-            mockNetworkStateRepo.simulateNetworkStateChange(Network.Known.Absent)
-        }
         test {
-            val isOnline = networkStateRepo.online().first()
-            assertFalse { isOnline }
-        }
-
-        action {
-            mockNetworkStateRepo.simulateNetworkStateChange(
-                Network.Unknown.WithoutLastNetwork(
-                    reason = Network.Unknown.Reason.NOT_CLEAR
-                )
-            )
-        }
-        test {
-            val isOnline = networkStateRepo.online().first()
-            assertFalse { isOnline }
+            assertIs<NetworkState.Unavailable>(it)
         }
     }
 
-    private suspend inline fun <reified T> resetStateTo(networkStateRepo: NetworkStateRepo, network: Network, testBlock: FlowTest<NetworkState, NetworkStateRepo>) {
-        testBlock.action {
-            (networkStateRepo as MockNetworkStateRepo).simulateNetworkStateChange(network)
-        }
-        testBlock.test {
-            assertTrue { it is T }
-        }
-    }
-
-    private suspend fun assertInitialValue(testBlock: FlowTest<NetworkState, NetworkStateRepo>) {
-        testBlock.test {
-            assertTrue { it is NetworkState.Unknown }
-            assertTrue { it.networkType is Network.Unknown.WithoutLastNetwork }
-            assertEquals(Network.Unknown.Reason.NOT_CLEAR, (it.networkType as Network.Unknown.WithoutLastNetwork).reason)
+    private suspend fun assertInitialValue() {
+        test {
+            assertIs<NetworkState.Unknown>(it)
+            assertEquals(
+                NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR),
+                it.networkConnectionType
+            )
+            networkManager.startMonitoringMock.verify()
         }
     }
 }
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/OnlineTest.kt b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/OnlineTest.kt
new file mode 100644
index 000000000..ff4e12368
--- /dev/null
+++ b/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/OnlineTest.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.system.network
+
+import com.splendo.kaluga.system.network.state.online
+import kotlinx.coroutines.flow.Flow
+import kotlin.test.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class OnlineTest : BaseNetworkStateTest<Boolean, Flow<Boolean>>() {
+
+    override val flowFromTestContext: suspend Context.() -> Flow<Boolean> = { networkStateRepo.online() }
+
+    @Test
+    fun testIsOnOrOffline() = testNetworkState(NetworkConnectionType.Known.Wifi()) { networkStateRepo ->
+        test {
+            assertTrue(it)
+        }
+
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Absent
+        }
+
+        test {
+            assertFalse(it)
+        }
+
+        mainAction {
+            networkManager.network.value = NetworkConnectionType.Known.Cellular()
+        }
+        test {
+            assertTrue(it)
+        }
+    }
+}
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
index a1e461e03..6db6c4028 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
+++ b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
@@ -26,6 +26,11 @@ import kotlinx.cinterop.asStableRef
 import kotlinx.cinterop.nativeHeap
 import kotlinx.cinterop.ptr
 import kotlinx.cinterop.staticCFunction
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import platform.Network.nw_interface_type_cellular
 import platform.Network.nw_interface_type_wifi
 import platform.Network.nw_path_get_status
@@ -54,26 +59,38 @@ import platform.SystemConfiguration.kSCNetworkReachabilityFlagsIsWWAN
 import platform.SystemConfiguration.kSCNetworkReachabilityFlagsReachable
 import platform.darwin.dispatch_get_main_queue
 
-fun NetworkManager(onNetworkStateChange: NetworkStateChange): NetworkManager {
-    val appleNetworkManager = if (IOSVersion.systemVersion >= IOSVersion(12)) {
-        NetworkManager.NWPathNetworkManager(onNetworkStateChange)
-    } else {
-        NetworkManager.SCNetworkManager(onNetworkStateChange)
+actual class DefaultNetworkManager internal constructor(
+    private val appleNetworkManager: AppleNetworkManager
+) : BaseNetworkManager() {
+
+    class Builder : BaseNetworkManager.Builder {
+        override fun create(): BaseNetworkManager {
+            val appleNetworkManager = if (IOSVersion.systemVersion >= IOSVersion(12)) {
+                DefaultNetworkManager.NWPathNetworkManager()
+            } else {
+                DefaultNetworkManager.SCNetworkManager()
+            }
+            return DefaultNetworkManager(appleNetworkManager)
+        }
     }
-    return NetworkManager(appleNetworkManager)
-}
 
-actual class NetworkManager internal constructor(
-    appleNetworkManager: AppleNetworkManager
-) : BaseNetworkManager by appleNetworkManager {
+    override val network: Flow<NetworkConnectionType> get() = appleNetworkManager.network
+    override suspend fun startMonitoring() = appleNetworkManager.startMonitoring()
+    override suspend fun stopMonitoring() = appleNetworkManager.stopMonitoring()
 
-    internal interface AppleNetworkManager : BaseNetworkManager
+    internal interface AppleNetworkManager : NetworkManager
 
-    internal class NWPathNetworkManager(
-        override val onNetworkStateChange: NetworkStateChange,
-    ) : AppleNetworkManager {
+    internal class NWPathNetworkManager : AppleNetworkManager {
 
-        private var nwPathMonitor: nw_path_monitor_t = null
+        private val networkChannel = Channel<NetworkConnectionType>(Channel.UNLIMITED)
+        override val network: Flow<NetworkConnectionType> = networkChannel.receiveAsFlow()
+        private val nwPathMonitor: nw_path_monitor_t = nw_path_monitor_create().apply {
+            nw_path_monitor_set_queue(
+                this,
+                dispatch_get_main_queue()
+            )
+            nw_path_monitor_set_update_handler(this, networkMonitor)
+        }
 
         private val networkMonitor = object : nw_path_monitor_update_handler_t {
             override fun invoke(network: nw_path_t) {
@@ -81,17 +98,11 @@ actual class NetworkManager internal constructor(
             }
         }
 
-        init {
-            nwPathMonitor = nw_path_monitor_create()
-            nw_path_monitor_set_queue(
-                nwPathMonitor,
-                dispatch_get_main_queue()
-            )
-            nw_path_monitor_set_update_handler(nwPathMonitor, networkMonitor)
+        override suspend fun startMonitoring() {
             nw_path_monitor_start(nwPathMonitor)
         }
 
-        override fun dispose() {
+        override suspend fun stopMonitoring() {
             nw_path_monitor_cancel(nwPathMonitor)
         }
 
@@ -101,26 +112,27 @@ actual class NetworkManager internal constructor(
                     if (nw_path_uses_interface_type(network, nw_interface_type_wifi)) {
                         if (nw_path_is_expensive(network)) {
                             // connected to hotspot
-                            onNetworkStateChange(Network.Known.Wifi(isExpensive = true))
+                            networkChannel.trySend(NetworkConnectionType.Known.Wifi(isExpensive = true))
                         } else {
-                            onNetworkStateChange(Network.Known.Wifi())
+                            networkChannel.trySend(NetworkConnectionType.Known.Wifi())
                         }
                     } else if (nw_path_uses_interface_type(network, nw_interface_type_cellular)) {
-                        onNetworkStateChange(Network.Known.Cellular())
+                        networkChannel.trySend(NetworkConnectionType.Known.Cellular())
                     }
                 }
                 nw_path_status_unsatisfied -> {
-                    onNetworkStateChange(Network.Known.Absent)
+                    networkChannel.trySend(NetworkConnectionType.Known.Absent)
                 }
             }
         }
     }
 
-    internal class SCNetworkManager(
-        override val onNetworkStateChange: NetworkStateChange
-    ) : AppleNetworkManager {
+    internal class SCNetworkManager : AppleNetworkManager {
 
-        private var reachability: SCNetworkReachabilityRef? = SCNetworkReachabilityCreateWithName(null, "www.appleiphonecell.com")
+        private val networkChannel = Channel<NetworkConnectionType>(Channel.UNLIMITED)
+        override val network: Flow<NetworkConnectionType> = networkChannel.receiveAsFlow()
+        private val lock = Mutex()
+        private var reachability: SCNetworkReachabilityRef? = null
 
         private val onNetworkStateChanged: SCNetworkReachabilityCallBack = staticCFunction { _: SCNetworkReachabilityRef?, flags: SCNetworkReachabilityFlags, info: COpaquePointer? ->
             if (info == null) {
@@ -131,7 +143,8 @@ actual class NetworkManager internal constructor(
             networkManager.checkReachability(networkManager, flags)
         }
 
-        init {
+        override suspend fun startMonitoring() = lock.withLock {
+            reachability = SCNetworkReachabilityCreateWithName(null, "www.appleiphonecell.com")
             val context = nativeHeap.alloc<SCNetworkReachabilityContext>()
             context.info = StableRef.create(this@SCNetworkManager).asCPointer()
 
@@ -146,6 +159,10 @@ actual class NetworkManager internal constructor(
             nativeHeap.free(flag.rawPtr)
         }
 
+        override suspend fun stopMonitoring() = lock.withLock {
+            reachability = null
+        }
+
         private fun areParametersSet(context: SCNetworkReachabilityContext): Boolean {
             if (!SCNetworkReachabilitySetCallback(reachability, onNetworkStateChanged, context.ptr)) {
                 return false
@@ -161,19 +178,15 @@ actual class NetworkManager internal constructor(
             when (flags) {
                 kSCNetworkReachabilityFlagsReachable -> {
                     if (flags == kSCNetworkReachabilityFlagsIsWWAN) {
-                        scNetworkManager.onNetworkStateChange(Network.Known.Cellular())
+                        scNetworkManager.networkChannel.trySend(NetworkConnectionType.Known.Cellular())
                     } else {
-                        scNetworkManager.onNetworkStateChange(Network.Known.Wifi())
+                        scNetworkManager.networkChannel.trySend(NetworkConnectionType.Known.Wifi())
                     }
                 }
                 else -> {
-                    scNetworkManager.onNetworkStateChange(Network.Known.Absent)
+                    scNetworkManager.networkChannel.trySend(NetworkConnectionType.Known.Absent)
                 }
             }
         }
-
-        override fun dispose() {
-            reachability = null
-        }
     }
 }
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/state/NetworkStateRepoBuilder.kt
index c0fe87c46..80f963562 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/state/NetworkStateRepoBuilder.kt
@@ -17,9 +17,10 @@
 
 package com.splendo.kaluga.system.network.state
 
-import com.splendo.kaluga.system.network.NetworkManagerBuilder
+import com.splendo.kaluga.system.network.DefaultNetworkManager
+import kotlin.coroutines.CoroutineContext
 
-actual class NetworkStateRepoBuilder : NetworkStateRepo.Builder {
-    override fun create(): NetworkStateRepo =
-        NetworkStateRepo(NetworkManagerBuilder())
+actual class NetworkStateRepoBuilder : BaseNetworkStateRepoBuilder {
+    override fun create(coroutineContext: CoroutineContext): NetworkStateRepo =
+        NetworkStateRepo(DefaultNetworkManager.Builder(), coroutineContext)
 }
diff --git a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt b/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
similarity index 58%
rename from system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
rename to system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
index fbec3dfbf..41ee08199 100644
--- a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
+++ b/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
@@ -17,10 +17,21 @@
 
 package com.splendo.kaluga.system.network
 
-actual class NetworkManagerBuilder : BaseNetworkManager.Builder {
-    override fun create(onNetworkStateChange: NetworkStateChange): BaseNetworkManager {
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+
+actual class DefaultNetworkManager : BaseNetworkManager() {
+
+    class Builder : BaseNetworkManager.Builder {
+        override fun create(): BaseNetworkManager = DefaultNetworkManager()
+    }
+
+    override val network: Flow<NetworkConnectionType> = flowOf(NetworkConnectionType.Known.Absent)
+    override suspend fun startMonitoring() {
         TODO("Not yet implemented")
     }
-}
 
-actual class NetworkManager
+    override suspend fun stopMonitoring() {
+        TODO("Not yet implemented")
+    }
+}
diff --git a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
index fa0138457..781efe759 100644
--- a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
@@ -17,8 +17,9 @@
 
 package com.splendo.kaluga.system.network.state
 
-import com.splendo.kaluga.system.network.NetworkManagerBuilder
+import com.splendo.kaluga.system.network.DefaultNetworkManager
+import kotlin.coroutines.CoroutineContext
 
-actual class NetworkStateRepoBuilder : NetworkStateRepo.Builder {
-    override fun create(): NetworkStateRepo = NetworkStateRepo(NetworkManagerBuilder())
+actual class NetworkStateRepoBuilder : BaseNetworkStateRepoBuilder {
+    override fun create(coroutineContext: CoroutineContext): NetworkStateRepo = NetworkStateRepo(DefaultNetworkManager.Builder(), coroutineContext)
 }
diff --git a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt b/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
similarity index 58%
rename from system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
rename to system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
index fbec3dfbf..41ee08199 100644
--- a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManagerBuilder.kt
+++ b/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
@@ -17,10 +17,21 @@
 
 package com.splendo.kaluga.system.network
 
-actual class NetworkManagerBuilder : BaseNetworkManager.Builder {
-    override fun create(onNetworkStateChange: NetworkStateChange): BaseNetworkManager {
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+
+actual class DefaultNetworkManager : BaseNetworkManager() {
+
+    class Builder : BaseNetworkManager.Builder {
+        override fun create(): BaseNetworkManager = DefaultNetworkManager()
+    }
+
+    override val network: Flow<NetworkConnectionType> = flowOf(NetworkConnectionType.Known.Absent)
+    override suspend fun startMonitoring() {
         TODO("Not yet implemented")
     }
-}
 
-actual class NetworkManager
+    override suspend fun stopMonitoring() {
+        TODO("Not yet implemented")
+    }
+}
diff --git a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
index fa0138457..781efe759 100644
--- a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
@@ -17,8 +17,9 @@
 
 package com.splendo.kaluga.system.network.state
 
-import com.splendo.kaluga.system.network.NetworkManagerBuilder
+import com.splendo.kaluga.system.network.DefaultNetworkManager
+import kotlin.coroutines.CoroutineContext
 
-actual class NetworkStateRepoBuilder : NetworkStateRepo.Builder {
-    override fun create(): NetworkStateRepo = NetworkStateRepo(NetworkManagerBuilder())
+actual class NetworkStateRepoBuilder : BaseNetworkStateRepoBuilder {
+    override fun create(coroutineContext: CoroutineContext): NetworkStateRepo = NetworkStateRepo(DefaultNetworkManager.Builder(), coroutineContext)
 }
diff --git a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
index a29e51e17..920ca8043 100644
--- a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
@@ -388,7 +388,7 @@ public abstract class com/splendo/kaluga/test/bluetooth/scanner/MockScanningStat
 	public final fun getDisable ()Lkotlin/jvm/functions/Function1;
 	protected abstract fun getPermittedHandler ()Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$PermittedHandler;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public final fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
+	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Idle : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
diff --git a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
index 422e2d921..b133b42f3 100644
--- a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
@@ -299,7 +299,7 @@ public abstract class com/splendo/kaluga/test/bluetooth/scanner/MockScanningStat
 	public final fun getDisable ()Lkotlin/jvm/functions/Function1;
 	protected abstract fun getPermittedHandler ()Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$PermittedHandler;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public final fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
+	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Idle : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
diff --git a/test-utils-hud/src/commonMain/kotlin/MockHUD.kt b/test-utils-hud/src/commonMain/kotlin/MockHUD.kt
index f7c5ff48e..b31ba4391 100644
--- a/test-utils-hud/src/commonMain/kotlin/MockHUD.kt
+++ b/test-utils-hud/src/commonMain/kotlin/MockHUD.kt
@@ -43,7 +43,7 @@ class MockHUD(
     class Builder(setupMocks: Boolean = true) : BaseHUD.Builder() {
 
         /**
-         * List of build [MockHUD]
+         * List of built [MockHUD]
          */
         val builtHUDs = mutableListOf<MockHUD>()
 
diff --git a/test-utils-location/README.md b/test-utils-location/README.md
index 89a91c322..65cb23af0 100644
--- a/test-utils-location/README.md
+++ b/test-utils-location/README.md
@@ -18,4 +18,4 @@ dependencies {
 ```
 
 ## Mocks
-This library contains mock classes for `LocationStateRepo.Builder`, `BaseLocationManager`, `BaseLocationManager.Builder`, and `LocationMonitor`.
+This library contains mock classes for `BaseLocationStateRepoBuilder`, `BaseLocationManager`, `BaseLocationManager.Builder`, and `LocationMonitor`.
diff --git a/test-utils-location/api/androidLib/test-utils-location.api b/test-utils-location/api/androidLib/test-utils-location.api
index e4e480ee4..74cc7bb3a 100644
--- a/test-utils-location/api/androidLib/test-utils-location.api
+++ b/test-utils-location/api/androidLib/test-utils-location.api
@@ -143,7 +143,7 @@ public final class com/splendo/kaluga/test/location/MockLocationState$PermittedH
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 }
 
-public final class com/splendo/kaluga/test/location/MockLocationStateRepoBuilder : com/splendo/kaluga/location/LocationStateRepo$Builder {
+public final class com/splendo/kaluga/test/location/MockLocationStateRepoBuilder : com/splendo/kaluga/location/BaseLocationStateRepoBuilder {
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Z)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
diff --git a/test-utils-location/api/jvm/test-utils-location.api b/test-utils-location/api/jvm/test-utils-location.api
index 32fef185c..04ee2e937 100644
--- a/test-utils-location/api/jvm/test-utils-location.api
+++ b/test-utils-location/api/jvm/test-utils-location.api
@@ -154,7 +154,7 @@ public final class com/splendo/kaluga/test/location/MockLocationState$PermittedH
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 }
 
-public final class com/splendo/kaluga/test/location/MockLocationStateRepoBuilder : com/splendo/kaluga/location/LocationStateRepo$Builder {
+public final class com/splendo/kaluga/test/location/MockLocationStateRepoBuilder : com/splendo/kaluga/location/BaseLocationStateRepoBuilder {
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Z)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt b/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
index 05796d071..b5f6aa069 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
@@ -70,12 +70,12 @@ class MockBaseLocationManager(
     /**
      * Mock implementation of [BaseLocationManager.Builder]
      * @param initialLocationEnabled Sets the initial state of location
-     * @param setupMocks If `true` sets up [createMock] to build [MockLocationManager]
+     * @param setupMocks If `true` sets up [createMock] to build [MockBaseLocationManager]
      */
     class Builder(val initialLocationEnabled: Boolean, setupMocks: Boolean = true) : BaseLocationManager.Builder {
 
         /**
-         * Ths list of build [MockBaseLocationManager]
+         * Ths list of built [MockBaseLocationManager]
          */
         val builtLocationManagers = mutableListOf<MockBaseLocationManager>()
 
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt b/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
index 93ebaae32..7bfde43fc 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
@@ -18,6 +18,7 @@
 package com.splendo.kaluga.test.location
 
 import com.splendo.kaluga.location.BaseLocationManager
+import com.splendo.kaluga.location.BaseLocationStateRepoBuilder
 import com.splendo.kaluga.location.LocationStateRepo
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.location.LocationPermission
@@ -27,7 +28,7 @@ import com.splendo.kaluga.test.base.mock.parameters.mock
 import kotlin.coroutines.CoroutineContext
 
 /**
- * Mock implementation of [LocationStateRepo.Builder]
+ * Mock implementation of [BaseLocationStateRepoBuilder]
  * @param permissionsBuilder Builds the [Permissions] to request permissions from
  * @param locationManagerBuilder The [BaseLocationManager.Builder] for building the location manager
  * @param setupMocks If `true` sets up [createMock] to automatically create a [LocationStateRepo]
@@ -36,10 +37,10 @@ class MockLocationStateRepoBuilder<LMB : BaseLocationManager.Builder>(
     private val permissionsBuilder: suspend () -> Permissions,
     val locationManagerBuilder: LMB,
     setupMocks: Boolean = true
-) : LocationStateRepo.Builder {
+) : BaseLocationStateRepoBuilder {
 
     /**
-     * List of build [LocationStateRepo]
+     * List of built [LocationStateRepo]
      */
     val builtLocationStateRepo = mutableListOf<LocationStateRepo>()
 
diff --git a/test-utils-system/api/androidLib/test-utils-system.api b/test-utils-system/api/androidLib/test-utils-system.api
new file mode 100644
index 000000000..4f8a0fe75
--- /dev/null
+++ b/test-utils-system/api/androidLib/test-utils-system.api
@@ -0,0 +1,124 @@
+public final class com/splendo/kaluga/test/system/BuildConfig {
+	public static final field BUILD_TYPE Ljava/lang/String;
+	public static final field DEBUG Z
+	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
+	public fun <init> ()V
+}
+
+public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager : com/splendo/kaluga/system/network/BaseNetworkManager {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)V
+	public synthetic fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
+	public fun getNetwork ()Lkotlinx/coroutines/flow/MutableStateFlow;
+	public final fun getStartMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager$Builder : com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Z)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+	public final fun getBuiltNetworkManagers ()Ljava/util/List;
+	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
+	public fun <init> (Lkotlinx/coroutines/flow/MutableSharedFlow;)V
+	public synthetic fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
+	public fun getNetwork ()Lkotlinx/coroutines/flow/MutableSharedFlow;
+	public final fun getStartMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class com/splendo/kaluga/test/system/network/MockNetworkState {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+}
+
+public abstract class com/splendo/kaluga/test/system/network/MockNetworkState$Active : com/splendo/kaluga/test/system/network/MockNetworkState {
+	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$Available : com/splendo/kaluga/test/system/network/MockNetworkState$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Available {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Available;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/system/network/MockNetworkState$Available;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;ILjava/lang/Object;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Available;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized : com/splendo/kaluga/test/system/network/MockNetworkState, com/splendo/kaluga/system/network/state/NetworkState$Deinitialized {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;Lcom/splendo/kaluga/system/network/NetworkConnectionType;ILjava/lang/Object;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class com/splendo/kaluga/test/system/network/MockNetworkState$Inactive : com/splendo/kaluga/test/system/network/MockNetworkState {
+}
+
+public abstract class com/splendo/kaluga/test/system/network/MockNetworkState$Initialized : com/splendo/kaluga/test/system/network/MockNetworkState$Active {
+	public final fun available (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)Lkotlin/jvm/functions/Function1;
+	public final fun unknown (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$Initializing : com/splendo/kaluga/test/system/network/MockNetworkState$Active, com/splendo/kaluga/system/network/state/NetworkState$Initializing {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Initializing;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/system/network/MockNetworkState$Initializing;Lcom/splendo/kaluga/system/network/NetworkConnectionType;ILjava/lang/Object;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Initializing;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun hashCode ()I
+	public fun initialized (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lkotlin/jvm/functions/Function1;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$NotInitialized : com/splendo/kaluga/test/system/network/MockNetworkState$Inactive, com/splendo/kaluga/system/network/state/NetworkState$NotInitialized {
+	public static final field INSTANCE Lcom/splendo/kaluga/test/system/network/MockNetworkState$NotInitialized;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$Unavailable : com/splendo/kaluga/test/system/network/MockNetworkState$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unavailable {
+	public static final field INSTANCE Lcom/splendo/kaluga/test/system/network/MockNetworkState$Unavailable;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$Unknown : com/splendo/kaluga/test/system/network/MockNetworkState$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unknown {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Unknown;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/system/network/MockNetworkState$Unknown;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;ILjava/lang/Object;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Unknown;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkStateRepoBuilder : com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
+	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;Z)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+	public final fun getBuiltNetworkStateRepo ()Ljava/util/List;
+	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getNetworkManagerBuilder ()Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;
+}
+
diff --git a/test-utils-system/api/jvm/test-utils-system.api b/test-utils-system/api/jvm/test-utils-system.api
new file mode 100644
index 000000000..fe040e568
--- /dev/null
+++ b/test-utils-system/api/jvm/test-utils-system.api
@@ -0,0 +1,135 @@
+public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager : com/splendo/kaluga/system/network/BaseNetworkManager {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)V
+	public synthetic fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
+	public fun getNetwork ()Lkotlinx/coroutines/flow/MutableStateFlow;
+	public final fun getStartMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager$Builder : com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Z)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+	public final fun getBuiltNetworkManagers ()Ljava/util/List;
+	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
+	public fun <init> (Lkotlinx/coroutines/flow/MutableSharedFlow;)V
+	public synthetic fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
+	public fun getNetwork ()Lkotlinx/coroutines/flow/MutableSharedFlow;
+	public final fun getStartMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class com/splendo/kaluga/test/system/network/MockNetworkState {
+	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+}
+
+public abstract class com/splendo/kaluga/test/system/network/MockNetworkState$Active : com/splendo/kaluga/test/system/network/MockNetworkState {
+	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$Available : com/splendo/kaluga/test/system/network/MockNetworkState$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Available {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Available;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/system/network/MockNetworkState$Available;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;ILjava/lang/Object;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Available;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+	public fun hashCode ()I
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized : com/splendo/kaluga/test/system/network/MockNetworkState, com/splendo/kaluga/system/network/state/NetworkState$Deinitialized {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;Lcom/splendo/kaluga/system/network/NetworkConnectionType;ILjava/lang/Object;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
+	public fun hashCode ()I
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class com/splendo/kaluga/test/system/network/MockNetworkState$Inactive : com/splendo/kaluga/test/system/network/MockNetworkState {
+}
+
+public abstract class com/splendo/kaluga/test/system/network/MockNetworkState$Initialized : com/splendo/kaluga/test/system/network/MockNetworkState$Active {
+	public final fun available (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)Lkotlin/jvm/functions/Function1;
+	public final fun unknown (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$Initializing : com/splendo/kaluga/test/system/network/MockNetworkState$Active, com/splendo/kaluga/system/network/state/NetworkState$Initializing {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Initializing;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/system/network/MockNetworkState$Initializing;Lcom/splendo/kaluga/system/network/NetworkConnectionType;ILjava/lang/Object;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Initializing;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun hashCode ()I
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun initialized (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lkotlin/jvm/functions/Function1;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$NotInitialized : com/splendo/kaluga/test/system/network/MockNetworkState$Inactive, com/splendo/kaluga/system/network/state/NetworkState$NotInitialized {
+	public static final field INSTANCE Lcom/splendo/kaluga/test/system/network/MockNetworkState$NotInitialized;
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$Unavailable : com/splendo/kaluga/test/system/network/MockNetworkState$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unavailable {
+	public static final field INSTANCE Lcom/splendo/kaluga/test/system/network/MockNetworkState$Unavailable;
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkState$Unknown : com/splendo/kaluga/test/system/network/MockNetworkState$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unknown {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;)V
+	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
+	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Unknown;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/system/network/MockNetworkState$Unknown;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;ILjava/lang/Object;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Unknown;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
+	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
+	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
+	public fun hashCode ()I
+	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/test/system/network/MockNetworkStateRepoBuilder : com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
+	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;Z)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+	public final fun getBuiltNetworkStateRepo ()Ljava/util/List;
+	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getNetworkManagerBuilder ()Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;
+}
+
diff --git a/test-utils-system/build.gradle.kts b/test-utils-system/build.gradle.kts
new file mode 100644
index 000000000..5a488a166
--- /dev/null
+++ b/test-utils-system/build.gradle.kts
@@ -0,0 +1,23 @@
+plugins {
+    kotlin("multiplatform")
+    id("jacoco")
+    id("convention.publication")
+    id("com.android.library")
+    id("org.jlleitschuh.gradle.ktlint")
+}
+
+publishableComponent()
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(project(":system"))
+                api(project(":test-utils-base"))
+            }
+        }
+        commonTest {
+            dependencies {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/test-utils-system/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-system/src/androidLibAndroidTest/AndroidManifest.xml
new file mode 100644
index 000000000..ba85ea38d
--- /dev/null
+++ b/test-utils-system/src/androidLibAndroidTest/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest package="com.splendo.kaluga.test.system"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:theme="@style/Theme.AppCompat">
+        <activity android:name=".TestActivity"/>
+    </application>
+</manifest>
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManagerBuilder.kt b/test-utils-system/src/androidLibAndroidTest/kotlin/TestActivity.kt
similarity index 70%
rename from system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManagerBuilder.kt
rename to test-utils-system/src/androidLibAndroidTest/kotlin/TestActivity.kt
index df17b71f9..62d3cec62 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManagerBuilder.kt
+++ b/test-utils-system/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -13,13 +13,15 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
- */
+*/
 
-package com.splendo.kaluga.system.network
+package com.splendo.kaluga.test.system
 
-actual class NetworkManagerBuilder : BaseNetworkManager.Builder {
+import androidx.appcompat.app.AppCompatActivity
 
-    override fun create(onNetworkStateChange: NetworkStateChange): BaseNetworkManager {
-        return NetworkManager(onNetworkStateChange)
-    }
+class TestActivity : AppCompatActivity()
+
+class CorrectlySetupTest {
+    @kotlin.test.Test
+    fun testSetup() = assert(true)
 }
diff --git a/test-utils-system/src/androidLibMain/AndroidManifest.xml b/test-utils-system/src/androidLibMain/AndroidManifest.xml
new file mode 100644
index 000000000..dd05f76f6
--- /dev/null
+++ b/test-utils-system/src/androidLibMain/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest package="com.splendo.kaluga.test.system"
+          xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
new file mode 100644
index 000000000..321404f15
--- /dev/null
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.test.system.network
+
+import com.splendo.kaluga.system.network.BaseNetworkManager
+import com.splendo.kaluga.system.network.NetworkConnectionType
+import com.splendo.kaluga.system.network.NetworkManager
+import com.splendo.kaluga.test.base.mock.call
+import com.splendo.kaluga.test.base.mock.on
+import com.splendo.kaluga.test.base.mock.parameters.mock
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * Mock implementation of [NetworkManager]
+ *
+ */
+class MockNetworkManager(override val network: MutableSharedFlow<NetworkConnectionType>) : NetworkManager {
+
+    val startMonitoringMock = ::startMonitoring.mock()
+    override suspend fun startMonitoring(): Unit = startMonitoringMock.call()
+
+    val stopMonitoringMock = ::stopMonitoring.mock()
+    override suspend fun stopMonitoring(): Unit = stopMonitoringMock.call()
+}
+
+/**
+ * Mock implementation of [BaseNetworkManager]
+ * @param initialNetworkConnectionType Sets the initial [NetworkConnectionType]
+ * @param setupMocks If `true` sets up [createMock] to build [MockBaseNetworkManager]
+ */
+class MockBaseNetworkManager(initialNetworkConnectionType: NetworkConnectionType) : BaseNetworkManager() {
+
+    class Builder(initialNetworkConnectionType: NetworkConnectionType, setupMocks: Boolean = true) : BaseNetworkManager.Builder {
+
+        /**
+         * List of built [BaseNetworkManager]
+         */
+        val builtNetworkManagers = mutableListOf<BaseNetworkManager>()
+
+        /**
+         * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
+         */
+        val createMock = ::create.mock()
+
+        init {
+            if (setupMocks) {
+                createMock.on()
+                    .doExecute {
+                        MockBaseNetworkManager(initialNetworkConnectionType).also {
+                            builtNetworkManagers.add(it)
+                        }
+                    }
+            }
+        }
+
+        override fun create(): BaseNetworkManager = createMock.call()
+    }
+
+    override val network = MutableStateFlow(initialNetworkConnectionType)
+    val startMonitoringMock = ::startMonitoring.mock()
+    override suspend fun startMonitoring(): Unit = startMonitoringMock.call()
+
+    val stopMonitoringMock = ::stopMonitoring.mock()
+    override suspend fun stopMonitoring(): Unit = stopMonitoringMock.call()
+}
+
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
new file mode 100644
index 000000000..82d0a77d8
--- /dev/null
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.test.system.network
+
+import com.splendo.kaluga.system.network.NetworkConnectionType
+import com.splendo.kaluga.system.network.state.NetworkState
+import com.splendo.kaluga.system.network.unknown
+
+sealed class MockNetworkState {
+
+    abstract val networkConnectionType: NetworkConnectionType
+
+    sealed class Inactive : MockNetworkState()
+    object NotInitialized : Inactive(), NetworkState.NotInitialized {
+        override val networkConnectionType: NetworkConnectionType = NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+    }
+
+    data class Deinitialized(override val previousNetworkConnectionType: NetworkConnectionType) : MockNetworkState(), NetworkState.Deinitialized {
+        override val networkConnectionType: NetworkConnectionType = previousNetworkConnectionType.unknown(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+        override val reinitialize: suspend () -> NetworkState.Initializing = { Initializing(networkConnectionType) }
+    }
+
+    sealed class Active : MockNetworkState() {
+        val deinitialize: suspend () -> Deinitialized = suspend { Deinitialized(networkConnectionType) }
+    }
+
+    data class Initializing(override val networkConnectionType: NetworkConnectionType) : Active(), NetworkState.Initializing {
+        override fun initialized(networkType: NetworkConnectionType): suspend () -> NetworkState.Initialized = {
+            when (networkType) {
+                is NetworkConnectionType.Unknown -> Unknown(networkType)
+                is NetworkConnectionType.Known.Available -> Available(networkType)
+                is NetworkConnectionType.Known.Absent -> Unavailable
+            }
+        }
+    }
+
+    sealed class Initialized : Active() {
+        fun available(available: NetworkConnectionType.Known.Available) = suspend { Available(available) }
+        fun unknown(reason: NetworkConnectionType.Unknown.Reason): suspend () -> NetworkState.Unknown = {
+            Unknown(
+                networkConnectionType.unknown(reason)
+            )
+        }
+    }
+
+    data class Unknown(override val networkConnectionType: NetworkConnectionType.Unknown) : Initialized(), NetworkState.Unknown {
+        override val unavailable: suspend () -> NetworkState.Unavailable = { Unavailable }
+    }
+
+    data class Available(
+        override val networkConnectionType: NetworkConnectionType.Known.Available
+    ) : Initialized(), NetworkState.Available {
+        override val unavailable: suspend () -> NetworkState.Unavailable = { Unavailable }
+    }
+
+    object Unavailable : Initialized(), NetworkState.Unavailable {
+        override val networkConnectionType: NetworkConnectionType.Known.Absent = NetworkConnectionType.Known.Absent
+    }
+}
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt
new file mode 100644
index 000000000..da8b47669
--- /dev/null
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.test.system.network
+
+import com.splendo.kaluga.system.network.BaseNetworkManager
+import com.splendo.kaluga.system.network.state.BaseNetworkStateRepoBuilder
+import com.splendo.kaluga.system.network.state.NetworkStateRepo
+import com.splendo.kaluga.test.base.mock.call
+import com.splendo.kaluga.test.base.mock.on
+import com.splendo.kaluga.test.base.mock.parameters.mock
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * Mock implementation of [BaseNetworkStateRepoBuilder]
+ * @param networkManagerBuilder The [BaseNetworkManager.Builder] for building the network manager
+ * @param setupMocks If `true` sets up [createMock] to automatically create a [NetworkStateRepo]
+ */
+class MockNetworkStateRepoBuilder<NMB : BaseNetworkManager.Builder>(
+    val networkManagerBuilder: NMB,
+    setupMocks: Boolean = true
+) : BaseNetworkStateRepoBuilder {
+
+    /**
+     * List of built [NetworkStateRepo]
+     */
+    val builtNetworkStateRepo = mutableListOf<NetworkStateRepo>()
+
+    /**
+     * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
+     */
+    val createMock = ::create.mock()
+
+    init {
+        if (setupMocks) {
+            createMock.on()
+                .doExecute { (coroutineContext) ->
+                    NetworkStateRepo(networkManagerBuilder, coroutineContext).also {
+                        builtNetworkStateRepo.add(it)
+                    }
+                }
+        }
+    }
+
+    override fun create(coroutineContext: CoroutineContext): NetworkStateRepo = createMock.call(coroutineContext)
+}
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index c2ec54e44..124305731 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -22,6 +22,7 @@ kotlin {
                 api(project(":test-utils-location"))
                 api(project(":test-utils-permissions"))
                 api(project(":test-utils-resources"))
+                api(project(":test-utils-system"))
             }
         }
         commonTest {

From fc557c9a7b915006820fb8ad63affdcfd26f0ff0 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 11 Nov 2022 16:18:17 +0100
Subject: [PATCH 014/227] Fixed minor typo

---
 example/android/proguard-rules.pro | 2 +-
 gradle/newModule.gradle.kts        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/android/proguard-rules.pro b/example/android/proguard-rules.pro
index e3345f14a..2f9dc5a47 100644
--- a/example/android/proguard-rules.pro
+++ b/example/android/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.build.gradle.kts.kts.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/gradle/newModule.gradle.kts b/gradle/newModule.gradle.kts
index 0afa01508..619fd06e1 100644
--- a/gradle/newModule.gradle.kts
+++ b/gradle/newModule.gradle.kts
@@ -24,7 +24,7 @@ abstract class NewModule : DefaultTask() {
         const val VALID_MODULE_NAME_REGEX = "^[^\\dA-Z-][a-z]+[a-z-]*\\Z"
         const val VALID_PACKAGE_NAME = "^[a-z]+(\\.[a-z]+)*\\Z"
         const val TEMPLATE_PATH = "adding-a-new-module/template"
-        const val BUILD_GRADLE_KTS = "build.build.gradle.kts.kts"
+        const val BUILD_GRADLE_KTS = "build.gradle.kts"
         val CREATE_DIRS = listOf(
             "androidLibAndroidTest" to listOf("kotlin/TestActivity.kt", "AndroidManifest.xml"),
             "androidLibMain" to listOf("AndroidManifest.xml"),

From d8ce566befe14c3a17385ec5058e717627eb2169 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 14 Nov 2022 16:58:46 +0100
Subject: [PATCH 015/227] Use AtomicFu

---
 architecture/api/androidLib/architecture.api  |  36 +---
 architecture/api/jvm/architecture.api         |  36 +---
 architecture/build.gradle.kts                 |   1 +
 .../kotlin/observable/Disposable.kt           |  40 ++--
 .../kotlin/observable/Observable.kt           |   8 +-
 .../kotlin/observable/Observables.kt          |  51 -----
 .../viewmodel/ViewModelLifecycleManager.kt    |  12 +-
 .../api/androidLib/base-permissions.api       |  12 +-
 base-permissions/api/jvm/base-permissions.api |  46 +----
 base-permissions/build.gradle.kts             |   1 +
 .../src/commonMain/kotlin/Permission.kt       |  28 +--
 base/README.md                                |  46 ++---
 base/api/androidLib/base.api                  |  62 ------
 base/api/jvm/base.api                         |  70 -------
 base/build.gradle.kts                         |   1 +
 .../commonMain/kotlin/flow/BaseFlowable.kt    |  63 ------
 .../commonMain/kotlin/flow/ColdFlowable.kt    |  68 -------
 base/src/commonMain/kotlin/flow/FlowConfig.kt |  41 ----
 base/src/commonMain/kotlin/flow/Flowable.kt   |  58 ------
 .../src/commonMain/kotlin/flow/HotFlowable.kt |  38 ----
 .../commonMain/kotlin/state/KalugaState.kt    |  69 ++-----
 .../kotlin/flow/ColdFlowableTest.kt           | 179 ------------------
 .../commonTest/kotlin/flow/HotFlowableTest.kt |  95 ----------
 .../kotlin/state/ColdStateRepoTest.kt         |   9 -
 .../commonTest/kotlin/state/StateRepoTest.kt  |  11 --
 beacons/api/androidLib/beacons.api            |   4 +-
 beacons/api/jvm/beacons.api                   |   4 +-
 beacons/src/commonMain/kotlin/Beacons.kt      |  18 +-
 .../src/commonTest/kotlin/BeaconFlowTest.kt   |   4 +-
 .../api/androidLib/bluetooth-permissions.api  |  16 +-
 .../api/jvm/bluetooth-permissions.api         |  16 +-
 .../src/commonMain/kotlin/Permission.kt       |   8 +-
 bluetooth/api/androidLib/bluetooth.api        |  24 +--
 bluetooth/api/jvm/bluetooth.api               | 104 +---------
 bluetooth/build.gradle.kts                    |   1 +
 .../androidLibMain/kotlin/scanner/Scanner.kt  |   4 +-
 .../src/commonMain/kotlin/Characteristic.kt   |   6 +-
 .../src/commonMain/kotlin/scanner/Scanner.kt  |  24 ++-
 .../kotlin/scanner/ScanningState.kt           |   4 +-
 .../src/iosMain/kotlin/BluetoothMonitor.kt    |   7 +-
 build.gradle.kts                              |   7 +-
 .../api/androidLib/calendar-permissions.api   |  16 +-
 .../api/jvm/calendar-permissions.api          |  16 +-
 .../src/commonMain/kotlin/Permission.kt       |   8 +-
 .../api/androidLib/camera-permissions.api     |  16 +-
 .../api/jvm/camera-permissions.api            |  16 +-
 .../src/commonMain/kotlin/Permission.kt       |   8 +-
 .../api/androidLib/contacts-permissions.api   |  16 +-
 .../api/jvm/contacts-permissions.api          |  16 +-
 .../src/commonMain/kotlin/Permission.kt       |   8 +-
 gradle.properties                             |   3 +-
 .../api/androidLib/location-permissions.api   |  16 +-
 .../api/jvm/location-permissions.api          |  16 +-
 .../src/commonMain/kotlin/Permission.kt       |   8 +-
 location/api/androidLib/location.api          |  14 +-
 location/api/jvm/location.api                 |  50 +----
 location/build.gradle.kts                     |   1 +
 .../kotlin/location/LocationManager.kt        |  36 ++--
 .../kotlin/location/LocationState.kt          |   2 +-
 logging/build.gradle.kts                      |   1 +
 logging/src/commonTest/kotlin/LogTest.kt      | 156 ++++++++-------
 logging/src/commonTest/kotlin/LoggerMock.kt   |  35 ++--
 .../api/androidLib/microphone-permissions.api |  16 +-
 .../api/jvm/microphone-permissions.api        |  16 +-
 .../src/commonMain/kotlin/Permission.kt       |   8 +-
 .../androidLib/notifications-permissions.api  |  16 +-
 .../api/jvm/notifications-permissions.api     |  16 +-
 .../src/commonMain/kotlin/Permission.kt       |   8 +-
 permissions/api/androidLib/permissions.api    |   4 +-
 permissions/api/jvm/permissions.api           |   4 +-
 .../kotlin/registerAllPermissions.kt          |   2 +-
 settings.gradle.kts                           |   2 +
 .../api/androidLib/storage-permissions.api    |  16 +-
 .../api/jvm/storage-permissions.api           |  16 +-
 .../src/commonMain/kotlin/Permission.kt       |   8 +-
 system/api/jvm/system.api                     |   2 -
 test-utils-architecture/build.gradle.kts      |   1 +
 .../kotlin/UIThreadViewModelTestTest.kt       |   9 +-
 test-utils-base/build.gradle.kts              |   1 +
 .../src/commonMain/kotlin/FlowTest.kt         |  15 +-
 .../api/androidLib/test-utils-bluetooth.api   |  32 ++--
 .../api/jvm/test-utils-bluetooth.api          |  48 ++---
 .../commonMain/kotlin/scanner/MockScanner.kt  |  16 +-
 .../api/androidLib/test-utils-location.api    |  24 +--
 .../api/jvm/test-utils-location.api           |  36 ++--
 .../commonMain/kotlin/MockLocationManager.kt  |  12 +-
 .../api/jvm/test-utils-permissions.api        |  12 --
 87 files changed, 548 insertions(+), 1582 deletions(-)
 delete mode 100644 base/src/commonMain/kotlin/flow/BaseFlowable.kt
 delete mode 100644 base/src/commonMain/kotlin/flow/ColdFlowable.kt
 delete mode 100644 base/src/commonMain/kotlin/flow/FlowConfig.kt
 delete mode 100644 base/src/commonMain/kotlin/flow/Flowable.kt
 delete mode 100644 base/src/commonMain/kotlin/flow/HotFlowable.kt
 delete mode 100644 base/src/commonTest/kotlin/flow/ColdFlowableTest.kt
 delete mode 100644 base/src/commonTest/kotlin/flow/HotFlowableTest.kt

diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index ea3093f16..10f875dac 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -1360,9 +1360,9 @@ public abstract class com/splendo/kaluga/architecture/observable/BaseObservable
 
 public abstract class com/splendo/kaluga/architecture/observable/BaseSimpleDisposable : com/splendo/kaluga/architecture/observable/Disposable {
 	public fun <init> (Lkotlin/jvm/functions/Function0;)V
-	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
 	protected fun afterDispose ()V
-	public fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun dispose ()V
 }
 
 public abstract class com/splendo/kaluga/architecture/observable/BaseSubject : com/splendo/kaluga/architecture/observable/AbstractBaseSubject {
@@ -1418,16 +1418,16 @@ public abstract interface class com/splendo/kaluga/architecture/observable/Defau
 }
 
 public abstract interface class com/splendo/kaluga/architecture/observable/Disposable {
-	public abstract fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
+	public abstract fun dispose ()V
 }
 
 public final class com/splendo/kaluga/architecture/observable/DisposeBag : com/splendo/kaluga/architecture/observable/Disposable {
 	public fun <init> ()V
-	public final fun add (Lcom/splendo/kaluga/architecture/observable/Disposable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun add (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun add (Lcom/splendo/kaluga/architecture/observable/Disposable;)V
+	public final fun add (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
+	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
+	public fun dispose ()V
 }
 
 public final class com/splendo/kaluga/architecture/observable/FlowInitializedObservable : com/splendo/kaluga/architecture/observable/BaseInitializedObservable {
@@ -1444,22 +1444,6 @@ public final class com/splendo/kaluga/architecture/observable/FlowObservable : c
 	public final fun getFlow ()Lkotlinx/coroutines/flow/Flow;
 }
 
-public final class com/splendo/kaluga/architecture/observable/HotFlowableDefaultSubject : com/splendo/kaluga/architecture/observable/BaseDefaultSubject, com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public fun <init> (Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/base/flow/HotFlowable;ZLcom/splendo/kaluga/architecture/observable/ObservationDefault;)V
-	public synthetic fun <init> (Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/base/flow/HotFlowable;ZLcom/splendo/kaluga/architecture/observable/ObservationDefault;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
-	public fun post (Ljava/lang/Object;)V
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/splendo/kaluga/architecture/observable/HotFlowableInitializedSubject : com/splendo/kaluga/architecture/observable/BaseInitializedSubject, com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/base/flow/HotFlowable;ZLcom/splendo/kaluga/architecture/observable/ObservationInitialized;)V
-	public synthetic fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/base/flow/HotFlowable;ZLcom/splendo/kaluga/architecture/observable/ObservationInitialized;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
-	public fun post (Ljava/lang/Object;)V
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public abstract interface class com/splendo/kaluga/architecture/observable/Initial {
 	public abstract fun getCurrentOrNull ()Ljava/lang/Object;
 	public abstract fun getInitialValue ()Lcom/splendo/kaluga/architecture/observable/ObservableOptional;
@@ -1538,11 +1522,9 @@ public final class com/splendo/kaluga/architecture/observable/ObservablesKt {
 	public static final fun toDefaultObservable (Lkotlin/properties/ReadOnlyProperty;Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadOnlyPropertyDefaultObservable;
 	public static final fun toDefaultObservable (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
 	public static synthetic fun toDefaultObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
-	public static final fun toDefaultSubject (Lcom/splendo/kaluga/base/flow/HotFlowable;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/HotFlowableDefaultSubject;
 	public static final fun toDefaultSubject (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
 	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
 	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
-	public static synthetic fun toDefaultSubject$default (Lcom/splendo/kaluga/base/flow/HotFlowable;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/HotFlowableDefaultSubject;
 	public static synthetic fun toDefaultSubject$default (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
 	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
 	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
@@ -1551,11 +1533,9 @@ public final class com/splendo/kaluga/architecture/observable/ObservablesKt {
 	public static final fun toInitializedObservable (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
 	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
 	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
-	public static final fun toInitializedSubject (Lcom/splendo/kaluga/base/flow/HotFlowable;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/HotFlowableInitializedSubject;
 	public static final fun toInitializedSubject (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
 	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
 	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
-	public static synthetic fun toInitializedSubject$default (Lcom/splendo/kaluga/base/flow/HotFlowable;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/HotFlowableInitializedSubject;
 	public static synthetic fun toInitializedSubject$default (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
 	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
 	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
diff --git a/architecture/api/jvm/architecture.api b/architecture/api/jvm/architecture.api
index 0e78abd77..d7ec3bd29 100644
--- a/architecture/api/jvm/architecture.api
+++ b/architecture/api/jvm/architecture.api
@@ -622,9 +622,9 @@ public abstract class com/splendo/kaluga/architecture/observable/BaseObservable
 
 public abstract class com/splendo/kaluga/architecture/observable/BaseSimpleDisposable : com/splendo/kaluga/architecture/observable/Disposable {
 	public fun <init> (Lkotlin/jvm/functions/Function0;)V
-	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
 	protected fun afterDispose ()V
-	public fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun dispose ()V
 }
 
 public abstract class com/splendo/kaluga/architecture/observable/BaseSubject : com/splendo/kaluga/architecture/observable/AbstractBaseSubject {
@@ -674,16 +674,16 @@ public abstract interface class com/splendo/kaluga/architecture/observable/Defau
 }
 
 public abstract interface class com/splendo/kaluga/architecture/observable/Disposable {
-	public abstract fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
+	public abstract fun dispose ()V
 }
 
 public final class com/splendo/kaluga/architecture/observable/DisposeBag : com/splendo/kaluga/architecture/observable/Disposable {
 	public fun <init> ()V
-	public final fun add (Lcom/splendo/kaluga/architecture/observable/Disposable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun add (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun dispose (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun add (Lcom/splendo/kaluga/architecture/observable/Disposable;)V
+	public final fun add (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
+	public fun addTo (Lcom/splendo/kaluga/architecture/observable/DisposeBag;)V
+	public fun dispose ()V
 }
 
 public final class com/splendo/kaluga/architecture/observable/FlowInitializedObservable : com/splendo/kaluga/architecture/observable/BaseInitializedObservable {
@@ -700,22 +700,6 @@ public final class com/splendo/kaluga/architecture/observable/FlowObservable : c
 	public final fun getFlow ()Lkotlinx/coroutines/flow/Flow;
 }
 
-public final class com/splendo/kaluga/architecture/observable/HotFlowableDefaultSubject : com/splendo/kaluga/architecture/observable/BaseDefaultSubject, com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public fun <init> (Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/base/flow/HotFlowable;ZLcom/splendo/kaluga/architecture/observable/ObservationDefault;)V
-	public synthetic fun <init> (Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/base/flow/HotFlowable;ZLcom/splendo/kaluga/architecture/observable/ObservationDefault;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
-	public fun post (Ljava/lang/Object;)V
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/splendo/kaluga/architecture/observable/HotFlowableInitializedSubject : com/splendo/kaluga/architecture/observable/BaseInitializedSubject, com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/base/flow/HotFlowable;ZLcom/splendo/kaluga/architecture/observable/ObservationInitialized;)V
-	public synthetic fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/base/flow/HotFlowable;ZLcom/splendo/kaluga/architecture/observable/ObservationInitialized;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
-	public fun post (Ljava/lang/Object;)V
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public abstract interface class com/splendo/kaluga/architecture/observable/Initial {
 	public abstract fun getCurrentOrNull ()Ljava/lang/Object;
 	public abstract fun getInitialValue ()Lcom/splendo/kaluga/architecture/observable/ObservableOptional;
@@ -794,11 +778,9 @@ public final class com/splendo/kaluga/architecture/observable/ObservablesKt {
 	public static final fun toDefaultObservable (Lkotlin/properties/ReadOnlyProperty;Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadOnlyPropertyDefaultObservable;
 	public static final fun toDefaultObservable (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
 	public static synthetic fun toDefaultObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
-	public static final fun toDefaultSubject (Lcom/splendo/kaluga/base/flow/HotFlowable;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/HotFlowableDefaultSubject;
 	public static final fun toDefaultSubject (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
 	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
 	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
-	public static synthetic fun toDefaultSubject$default (Lcom/splendo/kaluga/base/flow/HotFlowable;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/HotFlowableDefaultSubject;
 	public static synthetic fun toDefaultSubject$default (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
 	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
 	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
@@ -807,11 +789,9 @@ public final class com/splendo/kaluga/architecture/observable/ObservablesKt {
 	public static final fun toInitializedObservable (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
 	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
 	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
-	public static final fun toInitializedSubject (Lcom/splendo/kaluga/base/flow/HotFlowable;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/HotFlowableInitializedSubject;
 	public static final fun toInitializedSubject (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
 	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
 	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
-	public static synthetic fun toInitializedSubject$default (Lcom/splendo/kaluga/base/flow/HotFlowable;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/HotFlowableInitializedSubject;
 	public static synthetic fun toInitializedSubject$default (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
 	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
 	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts
index b539bf767..d5c2488e9 100644
--- a/architecture/build.gradle.kts
+++ b/architecture/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     id("com.android.library")
     id("convention.publication")
     id("org.jlleitschuh.gradle.ktlint")
+    id("kotlinx-atomicfu")
 }
 
 publishableComponent()
diff --git a/architecture/src/commonMain/kotlin/observable/Disposable.kt b/architecture/src/commonMain/kotlin/observable/Disposable.kt
index 321c84d98..95d84ca33 100644
--- a/architecture/src/commonMain/kotlin/observable/Disposable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Disposable.kt
@@ -18,8 +18,8 @@
 @file:JvmName("DisposableCommonKt")
 package com.splendo.kaluga.architecture.observable
 
-import kotlinx.coroutines.sync.Semaphore
-import kotlinx.coroutines.sync.withPermit
+import kotlinx.atomicfu.locks.SynchronizedObject
+import kotlinx.atomicfu.locks.synchronized
 import kotlin.jvm.JvmName
 
 typealias DisposeHandler = () -> Unit
@@ -37,12 +37,12 @@ interface Disposable {
     /**
      * Disposes the associated object
      */
-    suspend fun dispose()
+    fun dispose()
 
     /**
      * Adds this disposable to a [DisposeBag]
      */
-    suspend fun addTo(disposeBag: DisposeBag)
+    fun addTo(disposeBag: DisposeBag)
 }
 
 expect class SimpleDisposable(onDispose: DisposeHandler) : BaseSimpleDisposable
@@ -51,16 +51,15 @@ expect class SimpleDisposable(onDispose: DisposeHandler) : BaseSimpleDisposable
  * Plain [Disposable] to an object that should be disposed in time
  * @param onDispose Function to call when disposing the object
  */
-abstract class BaseSimpleDisposable(onDispose: DisposeHandler) : Disposable {
+abstract class BaseSimpleDisposable(onDispose: DisposeHandler) : SynchronizedObject(), Disposable {
 
-    private val disposal = Semaphore(1)
     private var disposeHandler: DisposeHandler? = onDispose
 
     /**
      * Disposes the associated object
      */
-    override suspend fun dispose() {
-        disposal.withPermit {
+    override fun dispose() {
+        synchronized(this) {
             disposeHandler?.let {
                 it.invoke()
                 disposeHandler = null
@@ -74,7 +73,7 @@ abstract class BaseSimpleDisposable(onDispose: DisposeHandler) : Disposable {
     /**
      * Adds this disposable to a [DisposeBag]
      */
-    override suspend fun addTo(disposeBag: DisposeBag) {
+    override fun addTo(disposeBag: DisposeBag) {
         disposeBag.add(this)
     }
 }
@@ -82,17 +81,16 @@ abstract class BaseSimpleDisposable(onDispose: DisposeHandler) : Disposable {
 /**
  * Container for multiple [Disposable]. Allows nested [DisposeBag].
  */
-class DisposeBag : Disposable {
+class DisposeBag : SynchronizedObject(), Disposable {
 
-    private val addingOperation = Semaphore(1)
     private val disposables: MutableList<Disposable> = mutableListOf()
     private val nestedBags: MutableList<DisposeBag> = mutableListOf()
 
     /**
      * Adds a nested [DisposeBag]
      */
-    suspend fun add(disposeBag: DisposeBag) {
-        addingOperation.withPermit {
+    fun add(disposeBag: DisposeBag) {
+        synchronized(this) {
             nestedBags.add(disposeBag)
         }
     }
@@ -100,13 +98,13 @@ class DisposeBag : Disposable {
     /**
      * Adds a [Disposable] to this [DisposeBag]
      */
-    suspend fun add(disposable: Disposable) {
-        addingOperation.withPermit {
+    fun add(disposable: Disposable) {
+        synchronized(this) {
             disposables.add(disposable)
         }
     }
 
-    override suspend fun addTo(disposeBag: DisposeBag) {
+    override fun addTo(disposeBag: DisposeBag) {
         disposeBag.add(this)
     }
 
@@ -114,13 +112,11 @@ class DisposeBag : Disposable {
      * Disposes all [Disposable]s and nested [DisposeBag]s added to this [DisposeBag].
      * Added elements can only be disposed once
      */
-    override suspend fun dispose() {
-        disposables.forEach { it.dispose() }
-        addingOperation.withPermit {
+    override fun dispose() {
+        synchronized(this) {
+            disposables.forEach { it.dispose() }
             disposables.clear()
-        }
-        nestedBags.forEach { it.dispose() }
-        addingOperation.withPermit {
+            nestedBags.forEach { it.dispose() }
             nestedBags.clear()
         }
     }
diff --git a/architecture/src/commonMain/kotlin/observable/Observable.kt b/architecture/src/commonMain/kotlin/observable/Observable.kt
index 580b7a84e..21e4fbd35 100644
--- a/architecture/src/commonMain/kotlin/observable/Observable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observable.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
 import com.splendo.kaluga.base.KalugaThread
 import com.splendo.kaluga.base.isOnMainThread
 import com.splendo.kaluga.base.runBlocking
+import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -189,14 +190,14 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
     var onFirstObservation: (() -> Unit)? = null
         set(value) {
             // if an observation took place before this field was set, invoke immediately
-            if (firstObservation) {
+            if (firstObservation.value) {
                 value?.invoke()
             } else {
                 field = value
             }
         }
 
-    private var firstObservation = false
+    private val firstObservation = atomic(false)
 
     var beforeObservedValueGet: ((OO) -> ObservableOptional<T>)? = null
 
@@ -253,8 +254,7 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
     }
 
     private fun getValue(): OO {
-        if (!firstObservation) {
-            firstObservation = true
+        if (firstObservation.compareAndSet(expect = false, update = true)) {
             onFirstObservation?.invoke()
         }
 
diff --git a/architecture/src/commonMain/kotlin/observable/Observables.kt b/architecture/src/commonMain/kotlin/observable/Observables.kt
index aca239e07..c8caf6f90 100644
--- a/architecture/src/commonMain/kotlin/observable/Observables.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observables.kt
@@ -18,7 +18,6 @@
 package com.splendo.kaluga.architecture.observable
 
 import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
-import com.splendo.kaluga.base.flow.HotFlowable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -98,45 +97,6 @@ class MutableFlowSubjectHelper<R : T, T, OO : ObservableOptional<R>>(
     override fun post(newValue: T) = poster(newValue)
 }
 
-class HotFlowableDefaultSubject<R : T?, T>(
-    defaultValue: R,
-    val coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext,
-    hotFlowable: HotFlowable<T?>,
-    autoBind: Boolean = true,
-    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue, Value(hotFlowable.initialValue))
-) : BaseDefaultSubject<R, T?>(observation),
-    SuspendableSetter<T?> by MutableFlowSubjectHelper(
-        coroutineScope,
-        context,
-        flow = { hotFlowable.flow() },
-        setter = { hotFlowable.set(it) },
-        observation = observation
-    ) {
-    init {
-        if (autoBind) bind(coroutineScope, context)
-    }
-}
-
-class HotFlowableInitializedSubject<T>(
-    val coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext,
-    hotFlowable: HotFlowable<T>,
-    autoBind: Boolean = true,
-    observation: ObservationInitialized<T> = ObservationInitialized(Value(hotFlowable.initialValue))
-) : BaseInitializedSubject<T>(observation),
-    SuspendableSetter<T> by MutableFlowSubjectHelper(
-        coroutineScope,
-        context,
-        flow = { hotFlowable.flow() },
-        setter = { hotFlowable.set(it) },
-        observation = observation
-    ) {
-    init {
-        if (autoBind) bind(coroutineScope, context)
-    }
-}
-
 open class StateFlowSubject<T>(
     val coroutineScope: CoroutineScope,
     val context: CoroutineContext = coroutineScope.coroutineContext,
@@ -442,17 +402,6 @@ fun <R : T, T> Flow<T?>.toDefaultObservable(
     context: CoroutineContext = coroutineScope.coroutineContext,
 ) = DefaultFlowObservable(defaultValue, initialValue, coroutineScope, context, this)
 
-fun <R : T?, T> HotFlowable<T?>.toDefaultSubject(
-    defaultValue: R,
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext
-) = HotFlowableDefaultSubject(defaultValue, coroutineScope, context, this)
-
-fun <T> HotFlowable<T>.toInitializedSubject(
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext
-) = HotFlowableInitializedSubject(coroutineScope, context, this)
-
 fun <R : T, T> MutableStateFlow<T?>.toDefaultSubject(
     defaultValue: R,
     coroutineScope: CoroutineScope,
diff --git a/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt b/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
index f46a59991..9b95932a0 100644
--- a/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
+++ b/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
@@ -19,8 +19,6 @@ package com.splendo.kaluga.architecture.viewmodel
 
 import com.splendo.kaluga.architecture.observable.Disposable
 import com.splendo.kaluga.architecture.observable.DisposeBag
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.launch
 import platform.UIKit.UIViewController
 import platform.UIKit.addChildViewController
 import platform.UIKit.addSubview
@@ -68,10 +66,8 @@ internal class ViewModelLifecycleManager<VM : BaseLifecycleViewModel>(private va
         super.viewDidAppear(animated)
 
         viewModel.didResume()
-        MainScope().launch {
-            onLifecycle().forEach {
-                lifecycleManager.disposeBag.add(it)
-            }
+        onLifecycle().forEach {
+            lifecycleManager.disposeBag.add(it)
         }
     }
 
@@ -79,9 +75,7 @@ internal class ViewModelLifecycleManager<VM : BaseLifecycleViewModel>(private va
         super.viewDidDisappear(animated)
 
         viewModel.didPause()
-        MainScope().launch {
-            lifecycleManager.disposeBag.dispose()
-        }
+        lifecycleManager.disposeBag.dispose()
     }
 }
 
diff --git a/base-permissions/api/androidLib/base-permissions.api b/base-permissions/api/androidLib/base-permissions.api
index 7b8b7d750..c1a4dc7dc 100644
--- a/base-permissions/api/androidLib/base-permissions.api
+++ b/base-permissions/api/androidLib/base-permissions.api
@@ -298,12 +298,12 @@ public class com/splendo/kaluga/permissions/base/PermissionsBuilder {
 	public final fun createPermissionStateRepo (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/permissions/base/BasePermissionStateRepo;
 	public final fun get (Lcom/splendo/kaluga/permissions/base/Permission;)Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;
 	public final fun getContext ()Lcom/splendo/kaluga/permissions/base/PermissionContext;
-	public final fun register (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun registerOrGet (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun registerOrGetPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun registerPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun unregister (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun unregisterPermissionStateRepoBuilder (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun register (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;)Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;
+	public final fun registerOrGet (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;)Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;
+	public final fun registerOrGetPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/base/PermissionStateRepoBuilder;
+	public final fun registerPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)V
+	public final fun unregister (Lcom/splendo/kaluga/permissions/base/Permission;)V
+	public final fun unregisterPermissionStateRepoBuilder (Lcom/splendo/kaluga/permissions/base/Permission;)V
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionsBuilderError : java/lang/Error {
diff --git a/base-permissions/api/jvm/base-permissions.api b/base-permissions/api/jvm/base-permissions.api
index e7049f2e4..3b0b54ad9 100644
--- a/base-permissions/api/jvm/base-permissions.api
+++ b/base-permissions/api/jvm/base-permissions.api
@@ -87,8 +87,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Active$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Active;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -97,14 +95,10 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Allowed$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Allowed;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Allowed;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Allowed;)Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -113,8 +107,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Deinitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Deinitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -123,8 +115,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Denied$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -133,8 +123,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Denied$Locked$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Locked;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Locked;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Locked;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -144,8 +132,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -153,8 +139,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Inactive$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Inactive;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -162,8 +146,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Initialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Initialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -172,8 +154,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Initializing$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Initializing;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -181,8 +161,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Uninitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Uninitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Uninitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Uninitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -207,11 +185,9 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Allow
 	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;
 	public fun deny (Z)Lkotlin/jvm/functions/Function1;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMonitoringInterval-UwyO8pc ()J
 	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -223,12 +199,10 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Deini
 	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
 	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getMonitoringInterval-UwyO8pc ()J
 	public final fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -244,12 +218,10 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denie
 	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
 	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMonitoringInterval-UwyO8pc ()J
 	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
 	public fun getUnlock ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -261,12 +233,10 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denie
 	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
 	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLock ()Lkotlin/jvm/functions/Function1;
 	public fun getMonitoringInterval-UwyO8pc ()J
 	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun request ()V
 	public fun toString ()Ljava/lang/String;
@@ -282,11 +252,9 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Initi
 	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
 	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMonitoringInterval-UwyO8pc ()J
 	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -294,8 +262,6 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Initi
 
 public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Uninitialized : com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive, com/splendo/kaluga/permissions/base/PermissionState$Uninitialized {
 	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun initialize-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
@@ -330,12 +296,12 @@ public class com/splendo/kaluga/permissions/base/PermissionsBuilder {
 	public final fun createPermissionStateRepo (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/permissions/base/BasePermissionStateRepo;
 	public final fun get (Lcom/splendo/kaluga/permissions/base/Permission;)Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;
 	public final fun getContext ()Lcom/splendo/kaluga/permissions/base/PermissionContext;
-	public final fun register (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun registerOrGet (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun registerOrGetPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun registerPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun unregister (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun unregisterPermissionStateRepoBuilder (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun register (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;)Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;
+	public final fun registerOrGet (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;)Lcom/splendo/kaluga/permissions/base/BasePermissionsBuilder;
+	public final fun registerOrGetPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/base/PermissionStateRepoBuilder;
+	public final fun registerPermissionStateRepoBuilder (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)V
+	public final fun unregister (Lcom/splendo/kaluga/permissions/base/Permission;)V
+	public final fun unregisterPermissionStateRepoBuilder (Lcom/splendo/kaluga/permissions/base/Permission;)V
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionsBuilderError : java/lang/Error {
diff --git a/base-permissions/build.gradle.kts b/base-permissions/build.gradle.kts
index 23ee29621..e6423f33c 100644
--- a/base-permissions/build.gradle.kts
+++ b/base-permissions/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("convention.publication")
     id("com.android.library")
     id("org.jlleitschuh.gradle.ktlint")
+    id("kotlinx-atomicfu")
 }
 
 publishableComponent()
diff --git a/base-permissions/src/commonMain/kotlin/Permission.kt b/base-permissions/src/commonMain/kotlin/Permission.kt
index 1997c1139..b6405e0fa 100644
--- a/base-permissions/src/commonMain/kotlin/Permission.kt
+++ b/base-permissions/src/commonMain/kotlin/Permission.kt
@@ -18,13 +18,13 @@
 package com.splendo.kaluga.permissions.base
 
 import com.splendo.kaluga.base.singleThreadDispatcher
+import kotlinx.atomicfu.locks.reentrantLock
+import kotlinx.atomicfu.locks.withLock
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.transformLatest
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext
 import kotlin.reflect.KClass
@@ -63,13 +63,13 @@ class PermissionsBuilderError(message: String) : Error(message)
  */
 open class PermissionsBuilder(val context: PermissionContext = defaultPermissionContext) {
 
-    private val buildersLock = Mutex()
+    private val buildersLock = reentrantLock()
     private val builders = mutableMapOf<KClassifier, BasePermissionsBuilder<*>>()
-    private val repoBuildersLock = Mutex()
+    private val repoBuildersLock = reentrantLock()
     private val repoBuilders = mutableMapOf<KClassifier, PermissionStateRepoBuilder<*>>()
 
-    suspend inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> register(builder: B): B = register(P::class, builder)
-    suspend fun <P : Permission, B : BasePermissionsBuilder<P>> register(permission: KClass<P>, builder: B): B = buildersLock.withLock {
+    inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> register(builder: B): B = register(P::class, builder)
+    fun <P : Permission, B : BasePermissionsBuilder<P>> register(permission: KClass<P>, builder: B): B = buildersLock.withLock {
         if (builders[permission] == null) {
             builders[permission] = builder
             builder
@@ -78,12 +78,12 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
         }
     }
 
-    suspend inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(builder: B): BasePermissionsBuilder<P> = registerOrGet(P::class, builder)
-    suspend fun <P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(permission: KClass<P>, builder: B): BasePermissionsBuilder<P> = buildersLock.withLock {
+    inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(builder: B): BasePermissionsBuilder<P> = registerOrGet(P::class, builder)
+    fun <P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(permission: KClass<P>, builder: B): BasePermissionsBuilder<P> = buildersLock.withLock {
         builders.getOrPut(permission::class) { builder } as BasePermissionsBuilder<P>
     }
 
-    suspend fun <P : Permission> unregister(permission: P) {
+    fun <P : Permission> unregister(permission: P) {
         buildersLock.withLock {
             builders.remove(permission::class)
         }
@@ -92,8 +92,8 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
     operator fun <P : Permission> get(permission: P): BasePermissionsBuilder<P> =
         builders[permission::class] as? BasePermissionsBuilder<P> ?: throw PermissionsBuilderError("The Builder for $permission was not registered")
 
-    suspend inline fun <reified P : Permission> registerPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
-    suspend fun <P : Permission> registerPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) {
+    inline fun <reified P : Permission> registerPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
+    fun <P : Permission> registerPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) {
         repoBuildersLock.withLock {
             if (repoBuilders[permission] == null) {
                 createPermissionStateRepoBuilder(permissionStateRepoBuilder).also { repoBuilders[permission] = it }
@@ -103,12 +103,12 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
         }
     }
 
-    suspend inline fun <reified P : Permission> registerOrGetPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerOrGetPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
-    suspend fun <P : Permission> registerOrGetPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = repoBuildersLock.withLock {
+    inline fun <reified P : Permission> registerOrGetPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerOrGetPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
+    fun <P : Permission> registerOrGetPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = repoBuildersLock.withLock {
         repoBuilders.getOrPut(permission) { createPermissionStateRepoBuilder(permissionStateRepoBuilder) } as PermissionStateRepoBuilder<P>
     }
 
-    suspend fun <P : Permission> unregisterPermissionStateRepoBuilder(permission: P) {
+    fun <P : Permission> unregisterPermissionStateRepoBuilder(permission: P) {
         repoBuildersLock.withLock {
             repoBuilders.remove(permission::class)
         }
diff --git a/base/README.md b/base/README.md
index ecc1b1ed6..2275d367f 100644
--- a/base/README.md
+++ b/base/README.md
@@ -27,42 +27,21 @@ You can run code on the OS Main Thread by using `runOnMain`. Use the `MainQueueD
 - Convert a `ByteArray` to a hexadecimal String using `toHexString()`
 - (iOS Only) Convert `NSData` to `ByteArray` and vice versa using `toByteArray()` and `toNSData()` respectively.
 
-### Flowable and State
-The Kaluga library offers usage of Flows and State Machines.
+### State
+The Kaluga library offers usage of State Machines.
 
-A `Flowable` is an accessor to share data with multiple `Flow`s at the same time.
-After creating a `Flowable` call `flow()` to get a new flow and start observing the data sent to the flowable.
-New data can be sent to the flowable using `set()`.
-The flowable can be closed using `close()`. This will automatically close all the flows derived from this flowable.
-
-```kotlin
-val flowable: Flowable<String> = ...
-val handleValue = launch {
-    flowable.flow().collect { value ->
-        // Handle value
-    }
-}
-launch {
-    flowable.set("Hello World")
-    // handleValue receives "Hello World"
-    flowable.close()
-    // handleValue finishes
-}
-```
-
-The `StateRepo` takes a `Flowable` to manage a state machine.
-The states the state repo can be in are described by a `State` class.
-As with flowable `flow()` will result in a new `Flow` to observe the current state.
+The `StateRepo` functions as a `Flow` to manage a state machine.
+The states the state repo can be in are described by a `KalugaState` implementation.
 However, in order to ensure only acceptable state transitions occur it is not possible to directly set a new state.
 Instead `takeAndChangeState()` should be called.
 This method takes a closure that determines the next state based on the current state.
 The closure should either return a new state created from the given state or `remain` to cancel state transitions.
 If additional calls to takeAndChangeState occur while transitioning to a new state they will be enqueued until the pending transition has completed.
 
-It is recommended to only allow `State` classes to create the new state that they can transition into.
+It is recommended to only allow `KalugaState` classes to create the new state that they can transition into.
 
 ```kotlin
-sealed class SomeState : State<SomeState> {
+sealed class SomeState : KalugaState<SomeState> {
 
     class StateOne internal constructor() : SomeState() {
         val becomeTwo = suspend { StateTwo() }
@@ -92,21 +71,20 @@ During transition the following callbacks may be implemented. The callbacks are
 
 If an atomic action is required on the state `useState()` can be called. When called, the state is guaranteed not to change for the duration of the action.
 
-#### Hot and Cold Flows
-Flowable or stateRepo may have a variable number of flows observing them.
+#### Hot and Cold State Repos
+StateRepo may have a variable number of flows observing them.
 Thus they may at some point (temporarily) lose all observers.
 To determine what should happen when no observers are available, both flowable and stateRepo can be marked as either stateful (Hot) or stateless (Cold).
 
-A **Hot** flowable/stateRepo gets an initial value upon creation.
+A **Hot** stateRepo gets an initial value upon creation.
 This value remains until the flowable is closed.
-Implement `HotFlowable` and `HotStateRepo` respectively to use this behaviour.
+Implement `HotStateRepo` respectively to use this behaviour.
 
-A **Cold** flowable/stateRepo by comparison only has a value when at least one flow is observing it.
+A **Cold** stateRepo by comparison only has a value when at least one flow is observing it.
 Upon creation the cold data stream should provide both an initializer and a deinitializer.
 The initializer will be called if the number of flows observing changes from 0 to 1.
 The deinitializer will be called when the number of flows observing changes drops to 0.
-Use `ColdFlowable` and `ColdStateRepo` for this behaviour.
-Note that by default `ColdFlowable` closes itself before calling its deinitializer function.
+Use `ColdStateRepo` for this behaviour.
 
 ### Date
 Kaluga includes a `Date` class to manage and compare time.
diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index f68375283..8161f9d4c 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -55,12 +55,6 @@ public final class com/splendo/kaluga/base/SingleThreadDispatcherKt {
 	public static final fun singleThreadDispatcher (Ljava/lang/String;)Lkotlinx/coroutines/ExecutorCoroutineDispatcher;
 }
 
-public final class com/splendo/kaluga/base/flow/ColdFlowable : com/splendo/kaluga/flow/BaseFlowable {
-	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun flow (Lcom/splendo/kaluga/flow/FlowConfig;)Lkotlinx/coroutines/flow/Flow;
-}
-
 public final class com/splendo/kaluga/base/flow/FlowKt {
 	public static final fun collectImportant (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun collectImportantUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -73,12 +67,6 @@ public final class com/splendo/kaluga/base/flow/FlowKt {
 	public static synthetic fun takeUntilLast$default (Lkotlinx/coroutines/flow/Flow;ZILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
 }
 
-public final class com/splendo/kaluga/base/flow/HotFlowable : com/splendo/kaluga/flow/BaseFlowable {
-	public fun <init> (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getInitialValue ()Ljava/lang/Object;
-}
-
 public final class com/splendo/kaluga/base/flow/SharedFlowCollectionEvent : java/lang/Enum {
 	public static final field FirstCollection Lcom/splendo/kaluga/base/flow/SharedFlowCollectionEvent;
 	public static final field LaterCollections Lcom/splendo/kaluga/base/flow/SharedFlowCollectionEvent;
@@ -866,47 +854,6 @@ public final class com/splendo/kaluga/base/utils/UnitSystem$Companion {
 	public final fun withRawValue (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/UnitSystem;
 }
 
-public abstract class com/splendo/kaluga/flow/BaseFlowable : com/splendo/kaluga/flow/Flowable {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun cancelFlows ()V
-	protected final fun currentValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	protected final fun ensureChannel ()Lkotlinx/coroutines/channels/BroadcastChannel;
-	public fun flow (Lcom/splendo/kaluga/flow/FlowConfig;)Lkotlinx/coroutines/flow/Flow;
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/flow/FlowConfig {
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun apply (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
-	public final fun getConfig ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/flow/FlowConfig$Conflate : com/splendo/kaluga/flow/FlowConfig {
-	public static final field INSTANCE Lcom/splendo/kaluga/flow/FlowConfig$Conflate;
-}
-
-public final class com/splendo/kaluga/flow/FlowConfig$Custom : com/splendo/kaluga/flow/FlowConfig {
-	public fun <init> (Lkotlin/jvm/functions/Function1;)V
-}
-
-public final class com/splendo/kaluga/flow/FlowConfig$Infinite : com/splendo/kaluga/flow/FlowConfig {
-	public static final field INSTANCE Lcom/splendo/kaluga/flow/FlowConfig$Infinite;
-}
-
-public final class com/splendo/kaluga/flow/FlowConfig$None : com/splendo/kaluga/flow/FlowConfig {
-	public static final field INSTANCE Lcom/splendo/kaluga/flow/FlowConfig$None;
-}
-
-public abstract interface class com/splendo/kaluga/flow/Flowable {
-	public abstract fun cancelFlows ()V
-	public abstract fun flow (Lcom/splendo/kaluga/flow/FlowConfig;)Lkotlinx/coroutines/flow/Flow;
-	public static synthetic fun flow$default (Lcom/splendo/kaluga/flow/Flowable;Lcom/splendo/kaluga/flow/FlowConfig;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
-	public abstract fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setBlocking (Ljava/lang/Object;)V
-}
-
 public abstract class com/splendo/kaluga/state/BaseColdStateRepo : com/splendo/kaluga/state/StateRepo {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
@@ -992,10 +939,6 @@ public abstract class com/splendo/kaluga/state/HotStateRepo : com/splendo/kaluga
 }
 
 public abstract interface class com/splendo/kaluga/state/KalugaState {
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun finalState$suspendImpl (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun initialState$suspendImpl (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
@@ -1003,10 +946,6 @@ public final class com/splendo/kaluga/state/KalugaStateKt {
 	public static final fun defaultLazySharedFlow ()Lkotlin/Lazy;
 }
 
-public abstract class com/splendo/kaluga/state/State : com/splendo/kaluga/state/KalugaState {
-	public fun <init> ()V
-}
-
 public abstract interface class com/splendo/kaluga/state/StateFlowRepo {
 	public abstract fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
 }
@@ -1016,7 +955,6 @@ public abstract class com/splendo/kaluga/state/StateRepo : kotlinx/coroutines/Co
 	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun collect (Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun flow ()Lkotlinx/coroutines/flow/Flow;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	protected abstract fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
 	public final fun getSubscriptionCount ()Lkotlinx/coroutines/flow/StateFlow;
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index ffa73bc04..4692642e8 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -42,12 +42,6 @@ public final class com/splendo/kaluga/base/SingleThreadDispatcherKt {
 	public static final fun singleThreadDispatcher (Ljava/lang/String;)Lkotlinx/coroutines/ExecutorCoroutineDispatcher;
 }
 
-public final class com/splendo/kaluga/base/flow/ColdFlowable : com/splendo/kaluga/flow/BaseFlowable {
-	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun flow (Lcom/splendo/kaluga/flow/FlowConfig;)Lkotlinx/coroutines/flow/Flow;
-}
-
 public final class com/splendo/kaluga/base/flow/FlowKt {
 	public static final fun collectImportant (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun collectImportantUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -60,12 +54,6 @@ public final class com/splendo/kaluga/base/flow/FlowKt {
 	public static synthetic fun takeUntilLast$default (Lkotlinx/coroutines/flow/Flow;ZILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
 }
 
-public final class com/splendo/kaluga/base/flow/HotFlowable : com/splendo/kaluga/flow/BaseFlowable {
-	public fun <init> (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getInitialValue ()Ljava/lang/Object;
-}
-
 public final class com/splendo/kaluga/base/flow/SharedFlowCollectionEvent : java/lang/Enum {
 	public static final field FirstCollection Lcom/splendo/kaluga/base/flow/SharedFlowCollectionEvent;
 	public static final field LaterCollections Lcom/splendo/kaluga/base/flow/SharedFlowCollectionEvent;
@@ -844,52 +832,6 @@ public final class com/splendo/kaluga/base/utils/UnitSystem$Companion {
 	public final fun withRawValue (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/UnitSystem;
 }
 
-public abstract class com/splendo/kaluga/flow/BaseFlowable : com/splendo/kaluga/flow/Flowable {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun cancelFlows ()V
-	protected final fun currentValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	protected final fun ensureChannel ()Lkotlinx/coroutines/channels/BroadcastChannel;
-	public fun flow (Lcom/splendo/kaluga/flow/FlowConfig;)Lkotlinx/coroutines/flow/Flow;
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun setBlocking (Ljava/lang/Object;)V
-}
-
-public abstract class com/splendo/kaluga/flow/FlowConfig {
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun apply (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
-	public final fun getConfig ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/flow/FlowConfig$Conflate : com/splendo/kaluga/flow/FlowConfig {
-	public static final field INSTANCE Lcom/splendo/kaluga/flow/FlowConfig$Conflate;
-}
-
-public final class com/splendo/kaluga/flow/FlowConfig$Custom : com/splendo/kaluga/flow/FlowConfig {
-	public fun <init> (Lkotlin/jvm/functions/Function1;)V
-}
-
-public final class com/splendo/kaluga/flow/FlowConfig$Infinite : com/splendo/kaluga/flow/FlowConfig {
-	public static final field INSTANCE Lcom/splendo/kaluga/flow/FlowConfig$Infinite;
-}
-
-public final class com/splendo/kaluga/flow/FlowConfig$None : com/splendo/kaluga/flow/FlowConfig {
-	public static final field INSTANCE Lcom/splendo/kaluga/flow/FlowConfig$None;
-}
-
-public abstract interface class com/splendo/kaluga/flow/Flowable {
-	public abstract fun cancelFlows ()V
-	public abstract fun flow (Lcom/splendo/kaluga/flow/FlowConfig;)Lkotlinx/coroutines/flow/Flow;
-	public abstract fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun setBlocking (Ljava/lang/Object;)V
-}
-
-public final class com/splendo/kaluga/flow/Flowable$DefaultImpls {
-	public static synthetic fun flow$default (Lcom/splendo/kaluga/flow/Flowable;Lcom/splendo/kaluga/flow/FlowConfig;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
-	public static fun setBlocking (Lcom/splendo/kaluga/flow/Flowable;Ljava/lang/Object;)V
-}
-
 public abstract class com/splendo/kaluga/state/BaseColdStateRepo : com/splendo/kaluga/state/StateRepo {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
@@ -975,14 +917,10 @@ public abstract class com/splendo/kaluga/state/HotStateRepo : com/splendo/kaluga
 }
 
 public abstract interface class com/splendo/kaluga/state/KalugaState {
-	public abstract fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/state/KalugaState$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/state/KalugaState;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -990,13 +928,6 @@ public final class com/splendo/kaluga/state/KalugaStateKt {
 	public static final fun defaultLazySharedFlow ()Lkotlin/Lazy;
 }
 
-public abstract class com/splendo/kaluga/state/State : com/splendo/kaluga/state/KalugaState {
-	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
 public abstract interface class com/splendo/kaluga/state/StateFlowRepo {
 	public abstract fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
 }
@@ -1006,7 +937,6 @@ public abstract class com/splendo/kaluga/state/StateRepo : kotlinx/coroutines/Co
 	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun collect (Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun flow ()Lkotlinx/coroutines/flow/Flow;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	protected abstract fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
 	public final fun getSubscriptionCount ()Lkotlinx/coroutines/flow/StateFlow;
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index 491c72910..784670e26 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("convention.publication")
     id("com.android.library")
     id("org.jlleitschuh.gradle.ktlint")
+    id("kotlinx-atomicfu")
 }
 
 publishableComponent()
diff --git a/base/src/commonMain/kotlin/flow/BaseFlowable.kt b/base/src/commonMain/kotlin/flow/BaseFlowable.kt
deleted file mode 100644
index 058f9a482..000000000
--- a/base/src/commonMain/kotlin/flow/BaseFlowable.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-
-Copyright 2019 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.flow
-
-import com.splendo.kaluga.logging.warn
-import kotlinx.coroutines.channels.BroadcastChannel
-import kotlinx.coroutines.channels.ConflatedBroadcastChannel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.first
-
-/**
- * Base definition of [Flowable]. Abstract class, use [ColdFlowable] or [HotFlowable] instead.
- *
- * @param T the value type to flow on.
- * @param channelFactory Factory for generating a [BroadcastChannel] on which the data is flown
- */
-@Deprecated("This Channel based implementation is deprecated in favor of SharedFlow or StateFlow")
-abstract class BaseFlowable<T>(private val channelFactory: () -> BroadcastChannel<T> = { ConflatedBroadcastChannel() }) : Flowable<T> {
-
-    private var channel: BroadcastChannel<T>? = null
-    protected fun ensureChannel(): BroadcastChannel<T> {
-        return channel ?: channelFactory().also { channel = it }
-    }
-
-    override fun flow(flowConfig: FlowConfig): Flow<T> {
-        val channel = ensureChannel()
-        if (channel.isClosedForSend)
-            error("channelFactory returned a channel closed for sending")
-        return channel.asFlow().let { flowConfig.apply(it) }
-    }
-
-    override suspend fun set(value: T) {
-        channel?.send(value) ?: warn("'$value' offered to Flowable but there is no channel active")
-    }
-
-    override fun cancelFlows() {
-        channel?.let {
-            it.close()
-            channel = null
-        }
-    }
-
-    // Note: if the channel is buffered, this could be wrong.
-    // Since Flowable is deprecated this will not be fixed
-    protected suspend fun currentValue(): T? = channel?.asFlow()?.first()
-}
diff --git a/base/src/commonMain/kotlin/flow/ColdFlowable.kt b/base/src/commonMain/kotlin/flow/ColdFlowable.kt
deleted file mode 100644
index 624e68dba..000000000
--- a/base/src/commonMain/kotlin/flow/ColdFlowable.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- Copyright (c) 2020. Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.base.flow
-
-import com.splendo.kaluga.flow.BaseFlowable
-import com.splendo.kaluga.flow.FlowConfig
-import kotlinx.coroutines.channels.BroadcastChannel
-import kotlinx.coroutines.channels.ConflatedBroadcastChannel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.onCompletion
-import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-
-/**
- * A [BaseFlowable] that represents a Cold flow. This flowable will only become active once observed and deinitialises once no observers are present.
- * Data can only be set when the flowable has had at least one observer and was never closed.
- *
- * @param T the type of the value to flow on
- * @param initialize method for determining the initial value of the flow. Will be called when the flow transitions from zero to one or more observers.
- * @param deinitialize method for deinitializing the flow, passing the last known value. Will be called when the flow transitions from one or more to zero observers.
- * @param channelFactory Factory for generating a [BroadcastChannel] on which the data is flown
- */
-@Deprecated("Use SharedFlowable or StateFlowable")
-class ColdFlowable<T>(private val initialize: suspend () -> T, private val deinitialize: suspend (T) -> Unit, channelFactory: () -> BroadcastChannel<T> = { ConflatedBroadcastChannel() }) : BaseFlowable<T>(channelFactory) {
-
-    private val counterMutex = Mutex()
-    private var flowingCounter = 0
-
-    override fun flow(flowConfig: FlowConfig): Flow<T> {
-        return super.flow(flowConfig)
-            .onStart {
-                counterMutex.withLock {
-                    flowingCounter++
-                    if (flowingCounter == 1) {
-                        set(initialize())
-                    }
-                }
-            }
-            .onCompletion {
-                counterMutex.withLock {
-                    flowingCounter--
-                    if (flowingCounter == 0) {
-                        val finalValue = currentValue()
-                        cancelFlows()
-                        finalValue?.let {
-                            deinitialize(finalValue)
-                        }
-                    }
-                }
-            }
-    }
-}
diff --git a/base/src/commonMain/kotlin/flow/FlowConfig.kt b/base/src/commonMain/kotlin/flow/FlowConfig.kt
deleted file mode 100644
index 9e9b93ed6..000000000
--- a/base/src/commonMain/kotlin/flow/FlowConfig.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
-Copyright 2019 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.flow
-
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.buffer
-import kotlinx.coroutines.flow.conflate
-
-@Deprecated("Flowable is deprecated")
-typealias FlowModifier = (Flow<*>) -> Unit
-
-@Deprecated("Flowable is deprecated")
-sealed class FlowConfig(val config: FlowModifier) {
-
-    object None : FlowConfig({})
-    object Conflate : FlowConfig({ it.conflate() })
-    object Infinite : FlowConfig({ it.buffer(Channel.UNLIMITED) })
-    class Custom(options: FlowModifier) : FlowConfig(options)
-
-    fun <T, F : Flow<T>> apply(flow: F): F {
-        config(flow)
-        return flow
-    }
-}
diff --git a/base/src/commonMain/kotlin/flow/Flowable.kt b/base/src/commonMain/kotlin/flow/Flowable.kt
deleted file mode 100644
index d12b26a7b..000000000
--- a/base/src/commonMain/kotlin/flow/Flowable.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-
-Copyright 2019 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.flow
-
-import com.splendo.kaluga.base.runBlocking
-import kotlinx.coroutines.flow.Flow
-
-/**
- * An object that be turned into a multi channel [Flow]
- *
- * @param T the type of the values emitted by the flowable.
- */
-@Deprecated("Use MutableSharedFlow or MutableStateFlow, with onCollectionEvent", replaceWith = ReplaceWith("MutableSharedFlow"))
-interface Flowable<T> {
-
-    /**
-     * Generates a [Flow] for this Flowable
-     *
-     * @param flowConfig the [FlowConfig] to apply to this Flow
-     * @return A [Flow] of values set to the Flowable
-     *
-     */
-    fun flow(flowConfig: FlowConfig = FlowConfig.Conflate): Flow<T>
-
-    /**
-     * Stops the flowable from being observed. Cancels all active [Flow]s.
-     * Starting a new Flow is possible however.
-     */
-    fun cancelFlows()
-
-    /**
-     * Sets the value of the Flowable. All active [Flow]s should be notified
-     *
-     * @param value the value to set
-     */
-    suspend fun set(value: T)
-
-    /**
-     * Applies [set] in a blocking coroutine
-     */
-    fun setBlocking(value: T) = runBlocking { set(value) }
-}
diff --git a/base/src/commonMain/kotlin/flow/HotFlowable.kt b/base/src/commonMain/kotlin/flow/HotFlowable.kt
deleted file mode 100644
index 7368811ae..000000000
--- a/base/src/commonMain/kotlin/flow/HotFlowable.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Copyright (c) 2020. Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.base.flow
-
-import com.splendo.kaluga.flow.BaseFlowable
-import kotlinx.coroutines.channels.BroadcastChannel
-import kotlinx.coroutines.channels.ConflatedBroadcastChannel
-
-/**
- * A [BaseFlowable] that represents a Hot flow. This flowable will contain data even if not observed.
- *
- * @param T the type of the value to flow on
- * @param initialValue the initial value of the flow
- * @param channelFactory Factory for generating a [BroadcastChannel] on which the data is flown
- */
-@Deprecated("This channel based implementation of Flowable is deprecated in favor of SharedFlowable or StateFlowable")
-class HotFlowable<T> (val initialValue: T, channelFactory: () -> BroadcastChannel<T> = { ConflatedBroadcastChannel() }) : BaseFlowable<T>(channelFactory) {
-
-    init {
-        ensureChannel()
-        setBlocking(initialValue)
-    }
-}
diff --git a/base/src/commonMain/kotlin/state/KalugaState.kt b/base/src/commonMain/kotlin/state/KalugaState.kt
index 5633e7bce..42ee09bbe 100644
--- a/base/src/commonMain/kotlin/state/KalugaState.kt
+++ b/base/src/commonMain/kotlin/state/KalugaState.kt
@@ -24,6 +24,7 @@ import com.splendo.kaluga.base.flow.onCollectionEvent
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
+import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
@@ -35,13 +36,10 @@ import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.Semaphore
-import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.sync.withPermit
 import kotlin.coroutines.CoroutineContext
 import kotlin.reflect.KClass
@@ -59,23 +57,8 @@ interface KalugaState {
      */
     @Suppress("UNCHECKED_CAST") // cast should normally work since the receiver uses one type of state
     fun <S : KalugaState> remain(): suspend() -> S = remain as suspend () -> S
-
-    /**
-     * Called when this state is the first state of the state machine
-     */
-    @Deprecated("Use an initializer state rather than relying on this method, it might be called after the initial state is already changed")
-    suspend fun initialState() {}
-
-    /**
-     * Called when this state is the final state of the state machine
-     */
-    @Deprecated("This method is not always actually called (e.g. for a HotRepo) since there is not always a final state")
-    suspend fun finalState() {}
 }
 
-@Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaState"))
-abstract class State : KalugaState
-
 interface HandleBeforeCreating {
     /**
      * Called while transitioning to a new state before the new state is created
@@ -143,32 +126,17 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
     val subscriptionCount
         get() = mutableFlow.subscriptionCount
 
-    /**
-     * Provides a [Flow] of the [KalugaState] of this repo.
-     *
-     * @return The [Flow]
-     */
-    @Deprecated(message = "StateRepo itself is now a Flow", replaceWith = ReplaceWith("StateRepo"))
-    fun flow(): Flow<S> = mutableFlow.asSharedFlow()
-
-    private val initializedMutex = Mutex()
-    private var initialized = false
+    private val initialized = atomic(false)
 
-    internal open suspend fun initialize(initialValue: S? = null): S = initializedMutex.withLock {
-        if (!initialized) {
-            initialized = true
+    internal open suspend fun initialize(initialValue: S? = null): S =
+        if (initialized.compareAndSet(expect = false, update = true)) {
             (initialValue ?: initialValue()).also { value ->
                 mutableFlow.emit(value)
                 stateMutex.release() // release the initial permit held
-                // The mutex is already released above to let the state initialize afterwards, to avoid changeState mutex deadlocks
-                // However releasing the above mutex might have already changed the state to a new state before initialState runs.
-                // State machines that need initialization should rely on having an initialization state rather than using this method.
-                value.initialState()
             }
         } else {
             state()
         }
-    }
 
     /**
      * Gets the initial value of the repo
@@ -351,19 +319,15 @@ abstract class BaseHotStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
 
     abstract val lazyMutableSharedFlow: Lazy<F>
 
-    private val lock = Mutex()
-    private var initialized = false
+    private val initialized = atomic(false)
 
     override val mutableFlow: F
         get() {
             val isInitialized = lazyMutableSharedFlow.isInitialized()
             val flow = lazyMutableSharedFlow.value
-            launch(coroutineContext) {
-                if (
-                    lock.withLock {
-                        (!isInitialized && !initialized).also { if (it) initialized = true }
-                    }
-                ) {
+
+            if (!isInitialized && initialized.compareAndSet(expect = false, update = true)) {
+                launch(coroutineContext) {
                     initialize()
                 }
             }
@@ -385,8 +349,7 @@ abstract class BaseColdStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
     context: CoroutineContext = Dispatchers.Main.immediate
 ) : StateRepo<S, F>(context) {
 
-    private val lock = Mutex()
-    private var initialized = false
+    private val initialized = atomic(false)
 
     abstract val lazyMutableFlow: Lazy<F>
 
@@ -394,19 +357,13 @@ abstract class BaseColdStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
         get() {
             val isInitialized = lazyMutableFlow.isInitialized()
             val flow = lazyMutableFlow.value
-            launch(coroutineContext) {
-                if (
-                    lock.withLock {
-                        (!isInitialized && !initialized).also {
-                            if (it) initialized = true
-                        }
-                    }
-                ) {
+            if (!isInitialized && initialized.compareAndSet(expect = false, update = true)) {
+                launch(coroutineContext) {
                     flow.onCollectionEvent { event ->
                         when (event) {
-                            NoMoreCollections -> noMoreCollections().also { it.finalState() }
+                            NoMoreCollections -> noMoreCollections()
                             FirstCollection -> firstCollection()
-                            LaterCollections -> laterCollections().also { it.initialState() }
+                            LaterCollections -> laterCollections()
                         }
                     }
                 }
diff --git a/base/src/commonTest/kotlin/flow/ColdFlowableTest.kt b/base/src/commonTest/kotlin/flow/ColdFlowableTest.kt
deleted file mode 100644
index af93195c8..000000000
--- a/base/src/commonTest/kotlin/flow/ColdFlowableTest.kt
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.base.test.flow
-
-import com.splendo.kaluga.base.flow.ColdFlowable
-import com.splendo.kaluga.base.runBlocking
-import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
-import com.splendo.kaluga.base.utils.complete
-import com.splendo.kaluga.test.base.BaseTest
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.channels.BroadcastChannel
-import kotlinx.coroutines.channels.ConflatedBroadcastChannel
-import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.take
-import kotlinx.coroutines.launch
-import kotlin.test.BeforeTest
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
-
-class ColdFlowableTest : BaseTest() {
-
-    lateinit var flowable: ColdFlowable<Int>
-    lateinit var initialized: EmptyCompletableDeferred
-    private lateinit var deinitialized: CompletableDeferred<Int>
-    lateinit var broadcastChannel: BroadcastChannel<Int>
-
-    @BeforeTest
-    fun setUp() {
-        super.beforeTest()
-        broadcastChannel = ConflatedBroadcastChannel()
-        initialized = EmptyCompletableDeferred()
-        deinitialized = CompletableDeferred()
-        flowable = ColdFlowable(
-            {
-                initialized.complete()
-                0
-            },
-            {
-                value ->
-                deinitialized.complete(value)
-            }
-        ) {
-            if (broadcastChannel.isClosedForSend)
-                broadcastChannel = ConflatedBroadcastChannel()
-            broadcastChannel
-        }
-    }
-
-    @Test
-    fun testFlowing() = runBlocking {
-        assertFalse { initialized.isCompleted }
-        val initialBroadcastValue = CompletableDeferred<Int>()
-        val broadcastValue = CompletableDeferred<Int>()
-
-        val channelJob = launch {
-            broadcastChannel.asFlow().take(2).collect { value ->
-                if (initialBroadcastValue.isCompleted)
-                    broadcastValue.complete(value)
-                else
-                    initialBroadcastValue.complete(value)
-            }
-        }
-        assertFalse { initialBroadcastValue.isCompleted }
-        flowable.set(1) // this will be ignored since there is no flow
-        assertFalse { initialBroadcastValue.isCompleted }
-        val initialFlowableValue = CompletableDeferred<Int>()
-        val flowableValue = CompletableDeferred<Int>()
-        val flowableJob = launch {
-            flowable.flow().take(2).collect { value ->
-                if (initialFlowableValue.isCompleted)
-                    flowableValue.complete(value)
-                else
-                    initialFlowableValue.complete(value)
-            }
-        }
-
-        initialized.await()
-        assertEquals(0, initialBroadcastValue.await())
-        assertEquals(0, initialFlowableValue.await())
-        assertFalse { broadcastValue.isCompleted }
-        assertFalse { flowableValue.isCompleted }
-
-        launch {
-            flowable.set(2)
-        }
-
-        assertEquals(2, broadcastValue.await())
-        assertEquals(2, flowableValue.await())
-
-        channelJob.cancel()
-        flowableJob.cancel()
-
-        assertEquals(2, deinitialized.await())
-    }
-
-    @Test
-    fun testMultipleFlowing() = runBlocking {
-        val values1 = CompletableDeferred<List<Int>>()
-        val values2 = CompletableDeferred<List<Int>>()
-        val scope = MainScope()
-        val flow = flowable.flow()
-        val job1 = scope.launch {
-            val values = mutableListOf<Int>()
-            flow.take(3).collect { value ->
-                values.add(value)
-                if (values.size == 3) {
-                    values1.complete(values)
-                }
-            }
-        }
-        scope.launch {
-            flowable.set(1)
-        }
-        val job2 = scope.launch {
-            val values = mutableListOf<Int>()
-            flowable.flow().take(3).collect { value ->
-                values.add(value)
-                if (values.size == 3) {
-                    values2.complete(values)
-                }
-            }
-        }
-        scope.launch {
-            flowable.set(2)
-        }
-
-        assertEquals(3, values1.await().size)
-
-        assertEquals(0, values1.await()[0])
-
-        job1.cancel()
-
-        scope.launch {
-            assertFalse { deinitialized.isCompleted }
-            flowable.set(3)
-        }
-
-        assertEquals(3, values2.await().size)
-        assertEquals(1, values2.await()[0])
-
-        job2.cancel()
-
-        assertEquals(3, deinitialized.await())
-    }
-
-    @Test
-    fun testStoppingFlow() = runBlocking {
-        val scope = MainScope()
-        val flow = flowable.flow()
-        val job = scope.launch {
-            flow.collect {}
-        }
-        initialized.await()
-        flowable.set(1)
-        assertFalse(broadcastChannel.isClosedForSend)
-        job.cancel()
-        deinitialized.await()
-        assertTrue(broadcastChannel.isClosedForSend)
-    }
-}
diff --git a/base/src/commonTest/kotlin/flow/HotFlowableTest.kt b/base/src/commonTest/kotlin/flow/HotFlowableTest.kt
deleted file mode 100644
index 65f41c3a4..000000000
--- a/base/src/commonTest/kotlin/flow/HotFlowableTest.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.base.test.flow
-
-import com.splendo.kaluga.base.flow.HotFlowable
-import com.splendo.kaluga.base.runBlocking
-import com.splendo.kaluga.test.base.BaseTest
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.channels.BroadcastChannel
-import kotlinx.coroutines.channels.ConflatedBroadcastChannel
-import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.take
-import kotlinx.coroutines.launch
-import kotlin.test.BeforeTest
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class HotFlowableTest : BaseTest() {
-
-    lateinit var flowable: HotFlowable<Int>
-    lateinit var broadcastChannel: BroadcastChannel<Int>
-
-    @BeforeTest
-    fun setUp() {
-        super.beforeTest()
-        broadcastChannel = ConflatedBroadcastChannel()
-        flowable = HotFlowable(0) { broadcastChannel }
-    }
-
-    @Test
-    fun testFlowing() = runBlocking {
-        assertEquals(0, broadcastChannel.asFlow().first())
-        flowable.set(1)
-        assertEquals(1, broadcastChannel.asFlow().first())
-        assertEquals(1, flowable.flow().first())
-    }
-
-    @Test
-    fun testMultipleFlowing() = runBlocking {
-        val values1 = CompletableDeferred<List<Int>>()
-        val values2 = CompletableDeferred<List<Int>>()
-        val scope = MainScope()
-        val job1 = scope.launch {
-            val values = mutableListOf<Int>()
-            flowable.flow().take(3).collect { value ->
-                values.add(value)
-                if (values.size == 3) {
-                    values1.complete(values)
-                }
-            }
-        }
-        scope.launch {
-            flowable.set(1)
-        }
-        val job2 = scope.launch {
-            val values = mutableListOf<Int>()
-            flowable.flow().take(2).collect { value ->
-                values.add(value)
-                if (values.size == 2) {
-                    values2.complete(values)
-                }
-            }
-        }
-        scope.launch {
-            flowable.set(2)
-        }
-
-        assertEquals(3, values1.await().size)
-        assertEquals(2, values2.await().size)
-
-        assertEquals(0, values1.await()[0])
-        assertEquals(1, values2.await()[0])
-
-        job1.cancel()
-        job2.cancel()
-    }
-}
diff --git a/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt b/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
index aebb851d1..f87172b17 100644
--- a/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
@@ -26,7 +26,6 @@ import com.splendo.kaluga.test.base.mock.parameters.mock
 import com.splendo.kaluga.test.base.mock.verify
 import com.splendo.kaluga.test.base.yieldMultiple
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
@@ -36,13 +35,6 @@ import kotlin.test.assertEquals
 class ColdStateRepoTest : BaseTest() {
 
     sealed class CircuitState : KalugaState {
-        val initialStateCounter = MutableStateFlow(0)
-
-        override suspend fun initialState() {
-            super.initialState()
-
-            initialStateCounter.value++
-        }
 
         object Open : CircuitState()
         object Closed : CircuitState()
@@ -84,7 +76,6 @@ class ColdStateRepoTest : BaseTest() {
         val job = launch { collect() }
         yieldMultiple(2)
         useState {
-            assertEquals(times, it.initialStateCounter.value)
             initialValueMock.verify(times)
             assertEquals(CircuitState.Open, it)
         }
diff --git a/base/src/commonTest/kotlin/state/StateRepoTest.kt b/base/src/commonTest/kotlin/state/StateRepoTest.kt
index 242e43c58..3335ca228 100644
--- a/base/src/commonTest/kotlin/state/StateRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/StateRepoTest.kt
@@ -41,17 +41,11 @@ sealed class TrafficLightState :
     HandleAfterOldStateIsRemoved<TrafficLightState>,
     HandleAfterNewStateIsSet<TrafficLightState> {
 
-    val initialStateDone = EmptyCompletableDeferred()
     val beforeCreatingNewStateDone = EmptyCompletableDeferred()
     val afterCreatingNewStateDone = CompletableDeferred<TrafficLightState>()
     val afterNewStateIsSetDone = CompletableDeferred<TrafficLightState>()
     val beforeOldStateIsRemovedDone = CompletableDeferred<TrafficLightState>()
     val afterOldStateIsRemovedDone = CompletableDeferred<TrafficLightState>()
-    val finalStateDone = EmptyCompletableDeferred()
-
-    override suspend fun initialState() {
-        initialStateDone.complete()
-    }
 
     override suspend fun beforeCreatingNewState() {
         beforeCreatingNewStateDone.complete()
@@ -73,10 +67,6 @@ sealed class TrafficLightState :
         afterOldStateIsRemovedDone.complete(oldState)
     }
 
-    override suspend fun finalState() {
-        finalStateDone.complete()
-    }
-
     class RedLight internal constructor() : TrafficLightState() {
 
         val becomeGreen = suspend { GreenLight() }
@@ -112,7 +102,6 @@ class StateRepoTest : FlowTest<TrafficLightState, TrafficLight>() {
         test {
             assertIs<TrafficLightState.GreenLight>(it)
             greenStateDeferred.complete(it)
-            assertTrue(it.initialStateDone.isCompleted)
         }
         val greenState = greenStateDeferred.await()
         action {
diff --git a/beacons/api/androidLib/beacons.api b/beacons/api/androidLib/beacons.api
index 874a396c9..3d1af0c09 100644
--- a/beacons/api/androidLib/beacons.api
+++ b/beacons/api/androidLib/beacons.api
@@ -34,8 +34,8 @@ public final class com/splendo/kaluga/bluetooth/beacons/Beacons {
 	public final fun getBeacons ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun isAnyInRange (Ljava/util/List;)Lkotlinx/coroutines/flow/Flow;
 	public final fun isMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun startMonitoring (Lkotlinx/coroutines/CoroutineScope;)V
-	public final fun stopMonitoring ()V
+	public final fun startMonitoring (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/BeaconsKt {
diff --git a/beacons/api/jvm/beacons.api b/beacons/api/jvm/beacons.api
index 28f7788ff..bcdbb8b3d 100644
--- a/beacons/api/jvm/beacons.api
+++ b/beacons/api/jvm/beacons.api
@@ -34,8 +34,8 @@ public final class com/splendo/kaluga/bluetooth/beacons/Beacons {
 	public final fun getBeacons ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun isAnyInRange (Ljava/util/List;)Lkotlinx/coroutines/flow/Flow;
 	public final fun isMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun startMonitoring (Lkotlinx/coroutines/CoroutineScope;)V
-	public final fun stopMonitoring ()V
+	public final fun startMonitoring (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/BeaconsKt {
diff --git a/beacons/src/commonMain/kotlin/Beacons.kt b/beacons/src/commonMain/kotlin/Beacons.kt
index 4cb6a1c6f..063f574b3 100644
--- a/beacons/src/commonMain/kotlin/Beacons.kt
+++ b/beacons/src/commonMain/kotlin/Beacons.kt
@@ -30,10 +30,13 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -47,20 +50,21 @@ class Beacons(
 
     private companion object { const val TAG = "Beacons" }
 
+    private val lock = Mutex()
     private val cache = mutableMapOf<BeaconID, BeaconJob>()
     private val cacheJob = Job()
     private val coroutineScope = CoroutineScope(Dispatchers.Default + cacheJob)
-    private var monitoringJob: Job? = null
+    private var monitoringJob: MutableStateFlow<Job?> = MutableStateFlow(null)
 
     private val _beacons = MutableStateFlow(emptySet<BeaconInfo>())
     val beacons: StateFlow<Set<BeaconInfo>>
         get() = _beacons.asStateFlow()
 
-    fun startMonitoring(coroutineScope: CoroutineScope) {
+    suspend fun startMonitoring(coroutineScope: CoroutineScope) = lock.withLock {
         debug(TAG, "Start monitoring")
         _beacons.value = emptySet()
         bluetooth.startScanning()
-        monitoringJob = coroutineScope.launch {
+        monitoringJob.value = coroutineScope.launch {
             bluetooth.devices().collect { list ->
                 debug(TAG, "Total Bluetooth devices discovered: ${list.size}")
                 updateBeacons(list.mapNotNull { createBeaconWith(it) })
@@ -68,15 +72,15 @@ class Beacons(
         }
     }
 
-    fun stopMonitoring() {
+    suspend fun stopMonitoring() = lock.withLock {
         debug(TAG, "Stop monitoring")
         bluetooth.stopScanning()
-        monitoringJob?.cancel()
-        monitoringJob = null
+        monitoringJob.value?.cancel()
+        monitoringJob.value = null
         _beacons.value = emptySet()
     }
 
-    suspend fun isMonitoring() = bluetooth.isScanning()
+    suspend fun isMonitoring() = combine(monitoringJob.map { it != null }, bluetooth.isScanning()) { isMonitoring, isScanning -> isMonitoring && isScanning }
 
     fun isAnyInRange(beaconIds: List<String>) = beacons.map { list ->
         list.any { beaconIds.containsLowerCased(it.beaconID.asString()) }
diff --git a/beacons/src/commonTest/kotlin/BeaconFlowTest.kt b/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
index 474c989b5..984c0ab96 100644
--- a/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
@@ -32,7 +32,7 @@ abstract class BeaconFlowTest(
 
     override val flow = suspend { beacons.beacons }
 
-    fun start(coroutineScope: CoroutineScope) = beacons.startMonitoring(coroutineScope)
-    fun stop() = beacons.stopMonitoring()
+    suspend fun start(coroutineScope: CoroutineScope) = beacons.startMonitoring(coroutineScope)
+    suspend fun stop() = beacons.stopMonitoring()
     suspend fun discoverDevices(vararg devices: Device) = bluetooth.discoveredDevices.emit(devices.toList())
 }
diff --git a/bluetooth-permissions/api/androidLib/bluetooth-permissions.api b/bluetooth-permissions/api/androidLib/bluetooth-permissions.api
index 5d63b610f..24083c513 100644
--- a/bluetooth-permissions/api/androidLib/bluetooth-permissions.api
+++ b/bluetooth-permissions/api/androidLib/bluetooth-permissions.api
@@ -25,13 +25,13 @@ public final class com/splendo/kaluga/permissions/bluetooth/DefaultBluetoothPerm
 }
 
 public final class com/splendo/kaluga/permissions/bluetooth/PermissionKt {
-	public static final fun registerBluetoothPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerBluetoothPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerBluetoothPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerBluetoothPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerBluetoothPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerBluetoothPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerBluetoothPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerBluetoothPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerBluetoothPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static synthetic fun registerBluetoothPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static final fun registerBluetoothPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static synthetic fun registerBluetoothPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static final fun registerBluetoothPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static synthetic fun registerBluetoothPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static final fun registerBluetoothPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static synthetic fun registerBluetoothPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
 }
 
diff --git a/bluetooth-permissions/api/jvm/bluetooth-permissions.api b/bluetooth-permissions/api/jvm/bluetooth-permissions.api
index d675140ad..6040fbdfd 100644
--- a/bluetooth-permissions/api/jvm/bluetooth-permissions.api
+++ b/bluetooth-permissions/api/jvm/bluetooth-permissions.api
@@ -28,13 +28,13 @@ public final class com/splendo/kaluga/permissions/bluetooth/DefaultBluetoothPerm
 }
 
 public final class com/splendo/kaluga/permissions/bluetooth/PermissionKt {
-	public static final fun registerBluetoothPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerBluetoothPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerBluetoothPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerBluetoothPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerBluetoothPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerBluetoothPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerBluetoothPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerBluetoothPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerBluetoothPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static synthetic fun registerBluetoothPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static final fun registerBluetoothPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static synthetic fun registerBluetoothPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static final fun registerBluetoothPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static synthetic fun registerBluetoothPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static final fun registerBluetoothPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
+	public static synthetic fun registerBluetoothPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/bluetooth/BaseBluetoothPermissionManagerBuilder;
 }
 
diff --git a/bluetooth-permissions/src/commonMain/kotlin/Permission.kt b/bluetooth-permissions/src/commonMain/kotlin/Permission.kt
index 6c65f6654..be5a92137 100644
--- a/bluetooth-permissions/src/commonMain/kotlin/Permission.kt
+++ b/bluetooth-permissions/src/commonMain/kotlin/Permission.kt
@@ -32,7 +32,7 @@ object BluetoothPermission : Permission() {
     override val name: String = "Bluetooth"
 }
 
-suspend fun PermissionsBuilder.registerBluetoothPermission(
+fun PermissionsBuilder.registerBluetoothPermission(
     bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -46,7 +46,7 @@ suspend fun PermissionsBuilder.registerBluetoothPermission(
         )
     }
 
-suspend fun PermissionsBuilder.registerBluetoothPermission(
+fun PermissionsBuilder.registerBluetoothPermission(
     bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
     stateRepoBuilder: (BaseBluetoothPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<BluetoothPermission>
 ) = bluetoothPermissionManagerBuilderBuilder(context).also {
@@ -56,7 +56,7 @@ suspend fun PermissionsBuilder.registerBluetoothPermission(
     }
 }
 
-suspend fun PermissionsBuilder.registerBluetoothPermissionIfNotRegistered(
+fun PermissionsBuilder.registerBluetoothPermissionIfNotRegistered(
     bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -70,7 +70,7 @@ suspend fun PermissionsBuilder.registerBluetoothPermissionIfNotRegistered(
         )
     }
 
-suspend fun PermissionsBuilder.registerBluetoothPermissionIfNotRegistered(
+fun PermissionsBuilder.registerBluetoothPermissionIfNotRegistered(
     bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
     stateRepoBuilder: (BaseBluetoothPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<BluetoothPermission>
 ) = bluetoothPermissionManagerBuilderBuilder(context).also {
diff --git a/bluetooth/api/androidLib/bluetooth.api b/bluetooth/api/androidLib/bluetooth.api
index 89872a138..00e51f574 100644
--- a/bluetooth/api/androidLib/bluetooth.api
+++ b/bluetooth/api/androidLib/bluetooth.api
@@ -859,10 +859,10 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanner : com/spl
 	public fun isHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun requestEnableHardware (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun scanForDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startMonitoringHardwareEnabled ()V
-	public fun startMonitoringPermissions ()V
-	public fun stopMonitoringHardwareEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun stopScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
@@ -901,8 +901,8 @@ public final class com/splendo/kaluga/bluetooth/scanner/DefaultScanner : com/spl
 	public fun isHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun isSupported ()Z
 	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
-	public fun startMonitoringHardwareEnabled ()V
-	public fun stopMonitoringHardwareEnabled ()V
+	public fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/DefaultScanner$Builder : com/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder {
@@ -924,10 +924,10 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/Scanner {
 	public abstract fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
 	public abstract fun requestEnableHardware (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun scanForDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun startMonitoringHardwareEnabled ()V
-	public abstract fun startMonitoringPermissions ()V
-	public abstract fun stopMonitoringHardwareEnabled ()V
-	public abstract fun stopMonitoringPermissions ()V
+	public abstract fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun stopScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
@@ -1188,8 +1188,8 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotIni
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$PermittedHandler {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)V
-	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;)V
-	public final fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;)V
+	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 }
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index 3538ffc3e..45f72c455 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -299,8 +299,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -309,8 +307,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$DiscoveredServices$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$DiscoveredServices;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$DiscoveredServices;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$DiscoveredServices;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -319,8 +315,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -332,8 +326,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -342,8 +334,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Idle$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Idle;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Idle;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Idle;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -353,8 +343,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$NoServices$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$NoServices;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$NoServices;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$NoServices;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -365,14 +353,10 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting;)Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -382,8 +366,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnected$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnected;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnected;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnected;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -391,8 +373,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -407,8 +387,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting;)Lkotlin/jvm/functions/Function1;
 	public static fun retry (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings$ReconnectionSettings;)Lkotlin/jvm/functions/Function1;
 }
@@ -438,10 +416,8 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun didDiscoverServices (Ljava/util/List;)Lkotlin/jvm/functions/Function1;
 	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMtu ()Ljava/lang/Integer;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -459,14 +435,12 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction;Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction;
 	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 	public fun getActionCompleted ()Lkotlin/jvm/functions/Function1;
 	public fun getMtu ()Ljava/lang/Integer;
 	public fun getNextActions ()Ljava/util/List;
 	public fun getServices ()Ljava/util/List;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -479,12 +453,10 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle;
 	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMtu ()Ljava/lang/Integer;
 	public fun getServices ()Ljava/util/List;
 	public fun handleAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -496,11 +468,9 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices;Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices;
 	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscoverServices ()Lkotlin/jvm/functions/Function1;
 	public fun getMtu ()Ljava/lang/Integer;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun startDiscovering ()V
 	public fun toString ()Ljava/lang/String;
@@ -513,12 +483,10 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getCancelConnection ()Lkotlin/jvm/functions/Function1;
 	public fun getDidConnect ()Lkotlin/jvm/functions/Function1;
 	public fun handleCancel ()V
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -528,10 +496,8 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getConnect ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun startConnecting ()V
 	public fun toString ()Ljava/lang/String;
@@ -544,9 +510,7 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -560,7 +524,6 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public final fun copy (ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getAttempt ()I
 	public fun getCancelConnection ()Lkotlin/jvm/functions/Function1;
 	public fun getDidConnect ()Lkotlin/jvm/functions/Function1;
@@ -568,7 +531,6 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun getServices ()Ljava/util/List;
 	public fun handleCancel ()V
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun retry (Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings$ReconnectionSettings;)Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -874,10 +836,10 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanner : com/spl
 	public fun isHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun requestEnableHardware (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun scanForDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startMonitoringHardwareEnabled ()V
-	public fun startMonitoringPermissions ()V
-	public fun stopMonitoringHardwareEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun stopScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
@@ -930,10 +892,10 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/Scanner {
 	public abstract fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
 	public abstract fun requestEnableHardware (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun scanForDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun startMonitoringHardwareEnabled ()V
-	public abstract fun startMonitoringPermissions ()V
-	public abstract fun stopMonitoringHardwareEnabled ()V
-	public abstract fun stopMonitoringPermissions ()V
+	public abstract fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun stopScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
@@ -1011,14 +973,10 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Active$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Active;)Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1028,8 +986,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Deinitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Deinitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1046,8 +1002,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1057,8 +1011,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun refresh$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle;Ljava/util/Set;ILjava/lang/Object;)Lkotlin/jvm/functions/Function1;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle;)Lkotlin/jvm/functions/Function1;
 	public static synthetic fun startScanning$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle;Ljava/util/Set;ILjava/lang/Object;)Lkotlin/jvm/functions/Function1;
@@ -1070,8 +1022,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1079,8 +1029,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Inactive$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Inactive;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1088,8 +1036,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Initialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1098,8 +1044,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Initializing$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initializing;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1107,8 +1051,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1117,8 +1059,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1127,8 +1067,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1136,8 +1074,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1145,8 +1081,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1155,8 +1089,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Permitted$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Permitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Permitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Permitted;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1185,12 +1117,10 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinit
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getPreviouslyDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -1225,10 +1155,8 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Ena
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Idle : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun refresh (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun startScanning (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
@@ -1240,11 +1168,9 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enable
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun discoverDevice (Lcom/splendo/kaluga/bluetooth/UUID;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 	public fun getStopScanning ()Lkotlin/jvm/functions/Function1;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
@@ -1255,11 +1181,9 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initia
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialized (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -1275,41 +1199,33 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBlue
 	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth$MissingPermissions : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions {
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun permit (Z)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoHardware : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware {
 	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoHardware;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotInitialized : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized {
 	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotInitialized;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public final fun startInitializing (Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$PermittedHandler {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)V
-	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;)V
-	public final fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;)V
+	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 }
diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts
index 66d0a479a..b02e51210 100644
--- a/bluetooth/build.gradle.kts
+++ b/bluetooth/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("convention.publication")
     id("com.android.library")
     id("org.jlleitschuh.gradle.ktlint")
+    id("kotlinx-atomicfu")
 }
 
 publishableComponent()
diff --git a/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt b/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
index 8f2bc560d..8bd6c6fad 100644
--- a/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
@@ -153,12 +153,12 @@ actual class DefaultScanner internal constructor(
         bluetoothScanner.stopScan(callback)
     }
 
-    override fun startMonitoringHardwareEnabled() {
+    override suspend fun startMonitoringHardwareEnabled() {
         locationEnabledMonitor.startMonitoring()
         super.startMonitoringHardwareEnabled()
     }
 
-    override fun stopMonitoringHardwareEnabled() {
+    override suspend fun stopMonitoringHardwareEnabled() {
         locationEnabledMonitor.stopMonitoring()
         super.stopMonitoringHardwareEnabled()
     }
diff --git a/bluetooth/src/commonMain/kotlin/Characteristic.kt b/bluetooth/src/commonMain/kotlin/Characteristic.kt
index d431fc716..1ed08ab4f 100644
--- a/bluetooth/src/commonMain/kotlin/Characteristic.kt
+++ b/bluetooth/src/commonMain/kotlin/Characteristic.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.bluetooth
 import com.splendo.kaluga.bluetooth.device.DeviceAction
 import com.splendo.kaluga.bluetooth.device.DeviceConnectionManager
 import com.splendo.kaluga.logging.Logger
+import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.first
 
@@ -37,7 +38,10 @@ open class Characteristic(
 ) {
 
     private val isBusy = MutableStateFlow(false)
-    var isNotifying: Boolean = false
+    private val _isNotifying = atomic(false)
+    var isNotifying: Boolean
+        get() = _isNotifying.value
+        set(value) { _isNotifying.value = value }
 
     /**
      * Enables notification or indication for this [Characteristic].
diff --git a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
index 3810d3db8..7a95ea70c 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
@@ -45,6 +45,8 @@ import kotlinx.coroutines.flow.fold
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 
 typealias EnableSensorAction = suspend () -> Boolean
 
@@ -67,12 +69,12 @@ interface Scanner {
 
     val isSupported: Boolean
     val events: Flow<Event>
-    fun startMonitoringPermissions()
-    fun stopMonitoringPermissions()
+    suspend fun startMonitoringPermissions()
+    suspend fun stopMonitoringPermissions()
     suspend fun scanForDevices(filter: Set<UUID>)
     suspend fun stopScanning()
-    fun startMonitoringHardwareEnabled()
-    fun stopMonitoringHardwareEnabled()
+    suspend fun startMonitoringHardwareEnabled()
+    suspend fun stopMonitoringHardwareEnabled()
     suspend fun isHardwareEnabled(): Boolean
     suspend fun requestEnableHardware()
     fun generateEnableSensorsActions(): List<EnableSensorAction>
@@ -117,13 +119,15 @@ abstract class BaseScanner constructor(
     protected open val permissionsFlow: Flow<List<PermissionState<*>>> get() = bluetoothPermissionRepo.filterOnlyImportant().map { listOf(it) }
     protected open val enabledFlow: Flow<List<Boolean>> get() = (bluetoothEnabledMonitor?.isEnabled ?: flowOf(false)).map { listOf(it) }
 
+    private val permissionsLock = Mutex()
     private var monitoringPermissionsJob: Job? = null
+    private val enabledJob = Mutex()
     private var monitoringBluetoothEnabledJob: Job? = null
 
-    override fun startMonitoringPermissions() {
+    override suspend fun startMonitoringPermissions() = permissionsLock.withLock {
         logger.debug(LOG_TAG) { "Start monitoring permissions" }
         if (monitoringPermissionsJob != null) return
-        monitoringPermissionsJob = launch(coroutineContext) {
+        monitoringPermissionsJob = coroutineScope.launch(coroutineContext) {
             permissionsFlow.collect { state ->
                 handlePermissionState(state)
             }
@@ -147,7 +151,7 @@ abstract class BaseScanner constructor(
         emitEvent(Scanner.Event.PermissionChanged(hasPermission))
     }
 
-    override fun stopMonitoringPermissions() {
+    override suspend fun stopMonitoringPermissions() = permissionsLock.withLock {
         monitoringPermissionsJob?.cancel()
         monitoringPermissionsJob = null
     }
@@ -170,18 +174,18 @@ abstract class BaseScanner constructor(
 
     protected abstract suspend fun didStopScanning()
 
-    override fun startMonitoringHardwareEnabled() {
+    override suspend fun startMonitoringHardwareEnabled() = enabledJob.withLock {
         val bluetoothEnabledMonitor = bluetoothEnabledMonitor ?: return
         bluetoothEnabledMonitor.startMonitoring()
         if (monitoringBluetoothEnabledJob != null) return
-        monitoringBluetoothEnabledJob = launch {
+        monitoringBluetoothEnabledJob = coroutineScope.launch {
             enabledFlow.collect {
                 checkHardwareEnabledChanged()
             }
         }
     }
 
-    override fun stopMonitoringHardwareEnabled() {
+    override suspend fun stopMonitoringHardwareEnabled() = enabledJob.withLock {
         val bluetoothEnabledMonitor = bluetoothEnabledMonitor ?: return
         bluetoothEnabledMonitor.stopMonitoring()
         monitoringBluetoothEnabledJob?.cancel()
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
index 8fafcf011..b735f2b2d 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
@@ -172,7 +172,7 @@ sealed class ScanningStateImpl {
 
         val revokePermission = suspend { NoBluetooth.MissingPermissions(scanner) }
 
-        fun afterNewStateIsSet(newState: ScanningState) {
+        suspend fun afterNewStateIsSet(newState: ScanningState) {
             when (newState) {
                 is ScanningState.Inactive,
                 is ScanningState.Initializing,
@@ -182,7 +182,7 @@ sealed class ScanningStateImpl {
             }
         }
 
-        fun beforeOldStateIsRemoved(oldState: ScanningState) {
+        suspend fun beforeOldStateIsRemoved(oldState: ScanningState) {
             when (oldState) {
                 is ScanningState.Inactive,
                 is ScanningState.Initializing,
diff --git a/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
index 6b893a1b9..3cd99dd4d 100644
--- a/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
@@ -19,6 +19,8 @@ package com.splendo.kaluga.bluetooth
 
 import com.splendo.kaluga.base.monitor.DefaultServiceMonitor
 import com.splendo.kaluga.base.monitor.ServiceMonitor
+import kotlinx.atomicfu.locks.reentrantLock
+import kotlinx.atomicfu.locks.withLock
 import platform.CoreBluetooth.CBCentralManager
 import platform.CoreBluetooth.CBCentralManagerDelegateProtocol
 import platform.CoreBluetooth.CBManagerStatePoweredOn
@@ -45,14 +47,15 @@ class DefaultBluetoothMonitor internal constructor(
         }
     }
 
+    private val lock = reentrantLock()
     private var centralManager: CBCentralManager? = null
 
     private val centralManagerDelegate = CentralManagerDelegate(::updateState)
     override val isServiceEnabled: Boolean
         get() = initializeCentralManagerIfNotInitialized().state == CBManagerStatePoweredOn
 
-    private fun initializeCentralManagerIfNotInitialized(): CBCentralManager = centralManager ?: centralManagerBuilder().apply {
-        centralManager = this
+    private fun initializeCentralManagerIfNotInitialized(): CBCentralManager = lock.withLock {
+        centralManager ?: centralManagerBuilder().also { this.centralManager = it }
     }
 
     override fun monitoringDidStart() {
diff --git a/build.gradle.kts b/build.gradle.kts
index 8c7ea7583..a54ea0a5b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,6 +12,7 @@ buildscript {
         // mostly migrated to new style plugin declarations, but some cross plugin interaction still requires this
         classpath("com.android.tools.build:gradle:${project.extra["kaluga.androidGradlePluginVersion"]}")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.extra["kaluga.kotlinVersion"]}")
+        classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${project.extra["kaluga.atomicFuGradlePluginVersion"]}")
     }
 }
 
@@ -24,12 +25,6 @@ plugins {
     id("org.jetbrains.kotlinx.binary-compatibility-validator")
 }
 
-// TODO: To be removed once we will migrate to kotlin version 1.6.20
-// https://youtrack.jetbrains.com/issue/KT-49109#focus=Comments-27-5667134.0-0
-rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin>() {
-    rootProject.extensions.getByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java).nodeVersion = "16.13.2"
-}
-
 allprojects {
     repositories {
         mavenCentral()
diff --git a/calendar-permissions/api/androidLib/calendar-permissions.api b/calendar-permissions/api/androidLib/calendar-permissions.api
index f24800078..950e42ed1 100644
--- a/calendar-permissions/api/androidLib/calendar-permissions.api
+++ b/calendar-permissions/api/androidLib/calendar-permissions.api
@@ -34,13 +34,13 @@ public final class com/splendo/kaluga/permissions/calendar/DefaultCalendarPermis
 }
 
 public final class com/splendo/kaluga/permissions/calendar/PermissionKt {
-	public static final fun registerCalendarPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCalendarPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCalendarPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCalendarPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCalendarPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCalendarPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCalendarPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCalendarPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCalendarPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static synthetic fun registerCalendarPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static final fun registerCalendarPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static synthetic fun registerCalendarPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static final fun registerCalendarPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static synthetic fun registerCalendarPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static final fun registerCalendarPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static synthetic fun registerCalendarPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
 }
 
diff --git a/calendar-permissions/api/jvm/calendar-permissions.api b/calendar-permissions/api/jvm/calendar-permissions.api
index c519e3c56..0b03d580f 100644
--- a/calendar-permissions/api/jvm/calendar-permissions.api
+++ b/calendar-permissions/api/jvm/calendar-permissions.api
@@ -37,13 +37,13 @@ public final class com/splendo/kaluga/permissions/calendar/DefaultCalendarPermis
 }
 
 public final class com/splendo/kaluga/permissions/calendar/PermissionKt {
-	public static final fun registerCalendarPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCalendarPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCalendarPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCalendarPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCalendarPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCalendarPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCalendarPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCalendarPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCalendarPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static synthetic fun registerCalendarPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static final fun registerCalendarPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static synthetic fun registerCalendarPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static final fun registerCalendarPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static synthetic fun registerCalendarPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static final fun registerCalendarPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
+	public static synthetic fun registerCalendarPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/calendar/BaseCalendarPermissionManagerBuilder;
 }
 
diff --git a/calendar-permissions/src/commonMain/kotlin/Permission.kt b/calendar-permissions/src/commonMain/kotlin/Permission.kt
index 533c053b4..85f389e1f 100644
--- a/calendar-permissions/src/commonMain/kotlin/Permission.kt
+++ b/calendar-permissions/src/commonMain/kotlin/Permission.kt
@@ -33,7 +33,7 @@ data class CalendarPermission(val allowWrite: Boolean = false) : Permission() {
     override val name: String = "Calendar - ${if (allowWrite) "ReadWrite" else "ReadOnly"}"
 }
 
-suspend fun PermissionsBuilder.registerCalendarPermission(
+fun PermissionsBuilder.registerCalendarPermission(
     calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -42,7 +42,7 @@ suspend fun PermissionsBuilder.registerCalendarPermission(
         CalendarPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerCalendarPermission(
+fun PermissionsBuilder.registerCalendarPermission(
     calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
     calendarPermissionStateRepoBuilder: (CalendarPermission, BaseCalendarPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CalendarPermission>
 ) = calendarPermissionManagerBuilderBuilder(context).also {
@@ -52,7 +52,7 @@ suspend fun PermissionsBuilder.registerCalendarPermission(
     }
 }
 
-suspend fun PermissionsBuilder.registerCalendarPermissionIfNotRegistered(
+fun PermissionsBuilder.registerCalendarPermissionIfNotRegistered(
     calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -61,7 +61,7 @@ suspend fun PermissionsBuilder.registerCalendarPermissionIfNotRegistered(
         CalendarPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerCalendarPermissionIfNotRegistered(
+fun PermissionsBuilder.registerCalendarPermissionIfNotRegistered(
     calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
     calendarPermissionStateRepoBuilder: (CalendarPermission, BaseCalendarPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CalendarPermission>
 ) = calendarPermissionManagerBuilderBuilder(context).also {
diff --git a/camera-permissions/api/androidLib/camera-permissions.api b/camera-permissions/api/androidLib/camera-permissions.api
index 18e3b739d..5f11e2aba 100644
--- a/camera-permissions/api/androidLib/camera-permissions.api
+++ b/camera-permissions/api/androidLib/camera-permissions.api
@@ -25,13 +25,13 @@ public final class com/splendo/kaluga/permissions/camera/DefaultCameraPermission
 }
 
 public final class com/splendo/kaluga/permissions/camera/PermissionKt {
-	public static final fun registerCameraPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCameraPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCameraPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCameraPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCameraPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCameraPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCameraPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCameraPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCameraPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static synthetic fun registerCameraPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static final fun registerCameraPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static synthetic fun registerCameraPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static final fun registerCameraPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static synthetic fun registerCameraPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static final fun registerCameraPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static synthetic fun registerCameraPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
 }
 
diff --git a/camera-permissions/api/jvm/camera-permissions.api b/camera-permissions/api/jvm/camera-permissions.api
index 7a0799b4a..515c5237b 100644
--- a/camera-permissions/api/jvm/camera-permissions.api
+++ b/camera-permissions/api/jvm/camera-permissions.api
@@ -28,13 +28,13 @@ public final class com/splendo/kaluga/permissions/camera/DefaultCameraPermission
 }
 
 public final class com/splendo/kaluga/permissions/camera/PermissionKt {
-	public static final fun registerCameraPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCameraPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCameraPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCameraPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCameraPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCameraPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerCameraPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerCameraPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerCameraPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static synthetic fun registerCameraPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static final fun registerCameraPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static synthetic fun registerCameraPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static final fun registerCameraPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static synthetic fun registerCameraPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static final fun registerCameraPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
+	public static synthetic fun registerCameraPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/camera/BaseCameraPermissionManagerBuilder;
 }
 
diff --git a/camera-permissions/src/commonMain/kotlin/Permission.kt b/camera-permissions/src/commonMain/kotlin/Permission.kt
index 0e246df2e..d3b5ccb06 100644
--- a/camera-permissions/src/commonMain/kotlin/Permission.kt
+++ b/camera-permissions/src/commonMain/kotlin/Permission.kt
@@ -32,7 +32,7 @@ object CameraPermission : Permission() {
     override val name: String = "Camera"
 }
 
-suspend fun PermissionsBuilder.registerCameraPermission(
+fun PermissionsBuilder.registerCameraPermission(
     cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -41,7 +41,7 @@ suspend fun PermissionsBuilder.registerCameraPermission(
         CameraPermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerCameraPermission(
+fun PermissionsBuilder.registerCameraPermission(
     cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
     cameraPermissionStateRepoBuilder: (BaseCameraPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CameraPermission>
 ) = cameraPermissionManagerBuilderBuilder(context).also {
@@ -51,7 +51,7 @@ suspend fun PermissionsBuilder.registerCameraPermission(
     }
 }
 
-suspend fun PermissionsBuilder.registerCameraPermissionIfNotRegistered(
+fun PermissionsBuilder.registerCameraPermissionIfNotRegistered(
     cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -60,7 +60,7 @@ suspend fun PermissionsBuilder.registerCameraPermissionIfNotRegistered(
         CameraPermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerCameraPermissionIfNotRegistered(
+fun PermissionsBuilder.registerCameraPermissionIfNotRegistered(
     cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
     cameraPermissionStateRepoBuilder: (BaseCameraPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CameraPermission>
 ) = cameraPermissionManagerBuilderBuilder(context).also {
diff --git a/contacts-permissions/api/androidLib/contacts-permissions.api b/contacts-permissions/api/androidLib/contacts-permissions.api
index b52e79285..ff19bae86 100644
--- a/contacts-permissions/api/androidLib/contacts-permissions.api
+++ b/contacts-permissions/api/androidLib/contacts-permissions.api
@@ -34,13 +34,13 @@ public final class com/splendo/kaluga/permissions/contacts/DefaultContactsPermis
 }
 
 public final class com/splendo/kaluga/permissions/contacts/PermissionKt {
-	public static final fun registerContactsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerContactsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerContactsPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerContactsPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerContactsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerContactsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerContactsPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerContactsPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerContactsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static synthetic fun registerContactsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static final fun registerContactsPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static synthetic fun registerContactsPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static final fun registerContactsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static synthetic fun registerContactsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static final fun registerContactsPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static synthetic fun registerContactsPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
 }
 
diff --git a/contacts-permissions/api/jvm/contacts-permissions.api b/contacts-permissions/api/jvm/contacts-permissions.api
index bc2a3b513..48abd3cec 100644
--- a/contacts-permissions/api/jvm/contacts-permissions.api
+++ b/contacts-permissions/api/jvm/contacts-permissions.api
@@ -37,13 +37,13 @@ public final class com/splendo/kaluga/permissions/contacts/DefaultContactsPermis
 }
 
 public final class com/splendo/kaluga/permissions/contacts/PermissionKt {
-	public static final fun registerContactsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerContactsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerContactsPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerContactsPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerContactsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerContactsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerContactsPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerContactsPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerContactsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static synthetic fun registerContactsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static final fun registerContactsPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static synthetic fun registerContactsPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static final fun registerContactsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static synthetic fun registerContactsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static final fun registerContactsPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
+	public static synthetic fun registerContactsPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/contacts/BaseContactsPermissionManagerBuilder;
 }
 
diff --git a/contacts-permissions/src/commonMain/kotlin/Permission.kt b/contacts-permissions/src/commonMain/kotlin/Permission.kt
index a03679546..c6cd7c963 100644
--- a/contacts-permissions/src/commonMain/kotlin/Permission.kt
+++ b/contacts-permissions/src/commonMain/kotlin/Permission.kt
@@ -33,7 +33,7 @@ data class ContactsPermission(val allowWrite: Boolean = false) : Permission() {
     override val name: String = "Contacts - ${if (allowWrite) "ReadWrite" else "ReadOnly"}"
 }
 
-suspend fun PermissionsBuilder.registerContactsPermission(
+fun PermissionsBuilder.registerContactsPermission(
     contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -42,7 +42,7 @@ suspend fun PermissionsBuilder.registerContactsPermission(
         ContactsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerContactsPermission(
+fun PermissionsBuilder.registerContactsPermission(
     contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
     contactsPermissionStateRepoBuilder: (ContactsPermission, BaseContactsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<ContactsPermission>
 ) = contactsPermissionManagerBuilderBuilder(context).also {
@@ -52,7 +52,7 @@ suspend fun PermissionsBuilder.registerContactsPermission(
     }
 }
 
-suspend fun PermissionsBuilder.registerContactsPermissionIfNotRegistered(
+fun PermissionsBuilder.registerContactsPermissionIfNotRegistered(
     contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -61,7 +61,7 @@ suspend fun PermissionsBuilder.registerContactsPermissionIfNotRegistered(
         ContactsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerContactsPermissionIfNotRegistered(
+fun PermissionsBuilder.registerContactsPermissionIfNotRegistered(
     contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
     contactsPermissionStateRepoBuilder: (ContactsPermission, BaseContactsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<ContactsPermission>
 ) = contactsPermissionManagerBuilderBuilder(context).also {
diff --git a/gradle.properties b/gradle.properties
index c02400535..805ca4e2e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,8 @@ kaluga.androidGradlePluginVersion=7.3.0
 kaluga.kotlinVersion=1.7.20
 kaluga.googleServicesGradlePluginVersion=4.3.10
 kaluga.ktLintGradlePluginVersion=11.0.0
-org.gradle.jvmargs=-Xmx3048M -Dkotlin.daemon.jvm.options\="-Xmx3048M"
+kaluga.atomicFuGradlePluginVersion=0.18.5
+org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx4096M"
 
 #MPP
 kotlin.mpp.enableGranularSourceSetsMetadata=true
diff --git a/location-permissions/api/androidLib/location-permissions.api b/location-permissions/api/androidLib/location-permissions.api
index 6231a107d..191e85673 100644
--- a/location-permissions/api/androidLib/location-permissions.api
+++ b/location-permissions/api/androidLib/location-permissions.api
@@ -36,13 +36,13 @@ public final class com/splendo/kaluga/permissions/location/LocationPermissionSta
 }
 
 public final class com/splendo/kaluga/permissions/location/PermissionKt {
-	public static final fun registerLocationPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerLocationPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerLocationPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerLocationPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerLocationPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerLocationPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerLocationPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerLocationPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerLocationPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static synthetic fun registerLocationPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static final fun registerLocationPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static synthetic fun registerLocationPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static final fun registerLocationPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static synthetic fun registerLocationPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static final fun registerLocationPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static synthetic fun registerLocationPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
 }
 
diff --git a/location-permissions/api/jvm/location-permissions.api b/location-permissions/api/jvm/location-permissions.api
index f336a04df..d516eee0c 100644
--- a/location-permissions/api/jvm/location-permissions.api
+++ b/location-permissions/api/jvm/location-permissions.api
@@ -39,13 +39,13 @@ public final class com/splendo/kaluga/permissions/location/LocationPermissionSta
 }
 
 public final class com/splendo/kaluga/permissions/location/PermissionKt {
-	public static final fun registerLocationPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerLocationPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerLocationPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerLocationPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerLocationPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerLocationPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerLocationPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerLocationPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerLocationPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static synthetic fun registerLocationPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static final fun registerLocationPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static synthetic fun registerLocationPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static final fun registerLocationPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static synthetic fun registerLocationPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static final fun registerLocationPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
+	public static synthetic fun registerLocationPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/location/BaseLocationPermissionManagerBuilder;
 }
 
diff --git a/location-permissions/src/commonMain/kotlin/Permission.kt b/location-permissions/src/commonMain/kotlin/Permission.kt
index 2865ff967..86ede8435 100644
--- a/location-permissions/src/commonMain/kotlin/Permission.kt
+++ b/location-permissions/src/commonMain/kotlin/Permission.kt
@@ -35,7 +35,7 @@ data class LocationPermission(val background: Boolean = false, val precise: Bool
     override val name: String = listOfNotNull(if (background) "Background" else null, "Location", "-", if (precise) "Precise" else "Coarse").joinToString(" ")
 }
 
-suspend fun PermissionsBuilder.registerLocationPermission(
+fun PermissionsBuilder.registerLocationPermission(
     locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -44,7 +44,7 @@ suspend fun PermissionsBuilder.registerLocationPermission(
         LocationPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerLocationPermission(
+fun PermissionsBuilder.registerLocationPermission(
     locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
     locationPermissionStateRepoBuilder: (LocationPermission, BaseLocationPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<LocationPermission>
 ) = locationPermissionManagerBuilderBuilder(context).also {
@@ -54,7 +54,7 @@ suspend fun PermissionsBuilder.registerLocationPermission(
     }
 }
 
-suspend fun PermissionsBuilder.registerLocationPermissionIfNotRegistered(
+fun PermissionsBuilder.registerLocationPermissionIfNotRegistered(
     locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -63,7 +63,7 @@ suspend fun PermissionsBuilder.registerLocationPermissionIfNotRegistered(
         LocationPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerLocationPermissionIfNotRegistered(
+fun PermissionsBuilder.registerLocationPermissionIfNotRegistered(
     locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
     locationPermissionStateRepoBuilder: (LocationPermission, BaseLocationPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<LocationPermission>
 ) = locationPermissionManagerBuilderBuilder(context).also {
diff --git a/location/api/androidLib/location.api b/location/api/androidLib/location.api
index f7264932f..4800f213b 100644
--- a/location/api/androidLib/location.api
+++ b/location/api/androidLib/location.api
@@ -11,9 +11,9 @@ public abstract class com/splendo/kaluga/location/BaseLocationManager : com/sple
 	public final fun handleLocationChanged (Ljava/util/List;)V
 	public fun isLocationEnabled ()Z
 	public fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startMonitoringPermissions ()V
-	public fun stopMonitoringLocationEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class com/splendo/kaluga/location/BaseLocationManager$Builder {
@@ -264,10 +264,10 @@ public abstract interface class com/splendo/kaluga/location/LocationManager {
 	public abstract fun requestEnableLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun startMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun startMonitoringPermissions ()V
+	public abstract fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun stopMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun stopMonitoringLocationEnabled ()V
-	public abstract fun stopMonitoringPermissions ()V
+	public abstract fun stopMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract class com/splendo/kaluga/location/LocationManager$Event {
@@ -436,7 +436,7 @@ public final class com/splendo/kaluga/location/LocationStateImpl$NotInitialized
 
 public final class com/splendo/kaluga/location/LocationStateImpl$PermittedHandler {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;)V
+	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index 1980faeb4..03e532052 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -11,9 +11,9 @@ public abstract class com/splendo/kaluga/location/BaseLocationManager : com/sple
 	public final fun handleLocationChanged (Ljava/util/List;)V
 	public fun isLocationEnabled ()Z
 	public fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startMonitoringPermissions ()V
-	public fun stopMonitoringLocationEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class com/splendo/kaluga/location/BaseLocationManager$Builder {
@@ -212,10 +212,10 @@ public abstract interface class com/splendo/kaluga/location/LocationManager {
 	public abstract fun requestEnableLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun startMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun startMonitoringPermissions ()V
+	public abstract fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun stopMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun stopMonitoringLocationEnabled ()V
-	public abstract fun stopMonitoringPermissions ()V
+	public abstract fun stopMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract class com/splendo/kaluga/location/LocationManager$Event {
@@ -257,14 +257,10 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Active
 }
 
 public final class com/splendo/kaluga/location/LocationState$Active$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Active;)Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/location/LocationState$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -273,8 +269,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Deinit
 }
 
 public final class com/splendo/kaluga/location/LocationState$Deinitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Deinitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -282,8 +276,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Disabl
 }
 
 public final class com/splendo/kaluga/location/LocationState$Disabled$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Disabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Disabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Disabled;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -292,8 +284,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Disabl
 }
 
 public final class com/splendo/kaluga/location/LocationState$Disabled$NoGPS$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Disabled$NoGPS;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Disabled$NoGPS;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Disabled$NoGPS;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -302,8 +292,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Disabl
 }
 
 public final class com/splendo/kaluga/location/LocationState$Disabled$NotPermitted$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Disabled$NotPermitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Disabled$NotPermitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Disabled$NotPermitted;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -313,8 +301,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Enable
 }
 
 public final class com/splendo/kaluga/location/LocationState$Enabled$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Enabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Enabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Enabled;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -322,8 +308,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Inacti
 }
 
 public final class com/splendo/kaluga/location/LocationState$Inactive$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Inactive;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -331,8 +315,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Initia
 }
 
 public final class com/splendo/kaluga/location/LocationState$Initialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Initialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -341,8 +323,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Initia
 }
 
 public final class com/splendo/kaluga/location/LocationState$Initializing$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Initializing;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -350,8 +330,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$NotIni
 }
 
 public final class com/splendo/kaluga/location/LocationState$NotInitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$NotInitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$NotInitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$NotInitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -360,8 +338,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Permit
 }
 
 public final class com/splendo/kaluga/location/LocationState$Permitted$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Permitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Permitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Permitted;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -384,11 +360,9 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Deinitialized :
 	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -402,19 +376,15 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NoGPS
 	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NotPermitted : com/splendo/kaluga/location/LocationStateImpl$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NotPermitted {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun permit (Z)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
@@ -429,12 +399,10 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Enabled : com/s
 	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDisable ()Lkotlin/jvm/functions/Function1;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 	public fun updateWithLocation (Lcom/splendo/kaluga/location/Location$KnownLocation;)Lkotlin/jvm/functions/Function1;
@@ -446,10 +414,8 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Initializing :
 	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -457,16 +423,14 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Initializing :
 
 public final class com/splendo/kaluga/location/LocationStateImpl$NotInitialized : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/location/LocationState$NotInitialized {
 	public static final field INSTANCE Lcom/splendo/kaluga/location/LocationStateImpl$NotInitialized;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public final fun startInitializing (Lcom/splendo/kaluga/location/LocationManager;)Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/location/LocationStateImpl$PermittedHandler {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;)V
+	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
diff --git a/location/build.gradle.kts b/location/build.gradle.kts
index cd8654057..a340f2a8f 100644
--- a/location/build.gradle.kts
+++ b/location/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("convention.publication")
     id("com.android.library")
     id("org.jlleitschuh.gradle.ktlint")
+    id("kotlinx-atomicfu")
 }
 
 publishableComponent()
diff --git a/location/src/commonMain/kotlin/location/LocationManager.kt b/location/src/commonMain/kotlin/location/LocationManager.kt
index 460f72b3e..cc059e8a8 100644
--- a/location/src/commonMain/kotlin/location/LocationManager.kt
+++ b/location/src/commonMain/kotlin/location/LocationManager.kt
@@ -36,6 +36,8 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 
 interface LocationManager {
 
@@ -50,10 +52,10 @@ interface LocationManager {
 
     val locationPermission: LocationPermission
 
-    fun startMonitoringPermissions()
-    fun stopMonitoringPermissions()
+    suspend fun startMonitoringPermissions()
+    suspend fun stopMonitoringPermissions()
     suspend fun startMonitoringLocationEnabled()
-    fun stopMonitoringLocationEnabled()
+    suspend fun stopMonitoringLocationEnabled()
     fun isLocationEnabled(): Boolean
     suspend fun requestEnableLocation()
     suspend fun startMonitoringLocation()
@@ -99,18 +101,22 @@ abstract class BaseLocationManager(
 
     abstract val locationMonitor: LocationMonitor
 
+    private val permissionsLock = Mutex()
     private var monitoringPermissionsJob: Job? = null
+    private val enabledLock = Mutex()
     private var monitoringLocationEnabledJob: Job? = null
 
-    override fun startMonitoringPermissions() {
-        logger.debug(LOG_TAG) { "Start monitoring permission" }
-        if (monitoringPermissionsJob != null) return // optimization to skip making a job
+    override suspend fun startMonitoringPermissions() {
+        permissionsLock.withLock {
+            logger.debug(LOG_TAG) { "Start monitoring permission" }
+            if (monitoringPermissionsJob != null) return // optimization to skip making a job
 
-        val job = Job(this.coroutineContext[Job])
-        monitoringPermissionsJob = job
-        launch(job) {
-            locationPermissionRepo.filterOnlyImportant().collect { state ->
-                handlePermissionState(state)
+            val job = Job(this.coroutineContext[Job])
+            monitoringPermissionsJob = job
+            coroutineScope.launch(job) {
+                locationPermissionRepo.filterOnlyImportant().collect { state ->
+                    handlePermissionState(state)
+                }
             }
         }
     }
@@ -131,22 +137,22 @@ abstract class BaseLocationManager(
         emitEvent(LocationManager.Event.PermissionChanged(hasPermission))
     }
 
-    override fun stopMonitoringPermissions() {
+    override suspend fun stopMonitoringPermissions() = permissionsLock.withLock {
         monitoringPermissionsJob?.cancel()
         monitoringPermissionsJob = null
     }
 
-    override suspend fun startMonitoringLocationEnabled() {
+    override suspend fun startMonitoringLocationEnabled() = enabledLock.withLock {
         locationMonitor.startMonitoring()
         if (monitoringLocationEnabledJob != null)
             return
-        monitoringLocationEnabledJob = launch {
+        monitoringLocationEnabledJob = coroutineScope.launch {
             locationMonitor.isEnabled.collect {
                 handleLocationEnabledChanged()
             }
         }
     }
-    override fun stopMonitoringLocationEnabled() {
+    override suspend fun stopMonitoringLocationEnabled() = enabledLock.withLock {
         locationMonitor.stopMonitoring()
         monitoringLocationEnabledJob?.cancel()
         monitoringLocationEnabledJob = null
diff --git a/location/src/commonMain/kotlin/location/LocationState.kt b/location/src/commonMain/kotlin/location/LocationState.kt
index d30e7a6a6..59269908b 100644
--- a/location/src/commonMain/kotlin/location/LocationState.kt
+++ b/location/src/commonMain/kotlin/location/LocationState.kt
@@ -106,7 +106,7 @@ sealed class LocationStateImpl {
             Disabled.NotPermitted(location, locationManager)
         }
 
-        fun afterNewStateIsSet(newState: LocationState) {
+        suspend fun afterNewStateIsSet(newState: LocationState) {
             when (newState) {
                 is LocationState.Inactive,
                 is LocationState.Initializing,
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
index 81b3548ed..98be16802 100644
--- a/logging/build.gradle.kts
+++ b/logging/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("com.android.library")
     id("convention.publication")
     id("org.jlleitschuh.gradle.ktlint")
+    id("kotlinx-atomicfu")
 }
 
 publishableComponent()
diff --git a/logging/src/commonTest/kotlin/LogTest.kt b/logging/src/commonTest/kotlin/LogTest.kt
index 506f39a46..fbd8613c4 100644
--- a/logging/src/commonTest/kotlin/LogTest.kt
+++ b/logging/src/commonTest/kotlin/LogTest.kt
@@ -18,87 +18,26 @@ Copyright 2019 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.logging
 
-import com.splendo.kaluga.test.base.UIThreadTest
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.yield
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class LogTest : UIThreadTest<LogTest.Context>() {
+class LogTest {
 
-    class Context(scope: CoroutineScope) : TestContext {
-        val mockLogger = LoggerMock(scope)
-
-        init {
-            logger = mockLogger
-        }
-
-        suspend fun assertLog(
-            logLevel: LogLevel,
-            tag: String? = null,
-            throwable: Exception? = null,
-            message: String? = null
-        ) {
-            yield()
-            listOf(
-                mockLogger.tagList.size,
-                mockLogger.levelList.size,
-                mockLogger.throwableList.size,
-                mockLogger.messageList.size,
-                mockLogger.levelList.size
-            ).forEach {
-                assertEquals(1, it)
-            }
-
-            assertEquals(logLevel, mockLogger.levelList[0])
-            assertEquals(tag, mockLogger.tagList[0])
-            assertEquals(throwable, mockLogger.throwableList[0])
-            assertEquals(message, mockLogger.messageList[0])
-
-            mockLogger.clear()
-        }
-
-        suspend fun test(
-            logLevel: LogLevel,
-            method1: (tag: String?, message: String) -> Unit,
-            method2: (message: String) -> Unit,
-            method3: (tag: String?, throwable: Throwable) -> Unit,
-            method4: (throwable: Throwable) -> Unit,
-            method5: (tag: String?, message: () -> String) -> Unit,
-            method6: (message: () -> String) -> Unit,
-            method7: (tag: String?, throwable: Throwable?, message: () -> String) -> Unit,
-        ) {
-            val tag = logLevel.name.lowercase()
-                .replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
-            val message = logLevel.name.uppercase()
-            val throwable = RuntimeException(logLevel.name.lowercase())
-
-            method1(tag, message)
-            assertLog(logLevel, tag, message = message)
-            method2.invoke(message)
-            assertLog(logLevel, message = message)
-            method3(tag, throwable)
-            assertLog(logLevel, tag = tag, throwable = throwable)
-            method4(throwable)
-            assertLog(logLevel, throwable = throwable)
-            method5(tag) { message }
-            assertLog(logLevel, tag = tag, message = message)
-            method6 { message }
-            assertLog(logLevel, message = message)
-            method7(tag, throwable) { message }
-            assertLog(logLevel, tag, throwable, message)
-        }
-
-        override fun dispose() {
-            super.dispose()
-            resetLogger()
-        }
+    private val mockLogger = LoggerMock()
+    @BeforeTest
+    fun setMockLogger() {
+        logger = mockLogger
     }
 
-    override val createTestContext: suspend (scope: CoroutineScope) -> Context = { Context(it) }
+    @AfterTest
+    fun resetMockLogger() {
+        resetLogger()
+    }
 
     @Test
-    fun testTransformer() = testOnUIThread {
+    fun testTransformer() {
         val exception = RuntimeException("original exception for testing")
         val wrappedException = RuntimeException("wrapped exception for testing", exception)
         val nullPointerException = NullPointerException()
@@ -133,7 +72,7 @@ class LogTest : UIThreadTest<LogTest.Context>() {
     }
 
     @Test
-    fun testDebug() = testOnUIThread {
+    fun testDebug() {
         test(
             logLevel = LogLevel.DEBUG,
             method1 = ::debug,
@@ -147,7 +86,7 @@ class LogTest : UIThreadTest<LogTest.Context>() {
     }
 
     @Test
-    fun testD() = testOnUIThread {
+    fun testD() {
         test(
             logLevel = LogLevel.DEBUG,
             method1 = ::d,
@@ -161,7 +100,7 @@ class LogTest : UIThreadTest<LogTest.Context>() {
     }
 
     @Test
-    fun testInfo() = testOnUIThread {
+    fun testInfo() {
         test(
             logLevel = LogLevel.INFO,
             method1 = ::info,
@@ -175,7 +114,7 @@ class LogTest : UIThreadTest<LogTest.Context>() {
     }
 
     @Test
-    fun testI() = testOnUIThread {
+    fun testI() {
         test(
             logLevel = LogLevel.INFO,
             method1 = ::i,
@@ -189,7 +128,7 @@ class LogTest : UIThreadTest<LogTest.Context>() {
     }
 
     @Test
-    fun testWarn() = testOnUIThread {
+    fun testWarn() {
         test(
             logLevel = LogLevel.WARN,
             method1 = ::warn,
@@ -203,7 +142,7 @@ class LogTest : UIThreadTest<LogTest.Context>() {
     }
 
     @Test
-    fun testW() = testOnUIThread {
+    fun testW() {
         test(
             logLevel = LogLevel.WARN,
             method1 = ::w,
@@ -217,7 +156,7 @@ class LogTest : UIThreadTest<LogTest.Context>() {
     }
 
     @Test
-    fun testError() = testOnUIThread {
+    fun testError() {
         test(
             logLevel = LogLevel.ERROR,
             method1 = ::error,
@@ -231,7 +170,7 @@ class LogTest : UIThreadTest<LogTest.Context>() {
     }
 
     @Test
-    fun testE() = testOnUIThread {
+    fun testE() {
         test(
             logLevel = LogLevel.ERROR,
             method1 = ::e,
@@ -243,4 +182,59 @@ class LogTest : UIThreadTest<LogTest.Context>() {
             method7 = ::e
         )
     }
+
+    private fun assertLog(
+        logLevel: LogLevel,
+        tag: String? = null,
+        throwable: Exception? = null,
+        message: String? = null
+    ) {
+        listOf(
+            mockLogger.tagList.size,
+            mockLogger.levelList.size,
+            mockLogger.throwableList.size,
+            mockLogger.messageList.size,
+            mockLogger.levelList.size
+        ).forEach {
+            assertEquals(1, it)
+        }
+
+        assertEquals(logLevel, mockLogger.levelList[0])
+        assertEquals(tag, mockLogger.tagList[0])
+        assertEquals(throwable, mockLogger.throwableList[0])
+        assertEquals(message, mockLogger.messageList[0])
+
+        mockLogger.clear()
+    }
+
+    private fun test(
+        logLevel: LogLevel,
+        method1: (tag: String?, message: String) -> Unit,
+        method2: (message: String) -> Unit,
+        method3: (tag: String?, throwable: Throwable) -> Unit,
+        method4: (throwable: Throwable) -> Unit,
+        method5: (tag: String?, message: () -> String) -> Unit,
+        method6: (message: () -> String) -> Unit,
+        method7: (tag: String?, throwable: Throwable?, message: () -> String) -> Unit,
+    ) {
+        val tag = logLevel.name.lowercase()
+            .replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
+        val message = logLevel.name.uppercase()
+        val throwable = RuntimeException(logLevel.name.lowercase())
+
+        method1(tag, message)
+        assertLog(logLevel, tag, message = message)
+        method2.invoke(message)
+        assertLog(logLevel, message = message)
+        method3(tag, throwable)
+        assertLog(logLevel, tag = tag, throwable = throwable)
+        method4(throwable)
+        assertLog(logLevel, throwable = throwable)
+        method5(tag) { message }
+        assertLog(logLevel, tag = tag, message = message)
+        method6 { message }
+        assertLog(logLevel, message = message)
+        method7(tag, throwable) { message }
+        assertLog(logLevel, tag, throwable, message)
+    }
 }
diff --git a/logging/src/commonTest/kotlin/LoggerMock.kt b/logging/src/commonTest/kotlin/LoggerMock.kt
index 5ddeb8468..7c6dfed3d 100644
--- a/logging/src/commonTest/kotlin/LoggerMock.kt
+++ b/logging/src/commonTest/kotlin/LoggerMock.kt
@@ -18,38 +18,29 @@ Copyright 2019 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.logging
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
+import kotlinx.atomicfu.locks.SynchronizedObject
+import kotlinx.atomicfu.locks.synchronized
 
-class LoggerMock(private val coroutineScope: CoroutineScope) : Logger {
+class LoggerMock : SynchronizedObject(), Logger {
 
-    private val mutex = Mutex()
     val throwableList = mutableListOf<Throwable?>()
     val messageList = mutableListOf<String?>()
     val tagList = mutableListOf<String?>()
     val levelList = mutableListOf<LogLevel?>()
 
-    fun clear() {
-        coroutineScope.launch {
-            mutex.withLock {
-                levelList.clear()
-                messageList.clear()
-                tagList.clear()
-                throwableList.clear()
-            }
-        }
+    fun clear() = synchronized(this) {
+        levelList.clear()
+        messageList.clear()
+        tagList.clear()
+        throwableList.clear()
     }
 
     override fun log(level: LogLevel, tag: String?, throwable: Throwable?, message: (() -> String)?) {
-        coroutineScope.launch {
-            mutex.withLock {
-                levelList.add(level)
-                tagList.add(tag)
-                throwableList.add(throwable)
-                messageList.add(message?.invoke())
-            }
+        synchronized(this) {
+            levelList.add(level)
+            tagList.add(tag)
+            throwableList.add(throwable)
+            messageList.add(message?.invoke())
         }
     }
 }
diff --git a/microphone-permissions/api/androidLib/microphone-permissions.api b/microphone-permissions/api/androidLib/microphone-permissions.api
index 11bfce5a7..17aadae67 100644
--- a/microphone-permissions/api/androidLib/microphone-permissions.api
+++ b/microphone-permissions/api/androidLib/microphone-permissions.api
@@ -25,13 +25,13 @@ public final class com/splendo/kaluga/permissions/microphone/MicrophonePermissio
 }
 
 public final class com/splendo/kaluga/permissions/microphone/PermissionKt {
-	public static final fun registerMicrophonePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerMicrophonePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerMicrophonePermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerMicrophonePermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerMicrophonePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerMicrophonePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerMicrophonePermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerMicrophonePermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerMicrophonePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static synthetic fun registerMicrophonePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static final fun registerMicrophonePermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static synthetic fun registerMicrophonePermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static final fun registerMicrophonePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static synthetic fun registerMicrophonePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static final fun registerMicrophonePermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static synthetic fun registerMicrophonePermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
 }
 
diff --git a/microphone-permissions/api/jvm/microphone-permissions.api b/microphone-permissions/api/jvm/microphone-permissions.api
index 0dee42186..ed26ba5d3 100644
--- a/microphone-permissions/api/jvm/microphone-permissions.api
+++ b/microphone-permissions/api/jvm/microphone-permissions.api
@@ -28,13 +28,13 @@ public final class com/splendo/kaluga/permissions/microphone/MicrophonePermissio
 }
 
 public final class com/splendo/kaluga/permissions/microphone/PermissionKt {
-	public static final fun registerMicrophonePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerMicrophonePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerMicrophonePermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerMicrophonePermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerMicrophonePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerMicrophonePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerMicrophonePermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerMicrophonePermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerMicrophonePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static synthetic fun registerMicrophonePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static final fun registerMicrophonePermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static synthetic fun registerMicrophonePermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static final fun registerMicrophonePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static synthetic fun registerMicrophonePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static final fun registerMicrophonePermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
+	public static synthetic fun registerMicrophonePermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/microphone/BaseMicrophonePermissionManagerBuilder;
 }
 
diff --git a/microphone-permissions/src/commonMain/kotlin/Permission.kt b/microphone-permissions/src/commonMain/kotlin/Permission.kt
index 9c0418e99..dae04629b 100644
--- a/microphone-permissions/src/commonMain/kotlin/Permission.kt
+++ b/microphone-permissions/src/commonMain/kotlin/Permission.kt
@@ -32,7 +32,7 @@ object MicrophonePermission : Permission() {
     override val name: String = "Microphone"
 }
 
-suspend fun PermissionsBuilder.registerMicrophonePermission(
+fun PermissionsBuilder.registerMicrophonePermission(
     microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -41,7 +41,7 @@ suspend fun PermissionsBuilder.registerMicrophonePermission(
         MicrophonePermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerMicrophonePermission(
+fun PermissionsBuilder.registerMicrophonePermission(
     microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
     microphonePermissionStateRepoBuilder: (BaseMicrophonePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<MicrophonePermission>
 ) = microphonePermissionManagerBuilderBuilder(context).also {
@@ -51,7 +51,7 @@ suspend fun PermissionsBuilder.registerMicrophonePermission(
     }
 }
 
-suspend fun PermissionsBuilder.registerMicrophonePermissionIfNotRegistered(
+fun PermissionsBuilder.registerMicrophonePermissionIfNotRegistered(
     microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -60,7 +60,7 @@ suspend fun PermissionsBuilder.registerMicrophonePermissionIfNotRegistered(
         MicrophonePermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerMicrophonePermissionIfNotRegistered(
+fun PermissionsBuilder.registerMicrophonePermissionIfNotRegistered(
     microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
     microphonePermissionStateRepoBuilder: (BaseMicrophonePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<MicrophonePermission>
 ) = microphonePermissionManagerBuilderBuilder(context).also {
diff --git a/notifications-permissions/api/androidLib/notifications-permissions.api b/notifications-permissions/api/androidLib/notifications-permissions.api
index 07871ee96..2cc828448 100644
--- a/notifications-permissions/api/androidLib/notifications-permissions.api
+++ b/notifications-permissions/api/androidLib/notifications-permissions.api
@@ -38,13 +38,13 @@ public final class com/splendo/kaluga/permissions/notifications/NotificationsPer
 }
 
 public final class com/splendo/kaluga/permissions/notifications/PermissionKt {
-	public static final fun registerNotificationsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerNotificationsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerNotificationsPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerNotificationsPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerNotificationsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerNotificationsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerNotificationsPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerNotificationsPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerNotificationsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static synthetic fun registerNotificationsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static final fun registerNotificationsPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static synthetic fun registerNotificationsPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static final fun registerNotificationsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static synthetic fun registerNotificationsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static final fun registerNotificationsPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static synthetic fun registerNotificationsPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
 }
 
diff --git a/notifications-permissions/api/jvm/notifications-permissions.api b/notifications-permissions/api/jvm/notifications-permissions.api
index 1fa58a542..4ff0a5694 100644
--- a/notifications-permissions/api/jvm/notifications-permissions.api
+++ b/notifications-permissions/api/jvm/notifications-permissions.api
@@ -41,13 +41,13 @@ public final class com/splendo/kaluga/permissions/notifications/NotificationsPer
 }
 
 public final class com/splendo/kaluga/permissions/notifications/PermissionKt {
-	public static final fun registerNotificationsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerNotificationsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerNotificationsPermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerNotificationsPermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerNotificationsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerNotificationsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerNotificationsPermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerNotificationsPermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerNotificationsPermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static synthetic fun registerNotificationsPermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static final fun registerNotificationsPermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static synthetic fun registerNotificationsPermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static final fun registerNotificationsPermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static synthetic fun registerNotificationsPermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static final fun registerNotificationsPermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
+	public static synthetic fun registerNotificationsPermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/notifications/BaseNotificationsPermissionManagerBuilder;
 }
 
diff --git a/notifications-permissions/src/commonMain/kotlin/Permission.kt b/notifications-permissions/src/commonMain/kotlin/Permission.kt
index a9ef213d8..cad514755 100644
--- a/notifications-permissions/src/commonMain/kotlin/Permission.kt
+++ b/notifications-permissions/src/commonMain/kotlin/Permission.kt
@@ -33,7 +33,7 @@ data class NotificationsPermission(val options: NotificationOptions? = null) : P
     override val name: String = "Notifications - ${options?.toString().orEmpty().ifEmpty { "Without Options" }}"
 }
 
-suspend fun PermissionsBuilder.registerNotificationsPermission(
+fun PermissionsBuilder.registerNotificationsPermission(
     notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -42,7 +42,7 @@ suspend fun PermissionsBuilder.registerNotificationsPermission(
         NotificationsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerNotificationsPermission(
+fun PermissionsBuilder.registerNotificationsPermission(
     notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
     notificationsPermissionStateRepoBuilder: (NotificationsPermission, BaseNotificationsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<NotificationsPermission>
 ) = notificationsPermissionManagerBuilderBuilder(context).also {
@@ -52,7 +52,7 @@ suspend fun PermissionsBuilder.registerNotificationsPermission(
     }
 }
 
-suspend fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
+fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
     notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -61,7 +61,7 @@ suspend fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
         NotificationsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
-suspend fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
+fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
     notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
     notificationsPermissionStateRepoBuilder: (NotificationsPermission, BaseNotificationsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<NotificationsPermission>
 ) = notificationsPermissionManagerBuilderBuilder(context).also {
diff --git a/permissions/api/androidLib/permissions.api b/permissions/api/androidLib/permissions.api
index e31d48e29..0aa4131f6 100644
--- a/permissions/api/androidLib/permissions.api
+++ b/permissions/api/androidLib/permissions.api
@@ -1,5 +1,5 @@
 public final class com/splendo/kaluga/permissions/RegisterAllPermissionsKt {
-	public static final fun registerAllPermissions-dWUq8MI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerAllPermissions-dWUq8MI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerAllPermissions-8Mi8wO0 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)V
+	public static synthetic fun registerAllPermissions-8Mi8wO0$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)V
 }
 
diff --git a/permissions/api/jvm/permissions.api b/permissions/api/jvm/permissions.api
index e31d48e29..0aa4131f6 100644
--- a/permissions/api/jvm/permissions.api
+++ b/permissions/api/jvm/permissions.api
@@ -1,5 +1,5 @@
 public final class com/splendo/kaluga/permissions/RegisterAllPermissionsKt {
-	public static final fun registerAllPermissions-dWUq8MI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerAllPermissions-dWUq8MI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerAllPermissions-8Mi8wO0 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)V
+	public static synthetic fun registerAllPermissions-8Mi8wO0$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)V
 }
 
diff --git a/permissions/src/commonMain/kotlin/registerAllPermissions.kt b/permissions/src/commonMain/kotlin/registerAllPermissions.kt
index a5bc71753..e3990bab0 100644
--- a/permissions/src/commonMain/kotlin/registerAllPermissions.kt
+++ b/permissions/src/commonMain/kotlin/registerAllPermissions.kt
@@ -29,7 +29,7 @@ import com.splendo.kaluga.permissions.notifications.registerNotificationsPermiss
 import com.splendo.kaluga.permissions.storage.registerStoragePermission
 import kotlin.time.Duration
 
-suspend fun PermissionsBuilder.registerAllPermissions(
+fun PermissionsBuilder.registerAllPermissions(
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
 ) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cf929ef1d..d9bc3de49 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,6 +21,7 @@ pluginManagement {
             val kalugaKotlinVersion = settings.extra["kaluga.kotlinVersion"]
             val kalugaKtLintGradlePluginVersion = settings.extra["kaluga.ktLintGradlePluginVersion"]
             val kalugaGoogleServicesGradlePluginVersion = settings.extra["kaluga.googleServicesGradlePluginVersion"]
+            val kalugaAtomicFuGradlePluginVersion = settings.extra["kaluga.atomicFuGradlePluginVersion"]
             val kalugaBinaryCompatibilityValidatorVersion = settings.extra["kaluga.binaryCompatibilityValidatorVersion"]
 
             when (requested.id.id) {
@@ -39,6 +40,7 @@ pluginManagement {
                 -> useVersion("com.google.gms:google-services:$kalugaGoogleServicesGradlePluginVersion")
                 "org.jetbrains.kotlinx.binary-compatibility-validator"
                 -> useVersion("$kalugaBinaryCompatibilityValidatorVersion")
+                "org.jetbrains.kotlinx.atomicfu" -> useVersion("$kalugaAtomicFuGradlePluginVersion")
             }
         }
     }
diff --git a/storage-permissions/api/androidLib/storage-permissions.api b/storage-permissions/api/androidLib/storage-permissions.api
index 92c791b14..e5f65e38e 100644
--- a/storage-permissions/api/androidLib/storage-permissions.api
+++ b/storage-permissions/api/androidLib/storage-permissions.api
@@ -8,14 +8,14 @@ public final class com/splendo/kaluga/permissions/storage/DefaultStoragePermissi
 }
 
 public final class com/splendo/kaluga/permissions/storage/PermissionKt {
-	public static final fun registerStoragePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerStoragePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerStoragePermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerStoragePermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerStoragePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerStoragePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerStoragePermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerStoragePermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerStoragePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static synthetic fun registerStoragePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static final fun registerStoragePermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static synthetic fun registerStoragePermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static final fun registerStoragePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static synthetic fun registerStoragePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static final fun registerStoragePermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static synthetic fun registerStoragePermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
 }
 
 public final class com/splendo/kaluga/permissions/storage/StoragePermission : com/splendo/kaluga/permissions/base/Permission {
diff --git a/storage-permissions/api/jvm/storage-permissions.api b/storage-permissions/api/jvm/storage-permissions.api
index 6b9655f38..4d568e4bb 100644
--- a/storage-permissions/api/jvm/storage-permissions.api
+++ b/storage-permissions/api/jvm/storage-permissions.api
@@ -11,14 +11,14 @@ public final class com/splendo/kaluga/permissions/storage/DefaultStoragePermissi
 }
 
 public final class com/splendo/kaluga/permissions/storage/PermissionKt {
-	public static final fun registerStoragePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerStoragePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerStoragePermission-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerStoragePermission-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerStoragePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerStoragePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun registerStoragePermissionIfNotRegistered-1Y68eR8 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun registerStoragePermissionIfNotRegistered-1Y68eR8$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun registerStoragePermission (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static synthetic fun registerStoragePermission$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static final fun registerStoragePermission-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static synthetic fun registerStoragePermission-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static final fun registerStoragePermissionIfNotRegistered (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static synthetic fun registerStoragePermissionIfNotRegistered$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static final fun registerStoragePermissionIfNotRegistered-exY8QGI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
+	public static synthetic fun registerStoragePermissionIfNotRegistered-exY8QGI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/jvm/functions/Function1;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/storage/BaseStoragePermissionManagerBuilder;
 }
 
 public final class com/splendo/kaluga/permissions/storage/StoragePermission : com/splendo/kaluga/permissions/base/Permission {
diff --git a/storage-permissions/src/commonMain/kotlin/Permission.kt b/storage-permissions/src/commonMain/kotlin/Permission.kt
index 7a127361c..2a7abdd3a 100644
--- a/storage-permissions/src/commonMain/kotlin/Permission.kt
+++ b/storage-permissions/src/commonMain/kotlin/Permission.kt
@@ -34,7 +34,7 @@ data class StoragePermission(val allowWrite: Boolean = false) : Permission() {
     override val name: String = "Storage - ${if (allowWrite) "ReadWrite" else "ReadOnly"}"
 }
 
-suspend fun PermissionsBuilder.registerStoragePermission(
+fun PermissionsBuilder.registerStoragePermission(
     storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -49,7 +49,7 @@ suspend fun PermissionsBuilder.registerStoragePermission(
         )
     }
 
-suspend fun PermissionsBuilder.registerStoragePermission(
+fun PermissionsBuilder.registerStoragePermission(
     storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
     storagePermissionStateRepoBuilder: (StoragePermission, BaseStoragePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<StoragePermission>
 ) = storagePermissionManagerBuilderBuilder(context).also {
@@ -59,7 +59,7 @@ suspend fun PermissionsBuilder.registerStoragePermission(
     }
 }
 
-suspend fun PermissionsBuilder.registerStoragePermissionIfNotRegistered(
+fun PermissionsBuilder.registerStoragePermissionIfNotRegistered(
     storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
     settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
@@ -74,7 +74,7 @@ suspend fun PermissionsBuilder.registerStoragePermissionIfNotRegistered(
         )
     }
 
-suspend fun PermissionsBuilder.registerStoragePermissionIfNotRegistered(
+fun PermissionsBuilder.registerStoragePermissionIfNotRegistered(
     storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
     storagePermissionStateRepoBuilder: (StoragePermission, BaseStoragePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<StoragePermission>
 ) = storagePermissionManagerBuilderBuilder(context).also {
diff --git a/system/api/jvm/system.api b/system/api/jvm/system.api
index b73607cc9..c84f0df81 100644
--- a/system/api/jvm/system.api
+++ b/system/api/jvm/system.api
@@ -82,9 +82,7 @@ public abstract interface class com/splendo/kaluga/system/network/ReachableNetwo
 
 public abstract class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/state/KalugaState {
 	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/Network;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
diff --git a/test-utils-architecture/build.gradle.kts b/test-utils-architecture/build.gradle.kts
index ea94dc000..bdc5101b6 100644
--- a/test-utils-architecture/build.gradle.kts
+++ b/test-utils-architecture/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("convention.publication")
     id("com.android.library")
     id("org.jlleitschuh.gradle.ktlint")
+    id("kotlinx-atomicfu")
 }
 
 publishableComponent()
diff --git a/test-utils-architecture/src/commonTest/kotlin/UIThreadViewModelTestTest.kt b/test-utils-architecture/src/commonTest/kotlin/UIThreadViewModelTestTest.kt
index 85a3a1fb3..294258b59 100644
--- a/test-utils-architecture/src/commonTest/kotlin/UIThreadViewModelTestTest.kt
+++ b/test-utils-architecture/src/commonTest/kotlin/UIThreadViewModelTestTest.kt
@@ -21,6 +21,7 @@ import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedSubject
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.test.base.yieldMultiple
+import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
@@ -34,7 +35,7 @@ import kotlin.test.fail
 class LazyUIThreadViewModelTestTest : UIThreadViewModelTest<LazyUIThreadViewModelTestTest.CustomLazyViewModelTestContext, LazyUIThreadViewModelTestTest.ViewModel>() {
 
     companion object {
-        var isDisposed = false
+        val isDisposed = atomic(false)
     }
 
     class ViewModel : BaseLifecycleViewModel() {
@@ -45,7 +46,7 @@ class LazyUIThreadViewModelTestTest : UIThreadViewModelTest<LazyUIThreadViewMode
         LazyViewModelTestContext<ViewModel>(coroutineScope, { ViewModel() }) {
 
         override fun dispose() {
-            isDisposed = true
+            isDisposed.value = true
         }
     }
 
@@ -72,12 +73,12 @@ class LazyUIThreadViewModelTestTest : UIThreadViewModelTest<LazyUIThreadViewMode
 
     @BeforeTest
     fun resetDisposed() {
-        isDisposed = false
+        isDisposed.value = false
     }
 
     @AfterTest
     fun testDisposed() {
-        assertTrue(isDisposed)
+        assertTrue(isDisposed.value)
     }
 }
 
diff --git a/test-utils-base/build.gradle.kts b/test-utils-base/build.gradle.kts
index 4e93e3911..b858911bd 100644
--- a/test-utils-base/build.gradle.kts
+++ b/test-utils-base/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("convention.publication")
     id("com.android.library")
     id("org.jlleitschuh.gradle.ktlint")
+    id("kotlinx-atomicfu")
 }
 
 publishableComponent()
diff --git a/test-utils-base/src/commonMain/kotlin/FlowTest.kt b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
index dc98f501d..4391198e5 100644
--- a/test-utils-base/src/commonMain/kotlin/FlowTest.kt
+++ b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
@@ -26,10 +26,19 @@ import com.splendo.kaluga.logging.e
 import com.splendo.kaluga.logging.warn
 import com.splendo.kaluga.test.base.BaseUIThreadTest.EmptyTestContext
 import com.splendo.kaluga.test.base.BaseUIThreadTest.TestContext
-import kotlinx.coroutines.*
+import kotlinx.atomicfu.atomic
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
 import kotlin.test.AfterTest
 import kotlin.time.Duration.Companion.seconds
 
@@ -81,12 +90,12 @@ private suspend fun <TC : TestContext> testContext(cookie: Long, testContext: su
     return contextMap[cookie] as TC
 }
 
-private var cookieTin = 0L
+private val cookieTin = atomic(0L)
 
 abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: CoroutineScope = MainScope()) : BaseUIThreadTest<C, TC>(), CoroutineScope by scope {
 
     // used for thread local map access to store the testContext
-    private val cookie = ++cookieTin
+    private val cookie = cookieTin.incrementAndGet()
 
     abstract val flowFromTestContext: suspend TC.() -> F
 
diff --git a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
index a29e51e17..48fb3a938 100644
--- a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
@@ -293,17 +293,17 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner : c
 	public final fun getDidStopScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getGenerateEnableSensorsActionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getPairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStartMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStartMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun isEnabled ()Lkotlinx/coroutines/flow/MutableStateFlow;
 	public fun isSupported ()Z
 	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
-	public fun startMonitoringHardwareEnabled ()V
-	public fun startMonitoringPermissions ()V
-	public fun stopMonitoringHardwareEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner$Builder : com/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder {
@@ -323,10 +323,10 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanner : com/s
 	public final fun getPairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getRequestEnableHardwareMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getScanForDevicesMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStartMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStartMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public fun isHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun isHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
@@ -334,10 +334,10 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanner : com/s
 	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
 	public fun requestEnableHardware (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun scanForDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startMonitoringHardwareEnabled ()V
-	public fun startMonitoringPermissions ()V
-	public fun stopMonitoringHardwareEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
diff --git a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
index 422e2d921..2e1afc1c2 100644
--- a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
@@ -201,17 +201,17 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner : c
 	public final fun getDidStopScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getGenerateEnableSensorsActionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getPairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStartMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStartMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun isEnabled ()Lkotlinx/coroutines/flow/MutableStateFlow;
 	public fun isSupported ()Z
 	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
-	public fun startMonitoringHardwareEnabled ()V
-	public fun startMonitoringPermissions ()V
-	public fun stopMonitoringHardwareEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner$Builder : com/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder {
@@ -231,10 +231,10 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanner : com/s
 	public final fun getPairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getRequestEnableHardwareMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getScanForDevicesMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStartMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStartMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public fun isHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun isHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
@@ -242,10 +242,10 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanner : com/s
 	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
 	public fun requestEnableHardware (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun scanForDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startMonitoringHardwareEnabled ()V
-	public fun startMonitoringPermissions ()V
-	public fun stopMonitoringHardwareEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
@@ -268,11 +268,9 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$D
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Deinitialized;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;ILjava/lang/Object;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getPreviouslyDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -304,9 +302,7 @@ public abstract class com/splendo/kaluga/test/bluetooth/scanner/MockScanningStat
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Idle : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun refresh (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun startScanning (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
@@ -315,10 +311,8 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$E
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Scanning : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;)V
 	public fun discoverDevice (Lcom/splendo/kaluga/bluetooth/UUID;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getStopScanning ()Lkotlin/jvm/functions/Function1;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
@@ -334,10 +328,8 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$I
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Initializing;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Initializing;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;ILjava/lang/Object;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialized (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -350,25 +342,19 @@ public abstract class com/splendo/kaluga/test/bluetooth/scanner/MockScanningStat
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoBluetooth$Disabled : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled {
 	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoBluetooth$MissingPermissions : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions {
 	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun permit (Z)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoHardware : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware {
 	public static final field INSTANCE Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoHardware;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
@@ -378,9 +364,7 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$N
 	public final fun copy (Z)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NotInitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NotInitialized;ZILjava/lang/Object;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NotInitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun isHardwareSupported ()Z
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public final fun startInitializing ()Lkotlin/jvm/functions/Function0;
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
index 53e0966e0..774d0df94 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
@@ -36,16 +36,16 @@ class MockScanner(
 ) : Scanner {
 
     val startMonitoringPermissionsMock = ::startMonitoringPermissions.mock()
-    override fun startMonitoringPermissions(): Unit = startMonitoringPermissionsMock.call()
+    override suspend fun startMonitoringPermissions(): Unit = startMonitoringPermissionsMock.call()
 
     val stopMonitoringPermissionsMock = ::stopMonitoringPermissions.mock()
-    override fun stopMonitoringPermissions(): Unit = stopMonitoringPermissionsMock.call()
+    override suspend fun stopMonitoringPermissions(): Unit = stopMonitoringPermissionsMock.call()
 
     val startMonitoringHardwareEnabledMock = ::startMonitoringHardwareEnabled.mock()
-    override fun startMonitoringHardwareEnabled(): Unit = startMonitoringHardwareEnabledMock.call()
+    override suspend fun startMonitoringHardwareEnabled(): Unit = startMonitoringHardwareEnabledMock.call()
 
     val stopMonitoringHardwareEnabledMock = ::stopMonitoringHardwareEnabled.mock()
-    override fun stopMonitoringHardwareEnabled(): Unit = stopMonitoringHardwareEnabledMock.call()
+    override suspend fun stopMonitoringHardwareEnabled(): Unit = stopMonitoringHardwareEnabledMock.call()
 
     val isHardwareEnabledMock = ::isHardwareEnabled.mock()
     override suspend fun isHardwareEnabled(): Boolean = isHardwareEnabledMock.call()
@@ -162,22 +162,22 @@ class MockBaseScanner(
      */
     val pairedDevicesMock = ::pairedDevices.mock()
 
-    override fun startMonitoringPermissions() {
+    override suspend fun startMonitoringPermissions() {
         super.startMonitoringPermissions()
         startMonitoringPermissionsMock.call()
     }
 
-    override fun stopMonitoringPermissions() {
+    override suspend fun stopMonitoringPermissions() {
         super.stopMonitoringPermissions()
         stopMonitoringPermissionsMock.call()
     }
 
-    override fun startMonitoringHardwareEnabled() {
+    override suspend fun startMonitoringHardwareEnabled() {
         super.startMonitoringHardwareEnabled()
         startMonitoringHardwareEnabledMock.call()
     }
 
-    override fun stopMonitoringHardwareEnabled() {
+    override suspend fun stopMonitoringHardwareEnabled() {
         super.stopMonitoringHardwareEnabled()
         stopMonitoringHardwareEnabledMock.call()
     }
diff --git a/test-utils-location/api/androidLib/test-utils-location.api b/test-utils-location/api/androidLib/test-utils-location.api
index e4e480ee4..b3505ec97 100644
--- a/test-utils-location/api/androidLib/test-utils-location.api
+++ b/test-utils-location/api/androidLib/test-utils-location.api
@@ -13,17 +13,17 @@ public final class com/splendo/kaluga/test/location/MockBaseLocationManager : co
 	public final fun getRequestEnableLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public fun requestEnableLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startMonitoringPermissions ()V
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun stopMonitoringLocationEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun stopMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/test/location/MockBaseLocationManager$Builder : com/splendo/kaluga/location/BaseLocationManager$Builder {
@@ -45,19 +45,19 @@ public final class com/splendo/kaluga/test/location/MockLocationManager : com/sp
 	public final fun getRequestEnableLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public fun isLocationEnabled ()Z
 	public final fun isLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public fun requestEnableLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startMonitoringPermissions ()V
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun stopMonitoringLocationEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun stopMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/test/location/MockLocationMonitor : com/splendo/kaluga/test/base/monitor/MockServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
diff --git a/test-utils-location/api/jvm/test-utils-location.api b/test-utils-location/api/jvm/test-utils-location.api
index 32fef185c..9eb60cd69 100644
--- a/test-utils-location/api/jvm/test-utils-location.api
+++ b/test-utils-location/api/jvm/test-utils-location.api
@@ -6,17 +6,17 @@ public final class com/splendo/kaluga/test/location/MockBaseLocationManager : co
 	public final fun getRequestEnableLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public fun requestEnableLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startMonitoringPermissions ()V
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun stopMonitoringLocationEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun stopMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/test/location/MockBaseLocationManager$Builder : com/splendo/kaluga/location/BaseLocationManager$Builder {
@@ -38,19 +38,19 @@ public final class com/splendo/kaluga/test/location/MockLocationManager : com/sp
 	public final fun getRequestEnableLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public final fun getStopMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public fun isLocationEnabled ()Z
 	public final fun isLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public fun requestEnableLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startMonitoringPermissions ()V
+	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun stopMonitoringLocationEnabled ()V
-	public fun stopMonitoringPermissions ()V
+	public fun stopMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/test/location/MockLocationMonitor : com/splendo/kaluga/test/base/monitor/MockServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
@@ -73,11 +73,9 @@ public final class com/splendo/kaluga/test/location/MockLocationState$Deinitiali
 	public final fun copy (Lcom/splendo/kaluga/location/Location;)Lcom/splendo/kaluga/test/location/MockLocationState$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/location/MockLocationState$Deinitialized;Lcom/splendo/kaluga/location/Location;ILjava/lang/Object;)Lcom/splendo/kaluga/test/location/MockLocationState$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -87,19 +85,15 @@ public abstract class com/splendo/kaluga/test/location/MockLocationState$Disable
 
 public final class com/splendo/kaluga/test/location/MockLocationState$Disabled$NoGPS : com/splendo/kaluga/test/location/MockLocationState$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NoGPS {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/location/MockLocationState$Disabled$NotPermitted : com/splendo/kaluga/test/location/MockLocationState$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NotPermitted {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun permit (Z)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
@@ -110,12 +104,10 @@ public final class com/splendo/kaluga/test/location/MockLocationState$Enabled :
 	public final fun copy (Lcom/splendo/kaluga/location/Location;)Lcom/splendo/kaluga/test/location/MockLocationState$Enabled;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/location/MockLocationState$Enabled;Lcom/splendo/kaluga/location/Location;ILjava/lang/Object;)Lcom/splendo/kaluga/test/location/MockLocationState$Enabled;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDisable ()Lkotlin/jvm/functions/Function1;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 	public fun updateWithLocation (Lcom/splendo/kaluga/location/Location$KnownLocation;)Lkotlin/jvm/functions/Function1;
@@ -130,10 +122,8 @@ public final class com/splendo/kaluga/test/location/MockLocationState$Initializi
 	public final fun copy (Lcom/splendo/kaluga/location/Location;)Lcom/splendo/kaluga/test/location/MockLocationState$Initializing;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/location/MockLocationState$Initializing;Lcom/splendo/kaluga/location/Location;ILjava/lang/Object;)Lcom/splendo/kaluga/test/location/MockLocationState$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -141,9 +131,7 @@ public final class com/splendo/kaluga/test/location/MockLocationState$Initializi
 
 public final class com/splendo/kaluga/test/location/MockLocationState$NotInitialized : com/splendo/kaluga/test/location/MockLocationState$Inactive, com/splendo/kaluga/location/LocationState$NotInitialized {
 	public static final field INSTANCE Lcom/splendo/kaluga/test/location/MockLocationState$NotInitialized;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public final fun startInitializing ()Lkotlin/jvm/functions/Function0;
 }
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt b/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
index 05796d071..b4c14cd8d 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
@@ -47,11 +47,11 @@ class MockLocationManager(
     val startMonitoringLocationEnabledMock = ::startMonitoringLocationEnabled.mock()
     override suspend fun startMonitoringLocationEnabled(): Unit = startMonitoringLocationEnabledMock.call()
     val stopMonitoringLocationEnabledMock = ::stopMonitoringLocationEnabled.mock()
-    override fun stopMonitoringLocationEnabled(): Unit = stopMonitoringLocationEnabledMock.call()
+    override suspend fun stopMonitoringLocationEnabled(): Unit = stopMonitoringLocationEnabledMock.call()
     val startMonitoringPermissionsMock = ::startMonitoringPermissions.mock()
-    override fun startMonitoringPermissions(): Unit = startMonitoringPermissionsMock.call()
+    override suspend fun startMonitoringPermissions(): Unit = startMonitoringPermissionsMock.call()
     val stopMonitoringPermissionsMock = ::stopMonitoringPermissions.mock()
-    override fun stopMonitoringPermissions(): Unit = stopMonitoringPermissionsMock.call()
+    override suspend fun stopMonitoringPermissions(): Unit = stopMonitoringPermissionsMock.call()
 }
 
 /**
@@ -143,12 +143,12 @@ class MockBaseLocationManager(
      */
     val stopMonitoringLocationMock = ::stopMonitoringLocation.mock()
 
-    override fun startMonitoringPermissions() {
+    override suspend fun startMonitoringPermissions() {
         super.startMonitoringPermissions()
         startMonitoringPermissionsMock.call()
     }
 
-    override fun stopMonitoringPermissions() {
+    override suspend fun stopMonitoringPermissions() {
         super.stopMonitoringPermissions()
         stopMonitoringPermissionsMock.call()
     }
@@ -158,7 +158,7 @@ class MockBaseLocationManager(
         startMonitoringLocationEnabledMock.call()
     }
 
-    override fun stopMonitoringLocationEnabled() {
+    override suspend fun stopMonitoringLocationEnabled() {
         super.stopMonitoringLocationEnabled()
         stopMonitoringLocationEnabledMock.call()
     }
diff --git a/test-utils-permissions/api/jvm/test-utils-permissions.api b/test-utils-permissions/api/jvm/test-utils-permissions.api
index b0d79d054..964a9c3d3 100644
--- a/test-utils-permissions/api/jvm/test-utils-permissions.api
+++ b/test-utils-permissions/api/jvm/test-utils-permissions.api
@@ -63,49 +63,37 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionState$Activ
 
 public final class com/splendo/kaluga/test/permissions/MockPermissionState$Allowed : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Allowed {
 	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/permissions/MockPermissionState$Deinitialized : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Deinitialized {
 	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/permissions/MockPermissionState$Initializing : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Initializing {
 	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/permissions/MockPermissionState$Locked : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Denied$Locked {
 	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/permissions/MockPermissionState$Requestable : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable {
 	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/permissions/MockPermissionState$Uninitialized : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Uninitialized {
 	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 

From b0b25d00b669dc9964c75a24c7f9eda1f1b2a1e3 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 14 Nov 2022 17:25:51 +0100
Subject: [PATCH 016/227] Fixed typo

---
 .../kotlin/device/DefaultDeviceConnectionManager.kt    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
index b81a75686..90cb69da1 100644
--- a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -70,7 +70,7 @@ internal actual class DefaultDeviceConnectionManager(
         private const val TAG = "IOS Bluetooth DeviceConnectionManager"
     }
 
-    private val discoveringMutext = Mutex()
+    private val discoveringMutex = Mutex()
     private val discoveringServices = mutableListOf<CBUUID>()
     private val discoveringCharacteristics = mutableListOf<CBUUID>()
 
@@ -138,7 +138,7 @@ internal actual class DefaultDeviceConnectionManager(
     }
 
     override suspend fun discoverServices() {
-        discoveringMutext.withLock {
+        discoveringMutex.withLock {
             discoveringServices.clear()
             discoveringCharacteristics.clear()
             peripheral.discoverServices(null)
@@ -206,7 +206,7 @@ internal actual class DefaultDeviceConnectionManager(
 
     private fun didDiscoverServices() {
         launch {
-            discoveringMutext.withLock {
+            discoveringMutex.withLock {
                 discoveringServices.addAll(
                     peripheral.services?.typedList<CBService>()?.map {
                         peripheral.discoverCharacteristics(emptyList<CBUUID>(), it)
@@ -221,7 +221,7 @@ internal actual class DefaultDeviceConnectionManager(
 
     private fun didDiscoverCharacteristic(forService: CBService) {
         launch {
-            discoveringMutext.withLock {
+            discoveringMutex.withLock {
                 discoveringServices.remove(forService.UUID)
                 discoveringCharacteristics.addAll(
                     forService.characteristics?.typedList<CBCharacteristic>()?.map {
@@ -236,7 +236,7 @@ internal actual class DefaultDeviceConnectionManager(
 
     private fun didDiscoverDescriptors(forCharacteristic: CBCharacteristic) {
         launch {
-            discoveringMutext.withLock {
+            discoveringMutex.withLock {
                 discoveringCharacteristics.remove(forCharacteristic.UUID)
             }
             checkScanComplete()

From 0f2f21d83c426dee23c9471b9ea6254ec237bfdc Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 14 Nov 2022 17:28:52 +0100
Subject: [PATCH 017/227] Beacons thread safety

---
 beacons/src/commonMain/kotlin/Beacons.kt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/beacons/src/commonMain/kotlin/Beacons.kt b/beacons/src/commonMain/kotlin/Beacons.kt
index 063f574b3..34fdf104c 100644
--- a/beacons/src/commonMain/kotlin/Beacons.kt
+++ b/beacons/src/commonMain/kotlin/Beacons.kt
@@ -50,7 +50,8 @@ class Beacons(
 
     private companion object { const val TAG = "Beacons" }
 
-    private val lock = Mutex()
+    private val monitoringLock = Mutex()
+    private val updateLock = Mutex()
     private val cache = mutableMapOf<BeaconID, BeaconJob>()
     private val cacheJob = Job()
     private val coroutineScope = CoroutineScope(Dispatchers.Default + cacheJob)
@@ -60,7 +61,7 @@ class Beacons(
     val beacons: StateFlow<Set<BeaconInfo>>
         get() = _beacons.asStateFlow()
 
-    suspend fun startMonitoring(coroutineScope: CoroutineScope) = lock.withLock {
+    suspend fun startMonitoring(coroutineScope: CoroutineScope) = monitoringLock.withLock {
         debug(TAG, "Start monitoring")
         _beacons.value = emptySet()
         bluetooth.startScanning()
@@ -72,7 +73,7 @@ class Beacons(
         }
     }
 
-    suspend fun stopMonitoring() = lock.withLock {
+    suspend fun stopMonitoring() = monitoringLock.withLock {
         debug(TAG, "Stop monitoring")
         bluetooth.stopScanning()
         monitoringJob.value?.cancel()
@@ -86,7 +87,7 @@ class Beacons(
         list.any { beaconIds.containsLowerCased(it.beaconID.asString()) }
     }
 
-    private suspend fun updateBeacons(discovered: List<BeaconInfo>) {
+    private suspend fun updateBeacons(discovered: List<BeaconInfo>) = updateLock.withLock {
         debug(TAG, "Total Beacons discovered: ${discovered.size}")
         discovered.forEach { beacon ->
             if (cache.containsKey(beacon.beaconID)) {

From 1085fbc22eb69c239ee7f3903b8e1ee657823e0e Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 15 Nov 2022 14:06:38 +0100
Subject: [PATCH 018/227] Fixed AtomicFu Android issues

https://github.com/Kotlin/kotlinx-atomicfu/issues/145#issuecomment-807336338
---
 architecture/build.gradle.kts                             | 8 +-------
 base-permissions/build.gradle.kts                         | 2 +-
 base/build.gradle.kts                                     | 3 +--
 bluetooth/build.gradle.kts                                | 1 +
 calendar-permissions/build.gradle.kts                     | 2 --
 kaluga-library-components/src/main/kotlin/Dependencies.kt | 7 +++++--
 location/build.gradle.kts                                 | 1 +
 logging/build.gradle.kts                                  | 1 +
 test-utils-koin/build.gradle.kts                          | 1 -
 9 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts
index d5c2488e9..043ed598a 100644
--- a/architecture/build.gradle.kts
+++ b/architecture/build.gradle.kts
@@ -11,11 +11,6 @@ plugins {
 publishableComponent()
 
 dependencies {
-    val ext = (gradle as ExtensionAware).extra
-    val kotlin_version: String by ext
-    val androidx_lifecycle_version: String by ext
-    val androidx_browser_version: String by ext
-
     api("org.jetbrains.kotlin:kotlin-reflect:${Library.kotlinVersion}")
     expose(Dependencies.AndroidX.Lifecycle.Runtime)
     expose(Dependencies.AndroidX.Lifecycle.ViewModel)
@@ -25,14 +20,13 @@ dependencies {
 
 kotlin {
     sourceSets {
-        val ext = (gradle as ExtensionAware).extra
-        val serialization_version: String by ext
 
         getByName("commonMain") {
             dependencies {
                 implementation(project(":base", ""))
                 expose(Dependencies.KotlinX.Serialization.Core)
                 expose(Dependencies.KotlinX.Serialization.Json)
+                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
 
diff --git a/base-permissions/build.gradle.kts b/base-permissions/build.gradle.kts
index e6423f33c..54f766aac 100644
--- a/base-permissions/build.gradle.kts
+++ b/base-permissions/build.gradle.kts
@@ -12,11 +12,11 @@ publishableComponent()
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
 
             dependencies {
                 api(project(":logging", ""))
                 api(project(":base", ""))
+                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
         getByName("commonTest") {
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index 784670e26..a4ca02947 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -12,11 +12,10 @@ publishableComponent()
 kotlin {
     sourceSets {
 
-        val ext = (gradle as ExtensionAware).extra
-
         getByName("commonMain") {
             dependencies {
                 implementation(project(":logging", ""))
+                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
         getByName("jsMain") {
diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts
index b02e51210..6ad18029a 100644
--- a/bluetooth/build.gradle.kts
+++ b/bluetooth/build.gradle.kts
@@ -19,6 +19,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":bluetooth-permissions", ""))
+                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
         commonTest {
diff --git a/calendar-permissions/build.gradle.kts b/calendar-permissions/build.gradle.kts
index cbf121810..e149787d0 100644
--- a/calendar-permissions/build.gradle.kts
+++ b/calendar-permissions/build.gradle.kts
@@ -11,8 +11,6 @@ publishableComponent()
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
                 api(project(":base-permissions", ""))
             }
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index 8b93445eb..0512cb7ea 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -50,9 +50,11 @@ object Dependencies {
     }
 
     object KotlinX {
+
+        private const val group = "org.jetbrains.kotlinx"
+
         object Coroutines {
             private const val version = "1.6.4"
-            private const val group = "org.jetbrains.kotlinx"
             val Android = Dependency(group, "kotlinx-coroutines-android", version)
             val Core = Dependency(group, "kotlinx-coroutines-core", version)
             val Swing = Dependency(group, "kotlinx-coroutines-swing", version)
@@ -64,10 +66,11 @@ object Dependencies {
 
         object Serialization {
             private const val version =  "1.4.0"
-            private const val group = "org.jetbrains.kotlinx"
             val Core = Dependency(group, "kotlinx-serialization-core", version)
             val Json = Dependency(group, "kotlinx-serialization-json", version)
         }
+
+        val AtomicFu = Dependency(group, "atomicfu", "0.18.5")
     }
 
     object Android {
diff --git a/location/build.gradle.kts b/location/build.gradle.kts
index a340f2a8f..9665f2872 100644
--- a/location/build.gradle.kts
+++ b/location/build.gradle.kts
@@ -19,6 +19,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":location-permissions", ""))
+                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
         commonTest {
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
index 98be16802..214ebe4b8 100644
--- a/logging/build.gradle.kts
+++ b/logging/build.gradle.kts
@@ -19,6 +19,7 @@ kotlin {
         commonTest {
             dependencies {
                 api(project(":test-utils-base", ""))
+                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
     }
diff --git a/test-utils-koin/build.gradle.kts b/test-utils-koin/build.gradle.kts
index 90c147628..26acc8a33 100644
--- a/test-utils-koin/build.gradle.kts
+++ b/test-utils-koin/build.gradle.kts
@@ -11,7 +11,6 @@ publishableComponent()
 kotlin {
     sourceSets {
         commonMain {
-            val ext = (gradle as ExtensionAware).extra
             dependencies {
                 api(project(":test-utils-base"))
                 api(project(":test-utils-architecture"))

From 87750cae03e9e314d86a9e4b201e125ce633f314 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 15 Nov 2022 14:59:33 +0100
Subject: [PATCH 019/227] Moving AtomicFu dependencies to Android only

This should deal with transitive issues on Native
---
 architecture/build.gradle.kts     | 2 +-
 base-permissions/build.gradle.kts | 5 ++++-
 base/build.gradle.kts             | 5 ++++-
 bluetooth/build.gradle.kts        | 2 +-
 location/build.gradle.kts         | 2 +-
 logging/build.gradle.kts          | 5 ++++-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts
index 043ed598a..bcf3a5adb 100644
--- a/architecture/build.gradle.kts
+++ b/architecture/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
     expose(Dependencies.AndroidX.Lifecycle.ViewModel)
     expose(Dependencies.AndroidX.Lifecycle.LiveData)
     implement(Dependencies.AndroidX.Browser)
+    implement(Dependencies.KotlinX.AtomicFu)
 }
 
 kotlin {
@@ -26,7 +27,6 @@ kotlin {
                 implementation(project(":base", ""))
                 expose(Dependencies.KotlinX.Serialization.Core)
                 expose(Dependencies.KotlinX.Serialization.Json)
-                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
 
diff --git a/base-permissions/build.gradle.kts b/base-permissions/build.gradle.kts
index 54f766aac..091b05ac0 100644
--- a/base-permissions/build.gradle.kts
+++ b/base-permissions/build.gradle.kts
@@ -9,6 +9,10 @@ plugins {
 
 publishableComponent()
 
+dependencies {
+    implement(Dependencies.KotlinX.AtomicFu)
+}
+
 kotlin {
     sourceSets {
         getByName("commonMain") {
@@ -16,7 +20,6 @@ kotlin {
             dependencies {
                 api(project(":logging", ""))
                 api(project(":base", ""))
-                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
         getByName("commonTest") {
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index a4ca02947..5845c6b98 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -9,13 +9,16 @@ plugins {
 
 publishableComponent()
 
+dependencies {
+    implement(Dependencies.KotlinX.AtomicFu)
+}
+
 kotlin {
     sourceSets {
 
         getByName("commonMain") {
             dependencies {
                 implementation(project(":logging", ""))
-                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
         getByName("jsMain") {
diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts
index 6ad18029a..5f166f78f 100644
--- a/bluetooth/build.gradle.kts
+++ b/bluetooth/build.gradle.kts
@@ -12,6 +12,7 @@ publishableComponent()
 dependencies {
     implement(Dependencies.BLEScanner)
     implementation(project(":location", ""))
+    implement(Dependencies.KotlinX.AtomicFu)
 }
 
 kotlin {
@@ -19,7 +20,6 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":bluetooth-permissions", ""))
-                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
         commonTest {
diff --git a/location/build.gradle.kts b/location/build.gradle.kts
index 9665f2872..166d29de2 100644
--- a/location/build.gradle.kts
+++ b/location/build.gradle.kts
@@ -12,6 +12,7 @@ publishableComponent()
 dependencies {
     implement(Dependencies.Android.PlayServices.Location)
     implement(Dependencies.KotlinX.Coroutines.PlayServices)
+    implement(Dependencies.KotlinX.AtomicFu)
 }
 
 kotlin {
@@ -19,7 +20,6 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":location-permissions", ""))
-                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
         commonTest {
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
index 214ebe4b8..d31c26b5a 100644
--- a/logging/build.gradle.kts
+++ b/logging/build.gradle.kts
@@ -9,6 +9,10 @@ plugins {
 
 publishableComponent()
 
+dependencies {
+    implement(Dependencies.KotlinX.AtomicFu)
+}
+
 kotlin {
     sourceSets {
         commonMain {
@@ -19,7 +23,6 @@ kotlin {
         commonTest {
             dependencies {
                 api(project(":test-utils-base", ""))
-                implement(Dependencies.KotlinX.AtomicFu)
             }
         }
     }

From 9874e42f56146b57333bd1c5d240a09d1ec13523 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 4 Nov 2022 16:37:40 +0100
Subject: [PATCH 020/227] Setting up new example code

---
 kaluga-library-components/settings/gradle.kts |  30 --
 .../src/main/kotlin/Library.kt                |  39 +-
 newexample/.gitignore                         |  10 +
 newexample/android/build.gradle.kts           |  42 ++
 .../android/src/main/AndroidManifest.xml      |  17 +
 .../kaluga/example/android/MainActivity.kt    |  87 ++++
 .../android/src/main/res/values/styles.xml    |   3 +
 newexample/build.gradle.kts                   |  42 ++
 newexample/gradle.properties                  |  17 +
 newexample/gradle/wrapper/gradle-wrapper.jar  | Bin 0 -> 59203 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   6 +
 newexample/gradlew                            | 185 +++++++++
 newexample/gradlew.bat                        |  89 ++++
 newexample/ios/ios.xcodeproj/project.pbxproj  | 383 ++++++++++++++++++
 .../AccentColor.colorset/Contents.json        |  11 +
 .../AppIcon.appiconset/Contents.json          |  98 +++++
 .../ios/ios/Assets.xcassets/Contents.json     |   6 +
 newexample/ios/ios/ContentView.swift          |  16 +
 newexample/ios/ios/Info.plist                 |  48 +++
 .../Preview Assets.xcassets/Contents.json     |   6 +
 newexample/ios/ios/iOSApp.swift               |  10 +
 newexample/settings.gradle.kts                |  69 ++++
 newexample/shared/build.gradle.kts            |  57 +++
 .../com/splendo/kaluga/example/Platform.kt    |   7 +
 .../com/splendo/kaluga/example/Greeting.kt    |   9 +
 .../com/splendo/kaluga/example/Platform.kt    |   7 +
 .../com/splendo/kaluga/example/Platform.kt    |   9 +
 27 files changed, 1241 insertions(+), 62 deletions(-)
 create mode 100644 newexample/.gitignore
 create mode 100644 newexample/android/build.gradle.kts
 create mode 100644 newexample/android/src/main/AndroidManifest.xml
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/android/MainActivity.kt
 create mode 100644 newexample/android/src/main/res/values/styles.xml
 create mode 100644 newexample/build.gradle.kts
 create mode 100644 newexample/gradle.properties
 create mode 100644 newexample/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 newexample/gradle/wrapper/gradle-wrapper.properties
 create mode 100755 newexample/gradlew
 create mode 100644 newexample/gradlew.bat
 create mode 100644 newexample/ios/ios.xcodeproj/project.pbxproj
 create mode 100644 newexample/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json
 create mode 100644 newexample/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
 create mode 100644 newexample/ios/ios/Assets.xcassets/Contents.json
 create mode 100644 newexample/ios/ios/ContentView.swift
 create mode 100644 newexample/ios/ios/Info.plist
 create mode 100644 newexample/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json
 create mode 100644 newexample/ios/ios/iOSApp.swift
 create mode 100644 newexample/settings.gradle.kts
 create mode 100644 newexample/shared/build.gradle.kts
 create mode 100644 newexample/shared/src/androidMain/kotlin/com/splendo/kaluga/example/Platform.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Greeting.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Platform.kt
 create mode 100644 newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/Platform.kt

diff --git a/kaluga-library-components/settings/gradle.kts b/kaluga-library-components/settings/gradle.kts
index 39e6b7b2a..ac8878b62 100644
--- a/kaluga-library-components/settings/gradle.kts
+++ b/kaluga-library-components/settings/gradle.kts
@@ -21,34 +21,4 @@ pluginManagement {
         gradlePluginPortal()
         google()
     }
-
-    // resolutionStrategy {
-    //     eachPlugin {
-    //
-    //         val kalugaAndroidGradlePluginVersion =
-    //             settings.extra["kaluga.androidGradlePluginVersion"]
-    //         val kalugaKotlinVersion = settings.extra["kaluga.kotlinVersion"]
-    //         val kalugaKtLintGradlePluginVersion = settings.extra["kaluga.ktLintGradlePluginVersion"]
-    //         val kalugaGoogleServicesGradlePluginVersion = settings.extra["kaluga.googleServicesGradlePluginVersion"]
-    //         val kalugaBinaryCompatibilityValidatorVersion = settings.extra["kaluga.binaryCompatibilityValidatorVersion"]
-    //
-    //         when (requested.id.id) {
-    //             "org.jetbrains.kotlin.multiplatform",
-    //             "org.jetbrains.kotlin.plugin.serialization",
-    //             "org.jetbrains.kotlin.android",
-    //             "org.jetbrains.kotlin.kapt",
-    //             -> useVersion("$kalugaKotlinVersion")
-    //             "com.android.library",
-    //             "com.android.application",
-    //             -> useVersion("$kalugaAndroidGradlePluginVersion")
-    //             "org.jlleitschuh.gradle.ktlint",
-    //             "org.jlleitschuh.gradle.ktlint-idea",
-    //             -> useVersion("$kalugaKtLintGradlePluginVersion")
-    //             "com.google.gms:google-services"
-    //             -> useVersion("com.google.gms:google-services:$kalugaGoogleServicesGradlePluginVersion")
-    //             "org.jetbrains.kotlinx.binary-compatibility-validator"
-    //             -> useVersion("$kalugaBinaryCompatibilityValidatorVersion")
-    //         }
-    //     }
-    // }
 }
diff --git a/kaluga-library-components/src/main/kotlin/Library.kt b/kaluga-library-components/src/main/kotlin/Library.kt
index 72556cc8b..bec8efc9b 100644
--- a/kaluga-library-components/src/main/kotlin/Library.kt
+++ b/kaluga-library-components/src/main/kotlin/Library.kt
@@ -29,7 +29,13 @@ val Project.Library get() = libraries.getOrPut(this) { Library(this) }
 
 class Library(project: Project) {
 
-    private val props: Properties = File("${project.rootProject.buildDir.absolutePath}/../local.properties").loadProperties()
+    private val props: Properties = File("${project.rootProject.buildDir.absolutePath}/../local.properties").let {
+        if (it.exists) {
+            it.loadProperties()
+        } else {
+            Properties()
+        }
+    }
     private val logger = project.logger
     private val baseVersion = "1.0.0"
     val group = "com.splendo.kaluga"
@@ -98,37 +104,6 @@ class Library(project: Project) {
     }
     val IOS = IOSLibrary(props, logger)
 
-    val exampleEmbeddingMethod by lazy {
-        if (System.getenv().containsKey("EXAMPLE_EMBEDDING_METHOD")) {
-            System.getenv()["EXAMPLE_EMBEDDING_METHOD"].also {
-                logger.lifecycle("System env EXAMPLE_EMBEDDING_METHOD set to ${System.getenv()["EXAMPLE_EMBEDDING_METHOD"]}, using $it")
-            }!!
-        } else {
-            val exampleEmbeddingMethodLocalProperties = props["kaluga.exampleEmbeddingMethod"] as? String
-            (exampleEmbeddingMethodLocalProperties ?: "composite").also {
-                logger.lifecycle("local.properties read (kaluga.exampleEmbeddingMethod=$exampleEmbeddingMethodLocalProperties, using $it)")
-            }
-        }
-    }
-
-    val exampleMavenRepo by lazy {
-        if (System.getenv().containsKey("EXAMPLE_MAVEN_REPO")) {
-            System.getenv()["EXAMPLE_MAVEN_REPO"].also {
-                logger.lifecycle("System env EXAMPLE_MAVEN_REPO set to ${System.getenv()["EXAMPLE_MAVEN_REPO"]}, using $it")
-            }!!
-        } else {
-            // load some more from local.properties or set defaults.
-            val exampleMavenRepoLocalProperties: String? =
-                props["kaluga.exampleMavenRepo"] as? String
-            exampleMavenRepoLocalProperties?.also {
-                logger.lifecycle("local.properties read (kaluga.exampleMavenRepo=$exampleMavenRepoLocalProperties, using $it)")
-            }
-                ?: "local".also {
-                    logger.lifecycle("local.properties not found, using default value ($it)")
-                }
-        }
-    }
-
     val connectCheckExpansion = (System.getenv().containsKey("CONNECTED_CHECK_EXPANSION") or System.getenv().containsKey("CI")).also {
         if (it) {
             logger.lifecycle("Adding extra dependend task to connected checks of similarly named modules (CONNECTED_CHECK_EXPANSION env present: ${ System.getenv().containsKey("CONNECTED_CHECK_EXPANSION") })")
diff --git a/newexample/.gitignore b/newexample/.gitignore
new file mode 100644
index 000000000..e510fa99d
--- /dev/null
+++ b/newexample/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+.idea
+.DS_Store
+build
+captures
+.externalNativeBuild
+.cxx
+local.properties
+xcuserdata
\ No newline at end of file
diff --git a/newexample/android/build.gradle.kts b/newexample/android/build.gradle.kts
new file mode 100644
index 000000000..cc6b78ad9
--- /dev/null
+++ b/newexample/android/build.gradle.kts
@@ -0,0 +1,42 @@
+plugins {
+    id("com.android.application")
+    kotlin("android")
+}
+
+android {
+    namespace = "com.splendo.kaluga.example.android"
+    compileSdk = 32
+    defaultConfig {
+        applicationId = "com.splendo.kaluga.example.android"
+        minSdk = 24
+        targetSdk = 32
+        versionCode = 1
+        versionName = "1.0"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.3.0"
+    }
+    packagingOptions {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":shared"))
+    implementation("androidx.compose.ui:ui:1.2.1")
+    implementation("androidx.compose.ui:ui-tooling:1.2.1")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.2.1")
+    implementation("androidx.compose.foundation:foundation:1.2.1")
+    implementation("androidx.compose.material:material:1.2.1")
+    implementation("androidx.activity:activity-compose:1.5.1")
+}
\ No newline at end of file
diff --git a/newexample/android/src/main/AndroidManifest.xml b/newexample/android/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..22d1facc8
--- /dev/null
+++ b/newexample/android/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="false"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/android/MainActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/android/MainActivity.kt
new file mode 100644
index 000000000..be6b7c113
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/android/MainActivity.kt
@@ -0,0 +1,87 @@
+package com.splendo.kaluga.example.android
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.splendo.kaluga.example.Greeting
+
+@Composable
+fun MyApplicationTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit
+) {
+    val colors = if (darkTheme) {
+        darkColors(
+            primary = Color(0xFFBB86FC),
+            primaryVariant = Color(0xFF3700B3),
+            secondary = Color(0xFF03DAC5)
+        )
+    } else {
+        lightColors(
+            primary = Color(0xFF6200EE),
+            primaryVariant = Color(0xFF3700B3),
+            secondary = Color(0xFF03DAC5)
+        )
+    }
+    val typography = Typography(
+        body1 = TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Normal,
+            fontSize = 16.sp
+        )
+    )
+    val shapes = Shapes(
+        small = RoundedCornerShape(4.dp),
+        medium = RoundedCornerShape(4.dp),
+        large = RoundedCornerShape(0.dp)
+    )
+
+    MaterialTheme(
+        colors = colors,
+        typography = typography,
+        shapes = shapes,
+        content = content
+    )
+}
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            MyApplicationTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colors.background
+                ) {
+                    Greeting(Greeting().greeting())
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun Greeting(text: String) {
+    Text(text = text)
+}
+
+@Preview
+@Composable
+fun DefaultPreview() {
+    MyApplicationTheme {
+        Greeting("Hello, Android!")
+    }
+}
diff --git a/newexample/android/src/main/res/values/styles.xml b/newexample/android/src/main/res/values/styles.xml
new file mode 100644
index 000000000..6b4fa3d08
--- /dev/null
+++ b/newexample/android/src/main/res/values/styles.xml
@@ -0,0 +1,3 @@
+<resources>
+    <style name="AppTheme" parent="android:Theme.Material.NoActionBar"/>
+</resources>
\ No newline at end of file
diff --git a/newexample/build.gradle.kts b/newexample/build.gradle.kts
new file mode 100644
index 000000000..76baf193c
--- /dev/null
+++ b/newexample/build.gradle.kts
@@ -0,0 +1,42 @@
+import java.io.File
+import java.io.FileInputStream
+import java.util.Properties
+
+plugins {
+    //trick: for the same plugin versions in all sub-modules
+    id("com.android.application").apply(false)
+    id("com.android.library").apply(false)
+    kotlin("android").apply(false)
+    kotlin("multiplatform").apply(false)
+}
+
+allprojects {
+    repositories {
+        val exampleMavenRepo = if (System.getenv().containsKey("EXAMPLE_MAVEN_REPO")) {
+            System.getenv()["EXAMPLE_MAVEN_REPO"].also {
+                logger.lifecycle("System env EXAMPLE_MAVEN_REPO set to ${System.getenv()["EXAMPLE_MAVEN_REPO"]}, using $it")
+            }!!
+        } else {
+            // load some more from local.properties or set defaults.
+            val props = Properties()
+            props.load(FileInputStream(File("$rootDir/local.properties")))
+            val exampleMavenRepoLocalProperties: String? =
+                props["kaluga.exampleMavenRepo"] as? String
+            exampleMavenRepoLocalProperties?.also {
+                logger.lifecycle("local.properties read (kaluga.exampleMavenRepo=$exampleMavenRepoLocalProperties, using $it)")
+            }
+                ?: "local".also {
+                    logger.lifecycle("local.properties not found, using default value ($it)")
+                }
+        }
+
+        when(exampleMavenRepo) {
+            null, "", "local" -> mavenLocal()
+            "none" -> {/* noop */}
+            else ->
+                maven(exampleMavenRepo)
+        }
+        mavenCentral()
+        google()
+    }
+}
diff --git a/newexample/gradle.properties b/newexample/gradle.properties
new file mode 100644
index 000000000..706a7399f
--- /dev/null
+++ b/newexample/gradle.properties
@@ -0,0 +1,17 @@
+#Gradle
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+
+#Kotlin
+kotlin.code.style=official
+
+#Android
+android.useAndroidX=true
+android.nonTransitiveRClass=true
+
+#MPP
+kotlin.mpp.enableCInteropCommonization=true
+
+kaluga.androidGradlePluginVersion=7.3.0
+kaluga.kotlinVersion=1.7.20
+kaluga.googleServicesGradlePluginVersion=4.3.10
+kaluga.ktLintGradlePluginVersion=11.0.0
\ No newline at end of file
diff --git a/newexample/gradle/wrapper/gradle-wrapper.jar b/newexample/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f
GIT binary patch
literal 59203
zcma&O1CT9Y(k9%tZQHhO+qUh#ZQHhO+qmuS+qP|E@9xZO?0h@l{(r>DQ>P;GjjD{w
zH}lENr;dU&FbEU?00aa80D$0M0RRB{U*7-#kbjS|qAG&4l5%47zyJ#WrfA#1$1Ctx
zf&Z_d{GW=lf^w2#qRJ|CvSJUi(^E3iv~=^Z(zH}F)3Z%V3`@+rNB7gT<C4E+e^X1+
z079LInxq~UYf-kNla?M9Qw5`wqM;O{-8tPk0sfaO{=LZmzBQ1)zwMpO|F66HKXsu0
zsblVBXkugf|5Qc(cU5;MLk9;_r~hk73h82L2Ot0dCNKa1{eNB}WN+`{?DBWLtf8fy
zvWuaUi>VU{Bb~90p|f+0(v;nz01EG7yDMX9@S~__vVgv%rS$+?IH+oZ03D5zYrv|^
zC1J)SruYHmCki$jLBlTaE5&dFG9-kq3!^i>^UQL`%gn6)jz54$WDmeYdsBE9;PqZ_
zoGd=P4+|(-u4U1dbAVQrFWoNgNd;0nrghPFbQrJctO>nwDdI`Q^i0XJDUYm|T|RWc
zZ3^Qgo_Qk$%Fvjj-G}1NB#ZJqIkh;kX%V{THPqOyiq)d)0+(r9o(qKlSp*hmK#iIY
zA^)Vr$-Hz<#SF=0@tL@;dCQsm`V9s1vYNq}K1B)!XSK?=I1)tX+bUV52$YQu*<ra!
z!v%7ZiKpO7g;NmE(;dSwu}#Qr14TWb<rzbgaS}{2FVDKaeCbmIt`T?_&=oa1ox)Gi
zqwS3lX?Fkmj%*6-JQ8ia`$(tFUJ#ol59+HHQxhli%Jb#vc@r`6ZP-EsfP2S!rwy#d
z;DP`C{cFdu2M4~`pHtE1KsUc1?BTR?&fOjbQh0|PcMiZgx_Kq$bLD%;`Ig2_LE~#`
zt32~lMNxY>0%fnWEukW>mxkz+%3-S!oguE8u#MGzST8_Dy^#U?fA@S#K$<FiPyhgu
zzq^L^|GyXf(+AWxl#$gjesG=F>S@9msUiX!gd_ow>08w5)nX{-KxqMOo7d?k2&?Vf
z&diGDtZr(0cwPe9z9FAUSD9KC)7(n^lMWuayCfxzy8EZsns%OEblHFSzP=cL6}?J|
z0U$H!4S_<U3#TVDkQ!s%Ox_BnFc2H6iNU0q=!|+Z9mk`Nbw?whndl6tI(Fj=$tl!^
zIOq<7BPlTvwG$fSu#@_%M(FvF2tpewu1-c35x~(IN{;#g5`-28n}V56vUKDyHalgc
zVFs4DD7(uszamXg!+b}p?!s)SZXGtIED*Jww1@^#7%op*kD~rw8S#!ebx(C|Oi-ci
zN~c@b8rVJSYHe*Cyn5uEa+-wenYQT6aAn!pd*%?%r>TVjj<`6dy^2j`V`)mC;cB%*
z8{>_%E1^FH!*{>4a7*C1v>~1*@TMcLK{7nEQ!_igZC}ikJ$*<$yHy>7)oy79A~#xE
zWavoJOIOC$5b6*q*F_qN1>2#MY)AXVyr$6x4b=$x^*aqF*L?vmj>Mgv+|ITnw_BoW
zO?jwHvNy^prH{9$rrik1#fhyU^MpFqF2fYEt(;4`Q&XWOGDH8k6<goGkkqwiLLr*g
z5z6x8$sF`?<e^h`j@COy$E+qY=Oj=v!b*KAnIYc*AP7qC0C#dwjl&srabEh<e-#E9
zv&sl%zw~Grb~0?}V1_A9--Q~b&NxawFDL54EJtT<qO4Z~5p7>M=%@fics4ajI;st#
zCU^r1CK&|jzUhRMv;+W~6N;u<;#DI6cCw-<Kad;hI?@=R3TXw!Cr}=BbI5m+uEl-w
zqErRfdJ>otsc@IsN3MoSD^O`eNflIoR~l4*&-%RBYk@gb^|-JXs&~KuSEmMxB}xSb
z@K76cXD=Y|=I&SNC2E+>Zg?R6E%DGCH5J1nU!A|@eX9oS(WPaMm==k2s_ueCqdZw|
z&hqHp)47`c{BgwgvY2{xz%OIkY1xDwkw!<0veB#yF4ZKJyabhyyVS`gZepcFIk%e2
zTcrmt2@-8`7i-@5Nz>oQWFuMC_KlroCl(PLSodswHqJ3fn<;gxg9=}~3x_L3P`9Sn
zChIf}8vCHvTriz~T2~FamRi?rh?>3bX1j}%bLH+uFX+p&+^aXbOK7clZxdU~6Uxgy
z8R=obwO4dL%pmVo*Ktf=lH6hnl<C=NTH%5`gfxBHGJj`iNz(A#<w&(&isR(NdjRau
zf|I4<<<u=|XXZxd2JFGs>z_5k3cG;m8lgaPp~?eD!Yn2kf)tU6PF{kLyn|oI@eQ`F
z3IF7~Blqg8-uwUuWZScRKn%c2_}dXB6Dx_&xR*n9M9LXasJhtZdr$vBY!rP{c@=)&
z#!?L$2UrkvClwQO>U*fSMs67oSj2mxiJ$t;E|>q%Kh_GzzWWO&3;ufU%2z%ucBU8H
z3WIwr$n)cfCXR&>tyB7BcSInK>=ByZA%;cVEJhcg<#6N{aZC4>K41XF>ZgjG`z_u&
zGY?;Ad?-sgiOnI`oppF1o1Gurqbi*;#x2>+SSV6|1^G@ooVy<y93LDm;wIOTj=5c$
zC-QhzvAl0y_;%{)gWRy`;Bf=?TtTe*SY!MP@9W|edu{l86Kr1<Cmr((Tem3gt4{#y
z3D<WVud@WzG8_>@fg?wyf@0Y!UZ4!}nGuLeC^l)6pwkh|oRY`s1Pm$>zZ3u-83T|9
z<QZfPf@8vDvzJ5u4A^A<#$7q&=f7lp3&n5W!oLxA;ja+?=SVAJ?`~&fZ)ozb9P1k`
z3pL1q5VB*z+Ct?<9|-*itS69vS4hVra5Z!lDKSySn;jjmUpRtte+Bax7QXjI?`90S
zA4?c)l!1W6+}k;06I}~wRC@!%R<xI9L>GaKJIV3_x+u1>cRibsaJpJqhcm%?0-L;2
zitBrdRxNmb0OO2J%Y&Ym(6*`_P3&&5Bw157{o7LFguvxC$4&zTy#U=W*l&(Q2MNO}
zfaUwYm{<Z#B+303&8&j|1AYBZQ1ef~@-GzfzfBY|H8XUzarxJ|f|I?ulc}?_jHR=S
zshz3QKN3ud>XtILD$3864IA_nn34oVa_g^FRuHL5wdUd)+W-p-iWCKe8m_cMHk+=?
zeKX)M?Dt(|{r5t7IenkAXo%&EXIb-i^w+0CX0D=xApC=|Xy(`xy+QG^UyF<x+1@YN
z-ZMAue9y-N{P;V-w=mmGh-1)C76Xu!U?t<}ByuZz$q|bl4S<l@37Jh~Glu1WLl}(l
zthb2~6ne4Q83FI<<Ay4c4`8D(It&am2#(!Ony)app0o62Q+)KCL_LQOA)tF@50mMJ
z<<yYk$({rlv3BkbtJ+SuacOk#dTZz@Qrop4gQ~UO=spb=-piAtn0x3U*bMbJdwI>e
z+#J6h_&T5i#sV)hj3D4WN%z;2+jJcZxcI3*CHXGmOF3^)JD5j&wfX)e?-|V0GPuA+
zQFot%aEqGNJJHn$!_}#PaAvQ^{3-Ye7b}rWwrUmX53(|~i0v{}G_sI9uDch_brX&6
zWl5Ndj-AYg(W9CGfQf<6!YmY>Ey)+uYd<oGrQ)76s0B|$EDBcWW*bGf!XzhAcke;%
zrh(E+RSxuWf~{)Nc=B!JS!X`$2DA4*+k72=D%60mnI%QDRarAyE}--rmK`Z^V+Yae
z&vDIckd3^cYT8wuAh(uIoqyu^LYf=&(`lZI>_J<fvopl!qQMd6Z#ZYajSPWAp}`qN
zjM~mJhn3N452gfOT)3x7am8MT`AA+VSSTZ}v@@8Ef-MrsX1vV|`Qx}Yh}~|pD;qlf
zbIL{96T!~st%_2?)f30K4Wp&xR_;627NS?#a?ONO1)C^TbaxNEe^u!aMYPy7;-Hq3
z8kFD}u19!l+a?p#Hl9<7(I=E6f85Gdi%U@U>NXH=>|`OH-CDCmcH(0%iD_aLlNHKH
z7bcW-^5+QV$jK?R*)wZ>r9t}loM@XN&M-Pw=F#xn(;u3!(3SXXY^@=aoj70;_=QE9
zGghsG3e<X)8z!NOUQ-K7Tg*M~$*Lq1YL~>kq#N||u{4We_25U=y#T*S{4I{++Ku)>
zQ!DZW;pVcn>b;&g2;YE#+V`v*Bl&Y-i@X6D*OpNA{G@JAXho&aOk(_j^weW{#3X5Y
z%$q_wpb07EYPdmyH(1^09i$ca<gJ(BN8tBcV!2)N5jxRqNZX(-f?Oe`25b>{O<}7)
zRWncXdSPgBE%BM#by!E>tdnc$8RwUJg1*x($6$}ae$e9Knj8gvVZe#bLi!<+&BkFj
zg@nOpDneyc+hU9P-;jmOSMN|*H#>^Ez#?;%C3hg_65leSUm;iz)UkW)jX#p)e&S&M
z1|a?wDzV5NVnlhRBCd_;F87wp>6c<&nkgvC+!@KGiIqWY4l}=&1w7|r6{oBN8xyzh
zG$b#2=RJp_iq6)#t5%yLkKx(0@D=C3w+oiXtSuaQ%I1WIb-eiE$d~!)b@|4XLy!CZ
z9p=t=%3ad@Ep+<9003D2KZ5VyP~_n$=;~r&YUg5UZ0KVD&tR1DHy9x)qWtKJp#Kq#
zP*8p#W(8JJ_*h_3W}FlvRam?<4Z+<U)YVE|@-H{P0L;lgD=4M+K83d`J=;XZ6cLXJ
z^Pb^7ai96hX*$t^`}X?;F@T^K^_U|s%%#VBR44vL@CQr;#z>-H77^$Lvi+#vmhL9J
zJ<1SV45xi;SrO2f=-OB(7#iNA5)x1uNC-yNxUw|!00vcW2PufRm>e~<GrW@0xg&;k
zL?iysf{CN}V{o=!B5cYHv{+Y1t=R-R>toH;M0Q85MQLWd?3O{i8H+5VkR@l9Dg-ma
ze2fZ%>G(u5(k9EHj2L6!;(KZ8%8|*-1V|B#EagbF(rc+5iL_5;Eu)L4Z-V;0HfK4d
z*{utLse_rvHZeQ>V5H=f78M3Ntg1BPxFCVD{HbNA6?9*^YIq;B-DJd{Ca2L#)qWP?
zvX^NhFmX?CTWw&Ns}lgs;r3i+Bq@y}Ul+U%pzOS0Fcv9~aB(0!>GT0)NO?p=25LjN
z2bh>6RhgqD7bQj#k-KOm@JLgMa6>%-ok1WpOe<hhSU`7#vu9^7%H57&(`pARdXnZM
z;eION-Jf1cVd1-MCh?1mFC&L}n&D)2PEzUHkSiE_t+j1!E~K#qcYI-`hc5a+<MQay
z<1}>)FS^XOU{c?d5shG(lIn3GiVBxmg`u%-j=)^v&pX1JecJics3&jvPI)mDut52?
z3jEA)DM%}BYbxxKrizVYwq?(P&19EXlwD9^-6J+4!}9{ywR9Gk42jjAURAF&EO|~N
z)?s>$Da@ikI4|^z0e{r`J8zIs>SpM~Vn^{3fArRu;?+43>lD+^XtUcY1HidJwnR6+
z!;oG2=B6Z_=M%*{z-RaHc(n|1RTKQdNjjV!Pn9lFt^4w|AeN06*j}Zyhq<HLE#a+A
zJ{@Y`FHfEI5bv;8o$ZEGCqCOp4`6-5eeTUyKzzSKd~k>Z^!-=cyGP_ShV1rGxkx8t
zB;8`h!S{LD%ot``700d0@Grql(DTt4Awgmi+Yr0@#jbe=2#UkK%rv=OLqF)9D7D1j
z!~McAwMYkeaL$~kI~90)5vBhBzWYc3Cj1WI0RS`z000R8-@ET0dA~*r(gS<U)h`aD
zLE6Dn5Q+3O*c2B9elF29G1VrakVK+eBtDr^Gf}-iF&NZnZ$t<sha>iCJmQMN&4%1D
zyVNf0?}sBH8zNbBLn>~(W{d3%@kL_eQ6jEcR{l><V*L*c8i9aN^J3k5@LC4D{kHc*
ztiPGM*MYdYK5-%KXLXp`;*IAihHn*4Pn*cYN8uZA$oHJE-8(VkYwPa2amx3wu)oxf
z;@K?9yEDA%g1*No{aF{@JJ45(#kW@dSB%B?ig4GNH`G^-kpE2q*E={oZNZKA>C|JK
z(R-fA!z|TTRG40|zv}7E@PqCAXP3n`;%|SCQ|ZS%ym$I{`}t3KPL&^l5`3>yah4*6
zifO#{VNz3)?<E9P2g)v<M^QTEwJXCARf%0EK}z-2B8QN$*7-J-mD@w9d6fzs+FVv4
zrJ6y#^xsh;O&ToHBFf~MC54(~Sb2j}sCotWQt($NS~kJz72WH?<eo8;ekt}!o;CT~
zFlF~#@UZt@DeNAn7u||SULov|N<ot`RP2<Gm?2rbIJ;;m_J~Yu)ZL<c+N#@?_iQO`
zRo%izIfJ9RLf%!Awp2T%_jV~S<vv}L?&aO;G&bt(!h60lS`2vX)v@WhGFXzOtRK;c
zyr@kt8OV3(72@wS&Pz;*6SWo#Z2jYhpl6$h+sV9U!&ep>ZL$be;NEaAk9b#{tV?V7
zP|wf5YA*1;s<)9A4~l3BHzG&HH`1xNr#%){4xZ!jq%o=7nN*wMuXlFV{HaiQLJ`5G
zBhDi#D(m`Q1pLh@Tq+L;OwuC52RdW7b8}~60WCOK5iYMUad9}7aWBuILb({5=z~YF
zt<!zJa=c$qO%0sJrsowK;!t%<S=X7Y&Jxn+nGDY&f(=_-CL}c~4K|D7ux0QbLt&^f
zSr24bBRsz?=*UjQu7gZoZ09|ewuhGV`hI~v^swhOT82+78;Tj2xT>?*Jr<A3W3T-3
z<1&Nz$ui_+E7n$IbPK2Rrimn|(;7EPx1h6Fi)-3?>5NG+WadM{mDL>GyiByCuR)hd
zA=HM?J6l1Xv0Dl+LW@w$OTcEoOda^nFCw*Sy^I@$sSuneMl{4ys)|RY#9&NxW4S)9
zq|%83IpslTLoz~&vTo!Ga@?rj_kw{|k{nv+w&Ku?fyk4Ki4I?);M|5Axm)t+BaE)D
zm(`AQ#k^DWrjbuXoJf2{Aj<e%564WZLSS(Vd#ROb?}iRVX%`%#SRY^TSh{u=kI84e
z3Ow&PB(uhOFrXgEsH|%j)I-Ug(1-{oj6dcgiDH#{Xclz$DM?xphY_S^6Z_M-j<Q{M
z3m5`Vg`@HsKN#jbtysG34Af*<`=E}BAe7{&&983YEEQfM{J8#P!otJO%!Ug4=|diY
zavSVyOcEEa#lU9-1SEeUY5cJ=<Ds##5c*EUsRi@fN(`2}Y5bh+k`b9uFL%rwlbF%M
zdSW_2pP9rtReb`cMyUFd*B2fwpi645^+_wI6EzB|mef<{4KFd8`yOM9scKF$vrUM|
zCoNlGyffVj5PnZZrY&Y5n|uW=PHnHX<YXTSdl@8HE*;J7fEIy#D!|gwR}m6V5SwWq
z(a}Z41Prc!Wk&AE!j3s3VBd*3Lw?gbM3E&oKBI9kltN8F1T6wcC{`?P4s@QUU>^KT
zFb1zMSqxq|vceV+Mf-)$oPflsO$@*A0n0Z!R{&(xh8s}=;t(lIy<Pl3uQSpJ4S8Y>
zv$S8x>m;vQNHuRzoaOo?eiWFe{0;$s`Bc+Osz~}Van${u;g(su`3lJ^TEfo~nERfP
z)?aFzpDgnLYiER<rBlW-W;>sKPu<X=38r|I{0&8J8r0^`tKAAKA8jUsvBhopXc14T
zgUW&TYxF3i;mZl;v5E+2qh>|0tq4l2wT)Atr6Qb%m-AUn6HnCue*yWICp7TjW$@sO
zm5rm4aTcPQ(rfi7a`xP7cKCFrJD}*&_~xgLyr^-bmsL}y;A5P|al8J3WUoBSjqu%v
zxC;mK!g(7r6RRJ852Z~feoC&sD3(6}^5-uLK8o)9{8L_%%rItZK9C){UxB|;G>JbP
zsRRtS4-3B*5c+K2kvmgZK8472%l>3cntWUO<l-B0`McQr%h#X$@@JrQb8#@ppQUG9
z)`zI{d#E;id*aB>VHxB|{Ay~aOg5RN<wtviA9uMGSHMzxbdkCR`SfK34yQ^bEpjN~
zPf^Bz$`=daT8!L25oqT&4i=+dRE^=E#-D#x^n<}e%YqXyp_!ut)H)b@E0UPjTon!Z
zEyxi=e>;{PJgeVD*H%ac+y!h#wi%o2bF2Ca8IyMyH{>4#{E_8u^@+l-+n=V}Sq?$O
z{091@v%Bd*<G_U#2l9N@Y9~(ygCl-h&9i8Yj9_3cV?DM!lxf11kY_LYnfWL$a@7F3
zk0$$mP<ka_iUf&lMdUX}1{nJ-EWCBw#je~5Smwg)p`tEv>3pk0^2UtiF9Z+(a@wy6
zUdw8J*ze$K#=$48IBi1U%;hmhO>lu!uU;+RS}p&6@rQila7WftH->*A4=5W|Fmtze
z)7E}jh@cbmr9iup^i%*(uF%LG&!+Fyl@LFA-}Ca#bxRfDJAiR2dt6644TaYw1Ma79
zt8&DYj31j^5WPNf5P&{)J?WlCe@<3u^78wnd(Ja4^a>{^Tw}W>|Cjt^If|7l^l)^Q
zbz|7~CF(k_9~n|h;ysZ+jHzkXf<NcXr7lv4BLC0%brrpzF{-obsvQr%!_>(*O*@5m
zLzUmbHp=x!Q|!9NVXyipZ3)^GuIG$k;D)EK!a5=8MFLI_lpf`HPKl=-Ww%z8H_0$j
ztJ||IfFG1lE9nmQ<au0Ml%cF(=R}3nZqu!gn~ulcq{4`|I}2tuFXsdOn=eq9Qz{LW
zP^cfInuhA7QFIUcH%13E<=O+Vy|WwD8Y7tHV5z9{b#53O<eDk6+LD+O<*lHC*Sh-<
zQQ*d{QylAFdIrjkp%D|@{O_AHu^XIETj$pt=r^Iy${cPPEHt@N92tqR6yn>0+jPQy
zCBdKkjArH@K7jVcMNz);Q(Q^R{d5G?-kk;Uu_IXSyWB)~KGIizZL(^&qF;|1PI7!E
zTP`%l)gpX|OFn&)M%txpQ2F!hdA~hX1Cm5)IrdljqzRg!f{mN%G~H1&oqe`5eJCIF
zHdD7O;AX-{XEV(a`gBFJ9ews#CVS2y!&>Cm_dm3C8*n3MA*e67(WC?uP@8TXuMroq
z{#<dYp{{+xCUwQw6)w9(r^`^0<F6$P{m>w$%z@CBIkRM7?}Xib+>hRjy?%G!fiw8!
z8(gB+8J~KOU}yO7UGm&1g_MDJ$IXS!`+*b*QW2x)9>K<JF7b%^NJe_9Fs0_(5~kP{
zjLlh(Gb|iDD!%2k=};N1Ay-P7$Wu_KP|<Nv<px9DnR*Bhp`@^|=#?&n9#0)w-FDC^
zYYwq=gkfiuN_5CjVN9Ao)scz%pogt!6S`BY&a-LBZ0vR8Hs`uYWwn}-oY<_#H(3U4
z+C^OQlGq~g8s<Q&bZc>~Y*E&bYMnjl6h!{17_8d!%&9D`a7r&LKZjC<&XOvTRaKJ1
zUY@hl5^R&kZl3lU3njk`3dPzxj$2foOL26r(9zsVF3n_F#<NB6ex9*oBW}l?xfbxx
zL%E!#nXs+R%q=x9ZnSy_@kOHMCrx3@5&BuHZd_<OOwDuA?g-PK!m67qWTCZlm0wKU
zv#i7p-7isYt{yv)OR8I5o;!7xop*Zm6Rp~J_EdjQW~sUFuwoyaW1U&NaV|M4U1?nR
z@)EUG9kIA_lYfhiyvI%HWy;Ge%?fKvOXHCrMb%0xeab5(rJo188D&|PUo17GFJ{-P
zs?t#M)7w#0RHw{KaZQP;u<ZWKm`x0&oP9ITEjmgxyDYbPrK*U@Usmmw0c2<WSXv-G
zvb6FvJhqfc@v@g(G}B*mRq{2pTwn0X@yc3sxqx=5S4D&>v)s5vv3<FgSd?p+)!kNm
zTv$3*E<J6vu2~)lp%4nMdtWE@=#AViY%^W&8R2_<v(+Qa%Mf{$Tn~RH;PHc?^uW;B
zl33*<G2>@dgs|lP#eylq62{<-vczqP!RpVBTgI>@O6&sU>W|do17+#OzQ7o5A$ICH
z?GqwqnK^n2%LR;$^oZM;)+>$X3s2n}2jZ7CdWIW0lnGK-<n4*9i9?XprV!b-2yz1y
z82;&r=GhqHm&zBz3e~(LKRa(8ZwPt%3TYt5`IuWWTX+)iO!EB5qiR4W$RDCd`g{-j
zZuyRBvdZnk><gEOlAyZgBQiT7{>b#EG01)P@aU`pg}th&J-TrU`tIpb5t((0eu|!u
zQz+3ZiOQ^?RxxK4;zs=l8q!-n7X{@jSwK(iqNFiRColuEOg}!7cyZi`iBX4g1pNBj
zAPzL?P^Ljhn;1$r8?bc=#n|Ed7wB&oHcw()&*k#SS#h}jO?ZB246EGItsz*;^&tzp
zu^YJ0=lwsi`eP_pU8}6JA7MS<SY@ZXteVGu2D;{e_dFnzL(OQbWI#IL1J(@}vxKG~
z{>;9pfD;DsSsLo~ogzMNP70@@;Fm8f0^;>$Z>~<d_jp#pvX)$*IF^kRoeC(j+t)Ur
zPx*FO4h)ZG=iqY;QK6W@ekh%ILEiXbr05ou^~><kZopq=@-e)e2pdVj4ZJKNAd~~=
zIWD3^k4g6+ly88l1dUP7-<u$%X=hfWc{o8z>}GWRw!W5J3tNX*^2+1f3hz{~rIzJo
z6W%J(H!g-eI_J1>0juX$X4Cl6i+3wbc~k146UIX&G22}WE<iA2ePZPFMn_vlC3@`(
zC;LX5HFTJ@i$J`Hbx0sRaj^uiUmU^s{mchNU>>0ga#WLsn9tY(&29zBvH1$`iWtTe
zG2jYl@P!P)eb<5DsR72BdI7-zP&cZNI{7q3e@?N8IKc4DE#UVr->|-ryuJXk^u^>4
z$3wE~=q390;XuOQP~TNoDR?#|NSPJ%sTMInA6*rJ%go|=YjGe!B>z6u$IhgQSwoV*
zjy3F2#I>uK{42{&IqP59)Y(1*Z>>#W8rCf4_eVsH)`v!P#^;BgzKDR`ARGEZzkNX+
zJUQu=*-ol=Xqqt5=`=pA@BIn@6a9G8C{c&`i^(i+BxQO9?YZ3iu%$$da&Kb?2kCCo
zo7t$UpSFWqmydXf@l3bVJ=%K?SSw)|?srhJ-1ZdFu*5QhL$~-IQS!K1s@XzAtv6*Y
zl8@(5BlWYL<vlUo^g==w+bwzmrMIfe1OGTk=p=b_r!$VPWnqI4+K-Q0Kn&YY_INtV
ze5P(@!H@m0AM%dGQN5FSnZ`He_+j(1bNGu}ee2>t1yAWy?rMD&bwze8bC3-GfNH=p
zynNFCdxyX?K&G(ZZ)afguQ2|<I|ToEQs5dh02L^JB6>r;XoV^=^(;Cku#qYn4<V}b
zA&FlaPRwlltsTXe9~a58?uH)L#hLx*;|`>Lus`UeKt6rAlFo_rU`|Rq<F_mt<XG?>
z&G?~iWMB<P-m~>io<78of-2X(ZYHx~=U0Vz4btyXkctMKdc9UM!vYr~B-(>)(Hc|D
zMzkN4!PBg%tZoh+=Gba!0++d193gbMk2&krfDgcbx0jI92cq?FFESVg0D$>F+bil}
zY~$)|>1HZsX=5sAZ2WgPB5P=8X#TI+NQ(M~GqyVB53c6IdX=k>Wu@A0Svf5#?uHaF
zsYn|koIi3$(%GZ2+G+7Fv^lHTb#5b8sAHSTnL^qWZLM<(1|9|QFw9pnRU{svj}_Al
zL)b9>fN{QiA($8peNEJyy`(a{&uh-T4_kdZFIVsKKVM(?05}76E<BOuTKNZ>Ez?#W
za^fiZOAd14IJ4zLX-n7Lq0qlQ^lW8Cvz4U<X+>KkV9~P}>sq0?xD3vg+$4vLm~C(+
zM{-3Z#qnZ09bJ>}j?6ry^h+@PfaD7*jZxBEY4)UG&daWb??6)TP+|3#Z&?GL?<NWw
zpo!n^_Mnx`#l`Mtp<H71ndq}LH(ZXJlzYuNAHINUglm=WWXJLtuPRY2?rIWUs=h@;
z1r9;ol65y`xO*SzvRa8o!D+_s;~<Bb-h5u71zg5ymFjIboenFkEakiwkF#l0c-sut
znM=(poO3Xq&}pnDV!O6|+_sscTBqqe%{pj$E^ku;b!#-zj>1i+280CFsE|vIXQbm|
zM}Pk!U`U5NsNbyKzkrul-DzwB{X?n3E6?TUHr{M&+R*2%yOiXdW-_2Yd6?38M9Vy^
z*lE%gA{wwoSR~vN0=no}tP2Ul5Gk5M(Xq`<W>$nw#ndFk`tcpd5A=Idue`XZ!FS>Q
zG^0w#>P4pPG<EP*xHW9WCTGn>+*NC9gLP4x2m=cKP}YuS!l^?sHSFf<ssGXChcP9X
za)*XSF8xSAX6O&AkMIyXtB<sR`J2gFTR8ck#bl<tOy9ZU%W%Jooi$>tZy{4CoQrb_
z^20(NnG`wAhMI=eq)SsIE~&Gp9Ne0nD4%Xiu|0Fj1UFk?6avDqjdXz{O1nKao*46y
zT8~iA%Exu=G#{x=KD;_C&M+Zx4+n`sHT>^>=-1YM;H<72k>$py1?F3#T1*ef9mLZw
z5naLQr?n7K;2l+{_uIw*_1nsTn~I|kkCgrn;|G~##hM;9l7Jy$yJfmk+&}W@JeKcF
zx@@Woiz8qdi|D%aH3XTx5*wDlbs?dC1_nrFpm^QbG@wM=i2?Zg;$VK!c^Dp8<}BTI
zyRhAq@#%2pGV49*Y5_mV4+OICP|%I(dQ7x=6Ob}>EjnB_-_18*xrY?b%-yEDT(wrO
z9RY2QT0`_OpGfMObKHV;QLVnrK%mc?$WAdIT`kJQT^n%GuzE7|9@k3ci5fYOh(287
zuIbg!GB3xLg$YN=n)^pHGB0jH+_iIiC=nUcD;G6LuJsjn2VI1cyZx=a?ShCsF==QK
z;q~*m&}L<-cb+mDDXzv<F>vrRsybcgQ;Vg21P(uLv5I+eGc7o7tc6`;OA9{soHFOz
zT~2?>Ts}gprIX$wRBb4yE>ot<8+*Bv`qbSDv*VtRi|cyWS>)Fjs>fkNOH-+PX&4(~
z&)T8Zam2L6puQl?;5zg9h<}k4#|yH9czHw;1jw-pwBM*O2hUR6yvHATrI%^mvs9q_
z&ccT0>f#eDG<^WG^q@oVqlJrhxH)dcq2cty@l3~|5#UDdExyXUmLQ}f4#;6fI{f^t
zDCsgIJ~0`af%YR%Ma<z>5VQq-p21k`vaBu6WE?66+5=XUd%Ay%D$irN>5LhluRWt7
zov-=f>QbMk*G##&DTQyou$s7UqjjW@k6=!I@!k+S{pP8R(2=e@io;N8E`EOB;OGoI
zw6Q+{X1_I{OO0HPpBz!X!@`5YQ2)t{+!?M_iH25X(d~-Zx~cXnS9z>u?+If|iNJbx
zyFU2d1!ITX64D|lE0Z{dLRqL1Ajj=CCMfC4lD3&mYR_R_VZ>_7_~|<^o*%_&jevU+
zQ4|qzci=0}Jydw|LXLCrO<tY^5#SIaz%jR-X`&*7)+bTVSc1BE2BLn%vVH`Mbz1R-
z>l1_P6Xf@c0$ieK2^7@A9UbF{@V_0p%lqW|L?5k>bVM8|p5v&2g;~r>B8uo<4N+`B
zH{J)h;SYiIVx@#jI&p-v3dwL5QNV1oxPr8J%ooezTnLW>i*3Isb49%5i!&ac_dEXv
zvXmVUck^QHmyrF8>CGXijC_R-y(Qr{3Zt~EmW)-nC!tiH`wlw5D*W7Pip;T?&j%kX
z6DkZX4&}iw>hE(boLyjOoupf6JpvBG8}jIh!!VhnD0>}KSMMo{1#uU6kiFcA04~|7
zVO8eI&x1`g4CZ<2cYUI(n#wz2MtVFHx47yE5eL~8bot~>EHbevSt}LLMQX?odD{Ux
zJMnam{d)W4da{l7&y-JrgiU~qY3$~}_F#G7|MxT)e;G{U`In&?`j<5D->}cb{}<s=
z)!EcZ!rs<Y#@^oA)#0D)Gvy7r4FLpRXcD*RfTd(<C=@A5lICI1^#y3rLIVLJon(Px
z9#Jw)(4Yq5v4TSV<tUJH3ExZMzKTk&i(qL2_(Map=flfs&WkPnAHQ!Ph9FQ-#b`+n
zGGm<qkbNX1D53P^JDqBMk-0!hNJ&trQIk`mzGOz)`{-cJ&~H;?Q%CleBz;+Wy0Yj`
zyHSagKdo#qV6?6Vcv+pcT%^1Q-l@v({R}QyX*+WEw%BJmI(}Q@j4m`CawF`x{MPHL
za$h&MF~4nMuyWgQrt}RgV#pg|Y^CiI*j!3z!tB-Jp4;1uuh(==9iU5dSb3$ZFATE!
z>{T(4DF0BOk<QYr>-=1195KB-E*o@c?`>y#4=dMtYtSY=&L{!TAjFVcq0y@AH`vH!
z$41+u!Ld&}F^COPgL(EE{0X7LY&%D7-(?!kjFF7=qw<;`V{nwWBq<)1QiGJgUc^Vz
ztMUlq1bZqKn17|6x6iAHbWc~l1HcmAxr%$Puv!znW)!JiukwIrqQ00|H$Z)OmGG@=
zv%A8*4cq}(?qn4rN6o`$Y))(MyXr8R<2S^J+v(wmFmtac!%VOfN?&(8Nr!T@kV`N;
z*Q33V3t`^rN&aBiHet)18wy{*wi1=W!B%B-Q6}SCrUl$~Hl{@!95ydml@FK8P=u4s
z4e*7gV2s=YxEvskw2Ju!2%{8h01<bQ)d%wXmu1Zpj%~-&jsiWxq+->rx-3`NCPc(O
zH&J0VH5etNB2KY6k4R@2Wvl^Ck$MoR3=)|SEclT2ccJ!RI9Nuter7u9@;<u*AgOz(
zn=C13+36e?Wp?2OIME<hmtjrXzJ<Zd*?$>sWf-%um;GfI!=eEIQ2l2p_YWUd{|6EG
ze{yO6;lMc>;2tPrsNdi@&1K6(1;|$xe8vLgiouj%QD%gYk`4p{Ktv9|j+!OF-P?@p
z;}SV|<w!@0*CQ5@xp9@`8c_*)IC@^rAGd{(#wPf?$`(^V&!%1qI&#?UztvBAF!4M;
z_oxBXB0!;X3yhd^D}+Xx4sUHZH*0n|si;UgfM!*1c|d1h4nY076_94CJP`FR$D}_!
zDgwP#mZV0tbmF7vmG7Log$Afqr(GuMl<urHsSR(EhO7^7wNPIUT%rDwjj%sGil746
zDLtAZLp-7)K|QJh+bT3@0I$b@q3|9LuBZk*!Xn-Gb?+~>oIK)iwlBs+`ROXkhd&NK
zzo__r!B>tOXpBJMDcv!Mq54P+n4(@dijL^EpO1wdg~q+!DT3lB<>9AA<tf}r`cy*Y
zjhdtI5OMNT6H0#L@X?3Sm%kGA7Vl5JMh4bZuEy3uPM@!CETCEPH`bN;-XzRi=Uj<*
zy1%%&-XKAU$eorwmA2>NSe!T1XgC=J^)IP0XEZ()_vpu!!3HQyJhwh?r`Ae%Yr~b%
zO*NY9t9#qWa@GCPYOF9aron7thfWT`eujS4`t2uG6)~JRTI;f(ZuoRQwjZjp5Pg34
z)rp$)Kr?R+KdJ;IO;pM{$6|2y<ydqUT>=k_siqvp%)2||cHTe|b5Ht8&A{wazGNca
zX$Ol?H)E_R@SDi~4{d-|8nGFhZPW;Cts1;08TwUvLLv&_2$O6Vt=M)X;g%HUr$&06
zISZb(6)Q3%?;3r~*3~USIg=HcJhFtHhIV(siOwV&QkQe#J%H9&E21!C*d@ln3E@J*
zVqRO^<)V^ky-R|%{(9`l-(JXq9J)1r$`uQ8a}$vr9E^nNiI*thK8=&UZ0dsFN_eSl
z(q~lnD?EymWLsNa3|1{CRPW60>DSkY9YQ;$4o3W7Ms&@&lv9eH!tk~N&dhqX&>K@}
zi1g~GqglxkZ5pEFkllJ)Ta<O6(=j@N_YA4+m(2{`eegY!ZQ2^vALR<RgI6}@oJ;#Q
znz8Q+-c~%`4rP2NC%pl75Va8USgVLiZL*d#F+vsZ>1I^c&Bt6#r(QLQ02yHTaJB~-
zCcE=5tmi`UA>@P=1LBfBiqk)HB4t8D?02;9eXj~kVPwv?m{5&!&TFY<knKM4n)!Ph
zud#tQR<C%y^0~@DM`a6)LueXb{y5yQ{QdB(pAh_Nx5%(@`(@LGcfv~*Wnh>hu>3=_
zsGmYZ^mo*-j69-42y&Jj0cBLLEulNRZ9vXE)8~mt9C#;tZs;=#M=1*hebkS;7(aGf
zcs7zH(I8Eui9UU4L--))yy<O?Y9%&u#eL}xwSxY`c_7W7JcW|iGpGkga)aNR1NtnV
zsQ!z$?wFhYyP2W>`&d&$In&VA2?DAEss4LAPCLd>-$i?lpXvn!gu^JJ$(DoUlc<UX
zkfN^{^6VUfk4qkMm$Kwn8iV7sNct*PLMd9WvC5vZDv+`U&Q-ZGnQrAf`3aDr3@9ll
zcH!Spxa>6wE98VLZ*z`QGQov5l4Fm_h?V-;mHLYDVOwKz7>e4+%AzeO>P6v}ndPW|
zM>m#6Tnp7K?0mbK=>gV}=@k*0Mr_PVAgGMu$j+pWxzq4MAa&jpCDU&-5eH27Iz>m^
zax1?*HhG%pJ((tkR(V(O(L%7v7L%!_X->IjS3H5kuXQT2!ow(;%FDE>16&3r){!ex
zhf==oJ!}YU89C9@mfDq!P3S4yx$aGB?rbtVH?sHpg?J5C->!_FHM%Hl3#D4eplxzQ
zRA+<@LD%LKSkTk2NyWCg7u=$%F#;SIL44~S_OGR}JqX}X+=bc@swpiClB`Zbz|f!4
z7Ysah7OkR8liXfI`}IIwtEoL}(URrGe;IM8%{>b1SsqXh)~w}P>yiFRaE>}rEnNkT
z!HXZUtxUp1NmFm)Dm@-{FI^aRQqpSkz}ZSyKR%Y}Y<Q&WCZ#r6E1BX>HNzBk)ZIp}
zMtS=aMvkgWKm9&oTcU0?S|L~CDqA+sHpOxwnswF-fEG)cXCzUR?ps@tZa$=O)=L+5
zf%m58cq8g_o}3?Bhh+c!w4(7AjxwQ3>WnVi<{{38g7yFboo>q|+7qs<$8CPXUFAN<
zG&}BHbbyQ5n|qqSr?U~GY{@GJ{(Jny{bMaOG{|IkUj7tj^9pa9|FB_<+KHLxSxR;@
zHpS$4V)PP+tx}22fWx(Ku9y+}Ap;VZqD0AZW4gCDTPCG=zgJmF{|x;(rvdM<f^n;1
zK8nxqYR0vKH0j_lDlpPKZ&MGwB{uMn`Y?-pX_!Y3B)-jRTo&O^8pthSIE0&!0lK-e
z!icB)w$6c%`*wHe1Fz?U<?TZjyK8JuG0UC$ZCke^hB6%|%?F1X$1uXP^O6o2PCxRi
zb_5>|2|9a}cex6xrMkERnkE;}jvU-kmzd%_J50$M`lIPCKf+^*zL=@LW`1SaEc%=m
zQ+lT06Gw+wVwvQ9fZ~#qd430v2HndFsBa9WjD0P}K(rZYdAt^5WQIvb%D^Q|pkVE^
z<umx#lsJRB+%c;<9rnPd8EZLPtdXF8y%S2H@ouSr1qOSZk)i$^f3$XJg9S<yWHU+7
zyJJ%uaeqUu9^B#_n2Ir_nIYz}G3SZ_C|5(`c6Umw#_yBgS{UuH<_&oA!pzsBV%g@=
zbOzA1`OA)5@fUbFgE?}SVsAWLGVW?bLByY#LXc_UE*PeNYf={+;y-vKh@$+ue#tsu
zvCKGNIefnaDUw~m>te$&#~zmULFACGfS#g=2OLOnIf2Of-k!(BIHjs77nr!5Q1*I9
z1%?=~#Oss!rV~?-6Gm~BWJiA4mJ5TY&iPm_$)H1_rTltuU1F3<q3^BkZ&_=uH2O^K
z_@P51{S(`LSn2c$B(%yIo=USrBfbZd`d}}bPg&0tq#f2!iBZc9Z>I(qTQ^U$S>%$l
z)Wx1}R?ij0idp@8w-p!Oz{&*W;v*IA;JFHA9%nUvVDy7Q8woheC#|8QuDZb-L_5@R
zOqHwrh|mVL9b=+$nJxM`3eE{O$sCt$UK<z2Kci>^2@L$R(r^-_+z?lOo+me-VW=Zw
z-Bn>$4ovfWd%S<yVaGCiuR4}{b|0tZrdZYdj>PY`ab-u9{INc*k2h+yH%toDHIyqQ
zO68=u`N}RIIs7lsn1D){)~%>ByF<>i@qFb<-axvu(Z+6t7v<^z&gm9McRB~BIaDn$
z#xSGT!rzgad8o>~kyj#h1?7g96tOcCJniQ+*#=b7wPio>|6a1Z?_(TS{)KrPe}(8j
z!#&A=k(&Pj^F;r)CI=Z{LVu>uj!_W1q4b`N1}<u;U_b=ty|*S;DXz*F-)!)F0Pv+Q
zRm=!T^zTn*A6)$bH1cl>E(i%;BWjbEcnD=mv$FL$l?zS6bW!{$7j1GR5ocn94P2u{
z70tAAcpqtQo<@cXw~@i-@6B23;317|l~S>CB?hR5qJ%J3EFgyBdJd^fH<ao26B*v)
zGUaiB1_W^rk+d9W+h~_tj2D}FfPY~B-BL~)lzp|oFVck~{r8sIIlCCz*!+vHo}=OE
zgW`_*^W8W`lLWY+AcSs_rDfwxzeg23BqYRWi$p*e3{sqP3719K#C&l{6X2y_TO;0c
zk>Zu7AzHF(BQ!tyAz<BOKd)9J&U=CXtSstlZ^pj1MMKG$H~T%~{<Zzl`|=?>^L0`X
z23S4Fe{2X$W0$zu9gm%rg~A>ijaE#GlYlrF9$ds^QtaszE#4M(OLVP2O-;XdT(XIC
zatwzF*)1c+t~c{L=fMG8Z=k5lv>U0;C{caN1NItnuSMp)6G3mbahu>E#sj&oy94KC
zpH}8oEw{G@N3pvHhp{^-YaZeH;K+T_1AUv;IKD<=mv^&Ueegrb!yf`4VlRl$M?wsl
zZyFol(2|_QM`e_2lYSABpKR{{NlxlDSYQNkS;J66aT#MSiTx~;tUmvs-b*CrR4w=f
z8+0;*th6kfZ3|5!Icx3RV11sp=?`0Jy3Fs0N4GZQMN=8HmT6%x9@{Dza)k}UwL6JT
zHRDh;%!XwXr6yuuy`4;Xsn0zlR$k%r%9abS1;_v?`HX_hI|+EibVnlyE@3aL5vhQq
zlIG?tN^w@0(v9M*&L+{_+RQZw=o|&BRPGB>e5=ys7H`nc8nx)|-g;s7mRc7hg{GJC
zAe^vCIJhaj<rU9d-Ny$?&}6qolDp7MDNB|ftJI`wi&EhaNhHyV!qQfb_Q>mm7C6g!
zL&!WAQ~5d_5)00?w_*|*H>3$loHrvFbitw#WvLB!JASO?#5Ig5$Ys10n>e4|3d;tS
zELJ0|R4n3Az(Fl3-r^QiV_C;)lQ1_CW{5bKS15U|E9?ZgLec@%kXr84>5jV2a5v=w
z?pB1GPdxD$IQL4)G||B_lI+A=08MUFFR4MxfGOu07vfIm+j=z9tp~5i_6jb`tR>qV
z$#`=BQ*jpCjm$F<t%->0+F)L%xRlnS%#&gro6PiRfu^l!EVan|r3y}AHJQOORGx4~
z&<)3=K-tx518DZyp%|!EqpU!+X3Et7n2AaC5(AtrkW>_57i}$eqs$rupubg0a1+WO
zGHZ<ibB|u&Jk?tUGE|?~tl5Wk^jlF-{lPR;A5i_2TUJp0F;38(es)rx!d-0-m4P-!
z$~|tV-l!W$kj%u&D~eY>KLN2L0D;ab%{_S1Pl<uJj0^JDir_rTS5CizT^_%RU3Cwc
zfrHnUz@7T<9U{4O%SD*qhHiuSo|}zv3Hju=+>m|hx8R?O14*w*f&2&bB050n!R2by
zw!@XOQx$SqZ5I<(Qu$V6g>o#A!JVwErWv#(Pjx=KeS0@hxr4?13zj#oWwPS(7Ro|v
z>Mp@Kmxo79q|}!5qtX2-O@U&&@6s~!I&)1WQIl?lTnh6UdKT_1R640S4~f=_xoN3-
zI+O)$R@RjV$F=>Ti7BlnG1-cFKCC(<Cu6MUX_IBo_X35UX_<48O%CsD25V#~38R@v
zrtYIkXvf1CPBiwCyX%=srhV;xX%`i(ICDDA6?ULc$>t|Qjm{SalS~V-t<tWc<BV1;
zl_jTzT9WFjJ~QeHdyK~l8BJDMnzlnWR?wVpES%e_)7o6AC7w~n8DW>X#+2ekRhwmN
zZr`8{QF6y~Z!D|{=1*2D-JUa<(1Z=;!Ei!KiRNH?o{p5o3crFF=_pX9O-YyJchr$~
zRC`+G+8kx~fD2k*ZIiiIGR<8r&M@3H?%JVOfE>)})7ScOd&?OjgAGT@WVNSCZ8N(p
zuQ<bOx+QY5+%zcISi3vNjYInP2!bhID0f~o9vf+-rhLL{z1^Ck(#`qsgx*#5swyXT
zW>G~76GE3%(%h1*vUXg$vH{ua0b`sQ4f0*y=u~lgyb^!#CcPJa2mkSEHGLsnO^kb$
zru5_l#nu=Y{rSMWiYx?nO{8I!gH+?wEj~UM?IrG}E|bRIBUM>UlY<`T1EHpRr36vv
zBi&dG8oxS|J$!zoaq{+JpJy+O^W(nt*|#g32bd&K^w-t>!Vu9N!k9eA8r!Xc{utY>
zg9aZ(D2E0gL#W0MdjwES-7~Wa8iubPrd?8-$C4BP?*wok&O8+ykOx{P=Izx+G~hM8
z*9?BYz!T8~dzcZr#ux8kS7u7r@A#DogBH8km8Ry4slyie^n|GrTbO|cLhpqgMdsjX
zJ_LdmM<k-VT(PJj^o5EU9N}k~N8WtTC-IGZ`@y!j$sb^<J0;G@Qw2FyCS!3I_NA$4
z1f*^zNnJ-2I0{osRtQts^V?d(XVo8U_KxuKrC4_(t;qw3T5EIb1gaTiFo3yT&HyFL
z)1@c>#I&4LqqsOUIXK8gW;V0B(7^$y#h3h>J0k^WJfAMeYek%Y-Dcb_+0zPJez!GM
zAmJ1u;*rK=FNM0Nf}Y!!P9c4)HIkMnq^b;JFd!S3?_Qi2G#LIQ)TF|iHl~WKK6JmK
zbv7rPE6VkYr_%_BT}CK8h=?%pk@3cz(UrZ{@h40%XgT<XHMp$hv;h9Ymj#=odkk`i
zIQae`_=X#DiyU&N400<DsTZGknpd*i59`VZ(hlvyF={mwt^rqfpTI2&<T<g_&ag;)
zGmdv3$7_Umm3*d1pC<tD4&^z@fB#qeFKt~J{6LxaG(+}hgg|*Exu--o{)yT#JuFbk
z1;57xTR<^av=7#O$H&Fm{_yrRCu{yYJoJ}c0L{yx#X=<de!)a1JlNVp083z$!k1?|
zV)^ps1(-LWXGsXjQ$H~1;~fb%PNBhFP?}VP6a;UunlMt9FKF=Z7zjl{Vm5wAE|rFq
z1-k1JTp~NHKqro%r!pzCx_v|wc?QzZb;2~gF~c_e(7kI?gTf@Sl;&2zZGHBdXMu10
ze@7*&Fo`5Se_O_wf2XJaP0LvFpQz-YM_~(7W9xrFv6N(8d1OJ9&>hP*-Oeo`T0eq9
zA8BnWZKzCy5e&&_GEsU4*;_k}(8l_&al5K-V*B<vk;3_5Y5GsaQRXITZ7En5+1cr}
zoEOfUwTvx(fB#P)g+XFq$3s&MIR%RGTY*w)u1F^x)_4KQF{~iPr`KL;JvOUA!)Bl1
z9p@=a4SF1Po>FM=O~;MgRkYsOs%9eOY6s6AtE*<7GQAR2ulC3RAJrG_P1iQK5Z~&B
z&f8X<>yJV6)oDGIlS$Y*D^Rj(cszTy5c81a5IwBr`BtnC6_e`ArI8CaTX_%rx7;cn
zR-0?J_LFg*?(#n~G8cXut(1nV<GD8u>F0Oka$A<Xrs+39Fcy_UX4+wJsyL;Ad#|W_
zoZzvm=HX_}HyBFXw08LR4`!>$1FGcERU<^ggx;p@CZc?3UB41RY+wLS`LWFNSs~YP
zuw1@DNN3lTd|jDL7gjBsd9}wIw}4xT2+8dBQzI00m<@?c2L%>}QLfK5%r!a-iII`p
zX@`VEUH)uj^$;7jVUYdADQ2k*!1O3WdfgF?OMtUXNpQ1}QINamBTKDuv19^{$`8A1
zeq%q*O0mi@(%sZU>Xdb0Ru96CFqk9-L3pzLVsMQ`Xpa~N6CR{9Rm2)A|CI21L(%GW
zh&)Y$BNHa=FD+=mBw3{qTgw)j0b!Eahs!rZnpu)z!!E$*eXE~##yaXz`KE5(nQM`s
zD<pRzTt9Ga7_+7V*(vgeNjPLq#T#Hzh4oMyk4m^&mDHa-;LXM`BMlpNPVXZiWB!7-
zsrLYk0v?{Pinwui>!$vW9XH)iMxu9R>r$VlLk9oIR%HxpUiW=BK@4U)|1WNQ=mz9a
z^!KkO=>GaJ!GBXm{KJj^;kh-MkUlEQ%lza`-G&}C5y1>La1sR6hT=d*NeCnuK%_LV
zOXt$}iP6(YJKc<sy3IAHEj2Y-R)3MS?rC66If(_;`nr~Onw70}P1hEBm+!itUy1C`
zNpHpki6_MC$7{&PcGt_M^XxtUNv`)v*iXj|1|scVAGjs`iL^4oZ_EXmgi;5b%!&n+
ziIZl66eo#;Grax0|H0Th2FKohS;Mhy+qQFJ+qP}z#I|iaIk9cqPEKq)Z~pVlJTr68
zJXP<9U-g%+tE>9j-Fxq~*ItVUqljQ8?oaysB-EYtFQp9oxZ|5m0^Hq(qV!S+hq#g(
z?|i*H2MIr^Kxgz+3vIljQ*Feejy6S4v~jKEPTF~Qhq!(ms5>NGtRgO5vfPPc4Z^AM
zTj!`5xEreIN)vaNxa|q6qWdg>+T`Ol0Uz)ckXBXEGvPNEL3R8hB3=C5`@=SYgAju1
z!)UBr{2~=~xa{b8>x2@C7weRAEuatC)3pkRhT#pMPTpSbA|tan%U7NGMvzmF?c!V8
z=pEWxbdXbTAGtWTyI?Fml%lEr-^AE}w#l(<7OIw;ctw}imYax&vR4UYNJZK6P7ZOd
zP87XfhnUHxCUHhM@b*NbTi#<F%^Z|eYk;z2_lk&RVh7s<F5xO2t#&+J(_Y0MwZqrY
zicy(G9z6&?{09>(-8|wcv%3BGNs#zRCVV(W?1Qj6^PPQa<{yaBwZ`+<`w|;rqUY_C
z&AeyKwwf*q#OW-F()lir=T^<^wjK65Lif$puuU5+tk$;e_EJ;Lu+pH>=-8=PDhkBg
z8cWt%@$Sc#C6F$Vd+0507;{OOyT7Hs%nKS88q-W!$f~9*WGBpHGgNp}=C*7!RiZ5s
zn1L_DbKF@B8kwhDiLKRB@lsXVVLK|ph=w%_`#owlf@s@V(pa`GY$8h%;-#h@<I6M_
zmQBeLGoxDbjVm1w<bC@g^^f(C!^JL|q^~JGpu4s;6B8qK+5^Y5Qq9@Z$yi1AO_ivY
zEj2e_U?RYgY($+y4MYyPw@#Znh;BBeSCVn{gx>TsO|Y8V=n@*!Rog7<7Cid%apR|x
zOjhHCy<N%=9>fbIt%+*PCveTEcuiDi%Wx;O;+K=W?OF<?k#V0K7HZbJn*d3I+eoH#
zh7<l$XDBh2e3X@S)0xR1RL*X3v}anZNmTRLP100Vjg6lZsj8M4WV<xI)QGou52W;l
zuhA|fVCliO=-1Jr275Sx<Y+M^NR?|nFbw_$)30P*nj@^6+|ZdgJZ18l!}qu2UJUSH
z1R0|V6_~e{(m?E}wM3qUG_Q$t&XB<F<iQ0B?7yghy}e3`PL?Jnn_FH7zs7FvV}ZNC
zg-k1nj;~OaAd0bVj&A17jIs@8j;@`1Da87%aS+QW)3w-0g!{V<Z8Jk0K;t-e-m_}H
z#$DpTS=ZJ!079fqU)_vsqe{Hxz{t*PFrYaR_X{Idl~pteGXU-!HXH+n-Nm@~!Nn|q
zjK^|6Bi^u9r}}mzbV)k27Kxg2T1S^j^-m&I%;>UV%)%~6;gl?<0%)?snDDqIvkHF{
zyI02)+lI9ov42^hL>ZRrh*HhjF9B$A@=H94iaBESBF=eC_KT$8A@uB^6$~o?3W<f9
zYtSca#$B|92$2MdaDc&Gb6a^9xjGKojcdPg>m5t1OIaqF^~><2?4e3c&)@wKn9bD?
zoeCs;H>b8DL^F&>Xw-xjZEUFFTv>JD^O#1E#)CMBaG4DX9bD(Wtc8Rzq}9soQ8`jf
zeSnHOL}<+WVSKp4kkq&?SbETjq6yr@4%SAqOG=9E(3YeLG9dtV+8vmzq+6PFPk{L;
z(&d++iu=^F%b+ea$i2UeTC{R*0Isk;vFK!no<;L+(`y`3&H-~VTdKROkdyowo1iqR
zbVW(3`+(PQ2>TKY>N!jGm<sD6AnGF=)0Re*7@0HIc_nG=Iw;>Go7oeoB8O|P_!Ic@
zZ^;3dnuXo;WJ?S+)%P>{Hcg!Jz#2SI(s&dY4QAy_vRlmOh)QHvs_7c&zkJCmJGVvV
zX;Mtb>QE+xp`KyciG$Cn*0?AK%-a|=o!+7x&&yzHQOS>8=B*R=niSnta^Pxp1`=md
z#;$pS$4WCT?mbiCYU?FcHGZ#)kHVJTTBt^%XE(Q};aaO=Zik0UgLcc0I(tUpt(>|&
zcxB_|fxCF7>&~5eJ=Dpn&5Aj{A^cV^^}(7w#p;HG&Q)EaN~~EqrE1qKrMAc&W<U9$
z+^)SZeHD%7BgO}J?hdzGer@n(wj6EYe>XIE;>@<&)5;gD2?={Xf@Mvn@OJKw=8Mgn
z!JUFMwD+s==JpjhroT&d{$kQAy%+d`a*XxDEVxy3`NHzmITrE`o!;5ClXNPb4t*8P
zzAivdr{j_v!=9!^?T3y?gzmqDWX6mkzhIzJ-3S{T5bcCFMr&RPDryMcdwbBuZbsgN
zGrp@^i?rcfN7v0NKGzDPGE#4yszxu=I_`MI%Z|10nFjU-UjQXXA?k8Pk|OE<(?ae)
zE%vG#eZAlj*E7_3dx#Zz4kMLj>H^;}33UAankJiDy5ZvEhrjr`!9eMD8COp}U*hP+
zF}KIYx@pkccIgyxFm#LNw~<U{`Via^B{gMVX)!#|jCh_xM6ikcrvnXbWa+dwBKVSS
zK-4G%y><Bux_?U*2>G&`;o&5)2`5aogs`1~7cMZQ7zj!%L4E`2yzlQN6REX20&O<9
zKV6fyr)TSc<e)zOh9v0_vMgh>JPPzNTC2gL+0x#=u>(({{D7j)c-%tvqls3#Y?Z1m
zV5WUE)zdJ{$p>yX;^P!UcXP?UD~YM;IRa#Rs5~l+*$&nO(;Ers`G=0D!twR(0GF@c
zHl9E5DQI}Oz7<JMjFG_&ureTdMV@FLw-eP(lgkhig$ECHD*ei9Xc()#hw||V#@>4n
zfKP>&$q0($T4y$6w(p=ERAFh+>n%iaeRA%!T%<^+p<H-<uJNd-sy)}Y@~CN#3u5W*
zjI&ROZ_Rx}0(a!_QCcJ9_!&~Uc}E0JQd?M`bT;-C9-Z?5E@UMa&Fe8b7GLT8{XPb5
zyf%i|Q0Xl+SI;QD#Yg>g?M)@ucY<&59$x9M#n+V&>}=nO9wCV{O~lg&v#+jcUj(tQ
z`0u1YH)-`U$15a{pBkGyPL0THv1P|4e@pf@3IBZS4dVJPo#H>pWq%Lr0YS-SeWash
z8R7=jb28KPMI|_lo#GEO|5B?N_e``H*23{~a!AmUJ+fb4HX-%QI@lSEUxKlGV7z7Q
zSKw@-TR>@1RL%w{x}dW#k1NgW+q4yt2Xf1J62Bx*O^WG8OJ|FqI4&@d3_o8Id@*)4
zYrk=>@!wv~mh7YWv*bZhxqSmFh2Xq)o=m;%n$I?GSz49l1$xRpPu_^N(vZ>*>Z<04
z2+rP70oM=NDysd!@fQdM2OcyT?3T^Eb@lIC-UG=Bw{BjQ&P`KCv$AcJ;?`vdZ4){d
z&gkoUK{$!$$K`3*O-j<Zi{jTPO?eI9$VNEqKns5`DQpeK-2u;%g&U>yM1~<ZC)5l@
zIkr@87e@uhA6MH$K<@Z>p-7T*qb)Ys>Myt^;<CgA4AYJg%~h2T>#1&a%O@x8A+E>!
zY<A2w=yT8AF-EkBw>8=eD`ZG)LVagDLBeHg>=atOG?Kr%h4B%E6m@J^C+U|y)XX@f
z8oyJDW|9g=<#f<{JRr{y#~euMnv)`7j=%cHWLc}ngjq~7k**6%4u>Px&W%4D94(r*
z+akunK}O0DC2A%Xo9jyF;DobX?!1I(7%}@7F>i%&nk*LMO)bMGg2N+1iqtg+r(70q
zF5{Msgsm5GS7DT`kBsjMvOrkx&|EU!{{~gL4d2MWrAT=KBQ-^zQCUq{5PD1orxlIL
zq;CvlWx#f1NWvh`hg011I%?T_s!e38l*lWVt|~z-PO4~~1g)SrJ|>*tXh=QfXT)%(
z+ex+inPvD&O4Ur;JGz>$sUOnWdpSLcm1X%aQDw4{dB!cnj`^muI$CJ2%p&-kULVCE
z>$eMR36kN$wCPR+OFDM3-U(VOrp9k3)lI&YVFqd;Kpz~K)@Fa<T;^H>&FRw}L(SoD
z9B4a+hQzZT-BnVltst&=kq6Y(f^S4hIGNKYBgMxGJ^;2yrO}P3;r)(-I-CZ)26Y6?
z&rzHI_1GCvGkgy-t1E;r^3Le30|%$ebDRu2+gdLG)r=A~Qz`}~&L@aGJ{}vVs_GE*
zVUjFnzHiXfKQbpv&bR&}l2bzIjAooB)=-XNcYmrGmBh(&iu@o!^hn0^#}m2yZZUK8
zufVm7Gq0y`Mj;9b>`c?&PZkU0j4>IL=UL&-Lp3j<Z6B(#r?G=5OTIVqppQV7;$oUZ
z_*bfNYVfkU+>&47B5pAW4JceG{!XCA)kT<%2nqCxj<)uy6XR_uws~>_MEKPOpAQ!H
zkn>FKh)<9DwwS*|Y(q?$^N!6<o$@lIm`~9<Ur$vhpA3&|(gF`!3*mR7y8%R>(51O0
z^JM~Ax{AI1Oj$fs-S5d4T7Z_i1?{%0SsIuQ&r8#(JA=2iLcTN+?>wOL532%&dMYkT
z*T5xepC+V6zxhS@vNbMoi|i)=rpli@R9~P!39tWbSSb904ekv7D#quKbgFEMTb48P
zuq(VJ+&L8aWU(_FCD$3^uD!YM%O^K(dvy~Wm2hUuh6bD|#(I39Xt>N1Y{ZqXL`Fg6
zKQ?T2htHN!(Bx;tV2bfTtIj7e)liN-29s1kew>v(D^@)#v;}C4-G=7x#;-dM4yRWm
zyY`cS21ulzMK{PoaQ6xChEZ}o_#}X-o}<&0)$1#3we?+QeLt;aVCjeA)hn!}UaKt<
zat1fHEx13y-rXNMvpUUmCVzocPmN~-Y4(YJvQ#db)4|%B!rBsgAe+*yor~}FrNH08
z3V!97S}D7d$zbSD{$z;@IYMxM6aHdypIuS*pr_U6;#Y!_?0i<Th%7C5rAWptzT;+8
z^q+L14xti*_qZw!_5cZk%7|55dKPFjM~R1_=~fye=uVS6nDqhi)PszECfuz7L#WMP
z!r+BR+k)}Z4nk;GJ*^~}T(1)9OIq4cSY?CPrYrC|{k3|*qwa%HsQZRC>|&yU*@16l
z*dcMqDQgfNBf}?quiu4e>H)yTVfsp#f+Du0@=Kc41QockXkCkvu>FBd6Q+@FL!(Yx
z2`YuX#eMEiLEDhp+9uFqME_E^faV&~9qjBHJkIp~%$x^bN=N)K@kvSVEMdDuzA0sn
z88CBG?`RX1@#hQNd`o^V{37)!w|nA)QfiYBE^m=yQKv-fQF+UCMcuEe1d4BH7$?>b
zJl-r9@0^Ie=)guO1vOd=i$_4sz>y3x^R7n4ED!5o<f!284U3o`_8>XL3@5**h<Hcp
z@=-jpH@#|<>(xr%Hv)_gILarO46q+MaDOF%ChaymKoI6JU5Pg;7#2n9-18|S1;AK+
zgsn6;k6-%!QD>D?cFy}8F;r@z8H9xN1jsOBw2vQONVqBVEbkiNUqgw~*!^##ht>w0
zUOykwH=$LwX<q*Afk5R&Mctbiz>2j&nLy=@{hr)2O&-wm-NyjW7n~Zs9UlH;P7iP3
zI}S(r0YFVYacnKH(+{*)Tbw)@;6>%=&Th=+Z6NHo_tR|JCI8TJiXv2N7ei7M^Q+RM
z?9o`meH$5Yi;@9XaNR#jIK^&{N|DYNNbtdb)XW1Lv2k{E>;?F`#Pq|&_;gm~&~Zc9
zf+6ZE%{x4|{YdtE?a^gKyzr}dA>OxQv+pq|@IXL%WS0CiX!V<r8QLM#*MRM`MfrL^
z$oozeKu(Nq#u9g*IQ%|9o}%#$^xUC(KN(HGggqLu?YF|WP9UQsZcqciD65u58u(o>
zm$fCePA%lU{%pTKD7|5NJHeXg=I0jL@$tOF@K*MI$)f?om)D63K*M|r`gb9edD1~Y
zc|w7N)Y%do7=0{RC|AziW7#am$)9jciRJ?IWl9PE{G3U+$%FcyKs_0Cgq`=K3@ttV
z9g;M!3z~f_?P%y3-ph%vBM<NK?r_G3UHy@sF~h!`(w;SXKRHdJ%HcvAvAAT4Qk5qo
zMgavqbI6bm$F8YQRbu-Q60TKKDjBrG#E!{k)-_O9;f|9i`Bf)1frR1W)S8zwM~^w3
zgTV=3ki=7ABU#jjo~7zOCe&Y02bU{vhUnu>eS@p7P&Ea8M@97+%XEj*(1E6vHj==d
zjsoviB>j^$_^OI_DEPvFkVo(BGRo%cJeD){6Uckei=~1}>sp299|IRjhXe)%?uP0I
zF5+>?0#Ye}T^Y$u_rc4=lPcq4K^D(TZG-w30-YiEM=dcK+4#o*>lJ8&JLi+3UcpZk
z!^?95S^C0ja^jwP`|{<+3cBVo<?ZqT?*63G^-kLfa79`_!t|3XN?#4oHPT!4lKDlS
z&|`dJ%anWz)cD{Izk)|S%W;K%rEUv+1C{y)t{{-Ax56UAAwT>g$(mRdQmadS+Vh~z
zS@|P}=|z3P6uS+&@QsMp0no9Od&27O&14zHXGAOEy<!&qoA;BoYe5Gd6XaoKZz3O>
zh~OKpymK5C%;LLb467@KgIiVwYbYd6wFxI{0-~MOGf<ue$0Kq0FKpj=H%&N{0wz|#
zv3H@VVff^)dR)T~U^4qB#5GIMnxWTKM_`%1WhbW1RX5wx$kbFST`O+(C#(QYZ1qYr
zH@an#>Tq$nBTB!{SrW<fHPfZ<Irz+G=%+OcFrK=FGzu_OrmZYz+$?F}3ABX2OV4Ts
zsD|%iq->mL9H<Tr^2xz>s}C&l&l#m?s*{tA?BHS4mVKHAVMqm63H<|c5n0~k)-kbg
zXidai&9ZUy0~WFYYKT;oe~rytRk?)r8bptITsWj(@HLI;@=v5|XUnSls7$uaxFRL+
zRVMGuL3w}NbV1`^=Pw*0?>bm8+xfeY(1PikW*PB>>Tq(FR`91N0c2&>lL2sZo5=VD
zQY{>7dh_TX98L2)n{2OV=T10~*YzX27i2Q7W<Ntl33%|cp7@_XQ%`!?JFZGy3th+(
z9`69=1diKn`u=0X>86M4$?gZIXZaBq#sA*{PH8){|GUi;oM>e?ua7eF4WFuFYZSG|
zze?srg|5Ti8Og{<A|-y4P^Vw-HZz`B)6iIj60J8RmoI9z56$O?KklBRh#A8wwXksP
zIQ{KLcY4jo=L=|_hbacrV%Qq6!Kf@BT^Q2N;#Sl~J=F}P(ian;6LK=Pia-a<t*`EG
zsvh#5MX1PG_H?pP{~kcN#Yl5&$-{v%{fm#~)VR&aYV*QjB+l!bVIL2ZIK*(o)mg>O
zeFx<XJQO~(UxB;12D)?%fz2kHQ0)}w{#l!~t+-NWg^{L<(tn&kN>uw9!U+zhyk?@w
zjsA6(oKD=Ka;A>Ca)oPORxK+kxH#O@<!C?nm{!PyX#FIJ5Fce^7Glx51z4q!IF-9T
z(}u{s9F?k?->zhC!!XS4@=swnuMk>t+JmLmFiE^1aX3f<)D@`%K0FGK^gg1a1j>zi
z2KhV>sjU7AX3F$SEqrXSC}fRx64GDoc%!u2Yag68Lw@w9v;xOONf@o)Lc|Uh3<2<E
zaTlN?EK~WL>1ctTYu-mFZuHk*+R{GjXHIGq3p)tFtQp%TYqD=j1&y)>@zxoxUJ!G@
zgI0XKmP6MNzw>n<q>RxK$-Gbzs}dyfFzt>#5;f6oR27ql!%+{tr+(`(>%51|k`ML}
zY4eE)Lxq|JMas(;JibNQds1bUB&r}ydMQXBY4x(^&fY_&LlQC)3hylc$~8&~|06-D
z#T+%66rYbHX%^KuqJED_wuGB+=h`nWA!>1n0)3wZrBG3%`b^Ozv6__dNa@%V14|!D
zQ?o$z5u0^8`giv%qE!B<jmp7|q6krbi_G>zZ!3j;BlDlJDk)h@9{nSQeEk!z9RGW)
z${RSF3phEM*ce*>Xdp}585vj$|40=&S{S-GTiE?Op*vY&Lvr9}BO$XWy80IF+6@%n
z5*2ueT_g@ofP#u5pxb7n*fv^Xtt7&?SRc{*2Ka-*!BuOpf}neHGCiHy$@Ka1^Dint
z;DkmIL$-e)rj4o2WQV%Gy;Xg(_Bh#qeOsTM2f@KEe~4kJ8kNLQ+;(!j^b<yk)2Ga*
z`Da!i<uGd>gJMcNhvklP5Z6I+9Fq@c&D~8Fb-4rmDT!MB5QC{Dsb;BharP*O;SF4&
zc$wj-7Oep7#$WZN!1nznc@Vb<_Dn%ga-O#J(l=OGB`dy=Sy&$(5<R7(thvp%XRU@s
zvD!RD|Ap4-iUR15Zc?p`W5PfYcwl?pqP=!?Ly8YQJV-_=LA<5F14$ueWH9bhJ%_)w
z7V5=v(sMJKH%(v>-n3zzu%d7E#^8`T@}V+5B;PP8J14#4cCPw-SQTdGa2gWL0*zKM
z#DfSXs_iWOMt<QB?xsXtvjwXo?shW#x+{vW<m&Lb0}Ev3ll-+Cv)H2yx72H2vfbao
z)&}#dlu-#QrCe#mI_dwQZ8aV{yR-kuQpUpp0FeFvxZ;1G7pk86VlScc8cAV!@aPt-
zLbAEaXYm_LG-m+FWTqvpGKKfn>)0*+Y>Lkd=LlyoHjublNLefhKBv@JoC>P7N1_#>
zv=mLWe96%EY;!ZGSQDbZ<UL<`wO?;KrMew|zF)HM0NF!*C)o2Xb2C86^s8tmic{Un
z9|@ov+&qEN=O7wL#??)8qe;19z|E|XhPC!>Wb#;tzqAGgx~uk+-$+2_8U`!ypbwXl
z^2E-FkM1?lY@yt8=J3%QK+xaZ6ok=-y%=KXCD^0r!5vUneW>95PzCkOPO*t}p$;->
ze5j-BLT_;)cZQzR2CEsm@rU7GZfFtdp*a|g4wDr%8?2QkIGasRfDWT-Dvy*U{?IHT
z*}wGnzdlSptl#ZF^sf)KT|BJs&kLG91^A6ls{CzFprZ6-Y!V0Xysh%9p%iMd7HLsS
zN+^Un$<a&ma`v<=_o?VGrwUGJw=O>tDV)T@i!v?3o0Fsx2qI(AX_$dDkBzQ@fRM%n
zRXk6hb9Py#JXUs+7)w@eo;g%QQ95Yq!K_<hHRNS7N*hWtqjDKgW@A%kX02U4KOU=O
zvdAz#;kT}}XkJ!QzU;bHk8JAq+{_%?pw^sYL|x|PeydT9?IGU9Y51^30i-q1#6m%s
zrcB|gv?mw<4R{=sU0@i6UC;{u0I&8wO=u?6r+b>d=z{0dGS+pToEI6=Bo8+{k$7&Z
zo4>PH(`ce8E-Ps&uv`NQ;U$%t;w~|@E3WVOCi~R4oj5wP?%<*1C%}Jq%a^q~T7u>K
zML5AKfQDv6>PuT`{SrKHRAF+^&edg6+5R_#H?Lz3iGoWo#PCEd0DS;)2U({{X#zU^
zw_xv{4x7|t!S)>44J;KfA|DC?;uQ($l+5Vp7oeqf7{GBF9356nx|&B~gs+@N^gSdd
zvb*>&W)|u#F{Z_b`f#GV<S^Bd2~Pyg*5%eHlTUz}@u5PV*7l^~{G24{Qqrx`@++o~
ztboMW3urCbjTB~&;i*a|(eC0qz31>tQ`pYv3#||N{xj1NgB<#=Odt6{eB%#9RLt5v
zIi|0u70`#ai}9fJjKv7dE!9ZrOIX!3{$z_K5FBd-Kp-&e4(J$LD-)NMTp^_pB`RT;
zftVVlK2g@+1Ahv2$D){@Y#cL#dUj<nH(n~Edj4!|Skt}P+Crb$TxBzD_v2O|_fXDf
zyOhDlptC3q?wEW8BD4DYDy}&OXN4=Gin3Clovb(?fZbl&a4@HKR2*IMYDM~#=eox}
zr@@VgW<o#eD*<OYTh-Dp*Y9Q~ulW+qlsH#Z{CRf%{8T(JHO1!sg=2L#MeC>9*&%#6
zd2m9{1NYp>)6=oAvqdCn5#cx{AJ%S8skUgMglu2*IAtd+z1>B&`MuEAS(D(<6X#Lj
z?f4CFx$)M&$=7*>9v1ER4b6!SIz-m0e{o0BfkySREchp?WdVPpQCh!q$t>?rL!&Jg
zd#heM;&~A}VEm8Dvy&P|J*eAV&w!&Nx6HFV&B8jJFVTmgLaswn!cx$&%JbTsloz!3
zMEz1d`k==`Ueub_JAy_&`!ogbwx27^ZXgFNAbx=g_I~5nO^r)}&myw~+yY*cJl4$I
znNJ32M&K=0(2Dj_>@39`3=FX!v3nZHno_@q^!y}%(yw0PqOo=);6Y@&ylVe>nMOZ~
zd>j#QQSBn3oaWd;qy<AH3+eYXyF}9Xqs&`j)Js;7`deezzO@(if{@wtUbaD%FKTU}
z5w@ZwEG`RDwK>$&5(5H$Ayi)0haAYO6TH<z?6tyk$+6-5SvI&DI1q3_)(4fdZ5Se9
zBbX2Qt9$@_(SU-uL9$`(89L9b^PH`sRc(S;t{a+9w+wmDT>>FR?rhqHmNOO+(})NB
zLI@B@v0)eq!ug`>G<@htRlp3n!EpU|n+G+AvXFrWSUsLMBfL*ZB`CRsIVHNTR&b?K
zxBg<HRwQH-Pd9_*;+0`Ns@&d6=NP#dv8(oIe;Q1jESZF+juys7ECR&=R-98_-67uO
z3$~aVQBexDk*n5GG0IbgeygBsp6J9Ak`^z@J>sN0BjfB>UVcJ|x%=-zb%OV7lmZc&
zxiupadZVF7)6QuhoY;;FK2b*qL0J-Rn-8!X4ZY$-ZSUXV5DFd7`T41c(#lAeLMoeT
z4%g655v@7AqT!i@)Edt5JMbN(=Q-6{=L4iG8RA%}w;&pKmtWvI4?G9pVRp|RTw`g0
zD5c12B&A2&P6Ng~8WM2eIW<Jfbv|J{U>=wxd?r7A*N+&!Be7PX3s|7~z=APxm=A?5
z<Ct?-npDR`F>t>xB4WG|*Td@VX{Rs)PV0|yK`oI3^xn(4c_j&vgxk_Y3o(-`_5o`V
zRTghg6%l@(qodXN;dB#+OKJEEvhfcnc#BeO2|E(5df-!fKDZ!%9!^BJ_4)9P+9Dq5
zK1=(v?KmIp34r?z{NEWnLB3Px{XYwy-akun4F7xTRr2^zeYW{gcK9)>aJDdU5;w5@
zak=<+-PLH-|04pelTb%ULpuuuJC7DgyT@D|p{!V!0v3KpDnRjANN12q6SUR3mb9<-
z>2r~IApQGhst<D{{Vf5G$!J9FyJ-E-*A*EoNl_C#=MT@p=Xle}_jo(=^L>Z!3*?5V
z8#)hJ0TdZ<kpQa~V_Tj9(@ze|2#~^ENp?G7Jt@Eflo`qt*qnbcmXouacBm8O7C@Os
z{Du2beNd5?Za)HL!ZE%zpwg!kyVuKIF9N=(m23`w*$5>g0M-BK#nGFP>$i=qk82DO
z7h;Ft!D5E15OgW)&%lej*?^1~2=*Z5$2VX>V{x8SC+{i10BbtUk9@I#Vi&hX)q<DD
zB<)Sw)<~oUy)n6wE>Q!LwySI{Bnv%Sm)yh{^sSVJ8&h_D-BJ_YZe5eCaAWU9b$O2c
z$T|{vWVRtOL!xC0DTc(Qbe`ItNtt5hr<)VijD0{U;T#bUEp381_y`%ZIav?kuY<v6
zX67v2C6cbIOG)5k!|qC-WsWgOfACm-q$QibFt!z9&vuM4Ra<@t5?aicE~iV+3AvjG
zIg1RVRV7=ipka+$YiU^iebt34R#X_ZP(5j+8#<1x%dt8dn8LWW*;+`tjJbED5GP+(
z;WzH$-`*O}!b)z&?E7%4&3EtV-<sTj?CD<=L+<P?A5!5CSPGi)w4A<JPgzq;6rR*O
zXNdyY$eTaKl$~z~drmdabQ@3giDtf2>G{iyYdEBPW=*xNSc;Rlt6~F4M`5G+VtOjc
z*0qGzCb@gME5udTjJA-9O<&TWd~}ysBd(eVT1-H82-doyH9RST)|+Pb{o*;$j9Tjs
zhU!IlsPsj8=(x3bAKJTopW3^6AKROHR^7wZ185wJGVhA~hEc|LP;k7NEz-@4p5o}F
z`AD6naG3(n=NF9HTH81=F+Q|JOz$7wm9I<+#BSmB@o_cLt2GkW9|?7mM;r!JZp89l
zbo!Hp8=n!XH1{GwaDU+k)pGp`C|cXkCU5%vcH)+v@0eK>%7gWxmuMu9YLlChA|_D@
zi#5zovN_!a-0?~pUV-Rj*1P)KwdU-LguR>YM&*Nen+ln8Q$?WFCJg%DY%K}2!!1FE
zDv-A%Cbwo^p(lzac&_TZ-l#9kq`mhLcY3h9ZTUVCM(Ad&=EriQY5{jJv<5K&g|*Lk
zgV%ILnf1%8V2B0E&;Sp4sYbYOvvMebLwYwzkRQ#F8GpTQq#uv=J`uaSJ34OW<hi?`
zP14gpnLmL&7H`p4L%8;nC1<^Sv9p;w<Wt?|_#g6*20U1pM3nHRfS>ITeSGo6+-8Xw
znCk*n{kdDEi)Hi&u^)~cs@iyCkFWB2SWZU|Uc%^43ZIZQ-vWNExCCtDW<BUzywAz*
z=(vxHv4d&65KOllAq-#$@U{@M^Tie>jqHs;;tWf$v{}0{p0Rvxkq``)*>+Akq%|Na
zA`@~-Vfe|+(AIlqru+7Ceh4nsVmO9p9jc8}HX^W&ViBDXT+uXbT#R#idPn&L>+#b6
zflC-4C5-X;kUnR~L>PSLh*gvL68}RBsu#2l`s_9KjUWRhiqF`j)`y`2`YU(>3bdBj
z?>iyjEhe-~$^I5!nn%B6Wh+I`FvLNv<KrLHuL|CB_`07?lkcY;`F}7N|9w?h$j;W(
z!pz0d;6Gc;=tP?z1|!0VS^mTNfuvL}h&K?b1^iwS6ciDpxQaBY5Gc}49BtNL@wSAH
zN-`fR84|MY8{n7xC}ub4B$LcEGUf*6``pjVtH+rgy&k|kpb4%YlJ~9w&{2Xuzeu1M
zq`UMUPdX@*+$axeLs?$}*bD{+cnrR~Y#}m-O=_R~Wti_#iWT_s(=ymH^VTEl)dozx
zf?Q;WOl1sf3*~dyaUWrzpj(B{DD^$`<1{1iWu+66OaaANG(C3>auve~eX<+Ipl&04
zT}};W&1a3%W?dJ2=N#0t?e+aK+%t}5q%jSLvp3jZ%?&F}nOOWr>+{GFIa%wO_2`et
z=JzoRR~}iKuuR+azPI8;Gf9)z3kyA4EIOSl!sRR$DlW}0>&?Gb<F6G*f~S_Xmd?&<
zcTp7FM31gIFJU_kMTKVvYfdLV&qNi%10o_cXO}T8c0JA~S7IvYJW{2Mc@QfYQPg<B
zM^$g#zoTZ3_m+CrHFauLo}15?s=HP)?JB{H_0#&&1l#xC0PUJEil&(!l3&4$4Oabl
z(t*+m#j)cGDV4roRR~6gh^^UTE<ORsZfX<yztwQw%!x#Q2cf-H-Ei*R_oEBu0*M}r
zaR*fDOfo;PPv!PbT7OdxPFjDUG&0BrIox?s;EQMl0XBMs85AAF!I(xegz)j_*&}F&
zVxM4&whWS?c~-!t@$rAV{-U7+LEraxy0yVT-$%W;DztTaLwSHk;hmJtJCfzd$8ZUU
zM49WF9Y$VtKqVmyl%^86>gPojmj<IO9KHY)gcrh=qY_}jG!}())PpS;BXBA!e*hSR
zilZbQ&4Xd81)(e#05gdbS)_Rc7=w(fM<O8%<WUPqvy2OZsgKBL!XxkiWU2;{7$;C6
z9R+3;R|H$*pUT7|00m@1wlw|z2Pi1^Q3j9tQwHGtFdr%Y_fp{BLtn(*#K`48rPtM-
zeUXnbzjJ6`4-eFtz^q{qhyCKLVL%|Li&oS2mxY?F!w9Q6rOe*>mnln;cTqCt=ADbE
zZ8GAnoM+S1(5$i8^O4t`ue;vO4i}z0wz-QEIVe5_u03;}-!G1NyY8;h^}y;tzY}i5
zqQr#Ur3Fy8sSa$Q0ys+f`!`+>9WbvU_I`Sj;$4{S>O3?#inLHCrtLy~!s#WXV=oVP
zeE93*Nc`PBi4q@%Ao$x4lw9vLHM!6mn3-b_cebF|n-2vt-zYVF_&sDE--J-P;2WHo
z+@n2areE0o$LjvjlV2X7ZU@j+`{*8zq`JR3gKF#EW|#+{nMyo-a>nFFTg&vhyT=b}
zDa8+v0(Dgx0yRL@ZXOYIlV<CBxH&myw-{Mgw|3Z>SZ0|MFizy0VPW8;AfA5|pe!#j
zX}Py^8fl5SyS4g1WSKKtnyP+_PoOwMMw<ZOz9;D51vwfT?(7P{J9uC+df4xbrr2zV
zB?xsPrQn{*Mv;KOgSS&5@+LuXkea1)Zq>u`(i@Z)diJp~U54*-miOchy7Z35eL>^M
z4p<-aIxH4VUZgS783@H%M7P9hX>t{|<kmOhY+3PLOlAj^>RU7$n4T(brCG#h9e9p!
z+o`i;EGGq3&pF;~5V~eBD}lC)>if$w%Vf}AFxGqO88|ApfHf&Bvu+xdG)@vuF}Yvk
z)o;~k-%+0K0g+L`Wal<EEr#pT9&cB!85zTR)doGHYQA;Y4iG{j=~O<Gh^(9@<v8&o
z)RDtDdQW7hx3ZX>a!$=ZV|z$e%>f0%XoLib%)!R^RoS+{!#X?h-<kGFCJU+*P>6uu
zF&&KxORdZU&EwQFITIRLo(7TA3W}y6X{?Y%y2j0It!ekU#<)$qghZtpcS>L3uh`Uj
z7GY;6f$9qKynP#oS3$$a{p^{D+0oJQ71`1?OAn_m8)UGZmj3l*ZI)`V-a>MKGGFG<
z&^jg#Ok%(hhm>hSrZ5;Qga4u(?^i>GiW_j9%_7M>j(^|Om$#{k+^*UL<NK}BVp#gd
zBD%KcbS)b{|CXjYx_P3_eGPFMMz1_Nk540?Us_HPBMy;cERLy0SxfOpX5xzV&cl#)
zt&&6pjk~F}sDOyA9s+XeyTf%9%I=S3nCcDp2Af;QpT#R>nEgzW_1gCICtAD^WpC`A
z{9&DXkG#01Xo)U$OC(L5Y$DQ|Q4C6CjUKk1UkPj$nXH##J{c8e#K|&{mA*;b$r0E4
zUNo0jthwA(c&N1l=PEe8Rw_8cEl|-eya9z&H3#n`B$t#+aJ03RFMzrV@gowbe8v(c
zIFM60^0&lCFO10NU4w@|61xiZ4CVXeaKjd;d?sv<gv6;u6elr3xr~p;CLrK1=+ZBw
z$Y<W|q#kt(G{*D&Qkw-trQSG}>52XM*lS8XiVjgWpRB;&U_C0g+`6B5V&w|O6B*_q
zsATxL!M}+$He)1eOWECce#eS@2n^xhlB4<_Nn?yCVEQWDs(r`|@2GqLe<#(|&P0U?
z$7V5IgpWf09uIf_RazRwC?qEqRaHyL?iiS05UiGesJy%^>-C{{ypTBI&B0-iUYhk>
zIk<5xpsuV@g|z(AZD+C-;A!fTG=df1=<%nxy(a(IS+U{ME4ZbDEBtcD_3V=icT6*_
z)>|J<Y(kIYsG`z6gyX&}qOiN*?9OL086m5X{hq6Ig4#W@iNENBRsw2^%kU7#L2|pp
zfdZ~o%7N|AM$3+2Q82nCBw2dK>?>&6%nvHhZERBtjK+s4xnut*@>G<VN!iYC0JC0F
z7C4lQZ~9^GNSctWumcZ#1X037wz24bZkA{*jo3r`%UXDS^K_+8hV8{gw8t#vVSJ;%
z9c?Ez0!rvl#uwpap|4<*d9UuKSjWn24OFIi&rE}!=sVnu59lQ~@4HIl&h;AmLia?2
zUL-?{m1bz0QDnL&$JD)qE4*iTL#%6dSw8A41Gt4doXWr-`$rleCkVKi0#mfRM!)mY
zIRoubkmw30NIQhtCJYLo7$LOA<y9EL8N*i`%g_PIUD8SHni$er{_LTTN*Wqfx<buS
zb$(_9;wX-c*`xTSvy6C@PDNyy2YoKV;`dWQKiLwa26g^kXh`=t6PlPNT~Q9So~U*X
z3nx6eVXazyi3=nJQw6@jVna;b;RTqKnF0f_=;<}6<0^@)YUgQHPBXXoP$FjaOB^=t
zP%99lNT=pyPA&53Wj%hQT>AmA5m*OTp$!^CHTr}vM4n(X1Q*;{e-Rd2BCF-u@1ZGm
z!S8hJ6L=Gl4T_SDa7Xx|-{4mxveJg=ctf`BJ*fy!yF6Dz&?w(Q_6B}WQVtNI!BVBC
zKfX<>7vd6C96}XAQmF-Jd?1Q4eTfRB3q7hCh0f!(JkdWT5<{iAE#dKy*Jxq&3a1@~
z8C||Dn2mFNyrUV|<-)C^_y7@8c2Fz+2jrae9deBDu;U}tJ{^xAdxCD248(k;dCJ%o
z`y3sADe>U%s<JWQeHbE;y_*tD>uxwwv~8A1+R$VB=Q?%U?4joI$um;aH+eCrBqpn-
z%79D_7rb;R-;-9RTrwi9dPlg8&@tfWhhZ(Vx<DUpdj8XcHW`q{6yqiIzcmGmhsxE(
z@-zez1_>&1PQ+6(huX`;M9x~LrW~~#3{j0Bh2kDU$}@!fFQej4VGkJv?M4rU^x!RU
zEwhu$!CA_iDjFjrJa`aocySDX16?~;+wgav;}Zut6Mg%C4><PTsD!{kIiIRy9=1Aw
zY;M8Eqj=FH#bx<r<6@cBrQ0UMw6e8^v|*8L6vZKlp_PoKF*td|-B1-bh(bXl;KGoy
ze|2jEKeeu5MGO@KpjsEha>}8FL?8)Kgwc(Qlj{@#2Pt0?G`$h7<q&K~4OS{ORv@L7
z>P#M+qoXtlV@d}%c&OzO+QYKK`kyXaK{U(O^2DyIXCZlNQjt0^8~8JzNGrIxhj}}M
z&~QZlbx%t;MJ(Vux;2tgNKGlAqphLq%pd}JG9uoVHUo?|hN{pLQ6Em%r*+7t^<);X
zm~6=qChlNAVXNN*Sow->*4;}T;l;D1I-5T{Bif@4_}=>l`tK;qqDdt5zvisCKhMAH
z#r}`)7VW?LZqfdmXQ%zo5bJ00{Xb9^YKrk0Nf|oIW*K@(=`o2Vndz}ZDyk{!u}PVx
zzd--+_WC*U{~DH3{?GI64IB+@On&@9X>EUAo&L+G{L^dozaI4C3G#2wr~hseW@K&g
zKWs{uHu-9Je!3;4pE>eBltKUXb^*hG8I&413)$J&{D4N%7PcloU6bn%jPxJyQL?g*
z9g+YFFEDiE`8rW^laCNzQmi7CTnPfwyg3VDHRAl>h=In6jeaVOP@!-CP60j3+#vpL
zEYmh_oP0{-gTe7Or`L6x)6w?77QVi~<VDx`fw;L`VTJ3A_($%0y%60sa5-^3a6v=d
zmmak>jD8lWN@3RHcm80iV%M1A!+Y6iHM)05iC64tb$X2lV_%Txk@0l^hZqi^%Z?#-
zE;LE0uFx)R08_S-#(wC=dS&}vj6P4>5ZWjhthP=*Hht&TdLtKDR;rXEX4*z0h74FA
zMCINqrh3Vq;s%3MC1YL`{WjIAPk<IG3Wg4CtfDQ*vr2eaPwC^O8I68!!&nV4u+r_F
z?Axith|qN&KZ99L>VL#3rj^9Pj9Ss7>7duy!9H0vYF%>1jh)EPqvlr6h%R%CxDsk|
z!BACz7E%j?bm=pH6Eaw{+suniuY7C9Ut~1cWfOX9KW9=H><&kQlinPV3h9R>3nJvK
z4L9(DRM=x;R&d#a@oFY7mB|m8h4692U5eYfcw|QKwqRsshN(q^v$4$)HgPpAJDJ`I
zkqj<O$?%~S@(l(Nhxp_sGA`$A%xJ7kG%+@Mg|5Rt6m|$*ZUs_O&tJj;*GHA8ccUky
ztdHVq5%mDvVz0+qo6-yO?&N>q(8Cd!K!+wCd=d@w%~e$=gdUgD&wj$LQ1r>-E=O@c
ze+Z$x{>6(JA-fNVr)X;*)40Eym1TtUZI1Pwwx1hUi+G1Jlk~vCYeXMNYtr)1?qwyg
zsX_e*$h?380O0<gk^3K^_@6N5|2rtFRkhT9jP1T;nZ|k<{vtt&=cCpw1{DoTNi|6*
zNR~&3M3w}sVsT4{Fd&%jPlD{py<BN_zia9hI9Ip7U3}jPq_+H)r9(in7-!PpJihq-
zw0+F|?s|8=Bj*cv!`7|95cO>0ou?0R@7-Fc59o$UvyVs4cUbujHUA>sH!}L54>`e`
zHUx#Q+Hn&Og#YVOuo*niy*GU3rH;%f``nk#NN5-xrZ34NeH$l`4@t);4(+0|Z#I>Y
z)~Kzs#exIAaf--65L0U<!Yaeav3)qH(`Lb>HT_SvV8O2WYeD>Mq^Y6L!Xu8%vnp<f
zF-ML?EA-QLj_KdFHPDT9@{&CgOfV=>ofG@w!}R7M28?i1*T&zp3X4^OMCY6(Dg<-!
zXmcGQrRgHXGYre7GfTJ)rhl|rs%abKT_Nt24_Q``XH{88NVPW+`x4ZdrMuO0iZ0g`
z%p}y};~T5gbb9SeL8BSc`SO#ixC$@QhXxZ=B}L`tP}&k?1oSPS=4%{UOHe0<_XWln
zwbl5cn(j-qK`)vGHY5B5C|QZd5)W7c@{bNVXqJ!<MH|d3P$j9&VqkPfJu|wcu=-=7
zLO~2}`PnP-On3_NOs4{hJ&4M7x*M^%g^_s4zus|ykus<=xkIi<3#(~DK73KtIuaza
zq3Ok{j4$g8v7e>!n$^ufc?N9C-BF2QK1(kv++h!>$QbAjq)_b$$PcJdV+F7hz0Hu@
zqj+}m0qn{t^tD3DfBb~0B36|Q`bs*xs|$i^G4uNUEBl4g;op-;Wl~iThgga?+dL7s
zUP(8lMO?g{GcYpDS{NM!UA8Hco?#}eNEioRBHy4`mq!Pd-9@-97|k$hpEX>xoX+dY
zDr$wfm^P&}Wu{!%?)U_(%Mn79$(ywvu*kJ9r4u|MyYLI_67U7%6Gd_vb##Nerf@>&
z8W11z$$~xEZt$dPG}+*IZky+os5Ju2eRi;1=rUEeIn>t-AzC_IGM-<V%6qUamagiO
zojXi&7L8*IWlJ}@8}`JxyIBN$u|oRzm@w!)u;`JJ^U^Jm{ZDgyeTstN3t7NGnWGqQ
z+EIa8gC_h)Zo3JN!q<7m%o03s)htD&NG?lXEop9Gx?#VaLBB3SgcFmh3F=U430hIe
z6>IXWK3^6QNU+2pe=MBn4I*R@A%-iLD<B3fBYdI`-^xCP#WQb@1Qb6Wc1|7$rrI$0
zS^}=1l87G|X!N)P#&2-ZEFApzIK5kn5Gfb61a_<ma9;3$9f;mz8FokB;4w(Y@!^ya
zu;TjxPaQyO7n{FcIlqEr<3P?P4i)3rOGc5I4};xC;qQa&0^@jzv_HUBAQxZ^AEFm5
zBTlS@?>COHTE-O^wo$sL_h{dcPl=^muAQb`_BRm};=cy{qSkui;`WSsj9%c^+bIDQ
z0`_?KX0<-=o!t{u(Ln)v><gH1Bl$-3LHEdi^mWSpxtdQaHDvah(~iGD|9egFyL#F~
z?1$GP^^-sUm)!YZ{+<LJ&0K7L{O*24r%mkt6Kzb6pOOS-L<yFAV=ioJ*0iBM>%VGL
z0pC=GB7*AQ?N7N{ut*a%MH-tdtNmNC+Yf$|KS)BW(g<Pdkm%)j?It(+K5~xj$IK!{
zp+6C1gYJS33v`?Xo$~~77W&2eyGU19<m6FlNMw~43kikpZyKWVZ@N_*wAeJPS%sqH
z40>QJ*z$d{+{j?(e&hgTy^2|AR9vx1Xre2fagGv0YXWqtNkg*v%40v?BJBt|f9wX5
z{QTlCM}b-0{mV?IG>TW_BdviUKhtosrBqdfq&Frdz>cF~yK{P@(w{Vr7z2qKFwLhc
zQuogKO@~YwyS9%+d-zD7mJG~@?EFJLSn!a&mhE5$_4xBl&6QHMzL?CdzEnC~C3$X@
zvY!{_GR06ep5;<#cKCSJ%srxX=+pn?ywDwtJ2{TV;0DKBO2t++B(tIO4)Wh`rD13P
z4fE$#%zkd=UzOB<aY_AGMe|>7<sX$yw1SM(554I3!t(H9Z3X!Z5et+k4_h&Thynx!
ziTh5;c|GaYsH@W32G0xdhr&KvFp@Nsj=Jm7RQGd8dhSlG9l$e(+pLSdq<w-kZ7W-l
z4}DfW=)F=&(6?c$=|K`W>4gi=-*CuID&Z3zI^-`4<B}t|X$V`AU_-K%EPFL_9twl_
zImK{&j6sLpH7WP2;B>U^S?dHxK8fP*;fE|a(KYMgMUo`T<LMf=xb>HIS1f!*6dOI2
zFjC3<eBkTsS?s~jirYF@Nrja2AilB1Grgok(Q{J!-yMdCbS>O=-AL`<v=HnY;qaP=
z%r%pyN;W|G{!13k5HgL{&1MZLLmT$ii@iPy4pvmSTAaNGh_&&=IOx}7|G?LkOre&5
ze$)ZX{wLMvAK$Ose+l($RV_DU6^yOKl5CcA-LOWBeC<Ob3qkCr#=PoHO}Zi7*=4i{
zhy`P5@RD?fbbG{Ww-4~nmy*sK0y=*cjfuaB@ZGQIADDEhtuw}4>6=9pp;`CYPTdVX
z8(*?V&%QoipuH0>WKlL8<OkjufLT@|_$itWfOgQQ1sL1my9jh5H&Aqu0?B`H1h6nM
zGosuE%;~qrp)5qiJt5TkvuY!P5&J7R#=`qhgmgE%$-tyU1wv>A*zTKckD!paN@~hh
zmXzm~qZhMGV<pYA7aBO1=rl8ewvtPYii`7)>dQGd=AG8&20HW0RGV8X{$9LldFZYm
zE?}`Q3i?xJRz43S?VFMmqRyvWaS#(~Lempg9nTM$EFDP(Gzx#$r)W&lpFKqc<y(GB
zQ)iBAS`N=DS_sKSXI55P(lHkwH)@Q89oTUc{-vd@Ue^>AoJh-AxEw$-bjW>`_+gEi
z2w`99#UbFZGiQjS8kj~@PGqpsPX`T{YO<m!OQBo2H4HfqK(14BF?XJ?$*LTUG|=XE
z%mXZ(W0fCU1)eodty#XEHD<Wgj8lxa(h;^9fW-UTt2UUeP&QC*>j`CaEqTFag;$jY
z8_{Wzz>HXx&G*Dx<5skhpETxIdhKH?DtY@b9l8$l?UkM#J-Snmts7bd7xayKTFJ(u
zyAT&@6cAYcs{PBfpqZa%sxhJ5nSZBPji?Zlf&}#L?t)vC4X5VLp%~fz2Sx<*oN<7`
z?ge=k<=X7r<~F7Tvp9#HB{!mA!QWBOf%EiSJ6KIF8QZNjg&x~-%e*tflL(ji_S^sO
ztmib1rp09uon}RcsFi#k)oLs@$?vs(i>5k3YN%$T(5Or(TZ5JW9mA6mIMD08=749$
z!d+l*iu{Il7^Yu}H;lgw=En1sJpCKPSqTCHy4(f&NPelr31^*l%KHq^QE>z>Ks_bH
zjbD?({~8Din7IvZeJ>8Ey=e;I?thpzD=zE5UHeO|neioJwG;IyLk?xOz(yO&0DTU~
z^#)xcs|s>Flgmp;SmYJ4g(|HMu3v7#<SE)AQQ4Qptn#EiMmi^p+Ei-7DkP+HtEnTf
z=ihEK*Qz1Ztg&vmf~iSIJvy;UM*1)`@_lXyy`^7!LwVESw8;X~PDDY`x##uAQg`Ks
z=exD#_B;<%p^vKWmo{iCKEmMLveyeSGEVy6BOKJM`)TA4((F&!tIH99l|b!Je=-ox
zTnV0#B=>;c*Aa8iF#UZo7CvDq4>8#qLJ|YdZ!AsH%^_7N1IQjCro<P>K7UpUK$>l@
zw`1S}(D?mUXu_C{wupRS-jiX~w=Uqqhf|Vb3Cm9L=<ElBA0am3@5~_j4>T+w91Cu^
z*&Ty%sN?x*h~mJc4g~k{xD4ZmF%FXZNC;oVDwLZ_WvrnzY|{v8hc1nmx4^<U$9gKZ
zXD;2On@pVz(zumYHw-cDICc(jj*0Lh@n}B_NB#b3S3Y`joU*Hg4D^tTlnR`X)wKiE
z<1(Wo3^4=KAZ|hOq%hItOAv2Yuv6FZW5>}Z;yriXsAf+Lp+OFLbR!&Ox?x<j>ABwl
zu8w&|5pCxmu#$?Cv2_-Vghl2LZ6m7}VLEfR5o2Ou$x02uA-%QB2$c(c1rH3R9hesc
zfpn#oqpbKuVsdfV#cv@5pV4^f_!WS+F>SV6N0JQ9E!T90EX((_{bSSFv9ld%I0&}9
zH&Jd4MEX1e0iqDtq~h?DBrxQX1iI0lIs<|kB$Yrh&cpeK0-^K%=FBsCBT46@h<vzQ
zR*F0_2h6Z11Y9Zzju}{_b;!1TT<IfdPup&BfzJrm?bo16`)8Tm1upGj;JDjh>#<Oy
z8t{(&!50W|bIsS-1avP5+*F7gID<ta6$a=EvLN_Gn#i|E*V;GvV|e9HOQ9zf{;k4c
z6E1|)o(`{GoSr=usmv~(8ivQq9h)k@J&LDI;_p0b!?ZsmFktoKIgcIE+yq!s*%$%)
z#ay6sWeCZZ>yi!AyDq1V(#V}^;{{V<B^hU0(%wtueKZDT`@J-_3mSLDBmaq~d|XD<
z7XM`Dzdz4EMpggFBJu`~KkDTFp@A11CGaoLc9C!MrY0!YzwKdGfx7t=5D@|7VVCk+
z^B@Uld)n>*@T4WJ&U-NTq43w=|K>z8%pr_nC>%C(Wa_l78Ufib$r8Od)IIN=u>417
z`Hl{9A$mI5A(;+-Q&$F&h-@;NR>Z<2U;Y21>>Z;s@0V@SbkMQQj%_;~+qTuQ?c|AV
zcWm3XZQHhP&R%QWarS%mJ!9R^&!_)*s(v+VR@I#QrAT}`17Y+l<`b-nvmDNW`De%y
zrwTZ9EJrj1AFA>B`1jYDow}~*dfPs}IZMO3=a{Fy#IOILc8F0;JS4x(k-NSpbN@qM
z`@aE_e}5{!$v3+qVs7u?sOV(y@1Os*Fgu`fCW9=G@F_#VQ%xf$hj0~wnnP0$hFI+@
zkQj~v#V>xn)u??YutKsX><O0LtJ*CTAYt%cbdwrkH)-u>pxKCl^p!C-o?+9;!Nug^
z{rP!|+KsP5%uF;ZCa5F;O^9TGac=<e#17!Ngq|n{jbexb$Js+_Pf5VvAs8ZxqWBs8
zB0&S13$r1<F)VBk$e5stmC}hMzOSHBA0t(kR!@rbH|QU6*IH0=h|_OeT6wpDmdv23
z34f|!XhwEd(Kkc%FUYK@H{gz+bBn7dd5Fl+jfYh}4;N_qJ7#NlT2O+)R4Pxe>M|=V
z_H(PfkV1rz4jl?gJ(ArXMyWT4y(86d3`$iI4^l9`vLdZkzpznSd5Ikfrs8qcSy&>z
zTIZgWZGXw0n9ibQxYWE@gI0(3#KA-dAdPcsL_|hg2@~C!VZDM}5;v_Nykfq!*@*Zf
zE_wVgx82GMDryKO{U{D>vSzSc%B~|cjDQrt5BN=Ugpsf8H8f1lR4SGo#hCuXPL;QQ
z#~<Fi-k$qL|7RVJ1Mm1Ag<$gB0(}Grl3S(KpYI)5f?u3vC7#V;7XHhGB(-?~L6q0H
z3n(8fq$!!dl{5-8`7Oj@C;&S?r8OD`wLCHxqX2ux!ard>b?C4MoepT3X`qdW2dNn&
z<Us;@%o6IHN`m_LE5@ycr7sZ5iN)2(z?4TB28{O!&JjxPf+H!xrjo)qWAjZifsc&}
zRUE<g)K;7gXjcN#UR5gfzb2nN2z_KhXjz-ToEUcM{^o{zAJg2QnR<7bsn(YUNIKF@
z%f>o8)K}%Lpu>0tQei+{<z4bzXqy$)s2?v=pRVAvTjJpopW)-K>>*VGErz|qjbK#9
zvtd8rcHplw%YyQCKR{kyo6fgg!)6tHUYT(L>B7er5)41iG`j$qe*kSh$fY!PehLcD
zWeKZHn<492B34*JUQh=CY1R~jT9Jt=k=jCU2=SL&&y5QI2uAG2?L8qd2U(^AW#{(x
zThSy=C#>k+QMo^7caQcpU?Qn}j-`s?1vXuzG#j8(A+RUAY})F@=r&F(8nI&HspAy4
z4>(M>hI9c7?DCW8rw6|23?qQMSq?*Vx?v30U%luBo)B-k2mkL)Ljk5xUha3pK>EEj
z@(;tH|M@xkuN?gsz;*bygizwYR!6=(Xgcg^>WlGtRYCozY<<HB2ZgQ)h*70uL|pZ2
z>rFX2E>kaZo)O<^J7a`MX8Pf`gBd4vrtD|qKn&B)C&wp0O-x*@-|m*0egT=-t@%dD
zgP2D+#WPptnc;_ugD6%zN}Z+X4=c61XNLb7L1gWd8;NHrBXwJ7s0ce#lWnnFUMTR&
z1_R9Fin4!d17d4jpKcfh?MKRxxQk$@)*hradH2$3)nyXep<KqaI3?gC#eK%i>5Z;B
z?yX+-Bd=TqO2!11?MDtG0n(*T^!CIiF@ZQymqq1wPM_X$Iu9-P=^}v7npvvPBu!d$
z7K?@CsA8H38+zjA@{;{kG)#AHME>Ix<711_iQ@WWMObXyVO)a&^qE1GqpP47Q|_AG
zP`(AD&r!V^MXQ^e+*n5~Lp9!B+#y3#f8J^5!iC@3Y@P`;FoUH{G*pj*q7MVV)29+j
z>BC`a|1@U_v%%o9VH_HsSnM`jZ-&CDvbiqDg)tQEnV>b%Ptm)T|1?TrpIl)Y$LnG_
zzKi5j2Fx^K^PG1=*?GhK;$(UCF-tM~^=Z*+Wp{FSuy7iHt9#4n(sUuH<I4zjuT^*g
zTOj)T0YzMUS}8lWAh=#M-<;W0su6sG+MC}XSqZj-`H_&HD?2Z|qE8QdIM(X#NffsX
zuwQ<4gm=;OFM%U76&;OT!|+5x?B#F>K??@v+6*|10Csdnyg9hAsC5_OrSL;jVkLlf
zHXIPukLqbhs~-*oa^gqgvtpgTk_7Gy<tuXYyQ=x)UZpuI%V@LXq4|I6hehHuRD*Qk
z+@3~62V_$Rc&ax*Fe`-_r5e~NV8Dh7^Qkc47_lIobqdmfrCP}{2YGKf1@Bh!U!R!l
zVh{a+_vh}x%?yACZT@@6M}$iwzkin{Cukrb?*D6_{O__PU~FPz|81A`Ki4JuH6?`4
zsEYmO+F8y*acunUpGD%Hp$-=5%jS}CI-%I;>pwH><53riYYL*M=Q@F-yEPLqQ&1Sc
zZB%w}T~RO|#jFjMWcKMZccxm-SL)s_ig?OC?y_~gLFj{n8D$J_Kw%{r0oB8?@dWzn
zB528d-wUBQzrrS<hDznyNCgL-qOb|p_nS%fSb5_Ze4V1&Bgk3Vp>SL<Uo&kY+&uyM
z)HW-LQUfYYW$q$nSg9;!DvA>q?fR!K%59Zv9J4yCQhhDGwhptpA5O5U?Hjqt>8nOD
zi{)0CI|&Gu%zunGI*XFZh(ix)q${jT8wnnzbBMPYVJc4HX*9d^mz|21$=R$J$(y7V
zo0dxdbX3N#=F$zjstTf*t8vL)2*{XH!+<2IJ1VVFa67|{?LP<VPiuN~9#0c!YR12a
zo;Lj{EKN(4nyG=Ui#tn@dJ(*;md5Ze)kd6mTF$dEZFv=nYr2Lr(==N%ad&FBajgz2
z6_^{6U)eu_=!Ix#bP)AA_tuIc?3=_Mq548F*;t3>&P41h$2i2;?N~RA30LV`BsUcj
zfO9#Pg1$t}7zpv#&)8`mis3~o+P(DxOMgz-V*(?wWaxi?R=NhtW}<#^Z?(BhSwyar
zG|A#Q7wh4OfK<|DAcl9THc-W4*>J4nTevsD%dkj`U~wSUCh15?_N@uMdF^Kw+{agk
zJ`im^wDqj`Ev)W3k3stasP`88-M0ZBs7;B6{-tSm3>I@_e-QfT?7|n0D~0RRqDb^G
zyHb=is;IwuQ&ITzL4KsP@Z`b$d%B0W<OzS}HhQ;U8}SDa=0^@=1zh?Ebwi(h3u<mG
zLDfZ57#t!A)c-~Y!O{*PdxzDz>uhioo1CWttW8yhsER1ZUZzA{F*K=wmi-sb#Ju+j
z-l@In^IKnb{bQG}Ps>+Vu_W#grNKNGto+yjA)<V{IjYd_d3*YH={C)J_}OyeI6i_H
zu|j9WcfZFU?Sgyac7umALud#l=-0F(fRl)O28qU<%HpKBh#im&8;uWW953cFj~Iy&
zlr`ZkkzG;HtUSI4CRZRj#8C;N*{hU?ezHzcM|gV*@iklj`$SU@402&viLPBGiWFL2
zQ6uyKx<>?>0?~X`4I3T@5G1)RqGUZuP^NJCq&^HykuYtMDD8qq+l8RcZNJsvN(10{
zQ1$XcGt}QH-U^WU!-wRR1d--{B$%vY{JLWIV%P<Wi12|;({s?oRC80?)@wj6UxV~n
zk2qyqDc_<v8oEujhH&m^Jq#Lrp)Z$Oj#rxlpUicHLpt@6dZF=U?wW~T_o?IN;ie!I
zV-bY1+kei0nc9KpW>4-KQuxxDeJaF#{eu&&r!3Qu{w}0f--8^H|KwE>)ORrcR+2Qf
zb})DRcH>k0zWK8@{RX}NYvTF;E~phK{+F;MkIP$)T$93Ba2R2TvKc>`D??#mv9wg$
zd~|-`Qx5LwwsZ2hb*Rt4S9dsF%Cny5<1fscy~)d;0m2r$f=83<->c~!GNyb!U)PA;
zq^!`@@)UaG)Ew(9V?5ZBq#c%dCWZrplmuM`o~TyHjAIMh0*#1{B>K4po-dx$Tk-Cq
z=WZDkP5x2W&Os`N8KiYHRH#UY*n|nvd<ovggige3u`1qGi1+Y8X!3s{W#*m=tX&CV
zNWQ(*z*>(U>yO=MFI-2BEp?x@=N<~CbLJBf6P)}vLS?xJXYJ2^<3KJUdrwKnJnTp{
zjIi|R=L7rn9b*D#Xxr4*R<3T5AuOS+#U8hNlfo&^9JO{VbH!v9^JbK=TCGR-5EWR@
zN8T-_I|&@<P6ysJp1u%bVccl?q?sU4Onn?IFII0`6;jp*_+1Vcjf$mX{%JA^!$Gkf
z>A}(hKeL4_*eb!1G8p~&_Im8|wc>Cdir+gg90n1dw?QaXcx6Op_W1r=axR<Rt0$d-
z&gdORS`9;Z%6j=d$PU%VL0xT-jF-dHo&#w}>w>4;rM*UOpT#Eb9xU1IiWo@h?|5uP
zka>-XW0Ikp@dIe;MN8B01a7+5V@h3WN{J=HJ*pe0uwQ3S&MyWFni47X32Q7SyCTNQ
z+sR!_9IZa5!&GTf&V$`q!%H8ci!a|RMx5}5MA_kr+bhtQy{-^)(hCVa@I!^TV4RBi
zAFa!Nsi3y37I5EK;0cqu|9MR<Vh>j<^r&h1lF}u0KpKQD^5Y+LvFEwM<n%Y4Ns0&r
z#Pgp7tfaM#i}k;d-@gi@qNBc}@xL(OgxbkB%Zc*U!8(yY_d_z4QrJ%DIL^_}pG(C;
zxV&Dt0*#6mW+VnKpUKH&)*t(_EhJ1#-d4~Kom-)N+kGAW3vl$z=E{EB!4#iw1#JGZ
zpZv7B?(+0N;`4s@&;+D$6BOaTPLlV-MY35`gn~5zS!mCgh|W$2sr@*jRa}74{|6)>
zLU@@v4_Na#Axy6tn3P%sD^5P#<7F;sd$f4a7L<t5V42bo`*JV+&3HWm9OI@30?%Oh
z5o+B(*v(C-H_!6}Lzhp-kE~j|H(u&BA@KX~k?60QV5NR)N2OJYIOG(f(FG`kmvdU7
zwM#zp&<w6$6785wBe4}t?5yT4MP5N47S8;*P_q6hn|Wj2S~%IPE(O9P2?RAKY>BMk
zGU^RZHBcxSA%kCx*eH&wgA?Qwazm8>9SCSz_!;MqY-QX<1@p$*T8lc?@`ikEqJ>#w
zcG``^CoFMAhdEXT9qt47g0IZkaU)4R7wkGs^Ax}usqJ5HfDYAV$!=6?>J6+Ha1I<5
z|6=9<InPN?WUE(MBZF{EDJ@lH!7KCH_7xC@JvfZL@&nc!7K2v>soU4>E))tW$<#>F
ziZ$6>K<f#VmS*<VCLk5Snrr-`d{Bp+A{=r<v#~0tw_zC-WYWg-s*<dPsHVYZm|7R#
z>Jf0bPfbx_)7-}tMINlc=}|H+$uX)mhC6-Hz+XZxsKd^b?RFB6et}O#+>Wmw9Ec9)
z{q}XFWp{3@qmyK*Jvzpyqv57LIR;hPXKsrh{G?&dRjF%Zt5<eso5q2Qq7|ChevXoo
zUUuocw%BMFdbc16MLS>&m20Ll?Oy<ul%w2Zua&zkQjQpssgWs#RKAL}6i`eHUzx7p
zSoNx{P@%ayUjixVqBLi(th$z4mR4dC*OaQENb9y_y<R>fUYC3WRn{cgQ?^V~UAv+5
z&_m#&nIwffgX1*Z2#5^Kl4DbE#NrD&Hi4|7SPqZ}(>_+JMz=s|k77aEL}<=0Zfb)a
z%F(*L3zCA<=xO)2U3B|pcTqDbBoFp>QyAEU(jMu8(jLA61-H!ucI804+B!$E^cQQa
z)_ERrW3g!B9iLb3nn3dlkvD7KsY?sRvls3QC0qPi>o<)GHx%4Xb$5a3GBTJ(k@`e@
z$RUa^%S15^1oLEmA=sayrP5;9qtf!Z1*?e$ORVPsXpL{j<cf(aoOxSwSjBR1mea0e
z^c3Q=wn8)%*koW31D%}j9dO0gR7Y@b_00J@vMv~iauOuPVkQGKG^LpkGueXj*z<(H
zv6PsTl$Bd^g^4yr-LK|PFHGhgs2bdrT$8)TR7nc(mnkPw6vrbaA_vA0JdMNVsoX7X
zzI)+QrS1A&rLp4hm_yCc#tP)G{!hBfUV@*{)uh;EQVyvIbs@16JE!9Psq3UaXMGQ^
zJ^Y2zHl3Zl1idw?=a56!^Y{sB%B-k(>L<6E)0sj&swP3}NPmR%FM?O>SQgN5XfHE<
zo(4#Cv11(%Nnw_{_Ro}r6=gKd{k?NebJ~<~Kv0r(r0qe4n3LFx$5%x(BKvrz$m?LG
zjLIc;hbj0FMdb9aH9Lpsof#yG$(0sG2%RL;d(n>;#jb!R_+dad+K;Ccw!|RY?uS(a
zj~?=&M!4C(5LnlH6k%aYvz@7?xRa^2gml%vn&eKl$R_lJ+e|xsNfXzr#xuh(>`}9g
zLHSyiFwK^-p!;p$yt7$F|3*IfO3Mlu9e>Dpx8O`37?fA`cj`C0B-m9uRhJjs^mRp#
zWB;Aj6|G^1V6`jg7#7V9UFvnB4((nIwG?k%c7h`?0tS8J3Bn0t#pb#SA}N-|45$-j
z$R>%7cc2ebAClXc(&0UtHX<>pd)akR3Kx_cK+n<}FhzmTx!8e9^u2e4%x{>T6pQ`6
zO182bh$-W5A3^wos0SV_TgPmF4WUP-+D25KjbC{y_6W_9I2_vNKwU(^qSdn&>^=*t
z&uvp*@c8#2*paD!ZMCi3;K<prH4a&u_&GPH7Wp*~+CzWZpzTbL&)4k=HC|E1=uT#O
zPuYcj5Jbb}c9+j=4foN!N-fSV`(c<30`iukl213!u4qI^cD3Ytg!~P3N1S(`-3^yF
zlFzoPUGJT0f@f{`ZDabbR@mNt3*M;G<P@?W{8}}Lg`Hvy7&Jmu=04fd1erYTPEwb=
z15%g^dl!<DS<}y*RUs*g6?{>{Na;I4Q35zw$YrW5U@Kk~)&rw;G?d7Q&c9|x<<Maw
zgBLn8*CoGPVj_^rpPn~ENvB}-`?vqbUaC%e+l73U+D^-Cb&Pj13W#6g!+x^$_tX)*
z@cs9Wk+{Dzx8NJw-G7(M|EOb>Hg|CNMsxovmfth*|E*GHezPTWa^Hd^F4!B3sF;)?
z(NaPyAhocu1jUe(!5Cy|dh|W2=!@fNmuNOzxi^tE_jAtzNJ0JR-avc_H|ve#KO}#S
z#a(8secu|^Tx553d4r@3#6^MHbH)vmiBpn0X^29xEv!Vuh1n(Sr5I0V&`jA2;WS|Y
zbf0e}X|)wA-Pf5gBZ>r4YX3Mav1kKY(ulAJ0Q*jB)YhviHK)w!TJsi3^dMa$L@^{`
z_De`fF4;M87vM3Ph9SzCoCi$#Fsd38u!^0#*sPful^p5oI(xGU?yeYjn;Hq1!wzFk
zG&2w}W3`AX4bxoVm03y>ts{KaDf!}b&7$(P4KAMP=vK5?1In^-YYNtx1f#}+2QK@h
zeSeAI@E6<gTYtZud5<DeMJ>Z8a?)>sZ`fbq9_snl6LCu6g>o)rO;ijp3|$vig+4t}
zylEo7$SEW<_U+qgVcaVhk+4k+C9THI5V10qV*dOV<w;)q>6pPtAI$)QN{!JRBKh-D
zk2^{j@bZ}yqW?<#VVuI_27*cI-V~sJiqQv&m07+10XF+#ZnIJdr8t`9s_EE;T2V;B
z4UnQUH9EdX%zwh-5&wflY#ve!IWt0UE-My3?L#^Bh%kcgP1q{<CvcqqQ2utk7s%sV
zoGl}#Zl)W@RNSAAf;w-DBO+*e0HO2%x-G=Z;*Pl$zHy^xW)%na$gbyTIw>&26eXLn
zTkjJ*w+(|_>Pq0v8{%nX$QZbf)tbJaLY$03;MO=Ic-uqYUmUCuXD>J>o6BCRF=xa%
z3R4SK9#t1!K4I_d>tZgE>&+kZ?Q}1qo4&h%U$GfY058s%*=!kac{0Z+4Hwm!)pFLR
zJ+5*OpgWUrm0FPI2ib4NPJ+Sk07j(`diti^i#kh&f}i>P4~|d?RFb#!JN)~<!~Z`*
zivNy#7kzu<{{tyjD6d)1{g;-B-EK2+0;|?2Nj`=2hUDsRiVj-}RAJN{d@x~38|)#_
zx&F#UxFFdbXxE(|#84p;-%dtBDbgEpl>D@)beox}bw?4VCf^y*`2{4`-@%SFTry2h
z>9VBc9#JxEs1+0i2^LR@B1J`B9Ac=#FW=(?2;5;#U$0E0UNag_!jY$&2diQk_n)bT
zl5Me_SUvqUjwCqmVcyb`igygB_4YUB*m$h5oeKv3uIF0s<pxU7XrV;DR{UhyjHRs5
zb+8Qf7A65FfQ?d1ZT2w}F_l*Eb)?ah<8c%Yy;Eal4{xBsX^nN@Pe5CxcymxUwL?eh
zv9_Z0XXBqZl6EhcKDo~Ou&%?PpG{{$wPe(7oy?yZ1mnWmr0b~pN$igR!(Rx*QN$iy
z=-Re}qI2g(ku?t~HgBj3V=|H$hiN2{j!P%zCB+1x34pnjx#?&{ENcU`o_2tynp}0U
zKI9mTgI{WS`?XY!3FH!0Q>k}~es!{D>4r%PC*F~FN3owq5e0|Y<Du-bB4EU)q{6=q
z#<0gBE8S|!ZrmQeH3JgM^AxLU0k8cAwCY-9?0w8gxwWKqzGP>eUTSG#Vq%&Gk7uwW
z0lDo#_wvflqHeRm*}l?}o;EILszBt|EW*zNPmq#?4A<L0#2f-Fpgzo6i9m?Cv{^Fe
z9>+&i0xx^?9obLyY4xx=Y9&^G;xYXYPxG)DOpPg!i_Ccl#3L}6xAAZzNhPK1XaC_~
z!A|mlo?Be*8Nn=a+FhgpOj@G7yYs(Qk(8&|h@_>w8Y^r<TLc~8#)=w@0;xlrL@mM3
zg*K(X)@-O)lt;P?5e(;WTL%O;a;rQNAE5;DqERSyAXc1biP%NUWXy?=-B^)wQ=+I4
zU%qA-ghSXXn27E3w8NMG!5XHJY>&5nCqe0V60rRz?b5%J;GYeBqSAjo|K692GxD4`
zRZyM2FdI+-jK2}WAZTZ()w_)V{n5tEb@>+JYluDozCb$fA4H)$bzg(Ux{*hXurjO^
zwAxc+UXu=&JV*E59}h3kzQPG4M)X8E*<G*nR0cBsK+3(q5`<{N)Z$_eT#;miD(s%h
z{fdYdgo~K&tWs<DY?yIi#?k!bT;M<ZDoV|<xhf7jcRFXDXl`LtGFz=LPAW$(hAEz}
zq@oGhJoeM0w4KvLTg%>}#_&}w*KEg<F5P|-B$Y<3$zfM|>tX)cU{vm9b$atHa;s>|
z+L6&cn8xUL*OSjx4YGjf6{Eq+Q3{!ZyhrL&^6Vz@jGbI%cAM9GkmFlamTbcQGvOlL
zmJ?(FI)c86=JEs|*;?h~o)88>12nXlpMR4@yh%qdwFNpct;vMlc=;{FSo*apJ;p}!
zAX~t;3tb~VuP|ZW;<Q&V!o{~5>z$=IHf->F@Ml)&-&Bnb{iQyE#;GZ@C$PzE<QuI)
zv_|vm%I_n1Dpq6lr--l%%tq7K!<v~?55k`WhA?y(q<f`<c6%@dUw9u~aA?j^`pueW
zW?_3n{u)d4@AQyf;UHiIRxp16RoWg&F+uwIJYB{!Spu!Z6TFEXau<!8UfawC4vbZv
zJTpZLC-RhzHO9xSd6HqYzkfjT+8e>f6~q}4D>9jic@mTO5x76ulDz@+XAcm35!VSu
zT*Gs>;f0b2TNpjU_BjHZ&S6Sqk6V1370+!eppV2H+FY!q*n=GHQ!9Rn6MjY!Jc77A
zG7Y!lFp8?TIHN!LXO?gCnsYM-gQxsm=Ek**V<u>mZu7vnuufD7K~GIxfxbsQ@qv2T
zPa`tvHB$fFCyZl>3oYg?_wW)C>^_iDOc^B7klnTOoytQH18WkOk)L2BSD0r%xgRSW
zQS9elF^?O=_@|58zKLK;(f77l-Zzu}4{fXed2saq!5k#UZAoDBqYQS{sn@j@Vtp|$
zG%gnZ$U|9@u#w1@11Sjl8ze^Co=)7yS(}=;68a3~g;NDe_X^}yJj;~s8xq9ahQ5_r
zxAlTMnep*)w1e(TG%tWsjo3RR;yVGPEO4V{Zp?=a_0R#=V^ioQu4YL=BO4r0$$XTX
zZfnw#_$V}sDAIDrezGQ+h?q24St0QNug_?{s-pI(^jg`#JRxM1YBV;a@@JQvH8*>>
zIJvku74E0NlXkYe_624>znU0J@L<-c=G#F3k4A_)*;ky!C(^uZfj%WB3-*{*B$?9+
zDm$WFp=0(xnt6`vDQV3Jl5f&R(Mp};;q8d3I%Kn>Kx=^;uSVCw0L=gw53%Bp==8Sw
zxtx=cs!^-_+i{2OK`Q;913+AXc_&Z5$@z3<)So0CU3;JAv=H?@Zpi~riQ{z-zLtVL
z!oF<}@IgJp)Iyz1zVJ42!SPHSkjYNS4%ulVVIXdRuiZ@5Mx8LJS}J#qD^Zi_xQ<pa
zK0_C<`%bp5M~CVCk7hV^j*M;Wzcj7kCsCfgg5CJ~2`y3|66=yp|GC7FJNP7A_Wc+(
zejiW#M^nRp{rUgmIRC{MB`ST%d>@>DKDr-_e#>5h3dtje*NcwH_h;i{Sx7}dkdpuW
z(yUCjckQsagv*QGMSi9u1`Z|V^}Wjf7B@q%j2DQXyd0nOyqg%m{CK_lAoKlJ7#8M}
z%IvR?Vh$6aDWK2W!=i?*<77q&B8O&3?zP(Cs@kapc)&p7En?J;t-TX9abGT#H?TW?
ztO5(lPKRuC7fs}zwcUKbRh=7E8wzTsa#Z{a`WR}?UZ%!HohN}d&xJ=JQhpO1PI#>X
zHkb>pW04pU%Bj_mf~U}1F1=wxdBZu1790>3Dm44bQ#F=T4V3&HlOLsGH)+AK$cHk6
zia$=$kog?)07HCL*PI6}DRhpM^*%I*kHM<#1Se+AQ!!xyhcy6j7`iDX7Z-2i73_n#
zas*?7LkxS<P{ZTB#tR|&N^U;Moy2#JwwW4RFPddYtD_bw0R1|Eo=5;j>-XSqv;YBa
zW_n*32D(HTYQ0$feV_Fru1ZxW0g&iwqixPX3=9t4o)o|kOo79V$?$uh?#8<F`E$a_
zutly1{7L1J@Y@6Vp*~KB!yXMF2QHqby@+ZG8+ND)X+s9is!(NOe)h&%h+bxjPFhwq
z$60~SJQ<aykcGl3;BUCZ>Q8e>4e)V6;_(x&ViUVxma+i25qea;d-oK7ouuDsB^ab{
zu1qjQ%`n56VtxBE#0qAzb7lph`Eb-}TYpXB!H-}3Ykqyp`otprp<BVE0iW(NxIg}T
zHQz%!Kt^1I=QqGS(r32Y=&DuF_0#yaLgW`I>7{VEuW*^IR2n$Fb99*nAtqT&oOFIf
z@w*6>YvOGw@Ja?Pp1=whZqydzx@9X4n^2!n83C5{C?G@|E?&$?p*g68)kNvUTJ)I6
z1Q|(#UuP6p<iHaJ>j78GUxq11m-GSszc+)X{C2eo-?8ud9sB=3(D47v?`JAa{V(IF
zPZQ_0AY*9M97>Jf<<kmA6!?J&2x7=_q{>o%#O_%Wq}8>YM=q0|tGY+hlXcpE=Z4Od
z`NT7Hu2hnvRoqOw@g1f=bv`+nba{GwA$Ak0INlqI1k<9!x_!sL()h?hEWoWrdU3w`
zZ%%)VR+Bc@_v!C#koM1p-3v_^L6)_Ktj4HE>aUh%2XZE@JFMOn)J~c`_7VWNb9c-N
z2b|SZMR4Z@E7j&q&9(6H3yjEu6HV7{2!1t0lgizD;mZ9$r(r7W5G$ky@w(T_dFnOD
z*p#+z$@pKE+>o@%eT(2-p_C}wbQ5s(%Sn_{$HDN@MB+Ev?t@3dPy`%TZ!z}AThZSu
zN<1i$s<Qod+!u+1TpqzHMAR;(P|C33h|NdU1+@toT{?QhAJAzzUDj;ch>iJhXFdjV
zP*y|V<`V8t=h#XTRUR~5`c`Z9^-`*BZf?WAehGdg)E2Je)hqFa!k{V(u+(hTf^Yq&
zoruUh2(^3pe)2{bvt4&4Y9CY3js<F>)PUHtd4rVG57}uFJL)D(JfSIo^{P=7liFXG
zq5yqgof0V8paQcP!gy+;^pp-DA5pj=gbMN0eW=-eY+N8~y+G>t+x}oa!5r>tW$xhI
zPQSv=pi;~653Gvf6~*JcQ%t1xOrH2l3Zy@8AoJ+wz@daW@m7?%LXkr!bw9GY@ns3e
zSfuWF_gkWnesv?s3I`@}NgE2xwgs&rj?k<VL?gG5MC{Nmj1vZX?3e8O$&f`#KcfCT
zD|dGfAH<9vQYUE_U}e#K2epdwK03De5{_327SI@sw~J+|<wi@;rZX!9Y2MH7_L7?E
z^an@e4GxaY9F(p#Ot=#L(YG%x=Gq!vNbxtM=IXzPyPmYSGU#`>H-FEy82=O8`+szN
ziHch`vvS`zNfap14!&#i9H@wF7}yIPm=UB%(o(}F{wsZ(wA0nJ2aD^@B41>>o-_U6
zUqD~vdo48S8~FTb^+%#zcbQiiYoDKYcj&$#^;Smmb+Ljp(L=1Kt_J!;0s%1|JK}Wi
z;={~oL!foo5n8=}rs6MmUW~R&;SIJO3TL4Ky?kh+b2rT9B1Jl4<n8E`j>>#Uh-Bec
z`Hsp<==#UEW6pGPhNk8H!!DUQR~#F9jEMI6T*OWfN^Ze&X(4nV$wa8QUJ>oTkruH#
zm~O<`J7Wxseo@FqaZMl#Y(mrFW9AHM9Kb|XBMqaZ2a)DvJgYipkDD_VUF_PKd~dT7
z#02}bBfPn9a!X!O#83=lbJSK#E}K&yx-HI#T6ua)6o0{|={*HFusCkHzs|Fn&|C3H
zBck1cmfcWVUN&i>X$YU^Sn6k2H;r3zuXbJFz)r5~3$d$tUj(l1?o={MM){kjgqXRO
zc5R*#{;V7AQh|G|)jLM@wGAK&rm2~@{Pewv#06pHbKn#wL0P6F1!^qw9g&cW3Z=9}
zj)POhOlwsh@eF=>z?#sIs*C-Nl(yU!#DaiaxhEs#iJqQ8w%(?+6lU02MYSeDkr!B-
zPjMv+on6OLXgGnAtl(ao>|X2Y8*Hb}GRW5}-IzXnoo-d0!m4Vy$GS!XOLy>3_+UGs
z2D|YcQx@M#M|}TDOetGi{9lGo9m-=0-^+nKE^*?$^uHkxZh}I{#UTQd;X!L+W@jm(
zDg@N4+lUqI92o_rNk{3P>1gxAL=&O;x)ZT=q1mk0kLlE$WeWuY<p^lk9k<q+rcOGG
zY)G$sy1c;kpqg0vV-}_XHLMzubt5&Y+X3Q{3Wa&iSOY9S8qUS1LUsYa--u3<U|kYH
zfL}q@Sl3A;lg32U^*mSX!dr5wpp#<9G)=5WC=&Cv)mW|a!muj?rXU0JHBrQ<`Qqt}
zCgYqLnoe5^we#~H-+!p+9n;rMDHiXMi5YFyOWW{wi{Tnu%1mqAov`>_$0`0jY-Kkt
zP*|m3AF}Ubd=`<>(Xg0har*_@x2YH}bn0Wk*OZz3*e5;Zc;2<o%?~}~ck-Gk+}B1o
z7H(amz-SpgFI})ialV|e<4!f0)HG}_n?GAIDeiC%vdRTJZ<WeGYT+p)vyz_FBWtO$
zz2K9gb9XN8(>uBdnl8?&XjupbkOeNZsNh6pvsq_ydmJI+*z**{<vBKXP!vVq<!p_e
z&dE_6Lim}RGRF|DDL<W_^>I{0K)-;p1~k8cpJXL$^t!-`E}=*4G^-E8>H!LjTPxSx
zcF<xkt%17w#Nu8CTO5_pkM9Mxb}Wf0;14cP1{yv5#7uIFNY2eGhq{_*hEBSbjQA$U
znAZkjT-yd=I_R8ZJ?H07yh5z>+cS`ommfKMhNSbas^<U&=a>@YbTpH1*RFrBuATUR
zt{oFWSk^$xU&kbFQ;MCX22RAN5F6eq9UfR$ut`Jw--p2YX)A*J69m^!oYfj2y7<PW
z+v>NYcH6&r+0~_sH^c^nzeN1AU4Ga7=FlR{S|Mm~MpzY0$Z+p2W(a={b-pR9EO1Rs
zB%KY|@wLcAA@)KXi!d2_Bxr<pdgvLNQgZmCJz&c*%>khDn`DT1=Dec}V!okd{$+wK
z4E{n8R*xKyci1(CnNdhf$Dp2(Jpof0-0%-38X=Dd9PQgT+w%Lshx9+loPS~MOm%ZT
zt%2B2iL_KU_ita<m0BJ>%N>xjB!<T714UjSOi9+HnppU8HTO6Xys3~>#71_3=3c}o
zgeW~^U_ZTJQ2!PqXulQd=3b=XOQhwATK$y(9$#1jOQ4}4?~l#&nek)H(04f(Sr=s|
zWv7Lu1=%WGk4FSw^;;!8&YPM)pQ<cfOEqZOX3qg|bi6Y+6raTouS~FCMLV)D&#=5p
zIeXB!ZqEvR`rjuFN1ix6GoI%|3=23*fhels&m^Kl7$Xb)d4}z-AG?ZOEDO)5!dX$;
zxo;%86BwnKIVK{n#wbp)z+DlG`Eo;!p1qmI5u}Dr3ERkBC^gA;rI=Ohq{XCvK{N9A
zv&z##C1k^|5<I!-;+MCJN#mX7#cD{4PE)89nNv$gm~ronTcb2Mq~#~4^M!^C-1#M(
z=1UT>DCY9DhU`hMty1@sq1=Tj7bFsOOBZOFlpR`W>-J$-(kezWJj;`?x-v>ev{*8V
z8p|KXJPV$HyQr1A(9LVrM47<GkZ=yfPF+Dq%S|w=MijcJ6`g68YLr!qXVkqpG~JGH
zv`>u-XpcrIyO`yWvx1pVYc&?154aneRpLqg<bQ>x)EMvRaa#|9?Wwqs2+W8n5~79G
z(}iCiLk;?enn}ew`HzhG+tu+Ru@T+K5juvZN)wY;x6HjvqD!&!)$$;1VAh~7fg0K|
zEha#aN=Yv|3^~YFH}cc38ovVb%L|g@9W6fo(JtT6$fa?zf@Ct88e}m?i)b*Jgc{fl
zExfdvw-BYDmH6>(4QMt#p0;FUIQqkhD}aH?a7)_%JtA~soqj{ppP_82yi9kaxuK>~
ze_)Zt>1?q=ZH*kF{1iq9sr*tVuy=u>Zev}!gEZx@O6-fjyu9X00gpIl-fS_pzjpqJ
z1yqBmf9NF!jaF<+YxgH6oXBdK)sH(>VZ)1siyA$P<#KDt;8NT*l_0{xit~5j1P)FN
zI8hhYK<Ctos5a2iSB6E;K{q?&ab{FphO?zxIqqf}%h}LQupBY+8nGBng;9rl>hQ)i
z37^aP<qpGiOwA$)u%NPBnx5-dJ?eaKuJ|k=(U7<z&!E=Ex{~rH$w*MsBugwy8}mlc
z@Cp`bIFkJ)nD=}RT7wXAD(8ljk?9q}6wNph<*7S`FnAlTK859*a=phG5gBZhql8^1
zqKXJBJSm<4{Im$>13B~u65?sg+_@2Kr^iWHN=U;EDSZ@2W2!5ALhGNWXnFBY%7W?1
z=HI9JzQ-pLKZDYTv<0-lt|6c-RwhxZ)mU2Os{bsX_i^@*fKUj8*aDO5pks=qn3Dv6
zwggpKLuyRCTVPwmw1r}B#AS}?X7b837UlXwp~E2|PJw2SGVueL7){Y&z!jL!XN=0i
zU^Eig`S2`{+<wl==2w=5|F9xM-02N5`F*r(R=yBH;xL${JnA$s&UywB#{_0RS^+hX
z*x9l+ftTA)(qqfU_K+4UB=w=A|0J9m!!ePjqBV0F7$&R=n`+yR@2tk2NwHhL{|&cH
z$fXb3^<M+ME~B<-d*&_qT19T_sRLwwvu;hmu)Vt+WHH@$?DQ6m2&aLvtcbK<MgTBu
zp(SQPX~F@0CgG?+)(jWG3Oc!+oEMIunjIDK0w|m6;WzWCMpr#dq3I<GeN7c@71Fqq
zf&ADs4Jz}_R;T_`?S9~(wB(9e>gU$68aRdWx?BZ{sU_f=8sn~>s~M?GU~`fH5kCc;
z8ICp+INM3(3{#k32RZdv6b9MQYdZXNuk<tNnM*Zj3!<Rmy`SQx3idGTVVW@OzSywq
z<sw@>7ed8;G?S2nT+NZBG=Tar^KFl2SvhW$bGW#kdWL-I)s_IqVnCDDM9fm8g;P;8
z7t4yZn3^*NQfx7SwmkzP$=fwdC}bafQSEF@pd&P8@H#`swGy_rz;Z?Ty5mkS%>m#%
zp_!m9e<()sfKiY(nF<1zBz&&`ZlJf6QLvLhl`_``%RW&{+O>Xhp;lwSsyRqGf=RWd
zpftiR`={2(siiPAS|p}@q=NhVc0ELprt%=fMXO3B)4ryC2LT(o=sLM7hJC!}T1@)E
zA3^J$3&1*M6Xq>03FX`R&w*NkrZE?FwU+Muut;>qNhj@bX17ZJxnOlPSZ=Zeiz~T_
zOu#yc3t6ONHB;?|r4w+pI)~KGN;HOGC)txxiUN8#m<I|Y6ES5NY<qwYy-|}EoiBmM
zzK&og-IJMpwjbL8IAA?{APd++5KnIBFcmKwZzO~h`v>exj+W(cz%9a4sx|IRG=}ia
zuEBuba3AHsV2feqw-3MvuL`I+2|`Ud4~7ZkN=JZ;L20|Oxna5vx1qbIh#k2O4$RQF
zo`tL()zxaqibg^GbB+BS5#U{@K;WWQj~GcB1zb}zJkPwH|5hZ9iH2308!>_;%msji
zJHSL~s)YHBR=Koa1mLEOHos*`gp=<n)R&-+66xg`pqUXP#0Zm{sf^MKJnR>s8KA-C
zu0aE+W!#iJ*0xqKm3A`fUGy#O+X+5W36myS>Uh2!R*s$aCU^`K&KKLCCDkejX2p=5
z%o7-fl03x`gaSNyr?3_JLv?2RLS3F*8ub>Jd@^Cc17)v8vYEK4aqo?OS@W9mt%ITJ
z9=S2%R8M){CugT@k~~0x`}Vl!svYqX=E)c_oU6o}#Hb^%G1l3BudxA{F*tbjG<UG_
z<Vo0tRnGPd)K5|7jd0}T-wQdZZG$TREj=4*<4bR;^};Y7orbT=`ITOz*@g<Y=x;1T
zesE`pc}OxPz?01Be<R|c+WT7B<35I5;~ham;Y6hY?F{PCSdwf@9qXBZn%JBWfW6@H
zxqGR{o+TW^4T&@lZ$GVT-8s0{R3MmXsMGGDxgNTZ8|S`+<Qxcf#Ei_^nsS}Yt*PB*
z5#h+HDAU+!GmbOJ#d(J8|6Rt?+U5gR1>;W_>=xV73pKY53v%>I)@D36I_@&p$h|Aw
zonQS`07z_F#@T-%@-Tb|)7;;anoD_WH>9ewFy(ZcEOM$#Y)8>qi7rCnsH9GO-_7zF
zu*C87{Df1P4TEOsnzZ@H%&lvV(3V@;Q!%+OYRp`g05PjY^gL$^$-t<lOaPfbWQ29U
ziQLZAEqJX}(BXW*YUz0#v0~iKqbJ35-`aw1m+YA~k)TQVyq!wOKDE%}gHJ%Woa=@J
z_G3Z9VfhbWs>0Y>H*CDDs?FZly*oZ&dxvsxaUWF!{em4{A>n@vpXg$dwvt@_rgmHF
z-MER`ABa8R-t_H*kv>}CzOpz;!>p^^9ztHMsHL|SRnS<-y5Z*r(_}c4=fXF`l<Xkw
zEy6TsVDdDoV_TNG(<WvkK8TcvFZ^8LA2wsz%Sl;DbLS}my*l(?>^-i}>e7v!qs_jv
zqvWhX^F=2sDNWA9c@P0?lUlr6ecrTKM%pNQ^?*Lq?p-0~?_j50xV%^(+H>sMul#Tw
zeciF*1=?a7cI(}352%>LO96pD+?9!fNyl^9v3^v&Y4L)mNGK0FN43&Xf8jUlxW1Bw
zyiu2;qW-aGNhs=zbuoxnxiwZ3{PFZM#Kw)9H@(hgX23h(`Wm~m4&TvoZoYp{plb^>
z_#?vXcxd>r7K+1HKJvhed>gtK`TAbJUazUWQY6T~t2af%#<+Veyr%7-#<!`u7=6z<
z@9(d@bkwuJK`;AXMIasQ=4>*A#@&*;@g58{i|E%6yC_InGXCOd{L0;$)z#?n7M`re
zh!kO{6=>7I?*}czyF7_frt#)s1CFJ_XE&VrDA?Dp3XbvF{qsEJgb&OLSNz_5g?HpK
z9)8rsr4JN!Af3G9!#Qn(6zaUDqLN(g2g8*M)Djap?WMK9NKlkC)E2|-g|#-rp%!Gz
zAHd%`iq|81efi93m3yTBw3g0j#;Yb2X{mhRAI?&KDmbGqou(2xiRNb^sV}%%Wu0?<
z?($L>(#BO*)^)<q1<y(%o-D>rSgyNRni$i`R4v;GhlCZ8$@e^ROX(p=2_v6Y!%^As
zu022)fHdv_-~Yu_H6WVPLpHQx!W%^6j)cBhS`O3QBW#x(eX54d&I22op(N59b*&$v
zFiSRY6r<ogkg`lB4Kzk}79-1@4WexUMjw+78PVxKkpJ}l$#uYSKRni~wAs(LFQ`S~
z)6H^=SsBl_=gtAZcCb%LqI~={V0L=Y2XD)_)<%!{eY=Ch6CuBtAu<8uk=VNIh~<**
z4}OE-7;4DiEfmH5r(r_l!C{NrR4GiA;)KB7^Z5GJe5Gi4jN{kozWVvza9J%ysu#}1
zV05Y-@;(u_e>Oc^(dgSV1<S;M;fP~XvG?H2UWU4_zajZjOwrCC*tclCC;-DiooNK0
zKT=dwZdL_ATeNsapPF;r>>a7-5C;(5S5MvKcM2Jm-LD9TGqDpP097%52V+0>Xqq!!
zq4e3vj53SE6i8J`XcQB|MZPP8j;PAOnpGnllH6#Ku~vS42xP*Nz@~y%db7Xi8s09P
z1)e%8ys6&M8D=Dt6&t`iKG_4X=!kgRQoh%Z`dc&mlOUqXk-k`jKv9@(a^2-Upw>?<
zt5*^DV~6Zedbec4NVl(<J^HBK@2E4@wD3MtdV(xxnq%Vbc}WuHo}5QftrZiThWddC
z`SqHbMkXtVXKo79381*cF)4R%emsAj0XSNL+PDEL#FejmgEu5hh1&sJBWank<?5||
zFa70^J_fIcXV;YE%H5TE-LegY#;Q{2+X5ec9PUkBc$GBoPD$f3kMxcc{GCuyqMnT@
zoFpa`18N8o#cD|?wHX2`2uRGD5<2)(v9&spIF?JOuSy<x-3h*1uo<tmXh9c!`+f(x
zJ!3;pKi`8)fAw>$2T{&b)zA@b#dUyd>`2JC0=xa_fIm8<d`*pjaOx{pV5Pe7q{O1W
zAT5c_%T(D{?pE<afMwAc3^p*w8J|rwP_Jm84rW1XYj_z!4LWkm8d^QnYM3TAJ00M}
zVy+@IpL$^~2r+Bvv<<LIU<+tp*%PbBjNTe&Z{H48g3%crRya-=a)qRylf)#ctNvw?
zlFff;8hFwWk7>{5u<t#%K`^*tgQ@!!adiD7YiKBgV_c5|kR2YSiy*0+0NhSocT-E<
zLsbh?CBfxQ!F7|i4p=%MX(y=Km3GT?bty_*CZh1*xF8v|8xjqfoni!cQE1EFLyy>m
zr-!ApXZhC8@=vC2WyxO|!@0Km)h8ep*`^he92$@YwP>VcdoS5OC^s38e#7RPsg4j+
zbVGG}WRSET&ZfrcR(x~k8n1rTP%CnfUNKUonD$P?FtNFF#cn!wEIab-;jU=B1dHK@
z(;(yAQJ`O$sMn>h;pf^8{JISW%d+@v6@CnXh9n5TXGC}?FI9i-D0OMaIg&mAg=0Kn
zNJ7oz5*ReJukD55fU<geid?Ih<u$lD<ZaBChRKMH%^g0f>sMuaP+H4tDN&V9zfqF@
zr=#ecUk9wu{0;!+gl;3Bw=Vn^)z$ahVhhw)io!na&9}LmWurLb0zubxK=UEnU*{5P
z+SP}&*(iBKSO4{alBHaY^)5Q=mZ+2OwIooJ7*Q5XJ+2|q`9#f?6myq!&oz?klihLq
z4C)$XP!BNS0G_Z1&TM>?Jk{S~{F3n83ioli=IO6f%wkvCl(RFFw~j0tb{Gv<R+ryT
zRX%I@y>XTx>*sB0McY0s&SNvj4+^h`9nJ_wM>F!Uc>X}9PifQekn0sKI2SAJP!a4h
z5cyGTuCj3ZBM^&{dRelIlT^9zcfaAuL5Y~bl!ppSf`wZbK$z#6U~rdclk``e+!qhe
z6Qspo*%<)eu6?C;Bp<^VuW6JI|Ncvyn+LlSl;Mp22Bl7ARQ0Xc24%29(<s4_N=u??
z$t{gru-VXd6Kxbxv5Bt?Z$yc1w+D)_3NsUN5!&<3)ieB&Nu@~@oJ<S*(@c3&Pewi0
z%9!QRq|vABdor|x%wu0~=1Z5hOOpQi`0!iyJhFLc128BQmq$$|x}WJU?iN}7Kl;!3
z&fH)Q*P121qPNW?v_ooy8Sm4CFA(z37NUr<`Xy>ZrdsIPw&-=yHQ7_Vle|5h>AST0
zUGX2Zk34vp?U~IHT|;$U86T+UUHl_NE4m|}>E~6q``7hccCaT^#y+?wD##Q%HwPd8
zV3x4L4|qqu`B<QDcIkg$mi~*?H~RNY_Wx4D`}Y)A)!YT!6xCZ~ZTPl7{FKBwUP;<e
zGwA>$4(LXqDJngNy-{&@aFBvVsywt@X^}iH7P%>bR?ciC$I^U-4Foa<B~H&?t+Qu`
zYwLM1`)@`@%8{2TvE*VigXq!t`qQLW_S5DOEz|2z2j3@V_m6j4f9Dj+Tf}F*MS{?9
z%5n(*$y|Ke#xMg=rzn#aJmhAj==f%8S}Mvc)f)j&X?h~FezLP0LfVpNB_5sLG5z-3
z-35pyFHV0nPmuu&M8{s3y}I4c7J41@C$_+Wqk&1f`MvOF;v`)pAYGN4MEXuFe)LY2
z=&C(w{X1B@m%`@ul3h(Gtch>`YKI^qDyGK7k%E%c_P=yzAi`YnxGA%DeNd++j3*h^
z=rn>oBd0|~lZ<6YvmkKY*ZJlJ;Im0tqgWu&E92eqt;+NYdxx`eS(4Hw_Jb5|yVvBg
z*tbdY^!AN;luEyN4VRhS@-_DC{({ziH{&Z}iGElSV~qvT>L<HMHzj7J-Kpa!p!c29
zr8L!oM5$VXc*@gwRrKuo*h${B7BEkfln@c=6oRf(*M;GdM=)m;H&XnLvs%-2b*+hr
z7OLt;wv$AG{1d5A_3iuPkRtq^Z3(lga~pLocX)JXz8xtPuFH$tb1E#7^Np@GfB#l+
z&L?_OtoPwP5<R)d%5@nIE}~}{W{Q)eZmHbhg7xXREu-ZQD=)K37HlG2J>-8G%+yEL
zX#MFOhj{InyKG=mvW-<1B@c-}x$vA(nU?>S>0*eN#!SLzQ)Ex7fvQ)S4D<8|I#N$3
zT5Ei`Z?cxBODHX8(Xp73v`IsAYC@9b;t}z0wxVuQSY1J^GRwDPN@qbM-ZF48T$GZ<
z8WU+;Pqo?{ghI-KZ-i*ydXu`Ep0Xw^McH_KE9J0S7G;x8Fe`DVG?j3Pv=0YzJ}yZR
z%2=oqHiUjvuk0~Ca>Kol4CFi0_xQT~;_F?=u+!kIDl-9g`#ZNZ9HCy17Ga1v^Jv9#
z{T4Kb1-AzUxq*MutfOWWZgD*HnFfyYg0&e9f(5tZ>krPF6{VikNeHoc{linPPt#Si
z&*g>(c54V8rT_AX!J&bNm-!umPvOR}vDai#`CX___J#=zeB*{4<&2WpaDncZsOkp*
zsg<%@@rbrMkR_ux9?LsQxzoBa1s%$BBn6<mos5IdgH=dhp$~J!{0^n6tTjg;U5Diz
zxn*0gDh2*1rZJV&&gt&fW9znj@{DqJLV4eBUx+J-d4%cpr)wD1@Vx?X)?B*tGi&A=
zu5vL>vk#{&&zUwcfzeCBJUwFYSF$08qDsB;gWQN*g!p8pxjofWbqNSZOEKOaTx@+*
zwdt5*Q47@EOZ~EZL9s?1o?A%9TJT=Ob_13yyugvPg*e&ZU(r6^k4=2+D-@n=Hv5vu
zSXG|hM(>h9^zn=eQ=$6`JO&70&2|%V5Lsx>)(%#;pcOfu>*nk_3HB_BNaH$`jM<^S
zcSftDU<V-inKL>1?nL;jy)+sfonQN}(}gUW?d_ikr*3=^{G)=tjBtEPe>TO|0ddVB
zTklrSHiW+!#26frPXQQ(YN8DG$PZo?(<o9TOVxrss2Tawf48g5GCBiDSDE3#UTp|k
z0pKVwU|jx{+EQY()yCur&pg1mIZ@qM8XqZ|+FwhjuUu?KF@3ju{(}}|suk~@HhJ@t
zQ#Y9~FZ`d#%R!jufJh!!RQMg1{%cNgteq&qcX<80AJGOV1RA*AhOQap$U?Y%h(E_|
z8KTI5C~yZDX7BVzv96*H*$a>po(QUCCf_OJC`pw*uey00%gmH!`WJkrKXj2!<hVw7
zGRWHF)G~HffGg-$(O!{Pk3Jwp$~FflQ(t@$&I&M44Aeq=eh)c85(&68I*-`m6uoK%
zdl?LKwDh&L2fOllfoB@M_mp%O$0z3aZY$k-iHXr}^=#M>#6?`T25mTu9OJp2L8z3!
z=arrL$ZqxuE{%yV)14Kd>k}j7pxZ6#$Dz8$@WV5p8kTqN<-7W)Q7Gt2{KoOPK_tZ|
zf2WG~O5@{qPI+W<4f_;reuFVdO^5`ADC1!JQE|N`s3cq@(0WB!n0uh@*c{=LAd;~}
zyGK@hbF-Oo+!nN)@i*O(`@FA#u?o=~e{`4O#5}z&=UkU*50fOrzi11D^&FOqe>wii
z?*k+2|EcUs;Gx{!@KBT~>PAwLrIDT7Th=Utu?~?np@t^gFs?zgX=D${RwOY^WGh-+
z+#4$066I<rp}NtcF5!lhZvD^1^l^-7{>Sh8eYW#FXWp~S`<*%O^ZuItL1Tyqt8#tZ
zY120E;^VG`!lZn&3sPd$RkdHpU#|w+bYV)pJC|SH9g%|5IkxVTQcBA4CL0}$&}ef@
zW^Vtj%M;;_1xxP9x#ex17&4N*{ksO*_4O}xYu(p*JkL#yr}@7b)t5X?%CY<+s5_MJ
zuiqt+N_;A(_)%lumoyRFixWa-M7qK_9s6<1X?JDa9fP!+_6u~~M$5L=ipB=7(j#f<
zZ<k8E`Rwou;l+s_T|L^56YmSu4%^`QFTOq==C$v}z48r)V)i|8HET~j$njp}R%Tx6
z6z1$DcJ|+-rK;8O+M4D2OI&h9Z=KBOt2kjcN}lMJQdr(sa_4xJa;t^b;+K^1J9dTU
z7E3oumY>34J%=bs549%~_mA(|={uZNs_0?o7;-LBP(ZRnkd{-^|2|=4vUTmtByHL8
zEph`(LSEzQj68a+`d$V<45J7cyv^#|^|%fD#si1Nx!4NW*`l*{->HEWNh6-|g>-=r
zXmQ|-i}Ku$ndUeHQ^&ieT!Lf}vf6GaqW9$DJ2NWrqwPY%%4nip$@vK$nRp*_C-v<|
zuKz~ZyN&<%!NS26&x?jhy+@awJipMQ-8(X4#Ae5??U<1QMt1l9R=w9fAnEF}NYu$2
z>6<Remz*?TALWUbsLm^V8JpOI8Qrv^I{Uf`UiQ}=bwlT?m7XzzYl?d75*MLY>}Vkc
zIb*A?G*z8^IvibmBKn_u^5&T_1oey0gZS2~obf(#xk=erZGTEdQnt3DMGM+0oPwss
zj5zXD;(oWhB_T@~Ig#9@v)AKtXu3>Inmgf@A|-lD-1U>cNyl3h?ADD9)GG4}zUGPk
zZzaXe!~Kf?<~@$G?Uql3t8jy9{2!doq4=J}j9ktTxss{p6!9Ud<L0{JvuM8zT}59}
zy?q<PQ`(o7I;|2vYuA@mlwTC2VWpG0`?f+&<cL+^MokC9tZR;`s@;M`H_iw&h5ar5
zCVhp4@v?m@Lrzz?2Z>jyDERlA*xZ!=Q)KDs5O)phz>Vq3BNGoM(H|=1*Q4$^2fTZw
z(%nq1P|5Rt81}SYJpEEzMPl5VJsV5&4e)ZWKDyo<HF@#^TWD2$%#hJqrPwhn_I`~h
zrl9TX+98FE%rR>Z>1EwpkHx-AQVQc8%JMz;{H~p{=FXV>jIxvm4X*qv52e?Y-f%DJ
zxEA165GikEASQ^fH6K#d!Tpu2HP{sFs%E=e$gYd$aj$+xue6N+Wc(rAz~wUsk2`(b
z8Kvmyz%bKQxpP}~baG-rwYcYCv<u@FIev&XxIE!%Ztbxbt-Y%ng;He-ByR+Lk{8!A
z+z_?%ukrIgzuh|^o09LLIM$E(jD2g{U~B*3O~s^?p1O(7xg6;i3B@l87#4eO$$oiS
znHnuA9vGDnw~@NpSw1YYZjoo+HWTzC%$-J_E}3wK-(9hvP0Ct}242U82Wv+8>kHOi
zlkR<=>ZBTU*8RF_d#Bl@zZsRIhx<%~Z@Z<pYsoy05ZE@HkOT*OyM_H}bO0QHT>=ik
z>adw3!DK(8R|q$vy{FTxw%#xliD~6qXmY^7_9kthVPTF~Xy1CfBqbU~?1QmxmU=+k
z(ggxvEuA;0e&+ci-zQR{-f7aO{O(Pz_OsEjLh_K>MbvoZ4nxtk5u{g@nPv)cgW_R}
z9}EA4K4@z0?7ue}Z(o~R(X&FjejUI2g~08PH1E4w>9o{)S(?1>Z0XMvTb|;&EuyOE
z<Uf?|k(eh=|5A0k%+DyPOynyZIUEys#os=5y;pE3-eqjU+vfn|kx^`PvS0aFgK5k7
z_Ws8b<tF{v{r8Xc%Ra(S^vGriKjcqYF_IFKBCZ&>GvWNpYX)Nv<8|a^;<iw`qCF!m
zJCer*R!Lka?@SE&ch5f_idG-0J0#H0t`-WqI6fU-<8)0T>1>bh#&znEcl-r!T#pn=
z4$?Yudha6F%4b>*8@=BdtXXY4N+`U4Dmx$}>HeVJk-QdTG@t!tVT#0(LeV0gvqyyw
z2sEp^9eY0N`u10Tm4n8No&A=)IeEC|gnmEXoNSzu!1<4R<%-9kY_8~5Ej?zReg<ow
z_S`;&)5*<v9D*b@Pp375jJ+bUt(~O-SF0ZSb>Mn78wuMs#;i&eUA0Zk_RXQ3b&TT}
z;SCI<r<Tr9OC%fOR>=7-FUB@*&;8|n>(_g^HGf3@QODE3LpmX~ELnymQm{Sx9xrKS
zK29p~?v@R$0=v6Dr5aW>-!{+h@?Q58|Kz8{{W`%J+lDAdb&M5VHrX_m<yIVSusgG)
z`wE|gu8*tGFN+9LZP$c*%%oTIyT7Y#Uu$+WtVYvbCQ+Do^ID=OntZUS+AP2A;pDLp
zQ|q{WRobah5mlF}4!P`?SD*ypcWDw;D;8QgDGN?GxP&*+636N@_L%TF<fCxBbhCW%
zM%&xYBGf(}%YX|$hc1=>DY;1-JLnf)ezmPau$)1;=`-FU=-r-83tX=C`S#}GZufju
zQ>sXNT0Ny=k@nc%cFnvA_i4SC)?_ORXHq8B4D%el1uPX`c~uG#S1M7C+*MMqLw78E
zhY2dI8@+N^qrM<pEkuRyo-$3h*azHIX|CuJeg6U1uTYr#f1L)jm7pty!Nt_EpVqGj
zXVf`s*T3XSv0ipIVh~5QdLCYp1wi6^@nTR33ob<X9tfmOm*uFzZ-27JIbc;RY)sW`
zt!7sXsMOap1pmxDHwCgCeJ^w>I1+;TUd<Y7V_}N3cTlx9g%Oxl!1(@Fz@fhB!X!Qg
zzGte&a;gDDb7s`2pRO@2w9ly`vje6Ilj<$_c7{OhbUJ}K%$c%`!Wu9kSA#`Xja47q
z=~M~uTQ&ejWO4`vDE9|h6MO?f*d<f1pCzFOx6YSGxl|H(I2h0=%!FyILZ_|=bX<Z@
zIXy76kKLDpG=TR2T<cl5;7+F|gWhKYZ346vNMyq9`PzDJfsBPN=&eq$MKd*arcmkB
zATW410h$o^5JE{IECTR`<Q+_;Q1BqjI5Ciw%m8kGTdmE2GB82|h<4gEtNm!8e#?mt
z;D<+GLqmLk>a(vGqGSRyU{Fnm`aqrr7bz4<dKN=G5TxM1z~0~yR6MN!z}y8FQ<9oh
z=+qK`&H;`)dq`^^SX>2c5xsOO-~oZpkzorD1g}Y<6rk&3>PsSGy}W?MtqFky@A(X#
zIuNZK0cK?^=;PUAu>j0#HtjbHCV*6?jzA&OoE$*Jlga*}LF`SF?WLhv1O|zqC<>*>
zYB;#lsYKx0&kH@BFpW8n*yDcc6?;_zaJs<-jPSkCsSX-!aV=P5kUgF@Nu<{a%#K*F
z134Q{9|YX7X(v$62_cY3^G%t~rD>Q0z@)1|zs)vjJ6Jq9;7#Ki`w+eS**En?7;n&7
zu==V3T&eFboN3ZiMx3D8qYc;VjFUk_H-WWCau(VFXSQf~viH0L$<p$oTrv;PAp(HR
zxGYwoQ{`RRg4u%PEm#VL7~lyq<6`h+F9OK~tPR1wo}q|fJ3M>gwD$<h61N|-us1_A
zl+PEzjP+uR3A<ynvirg<hO=WL=vh8&(Wl2haO~h*nJ_e*eGq{@?#~H&b}m8~6;8Z^
zpbmt5cVjrE;ei2}0ANsjD@<R3Rp?ZF=p4ZLJsD20%)C2Oh4~(z31DYTGiF#ITp7;7
z!>UfFHqNcgN`x}M+YQ6RnN<+@t>JUp#)9YOkqst-Ga?{FsDpEeX0(5v{0J~SEbWiL
zXC2}M4?UH@u&|;%0y`eb33ldo4~z-x8zY!oVmV=c+f$m?RfDC35mdQ2E>Pze7KWP-
z>!Bh<&57I+O_^s}9Tg^k)h7{xx@0a0IA~GAOt2yy!X%Q$1rt~LbTB6@Du!_0%HV>N
zlf)QI1&gvERKwso23mJ!Ou6ZS#zCS5W`gxE5T>C#E|{i<1D35C222I33?Njaz`On7
zi<+VWFP6D{e-{yiN#M|Jgk<44u1TiMI78S5W`Sdb5f+{zu34s{CfWN7a3Cf^@L%!&
zN$?|!!9j2c)j$~+R6n#891w-z8(!oBpL2K=+%a$r2|~8-(vQj5_XT`<0Ksf;oP+tz
z9CObS!0m)Tgg`K#xBM8B(|Z)Wb&DYL{WTYv`;A=q6~Nnx2+!lTIXtj8J7dZE!P_{z
z#f8w6F}^!?^KE#+ZDv+xd5O&3EmomZzsv?>E-~ygGum45fk!SBN&|eo1rKw^?aZJ4
E2O(~oYXATM

literal 0
HcmV?d00001

diff --git a/newexample/gradle/wrapper/gradle-wrapper.properties b/newexample/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..5c9a6bc88
--- /dev/null
+++ b/newexample/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Nov 04 13:12:48 CET 2022
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/newexample/gradlew b/newexample/gradlew
new file mode 100755
index 000000000..4f906e0c8
--- /dev/null
+++ b/newexample/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# 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"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/newexample/gradlew.bat b/newexample/gradlew.bat
new file mode 100644
index 000000000..ac1b06f93
--- /dev/null
+++ b/newexample/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/newexample/ios/ios.xcodeproj/project.pbxproj b/newexample/ios/ios.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..d6c8d7d77
--- /dev/null
+++ b/newexample/ios/ios.xcodeproj/project.pbxproj
@@ -0,0 +1,383 @@
+    // !$*UTF8*$!
+    {
+    	archiveVersion = 1;
+    	classes = {
+    	};
+    	objectVersion = 50;
+    	objects = {
+
+    /* Begin PBXBuildFile section */
+058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
+058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
+    		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
+    		7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
+    /* End PBXBuildFile section */
+
+    /* Begin PBXCopyFilesBuildPhase section */
+    		7555FFB4242A642300829871 /* Embed Frameworks */ = {
+    			isa = PBXCopyFilesBuildPhase;
+    			buildActionMask = 2147483647;
+    			dstPath = "";
+    			dstSubfolderSpec = 10;
+    			files = (
+    			);
+    			name = "Embed Frameworks";
+    			runOnlyForDeploymentPostprocessing = 0;
+    		};
+    /* End PBXCopyFilesBuildPhase section */
+
+    /* Begin PBXFileReference section */
+    		058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
+    		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
+    		7555FF7B242A565900829871 /* ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
+    		7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+    		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+    /* End PBXFileReference section */
+
+    /* Begin PBXFrameworksBuildPhase section */
+    		7555FF78242A565900829871 /* Frameworks */ = {
+    			isa = PBXFrameworksBuildPhase;
+    			buildActionMask = 2147483647;
+    			files = (
+    			);
+    			runOnlyForDeploymentPostprocessing = 0;
+    		};
+    /* End PBXFrameworksBuildPhase section */
+
+    /* Begin PBXGroup section */
+    		058557D7273AAEEB004C7B11 /* Preview Content */ = {
+	isa = PBXGroup;
+	children = (
+		058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */,
+	);
+	path = "Preview Content";
+	sourceTree = "<group>";
+};
+    		7555FF72242A565900829871 = {
+    			isa = PBXGroup;
+    			children = (
+    				7555FF7D242A565900829871 /* ios */,
+    				7555FF7C242A565900829871 /* Products */,
+    				7555FFB0242A642200829871 /* Frameworks */,
+    			);
+    			sourceTree = "<group>";
+    		};
+    		7555FF7C242A565900829871 /* Products */ = {
+    			isa = PBXGroup;
+    			children = (
+    				7555FF7B242A565900829871 /* ios.app */,
+    			);
+    			name = Products;
+    			sourceTree = "<group>";
+    		};
+    		7555FF7D242A565900829871 /* ios */ = {
+    			isa = PBXGroup;
+    			children = (
+    				058557BA273AAA24004C7B11 /* Assets.xcassets */,
+    				7555FF82242A565900829871 /* ContentView.swift */,
+    				7555FF8C242A565B00829871 /* Info.plist */,
+    				2152FB032600AC8F00CF470E /* iOSApp.swift */,
+		058557D7273AAEEB004C7B11 /* Preview Content */,
+    			);
+    			path = ios;
+    			sourceTree = "<group>";
+    		};
+    		7555FFB0242A642200829871 /* Frameworks */ = {
+    			isa = PBXGroup;
+    			children = (
+    			);
+    			name = Frameworks;
+    			sourceTree = "<group>";
+    		};
+    /* End PBXGroup section */
+
+    /* Begin PBXNativeTarget section */
+    		7555FF7A242A565900829871 /* ios */ = {
+    			isa = PBXNativeTarget;
+    			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "ios" */;
+    			buildPhases = (
+    				7555FFB5242A651A00829871 /* ShellScript */,
+    				7555FF77242A565900829871 /* Sources */,
+    				7555FF78242A565900829871 /* Frameworks */,
+    				7555FF79242A565900829871 /* Resources */,
+    				7555FFB4242A642300829871 /* Embed Frameworks */,
+    			);
+    			buildRules = (
+    			);
+    			dependencies = (
+    			);
+    			name = ios;
+    			productName = ios;
+    			productReference = 7555FF7B242A565900829871 /* ios.app */;
+    			productType = "com.apple.product-type.application";
+    		};
+    /* End PBXNativeTarget section */
+
+    /* Begin PBXProject section */
+    		7555FF73242A565900829871 /* Project object */ = {
+    			isa = PBXProject;
+    			attributes = {
+    				LastSwiftUpdateCheck = 1130;
+    				LastUpgradeCheck = 1130;
+    				ORGANIZATIONNAME = orgName;
+    				TargetAttributes = {
+    					7555FF7A242A565900829871 = {
+    						CreatedOnToolsVersion = 11.3.1;
+    					};
+    				};
+    			};
+    			buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "ios" */;
+    			compatibilityVersion = "Xcode 9.3";
+    			developmentRegion = en;
+    			hasScannedForEncodings = 0;
+    			knownRegions = (
+    				en,
+    				Base,
+    			);
+    			mainGroup = 7555FF72242A565900829871;
+    			productRefGroup = 7555FF7C242A565900829871 /* Products */;
+    			projectDirPath = "";
+    			projectRoot = "";
+    			targets = (
+    				7555FF7A242A565900829871 /* ios */,
+    			);
+    		};
+    /* End PBXProject section */
+
+    /* Begin PBXResourcesBuildPhase section */
+    		7555FF79242A565900829871 /* Resources */ = {
+    			isa = PBXResourcesBuildPhase;
+    			buildActionMask = 2147483647;
+    			files = (
+		058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */,
+		058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */,
+    			);
+    			runOnlyForDeploymentPostprocessing = 0;
+    		};
+    /* End PBXResourcesBuildPhase section */
+
+    /* Begin PBXShellScriptBuildPhase section */
+    		7555FFB5242A651A00829871 /* ShellScript */ = {
+    			isa = PBXShellScriptBuildPhase;
+    			buildActionMask = 2147483647;
+    			files = (
+    			);
+    			inputFileListPaths = (
+    			);
+    			inputPaths = (
+    			);
+    			outputFileListPaths = (
+    			);
+    			outputPaths = (
+    			);
+    			runOnlyForDeploymentPostprocessing = 0;
+    			shellPath = /bin/sh;
+    			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
+    		};
+    /* End PBXShellScriptBuildPhase section */
+
+    /* Begin PBXSourcesBuildPhase section */
+    		7555FF77242A565900829871 /* Sources */ = {
+    			isa = PBXSourcesBuildPhase;
+    			buildActionMask = 2147483647;
+    			files = (
+    				2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
+    				7555FF83242A565900829871 /* ContentView.swift in Sources */,
+    			);
+    			runOnlyForDeploymentPostprocessing = 0;
+    		};
+    /* End PBXSourcesBuildPhase section */
+
+    /* Begin XCBuildConfiguration section */
+    		7555FFA3242A565B00829871 /* Debug */ = {
+    			isa = XCBuildConfiguration;
+    			buildSettings = {
+    				ALWAYS_SEARCH_USER_PATHS = NO;
+    				CLANG_ANALYZER_NONNULL = YES;
+    				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+    				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+    				CLANG_CXX_LIBRARY = "libc++";
+    				CLANG_ENABLE_MODULES = YES;
+    				CLANG_ENABLE_OBJC_ARC = YES;
+    				CLANG_ENABLE_OBJC_WEAK = YES;
+    				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+    				CLANG_WARN_BOOL_CONVERSION = YES;
+    				CLANG_WARN_COMMA = YES;
+    				CLANG_WARN_CONSTANT_CONVERSION = YES;
+    				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+    				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+    				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+    				CLANG_WARN_EMPTY_BODY = YES;
+    				CLANG_WARN_ENUM_CONVERSION = YES;
+    				CLANG_WARN_INFINITE_RECURSION = YES;
+    				CLANG_WARN_INT_CONVERSION = YES;
+    				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+    				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+    				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+    				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+    				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+    				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+    				CLANG_WARN_STRICT_PROTOTYPES = YES;
+    				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+    				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+    				CLANG_WARN_UNREACHABLE_CODE = YES;
+    				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+    				COPY_PHASE_STRIP = NO;
+    				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+    				ENABLE_STRICT_OBJC_MSGSEND = YES;
+    				ENABLE_TESTABILITY = YES;
+    				GCC_C_LANGUAGE_STANDARD = gnu11;
+    				GCC_DYNAMIC_NO_PIC = NO;
+    				GCC_NO_COMMON_BLOCKS = YES;
+    				GCC_OPTIMIZATION_LEVEL = 0;
+    				GCC_PREPROCESSOR_DEFINITIONS = (
+    					"DEBUG=1",
+    					"$(inherited)",
+    				);
+    				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+    				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+    				GCC_WARN_UNDECLARED_SELECTOR = YES;
+    				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+    				GCC_WARN_UNUSED_FUNCTION = YES;
+    				GCC_WARN_UNUSED_VARIABLE = YES;
+    				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+    				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+    				MTL_FAST_MATH = YES;
+    				ONLY_ACTIVE_ARCH = YES;
+    				SDKROOT = iphoneos;
+    				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+    				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+    			};
+    			name = Debug;
+    		};
+    		7555FFA4242A565B00829871 /* Release */ = {
+    			isa = XCBuildConfiguration;
+    			buildSettings = {
+    				ALWAYS_SEARCH_USER_PATHS = NO;
+    				CLANG_ANALYZER_NONNULL = YES;
+    				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+    				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+    				CLANG_CXX_LIBRARY = "libc++";
+    				CLANG_ENABLE_MODULES = YES;
+    				CLANG_ENABLE_OBJC_ARC = YES;
+    				CLANG_ENABLE_OBJC_WEAK = YES;
+    				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+    				CLANG_WARN_BOOL_CONVERSION = YES;
+    				CLANG_WARN_COMMA = YES;
+    				CLANG_WARN_CONSTANT_CONVERSION = YES;
+    				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+    				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+    				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+    				CLANG_WARN_EMPTY_BODY = YES;
+    				CLANG_WARN_ENUM_CONVERSION = YES;
+    				CLANG_WARN_INFINITE_RECURSION = YES;
+    				CLANG_WARN_INT_CONVERSION = YES;
+    				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+    				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+    				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+    				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+    				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+    				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+    				CLANG_WARN_STRICT_PROTOTYPES = YES;
+    				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+    				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+    				CLANG_WARN_UNREACHABLE_CODE = YES;
+    				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+    				COPY_PHASE_STRIP = NO;
+    				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+    				ENABLE_NS_ASSERTIONS = NO;
+    				ENABLE_STRICT_OBJC_MSGSEND = YES;
+    				GCC_C_LANGUAGE_STANDARD = gnu11;
+    				GCC_NO_COMMON_BLOCKS = YES;
+    				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+    				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+    				GCC_WARN_UNDECLARED_SELECTOR = YES;
+    				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+    				GCC_WARN_UNUSED_FUNCTION = YES;
+    				GCC_WARN_UNUSED_VARIABLE = YES;
+    				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+    				MTL_ENABLE_DEBUG_INFO = NO;
+    				MTL_FAST_MATH = YES;
+    				SDKROOT = iphoneos;
+    				SWIFT_COMPILATION_MODE = wholemodule;
+    				SWIFT_OPTIMIZATION_LEVEL = "-O";
+    				VALIDATE_PRODUCT = YES;
+    			};
+    			name = Release;
+    		};
+    		7555FFA6242A565B00829871 /* Debug */ = {
+    			isa = XCBuildConfiguration;
+    			buildSettings = {
+    				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+    				CODE_SIGN_STYLE = Automatic;
+		DEVELOPMENT_ASSET_PATHS = "\"ios/Preview Content\"";
+    				ENABLE_PREVIEWS = YES;
+    				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+    				INFOPLIST_FILE = ios/Info.plist;
+    				LD_RUNPATH_SEARCH_PATHS = (
+    					"$(inherited)",
+    					"@executable_path/Frameworks",
+    				);
+    				OTHER_LDFLAGS = (
+    					"$(inherited)",
+    					"-framework",
+    					shared,
+    				);
+    				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.ios;
+    				PRODUCT_NAME = "$(TARGET_NAME)";
+    				SWIFT_VERSION = 5.0;
+    				TARGETED_DEVICE_FAMILY = "1,2";
+    			};
+    			name = Debug;
+    		};
+    		7555FFA7242A565B00829871 /* Release */ = {
+    			isa = XCBuildConfiguration;
+    			buildSettings = {
+    				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+    				CODE_SIGN_STYLE = Automatic;
+    				DEVELOPMENT_ASSET_PATHS = "\"ios/Preview Content\"";
+    				ENABLE_PREVIEWS = YES;
+    				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+    				INFOPLIST_FILE = ios/Info.plist;
+    				LD_RUNPATH_SEARCH_PATHS = (
+    					"$(inherited)",
+    					"@executable_path/Frameworks",
+    				);
+    				OTHER_LDFLAGS = (
+    					"$(inherited)",
+    					"-framework",
+    					shared,
+    				);
+    				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.ios;
+    				PRODUCT_NAME = "$(TARGET_NAME)";
+    				SWIFT_VERSION = 5.0;
+    				TARGETED_DEVICE_FAMILY = "1,2";
+    			};
+    			name = Release;
+    		};
+    /* End XCBuildConfiguration section */
+
+    /* Begin XCConfigurationList section */
+    		7555FF76242A565900829871 /* Build configuration list for PBXProject "ios" */ = {
+    			isa = XCConfigurationList;
+    			buildConfigurations = (
+    				7555FFA3242A565B00829871 /* Debug */,
+    				7555FFA4242A565B00829871 /* Release */,
+    			);
+    			defaultConfigurationIsVisible = 0;
+    			defaultConfigurationName = Release;
+    		};
+    		7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "ios" */ = {
+    			isa = XCConfigurationList;
+    			buildConfigurations = (
+    				7555FFA6242A565B00829871 /* Debug */,
+    				7555FFA7242A565B00829871 /* Release */,
+    			);
+    			defaultConfigurationIsVisible = 0;
+    			defaultConfigurationName = Release;
+    		};
+    /* End XCConfigurationList section */
+    	};
+    	rootObject = 7555FF73242A565900829871 /* Project object */;
+    }
\ No newline at end of file
diff --git a/newexample/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json b/newexample/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json
new file mode 100644
index 000000000..ee7e3ca03
--- /dev/null
+++ b/newexample/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/newexample/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/newexample/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..fb88a396b
--- /dev/null
+++ b/newexample/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/newexample/ios/ios/Assets.xcassets/Contents.json b/newexample/ios/ios/Assets.xcassets/Contents.json
new file mode 100644
index 000000000..4aa7c5350
--- /dev/null
+++ b/newexample/ios/ios/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/newexample/ios/ios/ContentView.swift b/newexample/ios/ios/ContentView.swift
new file mode 100644
index 000000000..4c626ac08
--- /dev/null
+++ b/newexample/ios/ios/ContentView.swift
@@ -0,0 +1,16 @@
+import SwiftUI
+import shared
+
+struct ContentView: View {
+	let greet = Greeting().greeting()
+
+	var body: some View {
+		Text(greet)
+	}
+}
+
+struct ContentView_Previews: PreviewProvider {
+	static var previews: some View {
+		ContentView()
+	}
+}
\ No newline at end of file
diff --git a/newexample/ios/ios/Info.plist b/newexample/ios/ios/Info.plist
new file mode 100644
index 000000000..8044709cf
--- /dev/null
+++ b/newexample/ios/ios/Info.plist
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+	</dict>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UILaunchScreen</key>
+	<dict/>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/newexample/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json b/newexample/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json
new file mode 100644
index 000000000..4aa7c5350
--- /dev/null
+++ b/newexample/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/newexample/ios/ios/iOSApp.swift b/newexample/ios/ios/iOSApp.swift
new file mode 100644
index 000000000..0648e8602
--- /dev/null
+++ b/newexample/ios/ios/iOSApp.swift
@@ -0,0 +1,10 @@
+import SwiftUI
+
+@main
+struct iOSApp: App {
+	var body: some Scene {
+		WindowGroup {
+			ContentView()
+		}
+	}
+}
\ No newline at end of file
diff --git a/newexample/settings.gradle.kts b/newexample/settings.gradle.kts
new file mode 100644
index 000000000..bd1e8a28b
--- /dev/null
+++ b/newexample/settings.gradle.kts
@@ -0,0 +1,69 @@
+import java.io.File
+import java.io.FileInputStream
+import java.util.Properties
+
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+
+    resolutionStrategy {
+        eachPlugin {
+
+            val kalugaAndroidGradlePluginVersion = settings.extra["kaluga.androidGradlePluginVersion"]
+            val kalugaKotlinVersion = settings.extra["kaluga.kotlinVersion"]
+            val kalugaKtLintGradlePluginVersion = settings.extra["kaluga.ktLintGradlePluginVersion"]
+            val kalugaGoogleServicesGradlePluginVersion = settings.extra["kaluga.googleServicesGradlePluginVersion"]
+
+            when (requested.id.id) {
+                "org.jetbrains.kotlin.multiplatform",
+                "org.jetbrains.kotlin.plugin.serialization",
+                "org.jetbrains.kotlin.android",
+                "org.jetbrains.kotlin.kapt",
+                -> useVersion("$kalugaKotlinVersion")
+                "com.android.library",
+                "com.android.application",
+                -> useVersion("$kalugaAndroidGradlePluginVersion")
+                "org.jlleitschuh.gradle.ktlint",
+                "org.jlleitschuh.gradle.ktlint-idea",
+                -> useVersion("$kalugaKtLintGradlePluginVersion")
+                "com.google.gms:google-services"
+                -> useVersion("com.google.gms:google-services:$kalugaGoogleServicesGradlePluginVersion")
+            }
+        }
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+includeBuild("../kaluga-library-components")
+includeBuild("../convention-plugins")
+
+rootProject.name = "Kaluga Example"
+include(":android")
+include(":shared")
+
+val exampleEmbeddingMethod = if (System.getenv().containsKey("EXAMPLE_EMBEDDING_METHOD")) {
+    System.getenv()["EXAMPLE_EMBEDDING_METHOD"].also {
+        logger.lifecycle("System env EXAMPLE_EMBEDDING_METHOD set to ${System.getenv()["EXAMPLE_EMBEDDING_METHOD"]}, using $it")
+    }!!
+} else {
+    val props = Properties()
+    props.load(FileInputStream(File("$rootDir/local.properties")))
+    val exampleEmbeddingMethodLocalProperties = props["kaluga.exampleEmbeddingMethod"] as? String
+    (exampleEmbeddingMethodLocalProperties ?: "composite").also {
+        logger.lifecycle("local.properties read (kaluga.exampleEmbeddingMethod=$exampleEmbeddingMethodLocalProperties, using $it)")
+    }
+}
+
+when (exampleEmbeddingMethod) {
+    "composite" -> includeBuild("../")
+    else -> {}
+}
diff --git a/newexample/shared/build.gradle.kts b/newexample/shared/build.gradle.kts
new file mode 100644
index 000000000..5fdd9f876
--- /dev/null
+++ b/newexample/shared/build.gradle.kts
@@ -0,0 +1,57 @@
+plugins {
+    kotlin("multiplatform")
+    id("com.android.library")
+    id("kaluga-library-components")
+}
+
+kotlin {
+    android()
+    
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "shared"
+        }
+    }
+
+    sourceSets {
+        val commonMain by getting
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
+        val androidMain by getting
+        val androidTest by getting
+        val iosX64Main by getting
+        val iosArm64Main by getting
+        val iosSimulatorArm64Main by getting
+        val iosMain by creating {
+            dependsOn(commonMain)
+            iosX64Main.dependsOn(this)
+            iosArm64Main.dependsOn(this)
+            iosSimulatorArm64Main.dependsOn(this)
+        }
+        val iosX64Test by getting
+        val iosArm64Test by getting
+        val iosSimulatorArm64Test by getting
+        val iosTest by creating {
+            dependsOn(commonTest)
+            iosX64Test.dependsOn(this)
+            iosArm64Test.dependsOn(this)
+            iosSimulatorArm64Test.dependsOn(this)
+        }
+    }
+}
+
+android {
+    namespace = "com.splendo.kaluga.example"
+    compileSdk = 32
+    defaultConfig {
+        minSdk = 24
+        targetSdk = 32
+    }
+}
\ No newline at end of file
diff --git a/newexample/shared/src/androidMain/kotlin/com/splendo/kaluga/example/Platform.kt b/newexample/shared/src/androidMain/kotlin/com/splendo/kaluga/example/Platform.kt
new file mode 100644
index 000000000..dfc314313
--- /dev/null
+++ b/newexample/shared/src/androidMain/kotlin/com/splendo/kaluga/example/Platform.kt
@@ -0,0 +1,7 @@
+package com.splendo.kaluga.example
+
+class AndroidPlatform : Platform {
+    override val name: String = "Android ${android.os.Build.VERSION.SDK_INT}"
+}
+
+actual fun getPlatform(): Platform = AndroidPlatform()
\ No newline at end of file
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Greeting.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Greeting.kt
new file mode 100644
index 000000000..03d25eef9
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Greeting.kt
@@ -0,0 +1,9 @@
+package com.splendo.kaluga.example
+
+class Greeting {
+    private val platform: Platform = getPlatform()
+
+    fun greeting(): String {
+        return "Hello, ${platform.name}!"
+    }
+}
\ No newline at end of file
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Platform.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Platform.kt
new file mode 100644
index 000000000..9ec59b0cb
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Platform.kt
@@ -0,0 +1,7 @@
+package com.splendo.kaluga.example
+
+interface Platform {
+    val name: String
+}
+
+expect fun getPlatform(): Platform
\ No newline at end of file
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/Platform.kt b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/Platform.kt
new file mode 100644
index 000000000..cec6997af
--- /dev/null
+++ b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/Platform.kt
@@ -0,0 +1,9 @@
+package com.splendo.kaluga.example
+
+import platform.UIKit.UIDevice
+
+class IOSPlatform: Platform {
+    override val name: String = UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion
+}
+
+actual fun getPlatform(): Platform = IOSPlatform()
\ No newline at end of file

From 82ca127e1202e4e478b5b7701275dc525c94c087 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 7 Nov 2022 11:33:55 +0100
Subject: [PATCH 021/227] Adding shared

---
 .../src/main/kotlin/Accessors.kt              |   7 +-
 .../src/main/kotlin/AndroidCommon.kt          |   2 +-
 .../src/main/kotlin/Component.kt              |   3 +-
 .../src/main/kotlin/Dependencies.kt           |   1 +
 newexample/android/build.gradle.kts           |  16 +-
 newexample/build.gradle.kts                   |   6 +-
 newexample/gradle.properties                  |   5 +-
 newexample/shared/build.gradle.kts            |  67 ++----
 .../src/androidLibMain/AndroidManifest.xml    |   6 +
 .../viewmodel/featureList/PlatformSpecific.kt |  57 +++++
 .../com/splendo/kaluga/example/Platform.kt    |   7 -
 .../com/splendo/kaluga/example/Greeting.kt    |   9 -
 .../com/splendo/kaluga/example/Platform.kt    |   7 -
 .../kotlin/stylable/ButtonStyles.kt           | 224 ++++++++++++++++++
 .../commonMain/kotlin/stylable/TextStyles.kt  |  37 +++
 .../kotlin/viewmodel/ExampleViewModel.kt      |  62 +++++
 .../kotlin/viewmodel/alert/AlertViewModel.kt  |  96 ++++++++
 .../ArchitectureDetailsViewModel.kt           |  57 +++++
 .../ArchitectureInputViewModel.kt             |  85 +++++++
 .../beacons/BeaconsListBeaconViewModel.kt     |  47 ++++
 .../viewmodel/beacons/BeaconsListViewModel.kt |  76 ++++++
 .../BluetoothCharacteristicViewModel.kt       |  75 ++++++
 .../bluetooth/BluetoothDescriptorViewModel.kt |  60 +++++
 .../BluetoothDeviceDetailViewModel.kt         | 107 +++++++++
 .../bluetooth/BluetoothListDeviceViewModel.kt | 139 +++++++++++
 .../bluetooth/BluetoothListViewModel.kt       |  75 ++++++
 .../bluetooth/BluetoothServiceViewModel.kt    |  64 +++++
 .../datetimepicker/DateTimePickerViewModel.kt |  57 +++++
 .../featureList/FeatureListViewModel.kt       |  97 ++++++++
 .../viewmodel/featureList/PlatformSpecific.kt |  20 ++
 .../kotlin/viewmodel/hud/HudViewModel.kt      |  51 ++++
 .../kotlin/viewmodel/info/InfoViewModel.kt    | 115 +++++++++
 .../viewmodel/keyboard/KeyboardViewModel.kt   |  35 +++
 .../kotlin/viewmodel/link/LinksViewModel.kt   | 115 +++++++++
 .../viewmodel/location/LocationViewModel.kt   |  61 +++++
 .../permissions/PermissionViewModel.kt        |  61 +++++
 .../permissions/PermissionsListViewModel.kt   |  66 ++++++
 .../viewmodel/resources/ButtonViewModel.kt    |  86 +++++++
 .../viewmodel/resources/ColorViewModel.kt     | 192 +++++++++++++++
 .../viewmodel/resources/LabelViewModel.kt     | 120 ++++++++++
 .../resources/ResourcesListViewModel.kt       |  37 +++
 .../viewmodel/system/SystemViewModel.kt       |  54 +++++
 .../system/network/NetworkViewModel.kt        |  64 +++++
 .../com/splendo/kaluga/example/Platform.kt    |   9 -
 .../viewmodel/featureList/PlatformSpecific.kt |  20 ++
 .../viewmodel/featureList/PlatformSpecific.kt |  20 ++
 .../viewmodel/featureList/PlatformSpecific.kt |  20 ++
 47 files changed, 2603 insertions(+), 94 deletions(-)
 create mode 100644 newexample/shared/src/androidLibMain/AndroidManifest.xml
 create mode 100644 newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
 delete mode 100644 newexample/shared/src/androidMain/kotlin/com/splendo/kaluga/example/Platform.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Greeting.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Platform.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/stylable/TextStyles.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/alert/AlertViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/datetimepicker/DateTimePickerViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/hud/HudViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/resources/ResourcesListViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt
 delete mode 100644 newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/Platform.kt
 create mode 100644 newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
 create mode 100644 newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
 create mode 100644 newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt

diff --git a/kaluga-library-components/src/main/kotlin/Accessors.kt b/kaluga-library-components/src/main/kotlin/Accessors.kt
index ae5f0538e..c13ed44c2 100644
--- a/kaluga-library-components/src/main/kotlin/Accessors.kt
+++ b/kaluga-library-components/src/main/kotlin/Accessors.kt
@@ -15,13 +15,18 @@
 
  */
 
+import com.android.build.gradle.AppExtension
 import com.android.build.gradle.LibraryExtension
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
-fun Project.android(action: LibraryExtension.() -> Unit) {
+fun Project.androidApp(action: AppExtension.() -> Unit) {
+    configureAction("android", action)
+}
+
+fun Project.androidLibrary(action: LibraryExtension.() -> Unit) {
     configureAction("android", action)
 }
 
diff --git a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
index 365e527c1..66263af27 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
@@ -20,7 +20,7 @@ import org.gradle.api.JavaVersion
 import org.gradle.kotlin.dsl.dependencies
 
 fun org.gradle.api.Project.commonAndroidComponent(type: ComponentType = ComponentType.Default()) {
-    android {
+    androidLibrary {
         androidCommon(this@commonAndroidComponent, type)
     }
 
diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index f0899920e..0629fdfef 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
-import org.jetbrains.kotlin.konan.file.File
 
 sealed class ComponentType {
     abstract val isApp: Boolean
@@ -40,7 +39,7 @@ fun Project.commonComponent() {
     }
 
     commonAndroidComponent()
-    android {
+    androidLibrary {
         commonMultiplatformComponentAndroid(this@commonComponent)
     }
 
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index 0512cb7ea..e5bf0adb6 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -113,6 +113,7 @@ object Dependencies {
             val Material = Dependency("$composeGroupBase.material", "material", version)
             val UI = Dependency("$composeGroupBase.ui", "ui", version)
             val UITooling = Dependency("$composeGroupBase.ui", "ui-tooling", version)
+            val UIToolingPreview = Dependency("$composeGroupBase.ui", "ui-tooling-preview", version)
         }
         val ConstraintLayout = Dependency("$groupBase.constraintlayout", "constraintlayout", "2.1.4")
         val Core = Dependency("$groupBase.core", "core", "1.9.0")
diff --git a/newexample/android/build.gradle.kts b/newexample/android/build.gradle.kts
index cc6b78ad9..7187dd077 100644
--- a/newexample/android/build.gradle.kts
+++ b/newexample/android/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace = "com.splendo.kaluga.example.android"
-    compileSdk = 32
+    compileSdk = 33
     defaultConfig {
         applicationId = "com.splendo.kaluga.example.android"
         minSdk = 24
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }
@@ -33,10 +33,10 @@ android {
 
 dependencies {
     implementation(project(":shared"))
-    implementation("androidx.compose.ui:ui:1.2.1")
-    implementation("androidx.compose.ui:ui-tooling:1.2.1")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.2.1")
-    implementation("androidx.compose.foundation:foundation:1.2.1")
-    implementation("androidx.compose.material:material:1.2.1")
-    implementation("androidx.activity:activity-compose:1.5.1")
+    implement(Dependencies.AndroidX.Compose.UI)
+    implement(Dependencies.AndroidX.Compose.UITooling)
+    implement(Dependencies.AndroidX.Compose.UIToolingPreview)
+    implement(Dependencies.AndroidX.Compose.Foundation)
+    implement(Dependencies.AndroidX.Compose.Material)
+    implement(Dependencies.AndroidX.Activity.Compose)
 }
\ No newline at end of file
diff --git a/newexample/build.gradle.kts b/newexample/build.gradle.kts
index 76baf193c..b97599c5d 100644
--- a/newexample/build.gradle.kts
+++ b/newexample/build.gradle.kts
@@ -3,11 +3,8 @@ import java.io.FileInputStream
 import java.util.Properties
 
 plugins {
-    //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").apply(false)
-    id("com.android.library").apply(false)
-    kotlin("android").apply(false)
     kotlin("multiplatform").apply(false)
+    id("kaluga-library-components")
 }
 
 allprojects {
@@ -29,6 +26,7 @@ allprojects {
                     logger.lifecycle("local.properties not found, using default value ($it)")
                 }
         }
+        logger.lifecycle("Using repo: $exampleMavenRepo for resolving dependencies")
 
         when(exampleMavenRepo) {
             null, "", "local" -> mavenLocal()
diff --git a/newexample/gradle.properties b/newexample/gradle.properties
index 706a7399f..da6d54955 100644
--- a/newexample/gradle.properties
+++ b/newexample/gradle.properties
@@ -1,14 +1,17 @@
 #Gradle
-org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.jvmargs=-Xmx3048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx3048M"
 
 #Kotlin
 kotlin.code.style=official
+kotlin.mpp.stability.nowarn=true
 
 #Android
 android.useAndroidX=true
 android.nonTransitiveRClass=true
 
 #MPP
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableCInteropCommonization=true
 
 kaluga.androidGradlePluginVersion=7.3.0
diff --git a/newexample/shared/build.gradle.kts b/newexample/shared/build.gradle.kts
index 5fdd9f876..39dafc51e 100644
--- a/newexample/shared/build.gradle.kts
+++ b/newexample/shared/build.gradle.kts
@@ -1,57 +1,34 @@
 plugins {
     kotlin("multiplatform")
+    kotlin("plugin.serialization")
     id("com.android.library")
-    id("kaluga-library-components")
+    id("jacoco")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
-kotlin {
-    android()
-    
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
-            baseName = "shared"
-        }
-    }
+commonComponent()
 
+kotlin {
     sourceSets {
-        val commonMain by getting
-        val commonTest by getting {
+        getByName("commonMain") {
             dependencies {
-                implementation(kotlin("test"))
+                val libraryVersion = Library.version
+                api("com.splendo.kaluga:alerts:$libraryVersion")
+                api("com.splendo.kaluga:architecture:$libraryVersion")
+                api("com.splendo.kaluga:base:$libraryVersion")
+                api("com.splendo.kaluga:bluetooth:$libraryVersion")
+                api("com.splendo.kaluga:beacons:$libraryVersion")
+                api("com.splendo.kaluga:date-time-picker:$libraryVersion")
+                api("com.splendo.kaluga:hud:$libraryVersion")
+                api("com.splendo.kaluga:keyboard:$libraryVersion")
+                api("com.splendo.kaluga:links:$libraryVersion")
+                api("com.splendo.kaluga:location:$libraryVersion")
+                api("com.splendo.kaluga:logging:$libraryVersion")
+                api("com.splendo.kaluga:resources:$libraryVersion")
+                api("com.splendo.kaluga:review:$libraryVersion")
+                api("com.splendo.kaluga:system:$libraryVersion")
+                api("com.splendo.kaluga:permissions:$libraryVersion")
             }
         }
-        val androidMain by getting
-        val androidTest by getting
-        val iosX64Main by getting
-        val iosArm64Main by getting
-        val iosSimulatorArm64Main by getting
-        val iosMain by creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-        }
-        val iosX64Test by getting
-        val iosArm64Test by getting
-        val iosSimulatorArm64Test by getting
-        val iosTest by creating {
-            dependsOn(commonTest)
-            iosX64Test.dependsOn(this)
-            iosArm64Test.dependsOn(this)
-            iosSimulatorArm64Test.dependsOn(this)
-        }
-    }
-}
-
-android {
-    namespace = "com.splendo.kaluga.example"
-    compileSdk = 32
-    defaultConfig {
-        minSdk = 24
-        targetSdk = 32
     }
 }
\ No newline at end of file
diff --git a/newexample/shared/src/androidLibMain/AndroidManifest.xml b/newexample/shared/src/androidLibMain/AndroidManifest.xml
new file mode 100644
index 000000000..f595a3b11
--- /dev/null
+++ b/newexample/shared/src/androidLibMain/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest package="com.splendo.kaluga.example.shared"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        >
+</manifest>
+
+
diff --git a/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
new file mode 100644
index 000000000..8d35888bc
--- /dev/null
+++ b/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
@@ -0,0 +1,57 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.featureList
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+
+actual val showPlatformSpecificFeatures: Boolean = true
+
+sealed class PlatformFeatureListNavigationAction : NavigationAction<Nothing>(null) {
+    object ComposeNavigation : PlatformFeatureListNavigationAction()
+    object ComposeBottomSheet : PlatformFeatureListNavigationAction()
+}
+
+sealed class PlatformFeature(val title: String) {
+    object ComposeNavigation : PlatformFeature("feature_platform_specific_compose_navigation".localized())
+    object ComposeBottomSheet : PlatformFeature("feature_platform_specific_compose_bottom_sheet".localized())
+}
+
+class PlatformSpecificFeaturesViewModel(
+    navigator: Navigator<PlatformFeatureListNavigationAction>
+) : NavigatingViewModel<PlatformFeatureListNavigationAction>(navigator) {
+
+    val feature = observableOf(
+        listOf(
+            PlatformFeature.ComposeNavigation,
+            PlatformFeature.ComposeBottomSheet
+        )
+    )
+
+    fun onFeaturePressed(feature: PlatformFeature) {
+        navigator.navigate(
+            when (feature) {
+                is PlatformFeature.ComposeNavigation -> PlatformFeatureListNavigationAction.ComposeNavigation
+                is PlatformFeature.ComposeBottomSheet -> PlatformFeatureListNavigationAction.ComposeBottomSheet
+            }
+        )
+    }
+}
diff --git a/newexample/shared/src/androidMain/kotlin/com/splendo/kaluga/example/Platform.kt b/newexample/shared/src/androidMain/kotlin/com/splendo/kaluga/example/Platform.kt
deleted file mode 100644
index dfc314313..000000000
--- a/newexample/shared/src/androidMain/kotlin/com/splendo/kaluga/example/Platform.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.splendo.kaluga.example
-
-class AndroidPlatform : Platform {
-    override val name: String = "Android ${android.os.Build.VERSION.SDK_INT}"
-}
-
-actual fun getPlatform(): Platform = AndroidPlatform()
\ No newline at end of file
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Greeting.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Greeting.kt
deleted file mode 100644
index 03d25eef9..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Greeting.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.splendo.kaluga.example
-
-class Greeting {
-    private val platform: Platform = getPlatform()
-
-    fun greeting(): String {
-        return "Hello, ${platform.name}!"
-    }
-}
\ No newline at end of file
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Platform.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Platform.kt
deleted file mode 100644
index 9ec59b0cb..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/Platform.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.splendo.kaluga.example
-
-interface Platform {
-    val name: String
-}
-
-expect fun getPlatform(): Platform
\ No newline at end of file
diff --git a/newexample/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt b/newexample/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt
new file mode 100644
index 000000000..07eba41b7
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt
@@ -0,0 +1,224 @@
+package com.splendo.kaluga.example.shared.stylable
+
+import com.splendo.kaluga.resources.DefaultColors
+import com.splendo.kaluga.resources.defaultFont
+import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.ButtonStateStyle
+import com.splendo.kaluga.resources.stylable.ButtonStyle
+import com.splendo.kaluga.resources.stylable.GradientStyle
+
+object ButtonStyles {
+
+    val textButton by lazy {
+        ButtonStyle(TextStyles.redText)
+    }
+    val redButton by lazy {
+        ButtonStyle(
+            TextStyles.whiteText,
+            backgroundColor = DefaultColors.red,
+            pressedBackgroundColor = DefaultColors.maroon,
+            disabledBackgroundColor = DefaultColors.lightGray
+        )
+    }
+    val roundedButton by lazy {
+        ButtonStyle(
+            defaultFont,
+            12.0f,
+            defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, BackgroundStyle.Shape.Rectangle(10.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))),
+            pressedStyle = ButtonStateStyle(DefaultColors.azure, DefaultColors.lightSkyBlue, BackgroundStyle.Shape.Rectangle(5.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT))),
+            disabledStyle = ButtonStateStyle(DefaultColors.black, DefaultColors.lightGray, BackgroundStyle.Shape.Rectangle(10.0f))
+        )
+    }
+    val ovalButton by lazy {
+        ButtonStyle(
+            defaultFont,
+            12.0f,
+            defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, BackgroundStyle.Shape.Oval),
+            pressedStyle = ButtonStateStyle(DefaultColors.azure, DefaultColors.lightSkyBlue, BackgroundStyle.Shape.Oval),
+            disabledStyle = ButtonStateStyle(DefaultColors.black, DefaultColors.lightGray, BackgroundStyle.Shape.Oval)
+        )
+    }
+    val redButtonWithStroke by lazy {
+        ButtonStyle(
+            defaultFont,
+            12.0f,
+            defaultStyle = ButtonStateStyle(
+                DefaultColors.white,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Solid(DefaultColors.red),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            ),
+            pressedStyle = ButtonStateStyle(
+                DefaultColors.white,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Solid(DefaultColors.maroon),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            ),
+            disabledStyle = ButtonStateStyle(
+                DefaultColors.black,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            )
+        )
+    }
+    val roundedButtonWithStroke by lazy {
+        ButtonStyle(
+            defaultFont,
+            12.0f,
+            defaultStyle = ButtonStateStyle(
+                DefaultColors.white,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Solid(DefaultColors.deepSkyBlue),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    BackgroundStyle.Shape.Rectangle(10.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))
+                )
+            ),
+            pressedStyle = ButtonStateStyle(
+                DefaultColors.azure,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightSkyBlue),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.azure),
+                    BackgroundStyle.Shape.Rectangle(5.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT))
+                )
+            ),
+            disabledStyle = ButtonStateStyle(
+                DefaultColors.black,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    BackgroundStyle.Shape.Rectangle(10.0f)
+                )
+            )
+        )
+    }
+    val ovalButtonWithStroke by lazy {
+        ButtonStyle(
+            defaultFont,
+            12.0f,
+            defaultStyle = ButtonStateStyle(
+                DefaultColors.white,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Solid(DefaultColors.deepSkyBlue),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    BackgroundStyle.Shape.Oval
+                )
+            ),
+            pressedStyle = ButtonStateStyle(
+                DefaultColors.azure,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightSkyBlue),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.azure),
+                    BackgroundStyle.Shape.Oval
+                )
+            ),
+            disabledStyle = ButtonStateStyle(
+                DefaultColors.black,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    BackgroundStyle.Shape.Oval
+                )
+            )
+        )
+    }
+
+    val linearGradientButton by lazy {
+        ButtonStyle(
+            defaultFont,
+            12.0f,
+            defaultStyle = ButtonStateStyle(
+                DefaultColors.white,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            ),
+            pressedStyle = ButtonStateStyle(
+                DefaultColors.azure,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            ),
+            disabledStyle = ButtonStateStyle(
+                DefaultColors.black,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.lightGray, DefaultColors.gray), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            )
+        )
+    }
+
+    val radialGradientButton by lazy {
+        ButtonStyle(
+            defaultFont,
+            12.0f,
+            defaultStyle = ButtonStateStyle(
+                DefaultColors.white,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), 50.0f, GradientStyle.CenterPoint(0.3f, 0.3f))),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            ),
+            pressedStyle = ButtonStateStyle(
+                DefaultColors.azure,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), 25.0f, GradientStyle.CenterPoint(0.6f, 0.6f))),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            ),
+            disabledStyle = ButtonStateStyle(
+                DefaultColors.black,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.lightGray, DefaultColors.gray), 50.0f)),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            )
+        )
+    }
+
+    val angularGradientButton by lazy {
+        ButtonStyle(
+            defaultFont,
+            12.0f,
+            defaultStyle = ButtonStateStyle(
+                DefaultColors.white,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), GradientStyle.CenterPoint(0.3f, 0.3f))),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            ),
+            pressedStyle = ButtonStateStyle(
+                DefaultColors.azure,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), GradientStyle.CenterPoint(0.6f, 0.6f))),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            ),
+            disabledStyle = ButtonStateStyle(
+                DefaultColors.black,
+                BackgroundStyle(
+                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.lightGray, DefaultColors.gray))),
+                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    BackgroundStyle.Shape.Rectangle()
+                )
+            )
+        )
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/stylable/TextStyles.kt b/newexample/shared/src/commonMain/kotlin/stylable/TextStyles.kt
new file mode 100644
index 000000000..b9d04f117
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/stylable/TextStyles.kt
@@ -0,0 +1,37 @@
+package com.splendo.kaluga.example.shared.stylable
+
+import com.splendo.kaluga.resources.DefaultColors
+import com.splendo.kaluga.resources.defaultBoldFont
+import com.splendo.kaluga.resources.defaultFont
+import com.splendo.kaluga.resources.defaultItalicFont
+import com.splendo.kaluga.resources.defaultMonospaceFont
+import com.splendo.kaluga.resources.stylable.TextAlignment
+import com.splendo.kaluga.resources.stylable.TextStyle
+
+object TextStyles {
+
+    val defaultText by lazy {
+        TextStyle(defaultFont, DefaultColors.dimGray, 12.0f)
+    }
+    val defaultTitle by lazy {
+        TextStyle(defaultFont, DefaultColors.dimGray, 16.0f)
+    }
+    val defaultBoldText by lazy {
+        TextStyle(defaultBoldFont, DefaultColors.dimGray, 12.0f)
+    }
+    val defaultItalicText by lazy {
+        TextStyle(defaultItalicFont, DefaultColors.dimGray, 12.0f)
+    }
+    val defaultMonospaceText by lazy {
+        TextStyle(defaultMonospaceFont, DefaultColors.dimGray, 12.0f)
+    }
+    val whiteText by lazy {
+        TextStyle(defaultFont, DefaultColors.white, 12.0f)
+    }
+    val redText by lazy {
+        TextStyle(defaultFont, DefaultColors.red, 12.0f)
+    }
+    val oppositeText by lazy {
+        TextStyle(defaultFont, DefaultColors.dimGray, 12.0f, TextAlignment.END)
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt
new file mode 100644
index 000000000..0d04f4d26
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt
@@ -0,0 +1,62 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.observable.toInitializedSubject
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+
+sealed class ExampleTabNavigation : NavigationAction<Nothing>(null) {
+
+    object FeatureList : ExampleTabNavigation()
+    object Info : ExampleTabNavigation()
+}
+
+class ExampleViewModel(navigator: Navigator<ExampleTabNavigation>) : NavigatingViewModel<ExampleTabNavigation>(navigator) {
+
+    sealed class Tab(val title: String) {
+        object FeatureList : Tab("Features")
+        object Info : Tab("About")
+    }
+
+    val tabs = observableOf(listOf(Tab.FeatureList, Tab.Info))
+
+    private val _tab = MutableStateFlow<Tab>(Tab.FeatureList)
+    val tab = _tab.toInitializedSubject(coroutineScope)
+
+    override fun onResume(scope: CoroutineScope) {
+        super.onResume(scope)
+        scope.launch(Dispatchers.Main.immediate) {
+            _tab.collect { currentTab ->
+                navigator.navigate(
+                    when (currentTab) {
+                        is Tab.FeatureList -> ExampleTabNavigation.FeatureList
+                        is Tab.Info -> ExampleTabNavigation.Info
+                    }
+                )
+            }
+        }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/alert/AlertViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/alert/AlertViewModel.kt
new file mode 100644
index 000000000..7f2d87d47
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/alert/AlertViewModel.kt
@@ -0,0 +1,96 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example.shared.alert
+
+import com.splendo.kaluga.alerts.Alert
+import com.splendo.kaluga.alerts.BaseAlertPresenter
+import com.splendo.kaluga.alerts.buildActionSheet
+import com.splendo.kaluga.alerts.buildAlert
+import com.splendo.kaluga.alerts.buildAlertWithInput
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.logging.debug
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+class AlertViewModel(val builder: BaseAlertPresenter.Builder) : BaseLifecycleViewModel() {
+
+    fun showAlert() {
+        coroutineScope.launch {
+            val okAction = Alert.Action("OK", Alert.Action.Style.POSITIVE)
+            val cancelAction = Alert.Action("Cancel", Alert.Action.Style.NEGATIVE)
+            val alert = builder.buildAlert(this) {
+                setTitle("Hello, Kaluga 🐟")
+                setMessage("This is sample message")
+                addActions(okAction, cancelAction)
+            }
+            when (alert.show()) {
+                okAction -> debug("OK pressed")
+                cancelAction -> debug("Cancel pressed")
+            }
+        }
+    }
+
+    fun showAndDismissAfter(timeSecs: Long) {
+        coroutineScope.launch {
+            val job = launch {
+                builder.buildAlert(coroutineScope) {
+                    setTitle("Wait for $timeSecs sec...")
+                    setPositiveButton("OK")
+                }.show()
+            }
+            launch {
+                delay(timeSecs * 1_000)
+                job.cancel()
+            }
+        }
+    }
+
+    fun showAlertWithInput() {
+        coroutineScope.launch {
+            val okAction = Alert.Action("OK", Alert.Action.Style.POSITIVE)
+            val cancelAction = Alert.Action("Cancel", Alert.Action.Style.NEGATIVE)
+            val alert = builder.buildAlertWithInput(this) {
+                setTitle("Hello, Kaluga 🐟")
+                setMessage("Type something!")
+                addActions(okAction, cancelAction)
+                setTextInput(placeholder = "This is a sample hint..") {
+                    debug("Input value changed to: $it")
+                }
+            }
+            when (alert.show()) {
+                okAction -> debug("OK pressed")
+                cancelAction -> debug("Cancel pressed")
+            }
+        }
+    }
+
+    fun showAlertWithList() {
+        coroutineScope.launch {
+            builder.buildActionSheet(this) {
+                setTitle("Select an option")
+                addActions(
+                    Alert.Action("Option 1") { debug("Option 1") },
+                    Alert.Action("Option 2") { debug("Option 2") },
+                    Alert.Action("Option 3") { debug("Option 3") },
+                    Alert.Action("Option 4") { debug("Option 4") }
+                )
+            }.show()
+        }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt
new file mode 100644
index 000000000..89e7ca1ad
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt
@@ -0,0 +1,57 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.architecture
+
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.InitializedObservable
+import com.splendo.kaluga.architecture.observable.subjectOf
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class InputDetails(
+    val name: String,
+    val number: Int
+)
+
+class CloseDetailsNavigation(inputDetails: InputDetails) : SingleValueNavigationAction<InputDetails>(
+    inputDetails,
+    NavigationBundleSpecType.SerializedType(InputDetails.serializer())
+)
+
+class ArchitectureDetailsViewModel(initialDetail: InputDetails, navigator: Navigator<CloseDetailsNavigation>) : NavigatingViewModel<CloseDetailsNavigation>(navigator) {
+
+    private val _name = subjectOf(initialDetail.name)
+    val name: InitializedObservable<String> = _name
+    private val _number = subjectOf(initialDetail.number.toString())
+    val number: InitializedObservable<String> = _number
+
+    private var nameResult: String by _name.valueDelegate
+    private var numberResult: String by _number.valueDelegate
+
+    fun onInversePressed() {
+        nameResult = nameResult.reversed()
+        numberResult = numberResult.reversed()
+    }
+
+    fun onClosePressed() {
+        navigator.navigate(CloseDetailsNavigation(InputDetails(nameResult, numberResult.toIntOrNull() ?: 0)))
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt
new file mode 100644
index 000000000..98dec51f7
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt
@@ -0,0 +1,85 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.architecture
+
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.ObservableOptional
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.observable.toInitializedSubject
+import com.splendo.kaluga.architecture.observable.toUninitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+class InputNavigation(inputDetails: InputDetails) : SingleValueNavigationAction<InputDetails>(
+    inputDetails,
+    NavigationBundleSpecType.SerializedType(InputDetails.serializer())
+)
+
+class ArchitectureInputViewModel(navigator: Navigator<SingleValueNavigationAction<InputDetails>>) : NavigatingViewModel<SingleValueNavigationAction<InputDetails>>(navigator) {
+
+    val nameHeader = observableOf("Enter your Name")
+    val numberHeader = observableOf("Enter a Number")
+
+    private val _nameInput = MutableStateFlow("")
+    val nameInput = _nameInput.toInitializedSubject(coroutineScope)
+
+    private val _numberInput = MutableStateFlow("")
+    val numberInput = _numberInput.toInitializedSubject(coroutineScope)
+
+    private val _isNameValid: Flow<Boolean> get() {
+        return _nameInput.map {
+            it.isNotEmpty()
+        }
+    }
+    val isNameValid = _isNameValid.toUninitializedObservable(coroutineScope)
+
+    private val _isNumberValid: Flow<Boolean> get() {
+        return _numberInput.map {
+            it.toIntOrNull() != null
+        }
+    }
+    val isNumberValid = _isNumberValid.toUninitializedObservable(coroutineScope)
+
+    private val isValid = combine(_isNameValid, _isNumberValid) {
+        validName, validNumber ->
+        validName && validNumber
+    }
+
+    fun onShowDetailsPressed() {
+        val nameResult: ObservableOptional<String> by nameInput
+        val name: String? by nameResult
+        val numberResult: ObservableOptional<String> by numberInput
+        val number: String? by numberResult
+        coroutineScope.launch {
+            if (isValid.first()) {
+                navigator.navigate(
+                    InputNavigation(
+                        InputDetails(name ?: "", number?.toIntOrNull() ?: 0)
+                    )
+                )
+            }
+        }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt
new file mode 100644
index 000000000..de8408407
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt
@@ -0,0 +1,47 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.beacons
+
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.base.text.format
+import com.splendo.kaluga.bluetooth.beacons.BeaconInfo
+import com.splendo.kaluga.bluetooth.beacons.Beacons
+import com.splendo.kaluga.bluetooth.beacons.get
+import com.splendo.kaluga.bluetooth.device.Identifier
+import com.splendo.kaluga.resources.localized
+import kotlinx.coroutines.flow.map
+
+class BeaconsListBeaconViewModel(identifier: Identifier, service: Beacons) : BaseLifecycleViewModel() {
+
+    private val beacon = service.beacons[identifier]
+
+    private fun <T> beaconInfoObservable(mapper: (BeaconInfo?) -> T) = beacon
+        .map { mapper(it) }
+        .toInitializedObservable(null, coroutineScope)
+
+    val namespace = beaconInfoObservable { it?.beaconID?.namespace ?: "" }
+    val instance = beaconInfoObservable { it?.beaconID?.instance ?: "" }
+    val txPower = beaconInfoObservable {
+        it?.txPower?.let { txPower ->
+            "txPower".localized().format(txPower)
+        } ?: ""
+    }
+
+    public override fun onCleared() = super.onCleared()
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
new file mode 100644
index 000000000..4f752265f
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
@@ -0,0 +1,76 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.beacons
+
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.bluetooth.beacons.Beacons
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+class BeaconsListViewModel(private val service: Beacons) : BaseLifecycleViewModel() {
+
+    private val _isScanning = MutableStateFlow(false)
+    val isScanning = _isScanning.toInitializedObservable(coroutineScope)
+
+    private val _beacons = MutableStateFlow<List<BeaconsListBeaconViewModel>>(emptyList())
+    val beacons = _beacons.toInitializedObservable(coroutineScope)
+
+    override fun onResume(scope: CoroutineScope) {
+        super.onResume(scope)
+
+        scope.launch {
+            service
+                .isMonitoring()
+                .collect { _isScanning.value = it }
+        }
+
+        scope.launch {
+            service.beacons
+                .map { beacons ->
+                    beacons.map { beacon ->
+                        BeaconsListBeaconViewModel(beacon.identifier, service)
+                    }
+                }
+                .collect { beacons ->
+                    cleanDevices()
+                    _beacons.value = beacons
+                }
+        }
+    }
+
+    fun onScanPressed() {
+        if (_isScanning.value) {
+            service.stopMonitoring()
+        } else {
+            service.startMonitoring(coroutineScope)
+        }
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        cleanDevices()
+    }
+
+    private fun cleanDevices() {
+        _beacons.value.forEach { it.onCleared() }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
new file mode 100644
index 000000000..9e7ee26a8
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
@@ -0,0 +1,75 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.bluetooth
+
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.observable.toUninitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.base.utils.toHexString
+import com.splendo.kaluga.bluetooth.Bluetooth
+import com.splendo.kaluga.bluetooth.Characteristic
+import com.splendo.kaluga.bluetooth.UUID
+import com.splendo.kaluga.bluetooth.characteristics
+import com.splendo.kaluga.bluetooth.descriptors
+import com.splendo.kaluga.bluetooth.device.Identifier
+import com.splendo.kaluga.bluetooth.get
+import com.splendo.kaluga.bluetooth.services
+import com.splendo.kaluga.bluetooth.uuidString
+import com.splendo.kaluga.bluetooth.value
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+class BluetoothCharacteristicViewModel(private val bluetooth: Bluetooth, private val deviceIdentifier: Identifier, private val serviceUUID: UUID, private val characteristicUUID: UUID) : BaseLifecycleViewModel() {
+
+    private val characteristic: Flow<Characteristic?> get() = bluetooth.devices()[deviceIdentifier].services()[serviceUUID].characteristics()[characteristicUUID]
+
+    val uuid = characteristicUUID.uuidString
+    val value = characteristic.value().map { it?.toHexString() ?: "" }.toUninitializedObservable(coroutineScope)
+
+    private val _descriptors = MutableStateFlow(emptyList<BluetoothDescriptorViewModel>())
+    val descriptors = _descriptors.toInitializedObservable(coroutineScope)
+
+    override fun onResume(scope: CoroutineScope) {
+        super.onResume(scope)
+
+        scope.launch { characteristic.flatMapLatest { characteristic -> characteristic?.let { flowOf(it) } ?: emptyFlow() }.first().readValue() }
+        scope.launch {
+            characteristic.descriptors().map { descriptors -> descriptors.map { BluetoothDescriptorViewModel(bluetooth, deviceIdentifier, serviceUUID, characteristicUUID, it.uuid) } }.collect {
+                clearDescriptors()
+                _descriptors.value = it
+            }
+        }
+    }
+
+    public override fun onCleared() {
+        super.onCleared()
+        clearDescriptors()
+    }
+
+    private fun clearDescriptors() {
+        _descriptors.value.forEach { it.onCleared() }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
new file mode 100644
index 000000000..513be4486
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
@@ -0,0 +1,60 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.bluetooth
+
+import com.splendo.kaluga.architecture.observable.toUninitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.base.utils.toHexString
+import com.splendo.kaluga.bluetooth.Bluetooth
+import com.splendo.kaluga.bluetooth.Descriptor
+import com.splendo.kaluga.bluetooth.UUID
+import com.splendo.kaluga.bluetooth.characteristics
+import com.splendo.kaluga.bluetooth.descriptors
+import com.splendo.kaluga.bluetooth.device.Identifier
+import com.splendo.kaluga.bluetooth.get
+import com.splendo.kaluga.bluetooth.services
+import com.splendo.kaluga.bluetooth.uuidString
+import com.splendo.kaluga.bluetooth.value
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+class BluetoothDescriptorViewModel(private val bluetooth: Bluetooth, private val deviceIdentifier: Identifier, private val serviceUUID: UUID, private val characteristicUUID: UUID, private val descriptorUUID: UUID) : BaseLifecycleViewModel() {
+
+    private val descriptor: Flow<Descriptor?> get() = bluetooth.devices()[deviceIdentifier].services()[serviceUUID].characteristics()[characteristicUUID].descriptors()[descriptorUUID]
+
+    val uuid = descriptorUUID.uuidString
+    val value = descriptor.value().map { it?.toHexString() ?: "" }.toUninitializedObservable(coroutineScope)
+
+    override fun onResume(scope: CoroutineScope) {
+        super.onResume(scope)
+
+        scope.launch {
+            descriptor.flatMapLatest { descriptor -> descriptor?.let { flowOf(it) } ?: emptyFlow() }.first().readValue()
+        }
+    }
+
+    public override fun onCleared() {
+        super.onCleared()
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
new file mode 100644
index 000000000..68a08b032
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
@@ -0,0 +1,107 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.bluetooth
+
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.observable.toUninitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.base.text.format
+import com.splendo.kaluga.bluetooth.Bluetooth
+import com.splendo.kaluga.bluetooth.device.ConnectableDeviceState
+import com.splendo.kaluga.bluetooth.device.NotConnectableDeviceState
+import com.splendo.kaluga.bluetooth.device.Identifier
+import com.splendo.kaluga.bluetooth.device.stringValue
+import com.splendo.kaluga.bluetooth.distance
+import com.splendo.kaluga.bluetooth.get
+import com.splendo.kaluga.bluetooth.info
+import com.splendo.kaluga.bluetooth.rssi
+import com.splendo.kaluga.bluetooth.services
+import com.splendo.kaluga.bluetooth.state
+import com.splendo.kaluga.bluetooth.updateRssi
+import com.splendo.kaluga.resources.localized
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+class DeviceDetailsSpec : NavigationBundleSpec<DeviceDetailsSpecRow<*>>(setOf(DeviceDetailsSpecRow.UUIDRow))
+
+sealed class DeviceDetailsSpecRow<V>(associatedType: NavigationBundleSpecType<V>) : NavigationBundleSpecRow<V>(associatedType) {
+    object UUIDRow : DeviceDetailsSpecRow<String>(NavigationBundleSpecType.StringType)
+}
+
+class BluetoothDeviceDetailViewModel(private val bluetooth: Bluetooth, private val identifier: Identifier) : BaseLifecycleViewModel() {
+
+    companion object {
+        private const val rssi_frequency = 1000L
+    }
+
+    private val device = bluetooth.devices()[identifier]
+
+    val name = device.info().map { it.name ?: "bluetooth_no_name".localized() }.toUninitializedObservable(coroutineScope)
+    val identifierString = identifier.stringValue
+    val rssi = device.rssi().map { "rssi".localized().format(it) }.toUninitializedObservable(coroutineScope)
+    val distance = device.distance().map { "distance".localized().format(it) }.toUninitializedObservable(coroutineScope)
+    val state = device.state().map { deviceState ->
+        when (deviceState) {
+            is NotConnectableDeviceState -> ""
+            is ConnectableDeviceState.Disconnecting -> "bluetooth_disconneting"
+            is ConnectableDeviceState.Disconnected -> "bluetooth_disconnected"
+            is ConnectableDeviceState.Connected.Discovering -> "bluetooth_discovering"
+            is ConnectableDeviceState.Connected -> "bluetooth_connected"
+            is ConnectableDeviceState.Connecting -> "bluetooth_connecting"
+            is ConnectableDeviceState.Reconnecting -> "bluetooth_reconnecting"
+        }.localized()
+    }.toUninitializedObservable(coroutineScope)
+    private val _services = MutableStateFlow(
+        emptyList<BluetoothServiceViewModel>()
+    )
+    val services = _services.toInitializedObservable(coroutineScope)
+
+    override fun onResume(scope: CoroutineScope) {
+        super.onResume(scope)
+
+        scope.launch {
+            device.services().map { services -> services.map { BluetoothServiceViewModel(bluetooth, identifier, it.uuid) } }.collect {
+                cleanServices()
+                _services.value = it
+            }
+        }
+
+        scope.launch {
+            while (true) {
+                device.updateRssi()
+                delay(rssi_frequency)
+            }
+        }
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        cleanServices()
+    }
+
+    private fun cleanServices() {
+        _services.value.forEach { it.onCleared() }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
new file mode 100644
index 000000000..f4d98b64a
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
@@ -0,0 +1,139 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.bluetooth
+
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.toBundle
+import com.splendo.kaluga.architecture.observable.UninitializedObservable
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.observable.toUninitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.base.text.format
+import com.splendo.kaluga.base.utils.toHexString
+import com.splendo.kaluga.bluetooth.Bluetooth
+import com.splendo.kaluga.bluetooth.UUID
+import com.splendo.kaluga.bluetooth.connect
+import com.splendo.kaluga.bluetooth.advertisement
+import com.splendo.kaluga.bluetooth.device.BaseAdvertisementData
+import com.splendo.kaluga.bluetooth.device.DeviceState
+import com.splendo.kaluga.bluetooth.device.ConnectableDeviceState
+import com.splendo.kaluga.bluetooth.device.NotConnectableDeviceState
+import com.splendo.kaluga.bluetooth.device.Identifier
+import com.splendo.kaluga.bluetooth.device.stringValue
+import com.splendo.kaluga.bluetooth.disconnect
+import com.splendo.kaluga.bluetooth.get
+import com.splendo.kaluga.bluetooth.rssi
+import com.splendo.kaluga.bluetooth.state
+import com.splendo.kaluga.resources.localized
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+class BluetoothListDeviceViewModel(private val identifier: Identifier, bluetooth: Bluetooth, navigator: Navigator<BluetoothListNavigation>) : NavigatingViewModel<BluetoothListNavigation>(navigator) {
+
+    enum class ConnectButtonState {
+        Connect,
+        Disconnect
+    }
+
+    private val device = bluetooth.devices()[identifier]
+
+    val name = advertisementObservable { it.name ?: "bluetooth_no_name".localized() }
+    val identifierString = identifier.stringValue
+    val rssi = device.rssi().map { "rssi".localized().format(it) }.toUninitializedObservable(coroutineScope)
+    val isTxPowerVisible = advertisementObservable { it.txPowerLevel != Int.MIN_VALUE }
+    val txPower = advertisementObservable { if (it.txPowerLevel != Int.MIN_VALUE) "txPower".localized().format(it.txPowerLevel) else "" }
+
+    val isConnectButtonVisible = deviceStateObservable { it !is NotConnectableDeviceState }
+    val connectButtonState = deviceStateObservable {
+        when (it) {
+            is ConnectableDeviceState.Disconnected, is ConnectableDeviceState.Disconnecting -> ConnectButtonState.Connect
+            else -> ConnectButtonState.Disconnect
+        }
+    }
+    val isMoreButtonVisible = deviceStateObservable { it is ConnectableDeviceState.Connected }
+
+    val status = deviceStateObservable {
+        when (it) {
+            is NotConnectableDeviceState -> ""
+            is ConnectableDeviceState.Disconnecting -> "bluetooth_disconneting"
+            is ConnectableDeviceState.Disconnected -> "bluetooth_disconnected"
+            is ConnectableDeviceState.Connected -> "bluetooth_connected"
+            is ConnectableDeviceState.Connecting -> "bluetooth_connecting"
+            is ConnectableDeviceState.Reconnecting -> "bluetooth_reconnecting"
+        }.localized()
+    }
+    val serviceUUIDs = advertisementObservable { parseServiceUUIDs(it.serviceUUIDs) }
+    val serviceData = advertisementObservable { parseServiceData(it.serviceData) }
+    val manufacturerId = advertisementObservable { "bluetooth_manufacturer_id".localized().format(it.manufacturerId ?: -1) }
+    val manufacturerData = advertisementObservable { "bluetooth_manufacturer_data".localized().format(it.manufacturerData?.toHexString() ?: "") }
+
+    val _isFoldedOut = MutableStateFlow(false)
+    val isFoldedOut = _isFoldedOut.toInitializedObservable(coroutineScope)
+
+    private fun <T> deviceStateObservable(mapper: (DeviceState) -> T): UninitializedObservable<T> = device.state().map { mapper(it) }.toUninitializedObservable(coroutineScope)
+    private fun <T> advertisementObservable(mapper: (BaseAdvertisementData) -> T): UninitializedObservable<T> = device.advertisement().map { mapper(it) }.toUninitializedObservable(coroutineScope)
+
+    fun toggleFoldOut() = coroutineScope.launch {
+        _isFoldedOut.value = !_isFoldedOut.value
+    }
+
+    fun onConnectPressed() = coroutineScope.launch {
+        device.connect()
+    }
+
+    fun onDisconnectPressed() = coroutineScope.launch {
+        device.disconnect()
+    }
+
+    fun onMorePressed() =
+        navigator.navigate(
+            BluetoothListNavigation(
+                DeviceDetailsSpec().toBundle { specRow ->
+                    when (specRow) {
+                        is DeviceDetailsSpecRow.UUIDRow -> specRow.convertValue(identifier.stringValue)
+                    }
+                }
+            )
+        )
+
+    private fun parseServiceUUIDs(uuids: List<UUID>): String {
+        val uuidString = uuids.fold("") { result, next ->
+            if (result.isEmpty())
+                next.toString()
+            else
+                "$result, $next"
+        }
+        return "bluetooth_service_uuids".localized().format(uuidString)
+    }
+
+    private fun parseServiceData(data: Map<UUID, ByteArray?>): String {
+        val dataString = data.entries.fold("") { result, next ->
+            val nextString = "${next.key}: ${next.value?.toHexString() ?: ""}"
+            if (result.isEmpty())
+                nextString
+            else
+                "$result\n$nextString"
+        }
+        return "bluetooth_service_data".localized().format(dataString)
+    }
+
+    public override fun onCleared() {
+        super.onCleared()
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
new file mode 100644
index 000000000..3f87cdc8c
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
@@ -0,0 +1,75 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.bluetooth
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.NavigationBundle
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.bluetooth.Bluetooth
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.launch
+
+class BluetoothListNavigation(bundle: NavigationBundle<DeviceDetailsSpecRow<*>>) : NavigationAction<DeviceDetailsSpecRow<*>>(bundle)
+
+class BluetoothListViewModel(private val bluetooth: Bluetooth, navigator: Navigator<BluetoothListNavigation>) : NavigatingViewModel<BluetoothListNavigation>(navigator) {
+
+    private val _isScanning = MutableStateFlow(false)
+    val isScanning = _isScanning.toInitializedObservable(coroutineScope)
+
+    val title = bluetooth.isEnabled
+        .mapLatest { if (it) "Enabled" else "Disabled" }
+        .toInitializedObservable("Initializing...", coroutineScope)
+
+    private val _devices = MutableStateFlow(emptyList<BluetoothListDeviceViewModel>())
+    val devices = _devices.toInitializedObservable(coroutineScope)
+
+    override fun onResume(scope: CoroutineScope) {
+        super.onResume(scope)
+
+        scope.launch { bluetooth.isScanning().collect { _isScanning.value = it } }
+        scope.launch {
+            bluetooth.devices().map { devices -> devices.map { BluetoothListDeviceViewModel(it.identifier, bluetooth, navigator) } }.collect { devices ->
+                cleanDevices()
+                _devices.value = devices.sortedByDescending { it.name.currentOrNull }
+            }
+        }
+    }
+
+    fun onScanPressed() {
+        if (_isScanning.value) {
+            bluetooth.stopScanning()
+        } else {
+            bluetooth.startScanning()
+        }
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        cleanDevices()
+    }
+
+    private fun cleanDevices() {
+        _devices.value.forEach { it.onCleared() }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt
new file mode 100644
index 000000000..ec7e7bb66
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt
@@ -0,0 +1,64 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.bluetooth
+
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.bluetooth.Bluetooth
+import com.splendo.kaluga.bluetooth.Service
+import com.splendo.kaluga.bluetooth.UUID
+import com.splendo.kaluga.bluetooth.characteristics
+import com.splendo.kaluga.bluetooth.device.Identifier
+import com.splendo.kaluga.bluetooth.get
+import com.splendo.kaluga.bluetooth.services
+import com.splendo.kaluga.bluetooth.uuidString
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+class BluetoothServiceViewModel(private val bluetooth: Bluetooth, private val deviceIdentifier: Identifier, private val serviceUUID: UUID) : BaseLifecycleViewModel() {
+
+    private val service: Flow<Service?> get() = bluetooth.devices()[deviceIdentifier].services()[serviceUUID]
+
+    val uuid = serviceUUID.uuidString
+    private val _characteristics = MutableStateFlow(emptyList<BluetoothCharacteristicViewModel>())
+    val characteristics = _characteristics.toInitializedObservable(coroutineScope)
+
+    override fun onResume(scope: CoroutineScope) {
+        super.onResume(scope)
+
+        scope.launch {
+            service.characteristics().map { characteristics -> characteristics.map { BluetoothCharacteristicViewModel(bluetooth, deviceIdentifier, serviceUUID, it.uuid) } }.collect {
+                cleanCharacteristics()
+                _characteristics.value = it
+            }
+        }
+    }
+
+    public override fun onCleared() {
+        super.onCleared()
+        cleanCharacteristics()
+    }
+
+    private fun cleanCharacteristics() {
+        _characteristics.value.forEach { it.onCleared() }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/datetimepicker/DateTimePickerViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/datetimepicker/DateTimePickerViewModel.kt
new file mode 100644
index 000000000..0a72e95f4
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/datetimepicker/DateTimePickerViewModel.kt
@@ -0,0 +1,57 @@
+package com.splendo.kaluga.example.shared.viewmodel.datetimepicker
+
+import com.splendo.kaluga.architecture.observable.toUninitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.base.text.DateFormatStyle
+import com.splendo.kaluga.base.text.KalugaDateFormatter
+import com.splendo.kaluga.base.utils.DefaultKalugaDate
+import com.splendo.kaluga.datetimepicker.DateTimePickerPresenter
+import com.splendo.kaluga.datetimepicker.buildDatePicker
+import com.splendo.kaluga.datetimepicker.buildTimePicker
+import com.splendo.kaluga.resources.localized
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+class DateTimePickerViewModel(val dateTimePickerPresenterBuilder: DateTimePickerPresenter.Builder) : BaseLifecycleViewModel() {
+
+    companion object {
+        private val formatter = KalugaDateFormatter.dateTimeFormat(DateFormatStyle.Long, DateFormatStyle.Long)
+    }
+
+    private val selectedDate = MutableStateFlow(
+        DefaultKalugaDate.now().apply {
+            second = 0
+            millisecond = 0
+        }
+    )
+    val dateLabel = selectedDate.map { formatter.format(it) }.toUninitializedObservable(coroutineScope)
+
+    fun onSelectDatePressed() {
+        coroutineScope.launch {
+            dateTimePickerPresenterBuilder.buildDatePicker(
+                this,
+                DefaultKalugaDate.epoch(),
+                DefaultKalugaDate.now()
+            ) {
+                setSelectedDate(this@DateTimePickerViewModel.selectedDate.value)
+                setCancelButtonTitle("cancel_selection".localized())
+                setConfirmButtonTitle("confirm_selection".localized())
+            }.show()?.let {
+                selectedDate.value = it
+            }
+        }
+    }
+
+    fun onSelectTimePressed() {
+        coroutineScope.launch {
+            dateTimePickerPresenterBuilder.buildTimePicker(this) {
+                setSelectedDate(this@DateTimePickerViewModel.selectedDate.value)
+                setCancelButtonTitle("cancel_selection".localized())
+                setConfirmButtonTitle("confirm_selection".localized())
+            }.show()?.let {
+                selectedDate.value = it
+            }
+        }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt
new file mode 100644
index 000000000..08f4211b8
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt
@@ -0,0 +1,97 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.featureList
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+
+sealed class FeatureListNavigationAction : NavigationAction<Nothing>(null) {
+    object Location : FeatureListNavigationAction()
+    object Permissions : FeatureListNavigationAction()
+    object Alerts : FeatureListNavigationAction()
+    object DateTimePicker : FeatureListNavigationAction()
+    object LoadingIndicator : FeatureListNavigationAction()
+    object Architecture : FeatureListNavigationAction()
+    object Bluetooth : FeatureListNavigationAction()
+    object Keyboard : FeatureListNavigationAction()
+    object Links : FeatureListNavigationAction()
+    object System : FeatureListNavigationAction()
+    object Beacons : FeatureListNavigationAction()
+    object Resources : FeatureListNavigationAction()
+    object PlatformSpecific : FeatureListNavigationAction()
+}
+
+sealed class Feature(val title: String) {
+    object Alerts : Feature("feature_alerts".localized())
+    object Architecture : Feature("feature_architecture".localized())
+    object Bluetooth : Feature("feature_bluetooth".localized())
+    object DateTimePicker : Feature("feature_date_time_picker".localized())
+    object Keyboard : Feature("feature_keyboard".localized())
+    object LoadingIndicator : Feature("feature_hud".localized())
+    object Location : Feature("feature_location".localized())
+    object Permissions : Feature("feature_permissions".localized())
+    object Links : Feature("feature_links".localized())
+    object System : Feature("feature_system".localized())
+    object Beacons : Feature("feature_beacons".localized())
+    object Resource : Feature("feature_resources".localized())
+    object PlatformSpecific : Feature("feature_platform_specific".localized())
+}
+
+class FeatureListViewModel(navigator: Navigator<FeatureListNavigationAction>) : NavigatingViewModel<FeatureListNavigationAction>(navigator) {
+
+    val feature = observableOf(
+        listOfNotNull(
+            Feature.Alerts,
+            Feature.Architecture,
+            Feature.Bluetooth,
+            Feature.DateTimePicker,
+            Feature.Keyboard,
+            Feature.Links,
+            Feature.LoadingIndicator,
+            Feature.Location,
+            Feature.Permissions,
+            Feature.System,
+            Feature.Beacons,
+            Feature.Resource,
+            Feature.PlatformSpecific.takeIf { showPlatformSpecificFeatures }
+        )
+    )
+
+    fun onFeaturePressed(feature: Feature) {
+        navigator.navigate(
+            when (feature) {
+                is Feature.Alerts -> FeatureListNavigationAction.Alerts
+                is Feature.Architecture -> FeatureListNavigationAction.Architecture
+                is Feature.Bluetooth -> FeatureListNavigationAction.Bluetooth
+                is Feature.DateTimePicker -> FeatureListNavigationAction.DateTimePicker
+                is Feature.Keyboard -> FeatureListNavigationAction.Keyboard
+                is Feature.Links -> FeatureListNavigationAction.Links
+                is Feature.LoadingIndicator -> FeatureListNavigationAction.LoadingIndicator
+                is Feature.Location -> FeatureListNavigationAction.Location
+                is Feature.Permissions -> FeatureListNavigationAction.Permissions
+                is Feature.System -> FeatureListNavigationAction.System
+                is Feature.Beacons -> FeatureListNavigationAction.Beacons
+                is Feature.Resource -> FeatureListNavigationAction.Resources
+                is Feature.PlatformSpecific -> FeatureListNavigationAction.PlatformSpecific
+            }
+        )
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt
new file mode 100644
index 000000000..3852fd997
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt
@@ -0,0 +1,20 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.featureList
+
+expect val showPlatformSpecificFeatures: Boolean
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/hud/HudViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/hud/HudViewModel.kt
new file mode 100644
index 000000000..050efb091
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/hud/HudViewModel.kt
@@ -0,0 +1,51 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example.shared.hud
+
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.hud.BaseHUD
+import com.splendo.kaluga.hud.HUDStyle
+import com.splendo.kaluga.hud.build
+import com.splendo.kaluga.hud.dismissAfter
+import com.splendo.kaluga.hud.presentDuring
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+class HudViewModel(val builder: BaseHUD.Builder) : BaseLifecycleViewModel() {
+
+    fun onShowSystemPressed() {
+        // SYSTEM style by default
+        // No title by default
+        coroutineScope.launch {
+            builder.build(this).present().dismissAfter(3_000)
+        }
+    }
+
+    fun onShowCustomPressed() {
+        coroutineScope.launch {
+            builder.build(this) {
+                setStyle(HUDStyle.CUSTOM)
+                setTitle("This is a custom title")
+            }.presentDuring {
+                // Simulate heavy task
+                delay(3_000)
+            }
+        }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt
new file mode 100644
index 000000000..843592790
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt
@@ -0,0 +1,115 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.info
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.NavigationBundle
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.toBundle
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.review.ReviewManager
+import kotlinx.coroutines.launch
+
+class DialogSpec : NavigationBundleSpec<DialogSpecRow>(setOf(DialogSpecRow.TitleRow, DialogSpecRow.MessageRow))
+
+sealed class DialogSpecRow : NavigationBundleSpecRow<String>(NavigationBundleSpecType.StringType) {
+    object TitleRow : DialogSpecRow()
+    object MessageRow : DialogSpecRow()
+}
+
+class LinkSpec : NavigationBundleSpec<LinkSpecRow>(setOf(LinkSpecRow.LinkRow))
+
+sealed class LinkSpecRow : NavigationBundleSpecRow<String>(NavigationBundleSpecType.StringType) {
+    object LinkRow : LinkSpecRow()
+}
+
+class MailSpec : NavigationBundleSpec<MailSpecRow<*>>(setOf(MailSpecRow.ToRow, MailSpecRow.SubjectRow))
+
+sealed class MailSpecRow<V>(associatedType: NavigationBundleSpecType<V>) : NavigationBundleSpecRow<V>(associatedType) {
+    object ToRow : MailSpecRow<List<String>>(NavigationBundleSpecType.StringArrayType)
+    object SubjectRow : MailSpecRow<String>(NavigationBundleSpecType.StringType)
+}
+
+sealed class InfoNavigation<B : NavigationBundleSpecRow<*>>(bundle: NavigationBundle<B>) : NavigationAction<B>(bundle) {
+
+    class Dialog(bundle: NavigationBundle<DialogSpecRow>) : InfoNavigation<DialogSpecRow>(bundle)
+    class Link(bundle: NavigationBundle<LinkSpecRow>) : InfoNavigation<LinkSpecRow>(bundle)
+    class Mail(bundle: NavigationBundle<MailSpecRow<*>>) : InfoNavigation<MailSpecRow<*>>(bundle)
+}
+
+class InfoViewModel(
+    val reviewManagerBuilder: ReviewManager.Builder,
+    navigator: Navigator<InfoNavigation<*>>
+) : NavigatingViewModel<InfoNavigation<*>>(navigator) {
+
+    sealed class Button(val title: String) {
+        object About : Button("About")
+        object Website : Button("Kaluga.io")
+        object GitHub : Button("GitHub")
+        object Mail : Button("Contact")
+        object Review : Button("Review")
+    }
+
+    val reviewManager = reviewManagerBuilder.create()
+    val buttons = observableOf(listOf(Button.About, Button.Website, Button.GitHub, Button.Review, Button.Mail))
+
+    fun onButtonPressed(button: Button) {
+        when (button) {
+            is Button.About -> InfoNavigation.Dialog(
+                DialogSpec().toBundle { row ->
+                    when (row) {
+                        is DialogSpecRow.TitleRow -> row.convertValue("About Us")
+                        is DialogSpecRow.MessageRow -> row.convertValue("Kaluga is developed by Splendo Consulting BV")
+                    }
+                }
+            )
+            is Button.Website -> InfoNavigation.Link(
+                LinkSpec().toBundle { row ->
+                    when (row) {
+                        is LinkSpecRow.LinkRow -> row.convertValue("https://kaluga.splendo.com")
+                    }
+                }
+            )
+            is Button.GitHub -> InfoNavigation.Link(
+                LinkSpec().toBundle { row ->
+                    when (row) {
+                        is LinkSpecRow.LinkRow -> row.convertValue("https://github.com/splendo/kaluga")
+                    }
+                }
+            )
+            is Button.Mail -> InfoNavigation.Mail(
+                MailSpec().toBundle { row ->
+                    when (row) {
+                        is MailSpecRow.ToRow -> row.convertValue(listOf("info@splendo.com"))
+                        is MailSpecRow.SubjectRow -> row.convertValue("Question about Kaluga")
+                    }
+                }
+            )
+            is Button.Review -> {
+                coroutineScope.launch {
+                    reviewManager.attemptToRequestReview()
+                }
+                null
+            }
+        }?.let { navigator.navigate(it) }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt
new file mode 100644
index 000000000..c177e9aa4
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt
@@ -0,0 +1,35 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.keyboard
+
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.keyboard.BaseKeyboardManager
+import com.splendo.kaluga.keyboard.FocusHandler
+
+class KeyboardViewModel(keyboardManagerBuilder: BaseKeyboardManager.Builder, private val editFieldFocusHandler: FocusHandler) : BaseLifecycleViewModel() {
+
+    private val keyboardManager: BaseKeyboardManager = keyboardManagerBuilder.create(coroutineScope)
+
+    fun onShowPressed() {
+        keyboardManager.show(editFieldFocusHandler)
+    }
+
+    fun onHidePressed() {
+        keyboardManager.hide()
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt
new file mode 100644
index 000000000..f11a4c15c
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt
@@ -0,0 +1,115 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.link
+
+import com.splendo.kaluga.alerts.Alert
+import com.splendo.kaluga.alerts.AlertPresenter
+import com.splendo.kaluga.alerts.buildAlert
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.NavigationBundle
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.toBundle
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.links.LinksBuilder
+import com.splendo.kaluga.resources.localized
+import kotlinx.coroutines.launch
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Repository(
+    val name: String,
+    val type: String
+)
+
+class BrowserSpec : NavigationBundleSpec<BrowserSpecRow>(setOf(BrowserSpecRow.UrlSpecRow))
+
+sealed class BrowserNavigationActions<B : NavigationBundleSpecRow<*>>(bundle: NavigationBundle<B>?) : NavigationAction<B>(bundle) {
+    class OpenWebView(bundle: NavigationBundle<BrowserSpecRow>?) : BrowserNavigationActions<BrowserSpecRow>(bundle)
+}
+
+sealed class BrowserSpecRow : NavigationBundleSpecRow<String>(NavigationBundleSpecType.StringType) {
+    object UrlSpecRow : BrowserSpecRow()
+}
+
+class LinksViewModel(
+    linkRepoBuilder: LinksBuilder,
+    val builder: AlertPresenter.Builder,
+    navigator: Navigator<BrowserNavigationActions<BrowserSpecRow>>
+) : NavigatingViewModel<BrowserNavigationActions<BrowserSpecRow>>(navigator) {
+
+    val browserButtonText = observableOf("browser_button_text".localized())
+    val linksInstructions = observableOf("links_instructions".localized())
+
+    private val linksRepo = linkRepoBuilder.create()
+
+    fun showAlert(title: String, message: String, style: Alert.Action.Style) {
+        coroutineScope.launch {
+            val action = Alert.Action("Ok", style)
+            val alert = builder.buildAlert(this) {
+                setTitle(title)
+                setMessage(message)
+                addActions(action)
+            }
+            alert.show()
+        }
+    }
+
+    fun openWebPage() {
+        val result = linksRepo.validateLink("https://kaluga-links.web.app")
+        if (result != null) {
+            navigator.navigate(
+                BrowserNavigationActions.OpenWebView(
+                    BrowserSpec().toBundle { row ->
+                        when (row) {
+                            is BrowserSpecRow.UrlSpecRow -> row.convertValue(
+                                result
+                            )
+                        }
+                    }
+                )
+            )
+        } else {
+            showAlert(
+                "Error Alert",
+                "URL is invalid.",
+                Alert.Action.Style.NEGATIVE
+            )
+        }
+    }
+
+    fun handleIncomingLink(url: String) {
+        val result = linksRepo.handleIncomingLink(url, Repository.serializer())
+        if (result != null) {
+            showAlert(
+                "Alert",
+                result.toString(),
+                Alert.Action.Style.POSITIVE
+            )
+        } else {
+            showAlert(
+                "Error Alert",
+                "Query is invalid or empty.",
+                Alert.Action.Style.NEGATIVE
+            )
+        }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt
new file mode 100644
index 000000000..936f18a68
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt
@@ -0,0 +1,61 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.location
+
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.location.Location
+import com.splendo.kaluga.location.LocationStateRepoBuilder
+import com.splendo.kaluga.location.location
+import com.splendo.kaluga.permissions.location.LocationPermission
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+class LocationViewModel(permission: LocationPermission, repoBuilder: LocationStateRepoBuilder) : BaseLifecycleViewModel() {
+
+    private val locationStateRepo = repoBuilder.create(permission)
+
+    private val _location = MutableStateFlow("")
+    val location = _location.toInitializedObservable(coroutineScope)
+
+    override fun onResume(scope: CoroutineScope) {
+        scope.launch {
+            locationStateRepo.location().map { location ->
+                when (location) {
+                    is Location.KnownLocation -> "${location.latitudeDMS} ${location.longitudeDMS}"
+                    is Location.UnknownLocation -> {
+                        val lastKnownLocation = (location as? Location.UnknownLocation.WithLastLocation)?.let {
+                            " Last Known Location: ${location.lastKnownLocation.latitudeDMS} ${location.lastKnownLocation.longitudeDMS}"
+                        }
+
+                        "Unknown Location. Reason: ${location.reason.name}${ lastKnownLocation ?: "" }"
+                    }
+                }
+            }.collect {
+                _location.value = it
+            }
+        }
+    }
+
+    public override fun onCleared() {
+        super.onCleared()
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
new file mode 100644
index 000000000..4f799c3d7
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
@@ -0,0 +1,61 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.permissions
+
+import com.splendo.kaluga.architecture.observable.InitializedObservable
+import com.splendo.kaluga.architecture.observable.UninitializedObservable
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.observable.toUninitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.permissions.base.Permission
+import com.splendo.kaluga.permissions.base.PermissionState
+import com.splendo.kaluga.permissions.base.Permissions
+import com.splendo.kaluga.resources.localized
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+class PermissionViewModel(private val permissions: Permissions, private val permission: Permission) : BaseLifecycleViewModel() {
+
+    val permissionStateMessage: UninitializedObservable<String> = permissions[permission]
+        .map { permissionState ->
+            when (permissionState) {
+                is PermissionState.Allowed -> "permission_allowed".localized()
+                is PermissionState.Denied.Requestable -> "permission_requestable".localized()
+                is PermissionState.Denied.Locked -> "permission_denied".localized()
+                is PermissionState.Initializing,
+                is PermissionState.Deinitialized,
+                is PermissionState.Uninitialized -> "permission_unknown".localized()
+            }
+        }
+        .toUninitializedObservable(coroutineScope)
+
+    val showPermissionButton: UninitializedObservable<Boolean> = permissions[permission]
+        .map { permissionState -> permissionState is PermissionState.Denied.Requestable }
+        .toUninitializedObservable(coroutineScope)
+
+    private val _requestMessage = MutableSharedFlow<String?>(0)
+    val requestMessage: InitializedObservable<String?> = _requestMessage.toInitializedObservable(null, coroutineScope)
+
+    fun requestPermission() {
+        coroutineScope.launch {
+            _requestMessage.emit((if (permissions.request(permission)) "permission_request_success" else "permission_request_failed").localized())
+            _requestMessage.emit(null)
+        }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
new file mode 100644
index 000000000..baf3c65b7
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
@@ -0,0 +1,66 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.permissions
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.toBundle
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class PermissionView(val title: String) {
+    Bluetooth("permissions_bluetooth".localized()),
+    Calendar("permissions_calendar".localized()),
+    Camera("permissions_camera".localized()),
+    Contacts("permissions_contacts".localized()),
+    Location("permissions_location".localized()),
+    Microphone("permissions_microphone".localized()),
+    Notifications("permissions_notifications".localized()),
+    Storage("permissions_storage".localized())
+}
+
+object PermissionNavigationBundleSpecRow : NavigationBundleSpecRow<PermissionView>(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))
+class PermissionNavigationBundleSpec : NavigationBundleSpec<PermissionNavigationBundleSpecRow>(setOf(PermissionNavigationBundleSpecRow))
+
+class PermissionsListNavigationAction(permissionView: PermissionView) : NavigationAction<PermissionNavigationBundleSpecRow>(PermissionNavigationBundleSpec().toBundle { spec -> spec.convertValue(permissionView) })
+
+class PermissionsListViewModel(navigator: Navigator<PermissionsListNavigationAction>) : NavigatingViewModel<PermissionsListNavigationAction>(navigator) {
+
+    val permissions = observableOf(
+        listOf(
+            PermissionView.Bluetooth,
+            PermissionView.Calendar,
+            PermissionView.Camera,
+            PermissionView.Contacts,
+            PermissionView.Location,
+            PermissionView.Microphone,
+            PermissionView.Notifications,
+            PermissionView.Storage
+        )
+    )
+
+    fun onPermissionPressed(permissionView: PermissionView) {
+        navigator.navigate(PermissionsListNavigationAction(permissionView))
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt
new file mode 100644
index 000000000..82651eee9
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt
@@ -0,0 +1,86 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.resources
+
+import com.splendo.kaluga.alerts.AlertPresenter
+import com.splendo.kaluga.alerts.buildAlert
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
+import com.splendo.kaluga.resources.StringStyleAttribute
+import com.splendo.kaluga.resources.StyledStringBuilder
+import com.splendo.kaluga.resources.stylable.ButtonStyle
+import com.splendo.kaluga.resources.styled
+import com.splendo.kaluga.resources.view.KalugaButton
+import kotlinx.coroutines.launch
+
+class ButtonViewModel(
+    styledStringBuilderProvider: StyledStringBuilder.Provider,
+    val alertPresenterBuilder: AlertPresenter.Builder
+) : BaseLifecycleViewModel() {
+
+    val buttons = observableOf(
+        listOf(
+            "Text Button".toButton(ButtonStyles.textButton),
+            "Red Button".toButton(ButtonStyles.redButton),
+            "Rounded Button".toButton(ButtonStyles.roundedButton),
+            "Oval Button".toButton(ButtonStyles.ovalButton),
+            "Stroke Button".toButton(ButtonStyles.redButtonWithStroke),
+            "Rounded Stroke Button".toButton(ButtonStyles.roundedButtonWithStroke),
+            "Oval Stroke Button".toButton(ButtonStyles.ovalButtonWithStroke),
+            "Linear Gradient Button".toButton(ButtonStyles.linearGradientButton),
+            "Radial Gradient Button".toButton(ButtonStyles.radialGradientButton),
+            "Angular Gradient Button".toButton(ButtonStyles.angularGradientButton),
+            "Disabled Button".toButton(ButtonStyles.redButton, false),
+            listOf(
+                KalugaButton.Styled(
+                    "Styled Button".styled(
+                        styledStringBuilderProvider,
+                        ButtonStyles.textButton.getStateTextStyle(
+                            isEnabled = true,
+                            isPressed = false
+                        ),
+                        StringStyleAttribute.CharacterStyleAttribute.Strikethrough
+                    ),
+                    ButtonStyles.textButton
+                ) {
+                    showAlert("Styled Button")
+                }
+            )
+        ).flatten()
+    )
+
+    private fun showAlert(message: String) {
+        coroutineScope.launch {
+            alertPresenterBuilder.buildAlert(this) {
+                setTitle("Button Pressed")
+                setMessage(message)
+                setNeutralButton("Ok")
+            }.show()
+        }
+    }
+
+    private fun String.toButton(
+        style: ButtonStyle,
+        isEnabled: Boolean = true
+    ): List<KalugaButton.Plain> = listOf(
+        KalugaButton.Plain(this, style, isEnabled) {
+            showAlert(this)
+        }
+    )
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt
new file mode 100644
index 000000000..bf184ac0f
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt
@@ -0,0 +1,192 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.resources
+
+import com.splendo.kaluga.alerts.Alert
+import com.splendo.kaluga.alerts.AlertPresenter
+import com.splendo.kaluga.alerts.buildActionSheet
+import com.splendo.kaluga.alerts.buildAlert
+import com.splendo.kaluga.architecture.observable.InitializedObservable
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
+import com.splendo.kaluga.resources.DefaultColors
+import com.splendo.kaluga.resources.KalugaColor
+import com.splendo.kaluga.resources.burn
+import com.splendo.kaluga.resources.colorBlend
+import com.splendo.kaluga.resources.colorFrom
+import com.splendo.kaluga.resources.darken
+import com.splendo.kaluga.resources.darkenBy
+import com.splendo.kaluga.resources.difference
+import com.splendo.kaluga.resources.dodge
+import com.splendo.kaluga.resources.exclude
+import com.splendo.kaluga.resources.hardLight
+import com.splendo.kaluga.resources.hexString
+import com.splendo.kaluga.resources.hue
+import com.splendo.kaluga.resources.lighten
+import com.splendo.kaluga.resources.lightenBy
+import com.splendo.kaluga.resources.luminate
+import com.splendo.kaluga.resources.multiply
+import com.splendo.kaluga.resources.normal
+import com.splendo.kaluga.resources.overlay
+import com.splendo.kaluga.resources.saturate
+import com.splendo.kaluga.resources.screen
+import com.splendo.kaluga.resources.softLight
+import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.view.KalugaButton
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+enum class SelectableBlendMode {
+    NORMAL,
+    MULTIPLY,
+    SCREEN,
+    OVERLAY,
+    DARKEN,
+    LIGHTEN,
+    HARD_LIGHT,
+    SOFT_LIGHT,
+    DODGE,
+    BURN,
+    DIFFERENCE,
+    EXCLUSION,
+    HUE,
+    SATURATION,
+    LUMINATE,
+    COLOR_BLEND;
+}
+
+class ColorViewModel(
+    val alertPresenterBuilder: AlertPresenter.Builder
+) : BaseLifecycleViewModel() {
+
+    private val backdropColor = MutableStateFlow(DefaultColors.mediumPurple)
+    private val sourceColor = MutableStateFlow(DefaultColors.darkCyan)
+    private val blendMode = MutableStateFlow(SelectableBlendMode.NORMAL)
+    private val blendedColor = combine(backdropColor, sourceColor, blendMode) { backdrop, source, blendMode ->
+        when (blendMode) {
+            SelectableBlendMode.NORMAL -> backdrop normal source
+            SelectableBlendMode.MULTIPLY -> backdrop multiply source
+            SelectableBlendMode.SCREEN -> backdrop screen source
+            SelectableBlendMode.OVERLAY -> backdrop overlay source
+            SelectableBlendMode.DARKEN -> backdrop darken source
+            SelectableBlendMode.LIGHTEN -> backdrop lighten source
+            SelectableBlendMode.HARD_LIGHT -> backdrop hardLight source
+            SelectableBlendMode.SOFT_LIGHT -> backdrop softLight source
+            SelectableBlendMode.DODGE -> backdrop dodge source
+            SelectableBlendMode.BURN -> backdrop burn source
+            SelectableBlendMode.DIFFERENCE -> backdrop difference source
+            SelectableBlendMode.EXCLUSION -> backdrop exclude source
+            SelectableBlendMode.HUE -> backdrop hue source
+            SelectableBlendMode.SATURATION -> backdrop saturate source
+            SelectableBlendMode.LUMINATE -> backdrop luminate source
+            SelectableBlendMode.COLOR_BLEND -> backdrop colorBlend source
+        }
+    }.stateIn(coroutineScope, SharingStarted.Lazily, DefaultColors.clear)
+
+    val backdropColorBackground = backdropColor.backgroundStyleObservable
+    val sourceColorBackground = sourceColor.backgroundStyleObservable
+    val blendedColorBackground = blendedColor.backgroundStyleObservable
+
+    val backdropText = backdropColor.map { it.hexString }.toInitializedObservable("", coroutineScope)
+    val sourceText = sourceColor.map { it.hexString }.toInitializedObservable("", coroutineScope)
+
+    val lightenBackdrops = backdropColor.lightenList()
+    val darkenBackdrops = backdropColor.darkenList()
+    val lightenSource = sourceColor.lightenList()
+    val darkenSource = sourceColor.darkenList()
+    val lightenBlended = blendedColor.lightenList()
+    val darkenBlended = blendedColor.darkenList()
+
+    private val steps = (1..10).map { it.toDouble() / 10.0 }
+    private fun Flow<KalugaColor>.lightenList() = map { color ->
+        steps.map {
+            BackgroundStyle(
+                BackgroundStyle.FillStyle.Solid(color.lightenBy(it))
+            )
+        }
+    }.toInitializedObservable(emptyList(), coroutineScope)
+    private fun Flow<KalugaColor>.darkenList() = map { color ->
+        steps.map {
+            BackgroundStyle(
+                BackgroundStyle.FillStyle.Solid(color.darkenBy(it))
+            )
+        }
+    }.toInitializedObservable(emptyList(), coroutineScope)
+
+    fun submitBackdropText(backdropText: String) {
+        submitColorText(backdropText) {
+            backdropColor.value = it
+        }
+    }
+
+    fun submitSourceText(sourceText: String) {
+        submitColorText(sourceText) {
+            sourceColor.value = it
+        }
+    }
+
+    val blendModeButton = blendMode.map { currentlySelectedBlendMode ->
+        KalugaButton.Plain(
+            currentlySelectedBlendMode.name,
+            ButtonStyles.redButton
+        ) {
+            alertPresenterBuilder.buildActionSheet(coroutineScope) {
+                addActions(
+                    SelectableBlendMode.values().map { selectableBlendMode ->
+                        Alert.Action(selectableBlendMode.name) {
+                            blendMode.value = selectableBlendMode
+                        }
+                    }
+                )
+            }.showAsync()
+        }
+    }.toInitializedObservable<KalugaButton>(KalugaButton.Plain("", ButtonStyles.redButton, false) {}, coroutineScope)
+
+    val flipButton: KalugaButton = KalugaButton.Plain(
+        "Flip",
+        ButtonStyles.textButton
+    ) {
+        val sourceColor = sourceColor.value
+        this.sourceColor.value = backdropColor.value
+        backdropColor.value = sourceColor
+    }
+
+    private fun submitColorText(colorText: String, onColorParsed: (KalugaColor) -> Unit) {
+        colorFrom(colorText)?.let { onColorParsed(it) } ?: run {
+            coroutineScope.launch {
+                alertPresenterBuilder.buildAlert(coroutineScope) {
+                    setTitle("Invalid color")
+                    setMessage("The text submitted is not a color")
+                    setNeutralButton("OK")
+                }.show()
+            }
+        }
+    }
+
+    private val Flow<KalugaColor>.backgroundStyleObservable: InitializedObservable<BackgroundStyle> get() = map {
+        BackgroundStyle(
+            BackgroundStyle.FillStyle.Solid(it)
+        )
+    }.toInitializedObservable(BackgroundStyle(BackgroundStyle.FillStyle.Solid(DefaultColors.clear)), coroutineScope)
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt
new file mode 100644
index 000000000..1e8fda99b
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt
@@ -0,0 +1,120 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.resources
+
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.example.shared.stylable.TextStyles
+import com.splendo.kaluga.resources.DefaultColors
+import com.splendo.kaluga.resources.StringStyleAttribute
+import com.splendo.kaluga.resources.StyledStringBuilder
+import com.splendo.kaluga.resources.attributeSubstring
+import com.splendo.kaluga.resources.defaultBoldFont
+import com.splendo.kaluga.resources.stylable.TextAlignment
+import com.splendo.kaluga.resources.styled
+import com.splendo.kaluga.resources.view.KalugaLabel
+
+class LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider) : BaseLifecycleViewModel() {
+
+    companion object {
+        val loremIpsumParagraph0 = listOf(
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
+            "Etiam et est quis lectus bibendum tempor.",
+            "Interdum et malesuada fames ac ante ipsum primis in faucibus.",
+            "Donec convallis metus efficitur mattis accumsan.",
+            "Pellentesque efficitur elit felis, vitae dictum sem vehicula eu.",
+            "In hac habitasse platea dictumst. Donec sollicitudin eleifend dui, sit amet viverra ex sollicitudin nec.",
+            "Sed at faucibus orci.",
+            "Vivamus ultricies purus eu nisi blandit, nec ullamcorper felis facilisis.",
+            "Duis accumsan dolor dignissim massa malesuada, in blandit sapien vestibulum."
+        ).joinToString(" ")
+        val loremIpsumParagraph1 = listOf(
+            "Duis eget leo commodo, consequat felis sed, vehicula justo.",
+            "Morbi facilisis facilisis varius.",
+            "Donec efficitur pretium pharetra.",
+            "Praesent ut lorem commodo, efficitur lectus quis, dapibus augue.",
+            "Quisque sed maximus quam.",
+            "Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Suspendisse ullamcorper, augue id blandit lobortis, arcu enim pellentesque felis, quis ultrices urna nibh et nibh.",
+            "Donec et velit faucibus, luctus massa congue, ornare odio.",
+            "Vestibulum interdum nec metus at eleifend.",
+            "Mauris finibus magna eu dolor dignissim elementum at vitae enim.",
+            "Nunc posuere, enim eu hendrerit volutpat, sapien lacus blandit dolor, eu faucibus nisl ex sed enim.",
+            "Praesent in ligula eu nulla semper posuere sollicitudin et nunc."
+        ).joinToString(" ")
+        val loremIpsumParagraph2 = listOf(
+            "Aenean eget quam eu diam volutpat tincidunt.",
+            "Pellentesque maximus tristique mi, eget pellentesque risus volutpat et.",
+            "Duis id ultrices mi.",
+            "Praesent nec orci at nisl pulvinar lobortis ut sit amet purus.",
+            "In id fermentum mi.",
+            "Nunc vel nunc nisi.",
+            "Vestibulum malesuada ultricies dui a blandit."
+        ).joinToString(" ")
+        val loremIpsum = listOf(loremIpsumParagraph0, loremIpsumParagraph1, loremIpsumParagraph2).joinToString("\n")
+    }
+
+    val labels = observableOf(
+        listOf(
+            KalugaLabel.Plain("Default Text", TextStyles.defaultText),
+            KalugaLabel.Plain("Title Text", TextStyles.defaultTitle),
+            KalugaLabel.Plain("Bold Text", TextStyles.defaultBoldText),
+            KalugaLabel.Plain("Italic Text", TextStyles.defaultItalicText),
+            KalugaLabel.Plain("Monospace Text", TextStyles.defaultMonospaceText),
+            KalugaLabel.Plain("Red Text", TextStyles.redText),
+            KalugaLabel.Plain("Opposite Aligned Text", TextStyles.oppositeText),
+            KalugaLabel.Styled("Foreground Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, StringStyleAttribute.CharacterStyleAttribute.ForegroundColor(DefaultColors.deepSkyBlue))),
+            KalugaLabel.Styled("Background Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, StringStyleAttribute.CharacterStyleAttribute.BackgroundColor(DefaultColors.deepSkyBlue))),
+            KalugaLabel.Styled("Partial Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.TextStyle(TextStyles.redText), IntRange(0, 13)) })),
+            KalugaLabel.Styled("Font Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Font(defaultBoldFont, 12.0f), IntRange(0, 10)) })),
+            KalugaLabel.Styled("Stroke Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Stroke(2.0f, DefaultColors.limeGreen), IntRange(0, 12)) })),
+            KalugaLabel.Styled("Subscript Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.SubScript, IntRange(0, 15)) })),
+            KalugaLabel.Styled("Superscript Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.SuperScript, IntRange(0, 17)) })),
+            KalugaLabel.Styled("Shadow Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Shadow(DefaultColors.dimGray, 2.0f, 2.0f, 5.0f), IntRange(0, 12)) })),
+            KalugaLabel.Styled("Kerning Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Kerning(0.08f), IntRange(0, 13)) })),
+            KalugaLabel.Styled("Underline Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Underline, IntRange(0, 15)) })),
+            KalugaLabel.Styled("Strikethrough Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Strikethrough, IntRange(0, 20)) })),
+            KalugaLabel.Styled("Link Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, DefaultColors.limeGreen, { Pair(StringStyleAttribute.Link("https://kaluga.splendo.com"), IntRange(0, 10)) })),
+            KalugaLabel.Styled(loremIpsum.styled(styledStringBuilderProvider, TextStyles.defaultText, StringStyleAttribute.ParagraphStyleAttribute.LineSpacing(5.0f, 10.0f, 6.0f))),
+            KalugaLabel.Styled(
+                loremIpsum.styled(
+                    styledStringBuilderProvider,
+                    TextStyles.defaultText,
+                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.LeadingIndent(10.0f)) }
+                ),
+            ),
+            KalugaLabel.Styled(
+                loremIpsum.styled(
+                    styledStringBuilderProvider,
+                    TextStyles.defaultText,
+                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.Alignment(TextAlignment.END)) }
+                ),
+            ),
+            KalugaLabel.Styled(
+                loremIpsum.styled(
+                    styledStringBuilderProvider,
+                    TextStyles.defaultText,
+                    { attributeSubstring(this, StringStyleAttribute.ParagraphStyleAttribute.LineSpacing(2.0f, 4.0f, 1.0f)) },
+                    { attributeSubstring(loremIpsumParagraph0, StringStyleAttribute.CharacterStyleAttribute.BackgroundColor(DefaultColors.deepSkyBlue)) },
+                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.LeadingIndent(10.0f)) },
+                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.Alignment(TextAlignment.END)) },
+                    { attributeSubstring(loremIpsumParagraph2, StringStyleAttribute.CharacterStyleAttribute.Kerning(0.08f)) }
+                ),
+            )
+        )
+    )
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ResourcesListViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ResourcesListViewModel.kt
new file mode 100644
index 000000000..7162feb76
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ResourcesListViewModel.kt
@@ -0,0 +1,37 @@
+package com.splendo.kaluga.example.shared.viewmodel.resources
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+
+sealed class ResourcesListNavigationAction : NavigationAction<Nothing>(null) {
+
+    object Color : ResourcesListNavigationAction()
+    object Button : ResourcesListNavigationAction()
+    object Label : ResourcesListNavigationAction()
+}
+
+enum class Resource(private val titleKey: String) {
+    COLOR("feature_resources_color"),
+    BUTTON("feature_resources_button"),
+    LABEL("feature_resources_label");
+
+    val title: String get() = titleKey.localized()
+}
+
+class ResourcesListViewModel(navigator: Navigator<ResourcesListNavigationAction>) : NavigatingViewModel<ResourcesListNavigationAction>(navigator) {
+
+    val resources = observableOf(Resource.values().toList())
+
+    fun onResourceSelected(resource: Resource) {
+        navigator.navigate(
+            when (resource) {
+                Resource.COLOR -> ResourcesListNavigationAction.Color
+                Resource.BUTTON -> ResourcesListNavigationAction.Button
+                Resource.LABEL -> ResourcesListNavigationAction.Label
+            }
+        )
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt
new file mode 100644
index 000000000..1dd8689b2
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt
@@ -0,0 +1,54 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.system
+
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+
+sealed class SystemFeatures(val name: String) {
+    object Network : SystemFeatures("network_feature".localized())
+}
+
+sealed class SystemNavigationActions<Value>(
+    value: Value,
+    type: NavigationBundleSpecType<Value>
+) : SingleValueNavigationAction<Value>(value, type) {
+    object Network : SystemNavigationActions<Unit>(Unit, NavigationBundleSpecType.UnitType)
+}
+
+class SystemViewModel(
+    navigator: Navigator<SystemNavigationActions<Unit>>
+) : NavigatingViewModel<SystemNavigationActions<Unit>>(navigator) {
+
+    val modules =
+        observableOf(
+            listOf(
+                SystemFeatures.Network
+            )
+        )
+
+    fun onButtonTapped(systemFeatures: SystemFeatures) {
+        when (systemFeatures) {
+            is SystemFeatures.Network -> navigator.navigate(SystemNavigationActions.Network)
+        }
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt
new file mode 100644
index 000000000..f79552975
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt
@@ -0,0 +1,64 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.system.network
+
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.system.network.Network
+import com.splendo.kaluga.system.network.state.NetworkStateRepoBuilder
+import com.splendo.kaluga.system.network.state.network
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+
+class NetworkViewModel(
+    networkStateRepoBuilder: NetworkStateRepoBuilder
+) : BaseLifecycleViewModel() {
+
+    private val networkRepo = networkStateRepoBuilder.create()
+
+    private val _networkState: MutableStateFlow<String?> = MutableStateFlow(null)
+    val networkState = _networkState.toInitializedObservable(coroutineScope)
+
+    override fun onResume(scope: CoroutineScope) {
+        super.onResume(scope)
+
+        scope.launch {
+            networkRepo.network().collect {
+                when (it) {
+                    is Network.Unknown.WithoutLastNetwork ->
+                        _networkState.value =
+                            "Network's state is Unknown and without the last available connection."
+                    is Network.Unknown.WithLastNetwork ->
+                        _networkState.value =
+                            "Network's state is Unknown and with last known connection as ${it.lastKnownNetwork}."
+                    is Network.Known.Cellular ->
+                        _networkState.value =
+                            "Network's state is Available through Cellular."
+                    is Network.Known.Wifi ->
+                        _networkState.value =
+                            "Network's state is Available through WIFI."
+                    is Network.Known.Absent ->
+                        _networkState.value =
+                            "Network's state is Absent."
+                }
+            }
+        }
+    }
+}
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/Platform.kt b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/Platform.kt
deleted file mode 100644
index cec6997af..000000000
--- a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/Platform.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.splendo.kaluga.example
-
-import platform.UIKit.UIDevice
-
-class IOSPlatform: Platform {
-    override val name: String = UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion
-}
-
-actual fun getPlatform(): Platform = IOSPlatform()
\ No newline at end of file
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
new file mode 100644
index 000000000..f00fd3397
--- /dev/null
+++ b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
@@ -0,0 +1,20 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.featureList
+
+actual val showPlatformSpecificFeatures: Boolean = false
diff --git a/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
new file mode 100644
index 000000000..f00fd3397
--- /dev/null
+++ b/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
@@ -0,0 +1,20 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.featureList
+
+actual val showPlatformSpecificFeatures: Boolean = false
diff --git a/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
new file mode 100644
index 000000000..f00fd3397
--- /dev/null
+++ b/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
@@ -0,0 +1,20 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.featureList
+
+actual val showPlatformSpecificFeatures: Boolean = false

From 7be931aec8ea32f723926da82b34d849adb4f6db Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 7 Nov 2022 13:24:14 +0100
Subject: [PATCH 022/227] Adding Android

---
 example/android/src/main/AndroidManifest.xml  |   2 +-
 .../bottomSheet/ui/BottomSheetLayout.kt       |   2 +-
 .../bottomSheet/ui/BottomSheetParentLayout.kt |   6 +-
 .../ui/BottomSheetParentSubPageLayout.kt      |   2 +-
 .../ui/BottomSheetSubPageLayout.kt            |   2 +-
 .../viewModel/NavigationMappers.kt            |   8 +-
 .../contacts/ui/ContactDetailsLayout.kt       |   6 +-
 .../compose/contacts/ui/ContactsLayout.kt     |   4 +-
 .../compose/contacts/ui/ContactsListLayout.kt |   6 +-
 .../contacts/viewModel/NavigationMappers.kt   |   4 +-
 .../viewModel/ContactDetailsViewModel.kt      |   2 +-
 .../viewModel/ContactsListViewModel.kt        |   2 +-
 .../src/main/kotlin/Accessors.kt              |   7 +-
 .../src/main/kotlin/AndroidCommon.kt          |  48 ++--
 .../src/main/kotlin/AndroidCompose.kt         |   8 +-
 .../src/main/kotlin/Component.kt              |   6 +-
 .../kotlin/{Library.kt => LibraryImpl.kt}     |   6 +-
 .../src/main/kotlin/Publish.kt                |   2 +-
 newexample/android/build.gradle.kts           |  89 +++++--
 .../android/src/main/AndroidManifest.xml      | 115 ++++++++-
 .../splendo/kaluga/example/ExampleActivity.kt |  76 ++++++
 .../kaluga/example/ExampleApplication.kt      |  39 ++++
 .../kaluga/example/FeaturesListFragment.kt    | 112 +++++++++
 .../splendo/kaluga/example/InfoFragment.kt    | 125 ++++++++++
 .../kaluga/example/alerts/AlertsActivity.kt   |  42 ++++
 .../kaluga/example/android/MainActivity.kt    |  87 -------
 .../ArchitectureDetailsActivity.kt            |  56 +++++
 .../architecture/ArchitectureInputActivity.kt |  74 ++++++
 .../kaluga/example/beacons/BeaconsActivity.kt |  81 +++++++
 .../kaluga/example/beacons/BeaconsAdapter.kt  |  64 +++++
 .../kaluga/example/beacons/BeaconsBinding.kt  |  31 +++
 .../example/bluetooth/BluetoothActivity.kt    |  93 ++++++++
 .../example/bluetooth/BluetoothAdapter.kt     |  76 ++++++
 .../BluetoothCharacteristicAdapter.kt         |  78 +++++++
 .../bluetooth/BluetoothDescriptorAdapter.kt   |  77 ++++++
 .../bluetooth/BluetoothMoreActivity.kt        |  49 ++++
 .../bluetooth/BluetoothServiceAdapter.kt      |  78 +++++++
 .../bottomSheet/BottomSheetActivity.kt        |  32 +++
 .../bottomSheet/ui/BottomSheetLayout.kt       |  73 ++++++
 .../bottomSheet/ui/BottomSheetParentLayout.kt | 124 ++++++++++
 .../ui/BottomSheetParentSubPageLayout.kt      |  53 +++++
 .../ui/BottomSheetSubPageLayout.kt            |  79 +++++++
 .../viewModel/NavigationMappers.kt            |  59 +++++
 .../example/contacts/ContactsActivity.kt      |  32 +++
 .../contacts/ui/ContactDetailsLayout.kt       |  97 ++++++++
 .../example/contacts/ui/ContactsLayout.kt     |  53 +++++
 .../example/contacts/ui/ContactsListLayout.kt | 100 ++++++++
 .../kaluga/example/contacts/ui/Styles.kt      |  17 ++
 .../contacts/viewModel/NavigationMappers.kt   |  52 +++++
 .../datetimepicker/DateTimePickerActivity.kt  |  21 ++
 .../com/splendo/kaluga/example/di/Modules.kt  | 221 ++++++++++++++++++
 .../keyboard/KeyboardManagerActivity.kt       |  46 ++++
 .../kaluga/example/link/LinksActivity.kt      |  79 +++++++
 .../kaluga/example/loading/LoadingActivity.kt |  45 ++++
 .../example/location/LocationActivity.kt      |  61 +++++
 .../location/LocationBackgroundService.kt     | 105 +++++++++
 .../permissions/PermissionsDemoActivity.kt    |  84 +++++++
 .../PermissionsDemoListActivity.kt            |  81 +++++++
 .../PlatformSpecificActivity.kt               |  90 +++++++
 .../example/resources/ButtonActivity.kt       |  79 +++++++
 .../kaluga/example/resources/ColorActivity.kt | 139 +++++++++++
 .../kaluga/example/resources/LabelActivity.kt |  77 ++++++
 .../example/resources/ResourcesActivity.kt    |  75 ++++++
 .../kaluga/example/system/SystemActivity.kt   |  92 ++++++++
 .../system/fragments/NetworkFragment.kt       |  44 ++++
 .../kaluga/example/view/ItemDecoration.kt     |  33 +++
 .../src/main/res/drawable/ic_account.xml      |   5 +
 .../res/drawable/ic_launcher_foreground.xml   |  72 ++++++
 .../main/res/drawable/ic_refresh_circle.xml   |   8 +
 .../src/main/res/drawable/ic_stop_circle.xml  |   8 +
 .../src/main/res/layout/activity_alerts.xml   |  39 ++++
 .../layout/activity_architecture_details.xml  |  43 ++++
 .../layout/activity_architecture_input.xml    |  63 +++++
 .../src/main/res/layout/activity_beacons.xml  |  30 +++
 .../main/res/layout/activity_bluetooth.xml    |  29 +++
 .../res/layout/activity_bluetooth_more.xml    |  93 ++++++++
 .../res/layout/activity_date_time_picker.xml  |  50 ++++
 .../src/main/res/layout/activity_example.xml  |  24 ++
 .../res/layout/activity_keyboard_manager.xml  |  32 +++
 .../src/main/res/layout/activity_link.xml     |  53 +++++
 .../src/main/res/layout/activity_loading.xml  |  27 +++
 .../src/main/res/layout/activity_location.xml |  44 ++++
 .../src/main/res/layout/activity_main.xml     |  19 ++
 .../res/layout/activity_permissions_demo.xml  |  30 +++
 .../res/layout/activity_permissions_list.xml  |   9 +
 .../main/res/layout/activity_resources.xml    |  18 ++
 .../res/layout/activity_resources_color.xml   | 166 +++++++++++++
 .../src/main/res/layout/activity_system.xml   |  42 ++++
 .../src/main/res/layout/beacon_item.xml       |  53 +++++
 .../layout/bluetooth_characteristic_item.xml  |  69 ++++++
 .../res/layout/bluetooth_descriptor_item.xml  |  42 ++++
 .../src/main/res/layout/bluetooth_item.xml    | 159 +++++++++++++
 .../res/layout/bluetooth_service_item.xml     |  61 +++++
 .../src/main/res/layout/dialog_info.xml       |  27 +++
 .../res/layout/fragment_features_list.xml     |   9 +
 .../src/main/res/layout/fragment_info.xml     |   9 +
 .../src/main/res/layout/fragment_network.xml  |  43 ++++
 .../res/layout/loading_indicator_view_.xml    |  25 ++
 .../src/main/res/layout/view_list_button.xml  |  10 +
 .../main/res/layout/view_list_text_view.xml   |  14 ++
 .../layout/view_resource_list_background.xml  |   7 +
 .../src/main/res/menu/bluetooth_menu.xml      |  18 ++
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   5 +
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   5 +
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 2147 bytes
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 0 -> 4049 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 1422 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 0 -> 2536 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 2990 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 0 -> 5845 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 4620 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 0 -> 9165 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 6296 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 0 -> 12899 bytes
 .../src/main/res/values-night/colors.xml      |   7 +
 .../src/main/res/values-night/styles.xml      |  11 +
 .../android/src/main/res/values/colors.xml    |  30 +++
 .../android/src/main/res/values/dimens.xml    |  23 ++
 .../res/values/ic_launcher_background.xml     |   4 +
 .../android/src/main/res/values/strings.xml   | 112 +++++++++
 .../android/src/main/res/values/styles.xml    |  31 ++-
 newexample/keystore/debug.keystore            | Bin 0 -> 2419 bytes
 .../kotlin/model/contacts/ContactDetails.kt   |  23 ++
 .../kotlin/viewmodel/alert/AlertViewModel.kt  |   2 +-
 .../BottomSheetParentSubPageViewModel.kt      |  36 +++
 .../bottomsheet/BottomSheetParentViewModel.kt |  42 ++++
 .../BottomSheetSubPageViewModel.kt            |  41 ++++
 .../bottomsheet/BottomSheetViewModel.kt       |  42 ++++
 .../contacts/ContactDetailsViewModel.kt       |  48 ++++
 .../contacts/ContactsListViewModel.kt         |  60 +++++
 .../kotlin/viewmodel/hud/HudViewModel.kt      |   2 +-
 .../kotlin/registerAllPermissions.kt          |  23 ++
 132 files changed, 5526 insertions(+), 179 deletions(-)
 rename kaluga-library-components/src/main/kotlin/{Library.kt => LibraryImpl.kt} (96%)
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/android/MainActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
 create mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt
 create mode 100644 newexample/android/src/main/res/drawable/ic_account.xml
 create mode 100644 newexample/android/src/main/res/drawable/ic_launcher_foreground.xml
 create mode 100644 newexample/android/src/main/res/drawable/ic_refresh_circle.xml
 create mode 100644 newexample/android/src/main/res/drawable/ic_stop_circle.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_alerts.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_architecture_details.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_architecture_input.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_beacons.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_bluetooth.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_bluetooth_more.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_date_time_picker.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_example.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_keyboard_manager.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_link.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_loading.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_location.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_main.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_permissions_demo.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_permissions_list.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_resources.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_resources_color.xml
 create mode 100644 newexample/android/src/main/res/layout/activity_system.xml
 create mode 100644 newexample/android/src/main/res/layout/beacon_item.xml
 create mode 100644 newexample/android/src/main/res/layout/bluetooth_characteristic_item.xml
 create mode 100644 newexample/android/src/main/res/layout/bluetooth_descriptor_item.xml
 create mode 100644 newexample/android/src/main/res/layout/bluetooth_item.xml
 create mode 100644 newexample/android/src/main/res/layout/bluetooth_service_item.xml
 create mode 100644 newexample/android/src/main/res/layout/dialog_info.xml
 create mode 100644 newexample/android/src/main/res/layout/fragment_features_list.xml
 create mode 100644 newexample/android/src/main/res/layout/fragment_info.xml
 create mode 100644 newexample/android/src/main/res/layout/fragment_network.xml
 create mode 100644 newexample/android/src/main/res/layout/loading_indicator_view_.xml
 create mode 100644 newexample/android/src/main/res/layout/view_list_button.xml
 create mode 100644 newexample/android/src/main/res/layout/view_list_text_view.xml
 create mode 100644 newexample/android/src/main/res/layout/view_resource_list_background.xml
 create mode 100644 newexample/android/src/main/res/menu/bluetooth_menu.xml
 create mode 100644 newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 create mode 100644 newexample/android/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 newexample/android/src/main/res/mipmap-hdpi/ic_launcher_round.png
 create mode 100644 newexample/android/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 newexample/android/src/main/res/mipmap-mdpi/ic_launcher_round.png
 create mode 100644 newexample/android/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 newexample/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 create mode 100644 newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 create mode 100644 newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 create mode 100644 newexample/android/src/main/res/values-night/colors.xml
 create mode 100644 newexample/android/src/main/res/values-night/styles.xml
 create mode 100644 newexample/android/src/main/res/values/colors.xml
 create mode 100644 newexample/android/src/main/res/values/dimens.xml
 create mode 100644 newexample/android/src/main/res/values/ic_launcher_background.xml
 create mode 100644 newexample/android/src/main/res/values/strings.xml
 create mode 100644 newexample/keystore/debug.keystore
 create mode 100644 newexample/shared/src/commonMain/kotlin/model/contacts/ContactDetails.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactDetailsViewModel.kt
 create mode 100644 newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactsListViewModel.kt

diff --git a/example/android/src/main/AndroidManifest.xml b/example/android/src/main/AndroidManifest.xml
index 8770c515f..3f7425dfa 100644
--- a/example/android/src/main/AndroidManifest.xml
+++ b/example/android/src/main/AndroidManifest.xml
@@ -84,7 +84,7 @@
 
         <activity android:name="com.splendo.kaluga.example.platformspecific.PlatformSpecificActivity"
             android:label="@string/feature_platform_specific"/>
-        <activity android:name="com.splendo.kaluga.example.platformspecific.compose.contacts.ContactsActivity"
+        <activity android:name="com.splendo.kaluga.example.contacts.ContactsActivity"
             android:label="@string/feature_platform_specific_compose_navigation"/>
         <activity android:name="com.splendo.kaluga.example.platformspecific.compose.bottomSheet.BottomSheetActivity"
             android:label="@string/feature_platform_specific_compose_bottom_sheet"/>
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt
index 6e39059d1..f91d50da7 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt
@@ -34,7 +34,7 @@ import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.store
 import com.splendo.kaluga.example.platformspecific.compose.bottomSheet.viewModel.bottomSheetNavigationRouteMapper
 import com.splendo.kaluga.example.platformspecific.compose.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet.BottomSheetViewModel
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetViewModel
 
 @Composable
 fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt
index eb7709a5b..c0e9c1df9 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt
@@ -43,9 +43,9 @@ import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.store
 import com.splendo.kaluga.example.platformspecific.compose.bottomSheet.viewModel.bottomSheetParentNavigationRouteMapper
 import com.splendo.kaluga.example.platformspecific.compose.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet.BottomSheetNavigation
-import com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet.BottomSheetParentNavigation
-import com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet.BottomSheetParentViewModel
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentViewModel
 
 @Composable
 fun BottomSheetParentLayout() {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
index 60444ce59..1168846bb 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
@@ -29,7 +29,7 @@ import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.store
 import com.splendo.kaluga.example.platformspecific.compose.bottomSheet.viewModel.bottomSheetParentSubPageNavigationRouteMapper
-import com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet.BottomSheetParentSubPageViewModel
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentSubPageViewModel
 
 @Composable
 fun BottomSheetParentSubPageLayout(navHostController: NavHostController) {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt
index 1740c02dc..27bc57c3f 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt
@@ -36,7 +36,7 @@ import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.store
 import com.splendo.kaluga.example.platformspecific.compose.bottomSheet.viewModel.bottomSheetSubPageNavigationRouteMapper
 import com.splendo.kaluga.example.platformspecific.compose.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet.BottomSheetSubPageViewModel
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetSubPageViewModel
 
 @Composable
 fun BottomSheetSubPageLayout(
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt
index e217f4693..acc30ad88 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt
@@ -22,10 +22,10 @@ import com.splendo.kaluga.architecture.compose.navigation.Route
 import com.splendo.kaluga.architecture.compose.navigation.bottomSheetContent
 import com.splendo.kaluga.architecture.compose.navigation.bottomSheetSheetContent
 import com.splendo.kaluga.architecture.compose.navigation.next
-import com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet.BottomSheetNavigation
-import com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet.BottomSheetParentNavigation
-import com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet.BottomSheetParentSubPageNavigation
-import com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet.BottomSheetSubPageNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentSubPageNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetSubPageNavigation
 
 /** Maps a navigation action to a route string. */
 internal fun bottomSheetParentNavigationRouteMapper(action: BottomSheetParentNavigation): BottomSheetRoute {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt
index 8d0b5b5e3..1ca6ee350 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt
@@ -40,9 +40,9 @@ import com.splendo.kaluga.architecture.compose.viewModel.store
 import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.platformspecific.compose.contacts.viewModel.contactDetailsNavigationActivityMapper
 import com.splendo.kaluga.example.platformspecific.compose.contacts.viewModel.contactDetailsNavigationRouteMapper
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.model.ContactDetails
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.viewModel.ContactDetailsNavigation
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.viewModel.ContactDetailsViewModel
+import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsNavigation
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsViewModel
 
 @Composable
 fun ContactDetailsLayout(contactDetails: ContactDetails, navHostController: NavHostController) {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt
index 6e73d12e3..bed60a083 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt
@@ -25,8 +25,8 @@ import com.splendo.kaluga.architecture.compose.navigation.SetupNavHost
 import com.splendo.kaluga.architecture.compose.navigation.composable
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.example.platformspecific.compose.contacts.viewModel.contactListNavigationRouteMapper
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.model.ContactDetails
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.viewModel.ContactsListNavigation
+import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
 
 @Composable
 fun ContactsLayout() {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt
index e482f6250..fd313db7f 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt
@@ -40,9 +40,9 @@ import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.store
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.model.ContactDetails
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.viewModel.ContactsListNavigation
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.viewModel.ContactsListViewModel
+import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListViewModel
 
 @Composable
 fun ContactsListLayout(navigator: Navigator<ContactsListNavigation<*>>) {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt
index 37e501068..9bd6b0092 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt
@@ -20,8 +20,8 @@ package com.splendo.kaluga.example.platformspecific.compose.contacts.viewModel
 import com.splendo.kaluga.architecture.compose.navigation.Route
 import com.splendo.kaluga.architecture.compose.navigation.next
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.viewModel.ContactDetailsNavigation
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.viewModel.ContactsListNavigation
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsNavigation
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
 
 /** Maps a navigation action to a route string. */
 internal fun contactListNavigationRouteMapper(action: ContactsListNavigation<*>): Route {
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt
index a2fd6c778..7f26c543f 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt
@@ -21,7 +21,7 @@ import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.model.ContactDetails
+import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
 
 sealed class ContactDetailsNavigation<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
     class SendEmail(email: String) : ContactDetailsNavigation<String>(
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt
index 356a18d40..5e66bd4b1 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt
@@ -23,7 +23,7 @@ import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.observable.FlowInitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.example.shared.platformspecific.compose.contacts.model.ContactDetails
+import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 
diff --git a/kaluga-library-components/src/main/kotlin/Accessors.kt b/kaluga-library-components/src/main/kotlin/Accessors.kt
index c13ed44c2..b6641420f 100644
--- a/kaluga-library-components/src/main/kotlin/Accessors.kt
+++ b/kaluga-library-components/src/main/kotlin/Accessors.kt
@@ -15,14 +15,15 @@
 
  */
 
-import com.android.build.gradle.AppExtension
+import com.android.build.api.dsl.CommonExtension
 import com.android.build.gradle.LibraryExtension
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
-fun Project.androidApp(action: AppExtension.() -> Unit) {
+fun Project.androidApp(action: BaseAppModuleExtension.() -> Unit) {
     configureAction("android", action)
 }
 
@@ -46,7 +47,7 @@ fun Project.publishing(action: org.gradle.api.publish.PublishingExtension.() ->
     configureAction("publishing", action)
 }
 
-fun LibraryExtension.kotlinOptions(action: org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *>.kotlinOptions(action: org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions.() -> Unit) {
     (this as org.gradle.api.plugins.ExtensionAware).configureAction("kotlinOptions", action)
 }
 
diff --git a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
index 66263af27..1341145f5 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
@@ -19,7 +19,7 @@ import com.android.build.gradle.LibraryExtension
 import org.gradle.api.JavaVersion
 import org.gradle.kotlin.dsl.dependencies
 
-fun org.gradle.api.Project.commonAndroidComponent(type: ComponentType = ComponentType.Default()) {
+fun org.gradle.api.Project.commonAndroidComponent(type: ComponentType = ComponentType.Default) {
     androidLibrary {
         androidCommon(this@commonAndroidComponent, type)
     }
@@ -49,13 +49,13 @@ fun org.gradle.api.Project.commonAndroidComponent(type: ComponentType = Componen
     }
 }
 
-fun LibraryExtension.androidCommon(project: org.gradle.api.Project, componentType: ComponentType = ComponentType.Default()) {
-    compileSdk = Library.Android.compileSdk
-    buildToolsVersion = Library.Android.buildTools
+fun LibraryExtension.androidCommon(project: org.gradle.api.Project, componentType: ComponentType = ComponentType.Default) {
+    compileSdk = LibraryImpl.Android.compileSdk
+    buildToolsVersion = LibraryImpl.Android.buildTools
 
     defaultConfig {
-        minSdk = Library.Android.minSdk
-        targetSdk = Library.Android.targetSdk
+        minSdk = LibraryImpl.Android.minSdk
+        targetSdk = LibraryImpl.Android.targetSdk
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -66,27 +66,23 @@ fun LibraryExtension.androidCommon(project: org.gradle.api.Project, componentTyp
         }
     }
 
-    if (componentType.isApp) {
-        project.logger.lifecycle("Android sourcesets for this project module are configured using defaults (for an app)")
-    } else {
-        project.logger.lifecycle("Android sourcesets for this project module are configured as a library")
-        sourceSets {
-            getByName("main") {
-                manifest.srcFile("src/androidLibMain/AndroidManifest.xml")
-                res.srcDir("src/androidLibMain/res")
-                if (componentType is ComponentType.Compose) {
-                    java.srcDir("src/androidLibMain/kotlin")
-                }
-            }
-            getByName("androidTest") {
-                manifest.srcFile("src/androidLibAndroidTest/AndroidManifest.xml")
-                java.srcDir("src/androidLibAndroidTest/kotlin")
-                res.srcDir("src/androidLibAndroidTest/res")
+    project.logger.lifecycle("Android sourcesets for this project module are configured as a library")
+    sourceSets {
+        getByName("main") {
+            manifest.srcFile("src/androidLibMain/AndroidManifest.xml")
+            res.srcDir("src/androidLibMain/res")
+            if (componentType is ComponentType.Compose) {
+                java.srcDir("src/androidLibMain/kotlin")
             }
+        }
+        getByName("androidTest") {
+            manifest.srcFile("src/androidLibAndroidTest/AndroidManifest.xml")
+            java.srcDir("src/androidLibAndroidTest/kotlin")
+            res.srcDir("src/androidLibAndroidTest/res")
+        }
 
-            getByName("test") {
-                java.srcDir("src/androidLibUnitTest/kotlin")
-            }
+        getByName("test") {
+            java.srcDir("src/androidLibUnitTest/kotlin")
         }
     }
 
@@ -107,7 +103,7 @@ fun LibraryExtension.androidCommon(project: org.gradle.api.Project, componentTyp
                 compose = true
             }
             composeOptions {
-                kotlinCompilerExtensionVersion = Library.Android.composeCompiler
+                kotlinCompilerExtensionVersion = LibraryImpl.Android.composeCompiler
             }
         }
         is ComponentType.Default-> {}
diff --git a/kaluga-library-components/src/main/kotlin/AndroidCompose.kt b/kaluga-library-components/src/main/kotlin/AndroidCompose.kt
index 2f3997033..739e7d2a3 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidCompose.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidCompose.kt
@@ -17,10 +17,10 @@
 
 import org.gradle.kotlin.dsl.dependencies
 
-fun org.gradle.api.Project.composeAndroidComponent(type: ComponentType.Compose = ComponentType.Compose()) {
+fun org.gradle.api.Project.composeAndroidComponent() {
     group = Library.group
     version = Library.version
-    commonAndroidComponent(type)
+    commonAndroidComponent(ComponentType.Compose)
     dependencies {
         implement(Dependencies.AndroidX.Compose.Foundation)
         implement(Dependencies.AndroidX.Compose.UI)
@@ -37,7 +37,5 @@ fun org.gradle.api.Project.composeAndroidComponent(type: ComponentType.Compose =
         }
     }
 
-    if (!type.isApp) {
-        publish(type)
-    }
+    publish(ComponentType.Compose)
 }
diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index 0629fdfef..5f62e6394 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -25,10 +25,8 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
 
 sealed class ComponentType {
-    abstract val isApp: Boolean
-
-    data class Default(override val isApp: Boolean = false) : ComponentType()
-    data class Compose(override val isApp: Boolean = false) : ComponentType()
+    object Default : ComponentType()
+    object Compose : ComponentType()
 }
 
 fun Project.commonComponent() {
diff --git a/kaluga-library-components/src/main/kotlin/Library.kt b/kaluga-library-components/src/main/kotlin/LibraryImpl.kt
similarity index 96%
rename from kaluga-library-components/src/main/kotlin/Library.kt
rename to kaluga-library-components/src/main/kotlin/LibraryImpl.kt
index bec8efc9b..c3aa97f32 100644
--- a/kaluga-library-components/src/main/kotlin/Library.kt
+++ b/kaluga-library-components/src/main/kotlin/LibraryImpl.kt
@@ -23,11 +23,11 @@ import org.jetbrains.kotlin.konan.properties.loadProperties
 import org.jetbrains.kotlin.konan.properties.Properties
 import java.io.IOException
 
-private val libraries: MutableMap<Project, Library> = mutableMapOf()
+private val libraries: MutableMap<Project, LibraryImpl> = mutableMapOf()
 
-val Project.Library get() = libraries.getOrPut(this) { Library(this) }
+val Project.Library get() = libraries.getOrPut(this) { LibraryImpl(this) }
 
-class Library(project: Project) {
+class LibraryImpl(project: Project) {
 
     private val props: Properties = File("${project.rootProject.buildDir.absolutePath}/../local.properties").let {
         if (it.exists) {
diff --git a/kaluga-library-components/src/main/kotlin/Publish.kt b/kaluga-library-components/src/main/kotlin/Publish.kt
index d3f15eb35..daa9b1345 100644
--- a/kaluga-library-components/src/main/kotlin/Publish.kt
+++ b/kaluga-library-components/src/main/kotlin/Publish.kt
@@ -18,7 +18,7 @@
 import org.gradle.api.Project
 import org.gradle.api.publish.maven.MavenPublication
 
-fun Project.publish(componentType: ComponentType = ComponentType.Default()) {
+fun Project.publish(componentType: ComponentType = ComponentType.Default) {
     afterEvaluate {
         publishing {
             publications {
diff --git a/newexample/android/build.gradle.kts b/newexample/android/build.gradle.kts
index 7187dd077..3ed968cda 100644
--- a/newexample/android/build.gradle.kts
+++ b/newexample/android/build.gradle.kts
@@ -1,42 +1,101 @@
 plugins {
     id("com.android.application")
     kotlin("android")
+    kotlin("kapt")
+    kotlin("plugin.serialization")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
-android {
-    namespace = "com.splendo.kaluga.example.android"
-    compileSdk = 33
+
+group = Library.group
+version = Library.version
+
+androidApp {
+    namespace = "com.splendo.kaluga.example"
+    compileSdk = LibraryImpl.Android.compileSdk
+    buildToolsVersion = LibraryImpl.Android.buildTools
     defaultConfig {
-        applicationId = "com.splendo.kaluga.example.android"
-        minSdk = 24
-        targetSdk = 33
+        applicationId = "com.splendo.kaluga.example"
+        minSdk = LibraryImpl.Android.minSdk
+        targetSdk = LibraryImpl.Android.targetSdk
         versionCode = 1
         versionName = "1.0"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    buildFeatures {
-        compose = true
+
+    signingConfigs {
+        get("debug").apply {
+            keyAlias = "key0"
+            keyPassword = "nckI1UYofHIMkOnXpmZJVA"
+            storeFile = file("../keystore/debug.keystore")
+            storePassword = "nckI1UYofHIMkOnXpmZJVA"
+        }
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.3.0"
+
+    buildTypes {
+        debug {
+            signingConfig = signingConfigs.get("debug")
+        }
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
     }
+
     packagingOptions {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        resources.excludes.addAll(
+            listOf(
+                "META-INF/kotlinx-coroutines-core.kotlin_module",
+                "META-INF/shared_debug.kotlin_module",
+                "META-INF/kotlinx-serialization-runtime.kotlin_module"
+            )
+        )
+    }
+
+    buildFeatures {
+        dataBinding {
+            enable = true
         }
+        compose = true
     }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
+    composeOptions {
+        kotlinCompilerExtensionVersion = LibraryImpl.Android.composeCompiler
+    }
+}
+
+kotlin {
+    sourceSets.all {
+        languageSettings {
+            optIn("kotlin.ExperimentalStdlibApi")
+            optIn("androidx.compose.material.ExperimentalMaterialApi")
         }
     }
 }
 
 dependencies {
+    val libraryVersion = Library.version
+    implementation("com.splendo.kaluga:architecture-compose:$libraryVersion")
+    implementation("com.splendo.kaluga:resources-compose:$libraryVersion")
     implementation(project(":shared"))
+
     implement(Dependencies.AndroidX.Compose.UI)
     implement(Dependencies.AndroidX.Compose.UITooling)
     implement(Dependencies.AndroidX.Compose.UIToolingPreview)
     implement(Dependencies.AndroidX.Compose.Foundation)
     implement(Dependencies.AndroidX.Compose.Material)
     implement(Dependencies.AndroidX.Activity.Compose)
+    implement(Dependencies.AndroidX.Navigation.Compose)
+
+    implement(Dependencies.AndroidX.FragmentKtx)
+    implement(Dependencies.AndroidX.ConstraintLayout)
+    implement(Dependencies.AndroidX.Lifecycle.Service)
+
+    implement(Dependencies.Android.PlayServices.Location)
+    implement(Dependencies.Android.Material)
+    implement(Dependencies.Android.MaterialComposeThemeAdapter)
+
+    implement(Dependencies.Koin.Android)
+
+    implement(Dependencies.KotlinX.Serialization.Core)
+    implement(Dependencies.KotlinX.Serialization.Json)
 }
\ No newline at end of file
diff --git a/newexample/android/src/main/AndroidManifest.xml b/newexample/android/src/main/AndroidManifest.xml
index 22d1facc8..15687a9f7 100644
--- a/newexample/android/src/main/AndroidManifest.xml
+++ b/newexample/android/src/main/AndroidManifest.xml
@@ -1,17 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.splendo.kaluga.example">
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <!-- If your app targets Android 9 or lower,  -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
+    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+
+    <uses-permission android:name="android.permission.CAMERA"/>
+
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <!-- When the app is not using Custom Tabs to open a URL, Android 11 requires a "queries" tag in order to look for apps that can open a given URL.
+    In this case the query will go through the apps with an intent that refers to a browser. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+        </intent>
+    </queries>
 
     <application
-        android:allowBackup="false"
+        android:name=".ExampleApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity
-            android:name=".MainActivity"
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.splendo.kaluga.example.ExampleActivity"
+            android:label="Features list"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity android:name=".location.LocationActivity"
+            android:label="@string/feature_location"/>
+        <activity android:name=".permissions.PermissionsDemoListActivity"
+            android:label="@string/permissions_list"/>
+        <activity android:name=".permissions.PermissionsDemoActivity" android:label="Permissions"/>
+        <activity android:name=".alerts.AlertsActivity"
+            android:label="@string/feature_alerts"/>
+        <activity android:name=".datetimepicker.DateTimePickerActivity"
+            android:label="@string/feature_date_time_picker"/>
+        <activity android:name=".loading.LoadingActivity"
+            android:label="@string/feature_hud"/>
+        <activity android:name=".keyboard.KeyboardManagerActivity"
+            android:label="@string/keyboard_manager"/>
+        <activity android:name=".link.LinksActivity"
+            android:exported="true"
+            android:label="@string/feature_links"
+            android:launchMode="singleTask">
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data
+                    android:scheme="https"
+                    android:host="kaluga-links.web.app"
+                    android:pathPrefix="/kalugaexample"/>
+            </intent-filter>
+        </activity>
+        <activity android:name=".architecture.ArchitectureInputActivity"
+            android:label="@string/feature_architecture"/>
+
+        <activity android:name="com.splendo.kaluga.example.platformspecific.PlatformSpecificActivity"
+            android:label="@string/feature_platform_specific"/>
+        <activity android:name="com.splendo.kaluga.example.contacts.ContactsActivity"
+            android:label="@string/feature_platform_specific_compose_navigation"/>
+        <activity android:name="com.splendo.kaluga.example.bottomSheet.BottomSheetActivity"
+            android:label="@string/feature_platform_specific_compose_bottom_sheet"/>
+
+        <activity android:name=".architecture.ArchitectureDetailsActivity"
+            android:label="@string/feature_architecture"/>
+        <activity android:name=".bluetooth.BluetoothActivity"
+            android:label="@string/feature_bluetooth"/>
+        <activity android:name=".bluetooth.BluetoothMoreActivity"
+            android:label="@string/feature_bluetooth"/>
+        <activity android:name=".beacons.BeaconsActivity"
+            android:label="@string/feature_beacons"/>
+        <activity android:name=".resources.ResourcesActivity"
+            android:label="@string/feature_resources"/>
+        <activity android:name=".resources.ColorActivity"
+            android:label="@string/feature_resources_color"/>
+        <activity android:name=".resources.LabelActivity"
+            android:label="@string/feature_resources_label"/>
+        <activity android:name=".resources.ButtonActivity"
+            android:label="@string/feature_resources_button"/>
+
+        <activity android:name=".system.SystemActivity" android:label="@string/feature_system"/>
+
+
+        <service android:name=".location.LocationBackgroundService"/>
+
     </application>
-</manifest> 
\ No newline at end of file
+
+</manifest>
\ No newline at end of file
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
new file mode 100644
index 000000000..2145a4a03
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
@@ -0,0 +1,76 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example
+
+import android.os.Bundle
+import com.google.android.material.tabs.TabLayout
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.shared.viewmodel.ExampleTabNavigation
+import com.splendo.kaluga.example.shared.viewmodel.ExampleViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class ExampleActivity : KalugaViewModelActivity<ExampleViewModel>(R.layout.activity_example) {
+
+    override val viewModel: ExampleViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<ExampleTabNavigation> { action ->
+                when (action) {
+                    ExampleTabNavigation.FeatureList -> NavigationSpec.Fragment(
+                        R.id.example_fragment,
+                        createFragment = { FeaturesListFragment() }
+                    )
+                    ExampleTabNavigation.Info -> NavigationSpec.Fragment(
+                        R.id.example_fragment,
+                        createFragment = { InfoFragment() }
+                    )
+                }
+            }
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val tabs: TabLayout = findViewById(R.id.tabs)
+
+        viewModel.tabs.observeInitialized { exampleTabs ->
+            tabs.removeAllTabs()
+            exampleTabs.forEach { tab ->
+                tabs.addTab(tabs.newTab().setText(tab.title).setTag(tab))
+            }
+        }
+
+        tabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
+            override fun onTabReselected(tab: TabLayout.Tab?) {
+                val exampleTab = tab?.tag as? ExampleViewModel.Tab ?: return
+                viewModel.tab.post(exampleTab)
+            }
+
+            override fun onTabSelected(tab: TabLayout.Tab?) {
+                val exampleTab = tab?.tag as? ExampleViewModel.Tab ?: return
+                viewModel.tab.post(exampleTab)
+            }
+
+            override fun onTabUnselected(tab: TabLayout.Tab?) { }
+        })
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
new file mode 100644
index 000000000..4b3b334fe
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
@@ -0,0 +1,39 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example
+
+import android.app.Application
+import com.splendo.kaluga.base.ApplicationHolder
+import com.splendo.kaluga.example.di.utilitiesModule
+import com.splendo.kaluga.example.di.viewModelModule
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
+
+class ExampleApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        ApplicationHolder.application = this
+
+        startKoin {
+            androidContext(this@ExampleApplication)
+            modules(utilitiesModule, viewModelModule)
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
new file mode 100644
index 000000000..9132c61e1
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
@@ -0,0 +1,112 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
+import com.splendo.kaluga.example.alerts.AlertsActivity
+import com.splendo.kaluga.example.architecture.ArchitectureInputActivity
+import com.splendo.kaluga.example.beacons.BeaconsActivity
+import com.splendo.kaluga.example.bluetooth.BluetoothActivity
+import com.splendo.kaluga.example.databinding.ViewListButtonBinding
+import com.splendo.kaluga.example.datetimepicker.DateTimePickerActivity
+import com.splendo.kaluga.example.keyboard.KeyboardManagerActivity
+import com.splendo.kaluga.example.link.LinksActivity
+import com.splendo.kaluga.example.loading.LoadingActivity
+import com.splendo.kaluga.example.location.LocationActivity
+import com.splendo.kaluga.example.permissions.PermissionsDemoListActivity
+import com.splendo.kaluga.example.platformspecific.PlatformSpecificActivity
+import com.splendo.kaluga.example.resources.ResourcesActivity
+import com.splendo.kaluga.example.shared.viewmodel.featureList.Feature
+import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewModel
+import com.splendo.kaluga.example.system.SystemActivity
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class FeaturesListFragment : KalugaViewModelFragment<FeatureListViewModel>(R.layout.fragment_features_list) {
+
+    override val viewModel: FeatureListViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<FeatureListNavigationAction> { action ->
+                when (action) {
+                    FeatureListNavigationAction.Location -> NavigationSpec.Activity<LocationActivity>()
+                    FeatureListNavigationAction.Permissions -> NavigationSpec.Activity<PermissionsDemoListActivity>()
+                    FeatureListNavigationAction.Alerts -> NavigationSpec.Activity<AlertsActivity>()
+                    FeatureListNavigationAction.DateTimePicker -> NavigationSpec.Activity<DateTimePickerActivity>()
+                    FeatureListNavigationAction.LoadingIndicator -> NavigationSpec.Activity<LoadingActivity>()
+                    FeatureListNavigationAction.Architecture -> NavigationSpec.Activity<ArchitectureInputActivity>()
+                    FeatureListNavigationAction.Keyboard -> NavigationSpec.Activity<KeyboardManagerActivity>()
+                    FeatureListNavigationAction.Links -> NavigationSpec.Activity<LinksActivity>()
+                    FeatureListNavigationAction.System -> NavigationSpec.Activity<SystemActivity>()
+                    FeatureListNavigationAction.Bluetooth -> NavigationSpec.Activity<BluetoothActivity>()
+                    FeatureListNavigationAction.Beacons -> NavigationSpec.Activity<BeaconsActivity>()
+                    FeatureListNavigationAction.Resources -> NavigationSpec.Activity<ResourcesActivity>()
+                    FeatureListNavigationAction.PlatformSpecific -> NavigationSpec.Activity<PlatformSpecificActivity>()
+                }
+            }
+        )
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val adapter = FeaturesAdapter(viewModel).apply {
+
+            view.findViewById<RecyclerView>(R.id.features_list).adapter = this
+        }
+        viewModel.feature.observeInitialized { adapter.features = it }
+    }
+}
+
+class FeaturesAdapter(private val viewModel: FeatureListViewModel) : RecyclerView.Adapter<FeaturesAdapter.FeatureViewHolder>() {
+
+    class FeatureViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
+        val button = binding.button
+    }
+
+    var features: List<Feature> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FeatureViewHolder {
+        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return FeatureViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = features.size
+
+    override fun onBindViewHolder(holder: FeatureViewHolder, position: Int) {
+        features.getOrNull(position)?.let { feature ->
+            holder.button.text = feature.title
+            holder.button.setOnClickListener { viewModel.onFeaturePressed(feature) }
+        } ?: run {
+            holder.button.text = null
+            holder.button.setOnClickListener(null)
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
new file mode 100644
index 000000000..0520e4b2f
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
@@ -0,0 +1,125 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.appcompat.widget.AppCompatButton
+import androidx.fragment.app.DialogFragment
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
+import com.splendo.kaluga.example.shared.viewmodel.info.DialogSpecRow
+import com.splendo.kaluga.example.shared.viewmodel.info.InfoNavigation
+import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
+import com.splendo.kaluga.example.shared.viewmodel.info.LinkSpecRow
+import com.splendo.kaluga.example.shared.viewmodel.info.MailSpecRow
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+import java.net.URL
+
+class InfoFragment : KalugaViewModelFragment<InfoViewModel>(R.layout.fragment_info) {
+
+    override val viewModel: InfoViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<InfoNavigation<*>> { action ->
+                when (action) {
+                    is InfoNavigation.Dialog -> {
+                        val title = action.bundle?.get(DialogSpecRow.TitleRow) ?: ""
+                        val message = action.bundle?.get(DialogSpecRow.MessageRow) ?: ""
+                        NavigationSpec.Dialog(
+                            createDialog = {
+                                InfoDialog(title, message)
+                            }
+                        )
+                    }
+                    is InfoNavigation.Link -> NavigationSpec.Browser(
+                        URL(action.bundle!!.get(LinkSpecRow.LinkRow)),
+                        NavigationSpec.Browser.Type.Normal
+                    )
+                    is InfoNavigation.Mail -> NavigationSpec.Email(
+                        NavigationSpec.Email.EmailSettings(
+                            to = action.bundle?.get(MailSpecRow.ToRow) ?: emptyList(),
+                            subject = action.bundle?.get(MailSpecRow.SubjectRow)
+                        )
+                    )
+                }
+            }
+        )
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+
+        super.onViewCreated(view, savedInstanceState)
+
+        val adapter = InfoAdapter(viewModel).apply {
+            view.findViewById<RecyclerView>(R.id.info_buttons)
+                .adapter = this
+        }
+        viewModel.buttons.observeInitialized { adapter.buttons = it }
+    }
+}
+
+class InfoAdapter(private val viewModel: InfoViewModel) : RecyclerView.Adapter<InfoAdapter.InfoViewHolder>() {
+
+    class InfoViewHolder(val button: AppCompatButton) : RecyclerView.ViewHolder(button)
+
+    var buttons: List<InfoViewModel.Button> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InfoViewHolder {
+        val button = LayoutInflater.from(parent.context).inflate(R.layout.view_list_button, parent, false) as AppCompatButton
+        return InfoViewHolder(button)
+    }
+
+    override fun getItemCount(): Int = buttons.size
+
+    override fun onBindViewHolder(holder: InfoViewHolder, position: Int) {
+        buttons.getOrNull(position)?.let { button ->
+            holder.button.text = button.title
+            holder.button.setOnClickListener { viewModel.onButtonPressed(button) }
+        } ?: run {
+            holder.button.text = null
+            holder.button.setOnClickListener(null)
+        }
+    }
+}
+
+class InfoDialog(val title: String, val message: String) : DialogFragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val v = inflater.inflate(R.layout.dialog_info, container, false)
+
+        v.findViewById<TextView>(R.id.title).text = title
+        v.findViewById<TextView>(R.id.message).text = message
+
+        return v
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
new file mode 100644
index 000000000..5fa52e39d
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
@@ -0,0 +1,42 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example.alerts
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import androidx.appcompat.widget.AppCompatButton
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+@SuppressLint("SetTextI18n")
+class AlertsActivity : KalugaViewModelActivity<AlertViewModel>(R.layout.activity_alerts) {
+
+    override val viewModel: AlertViewModel by viewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        findViewById<AppCompatButton>(R.id.btn_simple_alert).setOnClickListener { viewModel.showAlert() }
+        findViewById<AppCompatButton>(R.id.btn_dismissible_alert).setOnClickListener { viewModel.showAndDismissAfter(3) }
+        findViewById<AppCompatButton>(R.id.btn_alert_list).setOnClickListener { viewModel.showAlertWithList() }
+        findViewById<AppCompatButton>(R.id.btn_alert_input_field).setOnClickListener { viewModel.showAlertWithInput() }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/android/MainActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/android/MainActivity.kt
deleted file mode 100644
index be6b7c113..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/android/MainActivity.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.splendo.kaluga.example.android
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.splendo.kaluga.example.Greeting
-
-@Composable
-fun MyApplicationTheme(
-    darkTheme: Boolean = isSystemInDarkTheme(),
-    content: @Composable () -> Unit
-) {
-    val colors = if (darkTheme) {
-        darkColors(
-            primary = Color(0xFFBB86FC),
-            primaryVariant = Color(0xFF3700B3),
-            secondary = Color(0xFF03DAC5)
-        )
-    } else {
-        lightColors(
-            primary = Color(0xFF6200EE),
-            primaryVariant = Color(0xFF3700B3),
-            secondary = Color(0xFF03DAC5)
-        )
-    }
-    val typography = Typography(
-        body1 = TextStyle(
-            fontFamily = FontFamily.Default,
-            fontWeight = FontWeight.Normal,
-            fontSize = 16.sp
-        )
-    )
-    val shapes = Shapes(
-        small = RoundedCornerShape(4.dp),
-        medium = RoundedCornerShape(4.dp),
-        large = RoundedCornerShape(0.dp)
-    )
-
-    MaterialTheme(
-        colors = colors,
-        typography = typography,
-        shapes = shapes,
-        content = content
-    )
-}
-
-class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            MyApplicationTheme {
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colors.background
-                ) {
-                    Greeting(Greeting().greeting())
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun Greeting(text: String) {
-    Text(text = text)
-}
-
-@Preview
-@Composable
-fun DefaultPreview() {
-    MyApplicationTheme {
-        Greeting("Hello, Android!")
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
new file mode 100644
index 000000000..879360e98
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
@@ -0,0 +1,56 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example.architecture
+
+import android.os.Bundle
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityArchitectureDetailsBinding
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class ArchitectureDetailsActivity : KalugaViewModelActivity<ArchitectureDetailsViewModel>() {
+
+    companion object {
+        val resultCode = 1
+    }
+
+    override val viewModel: ArchitectureDetailsViewModel by viewModel {
+        val type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
+        intent.extras?.toTypedProperty(type)?.let { details ->
+            parametersOf(details)
+        } ?: parametersOf("", 0)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityArchitectureDetailsBinding.inflate(layoutInflater, null, false)
+        setContentView(binding.root)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+    }
+
+    override fun onBackPressed() {
+        viewModel.onClosePressed()
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
new file mode 100644
index 000000000..b4e3f51fa
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
@@ -0,0 +1,74 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example.architecture
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContract
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityArchitectureInputBinding
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class ArchitectureInputActivity : KalugaViewModelActivity<ArchitectureInputViewModel>() {
+
+    inner class Contract : ActivityResultContract<Intent, InputDetails?>() {
+
+        override fun createIntent(context: Context, input: Intent): Intent = input
+
+        override fun parseResult(
+            resultCode: Int,
+            intent: Intent?
+        ): InputDetails? = intent?.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(InputDetails.serializer()))
+    }
+
+    override val viewModel: ArchitectureInputViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<SingleValueNavigationAction<InputDetails>> {
+                NavigationSpec.Activity<ArchitectureDetailsActivity>(
+                    launchType = NavigationSpec.Activity.LaunchType.ActivityContract<ArchitectureInputActivity> { contract }
+                )
+            }
+        )
+    }
+
+    private val contract = registerForActivityResult(Contract()) { inputDetails ->
+        inputDetails?.let {
+            viewModel.nameInput.post(it.name)
+            viewModel.numberInput.post(it.number.toString())
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityArchitectureInputBinding.inflate(layoutInflater, null, false)
+        setContentView(binding.root)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt
new file mode 100644
index 000000000..b1d59b78b
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt
@@ -0,0 +1,81 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.beacons
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import androidx.core.view.forEach
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.ActivityBeaconsBinding
+import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel
+import kotlinx.coroutines.runBlocking
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class BeaconsActivity : KalugaViewModelActivity<BeaconsListViewModel>() {
+
+    override val viewModel: BeaconsListViewModel by viewModel()
+
+    private lateinit var adapter: BeaconsAdapter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityBeaconsBinding.inflate(layoutInflater, null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+        adapter = BeaconsAdapter(this)
+        binding.beaconsList.adapter = adapter
+        binding.beaconsList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
+
+        viewModel.isScanning.observe {
+            invalidateOptionsMenu()
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.bluetooth_menu, menu)
+        return true
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu?): Boolean = runBlocking {
+        val scanning = viewModel.isScanning.current
+        menu?.forEach { item ->
+            when (item.itemId) {
+                R.id.start_scanning -> item.isVisible = !scanning
+                R.id.stop_scanning -> item.isVisible = scanning
+            }
+        }
+        super.onPrepareOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.start_scanning,
+            R.id.stop_scanning -> {
+                viewModel.onScanPressed()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
new file mode 100644
index 000000000..1c76de087
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
@@ -0,0 +1,64 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.beacons
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.example.databinding.BeaconItemBinding
+import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListBeaconViewModel
+
+class BeaconsAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BeaconsAdapter.BeaconItemViewHolder>() {
+
+    class BeaconItemViewHolder(val binding: BeaconItemBinding) : RecyclerView.ViewHolder(binding.root)
+
+    internal var beacons: List<BeaconsListBeaconViewModel> = emptyList()
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BeaconItemViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = BeaconItemBinding.inflate(inflater, parent, false)
+        binding.lifecycleOwner = lifecycleOwner
+        return BeaconItemViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int {
+        return beacons.size
+    }
+
+    override fun onBindViewHolder(holder: BeaconItemViewHolder, position: Int) {
+        val viewModel = beacons[position]
+        holder.binding.viewModel = viewModel
+    }
+
+    override fun onViewAttachedToWindow(holder: BeaconItemViewHolder) {
+        super.onViewAttachedToWindow(holder)
+
+        holder.binding.viewModel?.didResume()
+    }
+
+    override fun onViewDetachedFromWindow(holder: BeaconItemViewHolder) {
+        super.onViewDetachedFromWindow(holder)
+
+        holder.binding.viewModel?.didPause()
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
new file mode 100644
index 000000000..74e5ad859
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
@@ -0,0 +1,31 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.beacons
+
+import androidx.databinding.BindingAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListBeaconViewModel
+
+object BeaconsBinding {
+    @BindingAdapter("beacons")
+    @JvmStatic
+    fun bindBeacons(view: RecyclerView, beacons: List<BeaconsListBeaconViewModel>?) {
+        val beaconsAdapter = view.adapter as? BeaconsAdapter ?: return
+        beaconsAdapter.beacons = beacons ?: emptyList()
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
new file mode 100644
index 000000000..d07256ba2
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
@@ -0,0 +1,93 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bluetooth
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import androidx.core.view.forEach
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.ActivityBluetoothBinding
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel
+import kotlinx.coroutines.runBlocking
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class BluetoothActivity : KalugaViewModelActivity<BluetoothListViewModel>() {
+
+    override val viewModel: BluetoothListViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<BluetoothListNavigation> {
+                NavigationSpec.Activity<BluetoothMoreActivity>()
+            }
+        )
+    }
+
+    private lateinit var adapter: BluetoothAdapter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityBluetoothBinding.inflate(layoutInflater, null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+        adapter = BluetoothAdapter(this)
+        binding.devicesList.adapter = adapter
+        binding.devicesList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
+
+        viewModel.isScanning.observe {
+            invalidateOptionsMenu()
+        }
+
+        viewModel.title.observe(::setTitle)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.bluetooth_menu, menu)
+        return true
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu?): Boolean = runBlocking {
+        val scanning = viewModel.isScanning.current
+        menu?.forEach { item ->
+            when (item.itemId) {
+                R.id.start_scanning -> item.isVisible = !scanning
+                R.id.stop_scanning -> item.isVisible = scanning
+            }
+        }
+        super.onPrepareOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.start_scanning,
+            R.id.stop_scanning -> {
+                viewModel.onScanPressed()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
new file mode 100644
index 000000000..5010367be
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
@@ -0,0 +1,76 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bluetooth
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.example.databinding.BluetoothItemBinding
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListDeviceViewModel
+
+object DevicesBinding {
+
+    @BindingAdapter("devices")
+    @JvmStatic
+    fun bindDevices(view: RecyclerView, devices: List<BluetoothListDeviceViewModel>?) {
+        val bluetoothAdapter = view.adapter as? BluetoothAdapter
+            ?: return
+        bluetoothAdapter.bluetoothDevices = devices ?: emptyList()
+    }
+}
+
+class BluetoothAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothAdapter.BluetoothItemViewHolder>() {
+
+    class BluetoothItemViewHolder(val binding: BluetoothItemBinding) : RecyclerView.ViewHolder(binding.root)
+
+    internal var bluetoothDevices: List<BluetoothListDeviceViewModel> = emptyList()
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BluetoothItemViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = BluetoothItemBinding.inflate(inflater, parent, false)
+        binding.lifecycleOwner = lifecycleOwner
+        return BluetoothItemViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int {
+        return bluetoothDevices.size
+    }
+
+    override fun onBindViewHolder(holder: BluetoothItemViewHolder, position: Int) {
+        val viewModel = bluetoothDevices[position]
+        holder.binding.viewModel = viewModel
+    }
+
+    override fun onViewAttachedToWindow(holder: BluetoothItemViewHolder) {
+        super.onViewAttachedToWindow(holder)
+
+        holder.binding.viewModel?.didResume()
+    }
+
+    override fun onViewDetachedFromWindow(holder: BluetoothItemViewHolder) {
+        super.onViewDetachedFromWindow(holder)
+
+        holder.binding.viewModel?.didPause()
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
new file mode 100644
index 000000000..a0b9e6322
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
@@ -0,0 +1,78 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bluetooth
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.example.databinding.BluetoothCharacteristicItemBinding
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothCharacteristicViewModel
+
+object CharacteristicsBinding {
+
+    @BindingAdapter("characteristics")
+    @JvmStatic
+    fun bindCharacteristics(view: RecyclerView, characteristics: List<BluetoothCharacteristicViewModel>?) {
+        val characteristicAdapter = view.adapter as? BluetoothCharacteristicAdapter
+            ?: return
+        characteristicAdapter.characteristics = characteristics ?: emptyList()
+    }
+}
+
+class BluetoothCharacteristicAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothCharacteristicAdapter.BluetoothCharacteristicItemViewHolder>() {
+
+    class BluetoothCharacteristicItemViewHolder(val characteristicItem: BluetoothCharacteristicItemBinding) : RecyclerView.ViewHolder(characteristicItem.root)
+
+    internal var characteristics = emptyList<BluetoothCharacteristicViewModel>()
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): BluetoothCharacteristicItemViewHolder {
+        val binding = BluetoothCharacteristicItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        binding.lifecycleOwner = lifecycleOwner
+        binding.descriptors.adapter = BluetoothDescriptorAdapter(lifecycleOwner)
+        return BluetoothCharacteristicItemViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int {
+        return characteristics.size
+    }
+
+    override fun onBindViewHolder(holder: BluetoothCharacteristicItemViewHolder, position: Int) {
+        holder.characteristicItem.viewModel = characteristics[position]
+    }
+
+    override fun onViewAttachedToWindow(holder: BluetoothCharacteristicItemViewHolder) {
+        super.onViewAttachedToWindow(holder)
+
+        holder.characteristicItem.viewModel?.didResume()
+    }
+
+    override fun onViewDetachedFromWindow(holder: BluetoothCharacteristicItemViewHolder) {
+        super.onViewDetachedFromWindow(holder)
+
+        holder.characteristicItem.viewModel?.didPause()
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
new file mode 100644
index 000000000..e59ee3b49
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
@@ -0,0 +1,77 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bluetooth
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.example.databinding.BluetoothDescriptorItemBinding
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDescriptorViewModel
+
+object DescriptorsBinding {
+
+    @BindingAdapter("descriptors")
+    @JvmStatic
+    fun bindDescriptors(view: RecyclerView, descriptors: List<BluetoothDescriptorViewModel>?) {
+        val descriptorAdapter = view.adapter as? BluetoothDescriptorAdapter
+            ?: return
+        descriptorAdapter.descriptors = descriptors ?: emptyList()
+    }
+}
+
+class BluetoothDescriptorAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothDescriptorAdapter.BluetoothDescriptorItemViewHolder>() {
+
+    class BluetoothDescriptorItemViewHolder(val descriptorItem: BluetoothDescriptorItemBinding) : RecyclerView.ViewHolder(descriptorItem.root)
+
+    var descriptors = emptyList<BluetoothDescriptorViewModel>()
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): BluetoothDescriptorItemViewHolder {
+        val binding = BluetoothDescriptorItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        binding.lifecycleOwner = lifecycleOwner
+        return BluetoothDescriptorItemViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int {
+        return descriptors.size
+    }
+
+    override fun onBindViewHolder(holder: BluetoothDescriptorItemViewHolder, position: Int) {
+        holder.descriptorItem.viewModel = descriptors[position]
+    }
+
+    override fun onViewAttachedToWindow(holder: BluetoothDescriptorItemViewHolder) {
+        super.onViewAttachedToWindow(holder)
+
+        holder.descriptorItem.viewModel?.didResume()
+    }
+
+    override fun onViewDetachedFromWindow(holder: BluetoothDescriptorItemViewHolder) {
+        super.onViewDetachedFromWindow(holder)
+
+        holder.descriptorItem.viewModel?.didPause()
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
new file mode 100644
index 000000000..22b422dfd
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
@@ -0,0 +1,49 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bluetooth
+
+import android.os.Bundle
+import com.splendo.kaluga.architecture.navigation.toNavigationBundle
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityBluetoothMoreBinding
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetailsSpec
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetailsSpecRow
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class BluetoothMoreActivity : KalugaViewModelActivity<BluetoothDeviceDetailViewModel>() {
+
+    override val viewModel: BluetoothDeviceDetailViewModel by viewModel {
+        val deviceDetailsSpec = DeviceDetailsSpec()
+        intent.extras?.toNavigationBundle(deviceDetailsSpec)?.let { bundle ->
+            parametersOf(bundle.get(DeviceDetailsSpecRow.UUIDRow))
+        } ?: parametersOf("")
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityBluetoothMoreBinding.inflate(layoutInflater, null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+
+        binding.serviceList.adapter = BluetoothServiceAdapter(this)
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
new file mode 100644
index 000000000..46711f70e
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
@@ -0,0 +1,78 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bluetooth
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.example.databinding.BluetoothServiceItemBinding
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothServiceViewModel
+
+object ServicesBinding {
+
+    @BindingAdapter("services")
+    @JvmStatic
+    fun bindServices(view: RecyclerView, services: List<BluetoothServiceViewModel>?) {
+        val serviceAdapter = view.adapter as? BluetoothServiceAdapter
+            ?: return
+        serviceAdapter.services = services ?: emptyList()
+    }
+}
+
+class BluetoothServiceAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothServiceAdapter.BluetoothServiceItemViewHolder>() {
+
+    class BluetoothServiceItemViewHolder(val serviceItem: BluetoothServiceItemBinding) : RecyclerView.ViewHolder(serviceItem.root)
+
+    internal var services: List<BluetoothServiceViewModel> = emptyList()
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): BluetoothServiceItemViewHolder {
+        val binding = BluetoothServiceItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        binding.lifecycleOwner = lifecycleOwner
+        binding.characteristicsList.adapter = BluetoothCharacteristicAdapter(lifecycleOwner)
+        return BluetoothServiceItemViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int {
+        return services.size
+    }
+
+    override fun onBindViewHolder(holder: BluetoothServiceItemViewHolder, position: Int) {
+        holder.serviceItem.viewModel = services[position]
+    }
+
+    override fun onViewAttachedToWindow(holder: BluetoothServiceItemViewHolder) {
+        super.onViewAttachedToWindow(holder)
+
+        holder.serviceItem.viewModel?.didResume()
+    }
+
+    override fun onViewDetachedFromWindow(holder: BluetoothServiceItemViewHolder) {
+        super.onViewDetachedFromWindow(holder)
+
+        holder.serviceItem.viewModel?.didPause()
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt
new file mode 100644
index 000000000..298917892
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt
@@ -0,0 +1,32 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bottomSheet
+
+import androidx.compose.runtime.Composable
+import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.example.bottomSheet.ui.BottomSheetParentLayout
+
+class BottomSheetActivity : KalugaViewModelComposeActivity<BaseLifecycleViewModel>() {
+    override val viewModel = BaseLifecycleViewModel()
+
+    @Composable
+    override fun Layout(viewModel: BaseLifecycleViewModel) {
+        BottomSheetParentLayout()
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt
new file mode 100644
index 000000000..7b77eb5f9
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt
@@ -0,0 +1,73 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bottomSheet.ui
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Button
+import androidx.compose.material.ModalBottomSheetState
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
+import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.store
+import com.splendo.kaluga.example.bottomSheet.viewModel.bottomSheetNavigationRouteMapper
+import com.splendo.kaluga.example.contacts.ui.Padding
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetViewModel
+
+@Composable
+fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
+    val navigator = ModalBottomSheetNavigator(
+        contentNavHostController,
+        sheetContentNavHostController,
+        sheetState,
+        rememberCoroutineScope(),
+        ::bottomSheetNavigationRouteMapper,
+    )
+
+    val viewModel = store {
+        remember {
+            BottomSheetViewModel(navigator)
+        }
+    }
+
+    ViewModelComposable(viewModel) {
+        HardwareBackButtonNavigation(onBackButtonClickHandler = { onClosePressed() })
+        Column(
+            Modifier
+                .fillMaxWidth()
+                .padding(Padding.default)
+        ) {
+            Text(text)
+            Button(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(Padding.default),
+                onClick = { onSubPagePressed() }
+            ) {
+                Text(buttonText)
+            }
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt
new file mode 100644
index 000000000..63e4549ab
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt
@@ -0,0 +1,124 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bottomSheet.ui
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Button
+import androidx.compose.material.ModalBottomSheetState
+import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.material.Text
+import androidx.compose.material.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import com.google.android.material.composethemeadapter.MdcTheme
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRouteController
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetSheetContentRouteController
+import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
+import com.splendo.kaluga.architecture.compose.navigation.NavHostRouteController
+import com.splendo.kaluga.architecture.compose.navigation.NavigatingModalBottomSheetLayout
+import com.splendo.kaluga.architecture.compose.navigation.route
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.store
+import com.splendo.kaluga.example.bottomSheet.viewModel.bottomSheetParentNavigationRouteMapper
+import com.splendo.kaluga.example.contacts.ui.Padding
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentViewModel
+
+@Composable
+fun BottomSheetParentLayout() {
+    MdcTheme {
+        val bottomSheetRouteController = BottomSheetRouteController(
+            NavHostRouteController(rememberNavController()),
+            BottomSheetSheetContentRouteController(
+                rememberNavController(),
+                rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
+                rememberCoroutineScope()
+            )
+        )
+
+        bottomSheetRouteController.NavigatingModalBottomSheetLayout(
+            sheetContent = { contentNavHostController, sheetContentNavHostController, sheetState ->
+                composable(BottomSheetParentNavigation.ShowSheet.route()) {
+                    BottomSheetLayout(contentNavHostController, sheetContentNavHostController, sheetState)
+                }
+                composable(BottomSheetNavigation.SubPage.route()) {
+                    BottomSheetSubPageLayout(
+                        contentNavHostController, sheetContentNavHostController, sheetState
+                    )
+                }
+            },
+            contentRoot = { contentNavHostController, sheetContentNavHostController, sheetState ->
+                BottomSheetParentLayoutContent(contentNavHostController, sheetContentNavHostController, sheetState)
+            },
+            content = { contentNavHostController, _, _ ->
+                composable(BottomSheetParentNavigation.SubPage.route()) {
+                    BottomSheetParentSubPageLayout(contentNavHostController)
+                }
+            }
+        )
+    }
+}
+
+@Composable
+fun BottomSheetParentLayoutContent(contentNavHostController: NavHostController, sheetNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
+
+    val navigator = ModalBottomSheetNavigator(
+        NavHostRouteController(contentNavHostController),
+        BottomSheetSheetContentRouteController(
+            sheetNavHostController,
+            sheetState,
+            rememberCoroutineScope()
+        ),
+        ::bottomSheetParentNavigationRouteMapper
+    )
+
+    val viewModel = store {
+        remember {
+            BottomSheetParentViewModel(navigator)
+        }
+    }
+
+    ViewModelComposable(viewModel) {
+        Column(Modifier.fillMaxWidth()) {
+            Button(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(Padding.default),
+                onClick = { onShowSheetPressed() }
+            ) {
+                Text(sheetText)
+            }
+            Button(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(Padding.default),
+                onClick = { onSubPagePressed() }
+            ) {
+                Text(subPageText)
+            }
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
new file mode 100644
index 000000000..20f93e69c
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
@@ -0,0 +1,53 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bottomSheet.ui
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
+import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.store
+import com.splendo.kaluga.example.bottomSheet.viewModel.bottomSheetParentSubPageNavigationRouteMapper
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentSubPageViewModel
+
+@Composable
+fun BottomSheetParentSubPageLayout(navHostController: NavHostController) {
+    val navigator = RouteNavigator(
+        navHostController,
+        ::bottomSheetParentSubPageNavigationRouteMapper
+    )
+
+    val viewModel = store {
+        remember {
+            BottomSheetParentSubPageViewModel(navigator)
+        }
+    }
+
+    ViewModelComposable(viewModel) {
+        HardwareBackButtonNavigation(onBackButtonClickHandler = { viewModel.onBackPressed() })
+        Column(Modifier.fillMaxWidth()) {
+            Text(text)
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt
new file mode 100644
index 000000000..76fce4ae4
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt
@@ -0,0 +1,79 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bottomSheet.ui
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Button
+import androidx.compose.material.ModalBottomSheetState
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
+import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.store
+import com.splendo.kaluga.example.bottomSheet.viewModel.bottomSheetSubPageNavigationRouteMapper
+import com.splendo.kaluga.example.contacts.ui.Padding
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetSubPageViewModel
+
+@Composable
+fun BottomSheetSubPageLayout(
+    contentNavHostController: NavHostController,
+    sheetContentNavHostController: NavHostController,
+    sheetState: ModalBottomSheetState
+) {
+    val navigator = ModalBottomSheetNavigator(
+        contentNavHostController,
+        sheetContentNavHostController,
+        sheetState,
+        rememberCoroutineScope(),
+        ::bottomSheetSubPageNavigationRouteMapper
+    )
+
+    val viewModel = store {
+        remember {
+            BottomSheetSubPageViewModel(navigator)
+        }
+    }
+
+    ViewModelComposable(viewModel) {
+        HardwareBackButtonNavigation(onBackButtonClickHandler = { viewModel.onBackPressed() })
+        Column(
+            Modifier
+                .fillMaxWidth()
+                .padding(Padding.default)
+        ) {
+            Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
+                Button(
+                    modifier = Modifier.padding(Padding.default),
+                    onClick = { onClosePressed() }
+                ) {
+                    Text("X")
+                }
+            }
+            Text(text)
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt
new file mode 100644
index 000000000..616631770
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt
@@ -0,0 +1,59 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.bottomSheet.viewModel
+
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRoute
+import com.splendo.kaluga.architecture.compose.navigation.Route
+import com.splendo.kaluga.architecture.compose.navigation.bottomSheetContent
+import com.splendo.kaluga.architecture.compose.navigation.bottomSheetSheetContent
+import com.splendo.kaluga.architecture.compose.navigation.next
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentSubPageNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetSubPageNavigation
+
+/** Maps a navigation action to a route string. */
+internal fun bottomSheetParentNavigationRouteMapper(action: BottomSheetParentNavigation): BottomSheetRoute {
+    return when (action) {
+        is BottomSheetParentNavigation.SubPage -> action.next.bottomSheetContent
+        is BottomSheetParentNavigation.ShowSheet -> action.next.bottomSheetSheetContent
+    }
+}
+
+/** Maps a navigation action to a route string. */
+internal fun bottomSheetParentSubPageNavigationRouteMapper(action: BottomSheetParentSubPageNavigation): Route {
+    return when (action) {
+        is BottomSheetParentSubPageNavigation.Back -> Route.Back
+    }
+}
+
+/** Maps a navigation action to a route string. */
+internal fun bottomSheetNavigationRouteMapper(action: BottomSheetNavigation): BottomSheetRoute {
+    return when (action) {
+        is BottomSheetNavigation.Close -> Route.Close.bottomSheetSheetContent
+        is BottomSheetNavigation.SubPage -> action.next.bottomSheetSheetContent
+    }
+}
+
+/** Maps a navigation action to a route string. */
+internal fun bottomSheetSubPageNavigationRouteMapper(action: BottomSheetSubPageNavigation): BottomSheetRoute {
+    return when (action) {
+        is BottomSheetSubPageNavigation.Close -> Route.Close.bottomSheetSheetContent
+        is BottomSheetSubPageNavigation.Back -> Route.Back.bottomSheetSheetContent
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt
new file mode 100644
index 000000000..01d6d45f2
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt
@@ -0,0 +1,32 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.contacts
+
+import androidx.compose.runtime.Composable
+import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.example.contacts.ui.ContactsLayout
+
+class ContactsActivity : KalugaViewModelComposeActivity<BaseLifecycleViewModel>() {
+    override val viewModel = BaseLifecycleViewModel()
+
+    @Composable
+    override fun Layout(viewModel: BaseLifecycleViewModel) {
+        ContactsLayout()
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt
new file mode 100644
index 000000000..c5b96f85c
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt
@@ -0,0 +1,97 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.contacts.ui
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.Button
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
+import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
+import com.splendo.kaluga.architecture.compose.navigation.rememberCombinedNavigator
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.store
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.contacts.viewModel.contactDetailsNavigationActivityMapper
+import com.splendo.kaluga.example.contacts.viewModel.contactDetailsNavigationRouteMapper
+import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsNavigation
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsViewModel
+
+@Composable
+fun ContactDetailsLayout(contactDetails: ContactDetails, navHostController: NavHostController) {
+    val routeNavigator = RouteNavigator(
+        navHostController,
+        ::contactDetailsNavigationRouteMapper
+    )
+
+    val navigator = rememberCombinedNavigator { action: ContactDetailsNavigation<*> ->
+        when (action) {
+            is ContactDetailsNavigation.Close -> routeNavigator
+            is ContactDetailsNavigation.SendEmail -> ::contactDetailsNavigationActivityMapper.toActivityNavigator()
+        }
+    }
+
+    val viewModel = store {
+        remember {
+            ContactDetailsViewModel(contactDetails, navigator)
+        }
+    }
+    ViewModelComposable(viewModel) {
+        HardwareBackButtonNavigation(::back)
+
+        Column {
+            val image = painterResource(id = R.drawable.ic_account)
+            Image(
+                modifier = Modifier
+                    .size(320.dp)
+                    .align(CenterHorizontally),
+                painter = image,
+                contentDescription = ""
+            )
+
+            Column(
+                modifier = Modifier.padding(horizontal = Padding.x2)
+                    .fillMaxWidth()
+            ) {
+                Text(text = "Name:", style = MaterialTheme.typography.h6)
+                Text(text = contactDetails.name, style = MaterialTheme.typography.body1)
+                DefaultSpacer()
+
+                Text(text = "Email:", style = MaterialTheme.typography.h6)
+                Text(text = contactDetails.email, style = MaterialTheme.typography.body1)
+                DefaultSpacer()
+
+                Button(onClick = ::sendEmail) {
+                    Text(text = sendEmailButtonText, style = MaterialTheme.typography.button)
+                }
+            }
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt
new file mode 100644
index 000000000..a5c221458
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt
@@ -0,0 +1,53 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.contacts.ui
+
+import androidx.compose.runtime.Composable
+import androidx.navigation.compose.rememberNavController
+import com.google.android.material.composethemeadapter.MdcTheme
+import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
+import com.splendo.kaluga.architecture.compose.navigation.SetupNavHost
+import com.splendo.kaluga.architecture.compose.navigation.composable
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.example.contacts.viewModel.contactListNavigationRouteMapper
+import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
+
+@Composable
+fun ContactsLayout() {
+    MdcTheme {
+        val navigator = RouteNavigator(
+            rememberNavController(),
+            ::contactListNavigationRouteMapper
+        )
+
+        navigator.SetupNavHost(
+            rootView = {
+                ContactsListLayout(navigator = navigator)
+            }
+        ) { navHostController ->
+            composable<ContactDetails, ContactsListNavigation.ShowContactDetails>(
+                type = NavigationBundleSpecType.SerializedType(
+                    ContactDetails.serializer()
+                )
+            ) { details ->
+                ContactDetailsLayout(details, navHostController)
+            }
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt
new file mode 100644
index 000000000..2e72cd4e3
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt
@@ -0,0 +1,100 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.contacts.ui
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.splendo.kaluga.architecture.compose.state
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.store
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListViewModel
+
+@Composable
+fun ContactsListLayout(navigator: Navigator<ContactsListNavigation<*>>) {
+    val viewModel = store {
+        remember {
+            ContactsListViewModel(navigator)
+        }
+    }
+
+    ViewModelComposable(viewModel) {
+        val items by contacts.state()
+        LazyColumn(modifier = Modifier.padding(Padding.default)) {
+            items(items) { contactDetails ->
+                ListItem(contactDetails) {
+                    onContactClick(contactDetails)
+                }
+
+                DefaultSpacer()
+            }
+        }
+    }
+}
+
+@Composable
+private fun ListItem(
+    contactDetails: ContactDetails,
+    onClickHandler: () -> Unit
+) {
+    Row(
+        modifier = Modifier
+            .clickable(onClick = onClickHandler)
+            .fillMaxWidth()
+    ) {
+        val image = painterResource(id = R.drawable.ic_account)
+        Image(
+            modifier = Modifier.size(48.dp),
+            painter = image,
+            contentDescription = ""
+        )
+
+        DefaultSpacer()
+
+        Text(
+            modifier = Modifier.align(CenterVertically),
+            text = contactDetails.name,
+            style = MaterialTheme.typography.h5
+        )
+    }
+}
+
+@Composable
+@Preview
+private fun ListItemPreview() {
+    ListItem(ContactDetails("name", "email")) { }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt
new file mode 100644
index 000000000..4bac3e533
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt
@@ -0,0 +1,17 @@
+package com.splendo.kaluga.example.contacts.ui
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+object Padding {
+    val default = 8.dp
+    val x2 = 16.dp
+}
+
+@Composable
+fun DefaultSpacer() {
+    Spacer(modifier = Modifier.size(Padding.default))
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt
new file mode 100644
index 000000000..09e1f9b2d
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt
@@ -0,0 +1,52 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.contacts.viewModel
+
+import com.splendo.kaluga.architecture.compose.navigation.Route
+import com.splendo.kaluga.architecture.compose.navigation.next
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsNavigation
+import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
+
+/** Maps a navigation action to a route string. */
+internal fun contactListNavigationRouteMapper(action: ContactsListNavigation<*>): Route {
+    return when (action) {
+        is ContactsListNavigation.ShowContactDetails -> action.next
+    }
+}
+
+/** Maps a navigation action to a route string. */
+internal fun contactDetailsNavigationRouteMapper(action: ContactDetailsNavigation<*>): Route {
+    return when (action) {
+        is ContactDetailsNavigation.Close -> Route.Back
+        else -> throw IllegalStateException("Unsupported action: ${action::class.simpleName}")
+    }
+}
+
+/** Maps a navigation action to a NavigationSpec. */
+internal fun contactDetailsNavigationActivityMapper(action: ContactDetailsNavigation<*>): NavigationSpec {
+    return when (action) {
+        is ContactDetailsNavigation.SendEmail -> NavigationSpec.Email(
+            emailSettings = NavigationSpec.Email.EmailSettings(
+                type = NavigationSpec.Email.Type.Plain,
+                to = listOf(action.bundle!!.get(action.type))
+            )
+        )
+        else -> throw IllegalStateException("Unsupported action: ${action::class.simpleName}")
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt
new file mode 100644
index 000000000..b766243e4
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt
@@ -0,0 +1,21 @@
+package com.splendo.kaluga.example.datetimepicker
+
+import android.os.Bundle
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityDateTimePickerBinding
+import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
+import org.koin.android.ext.android.inject
+
+class DateTimePickerActivity : KalugaViewModelActivity<DateTimePickerViewModel>() {
+
+    override val viewModel: DateTimePickerViewModel by inject()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityDateTimePickerBinding.inflate(layoutInflater, null, false)
+        setContentView(binding.root)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
new file mode 100644
index 000000000..4e652e223
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
@@ -0,0 +1,221 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example.di
+
+/* ktlint-disable no-wildcard-imports */
+import com.splendo.kaluga.alerts.AlertPresenter
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.base.singleThreadDispatcher
+import com.splendo.kaluga.bluetooth.Bluetooth
+import com.splendo.kaluga.bluetooth.BluetoothBuilder
+import com.splendo.kaluga.bluetooth.beacons.Beacons
+import com.splendo.kaluga.bluetooth.scanner.BaseScanner
+import com.splendo.kaluga.datetimepicker.DateTimePickerPresenter
+import com.splendo.kaluga.example.architecture.ArchitectureDetailsActivity
+import com.splendo.kaluga.example.shared.viewmodel.ExampleTabNavigation
+import com.splendo.kaluga.example.shared.viewmodel.ExampleViewModel
+import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
+import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListNavigation
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel
+import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
+import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewModel
+import com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel
+import com.splendo.kaluga.example.shared.viewmodel.info.InfoNavigation
+import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
+import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
+import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
+import com.splendo.kaluga.example.shared.viewmodel.link.BrowserSpecRow
+import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
+import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
+import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
+import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListViewModel
+import com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel
+import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
+import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
+import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
+import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationActions
+import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
+import com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel
+import com.splendo.kaluga.hud.HUD
+import com.splendo.kaluga.keyboard.FocusHandler
+import com.splendo.kaluga.keyboard.KeyboardManager
+import com.splendo.kaluga.links.LinksBuilder
+import com.splendo.kaluga.location.LocationStateRepoBuilder
+import com.splendo.kaluga.logging.RestrictedLogLevel
+import com.splendo.kaluga.logging.RestrictedLogger
+import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.Permission
+import com.splendo.kaluga.permissions.base.Permissions
+import com.splendo.kaluga.permissions.base.PermissionsBuilder
+import com.splendo.kaluga.permissions.location.LocationPermission
+import com.splendo.kaluga.permissions.registerAllPermissions
+import com.splendo.kaluga.resources.StyledStringBuilder
+import com.splendo.kaluga.review.ReviewManager
+import com.splendo.kaluga.system.network.state.NetworkStateRepoBuilder
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.module
+import kotlin.time.Duration.Companion.minutes
+
+val utilitiesModule = module {
+    single {
+        Permissions(
+            PermissionsBuilder().apply {
+                MainScope().launch {
+                    registerAllPermissions(
+                        settings = BasePermissionManager.Settings(
+                            logger = RestrictedLogger(RestrictedLogLevel.Verbose)
+                        )
+                    )
+                }
+            },
+            coroutineContext = singleThreadDispatcher("Permissions")
+        )
+    }
+    single { LocationStateRepoBuilder() }
+    single {
+        BluetoothBuilder().create({ BaseScanner.Settings(get()) })
+    }
+    single { Beacons(get<Bluetooth>(), timeout = 1.minutes) }
+}
+
+val viewModelModule = module {
+    viewModel { (navigator: Navigator<ExampleTabNavigation>) ->
+        ExampleViewModel(
+            navigator
+        )
+    }
+
+    viewModel { (navigator: Navigator<FeatureListNavigationAction>) ->
+        FeatureListViewModel(
+            navigator
+        )
+    }
+
+    viewModel { (navigator: Navigator<InfoNavigation<*>>) ->
+        InfoViewModel(
+            ReviewManager.Builder(),
+            navigator
+        )
+    }
+
+    viewModel { (navigator: Navigator<PermissionsListNavigationAction>) ->
+        PermissionsListViewModel(
+            navigator
+        )
+    }
+
+    viewModel { (permission: Permission) -> PermissionViewModel(get(), permission) }
+
+    viewModel { (permission: LocationPermission) -> LocationViewModel(permission, get()) }
+
+    viewModel { (navigator: Navigator<SingleValueNavigationAction<InputDetails>>) ->
+        ArchitectureInputViewModel(
+            navigator
+        )
+    }
+
+    viewModel { (initialDetail: InputDetails) ->
+        ArchitectureDetailsViewModel(
+            initialDetail,
+            ActivityNavigator {
+                NavigationSpec.Close(ArchitectureDetailsActivity.resultCode)
+            }
+        )
+    }
+
+    viewModel {
+        AlertViewModel(AlertPresenter.Builder())
+    }
+
+    viewModel {
+        DateTimePickerViewModel(DateTimePickerPresenter.Builder())
+    }
+
+    viewModel {
+        HudViewModel(HUD.Builder())
+    }
+
+    viewModel { (keyboardBuilder: KeyboardManager.Builder, focusHandler: FocusHandler) ->
+        KeyboardViewModel(keyboardBuilder, focusHandler)
+    }
+
+    viewModel { (navigator: Navigator<BrowserNavigationActions<BrowserSpecRow>>) ->
+        LinksViewModel(
+            LinksBuilder(),
+            AlertPresenter.Builder(),
+            navigator
+        )
+    }
+
+    viewModel { (navigator: Navigator<SystemNavigationActions<Unit>>) ->
+        SystemViewModel(
+            navigator
+        )
+    }
+
+    viewModel {
+        NetworkViewModel(NetworkStateRepoBuilder(get()))
+    }
+
+    viewModel { (navigator: Navigator<BluetoothListNavigation>) ->
+        BluetoothListViewModel(
+            get(),
+            navigator
+        )
+    }
+
+    viewModel { (identifier: com.splendo.kaluga.bluetooth.device.Identifier) ->
+        BluetoothDeviceDetailViewModel(get(), identifier)
+    }
+
+    viewModel {
+        BeaconsListViewModel(get())
+    }
+
+    viewModel { (navigator: Navigator<ResourcesListNavigationAction>) ->
+        ResourcesListViewModel(
+            navigator
+        )
+    }
+
+    viewModel {
+        ColorViewModel(AlertPresenter.Builder())
+    }
+
+    viewModel {
+        LabelViewModel(StyledStringBuilder.Provider())
+    }
+
+    viewModel {
+        ButtonViewModel(StyledStringBuilder.Provider(), AlertPresenter.Builder())
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
new file mode 100644
index 000000000..15ffc09e7
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
@@ -0,0 +1,46 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example.keyboard
+
+import android.os.Bundle
+import androidx.appcompat.widget.AppCompatButton
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
+import com.splendo.kaluga.keyboard.ViewFocusHandler
+import com.splendo.kaluga.keyboard.keyboardManagerBuilder
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class KeyboardManagerActivity : KalugaViewModelActivity<KeyboardViewModel>(R.layout.activity_keyboard_manager) {
+
+    override val viewModel: KeyboardViewModel by viewModel {
+        parametersOf(
+            keyboardManagerBuilder(),
+            ViewFocusHandler(R.id.edit_field)
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        findViewById<AppCompatButton>(R.id.btn_show_keyboard).setOnClickListener { viewModel.onShowPressed() }
+        findViewById<AppCompatButton>(R.id.btn_hide_keyboard).setOnClickListener { viewModel.onHidePressed() }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
new file mode 100644
index 000000000..485777505
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
@@ -0,0 +1,79 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.link
+
+import android.content.Intent
+import android.os.Bundle
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.ActivityLinkBinding
+import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
+import com.splendo.kaluga.example.shared.viewmodel.link.BrowserSpecRow
+import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+import java.net.URL
+
+class LinksActivity : KalugaViewModelActivity<LinksViewModel>(R.layout.activity_link) {
+
+    override val viewModel: LinksViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<BrowserNavigationActions<BrowserSpecRow>> {
+                when (it) {
+                    is BrowserNavigationActions.OpenWebView -> NavigationSpec.Browser(
+                        URL(it.bundle!!.get(BrowserSpecRow.UrlSpecRow)),
+                        NavigationSpec.Browser.Type.Normal
+                    )
+                }
+            }
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setupBindings()
+
+        handleAppLinks(intent)
+    }
+
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+        intent?.let {
+            handleAppLinks(it)
+        }
+    }
+
+    private fun handleAppLinks(intent: Intent) {
+        intent.let { i ->
+            i.data?.let { uri ->
+                val url = URL(uri.scheme, uri.host, uri.path)
+                viewModel.handleIncomingLink("$url?${uri.encodedQuery}")
+            }
+        }
+    }
+
+    private fun setupBindings() {
+        val binding = ActivityLinkBinding.inflate(layoutInflater, null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
new file mode 100644
index 000000000..11468040e
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
@@ -0,0 +1,45 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example.loading
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import androidx.appcompat.widget.AppCompatButton
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+@SuppressLint("SetTextI18n")
+class LoadingActivity : KalugaViewModelActivity<HudViewModel>(R.layout.activity_loading) {
+
+    override val viewModel: HudViewModel by viewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        findViewById<AppCompatButton>(R.id.btn_show_loading_indicator_system).setOnClickListener {
+            viewModel.onShowSystemPressed()
+        }
+
+        findViewById<AppCompatButton>(R.id.btn_show_loading_indicator_custom).setOnClickListener {
+            viewModel.onShowCustomPressed()
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
new file mode 100644
index 000000000..0ef45e6d2
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
@@ -0,0 +1,61 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.example.location
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.widget.AppCompatButton
+import androidx.appcompat.widget.AppCompatTextView
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
+import com.splendo.kaluga.permissions.location.LocationPermission
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class LocationActivity : KalugaViewModelActivity<LocationViewModel>(R.layout.activity_location) {
+
+    companion object {
+        private val permission = LocationPermission(background = false, precise = true)
+    }
+
+    override val viewModel: LocationViewModel by viewModel {
+        parametersOf(permission)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        findViewById<AppCompatButton>(R.id.enable_background).setOnClickListener {
+            startService(Intent(applicationContext, LocationBackgroundService::class.java))
+        }
+
+        findViewById<AppCompatButton>(R.id.disable_background).setOnClickListener {
+            stopService(Intent(applicationContext, LocationBackgroundService::class.java))
+        }
+
+        viewModel.location.observeInitialized {
+            val info = findViewById<AppCompatTextView>(R.id.info)
+            info.text = it
+            info.animate().withEndAction {
+                info.animate().setDuration(10000).alpha(0.12f).start()
+            }.alpha(1f).setDuration(100).start()
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
new file mode 100644
index 000000000..d7cd3d96e
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
@@ -0,0 +1,105 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.location
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
+import com.splendo.kaluga.permissions.location.LocationPermission
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+
+class LocationBackgroundService : androidx.lifecycle.LifecycleService(), KoinComponent {
+
+    companion object {
+        const val notificationId = 1
+        const val channelId = "location_channel"
+        const val channelName = "Kaluga Location"
+
+        private val permission = LocationPermission(background = true, precise = true)
+    }
+
+    private val notificationService by lazy { applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager }
+
+    private val viewModel = LocationViewModel(permission, get())
+
+    override fun onCreate() {
+        super.onCreate()
+
+        viewModel.location.observeInitialized { message ->
+            NotificationManagerCompat.from(applicationContext).notify(notificationId, getNotification(message))
+        }
+
+        startForeground(notificationId, getNotification(""))
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+        viewModel.didResume()
+        return START_NOT_STICKY
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        viewModel.didPause()
+        viewModel.onCleared()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        } else {
+            stopForeground(true)
+        }
+        NotificationManagerCompat.from(applicationContext).cancel(notificationId)
+    }
+
+    private fun createChannelIfNeeded() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && notificationService.getNotificationChannel(
+                channelId
+            ) == null
+        ) {
+            val importance = NotificationManager.IMPORTANCE_DEFAULT
+            val channel = NotificationChannel(channelId, channelName, importance)
+            channel.setSound(null, null)
+            channel.enableVibration(false)
+            channel.setShowBadge(false)
+            notificationService.createNotificationChannel(channel)
+        }
+    }
+
+    private fun getNotification(message: String): Notification {
+        createChannelIfNeeded()
+        val builder = NotificationCompat.Builder(applicationContext, channelId)
+            .setSmallIcon(R.drawable.ic_launcher_foreground)
+            .setContentTitle(applicationContext.getString(R.string.location_background))
+            .setContentText(message)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setSound(null)
+            .setVibrate(null)
+            .setBadgeIconType(NotificationCompat.BADGE_ICON_NONE)
+        val notification = builder.build()
+
+        notification.flags = Notification.FLAG_NO_CLEAR or Notification.FLAG_ONGOING_EVENT
+        return notification
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
new file mode 100644
index 000000000..ca92bc4cd
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
@@ -0,0 +1,84 @@
+/*
+ Copyright (c) 2020. Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.permissions
+
+import android.os.Bundle
+import android.view.View
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.widget.AppCompatButton
+import com.splendo.kaluga.architecture.navigation.toNavigationBundle
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionNavigationBundleSpec
+import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionNavigationBundleSpecRow
+import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
+import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
+import com.splendo.kaluga.permissions.bluetooth.BluetoothPermission
+import com.splendo.kaluga.permissions.calendar.CalendarPermission
+import com.splendo.kaluga.permissions.camera.CameraPermission
+import com.splendo.kaluga.permissions.contacts.ContactsPermission
+import com.splendo.kaluga.permissions.location.LocationPermission
+import com.splendo.kaluga.permissions.microphone.MicrophonePermission
+import com.splendo.kaluga.permissions.notifications.NotificationsPermission
+import com.splendo.kaluga.permissions.storage.StoragePermission
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class PermissionsDemoActivity : KalugaViewModelActivity<PermissionViewModel>(R.layout.activity_permissions_demo) {
+
+    override val viewModel: PermissionViewModel by viewModel {
+        val permissionNavSpec = PermissionNavigationBundleSpec()
+        intent.extras?.toNavigationBundle(permissionNavSpec)?.let { bundle ->
+            val permission = when (bundle.get(PermissionNavigationBundleSpecRow)) {
+                PermissionView.Bluetooth -> BluetoothPermission
+                PermissionView.Calendar -> CalendarPermission(allowWrite = true)
+                PermissionView.Camera -> CameraPermission
+                PermissionView.Contacts -> ContactsPermission(allowWrite = true)
+                PermissionView.Location -> LocationPermission(background = true, precise = true)
+                PermissionView.Microphone -> MicrophonePermission
+                PermissionView.Notifications -> NotificationsPermission()
+                PermissionView.Storage -> StoragePermission(allowWrite = true)
+            }
+            parametersOf(permission)
+        } ?: parametersOf()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val permissionNavSpec = PermissionNavigationBundleSpec()
+        intent.extras?.toNavigationBundle(permissionNavSpec)?.let { bundle ->
+            supportActionBar?.title = bundle.get(PermissionNavigationBundleSpecRow).title
+        }
+
+        viewModel.permissionStateMessage.observe {
+            findViewById<TextView>(R.id.permissions_message).text = it
+        }
+
+        viewModel.showPermissionButton.observe {
+            findViewById<AppCompatButton>(R.id.btn_permissions_bluetooth_request_permissions).visibility = if (it == true) View.VISIBLE else View.GONE
+        }
+
+        findViewById<AppCompatButton>(R.id.btn_permissions_bluetooth_request_permissions).setOnClickListener { viewModel.requestPermission() }
+
+        viewModel.requestMessage.observeInitialized { message ->
+            if (message != null) Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
new file mode 100644
index 000000000..48fdd892b
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
@@ -0,0 +1,81 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.permissions
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatButton
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
+import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class PermissionsDemoListActivity : KalugaViewModelActivity<PermissionsListViewModel>(R.layout.activity_permissions_list) {
+
+    override val viewModel: PermissionsListViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<PermissionsListNavigationAction> {
+                NavigationSpec.Activity<PermissionsDemoActivity>()
+            }
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val adapter = PermissionsAdapter(viewModel).apply {
+            findViewById<RecyclerView>(R.id.permissions_list).adapter = this
+        }
+        viewModel.permissions.observeInitialized { adapter.permissions = it }
+    }
+}
+
+class PermissionsAdapter(private val viewModel: PermissionsListViewModel) : RecyclerView.Adapter<PermissionsAdapter.PermissionsViewHolder>() {
+
+    class PermissionsViewHolder(val button: AppCompatButton) : RecyclerView.ViewHolder(button)
+
+    var permissions: List<PermissionView> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PermissionsViewHolder {
+        val button = LayoutInflater.from(parent.context).inflate(R.layout.view_list_button, parent, false) as AppCompatButton
+        return PermissionsViewHolder(button)
+    }
+
+    override fun getItemCount(): Int = permissions.size
+
+    override fun onBindViewHolder(holder: PermissionsViewHolder, position: Int) {
+        permissions.getOrNull(position)?.let { permission ->
+            holder.button.text = permission.title
+            holder.button.setOnClickListener { viewModel.onPermissionPressed(permission) }
+        } ?: run {
+            holder.button.text = null
+            holder.button.setOnClickListener(null)
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
new file mode 100644
index 000000000..e47f80400
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
@@ -0,0 +1,90 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.platformspecific
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.Button
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.google.android.material.composethemeadapter.MdcTheme
+import com.splendo.kaluga.architecture.compose.state
+import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.example.bottomSheet.BottomSheetActivity
+import com.splendo.kaluga.example.contacts.ContactsActivity
+import com.splendo.kaluga.example.contacts.ui.Padding
+import com.splendo.kaluga.example.shared.viewmodel.featureList.PlatformFeatureListNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.featureList.PlatformSpecificFeaturesViewModel
+
+class PlatformSpecificActivity : KalugaViewModelComposeActivity<PlatformSpecificFeaturesViewModel>() {
+    override val viewModel = PlatformSpecificFeaturesViewModel(ActivityNavigator(::navigationMapper))
+
+    @Composable
+    override fun Layout(viewModel: PlatformSpecificFeaturesViewModel) {
+        PlatformSpecificFeaturesLayout(viewModel)
+    }
+}
+
+private fun navigationMapper(action: PlatformFeatureListNavigationAction): NavigationSpec =
+    when (action) {
+        is PlatformFeatureListNavigationAction.ComposeNavigation -> NavigationSpec.Activity(
+            ContactsActivity::class.java)
+        is PlatformFeatureListNavigationAction.ComposeBottomSheet -> NavigationSpec.Activity(
+            BottomSheetActivity::class.java)
+    }
+
+@Composable
+private fun PlatformSpecificFeaturesLayout(viewModel: PlatformSpecificFeaturesViewModel) {
+    MdcTheme {
+        ViewModelComposable(viewModel) {
+            val features by feature.state()
+            LazyColumn {
+                items(features) { item ->
+                    Button(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(Padding.default),
+                        onClick = { onFeaturePressed(item) },
+                    ) {
+                        Text(
+                            text = item.title.uppercase(),
+                            style = MaterialTheme.typography.button,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+@Preview
+private fun PlatformSpecificFeaturesLayoutPreview() {
+    PlatformSpecificFeaturesLayout(
+        PlatformSpecificFeaturesViewModel(ActivityNavigator(::navigationMapper))
+    )
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
new file mode 100644
index 000000000..9a38060f6
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.example.resources
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityResourcesBinding
+import com.splendo.kaluga.example.databinding.ViewListButtonBinding
+import com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel
+import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
+import com.splendo.kaluga.resources.dpToPixel
+import com.splendo.kaluga.resources.view.KalugaButton
+import com.splendo.kaluga.resources.view.bindButton
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class ButtonActivity : KalugaViewModelActivity<ButtonViewModel>() {
+
+    override val viewModel: ButtonViewModel by viewModel()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityResourcesBinding.inflate(layoutInflater, null, false)
+        setContentView(binding.root)
+
+        val adapter = ButtonAdapter().apply {
+
+            binding.resourcesList.adapter = this
+        }
+        viewModel.buttons.observeInitialized { adapter.buttons = it }
+        binding.resourcesList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
+    }
+}
+
+class ButtonAdapter : RecyclerView.Adapter<ButtonAdapter.ButtonViewHolder>() {
+
+    class ButtonViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
+        val button = binding.button
+    }
+
+    var buttons: List<KalugaButton> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ButtonViewHolder {
+        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ButtonViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = buttons.size
+
+    override fun onBindViewHolder(holder: ButtonViewHolder, position: Int) {
+        buttons.getOrNull(position)?.let { button ->
+            holder.button.bindButton(button)
+        } ?: run {
+            holder.button.text = null
+            holder.button.background = null
+            holder.button.setOnClickListener(null)
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
new file mode 100644
index 000000000..105ffca09
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.example.resources
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.widget.Button
+import android.widget.TextView
+import androidx.databinding.BindingAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityResourcesColorBinding
+import com.splendo.kaluga.example.databinding.ViewResourceListBackgroundBinding
+import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
+import com.splendo.kaluga.resources.DefaultColors
+import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.view.KalugaButton
+import com.splendo.kaluga.resources.view.KalugaLabel
+import com.splendo.kaluga.resources.view.applyBackgroundStyle
+import com.splendo.kaluga.resources.view.bindButton
+import com.splendo.kaluga.resources.view.bindLabel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class ColorActivity : KalugaViewModelActivity<ColorViewModel>() {
+
+    override val viewModel: ColorViewModel by viewModel()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityResourcesColorBinding.inflate(layoutInflater, null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+
+        binding.backdropEdit.setOnEditorActionListener { v, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
+                viewModel.submitBackdropText(v.text.toString())
+                true
+            } else {
+                false
+            }
+        }
+
+        binding.sourceEdit.setOnEditorActionListener { v, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
+                viewModel.submitSourceText(v.text.toString())
+                true
+            } else {
+                false
+            }
+        }
+
+        binding.backdropLighten.adapter = BackgroundAdapter()
+        binding.backdropDarken.adapter = BackgroundAdapter()
+        binding.blendedLighten.adapter = BackgroundAdapter()
+        binding.blendedDarken.adapter = BackgroundAdapter()
+        binding.sourceLighten.adapter = BackgroundAdapter()
+        binding.sourceDarken.adapter = BackgroundAdapter()
+    }
+}
+
+class BackgroundAdapter : RecyclerView.Adapter<BackgroundAdapter.BackgroundViewHolder>() {
+
+    class BackgroundViewHolder(val binding: ViewResourceListBackgroundBinding) : RecyclerView.ViewHolder(binding.root) {
+        val view = binding.root
+    }
+
+    var backgrounds: List<BackgroundStyle> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BackgroundViewHolder {
+        val binding = ViewResourceListBackgroundBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return BackgroundViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = backgrounds.size
+
+    override fun onBindViewHolder(holder: BackgroundViewHolder, position: Int) {
+        backgrounds.getOrNull(position)?.let { background ->
+            holder.view.applyBackgroundStyle(background)
+        } ?: run {
+            holder.view.setBackgroundColor(DefaultColors.clear)
+        }
+    }
+}
+
+object ResourcesBinding {
+
+    @BindingAdapter("button")
+    @JvmStatic
+    fun bindButton(view: Button, button: KalugaButton?) {
+        button?.let {
+            view.bindButton(it)
+        }
+    }
+
+    @BindingAdapter("label")
+    @JvmStatic
+    fun bindLabel(view: TextView, label: KalugaLabel?) {
+        label?.let {
+            view.bindLabel(it)
+        }
+    }
+
+    @BindingAdapter("backgroundStyle")
+    @JvmStatic
+    fun bindBackgroundStyle(view: View, backgroundStyle: BackgroundStyle?) {
+        backgroundStyle?.let {
+            view.applyBackgroundStyle(it)
+        }
+    }
+
+    @BindingAdapter("backgrounds")
+    @JvmStatic
+    fun bindBackgrounds(recyclerView: RecyclerView, backgrounds: List<BackgroundStyle>?) {
+        val adapter = recyclerView.adapter as? BackgroundAdapter ?: return
+        adapter.backgrounds = backgrounds ?: emptyList()
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
new file mode 100644
index 000000000..9addfb939
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.example.resources
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityResourcesBinding
+import com.splendo.kaluga.example.databinding.ViewListTextViewBinding
+import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
+import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
+import com.splendo.kaluga.resources.dpToPixel
+import com.splendo.kaluga.resources.view.KalugaLabel
+import com.splendo.kaluga.resources.view.bindLabel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class LabelActivity : KalugaViewModelActivity<LabelViewModel>() {
+
+    override val viewModel: LabelViewModel by viewModel()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityResourcesBinding.inflate(layoutInflater, null, false)
+        setContentView(binding.root)
+
+        val adapter = LabelAdapter().apply {
+
+            binding.resourcesList.adapter = this
+        }
+        binding.resourcesList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
+        viewModel.labels.observeInitialized { adapter.labels = it }
+    }
+}
+
+class LabelAdapter : RecyclerView.Adapter<LabelAdapter.LabelViewHolder>() {
+
+    class LabelViewHolder(val binding: ViewListTextViewBinding) : RecyclerView.ViewHolder(binding.root) {
+        val label = binding.label
+    }
+
+    var labels: List<KalugaLabel> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LabelViewHolder {
+        val binding = ViewListTextViewBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return LabelViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = labels.size
+
+    override fun onBindViewHolder(holder: LabelViewHolder, position: Int) {
+        labels.getOrNull(position)?.let { label ->
+            holder.label.bindLabel(label)
+        } ?: run {
+            holder.label.text = null
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt
new file mode 100644
index 000000000..a587071fb
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt
@@ -0,0 +1,75 @@
+package com.splendo.kaluga.example.resources
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityResourcesBinding
+import com.splendo.kaluga.example.databinding.ViewListButtonBinding
+import com.splendo.kaluga.example.shared.viewmodel.resources.Resource
+import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class ResourcesActivity : KalugaViewModelActivity<ResourcesListViewModel>() {
+    override val viewModel: ResourcesListViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<ResourcesListNavigationAction> { action ->
+                when (action) {
+                    is ResourcesListNavigationAction.Label -> NavigationSpec.Activity<LabelActivity>()
+                    is ResourcesListNavigationAction.Color -> NavigationSpec.Activity<ColorActivity>()
+                    is ResourcesListNavigationAction.Button -> NavigationSpec.Activity<ButtonActivity>()
+                }
+            }
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityResourcesBinding.inflate(layoutInflater, null, false)
+        setContentView(binding.root)
+
+        val adapter = ResourcesAdapter(viewModel).apply {
+
+            binding.resourcesList.adapter = this
+        }
+        viewModel.resources.observeInitialized { adapter.resources = it }
+    }
+}
+
+class ResourcesAdapter(private val viewModel: ResourcesListViewModel) :
+    RecyclerView.Adapter<ResourcesAdapter.ResourceViewHolder>() {
+
+    class ResourceViewHolder(val binding: ViewListButtonBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+        val button = binding.button
+    }
+
+    var resources: List<Resource> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResourceViewHolder {
+        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ResourceViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = resources.size
+
+    override fun onBindViewHolder(holder: ResourceViewHolder, position: Int) {
+        resources.getOrNull(position)?.let { resource ->
+            holder.button.text = resource.title
+            holder.button.setOnClickListener { viewModel.onResourceSelected(resource) }
+        } ?: run {
+            holder.button.text = null
+            holder.button.setOnClickListener(null)
+        }
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
new file mode 100644
index 000000000..293f385b3
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
@@ -0,0 +1,92 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.system
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.appcompat.widget.AppCompatButton
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.shared.viewmodel.system.SystemFeatures
+import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationActions
+import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
+import com.splendo.kaluga.example.system.fragments.NetworkFragment
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class SystemActivity : KalugaViewModelActivity<SystemViewModel>(R.layout.activity_system) {
+    override val viewModel: SystemViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<SystemNavigationActions<Unit>> { action ->
+                when (action) {
+                    SystemNavigationActions.Network -> NavigationSpec.Fragment(
+                        R.id.system_features_fragment,
+                        createFragment = { NetworkFragment() }
+                    )
+                }
+            }
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val adapter = SystemFeatureAdapter(viewModel).apply {
+            findViewById<RecyclerView>(R.id.system_features_list).adapter = this
+        }
+
+        viewModel.modules.observeInitialized {
+            adapter.modules = it
+        }
+    }
+}
+
+class SystemFeatureAdapter(
+    private val viewModel: SystemViewModel
+) : RecyclerView.Adapter<SystemFeatureAdapter.SystemFeatureViewHolder>() {
+
+    inner class SystemFeatureViewHolder(val button: Button) : RecyclerView.ViewHolder(button)
+
+    var modules: List<SystemFeatures> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SystemFeatureViewHolder {
+        val button = LayoutInflater.from(parent.context).inflate(R.layout.view_list_button, parent, false) as AppCompatButton
+        return SystemFeatureViewHolder(button)
+    }
+
+    override fun onBindViewHolder(holder: SystemFeatureViewHolder, position: Int) {
+        modules.getOrNull(position)?.let { feature ->
+            holder.button.text = feature.name
+            holder.button.setOnClickListener { viewModel.onButtonTapped(feature) }
+        } ?: run {
+            holder.button.text = null
+            holder.button.setOnClickListener(null)
+        }
+    }
+
+    override fun getItemCount(): Int = modules.size
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
new file mode 100644
index 000000000..3535caea9
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
@@ -0,0 +1,44 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.system.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.FragmentNetworkBinding
+import com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class NetworkFragment : KalugaViewModelFragment<NetworkViewModel>(R.layout.fragment_network) {
+
+    override val viewModel: NetworkViewModel by viewModel()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val binding = FragmentNetworkBinding.inflate(inflater)
+        binding.lifecycleOwner = this
+        binding.viewModel = viewModel
+        return binding.root
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt
new file mode 100644
index 000000000..b7398e774
--- /dev/null
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.example.view
+
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+class VerticalSpaceItemDecoration(private val verticalSpaceHeight: Int) : RecyclerView.ItemDecoration() {
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        outRect.bottom = verticalSpaceHeight
+    }
+}
+
+class HorizontalSpaceItemDecoration(private val horizontalSpaceWidth: Int) : RecyclerView.ItemDecoration() {
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        outRect.right = horizontalSpaceWidth
+    }
+}
diff --git a/newexample/android/src/main/res/drawable/ic_account.xml b/newexample/android/src/main/res/drawable/ic_account.xml
new file mode 100644
index 000000000..0e510741e
--- /dev/null
+++ b/newexample/android/src/main/res/drawable/ic_account.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/colorPrimary" android:pathData="M3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2L5,3c-1.11,0 -2,0.9 -2,2zM15,9c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3zM6,17c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1L6,18v-1z"/>
+</vector>
diff --git a/newexample/android/src/main/res/drawable/ic_launcher_foreground.xml b/newexample/android/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..fffaf19df
--- /dev/null
+++ b/newexample/android/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,72 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="361"
+    android:viewportHeight="361">
+  <path
+      android:pathData="M0,0h361v361h-361z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M216.166,228l49.628,0l-24.814,-42.538z"
+      android:strokeWidth="1"
+      android:fillColor="#0095D5"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M186.999,183l49.628,-0l-24.814,42.538z"
+      android:strokeWidth="1"
+      android:fillColor="#3087DB"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M186.999,178l49.628,0l-24.814,-42.538z"
+      android:strokeWidth="1"
+      android:fillColor="#557CDF"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M216.166,133l49.628,-0l-24.814,42.538z"
+      android:strokeWidth="1"
+      android:fillColor="#806EE3"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M138.333,178l42.628,0l-21.314,-36.538z"
+      android:strokeWidth="1"
+      android:fillColor="#F88909"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M159.647,219.538l-21.314,-36.538l42.628,-0z"
+      android:strokeWidth="1"
+      android:fillColor="#E47550"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M112.667,222l42.628,0l-21.314,-36.538z"
+      android:strokeWidth="1"
+      android:fillColor="#C757BC"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M87,183l42.628,-0l-21.314,36.538z"
+      android:strokeWidth="1"
+      android:fillColor="#0095D5"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M87,178l42.628,0l-21.314,-36.538z"
+      android:strokeWidth="1"
+      android:fillColor="#3087DB"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M112.667,139l42.628,-0l-21.314,36.538z"
+      android:strokeWidth="1"
+      android:fillColor="#806EE3"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/newexample/android/src/main/res/drawable/ic_refresh_circle.xml b/newexample/android/src/main/res/drawable/ic_refresh_circle.xml
new file mode 100644
index 000000000..43bf87fcd
--- /dev/null
+++ b/newexample/android/src/main/res/drawable/ic_refresh_circle.xml
@@ -0,0 +1,8 @@
+<!-- drawable/refresh_circle.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M12 2A10 10 0 1 0 22 12A10 10 0 0 0 12 2M18 11H13L14.81 9.19A3.94 3.94 0 0 0 12 8A4 4 0 1 0 15.86 13H17.91A6 6 0 1 1 12 6A5.91 5.91 0 0 1 16.22 7.78L18 6Z" />
+</vector>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/drawable/ic_stop_circle.xml b/newexample/android/src/main/res/drawable/ic_stop_circle.xml
new file mode 100644
index 000000000..a0770a6eb
--- /dev/null
+++ b/newexample/android/src/main/res/drawable/ic_stop_circle.xml
@@ -0,0 +1,8 @@
+<!-- drawable/stop_circle.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M9,9H15V15H9" />
+</vector>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_alerts.xml b/newexample/android/src/main/res/layout/activity_alerts.xml
new file mode 100644
index 000000000..74ea5dea3
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_alerts.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_simple_alert"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/show_alert"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_dismissible_alert"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/dismissible_alert"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_alert_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/alert_list"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_alert_input_field"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/alert_input"/>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/newexample/android/src/main/res/layout/activity_architecture_details.xml b/newexample/android/src/main/res/layout/activity_architecture_details.xml
new file mode 100644
index 000000000..926bd42b8
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_architecture_details.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="10dp">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:text="@{viewModel.name.stateFlow}" />
+
+        <TextView
+            android:id="@+id/number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/name"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:text="@{viewModel.number.stateFlow}" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="@{view -> viewModel.onInversePressed()}"
+            app:layout_constraintTop_toBottomOf="@id/number"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:text="@string/architecture_details_inverse"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_architecture_input.xml b/newexample/android/src/main/res/layout/activity_architecture_input.xml
new file mode 100644
index 000000000..95c28e0ac
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_architecture_input.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel" />
+        <import type="com.splendo.kaluga.architecture.observable.BaseSubject"/>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="10dp">
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/name_input_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:hint="@{viewModel.nameHeader.liveData}"
+            app:errorEnabled="@{viewModel.isNameValid.liveData}">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/name_edit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@={viewModel.nameInput.mutableLiveData}"/>
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/number_input_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/name_input_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:hint="@{viewModel.numberHeader.stateFlow}"
+            app:errorEnabled="@{viewModel.isNumberValid.stateFlow}">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/number_edit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@={viewModel.numberInput.stateFlow}" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="@{view -> viewModel.onShowDetailsPressed()}"
+            app:layout_constraintTop_toBottomOf="@id/number_input_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:text="@string/architecture_details"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_beacons.xml b/newexample/android/src/main/res/layout/activity_beacons.xml
new file mode 100644
index 000000000..30abccc0a
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_beacons.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel" />
+
+        <import type="com.splendo.kaluga.architecture.observable.ObservableKt" />
+    </data>
+
+    <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=".BeaconsActivity">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/beacons_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:beacons="@{viewModel.beacons.stateFlow}"
+            tools:listitem="@layout/beacon_item">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/newexample/android/src/main/res/layout/activity_bluetooth.xml b/newexample/android/src/main/res/layout/activity_bluetooth.xml
new file mode 100644
index 000000000..59d229ef1
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_bluetooth.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel" />
+
+    </data>
+
+    <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=".BluetoothActivity">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/devices_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:devices="@{viewModel.devices.stateFlow}"
+            tools:listitem="@layout/bluetooth_item">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_bluetooth_more.xml b/newexample/android/src/main/res/layout/activity_bluetooth_more.xml
new file mode 100644
index 000000000..9a917b91e
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_bluetooth_more.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp">
+
+        <TextView
+            android:id="@+id/name"
+            style="@style/ListTitle"
+            android:text="@{viewModel.name.stateFlow}"
+            tools:text="@string/bluetooth_no_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:id="@+id/info_row"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="@id/name"
+            app:layout_constraintStart_toStartOf="@id/name"
+            app:layout_constraintTop_toBottomOf="@id/name">
+
+            <TextView
+                android:id="@+id/identifier_field"
+                style="@style/ListSubTitle"
+                android:text="@{viewModel.identifierString}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2" />
+
+            <TextView
+                android:id="@+id/rssi"
+                style="@style/ListSubTitle"
+                android:text="@{viewModel.rssi.stateFlow}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/distance_field"
+                style="@style/ListSubTitle"
+                android:text="@{viewModel.distance.stateFlow}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/status"
+            style="@style/ListContent"
+            android:text="@{viewModel.state.stateFlow}"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/info_row"
+            android:paddingBottom="12dp"/>
+
+        <TextView
+            android:id="@+id/services_header"
+            style="@style/ListTitle"
+            android:text="@string/bluetooth_services_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/status"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/service_list"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintTop_toBottomOf="@id/services_header"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:services="@{viewModel.services.stateFlow}"
+            tools:listitem="@layout/bluetooth_service_item"
+            />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_date_time_picker.xml b/newexample/android/src/main/res/layout/activity_date_time_picker.xml
new file mode 100644
index 000000000..f92a40694
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_date_time_picker.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel" />
+
+    </data>
+<androidx.core.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_select_date"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/select_date"
+            android:onClick="@{view -> viewModel.onSelectDatePressed()}"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_select_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/select_time"
+            android:onClick="@{view -> viewModel.onSelectTimePressed()}"/>
+
+        <TextView
+            android:id="@+id/current_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/current_time"/>
+
+        <TextView
+            android:id="@+id/date_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@{viewModel.dateLabel.stateFlow}"/>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</androidx.core.widget.NestedScrollView>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_example.xml b/newexample/android/src/main/res/layout/activity_example.xml
new file mode 100644
index 000000000..fecd0859d
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_example.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/example_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/tabs"/>
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tabs"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_keyboard_manager.xml b/newexample/android/src/main/res/layout/activity_keyboard_manager.xml
new file mode 100644
index 000000000..364a8b6c4
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_keyboard_manager.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/edit_field"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_show_keyboard"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/show_keyboard"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_hide_keyboard"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/hide_keyboard"/>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/newexample/android/src/main/res/layout/activity_link.xml b/newexample/android/src/main/res/layout/activity_link.xml
new file mode 100644
index 000000000..99c88fc0b
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_link.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <Button
+            android:id="@+id/browser_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{viewModel.browserButtonText.stateFlow}"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:onClick="@{() -> viewModel.openWebPage()}"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@{viewModel.linksInstructions.stateFlow}"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginEnd="20dp"
+            android:layout_marginStart="20dp"
+            app:layout_constraintTop_toBottomOf="@id/browser_button"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_loading.xml b/newexample/android/src/main/res/layout/activity_loading.xml
new file mode 100644
index 000000000..7a18b8ce4
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_loading.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_show_loading_indicator_system"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/show_loading_indicator_system"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_show_loading_indicator_custom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/show_loading_indicator_custom"/>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/newexample/android/src/main/res/layout/activity_location.xml b/newexample/android/src/main/res/layout/activity_location.xml
new file mode 100644
index 000000000..12715da9c
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_location.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <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=".LocationActivity">
+
+        <TextView
+            android:id="@+id/info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text=""
+            android:textAlignment="center"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/enable_background"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/location_enable_background"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/disable_background" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/disable_background"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:text="@string/location_disable_background"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_main.xml b/newexample/android/src/main/res/layout/activity_main.xml
new file mode 100644
index 000000000..875a0a8d3
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_main.xml
@@ -0,0 +1,19 @@
+<?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=".LocationActivity">
+
+    <TextView
+        android:id="@id/info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_permissions_demo.xml b/newexample/android/src/main/res/layout/activity_permissions_demo.xml
new file mode 100644
index 000000000..e76948d19
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_permissions_demo.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/permissions_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:textAlignment="center"
+            android:padding="10dp"
+            tools:text="@string/permission_allowed" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_permissions_bluetooth_request_permissions"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/permission_request"/>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_permissions_list.xml b/newexample/android/src/main/res/layout/activity_permissions_list.xml
new file mode 100644
index 000000000..9b358e3bb
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_permissions_list.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/permissions_list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
+
+</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_resources.xml b/newexample/android/src/main/res/layout/activity_resources.xml
new file mode 100644
index 000000000..df84bfee3
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_resources.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:padding="10dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/resources_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_resources_color.xml b/newexample/android/src/main/res/layout/activity_resources_color.xml
new file mode 100644
index 000000000..0c73058f8
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_resources_color.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel" />
+    </data>
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="10dp">
+
+    <View
+        android:id="@+id/backdrop"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/blended"
+        app:backgroundStyle="@{viewModel.backdropColorBackground.stateFlow}"
+        tools:background="@android:color/holo_red_dark"/>
+
+    <View
+        android:id="@+id/blended"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toEndOf="@id/backdrop"
+        app:layout_constraintEnd_toStartOf="@id/source"
+        app:backgroundStyle="@{viewModel.blendedColorBackground.stateFlow}"
+        tools:background="@android:color/holo_blue_dark"/>
+
+    <View
+        android:id="@+id/source"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toEndOf="@id/blended"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:backgroundStyle="@{viewModel.sourceColorBackground.stateFlow}"
+        tools:background="@android:color/holo_green_dark"/>
+
+    <EditText
+        android:id="@+id/backdrop_edit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@{viewModel.backdropText.stateFlow}"
+        app:layout_constraintStart_toStartOf="@id/backdrop"
+        app:layout_constraintEnd_toEndOf="@id/backdrop"
+        app:layout_constraintTop_toBottomOf="@id/backdrop"
+        android:lines="1"
+        android:inputType="text"
+        android:imeOptions="actionDone"/>
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/blend_mode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:button="@{viewModel.blendModeButton.stateFlow}"
+        app:layout_constraintStart_toStartOf="@id/blended"
+        app:layout_constraintEnd_toEndOf="@id/blended"
+        app:layout_constraintTop_toBottomOf="@id/blended"/>
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/flip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:button="@{viewModel.flipButton}"
+        app:layout_constraintStart_toStartOf="@id/blended"
+        app:layout_constraintEnd_toEndOf="@id/blended"
+        app:layout_constraintTop_toBottomOf="@id/blend_mode"/>
+
+    <EditText
+        android:id="@+id/source_edit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@{viewModel.sourceText.stateFlow}"
+        app:layout_constraintStart_toStartOf="@id/source"
+        app:layout_constraintEnd_toEndOf="@id/source"
+        app:layout_constraintTop_toBottomOf="@id/source"
+        android:lines="1"
+        android:inputType="text"
+        android:imeOptions="actionDone"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/backdrop_lighten"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toBottomOf="@id/flip"
+        android:orientation="horizontal"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:backgrounds="@{viewModel.lightenBackdrops.stateFlow}"
+        tools:listitem="@layout/view_resource_list_background"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/backdrop_darken"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toBottomOf="@id/backdrop_lighten"
+        android:orientation="horizontal"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:backgrounds="@{viewModel.darkenBackdrops.stateFlow}"
+        tools:listitem="@layout/view_resource_list_background"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/source_lighten"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toBottomOf="@id/backdrop_darken"
+        android:orientation="horizontal"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:backgrounds="@{viewModel.lightenSource.stateFlow}"
+        tools:listitem="@layout/view_resource_list_background"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/source_darken"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toBottomOf="@id/source_lighten"
+        android:orientation="horizontal"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:backgrounds="@{viewModel.darkenSource.stateFlow}"
+        tools:listitem="@layout/view_resource_list_background"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/blended_lighten"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toBottomOf="@id/source_darken"
+        android:orientation="horizontal"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:backgrounds="@{viewModel.lightenBlended.stateFlow}"
+        tools:listitem="@layout/view_resource_list_background"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/blended_darken"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toBottomOf="@id/blended_lighten"
+        android:orientation="horizontal"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:backgrounds="@{viewModel.darkenBlended.stateFlow}"
+        tools:listitem="@layout/view_resource_list_background"
+        />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_system.xml b/newexample/android/src/main/res/layout/activity_system.xml
new file mode 100644
index 000000000..bfd4af551
--- /dev/null
+++ b/newexample/android/src/main/res/layout/activity_system.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+<LinearLayout
+    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"
+    android:orientation="vertical"
+    android:layout_gravity="center_horizontal"
+    android:layout_margin="@dimen/networkLayoutsMargin">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/system_features_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/networkFragmentsHeight"/>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/system_features_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/beacon_item.xml b/newexample/android/src/main/res/layout/beacon_item.xml
new file mode 100644
index 000000000..3313db0fc
--- /dev/null
+++ b/newexample/android/src/main/res/layout/beacon_item.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListBeaconViewModel" />
+
+        <import type="android.view.View"/>
+        <import type="com.splendo.kaluga.architecture.observable.ObservableKt" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp" android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="24dp"
+            android:orientation="vertical" android:paddingLeft="16dp"
+            android:paddingRight="16dp" app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+            <TextView
+                android:id="@+id/instance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@{viewModel.instance.stateFlow}"/>
+            <TextView
+                android:id="@+id/namespace"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@{viewModel.namespace.stateFlow}"/>
+            <TextView
+                android:id="@+id/txPower"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@{viewModel.txPower.stateFlow}"/>
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/newexample/android/src/main/res/layout/bluetooth_characteristic_item.xml b/newexample/android/src/main/res/layout/bluetooth_characteristic_item.xml
new file mode 100644
index 000000000..283cc3671
--- /dev/null
+++ b/newexample/android/src/main/res/layout/bluetooth_characteristic_item.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothCharacteristicViewModel" />
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+        <TextView
+            android:id="@+id/characteristic_uuid"
+            style="@style/ListContent"
+            android:text="@{viewModel.uuid}"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/characteristic_value"/>
+
+        <TextView
+            android:id="@+id/characteristic_value"
+            style="@style/ListContent"
+            android:text="@{viewModel.value.stateFlow}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_marginStart="12dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toEndOf="@id/characteristic_uuid"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <LinearLayout
+            style="@style/ListFoldOut"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            app:layout_constraintTop_toBottomOf="@id/characteristic_uuid"
+            app:layout_constraintStart_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <TextView
+                android:id="@+id/descriptor_header"
+                style="@style/ListSubTitle"
+                android:text="@string/bluetooth_descriptors"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/descriptors"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:descriptors="@{viewModel.descriptors.stateFlow}"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/bluetooth_descriptor_item.xml b/newexample/android/src/main/res/layout/bluetooth_descriptor_item.xml
new file mode 100644
index 000000000..15a440e07
--- /dev/null
+++ b/newexample/android/src/main/res/layout/bluetooth_descriptor_item.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDescriptorViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+        <TextView
+            android:id="@+id/descriptor_uuid"
+            style="@style/ListContent"
+            android:text="@{viewModel.uuid}"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/descriptor_value"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+        <TextView
+            android:id="@+id/descriptor_value"
+            style="@style/ListContent"
+            android:text="@{viewModel.value.stateFlow}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_marginStart="12dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toEndOf="@id/descriptor_uuid"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/bluetooth_item.xml b/newexample/android/src/main/res/layout/bluetooth_item.xml
new file mode 100644
index 000000000..eed0a1682
--- /dev/null
+++ b/newexample/android/src/main/res/layout/bluetooth_item.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListDeviceViewModel" />
+
+        <import type="android.view.View"/>
+        <import type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListDeviceViewModel.ConnectButtonState"/>
+    </data>
+
+    <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="wrap_content"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:onClick="@{view -> viewModel.toggleFoldOut()}">
+
+        <TextView
+            android:id="@+id/name"
+            style="@style/ListTitle"
+            android:text="@{viewModel.name.stateFlow}"
+            tools:text="@string/bluetooth_no_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/button_container"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:id="@+id/info_row"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="@id/name"
+            app:layout_constraintStart_toStartOf="@id/name"
+            app:layout_constraintTop_toBottomOf="@id/name">
+
+            <TextView
+                android:id="@+id/identifier"
+                style="@style/ListSubTitle"
+                android:text="@{viewModel.identifierString}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2" />
+
+            <TextView
+                android:id="@+id/rssi"
+                style="@style/ListSubTitle"
+                android:text="@{viewModel.rssi.stateFlow}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/txPower"
+                style="@style/ListSubTitle"
+                android:text="@{viewModel.txPower.stateFlow}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:visibility="@{viewModel.isTxPowerVisible().stateFlow ? View.VISIBLE : View.GONE}"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/button_container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            app:layout_constraintBottom_toBottomOf="@id/info_row"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/name"
+            app:layout_constraintTop_toTopOf="@id/name"
+            android:visibility="@{viewModel.isConnectButtonVisible().stateFlow ? View.VISIBLE : View.GONE}">
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/connect_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bluetooth_connect"
+                android:onClick="@{view -> viewModel.onConnectPressed()}"
+                android:visibility="@{viewModel.connectButtonState.stateFlow == ConnectButtonState.Connect ? View.VISIBLE : View.GONE}"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/disconnect_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bluetooth_disconnect"
+                android:onClick="@{view -> viewModel.onDisconnectPressed()}"
+                android:visibility="@{viewModel.connectButtonState.stateFlow == ConnectButtonState.Disconnect ? View.VISIBLE : View.GONE}" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/status"
+            style="@style/ListContent"
+            android:text="@{viewModel.status.stateFlow}"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/info_row"
+            android:paddingBottom="12dp"/>
+
+        <LinearLayout
+            android:id="@+id/fold_out_block"
+            style="@style/ListFoldOut"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/status"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:orientation="vertical"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:visibility="@{viewModel.isFoldedOut().stateFlow ? View.VISIBLE : View.GONE}">
+
+            <TextView
+                android:id="@+id/service_uuids"
+                style="@style/ListContent"
+                android:text="@{viewModel.serviceUUIDs.stateFlow}"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/service_data"
+                style="@style/ListContent"
+                android:text="@{viewModel.serviceData.stateFlow}"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/manufacturer_id"
+                style="@style/ListContent"
+                android:text="@{viewModel.manufacturerId.stateFlow}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:id="@+id/manufacturer_data"
+                style="@style/ListContent"
+                android:text="@{viewModel.manufacturerData.stateFlow}"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/more_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:text="@string/bluetooth_more"
+                android:visibility="@{viewModel.isMoreButtonVisible().stateFlow ? View.VISIBLE : View.GONE}"
+                android:onClick="@{view -> viewModel.onMorePressed()}"/>
+
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/bluetooth_service_item.xml b/newexample/android/src/main/res/layout/bluetooth_service_item.xml
new file mode 100644
index 000000000..c0d392fd4
--- /dev/null
+++ b/newexample/android/src/main/res/layout/bluetooth_service_item.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothServiceViewModel" />
+
+    </data>
+
+    <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"
+        style="@style/ListContent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/service_header"
+            style="@style/ListSubTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/bluetooth_service"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"/>
+
+        <TextView
+            android:id="@+id/service_uuid"
+            style="@style/ListContent"
+            android:text="@{viewModel.uuid}"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toEndOf="@id/service_header"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <TextView
+            android:id="@+id/characteristics_header"
+            style="@style/ListSubTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/bluetooth_characteristics"
+            app:layout_constraintTop_toBottomOf="@id/service_header"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/characteristics_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/characteristics_header"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:characteristics="@{viewModel.characteristics.stateFlow}"
+            tools:listitem="@layout/bluetooth_characteristic_item"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/dialog_info.xml b/newexample/android/src/main/res/layout/dialog_info.xml
new file mode 100644
index 000000000..65879af29
--- /dev/null
+++ b/newexample/android/src/main/res/layout/dialog_info.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:textStyle="bold"
+        android:padding="10dp"/>
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:padding="10dp"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/fragment_features_list.xml b/newexample/android/src/main/res/layout/fragment_features_list.xml
new file mode 100644
index 000000000..25d5138a2
--- /dev/null
+++ b/newexample/android/src/main/res/layout/fragment_features_list.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/features_list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
+
+</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/fragment_info.xml b/newexample/android/src/main/res/layout/fragment_info.xml
new file mode 100644
index 000000000..1f333028f
--- /dev/null
+++ b/newexample/android/src/main/res/layout/fragment_info.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/info_buttons"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
+
+</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/fragment_network.xml b/newexample/android/src/main/res/layout/fragment_network.xml
new file mode 100644
index 000000000..35562c4b0
--- /dev/null
+++ b/newexample/android/src/main/res/layout/fragment_network.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/networkLayoutsMargin">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{viewModel.networkState.stateFlow}"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/loading_indicator_view_.xml b/newexample/android/src/main/res/layout/loading_indicator_view_.xml
new file mode 100644
index 000000000..284bfab62
--- /dev/null
+++ b/newexample/android/src/main/res/layout/loading_indicator_view_.xml
@@ -0,0 +1,25 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="40dp">
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminate="true" />
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Loading..." />
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/newexample/android/src/main/res/layout/view_list_button.xml b/newexample/android/src/main/res/layout/view_list_button.xml
new file mode 100644
index 000000000..8f8c59399
--- /dev/null
+++ b/newexample/android/src/main/res/layout/view_list_button.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+<androidx.appcompat.widget.AppCompatButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/button"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:text="Feature" />
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/view_list_text_view.xml b/newexample/android/src/main/res/layout/view_list_text_view.xml
new file mode 100644
index 000000000..be06c5ff6
--- /dev/null
+++ b/newexample/android/src/main/res/layout/view_list_text_view.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="Label Text"/>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/view_resource_list_background.xml b/newexample/android/src/main/res/layout/view_resource_list_background.xml
new file mode 100644
index 000000000..c01259329
--- /dev/null
+++ b/newexample/android/src/main/res/layout/view_resource_list_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools">
+    <View xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        tools:background="@android:color/holo_purple"/>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/menu/bluetooth_menu.xml b/newexample/android/src/main/res/menu/bluetooth_menu.xml
new file mode 100644
index 000000000..8aab659e7
--- /dev/null
+++ b/newexample/android/src/main/res/menu/bluetooth_menu.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/start_scanning"
+        android:title="@string/bluetooth_start_scanning"
+        android:icon="@drawable/ic_refresh_circle"
+        android:iconTint="@android:color/white"
+        app:showAsAction="always"
+        />
+
+    <item android:id="@+id/stop_scanning"
+        android:title="@string/bluetooth_stop_scanning"
+        android:icon="@drawable/ic_stop_circle"
+        android:iconTint="@android:color/white"
+        app:showAsAction="always"
+        android:visible="false"
+        />
+</menu>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..7353dbd1f
--- /dev/null
+++ b/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..7353dbd1f
--- /dev/null
+++ b/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/mipmap-hdpi/ic_launcher.png b/newexample/android/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..b98ddc769847d26653fcd4f11b3445c20dac8e93
GIT binary patch
literal 2147
zcmV-p2%PtcP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000OoNkl<Zc-rlp
zYitzP6~}GIR7t2>q#~MBl`6GOztEBgA1Yc^(Dp-18kAO{Eu;xjlB!jT5*pf)6sT|@
z7-I~WU}KDJ5*M7<hPFV0Q|x+e2!3HN#$La@_O5r=>-9dzv%9nNGXLH?c!6afeh{MZ
zGFSTRuI1S?_x$cT=iZsoY)XpOw5Bz!X>EQt0I5XjNv71#3Qk%QPkh>EW`KNtnrIi%
z0iqnD{qsyYQ)8z-Jbl-Y!e1o)Vxqe1*RO+Wa&mIsYs!~8mSq>u3DWKPNetCfgR(43
z$t3C%0d$GDn0BYnGXa!Nd!FZ?3ByT-$hjkmB#z_I)z!83cAsYhC^ZlW>`hicM3N|q
z=<V%2M17qLpfrYI3aGJU1VnuzjRHDOeVq%SbeGF@G+6=B2%>;GJ3HT_zRnd;;e7z;
z{W${~A0I!K?0`BtI!ZM_8Xygj21o;>0nz|zfHXi!0LbkW(9s&0kqm7C1XxKufMj_R
zAx;JtOsr5yR*szw7+#Rk+T(}UEn@HAt=RF}$h0atFs2?rEGL2IWt1HqN8WCGLRFpi
zKnMmfDRMIg)IJcvi#tsiw1jY}hQZsL62qbY@9zq#BgI5X##?9XXfXPrZ(_0Y4NKgC
z@7ipEWjF+}ITym^%o)L90}{3t+OT%p5Ox%gA{dlVkY!H@==A$8h$QM%0jP1vkEiww
zU|oqBURFeD-gw-BpRe>lbPgbN<U0uEeG~Fn`?P@0U-seG+lLfDw7=NSqWf9^@BAh9
zL}YHU!sQUuQKT7?S{q77@I+=mp4`)qlg%C&`#5C18C@s#ZMDJY5g>f>D!9E5gUfmd
z{Mij8)%duM*ql5z?jKR$gth6Q1#X{+iV{~$K)Nd5OlsV{2Sf+)VXK!!Prm|)>gRbw
z7$#1AT;YirbjIr=Xw*$WGF=3B@DT-$q614H^?w{Ub&JnABjAKpQR~47N!5MZY!T<l
zeVe3UKvKstZ+7!|reOFcoUk%4IAF8!I79{;9yqNTe1HT0!Ow2NnG*lcm6+swQT7eS
zAYR&SiV5hIJ!TBqLZ~_CRp8Te?EJF@?ah95?1Ka{yV*74QE;e!w0{sSrT{LJh@q<q
ztrb0_W=MuIaM@ps0>ov13F4K*5%xK<71&*Bj|nHNcPq!?7!#16d81&L<~blFF3g`F
zApJ-XD-RlD0;1YjVTHpbpqT7M%8Q+l{BDGfE{%pWrBME3kQwVu`#Svup5HN?5YX>3
zhRNP20DU8iY_c~R?&s98lMa$udi|75sXg)Z{p<mJ)WN_!$YInRgz)KZQkWOU7l|yP
zX7i20?-%jLyH;hznoj>H8ims>;984cJ(n6T;=q5}eW+;jCX}w9g-pLAh9Gs7L(~^0
zR{L>G$`VFN<W)B__;1tns%~N6A}gAzuEoXz0!q3($nS6`)Y&0M0VIn8{Q7#Zm#Y%1
zshR+iVfOGirJsHRsOWKHjG!(+enG;T^Jb*w8{+E0f-aQydcpK~z#4sEs>@;d+b`p5
z%dg-)Q>57U1VlVnWJ;LAVZD690<(|D334u3O;_`mY<_&DxCbeDhL~FYkqItm5S`mw
z(3^7&(gXwho<G9!*JopD^qp5AdYw1zpCk2)*0Fet0M&|p1E?oyT+;2ql9C?itbX+X
z;>j|<>5@GroJB=suof0J0;zG`|IqY;4(=8Q{H;1AQtpIfee*d?Ts#+HKfp`)Q@J%E
zpsi=^=yiwiy$=VJ^ZxYAFgQ_G&;6hQZwTK$(H{k9WBn++W)}L_K1IWCY7|}D(gcy^
zFkY}d3XtRQ7D&P9*}p>eQt`GDKR#qcx1GaV4P#15)AN4e$c?mC4IqhJY8)oTI6OeA
zZ<O|-&&9z=(k~20(Qj)oO6nFj*a_SA^|zvD+d2dd%`u&zn^C$ee=-K3f{QLR+5>p>
zcyGkye2Yw&CnTxoj-n?d;s>XV%HUFo4qSD?V{oJ8<+?~fL|6V$j}U?9uFShpm<b@)
z$sA>si)Vk>#p4%8A}?p2Ei}PSR<5<5j6_8*9m9@hhcbDpx#e0t!s3DaE<9B+2(Mp2
z*RHlGIAINuV#<$Mm7+Yl^Cj?B<FvDVvc;p^DNybh5S=$L__vY4!lT_WYv7lUb)%1@
zziI%{R9Jt(f(zyeICM5NK3^LbP}2*wnCSCiqV5csnu;0K3t#ZoEtTJ&w7^GF=<)Kw
zxGN~t`fAH`1^e^8<w^%F5_M-?#nsIX2{lCOhUgDM7Wf%2%MC+*{4i$_hEWb#ZB8X(
z69Gym1-r^Lp|YnMB=1GC$rH&=JCP(#RF0j^&NoD&p>BYMnc=axq$eSquxM>`2F3g9
zvCkmcHGk0WoslXAeD@z9?ZKf2NCTt+(g10IG(Z|44Uh(CUH~e*4*<>mT@9DZm9!BQ
zejUnSFw8xI91cfrvcFK*+}wO@&VU*l8#jcF5lG1tJ<2PYEX$&-tn5|lYg=2}g4w>*
z`vB3SCX?wZ4Ml2@f=UKaU#L%dy}pC^_;u>*tbb^rva*r_TC`@(nw6cMogF@(4}u_o
z8lKOhX~i%MT3cH?SFc|E6Y66|Mn-zdT-vHts~#lX*NC3T&CT6fRaI41Utj;P+S=Mv
zb#-;8Z<kJ|i}-x!-!nbtUf7)KPtmbcAE+<XC+gdZ6)PUPn;&0DUA}zz!=!(N=rN+D
zMBkm~S~}&+SC=hYwvhUG*S~Q=AT1!#w21VJiP0tVS=5IqUlyd?gO-{k(wf$^rnPy|
Z{trO%k^&M-hKB$E002ovPDHLkV1hat4bA`n

literal 0
HcmV?d00001

diff --git a/newexample/android/src/main/res/mipmap-hdpi/ic_launcher_round.png b/newexample/android/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e97f306ba0f955c1e4ff171abbdb8a61565aea2
GIT binary patch
literal 4049
zcmV;?4=(VDP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000k|Nkl<Zc-rM$
z33OD|88#sSrH8193nH>vsTHvnMG<O)8wx$vwgMukP#0`1D3zijN<bqhOQ?}m76F6o
z2(l(5CIX365+EcbWRgi{CX-n*`@ZJy|3B^<UM91=2@sO_&iT%~WZt{?zu*1WJNLb-
zuDXH;0K_rGhXMEfRlk&j4Y&g$fj(onFK|!0BaCSR4K6;+_ni>k5Iqt77<#h*b!twV
zZG{+a)`R|c17bL024W-P7@`WHYiMY&Bisyhu4CUFW7qzN-Frh&n=xr)Yak{;Xa;zG
zGvXD*9)t!54g|m79~1cds13w!*5=JY=9|#kH6~v0_YlNdgdvC&zmFa4)X$EFAo$sL
zKEd@3Lc*wR*2j<_^Xt&+v_^2AjL0JC1*G@{Ou$8gXVn)(7WJ7NN~SCAfaBSDAH+5x
zF~PHb8PLG`5E4Z)^a+;lN|2K%IDZS_WW+SI05Rc+;`+qHMKXnwwMEIn&ufvCy#kH#
zwje1X!OOt>-aeACMM)BnGXPOTf-s@{SDKt4KgAPO<9566X%Uim$LIBWN01r|$br@f
zfov|D&Gyt~b>2Mt*y(d*<N_xQtr@(G_yH!9Y3yauB)&n^oG057IYN?1+fjbdYPBOT
zDM`Faq8*dZakVvaf=R-0xT>qGe|JgDO_1Xxk+Wkyr_GTQOp@JhmlYQmUoRZvMG=JU
z?rrT3IabH5*Xs}9(Bhg+5U+k7k7sIoAx8i&ni|OE^6AYoHNMz$I-R|d90#9Uv?GGJ
zblYmRI!>NE`D@{rV<HH(W=lKNo`9)Q=vS-NJDI6<h{?22dmdpSy`jC4!-MK-hr<CS
zB_$(7n;P%5FlWeY>rqQ=5~)(Dazr_7Ud@oz!F)p4o;8TZM&raX1d57^9*OFUcolQG
zT&r8N_MlWyR&0j@I}9<QFyD&VbW<%NUnG;sHbyivUcFG=Zp0gPu|zHs*lzQJ%_<IV
zm#^96NR>`FRbc}~jT7d-tAN>4WTG(lZ8?+_*}_INgTbKx=9_PB3!6Oh%vmg!zccL-
zMUK^Ze!#oF(ZTZ1R8g^VfeNb19pHDGV<yLreWh(y!v`yspwYV_YqtUByd{pHEo-#k
za)zB4KL#bhkpE^_En>D8hvxO2So1PFypXa_1*LTkI8$hYPu`J76*Oao25bg1xDQPQ
zul!g{1m&Nx!noN|82e!rY|k-($>4$XPn1#nTrjg16xGhC&Khg9{m4PnMSuQhn*99y
zu6V6Vta)XfHN((F5}3KC4s=EjY+0?1C@2v~+T)exfMdz6;My@7{C1rva*P%a%vz;{
z=RT<7@Q(#DsMWgQc%B93P76OVDN|+WfApdfN38TUX=!QQg`6~sUg&>@^Xtmd1UA?_
zFnV=0{O;3p@W5vkaJb9@nmSiRE!zDplHo9dE8_`p%)bU4pLYSz$+e;g+Mc6_u^&kT
z1dX0m1<Q77z=#t=S{bg-W%KJmuXT&ci71-o<m8MZE`IpohlD2n2OZUa#F&@I>w`7N
zbZ|csLj)0CS}y~Q*~86ND8KN<$4aP^JHS)85*!P=o+k+5Ts;VU#+r!2YYc9flv)!Y
zhsT6DQYfypL$$;ia$-_Y4vJh9L_|!2kLt5ir%rvua-xJ_4T?txy;011k6iD9C%>!;
zki%=y`T{-FYup?e!NUHSX#$^B3(ggH2gnI%QQlne`#d50a=Cr5c5i(Xa(H~Yp$<%F
zemghT!|bVz`&_+P1x|-gbka!SzP!AAOCvud*kaNFJ^7Jn1UXUQkM^n>k;7vc`Xi;$
z4Mhc3)S?SB`qd&8*v$@bXTRH+93G3hflqxpWPe5FHh6Jvby$L)N3+|XZv?H{4NK-+
zn3(zRDb7dB7}ttwYHA9Qi;e+acxRNHoP0H^n1o#%)<OR$vBDphRE8voFz=8WbQoPW
zEIscRQm4zg2<Md@1?QLjLKB2=eLty5=(k~%oV!jLmK+}cS|kU($-`+WZ{E8%>A>Uh
z#X=D0i0bO<s`~fu-zDIv`J`yWh7C92MVd$v%#FTh(nfh$atMzsmcVhTjhnrX|1F12
ztF+*Cxw(iHjvNk)Zvt=mca4(I!~ZkG3n|j51dTz5y(v=%dYuQpTBw4w*|nfjxSF*D
zf{{!+W5$dN2_sL?fddD6BSGeH1bI>5t%U}-e||+of(Wl>$hjOTXP*)C4|L2Wo6(GJ
zh)fVU>~#+X!oChQ;-3p;QOV&!PQ1Lv0TrcoD9AO7b<CkMYRi%(OZqn<Xy3klcOpTK
za0RNt?&0#CF>7j~f+AXem6gj}J$4JY54;J^wGT#xYyBU<du|W*=Y!lLGfYoc#DuNc
zdd{qzPG7SNS0u=R1PyFL(C*#4`$r<^7k~gkixw@qw+TTR85w=OUauvbiPbwiFd+;5
z&t^$fJiNUUvSb$U;yqqWzVzFcf@<;GQKA0tbg-W(;QIT%*d$6@g;<_f4=(hR7MHi#
z%dk3~&YF^v@>?N6Tog-9P3`XScr=lG(DGs(BrYp~tG+xF5y`uxU_^3cTP0wwFoLZx
z7ZfwcfPDI&BSMun4GBFT$<$^yj9ey->hE~`F|86#D(rBe+6-Tus^{cwu9JS_jW>D=
zqZmg}w{G3KU>+1P%+u^Vva>28IoE%67P93QFd&%)<Fn!H=O@93QLKL5rxD3feDFNj
zi}No;F~rW3MtJD+=t1H4^Ugu~4_c@(x!|E~mC$>AIh@kkV_jY32vR5%(xjxMu8jy{
zB>f6A>7&sS#r-%#-BzCsOVFFSN-*ghQ1ZzMI5s8=etIbf>hm$9tt<iM+(}^x(rsD{
zK1bvA8jI5llfP9&CFoD6X&ThHc_%cGfEpf$a=enQ0H@a%bD~&LQE?o(NNTi4o2Av)
zXf&FPXaw0YN=(GgLy>dss<TjIc7Zyl7V^g(<_IDb&pHlnqa6%;)`r%enPb7Fl!ol@
zNTn5qE|i2Nhf17H|1&_D-U<CSo(srw!|L;z91B5IY7`b0ZYM4pEqSoQtRvPTv&0mu
zl|~oz{JOjmIh~f5z`{Z;*p)UYdi!XA93G1Aq~Ns}p>E#f#stmyD;N)EU@aEfu{v==
zKFiXCCFoyUYN6idftRuroaP8+8oHwj%;Fukj~2}i9Xj+WD>a%Fs|g1W9vmfRi>@1)
zCUq7%Y>He;s~e<f|M|}!ZbA@|W|f-2a&$i^-X9$xsBYmD@aWYM`=k1foNzEXLl#Kj
zC(PROYOT<DMQIa_?y&R>tS!|?b=agibePR%SiXGu7~&#$xr1yi{)HD_=!GoSiCHkK
z$Heho4Cy3DN7SAj5);_uRw#HerwKV6#%6(JWhr>=R?sY)8PFa}L8hn~UUfv*D2u-j
z9rJ7~nw1tejQYMhtWUi6TM4J}VjQ$wE?18nIr2_c%{PAJfiZTiTCM(G>=u`8NJ`SG
zQZ7F-7@SbH=u~KO7>GP0MmNW~lTiENc+g^G<HLG1)LT6;al?f=@TsL$P_1*p($hL_
zg2E9Lhg$Sjo|21-(frSe6DKl}gX<b;Pmmw#Tu@LjHCja<SO&!?^9nlT6B;{cF;a!q
z9s$nIF9Mg&4Eh}_z$q<_DHPKZ?_do3gXW(@jj9I)YR_F66;boDo7a}XakVYdE`C3)
zCT`xm`90zQiAoIlBo2NgjvYJpE{DUR6}v7?PSA@)Rp3mWno$rP?-g)b<a5|#&UWb+
zlo`8}@bU&3D9~))J*GlG6FqSy=l!<>GO)V6Va=<ywpRDV6Hm~_s>HBQ6m8wQwIhCX
zl}IET#hMuhR8J2&Xg7v<F(5*lTQilZoLnJ%TxEl<5%RHMbi{zN9bH1G=!F#o<mTpX
zqp>p%BL4K;8LQbp(M@6(@LT+sRm7euGraYqGA2+&a|@D3$_+_-^m;wanl<Y=8hc3p
zBRr-|nL^KK-6E68vfJu@#8@{k{QUFJM{vyD+1Mi=jKMDH>FJ|gE?2A7qDw$d1FPO)
z&YU?f(wJASTq$nn>%@r@uf~sCOG`_4Q}}C-8>na-9`il)YwE3R%;FAoROE}gj2ky@
z7%f3EE%LV`?cpL9x)IAW&pb1n#+s6n65BpSynz_KW!J7<DYOd<N%FN5a=5XWOeR>j
zZrwZ@<Fskhu4&Fj*SMiWhtkg<eT$2W50N^OTDAjnIMd3@%ge^G^<!gf-jmc!?XK_9
zqsP6~)zww4<&me0*|<sW;>?*d((c{652CTX{`%_|_ecUZ&>25&e);8>M`4|2A=_=M
zk0OxlQmNF6)xw`?Ol)iye~ceLJ_$c=OHEDvdwqSqzpatPlY`}i9}~jKIF_DlOqc8>
z1#!<l`|Nf2**h&QZHh*t@v}{y++O3>>~qMhcye%pr_mTjjT&|Rr6h+x;)e|zMh*8x
z-}I_Np)j*bxK)zGJ7n@XXjYc@-+!Mpr|*y<Luf(%vOVY<|JY-X(VGwYOqej?nX<An
zDa*F~V)rz*RGvdJ(SD!Pr%y{qj~@LOl9|bV*`I=rA2DJC%|frFq@)Lq966F{G#Wu*
zat&9qd>|P}7LqADJNq!oIGAK*GPl?x;&G2Z{y05N+ygOS&6+i-H8nLRnz1WEl#m#b
z0aFswiWMv7qipmrZx1GGi@!A{ZqT4XoqP4_MVlV)96o&bh^(xvy;`l7d-RbJ<-44w
z$G^IQMOFG$lzx@imz<nT5AfbevXP8ef*j$IFnI7_vhCXucVpT<>FCj;c@*i$Kd~e5
zMv05jEV`GqL8SP3jiJ7%Pwe{@l7VDlGPRnQop9RJr%xYx8%tlrz{!&*PuRbI|JJIi
zDmDF_!fO?Kb%js(juZUO&jucV;D6k;bPs<&wPmqbfZC=$UVH5|TCSiiD}70Z)}S@v
zjt&n#_+Sz<J0j|CJcg&Ir+=86n|nwik<`-a9W9Wv+76-}6sGA~yWLJ(Q=qc4vKH&8
zgVZLq%`~Pj^+|n`3~k{xLLI0G957%2X;e=H?bx~pXZH{9yz|bhUw{4eg3Qd!9fgI3
z1(+&Spi`|=DwTRP6*Ga((dpNfmzP)2HR#)RtY5!=0o_Y&Fm0hWZ>K(3!P$0RvLs9i
z?zrQQPLyCW^P|0g{Sd#Q=$Dw7cpu^c8uY^tKm6pQk3RY|fzIiF_}%?<4PDFbp?hzm
zwx~^NyCp;SWhV<wq9e^VWwQeZ4!r5c8*jXY)`A&v<m7uX+|K^jovxv4=^nb5+GtOt
zM0D&lPz=cl=u{J*e){Q7v=x~^=k!1Nj*)T29Pa-CDOXZy#zpy100000NkvXXu0mjf
DXSuQ!

literal 0
HcmV?d00001

diff --git a/newexample/android/src/main/res/mipmap-mdpi/ic_launcher.png b/newexample/android/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..27bbf5142de0ab071112ab8ea360861e9af20e93
GIT binary patch
literal 1422
zcmV;91#$X`P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000G5Nkl<Zc-rlm
zc}!GC9LKGoEt;CNv}v34h)u7QHfdUGqBb>+HL-uR_Ch6=#7NWnN2~U*2gM2|0v;8u
zh*hg15NJ^j>(v5*0CKOa3a+rQ3vUnDi+ykJeFuI!Zvz|FU67c*?l#>?KABB+=gs%~
zoB7Sm+nF&VS|Ydrh#|y=nV35fK2s!u0y%v>6MslP#}ghWJQgOzzT-n_n^HWf=MeI4
z-n?lT9UUDBCu17&L`}CfG5)0>2)~eqAPpl1hGC8pX?IO(U_4pucKZXwfJtmbYL?Wa
zqz(&XeY0XPi7s<PL&GBzwcctVR;(2Y#nU{`(_;ok!yS21!<Yf4va<5|iCRM%Xl!hJ
zh8VC$qJiS#;)LlMh{zErC@6R#Y9MMLY9MOhpAa<)hm8kg<w9a-cnG|N26#?@#l(ih
z<>aRn&yuzZwHtL8Y3%x58<LA<BfdT)F<`QDkPo_0m}kVEG+h7(Gl!s6Xd&p@CN&^e
zI<a}b1|3%%*q@=tw$G^mcBkqvr1eTOg;-v|?iwT37iu7vIgq|Fu=BGeCU_cl!jr!k
zg3}Zv-s$F%aa@lNe^6m>i2+TuwxDO!UZBDA66Jtg<HGBE`|wJ(66KvViVhk59p|L$
zF?_WXp1fz_-gPgyOIbk%s@oVOZBzRUe3UVOdYKK!at!`w<n9=Pjpn3DVuy#vrc*k+
zl-cWJMXnl(UKcXAXnj#^tTMxU{!_TK<9v7y%!gp<^$Rf*VH<NaKJnvxcSwh8awoQL
z)*yWog)8k2=~kf&-8Q_sQ|UJ#a-hzHbEigdWX~{cSO0=L=OMoVclI2x=Tbn<!yr#V
z;hz>Hrl|r9tlp}|nR*(h^UXM!YXr**(ikv1IIKNEVF58Pk)=8PxYq9i)oX>f<SjCF
z<^}RoJa}yjs9`VGXAWY`kLn;c?53a|@IXg-rP~K+l6*~+1C1fj*;oi32iO4_SXFBf
zyoG|1X3?p3P0EOalXfE;cCuJl+K*Xz-2vSHtAdOG1E$*m<KeB)e)~ZnsjJ`_xPd;S
z2XE}_4;n#{6}c+3>z$ApUDEEv#XU6cKGcmFxm|uzn}^YN{06S3w!zlk3SC+fG+(bA
z<6T%v_W5%lr`Cj*vw8z^XaQNxPPAB%RHebPN;TY^Ae{l5m&ZHj2mRuoIN1a0`UqOr
z)uMTI4YU<~u>AJ3-+(@29ay8zFJzcuvGVXhfPuC76e^SqW|Ps3IoO4w9;?r+WM`pE
zdI#=1sz5C1@K~1x*E27pX;rlk*=LQQ+q<FP@i8>tybq@O_n>H=zD#4`*h;o|Pai6-
z(Ri&)<qt|iu@ZU*E1dx^*@?es7{bzW6?A0!G_R@g8xZL~+zq;_6o!3Yg16H_2JB=n
z`J`CuGq9yXkNt8pW*+Pcn3m~n25^EP-Dy;eP^-r7i+;z3`T*o#HG#Q8!86!1>8jGC
za^Srq12}tw!Bd630pdj-COIWHxuiW#3nbZGL(Y(Jw@iUhr%@T@!gdnr2ahR2vZ-G0
z8|{dFAK=ORfPpN{8oM_n;<C*N(KoWFfvAE1wSoWcpS#V?&Cf;Z2ox0+y*QNt-=#rW
zS=pl;$63Tik#fO7w83h%j$~zJJt=CetE-Eh>Wb+erBYc+Oo;6u8VOe!@0(>=$Yio|
zqAhMZcVsb3mMlr==;%0OHk++9P1}fjMy&r$#{0BbEY_BmmOmCPS|m=NnCaeB#u4T(
zU%q@<N=nMx$;ruKLG1fYQbaAcjsC4B5)%_=laF%=^TNzrQOg}&yo<>~=H9GuGHJp_
cON5la0ptn$v9hKG82|tP07*qoM6N<$f*k#x5C8xG

literal 0
HcmV?d00001

diff --git a/newexample/android/src/main/res/mipmap-mdpi/ic_launcher_round.png b/newexample/android/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..34e8f9230872bfefa8af506e2df00be7e1846f01
GIT binary patch
literal 2536
zcmV<E2^aQ>P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000TENkl<Zc-qZc
zdr(y86&HmVAGNhJCb4ZgrdAuvKRStN>tv?mOq-eXF=f&aO)_LAV_%cTXdYutj8S9^
zphhy7DrgWe@`zca5rc}l@&?PJ0xqz-EX#A3eX#HM>-3z<y~|zhWkKbUJM$avF5msm
z?>xWreRmfuc)$w)Vi1cEarAc@<HKX=*#+};q40%>*h&7k9I+bl1Pi)fKFQcvnrmK(
z<LC8=*AZEvP^dB(3@Q;iyf+i*p1!01(HM5@`Z-sGTtC6eNl5A%!j1qWIc>1dT%$P<
z%fw{NB=Hz7zS;YKAPM;d(xE^g5S$KZ>;#46G$)r6tT$q2iu@wp{V$MoBab){@(0H*
zxJL+{#m|i-LrnHekl&5O13ck@`yed}cCH{BT6DkrftBDth!dXVtj=03G*jd!grJ}M
z?DP4u?pq0dHNeRVSn^!_!fayP8A0%Ry@g02=AM+`Cl5|`ipcXPog;*eWw+b2c}m1g
zM}b(@^1C?8&oTM15-30D_xr(YHowE?Hf5d1_<M#+*trOsXyHUg#83(h4-apNx=!%p
z9<^@dB`nM*I1Uzz<-bU6;Y6;2&_V0}ofkTx`Bq>ol0re`1?Yu0MMH_x2>&ic>&tny
zdDe*eeF5;eqr-<|I4)#V^n#+iynKbg3!Fv{ha-t+{aGXL_5@&1?FLD{0lv)9i{ipr
z1N3ye_`OpQa{+pLdv`>5fnS<D9?!MOV&92E^&?)m{<R6Nln8O{KPE8ioe=aoqmp-_
zWlwyiga36ppdecZ2X^+0;`8HLFpv5KxuDbOZt!v;CcHrC_4;)<$j+58zEGb(09n-r
zsPDGJ`7Cjv=TGUt(Io|6T{>V9pHzX{GCRC{pcjr7YC+cSfRwif1al?t>WB7byP&Kh
zS6UbBwY9bJ;l+(BOBi1}*zge~u1w>CUmaD#KffFTx!ehdc1H?L-7^U4E;D$Fo(I?Q
zM<AeS5hXur@xi|AA$W103SLd_1!<ENzAiMv!MB9Q@OcAbEqI8+sI#;4jc`fjJYcig
z&WP20i_;HpONL<M$8uCc0g@IoTq;JPyT*i(@NX^{z}tEjT*tl-uC%4#xws92F0+7u
zL^=xFKI&x@Anf{d0D5{{@M-dJnEcUwL!ef=CS4a0pjNB%Xm#ed7cow!vqnsTD|fAo
z^+^H3A5Zmys@EMBnwc^T8hJmsbDl=>OU7_)CHT8aBZQBPdf{*BePQy1m-efm^p**v
zSIlExV2m*e812#eB+zQL^~ia=l-{~^Yq{I)R!&sFX!pSjr`2Kd98Ojlphjw8gx;<+
zgSYa)IC&PH+$|8W4uz{uR;eBmKU761K=^A~AGCKnAtz%5K0B-dqux8^%4{$gRH><{
zE5i!hxpU`-xKNDn6`;h;#>9O(O(9U=xf3dA=(5ArizaX=YQcSSy+8rikrm*rPGJP!
zQ99wZ6t#dnhZ7PVw6{8-sn&+_r*18*R;w;IH+M}~f#&AswYY$p_zF<jJl8l1$8YLI
zQKxcXj}icX&vo!h-$(2fz*l#KsYrG0HaK_1I4MdnjErU<Gv9Q2Bg|K`L?U@ItUy&&
z)w+oa*u8%Eq*V{^)o4Uf(Psm{#}Ce~7BH3Nio$YJ!YEMDX`R#%gfq29&|1CV@=afX
zyu7^lumWXeWk1G6OvhKiiy@SJdj#T6-h~C9bwuFtyl$xJHbL*XZgAXfhvCD2fr0n_
z6oJ8i{TVFRiWtES=&ffzQ3^tl!-r)WkSHv0x?>c4(+D9f`TESv%(Y<!_U_%g(&cgq
zl6b`7gZM&)K!J}MN1*R=AJlET4w|cdU@recpukARJK!@L##UbpjYH*H*pw<H|C`Jn
zs8reD*%B3OC{TdX?4D8qT#Z#pNlB0J`?<xqX{Z$|qlI!4EX$UK$*=oD4qBxJT6Wez
z-AmV@Wmhd&JNiL;?5%O@zn=(>w%Q2cLnbf$7L%V({;4!M<kT6_(>hrA?+%E;`QNA<
zp41B*w}F9yM&!Jd-^j&cZOs)^VASP<gm3y7^2@Shklk*Cp3^d@-+qHpfV`mkTn4uK
z3Whi-pwCMMzf;f(z?m9jL{&@3RzvNe9oC{zI0HR)whO9;>`@o8j*gD=$T^PT&bAUU
z?d|Pva{c$jcA{y-$#~&+Woj7i9EJK<ZjO;>ar<>CnA=7`m%Sf`_H75xfKrrz&gz5L
z^849UT?rTOm|=%>h_OCDM4v}FA_+~ML<n;gDk>`8Wmn?yRw6$?e-o|+R<UM|68az}
zbfv-!ooTHR<T)?MK5hYfTPs*@d=<5slge%I%n=2=TQUrnRaSWTl(0y|V&N!~n;|g4
z`qa!}sN2%h(|^e>z_I*xdO3Ea(#hIsDyue)1Jng_=*{aAK#gJG(&9qo^+YX&4lKR<
zE@?ojw80-P_X)^z*dkFuzttmXr{!{a6>|M<#8!aIgX-$)oq;jyg=TX*Nmc2#)&Z|n
z48V(5`bCj=wI6N_*f{bb<QT$s2TDszDSTohww2uWZ1d*LkE4qebFroLU|8D7t5M+g
zM{X&x`Y1PU+_*+`W6x^zuv9AjfX-r=o%FY4Q_r*h0pcinKE%^#wML_9{<a;fVC=Ud
zw;vI~3l}adigqfuI3pt?0XO(w_E<46U*s_o0#tcSCX+WgIXRKIVdEJ$oukF?m6w+v
zrkYFcn~&2uwrqxQqXi`;CF#Uz%A-ZDG$ke`l8b)O(9lpodr-WBbEyPNK1c?{T3<|D
zh|{#++OYXRu6m-Wsp%5y3C5*!6*eTZzP|o4a`*{xnKbUFc)_t4v9_kBrVzVTMhQwP
zs%o=fb>;;J$)K>oYDkv<DRE#{-21uM2T6%F6o<G*c-Z5a&`c@9BhJiaG#Wj{#l=TR
z<^z%Ehf{of{6iFnxNms5tE;P-yg?O;r^vk?1aogR8R9e-&Dq)6*}P}Zo>xg0$-L*V
ziI&(n87V<00UL^niVmsOY6ZEP^$2ruZ&s#w#Tw*|XTpW%DkvyO!MT4<GDy~}{0xDu
z!4y)Dty;BeQ%+9K2W@R_RR)8>LKdVIoIOE<i5K^hkjBueilJh`7QTw+pt)$yY1R3e
z@CGYn3F1-2&$e&h{(Ef4_hU0yjA777JqvF8w738n33NX=IH<(%YoswWmY%_9pJeA)
zLUSHGcyL~RGeOF%V2M!TZCJf}^;287ZvAyaLc((dx~K2xf9#k?*=OSB{Kp<*9-&Gh
ylgS=p^Mvyb{r=%QES9m~#j)`nN6*Yeoc|v$cjkX<ECkU20000<MNUMnLSTXk%;^09

literal 0
HcmV?d00001

diff --git a/newexample/android/src/main/res/mipmap-xhdpi/ic_launcher.png b/newexample/android/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5a9969b906f9d697840f076bf9d0aabc2f9350e
GIT binary patch
literal 2990
zcmV;f3sLlmP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000YhNkl<Zc-rlq
zdvH|s701Ivu~jRr)mkW{QNc=Wp(<9ZD5FfB=^tpth>sB|bw<Y)YRf~dMM3}rMC6r(
z27zQCMoP*<VxnzAL_!jTkSKX=9=qB1W_Ppi*L^Lg=UjJFL$d5{*ivuvJ2T%|{$YRj
z_x=2S=bYcY3pXu|1q&7|Sg>Hhf&~lZ1OSXijbV~C`cfJ%56YI{|G*a<VC>iad>QIT
zsGCvgBUCp>Jh*Hqk5W!J@;M&03Uvl$LwQi{$md8>bk4Sj7v#zKuX~m9m5-lOQ7ROi
zJ9iGk;V@G~<OfRS^ZD*b=}w5!^mshq!vQ)X#`BUSiTEiog{6oWJb8lvI*%VeeqG9T
zLi9^SQCv+c9|sd~uybtH4-$DIa2y93jV3200HW<xMMcFp{PHFuOt_iZLo4cy*=%lp
z<&{^i`nrb~wfa>mRXTogUu2LlGdm`LFl7m=)#@lNE}nYPyCCwHN7dHW-hl)77=Xk8
z*zI=zjvYH@kawv7FuJm`@}~?y;s9(mn{WH}?e~y(sQ@shtgLJr1CSH||JJQr?<MaT
z00w{oU;r2Z27m!z02lxUfB|3t7yt%<0bl?a00w{oU;r+?d|nY;4q;ewy95Sc*v1D%
z5XCTjdCCXd)|g?-DpPXGGC_5@OW6Q|K?y8IE-Bf1d7wF6Tv`Z2$-f+Mvc(5}p9lpx
z7FfARmy|ZHFhZ}1Qzn2AFM&HCg5Ao)=1dc;S)xx^hl=|^;6;$U7W^)0SO9bu4xZ2I
zfhF4v;6VT_jeb~*-<_!WtNy5iPd|1kw+2+Jys)Co0vv)k_K7>;iLYI%2dkL_$<_*7
z=@SUSoV58g=Ee_t;mJ4EvJM?{0>??PZ>KHc>)5{D3|_aWOaKnQ0M8fc;J%zL8AQM@
zVh%RNpZH=OR335CSim1y0Ks+N2BCIC(z~Fc-49Q#Q1=6PF<T2p8wZA-5N!C1A?|go
z{*xZQJnd6%7gSX5fIG80VEWq~FmIO@d?689oBVMn{_aX61OpO?>M97n^IZh+EePe_
z0+O{QVKY1kdwIU0-~6cZ4p@Q5ok4)(T}R0d8}OW@OaK}?2ao2eW%EgQt?PioI)_{o
z_vBe)PCDyVJv5%gRVRcXRP;;P{HVCHg%B3`gbMG6pE(DaPkJs>15F)%xwXt)YmRvx
z>s~j29(Rf&&jBJ{$I6c^@bifIQ9Zn+8%!=9jJlAV<A<7f(Y9VJyb=fv1rS_+<p2P|
zcdrMr>*Kga7_1z;oTD2O0BPk;le|Nk5HuCpp|0bfhn;fksz?C!8b8e3*fqd>5&_99
zx5z8B;vWvkTs&~n*~<-}=?KaNH<WkFK=Y%!p!g982V-|7ydXirVOvb|N%K}{;FEec
zra2Mz<`3SDTUVRFVHcEn5)R_(eX&?S$o#18S>Fj?7y{tz6JYbI{}g0`QMRuSM4ku!
z=<*@Wmz8r32&eO7j{ilcA6{79b3p*4#hdhC?&G1SGdN&3(si6Z;T_ib;~N3sP?HO0
zpvkcSkX|Y=Kmdzd{V|W6^J(IAMzC4%;AJ{3r<#}ms38AsDoAeKpt1dU;$2;6j%z+C
z<F9HcEVs)Ax$N(begK7AdgX3Sk@td}*mnLpUvok8<y3^7QTbW7Jked7d*wV_Q{{#*
z=LPOS#s$rng|&gNTr#LFtvuy{XI5$w0zg{$wiep8K}<J1<h*HwENnZ~s-QA&#?jbY
zt8Ie{Z!A4t&;vHF0IKGI+!gse0*Gw~Ah_W>@c~2%vSdEfKfc{1z^j|}37a2P_8yD8
z3u>#~aB#0Z>B9Ss0ibhm@X)4iImaie_iFm&$x}U$d{zkUorO7me8S=mJlQ|~zA6Vi
zi!CPYfMhfu>jm8>qJH1)6qI{A+T!M+K^I6$?Uo=2VkC`VXCvuql2-Iw(4`MSt0pik
zQQNBc=K*>z2cH>zNvY8q06qdh3iu$TZh=sDate!It=eW&FzE#lmBt=YK7dYF2(I1P
z2IIE3B&;>3tn%H?kSzeB*9E=XmV@E-Cli*faBctidB^PViw&Jgr9jdHcwRY5_o?vw
zp!f311wdoJQD=csxy_K4fNp=k6HGoH91T`zUDE&@0`xc4fZ??#K)>{{xH7!?G;sQ^
z0V$9Q`}72xfT$MjH$n)_-`Hq_`BjGg9jVAR)D{pReNRVR^GD}3Lvgzkcm#0vty56<
zOcfZ8^ner!;HrK*K7eJ9gY)ovgWAvojV^grCu;tz&E3$X4}jXu!413H<z0DH?^E_O
z;hilGxIDk*f&gZJr~x0Q9@ED<sC)J()IL=S4S%QszrhEbt^<s?x-SI4oc$6A4(p(?
zy?79N=>tPT=F?dur_u@m?809D)YyM*4;|8gGbAb(fFCC`3nvlFd|G97W<Lb605>eE
zk<FJiuM)a<w1UL*;5@P`cItU;E_iD`iaCCr+Bf8VsPpw0rYk+R&d0DBxT>Ia!0s$)
zb}08&1gT2rh4JsT4KknV!@{Em2;+6C3)^MW`vIU%E~o}qOCJbs2bfkb91=ip-WwnW
zVy6iX^LbW<<$~tly{;4Xop#DA{ZUMP=U?ZP;ttTbIpqSN+tFn7`30HsY>$TnZ?_vx
z&aWO|epD@4r$NN@<ULV=x&AkU3U8qGR9qv}w$OlQ5$Ef7#d>gIy((&Rz}UQ@)8*0=
zW)LJvxxWi)cZ6V4k*a?}G|}}9HhJ~8tZf+5d{W)BRnUt$SrT}#Z2I#60DUE!KoW(7
z9>^5cIflF~a&Jy2)MA>VbIVUkI%B3vYN_ijer5kKE9Z<&&Z#t^JNI>ghZDhmvNxvr
zQ8oPjI0$|of~rO^ypbWBZ_4^DaAs}7X1D?(JhNLn2*6t(S>(3!b!?gAb!&6VwQ@~U
zEC6at?=9_yE3wEOR=a`6gHGeCC*lI2+MvbN8O9XQSMsh5z<snd>4);4b@}8+p;7Z6
z+0qR?b`Czrm3{rL_P7A9z=olu!=>z>CLY3k{{kLx==VYT1M2wZM+-962x?1tT=lly
zYe2-poNQ5~F_#`R^#j;l+b6H+C$RlZOYp!r9e1w9&np)I9q}DO0Rko;_WH-6{`u;J
z)tTRnZK(*N$2si7QI|CY_rKEx89TM|^NP|gm%Jkr1uzC{*Q(F0%Kve$fRp!Wy-6v6
zJ-T!ew+5mGdE2Kp`F@WbQ{s&M-3gl?)x<&-oV5qpk8_7B51x>zrF>uIgde}(3AgU;
zNJ^7YE9!e0fQuD11zJ3Z3`a&E&j7H0puqqz01N;FzyL4+%xngL0bpVP7yu>)fB|4)
z02lx!2H>0apLeGeKzVujbOs=~9gv%wdtb@`?BBnCDt@_x0Z0sh$z*b7XJ_A)3IO!_
zjWIK4&b%%Z3bn9Tn8bgD33;SasXC@jn>I1BcrWffG6e+%^pdh`+S=OkMNy<zH3>8h
zGyJ@tV~XNA^2Y1+LPbSI5qTEzE-e)Ru9`b{?%jF}K@emJIH*XQ0S6w@A`j>_R^$nJ
z)6~>toIQIs72vBgGczwwOF@jv$jG2K0!>`DY}q{A2}ZZuEmLRlRZ!aTcsy|C%o)?7
zMT?#zujb5|b2WLFmZBItWy+NA<L9ljX3d&?@ZiA`B;BpmYTZVoF@W+%K1Y(|IqP&f
z4|!2qTKd6*4?g%S@(6=o<d)KRN)pL&x7~Kz1R4PKvk4O>+>dE#?t%pio}NE{{=AVW
znmc)bUOYgakT(&J#-(!gM}s<|E7H@`e}IvWf1ZrG9W`}?i#(W2o{%@>QN*kNN)S~l
z%2!UDIPuz>Zo27)8*jYvhm$5vnlKVYb0-hT3-To5&8W0X5H!e`NS?cFgllZXi%ViW
k3l=O`uwcQ0#s5eA8}>&{^`cAiI{*Lx07*qoM6N<$f}7}p&;S4c

literal 0
HcmV?d00001

diff --git a/newexample/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/newexample/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b07dabf9f3f7fac6eda88ac4d0778cf7a951382
GIT binary patch
literal 5845
zcmV;`7Aon9P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000)8Nkl<Zc-rk<
z33L=y);0-22q?nHBBJaf!y*WX4mzXG`C*)MTxL{Ua1i}RX8t+DpolWEXk_11R!M{e
zWR0u=lszFVl7z4&B#=Gn?xefZouoUxFO}T?-pZ>`S-QKb6Chiib5AGT)m86(_ucP)
z_r0p>d+ur7S~p)C00f`~G7Iuy!hQj*$oUUA0oaCFP(6+lBsxxDE3)24IDr-H4RHJ{
z1g#rdZ?r*ZLzoR>@6l%=J{%IvURxtXG(rPvyx$gWFxp?y=Avyui$S}Nra~)4v!L0S
zS=f6@woeTE&Rlj3I#$~{oL;X8Ys$da>Nx)26YVXuFtn>^W;Cd%sHn2?@^Z;0{vJEl
z6?SYoN6)$jLQ5I(L8AZfLwg-<Cz@6axCl%R%`GyHS<Q{}ux~A=uygHX=f2NV`<gTG
z{m??uGU@<b3~+^<QSZSjYB;E-Gcs6P`ZYU82s|tLzdzbqG=l&<1IX2YfJ=3VOE@2M
zgn_lKe+{Y(XtF#n`nxmQLNucYc!4hN1nAzJQAJhE5k}V5&UN*rsf_wy(f@Cw<%oc<
z#m$YxgaIKqg4+C!s2{<NJ{p8dmHpivElLEuKr_(DO`s=W8}*^PC^rN)+C(e*`_D|T
z3!QQ|0pM$zI2x$F_;X!-ZFGE(jh<Iy)K@e?@Wna8B`7Ah+x;bWF`!Z91)(7{DzLFz
z1@JkJb2nk&tC`Rj>X*yq+IIT%={AkR2|}`^Vg?&`oKa4B6XAM)azi<D!ik)moK9j4
z?&ipU02`ISz;`!s%8?{n$q7!UGf|~db-62%Ae>OI*VD+4C-9pS<w&6<a)QlfOF%k$
z;Ep;$Br}7s5yx5@_%-u_*=#-$9v&WiN7Rv61LMhmY$3Gck&bY4qa(mzFl-m8qrlrf
z`caO}6(!u32)@_}<(QN~qtS%k)+i9NJ%axyk<Kq~!QfY^BbE;!H#hf{+oFtw1Y@yS
zy5q@|%}wVwKtA9I6Qm+lLPA2X22ILra*g;c0ME0lr6ye|Qx~`q741c=0!6qr%;-nm
z`<7^Kr=k_`+WCO+v0AN=k&!XEL83rND5a&PoiN0*81-<iV0)*cl9G~~!-o$)Sns6F
zz8rv~e?Ft0R`7ja48S=Y4#>{VUQXEg?EvA6Mx(JG9<-E={#MoFI|}%P1dIa1nKNew
z6NbX%oj=?kfEssI>*$xiy2hd)j732kzY;HI^gcN9i(5y({3syIii?X&Fc&;dSYEnx
zDOfi5+wJywqKda!fa7v;kegwHluMR+*^Oi?*zKIh^AK!QoTa6uEtZuFgt-jlt&Vu0
zwC1FIR7DQn0q0K{;p^!N_-dM;_8$f8`%&-J0Rm=fwK_dCG_;H4c_M-PO(xT8_0j#5
zi;C1v$j!9*W%S*K1Ye<Xz|3_j$k*7xZsTCXGL7F3SoVbqw1o~|G{n~hh$AE>CcY~v
z7l^92K%}4T{!TfVY;JJ7%OT;636{=M!NO0KvTX5ZD!BBksj?$BL%qSb+TE~rPZ7K^
zCkG-9>-oWP?V=eL%~Z+;KNLs*@dKrjt7Dp|%goH&gO~>Std4~cLEh?tUoP+``5F=Y
zPxlo<n%V|7D+iIQw6Z(7?fW9InB2hWZ-8UpMBvPtdO6_N6cfA~n#((2%ECOjmT3hC
z(#M`Hdf9CYTdsl9VwWsQs?}=M8#Zj{L)h-#y*tR)jAsC9*f;#49~Yi)YeES;wLBAM
zA5w!0qaZ!S%8zKN9i0D(lBXcfVFKsRAAxPf1K_&2)^G3)CKr6Mp@0XU>`k=!o7ET<
z926=Xu<XAw+V-&$t|pqHoRh4Es%Yr^`Sb4+wm7)k`cglER;zWrKcm0U;Dndf=fa4^
z8Su=CEJ(_?@O(=NOKK-~N9y@wxpQN{_H9?NEo~3>@S(sNmEcbvI(*ImZ-1Fv<p8pY
zb94BppoDyEe+f@3Qrh<8IxQd7a;K}EPA93MNH$3q<duF#jT#k<yp<%^0S@fUf}<K9
ze8E24ri2oUix1f)vwV-V)n6A@CO1nFIJP~{gU{Qt4&XdK9m-vHS)Etwo$$e;ylUVJ
zHe-zn)WuFP88JUBEcDqn%4PZ4cE4%@dd<(zzuL2B&k&C^B&eVC^z=da1%vp@QtU#G
z8D3bOUCjZbmuAAA%Lc%sK+Mku`1)g|*W`BQxRD>Vu8V8HwzBgr2atW&1Kg^3$sKn%
zIoNbaS10&<6wJ$kohM58^Ibe=f(4&=Z`<LhVqRGIJ2j!x>5Mye>=;29*IASa4nW=d
z7ZLwUa)8Ut!PK3qYTyg@`VV=aEOCIL#D&sN?IpRX!Dw&+XVHOuZQttPGjr^J3(D<f
zk~*H8W%W4v1^fGwe8^MV`Gmi9eUazLoL}fuc6y^A!n3Tb3}Rwp{^n7R3jAMMTKa`(
zxzT3=cB6w2Ts6R$Wtnw4;K?N!u=tpk-<K-Lx<(qkmv+qpoYMx*Q=ireK5yUr23*&+
zNRXWze7UjEEBHb}{&pAgx`P8nj-8jlbvYpMY#ARZ^;jq1tKy`jq=j|n0g*m!gBd$Q
zPW4NP_pONhI>8t0cPq0XLu&`C#SJ^db+tOUeM1qrkTN*MIk2yJ)UyL9A#ZvTIBSX5
z#2b@T2Je2A>(c>bBu_8hwD1WzdV6uLgdDy?16H%U-c!_+h*MHhb|A*Vwdw&;iQE<y
z&<UvyAZ}k5r}qlJU^Dj@LK)TwsyutO0%*mY0?5m<LAlccjy<n=1-~*OcLdkD#Zd09
zyHeI0T`>JSr6lkLn}^X-TIS-b@9)04m5@n3r(Lx)$m}RxzJmER4lxd?H7&vZ33&6(
zH#<5Uj%(t%3~zQ-WrYdrawIumEY=3UT(3;BNA{xhV{<Vl50--4<wk1RiWKvpZwF8m
ztm_Ay=1QHpX#4SEo?7HMfMn`{xKh4t=S1^Fd$CZX$ZUv}GNy!5pLymPnimSFri6sq
z&y5>5c1H=CE5!lS*v}6X!pJ2Vk{m!bX|n=~%`QHntzA$Et59~9=&`CqO0jPmEeU+V
zoWFd8vb1_)%uv|iAIlZ8z!!|Zr$ah5l)7N!HyT(uw*Zv6_6A$3q(rPzsT9+vPk*%5
z?5N;?0|yTD$9=U@B<Q(pGmKm;9ehEShMm>(iTg^t8IsPMfOET$QWnVqze<+gjIJgI
zmTcAd1wNmUu{hg!P|wTP%rq;+9W(kRJH1I!jYgwev}n;#PYwt?dGh37+}URhV6eJj
z_CYm_Uz;P_-o}KjGr9QCcA)y;^y%Q({ztH{A0X2PqAZ;V<y>WgOwF;vv~QLCNcPvL
zILk#@O2AVE-_XmHMMXu%b?eqWSxX5C4mf)B=y3dk$(I9c2wu9z&QG}cW0Z`mj%UMS
zNPXFF6OwT;))3hR_Iex59o?>VVl2kY=zy`F91wK)@Zl$<IKYAqxTdqhC9Qu}YQNP<
zx5WewWtQJo?yfwRw#@1GfDjwysN3m)HEY&9&8DVnJ7DkLy+fo>P_fMglTIk1*OqkI
z_T*1lpf)?P=yHSG?gpn;1x4$>fWig;E8Fy2mLLUHQUy)?y%Lt|7cC0*`o=s+*J3e<
zYO2iPzAY5AY}vBW9v$$*4?jHScDp4d;iLH`2v~O=?vY`^-={)of|j4Q)}Af^%_$Xd
zE*BV2M1gYVtFo+M-n(E)zECX*PupD}OB9HW)Z8Mh*zFkINAt>H!NnqQa$JKtK&@8m
zX3d)QghvN_{`u#<unx$RB15Ue6OSn%V7+t)JheL;v=%2=6ehUx@p-sB?Ht&Ul8A;h
zE2qhFK=Ds&(0SF1vE%~jbxBQ|fDxcJIzef2!qa=Qq37nCa6xTpP#Kz+m#4s5YXD(g
z?OGvLhy@NAGNcPu!jcQI^Vq;gkXEFC-##oAcBGf`iy1kQ*txe)!LJifLf(!H1kw%W
z#8aS}{gx!~3+I0T4pnxo_7HWfj@8MQ$25->`D-y>*{`^)gEknc)aG}PX6^0<i2@$W
ztgNimK7IQ1AgpT^V*ENV+WkhO@uZxoh`I4vNe*}eqs4%nUzTZrgvqfy_+%HSo&jST
zDj|m*bP@A?JK*!bfbrx{Rmr!eQ8IotJWrMbKG>!NJ*uCyVjJ}N@z#L4|A#c#mu+mY
zsfd)66q<^lN;ohyG_=}OL;$`)A<+>N#b!B^artEqKCyZOzhihBB<nG`Ve-AP{7M!0
zf~76K%qL}APAU|HPWI{m&5D2Xl;y2Lr`cJW`j9$BayHWp4jkzp#Hb*!2BnTc+9c6Y
z5BjN^j7vyJh(e6-BdlvJ&a*{=5Db$qMURn@G#wp*Be*RK+nPol`oGhK{Jy$hH4r~3
zrj`TfJv}C8&f$R4=uIBMSA8)NObI7_cG`jp=ELnu--#FPvjc@-#e$ING$bsoR{Ke4
ze4kS6_jEK{7p|~aEP!<uU9cNc=YkA-v)#FK=iU)LJW0}m3~}!tqjT$Yz|ftUkZo{)
zU1x)9pT*Y#U$ASl;=zs-;5HeM<EPZ=0Fs@YO<H1%&$YlGzRULNfEQP1qwGZLv$|mX
z!90%<JYZV}q+kTsXF<kbFu>-`n?E9qk^kFzS`llzdiCm2C`C);E=it1Wz#+4W-Zyd
zA*C|8<ws@0g?CPQbO0q~<^CMtNQ1{61l51vtR*|`c{e3@oT~N3$F&~8AGI_S)}Ge!
zBb(aTZbPa^2T&AGjV(a=%=s-r3knJhpM3JkbA+*{B}w8W`k<@HWJ;3j0Go^B8!2x1
z9}v(Y99?#-niD^W^$5OTBuh!6QWR*{&bsA*&t8L){b86V<XtVNC~<g<f;To+E|qFf
z77yN$=~F~>*?0ra7n=QEl)rxcdNN}BFkxIR0gE>*lkdfs&I*Mh+@H%*C?WUVTB#yB
zVB(D{FoO#nkg+DkC-{P;f0tb8(DbXIno}uD)l2^gu2P*}m!)h=D5<qvO3S1t(#rV6
zJL8-hf+W^5M6;yiWUhvl+wFE*52n?y&J5$aw<AZ6(1#sQojUctC=bZEFpGngS9E+h
zzjso}SG>hZMUXHhR<Z*wU_v&eqAayrp*U(aQqdbwcIJ@ZDum{C-rJ(6mU#cUOT{PZ
zOGQ?AaMKN0mHgJ5r97p|xiG7wqy)ml!~ad#VjgJc(E+SDXg_Jvq~F?XHl<t|A}g`G
z;IBs&eCJ#!JFkCrQ8M^dvUJg9a2g%p)F?3VE(Uj5X}xs#i5q2AvXm$(KF17Zl)Y~s
zSIU}7AsdB~JJ0Bl#s8U^nS~Q3OrUA#_Dt@3-d=j?C5nP>`T6;~#Lq;KbvdA&F3#mZ
zeOv*FAI3ub-{e`s`>~)wP0q_)tGV8VkQv)E=a8Crz|s?1UOI2bs{Fq2G}#WIggo=S
zMymdI6aB=-#zrHi-5IvtH}numqz9s-qbGB>vcCM=Qn8a3m5HYlf6SsXH|UgbW|18x
zM&$EXXBd%wMn+}H24AqQ5jT9wQh|Q-dOfUKwd!AlsaO85K|>*rJn~3?<gPTS^FmF*
za`g^A@zQ)x(E3!r9YDnyO~;$OPg(PrB_}6mJoL~*bhBQFPx=wIsZ*!Yr4!vQUc9)3
zMM1N9C<jfh#bR_tWf<yZ(K$ws4q&6d+-Nkyo;`ck5S9#6X&a-V`zKGH{1ny%+SZ%&
z{42gN`RZPI<(1zPmeZz9yI0PQlKeG7_}cUG<;!98420GvqsW?kE2nz`FpvI77&0v7
zJvV}Rtn+*Cz4to|rJ~j-kT?1>GBWfy`d=Unr%ajB&Yzp*1ICRTM~`;zb@uGpZ|KJ3
z)+mrR`f1{A*REaP6Lt(k|DKwHp+mW#3o4?aDwQhT-@2eB-62m-K-$jg-McpxUR@+<
ze{WHMVMHE$c+;j$|1z8TAGK(W1n&#)ux#0~PYE*w|9-zmzi4aIt5+{tM(dBVbRSU>
zt?;yhUVGJx2Iyhj2rGtJgFH1W;N_QJCJozT#E21N^7Hd^S#8itMGSnxf?ls&xspF@
z*sx~^tLLA8zGFj-eqjrI_St9Y2Mr!wvSi5=EU(?Is;D~k<mTqOXU&@R55kCH)!<K0
z3?4pwcsG0<uz&yl<&^1LdOi@{hz*gEk*f$BhS6<#o^$~6TKf(iI?#13kH^NwMp3ar
zKA_UO1%l5{H_%-F-o1PG5hjEUyA}1e{nAF@fB^&UXG?3t;^X5_&}u&=pqAu>%16Uh
zaCGP6v17+#5sTr33B%^L|H4KPCK^5;1P2F?NJ>h&(2|@WfKSmM6BCn&7>pt;7$$e*
zmo@miDMyYR*%e>=goK2QN=QhE7wD)t=LE+2<?No{i|yODe~K_*ShTsF)KixegrwXT
zZDd?r+({uZQ$sn9YgSTI^e{g7<(FTGcIYzmzM`ai$A4joPS|$n(4q7TL-Z?jPaHXN
zWOq?fk)V#;&A|zR&S&>{(fmFoTzcd{Ki2oQcLV%tPQc{Tl|{m^EnBv%#A3}w4=Q36
zbCZk)VbrtSMo&O=g@uKY)Eq{AWqrP@;8&xghaZ0UH=R0lA}0))J$v@wu`0|Zu560Y
zARhJ9hs4ChycsiQP?0r+`bd4fTeRcV37tE4?$if2{Cn_Yk3IJ6&p-bhU07HMEE@Q!
z!p7_fHtIRnR=Tej_U+quXyCwsw5m0j`t|^BjSYOU6G(=2=-<EpBltRy^zp)l3uj!q
zbSb^KxLEiF({h%iD;kruWOTzPT52nf`i#)f(3wo*4`hAn!1~yzf6|Z&k#>Fi_U+!S
zTQ~Y;(%*LJ(&g!`Teq%DO-<F3QewYOSHb4b?@EpkIG)--ZQ*~#(`ck?IJJ?Hk>69B
zsqNGU>I?PhP83-UN=bAxLcf0f9%a!m?78Qjn-CQhwHY0up;1O_&Ft4W+>D+oZl^OC
z=oO4++)Og_(vsS=YuBzV<Hn79i6z>BtnK$TR?3k|N$q;{=+U)z@7|Q42T@3m9XobB
zj<VGl=4q58SS2kuqns%x;kAMRCl_d7G*@*jfntQ`{FAJtHbg{3tQj+A%%2$D45GGD
zo7t!jYKq|3s+@^GF`T<&a_+|*F$~N2r{>O`J3Tr&`ap7WvVs7iMGYY`gpGh>l9sEn
z3HjvK8@LbcD+XH_>EvjtQ}A5*bWS=qwqYzA@q?&s)JDejZJIjpb>#*M<qpKDOf3;L
z4M7l|7&K_m3-jj9n}LPS_6rv-T&AlEv|25{z)ho-?y+JkPvB`|YZScdq9;@lr|WdO
z@~o^ZU3`4}WjZ#UgU&_gq;pdns4a}=JFqqe-qVaX!4V;(r_p+$wicpdC;@{uX8ic^
zFJnD1ebc5*-yA%6@Tb$bB_$<YMXt_HPfst*$;l~FC=|tH^fx-JkUpb*;^N{?A3Ag>
z3aRCrIdkUxhmJ+ZWT4a2N(Rw6>D)}yhqMIXJ>>}go&@4tN_uonDlKf#{5k_`IL*4!
ztRv9{e*XK>qeuVGi!Z+TGH$Pu(cknQe)b&g!}cA)IDIHP)&M#-orCdvM|SR@=0-LC
zI3kd7E&<X3M`vfcp_#Nd(F2Q+{*1B)F+j-%i|lds8ST@bzC+(-$LK-FWE68RJ6B*!
z2VROpXs)F_0Y_CfU1`v>XU_*&4(TB_dXGM%eP~|>c6)Y=R>14&5Wy*dj52~4sA3b|
f4-|pj=mGzKtPZqnTIC&!00000NkvXXu0mjfW*l!>

literal 0
HcmV?d00001

diff --git a/newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae0d78c8a74fa2864106d48c937a00bf147fbb16
GIT binary patch
literal 4620
zcmZ|TcQhMp+W_zcu~*C*L9H6Kx5li|q9`?M6tx?pYOfe+sT!?SwL)o7Bac}nX7Ti~
z2})X|MvAJDgo^d`eb4#6^PTg3?|sgF-{-oo>;B{V^LM3NTbi;k@-qSe0G8XgjBNhg
zIse-9w0};5$@dQc0C@Jck-@#FrQK47CwUv4BMeuQlkMfXK_oa`K$9uVxEsU!UakYv
zfx_Ko1U10TMh{kD)icf5<m<r20sb5vkl9N(eKQUF%>fP$`m0H=<CRs4)KrSZTbfor
z5qc(%<5k3cl#AqYE#k_;E_^MGRQ9?j_hJi<qv=jbSH=G0Vj2aAq}M9gD%aje=-x6D
z_oLt|x4_$>JzKIA$y$^=dSxL&sE>4IcFp4Lt#6eh#=^|>oA1j2R?Wd47Qss1O1Fz1
zSqMpL)ZSkQ$BS^s9~Q6)l~2ZSK=pj;QtglC9Nb^Vq&YiDjD&K=&=~cAqA<(;4M@DR
zv$M6|pH!-|QF+J@u_H#4w+ER)h`)ImUvAp(M}>q|3CURmu7+spOXi-}-wzOVmvFy#
zFK+-@D;mYYCK@;Ar~0ZhjIfMbLLI!&y={pi9yiSJXh|l0dg0~I{5&IrfK*Vr@`-Gb
zgb{C9B9y$gWkAw!>XL#w1Y~4n9v3N`LUdwOwaT_+rNzY765822>8+WxB=FeeZ$(C;
zcgIV#h*wGeE;FwcC@#GT=Qkb!BV1A)w{mSc%;SQa?#V#5wzgJG%ZDWxH#Rpt&u0}B
z6!xT<Q)sL`pXUoh^#j`8;M!rh#7e8k-KBgE1-MOfb8}h$L<Yd@5&WJEcVR(+x==hn
zFZ`3n*5tsq78>h4fRvgV`Pq+I@6m#9oEmUeVO?keU>gEZ3UL#M-(mnw0jO#gfU0nS
zC|F;dD$NK0)~8_y8i~Sh(XgijMB(%z|9X5$FTw%*@7(_zF^YF(rfix_y7Fm9v)uII
z9C;uDkJ+-7?>2i6K}*<C7Z(h>6;2ex*XWUM*WM0MFPO<eje-h!S$DC6Gm+d%c1xma
zs%jsk5un_mbs%OQqT(dy;sVePpQCS?#~L&&eZH)>>l6uZRDK88a8)(V>*=`*n9IX?
z7{5?YAX9Pw9VqC^n*FgK)UqJG+L2L({$;IG?m0D0(1ktcg9<my9KOta{sUm6*7YDU
zK`csB;lnpK&4elT+&g+<Rbc1+^o_5p6Hd%>^5%tD9bC4?{yy@ZT&}@Iq5Z|ABBjB-
zK8q4|{j!CsZuBP>5niRn`(%IZPMft<$AO;Lw$o{kOx>N8W*2JOQfq~fnMWb@UBXZY
z2PLFu@l25U&;3otPGJ#jH%tbtm3rJ6Iz%<PlEI1`(_sOl8r|5e(`P0Ii9hQCe)n2%
zJC@ep@s<X3W%`wUITLJQkN<gRRa+A%82AfB*aWYt-5X*Sx@InIuA&NCHMn!G&v;E<
zgLs)Wx`n_9go6_c)DmqE$Xun=pq$Y)gr3mdgMDNIx{+453$}haHau|I&ZY*2#SBYA
z9LEKPVNl~6eSbxWu(AIWzR5QAJ^hYro~vK-Lc!llz*NfMw)T_;6PSH=vhD=G5I*`P
zB?SLa1tK0%MfCRh-M_@Ir(g3qb{(n0B;fA+FvUA;07uGCv@_g*RJiS{-|p)qO6x(p
z=h=LucMUC;j`U#GG^ryf$Tfbr*WDaqYai;8xwjGb(T3@r4;zpR?dn?_@LfJyAj*2O
zq48-$=XHYD?tsnWMFYMRC3xcjfHy+6gz4)d5jU`wVfgHVw>#qIy&b)%9`L*C1+<_a
zk>=jkPK5mqvVbl<203g=@+m`@@B#IhXUn=xu5^9;2+^;(Ty|la)5b%MrNaiE5e=Cx
z9ivXSL6${yS>uD$RH@SAVSyUvp)cEpWH3zc6bk7OBPeXVGx`SN__K~LvsR_hmv?li
zL302Is^I}U%~m&~8d#e>TjNh8gle})S7lCqRz3tpWsEX5T1kSQn&yQqsI0;Yo?;?2
z-s9Bc>X{gXxJ+tChYZD)1a#0|4eC|I_e*AUEVk6zaN@u#6|w=|;GFJ#=3xMW$R#Km
z!E+IMw0<M}D9<}tY_}f?sQA<UK+sOcdsyka#-_jtNeR^=9Zy$Z1ok-D6q_roVWPT6
zF#$Ze8I%$lSa$<Nua?e@r5C)21Qm`MOxmJXH#PpL1QC`)O9uussx>V`)kq)5C;HD|
zb?DWDttmogoIxh+9IwLyNyy4HpL;OXwWVz;QUnnkgVxY92$i#b^ZRaFl%f^9H%wvO
z0cD#4#^a-%irX<Nomo9pazXcRU7J8Psy>6n$5GDfv~y}wKUzve4s0Wm*v!re4m8%M
z11ElWRaU$a)KiyL<_3WrWq;S%K&||{4rDJYX{ud9UN}V3mE1Q)FlRS49Onr!)`lF7
zcZtpo4{BfRgJ)+6*WTdzTb}8NoSksHN(Cwy=Q6o1OEWPEmD?vauGtoi?83szk`d%B
zi_ql_GJI$K3GGlk9+(OWA11E0Z71_gbXlnzfwF@w?L{U&zo>7-b)Wq*khc6KYrgwL
zOerVi)<@m@!eD3(@4PwEQTkD%N%S$)dyPX)mG4t@;kuxvIx~ZSklPMz65(;cvz=bf
z2g}^G%PX~;Y*&>ezH4PSbwNK)vd^_*9H>(#%F&(bo^b0#?aECy;n20P3I3C7>U)(=
zQEc{uAC7vj@IiZ|@^m@6SvGd(vu;jvpSCF_(UG_5lz&^4<l?p1vRu)yCWo$%zuO-s
zQ$6&xnu{&3d7Df}K6}HjX&dl8P#U^CV$ZuL)X|E@+PA9I4``u(c}eeQM!?R8ihVAO
zwCn*D%eQUe&U=UMiI}M2E96$p0@ag>0cM4uoIYY;VCDSI>9)SY#OFBta^P%A*lA?{
z%Oib~r*w|3%Rv)ndL7^7v)ZRRzZCY*>a*cFM6E0yIIzQCURdlUDXf2ysWcCC2)*ue
z7?5$+i+k`XcEbKc#0W<ix4q-Z_mZCZo0WTra0&fregVN+rD2PJKpg$L|4dTDdcfGa
z&HV4gNX+MP)T*P2b@}7>a$HG<)7Qqf*nY}C%iHz7yL0lkEdj2Hvi|v)N6b&R1XPE}
zeY>!NN^Utazg$vswH&X>xP3nFtVy^Z?lz)96Ne(a<FC2t^i8n)l^tDtdpuu0J2EAI
z{OsKg0f@+=6Ri+f(%g+lieN>v(d|$<Wu$l(7~duT(<uF~Z`B=s<c#cxA}aK*j#)EQ
z8B9;kN?riA6*Hai6)&FG04N*&T31d^XWXpgY?wez?lfwrzGs^sN|3m-g&Kg3LM-Q3
z@^d(`D^l4`DTOXu>}W%Sp%*vQ&!(3@&=KL#2T4f*Fh(HO6dc-exUNEv_hg>E=l7s_
z@bb;-=Fia(*fwtnu~c?-is2ge=+ICXWK1)ayaGQs8-X-lejKA!faQFmLGqn)Px+De
z!M+QHnHM@mF>ce<wb$`ois{n~R%h?EMd24wx2ff6D+;Rzw;QUV&~CSLssN{WiMZno
z>cRfjG#jULidJ7yaf;i8d$c958uT*Xo_aBVV53>Pg~>#?yG!`^r&NlqjS7(K5q~eH
z75qw%k*&<*ROV!SlkMm^Ddc>-qzj<LZP81=$&W7<ly76kj;=5=3C*3__Qj~6X31XT
zheX&+4d6|pA$0_gx1#9e=xqCG{aW^IgWzL!eMoK5oT37x@F{4j07omNn?24_oxz0b
zTeDq!F3MAyx*rTpl&Y7)q9e83Zz3KG|Ijz!e38j6R01mSPt_*GU|4AP{M|V{wQ-J~
z`;oph)_@JEhN<lEdlh{|(ui8z_IK1ifh*^->n9vg!QVK?1jE!aY|k#UG=y9{;Mc77
zzS{KdAz{^Se%_R7sz4AgtNSJ2l6fXS3u+CT8@HsY8H`B=9@w|n*+!uyHQldaX|ia$
zdP9EQ>eyUQ!iiUD;~LD76kPBPP|eBuGP<`Y>9}>|X|(jOeAmZ*X!_c%khYh4ujr2!
zeK%_QcgY<3ka^Cr=_JFbz&jqU>3ff=BCNFB73rwyt2IUOxVWZSAPb*t^1xeH6@jm`
zFr$@srI9Y2%Fx$``#eBl<A$Is#nM|Od~{A5d6AI`$W@PYbE<h(#mcx{!IvM>Wl+OA
z_A?!GVPc8eM>6_uB-_aw$)Q>WvF7hUw0;-CeUEotKCLk2@|7s+%C)v99C>hmaT&m`
zHw(o45b)$Yn4NrhrUeFKryWw949?dp-b4r#p55iU{!bI(>Y$%Zfio8eRM!qwc<9C2
zG%|>)(FbgGC{RrVJP$Z8cDgg`Br~{2DNNIlHvd9>@a3W|r}){$b;O>0peQ_<VF&oN
zMjb)K^IJQmf<ZjP6;+Muu=5v!e%-aatcn7vNLQUMSKP0fZf^3@f#UwcjfV!d3x_S_
zIR4@GcnWVFn$6|_NZbVhxqdX6dI+3m%s#$+%JM+*{H;sWHd;i!ELQG%RGf^fjT9I5
zy0KGZdugtk(DEnei!Uz1I&P2F>D~f+%P`eEswVv>zD~}V#K`C`bTv^v?W@l57E2Vj
zSYi66Sms4pF07uO1c9jgPJRP5leTK$(beS9pj>7hrq1-EU7l;{NMg3X!FK3Z6EQs2
zWB#i5ji})RVx!5W;t9fQCe0WAK|_Kif=bHK;QW_2%b5VKMlfG-uUT5IUZjUhNk8uX
z<u5yQ22sV-PDzT_f@&5a2IifB)anNy3VV)p61%B9!A-@hTd`(o1UHEP_r;GjC^Cj(
zQkhp>9NxkI+d0V#T=Nv>th)dE-YAl5^I<)5Lc4D%HkMa#s;zIveuX>|y}-+DcrDE<
z9e*nGw&$PZ%ps@FA^@ZR*SntZWPe^Ss;SH(tp_r}+lQmhhxTF3og>(|R(<qEoW!93
z{jSx9#N9hPy-I-2H>Gim8ToOjS=WX{x8UUR=7CO^9d=wqY!|DFbAv)qnr8lVHAP7N
z(T+l1@yXv_$5D6()Q%@3TcQeHINv((30NO<ewqLBZFAr2lsUz1eY>%?N^7<<dVV04
zR1$W5f1lXXm@~hfC6)OH8QTMYXz@Ro_|MSzqmO@+<lhMSqmO@A{_lS)P`I*+O1am5
z2#xi3>by5^C^laKp20J0E7$+v>y%mO1~Bgn;PXS}kpTpgyMB4k`4LXqm31ml+V<7K
zxLd->20p0czBCoq(DJrs8*(pbrKbU+mvDB4w3W)hNg=1FkiCPW6k;Ks%0-Vu!7qFi
zw8a1Vbha6;T^h1AQ*F388l0iKE5Hl)8GEh74wR9Sa{N2=Y^B>6AYo7W4z!WU?=yQj
z_rtuviFSwyS*7GPO!93?5soKK@1aHOEmPCP2;$68L0P@k!;R559)nMH(t8Be0<ZuQ
z%mv_S#-|bVwPSI|>wZU2X@j-YZ^Tt2x28hDxj}sY_s$O=t`uB%Qs#}9q9{w00X+Uv
z^ZS$r&Td|~=6K}{U025_$Vw;7f7h|fquOdaAswW$$6GiG>InLle5Y8wx?=AsoAAXI
zip?L30=C6A&6uNaK4pbyzrpCXc@91AjE;`xpXW&)_qmw^uP0pL8GGC**xb_6mcb+E
z4A<q1*DxY^ujq!hiYu*O?aXH8Q(j+L+);UCur@n8+fkwu+b*uB=k9KAznOPSe0h62
zAd4$;4vUSFm60i_U!3;!_RdGw<W9t;`sz-m>Bbt7Jj|ePt#+hRhe#<FVxK&JZsq0W
z`4*K4=){n$B(2Jz;Y+RlO)ZS&SeBUGwgtCxRsWgyVy0PV48+fxBo@jo(j5JC<oOyT
z-r2O`q0$-N@agg1O5)fco8B3zFNwN$B;lfrp0l<X(W76E44yLmAv^6$Z6qv7-jWPt
znWna2Q}XaQ*S!BDl8%L+w7%M(QZ5-@K1DaiYlXBjT7imF>TviIZ6nRJE-M#79-o^-
zf;TL%AvP`>xMNczccfL11m#Cr8I@IFTAWCAS~S@$^e<{-7SSQQp7>rXl5yg+#^;8!
zxwWwlbWi20+d782i6qAmZR+P(jOhQFpk(}WAv~S9I)SOx9s4uo0o*pWG-@<_ko;c>
CE3T3N

literal 0
HcmV?d00001

diff --git a/newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4c0dd6c0839a36f32a19b7a6839a3a49d9e1da5
GIT binary patch
literal 9165
zcmV;;BQo5HP)<h;3K|Lk000e1NJLTq0058x0058(1^@s6=SJeV001MDNkl<Zc-rlq
z30zZG_Q#6?ii!&^IIg&~)>^lAYHM|-?R2K2)9L@;&33G|)BWF>|JZSvwrZzSw^nhj
zifi4AqE=M&kJ>7rfIwLkWZxkRAt68l*%LhfdtUAfF$T%<5*FY4e9k8klegUaedqkn
zx%b^X@BqK@8^7@zzwsNtb<_<2e28_S*0mL5Kj*`@-2Dj&Lf}iSt2-djecJAihpUqT
z!*r|zpA94yOl%~vhlx!l_87Iv^lu~SX98P;#0o4Ps162A*Oq`Ge;-I}8nOArRuDT#
z><Y0=Vim;dh-rx#i8Vp<)<plNrJt#w-?>8fv4ZXs_dW0)Ky~F|>LAe2J0HEqJH&Po
zOC}}-JKOEsw_P?n8y+Kx*iL$EJclkkOzjUGCOp~v4MWQxiESp9PCbS_P@2eQq-LVV
zZns-8c4NQC?x(2*u(b4CHq&zpv^i&ATfq3ui{6HI!0(8K5i79+jL8ZV77*}|-L`^@
zIi?*iRYK48IqMsM_e!3J=Z?muf_6EvY#V5BV}bD`EY3j107cKu`gF7DHH@^qN%$W3
z95^$G9U-Q&@iazy_d`3kCJK{vs8i8vn!$s_EjZSp>i5Kcw(&Nsr-2S?tY@;mEWE})
zwA2p#=9td0)&|pwMcV=Ab_WK>UYN5539tES8?DFdqgLRt1}B8Nb!&NJ>_pJCWJVjI
zgl!OFuZ{T4j@QBWq!B+SuSzR&O!omecZD}Aj+C@be0XnUN9$O<f11`zI%}wMH?(Eg
zgte~sJ3M|??^jv5?T(UBc`b9po5`wuR@rOA`>r5J-;W}8&Bp8S(6p?N*rviZ8)dK5
z(dmaE*!L!r=?(I4g_YO2%|p_9ShMm*3cX(croFbkAN0;T-s^DVjf_TPC}~okPOXcq
zvMhgc;is)qb6)GXm#HyXzfPw+Q(Ro!ty8A@tk6>`l|gh`1s}3J5Yh|=LrP&`;ebvh
zuGzamtJPv*FrUI>;5(jkGho9KO;jKd2*z{@PsCmTxu^-`eH9On*C47A3Wbw8G(@Zm
zB^UDud0#^X4-b!*AR-=LURG8%xkH9CtFVQ0cEmh9Z3B^7t**+>&hA*@j7=jI3PnHi
zK9`55?I6PJj3h4k@$vBkJ4A}l7P4}4b1_v<<~2{-8hhi`*Vm_R-n==WT^AdzO6fl2
z#82_?v>%9!Mk7e2(kRk5U2OWQ-Gwfkit&wAormwl_5qPmr_(`IRn<o9qjnd{Se0)w
znO?CxiN_ZS+f}g<`=qh45sHe6=C-TMjHQ{xSu7OR-p3QbI>ZFEI<h4sBs|nEM753X
zxyBESw*OFOFc?5A7AKKD>)Pgeh}IT-h)7$>>z<Bb*hear3Pag?s)u~rR5WWenkRYP
z)A96BZEY>2rKLTKeHa%P=i64Hs|#_9DSYVan4wH05@nD+^z(WsV?!4?iG_UV>bRk-
zp`ihCb90w_HI&gxrcYH>)d)gz9SvRlq_B=TQ6H+StLx97KmQ<wsEfC>PZyKPw2u#6
z9Y2&24GRSY1xK+@J)YLH!da<QPGeW_;)Qd^7t}JDtceI|&kJhm;?Vn?;k{4i8s;c0
zEWC)dA&-SI*89}g*FVQji03<?(+KL@QmGV(_xZEOypWamIZs0uKU~p?hB?p+<>%*L
z_J|i^y^mZjpT-vrJFga!NF;FS(xvA(_d;yuWiS}_^4`aFQ>%<nE!KfV<aw*FH2~=)
zXS9$>tyV);Ru;Dz8C&-uB5NpL_i@ck^cCUxev<^Yd@c5<ZCfRV^y>{^GC5xts;sP3
z?Ay0*EcW@ylP9}!Rdw#7QmK~kQ#G77xxxVX6&lOGubiucuNPE$)b?(aKx2c^Imk^W
z>|PT|k{~%bc?I@)dV0Da7h_&%zDA=l-IL+VXlw$F#snI*(F103_HN|F3<eV%{YegA
zeJ_TZdV?7#sUCKPR(TAbHA@7LouP6yr8nX9*MfqATcpps)9SR3+uBDalg(sTL-mw+
zR+0ujf1(z`cS$+7$RjnN*O|NyP^Cl%?|)MPfB8=toV`{@@AM`nym$(r<NIXHP2-N3
zuCA_z=;-KK*!OOUY3jndYBZXSo(NwCqX`7HI`h9t!(NY7a^9e;76~AU?ALq@BbaK7
zyd#*kCfIna8eadhl(F}|DF<;)^R*t>TFv>je)BH@$Rv7qYeFWR`kI!Owj2B2<uJyE
zuN^yf^ddXX^@MoNs8quz5kinE%@?gAaeLP~Zr%I-@2VN^#@zk#BG83DPhJZ>4$$?i
zMtEm+xdos(|1O0+Q8Lg{Pgt0vhR|g~&aQLiKP%y4WF04itf+^Ii;D|C_~3&em%|tv
zz9bUKb5`MtyUc{#g$sWa!Q<<SV8>MwVvOd7&HSa2xsy0))P(}b&r(~CsgGR_nsou7
zkNyanbd4T^M?)a_EKF#Dhqbp?mBXzPwM8FA9g}kgP}nzOkjwO3Ri>GmP*haZf4LmS
z=$Cv+_Vq2-;u+!jDOU;8))&E)ZwukKn@b?K%ABbf^d=^byW5~EKCNW5k4|d_(^we~
z+HE5lfHa%>gE9XMcq$n{z4OLbrFQ{@wqm~+lq$1Esj1e(cPqs1hiP)7WF$3mIX-5>
zxk5=vNnyx<(*RjzU;YMzA(3l<Fl7DpNF@UgYs=47fttGa@?s6FU+$iJ$L|ZvwdP~$
z)u225CTK!?m;oZD4gVdO)N;-N5=wROznd!U!h<$%MH&2*qOic0a9P2GA9t?x@D8cd
zX?tq`;f%$coSZbmK!DR>j2-v7dGqFjWM@jQv#*0m@;l%`o4KhNe$G=`-23III=8&f
z<#Ww?z*u;Wz|+$L4`Unpf+6KQMp$#16zn-GYY`sS{%3uq#S3XQCfMnQ?pw210A+<5
zj|^>8R8%w)4Lk)|aH^=tW?v+o`wP`SoQdZ=i3VQWS#}pdXm9MV0Hwxg5!9RiBXX%x
z_iT_@^nj_p5_CtNxf34N3x$maQ(YNn4WFK`g7?3zXcZu|@So(MH<&#x)@{E1Oz6^$
za`vd4^BNZ|DmKYvGPrp0;>XAW0m$E3{o_aC;ASSTBO6!RXGOFG9$Q;z7a$bW$5QLS
zNE-yx@70S0PB$v*0du38z>u^NH0uNH0>lXFn9rffpyNdQe7#TX5Ikrft*d|{fyUy6
zPV9GH_o03gRcbvoPl!q9uV26ZJ+k1i4#HSBXU-gSSKV|vT@051-5_auOYpEZYey-R
z$h4Nh$HQS#=k!2WwWVlilI4MRdq|7$FkWcuFff+IxP4>9Whfnnhqcgf3F!3ZbFC8U
zAatp7UMMj}>Cq`3sDp@%xsEyrnQ%x4vHEA@#*G6AHv+1E+zw&2jRyGpap67TVQtN&
zYS2;lUYw_P*uAe`CM2KNScJ3w!Y6lYA3LTy{%4Zbt6aXesv14~%TC(fnqgWWpV`0+
zwxaICaWY2*HI8>RD2$#2h#6chDk`d)H*elBIzr#Y(eTwZD=Q0s?%KeWfR4(nhbKad
z90KUs?@A!G+}xp<hM)OC4qt!TdZVHqz))gN+Y?B-KA=^27~2>G#_Z!v$aCe|j$f%|
z3Wd%Bg!b7EA*i)x5EQirhthf!&RMCA9v$B!&Vv!sB9X{=;J|@rkcmBe_V_s}pnWSV
zD_^%-$l1NrwoV5x?J9E!9@gGITxlsT*47wc!<Y9K)HsC!>nhB}t7M=%_JU*Zu%T@4
zWH2d&PG4I=g$6!wP&l__k#Thv@H3JdVfA7`tK(gs9vr4Z`Zfyb$jHbKkO_x`GzG|C
zE|)K*`lrdg)V2w>#7G%|><mDtm7=p17C{|%v7V_cx74U8xY<rHr0*tPrJqv(Y1Z`s
zeZm@OGCE$(Mg6iVqS|He!`gz)Bo!B%bsyGqZ~(Za>)iNn5mP7g_#7qz5c&><LIIaA
zUtWt$I0O*=P&cJgxq}M<T_n{qH6CZ+u}<s7_2v%68FrYS+b!dNTLn5+I5$><cGq|(
z;h|n==R;tsN_TuLuRsNFe&rrKtnEB4wd@xGS=GYL^7C2Ztqk6oS-{RxOh`yLf=oCB
z(25l+Py+>!FGjfwP=m$@OHPYjf(LCX@j_c-n%#9?rivL|w{Fn2p9>-PCKbR24N1$t
za7Z|}<b`yRZ#d+IaDLD7Jt9uvLBoMp1d`Ej1d#J5<gmg<P;Vt+x>0HL=9CnZUayDL
z)Kr{o--EJo@9o)VpT!UL&}y~6pn!HKg#DbWgr_$ay9^N83)@Q}Thv@HiTGZ2hoC-r
zK-N6oB}xU&wh=DE6VN<PR&uFTK^+xe&&>1T3Lv!AhpM1~&gH2V>6q!M>~*3pO1akH
z)roP~_ZZ4D$wrt6q-^-y%llxO<~w%m*xm+%A>SQ<>PbVqNkWi2@GxG8*uRJuW7B#Z
z-&#lOB{<$?DWvHd&Es9}z{95X;lG0>BE(y|HZe)taX5lYc-Sc)F=@@UorEh2rZ9@v
zdT4t!a|3yGE;s3WWFRLer)2Qp!MIegFJ+`f{nM3xXt2>}6uMdi!ZD$JiE{Y0lft<r
z!~Mh+HZ+gqpQ&RsLTq$BQ$Jz6&#j}N**u67fHa}Kz>u;P$n9rWIPX3yb6YsKWQ(_v
zn?h!;j4SF4%*3;GUkIT%U)?4PFrbVnEG(>g`|Y<!Q8s*A1ITaZ&YhzPeR5X;s;t$)
zAHzyHfrqsZj|xEAV4fHzmFOXSw-g!_23j;!fp*_x+`z*M>hGt5sV4vKvAl8(Qvmb?
zJZLx#<cCXg%aa^=S!y^JA-9C-wg9NCtgP<SPd|MW*>D6P|6|9FJxspa=t>b$OFROO
zcX0_1o7NvlYMy>!nfGfnfFWrEr|?+P`U{`jId5BKWORzB;IXbymx{D^U#qttN20~V
zii!%=S6_YgxWfRE*NFrktt$Xw+P&$D6uvqy;oP>z$v~^Oxf9iLFvPEBW*KsBmli;i
zR$)0-MU@uzM#&)Tl+>fPBT~u?aj<o*HhZ3p0wfR!bgNdanvQJT6Chfu#(aMYfk*Gj
zr!aWy01re`fP_M!kpMIU*&qP<w+c{1M8s4cAl|Gzkij8<sC(*m`0(LL1Rjkm0F^6s
zuq2@h{(42oxh+qUfZC=CYg8#g@lyoIk8kDNY9n`oNz*(^Us$bWW(s&BJX_m;h+WK4
zT844j8lcL`O6{^`%P@p>`}pIJ{aOWR_wL<~kR3F*l7(qV2Y(PNga^X1Ikm1ka$sG0
zbGhHpNUOz0BPe1|f#6^N&9S`<wI{dR)V2)pw+JEU34*Q7*jNmCRn6mFb=o!)(QFph
zxMazaCmaT7_3G6Rk}ub|n#LE^X<_)G0!{&X_DmUwDKsi!Bjl~U0lGSKree}*L9$^1
zrvO#0|6kBo3+|p2Cr~pT>?wF2C)wtAu`(u&M>|`hfRAED(5N@ISsGtjT3Y-5`|nR~
z6(Dvd;(PDCH(amRyF8f;r(t}XCI!EpIh??Q`-v)5Sf1)E`=Jn$=3arylf_`7A+0ej
z7KC5^g&TlAe+86R&)O{{VivgSf~3`%m9E<B-<Lx<eS%fkpoeEpmqNeq^Wf*ohBgBz
zFE6iZ)~s3MkPSMVac_W#_1EcidF~8l$TbF-dZO5EczlSxez6j?bZ(Hcs2+ZKKMt<H
zaT!uSx(W>?3hIS4P;+Q4CjeFNSPI65`WCOPLe71mlpQ=ibF=xl>oa7~Wrw*Po+BPu
zp)<D0P)1f(RtaI^SI7osq{XdENJt2-$`GVhtCQUwOg%|DJ8(~~TL29sq3{=pS;!iQ
z2Fc%W6Ry8`nE?o`U`rMlHRg)6wxR$;E8cMn9^tY#K%JM?>R{^O<XVSkSUNi9hx$rE
zi-xyqG!SyQSq22`&VjHjxwnON6Ry^gmX>ytFfov_anEV3KEy@ghx*mk)tz;BI!8Sb
zf3Fem;j;H3ci(4;RhCARr&dGqyci2SXesZ;LQP7w`Hs=+pzhoO5PbHs%K*s^u4Ss*
ztzBESQV;JOuH+0LoHLbBY<{{_N4)JPabl7<+}R#uN$9Rt8N5231J_Qxdi5$!=Ln)~
z+#4Vwl6sKWz7mOKCl?dS@J{Np*EKIR<#;hu7GS&!*-zH8lsn*I?dFo}V5FIfQCSD#
zZ$EYk9`TwFK__s0^$zUt$JcQK(AUut%lOwdQ6u=bpdUX^lrVsKX+|RRXwQWU7jW6T
zzLbr7KAGXOXwf2kl(kP`Vc~L4rnHh1K`-L#q@c#wA70S>jF{lZ5=J=N0|-N!_(BDk
zXu~!nMw3u9$LX{k>q(AyA4|!C2<p#Hiy7_W4m>aIE`xlDIc=AbFg^Qxd5i5b^k6;%
zn75|1;;;IgIB{YFGT{tBy%Q1==5n<fYiYd>9whG98GxprDzV&YnrbzqeSFnEJk&D&
znFwmJxnWTNOLu+gT-qM`cQDk+oW8b9p&Fk1uEZ^XaOw+tqa4hwh3>oWeY3qvWP#C3
zlj^Igsvs;Z>~F|~LjWyUumH2Lz`c9-K23I{<!U$s8>ZVX$Gp&>{rM0pG^ed7kc)^n
zvKG!QSuxo^>xHx>IUrpArh~$H4yZD&y8KuVE>GjC7y8To3TUL+m4Kw}qmQ(HqxIOG
z3rC4}HhG~6U0PbI`{Ii){)kMx`|i8lTLp;b`8}V0`stBGK$W|jiCI?UAg+1VxpIfn
z_D|wO%(M`u3Y%F2DSwS^6&@z7|1ggEJX>6ppV;n@pqB3ankfUgyp$bD>)&u;_9Yf1
zamd0%h4Zo`iNm4(NfOc}D!s>3_{_{q(WFU}um;rg@y8$cYYiaWx&{Xa_av{u_4W0a
zDL|Y&+MGZ_jBRFNYa>bOnk&~>hAVPbr#l1>YxsF1y`%M#N)WGn_nz>GzMc=7f}3tH
z<9jYk;WR-1{87Z{C?*ujG|+!vo>O6d;|-ZNGBA9!`By`R4C%rC&T4C0mpOCh^dheV
z%FD~QaJskxu@7Q|mg1PL;oY~Dcn~(eqcFBj+gmjf>Z)T!mPNJ|v5_G7{M8l#s*BnW
zCWHHTGM@8?;R1)@`Te$1xJ4fpP!ix@ccI*Y;V!*e?Xe6Dm;60_`t$*0fimIHPat%8
z>7|#DwxHP9*mt=8S%VCz8pgB`=P_-sr|Gz!r0;2ek9Q6pYFSHDK*JUvYo$=V?KAsn
z`>OZAAeV5~@bM(Af7U@kjpJSHg92D^b*0pSH{$y-B9iHPMnH>1BG|TV+o#9^Wx^qV
zd}hy{jY7K5;>C-n8jZ$Ut`=BeEi^-RS7Y=h4TueCE(n^S{AiI&@UUK}{8)26M|~^#
zE-fTn`Z_4%?2mW3v%u8qixP((RjQ{IXY@XkBU~Ty2_S+xR@mr~F|gd+T*dtP^M8XZ
z&?2HktCabmSPBXX>P_AcC2s5*S3;UK5z#g?B1`XRh<TR<mJw$K$=Gn5%VmJrak65C
zMNl*2WL6MWhb;wTBlpXrl+|ckTtEx$sSQPNGQG|+=p33ZbGk-mYrl^wW9mm-0)+Y}
zE-nt2xEp~iI4YnmLVCuG8G+<=a9&>CI<5giEp&o-8#b*E`aTcRrRG>}BoO6q%5)1J
z)(aJGztucWR+4QQClfAz15{bpJ+nGJfdZHCYiTV2e7c17J_WT}hthUOW-A;ZH=T*Y
z0-{_lhhxW%?Zss3$tR!e?WlmZ=%5!~cmXr90S6Brd<hjf*V9{ZuF`)+S1@<qSIO1p
zl{m=Xq}Rld@=mP#01?B=wLGnP5?cNFLkvLj<J-Wb_1pplYMuRuDramehF{oaYm7MY
zPQ=-KsqrM_7uRb!tN)agl$gH!^2>S10100X3usFi8#{I^>Y%>FLP!|P;@S%_qLZZc
ze<1Ex)L_nn^a>r^{49wRcv!pjpH$Gv%?+!UilBPOGV&_)_)q{YV{E;s1Qr_CT&xB)
zP1~c(l`wFB9%lgg?#O|K@nTNG7p_c}kdRP7`W}DHxi4kGsl~>bA6S_=b7nu(K{+`&
zn>_&#dL7GML%fgZ|0+0zhw(yh#ekUX*L(~U=w%|WjAW~b7g`e8ys*SGTS}ODL~ICu
z=5!h7(|&vH$%Xt{EhphCJUo0q_Wktf({Z(WUuOZb)<J`|Y}qoKWMdwEN<&93yo6|>
z+_f2;TT$38%V@nftyrpM()wSA7QvyUT1&lXUrsIO@UZsEg-S~)#MSUsSXgKv8Tgyn
z_paz4iw?pWXn}!&{V|M5rP5?icp=Nl6K`Zt8HnjUVogTxKN^f4c3Z3r-upoS5{2F}
zUwrEEVvhmTlX#&MMfI+(2gGDwF)=Z?8pjyg_uZV;Kh|N)kGim-v9YnsaCRD(YewG>
zh7-?lB0l?X9Pje+5In3+`?197w4PlX8jFWJckWz=eLij4Gz7@cmGET=V-qG!Km|UC
zDDf!@g+ju0QSpBI$;)iH2A(3Fi&IrSX%B`MGGWr$pS;A^w6rwYQ%^nhB=-5ZapMAA
z4PSSJv8hw1;@U7HGcz;yqZi_Tbl1hDjx`2mhGv!*tU{@CxGuzwebv;|VD0Aw_VuJm
zlLomHzV67zaKS0^I%Mh6rL!6v8}<Cpes|7Cn6t973?F{@;j7r!qeqYK<7)PGR~W-J
z6Gx326--`7=jZ1~@m{D?!DAVDKXc{`PM#l4`#Qkg@O6inCRzx^^sv>dSHIlQ&|u^j
zUg$K&c%SU-Y}0}T3$XG$?BRzWc3V8#0)!;?7&&qzK3q2T=FOX@arI8#3v~|fgA?aZ
zo;-O8`<C`GJ9&%~fLJl@KWx}A^g<*4@sEGZmdoX8-V1dO?{nkE4bA-d^IyZh9XfO<
zdLMsx#dAwusOLiuJv0<aO-M*MpwVb}FVw-k5B|jW;lqb9^CG#@So~3yo?MA%yD2>-
zbi@;669@!iJP}V-r+M@IW6Oz&iPcl4Ou@yYMhqD;WB?bb`#n>7B$SdmCL$tYIjVR1
zi{N~xbRh48eO6LZ0vk7O{095d)86L}Erdh-0RaKS$?L;eSy}Nklo|QX=`f+oh&TSZ
zbLUb?AC9Me+1C@=r^SpcBqU@o)(k%S=%YUig+h(VJhzzlL>(Y>;cIGYs&?+&xhR}R
zdn)s~mlwhsL2m+42zecM>eQ*VSO(_@T04aIX(}ozg6-S4e}{cX`>;3d(=HEqVPm}z
zvyM=oK7DWr{6~_KlCI!N4t!SDzOyd8(IX=x6R^){-v!aW^osYnOHdCOFaX`(n28f7
zPS4NJ7vX#o9-{UMk5;S2CoQVRk01YA>@(7LL%boJTNBiM*ig1|<;wR+YTv}`q4uYH
zFzw3B%xqe;Xwl!XuZZqJ@6*Q{!nw6jhJ$YXhYcGx7Tw~}qenO3k|6ZAR{1J*`xt4z
zT~JVfPnmAVKB9fq-)g|r=YclbETIf1AocFu8&B-f3l}b&luD(1C~GI7tD>R;4jnpl
z4*Q1o(V(^rT`h&Oz#ct%455#LOeC>34rlk{1@N8OcJN>{IC=79BIy%c=lQ{afB+nd
z3T(^JWzP$Bp(XIXWE+Vwme`c**RN+_!3qmkCX<QpST7d~G2=RW_UtXv7x+_6<7nUX
zwHmJQd7zza)_N!?I5>DTR;kC19XmZGC8Y>|I+};byYST2)#2iprK3lWo{4=y`y{A6
z=$_W}5LPq?P@y({#*7)y5s1oIPsDe!ci_2n=~CqrPdxE^>;uvlC@TigzVU63@Z2$b
zkqWedY-WZKB_<{o@|wu=nnxy+q30=~@UR)zK-wpM?HL~1p$_J8AWHuuW5$e`aplUD
z44i*LA>vbf4pVh(Q+%c?GBPr2)TmLvq3}FNGp=6V9ID_FB2@dqLx&E1h`dhl^YeQw
zIyyR5AP_KhA}kg0y2w4RLyLsB%gV|iA|fK5wDGU8t!bMF(?0NPZ=%`J%*>x&z~BJ`
z2H*ufLN0I$Nh^QExhV8WR}&AB>mduL73byU!NG$E&ycpAifv5WdazBp-eKTr38G+H
z#2Qa7bn@=qyEoyJ04kM=*F`SEgY&S`($Y+uHf`F5ZHjG6+c>zR!($I3jKc%Fckezb
zC@5$Gc|U34!i66uBqRv1YK=4G_>kss$ZA3@`SZ^|i$3|}lfNN6*rudyM^nMvt34G8
zxzt2GX*xM#@ZiA+(L}6MoIZUz2Ir{Yqe6VDfA16>U-R?x@e$;!At52pU>gn}KKxN^
zQ`)vYJEG=s)D!v9S_BT{4JQyig5xu&i?(gswmv;QU4_+C6oq)F@!sf8p^Rma#Kc6^
z`t|EKW1C^y(Hn6%ZPOl|5gvQRMy!V7>Ssd&0|OuG*RS71bi=Q_^2&clMMWhR78U}=
zcPbL^OORM_uno{Nqt_wHN79QgzW6G(6}B0+9kwBD%K+N8T^{J<oAr#w-c;~~1P2GB
z8%B_(hK7cI9UmVr#B`s{)UYk@2axDB-exl_p-_kmK8aVZT)B#7Srchnh0wO^-4-(n
z+Y3ajxJLIojNDP<diLzecq0<me{<;2p&wFHQyU}_3A=)pv9pFYE01Hu7><cWN=iz@
zo;`bx4jVS?8Eg}58`4G(V_VTSW5x1)1&=*l6hKFb2itg~DYIwKe);IpqvvkixS_+$
zgMwsYLF&jbS)D%<st_F1fEgJXx+6!9{NJouvtF^|bq3S63h3;5$60UGjn*zOlNi>m
zTepV>4H`5F(|v5jdGqGI6%i3}fe39ix^>hAC@ec-c(V>un37|d7K_DL(@}?qhhLmK
zckX-&&LnIDYzyjj2GBO@cE5TZN4-%W8sA5t%O;J8MY74*s3;=$?c4XmwQJWzSj}!|
zXh4dX$5rTKMePzM>TPaQZ^O({#v&>XLEyFQ-McsZPk;K;YZRQxc+E6ijihbShxa<p
zX``MryFiycvRAKO<1zDKJrZf)8Ee<BT|=_AR1)48ucTJ1fx4w8t1#ClK-mCeVxhq&
zBhcI2ym?cN=e}mmnr{XU95|EpICzbCtrVQWv<-UR&sxV-Z{$l|buT&*3LhT|p&p41
zZBvLn{@QD=%?%3++jH^a#jMQCOf6<_=$Yul2zLNw4VAkZ%6cDkpG~&Fpm#)1gV5Z%
zbxVuqi0At1tFOL==T7T6OsJwBCxl*W5WV(pR_Qqp4+kJI9tm{;5tb84W`d!O32!(O
z{nlG=y}fno)*WZgoVlKqlqAKP63z=opipaAZEQ!Ith`kd3jzDy-rrab+3(`M*qtIw
z2n-7T;^Jb!b2xkUY$Bc$(Q$tz=lBFYSInv=<26u?!+IPRobEh0+=JAeHf}#U&jp3$
zXyWo8!8_RB-=FnL*g=my`skxCEMC0$(_OoE?LBqs6wdQ6A>mGm9g86kGadvB!wOyZ
z5n9{Oqu^)p0ZRNXuI`22rL?pZpSx1xG4NP;%teb9{d2;E34f%X2G3~<o+F+so->|1
zy@o;bns|@nC6N4S*}gZ;Onybjg2u2gS$QT4P{f{k{`u!$Ubt}Kf_3ZGh3?<K|M0P6
z$D+@jJC__26O$VsA77rFoGc<~w2Z(|OF~Y4c6N4sR#sLm0Z;bJFTaQq5)#T{V`FpA
zpFf{`{P^)`+(&3==sMgd?%UVbcRD@RRC;X2(^x?>hMw!M=(+cy*W%BE<6V%t(u{=l
zN`0(g!m*)IBs7d8qV!ShJo3uwCR?Z;qaNZ3?EIlahdxKV#;j@6roA|G=FFGS@IC$w
z|BnJP4a23?_bsqcAv}p5^HDqpJQsRS*3htF%8y<P4^A6^Wb2izVd_uQ-y!slN1z_0
z*&G8E0b&ZK%U0gX+NRjp9sf_g%4E6^1{T~m9)kiif*w1Vo{Kd!w%&#Zr=7yogBITU
zQgJ$v3e}<1BaEb-jap<3c0PIx1cBNk)W%ad#!*1V(C>_*`xs95IhY<Jh#oVLo&yg}
z2ZgCC?KD3sP6KF7r5DvtELi<%Xc<TaZ7_ww+Jfo-4Wys#Zv{$ky3d~U7~SYGeQm-M
z4^0OL${H#bEPvYJ-D&3sP_JRn*#GZNzvFKOiZv`eF!u>mws3W^0nOU%ea3b__ucmY
XlyttOFJoE*00000NkvXXu0mjfH7Bw7

literal 0
HcmV?d00001

diff --git a/newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b2da9ea10826d8f5e1181ff7411073eb43b7800
GIT binary patch
literal 6296
zcmc&&S5Oqplb<CDf}kJ>NR9%6<O~alWERPJ70FRSa+Dx~A4-t8WI-~E<h+QISwKmW
z(}GA4mas_N<A3*XcXd@)_jV6GGgUo3HPij;FdeI}r%p-ENDcs?)YN!ra5Z=Si>{Ge
zjRtdWqyXH3Yd%yq@}JqsCi6F1Ywp#hK=4HnxU`2@xwz-XS(ew&m{io)SK0(^rL<Tz
znh5>q-l41Ku!Y{VOJOF81_U)tQI%}3qqw2h*q>gX?sqfiNgm>=&B@qX*j32M5ToH4
zv|AsdK;uJl@L~|+^`T>Y$l_W1V$g7w9}B@NC>!-PqW{yhA^nC=Z6i2eJl{tDy-DUu
z^oN`$fhV>i#B4LzH(>@kCyipE>5C|<4U&AOe3tvT&b6oKFaAWb39+TzKHLh5UMJt7
zDWmfu*HmFCQIG3gDDr=ryAmHXdoUu?m_>XM+&C)a!aJNLLwKZLPqUrU`ZeHpmROjp
zt7{<Q?LqAI<JiR*Hj{F^BTlXQu{_I2l=qDY$$KMnOItVT{U2HJDeIHkBAy3w;b$Cb
z(ex%-&Rdms3w!$r9kR@mfb4^(Px7yImw#bsoYf_XTvot+sNvPnbO22=$tzyXf5`L#
z9;EBjQYUoV=0`+CEb>zqa_?*-&(rx+tKGt8B9)^GZWgQFh>08+7{FckJThR@(43iG
z^k~HMm$XD?vBq`hgpaWe3=dxt1_>%Dp-g{3s$HjqNS1;%ljzuvUfJHm-6~cN2nZ0E
zeik>CBy_Qi_7p}=1wk_|Ab?g3Wa;rT%Xk&)`)?EAECK@qU4Ec1&u}}fT5V6;4Y~+`
zegzJqDDwHo=V!e-W5qB$B*-1R(%qj-Qfb*(B{g!nLb<@RP{9PCpQ}i)ig|5qbJ>ZB
z*z35NEE(@pE=pk8=&>d>cDD2-(vSaw8FSDd6MRRW&*gL4PeTHLOg{-j+gLWZnZxlA
z^8!w_0I?8nZ|~h(g<3iSAl#M`>g-(VcX@t-dWuA6$<)GYAfvEt;!qO6b{~?i5QN+P
z>8eQ_zV9IPv)TLC2m};zgIWi4V0e3KPEM$D4M->hqhVLi@goEp+Q4Bb9m^J^3t_tr
zpn&Z=;PWH_&`iPy?lX0GJ7heA*r%{7krmP>Ta%Svue3u7gp7cOCJzuI0@PPt^Pd#X
z27odE5daWDz%>FuO$6Ak0Vp;2AB_Jd_Fs?qkG1|AuJ`Y^(F;+1zxN;jB$yeewK}c)
zbG9FsDgK$ks&QV)V@*SnW7=#`&KAyN7T4P^RD7(Cz7TPmZz^0dznR)BC%$+~S=U%1
zvlp~3OBIsf@ekr;3|{t$PzL>zkc%;#u^qv$ot>#|x|Za<V+Wp0J!Oi&W2%fCnlyY?
zOKV2#<u}cD(ft?fVYe-68vP;A0!ZKDluj~yOmS+yZ8(V*h?9NAhd4+m>^l(0Q(NTP
zCz=vndft~54iPVZ<b41;jd`c_PEMa#iwGo5sh<g0d~@B)n{ts|GF%)rto&Yi!vKAA
zf0_ad3;8C2JQ?6XEF$sQUYTV&Rh@Y6&63E46Q%4=xxJ18Xv~W<0ObIE{LY^i(a6Fd
z7CxhIyYo=x%XzyqlZ77AJ3g38j49Vz;ahmGpIV7{%LXjDOa(ka&+DrT+56Z&^Dy(6
z+^$WRoP<h{NDV`7LBhZ86sar8>Nd8Ss;r9YVvI=U(UCd%=)94TsfYK`msV5iKfW|$
zvI1{5uiJ2%M07P}EOJ-9m@KY$%*Z{$MDY&@H<X`oJRQA<+>*$p0MNS-YCJ)RS9PLC
zwiO5A^IvraGuD&0L^pQvVhxeQOamWd#>2i&>8n(!NhNq|DVhHf&Mh#>rKJb^dJUti
zo~Eyf!zDsv6Wws0&?B-)2X~LS=96E#qW$-H^&)5hG#jmo`kQAZiGqjOlz!w<AI<ZO
z-N_S17z&u0Vvd&%k{r*pAqRt*if`K1W+kLh_1)T@LXvf^p_3myjej&)mA6>LDTxWZ
zwtpNT+SmB;Hpfk{*W<U3o1s3a4dpY5tdAK_)({%RF6#)AWF6C<^84g2moI1!o0~=v
zuwhRB@{Vu%xVprlgAkY+M|DtrDfuze<^JZE@kGM=A_8w6hAJn-k05}#M1MDr6$KBZ
z1A+_Grj|y8EHt%7f(~**K_m;27>?u3vk_5L#qnA42Ps%B<>!uJ-H*k_elDS?RJ%#i
zj8fyOE1(2CH|{U=?&Y2!1n%Q2`#&}$POH})=lR8d!(Ga{kXbDc#g@btCH0?0X3lD>
zF<`PJAIO6?@}cIqV9Ad>ydBq-kXtn;<|A#EYP|f+>>(=2JsSm?6b%)Pc}(JufgPRs
zZ*@bh*(-$yo5(QBR<0LM+@5DWj1}I(&`flO|3qUf<SVQX&eo=}aT?LKv-E~W>j{+1
zWT3(?HKUL7MCCN91woF!>zT*%mIz#7sedzHJ=Ms^DHL_dVL}#m{~V$0xiOh1oNcUn
zqt)VfLQU_Wvz{Z6cBJ4zE<=Z^=6~b9N4<}~iOB7qDA<k|Rm?Z{Wcrx%?<iVY3kz+K
z(Z_A;DCJmaA>Nf4C%g`PpEdAMbZKs1-wJc>UXZNgjh(sk%bJZ-CH-;%$=A~vj$75+
z(-}5dMIY&6$oChJmEy~5eJ0&SVy^wa_Xxrtg6DG^g=gzVFZ<6!FG61!=Lv3Jz4s=?
zX%9v1%r2*7M~-mrX3dGcE;IDU=laK<Z<@dC5I<e|lL`Mr!)U6!)zLtNdlY;yki;Ny
zQ-?(MB#PNDiW`8mJ~$lTMVokXVgH@jcH&x9w4cvt@q4j^&lZ(0{RjQ}Ucb8rngs)6
zeo}9JY`HX^W!iYZ%3naxiDH+`oN$$W?3Bhd-LfCB*Wbc*^6w5VJE7yJEBy8jn1prb
zj+xI;1oAT3E(q+gTP%$ZK4qU8SiXr^6m}lrI$5fao2n}J9y6pVFOUq&gE@s*KT#bD
zQQ1n%Xq9C6R=Q0FX8P6-e<Tl<x7vrIdP1E!-cQjt!F}g@kC<=#J@4nKk<fHO!7jTz
z5O5pfb!*j*nF0@=AU(J>jo85;@3&QfHJ2p(;*zn)=FfM>kK`GaKK&(vRNJD8#%df*
z4e|+7T+BZ>);jM{1kQ4X!k-a0(^;|J28)Me3d~rt7s|2i+Poc!akG5qOt!eGDdt16
z`{}pj89;awL7wN!G32_*!>fDw-(H@;AQV{=P24G!HgW~aIMcNIecD;}-NHm%4oC+I
zxDhR(OS}tP<p+l%QYd^+#*!kt<lpmS9mfzl8k;y6iV8TX|F(2#vATlH`Ef<RD+T6g
z@=+|E&JE_53rs}EXa2BXQ9H-KefjHbrR!yxS|4mw);YtHd1_HJyoH>}<_aYO19Gh}
zr=yr7jMwSE%ph&Gvw`brR8XkSODba;7cbPOIE_jhr^Gf;($#+%wC6r<S?nD;e^s;b
zWjfoY_4C4&6Pvg?grXD|+)|mYuW2D3oR&rVusgD~XwkF$lX4CCe?6V!x7I=LPMyhZ
z5-_bSDgV+UMUuOqM##PNSnpT@|J!DJ3ZIcBZul8)){t~_Wb=u6u+%hmNim<CzP<c|
zTBAE{@+%A>z><V}zMKvmVyqqKwaV2G_1VZfU>~{M&I@Hl<XExJvv?nzwW=xL1C_T`
zyAWGW&5=2w#r#5`ng?0J9#ivcdBXFcm@X5Wnoc2T(1l*)gjCmQ9F7)f=??8qUEiYc
zGA)(gFerBmZNz`_c&Y>QZF#U6Jp(#3Wun?nFC48~t=)nbtv%upC+4t1@7x4(C1eEg
zndP_`HK0}k7~jRawV$qnl}P;uNzx;-=-{RLXiR2Mz3=*Qn%dMkuEOJcMKF_sWQS<g
zRS*?1g~c~u(y>9}U~a$qs7be@T-((?Eh;Q7W8?$O;Ig2pWMZ1u;G|#fJ4YJtYUK`T
zh0)j&1o(?{5M3qttKdTzZdeE{he`ZsD<DDFmx>1Gc37Hfp@SN~soAJ&Ymk4VI*C(1
zoif?lXHsP(fj}cb!ngX4ki67kgrAP#k+px830;g*q7M^)--Bg_AMq#cpUN!7ZQLSM
zrE=i37Qb=F+7iM9brWxjic32f5KDy`uQs=DS)<Ax8UmKN;7m7<A_kob*&g=^j86ce
z{pct6a*g9nR&g=ZCAzoI*!XV4!4cB+=!HbsY+QQBwCbRqWC2BHUt~4xA>#*8IMV^V
z=8$Xc&iMFO{>w_j5xaisI{ru@iOf=mp0_h#Z!;{>eznV&s_TZy^zUC{11lsTH}+>r
ze<$a{7~Gd(V|EahST#)vZq<|d28D>9A86?Uf0153{6)?8ZWnJ`FUZc>s_Dy(le=CL
z(i0v-k#d^&5p~-e;V*t@Bn?UIz+24{|9%$2J_wsN#D?(5SyyjFoy)YhSzcrTC_x#t
zHU9p~<rNwc34FbPR!Lp|ZKv2On#ioPzj_S7q`SsehC4~gzc_m{P4A8S=E3P#yTQwX
zF;}F^^RbHqesKwWrTb}tH21l#gYi-=<K8ma4Ez}>h!u=fOe-q>a3@2_xX{R(9PJgy
z&Ds(>ec4yu3^}O9DW#~Pi#C@()Nb=JECg~mfbrpg_%__S5JjLsrSy~U6|8YbODacX
zftPh+^|~`BqjWyVD<}YH^n|WyoVg4gIJXOtk!TrbvMrlRiB4ZcCL5CXZ5i=%*l1$5
z-r9<ty$|_tx3}doi*14WjP;_bdmF{G!BEyiM@4CA9XRQj+OQ;DdEc1;#L8bo*ysyW
zJ*=z6>t)LxG#FXj^EC1`12~12<jv#EahzRk>_5Bj{$T_MWxvPy)l6LGEEhNs5|co_
zR;69;-Gzil*jdpp#8hg3I0z?#bk^dSZE^2N!tvAj*WEUPS%kAQjcFIo<KF$#PdP(<
zRuV9hx*^#?lgr(hU&93Z;!zalCf+lC-l%(zvRO$MHLR?v<Pw&$M*H&o)eLm=8n`t|
zj#Z1UpS{WwLn%_Fev%S*D~bqVjy~5qJJeAHo3KFw`^UqxuD?1a-9d%iWP>GcTb#1O
z?>p?78C{6j7?)`#<`-A&lzQWq>;;7krGnKj0AdNkExA~>x}ee8Aq%%^P1&-Yar)m8
zq;is|0@aV+CCw@dY+iJ%Jo8&r>TZ{r8N$iqcJDS%mHNuka@}rLp6uqBKPry&AiJoT
z)4FJt{w&XK@;Hs2sz=LAY%bq|G(@0_5_@c#k}zGmKL1+RnB9J4*husjUjQL*4~xwE
z_jTLON?FWD^$5gAl;#@&t+&1iLf*Ec8?k@p^jW@ZWtu-Fyt*RPK+@G(fqgwR_qOtd
z;xMD!8s5h*4L!0#v+}x4)`z%sY|x#;nmF(BqaWrV%FGJysGd1<VUSR@k*{WK=TpXw
zc8=L9HI3?yZk04DNf8Isc;AgNNvZj|Pj%XnM_a<>n7dPOoFLpwWq5}Z67F+YDW4Qk
z#-?j&I<P}weJ|+s*75I4Dce)0@y$O+WFpdEE)<L6g<51+jlSKp_k;|QMmvCnzB7oZ
zo}{k@-CAg_bzuEsuWwl*&aVOMuHFpW=2}f1+jK|VHxbokn7;>7N0j8tXT>abkadFr
z!G&N?YV)sDNAT?L1M}A&#}?Myouv)USKkn@l-v&|WuA@^n2leszxH7#*ml*|tt;On
zV^LTyJL~A3&@maqk6fPqnY?~eF5RV=XtgG+!rk%R+9{{^W!+I<PJ$XlJnSC>>PO8y
za!2NOLT@)YsF9@*rzmV4Ph4f?F!Q>VkI9>PZzx~PcfHv04Vv+FbUEJHb1;1vqB3Vj
zKW8g)UK^J_2YXCiT*C*Petj_yqp8)OeI)}Q((`^hes_X1b@QAa_mB!4lPR1?Oh=qX
zS>5jaiX(e5J;v)C<lR3Ygd@Wy?;XbHBpixJJaS(@4t;#D5k?qJG*9D3%{11)o9_2^
z8V$!`#$%{zZJ&ms-W9Qu-+hPulDbwqs>pu9#Mu`h3imcN+rFic{T<7>dJ;QxWdO<*
z?`DVY(sZ9mQ4Q<{4FO=DlRo%z)BDMzEz|~)d#S<J`2Aw{mwV0DBE;c_`3Z{ovV<8t
zN=V#UMV63c2lgJ#AAaZ5-E|kLa3$mq;tm$A&BDdv*3&PW24(fyfbB6X+6n9bd$Qhs
z|B3ujilROaGs|>BE%0gG)M#%&ao=qIm2qckvS!N^3(snl<Jwv5sxk8m|G%yuyN=1Q
zs?pwB6Z~e0)0%05G7R3JY3YFoQV*<O!8uTHAnmqEfb%cq8-m9%o0u%?>%eS+X<&_3
z`*me=>?YkmMW5Vrop3vQJEcuM_ZBB6=)zwhT>46bn{%z(6gyOlr!OYb!mRG@PZNeq
z6LvDKAj=ShwbUcS>b<|59YReO`rK+v%XcO`LITDw6z64`>8BKhTNS^Zqp}Q@i(Mx8
z?<ids?RKqZD%veM+k_}6f&>bxp0X1Q7%Bb(ccX~YJ)yT=u092x4C0L%`}5Y9OxAR}
z9tk7YF}!ZlT&L4L<Y-p0uarKP<!*qD0W6_C$6mZ$UrBNj1)bgDLj|5Jy!gE&eug*C
z)d(sj<Vy%h!JgB%rZ~sojzQNmG9Nl2=a=8>MFfL<c@!fvOzp1Pacm-@<_i1Fc2{=A
zilX3)=8sj@bUm)}{;hI_9=c}d_@KY5rEjBcW-SQ;fZBHZjb?O{G$}${;;<J40CcT>
zhg_8i|0)yyKWK(vi5Td=Cs;}`wfWua>2k1+R-#|`g8;rB7kk)kdivI4os4}D<UU^V
znEt9GG@^Ls2FK38M`eb#ju<mc0O-C2mIVezMvzQ0UKrS&@SB{E4z=lkfoIe5>jjGN
zQR<klFYW-Sh)$Ts&}F4>Yj#a-EsXrVb-zvPpO&rD>f<B=kY6YFr|B6Wd?K1*vgb8%
zs{4dGKOH;~XLMfeiO<*;>2`J2B<>73p7#?$H4hC970a_w-7D{8px~e_8s3YtFf-FI
zEY=HorQkcFa7>}Y1Ei_6TeoWlrHL5@U-}pu8+Xj!4>Pa%M)Zt2pU)wzw4)>E+qXa!
z|1G)g&+MwNtx7;bk|4+u9^d_h@L=S(LACp1R}$Oousy^<5WdWD^(3wVG`c93hPR_{
zfl<=!r~S4>x3?xSbn&flhyN&dn$^BL_Q0>vZ90kFgy0ta^VjU1T0qSuR4?oXtD=r}
znvivGj;-hC-k+}hMB!nqohf;cNK&fHRR4Apr=L7Gxw*M9Ud@=Ie}vx%-*^CB)<OP_
z@D7bVPIS9m8%*1MBK)~nsQu8O3Q+2|rDnQ;Lj$e+$nMZ^$lsh%-Evc;jiJ6ilqXqJ
zFE-r`CH-LnvYEfHo*-P((2$DTo>t{ZSzwcYDHf!O9e>jOtUbw|FxZ5V>)S-$V7J!u
zcK-`yq)oer9t_6HNf&9$lR3swKB1)}o&0`d`pfHI@~GzKjF+;^%(5@vOd{c7oAFW$
z{_*W!Sq$1<Hm_6`YKL`I5~Pt|^s3QYA6{HuoGtdzbG$rjda=4-*6g)*1EOkfVqy{r
zx(v<CHsri8Z|FA@_sOU<WMpJ0Gcq#l85kJg@yv2K-Q^V4TF0Mq+w8ccmD0kji`goI
zU=_ccQ?3D13&pV9t(Y6k16*Q6jpP>(?%&@TKHEj%QR?xG5?+TJ-$zsx3^^XvlK#BD
zO@<>0ifZr5dAeI2Ln~}u=r3^35uYFivCm*!ih*vlEVKtLKCtUcu#CDBVR`-lny^AV
z%_N8;58~-NC!~cHao3()fWn4X;Zj0Y3@w@3<|>Qy^!}@zuLwPFHqTQbn^xjj$>vFp
zG%nsKu(drG3yNsZ_s6(&i$%_+D@ja4oUTKJ&4XQf>u2+|ILC}trud=`x^1YAoI*^o
zT@rCpRYq-BQC~0DyZ_vsT^e3GjWhIWQYN1Wer3w{0Zw+cPaE5%-^~<Bi##-J^S*3$
zxWt)6E({n<!r6nu4JH}y6e{b#*WXKrSNJchbTftAMiyod_IO@b-iu54^r0qDV9=6v
ztsp;#7ytLzL_TrSp-1T#dXeQ?sWKF*U(I{D^UvaKzPz0K|6BY1;UN~U5%r1omNDtS
Q`ldirP48iq%9DtH1L^tN-2eap

literal 0
HcmV?d00001

diff --git a/newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f94649519ade445e06a6cdd8910d1f2ddb46ed5
GIT binary patch
literal 12899
zcmYLQRaBeZ7EFS>yE{dSYjJmXiWG-p#ft`acc-|!6etkfU5dLFC|X=@{-^u!C3#5B
zS!?U;nVm>A6<IW7Vq^dSfF>^|r2&11{P!TjLti!4?GXR~P9}LNaV@Xab0dV$xWDhv
z@z03Q;1(FwaeO93hiqaFGxMw~IR>SYt>t%pR5fF|2c*#C&xn0uyUbvuBcm9jz!5>*
zC%K_;_<H!Qd#_tun}L~@fg6@q9)X{FwjKi!n>z3Pw*<BX?$<xX3rVnf&qf>H77}zF
zOaK3)b~*~xen<^cYw19izU|pouW-(B#N7C-IC_D@RFF={Z!?oJfpE$c(%Z&tStqmJ
zEr6a;eY=_KFfZ;J*Yc2gcEq`*8P4c*9#zkt${YM!YdhY4L2*Gkqj8%)TF*SZp{RXw
zz4GuKN^4Jj?l67`E50FqE44kby|?|rGI_z+Dey5f??nacF<Z|i{$@X~C*gO7lyQ?X
z+C^2S-fV<18pSQD*Tjp7qP?oA55by-{cydsSuzgbx0kTjCB&@ifQg}wNPZLMSGs3C
zTF|}Cp<ferY*L^xkM|S3l|OnxR+t0I)levp`HQ#!FOA;!@9h=(-rA3bE~-C0mCqPy
zFTSCCpAN2kRO05Gsp{k6<$2WqYHuF7{xgWRhqxGq5)Jm)S(q|RiucZa42c7EzbnHh
z`*EM^MM6aLbX7#Oi&&O(Ehd{W$-*6#7sI}--gXik31`?YCDs;7=&UV^$ognczTd=K
zXRCC)C}tTqI!&3F6VD1kJ=XuQR}OBAz&x{Nmka}3uRLc)B5RTJXk|+N+K67hOOk37
zWQ!-xNNsW%-RBw~)%#_GjaMOLhqy?J<A4$QqbGBq<wsCAFK5Od+5k?O8s)JHZt4Zy
zir^ln_;Y4^EURB#4S8cERF+AzN?PECCt^bcrr1CFF5{1$B%l|<WH^SQ8y>S6T}5~<
zb*iwKFC@tkV#$^W3y&%+STQnt!w+8x;kwVI*!3&I8eSqk4RMP)E7f7VauX<nor)oC
znTRsU5diZ~c``7=08xSm;n6>3aa{V_S057K*s-ye6=jDy%G%ot(g%zw#&cD#dNh^6
zs>0n~a}iw{U(Rf~6ZB49yDx&zf68l@<$$!4u$kKIU|na1*GXp;X-9*Fr^6q%IGH?2
zW$;H$Rmy3xRj;|}wmc!Nv14T6snTmJEijIjamFAy^59+o+UNW7-<}UPm_Kx?@{5w>
z#72V=zVp7dMZt-r@O`)>ZR!fTO)GCUI45O_{DbH}w^X0z{rW_JW}0{F{VJ%cI$fFq
z%L_KC(DE1vKDN|2_(54kVPzo?K1lHN_4Tz@05L=2`^!F+r2^rT)A&w*(3<6@sg!jl
z=jIA0Bte1(SxI?icP=!`H=PKzsX4<DKea66<m6Z%7wV%~ss#65V!Zf~1AFom^5ByR
zj**bA_gx;Do0Y~80&p6C@(=}>DD-aCLvK_2K;PS$LmjSZe*ZGl{emul8KvV*EFOv|
z3qnhiq=2mRt;&gUi-O<tabIHNVeMKBk~1?O$*IJfWRU!;9~oQ-elk9g5FjaBrDkP4
zDHKryQQjIG8_O>5+o3;5hrQIU&>Ay0H_vy#rDd<UVVDg`rytS-6%`g1ri_e?h@*Mu
zf?3`12?#p3G5oWG@`=-7A0Hn*>r8q!OT>9+zQxTu_fb6HrV20ogx7;q0uJ`~z06~{
zd3u#z**qJ!hbcVpj=Y>Y`V?b3%|6H7NTlTDbpz|of^y;2|Gwn-{H4!zv$I;Qp!y&a
z85wE97g3y{dG#pz;>WSJF2j&*!1D;kx(*Bq0$EB)4gB<02Jt5L+B?RJE|XP0SLhp%
zFP^wDGBcm%m6ch`dbIo$X%*ndI%$dx%Fk+{Rjbfq{P4k+jS8&UHHI+KPmsf&ELzZ!
zpH=e+NRwdX<aB|j62Ez(^~=FU4rPABB&xnIOIDa%Wi0r8s%~Xv)taAAAvDl`@@KJX
zlGOMq!71DH#5F>J!p_}@0`MUvA;CGQNo0HfQk#Osuk@NcTaF<)>wKCGtZjyig>}^~
zsT-<yLX$q;`DJ2Q^F&g4q*Bemz#u6-Jw3Z$fy(7Y8Yj57J}z%pO!@d<;O?%O+xy$=
zIhf<F94|as#ID7g+uD$(=1C2wnkj^gd2DLxBMK^N4x%0k3d+~Na*=g7^1fXaw?F6)
zR{?P#0*<AuhEtfh!q;rmi+6Hm--^gw%%lDNg6-|?6R<#M9cFTxHbeEO!IujPsV-5T
zh9ZDl%+TOq=<8)a#<?7By~!H)>=$Kj;z@#qXU*heevg#w>}UxIiNnN@<(1macc={<
zu1Go+KM7aJYhwj5Vp330booBI5EP1Ktxi7g@kv5Y9W4Uvg8~BsZ-Bu`x*>WOJ#Hs+
zX?o8Hn&+y@fAEnaKpY$#o(!sa>nhibVmiB7<yuSzk3X#1qSUOc===0S9B1j1YS3N(
zyiKCQ2V?wuTR6jmQ&3Qt>GHX+HDwW0Z2bta3uyl=lIF+G<0n*Mo-OVqrRx_xlPBs*
z)))78Lb6?dRj>}d|88_)L8~i1ewsN+J0xPsu5!_iZ+=YmwPD|j=lX#jhV@akW8-|`
z&9``wI5Ywz6DkqtxY5x<!T!OU9AfugUe3t(0zVgdUk2+e)`_Jav^%$m_r7!*bKHjn
zXYge592D?RRi9B*mqAY+cM2yeI(mGw-Sr3nIgBIwlohQEF6DpBom@GROEy7hO45MI
z>ZB*D;m-(OAXUvyFOod<A8jOgNS~Y*d((>|LhVbFvg9P{@Hk%uK}u~#*+2LN@eGgF
z)paFrt=qG9cy=y)gcozsx;*9hDfEhW{F<LM+iY3ENck(|{{1%_-Wn^i{hLvkmO?P&
zs53N2v|}c9ie<|qZ8k-Ph5c}?a_2TjozPVZA=$4{T~R5mR^RY7_CI|D?#?aP97b`6
z0Zeb+Cd8!ao}%7$@lR$qW80I0-|sIt>u=N|8#pJL6&UE~DxA?TL8e-`L{iu>RwX4R
z(Py(4by_593jUS{5E~X*f@xfZKa&}le>Fp5axfiP<irjvk;4H!Do#?T@kct~{1&d?
z$ln`jcnfg@@NJQt-E_&Bn0X?!v02l{4;U#aO$AJ~E-k!H=1O8-GC3_3m?v7RU|*By
zdxrawXK!In%2SGL@xBW-yN4<@%CCo+DC!SnO1V?bk$YpET)Z7%!Xid7iRZs%8H55%
zYE)$9^|KT*Ln2*#J@YK~?nv(5^iPP@pM&eoWp;LUsETCc9WnIiGVpZXXc-vZ^M&_S
zUAp1Bx@ho(TZG8TdSbgW8#s}r)-`^V+!SX@86)x?CyIEXY1BE!bFbw~4Pj?);A~N}
zTIc{pmvQX_c1H^Mv;^ZPw9pKmn;wv^IEDDS%Wx&=yBBMbXzA%I(MkC)3%5BVSp0eV
zM~B+%kAk%pDM+nmD#u;8?WBc>uVjV1ophNL4&<m}S0nBmF-_*lS4J^*hWaduR|GLD
zbekpqq&g)2?LeRpUHZ6<AiGWS*&hF;+V3zis&7w`E<J%H%@RfDuKK|31Yw5q=;-L4
z*;Kn8UO?v!;?ks2_KDg3T$EQf_RYx>1mnN-_V6j4f@*icX0T9cmVS0`4K*cs6xe1Q
z>=rQXhv>h=+d(DiQEr5oKtEp?P^Vm%2rv~rAF-l_d-e>4^OjkPJbLAtsX3+7XptfO
zL5xdG>>XMIk3=1;_vre3ckcfX%2`Y+#-ZZdBb+)3Bf1<SnyjYhP2^PZzTN<8-tXBB
zxxC5aALVf|KuP*YJvp@L3o@PeR+c<4NG;w*ux)r%BF}2%Z`T3&Ub=EVk;o#`$V!9-
zhv0rdCS9hMr5l8o9|E!?F^mol4UH|;81iYc6Ag?}kQ#3ukzaop4DZ0LlA5knD3<^y
zE_e42FfQt#*P{9y|5I#~LfZM&(W4&UENff?@*i6Alnvu|l1IYKu9V^OSFFK<8nlxG
zXO!Ravs{E{%_LSRK>mI)DW4%LFE8%buU}S4b_uRV1U&^u6x3j@sYYEn{kIh6e=(bU
zZ~<^g&Jw;Nl^JEWPH-uRe_x#tTqJ(Zf^R)NY5rAu93p|0o4)eLf#yQ|@Zu5_-;?xF
z{g*tv4zv>!nBN(4LP8>3p2WI^1*OJ!a0RLjT7g!;PWL~UmLyyCEem!n{u-&GKgOC~
zy+ypeEhSoD0oko=WR?UcUPxC<2Yt4ye%UVSkxAJPrIeG<u>el=>(k7nQZeSIt1fTZ
z$kMkYGag{+UI_nYv1&wO0w{LvsbqzbOPS^y6=Y<Dl3x(+2q;e2<N)j(2>dPo&ew0U
zQL^xUg3MZU^A#kzT#koiGwj}77N~JRf%0ebA7XAY5{G4u4@u%jQ`?$t>q1Ce??^^~
z$+`|^C^~C->6vY0jX+Yc!eZ)v+IYw*&UKI4z<6fyIvZ+L-|XycBObF3D#F>)2Mo%9
zb<(^;WpaB4?;Dcir@<qOmZ1C=f+dE+;$I3*Mg5y+``s@c%G5|ZGE=m~T%bfN*MMlm
z0^?a?+v#cX1Nf`4fM>rORt4WGt_afKf733h6%u-q68+qXI&;6eWO$(Xoa4g8nEgtl
z_~daW3HcZY;5`DWgaD?HLw9{DZUe-EkYi2KEjWOb1bW^g2&uM@(Lz=J%|`RJCP}fJ
z8ayup_qXA4U5zcFu#nbXG$M`K2(7z?0ycluCZd;W*44DoYXMX3bmBi+_@U)QSe3g1
z=oOZjrnnuFY@dH#elkrrT^=ocdJjRu5d*ahAYGbh90y#!<)5pz5x!K%>gPr{(pGq-
z#xft-o9wsWd2%>m|2VV7dst~aPSjOvuT`4iV45eK%^yCP_~U4V#QyIH*KIw1YZ%wP
z3|DbPDSJGRy6(Xs1pyZyU&4o5NV9;>bh-2&;97QaD2{9modLo(Ko6kp4wpok<!Yhr
zUR)sv=S(PUp34?rJC}*KuVVQ2%tXZWq4rn2dS+xZ0)qjXzelJZMFWK_W|8S0E@_Pf
z1)FjO*F!t=0O!<L2R_c(zW*uRepY^?nqAOp?Kve2aC;yEiY@AUgAw{A@9gOTUhjvp
z@#OCPeE7n^G`!Op(YBIhSpWLjD(sorwa{NaeN42~y9VnQ!2$P<?0g|4iEm3o#N&A_
z^aIa%=BxA}ghkY;z}H{QhU}NF<Aua=At6I82PiesAOaPpjFD4B1Z#0>Qan7m=bdm0
zcu<)2bl%4L66~^okkE^OuV!inim6~QR?RP#HmHA;*Aqgn1-dR~I$do#*LUSZws@TB
zXEO*4S1!z(T4V&@-;p>~%Ife7F#_bVasc(;=(%+U_4V0?u^UHrLkRIvqH(=DgY!En
zp|DrC!~JyW_lP%mF|vMsv&+YDw~m#Qle09c>y?AH1^3n5+$9$Y(7J@-!-XE9>8$s*
z_lz2SS6MpXD)Cc1+O6B<3(<UO94tiLRMW(w+B{#)I1%0NN;YeI+Zv4;rA@W`r&>Jk
zD}58=6<T{~v*E6x5gnpVh-$7N4+8ryC@RreqVHn?8XO)T`qLct>ash(-%Vh{z9`{7
za3M)sq+N{_8i%9UDMw7_tFfa<;9W2?<5v9ksN{N}I0V%s-klxsQ+;gtUNqi~@>m#1
zakfYI;n)mO^br9GDI09Z;!`^%{)aQT2%KL7D-2dhXlvth3u|qT1iU{^2N;Oy8mX(#
z8Z<n;f2sGQj{a(N)w0wrm^FHe6BNtE^AD-_{hO}uxZ+LX-7-lZI6oP4ZIuBxPi>60
z$_yJ|zZAutqFcTvFJ}W&=eSO(y3K|!hziU|Lo_kj+5mqEvOGm(w_9Kw0j`#7RTi1i
zK@uMP8~KdXE`x>J=o6{ZW-YjW3OK>bbFu)w3FnLWVrbNT!%73F;S1klSZG-p8r{7(
z<SV&dHhDnWz>)lCr)Bh&nY&;CkeEeiWg-kV1PU*|L>FV2W|*$HfRr*h;hqAv<5%st
zv&Ny9b;6*)B8Yyy_^V{OTEWcikVt-RtlM(>?f!}MO(s2ww0MO_!ugV`wL^F=yt>Vf
zD<L2Q+pm#ZniKT$^*izWmoWz(J_agX(~FDpGIOv&AZwDixHun2*q3Mv*C5*}g@UQq
zr+=pf^CuES3PiC%*py6)vBn!YEW|)a!H>93G<K1W7=e|*Tq(WFols{v-`4<({U}CQ
zQ{JgtaT)0(Y4c*WKeL}vcsmds$oY3|++J=%cwY?KOF`yd=NHtn(8`Ai_~fXE67dJx
z2X!Hh+9hfdV0^_imXnI#r{<yb02c4pV^;H3!U0;ysiCG?jMAiHMEv<!)uoj+IvzV&
zF&;S|AIO%sBND-%p1>y9Exo(KJ(Muw^t&{bz(X(P?&o;M9bisk!VMD!0+=b0MpPS{
zcX++sl>y1e-xJcv1M5ufK99fF<`h7>#b{&$3MozHBv~JX75y6h%i>pLhzJ$q_n>>-
z{crT@RT2gls)NwpbP7cmt1ZOCh^wjAbxKVrKuGsmN+h!K6wcFEzmJ-CzX&Q_EG~8J
zlX^TajPG6^Z)5>!HS!_)pyu1#Thb^eT7o1%y&BJ{a~SP50!bS$mQgHQg<M1+>P#(4
z8Qo2xMhpYIm98x!0O_iMuS!@IF==Ko-1Q9J|ByCvaP&At^oSc_PZ9|!x7957f`%5D
zvEkCt04MtXazhB=6q*<`1KF?tO#Bd-C*W#@+pV6M0L%ZatbUB%vjGiJccMaDa>GE|
zY}@C(Yg!&23L-oto+7#qX)LOdm7jSQYheMwFEp91d6@hd(%qZ0z0;<6I>8rPJ$1L2
zml*)P)<^&Wn=xsulNK@`P7t7e_Fz)*_IY72F7p=YYWiM3e4%PpK@p%wwRz3YnTB_X
z0a7EHDXh`=fQIR5+@YX-qag_p8ykC}O1Cc0f(JOl);0tS7NLw)g9Q&(><ghOq$oPI
zkJ%}B=rKzSm#LFG5Cqfcc#X29i4wINq~z@prsbB^=x$ph0V?S@IMh4s7Atju<6FKr
zv4d5;Di$X{Tk`X_ZU|qze;|s*W~IPFupssRuTOk{@#TuP))auU9_Z!ueoG8MMh9r|
zRsaa6iG2p?HM12UC5kyr<$mHr4>n=N1uE3TMyZ#pYjxkI>1%Ys&Ji5Y<g!eDv|6yO
zY7Sddq|a(<208fAgAe0H-@M4`m1q+zVJUmo4{uNA%`eg56oYW0xJO=1g}g0XQ}$aQ
zjm3H7>w$RB`7%VJzk)ft0~9sJ?;Z#^%Trz!w={&G^g`Yk4IO$j?TuBn{S<=s_VyOZ
z$;sJZ(*A1^t9Bq#Veea8-+l=yx|!Ay(EcwT1C2{nq2wUkKV#Rq#wC&+W>Zb@+;%BV
zZ-(-{`Hy=Da(FH)XN0{SaNM^mBri_(%3r3eY6$tx^faSd{)GV=8X5+p3E2E+?LZS5
z9KnfV&=jDEb4sJx7X(*ph0}YN$icteeKJq*<SgUDRm{7^k!O6R?V%{Ubp(vPoY0IS
zQf{@w5-CjPQ<g1~WOAv?u428+lr{#RlvLVJbS6|vQ5a2#A;)$bvxG>?${tN;^Er{4
z66HC3;Q=~75SGuMXoNb3{>-Y7P;Qfx1Z1$ol*QF3u}J)As{4^}@+Oz7ITj6i3}2E1
zy;ToVP`USY5f2|5>kxU{YBp{lvRir*kLhZIgh^y48_JT@#~o&moj-r+vI#}Rz?jYw
z@q1#dLb_c2TGuO~mko8$&v>1xSgazVzsZV3<&h(_$DWkrp`!w2a(lEdZ&}W6u751u
zZi2@dzkJ1=OV?Iu<YgwZWPQ~73}W#j`7m_`8LcZ_vf@9sYC(9&H_8S37BSz;f$vSo
z>4#NLf4Gr-V`+FQ3=00Ql;L7yC-K|P6*B<Fap;w7Y&n3-lkCeKDXFO&*hOSd_;=l1
z_rsC!{tWhtP6wRYsZp>uj^xNs%ke-_y%E%aLu)*Bu{z06k!LC8h^93EFt^7vVPzTP
z!nX0TN8Mr0#H@LAvZ`$YHp=iD#MB$=s-hOjszp0DXqA?W*)awmK#|NRLq&ibu^@Bm
z*ti)c;Ou_Q1-{%2)ATYCHcw{}w_JUH*AQ>pn)Uj~P;U6j3cdt1sxyhlaAovBuJM%L
zU?&-)D}}X}SOR*FCP|thn`$CxUJmsAMu#JiDfKnosNuL<VlM)TT@t`gdq0-STu)Vs
zVw!2XN)3Y8>2pmG@*B0eii`JtY48XsVQx7lnx^gT-SUt{6?E=N(Cr={i1eJ1_18wk
zd>O?{@e_&l%=jvQNtg22^P!KS+wd*?RvK=JEU=b?om`&@RNa|0OuK_8t8G=Gc6xqT
z<&kf0mU4`WE)Om&q;`9Id31#~-~%iCHi>$MzMZ;UC?mKO(f;9$65h@=aJ-Psr|g<u
zCf6{k@6fmo<iE82-YlKEIZ?nQb4{igLI+6GwoDY~jh&ygz?)xU<$YjqP?F)C`gWrx
zm=}{P>Ar`m4&hTiNyy%Hb#<MM#9_DtgdwHXP>ap0iaf&JX?Vm$Mm`#!nX4O%rZW*f
zbiTP$z>O+=k968?J&qb^6I9%Er6A%jo-G~RW4sJBjdbcwbRQ{iQRW288nZ%rzqI65
z9}x|09scBLEYLZE#rh?;=QUhtVPR45`h4FHY$q#I%A5-nI_h%)ZHorg?_d)WJ|Izn
zZ4k_jMj6G0?=}fS09zXgR6GnJ1k%hIN!H5S2*GnU>TW;=swJAi$VtLq?y3<@>B_QM
zw-18(1sqq?w6lnpkG-f`11nrW?K}o_h6TY*)_T_!U$(78Y_mht>f+*J1QI^S7d}(3
z>;2L5YI?{xTMw#sf$aU+$_>aWRb!$Ei)uE@Q`ivmf=%<pi@Cdj`R@|4|B_kS)*z&g
zHvS_6ndLig(-bVDP@8VOCU+kG7cQ)7K@&yBoylR<-uCj$(7ERKUN8E5*Ww~98X6i!
z{Ewd>@J+q?LXaG4=){sa%!eR-;^A!F4`u~ARmxaZ*aOND6m^pMYRoz14xA_ViAEEq
zNuL#wFon*M$GWlx<s)L{zE6^z-g`R02TbK}QTzGFQJQNN%yH!z*nqq~j~ob_?07g5
z6<yR2y}!d-(8TsqO(B}`4upq<SaiKToz_$Q>@Qa@TINNJo`$#E{rh(_D5qks=;zM|
zCaAT`Bqj4l!y<g?i&rJU1S$+P0-owsa?yV$P@17bkTeUb%xa%P4SH^2dp5yJ`RkT=
zrJ;WidA$EYchc;s#NW(A4_}F^?L9>zop@0>J-r>zkiFR-u-;IXXpOM53)t`XeAnWI
zRUHI4YZrU?%9p9sY8ZuJ!T7E3X<hzwywIU___7j<(tIwCzMuf(wVEEFH&kI^tl!MS
z8zXN~^U=rA(B5^|aK5%f+POFeupQtn4O%6J1PrZSg;19Uj4l1ip0a8F1iZe!p2_60
zRsne+h2=U>iMf&rZpU}ZNK3PBYXwR9$z-TT%~f8apm4u;Bt>fFAje^=njKev<qdrQ
zqJInTis3l!_V$LSlL#<iTDaONj8XTkh3}#ilXw~Jc1zLxoXLe}hidcCAeC*&D0LzE
zE!0CX0y>rg{S(sC!kqthfa(?5*Vhd|&c8u|`GW3toSj@sXW<t8rJ2(o4atK({f(2J
zg|jnW;qo^xp4_&!|6`c~zL<;!W$oLfyq+H6;}mQ^$b<}*+w3(jsT!9xr9z(jA1gj1
zJz0Bo4@Nq*Sk6NGlcHst2$dC$lABwz|4O6fJh1aWmdt6A7!VJj_4)g-sB41OAL-n<
z9Lesvr*za~7Y}0BA9p;so}TTYYAQd||0)raZ0(qjsj2Z#*aGXpa=b^XV;xm}n6XMO
zT;zp$(h4Nj>5f$9kD*c=FV>|$6KvT$kIc^93kL^h+5P_ZJPq`yF@oJol`t|g`hk7R
z$c>AKkN?K%K|S$L25`2@I~6muNuSyz-e0g(ba@f{2TGw7rfnS7V4kA5s7<YYZ^16u
ze-e=4jTGEjp4w!#5^8VR4)8ako_93D+HjuY9u`%s@2(z3AK;jbyPJ70h68znp8y^{
zcV{cBS=fwqxX7|&i3qX(<mBY^sI<u;Ui_po;iU5A>d!Y%bFpf7N(87crU_C<50;mA
z80oM^)eS66hW~gt?TQ7sOe%Pn-Ny35*+lK0tWyd;1`Hzqj*LFCT0KDRJbs^;P;xt-
z`H>6O58A+AN)!8@TJUXes9lWL4|;bz#~qr+KCt@xu2l2l9br?=)WuWj&6A&2g#!I|
zyd;3B=bH~qs>`^~a?^MlTdhY?bj_<sE3unnoQd`K{28B44fQOEal>2hJE<hb^W*e+
zMOqU;XTW>+)%{jLK1v1|mz9#NA(PlI1x$JB4k%nP4>71oW5F=ZZrJQnYay!QQt|zv
zm}q#Xw2G(swI{wtos!5$cD~VODQUVAlk$Dr&SF8~xm<0Tzv)aOPMX0XzR%^vOYe(x
zPkbOZO;ihqZIUNb6P(T%&8!m?I6p#hLoD3HssV79uCL(7YRlK(NC6l0$)hUKE7)I_
z`bWnr_dzBm2l-lRxcXp6zi-;km#(@IRDD{QDrM49$%d6F!l$bjn(2+@bR^cL6x;cU
zS(OW%ot*=#DX`MWHs#4oz_4NJ@87>a2EHLoV83on;6G|6BKD7VWXR`U{m$d>GzNT;
znHb`C9VNd-YFN7pBUcvtmJ>@@U&3K`;xG%DHaM$v-W(!YUQB&`o`}NRDvXwuV)a>C
zQb)1QUuxYY$td1+Pz)UsXGpxafL6}WKaNSPm*M%F-A{GO-|tBUTxjh>Y;6@m_F0IZ
z;t4rGOyV0m#YUu7*TpH~7;XC%vjzP~O68j_bp<Xz-~v(+EY^PQes#c2*h;u^0hYXf
zuu4z2e<ZbH$P``!6eQpD3m=Xb(u}%d|6G%lbWupG5+nP`BLh79d1!Lf)2jC>+UB(N
zF^A{tk_F_?%nwN;{--T^kk&rXsKd=xu{G`AAm?$C)`42BI3t-4XJpSToT}MF5G8c<
zFnGY|l^c%~32Veo>9oYsBytH+85wV&v#HL!2{GR23(!F4t`W!Tl`kx^EzpJ|J{w>O
zV8TUq`@7yw88iC^)(+Co{wK<Y0p2Uw*w_dJI6`F|(If&t%2ZS{p`0PenK+NjSY8GH
zFNK{~X6)Vg7qzD=DT{qCu3Vw2)f>NJUTDb7Fn1yY@77sNmvol5ZWKP^`w|#C+$}wF
zZ|+!t#`6)Nf}hQJ8tYd;5o}e>pTc+L8-Ry!!BL@fG(8mcjh3W|Yu}BPeo$Zj{X0{W
zytsMI1fJ5p)?An*{a$Hjg7Y>$HuVSzO5CT~79HkYaP25X?aOMmu3!bnML>tJrY90o
z(&~q^rs+-C7<6Lpa-52Hz8YpA(-MrJ#~I>*n%C~8c|}EqbvuLeO25LqVn!>1kDhJm
zo(N5}Pu>h6OZb%Rhwpez2W<yQWC~V)i{sWcy0#Z7+CQUj<m*Phoc!6{o%`|e-}@g6
zwNom|Ft=dxuM`yd?_zUQ?(!*F2S^-3RIZzmESoX}2?=I-gId{vXPm-S@)3h|85xAl
z-v9pO1GDui+!$n^xN-WPZ^nMq*4D<L5{vr3$mO^V%pSq>*Y=J&Vr9Pg=LaBIMEet)
z)R0);trHZpj0wLFZ*7UXFF>0wFuMzSl-BQS>lRK#!_Gh$ggaOwx1*_CWm;r4&;m@b
ze}39p;W-p&m=5dPl1<~7#f!?TsK`Ls`cH@%w9EDk#V-}q!B6)W7~jDpDq$wtOsRuf
z@B-c9Js57k<3w}MFyZljjJ$NT#MIYJQ&CaTaam9KQm{WRo5#E37`$m!zzav!K{*JR
z`E{s_Jbg@2>rWgbLjy;`^T9A5O<!MsWPbjJ(-eyxX&JZi$=pL7)o`ub?^&X7)^n}Z
zAwMl8h0qqafd1c3n^;hNef@R5|I^7=h*`dfpErOvRPUwIUA-FG>Jv~q%}5fUnro~S
zkS3SZPQ$@Bun1#1M*t^^gCDV8j+oalk}9C`7GAuN!xRGG_vqMy+M;_v9h@drA^+!<
zhMGDdJbV}gDd_C%tdhTGMh1F~vRje5MRWjRzTqMUg@nie?KHds^d6ucA9;A$2b+Dl
z)nV<U8C}mJeZTXr4pg2E1iX4)Y`(gGp%PM5?clYwi=86}ApPC!dNzf&O%$LHbeah6
zuM>>Oe9=iqZKIk9=DU>A(n=9M8~Og=MQ?yrNFR4UJv9|JrpkWx)`bMW_TM)<IZ-?R
z`uzI?_cZReSgD=AGgI8;8IRc#R`vR085<hJ&wo2Fx?v~&ovqBr<`~RrFkP6G&?2MS
zL+>;hfrF~FDt&X@&nY5;-xfk>#q8{uavm=EOwrh7e~Gr;ejoxaTV#;HJxynF9W6FD
za|^Ji-XW^v>|~n2X_l$@5!74lzGllK`OhaY-mpOXg3o=w3BuFELp2*CqbctMM4#0S
zyJC^&DwJ7Jkl10h8ENX7==ksu-eEcy=`N?_?(NVe5ItAWJ;*)qEnej5*!jikA}uX#
z4j;)bs97jMx-J8qOb{Yj_w0GLJe#WJPy74run_R9w4-8=3qiVyiHSiK)~71fh{&3p
zLtu*LbJ|>B)2j!dcM{97FO3#on-hSv^a;Ql4;dwxd3is*u69NE%ivsq#Bk*+jDG*^
zF3i>%bqWDB&)3>K5n|+x?%SHFVVS>?8GZh2YP9_=r&tIN3kwU)0o%<1oW;uXo|8kG
zAcC~f=@|ge9(uq->a~_=s@&MoQ=$&Zyft@ocXx*?MSuGD+r%0Q>TL>?gLFd6^=bST
z?07o-UpqXY(~}7>jlGnd!DntIk0Si?O<Pb}-nLQ}nsf*dJ2I<Fdc7_h*aB@TJA8Qx
z8;`X{%W)GhRZs~ztYOWW`dzai75xtK<^y}qz-NX>K&r%oU8;y4PXQEiNmSi9LokOl
zOrZQ8t9--`VyYvw(tjzQA#wV}aRPM>kwS^aHO@i#BHLv@%wOmpN~4MQNy%^ECs@f1
z#8LzPtXqzBOxF_3sZbyE5cXD=gE6-M2$6zw8xgU|oWJ2MMPM*s5?W!qVJ0xoZn+ah
zl*zwsS4H6lZ3zD7LZeTTP-it`_mQl85|bCJ0lm~)K}Ei(C8&k5>Lu9s3@D0Kl{F$N
zkj3|snwq$L3w}Up7U3MIN`?yG50izfX+E7Xh)s09-hRVv3R@q<aYI=4XYX>Ztkg=t
zDlmq{Ob8e`S)!O;3u($>M;f#3!K`^07#tK&x27B#LgYd*W+iL*V;+keB#pvf)nyGe
zX{Ik^W8+o7`rluO1cGuDNy|N7U$4$^JVpGU-*sF38rK%?J<+2<x?R-Z_BeHV3P>cH
z+>hSmOZS_@N!aBrdHEUs-u%QwAamCTwqKWhU%`>&!rnr?v#%cKx46s{rmboo7n@|Q
zO=y|C4y$X>0+*@w)JMv$X3AYFS>r6i=ySi}xuexa1&h;#B=e`_ZyPOzX}sRW-r*rH
zEOy>XleH=mGIEkSHaGFK6L<>jdNg%lhVX!73RzrqKc>N;u-`~EEw=Py{BFP;y8JH?
z-Qr6Tn_`fF>!EMRK?3SicLk~4a$~rc|6>dhm&gIQhmGOnVCgxR+?JAn?}HV==r)Y#
ze@bT<EVS<CAWwV2U6`^H#xzT<ZdVG+Fb4Se_>AjKs~)~_1i^VURDG9(2~bX@vT^o~
z@e2Gx;d|M;rdwyM3=W(-{nz}x_RFzfM!$<!$Vr7}S<;sGDeKHj|78va&GyACCX<Le
zQ@q)!EWE|?&u@G5k55mVf!7%-Wj<oMF{k&)Z2TO{3oiR3i9Y5-G2ihHe?rfl*<YG2
zUO!o%>2<0VS`D*zHkAWQ?y7N$nLC%?_5{3(1Z`4z@0-2a+XttmUtT(Ufd^yrgni;d
z+s{{9PTA2PK4GJB6JKVpN%hl-ORLQM`hHUejXyV9PEKrbf)8}!uL>SJgvs06rp*p(
zt;y`^Qa2cMjl;Mv$|N`sU#Wq~I6r^>tfwVx_<nP!{o}_EyQv_eNfgqB)27jnS~oAR
zuRP2;)p{7Nh_3R7DT^<$<S&bfVC9&dg*t}Z+*~5;mxsN0*SgQ`N$B5!Dsi^P+YoOG
za=r6|gH!<u6LwGbaQ5`#g;DxnxGy}kL-vu)s?qqY@Me?zq!{~`NBIG7sq<y3TkMHa
z+{FA5zr&5+>g(B?1K!^XuJ(p|&|R0HagJ4t@)M(MVN}P5@!=~auv2d+hg}@I?2DJ0
ztmB}rnwlEXnzBMspkJ4W5CI&1n{&uV!%mNLmBRZKi~Db!;Tt14yipouYSETtawdp5
zz>_$heYG@L6aU8p0ud3BS?AB>q@AGgQ*L6pzyHuIEiDnB9)yL3&98DMg4zQGs9g_K
z4r@`YL(_w{qFN)<ia#Jvfi1{~Lt6Gt`Mt54Evs~D@>ZZQ-JcX~VMZJAQ&a?ci5MQn
z!vtY}uo@*uval0s*?zB&d7%P<|D9(!Wo+?xHS_jP?b1*@2)~#$tp-z^ng=|I0@<6$
z{p4BN)^=}nDTN#wwBe)_Ny+{o{s-_79UYyy`qp4ROl>up^^a}>SanbF-3wXHM5UyR
zHB%DVpF|!~gDI@gOiL44Uq;j?17ol1v|RtCC_mri<Jrfc5L9d~VyuwaNA@&l8HSki
z$D1Qp-P+IXaPf~^q;;YpG~YWC+jn)m86Qsd=q+!8?nvcfc@6^CZ7%;*)v0VkA@m6Z
z0?}CZ#YmQ+Pr&X)o^b`6II<H$*RhD9dp8Cr(6yak|CzK+zYfD3!&U4sC{^fOz&l^Z
zTWSPlHOaumQ{#)Xr-ui5jO3*pHd<a5G!=WCBf5#Pu?xe81SMdJu~-ngvA`ID6e?Dm
zJplob2`FRGzuZUIuh*Y}Q@52p5sH#YQh868AZ1^XLV^Yl4O`T&^QDuBX^2|^@2@X7
z3@WDNA%xpkf-|}UbRgl9TBge%835@}Xz2Iv^oKi5=8L`?;y<vrvJXj}x_0>^s7R8e
z3Sp-zw9kSk(VonwZ()x$Bw!<ui@=Cb9kwg3B#~Z3B#$*$WP7Y=ND5vvGZ<$bL2WK1
z?EuPB*`SjPc?AOkaG5<#mA=@2i4ic!KmBJLIUhF*aI<F6@H>{Ym`zs8G`)ejG;4xZ
z_;x7lY2w%a7!egEQID3)n%}7Sh?a`Ta=cO`r?)G4z(P+CZ`AFp-|+Q!t!vYzw2+A5
z2C)5xHu00+2%#snxk^_znY^jNM@wdDBRQKem-Rhb(QT}qNxm&#>-kdUPrtgl_8hmm
zjnI*}B9T8w-hyGW!a&}oc}Sb&E;KJIvCz^NY0~5WTAOa{eL{w_9ZxCv{*5!OYh<|*
zk9_``9<C?1D6oR%&)6siA+;FcFmDnaXsOAZ0LqZ{L&2smn^6aCFipGodlILe^m%7D
zW?xQv_%wh5_L^eZ5&4wvQvVz6?ckg<RSXctmym?oU2nTdu&0WsU9zh?SSKn+o~V|L
zLDboj2E<D*dkk%EnzZ^>BkW)LLimJ*g#7!T?vWMY<#M8<q6jl#2~MSzk-lJPWc<2=
z`RfyWk1QIV=UcuHIBpn7B;$A99)kjcH$o`Rw}@+_0Gb2MuSfcmpY`G|#(@5xI7_FR
z`!oYA5<g%qN6dsDuLSa|lfx6IC$qya=4J7J+ubjDScSUe5&F=Fg@mN^wu;z11*vE;
zVr5am`dmePv0DmS8(=aXA>F2O>9zGqI1UdBOM~X-M=X(kww{-3<~Jp$#Nsrdh_BW4
zN_e7yNY#~(KEN0G&08ttBW+^v6VGimDwq}nCNNR9)Z%!p?E+Ts+N8;9(u$Pq1)#;}
zxXu{ZYG0lOks%wQFny*-R7T~CxGhgmBmJPgXZiGe<~JgoiGqk|8cs`Ih|3KJ4+od}
z@bEy}=kpmls-!_P!+)_%H9zv~$W&ZagofD_K7r#{d8il#&cB~Q!ce2_uN1zs-uD41
zH~>5V)&gk#EtYP8QCIgj(to1?>SZN#Z1@yZ2T+Q7fJPhMdWX9rnrVnKRe}Xb02u{^
zC`fF#V$qIB!15z8qzAYxMmuv#X(Hy|o9s?`4OpQ>4h;>hfB}J!*_ZcrT6TmXKL0iT
zqsz?#)(~c=Z7zs4RY5?~-no9}d~S?10w*u-16mHEed9!$YP))GtRno(K(!L*D3Oed
z(CIu>Tk;~em_J)-Ix;)hZ-6fG)j$_c_>ndrplViIeM}VmMU1<bAiNWP9A!Hc*-l`f
zqkn{4R|2{*P*EoaMW=&uow~cbBQvzrFWbV=$vS>P@dJ*ts_(_tHjmiU_HWW@;In4V
zJx>rFTOyxo26%IFV6EvuiMPE3;sh&YW1y^cEO+aKp<;2Yirp{19E=WB`$E(!hXl|+
zU8<4IqJsNcgeaH)?c2BS{xb#QbwbZ)P45E$|BI4z<E-n$Y$p}C;ENsW%Ye&Imz~8c
zXSQ*U0b{slm#dfLa{u6U?819}LhcndT?69EF2qF)hwXm(X(GQ2>GJH#gyLI`%!JB?
z7)vp@BK1lkCMeZkq#mDQEpv&UA0FOu1DYhm(N!}s2bh9;LVX}z+j-7TAUCTz*4eA-
z@FP$+-}mW_QEPTMKNK7%)ha=5CM_wrk3_4Ok(Z3KqbyY3*dJ!Y7sj4(B00d|Z<s)O
z`!fm&M9v)A)#_O8hMnS2bN<;=$w<C{r1h_u?e~CdgV)io_f!`p3<#IGBR-C*BEcVy
zE85D^2Q8cr_fc7>mJw$&N22~pncY&Go+*P@(!tFX;k4Dlj%Mrcr>bv<94_%9`+1K0
zJl+Yv&lEOcPIvSnO<9|nL3zgRbio1=^;m^GiFoIT01CQDO9s%yN7&*GL{t63`lV#T
zd+W0ccbb5;(Df>u_WPp!mes`Hj+0lHhX7S^RW|VvQw2oVVjFqLaug27s*BuQ9*+0~
z(ewK`f57iBm}{MVo{7K>((Mn&Cv-#~lp=eRiUh)Gr$`$!xc*)^zqji1h?SX^rT1eM
r3c7Gtgs~ioZ4|>NXhKlDUPXz&{TQYHyL}G*^9Vp*T1Bc>!ZhfAgRjh<

literal 0
HcmV?d00001

diff --git a/newexample/android/src/main/res/values-night/colors.xml b/newexample/android/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..c32882de3
--- /dev/null
+++ b/newexample/android/src/main/res/values-night/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="text_primary">@color/white_87</color>
+    <color name="text_secondary">@color/white_54</color>
+    <color name="text_disabled">@color/white_38</color>
+    <color name="background_card">@color/black_38</color>
+</resources>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/values-night/styles.xml b/newexample/android/src/main/res/values-night/styles.xml
new file mode 100644
index 000000000..b2a3db893
--- /dev/null
+++ b/newexample/android/src/main/res/values-night/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.MaterialComponents.Bridge">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/newexample/android/src/main/res/values/colors.xml b/newexample/android/src/main/res/values/colors.xml
new file mode 100644
index 000000000..28731d9b2
--- /dev/null
+++ b/newexample/android/src/main/res/values/colors.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+    <color name="li_colorBackground">@color/colorPrimaryDark</color>
+    <color name="li_colorAccent">@color/colorAccent</color>
+
+    <color name="black_100">#FF000000</color>
+    <color name="black_87">#DE000000</color>
+    <color name="black_70">#B3000000</color>
+    <color name="black_54">#8A000000</color>
+    <color name="black_50">#80000000</color>
+    <color name="black_38">#61000000</color>
+    <color name="black_12">#1F000000</color>
+
+    <color name="white_100">#FFFFFFFF</color>
+    <color name="white_87">#DEFFFFFF</color>
+    <color name="white_70">#B3FFFFFF</color>
+    <color name="white_54">#8AFFFFFF</color>
+    <color name="white_50">#80FFFFFF</color>
+    <color name="white_38">#61FFFFFF</color>
+    <color name="white_12">#1FFFFFFF</color>
+
+    <color name="text_primary">@color/black_87</color>
+    <color name="text_secondary">@color/black_54</color>
+    <color name="text_disabled">@color/black_38</color>
+    <color name="background_card">@color/white_38</color>
+
+</resources>
diff --git a/newexample/android/src/main/res/values/dimens.xml b/newexample/android/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..7bcd2253b
--- /dev/null
+++ b/newexample/android/src/main/res/values/dimens.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+
+<resources>
+    <dimen name="linksBottomMargin">250dp</dimen>
+    <dimen name="networkFragmentsHeight">500dp</dimen>
+    <dimen name="networkLayoutsMargin">10dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/values/ic_launcher_background.xml b/newexample/android/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 000000000..c5d5899fd
--- /dev/null
+++ b/newexample/android/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/values/strings.xml b/newexample/android/src/main/res/values/strings.xml
new file mode 100644
index 000000000..9d10a2527
--- /dev/null
+++ b/newexample/android/src/main/res/values/strings.xml
@@ -0,0 +1,112 @@
+<resources>
+    <string name="app_name">Kaluga Example</string>
+
+    <string name="feature_alerts">Alerts</string>
+    <string name="feature_architecture">Architecture</string>
+    <string name="feature_date_time_picker">Date Time Picker</string>
+    <string name="feature_bluetooth">Bluetooth</string>
+    <string name="feature_hud">Loading Indicator</string>
+    <string name="feature_keyboard">Keyboard</string>
+    <string name="feature_links">Links</string>
+    <string name="feature_location">Location</string>
+    <string name="feature_permissions">Permissions</string>
+    <string name="feature_system">System</string>
+    <string name="feature_beacons">Beacons</string>
+    <string name="feature_platform_specific">Platform specific features</string>
+    <string name="feature_platform_specific_compose_navigation">Compose Navigation</string>
+    <string name="feature_platform_specific_compose_bottom_sheet">Compose Bottom Sheet</string>
+    <string name="feature_resources">Resources</string>
+    <string name="feature_resources_color">Color</string>
+    <string name="feature_resources_button">Button</string>
+    <string name="feature_resources_label">Label</string>
+
+    <string name="show_alert">Show Alert</string>
+    <string name="dismissible_alert">Dismissible Alert</string>
+    <string name="alert_list">Show Alert List</string>
+    <string name="alert_input">Show Alert with input</string>
+    <string name="show_loading_indicator_system">Show Loading Indicator (System)</string>
+    <string name="show_loading_indicator_custom">Show Loading Indicator (Custom)</string>
+
+    <string name="select_time">Select Time</string>
+    <string name="select_date">Select Date</string>
+    <string name="current_time">Current Time</string>
+    <string name="confirm_selection">Select</string>
+    <string name="cancel_selection">Cancel</string>
+
+    <string name="permissions_list">Permissions List</string>
+    <string name="permissions_bluetooth">Bluetooth Demo</string>
+    <string name="permissions_calendar">Calendar Demo</string>
+    <string name="permissions_camera">Camera Demo</string>
+    <string name="permissions_contacts">Contacts Demo</string>
+    <string name="permissions_location">Location Demo</string>
+    <string name="permissions_microphone">Microphone Demo</string>
+    <string name="permissions_notifications">Notifications Demo</string>
+    <string name="permissions_storage">Storage Demo</string>
+
+    <string name="permissions_unknown">The status of the permission is not known yet</string>
+    <string name="permission_allowed">The permission has been granted</string>
+    <string name="permission_requestable">The permission can be requested</string>
+    <string name="permission_denied">The permission has been denied</string>
+
+    <string name="permission_request">Request Permission</string>
+    <string name="permission_request_success">Permission requested successfully</string>
+    <string name="permission_request_failed">Permission request failed</string>
+
+    <string name="architecture_details">Show Details</string>
+    <string name="architecture_details_inverse">Inverse Input</string>
+    <string name="keyboard_manager">Keyboard</string>
+    <string name="show_keyboard">Show Keyboard</string>
+    <string name="hide_keyboard">Hide Keyboard</string>
+
+    <string name="location_background">Kaluga Background</string>
+    <string name="location_enable_background">Enable Background</string>
+    <string name="location_disable_background">Disable Background</string>
+
+    <string name="browser_button_text">Open browser</string>
+    <string name="links_instructions">Tapping \"Open browser\" will redirect you in a webpage.
+        There you can find a button that if tapped will bring you back to the app passing a query.
+        That query will be deserialized into a object and shown in an alert.
+    </string>
+
+    <string name="network_feature">Network</string>
+    <string name="bluetooth_start_scanning">Start Scanning</string>
+    <string name="bluetooth_stop_scanning">Stop Scanning</string>
+    <string name="bluetooth_no_name">Unnamed Bluetooth Device</string>
+
+    <string name="rssi">%d dBm</string>
+    <string name="txPower">%s dBm</string>
+    <string name="distance">%.2f m</string>
+
+    <string name="bluetooth_connect">Connect</string>
+    <string name="bluetooth_disconnect">Disconnect</string>
+
+    <string name="bluetooth_connected">Connected</string>
+    <string name="bluetooth_connecting">Connecting</string>
+    <string name="bluetooth_disconnected">Disconnected</string>
+    <string name="bluetooth_disconneting">Disconnecting</string>
+    <string name="bluetooth_reconnecting">Reconnecting</string>
+    <string name="bluetooth_discovering">Discovering</string>
+
+    <string name="bluetooth_service_uuids">Service UUIDs: %s</string>
+    <string name="bluetooth_service_data">Service Data: %s</string>
+    <string name="bluetooth_manufacturer_id">Manufacturer Id: %d</string>
+    <string name="bluetooth_manufacturer_data">Manufacturer Data: %s</string>
+
+    <string name="bluetooth_more">More</string>
+
+    <string name="bluetooth_services_header">Services</string>
+    <string name="bluetooth_service">Service</string>
+    <string name="bluetooth_characteristics">Characteristics</string>
+    <string name="bluetooth_descriptors">Descriptors</string>
+    <string name="bluetooth_permissions_read">Read</string>
+    <string name="bluetooth_permissions_write">Write</string>
+    <string name="bluetooth_permissions_read_encrypted">Read Encrypted</string>
+    <string name="bluetooth_permissions_write_encrypted">Write Encrypted</string>
+
+    <string name="bottom_sheet_show_sheet">Open Bottom Sheet</string>
+    <string name="bottom_sheet_show_sub_page">Open Sub Page</string>
+    <string name="bottom_sheet_sub_page_title">Sub Page</string>
+    <string name="bottom_sheet_sheet_content">This is a bottom sheet</string>
+    <string name="bottom_sheet_sheet_sub_page_title">Sheet Sub Page</string>
+
+</resources>
diff --git a/newexample/android/src/main/res/values/styles.xml b/newexample/android/src/main/res/values/styles.xml
index 6b4fa3d08..8b5a75d76 100644
--- a/newexample/android/src/main/res/values/styles.xml
+++ b/newexample/android/src/main/res/values/styles.xml
@@ -1,3 +1,30 @@
 <resources>
-    <style name="AppTheme" parent="android:Theme.Material.NoActionBar"/>
-</resources>
\ No newline at end of file
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.Bridge">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="ListTitle">
+        <item name="android:textColor">@color/text_primary</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="ListSubTitle">
+        <item name="android:textColor">@color/text_primary</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="ListContent">
+        <item name="android:textColor">@color/text_secondary</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="ListFoldOut">
+        <item name="android:background">@color/background_card</item>
+    </style>
+
+</resources>
diff --git a/newexample/keystore/debug.keystore b/newexample/keystore/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..38a87ac589bd046c4a57ae014ae5850c828d9679
GIT binary patch
literal 2419
zcmY+EXEYlM8^<HdD6S%A?R||T6+8B5RMl!xZH=ncVcaUB1PM{AD5}~jLamyK)vIWU
zRc&lFi&U-Jqr|A&_dV}>@3|kI^PKbh|DWgM4}oX(12TaScvg8R>+eJiagT$EnJE{~
zDhS52!hYe?2t35&UlGI}jEC6%!WVzddFZMCU9qz<0dw)-Lj)eYhfsjB{U85&E)3>%
z?B@O<ND<iAm6BA>VK|B0U@$6yAV8Zn7!U5Mv|M{l+g)_qs*(`Lkp21Ds(e>Wp4;ED
zWwXXg(|NW^-_i`F*n$*J%$;V2X7s7w4}>nH$6fh2G!$B-XnA_q-YV8~d3q5ZKwqCu
z6E`w=_<O=D&Ud(>#@yzO9YV_{9RWZY3|p04AA)N`mmDZP+w&0y<-wWp5rMs&AQ|b?
zfj#fi*l+bo5k`DHg-cK$Y>(Yoqqvj-j6R1Sa@@q3DAH$V^A9tar+Fulv$;QuwLI1_
z@@*<GsG+c2K(%ji;r`yG`xb<~M{X(OJG^nbkPQiJw8)cBTR}V@)5VJGZ;w6V@yC|7
zxGE~>sDFB4<h{h_&vDNg781E9BteGe=ks&OEsErcPO$-|E=78$sCmAe(`6IZ(5Tn`
z`pqaYKe$r`ohDjqQ?n-FNWdl!XkG04<3Z?@)h502=ER=9znHHxtWj%&`shRn%Q=#`
zVHTr`Ee!k3?rL=~e|zBO*lotQeKb}z9&eqk#f@V-Q}XIE@R_&I<CrZigV6IjlB7_E
z_auDZyet{EC)Z6Jlb3CgDc9zhlV85m+jF*Jk07aOA-ZoTpeT)zCMWHhHl5DGlGK5y
z@FJTFn<0`UODpnl$!#oSHYH2oxh3`P>vQ>tYLlA&kymU>V>I`HQPa)b0*-3;99_Tm
z9|pzu?c^1Mon4%DK|V+3BQ1#~Q>MOduu^dtEz97y*ZDUA7ABX@TJAJR1}TV0)4Q1d
zhyqJNcuk3ZU#@SgVaaO;+75^tMQ65l+X*c6QgwZxyzKb4&OBFP>3JC(EQH56O55Z^
zjKXFQk}u-kL=&*x#n3QjGKn$JMg_8oJ?6}@xfeml6%}%pYl<XSzL8<FHar?qx}V!W
z&<in)Ef+n6_z7onf7rHiMH=<DGS|c!1a+PD&`(Nv%qR6-(1j|1z8qHeVEUA!vEM>#
z5M0SoQ%Hu!-?nfd9_0$EAtUsst{S>Ndw5XijoD5J86V6KxpqXkR_vnMIxQ#4KEz2n
z#yWs{I$>`M_p0F%8S#!3jAqw&>=un6_oA8_Cl0;BzZ{9nG?1!R3P0GnxzT@F8KnRb
zhevsZOr@52UR-}9>ihJ?yxL4X2QGfN@eUP!?}-sJF>CTsC-o##rk*9?C2Neq`>sS|
zsde`bTo&$3HqbSYqwzI5|M~%dcoFv9A>7A`WymB4`evPk;`2w32k;jqNr*;M-ge~N
zyZM5g@~qvWo-R`+G<^GhSd-<cPHTNTTVk=Nk9_ikeDSw1kZt=1JvE=i?DU_F-en()
z9<?G?6qmfbV-(+@LAXK7SA!=cE#1(A5o3*qs&q0fY2GWf4Mmtzb<BUBCN<|@l{g4e
z11w8MhxSk2VJ^$QQVW4})=-ggUbfl0jHTn6rGk2=p0N>?xE0=zu%IfMmr2X|%8vb~
zUS09KE^;Ed>)?oY4thmWC^2eS8X<kwn<jZDS^vu+AlTGdcs?kmZ$?qO8`}HcI3IeY
z&^kv29lzs*%MfXxR+)w0yLx6f!Op0biGw4@K9779O)w-M&@t!quf@$mV(4vQwRG~+
zp>q*P6SY5Q_$go0=e}|b$kFuwJVgH}j_Tc;SFX6>Zm!`8i*~!wcMbxE*RmH~r<_eb
zjYK2(|5ha{FOp4^1#lbS0l)$f2#J3J7?KyveaYvphd5Flsg6QwYH6WVH8l`;P{H3N
zW@s)Rl<^Ct0+|56R{TE+)4%Kr{f}MU0@C{gJH*OxjuB?(v%7sJ^wzunYu89T$Xe9F
zd=#s`%Rx#lGFByAP#)~!Z#PMPI;yl;)<e6mB7D@u)wXR>fmTOr^)qtgGcI0XhXp+d
z-+D3Nw;#UQOCLzX6iy2}_3P2=4Gs@K3$5DcxI9aJk&RV|;T^lS?L{wf&0cD53$Y`i
z%SYzn@|%~L`m~l$UbCwwGn4h-pYcSm&8_acFNv2X7L%zUS9M5ny{VZ};f+JA<X5k7
z2f@HCH@68@#)QsMHOYK0#8It0bv>~m%>Oqy{R9QeJGvyTOhU-kokT+#>*7p|w4uA-
zKr-9Vf_Sbm45V2wJ2ZaoNK;GOiH#D<lo?k1bh^dqD#KIV_Dv2p%xY4p&l?^9(Y|z6
zaY(oSvCe{&>0tI=@8im`Mf!sKGx&K!@0rU1bsraEhrVUjJ9c_>Yw9-^)&wCXbd#If
z)jTIPTwA}1bS~f2;Y;WM+n-J;Ir*ckB;(*#z76B0rW@~hmIu1AqgUK&B`Iwe3i{Kk
zEUrBsrz)R`9Or7u4(?hN?JiU_c`i2Q&EBwhK@AhFk##PbGj8#g^{Tsaq_PKc!wy)v
z(E2RIeS9{RHpm>`Jo*z4*-*b*ZJGTAMHtomqT72N9-5cKTD}ONG}=^PP9Y13G?v!Y
z42{@zR!Rdl0@v<}3vqT#wGsN%wnd=?%NjDiR+~KU_H&nsSSM&GsTOR-a(o}!ko+>>
z_4O&G?(VxU)TE#s;;ds}{rptNGO1)>&CJX-c`0MXz|A%{UYqDrASpX6;+ectOKcb}
z@IdeiMERZSW)CJ&#+w<<%?d9Cf<;$mSc-XLqPbT(h9mnrGV&BUWC4pu>NaE?^MEHi
zNhj%euHpu5>(mJ1?(YZ`(;F2lLoTB*RlS#a<_|Lu@(H_^DSghv(g`+Y&0<D@5#Id4
z2(bxNIQerOV{Y*Ev026Uf{;~@0j0bQJu9PwpidECo{M!=W5yGs9kS4w-9y)2<Zgp9
zm?xZ8_=G#ix@F@mdOuTffF5bO(VLnfrQ*;yg)a=Y^OgLV@B~)4gqm>YW6Q|-2v^Cn
z3stlb`}{t5aB>zpyH+uZ;TZNUHP>tE<paJ1-f`J0Fb!CT%;hy9hd<>w{V828#BS$D
zennMYHMiLiI7X5XdI$*wD-@#02?7d10AOBy6kO2loCu7bDcmcT9y`NRxey8F<zkuB
aw+G(&S)6j5{`RupuIS1%1_)vz=KcljmUG$w

literal 0
HcmV?d00001

diff --git a/newexample/shared/src/commonMain/kotlin/model/contacts/ContactDetails.kt b/newexample/shared/src/commonMain/kotlin/model/contacts/ContactDetails.kt
new file mode 100644
index 000000000..80767a6c4
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/model/contacts/ContactDetails.kt
@@ -0,0 +1,23 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.contacts
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ContactDetails(val name: String, val email: String)
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/alert/AlertViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/alert/AlertViewModel.kt
index 7f2d87d47..5fe15bade 100644
--- a/newexample/shared/src/commonMain/kotlin/viewmodel/alert/AlertViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/alert/AlertViewModel.kt
@@ -16,7 +16,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
-package com.splendo.kaluga.example.shared.alert
+package com.splendo.kaluga.example.shared.viewmodel.alert
 
 import com.splendo.kaluga.alerts.Alert
 import com.splendo.kaluga.alerts.BaseAlertPresenter
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
new file mode 100644
index 000000000..744b64c5e
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
@@ -0,0 +1,36 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.bottomsheet
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+
+sealed class BottomSheetParentSubPageNavigation : NavigationAction<Nothing>(null) {
+    object Back : BottomSheetParentSubPageNavigation()
+}
+
+class BottomSheetParentSubPageViewModel(navigator: Navigator<BottomSheetParentSubPageNavigation>) : NavigatingViewModel<BottomSheetParentSubPageNavigation>(navigator) {
+
+    val text = "bottom_sheet_sub_page_title".localized()
+
+    fun onBackPressed() {
+        navigator.navigate(BottomSheetParentSubPageNavigation.Back)
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
new file mode 100644
index 000000000..2a7e00d61
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
@@ -0,0 +1,42 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.bottomsheet
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+
+sealed class BottomSheetParentNavigation : NavigationAction<Nothing>(null) {
+    object ShowSheet : BottomSheetParentNavigation()
+    object SubPage : BottomSheetParentNavigation()
+}
+
+class BottomSheetParentViewModel(navigator: Navigator<BottomSheetParentNavigation>) : NavigatingViewModel<BottomSheetParentNavigation>(navigator) {
+
+    val sheetText = "bottom_sheet_show_sheet".localized()
+    val subPageText = "bottom_sheet_show_sub_page".localized()
+
+    fun onShowSheetPressed() {
+        navigator.navigate(BottomSheetParentNavigation.ShowSheet)
+    }
+
+    fun onSubPagePressed() {
+        navigator.navigate(BottomSheetParentNavigation.SubPage)
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
new file mode 100644
index 000000000..43b564cbb
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
@@ -0,0 +1,41 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.bottomsheet
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+
+sealed class BottomSheetSubPageNavigation : NavigationAction<Nothing>(null) {
+    object Back : BottomSheetSubPageNavigation()
+    object Close : BottomSheetSubPageNavigation()
+}
+
+class BottomSheetSubPageViewModel(navigator: Navigator<BottomSheetSubPageNavigation>) : NavigatingViewModel<BottomSheetSubPageNavigation>(navigator) {
+
+    val text = "bottom_sheet_sheet_sub_page_title".localized()
+
+    fun onBackPressed() {
+        navigator.navigate(BottomSheetSubPageNavigation.Back)
+    }
+
+    fun onClosePressed() {
+        navigator.navigate(BottomSheetSubPageNavigation.Close)
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetViewModel.kt
new file mode 100644
index 000000000..c6f5a0694
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetViewModel.kt
@@ -0,0 +1,42 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.bottomsheet
+
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+
+sealed class BottomSheetNavigation : NavigationAction<Nothing>(null) {
+    object Close : BottomSheetNavigation()
+    object SubPage : BottomSheetNavigation()
+}
+
+class BottomSheetViewModel(navigator: Navigator<BottomSheetNavigation>) : NavigatingViewModel<BottomSheetNavigation>(navigator) {
+
+    val text = "bottom_sheet_sheet_content".localized()
+    val buttonText = "bottom_sheet_show_sub_page".localized()
+
+    fun onSubPagePressed() {
+        navigator.navigate(BottomSheetNavigation.SubPage)
+    }
+
+    fun onClosePressed() {
+        navigator.navigate(BottomSheetNavigation.Close)
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactDetailsViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactDetailsViewModel.kt
new file mode 100644
index 000000000..6a712ec93
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactDetailsViewModel.kt
@@ -0,0 +1,48 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.contacts
+
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
+
+sealed class ContactDetailsNavigation<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
+    class SendEmail(email: String) : ContactDetailsNavigation<String>(
+        email,
+        NavigationBundleSpecType.StringType
+    )
+    object Close : ContactDetailsNavigation<Unit>(Unit, NavigationBundleSpecType.UnitType)
+}
+
+class ContactDetailsViewModel(
+    val contactDetails: ContactDetails,
+    navigator: Navigator<ContactDetailsNavigation<*>>
+) : NavigatingViewModel<ContactDetailsNavigation<*>>(navigator) {
+
+    val sendEmailButtonText = "Send email"
+
+    fun sendEmail() {
+        navigator.navigate(ContactDetailsNavigation.SendEmail(contactDetails.email))
+    }
+
+    fun back() {
+        navigator.navigate(ContactDetailsNavigation.Close)
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactsListViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactsListViewModel.kt
new file mode 100644
index 000000000..cb0ebb93c
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactsListViewModel.kt
@@ -0,0 +1,60 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.contacts
+
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.FlowInitializedObservable
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+
+sealed class ContactsListNavigation<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
+    data class ShowContactDetails(val contactDetails: ContactDetails) : ContactsListNavigation<ContactDetails>(
+        contactDetails,
+        NavigationBundleSpecType.SerializedType(ContactDetails.serializer())
+    )
+}
+
+class ContactsListViewModel(
+    navigator: Navigator<ContactsListNavigation<*>>
+) : NavigatingViewModel<ContactsListNavigation<*>>(navigator) {
+    val contacts: FlowInitializedObservable<List<ContactDetails>> =
+        MutableStateFlow(emptyList<ContactDetails>())
+            .also {
+                coroutineScope.launch {
+                    it.value = loadContacts()
+                }
+            }.toInitializedObservable(coroutineScope)
+
+    private suspend fun loadContacts(): List<ContactDetails> {
+        // a real call shall happen here
+        return listOf("Alice", "Bob", "Charlie", "David").map { name ->
+            ContactDetails(name = name, email = "${name.lowercase()}@example.com")
+        }
+    }
+
+    fun onContactClick(contactDetails: ContactDetails) {
+        navigator.navigate(
+            ContactsListNavigation.ShowContactDetails(contactDetails)
+        )
+    }
+}
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/hud/HudViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/hud/HudViewModel.kt
index 050efb091..6f7d4d03f 100644
--- a/newexample/shared/src/commonMain/kotlin/viewmodel/hud/HudViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/hud/HudViewModel.kt
@@ -16,7 +16,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
-package com.splendo.kaluga.example.shared.hud
+package com.splendo.kaluga.example.shared.viewmodel.hud
 
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.hud.BaseHUD
diff --git a/permissions/src/commonMain/kotlin/registerAllPermissions.kt b/permissions/src/commonMain/kotlin/registerAllPermissions.kt
index e3990bab0..97e8b5263 100644
--- a/permissions/src/commonMain/kotlin/registerAllPermissions.kt
+++ b/permissions/src/commonMain/kotlin/registerAllPermissions.kt
@@ -20,13 +20,21 @@ import com.splendo.kaluga.permissions.base.BasePermissionManager
 import com.splendo.kaluga.permissions.base.PermissionStateRepo
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermission
+import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNotRegistered
 import com.splendo.kaluga.permissions.calendar.registerCalendarPermission
+import com.splendo.kaluga.permissions.calendar.registerCalendarPermissionIfNotRegistered
 import com.splendo.kaluga.permissions.camera.registerCameraPermission
+import com.splendo.kaluga.permissions.camera.registerCameraPermissionIfNotRegistered
 import com.splendo.kaluga.permissions.contacts.registerContactsPermission
+import com.splendo.kaluga.permissions.contacts.registerContactsPermissionIfNotRegistered
 import com.splendo.kaluga.permissions.location.registerLocationPermission
+import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
 import com.splendo.kaluga.permissions.microphone.registerMicrophonePermission
+import com.splendo.kaluga.permissions.microphone.registerMicrophonePermissionIfNotRegistered
 import com.splendo.kaluga.permissions.notifications.registerNotificationsPermission
+import com.splendo.kaluga.permissions.notifications.registerNotificationsPermissionIfNotRegistered
 import com.splendo.kaluga.permissions.storage.registerStoragePermission
+import com.splendo.kaluga.permissions.storage.registerStoragePermissionIfNotRegistered
 import kotlin.time.Duration
 
 fun PermissionsBuilder.registerAllPermissions(
@@ -43,3 +51,18 @@ fun PermissionsBuilder.registerAllPermissions(
     registerMicrophonePermission(monitoringInterval = monitoringInterval, settings = settings)
     registerStoragePermission(monitoringInterval = monitoringInterval, settings = settings)
 }
+
+suspend fun PermissionsBuilder.registerAllPermissionsNotRegistered(
+    monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
+    settings: BasePermissionManager.Settings = BasePermissionManager.Settings()
+) {
+    registerBluetoothPermissionIfNotRegistered(monitoringInterval = monitoringInterval, settings = settings)
+    registerCalendarPermissionIfNotRegistered(monitoringInterval = monitoringInterval, settings = settings)
+    registerCameraPermissionIfNotRegistered(monitoringInterval = monitoringInterval, settings = settings)
+    registerContactsPermissionIfNotRegistered(monitoringInterval = monitoringInterval, settings = settings)
+    registerLocationPermissionIfNotRegistered(monitoringInterval = monitoringInterval, settings = settings)
+    registerMicrophonePermissionIfNotRegistered(monitoringInterval = monitoringInterval, settings = settings)
+    registerNotificationsPermissionIfNotRegistered(monitoringInterval = monitoringInterval, settings = settings)
+    registerMicrophonePermissionIfNotRegistered(monitoringInterval = monitoringInterval, settings = settings)
+    registerStoragePermissionIfNotRegistered(monitoringInterval = monitoringInterval, settings = settings)
+}

From 5cb1d1fefa9d195be5cd11d653f12794c33964b8 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 8 Nov 2022 11:09:04 +0100
Subject: [PATCH 023/227] Fixing dependencies

---
 .../com/splendo/kaluga/example/di/Modules.kt     | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
index 4e652e223..92751fba5 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
@@ -88,21 +88,17 @@ import kotlin.time.Duration.Companion.minutes
 val utilitiesModule = module {
     single {
         Permissions(
-            PermissionsBuilder().apply {
-                MainScope().launch {
-                    registerAllPermissions(
-                        settings = BasePermissionManager.Settings(
-                            logger = RestrictedLogger(RestrictedLogLevel.Verbose)
-                        )
-                    )
-                }
-            },
+            PermissionsBuilder(),
             coroutineContext = singleThreadDispatcher("Permissions")
         )
     }
     single { LocationStateRepoBuilder() }
     single {
-        BluetoothBuilder().create({ BaseScanner.Settings(get()) })
+        BluetoothBuilder().create({ _ ->
+            val permissions: Permissions = get()
+            permissions.registerAllPermissionsNotRegistered()
+            BaseScanner.Settings(permissions)
+        })
     }
     single { Beacons(get<Bluetooth>(), timeout = 1.minutes) }
 }

From 4d248f004c74eb658db27e29e3e1d63054f0cb3e Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 8 Nov 2022 13:10:43 +0100
Subject: [PATCH 024/227] Fixing dependency injections

---
 .../com/splendo/kaluga/example/di/Modules.kt  | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
index 92751fba5..cf8c0e8a7 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
@@ -74,7 +74,9 @@ import com.splendo.kaluga.permissions.base.BasePermissionManager
 import com.splendo.kaluga.permissions.base.Permission
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
+import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNotRegistered
 import com.splendo.kaluga.permissions.location.LocationPermission
+import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
 import com.splendo.kaluga.permissions.registerAllPermissions
 import com.splendo.kaluga.resources.StyledStringBuilder
 import com.splendo.kaluga.review.ReviewManager
@@ -86,19 +88,23 @@ import org.koin.dsl.module
 import kotlin.time.Duration.Companion.minutes
 
 val utilitiesModule = module {
+    single { PermissionsBuilder() }
+    single { LocationStateRepoBuilder(
+        permissionsBuilder = {
+            val builder = get<PermissionsBuilder>()
+            builder.registerLocationPermissionIfNotRegistered()
+            Permissions(builder, it)
+        }
+    ) }
     single {
-        Permissions(
-            PermissionsBuilder(),
-            coroutineContext = singleThreadDispatcher("Permissions")
-        )
-    }
-    single { LocationStateRepoBuilder() }
-    single {
-        BluetoothBuilder().create({ _ ->
-            val permissions: Permissions = get()
-            permissions.registerAllPermissionsNotRegistered()
-            BaseScanner.Settings(permissions)
-        })
+        BluetoothBuilder(
+            permissionsBuilder = {
+                val builder = get<PermissionsBuilder>()
+                builder.registerBluetoothPermissionIfNotRegistered()
+                builder.registerLocationPermissionIfNotRegistered()
+                Permissions(builder, it)
+            }
+        ).create()
     }
     single { Beacons(get<Bluetooth>(), timeout = 1.minutes) }
 }

From 3f69b4a29e7774983dbd38c4c665b2b87c54bb5e Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 8 Nov 2022 14:54:54 +0100
Subject: [PATCH 025/227] Fix DI issues

---
 .../com/splendo/kaluga/example/di/Modules.kt   | 18 ++++++++++++++----
 .../permissions/PermissionViewModel.kt         |  4 +++-
 .../permissions/PermissionsListViewModel.kt    | 18 ++++++++++++++++--
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
index cf8c0e8a7..a2825a380 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
@@ -28,6 +28,7 @@ import com.splendo.kaluga.base.singleThreadDispatcher
 import com.splendo.kaluga.bluetooth.Bluetooth
 import com.splendo.kaluga.bluetooth.BluetoothBuilder
 import com.splendo.kaluga.bluetooth.beacons.Beacons
+import com.splendo.kaluga.bluetooth.device.ConnectionSettings
 import com.splendo.kaluga.bluetooth.scanner.BaseScanner
 import com.splendo.kaluga.datetimepicker.DateTimePickerPresenter
 import com.splendo.kaluga.example.architecture.ArchitectureDetailsActivity
@@ -68,6 +69,7 @@ import com.splendo.kaluga.keyboard.FocusHandler
 import com.splendo.kaluga.keyboard.KeyboardManager
 import com.splendo.kaluga.links.LinksBuilder
 import com.splendo.kaluga.location.LocationStateRepoBuilder
+import com.splendo.kaluga.logging.Logger
 import com.splendo.kaluga.logging.RestrictedLogLevel
 import com.splendo.kaluga.logging.RestrictedLogger
 import com.splendo.kaluga.permissions.base.BasePermissionManager
@@ -88,11 +90,14 @@ import org.koin.dsl.module
 import kotlin.time.Duration.Companion.minutes
 
 val utilitiesModule = module {
+    single<Logger> { RestrictedLogger(RestrictedLogLevel.None) }
     single { PermissionsBuilder() }
     single { LocationStateRepoBuilder(
         permissionsBuilder = {
             val builder = get<PermissionsBuilder>()
-            builder.registerLocationPermissionIfNotRegistered()
+            builder.registerLocationPermissionIfNotRegistered(
+                settings = BasePermissionManager.Settings(logger = get())
+            )
             Permissions(builder, it)
         }
     ) }
@@ -100,11 +105,15 @@ val utilitiesModule = module {
         BluetoothBuilder(
             permissionsBuilder = {
                 val builder = get<PermissionsBuilder>()
-                builder.registerBluetoothPermissionIfNotRegistered()
-                builder.registerLocationPermissionIfNotRegistered()
+                val settings = BasePermissionManager.Settings(logger = get())
+                builder.registerBluetoothPermissionIfNotRegistered(settings = settings)
+                builder.registerLocationPermissionIfNotRegistered(settings = settings)
                 Permissions(builder, it)
             }
-        ).create()
+        ).create(
+            scannerSettingsBuilder = { BaseScanner.Settings(it, logger = get()) },
+            connectionSettings = ConnectionSettings(logger = get())
+        )
     }
     single { Beacons(get<Bluetooth>(), timeout = 1.minutes) }
 }
@@ -131,6 +140,7 @@ val viewModelModule = module {
 
     viewModel { (navigator: Navigator<PermissionsListNavigationAction>) ->
         PermissionsListViewModel(
+            get(),
             navigator
         )
     }
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
index 4f799c3d7..51d2289ec 100644
--- a/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
@@ -25,13 +25,15 @@ import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.permissions.base.Permission
 import com.splendo.kaluga.permissions.base.PermissionState
 import com.splendo.kaluga.permissions.base.Permissions
+import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.resources.localized
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
-class PermissionViewModel(private val permissions: Permissions, private val permission: Permission) : BaseLifecycleViewModel() {
+class PermissionViewModel(permissionsBuilder: PermissionsBuilder, private val permission: Permission) : BaseLifecycleViewModel() {
 
+    private val permissions = Permissions(permissionsBuilder)
     val permissionStateMessage: UninitializedObservable<String> = permissions[permission]
         .map { permissionState ->
             when (permissionState) {
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt b/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
index baf3c65b7..fe6b78e04 100644
--- a/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
@@ -25,7 +25,14 @@ import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.navigation.toBundle
 import com.splendo.kaluga.architecture.observable.observableOf
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.logging.RestrictedLogLevel
+import com.splendo.kaluga.logging.RestrictedLogger
+import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.Permissions
+import com.splendo.kaluga.permissions.base.PermissionsBuilder
+import com.splendo.kaluga.permissions.registerAllPermissionsNotRegistered
 import com.splendo.kaluga.resources.localized
+import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -45,7 +52,7 @@ class PermissionNavigationBundleSpec : NavigationBundleSpec<PermissionNavigation
 
 class PermissionsListNavigationAction(permissionView: PermissionView) : NavigationAction<PermissionNavigationBundleSpecRow>(PermissionNavigationBundleSpec().toBundle { spec -> spec.convertValue(permissionView) })
 
-class PermissionsListViewModel(navigator: Navigator<PermissionsListNavigationAction>) : NavigatingViewModel<PermissionsListNavigationAction>(navigator) {
+class PermissionsListViewModel(private val permissionsBuilder: PermissionsBuilder, navigator: Navigator<PermissionsListNavigationAction>) : NavigatingViewModel<PermissionsListNavigationAction>(navigator) {
 
     val permissions = observableOf(
         listOf(
@@ -61,6 +68,13 @@ class PermissionsListViewModel(navigator: Navigator<PermissionsListNavigationAct
     )
 
     fun onPermissionPressed(permissionView: PermissionView) {
-        navigator.navigate(PermissionsListNavigationAction(permissionView))
+        coroutineScope.launch {
+            permissionsBuilder.registerAllPermissionsNotRegistered(
+                settings = BasePermissionManager.Settings(
+                    logger = RestrictedLogger(RestrictedLogLevel.None)
+                )
+            )
+            navigator.navigate(PermissionsListNavigationAction(permissionView))
+        }
     }
 }

From e722c5d21580fd6a70a750961ac07b310c5a1643 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 8 Nov 2022 15:27:45 +0100
Subject: [PATCH 026/227] Cleaner gradle structure

---
 newexample/build.gradle.kts    | 32 -----------------
 newexample/settings.gradle.kts | 64 +++++++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/newexample/build.gradle.kts b/newexample/build.gradle.kts
index b97599c5d..dbc298fb4 100644
--- a/newexample/build.gradle.kts
+++ b/newexample/build.gradle.kts
@@ -6,35 +6,3 @@ plugins {
     kotlin("multiplatform").apply(false)
     id("kaluga-library-components")
 }
-
-allprojects {
-    repositories {
-        val exampleMavenRepo = if (System.getenv().containsKey("EXAMPLE_MAVEN_REPO")) {
-            System.getenv()["EXAMPLE_MAVEN_REPO"].also {
-                logger.lifecycle("System env EXAMPLE_MAVEN_REPO set to ${System.getenv()["EXAMPLE_MAVEN_REPO"]}, using $it")
-            }!!
-        } else {
-            // load some more from local.properties or set defaults.
-            val props = Properties()
-            props.load(FileInputStream(File("$rootDir/local.properties")))
-            val exampleMavenRepoLocalProperties: String? =
-                props["kaluga.exampleMavenRepo"] as? String
-            exampleMavenRepoLocalProperties?.also {
-                logger.lifecycle("local.properties read (kaluga.exampleMavenRepo=$exampleMavenRepoLocalProperties, using $it)")
-            }
-                ?: "local".also {
-                    logger.lifecycle("local.properties not found, using default value ($it)")
-                }
-        }
-        logger.lifecycle("Using repo: $exampleMavenRepo for resolving dependencies")
-
-        when(exampleMavenRepo) {
-            null, "", "local" -> mavenLocal()
-            "none" -> {/* noop */}
-            else ->
-                maven(exampleMavenRepo)
-        }
-        mavenCentral()
-        google()
-    }
-}
diff --git a/newexample/settings.gradle.kts b/newexample/settings.gradle.kts
index bd1e8a28b..85adad83e 100644
--- a/newexample/settings.gradle.kts
+++ b/newexample/settings.gradle.kts
@@ -36,10 +36,54 @@ pluginManagement {
     }
 }
 
+val props = Properties()
+props.load(FileInputStream(File("$rootDir/local.properties")))
+
+val exampleEmbeddingMethod = if (System.getenv().containsKey("EXAMPLE_EMBEDDING_METHOD")) {
+    System.getenv()["EXAMPLE_EMBEDDING_METHOD"].also {
+        logger.lifecycle("System env EXAMPLE_EMBEDDING_METHOD set to ${System.getenv()["EXAMPLE_EMBEDDING_METHOD"]}, using $it")
+    }!!
+} else {
+    val exampleEmbeddingMethodLocalProperties = props["kaluga.exampleEmbeddingMethod"] as? String
+    (exampleEmbeddingMethodLocalProperties ?: "composite").also {
+        logger.lifecycle("local.properties read (kaluga.exampleEmbeddingMethod=$exampleEmbeddingMethodLocalProperties, using $it)")
+    }
+}
+
+val isCompositeBuild = when (exampleEmbeddingMethod) {
+    "composite" -> true
+    else -> false
+}
+
 dependencyResolutionManagement {
     repositories {
-        google()
+        if (!isCompositeBuild) {
+            val exampleMavenRepo = if (System.getenv().containsKey("EXAMPLE_MAVEN_REPO")) {
+                System.getenv()["EXAMPLE_MAVEN_REPO"].also {
+                    logger.lifecycle("System env EXAMPLE_MAVEN_REPO set to ${System.getenv()["EXAMPLE_MAVEN_REPO"]}, using $it")
+                }!!
+            } else {
+                val exampleMavenRepoLocalProperties: String? =
+                    props["kaluga.exampleMavenRepo"] as? String
+                exampleMavenRepoLocalProperties?.also {
+                    logger.lifecycle("local.properties read (kaluga.exampleMavenRepo=$exampleMavenRepoLocalProperties, using $it)")
+                }
+                    ?: "local".also {
+                        logger.lifecycle("local.properties not found, using default value ($it)")
+                    }
+            }
+            logger.lifecycle("Using repo: $exampleMavenRepo for resolving dependencies")
+
+            when (exampleMavenRepo) {
+                null, "", "local" -> mavenLocal()
+                "none" -> {/* noop */
+                }
+                else ->
+                    maven(exampleMavenRepo)
+            }
+        }
         mavenCentral()
+        google()
     }
 }
 
@@ -50,20 +94,6 @@ rootProject.name = "Kaluga Example"
 include(":android")
 include(":shared")
 
-val exampleEmbeddingMethod = if (System.getenv().containsKey("EXAMPLE_EMBEDDING_METHOD")) {
-    System.getenv()["EXAMPLE_EMBEDDING_METHOD"].also {
-        logger.lifecycle("System env EXAMPLE_EMBEDDING_METHOD set to ${System.getenv()["EXAMPLE_EMBEDDING_METHOD"]}, using $it")
-    }!!
-} else {
-    val props = Properties()
-    props.load(FileInputStream(File("$rootDir/local.properties")))
-    val exampleEmbeddingMethodLocalProperties = props["kaluga.exampleEmbeddingMethod"] as? String
-    (exampleEmbeddingMethodLocalProperties ?: "composite").also {
-        logger.lifecycle("local.properties read (kaluga.exampleEmbeddingMethod=$exampleEmbeddingMethodLocalProperties, using $it)")
-    }
-}
-
-when (exampleEmbeddingMethod) {
-    "composite" -> includeBuild("../")
-    else -> {}
+if (isCompositeBuild) {
+    includeBuild("../")
 }

From 73566bbb7b21264288126f92be2871cf38221188 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 8 Nov 2022 16:57:17 +0100
Subject: [PATCH 027/227] iOS & DependencyInjection

---
 .../src/main/kotlin/Component.kt              |   12 +-
 newexample/android/build.gradle.kts           |    2 -
 .../kaluga/example/ExampleApplication.kt      |   10 +-
 .../ArchitectureDetailsActivity.kt            |   10 +-
 newexample/ios/Demo.xcodeproj/project.pbxproj |  939 +++++++++
 .../contents.xcworkspacedata                  |    7 +
 .../xcshareddata/IDEWorkspaceChecks.plist     |    8 +
 .../xcshareddata/IDETemplateMacros.plist      |   22 +
 .../xcshareddata/xcschemes/Demo.xcscheme      |  100 +
 .../xcshareddata/xcschemes/DemoTests.xcscheme |   52 +
 .../xcschemes/DemoUITests.xcscheme            |   52 +
 .../Demo/Alerts/AlertsViewController.swift    |   47 +
 newexample/ios/Demo/AppDelegate.swift         |   80 +
 .../ArchitectureDetailsViewController.swift   |   79 +
 .../ArchitectureInputViewController.swift     |  106 +
 .../AppIcon.appiconset/AppIcon20@2x~iPad.png  |  Bin 0 -> 1340 bytes
 .../AppIcon20@2x~iPhone.png                   |  Bin 0 -> 1340 bytes
 .../AppIcon20@3x~iPhone.png                   |  Bin 0 -> 2053 bytes
 .../AppIcon.appiconset/AppIcon20~iPad.png     |  Bin 0 -> 667 bytes
 .../AppIcon.appiconset/AppIcon29@1x~iPad.png  |  Bin 0 -> 927 bytes
 .../AppIcon.appiconset/AppIcon29@2x~iPad.png  |  Bin 0 -> 2021 bytes
 .../AppIcon29@2x~iPhone.png                   |  Bin 0 -> 2021 bytes
 .../AppIcon29@3x~iPhone.png                   |  Bin 0 -> 3078 bytes
 .../AppIcon.appiconset/AppIcon40@2x~iPad.png  |  Bin 0 -> 2895 bytes
 .../AppIcon40@2x~iPhone.png                   |  Bin 0 -> 2895 bytes
 .../AppIcon40@3x~iPhone.png                   |  Bin 0 -> 3972 bytes
 .../AppIcon.appiconset/AppIcon40~iPad.png     |  Bin 0 -> 1340 bytes
 .../AppIcon60@2x~iPhone.png                   |  Bin 0 -> 3972 bytes
 .../AppIcon60@3x~iPhone.png                   |  Bin 0 -> 5454 bytes
 .../AppIcon.appiconset/AppIcon76@2x~iPad.png  |  Bin 0 -> 4925 bytes
 .../AppIcon.appiconset/AppIcon76~iPad.png     |  Bin 0 -> 2700 bytes
 .../AppIcon.appiconset/AppIcon83@2x~iPad.png  |  Bin 0 -> 5338 bytes
 .../AppIcon~iOS-marketing.png                 |  Bin 0 -> 58518 bytes
 .../AppIcon.appiconset/Contents.json          |  116 ++
 .../ios/Demo/Assets.xcassets/Contents.json    |    6 +
 .../close_icon.imageset/Contents.json         |   15 +
 .../close_icon.imageset/close-24px.pdf        |  Bin 0 -> 4345 bytes
 .../darker_color.colorset/Contents.json       |   38 +
 .../error_icon.imageset/Contents.json         |   15 +
 .../error_icon.imageset/error-black-18dp.pdf  |  Bin 0 -> 1020 bytes
 .../li_colorAccent.colorset/Contents.json     |   20 +
 .../li_colorBackground.colorset/Contents.json |   20 +
 .../Demo/Base.lproj/LaunchScreen.storyboard   |   27 +
 .../ios/Demo/Base.lproj/Localizable.strings   |  102 +
 .../ios/Demo/Base.lproj/Main.storyboard       | 1727 +++++++++++++++++
 .../ios/Demo/Beacons/BeaconsViewCell.swift    |   52 +
 .../Demo/Beacons/BeaconsViewController.swift  |  115 ++
 .../Bluetooth/BluetoothCharacteristicCell.xib |   85 +
 .../Bluetooth/BluetoothDescriptorCell.xib     |   53 +
 ...BluetoothDeviceDetailsViewController.swift |  364 ++++
 .../Bluetooth/BluetoothViewController.swift   |  230 +++
 .../DateTimePickerViewController.swift        |   58 +
 newexample/ios/Demo/Demo.entitlements         |   10 +
 .../ios/Demo/ExampleViewController.swift      |   57 +
 .../FeaturesListViewController.swift          |   75 +
 .../ios/Demo/Helpers/UIControl+Closure.swift  |   38 +
 newexample/ios/Demo/Info.plist                |   82 +
 .../ios/Demo/Info/InfoViewController.swift    |   79 +
 .../KeyboardManagerViewController.swift       |   50 +
 .../ios/Demo/Links/LinksViewController.swift  |   59 +
 .../ActivityViewController.swift              |   20 +
 .../ActivityViewController.xib                |   65 +
 .../LoadingViewController.swift               |   44 +
 .../Location/LocationViewController.swift     |   52 +
 .../PermissionListViewController.swift        |   77 +
 .../PermissionViewController.swift            |   87 +
 .../Demo/Resources/ButtonViewController.swift |   68 +
 .../Demo/Resources/ColorViewController.swift  |  202 ++
 .../Demo/Resources/LabelViewController.swift  |   69 +
 .../ResourcesListViewController.swift         |   74 +
 .../Network/NetworkViewController.swift       |   48 +
 .../Demo/System/SystemViewController.swift    |   83 +
 ...omaticHeightCollectionViewFlowLayout.swift |   51 +
 newexample/ios/DemoTests/DemoTests.swift      |   46 +
 newexample/ios/DemoTests/Info.plist           |   22 +
 newexample/ios/DemoUITests/DemoUITests.swift  |   44 +
 newexample/ios/DemoUITests/Info.plist         |   22 +
 newexample/ios/ios.xcodeproj/project.pbxproj  |  383 ----
 .../AccentColor.colorset/Contents.json        |   11 -
 .../AppIcon.appiconset/Contents.json          |   98 -
 .../ios/ios/Assets.xcassets/Contents.json     |    6 -
 newexample/ios/ios/ContentView.swift          |   16 -
 newexample/ios/ios/Info.plist                 |   48 -
 .../Preview Assets.xcassets/Contents.json     |    6 -
 newexample/ios/ios/iOSApp.swift               |   10 -
 newexample/shared/build.gradle.kts            |   58 +-
 .../example/shared/di/DependencyInjection.kt} |  130 +-
 .../example/shared/di/DependencyInjection.kt  |   84 +
 .../shared}/model/contacts/ContactDetails.kt  |    0
 .../example/shared}/stylable/ButtonStyles.kt  |   17 +
 .../example/shared}/stylable/TextStyles.kt    |   17 +
 .../shared}/viewmodel/ExampleViewModel.kt     |    0
 .../shared}/viewmodel/alert/AlertViewModel.kt |    0
 .../ArchitectureDetailsViewModel.kt           |    0
 .../ArchitectureInputViewModel.kt             |    0
 .../beacons/BeaconsListBeaconViewModel.kt     |    0
 .../viewmodel/beacons/BeaconsListViewModel.kt |    6 +-
 .../BluetoothCharacteristicViewModel.kt       |    0
 .../bluetooth/BluetoothDescriptorViewModel.kt |    0
 .../BluetoothDeviceDetailViewModel.kt         |    5 +-
 .../bluetooth/BluetoothListDeviceViewModel.kt |    0
 .../bluetooth/BluetoothListViewModel.kt       |    5 +-
 .../bluetooth/BluetoothServiceViewModel.kt    |    0
 .../BottomSheetParentSubPageViewModel.kt      |    0
 .../bottomsheet/BottomSheetParentViewModel.kt |    0
 .../BottomSheetSubPageViewModel.kt            |    0
 .../bottomsheet/BottomSheetViewModel.kt       |    0
 .../contacts/ContactDetailsViewModel.kt       |    0
 .../contacts/ContactsListViewModel.kt         |    0
 .../datetimepicker/DateTimePickerViewModel.kt |    0
 .../featureList/FeatureListViewModel.kt       |    0
 .../viewmodel/featureList/PlatformSpecific.kt |    0
 .../shared}/viewmodel/hud/HudViewModel.kt     |    0
 .../shared}/viewmodel/info/InfoViewModel.kt   |    0
 .../viewmodel/keyboard/KeyboardViewModel.kt   |    0
 .../shared}/viewmodel/link/LinksViewModel.kt  |    0
 .../viewmodel/location/LocationViewModel.kt   |    0
 .../permissions/PermissionViewModel.kt        |    0
 .../permissions/PermissionsListViewModel.kt   |    5 +-
 .../viewmodel/resources/ButtonViewModel.kt    |    0
 .../viewmodel/resources/ColorViewModel.kt     |    0
 .../viewmodel/resources/LabelViewModel.kt     |    0
 .../resources/ResourcesListViewModel.kt       |    0
 .../viewmodel/system/SystemViewModel.kt       |    0
 .../system/network/NetworkViewModel.kt        |    0
 .../example/shared/di/DependencyInjection.kt  |   36 +
 .../example/shared/di/DependencyInjection.kt  |   22 +
 .../example/shared/di/DependencyInjection.kt  |   22 +
 128 files changed, 6374 insertions(+), 704 deletions(-)
 create mode 100644 newexample/ios/Demo.xcodeproj/project.pbxproj
 create mode 100644 newexample/ios/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 newexample/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 newexample/ios/Demo.xcodeproj/xcshareddata/IDETemplateMacros.plist
 create mode 100644 newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
 create mode 100644 newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme
 create mode 100644 newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme
 create mode 100644 newexample/ios/Demo/Alerts/AlertsViewController.swift
 create mode 100644 newexample/ios/Demo/AppDelegate.swift
 create mode 100644 newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
 create mode 100644 newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPad.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPhone.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@3x~iPhone.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20~iPad.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@1x~iPad.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPad.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPhone.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@3x~iPhone.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPad.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPhone.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@3x~iPhone.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40~iPad.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@2x~iPhone.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@3x~iPhone.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76@2x~iPad.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76~iPad.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon83@2x~iPad.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon~iOS-marketing.png
 create mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
 create mode 100644 newexample/ios/Demo/Assets.xcassets/Contents.json
 create mode 100644 newexample/ios/Demo/Assets.xcassets/close_icon.imageset/Contents.json
 create mode 100644 newexample/ios/Demo/Assets.xcassets/close_icon.imageset/close-24px.pdf
 create mode 100644 newexample/ios/Demo/Assets.xcassets/darker_color.colorset/Contents.json
 create mode 100644 newexample/ios/Demo/Assets.xcassets/error_icon.imageset/Contents.json
 create mode 100644 newexample/ios/Demo/Assets.xcassets/error_icon.imageset/error-black-18dp.pdf
 create mode 100644 newexample/ios/Demo/Assets.xcassets/li_colorAccent.colorset/Contents.json
 create mode 100644 newexample/ios/Demo/Assets.xcassets/li_colorBackground.colorset/Contents.json
 create mode 100644 newexample/ios/Demo/Base.lproj/LaunchScreen.storyboard
 create mode 100644 newexample/ios/Demo/Base.lproj/Localizable.strings
 create mode 100644 newexample/ios/Demo/Base.lproj/Main.storyboard
 create mode 100644 newexample/ios/Demo/Beacons/BeaconsViewCell.swift
 create mode 100644 newexample/ios/Demo/Beacons/BeaconsViewController.swift
 create mode 100644 newexample/ios/Demo/Bluetooth/BluetoothCharacteristicCell.xib
 create mode 100644 newexample/ios/Demo/Bluetooth/BluetoothDescriptorCell.xib
 create mode 100644 newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
 create mode 100644 newexample/ios/Demo/Bluetooth/BluetoothViewController.swift
 create mode 100644 newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
 create mode 100644 newexample/ios/Demo/Demo.entitlements
 create mode 100644 newexample/ios/Demo/ExampleViewController.swift
 create mode 100644 newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift
 create mode 100644 newexample/ios/Demo/Helpers/UIControl+Closure.swift
 create mode 100644 newexample/ios/Demo/Info.plist
 create mode 100644 newexample/ios/Demo/Info/InfoViewController.swift
 create mode 100644 newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
 create mode 100644 newexample/ios/Demo/Links/LinksViewController.swift
 create mode 100644 newexample/ios/Demo/LoadingIndicator/ActivityViewController.swift
 create mode 100644 newexample/ios/Demo/LoadingIndicator/ActivityViewController.xib
 create mode 100644 newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift
 create mode 100644 newexample/ios/Demo/Location/LocationViewController.swift
 create mode 100644 newexample/ios/Demo/Permissions/PermissionListViewController.swift
 create mode 100644 newexample/ios/Demo/Permissions/PermissionViewController.swift
 create mode 100644 newexample/ios/Demo/Resources/ButtonViewController.swift
 create mode 100644 newexample/ios/Demo/Resources/ColorViewController.swift
 create mode 100644 newexample/ios/Demo/Resources/LabelViewController.swift
 create mode 100644 newexample/ios/Demo/Resources/ResourcesListViewController.swift
 create mode 100644 newexample/ios/Demo/System/Network/NetworkViewController.swift
 create mode 100644 newexample/ios/Demo/System/SystemViewController.swift
 create mode 100644 newexample/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
 create mode 100644 newexample/ios/DemoTests/DemoTests.swift
 create mode 100644 newexample/ios/DemoTests/Info.plist
 create mode 100644 newexample/ios/DemoUITests/DemoUITests.swift
 create mode 100644 newexample/ios/DemoUITests/Info.plist
 delete mode 100644 newexample/ios/ios.xcodeproj/project.pbxproj
 delete mode 100644 newexample/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json
 delete mode 100644 newexample/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
 delete mode 100644 newexample/ios/ios/Assets.xcassets/Contents.json
 delete mode 100644 newexample/ios/ios/ContentView.swift
 delete mode 100644 newexample/ios/ios/Info.plist
 delete mode 100644 newexample/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json
 delete mode 100644 newexample/ios/ios/iOSApp.swift
 rename newexample/{android/src/main/java/com/splendo/kaluga/example/di/Modules.kt => shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt} (60%)
 create mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/model/contacts/ContactDetails.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/stylable/ButtonStyles.kt (94%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/stylable/TextStyles.kt (67%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/ExampleViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/alert/AlertViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/architecture/ArchitectureDetailsViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/architecture/ArchitectureInputViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/beacons/BeaconsListBeaconViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/beacons/BeaconsListViewModel.kt (92%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt (94%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bluetooth/BluetoothListViewModel.kt (90%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bluetooth/BluetoothServiceViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bottomsheet/BottomSheetParentViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bottomsheet/BottomSheetViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/contacts/ContactDetailsViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/contacts/ContactsListViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/datetimepicker/DateTimePickerViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/featureList/FeatureListViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/featureList/PlatformSpecific.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/hud/HudViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/info/InfoViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/keyboard/KeyboardViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/link/LinksViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/location/LocationViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/permissions/PermissionViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/permissions/PermissionsListViewModel.kt (91%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/resources/ButtonViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/resources/ColorViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/resources/LabelViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/resources/ResourcesListViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/system/SystemViewModel.kt (100%)
 rename newexample/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/system/network/NetworkViewModel.kt (100%)
 create mode 100644 newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
 create mode 100644 newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
 create mode 100644 newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt

diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index 5f62e6394..4cca3ec05 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -21,6 +21,7 @@ import org.gradle.api.tasks.Copy
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
+import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
 
@@ -29,11 +30,11 @@ sealed class ComponentType {
     object Compose : ComponentType()
 }
 
-fun Project.commonComponent() {
+fun Project.commonComponent(iosExport: (Framework.() -> Unit)? = null) {
     group = Library.group
     version = Library.version
     kotlinMultiplatform {
-        commonMultiplatformComponent(this@commonComponent)
+        commonMultiplatformComponent(this@commonComponent, iosExport)
     }
 
     commonAndroidComponent()
@@ -78,7 +79,7 @@ fun Project.commonComponent() {
     }
 }
 
-fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Project) {
+fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Project, iosExport: (Framework.() -> Unit)? = null) {
     targets {
         configureEach {
             compilations.configureEach {
@@ -91,6 +92,11 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Pr
     val target: KotlinNativeTarget.() -> Unit =
         {
             binaries {
+                iosExport?.let { iosExport ->
+                    framework {
+                        iosExport()
+                    }
+                }
                 getTest("DEBUG").apply {
                     freeCompilerArgs = freeCompilerArgs + listOf("-e", "com.splendo.kaluga.test.base.mainBackground")
                 }
diff --git a/newexample/android/build.gradle.kts b/newexample/android/build.gradle.kts
index 3ed968cda..d8fc3643c 100644
--- a/newexample/android/build.gradle.kts
+++ b/newexample/android/build.gradle.kts
@@ -94,8 +94,6 @@ dependencies {
     implement(Dependencies.Android.Material)
     implement(Dependencies.Android.MaterialComposeThemeAdapter)
 
-    implement(Dependencies.Koin.Android)
-
     implement(Dependencies.KotlinX.Serialization.Core)
     implement(Dependencies.KotlinX.Serialization.Json)
 }
\ No newline at end of file
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
index 4b3b334fe..7622e5ab7 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
@@ -20,10 +20,7 @@ package com.splendo.kaluga.example
 
 import android.app.Application
 import com.splendo.kaluga.base.ApplicationHolder
-import com.splendo.kaluga.example.di.utilitiesModule
-import com.splendo.kaluga.example.di.viewModelModule
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
+import com.splendo.kaluga.example.shared.di.initKoin
 
 class ExampleApplication : Application() {
 
@@ -31,9 +28,6 @@ class ExampleApplication : Application() {
         super.onCreate()
         ApplicationHolder.application = this
 
-        startKoin {
-            androidContext(this@ExampleApplication)
-            modules(utilitiesModule, viewModelModule)
-        }
+        initKoin()
     }
 }
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
index 879360e98..58cffa8c6 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
@@ -19,11 +19,14 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 package com.splendo.kaluga.example.architecture
 
 import android.os.Bundle
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureDetailsBinding
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.CloseDetailsNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -37,7 +40,12 @@ class ArchitectureDetailsActivity : KalugaViewModelActivity<ArchitectureDetailsV
     override val viewModel: ArchitectureDetailsViewModel by viewModel {
         val type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
         intent.extras?.toTypedProperty(type)?.let { details ->
-            parametersOf(details)
+            parametersOf(
+                details,
+                ActivityNavigator<CloseDetailsNavigation> {
+                    NavigationSpec.Close(resultCode)
+                }
+            )
         } ?: parametersOf("", 0)
     }
 
diff --git a/newexample/ios/Demo.xcodeproj/project.pbxproj b/newexample/ios/Demo.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..6d30214da
--- /dev/null
+++ b/newexample/ios/Demo.xcodeproj/project.pbxproj
@@ -0,0 +1,939 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2017B1C52400175C00F9072A /* PermissionListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2017B1C42400175C00F9072A /* PermissionListViewController.swift */; };
+		20524A24257BEA1E0054B57E /* DateTimePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */; };
+		205747572397C9C400CDE25E /* KeyboardManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */; };
+		205AF6562488F017001BD99E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 205AF6542488F017001BD99E /* Localizable.strings */; };
+		2073D0F0270303B3002CB856 /* ButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2073D0EF270303B3002CB856 /* ButtonViewController.swift */; };
+		2073D0F227032B5B002CB856 /* ColorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2073D0F127032B5B002CB856 /* ColorViewController.swift */; };
+		209471E124C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209471E024C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift */; };
+		209471E424C07EAD001426CD /* BluetoothViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209471E324C07EAD001426CD /* BluetoothViewController.swift */; };
+		209471E624C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */; };
+		209471E824C07F19001426CD /* BluetoothCharacteristicCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */; };
+		209471EA24C07F5F001426CD /* BluetoothDescriptorCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */; };
+		20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */; };
+		20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */; };
+		20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */; };
+		20C7D1D52469B25B00C9A63F /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D42469B25B00C9A63F /* InfoViewController.swift */; };
+		20C7D1D8246A93A600C9A63F /* ArchitectureInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */; };
+		20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */; };
+		20D8CD3726FE8FE200D14AC9 /* ResourcesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */; };
+		20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3826FF550100D14AC9 /* LabelViewController.swift */; };
+		4B02E504236B221B003F0B36 /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B02E503236B221B003F0B36 /* LoadingViewController.swift */; };
+		4B54CB212369DA6600B69B2D /* AlertsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B54CB202369DA6600B69B2D /* AlertsViewController.swift */; };
+		4BC0CBDF269F1D25000512A9 /* BeaconsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC0CBDD269F1D25000512A9 /* BeaconsViewController.swift */; };
+		4BC0CBE0269F1D25000512A9 /* BeaconsViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC0CBDE269F1D25000512A9 /* BeaconsViewCell.swift */; };
+		641CC0DC25CACAAD001E1CD1 /* LinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CC0DB25CACAAD001E1CD1 /* LinksViewController.swift */; };
+		649979D325CC638C00348419 /* SystemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649979D225CC638C00348419 /* SystemViewController.swift */; };
+		649979E725CCD37200348419 /* NetworkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649979E625CCD37200348419 /* NetworkViewController.swift */; };
+		7425815FF35195035A8991B0 /* LocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74C710A1E2E41AF0F4A9FFC5 /* LocationViewController.swift */; };
+		74671D1F8F6A31F1DD3F7912 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74BBBF2C57521E71982179E0 /* AppDelegate.swift */; };
+		7478297FCF44ED1D49525D4E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74FDC8922442294AF0776058 /* LaunchScreen.storyboard */; };
+		749B42F84CA72A5D4A0F3AD9 /* DemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */; };
+		74C75886D08DD78EA65E6DD9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 74C9C443CC304CB387AB324D /* Assets.xcassets */; };
+		74C9929AB26988E8CC66893D /* gradle.properties in Resources */ = {isa = PBXBuildFile; fileRef = 74F1F3223C9CF11420F72B08 /* gradle.properties */; };
+		74D656BE6B4BD50115400411 /* DemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 744CF99B70DA1947AA98CA3B /* DemoTests.swift */; };
+		74E6599B023623BD96737582 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74F483E9C1890D693F808DDA /* Main.storyboard */; };
+		978348A7235DF586005B140B /* PermissionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978348A6235DF586005B140B /* PermissionViewController.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		74798B41F78378ECDB0E4BB7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7477FD4305C126F92DB837CC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 74555136E1B2BB715E50195E;
+			remoteInfo = Demo;
+		};
+		74D5F38618D40CB8E5FC86D8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7477FD4305C126F92DB837CC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 74555136E1B2BB715E50195E;
+			remoteInfo = Demo;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		74A05339C53B02B14407A5BD /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 0;
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		2017B1C42400175C00F9072A /* PermissionListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionListViewController.swift; sourceTree = "<group>"; };
+		20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimePickerViewController.swift; sourceTree = "<group>"; };
+		205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardManagerViewController.swift; sourceTree = "<group>"; };
+		205AF6552488F017001BD99E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Demo/Base.lproj/Localizable.strings; sourceTree = "<group>"; };
+		2073D0EF270303B3002CB856 /* ButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonViewController.swift; sourceTree = "<group>"; };
+		2073D0F127032B5B002CB856 /* ColorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorViewController.swift; sourceTree = "<group>"; };
+		209471E024C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FittingWidthAutomaticHeightCollectionViewFlowLayout.swift; sourceTree = "<group>"; };
+		209471E324C07EAD001426CD /* BluetoothViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothViewController.swift; sourceTree = "<group>"; };
+		209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothDeviceDetailsViewController.swift; sourceTree = "<group>"; };
+		209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BluetoothCharacteristicCell.xib; sourceTree = "<group>"; };
+		209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BluetoothDescriptorCell.xib; sourceTree = "<group>"; };
+		20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleViewController.swift; sourceTree = "<group>"; };
+		20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIControl+Closure.swift"; sourceTree = "<group>"; };
+		20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturesListViewController.swift; sourceTree = "<group>"; };
+		20C7D1D42469B25B00C9A63F /* InfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoViewController.swift; sourceTree = "<group>"; };
+		20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureInputViewController.swift; sourceTree = "<group>"; };
+		20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureDetailsViewController.swift; sourceTree = "<group>"; };
+		20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesListViewController.swift; sourceTree = "<group>"; };
+		20D8CD3826FF550100D14AC9 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = "<group>"; };
+		4B02E503236B221B003F0B36 /* LoadingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
+		4B54CB202369DA6600B69B2D /* AlertsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertsViewController.swift; sourceTree = "<group>"; };
+		4BC0CBDD269F1D25000512A9 /* BeaconsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeaconsViewController.swift; sourceTree = "<group>"; };
+		4BC0CBDE269F1D25000512A9 /* BeaconsViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeaconsViewCell.swift; sourceTree = "<group>"; };
+		641CC0DB25CACAAD001E1CD1 /* LinksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinksViewController.swift; sourceTree = "<group>"; };
+		648214DD263095A900CDAE05 /* Demo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Demo.entitlements; sourceTree = "<group>"; };
+		649979D225CC638C00348419 /* SystemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemViewController.swift; sourceTree = "<group>"; };
+		649979E625CCD37200348419 /* NetworkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkViewController.swift; sourceTree = "<group>"; };
+		740C363F8973304E72F429BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
+		741672C742FA38B5D4971C10 /* gradlew */ = {isa = PBXFileReference; lastKnownFileType = text; path = gradlew; sourceTree = "<group>"; };
+		741A9B938B05534BD1B508C6 /* settings.gradle.kts */ = {isa = PBXFileReference; lastKnownFileType = file.kts; path = settings.gradle.kts; sourceTree = "<group>"; };
+		741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoUITests.swift; sourceTree = "<group>"; };
+		741E82A1DDEE399E80A02B54 /* gradle-wrapper.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = "gradle-wrapper.jar"; sourceTree = "<group>"; };
+		7428D8755D288FD7EA2E6537 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
+		742CCE9033CEC8C8004D624F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		7433F67D6FEF093F4C827A5A /* build.gradle.kts */ = {isa = PBXFileReference; lastKnownFileType = file.kts; path = build.gradle.kts; sourceTree = "<group>"; };
+		744CF99B70DA1947AA98CA3B /* DemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoTests.swift; sourceTree = "<group>"; };
+		744F12775216AF134CBAF4E9 /* build.gradle.kts */ = {isa = PBXFileReference; lastKnownFileType = file.kts; path = build.gradle.kts; sourceTree = "<group>"; };
+		746834742E284396FD5452F4 /* DemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		746E133CAEC5C7B1D516B11F /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		74A0718952D0CC604E49709B /* DemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DemoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		74B0C3AB70AAB7878B48F6B1 /* gradle-wrapper.properties */ = {isa = PBXFileReference; lastKnownFileType = file.properties; path = "gradle-wrapper.properties"; sourceTree = "<group>"; };
+		74BBBF2C57521E71982179E0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		74BEC2BADB02749FD409313B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
+		74C07E8A2DB465B1CE47DC5E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		74C22623993814F606777266 /* KotlinNativeFramework.kt */ = {isa = PBXFileReference; lastKnownFileType = file.kt; path = KotlinNativeFramework.kt; sourceTree = "<group>"; };
+		74C710A1E2E41AF0F4A9FFC5 /* LocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationViewController.swift; sourceTree = "<group>"; };
+		74C9C443CC304CB387AB324D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		74E253D6EF4BB7BA4916943D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
+		74F1F3223C9CF11420F72B08 /* gradle.properties */ = {isa = PBXFileReference; lastKnownFileType = file.properties; path = gradle.properties; sourceTree = "<group>"; };
+		978348A6235DF586005B140B /* PermissionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionViewController.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		7400F8CCBEA88ECB1634EEDE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		740935FBE067214171F75A8D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		74B635A880CB81844D31A213 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		20524A22257BEA020054B57E /* DateTimePicker */ = {
+			isa = PBXGroup;
+			children = (
+				20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */,
+			);
+			path = DateTimePicker;
+			sourceTree = "<group>";
+		};
+		205747552397C99100CDE25E /* KeyboardManager */ = {
+			isa = PBXGroup;
+			children = (
+				205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */,
+			);
+			path = KeyboardManager;
+			sourceTree = "<group>";
+		};
+		209471DF24C07DE2001426CD /* View */ = {
+			isa = PBXGroup;
+			children = (
+				209471E024C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		209471E224C07E61001426CD /* Bluetooth */ = {
+			isa = PBXGroup;
+			children = (
+				209471E324C07EAD001426CD /* BluetoothViewController.swift */,
+				209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */,
+				209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */,
+				209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */,
+			);
+			path = Bluetooth;
+			sourceTree = "<group>";
+		};
+		20C7D1CD24699A5000C9A63F /* Helpers */ = {
+			isa = PBXGroup;
+			children = (
+				20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */,
+			);
+			path = Helpers;
+			sourceTree = "<group>";
+		};
+		20C7D1D02469A3C100C9A63F /* FeaturesList */ = {
+			isa = PBXGroup;
+			children = (
+				20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */,
+			);
+			path = FeaturesList;
+			sourceTree = "<group>";
+		};
+		20C7D1D32469B24C00C9A63F /* Info */ = {
+			isa = PBXGroup;
+			children = (
+				20C7D1D42469B25B00C9A63F /* InfoViewController.swift */,
+			);
+			path = Info;
+			sourceTree = "<group>";
+		};
+		20C7D1D6246A938A00C9A63F /* Architecture */ = {
+			isa = PBXGroup;
+			children = (
+				20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */,
+				20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */,
+			);
+			path = Architecture;
+			sourceTree = "<group>";
+		};
+		20D8CD3526FE8FBA00D14AC9 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */,
+				20D8CD3826FF550100D14AC9 /* LabelViewController.swift */,
+				2073D0EF270303B3002CB856 /* ButtonViewController.swift */,
+				2073D0F127032B5B002CB856 /* ColorViewController.swift */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
+		4B02E502236B2206003F0B36 /* LoadingIndicator */ = {
+			isa = PBXGroup;
+			children = (
+				4B02E503236B221B003F0B36 /* LoadingViewController.swift */,
+			);
+			path = LoadingIndicator;
+			sourceTree = "<group>";
+		};
+		4B54CB1E2369DA2B00B69B2D /* Location */ = {
+			isa = PBXGroup;
+			children = (
+				74C710A1E2E41AF0F4A9FFC5 /* LocationViewController.swift */,
+			);
+			path = Location;
+			sourceTree = "<group>";
+		};
+		4B54CB1F2369DA4E00B69B2D /* Alerts */ = {
+			isa = PBXGroup;
+			children = (
+				4B54CB202369DA6600B69B2D /* AlertsViewController.swift */,
+			);
+			path = Alerts;
+			sourceTree = "<group>";
+		};
+		4BC0CBDC269F1D25000512A9 /* Beacons */ = {
+			isa = PBXGroup;
+			children = (
+				4BC0CBDD269F1D25000512A9 /* BeaconsViewController.swift */,
+				4BC0CBDE269F1D25000512A9 /* BeaconsViewCell.swift */,
+			);
+			path = Beacons;
+			sourceTree = "<group>";
+		};
+		641CC0D625CAC0A1001E1CD1 /* Links */ = {
+			isa = PBXGroup;
+			children = (
+				641CC0DB25CACAAD001E1CD1 /* LinksViewController.swift */,
+			);
+			path = Links;
+			sourceTree = "<group>";
+		};
+		649979D025CC636F00348419 /* System */ = {
+			isa = PBXGroup;
+			children = (
+				649979D125CC637600348419 /* Network */,
+				649979D225CC638C00348419 /* SystemViewController.swift */,
+			);
+			path = System;
+			sourceTree = "<group>";
+		};
+		649979D125CC637600348419 /* Network */ = {
+			isa = PBXGroup;
+			children = (
+				649979E625CCD37200348419 /* NetworkViewController.swift */,
+			);
+			path = Network;
+			sourceTree = "<group>";
+		};
+		743414FDF97167BD81A5293E /* wrapper */ = {
+			isa = PBXGroup;
+			children = (
+				74B0C3AB70AAB7878B48F6B1 /* gradle-wrapper.properties */,
+				741E82A1DDEE399E80A02B54 /* gradle-wrapper.jar */,
+			);
+			path = wrapper;
+			sourceTree = "<group>";
+		};
+		743EA5EA3B99CA8E01574460 /* KotlinNativeFrameworkMain */ = {
+			isa = PBXGroup;
+			children = (
+				7470228E28317355EFB70D41 /* kotlin */,
+			);
+			path = KotlinNativeFrameworkMain;
+			sourceTree = "<group>";
+		};
+		745520950D85E4696686141D = {
+			isa = PBXGroup;
+			children = (
+				205AF6542488F017001BD99E /* Localizable.strings */,
+				747A549D9FF0D1B49E65E190 /* Products */,
+				746CAD9D15ECB24F4ED84E11 /* Demo */,
+				7492DE0914511F3DC96A30A8 /* DemoTests */,
+				74D6698E6E24A4F93E6B289A /* DemoUITests */,
+				747F646D72854D37D5686909 /* KotlinNativeFramework */,
+				74588EBE65D1E22D05BFD2A5 /* Supporting Files */,
+			);
+			sourceTree = "<group>";
+		};
+		745778F955B940F5CB818364 /* gradle */ = {
+			isa = PBXGroup;
+			children = (
+				743414FDF97167BD81A5293E /* wrapper */,
+			);
+			path = gradle;
+			sourceTree = "<group>";
+		};
+		74588EBE65D1E22D05BFD2A5 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				7433F67D6FEF093F4C827A5A /* build.gradle.kts */,
+				741672C742FA38B5D4971C10 /* gradlew */,
+				745778F955B940F5CB818364 /* gradle */,
+				741A9B938B05534BD1B508C6 /* settings.gradle.kts */,
+				74F1F3223C9CF11420F72B08 /* gradle.properties */,
+			);
+			path = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		745DD28172357B2F37C397E8 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				743EA5EA3B99CA8E01574460 /* KotlinNativeFrameworkMain */,
+			);
+			path = src;
+			sourceTree = "<group>";
+		};
+		746CAD9D15ECB24F4ED84E11 /* Demo */ = {
+			isa = PBXGroup;
+			children = (
+				20D8CD3526FE8FBA00D14AC9 /* Resources */,
+				648214DD263095A900CDAE05 /* Demo.entitlements */,
+				641CC0D625CAC0A1001E1CD1 /* Links */,
+				649979D025CC636F00348419 /* System */,
+				20524A22257BEA020054B57E /* DateTimePicker */,
+				4B54CB1F2369DA4E00B69B2D /* Alerts */,
+				74BBBF2C57521E71982179E0 /* AppDelegate.swift */,
+				20C7D1D6246A938A00C9A63F /* Architecture */,
+				74C9C443CC304CB387AB324D /* Assets.xcassets */,
+				209471E224C07E61001426CD /* Bluetooth */,
+				20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */,
+				4BC0CBDC269F1D25000512A9 /* Beacons */,
+				20C7D1D02469A3C100C9A63F /* FeaturesList */,
+				20C7D1CD24699A5000C9A63F /* Helpers */,
+				20C7D1D32469B24C00C9A63F /* Info */,
+				74BEC2BADB02749FD409313B /* Info.plist */,
+				205747552397C99100CDE25E /* KeyboardManager */,
+				74FDC8922442294AF0776058 /* LaunchScreen.storyboard */,
+				4B02E502236B2206003F0B36 /* LoadingIndicator */,
+				4B54CB1E2369DA2B00B69B2D /* Location */,
+				74F483E9C1890D693F808DDA /* Main.storyboard */,
+				978348A5235DF51D005B140B /* Permissions */,
+				209471DF24C07DE2001426CD /* View */,
+			);
+			path = Demo;
+			sourceTree = "<group>";
+		};
+		7470228E28317355EFB70D41 /* kotlin */ = {
+			isa = PBXGroup;
+			children = (
+				74C22623993814F606777266 /* KotlinNativeFramework.kt */,
+			);
+			path = kotlin;
+			sourceTree = "<group>";
+		};
+		747A549D9FF0D1B49E65E190 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				746E133CAEC5C7B1D516B11F /* Demo.app */,
+				746834742E284396FD5452F4 /* DemoTests.xctest */,
+				74A0718952D0CC604E49709B /* DemoUITests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		747F646D72854D37D5686909 /* KotlinNativeFramework */ = {
+			isa = PBXGroup;
+			children = (
+				74E253D6EF4BB7BA4916943D /* Info.plist */,
+				74ED9583BC95062A511A899E /* Supporting Files */,
+				745DD28172357B2F37C397E8 /* src */,
+			);
+			path = KotlinNativeFramework;
+			sourceTree = "<group>";
+		};
+		7492DE0914511F3DC96A30A8 /* DemoTests */ = {
+			isa = PBXGroup;
+			children = (
+				7428D8755D288FD7EA2E6537 /* Info.plist */,
+				744CF99B70DA1947AA98CA3B /* DemoTests.swift */,
+			);
+			path = DemoTests;
+			sourceTree = "<group>";
+		};
+		74D6698E6E24A4F93E6B289A /* DemoUITests */ = {
+			isa = PBXGroup;
+			children = (
+				740C363F8973304E72F429BC /* Info.plist */,
+				741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */,
+			);
+			path = DemoUITests;
+			sourceTree = "<group>";
+		};
+		74ED9583BC95062A511A899E /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				744F12775216AF134CBAF4E9 /* build.gradle.kts */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		978348A5235DF51D005B140B /* Permissions */ = {
+			isa = PBXGroup;
+			children = (
+				978348A6235DF586005B140B /* PermissionViewController.swift */,
+				2017B1C42400175C00F9072A /* PermissionListViewController.swift */,
+			);
+			path = Permissions;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		74074B293DEEEE5CB9495BC2 /* DemoTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 740AC894114C7B2501D2F458 /* Build configuration list for PBXNativeTarget "DemoTests" */;
+			buildPhases = (
+				744899861837358C3FC4D6EC /* Sources */,
+				740935FBE067214171F75A8D /* Frameworks */,
+				746B879C3C63B46AE1237085 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				744683563AC18D9D78E89D91 /* PBXTargetDependency */,
+			);
+			name = DemoTests;
+			productName = DemoTests;
+			productReference = 746834742E284396FD5452F4 /* DemoTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+		74555136E1B2BB715E50195E /* Demo */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 74C754F7F747073B076C3A91 /* Build configuration list for PBXNativeTarget "Demo" */;
+			buildPhases = (
+				95D0860F27D2540B00838E57 /* Compile Kotlin/Native */,
+				744156D82DB12C1F9CC3C68F /* Sources */,
+				74B635A880CB81844D31A213 /* Frameworks */,
+				746C535FD7586B544C684D34 /* Resources */,
+				74A05339C53B02B14407A5BD /* Embed Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Demo;
+			productName = Demo;
+			productReference = 746E133CAEC5C7B1D516B11F /* Demo.app */;
+			productType = "com.apple.product-type.application";
+		};
+		74F1ACA722488B68F78605D9 /* DemoUITests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 7493E4639A804158022EC4C4 /* Build configuration list for PBXNativeTarget "DemoUITests" */;
+			buildPhases = (
+				74EE94DACA1A8475269C9E82 /* Sources */,
+				7400F8CCBEA88ECB1634EEDE /* Frameworks */,
+				7471171052DD797BF549D296 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				749B2B4D04F5064568547D5D /* PBXTargetDependency */,
+			);
+			name = DemoUITests;
+			productName = DemoUITests;
+			productReference = 74A0718952D0CC604E49709B /* DemoUITests.xctest */;
+			productType = "com.apple.product-type.bundle.ui-testing";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		7477FD4305C126F92DB837CC /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				ORGANIZATIONNAME = "Splendo Consulting B.V.";
+				TargetAttributes = {
+					74555136E1B2BB715E50195E = {
+						DevelopmentTeam = 2732HQPVJP;
+						ProvisioningStyle = Manual;
+					};
+				};
+			};
+			buildConfigurationList = 742F13205C35E0F5E5498808 /* Build configuration list for PBXProject "Demo" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				English,
+				en,
+				Base,
+			);
+			mainGroup = 745520950D85E4696686141D;
+			productRefGroup = 747A549D9FF0D1B49E65E190 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				74555136E1B2BB715E50195E /* Demo */,
+				74074B293DEEEE5CB9495BC2 /* DemoTests */,
+				74F1ACA722488B68F78605D9 /* DemoUITests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		746B879C3C63B46AE1237085 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		746C535FD7586B544C684D34 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				205AF6562488F017001BD99E /* Localizable.strings in Resources */,
+				209471E824C07F19001426CD /* BluetoothCharacteristicCell.xib in Resources */,
+				74C75886D08DD78EA65E6DD9 /* Assets.xcassets in Resources */,
+				7478297FCF44ED1D49525D4E /* LaunchScreen.storyboard in Resources */,
+				74E6599B023623BD96737582 /* Main.storyboard in Resources */,
+				209471EA24C07F5F001426CD /* BluetoothDescriptorCell.xib in Resources */,
+				74C9929AB26988E8CC66893D /* gradle.properties in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		7471171052DD797BF549D296 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		95D0860F27D2540B00838E57 /* Compile Kotlin/Native */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Compile Kotlin/Native";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cd \"$SRCROOT/Supporting Files\"\n./gradlew :KotlinNativeFramework:embedAndSignAppleFrameworkForXcode\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		744156D82DB12C1F9CC3C68F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				205747572397C9C400CDE25E /* KeyboardManagerViewController.swift in Sources */,
+				74671D1F8F6A31F1DD3F7912 /* AppDelegate.swift in Sources */,
+				20D8CD3726FE8FE200D14AC9 /* ResourcesListViewController.swift in Sources */,
+				209471E124C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift in Sources */,
+				2017B1C52400175C00F9072A /* PermissionListViewController.swift in Sources */,
+				978348A7235DF586005B140B /* PermissionViewController.swift in Sources */,
+				641CC0DC25CACAAD001E1CD1 /* LinksViewController.swift in Sources */,
+				2073D0F227032B5B002CB856 /* ColorViewController.swift in Sources */,
+				20524A24257BEA1E0054B57E /* DateTimePickerViewController.swift in Sources */,
+				20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */,
+				4BC0CBDF269F1D25000512A9 /* BeaconsViewController.swift in Sources */,
+				649979E725CCD37200348419 /* NetworkViewController.swift in Sources */,
+				20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */,
+				4BC0CBE0269F1D25000512A9 /* BeaconsViewCell.swift in Sources */,
+				20C7D1D8246A93A600C9A63F /* ArchitectureInputViewController.swift in Sources */,
+				20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */,
+				20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */,
+				649979D325CC638C00348419 /* SystemViewController.swift in Sources */,
+				978348A7235DF586005B140B /* PermissionViewController.swift in Sources */,
+				20C7D1D52469B25B00C9A63F /* InfoViewController.swift in Sources */,
+				4B02E504236B221B003F0B36 /* LoadingViewController.swift in Sources */,
+				7425815FF35195035A8991B0 /* LocationViewController.swift in Sources */,
+				209471E624C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift in Sources */,
+				209471E424C07EAD001426CD /* BluetoothViewController.swift in Sources */,
+				4B54CB212369DA6600B69B2D /* AlertsViewController.swift in Sources */,
+				2073D0F0270303B3002CB856 /* ButtonViewController.swift in Sources */,
+				20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		744899861837358C3FC4D6EC /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				74D656BE6B4BD50115400411 /* DemoTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		74EE94DACA1A8475269C9E82 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				749B42F84CA72A5D4A0F3AD9 /* DemoUITests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		744683563AC18D9D78E89D91 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 74555136E1B2BB715E50195E /* Demo */;
+			targetProxy = 74D5F38618D40CB8E5FC86D8 /* PBXContainerItemProxy */;
+		};
+		749B2B4D04F5064568547D5D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 74555136E1B2BB715E50195E /* Demo */;
+			targetProxy = 74798B41F78378ECDB0E4BB7 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		205AF6542488F017001BD99E /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				205AF6552488F017001BD99E /* Base */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		74F483E9C1890D693F808DDA /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				74C07E8A2DB465B1CE47DC5E /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		74FDC8922442294AF0776058 /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				742CCE9033CEC8C8004D624F /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		7450045FC3F0FAB4E9E0751D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		74B72DFF132E49F15B2DF935 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				INFOPLIST_FILE = DemoTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUNDLE_LOADER)";
+			};
+			name = Debug;
+		};
+		74BDCF7AC0CDEAF092DB5F7F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = 2732HQPVJP;
+				FRAMEWORK_SEARCH_PATHS = (
+					$BUILT_PRODUCTS_DIR,
+					"$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+				);
+				INFOPLIST_FILE = Demo/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.kaluga.example;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "Kaluga example";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		74C4C9BEEE5FE949D448C58D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				INFOPLIST_FILE = DemoUITests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_TARGET_NAME = Demo;
+			};
+			name = Debug;
+		};
+		74DE35733E2CD78059A3003A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		74E9BA46A80E6C492CC81D95 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				INFOPLIST_FILE = DemoTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUNDLE_LOADER)";
+			};
+			name = Release;
+		};
+		74F864CC21F489CA494FD856 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				INFOPLIST_FILE = DemoUITests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_TARGET_NAME = Demo;
+			};
+			name = Release;
+		};
+		74FB1F493C4D48DDF9E1C969 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = Demo/Demo.entitlements;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = 2732HQPVJP;
+				FRAMEWORK_SEARCH_PATHS = (
+					$BUILT_PRODUCTS_DIR,
+					"$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+				);
+				INFOPLIST_FILE = Demo/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.kaluga.example;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "Kaluga example";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		740AC894114C7B2501D2F458 /* Build configuration list for PBXNativeTarget "DemoTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				74B72DFF132E49F15B2DF935 /* Debug */,
+				74E9BA46A80E6C492CC81D95 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		742F13205C35E0F5E5498808 /* Build configuration list for PBXProject "Demo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				74DE35733E2CD78059A3003A /* Debug */,
+				7450045FC3F0FAB4E9E0751D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		7493E4639A804158022EC4C4 /* Build configuration list for PBXNativeTarget "DemoUITests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				74C4C9BEEE5FE949D448C58D /* Debug */,
+				74F864CC21F489CA494FD856 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		74C754F7F747073B076C3A91 /* Build configuration list for PBXNativeTarget "Demo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				74BDCF7AC0CDEAF092DB5F7F /* Debug */,
+				74FB1F493C4D48DDF9E1C969 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 7477FD4305C126F92DB837CC /* Project object */;
+}
diff --git a/newexample/ios/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/newexample/ios/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..919434a62
--- /dev/null
+++ b/newexample/ios/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/newexample/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/newexample/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/newexample/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/newexample/ios/Demo.xcodeproj/xcshareddata/IDETemplateMacros.plist b/newexample/ios/Demo.xcodeproj/xcshareddata/IDETemplateMacros.plist
new file mode 100644
index 000000000..89382abd1
--- /dev/null
+++ b/newexample/ios/Demo.xcodeproj/xcshareddata/IDETemplateMacros.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>FILEHEADER</key>
+    <string>
+//  Copyright ___YEAR___ ___ORGANIZATIONNAME___ The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//</string>
+</dict>
+</plist>
diff --git a/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
new file mode 100644
index 000000000..e9ab380d8
--- /dev/null
+++ b/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "74555136E1B2BB715E50195E"
+               BuildableName = "Demo.app"
+               BlueprintName = "Demo"
+               ReferencedContainer = "container:Demo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "74074B293DEEEE5CB9495BC2"
+               BuildableName = "DemoTests.xctest"
+               BlueprintName = "DemoTests"
+               ReferencedContainer = "container:Demo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "74F1ACA722488B68F78605D9"
+               BuildableName = "DemoUITests.xctest"
+               BlueprintName = "DemoUITests"
+               ReferencedContainer = "container:Demo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "74555136E1B2BB715E50195E"
+            BuildableName = "Demo.app"
+            BlueprintName = "Demo"
+            ReferencedContainer = "container:Demo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <LocationScenarioReference
+         identifier = "Moscow, Russia"
+         referenceType = "1">
+      </LocationScenarioReference>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "74555136E1B2BB715E50195E"
+            BuildableName = "Demo.app"
+            BlueprintName = "Demo"
+            ReferencedContainer = "container:Demo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme b/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme
new file mode 100644
index 000000000..df330714c
--- /dev/null
+++ b/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1320"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "74074B293DEEEE5CB9495BC2"
+               BuildableName = "DemoTests.xctest"
+               BlueprintName = "DemoTests"
+               ReferencedContainer = "container:Demo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme b/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme
new file mode 100644
index 000000000..f5b5d4dc4
--- /dev/null
+++ b/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1320"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "74F1ACA722488B68F78605D9"
+               BuildableName = "DemoUITests.xctest"
+               BlueprintName = "DemoUITests"
+               ReferencedContainer = "container:Demo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/newexample/ios/Demo/Alerts/AlertsViewController.swift b/newexample/ios/Demo/Alerts/AlertsViewController.swift
new file mode 100644
index 000000000..743ea8f06
--- /dev/null
+++ b/newexample/ios/Demo/Alerts/AlertsViewController.swift
@@ -0,0 +1,47 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import UIKit
+import KotlinNativeFramework
+
+class AlertsViewController: UITableViewController {
+
+    private lazy var viewModel = AlertViewModel(builder: AlertPresenter.Builder(viewController: self))
+    private var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { return [] }
+    }
+
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        tableView.deselectRow(at: indexPath, animated: true)
+        switch indexPath.row {
+        case 0: viewModel.showAlert()
+        case 1: viewModel.showAndDismissAfter(timeSecs: 3)
+        case 2: viewModel.showAlertWithList()
+        case 3: viewModel.showAlertWithInput()
+        default: ()
+        }
+    }
+}
diff --git a/newexample/ios/Demo/AppDelegate.swift b/newexample/ios/Demo/AppDelegate.swift
new file mode 100644
index 000000000..b1b416e18
--- /dev/null
+++ b/newexample/ios/Demo/AppDelegate.swift
@@ -0,0 +1,80 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+    
+    var window: UIWindow?
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        return true
+    }
+    
+    func application(_ application: UIApplication,
+                     continue userActivity: NSUserActivity,
+                     restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        guard let url = NSURLComponents(url: userActivity.webpageURL!, resolvingAgainstBaseURL: true) else {
+            print("Invalid url.")
+            return false
+        }
+        guard let stringUrl = url.url?.absoluteString else {
+            print("Could not retrieve string url.")
+            return false
+        }
+
+        let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        let vc = storyboard.instantiateViewController(withIdentifier: "LinksViewController") as! LinksViewController
+        self.window?.rootViewController = vc
+        
+        vc.handleIncomingLink(url: stringUrl)
+        return true
+    }
+
+    func applicationWillResignActive(_ application: UIApplication) {
+    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+
+    }
+
+
+    func applicationDidEnterBackground(_ application: UIApplication) {
+    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+
+    }
+
+
+    func applicationWillEnterForeground(_ application: UIApplication) {
+    // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+    }
+
+
+    func applicationDidBecomeActive(_ application: UIApplication) {
+    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+
+
+    func applicationWillTerminate(_ application: UIApplication) {
+    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
+
+
+
+}
diff --git a/newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift b/newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
new file mode 100644
index 000000000..577b793ef
--- /dev/null
+++ b/newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
@@ -0,0 +1,79 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class ArchitectureDetailsViewController: UIViewController {
+    
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "ArchitectureDetails"
+    }
+    
+    static func create(inputDetails: InputDetails, onDismiss: @escaping (InputDetails) -> Void) -> ArchitectureDetailsViewController {
+        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! ArchitectureDetailsViewController
+        if #available(iOS 13.0, *) {
+            vc.isModalInPresentation = true
+        }
+        vc.viewModel = KNArchitectureFramework().createArchitectureDetailsViewModel(parent: vc, inputDetails: inputDetails) { inputDetails in
+            onDismiss(inputDetails)
+        }
+        return vc
+    }
+    
+    var viewModel: ArchitectureDetailsViewModel!
+    private var lifecycleManager: LifecycleManager!
+    
+    @IBOutlet weak var nameLabel: UILabel!
+    @IBOutlet weak var numberLabel: UILabel!
+    @IBOutlet weak var inverseButton: UIButton!
+    @IBOutlet weak var closeButton: UIButton!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+            
+            guard let viewModel = self?.viewModel else {
+                return []
+            }
+            
+            return [
+                viewModel.name.observe { name in
+                    self?.nameLabel.text = name as? String ?? ""
+                },
+                viewModel.number.observe { number in
+                    self?.numberLabel.text = number as? String ?? ""
+                }
+            ]
+        }
+    }
+    
+    @objc @IBAction func onInversePressed(sender: Any?) {
+        viewModel.onInversePressed()
+    }
+    
+    @objc @IBAction func onCloseButtonPressed(sender: Any?) {
+        viewModel.onClosePressed()
+    }
+    
+}
diff --git a/newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift b/newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift
new file mode 100644
index 000000000..d9762d316
--- /dev/null
+++ b/newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift
@@ -0,0 +1,106 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class ArchitectureInputViewController: UIViewController  {
+    
+    @IBOutlet weak var nameLabel: UILabel!
+    @IBOutlet weak var nameInput: UITextField!
+    @IBOutlet weak var nameError: UIImageView!
+    
+    @IBOutlet weak var numberLabel: UILabel!
+    @IBOutlet weak var numberInput: UITextField!
+    @IBOutlet weak var numberError: UIImageView!
+    
+    @IBOutlet weak var detailsButton: UIButton!
+    
+    lazy var viewModel = KNArchitectureFramework().createArchitectureInputViewModel(parent: self) { [weak self] inputDetails in
+        return ArchitectureDetailsViewController.create(inputDetails: inputDetails) { [weak self] inputDetails in
+            self?.onDetailsDismissed(inputDetails: inputDetails)
+        }
+    }
+    private var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+        
+            guard let viewModel = self?.viewModel else {
+                return []
+            }
+            
+            return [
+                viewModel.nameHeader.observeInitialized { header in
+                    self?.nameLabel.text = header as String?
+                },
+                viewModel.nameInput.observeInitialized { name in
+                    self?.nameInput.text = name as String?
+                },
+                viewModel.isNameValid.observe { isValid in
+                    self?.nameError.isHidden = isValid?.boolValue ?? false
+                },
+                viewModel.numberHeader.observeInitialized { header in
+                    self?.numberLabel.text = header as String?
+                },
+                viewModel.numberInput.observeInitialized { number in
+                    self?.numberInput.text = number as String?
+                },
+                viewModel.isNumberValid.observe { isValid in
+                    self?.numberError.isHidden = isValid?.boolValue ?? false
+                }
+            ]
+        }
+    }
+    
+    @objc @IBAction func onShowDetailsPressed(sender: Any?) {
+        viewModel.onShowDetailsPressed()
+    }
+    
+    private func onDetailsDismissed(inputDetails: InputDetails) {
+        viewModel.nameInput.post(newValue: NSString(string: inputDetails.name))
+        viewModel.numberInput.post(newValue: NSString(string: "\(inputDetails.number)"))
+    }
+    
+}
+
+extension ArchitectureInputViewController : UITextFieldDelegate {
+    
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        postInput(text: textField.text ?? "", fromTextField: textField)
+    }
+    
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        let resultingString = ((textField.text ?? "") as NSString).replacingCharacters(in: range, with: string)
+        postInput(text: resultingString, fromTextField: textField)
+        return false
+    }
+    
+    private func postInput(text: String, fromTextField textField: UITextField) {
+        if (textField == nameInput) {
+            viewModel.nameInput.post(newValue: NSString(string: text))
+        } else if (textField == numberInput) {
+            viewModel.numberInput.post(newValue: NSString(string: text))
+        }
+    }
+}
diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPad.png
new file mode 100644
index 0000000000000000000000000000000000000000..43cafa80cbfc37485e1c7d63e7df89a4f380b5c7
GIT binary patch
literal 1340
zcmV-C1;hG@P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000e
zpaTE|000010000e00000SuRAD000E9Nkl<ZSPAV{Z)_7~82{b%f48os8(Wvb*rsd~
zhMO{}(@d0XY+wRWqA`;2#gHhPKr~T4_+@GgM(_iXn5fY&45#7}HHMIhu51#PA#7}b
zL$V31<4?DCUE8hg+B@I(y54%bJ3yNdLi!}lJ<t36p67n|yw7v*mEnot9v1c<<|a_f
z5KMQ6G8N2JFx?8I8=vXH`@VwObf56Q#QS}5@SJ*t$;`rFVkCgu5}b|l7#@m9f>Mpr
zas%`RY0^|b)u%!nP7H=%^6}_AGPTex+OO?)Am1dVB(+3nLOC-UhF-&<=U4z&N8}`z
zlo(K+e*t_n2xe*hg6MhkP=^mE213~TdJ)d_OvCSu%{%9`hilEqFO<_!onrcl^HGOK
z_-)u?1H($I#4rr#dhFM?grC~p4Ua|f`{^LUQ4Zh!=EM5URv9_Hfkne6n{1sfs1j`N
zo5IkI2nNQ&IOPxH5vN&_pn8oNj$k`D_epS`L2!LvNc>6Tt6#iGe$jRH2cfaED0$G3
zbPLz|Mhh%fWh#oR!3c)~$0x)j`#UF4*OUXJDFHVa$rCs05OcjNVq)Fz17V+NQ{{Mn
z2p6w}C2L<3!p+ayz|QT+qC73?)>$N&R6~*AXI)<SrsE=RJQ%~l{z*K&AxBtS+f2v~
zehfa~7BT#c7qRa5L_17|tM#aqFm(=(MR4wV1goFO60l9r*`U#gVKPNVaLgaWcc=X_
z;Gy10II0Y&TxEi@W*qTT`(+re?@RDxyQ#FhCgBUnhk^R&&^Q|`s9J4CMU{~*sS303
zlfU=!3|yB&iUE%<HDTTIEO3{827k3%5yKSL0u?Wy?U)a<%KU^l=L$0_i%Bm^XHS+>
zHrD|y54UlCds8FIw28NDG+Ka2s3O%R>iUQSdUDfo9fv5Z{&#0a!-FF@*%peK5{isq
zX^sw`4v>E0q{->~aK{Q8E`D+rW!sA3ZQTn#HY-WTuo`6T+6Mv^q?NRVlGx1}y!e<E
zTRYtNrm;u~BCg3Epwyznjw-tdNGiLkb747o6W(4AJUvllKeajO60cd0uZPyLOt7~<
zX~*Jh+4Bp&H`eB2Pu~RE{`TX?e*$8>k|HBWK`m<*BQNF1ahSE(U2etb_rpSt(H}-&
ztlb2SHCN2Znk~p_dReqhItDwRnfE6h4>^n|TVlZH=MxkD<{vi@S+HA4EWIicwCP!V
z;LI0sd+G|{J3NBebfW9yGck-F9))$|HW5R~F{W(MrpmJ`EvPOsN!H$J%)`#^>xj>h
z8umxAk5p4l6bVxBcG7P(c}6%3%-BK*dpgG?IXtdw;BsnUD5-?5a2e?KD#_b~5Iq*D
zY$Sw-!cn-~(znEie~!Z)QXYBPYbNz3UDu{z(6Gola1MbXdBa<lTT%Y%BJdINQBk%s
zHB_Rv9Jz_37lLSer5N=;jo?Z^I$RXIm9)^o2Km6;k{}J_B60Z1RI7=V3>0g;#Zf>4
z>8aH5R}kmpQM8aDQ<JkVJ%Ckq={bE{f@;bB&-&%yEa^S<NIQ8@+W)C?R|%%x_)c{x
y-8+rCi?|HIbc>y-V5WlURv_K@Ob_1o75o=Z#fT0_E8!^s0000<MNUMnLSTX{jcf}5

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPhone.png
new file mode 100644
index 0000000000000000000000000000000000000000..43cafa80cbfc37485e1c7d63e7df89a4f380b5c7
GIT binary patch
literal 1340
zcmV-C1;hG@P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000e
zpaTE|000010000e00000SuRAD000E9Nkl<ZSPAV{Z)_7~82{b%f48os8(Wvb*rsd~
zhMO{}(@d0XY+wRWqA`;2#gHhPKr~T4_+@GgM(_iXn5fY&45#7}HHMIhu51#PA#7}b
zL$V31<4?DCUE8hg+B@I(y54%bJ3yNdLi!}lJ<t36p67n|yw7v*mEnot9v1c<<|a_f
z5KMQ6G8N2JFx?8I8=vXH`@VwObf56Q#QS}5@SJ*t$;`rFVkCgu5}b|l7#@m9f>Mpr
zas%`RY0^|b)u%!nP7H=%^6}_AGPTex+OO?)Am1dVB(+3nLOC-UhF-&<=U4z&N8}`z
zlo(K+e*t_n2xe*hg6MhkP=^mE213~TdJ)d_OvCSu%{%9`hilEqFO<_!onrcl^HGOK
z_-)u?1H($I#4rr#dhFM?grC~p4Ua|f`{^LUQ4Zh!=EM5URv9_Hfkne6n{1sfs1j`N
zo5IkI2nNQ&IOPxH5vN&_pn8oNj$k`D_epS`L2!LvNc>6Tt6#iGe$jRH2cfaED0$G3
zbPLz|Mhh%fWh#oR!3c)~$0x)j`#UF4*OUXJDFHVa$rCs05OcjNVq)Fz17V+NQ{{Mn
z2p6w}C2L<3!p+ayz|QT+qC73?)>$N&R6~*AXI)<SrsE=RJQ%~l{z*K&AxBtS+f2v~
zehfa~7BT#c7qRa5L_17|tM#aqFm(=(MR4wV1goFO60l9r*`U#gVKPNVaLgaWcc=X_
z;Gy10II0Y&TxEi@W*qTT`(+re?@RDxyQ#FhCgBUnhk^R&&^Q|`s9J4CMU{~*sS303
zlfU=!3|yB&iUE%<HDTTIEO3{827k3%5yKSL0u?Wy?U)a<%KU^l=L$0_i%Bm^XHS+>
zHrD|y54UlCds8FIw28NDG+Ka2s3O%R>iUQSdUDfo9fv5Z{&#0a!-FF@*%peK5{isq
zX^sw`4v>E0q{->~aK{Q8E`D+rW!sA3ZQTn#HY-WTuo`6T+6Mv^q?NRVlGx1}y!e<E
zTRYtNrm;u~BCg3Epwyznjw-tdNGiLkb747o6W(4AJUvllKeajO60cd0uZPyLOt7~<
zX~*Jh+4Bp&H`eB2Pu~RE{`TX?e*$8>k|HBWK`m<*BQNF1ahSE(U2etb_rpSt(H}-&
ztlb2SHCN2Znk~p_dReqhItDwRnfE6h4>^n|TVlZH=MxkD<{vi@S+HA4EWIicwCP!V
z;LI0sd+G|{J3NBebfW9yGck-F9))$|HW5R~F{W(MrpmJ`EvPOsN!H$J%)`#^>xj>h
z8umxAk5p4l6bVxBcG7P(c}6%3%-BK*dpgG?IXtdw;BsnUD5-?5a2e?KD#_b~5Iq*D
zY$Sw-!cn-~(znEie~!Z)QXYBPYbNz3UDu{z(6Gola1MbXdBa<lTT%Y%BJdINQBk%s
zHB_Rv9Jz_37lLSer5N=;jo?Z^I$RXIm9)^o2Km6;k{}J_B60Z1RI7=V3>0g;#Zf>4
z>8aH5R}kmpQM8aDQ<JkVJ%Ckq={bE{f@;bB&-&%yEa^S<NIQ8@+W)C?R|%%x_)c{x
y-8+rCi?|HIbc>y-V5WlURv_K@Ob_1o75o=Z#fT0_E8!^s0000<MNUMnLSTX{jcf}5

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@3x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@3x~iPhone.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ed5b1e60abf4db6bd37671cd352091459c13621
GIT binary patch
literal 2053
zcmV+g2>SPlP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000y
zpaTE|000010000y00000s29s-000MgNkl<ZXa((A32YQq82)DV>Tb8YTe{E+1)-ot
zj&cbV1j=peg@_t8f)QiT#3)7u6CsdjA`oH%i9`aCD=LbD1`m)+?#lu~ZLnOW^r9`@
z?QYvWIy>uo1G7hGW_N06O3MDpX5RbX|Nj4d?|=XQznNu%gm4cLdk<k1pe6u!c8@1K
zobYfb+kwQ9?qm*?z)5&mvL&62k??RQbEpJP!o!j+>12$AhdY@=C2+J7&RxcEH}I&s
z?r+noGJES`GRq&{yB2T@7sRfUZWN5NVCOa`95*>tpiO2C-dmEPDBC8$KC%c6%V5uT
zCkl@?DJm5QG+G94&QFIeg~;kHB3spS#}OB{?ssBnKO-KSVZ)Ynb*kn~e!>E+j!~4A
z_q&4lhT{%=^OqBO`9!In0Y^3<*6-o5$*@`dX!&|F;8C|=YP#MP!1jX;2n2#y|64t>
z2PYvbJ4s<xVRlBQ9>Yf`hZ!<0)qtyA95$SAV(pQ7c$gq27R2_L*`mStX%+;IEeBuw
z54eMiWz5U7Ht%x4=jVmN^Orq1S=@|*nKrN*WzSJzDudV}P!0I=eRc4*@M!e$So!Bo
zj2vr5xBGPRD<<5jPg|k)mLYIzr69wf+lb(evx@TKz=bj&j+|>0yTWtRP6w=M8jKoe
zj^aml28}SGSC&4KCEHd7xUkHF-50`(*m2&C;u}8XKTCF0hBA8_kTcQ*ZvRIJa$Z3q
z805k2eP2d8%%UHR*Z*1{X54PoI9fnsdIAY0nv`0TPS0Z6bZcw2Y(Fkwo-AVdp6K|a
zpR$+ju0@{*4R~mXF-kGRFv8IaUfYjA$<I+^eEBi(#otBoB0GBv8*#PL7s(2>X-qef
z6GoF#YZ^B-1u0hPMzofr{kVXCIO{@5jdT&`E4|oJ<i@mTY*ATpXs!v}d$PovAIjMS
zcVHpV(kvNk_VU=W$06a13>wokwrNtjk0d9NQq!~;Gbu&v#(l;F>>`U;eekBDl2s&@
z^`yXy1`SCpCO>IK;LIBEb;Yvtg6;|gjxU#teZS8MS5rX3k7Ur;rZFxgr`rQ`!!>Ov
zt}y{qunivNMbtHNSbMY{^hjB3TA^GeYaIw2{xou(lD3e@8cIX_@|qUmk`ZFWXnaLt
zJhP7;gGrL2rK*2U{BjkkP7yFIL-aVuqpwdnQAvQ$n3am$JTtgMOAz!rV@?ZlK5+XM
zgk)%~r8QR#l~(ycV|^+~QjwlkGndLRN`IzR5x_+xPSsGBU5~!xM~N@l4ygQpj_vm(
z{Jai@|9aGz3CWmEECy$_&9mZU#nbO+gK+3>6@O7!>FFV|BKdt81h2YzMv^mma#3j1
zs*@LOu;hCCe@PKAL#`|@?<NU`)}<JvC%2!X7yH6h>_AGk4c?1q(RBQe7&C4S83*RV
znDZ#8pME5vbD~t5xs{YG%I}8qCLLTPa}P)jXKW?;NWNkW_cCiScVKFytZaMUkTmo)
zYH|6CVpRWr9hUr8z#3!UXBn*y)~8+z>6<^r4y{VBWv3f3W2go5kKVvLhpIz5)HW0W
zQw5)l>V_^!$^|{cq{YG!c2xdU3g1mHDz;rkpv3^ow3lMqH|I@<rb~KAhUS15hO4_N
zEtuLBN2)#e_F@C}mN#PC6?aIFnnp~(T@0)MT1nBe(dp1T{iyt<Oc3FkIb8qtGLlCZ
zK$p==cACbThLlOqNygq9*9EC2<;|rN@&}|~NM=%$XFnjG_NvVAR7Xs}RDd4q9J@3l
z=BAr4E8B`|n=gX*hii51fhsgzZG`pd*XeW#Ss$MbMrV-l&17@m9-k)RiwvWV#d{O&
zSXb=Cnc8qxzv}X1#aZRckvLy`#sy5@$X1Sx{(?a7%d5s^z+L1({mB|pm+++b?9vS-
zF!alTanK`CV}{=SVH`F-iWk|TvDrUEx*1ev&gfL=4Gca$5p9o-eRjHzBr$bgMB)Ob
z3MX_o;rV{yOZ%(Dv!m<=lx{4c!xD0n_^LZtEhHvJcPooBEDP)OHzcx=3|ed!Oz9fQ
z652g%I?T?sVe!dY)On=9n#oJWhvaChAyt5>q7`E@VAQg(=rveMVz>H_3N&92zcRKq
zR`$&$Fh&xudCv$#rje7O>yg!3Owu1pVzhw7Y9zfs$&O2|7OXCkzB-C>TgWCKs)}FQ
zR0F1EYW}b^EPB|EG>%94)+?ed*{9#>L;1E+m?zF83G9BMT*(T`Fz1n2r7=q>x3>us
zA56x(hpWNGxf9Sb74Hh8c(s&S2RtMjYDxT7Y$`#`-U>O9C>~1|J$Pv@`F_WPNis!^
z#p|p)>cE=A_4sa1PyFrn;aO7S)zFs{x?}DD`41CxewzTRF?gqB{A6>to_1m8a0>>I
zQb)6~8nTm1(6w0)z(l^7%F$g5SX^uc$-afP>Rw{RIgg|p(ak7d)9-q~B8WTnRGqZ$
zl);YHlK|Y&9%yg-2@kjT4tKQvgoiuY1MO`;;o<h);f~gy@Nh?apuO!UJlx(p+|l|I
j9`0xlw730x&cpu!>Wp>Ump=@K00000NkvXXu0mjfLomOX

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20~iPad.png
new file mode 100644
index 0000000000000000000000000000000000000000..320916c834137f9f00dcd23e016cfd079cb9b335
GIT binary patch
literal 667
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOS+@4BLl<6e(pbstU$g+YJ_K+
zuP=iZkj=rs*q+J20%S1)u@n$9Ffc7(f{TbOU`DV(k`qNQ9S17m^K@|xu@HPZ#XDO#
zP^4jh<q}V0#k0=0wWj=N5R>P=*yZ6UF6eU0*RgAzOF3)d!)t5zJ06_6LxAOItHKMX
zmM9L7O%t|cWMwZh^VPX_<cO#7$&@*FGTT#vH<nyCzGGZ`{_*VU^R~v5Qn{@)KJjg0
z$r5L}`u5s|tkM)Og`10YV;$~pIFb75jC$$AFTYaM)Lt#%?Wl~d)iwLEW5c=M&-Z7V
z&1I9E&t+`2taHXX=biuGsju$}E$S}4q&YVuL-z4SiIC5FA0D1Iop)}Ugsr&1wi9tv
zC#TCs+<w5cfBGyN&uNu&w2GD13BLVaaB5F?=*i19)$S_l&q^+Nn|g&#Zpsqk(TthH
zqquuYpYHyXA(lojL_4{?Ca=^kixv9p@%wzj)Xhm#J1zMSJKG6v4l&qKXzTUHp?^lc
z*7i30Dj%b$;2Zo^zJGefo^ImZY_D>1pOUV;YkYIfdf~;VgtYgGZS=i#>~8FvCkqu$
zUX{|Uj?t3Vu{*KojpU&dwN9O1l-ZS!xHHv6#EB<Y960^-`u&QDYs(a4A3R*pKKr=x
z9V@A0pWkqA-P5=3NZ>D}FTL@?p5ksMe#if~m`*j_f3#@p!M8V=zNN)Xw5sP5y&dfN
z-)VlNAfwlMuQ#t0iWHux)x??3IQcKpDs)Mn)spJx-wkVZbdq*8<Xy9uyLC6+O813B
t&e|N4Z`&H8_nu$-FwF7)<J+wV_S+=votB#&b{>>MJYD@<);T3K0RVyy6Ab_W

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@1x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@1x~iPad.png
new file mode 100644
index 0000000000000000000000000000000000000000..504cff69fe40a6dba098f726b87db33053b227fa
GIT binary patch
literal 927
zcmV;Q17Q4#P)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000T
zpaTE|000010000T00000{j)S{0009LNkl<ZNDb{(OGs2v82;|ObY9N*7$1zFgQXGq
zSePl8OxQyS3*EGcqT0F$X;H0e(ZWpyMzo3`GAt}8ELtdP44BsRMxuO+GlSFUb)MIG
z-09vcbM-hQ5{$0qhkNgTzVAQ(ckch6!=a*_VV6y^%X)%bN_0o7o+|H-mRFX{?0z4M
zxyfK$O07-;W069{6N)a-VXVxAVCnaWfxJ^utwL>;6VRIooFBX!^&lLI!v2AQZJrc9
z-)<n{6K<sIuN|0@hQS0_*trD!v*Zk;+&GS4PZJOh5J^0K7S9K0^bXTFd@_UJN)ISu
zDorD>IMKeJ9{jK|=o)sx+@ceM&COaUMmi96&m%H=Tf}*%r+*pVKm>k<#o#ZWP!S%N
z$|y9o>UoziLNvgYr)$V11US864AFj+>`O;Zo*dQs7hoM<1THdq2jIkcn{fm&VD$<<
z{~G$@#h!yIDAFXTGi#BVBNe%rLx?^eqrr>C?8!$Ol}FWRZjpnv+=#)5h8cthuL<Kv
zZ<fHa>vsl!e>{6nqp3}gh7($G&PIpYc*|Jr41A%;Mjj?z8VY4@L>zwzoRUzWifiz7
zn(S{ZsG?X28SzUo1|W8C-+~u6#}-9aA*EnFVuaSsfO-1>5$}q~Da-4SWvapbktKYd
zCxt7F>1bHh;LKhfG+bXd8?lxvRoN&|%f*<E%52Dbr!f0;4%*{qMVyi=pli7(jISOu
zKtio2ra1pXeI_nj9Juv~J6;Kl5an0ZS(___@#5_qOMiDEVDrKKw+xEH5`oj2TOrl2
zoxRdr1=_0CkIAWWEgnwNT$@<j{pP}iI}|5Ni1O^YG93=(snA(tfUA2#oUrh68tTSN
zkYyU6F}I00@3c2$BO_f34ZmaetI+*>tqs9Q6dl|jZ#H5h#mFgcb-M9o*j~-XAmN)+
zpO4%+Iiy+n1kMk7tSeaMMDEQk!@5ZJxc_t!8jWgkPC`+U{ZGfqL}0P|<7O48WT?$k
zig;2*#jM*naXsB8J}GocG%01=DoLumTU910_&=xf4@HZ`yyyS`002ovPDHLkV1i~q
Bl0pCg

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPad.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab7da101b5ab8605054069df4c9dc06f4908a331
GIT binary patch
literal 2021
zcmV<B2O9W^P)<h;3K|Lk000e1NJLTq0024w0024&1^@s6;k!yG00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000w
zpaTE|000010000w00000fMbcy000MANkl<ZXa((AX-rgC6#iy~0cHk-Q3z^9YY^*#
zf)+(uaG`ENt)@068Y}Tvt!-Mx*0i;M)Y#S5CN`#ZiCU{ojhebIxFGITF<L|skwrw9
zahQb}X5PHs_h5#3Gw;0_5(!f0B$IdVIp>~xzx$nc?tLJkiQpv==}Ul-g%|?*e`7kt
zXo%5nx&xuq?WV*DE<41i;MR0gLx|CCN}S-bLyQV;O*b{XG>pn$WP;c)<&JzUO8^P^
z@yQDb)M|6VNdY&CEGRr=<XbndZpOSGNPRtm*VbX6R*MU#{%+z8=Bpf*9)Z3Cl)mbK
z{XK=xV6)R$JUtfIFIw<S?+iF5u9pJCNAZJX26qVPkEa{4<jq*vnq9bk-6}e{CR&EK
zW@$kcuZ1lAeL$%Z^>-VqpE_{#k_k-O=8je)ccvD5HaEJ>g3l?lqahKgI3gx)%;E|w
zwq7(~_cbGOXK0~N3cL($!zSfLLvFlHfUW^`ehoL6NN?*wJt&HX%SB@gX{QWVA!%T^
z$Os^Ls0#g)!$f_80_t=D-<)V*1N~A&77{K&<^*Ae`t}dQkTeyXCzpYCQK0_W2wGnz
zx)8>A<zFjG%9}lYcOThs?xqC{TT&_i#>(Xqk~z_yF+z=?fbP2b3=bPy*cc`og`dwf
z5};~md-!L*ge-_znCtFdxE`Hl$Iz66fL<=N23F4$pKXT?em*;o8K91pA$?q=pN&zB
z$x$PQ*aJyGpn5BXP3QHTIQwok;lAF^rZC4qIwLb85g$*%S@;>p<f=FhSNS21&bxD<
z$cTD_!&}9+^-WIfJ!3@9R4pPRxq#GK8M1QKeq;C)0fBBH?3wK(cfG_#D#g0v4H%rN
zLO-wfCp<!m@zXV+E`JZYsmg0aYtwnE0H9hk!`rAgQP_7@_!v1@Y=n_yQqDB)>oO@X
zaIJ99BMS6RogMp2Om1J!^G0<u4&O0j%G+Ac`;$Fcg9ukGs7v2*eBB+|@Bq}+4eqYz
zx#NfdwifPYdW@vuaMC2L^++2_vL&(gxayM>hN0y63RXmct~>selzHK+$@;<uXmoO<
zWky05ufXW6D3Y?Df_AhQ6yJqV7uEsh#~yX*BRh&p%$~kb<0>gsw;tHo_upLygnaq*
zf<RB-v!JBL#y7^Jt2a6E+XVy0llN!(+!&zd9H`R09y?!yZZX4o=5yA>>>+c61S^bh
zVv-Vb7sVo>k0RJ%te-^ae=j$xZKyQ{zL6+Nd7qfvS`q1*i=d4UgIItB(v&$c+a$PN
zCd@uxpkc47pp6vdhi?e0^FJTjT+MPCdIhQZ0VG`BKB>bQ4a%MnU<6~9Kt)SHk)zQ>
z=IMw~l8*ViV+#UpXm(=$i5j<`;B#e~4zqfxV68GEOi4k%YrUYa+Ym7_8>$g+KtnD(
z+pic<N{U`Ek`${%Zc1P5t1w|^QgFwLJ8nB2ZcW>h36v2pUeyw#6j+%ShpOG>sQ9%M
z%6@~P8kXr3iQAQik<^>IfK@VgofQ*xTnCX}!6Y4upI9;bNHwlK6|Wz@VFZCPjvKP#
z$@d-q)r+xzJ*F2VwH7=f%v-B1s5@E>?ev9^D1`5w>Irio)sVu~CaJx{G4-{;>|_s&
z!l+kNSbDAw%sIZas16-TVo{*!x^TQVi2oj$nGk__12w4JRz~i#ty5P2`2e&`3w6#c
zHxABI9-DxutUQj6>3ozE2bEHIDNMopWI`M^-7(;1Lo1WTkFD5QCVa{8okTc#o9Eh$
zp3o?{S1&1H`6t4*{$f3hx7+WhPOB4Df0RR=Jqz*}|CH3`EdpfzWkDAuL;jd{mVFmF
ze^d-2RZ@I$=_$vw;zB*l<T4SA1O(bsCBv#w+(qZ7L}P?jiOL=K{N|`HtR-n|hi2MB
zjx9WS1j19&IXdsog3&QZjP^epd#dHg9~*-&FV~~d#y#$8Ee@={$_4Ko)4LrIDC7LW
z&>l#RX?^dsVKS^HEY}{WguN||yaO_6T(PB$6s55U8!&`5NeGMDynJsrzqW!T%`%dn
zzVcyq9Lh~C*yxox-abFv)T6w~|6{=0hiL}|R6)GfkBeu=enr^TTAZlaU+Ejm(>L9H
zhQ{+x5Itit`RbP;Dsvj-x<rp%sF6J|5*hv4D}8Ej6)99vY~i8W>VWT9JLSU1=j(jc
ze*K_;GNUH<iA2H3I4mLTR&KusSBv;%qH^bbNMm|KJ@Fm(=Qp!}VmUcN<m8){sRIQQ
z<M7u56ADR17n1|zTs>AL?jv{w6bkG#IoN_DWcSv`k%FZbsM_9szU^;MHo!{0W(sn3
z81#ENDoN@Fl0oFvy7le=kOIvs9R|u9<vA;v?_US`yU_-6oU9^6C|KD%K9L-UT3+`T
z5~zEn1Z#&b1q_+8?!>4Y=<|FAU5uXRq+Jm!1hgx5y))+wG1{5C+ZC}xjCRGYcjlZS
zMmuwNyCQao(XQC_&YUyEXlL$jSHuo6+7-LrnREUJ_Nh@QW?MpK00000NkvXXu0mjf
DDj%Wd

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPhone.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab7da101b5ab8605054069df4c9dc06f4908a331
GIT binary patch
literal 2021
zcmV<B2O9W^P)<h;3K|Lk000e1NJLTq0024w0024&1^@s6;k!yG00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000w
zpaTE|000010000w00000fMbcy000MANkl<ZXa((AX-rgC6#iy~0cHk-Q3z^9YY^*#
zf)+(uaG`ENt)@068Y}Tvt!-Mx*0i;M)Y#S5CN`#ZiCU{ojhebIxFGITF<L|skwrw9
zahQb}X5PHs_h5#3Gw;0_5(!f0B$IdVIp>~xzx$nc?tLJkiQpv==}Ul-g%|?*e`7kt
zXo%5nx&xuq?WV*DE<41i;MR0gLx|CCN}S-bLyQV;O*b{XG>pn$WP;c)<&JzUO8^P^
z@yQDb)M|6VNdY&CEGRr=<XbndZpOSGNPRtm*VbX6R*MU#{%+z8=Bpf*9)Z3Cl)mbK
z{XK=xV6)R$JUtfIFIw<S?+iF5u9pJCNAZJX26qVPkEa{4<jq*vnq9bk-6}e{CR&EK
zW@$kcuZ1lAeL$%Z^>-VqpE_{#k_k-O=8je)ccvD5HaEJ>g3l?lqahKgI3gx)%;E|w
zwq7(~_cbGOXK0~N3cL($!zSfLLvFlHfUW^`ehoL6NN?*wJt&HX%SB@gX{QWVA!%T^
z$Os^Ls0#g)!$f_80_t=D-<)V*1N~A&77{K&<^*Ae`t}dQkTeyXCzpYCQK0_W2wGnz
zx)8>A<zFjG%9}lYcOThs?xqC{TT&_i#>(Xqk~z_yF+z=?fbP2b3=bPy*cc`og`dwf
z5};~md-!L*ge-_znCtFdxE`Hl$Iz66fL<=N23F4$pKXT?em*;o8K91pA$?q=pN&zB
z$x$PQ*aJyGpn5BXP3QHTIQwok;lAF^rZC4qIwLb85g$*%S@;>p<f=FhSNS21&bxD<
z$cTD_!&}9+^-WIfJ!3@9R4pPRxq#GK8M1QKeq;C)0fBBH?3wK(cfG_#D#g0v4H%rN
zLO-wfCp<!m@zXV+E`JZYsmg0aYtwnE0H9hk!`rAgQP_7@_!v1@Y=n_yQqDB)>oO@X
zaIJ99BMS6RogMp2Om1J!^G0<u4&O0j%G+Ac`;$Fcg9ukGs7v2*eBB+|@Bq}+4eqYz
zx#NfdwifPYdW@vuaMC2L^++2_vL&(gxayM>hN0y63RXmct~>selzHK+$@;<uXmoO<
zWky05ufXW6D3Y?Df_AhQ6yJqV7uEsh#~yX*BRh&p%$~kb<0>gsw;tHo_upLygnaq*
zf<RB-v!JBL#y7^Jt2a6E+XVy0llN!(+!&zd9H`R09y?!yZZX4o=5yA>>>+c61S^bh
zVv-Vb7sVo>k0RJ%te-^ae=j$xZKyQ{zL6+Nd7qfvS`q1*i=d4UgIItB(v&$c+a$PN
zCd@uxpkc47pp6vdhi?e0^FJTjT+MPCdIhQZ0VG`BKB>bQ4a%MnU<6~9Kt)SHk)zQ>
z=IMw~l8*ViV+#UpXm(=$i5j<`;B#e~4zqfxV68GEOi4k%YrUYa+Ym7_8>$g+KtnD(
z+pic<N{U`Ek`${%Zc1P5t1w|^QgFwLJ8nB2ZcW>h36v2pUeyw#6j+%ShpOG>sQ9%M
z%6@~P8kXr3iQAQik<^>IfK@VgofQ*xTnCX}!6Y4upI9;bNHwlK6|Wz@VFZCPjvKP#
z$@d-q)r+xzJ*F2VwH7=f%v-B1s5@E>?ev9^D1`5w>Irio)sVu~CaJx{G4-{;>|_s&
z!l+kNSbDAw%sIZas16-TVo{*!x^TQVi2oj$nGk__12w4JRz~i#ty5P2`2e&`3w6#c
zHxABI9-DxutUQj6>3ozE2bEHIDNMopWI`M^-7(;1Lo1WTkFD5QCVa{8okTc#o9Eh$
zp3o?{S1&1H`6t4*{$f3hx7+WhPOB4Df0RR=Jqz*}|CH3`EdpfzWkDAuL;jd{mVFmF
ze^d-2RZ@I$=_$vw;zB*l<T4SA1O(bsCBv#w+(qZ7L}P?jiOL=K{N|`HtR-n|hi2MB
zjx9WS1j19&IXdsog3&QZjP^epd#dHg9~*-&FV~~d#y#$8Ee@={$_4Ko)4LrIDC7LW
z&>l#RX?^dsVKS^HEY}{WguN||yaO_6T(PB$6s55U8!&`5NeGMDynJsrzqW!T%`%dn
zzVcyq9Lh~C*yxox-abFv)T6w~|6{=0hiL}|R6)GfkBeu=enr^TTAZlaU+Ejm(>L9H
zhQ{+x5Itit`RbP;Dsvj-x<rp%sF6J|5*hv4D}8Ej6)99vY~i8W>VWT9JLSU1=j(jc
ze*K_;GNUH<iA2H3I4mLTR&KusSBv;%qH^bbNMm|KJ@Fm(=Qp!}VmUcN<m8){sRIQQ
z<M7u56ADR17n1|zTs>AL?jv{w6bkG#IoN_DWcSv`k%FZbsM_9szU^;MHo!{0W(sn3
z81#ENDoN@Fl0oFvy7le=kOIvs9R|u9<vA;v?_US`yU_-6oU9^6C|KD%K9L-UT3+`T
z5~zEn1Z#&b1q_+8?!>4Y=<|FAU5uXRq+Jm!1hgx5y))+wG1{5C+ZC}xjCRGYcjlZS
zMmuwNyCQao(XQC_&YUyEXlL$jSHuo6+7-LrnREUJ_Nh@QW?MpK00000NkvXXu0mjf
DDj%Wd

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@3x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@3x~iPhone.png
new file mode 100644
index 0000000000000000000000000000000000000000..5018f00cce7ff541b41b84edc5088e46ee32f276
GIT binary patch
literal 3078
zcmcIm`9BkmA0Enz<fukwM7eS$3Cn$7o7?1=$bHTbh9aMZMTAtSgd)PnS;LIv44I?a
z9L=2^n_HXl_4(!V{Rh6^AD;K~yr1{$_5Aey;YqcIoA7W6a{&MV9y3!z+apH&gA<%b
zGpvUkbVSE|^<a7cKureszQ^&SUESNs%m)SoTt3n#0Bp(rfMZ9B?Fhn0007tv+5dGA
zg&hCY{~QzY1{DDS?ie#eJ^N_3RhL+l{n+`#;H&|ky8OvYd;%#w7UB{{eFiznw=Qf9
zu|0edU{XI@2Dve7Dpv?!O{4g)mc8L<d=$w5$X|7qZ7tUo&rC=$P3Jetp_}$_>%Yuj
z@lhk25NV3dW_M_7Q_a24@2vbeAjf|FGf0cujcSc;rN!ZukC|RDI>8~UZ!KB&Dd7^L
z@S-VN63>2~?}UODB1<llEpcc#{C{V>km6(B<7(<Y(?;4*Jk=?E1z|PV)<f$0>+5c%
z^sat|U`U48ZIibhr0EW#&WgFIxh6KP|7?G2udtQmgj&hm%f0vDwUB#4uC&e)Ss$lh
z12AXfS^zdXh%wJ`Tm~7^k;*05<kma>5%rEos!ngDnCB!u9fC}&FMa)Gx?}CdYM#_1
zdtv3_lqEH%1f(E!m9xJ?!Xe@(!ZC7or21sWT*oZDKR=-T)BK$k3h6EQA#m=TP#7yN
z82N>fbSFDoP&4{gtk%R-!c}E(W}3X)6CRG6v&_AiXkP6nr#>erYoiAh<{HGwjio#<
zrvN?!4GDr*&z~fhMXnU~#)pKe2tzUJ-!BGpX#^!8@e56sY59Ka(DLaUjVBLgUHJSM
zu1fs?mYa!)-^WpKNML02x?_yV@O2PO_4fXyTASokxCvf(#PlWxgEd2HQBF^Z{s3Gz
ztSC9p<AiQ@v)Ns{C&E^pEYT!36`v7+O&MNBF=~qCF|imL3YbS}>C@l1AMm99TB8kd
z<Pt1Ijo_Kzm)Efq({eZHhggfR!H)|HSEFn|EBJROMpu%ne-r3@_a^!GtPZr|suw+(
zL<$vc0<1(*nvj!_iO?9m7>|aYf*E-)UW>6JsIIg>`f%SyE)PoJXfr1+eUet4#EA!4
zOVliucuaW?bMH|V+{E6jDa2kCq84F1)e7Fx^vJ$7Bb8RI=$XCqA8HF*{!aaz`vMmu
znYulS%98j{HTf{OyU6{<OX{Ea0Xpf!?;t)f$jaRD7@-@nZnBqeW&Dm4x-8p9;2RUI
z_Sj@r)>nQ$bh`TmSV_;mz4?h!J1cD|DOc-Z`F&yf@f}H{wFkpKTSIbhrF<1*=srft
zo=0&OU6xm-DNFTgQ6rur2a)osTqy7pT|v9o?%nO?((th+W<#0#H`VQ1yCk@`%SUf-
z6cI7ff^Io!=i`?l_E@N?R|`Fetu6mi4Y8tcymqX&n;Cpilla)vRQVPeqBlbTzA|pB
zJOI(vPot(dtPJ%HC!1s0qtkbsD>oJr@2LN}($3w_4UuI9r>%@&svo-IZbl~}nT9hc
zCVjXaWRz~^Wx)KB23F`%x+a0Du{CRE?7nkj!U+~^v;=3w$5pW$NWIbL1XO7swr)K6
z`!1)T!GN*$&{@~VuG%7ba6x=%93?SaLF;u**u5x6C<=$vxo)iy<M!?P2)Sj?F(19C
z;8s!M7M7?Og|YZ9n`i}lx(uY*AuA9&h=^&|+ZnY(EmZMohTeLx9@rqbcRxVt!@zup
zTrv}`nJTquXB`tllQc@_@lLwAx98tjBI6G#b#caWhyt}$rx}TA#;2@DcpLt(*iZnk
z>Enx7-=iogvbqx~jn3QvMGP-jnOqKNu37YY>L~;6?}lsNMYD9x>b4RdR|)LN0Ct}C
zjl^#!9jrQ66RX1HB7sO0GMccR6us#u@u8_fkS0P)OFmN<I-8h_n)Ddc!cQ~UN^fGY
z9Adz>Oqp#C^9oKm*7E6!H6Dt(lclJbPH(fO!NsxDYtJD!D$Tum$P1#DidSS~!N2^t
z4K5G+9LkffY~QU~i<X@<|DtOUuH*wEDL0zBIamd{*(ph#eOsKszG|JScM$vA+U9(E
zac}tUDAdMzF-^3xW*&$jUr|xISO$AJj^E|!b7x+56!y3uz{wFL8I`s8HtA<d6wxxI
z8COtO(t`_JS`{`Y8LmB(zj)ogF+l}DKx4;JN`2=OIXfb!Qu}Kh&EK*Al8?1e$|(xP
zPlK>dt@x{Ika-8VeV`@pZJ4@*91rinz;S62_xg|PlhaQj;@<%2t9k6sHg}+F%~E)+
zU985Ro)RuHRx47SHGC556}S#DZCF0EFu;-7$FrI{GIEW-Rl93y#=TnUv<ek{bgDd)
zu<s3aq*WkH;h>5`b=cfSg0F8z!sJ;Z--y_=>cxy&sv<?8<prT^JnVE8MbUM_g*S<G
zj9ICJv$u*4mBVw(<|g*C3c{X$Tq<wn(ACd8f%Qi`s|l(-H<06_9r^yGdjp1^ti<^$
zk$x?&7vcf$wA;r7=A5N~-3#0c{l2%}<wW|TGAiRY-|IKVP~x6-A&dEWt}J9c@E$}v
zup;LOU89L6K@OcM#*ORiS%r&-Gk#|%ii_)CMVkMzfQB<p_{}@2;NP?8Ij(2t{l>S%
z3JTKwJ1kKSQAJC-2GJp*2&I6Z>J<~?2yNY%>g#8m1eGI9e8DxC+=Jldo#h~zKDF1i
zok=?JV+hTF-97qTH_RhHn=rKF^^}xeLI^_+foEaQvLEBzN!LH2LpEj2gMpl%-m<n)
zV-f96>Y~r<K;22UjD9<xj)<|*j~HHC-M+d2+*d9*h`dL?Pi;NydChIp&QOvbw;@^n
z*}7mTh}Zm@MFPDS5+q(d?0?TM1n>GF(wZ_D%FvYXlFoJ`%;%s3T`+3u)|~<ddHg%$
zYY)dDA!>HI7_Zkm7yb;jxXwMZqci-0r&SG0pBJ20UP|JhoZIjs=DPsw${9m};VSfO
zSq=IKLQ%E)#UuaxSue2jBUgL&v%qqvtOn|xl7)rt-=afz$8+Q@6)X#kVL~q--SGV}
zT{IEMG7$vc+9GO9{Q9(WnKjnP_W)|}dP<0RCdgP5s(@&S8rhGd|CCz(S!HY$xc~jP
z=3^RdT`m#F;aGxd>hjMQjd_2Gmy^qW-D`426SdET8L9l1;ryK4-NRO3W<MdMB8!fp
ze)XO6$nmCX#El&TgU&fq{n5qiuT<ZI5SsO+sx5Yv$1XE*%;E?Qx7m7F23<C=Gs-j6
zMa`;y=0S~*y&Y!H1u7(&g^@TUTLB$s1kz7#OT((3Ol;!8NqP_4ugVnv)CF?p<`Es*
ze_9+D<{73>#Y8LOJ(?I$6qPI0f5HpZl$%DM3RE@HafXsx8r7d+D&MTO4cv1kU5JBf
zEvL|?1Fn!jW&WLh&9Oz0aAR8soENL!L&&0g?zDNEi|qODmk&h6216@sM>SAkfY~ie
zGeZ4+!(a10Z)du5v<&+Q-xmur4=66qw9kVolwDiivFkC)TYZH+^DkD7%m=!>-pr;h
z&GF|P9}VIWc+;H;GN(c!w&vQr-Tt;U`<hnVwUn4L%$n{GN`vHzhAcALS!xS1CgZBf
zTW7X+ZUT3H%OiPku8nb=4$XZ;H7Qpe)L0}|%=D|#wxjugUsx@U$U9y;hIvr_8$IbU
zSwsc3aj}+x(gMev9dx^np0cW`BlBCh%cE=Ui^D`Utf-VPMl?+$ehL&I)=$fWq@#vP
zVfhHb%iBq*<5tNT_+ILUc)-BuF9j2xK+|4_d@6C$aeRtfFuqntRtLiSL~Z8D845Aj
zx=t$}hge+03zL^p-5H@;c=7vC*;sN!f%a|TXaU~HWrmw}7X`7Op|WxKU_xEw#IpIy
s_@}oAI~*41<5e}6{tpfG-&%XfmMK!o54m@)<DW8aW&}5^(!X{8KMn@fSO5S3

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPad.png
new file mode 100644
index 0000000000000000000000000000000000000000..28aabff4a999f46dcb4c52d42721d09a939b33ac
GIT binary patch
literal 2895
zcmb_eX*|@87XBM!EMv&NWXm!n<jsV_Sh5Yq3@MD|#bnFAE3%HYtf4a2lu`)U3faas
z_Uz&vdn5|kGPwG1@BMy%_rr6Z=bZC=KIcim8tcKB_?Z9zfT8rYP0twn2Mmz2n#{Ic
zc1B=lO|&KeRHi_w_H<{xvZDpc35^D%&ol!-6Xyzm&lJrW_|E_UpaRf;CfEYn|LQ+W
zb}7#Q0AOlEX=|DV(`;BVx^qtOo$P&L4UPKiX)obC`{E=GhqwF+OJSLmEAg$t%f#mb
z64=+-25W@`tl2dCEm0Hw8%#`Sl+J~j{WUFyc}VmkbkT2PciJtaN#)Ca=hW_fXXikt
zI4RlezqO85nodtCM6c7GG7~yR%|ZejR#K*fp^8BYAS1wZ8gv@Z7`i#lWw10@IOs|T
z7t{>MNQf}<=>Ty7j-nzrtt<ZrOU;$#Q|AuD<eI`736b^C5vM78#9MHHsyDESoJ~Bu
z`CZ>&%;85eck2@#oItk6BdAbj^JQTCc2Ln$FmdQ!@Pse4w41kd(dJ2&_qM6ZNo`k5
zAs^%sA6|Qpm&4#)fWArV_M0*3zQgjH896e5*VvKWXo<W_0n61}$k7S^htmjBMtXUB
z+e>icxHPya0K1znfJ>)NjR}(Uj<PL3^fwSI0xcm<mjesFJ4u3QT*E{E`p^<pO|wvt
zmKif4<kBL{a#c&Gjbxohu@JxVi*9TQd?NOCUcExp7qxvbg7>V)9hX|`l(EtehNR{c
z>-^*YR@}zvAtc66@VO&9#QVptqV?-<EeT&Xly9wcq_UAb;LmitRDE+8#dOcJm8vGU
z^kZ6QROna8de4`|_|}QX2m2R;mN=2f$*5Wu$jH}8`x>|3rHpEv11b5+qRSkhiV<N_
ztXPu0+B%D3+aS<^xmF+{Czyi3aXE3=g82?ucX4^Alj{+K9GIN<#*4N}*KUg6You{k
z9|bjO#yo?PEX{svsQDIKh>np2CBbt?&e<mWH4Q_8($+|KH3~>i9acP0-7$*@kIn2)
z@9RL@@t4OQMsEZ#<b)|uWt_a%j3ozb_B-#)h7UxOKYALG74UXhNH}Im9CiaCfV$8F
zjMpC@R1mC$8bio*Jcr}ZM0c?M3E=MM@-w(naMiyxe4#GqJp>s}-@5W8=g@+Kx$-wF
z(ys&O@Rb+NYx{#HPB^!cm6&!_71=#ZL_xfd=XL!}!jqoY%0a@B)1;5`0ggy%+^XFy
zIeY;IRv}(<Z`Du&#ohK@!K1&+y6Rjl0TWgYEa?YqcdNLSFDL~*8eh95WlIWox^SEh
zP%%36ER>~p`+>H5b9X&>P;mI2v={8?XE&G&F0;AUGq3dS7d>eojI4TKN8XFg$HQ<<
z%(cQR_qAmHkqxo=nZ}E1R*g<OBGc&vPNEJ_g!<{=>LJr_9_ccK_>;=@>0_7-G=LA6
z8mq4pW%zn@OW0a-JI<TPrQFD5cd$<OpwFJ)Sh}y}(%d~5%dH-m=Pog2G0TAz<<3Rn
zjP8ks%_N^&Q{aTn?Lj?fTvxw|39Qfiq9p@uwnWr!Oh^_DYZ$ArtaPfkn&m!{n08L~
znbn=6b|U=><KAr^dM|;RB?$+j>ZbuSNxDG*B2wbjZXi-E^M?4V>PjiVN?&bvf`i(6
z{k|bTwCR(G3)=C@Tgy6oL&k7=s@{b5`yC|xKqFmhp8%Q|)S$sZ;M@*ScyZH56Rnyl
zTNp3D5u}GfpiJ85x#;Fpx`=aYoPi(o`(YkojUm$=QRd2nt=#XqiTsi2y9~9r^{SYX
zqiuvLYV5&08$n)X{<?kf!g-%&lHHbVx`o`pvP&I%4O%L%7mhQ-@FBo^rL5?*gD&dz
zB&PgEW!~tV>sXTjE3VKVXziiP8_TZWM~_#f%xHZzk7l1J&A{s1wJvwoWsUtkxYxtH
z_Pe?%udhoe2q_nVOjol8leD`%M_Y^xz*!%^pf<W>t+dz19*cN+SIovX*jO)|`%Jtu
zQlVCVE@krSN#ed6>{mU~Bza)=O2KoVH}oxbSX#K<(v^g#CiDTNSt2IO&H;(%*zF4M
zZ}N1|ReZP<QD|i#(NK|B|1<MtyZ!rhR1Z6Naks#8))(9m1Es9;6v^d$43+hdu0kyU
zd0$ME?qdea3=!|1eob?QxQE!EyB_cStebDy)cOm*-S~neo@67ZE3}fC(9<2bYEswC
zUla1Cz^AxP5$_}Z@O9<2SE+O<S4JAT%$aU#_iX)DmYvCj%afZjPwFi{aOBI+8w#}s
zE-wDq{yc|>e>X~R;eT+;n29QW-u$?TIVdPJ#<PxfoR1PYeo+Xh83rFUI%_#Qs(($c
zbTD;tc&WGLa^4rhSNZlitbwc+e0ax0cs4;b9wZ+l9<3yV<|;caqar5#@0vXbjf<Fs
zH9rA9Y_OPJSNjgl<0<P>^kW>oUA}wjaGR-8)OFKY{Oi3Mc|IgNBrNRBt6Ejl*<=j)
z#ozflpCY7yl9nnT6fcoeopI?UajWkJOYo&H*zi@);CHe3{UKu(w`_T?SbKc?PAIL%
zT}UY%)Il!AKxwWdVM$jH)RanLJ>I}kw|e0jwZA@Yx`B=OSve$zfpirt)fM+~4vCmM
zb;N}$;<LOyb-+_nfsMz#N|Zaoxesj#iM3$RlJx;zqdk8y3xkPG3XbI^d$0bq&g0mR
zm!zKTd^!$|>58jsc404q!&6*<l3#t1+%iI)r~T^c<j5I>SoXkZ(eCxSm7R?AuwUA;
z)wHoK>E;4E8vdV^rRgEtnE2n%Mh{#y)6W?OZ;VNr+KF&i{B~DUMS7we_O!&LQH{m~
zaT<Lk3-zmly0Yed<r8!LRDXH#ZnKl7jD49*E3fDa9)%uzBUoaY0FtZnde>vpZ|$Ld
zKLOq>(NM;0qNDEc4ep$>^_DE+gK#BAk73PCCG)(My_v#*LW~@{*32D`*XXzjxP)JQ
zSS~Tq|1spM%B7*PZc6!Kb_2GlC?~=>y6M0*S%`nX`Xb+-vs?Yh%94~ngLq+Uc`F0N
zKW{6_XTExx<<-2=S(!bl4kJygASC%Tr0ZAGIPc&>&iAAl)7tXqgN135LA)t<)!%A6
zd(g|I^hcJ5-+pR?_iMXdEq?YOQq@U>wlr(Q;wnnWWF%Y3{ZQ}rBtH^pk&VvsE)vC{
zp^zZCUi=H50i#<JxdoDT>0%e_)E3UUAa`?XUiR~Hi6)0Z{P&%_7_vxHr<JBdPM*^T
z248kB3q@JRvL$}EeoLRtdkMTP#cnf`f`wTMMhqHn9M>3BiXAQF!{cFo^j5<Lik{LX
zU)@`jhK)c$y&dq?xRhvDDt?Gnh;ceVT#Ggrr+VbljC|fJgo(|yrkt)=(|*(6<1&2r
z1ks`sMqxAb@xl{0ZQQ>_#f0umy`VHzzXAUv?OI1FW>$cg_R=r9f=5<j<@^Xkfl+R`
zOK;qUi<xRMEV~UaUmWpa5)VBS!VVSKlNHl_jhK5t^3{<~s&)4Dn~4lB2g!s?i=E>F
zwTbDUy}32PKjNOb_bPe?aqXGu|3J8GA3F5NKf)}W$a6m!I0D&KfA-qBw|-A4On$0$
zuK^ll4iC*}GlH_HPZ8%1IMuv?SX=*g37*Z`hba#(eCQq=OA!~lHXuQ!h1!Xqqbw=U
v%TUom-%e3=pn^UxLz@3<w)=NN+&TrNC*diVzUub>Nwp{)W9@P+yQqHwygM{S

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPhone.png
new file mode 100644
index 0000000000000000000000000000000000000000..28aabff4a999f46dcb4c52d42721d09a939b33ac
GIT binary patch
literal 2895
zcmb_eX*|@87XBM!EMv&NWXm!n<jsV_Sh5Yq3@MD|#bnFAE3%HYtf4a2lu`)U3faas
z_Uz&vdn5|kGPwG1@BMy%_rr6Z=bZC=KIcim8tcKB_?Z9zfT8rYP0twn2Mmz2n#{Ic
zc1B=lO|&KeRHi_w_H<{xvZDpc35^D%&ol!-6Xyzm&lJrW_|E_UpaRf;CfEYn|LQ+W
zb}7#Q0AOlEX=|DV(`;BVx^qtOo$P&L4UPKiX)obC`{E=GhqwF+OJSLmEAg$t%f#mb
z64=+-25W@`tl2dCEm0Hw8%#`Sl+J~j{WUFyc}VmkbkT2PciJtaN#)Ca=hW_fXXikt
zI4RlezqO85nodtCM6c7GG7~yR%|ZejR#K*fp^8BYAS1wZ8gv@Z7`i#lWw10@IOs|T
z7t{>MNQf}<=>Ty7j-nzrtt<ZrOU;$#Q|AuD<eI`736b^C5vM78#9MHHsyDESoJ~Bu
z`CZ>&%;85eck2@#oItk6BdAbj^JQTCc2Ln$FmdQ!@Pse4w41kd(dJ2&_qM6ZNo`k5
zAs^%sA6|Qpm&4#)fWArV_M0*3zQgjH896e5*VvKWXo<W_0n61}$k7S^htmjBMtXUB
z+e>icxHPya0K1znfJ>)NjR}(Uj<PL3^fwSI0xcm<mjesFJ4u3QT*E{E`p^<pO|wvt
zmKif4<kBL{a#c&Gjbxohu@JxVi*9TQd?NOCUcExp7qxvbg7>V)9hX|`l(EtehNR{c
z>-^*YR@}zvAtc66@VO&9#QVptqV?-<EeT&Xly9wcq_UAb;LmitRDE+8#dOcJm8vGU
z^kZ6QROna8de4`|_|}QX2m2R;mN=2f$*5Wu$jH}8`x>|3rHpEv11b5+qRSkhiV<N_
ztXPu0+B%D3+aS<^xmF+{Czyi3aXE3=g82?ucX4^Alj{+K9GIN<#*4N}*KUg6You{k
z9|bjO#yo?PEX{svsQDIKh>np2CBbt?&e<mWH4Q_8($+|KH3~>i9acP0-7$*@kIn2)
z@9RL@@t4OQMsEZ#<b)|uWt_a%j3ozb_B-#)h7UxOKYALG74UXhNH}Im9CiaCfV$8F
zjMpC@R1mC$8bio*Jcr}ZM0c?M3E=MM@-w(naMiyxe4#GqJp>s}-@5W8=g@+Kx$-wF
z(ys&O@Rb+NYx{#HPB^!cm6&!_71=#ZL_xfd=XL!}!jqoY%0a@B)1;5`0ggy%+^XFy
zIeY;IRv}(<Z`Du&#ohK@!K1&+y6Rjl0TWgYEa?YqcdNLSFDL~*8eh95WlIWox^SEh
zP%%36ER>~p`+>H5b9X&>P;mI2v={8?XE&G&F0;AUGq3dS7d>eojI4TKN8XFg$HQ<<
z%(cQR_qAmHkqxo=nZ}E1R*g<OBGc&vPNEJ_g!<{=>LJr_9_ccK_>;=@>0_7-G=LA6
z8mq4pW%zn@OW0a-JI<TPrQFD5cd$<OpwFJ)Sh}y}(%d~5%dH-m=Pog2G0TAz<<3Rn
zjP8ks%_N^&Q{aTn?Lj?fTvxw|39Qfiq9p@uwnWr!Oh^_DYZ$ArtaPfkn&m!{n08L~
znbn=6b|U=><KAr^dM|;RB?$+j>ZbuSNxDG*B2wbjZXi-E^M?4V>PjiVN?&bvf`i(6
z{k|bTwCR(G3)=C@Tgy6oL&k7=s@{b5`yC|xKqFmhp8%Q|)S$sZ;M@*ScyZH56Rnyl
zTNp3D5u}GfpiJ85x#;Fpx`=aYoPi(o`(YkojUm$=QRd2nt=#XqiTsi2y9~9r^{SYX
zqiuvLYV5&08$n)X{<?kf!g-%&lHHbVx`o`pvP&I%4O%L%7mhQ-@FBo^rL5?*gD&dz
zB&PgEW!~tV>sXTjE3VKVXziiP8_TZWM~_#f%xHZzk7l1J&A{s1wJvwoWsUtkxYxtH
z_Pe?%udhoe2q_nVOjol8leD`%M_Y^xz*!%^pf<W>t+dz19*cN+SIovX*jO)|`%Jtu
zQlVCVE@krSN#ed6>{mU~Bza)=O2KoVH}oxbSX#K<(v^g#CiDTNSt2IO&H;(%*zF4M
zZ}N1|ReZP<QD|i#(NK|B|1<MtyZ!rhR1Z6Naks#8))(9m1Es9;6v^d$43+hdu0kyU
zd0$ME?qdea3=!|1eob?QxQE!EyB_cStebDy)cOm*-S~neo@67ZE3}fC(9<2bYEswC
zUla1Cz^AxP5$_}Z@O9<2SE+O<S4JAT%$aU#_iX)DmYvCj%afZjPwFi{aOBI+8w#}s
zE-wDq{yc|>e>X~R;eT+;n29QW-u$?TIVdPJ#<PxfoR1PYeo+Xh83rFUI%_#Qs(($c
zbTD;tc&WGLa^4rhSNZlitbwc+e0ax0cs4;b9wZ+l9<3yV<|;caqar5#@0vXbjf<Fs
zH9rA9Y_OPJSNjgl<0<P>^kW>oUA}wjaGR-8)OFKY{Oi3Mc|IgNBrNRBt6Ejl*<=j)
z#ozflpCY7yl9nnT6fcoeopI?UajWkJOYo&H*zi@);CHe3{UKu(w`_T?SbKc?PAIL%
zT}UY%)Il!AKxwWdVM$jH)RanLJ>I}kw|e0jwZA@Yx`B=OSve$zfpirt)fM+~4vCmM
zb;N}$;<LOyb-+_nfsMz#N|Zaoxesj#iM3$RlJx;zqdk8y3xkPG3XbI^d$0bq&g0mR
zm!zKTd^!$|>58jsc404q!&6*<l3#t1+%iI)r~T^c<j5I>SoXkZ(eCxSm7R?AuwUA;
z)wHoK>E;4E8vdV^rRgEtnE2n%Mh{#y)6W?OZ;VNr+KF&i{B~DUMS7we_O!&LQH{m~
zaT<Lk3-zmly0Yed<r8!LRDXH#ZnKl7jD49*E3fDa9)%uzBUoaY0FtZnde>vpZ|$Ld
zKLOq>(NM;0qNDEc4ep$>^_DE+gK#BAk73PCCG)(My_v#*LW~@{*32D`*XXzjxP)JQ
zSS~Tq|1spM%B7*PZc6!Kb_2GlC?~=>y6M0*S%`nX`Xb+-vs?Yh%94~ngLq+Uc`F0N
zKW{6_XTExx<<-2=S(!bl4kJygASC%Tr0ZAGIPc&>&iAAl)7tXqgN135LA)t<)!%A6
zd(g|I^hcJ5-+pR?_iMXdEq?YOQq@U>wlr(Q;wnnWWF%Y3{ZQ}rBtH^pk&VvsE)vC{
zp^zZCUi=H50i#<JxdoDT>0%e_)E3UUAa`?XUiR~Hi6)0Z{P&%_7_vxHr<JBdPM*^T
z248kB3q@JRvL$}EeoLRtdkMTP#cnf`f`wTMMhqHn9M>3BiXAQF!{cFo^j5<Lik{LX
zU)@`jhK)c$y&dq?xRhvDDt?Gnh;ceVT#Ggrr+VbljC|fJgo(|yrkt)=(|*(6<1&2r
z1ks`sMqxAb@xl{0ZQQ>_#f0umy`VHzzXAUv?OI1FW>$cg_R=r9f=5<j<@^Xkfl+R`
zOK;qUi<xRMEV~UaUmWpa5)VBS!VVSKlNHl_jhK5t^3{<~s&)4Dn~4lB2g!s?i=E>F
zwTbDUy}32PKjNOb_bPe?aqXGu|3J8GA3F5NKf)}W$a6m!I0D&KfA-qBw|-A4On$0$
zuK^ll4iC*}GlH_HPZ8%1IMuv?SX=*g37*Z`hba#(eCQq=OA!~lHXuQ!h1!Xqqbw=U
v%TUom-%e3=pn^UxLz@3<w)=NN+&TrNC*diVzUub>Nwp{)W9@P+yQqHwygM{S

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@3x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@3x~iPhone.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5939d48495852bd69d3884da487357b4cfddc4b
GIT binary patch
literal 3972
zcmc&%={wZ#+y2NJ8NP}NQOPc%EX9{X7={tqvX-&aAiJ?|iR}9>%QQ4XhO7<3WKVWu
zY=aQSVC?+#d+|Jf!E-z>&igv=>pYJ0x?bJqaYyUws53KiG6Dd=4AxN9JFh-}!9aI@
zK7`2(ofjIrC)!T{peml}_$BT6UCzcBY^$veh@5i<fGWxXpgCt$=iodC09+`z@IM`&
z0_y+ee??Id?_mG{?SWOFJolkmH+OL5?qClrH%HebQCLUksKt11PL2Q5iA2y6^>b<q
zl0=qgH8k{|m$_oYi<ApQim?}q3p65l1;Y7)sp%TA+_!3Dt8D0}xMgs3)~2{e&OaJ9
zo#J=0e^yX3*7H_!*?WsE*~=$3#-=x$;fFpmy_{OX3=EPkG<uM=OjpReU|^gm8wwZ$
z&SZuR{J)Z6v{-@o;2+bM@Be?cv_X}9#MAe2{zbd+JH|DQe84ErmkbWme0aoyx}SCT
zt{9Fhow05v{d2umm8ugc6K}QolZSM)xHjT6ZKbuCVZqrc-rQRB#9!3_P+(&kG16YQ
z7(cdUY6|+O<+#v-Wz;g1GpHLYlUtCYhloRdO+tovG5m+KQPY*n%{t<I4(~aVvErtw
zO|v5JPul!l?#U6O#=Pp<hdw}DZHuu(sXB7*l~*54Hfd^q?Qyj+ZjOUf<_o~Nt<o+k
zgOh8?IoWl0n1;YN508!;PSPFg9&fRmxRdB6Zw-=55V_w6y2}FPJet%w3y}l#rd}BE
z7{hmw>gQ{BW76eYRSX#{z#`cAO~*(irADLH<j0FD+uRl^W8Y>jR@fDI2XAZRw(O8+
zwW8}lz{d3G+YRraA?A@~x{~V5boqkWS1lzEKKz=K5Rbn*HzMo+80Bn41R(uq(Gm@_
z#_ho{^3H8~NM>3EF=nZnNwDO}&!$VL8~tWycG<0#Us#R>YaKSUT&VGHoVaZ6g}EG`
z0>=xv{|tU^_(`31B>-gR$4yAOP??TjiBFg9X%#$6Amn??&@NE<a6+mCIDnXr3)gT3
zKHe_j!Ip%hCSE+W^i5EuX5BaQ=D=}HiW&dGDn#kenX*Ogb{Db@-;t^5nAI(yqaBv{
zhC6FgNLY||)(BMBo;jK*f3kfT=+mgD=(ZGxX+7qTrnRE9UAm?uX+Z7@B5RZKCoYrk
z4w^8vgvCd-ta)xpRF8Qj|0|o<w4=z=1naaukQR4M*rxkD%g7o?y-f*Q-$%c_@2C~e
zBEx&lq&n2`>(xDG`q}RC>4d}%Z&wX1XbAflXmhcJinP%pA*cHL^XA}XfX2SLxZx#h
z_YVuL<TQ|k^VHNW)XlH_-_<QL8-*@+>LkFe2#TTW9`x5j{#?Ii3xpOWeAAx3<BgY~
z&flm62#X5tPf<)#xz!U4u!02$L^h;Qkrc?vgoypn9lDI;iSfUyMIg*vTn5L*O2Hij
zh>43Y%B@OUxwuNIJZSgF>#4>io34m5Q>089oTj3RMOMU{2P=v>>cj+<*g5EaeW>sw
z1zZUdrsR%;Lb96Oj`U33g8!f`4a=u~Ny-K$5^+Mr48X{(63TCsxcINWlJU-3v>Yay
zyVU;d(N=;4knso{O2r^A^dn*ix)LnoT;)A*!g}q)_BR5#F(jwucdnkJ8}vkQ!W6@>
zgv$^uf;8M=7SFw#zcaEEg4jMTF>!ouu=bmd1WE!K<k`%u_(ONGA#j+LfKFBWr~1_k
zx^g{K`pBM#wgnr&ehVUZrT80)?N~kU<!XoixDMqx-W0>Q)UBW(O~7(YvnHZPOBxBS
zfWmGe#Qx*OPHPy4wMay@=55j6w#F_TLU)-;pHh+1;3-_?`#XjTmj-$Le_KmGZSkd_
z(D$WzV}n-kyp6cur{)K9xZA!;8pcCF&m2n{Y*=d%V#_Jw@dop54lY;CSHk~r9}KT6
zk;V48;)jO$RxbpgXQ%g~-bzVZh9bUjn)BZvq9nc5p5#sD-pHpwQ{aZ2O2%pTusB(3
zLb(A+^<3Tp$J)iZ139ln5kY;VcA7R>f6<z-MWsVA8k{@Yu<gJW<MLs*hBO>a?)zyS
z6$HIzrSM>G4qWb${9Kb6+DvZHXn8m&kI?va&kDP#-~35*tB*7CovuN<{#vW7`X$a?
z{#(JKWw4fqWzZ2z69vq7*@1Xswt+WK$;UM0>A;-vxgt7ZIYJuVrxD4NU~;7v+v;mg
zQOEQozRS?-SU_3t+a{4|4wi5h!$H<t!(Z)M3@ZW}3r!v`pc3JECDbzzu6(Xp`<6@@
z2DCU2^hUd^QPATxHG>;5NZYNxGP-BFdh@7VVm5o^C3ZI|?szz8w`}Wn7P7y;O7g(=
zy-N7-!q%|k{*taBr^LPV&KypDoc@6DXgs_$vz^ve;oO%M4f0*JYx7y1+UT|>_tl)*
zdrCpId4$!XUz{(Wx%xRnKWck;zq-x-t@~@`>(}=P7H#zv8Kn{>UKPKXP6$BpWj#JV
zT*qP5%|So5PZ4WE9B$8V1x%Q;BuGDTH1iH*Fv~PFmb+iol_933s5HVNx@-ehkXCfP
z&Rq5O3^Q#XelW!q<`jKO>1F40dLO*R@0alDwbG;s{UnOH!NH5n(f);h;Z~T~&s$r*
zg)VC|IDNi@+zQ=#(AB)PAdv8eq#o3uFO0OKxQ@UW-cN)42(Iqg&kJ+9A^P$2bu0PI
z?f&5_KBuAq+a3PP#Bl7c7jsA-m?tgSNYbT#p>X@eD3r2F9(z_JM<ebf$KM5VA?^~O
zPDdUqmZ;<hri^%uf_j<q{O9D}ls`2@i2^e|g$5zs9IqCm*C{!?>6wfyy*;V9n_J3@
z)KM=#ssti?d^;XhnkOKKW6OJ!vgkIP;L#5Ln`LGit;ij4QZ|R5Rg-BR6lzr48o(<p
z;82WvT@UcARkm#||M0ekc_U^{YlK*;Bh!~A(FTJv<MbF)ou1qYy^A;N$ey1DyM1l0
z8~;o0yJBIUVHd?^D`<Dn>pd}R7gJp__ks>V8l2lE?Jca6Ozs~Y_<nt_FlGiUJmz}W
z`M6MUE4?YE%N7e|T+FHbTtUz2owO67@hfV%0I3;x`F?<*WU-~*om4^c%btE(JFp2}
zJn-a1a#nK;Zo>%jumi`XoX+jhgJhnVeq%WfFKxEARMF*k2&$**Y~GJ9nGEW`wsDc%
z2fcfPsWqbNFyiyA+2s7f+fefpd~`y?(cu*KmA2S^h0|-g%8nqG-UW@2sdRHzPW||p
z9tn4B)^#a6*BTo@hL_8i_T#*ng!99WJ-v_@Q(vh%sVed^XpOFt&PZ#cD?Azbf@ed8
zySkS>5dZiltv{Ne>TCC|zk7BYCnj#NW)y2NIczd3^ny*F$D9=Q@O4I3_I`Kx$$Vbm
zW_RK`U?<j(cdcK3%(uf9Drl0#inYJe|4P0~g58XmK+&i|_%O2Cep)I?ey2Fv<j!~u
zn^AT{Td<5m){lz$I~emYb;1;0^S2fFFM9dgv>PkG$cyX?22%Qad8t7stctegd#nm%
z6vYld7cf|HneOYLOFG4R@}{OIOaDLw!rfTqVPg^9;eaSoD9nXgcTWvdZ080GE#K)H
z!lcFbMwGY8)IRo1rlpMwM;QxF^teIQTdyBZopmZnpDk)IAyo9*VH#~f(KDY9JlTbc
zC3$JNblwOkVU6xbiwC98u?)_<If?}yniRprjA<!b$*9A*RN?D7t`#P{7R9T6d_PPi
zy%*W>e~l+pZSC*UVgr>)a6IoB-7JP`YRjKhMud$wTjTX7!@N86qC=`lS?SPFxX;D7
zF#`00?#cX^yY$2u-YMuGsB|g*DfVdsrduxQ3jyM8#MAokaTH8K9VLKORI?S*sx|Ud
z_6_*M*6-L=Hb!g3O)PbIZJaQ0Dvie^=ji$+9uJqsRKDyZCKReoDmp~Q6_IcCD*DpF
zdM!Gg(;ig>bN7zk+npE2Yq}ftzQizY%(YtoP@CuN*Ojh*Y039HfH1^t1@Sy>aOU>C
z!U6GnW!~04ei=s5R0hS346qDz8yj@6J$#=8&B-7akFOxjS-@yE-(+rH^H-qqr)kMu
zAHPNw{i)cDa6yhBpLD%Anp^3{L6m#OH5(eJVsj;K3J>(b1iF&tCAg@sHZpWUh{qd#
zzfoz?u|9`C7Xye_CP|wwP~)0BS7535YiPE^IK-FSVzp?-rOG!N;^k_t1D(xWv<FMf
z?32;4Q5p^7khiSOsz$*-Kl&(mKA15(a%4|u*@Yw8iKvCGJ~QehHAml7`<D9Zr}FF*
zI{kd#<bCqShBLexsJY{j1XXu}Ym4v4H$?h*NyBH1P0bbp&>QD(xQ7;6uU-E<l!kSL
zQ~k)p4b-t->f6IO*)tEH70`0Fu%ceMy@GTMywnSVf^7|JBJP*SJErC-c<KS5Wt0Qr
z{)m<)|NFmDlJXj5@E|X%Q&wNT<oS8-3({KE$m8^9q^7kO|Lc?D<A_1r$5?BYutCw0
z=d;1+p)jNlC)WNTIUE^SV=VC4{=a@U51{KNds^?j<_$CzFq|!!-Y_DHS33d8gQ*kY
zBA_E0#twA)Yk>ES6@WmB_6O8&3-3J&osiN`W}NJ|-SP|3NvbWrhiUrHHIup$Jd*rw
zSSqm#EQmt5r5u4b<CI(%_qb!d!atdu<GNCGqXVhir}W^{LsFMExT@ay9aC+p1#YAc
z$Pje~Ho4bAhqQ9p_@fcqm&orDUuY)T;mn<wtU74cC6)v|S(e<s3%OKe3Wvo|2<Q;_
z(k_dyV`lNlXjn$;<b26T^v1K$SNhr!3SXWb6|rdxoCFDN(*)Ms-Zrmwsd;6!>PCYt
zjWj~aK7#P@sWb}ORu;}#b4dWUUARHc3sx%aT{0FxZ(L%bGz~T~GTx;L$hg6$;=~Zl
z%*;FGLv>GHEpn6<;Nn!Q-MV1q6?+MN3y^t$a9*Ir{<(Jjg$m$ozdzo|6g(j*RTBw}
q50a|hUj@Ec!|a)<{_h5Lo&mNRY-jEhSsj1B!r-Smsujvsq5lD-1*Dk(

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40~iPad.png
new file mode 100644
index 0000000000000000000000000000000000000000..43cafa80cbfc37485e1c7d63e7df89a4f380b5c7
GIT binary patch
literal 1340
zcmV-C1;hG@P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000e
zpaTE|000010000e00000SuRAD000E9Nkl<ZSPAV{Z)_7~82{b%f48os8(Wvb*rsd~
zhMO{}(@d0XY+wRWqA`;2#gHhPKr~T4_+@GgM(_iXn5fY&45#7}HHMIhu51#PA#7}b
zL$V31<4?DCUE8hg+B@I(y54%bJ3yNdLi!}lJ<t36p67n|yw7v*mEnot9v1c<<|a_f
z5KMQ6G8N2JFx?8I8=vXH`@VwObf56Q#QS}5@SJ*t$;`rFVkCgu5}b|l7#@m9f>Mpr
zas%`RY0^|b)u%!nP7H=%^6}_AGPTex+OO?)Am1dVB(+3nLOC-UhF-&<=U4z&N8}`z
zlo(K+e*t_n2xe*hg6MhkP=^mE213~TdJ)d_OvCSu%{%9`hilEqFO<_!onrcl^HGOK
z_-)u?1H($I#4rr#dhFM?grC~p4Ua|f`{^LUQ4Zh!=EM5URv9_Hfkne6n{1sfs1j`N
zo5IkI2nNQ&IOPxH5vN&_pn8oNj$k`D_epS`L2!LvNc>6Tt6#iGe$jRH2cfaED0$G3
zbPLz|Mhh%fWh#oR!3c)~$0x)j`#UF4*OUXJDFHVa$rCs05OcjNVq)Fz17V+NQ{{Mn
z2p6w}C2L<3!p+ayz|QT+qC73?)>$N&R6~*AXI)<SrsE=RJQ%~l{z*K&AxBtS+f2v~
zehfa~7BT#c7qRa5L_17|tM#aqFm(=(MR4wV1goFO60l9r*`U#gVKPNVaLgaWcc=X_
z;Gy10II0Y&TxEi@W*qTT`(+re?@RDxyQ#FhCgBUnhk^R&&^Q|`s9J4CMU{~*sS303
zlfU=!3|yB&iUE%<HDTTIEO3{827k3%5yKSL0u?Wy?U)a<%KU^l=L$0_i%Bm^XHS+>
zHrD|y54UlCds8FIw28NDG+Ka2s3O%R>iUQSdUDfo9fv5Z{&#0a!-FF@*%peK5{isq
zX^sw`4v>E0q{->~aK{Q8E`D+rW!sA3ZQTn#HY-WTuo`6T+6Mv^q?NRVlGx1}y!e<E
zTRYtNrm;u~BCg3Epwyznjw-tdNGiLkb747o6W(4AJUvllKeajO60cd0uZPyLOt7~<
zX~*Jh+4Bp&H`eB2Pu~RE{`TX?e*$8>k|HBWK`m<*BQNF1ahSE(U2etb_rpSt(H}-&
ztlb2SHCN2Znk~p_dReqhItDwRnfE6h4>^n|TVlZH=MxkD<{vi@S+HA4EWIicwCP!V
z;LI0sd+G|{J3NBebfW9yGck-F9))$|HW5R~F{W(MrpmJ`EvPOsN!H$J%)`#^>xj>h
z8umxAk5p4l6bVxBcG7P(c}6%3%-BK*dpgG?IXtdw;BsnUD5-?5a2e?KD#_b~5Iq*D
zY$Sw-!cn-~(znEie~!Z)QXYBPYbNz3UDu{z(6Gola1MbXdBa<lTT%Y%BJdINQBk%s
zHB_Rv9Jz_37lLSer5N=;jo?Z^I$RXIm9)^o2Km6;k{}J_B60Z1RI7=V3>0g;#Zf>4
z>8aH5R}kmpQM8aDQ<JkVJ%Ckq={bE{f@;bB&-&%yEa^S<NIQ8@+W)C?R|%%x_)c{x
y-8+rCi?|HIbc>y-V5WlURv_K@Ob_1o75o=Z#fT0_E8!^s0000<MNUMnLSTX{jcf}5

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@2x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@2x~iPhone.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5939d48495852bd69d3884da487357b4cfddc4b
GIT binary patch
literal 3972
zcmc&%={wZ#+y2NJ8NP}NQOPc%EX9{X7={tqvX-&aAiJ?|iR}9>%QQ4XhO7<3WKVWu
zY=aQSVC?+#d+|Jf!E-z>&igv=>pYJ0x?bJqaYyUws53KiG6Dd=4AxN9JFh-}!9aI@
zK7`2(ofjIrC)!T{peml}_$BT6UCzcBY^$veh@5i<fGWxXpgCt$=iodC09+`z@IM`&
z0_y+ee??Id?_mG{?SWOFJolkmH+OL5?qClrH%HebQCLUksKt11PL2Q5iA2y6^>b<q
zl0=qgH8k{|m$_oYi<ApQim?}q3p65l1;Y7)sp%TA+_!3Dt8D0}xMgs3)~2{e&OaJ9
zo#J=0e^yX3*7H_!*?WsE*~=$3#-=x$;fFpmy_{OX3=EPkG<uM=OjpReU|^gm8wwZ$
z&SZuR{J)Z6v{-@o;2+bM@Be?cv_X}9#MAe2{zbd+JH|DQe84ErmkbWme0aoyx}SCT
zt{9Fhow05v{d2umm8ugc6K}QolZSM)xHjT6ZKbuCVZqrc-rQRB#9!3_P+(&kG16YQ
z7(cdUY6|+O<+#v-Wz;g1GpHLYlUtCYhloRdO+tovG5m+KQPY*n%{t<I4(~aVvErtw
zO|v5JPul!l?#U6O#=Pp<hdw}DZHuu(sXB7*l~*54Hfd^q?Qyj+ZjOUf<_o~Nt<o+k
zgOh8?IoWl0n1;YN508!;PSPFg9&fRmxRdB6Zw-=55V_w6y2}FPJet%w3y}l#rd}BE
z7{hmw>gQ{BW76eYRSX#{z#`cAO~*(irADLH<j0FD+uRl^W8Y>jR@fDI2XAZRw(O8+
zwW8}lz{d3G+YRraA?A@~x{~V5boqkWS1lzEKKz=K5Rbn*HzMo+80Bn41R(uq(Gm@_
z#_ho{^3H8~NM>3EF=nZnNwDO}&!$VL8~tWycG<0#Us#R>YaKSUT&VGHoVaZ6g}EG`
z0>=xv{|tU^_(`31B>-gR$4yAOP??TjiBFg9X%#$6Amn??&@NE<a6+mCIDnXr3)gT3
zKHe_j!Ip%hCSE+W^i5EuX5BaQ=D=}HiW&dGDn#kenX*Ogb{Db@-;t^5nAI(yqaBv{
zhC6FgNLY||)(BMBo;jK*f3kfT=+mgD=(ZGxX+7qTrnRE9UAm?uX+Z7@B5RZKCoYrk
z4w^8vgvCd-ta)xpRF8Qj|0|o<w4=z=1naaukQR4M*rxkD%g7o?y-f*Q-$%c_@2C~e
zBEx&lq&n2`>(xDG`q}RC>4d}%Z&wX1XbAflXmhcJinP%pA*cHL^XA}XfX2SLxZx#h
z_YVuL<TQ|k^VHNW)XlH_-_<QL8-*@+>LkFe2#TTW9`x5j{#?Ii3xpOWeAAx3<BgY~
z&flm62#X5tPf<)#xz!U4u!02$L^h;Qkrc?vgoypn9lDI;iSfUyMIg*vTn5L*O2Hij
zh>43Y%B@OUxwuNIJZSgF>#4>io34m5Q>089oTj3RMOMU{2P=v>>cj+<*g5EaeW>sw
z1zZUdrsR%;Lb96Oj`U33g8!f`4a=u~Ny-K$5^+Mr48X{(63TCsxcINWlJU-3v>Yay
zyVU;d(N=;4knso{O2r^A^dn*ix)LnoT;)A*!g}q)_BR5#F(jwucdnkJ8}vkQ!W6@>
zgv$^uf;8M=7SFw#zcaEEg4jMTF>!ouu=bmd1WE!K<k`%u_(ONGA#j+LfKFBWr~1_k
zx^g{K`pBM#wgnr&ehVUZrT80)?N~kU<!XoixDMqx-W0>Q)UBW(O~7(YvnHZPOBxBS
zfWmGe#Qx*OPHPy4wMay@=55j6w#F_TLU)-;pHh+1;3-_?`#XjTmj-$Le_KmGZSkd_
z(D$WzV}n-kyp6cur{)K9xZA!;8pcCF&m2n{Y*=d%V#_Jw@dop54lY;CSHk~r9}KT6
zk;V48;)jO$RxbpgXQ%g~-bzVZh9bUjn)BZvq9nc5p5#sD-pHpwQ{aZ2O2%pTusB(3
zLb(A+^<3Tp$J)iZ139ln5kY;VcA7R>f6<z-MWsVA8k{@Yu<gJW<MLs*hBO>a?)zyS
z6$HIzrSM>G4qWb${9Kb6+DvZHXn8m&kI?va&kDP#-~35*tB*7CovuN<{#vW7`X$a?
z{#(JKWw4fqWzZ2z69vq7*@1Xswt+WK$;UM0>A;-vxgt7ZIYJuVrxD4NU~;7v+v;mg
zQOEQozRS?-SU_3t+a{4|4wi5h!$H<t!(Z)M3@ZW}3r!v`pc3JECDbzzu6(Xp`<6@@
z2DCU2^hUd^QPATxHG>;5NZYNxGP-BFdh@7VVm5o^C3ZI|?szz8w`}Wn7P7y;O7g(=
zy-N7-!q%|k{*taBr^LPV&KypDoc@6DXgs_$vz^ve;oO%M4f0*JYx7y1+UT|>_tl)*
zdrCpId4$!XUz{(Wx%xRnKWck;zq-x-t@~@`>(}=P7H#zv8Kn{>UKPKXP6$BpWj#JV
zT*qP5%|So5PZ4WE9B$8V1x%Q;BuGDTH1iH*Fv~PFmb+iol_933s5HVNx@-ehkXCfP
z&Rq5O3^Q#XelW!q<`jKO>1F40dLO*R@0alDwbG;s{UnOH!NH5n(f);h;Z~T~&s$r*
zg)VC|IDNi@+zQ=#(AB)PAdv8eq#o3uFO0OKxQ@UW-cN)42(Iqg&kJ+9A^P$2bu0PI
z?f&5_KBuAq+a3PP#Bl7c7jsA-m?tgSNYbT#p>X@eD3r2F9(z_JM<ebf$KM5VA?^~O
zPDdUqmZ;<hri^%uf_j<q{O9D}ls`2@i2^e|g$5zs9IqCm*C{!?>6wfyy*;V9n_J3@
z)KM=#ssti?d^;XhnkOKKW6OJ!vgkIP;L#5Ln`LGit;ij4QZ|R5Rg-BR6lzr48o(<p
z;82WvT@UcARkm#||M0ekc_U^{YlK*;Bh!~A(FTJv<MbF)ou1qYy^A;N$ey1DyM1l0
z8~;o0yJBIUVHd?^D`<Dn>pd}R7gJp__ks>V8l2lE?Jca6Ozs~Y_<nt_FlGiUJmz}W
z`M6MUE4?YE%N7e|T+FHbTtUz2owO67@hfV%0I3;x`F?<*WU-~*om4^c%btE(JFp2}
zJn-a1a#nK;Zo>%jumi`XoX+jhgJhnVeq%WfFKxEARMF*k2&$**Y~GJ9nGEW`wsDc%
z2fcfPsWqbNFyiyA+2s7f+fefpd~`y?(cu*KmA2S^h0|-g%8nqG-UW@2sdRHzPW||p
z9tn4B)^#a6*BTo@hL_8i_T#*ng!99WJ-v_@Q(vh%sVed^XpOFt&PZ#cD?Azbf@ed8
zySkS>5dZiltv{Ne>TCC|zk7BYCnj#NW)y2NIczd3^ny*F$D9=Q@O4I3_I`Kx$$Vbm
zW_RK`U?<j(cdcK3%(uf9Drl0#inYJe|4P0~g58XmK+&i|_%O2Cep)I?ey2Fv<j!~u
zn^AT{Td<5m){lz$I~emYb;1;0^S2fFFM9dgv>PkG$cyX?22%Qad8t7stctegd#nm%
z6vYld7cf|HneOYLOFG4R@}{OIOaDLw!rfTqVPg^9;eaSoD9nXgcTWvdZ080GE#K)H
z!lcFbMwGY8)IRo1rlpMwM;QxF^teIQTdyBZopmZnpDk)IAyo9*VH#~f(KDY9JlTbc
zC3$JNblwOkVU6xbiwC98u?)_<If?}yniRprjA<!b$*9A*RN?D7t`#P{7R9T6d_PPi
zy%*W>e~l+pZSC*UVgr>)a6IoB-7JP`YRjKhMud$wTjTX7!@N86qC=`lS?SPFxX;D7
zF#`00?#cX^yY$2u-YMuGsB|g*DfVdsrduxQ3jyM8#MAokaTH8K9VLKORI?S*sx|Ud
z_6_*M*6-L=Hb!g3O)PbIZJaQ0Dvie^=ji$+9uJqsRKDyZCKReoDmp~Q6_IcCD*DpF
zdM!Gg(;ig>bN7zk+npE2Yq}ftzQizY%(YtoP@CuN*Ojh*Y039HfH1^t1@Sy>aOU>C
z!U6GnW!~04ei=s5R0hS346qDz8yj@6J$#=8&B-7akFOxjS-@yE-(+rH^H-qqr)kMu
zAHPNw{i)cDa6yhBpLD%Anp^3{L6m#OH5(eJVsj;K3J>(b1iF&tCAg@sHZpWUh{qd#
zzfoz?u|9`C7Xye_CP|wwP~)0BS7535YiPE^IK-FSVzp?-rOG!N;^k_t1D(xWv<FMf
z?32;4Q5p^7khiSOsz$*-Kl&(mKA15(a%4|u*@Yw8iKvCGJ~QehHAml7`<D9Zr}FF*
zI{kd#<bCqShBLexsJY{j1XXu}Ym4v4H$?h*NyBH1P0bbp&>QD(xQ7;6uU-E<l!kSL
zQ~k)p4b-t->f6IO*)tEH70`0Fu%ceMy@GTMywnSVf^7|JBJP*SJErC-c<KS5Wt0Qr
z{)m<)|NFmDlJXj5@E|X%Q&wNT<oS8-3({KE$m8^9q^7kO|Lc?D<A_1r$5?BYutCw0
z=d;1+p)jNlC)WNTIUE^SV=VC4{=a@U51{KNds^?j<_$CzFq|!!-Y_DHS33d8gQ*kY
zBA_E0#twA)Yk>ES6@WmB_6O8&3-3J&osiN`W}NJ|-SP|3NvbWrhiUrHHIup$Jd*rw
zSSqm#EQmt5r5u4b<CI(%_qb!d!atdu<GNCGqXVhir}W^{LsFMExT@ay9aC+p1#YAc
z$Pje~Ho4bAhqQ9p_@fcqm&orDUuY)T;mn<wtU74cC6)v|S(e<s3%OKe3Wvo|2<Q;_
z(k_dyV`lNlXjn$;<b26T^v1K$SNhr!3SXWb6|rdxoCFDN(*)Ms-Zrmwsd;6!>PCYt
zjWj~aK7#P@sWb}ORu;}#b4dWUUARHc3sx%aT{0FxZ(L%bGz~T~GTx;L$hg6$;=~Zl
z%*;FGLv>GHEpn6<;Nn!Q-MV1q6?+MN3y^t$a9*Ir{<(Jjg$m$ozdzo|6g(j*RTBw}
q50a|hUj@Ec!|a)<{_h5Lo&mNRY-jEhSsj1B!r-Smsujvsq5lD-1*Dk(

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@3x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@3x~iPhone.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc7f781dd0b2ca730f1ec28abfe5ee49a88640ad
GIT binary patch
literal 5454
zcmeHLS6CBKltyZ3hOR^n(u-202_b-?DIFwH5D20uNN9mjLX{dt6fB4cL86q<MM01b
zk)l9E5JHtEhTcL|gdN=db|3eBzkRqfXKp#?KmWb+%|GY9jnze7E(jMB6BDoLC8Nv0
zz2dNe*nz8VH@hluV|7PZBAA%Uleza?*??!QTlS{6EiIW802{<~gm8z66|jx~4FWVK
zCgyDB|L&>CX89lca4_&xg&`A@P_wBK0vU2-$(cLl6e@k6uAAOPG*x}dasNJCfYtDI
zaa{~w46DFd0i=+*!<h4xF~zEE5##7e946Y>Sg7L~lJuOFuSb~dPh+a(Gn9(+5HR#}
zxTG3q@dSJO36EO(=PtL~%M`}=B5{OnwLQ0dkkuD4``5bvJ8m2Q_aL|-?DvMY%d66k
z`%EW~N5`GEN$1la<TW{+%p~~oeu^CHi=O+QRzV4z-6t;zF<Z<UX~^nO;%*<6;yNOO
zd;Rh$(bYhWLm-|>5N6x`nW{ocXSr{1my<~T<>vmPrz_e>yeZBK8SqZc!sFM4*L>Fv
zWDB*2L}k<iPTPW1NP_*Di#&oawf~QX$$Ke&Nsn2V(A%@shCOqNsGZMlmF1G(ttnHX
zDYvBP;fc}k3d8d~!X-Q0azh2O?NPknR}6nLJX+#6Y-{gs4OuPYQ!qYLw)g2-OM%9L
za&-=W-iIr9DhZq=!d5z5VLL;?Ob3~h6>9Sn5$=}$=)}$H@&c~sr5?RLEP~f`a@Itu
zZ*HsXxzc*>>th#r&gki}t!nxj+BX!6dM<2?+}J$+yPNiiQsc7KmKbHWAr<u}Rn#VT
zo9gi?-$EoOOEhe*HNQK0{^0#7-xc%cx!3!+|C-E$ugzv|543PlF`$=lB&>)tqHQYl
zNTe{XB00g|%zf%isZZq96wwHD)km>?T+Yq}P5#j<e6H9P7i3+fvh(8@q9cdvgolZ&
zMRaE&nSA$5*}3ysRh}JdEv1N^@lt-ylQ<~io@AG9?okn<<hE3L+JW$C$&up(@7%zx
zQ=LtA%3G;ustcvsfLu^=ccv(VJOA-PI{?<ht{GyGoD;AbJAN{{_LaWGuIKue6bk7-
zHSqK&tjgdv!#QR5Z-jKgw0^{1W0-4*QIfV9Gn%61Zhtm1XGPm#e6;MnS3lM{LV99w
z$n9-H52k9vfd1{=;Ltgq1+-X7xCtL$k{o5|n0k|G047JFPdQxJ|Kmxw58>bmdxFq0
zx~XHkoL6{YPakU%Mn?`jGF8o(EN=VxY$!<Gu}1cjzma<sWMIEEq_!@~5X_T2(<Uem
zlF18cJ0qvvB=+^z)z7-7TT#$>FZze@FQbEeIp_E6OiOpH#IDhv9+2=3clBFdC8|?Z
z!qB|otKoR9nIu}osOlSbzaK-mw=q52iKMo*@~Nfu)pGT{om+UQaPtM5*PzZ)ub2cA
z4)r%IDL-};3+B5{G{%iKclTCmS-ssJ3uub67!UGeMUP@FRQaPSY{z!5MAnHaNWPHw
zuXy<r<0d<@4W=-Bzg)OEqdzjt!SOrMdJ)vdbtG}F2lk$w>Zq_SrR78A4YDS~>i3JL
zuB}<Aibqd!w_glcwg0?hkD8hOx_#uAJZl|eGMR?6f9ogE6%|!K=ea)9ZZ=!ov{kFz
z0gh%XYgg5-&X@9uX1dk<r@J(0QsA7D@G*nZDqhtQF}X~$gZE=P;<b$Y-by*^ETQ+1
z2$oi9pT?SVOHWTE8tPai>!bJhGq|c#V(SBt&EIggD2HPD=TjG5zlyJn%=nJ5yD~-$
zTY08DW@P=)gI(%SCEjU)ay7SsC|>{cDPoH#p?xlGpY8fjkGWgZbZ3L2=zuO)mS6WT
z)1wVr@ASQKT)y|P=WqM_)h6?Gt)UX^+cc|V1RCCtdVbX}T9;FaSI2Ox#9jRTc4KCm
z%t?AeTtvq53%{|A_{tl?DvEh9N<u|7!#J0rl1sDMJ$Zs8w&M*xc}mG@CrorV=&KyO
z+_J$E{q7wn-&vyT=UjP*-PBXDT?vlNsK;Y#k{z3M{Bk9ajM(bgD~sy}B$<f>`TB$}
zEB2sz`l=j!*K>7bCizp+#TA>!dvc!Nv=Og7MZT1sxh!Cn?yVoUsN>zMQTEhHlXq_O
ze3&t&9$iSw7I{>Us{!5FZ%=}OoyAMp%I!fBRmV--R`07^*OIwXJK*(<ZX2jXLMuIw
z!J3A^d4dqXQdg2*v1@lMk1!4CHgY|wC|1u6<@I!BBNEi~=i#gE&OUyQw-l?ovUeqA
z)vdmHW75PnVvheQqOm8<!bdkCa}USkM(@>K6aCb-kuZ`p53k#RAiM(1V~4?lFfft$
zFk`F`^H>0~3E56WT`+6vR~mzXtFl-(Awx8={1>2)4G|`RP_5*}Jlbi|Gpgx5cq0<P
z<_UQccPMWvqEHK%o{BcSMNptVqe_<1<Q(SghWOR3s;H7&09{obAm>7wjc9ISKtJAz
zKeDpZx{UM=A?$8OpUkJ(4CN&D6)^6Zm66tERSnYSHIOC+Q%-@<&Xxsu%&Z17h&+V@
zETCVrU<x+}f8C2Ahu@FuK?AW}3#<JDp{^Sc1sx=|1_yQBgeYVnu|6<x<_Z|{`a6c~
zrE2AIi0y^K(Lm_9i!$ay%PhR*zueBjTmIASC=OaJal(ksUx_xHAz%&u%xNIo3Z^ud
zMdPl5VBo}m$(1@0IZyy{Q{jvKc%u@4f$PtD5I{s06n31ufZ^AVS&X1w{g)d7mfV%6
zgED=FMb;<0voX#|qfX;mBca$?4I!nwwgw#i7%~sCl|-GUkHjv(oi-tjyETQ0@1|9C
zpi*=2FZ~!B-rzobF>;a4PXI7woHHN*OOlYSy4CV8sBfGAUfEG6jp-zFAfCDKF(jQo
z4M17@-}Bh|@e@UVW`O(v0<C7@`-Z7TiIno<fGA#h)tINJfgMH-fGij#Eg(`sD6b1f
zS72ujZc`RrwyeW~Dw{kj*@X?Iltkm8<Py1vA}I^qn%>`Y@F{@P@b6Z${s8BOC@dP5
z+)CH{dA>k?tRVj+0O}~p$%aVq0W29*rWu{T3IJ6VWRO+_9Dt(4fIfWoSt0u6`YoDG
zs=EZ$n(k^=hS+R1r$=)u<!#flhl^8t#-^k#==%`l8}cr&FS)*nI>5kyVK+Vh@GU+)
zvQYl2{fYTZ)l|VuMn`^X4+g#Xc#Edu`nJ&GJATjY{gke8+FuRiO!_@WFaE^<#wG&W
zhqviWlyHeZ9>pFN_^DmO>DR!O7uL?`Z#zFsbEjvXa?bfb+I}QsWP&3x|KT6%*yDy{
zW9c&uDyaJfR~wF(Vx)0ATLGy_cjN93h!c>iuT+@Noz4#A;1iE|f1`smN|0F?{3*%a
z#6V3&(xk)CBPvde7#5C;E6>FVR}2pNe;*C;3f`y%X`h%HX!MBpby1<<@9b%vSLGQC
zjuKU6dAENPjxgfrYYad3Ju5s9Iihxhd(wA5bZQ@e`SlAcpGHraVwm~32#3sA5A5g8
z7Mq&u<;npG!(F{Ff8Oxv%(*PQ!n_Qk@1p*SsF<-4WyoAMMRcLwjPLfhMGsANo@u&6
zOI|Q{`Zwj0#f%Yq-l}_0)zZ~5X|?QcYpMC=4YnRpZpm&|6oOLxFh1X$_8L}DToQY`
z6+HjEGrxUnm-jpma56NtDFcS>lUY~q_%7>oo(lx_%Ht>Pt4}muKA_ei^hmke6&9!9
zn!3)J{q~XUg&`J|>Z?C)-u%+<axY%%q1dhzQnM=LBNMlEVQl|{#gCO`0v|G^y%bn8
zQFU0mW1|gAAROCZTS<!YmxEzWT~qkuhyzNfe((YZXiEyClqKE02*oTAB$Weaf<KH`
z1*IX4x<}dW>IOa|g$`R>Qmh}Y`f@_)PW0!%;f&U*AHA#|l!q-M?jbmu?O?A4E6W?v
z>P=yt_CF>me|{Fo+iSYN6Xbr=PJ5-zMom{r*5B5x!0f5<vP>a_KQHlEiv2x_9LN~M
z3_G|m3LB4*w;BT~ElOjQBSK!PVa~R@)c8TN732LZyaaFy&kf`4LX1-W1QULO!ya91
z3%MTGGyC=LvF?~c(67*!o<$R-j2VZAloL9WgO2OBQ?&Lv9tmCLJaZ!d!u&goWOPGh
z^9`~~NaRF~UKmv<WJNvTl^#Qlbzy(;<N82Lu$K-GF}5}09X5K`q>kmcun4y9oPn}W
zL2RR=R)4k5LHIK6#kqpPr*5AHmzxBAEy=+Z!K|>XAF|HAb+ZcOEIr4XygxYx;V~cZ
zo5u`<9|#(sS597;ge(MEU8&qmZjR8A)dTG}gdK;9=vG=bA18hLtV7K>(l`IWt#4^Z
z)NWxS!FYY?<8(olYsJ^UMNGtnEy_KQxHTITuiX`A{YcNL>+4U>kV1cr_87b1JXxIJ
z`ZcbO%}o!iGkEN))JCPCtQWEUUDBg6ZM`gyz<M90?r%J?HLw;0i(K-wo76j3T!0Pn
zs|z?@lch7^;Cv;V>-xB4ZSGEunjY)s)K??&%TZR#tKkVw8{KJ@1`qv*o;p=vOp1#(
zsH>yVh@DM6{PT|Vj~F@Pt4%-j1I8eNL+$p&+nd;;y{5c3d8quH>#a^7IWWiEjC%_W
zR<<PlHZ&Y=4A=b*CG*u+F85Td!^q^cuv(SCu8eCewA7?ql%L=Xk@jwTck%1(f0ADZ
zZ*gxo4zScFe-Yc-=)9@$LyJ@%+st7^BwZ2u9s8u9xj}#9!pc$ndFe9Pwr-tcIEWm=
zUE)LJ)yf(W^`vKV@zR~qL62R8-t(5+X#Rq0g8AL1hz{(nof?$R(%oZTb_?v2(aBp&
z5`;9{Yt|mo)6n11yA#P2Im4o;(g<wqY3&iQRDwXEYJv`XYtPT@XHu1W*T`m{t+y`6
zq{w#PSj$7+6?%6se4TymR`iLq&y410{(I}!PuX7;$2}k{j8s9DGJo$!<wY<JR9f%-
z$niDl=9Cau9}fQ-|Gwg%L~#DPNSLIOY<h6;%45A#bM<_<e=;Gyre*)4V!SDlkb$25
zpg7i}EMn6Vmw{eRu-&|;Y=O<Gc+4M~Rh>K6gRh>`IQrb8oed$O2)(_fFCHZ%SH|Eg
zx;MkB56CAkI~Z8GzHRtC#kzfo|Gl|SUl{V0{H}zgI^=38m117@SoG+=21@o4!DTU%
z%-9(`*4c|!M~6PVTsB#(-*s*tZsSPO37OL%`~Dh}ht^Dg#~Yb>e8-OlOj=ydAa6i&
zn2lw;)QPa<I`s6DWZUkwZo)7Z@lcphXvdRTu?uhsY4sbc1${3s!NB_U2^<X#X@T>H
zx+47H`lW2gLoKqZLfQ7uge7-yKJ<v|$Fufhb|jV_Um#E=i_sK{(0C^xF%TP&hPDu?
zdv<hwZW8661NiD@y;CVQ_BCx)<BMdp67ix<eF8zWA#J)B|H;6^NRmvYpvu-Ns?d~U
zcam9WX5r*eUa(!ba#|4sR0J&QkVKq>B@cp5A?cHaG(KO_>`_@9bba9(0tW@Y;N(b~
zK&VhXdw-i24qDC+K^PF*UyJx2su6_u-5*N?!-ao}!8>>U&~qUXBQb#gbjZ#`k)2O7
zs;peH8ciwbI!yz#4{lB)W^m@YOfmHh@V$2Yizp>6s+$on7RQ-fsKY@^Lmvvvx$|A1
z<Z-@XbZ~E*YbJ3zx@gY<nfgI%PXZtY<N~4Pf)Ip4KR)y4yGC~7LlCF`@%~J$0OipM
zXpzS>%(G(k%Nr0R<xMZ%9&rfeU5L0v4+d1CXk2D1r@R=Ye<-F+>~*;3{^FppO-MY9
zvVW1tF`sA2aR&6z>a`!|HseBlo6Ga%vNih?Hk%M66AA{l1M(}0gn<`Z$F^wM05?HD
z_?si41ALG`sNC@OuuCkLgvP5hs$}I}Uy3RjP!tQfjE)5jvyJcZe>KQ~whUtu1NgxN
z^=jPE2loRq<8;BH%qZy8Kjjg{>q-0`j{eUm#JoW0ukj^PsM7jo;&~a9Fq7;cGptUb
zYNF(=B_U;S#o2UD;YYfROKip|oPkj5#$oW%N@hsoSIaW2`{#WK{|jl9Z4ch-<1e8*
z`Df&9MP=(^qeLf$UIh025U-vbKX`V2X}pxE=xuuU59X|pvPOuvDPOKW*jbZf|98YX
zIu14u{F{>~q=S`PLO7@`aP&hmdhvc>OK<)MjHMObwbGmbbLLT(=`ROfRbS@Ih+|yA
z4-``Z*<~uM)D;!Ew`ukp52~0Cy>iR>hWu4y<euN@EE%6CwD=RJ_hk77NA$U(#G3VD
zh3dA!Nq3~xw|kylnSc*SG=bv>G<i>$AntNnA|5jAA210H59hg3<bcAFJQ)kc@LxA@
z98vc=&UQpbolS#!Q<2%i1Cx=!`{s00TwZn?zS#IKr?+?CTUQ~Vh$Zx0E4dO_S>g@R
zOo{<&TQLxNxyTWjib_jLf-O*(va^{!3>x?0!<|7DF2EI+XJ-2~VCDaV_+OaV6Q%vJ
V0M+K;WDbj(rp8uAr3Tky{sVnlPUrvt

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76@2x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76@2x~iPad.png
new file mode 100644
index 0000000000000000000000000000000000000000..95e22a1dacf8a5cb7e612370a499dc2c2be90bf7
GIT binary patch
literal 4925
zcmds*`9D-||Hp@sETfQpEFsI#AY?2<Da2StGq&uqOC*tHDp_xP7~8~TiLomqyFvDe
zl%<d?S+X-@$y)dHxgU@3_iwoGAFgw~&vl;f<+>i{@p!$@i8VF3#l|AQ0ssKm4D@wS
zv^neVU}B_Q`QBd?rA-X(+Q!-dz}sZj6Q?t@dsSB}12<!1fDFxM0?@^H0vKo(9c>8E
z1^_^xNB@5-S$V+!xBosQXI|a_065<m=xCb-(QVi<W4XHde?NX4xR1|`TI8%ww_(@O
z<q>_z93K}hFrOPFxwNgKccD<;>uyUTsikEZJ<1*)`@?|iOrxc#vaOidPr1t<rq^qJ
z36|nqn?l?|ypBp%_a~mU*87$<m;L@z-A1bVT~6AZu2nDyW7fRb4_rxID6rbS-UVb*
zU<fxmf3f{_6K|AwJ3A1i83ssOwdYC#+yv?G0qBj&LT{_mgRWd0qoJjnx^qklU19%A
z4xyjU%ov|nzREC{)*T~s)u(G&knf6QZz>y;g5l<cZ>l=Kp?5;8lZ~ELgJ`cq-F@#1
z<vN7g^_)klzwWkuoa`^3gDN)qddmkd?OA*Hut7rHKSCIgOSiiq?i>9^_{E4E_}cax
zxeomAr(5qZb(L&io{h1vYWbKQS?jyKjU8ddIyWnJpDNA`5O<<Vj!mY-+N6D>{#4%M
z9v0QSp_iM%T7>RWHBBa&1vCMjf;KvZ9ie}yOapKtz(l<V?5VPnLqFa?Vmk**JuWi#
z<Y~NG%!&&U1ZJsE^Qo!uY6Z9PPg+L|+bs_w&ax;-MD;@<#xG#p`8|qTRi4qfo=tu6
zqd!g#_EUi5snKf>jeJv-`YNf3maB=(SMP+5L(~*Jf-?HQ#10Blyq#^>pB`_DcH`D_
zl(Pa!NVSaYY}=&>jL2HxY{W}CoUCiv0@=so-1~3k&X(~SGU|?Fk}8GCf-iwmAWqnF
zKZqJMoVPBv_Po_vYp3?8V&TMJcFn2(EA)+*l#OWaQw!l;k#T>U7eypX5#&JSm6m5v
zhWd{&?bJ}$QX|N(cjv)*#P~D&pBY)Tydsn2_GhYwTDy>v){S(}Rz~TiS93Y8YWG!d
z0KQp#XWsJmiRJq<TBFXS^TZHyD_2@+P|VW3=|`IaL&h}sZQhe5D3fJHYN<7PfB#9Y
zDJg2uY!$&aNM}`BW1u$X>nQmt-qb=ydLWGG9_L^>e(p{0wW^5aKl#-j>*0s5u1E=A
z>jQ&Dn0J?EIVKcbT<XNG)KVmv#=I?(fFGE~J>YI=v3!e5Uw)K^wzcq|D-A#P{Fzc2
zVXJmiW&Zt*zTLQ2qKj59yY9uec|A8iJL!yYxa=FIZvFrXoHVMoA}T5lhgBtDM<*Db
zk3BOz=P7A+%pIvhV)r*$>KJB&zWL=SWvLrhA?I-F8-a@1G&EMLHdW(ESF5_jYNB@Y
z-8P3rRv(8(s$l12bLV#EVytYw3g@$uq2m+&>zPYpBM1G5pPJ=u6wX>)1I_L0*enMx
zI|5~f8Q)cWNn&pyB@9lj)*PHfZ`^<5=^pbiWU33ktZ@;oR)@>?%N_XCr4rWKP)FyL
z?6I}@Df_-5cQbBfsh|x8jO3PDI#vwZMBG9*_}C0*%S?UFQXuMni#<7o(OD9`zL-cH
zb1TN5NuF+9NkR;G=al)yQQyw{JGJ}$0D!AM@`RbI1azJZr8&G+mJB_ax9+Y3g;&-z
z-t{>%;?5fmi|^)n?)o^*RQB+xjmO9b_Nwm%<6`Q>wqmf>QHy&@q2>PbNx1_@J0hyp
z#e+vQzj9_+dPe_LTxo({p~-svT#ZD%MNFOWx~WBGEk@OeY8YLUXIpMu<_|<}zb{>2
zNi6=9R4-cVtGjEulNm1G)HGV*NLhfZgNwGKGU8wvBX^RaH<r(Mq!V5%h5C?enflUA
z;Cm~06|2L_eH45;Whm|Rt;OCnGP1^zh{QaZ_OrIO_2yW=bZqyFf|GX5Ctqcs{9XL;
zvdqoH9%%DjUbPU{`jiIaOGrqn@4}w8O#8C%*9(SgK}XKyRU6<oee764=@8(2!b=yQ
zE%)69+dL&J<uhNevCVZJ7sNoG0cDx^fJ^Op61Iaduk<ywTfyY-=5`44CO(<VioE4<
z3t;XDWknQS-FCd>IC@C1AphFjXq$?12Ps<EK8a`8HP{DVqk%JZSYucO4>exrwy6~i
zn>`}bmPu;z`b_&a7^9qCUmt`~S1IHIxNEHmmXIL4b}FQTxIEK0BFpB8^*uQjPytgC
zOfx@Q8EdX(&q0RdWdF4Y?)T=}bgRW$i^wD0H96o#JT(4;ERl@XJJ8$1UqohyDS845
zG4m-VJXnFZ0UMhZR;}@L@0pMWhds>baV_ge-;*OY@zwOEx$80Pc&dn@z|})N-IR_5
zZaj){rccR%rF|45j#R5&H{fihrA?zG!tGiV%i$7>;IBSf@6k>T6)^-Cq@zv{nYq;2
z{0>IE8i)cEFM)%}!LDvWWHXw#NcF&FWND1=!pdSgRPLJK2Xtz0E{cM!IncxBzNahh
zhEYMY>HKq$z3qRZ6XA<B@=323z`-HGu8+*UA_>@j7<HYC<&6tQd<bBl&4EYB({|b`
zt3*blNPcs}dU*X0t|7tXNKNezxII>O76sv%l9|`zxR4-(IL5i+(djKs_~OkbFyA6L
zfHkSSB!(bpBa`WypafYm<!eV#60caZ33^bly8&_miey;XH-Y{bmDbns1m#Ycz}uU4
zFm9yh*_o0$DJ^-BW5_{I&|*mPd@$mu&JX(+SsepA$iGK(*1*jbKfsDpUsmMwq9;3G
zlEipCFTH{|t!zH~Y#yWm@Hopo8}!dMYfQVnn4S=&J-KBu&Zv9{ODY8$NITx0%fJLJ
zzP#z+pAaIdxEpOB;O}>N=3qi8`aqAkuVc^oc^0C(o#=Ld_y^>t?VU^Or+UP|JB;H6
ziG$IHdc>Zd9qewSw8U+a-}f|f{(zApp4$4324x?;bGb*s_Tu~co>r;^<`{}cQ$$7)
zPTjoR8=ppfk~k5f*2IR_k0o==a+Vt&%$snA`Hp#uFTR#KJB*Zx=V+yT3tYaG9IcVv
z1N!*fn_1pBYa`7yEZaO`V``4>L%sgv2If%DFTf?d1=`c*_88-yQ2#4GOLOj2A^U}>
z6y37%wUW{6cH9hQvXRT5#4iobM^(%by3L?c$gR3^d|x7@cE$0Af!xB=7@w33y8QrW
zsgt{l+BQ>}26Ym3wkrB)OKUeCWjPGb4ZHP?OM`LYCP!|zc)*+c3!1%cRS1lb$qO>}
zZVzbS`AR41nt2N9MLSD|Zwf5emZ9^i8`pCcnF1fpB3{rA5%6c5XaBmho|A9itB_cf
zrCSer^ejuUJvQ%0@BHb51czx^M`jjtDe0M@p@h4OMqts-59QsO)Ji6mthXQqsy0th
zAZmyZ4O&$(YjvnPE6n%xmgfkmjhhtgeL--d-~Oje7MvH}dL$Fz;)?nChaqfAY(6b>
z;LT&CbA+IS+)mKuGQDc!HC7?v)0%TWR`zGU??bn*HoNmXnt4t51wYVc4vjNIr*)?#
zXY2zVB$Xa-$!c8G!Rt?HY=I>w(wL)&)y}<~5AQ_iX@6XfHIP6G;m*z@U8>0vmC|qW
zE@}XMvZriP8tRL{_$jON-wY0@EnXRxGUHiJ;%>KBMlKu!Tf<#n`<*_Vot#UU^*N~E
zIp@34s3|-#26`uJ1<KMa<Emjy&TwKp#Gn`t<Xc3G)<Zu+7?T%}(9*<%i7tCn><9aV
zM*j`bWz{3q?VDh){NnE<-K<GD953UW4w6xWKd3qG2Y0q+@!M|y1s=gDpR9pH?wz(o
z4$H;|ybR_hyF-nl^wC)e`g7EtA%>x_3ur_ExZ|37q8&Q~Y*k`9{Eam;_v0g|#wQlv
z4L7IGxsMm8>Z^Lf8SfcK(Iwz0%}Ph@Veq%wn^!wo^05PspUw6*wU$d_+3cHf>T~Tc
zn+wg`N4A3cUMd)>@uV0GLBqmpWFN&h1*6t03Yzmf;@Xl1GBgwQZO_+Nx;Z2z#Np~&
znN>z>&X?#6eWS>7IUZj6@eC8*a8ct`m+dn-S8CI$#&dcjS@UNNBI@UAU?~`->aYa(
zD+_b<PYi=CmrDp*J5c?E>P=B<vi^e=J-q&_wP3~920T|Dt#k3V%J!GBu~~*#2`<Ol
zLQ6JiB=hMVLSZg!=QvbdJax=j+5BY3hA9=|AgfFN+w!rruBTeCOHU(8tuD1+@B#fo
zdImp_AEi`_?@My!I*4^vc{?@!uxiD-+xnJDv&aejuyT83RVAw}qBXXQ16r%E+U`-Y
zJ9S=vK<BQMtmlJ#ULVWuM^G1BwJb8{_n11ak6gN9Sohh$xp=@CF=}qKc*;BNv1&Lv
z3T(^nsIxGFAcvP%{hq3R8ImI%fBkyhnMH4L8hLM)sWo{rD-xJ6`Bd+fcf-@j)%b8p
z^<5D2dir@G&R6TXy>3$YhSuthum`(qR~Z(5t1$@jpgt}W+YRd^2a4bJx^-5h?af&4
zEw9+jJ_ir27MXq5zY)V*FYyO%QG3_?9t?iNB0W$N0w@$Z7&#!#?$i_!Q%nZcwM5)r
zy{J|$y%Pwq{`F3}x5emeBe$TfZN3>LBL~z-FhM0Hx=5dzsUBO48!N9(UwOy(&@40v
zmk!ElxzCc`yUDIhVp+kgu4WtWy(!Ora@-kajW#c$tMD~pgqKVPf4wKP2p$`_{sQAi
zpzhg)yu7t4WL3-C^m6=`CFZ9C>x%vSThk6~<BPfar}1kxFX+A^r4>hGT+$&kLDTwy
z6zC<Ro>iGAuX+m<oBP(E_D-(4{D^v$$*AD90*%yACZl_H64U=ouzh!NpVVgwWXQYQ
zVNw*!j~||wk3NC$$|_d4>1<=IG4q<QsPiaj^USvqdPAAL2$W&;v_FbYZ;NGhLOT66
z4aiU4CwLX#vA^X5wg^Iq(7r=lC8>!x@}nHC4zw2~F`ZGKR8m@BU0N4Kz_KVz@{9j%
z3;2rvjP~gigkEzCrb%)kv%i>e#WuE|rYLpe-Dt#FzJM@cd}=QY7f`_eS6n^5NYYdo
zDaF&ho%lEf`cj&<!lMy{umNPm5k@=za<~7(36s(GUM~o*G4qQA;(ZY^Oit`l+nCE)
zq$g{8iFgp)m44>HUYDNcpG}is;UcwUg3-_*tP3V{gU#)!&x^m&1eCQ)<z5nMX`K!M
zV-!IcT>#Hal&fCXDL(2%*ujgEO$})c4Y7{aB1oO@AL)kS-s!3!J;CiIz^X5^kS$pI
z--3kk!<YXSt_hd;exW5){acLTKcpnmQ?`A1nuz;bq!1%bBTbCD(YQtM;ACM8p=HTv
z9#eQH)P;hrqfZFLQ?Xy!wwSF3sflj6SqX$%GA&t5?|<+c!Q^X*S;&3bakUpN@K=9`
z=E5z32i0%K69zP#aqOhe6~_HR2w7S@8+=APTAf~jjF!u~VoHhNC*Ah+R=6;PK9WC8
zr-6C=hyW;lSZ1b#36_=8fv!0l2NH08*Ca5pw{}k3qRp1-ZeB*(4~SeBdhnZ~nGV&e
zFGh;D@hn1SCZ|B=3vI)(Kfs3qX_<P#2y*+s^baT(IPAGD&Zh}gKKNP?@!&I`2>gLu
zsL=@>m2s?-^R76)f0r(5aDgp^1Ibq^#fdk$oVNblbKwbjrIUJL+7}ZJFS_@bvmgBf
z<o0XXZ}+yn!>RhBgyBAGex#~Q8V|RdYx~D?#+z4yOTQu>US=fT-Tn2hQouH}&slZC
zrEm{XqqbpI;9znzXYfV%R}cR{>1Y2~`-Bc##ZM*y7wDF-KkW*5>6TKT2bR5LQXs&$
zI9r(%GC{TI?>b>>i@}-8x?znjdAX~S^aGHgW*vF@0SVxS8H~fxBzRgPgu_ve--FN;
z3-BlJ$bF6n`1fDe7&B(bLgOFD+B0MsGESEIh_&ZXTMT!_+W*^A9zHWBNH-66`W*iK
Ohh?B^qEmIlG5p`T!8Mlv

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76~iPad.png
new file mode 100644
index 0000000000000000000000000000000000000000..b18c4f9f4832f1c68e6b10d5534598ab5a58c251
GIT binary patch
literal 2700
zcmbuB=OY`68pac=f^w{itya_wV((Fe*t?F^W5k|qjb5u(tdz92BWmy2mI}33m8ucc
zE@FjfjcTdue7W}zI3J$(dEVdq<@xxc%uMue({RuL0D#+Y16_+7NBkpds+&2SV=i`M
z6rNhfS^z*Zn)cF_@@7|bw}X2a8v{gdGBp60<OQI(Nx&O%+z0?5!;<}vAh6{B&;K0d
zg0>a`0MIpDSIa64NPGbDWx=!mK0D!Aaa<jew~Y;ykLd{bur2Hd=Qb>;F}!P0`=<Ky
zcASlu0fV(Q24;?;5%mhfRPdYezj*V4iB8aE0uaj*!k(7?(be~8%V#pLTfyU?=yZGn
zcfVc~W*V1w?tJv|{P%VAb)*luDaT0#JFwIP?r5f|c`I#-F|;SN2h8Zgf>%S_N@E1-
z1uggg3y{VLl`Xxze*MF<IP~j$??f9x(LaluHv65$p2i<BSEpFsR$)cyl9^ca8O6E}
zy8IHUR59qSyDMJFWu)C1&=c3KShM0w$>#YhJY-2%C0i|9C=a1r)cG5%uE;eom<W}x
zlNiX-Z*96l`;Av@O9c0BnNOPSG12Ha`=zhdm#Vk78e@5RPln~L_jk9UopJ3^g30qM
zM`CH%^vekzUVd|W!hU2R?hWT(kVWXjG~<GAYSndIvfGjf?vz)(ZNSL#cefqT7lA5Z
zodp?%LP-qL@)Qms+|?ZRi9-G8s9)netKAy`6*e-gZzeRT&lO*9-G>eRW$%6`O<0H5
zk?1~J%99Hldhj5|+WD{#lD<rx`SL$sH92K`sl+ei^!=R3Rt4%RIC1AP8=msCZS%j`
z0O}2JXO;~`>|U``vzV%bSJ)gyrp8Fx?spj>)$$1fPfM(DWPLh&6VzUdCTsr8ac`iS
zQ%$63SM&IfS_7M>lJ>i?3uI=`!x|KnLWns(dn~OG4-eE9Vk@!@m{<jiDL?U~l|Jp@
z%ov|>3V?Am6-uLJ$j{C|8vc~8vQVE%g0vZ1wHA=$^->vVR15dgY;;VglSH#tKeO5u
z?Oj*lN6H5DOF=!wx<q2402dPJF^|G)Y-GP=L``oiWjdEh-#NM`4SbxmSzGf}JqXwB
zxx5U09L3SIwr+zc+}<gLbf46FsK(9r@(Q)YKT+q>Joxm1d?z^GZ&p3@R3wQs75!xW
z;a^}&4;6Em-O4_<3G<jO(ntUm;zD+i{*0)-VhH2w4p2V0&o|(DJSJ`@OO;=wJdBEa
zNV`!fA9p^R>YW8SU-+`-Fky%sElT{t$fa2CRA@u=KRS&_crFH6@f2_xS)_`}i%Xa`
zzWX$+Stpj3Vk9L%c_st#mhpRz!CPeKG_|r;=!)Lud?TwLNj1stv^C}F*!;UMv>BF-
z7a~owmC8`Jcvc3}ml0Q3Cb1o|ifI^7k8tk&sJ7<ne3Hssf3J06OLBAblt8uj^KlYm
zGuoMgcUOvhlP*{R{j9UeF(W}ha7I!t(Jef9fH)f!3UWFE)^85#F?Yo-cTk*0iM^7`
zgHUb+8`&ia2n~W-8V`IDP`)Nc@0U7(ELqS(c|7R%9B9C26(cHg@{sqMBKfgVd!`8b
z$vORaF;hvIiT)F=FXzADlmUI0gI!LhXj2{iF~V!XM+*(2F5GSj$SN<twgGJU(9Yx+
zXmFje;%_jWD(E$#Eg!HN6r#CvsH{7d0Qkjztn(mhDg7b6l06HH{m2wbZ3<%YCu@_0
zeix~7K9eaObrc$cJzcDk>%f*%7;i5X$?`i)WBlo<Vbm=rxF6>NTE-Eh+OSpYOq{;h
z#cK_b7!|Qce%W=!OA1w2=7AWEl-zIhfBQBzI&Vt%dvxcBDChU;TM`=72jkhEl>(aF
zOIwq4u(IiJ!FkcK)|i><^W~qit#Q@R<6b03G}4&XzIpJgJn3MHf;j+qrI&HZW}Z$N
z)OLMn$=dXh&=q!7cgCexsWRi<Ti%G)#)(m3rqf6-TS>%A?&%!x$VD~jLcz7g^OfxQ
z`f-gg(>Ce@c6sT<mEJcT2UdRwaj4Ln@dueXzRjuF62Moa)Vht^5?K07{Au^(|JEnP
zF=Xu0x^k;p@R!bwiaUTTO-lG|5PiQ;dDUn~!!v{+Jzi=;CwU3~adkGPVgmN3T5r3k
zi+x$t#o+iQ#mkvScOjEHp54SFE6z*8;uNV;Ot%*>ITlcEgILQ~?Fh84GsFT+Cnoet
z3jEfqVjEvXKxHOV@CGktB6PxjBU1+?ee_wO-lQ*ITcz)rURh)`Y!8J$Gw9x!`r%&$
z%{k;OLN4Ix_M4;w5%;EH8j~pymnJs@w_U1li15GTE9OR93P@cSN=V`Abz9E}hBK80
zs=%E$Z9|r=m=Qb$xGVLS1W>!)+y%1jv37RINxi&VY&D$`F<>APX7iL;&&PXBHW8iB
z6&ibBW;E>nDm3}5v$k?9xpFbhP9IlOu(XUK?)E?F2`iPXsUbkkTk7UxXG>qCc5@ZL
zsh6vy;tDz&QoZ|R=h*Lm&+vi1Yh8aJa{INe*0ZT9j(7WPTbOT}UFu-V+}JU=|IE^E
z@0)j;8&F03oxVF+4%1%wst6bY)6vi0`0YD8<;X{9$+6U<<Rq#&gv6|ZR=;dWuVHRT
zsxBrAvdkqeBp}$fIgzU^CJL$SCcIMKr*3K!E?E)8J1I|z9^?n(tY8<7wx7WHUPC`W
z$A)jN|H;`c8_SYwONOk?Eao#6^>-!b6M9QX^|_Vi(x$TRbe0YbRqC^(MONLjJun*X
zfVwB&j&5HYuB=xJ7XHMO;@Usj*@Cmu74E4jVKWSo9v4!>eZJJIT<sJPWzaXGJ38)c
zN-w7WvSWe5Mjqo`LTe)Ft;bq8j~%ndxAKd0dt_NVNSFdVn`s%9TSz?vp=&RP2K5z6
zuD4&iI!>%dSCv?o#fwM<VNXjPcIs?3j;59|5YYVha)>Jy&rxPilhmW+nLuhdeLrhy
z(D7Vq8D4#uZ(nv9n0Neb)TZsUtf6CvI5thgSOR14xG6cT*KVdh59(Y<##4s{1uMQk
zUXd%87CeE%+Z8mB@f|ME!Vq4@Fc#J4@spo-Cc6AHVQMUq;uKBdGe7(0bxlMbEcR|o
z;+z|wO6U7N^UDS;!swz^<rw;9B#<liXr#-Ulp<&&3-1u^qZ<z(IGtE4dP-^y>0pGO
z))%q&A5?*-uR|7FS;L!{1f%Vy<G{x}^~4SVi9WbyDsIm&AwSa~68u_2%{a<tMqSHW
z)>BVCv5~#r!|7#o>Qbh4_aky<Bj3L8Ap9x4)uETgtkInx><e282uy@;3mtJ)!6jJl
z8sD~x4{JvH3LCaafZr228g9Lg>{PUUAnACQjY?><h0i*Y55TNJD*6D#nM^e9z8Pcm
zx0Z^;0*u&1?sT<b)IabsWYy7wzk2V*?8Zp*_lPt^=F)=&$kI06CH)Hk7I3)+5=0cG
UC$vYO|ML>U@0;j0XuHJy7s}ofi~s-t

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon83@2x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon83@2x~iPad.png
new file mode 100644
index 0000000000000000000000000000000000000000..a531c53a2fb8b89f5bc9b83d8490816539da4024
GIT binary patch
literal 5338
zcmeHLX*d*KxJSsItRY*{*#1bC5M!5ZvPE`9BvCO;$SD3oc7wt&vSi=0%#5WdGInDN
zV~d!f8M|f}?sT8$-uvl(xu5Tc_q^|U&wI{!&wHNd{C>|#um+iOvI(=%(a~|5-8QnN
z>9W7V!c1$y0+w4e#ptVVrB6rKkjj2?pNZDL`S6~ZkChdj9L;8-qmT2WW29O1G!do=
z9UVg<!+(3q3eWwI{dZ6xJ8y%Ij?c=>NZ<Yi{cktcH2!Zwr;BsPFBRAg^thOeE+Q`=
z^%*toZ*9vZn@zlJ$awKJ#>kF8`MSfl`s0*J7GWzko1a;Q@!S^}+qdIi71nPxepW;)
zpa;6eNVku$VZrS=1;uDzlTDJ`3oI6Qc6Ow(IJm#Bp(A3J&iJ1DHTM;6&ij^^c&?<G
z(Df%6vHZhudw5h#n1iD~;qw1?{<j(^2ul75mEtBbJSvwui<LH}3qKm-<>Ab*V@diV
z)GvMO-oc4v`Dvw8n}lkCX_C_GV5O?jt)0$<))3MR(^Qa4b3y#x2#Gme2I<WN-(@dS
zUf+6OFOvrEF5K_4p6mp*1^<AS>l7|v@B!e#3h7hE&)X`IfkK(tiN%>WEs_dxe5JN@
z2}a6i8DF2yV1J(JvbgQ=DV&YyyOlSMD8zNIEOGfBi6Ng6s#V-9+jB;fHAM(3+v}wv
zX_nmC6nO8Qe`1*g!FxZdf+3qg|Cj*u9F|j;yespv{<ln$c7sg5l3YS}HF>R`fHWND
zWUCJAMdBm?riJ<s<l5}4u&Ihe{8hdr*Z0ab_I893pNmMsp!2<2NcP6W`nkanaOqOT
zbT0VfEhItWtJ=&MtjhQ4^*b0XQ}rBufIv5E4|~94q!Je#e(bXHtS9&woIV0~<oZ?`
zeaA3AZfmeQ_Ie@XUE83(#I$=+?=m<~jy#^K8F~e~3ih4GxNT!7zXm&5SP{CH$vHtm
zSH@pfn)Zx{`Mtz-wa`zIp2SSfarqt!@ELoy?8s%y@^?MAMBKWhVZ5i8zVYf0%0qu8
zCXPP0>Z>-`ui?}ho>u?u)8yX2pR8&KYkO_HY)d8S9*YDk5taqb`{A<oVp6`~OEQ|k
zYF)OvC_~KoDRl#Fp$&Pz!4jT73k_s*2g1{EIg=Z_uooo#+oF}x_V6_DZ=Q<I{7X?m
zcX`2~(pFV1kgH9BN5La_W@K0{S5C|7qLXd*xf|czKn`q4aI@~7Qh#9;>g?h;(}4P;
zUVBCtV4zKp34hP$FHAW%m!AD|Reb^04+w4NsKEK(2<y_&o%_K>3h?tnMIOU?>N`yG
zkGH0D&R=7P2C1`q9_Cz^k;#PcFq#beYH0KvhVxs`k^$<X(UIO9l_k)=^&VNT#H{LV
zkMNM3h!p7f%}%1j?GVv1^4mHjt3>I7R!A(*4YQyISCfw^@T*$ijLMcXRYO2RnGjeo
zx>T34KM*&@yCy0^km3$%`2<*QXl>Fb#RFca=r{Wf7hPIi8(<B_Y^lWGEx+JiG0T}Y
zgR<S!?Z|&J&zz8Yn%V4enBu6>++7gvdxKfqU)vLBN@&wj0y6Mv3(4|GUeHhMk9pUg
z=%e*S(-g;?-na1h-(SVQ9E;SvIVki(iE<SR+2^qFyAoR8<bv)K@Xl!2_&Vg+xYdg2
z?kdziYUQ4Tfc0qjRaW_FWM0$BdhWHG;~(60<5Fd#Ph(UK1?ZpK@RlXXzwtVci4xn+
zhih|zyPL%GfMIeo)a3)_LN8nCu^l_((is=Nj(mS{;S9tru6|T1|2wCyiWHytu7kX4
zYGbH%QL_{Lvx9El1%T(8v(5+OO=8hOa8>6hwG#%@Wt9Fjcq4&0a89&7Bgrf))9{5E
zLeIFAewF^wjLZ<2U3y^-GLw4;N?|Oy#Mq*?RL?LuG7T+XC=yk-aEu7COSH%3FMKm1
ztXFrE%|TiL`(Fa7J#X$lOYI2Z&h4MEHv^=|{QEO*w~E_l_b}zTfW*!)Nh0LyX?DK3
zwB+fVgBp*7tfP0j^H&2vp7P?XSB^2`xC*Flf1DFt>C?{irkKI|y7jd-JO0OW;{~rw
z7bm6>5O<Au9^+_0a=t4=$M+I+hHbKoWCK~reCkjG>3i;KYju6idULb`@aVDO7%uDZ
zEwOgB;}kPG;?(fRWOz*^&(ouck}D`LQ@TaI<NO^AqkJ+CfmDh|Sou)GPLlH^vh2(1
z;4>**WPiFIFbozN8Zx*aj8=D8D++-)QIK~}z+FnKB@}XyN*rE&tN}l+b{;&mk*DDv
za^%FGL?K(GRXdk8k*>lXm+~H1<lBeb?Xv_z9_raSl@LKBhyB_$$ZjkgOl-s%K$|v|
zvu+x15dEkxD{X*hrTGy9yI+qluukG=J3Zu9XDR|8B^UuoV-{Oa60A1x5AdrKgmn;u
zN|lrWq;-5`=tT1ez!~C;Uk9yR|Lc2KgUI_<vjsB;Q9f5pj_{WSMpY0&ebqTe1qn%a
z=5thFoZ8g+l7wQnA}|C%K^DKVl-nT?8xMkEX*bX%88A?b$iZHc?>mtJjc_b3pRlgj
z({H~%NxPLmIHmuR;HTxgkRwB&Z-|YsCYGX^E^91ZheF#?=l$XBsAGRpvw>B<mejHu
zmxHzv3hhDBln?Y<^~SGPzq<GEBT75$xK|E2Ia0GV^ZTfhHtj?xX8zIofIrd&hf|`$
zC&gt~!9|Fs=m%L3@x(HxP2vv<S>+>icy~Z<uM!<GHsbWW9#c*{tzI_fk;mcgP~rSd
zd_h_?zkUM-P9XlGkbf&+T^|O9K*VS{6;`QhVR6)n5vRzDAdm(v8)b)_eBy91qUod&
zGfyDiqPe&na(HpLr?jQ&tb<UKBTlayFk4`VI~Bf`cQ<<q*Q(o7nW4!00Wqi5Q11B=
zjh(DD-*o{xp5#*5q{{@U^9nM6<7zM@n0n$fO+msg4HCYdMTpozNUBazfj*|cbc>0g
zE?&K9^!X2nCW>ql-2EWf;aRncJTCHdg{_AYT!}bt)f)mq$})<cQ#Gp)Dwsj=5tH{1
zV{VFORaE!)ep<c^-dQ=ck|a&G8^PV9h;Be%vQL&1o~W`P>~OhSrI@Ju?6$rH?Kmcq
zkD-9DFKXrjIzu}B;lt_tjCX!yM~W&R8SPDP*f!@$%tk1Xb7jfv!R8KKtYdb}gmx$>
zn=H4eKF-gWNq*_5Z7KR8Oz2wS&FXm*+pA9eD^Mee+l>F>red}jDW`!~Uag)4icOP@
z>i$jAoa=wT7w3OO=)Acss6`#vT`Dl^dym>YAw-R~?5JT?erU6UE-`)k>AN}K{>M+g
z9X;@a0qACEmXl*>?s=-bw}ZO+u6B@3(pNGp8EE#VR=&%-&J@C*(}R&8zB$$CbNcGT
z=%?L_@#57@)l$V02B&ZJ$R`7hmZ{>_jF38Ax_!>7Lc8naw-~FY2u4w6Y*+mpr2`gW
zXj7{kJXo03jgK^6>ejDBrQhU<>pc*@!jtiJ7-djFoO_B-GET#GIA(Y0Hn_IEEIRXl
z-pC-SU7I^E8veNRHN_-A<VirrF`>Zea&=_)%tV)}V0O|D$#PI~b40vg%4NDW*Eh7g
z_MwN~Nj)mJaeI~3`lfeDZNZ==sG0`@a(RMZd27Z$TIKqkb6`BqO~32yt+pra;TfY!
zcifK;p>0qq6#cO?n_UW!OvxV0((8K#EfK#^^(sA!0C|-{^ov1F`?Fq07y5j2L~%dx
z^<cd?Cay3YW__a}7WnFRf$%%$-2;dFfsBFg*A~s5?BChb$e0T&pios_>^H^KuX&!Y
zuGQsGa%j#~WA#Q@2MMG%tVi1IJKhlLsFWFetqnMw$f*r~piMSkp7uggG#)Rr&^wzU
zJ1F}7B{ZTi`}E6aSmC1yRhMI5xIJ6(v0tXboWP2lrB>}F9}Wk=g2?wi`M@X-H)y1k
zkU+?bliBz-nXZ<rned6#m7fEiJ|4|`Mdv;q65-D{>;=lppuF_0IdH1E`Nd~d*#VA?
z_{Cl1J3UZ>mhL1!+jpZPoA`fFn1)j6vLnl?$0;H#<?l@u#WZ-kX2F}i;WsBfKzB%0
zzd&tgUi=mTZe6Xhw0C*wLq*5y6xN3&%UQA8FxVu}<K30bWyo2iX?9h1jn!z|2i+#1
z?LCgQJ;k9_<EMP7K+#=_7-?o})SdinK_(24=p-SSoc!f^7NOoh*iic<!2hsMkx1F5
z+mgQUP9Gq<dRf0W+L<9?YqclykMII1vQ&6>bCMMHIPxyA<6K5Q;gi+QznW>JXgz0_
z>feuS5&$b_V6CthR}A@pwnrJRZQ<sSe0d7DQ5juwMKXN5wY@6mK-pniRw)*)dbpV3
z@)Yvrv(h!JNfV_K5l*}s^QS|}-pOE6zm_AyV<Hpw&Tf7_{2xvcHq5#!hs_1UH-W}B
zZ9cgL%FNjAMj*n5wRH8Vog7|V+j%KJaw_^Wb}nxjNBsrpcwl%~CtTxs2gk|{ej+2s
zpP@MsQMR$pRfVAN@Z|1f<kWR2IT`{aD>8Qb4J~#y@aEaa8mYQZtlXD=499vsP%bY!
zz;^id<i6<%7wj&&ND%P~@FqU$XFity*-T24uj)-%%p3o1rX8dvB$Bf6<;=?JaU#f$
zQ|4};MU985VGsInFQ|XmXzIOc%TiGMuS7}4{ErN~%ByN)l9(Z$EMe5?Nw%gA81c00
zxR`my@Z<c}c$|0Jep~<hiQ4?~AX2$j{40h#;wdlefGQA__a~pgG!9s0cGU9Blb;{M
zAN?qT4qr3BhOrRhT?26naw1rm7_R*Ra4AG%-(bet1mUi1Qpc5o@oqJ4&qzM&;^?+y
z&*^HRR_$*lMmiO%CG^8vb{v8nzar#1AVEqp*I?7;l^!na0qA)vfwHn}Rj;!~e4@m(
z(F6OJGgMpZt<YboTa}uMT|1w|tR?Q9mQu(eH`D-X3BLrvVtaXHPr#Q+SXt=rTjenI
zBEoF|fHTt+qJbUpch~~s&ZN}hJ_H_!HM==OjzEg?RM(KDK#Mm-=-Mh<KD6^q`6Hz*
z@LABXlsA_q3l1k36h4U?+TYWWhZr~}whHn+zU|UM)E$En1IrNT;!<Z98i_dABc(d7
z$5cR}qG6wRGFFTxSPURXv2Z?a8sz3cJEKBs1YcqUjPS%z3UZpxm_T%(>6z$JT%;6W
z5{I7|^J~P8<j-E8`Z@U*;!V0hdsn~^8Zq!w=naQ%5<Amjq5BLf2}FBH8SIY&b)E%|
zy_HHNIshTUum-VIVu6LX7cG2a#Bbp#4(AwT%MITk+5@|KUqgv}_Fg(PO5j2pp7tvs
z5Z6=o)q9@r-1Ma&vG<Y=prm3VQCpM7N&xFl{mIbb#vZxgDs%)5cdyrDpeCy(tthm}
ze`0Uwj42KW2^vqabHbWKfQzNjVTO#qi0m<2<IpgM>maOGo`bl!gCVUHBszX#7K$gn
zPNRjEQOJ=d)Dyo5s%z{JZpz&N1VCxmL5YfT%`GB0Totr7Jh*i&jwr^WDa+x5LRUZ)
zpSva6;qo1U5Xj8rY#<m?M?n&XaM|Lh2+vhj0<oQf)P6KM`w?|qy?2BEEl8jk;md)V
ze^!K6y6oOtia>M7+PSq5#V%?3U1&x{v_Lzjo1q2zLu)44MBSh8PsD<$k&#`+=O~Vz
zMlB17;0J_@R*P&Q>R2@Qz*K$GP4K)qNcf*g-1>pikaJX^t3Dp(t0;UA|Cg)_O5!UU
z!4Mk?a`;2yptv-F_~8%cvfFRRLZ{$QdDSKJt(Cn@MkjZJ`_V<kVsH+mH#PE_^mnb?
z%T~H}OJ^q97yCxYn}Ow0QL7GS_P{7&C4J7rPJ5uZS++6uVJGw>a&={QHisIE<~YHa
zMU+TibBm%eqzL2hmXHhV*ZmOXL}<tT4)i1HynLuVB&x#P?d|W$lm<7MS~#lk`wzqw
zab|WoV^vZzGyk~(691j)?q9jZdIx)biUe4N`848!BsOsNVP}qkxH|K<-Q_(CX1t<m
zd!XU-wTX}`40^0Q6F@fw$w6zJ4r0k`VgwHhw*Fe8+&_xzfvj;zN_Gp3_eIR!pJ*VA
zv!hO5&STs@4!oo$b*L(_dAMp_qVOdOmBo=TctGx=t%vi2am9Nzz$0`7jjp!`Q6d?c
zj<wBu*In{XBDH)&UMFEZ`JA3xM1}EYzy$T5C~?xa*I2{|aPHAq&8ji?oP{A>zbvP-
z>R=+>e+67EQ++h1ti*5|<j&a8p~{#BA1^fSX=jnp47>RCaGYB&$o&5o_`lZRL_EQo
VB4cf=BlY)#(aacRRBPZF{U1D*U$6iG

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon~iOS-marketing.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon~iOS-marketing.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9ba557d546bc3c84c1e77bb31bf42ceef0b2202
GIT binary patch
literal 58518
zcmeF3Wk6J0`}T(sq(neUMY@z0RJue3qy!8Q5JVaY=^jRDkd*H3knSNwl$P$HySrxQ
z-2>?3IsfnPr}N=>V2)?@UTgNc*0p~3b&t<81t|i&n|L4)h(JdAkunH`3H*o&!nq9m
z3qr;A3H_UaguDa@^feIw^eq<fJHMW)jJ~`)h!yx52ZZ5eboT#X0KeS?{sDo&iQwO_
zV1g1a{qJY=f7~Sd!2$w_gJd2_Jh#VK9Y2CRe^GUK!b11>$E_$OaSW}G-mRHD{BC&O
zh_xqO2ZR-<dc;rH;fZymYuA#M@B(!oZ>CGv*HY7^mtRjtjTL!r^I%@$VJ+^ydE>>k
zhu`V57++Mck64?05?2oED>mM!6+NMl$u`d0s~LQl9Y3<7hGk@hO995Abp!qV$D`MY
z+&#aDZ~gt+*<aBhqQ$6xC=SBFB>L-*dJK$fpsR8`boBpx8(ML&+x>sN<mPq>%m}&_
zsr&HJzuv_S6J+wQmp~ZUn9?AA?w{`7|F}QkUT{GJ|9%O46(<N}p&f!t{LkA10e6@C
z@0T!d0YjOrXC$Hj_aGTTs+ayfA^gBl>Y*~skNz=k;BKWsg_r-H3iJRh#N9C6E``c@
z|NC8nK-vWVnrYfe^iZ&wqlk$Ano#t+026)lUoVOOH_`w282_8-f2^1Pp6Gw9m;a>W
zZ(;gRI{uT6^BMSWGyHp9{O3CUu`d2|9sk%;|Fd`h*i!$Kj{l_NzXQuZ&Yl0A4F7S!
z|L+L?_W}Pu*6|Ox@}G44CmrWA@E^VVn+^VlN&m4f{==mI*i!%F(SL8L|AGI1Y^nd>
zrGr#}h=J~Zb)HAhX@3O=80xxvh!<kvVf$R+<iy#hy)mu_6nQuqrYQa=b8m_5QHps*
z2I|7>O?t67kDg3IkXlW%;WwCqeOkiAhrpAqawIIj2S+3UeN6c3=@!vM&l3w{+&lH)
z85Z)LDY5#U-qG$un4Y<yu;(AqATosZY(Lxz1!>^WYD*<17K&3JR~rk({gUm(k_OGj
ze!2X=;>vrx_BYQso1~iG+sbI+@UwB7yovIsZiAN>a)Pdb-o^=h|NQ5DEhG}VYf?0i
zZ^NaFZV`2pUsry88$aSh%jdFU{S!veJsTs+Kk%g9w?6ewGtb-uyb!g9bP@wBa*mvk
z9v;z$o(>q?PH*Eyz6bny-_6hU({ueincnYy)?rK$;><qN{<av|9<LSNL~g`N15Dj^
zl0w4&rcQvOLVt)h3YJN~u+~Eh#yQoCk;h1&mV}W;Hg+r0Vf=4>ICB(EHsEDt-rU^_
zJf*<Ew4~*>am<p7)rkERZb%PDzq81t-M~M062uD~ngnl^gDvRX#LX~$+smS{Vd`Nq
z-wl~I(0^GJ>&hP<Vj)F4x6~qNs_)|;Q(qo-+_O9RvHldBHFe~D!IZBj2-nT9ok8i(
zy+A4WM?=0CK%53z`DuWU<Ie3w+C;MVf<C$8dZk%8AH;0#C*Nye1SQ{#`S$Vm4PmNk
z&qXs2yKdI37RY7>TDDh2w#UjgTiO^3dY8Dt;=aRQHjz;Q^}JtEvh)(aZw<_5v8npd
z)}`meTW44L`r<+|?O#n{%EIpD)lf~+E9~9qho_B$_bFK9$>oSz5K5|j!vEEuJH^qZ
zn@oHBGT-cYo-Bj1N^j506n>h!=LI}dY8AQ4ISwO_X^X&E9$3@nDO0}jz(5x}?hw=c
z7HQ};)$&?-g#kM)p7inu<<jb2NK=s2I%mXGicZ9C2O$n^cXfTPgC36~JH*`a72ZM$
zBdAfp-2dk9X9veayrwslkFWI2gMk2dmIBzQ^YDfh!tddZncY%~b7+*ws}aBa`XJ@?
zSfBM(-yo3p_Ubjt-zz1^06GXa3AZ;`_D#tgri|!<)$De<v59_ggT>xUQ%xWH{$?J7
zXWLQ=^WuqQeqvJ<HJsVW{^8FM9LV`y)72likiwR43#;6k4D&O-q_O8CV6VM(kgfNO
zxWC;>T!w_0{Q6x%=Hdk_$0zO?kwTzk;mU7+7U8T)J<4JO@?&F7(2<8ueLsF<?T&!M
zYV_2+@Xq5{gLo3Tn?AX2FwJzg0&fN(n5(v&d1^+)<Zqq=J;mu;7voB}rKsC?l)cx{
z)8FfqOq=3)Y~S+{n=Lij_!&*t^jpj^(n!JD=gbP6w!HRU$;=p&-MS>Kzh^>QGI7*7
zQcG_iY2bLjlu16RK3pzgVq>BCGKDvc%ncs{lauT=&*(eqQ?vdw*ldP09x#=&CD%xQ
zzd?`~wA|!%+SmJ0{h$HoA!dS(;acXLtH|S7qvEH!W0-YwtASJnKKW-)z2kMemPdA;
zDDoS)ZZNe?mOqtYC<b1vsZ6WT=tz-S8cS5TmMSaGVK+R=r4x%3v)wVoUV;&eHAmjX
z|0FAr_~*~shtC*6`EHE`zo!BN^O&X3Qa;rBz#ieaB_$=K3(?fKxpds$prv(BUqep6
zGp*-H{ECCAH6}S%0Xf9!N(3daR>vX@lK+&{`>?K3%l^n$6ujIQm>|A+93l228-5|E
zcm^KdLm61OU3I>W@uV<Xejx7d$MVfb5(Uz_xs{1GMTms-!PhgXF0V0kb3vz4e044E
z!ufac11ac;#4%7MurPrN50tfJdG3Qf5VGa;Y5#56HhjIQqNi#HWv*Ki{o;nVpsskN
zq~zW(D$h0!V6~cc@cp_hH#sR4x7~2OdLVO|{fg%&@d0pH|Kn{4%KrI4!3-7-Es+M)
zW^{B`*TqiZ^5MWdd8OTx%ID$Bu99L4>z2c{do}k44rX=7?tK)G#MJL#3;p%(-P@Zy
z?>eAv>!=r2+~U#Vw5?#I!?(Gx=Ng~4Z;_0KVTB7TGd;drhkzAbg*~Qq25%{J-I^JU
zE{57M3OgXi+XIPL&09R?<2HMwjxLwLTx&RMz>;#79k5HDZ6d&puXhL#V@ub=5Dr@h
z{8snHRT`hM<7kLwsirF!z>=_xtHkT0>sL1J%hvFQ^&*Y;zt8P(Sy@R*m|u!HUwf!f
zN8ahLi@5BsUoxfXIg|QNwC__97f+NEcZrL?m>d{R<JrI5$?)=V`c^$oA)K3Ar9qtN
zM^yb5?|9KtihbwENflieDVaSJ_I<26vx0IIC-P0{71rte)Cqrkc0n-1lNQ~5XN3mu
zPJew0TwJ%+8v6%eR&cCTZsXGw4AM=wg@085!V@F*rl-3&4C}NJg7mWayt4Sy{r#}h
zo0KKlksAF90c;oIg+#57jfBBuo8`5nn|HX2c1B-m%eiPh6b^91f||6n=ziBsBX>;3
z$J}OlHod{;?2Yg|iotMvLVEx%J?Uzjn(-Oqb5`=p8Q_zB6{zrWD%tE?L7R%wW6gL!
z`9rH+OtU)lx}ERrUF>*2PaF*TG3IMPpU7IcIK>JKpDcaL8UN6v#vORq_{+yqv<Beu
zdC4Qz;sdP{V`JH9@TX&`z2?g&HV(IOGDQ+f62zeN#T_0aDn~nnPrDdFA9+apn;f7;
zz7Hz{&86bBu$8c`3otVyKS%<WfQag1SsO7W-lr*(kt}xA>eUbXQGx3$WUQyW^sVam
zg058cB2@Ka1c4vWU1>3e3a#IXc*`(Mv$oIbt-rg<=RaR_Evy=BpdPZ_S@ysLBqF0i
zWFa3KhRkex=MkmAj{p2+j3C8<%0eTL6KypE2GI|rx6ktNPUnPm0<f%YkSRA0fK5oR
zQQkR)y#I)alMm}<G~vv+NPPd~!L6krgiY1n<x{us{(e8(E62X-+E^~hX=-n68*i0Y
zTF{+2J#ljIF_ZTrvl<6)xw^0&@8U@E_?z0$WL2o}p=QWyjCguaPheeP2QujnvQVkP
zI4QU`NeJUTYMPS0*s|I}{cux0i{tnwsIr&0PuA+uGBbca(P9v}$!OzD5lKhtNTIrD
zmh-L*aCJ92e0!O>^hiw`I&7|b|2YJfWH%WxP30gfa5Gv81jv9GY6#}63GA261=xu$
zVc{_<vf&?$ead*(R`Ac(ex3(Dv;gp5&KwO8;zh|x1NE5Mam5k6jwE}Uu3Lvql2W8U
z$2?YhZ&omJ%&H_7RsHC6ZCbBj6g%``G;w7N>4S;zC#3Iw7O%q^Ff|Vi-5YnH`W_Rb
zo|-3#df+Bt7tyw<)HnBYMYs3J4eJzKlhRTYfPLjg(q(DTBSRkC$BL8qDyxS5>#$oA
zyBhK-jB<DB*H+A|s6RNQA^9>!K6KYrgJr3+u0inK_QOVwQ&VRQ7{?uzl}8f>)&us5
zEnd=2EJe*6zTTmRNHvBI!u!QsH@R#a4(IP}kaU8MIk;252&o-^rkJ7#0eNrEUVFWc
z8SjY7wMOkpLTUv94;R$;;PzKI=W_?fI%qkD$tzryzskks!{FTGr%|b*j#Dw4%GF4f
zRKzZy*bX)((T}+L?1N~giKtf1PnQg{^vyLyQOYO<cNrC5y;jp>6c;53i|g@ZHW)wR
zg^bY+nuC12*~Lq_I8rR}g}f9)t~DxU&bG)9ikh;V$8{wZ`&)U%vU;lo&lO>q2{d3X
zZ7bMY<C&Qd1;m=9cvXf<2qlEbp5d~$_z-45!czEWnk92+TVFG8GtQf@&;8IFKk&RP
zecP<5$ML^T6)LbJ&_T~laxD=W1j6ao<^D2>o7x_SRE#l4!CY*ZM0QTTo1<RO832p<
zZJN?!=<qy2OXkY%0i~mj3FC|M^&)9yDG1AwN@)ZlUW?XE9CfZm>$I9uip;ug6S5?`
zH)pE#4{4*yy{m+8mX&0&6z={qzB3sbPi^6?uCL~9zkR)`uAX&A9<}fpa$>tRP0a_n
z89_C_4q96o*}5C`;Z>F`UrC_20_M|GgeRd|X6)LYv~e%VD=I6?rg!v42>Q3Ls6d3Y
zM0C&*#KPR>mNxm2MroZ|Rr?*0kqE7bjAY*`;gQag1WIU(IaioZXyvDSe9^y5JTS#~
z=f8McGIqcBrK&B-JE%n>$1#wa;E};(uN?kBRm!M+EBeCj-2Q9$Cj=_h@gxOH#W?}P
zCj7J$6BGr<{Di=8^#MI=Duo@0Wxfi{YTKDlhmkJz-+K4HP%Fagqg(X%k~m6eGQF|%
z+!LOvJiwN$k6jxEVa1R4-CpyV@T2OFs=nk}s}7^LRC}B>W-z1Pj}g6PS&sE2z~|?C
ztFfSCo4SeTCy?wevyf6nU&fCo4QX8<doUP-$i6!L#Z8XBnj6xYCZg{{J?Ce|qkk-x
zUg%#=G%>kiYs_!`%b7I=KkUAX>qaDZO|pb*^Jf(2Q7?4gUl2Jwz-)Ba4&PAAZcK%<
z>B;g&&OpGY{S-EB6WCkJ9YUt@{sVZIwLvJbdc77ulH35df(<%|D>mMnsI2Qvb{s^i
zIKENqy|?MfV+gGhzCpY7r3Ux;OTv(&1C;`La}uJE02z?GZu0eXO=yN3RE#TbxE29S
zahK@;7tUeCj(5)L!){9O4LrHHH>@OPJt%#47yWX3FG$=}=A#-HSdjHhl7B)M39<O3
zIT)rf%04b~jJpoo8$yY#3G~pNtn99k`rn`kjk4kxTk3=0y;&-BgUL6;^BX<H%>nb|
z*gJKX1#3cJh|@{Y;MLd$;mPQnAtKBVYyR5S_ZY7qvqrH}v9c;7H!H-I+9zC_W{+DK
z<K9|!2C}cEF&@?3!TI3<0;}QP5)KcF^V(xuHMpNC8eh{hhBc}7;}yGOMM#yfOFI_f
zD8+TLuc~HIKb;<(Y)`EOV~QWn`xCR_G0J^SSup9;8~+3;ulHrUMG<Kud7}o9eqe9x
ztoO+nB2m@er+i7!4>w<=It;VdT5A>L-k2rd3aAO&Td~Ig=i?n_AdXs)9&3W*-5jnW
zptYQmu~^%p_C_O?5oouoE+!rx{x^6$FkEI}xI9YJ0-ZQDhWk5wB?kpT-7Oh{fGk&3
z^>-6L=CPwYsqRZ!qGf=#F4GI05LC}x8tF>NJqngqM(t1fciUeBV^9D`9!-VU6*=;s
zraC$}dIpjpl=ZRIZF+~dm$wbu=}h&xxZB>#-Vh1ji>!@}DWJueoUb9-Bg3rYZVq?@
z7b#3}kIyms;(q5zs>{&=am1@-$V@gB_L`TL_D_Zv)8-i6b;{}qU#w5%VAV3^@%LD;
zg~vArcOGJD5PQcYmpusR@7-RNw%<OkKF)xgrg0L&D~vlB*7P~KQ~Sn(b;{B#=z_9<
zgPL5L{hL{=c%Jf2JHpK-r@v&mtb9Rmn?%tK@qctV2|jar?2)C3y3^x&yh3xt1;){k
z(C&BYxVEv1z!_t!VSfh8K09dj6}0ghJ^d<I`2vN4LL2qCp(Lsmxlf<A9ZFMF_~353
zsd8Y%-}2N~)IQl#7~WPh1N7ruob|WQ#rgQf;93V*#6zZj-nFUkdka(C&BK@@YsCyk
zJ|wMNyFVF54!EVuy6t=5Zh4Ur_FNSG<pS00w}ti&_iY?XSibBRuyX5I%gwhhJon83
zZ`G3l`>jT>hgKD15RcueSX>j>Ra2&`Bm=^pC?*vvwc7KP;AL*{LfFs0q?yy8AtL~(
z(34?oH9$>3N5q5y+e|=B3E&O>3dJ2R;^Xr{ObF-S5S5<iNaj>De<GZIq0GIp)E1A_
z^?yFH*1=`7g1(riJn5puMy^dai<lwraSF9-VvP)z&b;H9$yZ)8Go*pao+<MKR&6Jd
zkdfVQOfC!4UbC02*tK87q*Xb;Kc&POx|TT(d2^K}@MTi_i<OwPw%GL)mm?bo*6hr-
zlr_1N2)r?8CxB<P$0bH&Z>s!$mV?O*9{|tQNP4jW9F|iLs}?_by=y_XKy1R$i(~@h
zcSN&&1<ZBniojO1Xm#p_#_8n!TSVp?ewBv44~V?o#mkR^RyPoVBmKI|+ckO$Slx9x
zpAc2Tq?moS=?EAuDVY-fviZ%^JL<rhVAyx-R2o;fI!kGUM6fwv85kyPVmy2O#Y?5z
z2O^L5UIDP8f|lD-PVRIR)nBl)mu`$wF&<|$Ng$PZv~el$=5+$8*OP0}FO5o`RWs9g
z=aiSqNLrx+4m$K}E@YW9=JSoNHP~-ij@#AhUV9Y+vT#Di1t3FtHMcV^tz};p8y#Wf
znCHB-wi4jfsy8H!Knww{#&r|x{TiR#z^QbPrXxhGH%>m}bdu&HVJ8mpGje{DfO?k}
zXX$|D{&xxo4tjuj-9($$;Ufjs9PFQ`Cs{&Mrw^}#fTe>mxz%HVFRX{R=U_DMw2P?5
zk1r6&xVncH<Gz!mOXXPU3S42hd`pm~FwtW58cFlacTOj+bW7hQml53<U<vZWxe@)P
z^<Rq57kah3g0Bv1WoW^*&xnr6)YU9!ogTXhtkX4SWElx3<}sT%I1y%9!`TPkxb;4w
zHe=6k_edHBA7qwVu~OIFe0s<?A^eD0aYlHWZFsX9ici|S3XC!zBG=RUQ$UOHj|{t|
zoVnkHw}_`l5|f%n>)=iHSpjkp4H?aNS~>eiE$8Rn&;v)}xHl$mgF%H)<fSBt(cbq#
zT^LI64T|#<nSikV=8A2>F1)!7*x(PJa-W*jgYny4o3fLRPY7x+!LDuOXkMZ=PbaWv
zDfhOU&67*$+#&MzcY};1Kvomj2A4d|)OM1PFTHv!WiwJMcs_hP`YbN-w!vd20d|B1
z5l>72RQMRTrLB=|GkG`y-kq;Sw5XF5sA$tV(zN9VN!wmXV(`^nf4J|FH7Ph|sAm%#
zhwvQVs#$G2SRp_Qv9?zPQ4;nu?eTqE0i&t)5?T*rx&U$FKfEz+&zRI(_Tu*akYDfA
zUMWSkIk$*|Y2m!$sFzshLYxO-><;_rXlr$DkK4ooD{7QcF|XJ74aNBX?T$;TD{~Rn
zD>5=`_VY#X9em7WRwBM;Bly^t1PK0)(Ma%S?k&5+h$`V*_>o<e0k7ebPdnn6^qqhP
zgGwOI9)$mR1m|<T%KXbyGkluH0!(G|P6p)BOT@dD%M=tpKEYFHC&T95;CfsZh*X^@
zK}`tkZPgL4jLYuB{Y&k?*p!7(lBo#mfY&KEFh6n>F4yY&*e&0JQm+1Z`~Y$b;9h^r
zah$|~zH=q<g&YrsQ_8=7%k=efEb+Nd4u|VV6|5Ntb8*C$I*+a@-*EcmT54-R9+(0h
z88eR@Ijl%kIW})Cco4P}uOMS~+R#rue}HDzhf!w3hr!73lEjY=>4yz$;l?!VZ{Emj
z#wT*R6MZ&8W8A2&rE7H2MfHSXnBtQe-Wc-_Y4z4?AS23jbrau5!*<*GZ#p?W?W6`C
z<ya-b(e70M4K52J5T0+wZ_4!NwN+a!FK#fpWIx!L(FWld;vIURP6-=0wa$F9D1r;~
zw-yJsnQ%~i<#H)`jd%Dh9RKOaVGgLxCvDOlFv%S!3!jewldLn_k?>v5tCCXUq{`M=
zE*-9xJx;JD^*r$#+`OW_(N(fQN;xJT$6v?tlK?q)o)#lJHwG_J2Bz^rLPS%`9s4E4
zDi}d>TPz;1Pyd$TTmAdy=coCA&dg5px@mfhATEdFQs#4mEDzamd4O?b$8c!JWT<rj
z$?)CrE)8ZFK{k5jq<(7z_PP9pW|L!fZr?Xe7+d>w*CV&Mi7+jhx=lq_k7*n$k@VgF
zSA_#~P98tTDvFF&P>LO?X?X;u-B76qm0-p5_8*LrG_cw}H&}mixVQdttvf9@`PsVD
zkH+$f<=}3pJT&;7&NLiZ;2KvD(YH^wJgz$`QM4};j7jsQ$Y$oKf!y9nHs{{!ObL?r
z9<oy9j_NV@?yb<^JFnzkyTJ!F|G?G1kWq&@KdwdB-&En0%Edz6^~McTd|$tY{t-AK
zb}2+`-JEdN8&Xy(^SXT;cVv+2;7eO!@bO7S=}e-F6S!=jk{LM8F6B=m5OQ`8WVSy+
z3b7Rwac<+s-j|xJD=w9<jM%&nf2V-uh?ZlhN<<5um9Ah`E;S=Qb)xGdUFLh*=rh-l
zJ9q3D9-znT4o3I~BM0w>keaw%gRv_uY{gDLJ$Af11lBchbm`B4e}xPxCVMw(e45IU
zA(U=zPGF)=OS)?7*_-2Z6--Nx&9>5xp7E3fi_X0Y(~|N9X|L6S-U2^vG+i8ftVvC2
zb<;zXJjRp(xlhcAc@OAvG0g1Ir^S3pV|*sfYXpo#@C}pDl)d9-T=Q7Lb76+Ihv64+
z_zsVnM{1xVQ!how?kouY5oYlpXH2rQ>6mPzslDXf8wWm%U}?|!HZjzq$R4h)za8HZ
zU*RMY46-oqjPvGy>q{k4u7(=jgX$dHvE&w73r|hYy@-_(?#A^yTv>=gc)pO_15TLO
zu1piJs=)<IabxrozsfI(DO~oh@5emtMV`JxRX9@c1D@DKv=2_N^xAC6I&7k8?ic8s
zQE0m3W5@%0dURDu93PaT19|Lei)a+B#Mzuti7VQ-5T=md8~J|WihnvjwmfY3ZHkjd
zv=YWnC4*CuYYkVqL>|5(z3{|sa(6LJ<Y7h%n1(CeFaqt)@i`u6QX7X{`S(8rqwkl?
zJqgrvaeqJZkWb?pC@F^L@>oPYMf%XMmFm5~{UwuI!@|g1fh^j$zQjgaXEgH|zG>Vd
zaZ*X4s<Zs)P#siK&^N%sL?xCoF5fw#SRVhSFTlVOZQZnGY0Z4w>niVPpvXsxDwV~k
zaJyRX`cN!y3%Bysyo$aw2;l?#G2J#d3twg3)%V{N!S$XzE~;eqtz*h?)2SwF&QIBV
z3&ber9OTz`pZpLz-gj^!+baDYst+o%hG+Exlbs$T7TPDp<sQIZx+C^zMA6G^?8=ZS
z^u-wiRh62&?D7Py#_zP22Ir#A7-%*MHJ0eaTPKS}&Usc6i`L9;RJ;k!<so=6(jHU4
zKND9pS8PEp<Y@ZJ&)I0oe|}UyqIHOJH>YO7l(_rDOYj5WvJXT#m%bolR&qf+_Lk@P
zBB+7a0T0|j#Qz~(>Va!2td#xwuX!`l_&d>?es-&Ua;h~o(N)5gF;(5=_s&c*7rx6a
zOrop6=RFn4@+1l>-a00MDoOk3c;gDoN`^I)h=ac5yMcn0E`0vL3Nhnf&K>{KW_%8v
z3vDi$F_<*NttmQ=%`z^4<+1x_|CZ-#zvWqxbnqEO=e2Q}2kB;3u9$UAIt`e;)HQJ{
zL>n)c2c8I-xL#*Y!8I_pyHK&pZFkpDYcL@2=dO@Ipz5f=;#$Pv2|<L~kon>n#E@86
zv~vDQFt1u);u>5iirq*;wD?$i1-fH-$nU}CM7O*{2RV5ZAs{b(vc0nX{JBzu6#7lz
z&Q3mPw;Uyrka7ESAg1^i{oX0nX!)-x5oJpoN#zo!C6)N~uo#JxX<;4HsmXHK<`nCl
zbFb_Gcx8N1X&Q#zn^(Qd51K{eo11WE6@eOyp$lT%@Kilg>~S!&O2h((6|37m8RhEW
zToP?!nN`pz7b|N}b1sxtQHinT379sdclph;t|->yH6KG#p=_a1CfIOqwy2LDnTI7@
zlDrP_BGCQnF~eVuIb@{nVJ)RP6{87Cjj;inU43FVG_HPB{dL-}ha6F>PslnA3MK}C
z`pj_)E?h9@(RcaDQMg5Z2sF@f0zsxM;$JO(nNtRT80ZK5@x*W8vhpO_G`AquptsZ^
z*n1C6LrWs7Z<Z9C1Kzy@hzYR1hVh3+%p-wwZfbS%&H?YZgF*<+DWj9c8>m}Ry_yx~
zx{&(l7pD&yN7Po)-L3a+@xaOvEpawBA5z2mKj}7H>VsAcxr>bw(_(11M7<%!ig$!5
z)s%QR&6B-5wCzQXUjfAWWWT@)xq}w#qYVu++}||g`<*kIG2wkHzkEYahL74;Lj#l4
z462oH8oo}A`1YY9tcVh^&OlWJQ-H-cMt%Tj7ln;OQB2&X*eGld4!_*!;bsav*JaI1
zTp8dT!qT>h-s8tRmV%2{C{GY|4+LHpX!UJ=&yv*Lz6T%$i`NfPCCQO6c(+0iOC|EI
zj1;@T0+(A!M98e?hL<Y`k+?M`x_|_Tb=XP@L%0JYQWFGFWIP)Oo`lfb!d9o>bSm|j
zH)@l)Bi{N$F~zSNe7>u729N<_g9;bc8bfLlu(4B_RM<NJ$FK#HWR3$N_$puS&1~SJ
zLYr(`bt8HLf==TOEXLo2j>~GVF5yCRZ~%yrr(wGAaxdo!T@OqYE!$-)=6Sa{%B@*t
zQw`W|HISjJN^76+q0YF#XB#1mxT-qYoG0G{80bWU`b$*emuM1}zm$5-Tr#99j<`yt
z#Avngj^?%g>nWF)7bf~cu_BVD5kG9|M`#S>_8Dewn%cZ4g{I6Aq2%l2R$mSt4w;)7
z2bWz%jDqIJG=aE)QUuGgiRr)?4}dfr0*-~T1w^lbB;u*Q+rEHu0rY0jZiVKTRX>KR
z^Q4+pqeLSqLr>lM8x6X-uw(cY^waeUt==N%>Rkp2w?6f^<#R9>Ljz}__@5{I*WIeY
zA5_=}P!_FeY~8_|y8TW7+R(^s+qn(DveK#Vs!pS9yuNE6NfNm&gukl*bk-6*g=X-@
zh5=^U_mi6nV5VIiVvv-94b8x=VY}~%-Oyip_q<j$2se*3L&_;TAxCda^mU?$jKtRD
zYA|oILxDp!)5ML>3>Kf5oQ@3tuW~Q9G0gHkz$A~JiI8nOJk)E77R~3Z$E&F#2*iAj
z#u`~ieR+VFUVo4F(rdrHw9TO#XWoyiZNI5T4<z)~m!D4$te;xWkVxFPI%6R{`7Mfi
zxIzlz7b%%q>$x1IgAcQBQONTEj$B!7y({nCcN&OO-tibnIPhb4Wil`UCl}@38whRX
zd4<Ca4zlm~A^NX+LJc0=dwt{D0<rqrvXP&Esr75XNf+N#ClZv6(s2W*v&410cfd8n
z`WNJE91&}8uLkemSU%$$iYR<<6Hmer2YleN3-0c#xUwDl0bo%FkM{$~0vh3O?=9Rf
zQmTEskAO@pc9#25D9)yfwE&j-<hP~%>F{l&vuuQG>wuE8xDejG65PjZ2g6k~vu_up
z=^iNQ37i3|6UL(bw0KmY-sB*7ktc)5NXu0--j@}?WkRFIsQFP@-D%zR!jd_8v0D5f
z(Bin4)TMLcT=4?J<?Qyb?)`1Wm}<~zHEju3C&K`F*&wn}?}f6?TL9}1?o8izG3F|C
z+nYV(8nPIaWKBNF0M^(%I<7WDsYiA>nDW>-OpN4e+24IIRL~|VQSaPolYh*Kmg;uB
ze10PqY~V<0=_XBLiwT(O%~29Fia%O?^$nVBaF%Z7eRX6svqLMjeiv7-6u%Z%)*9RH
z39dci&k>f#*POZW5AS)n+MAmjg+0N)|Mnqa+V%QnQ`4UAT*wum9&uJgzyC7!DVuy(
zHSA%w*9Sf?AQJLZ8ZgvP<b?0Q!BWfBvw<h0J0kw#yQp)WrUP_(g99kU?HznJX_>M-
z`R%AVk*?`NU4WrZsHmCs)>NC!6#yT^<(anDb~|f<MdnG9!%S95F;h7ewTg*XTi5`=
z@ew<7foN6D(%c#-n8)lqds3t0l41||={hg*78w5YQMA=EL#+k%R{_3wwpg%AMntQ7
z%q~peX~HnaL=s=4Pb#;uIlL{zOgOchN1mQ``@%?rzE_z;$E5^yA#tu$o_A+-cxE`4
zw|7Mt8k{|0pPS&F4Ibh_fQ`m9dT_ms4C}X#hHHM^aYJq&oQ%vG)+!eT3;+Hu0N1<U
zC^N1G$E1It{vaOF@WSf_>CQpGh|C1zpcu1Jh!wp3@rbO9WzzxdC`ybrhz<Iw<yz5B
zp)1z0#^*r~+tX^0F#gf?<!yJX`=5bgU$6c)HEV1!#hOwm$b0|PQ?$zcj_vN4KEk}Z
z>GB+$;A>;g2XEQ%SHRVNkpFOoz^0x7=h2CVSIsBJuYOqXdacA|5_jDq_~9X*kG9n>
z^UJK-9P+=fJ`_R+W;$#U95>SD!WFDOyzOCcR(+;Qi`*yR#Qb<0ShU{7jgfW4_D1TV
z_exeMMvl^(h!9if?pnj;+gTCtWC)giH7?~UYmVRQD&J~=tYsT~!LaX_33KI<7rhK(
z^iv9p)T39|?CqqgV@oUs2g8o%?P~FBDzhGs2=1C+inOw;yg~z%nkNhx_yap@a?lpL
z?jtXQ|EvzMDN>khE{Nkg1E-1FGFen+oH$n8oOb+u7KXEu;05!b)LY}%FogJIjZU7?
z=TW3u&lc~<xO>?J@?b_=z6LaYE`W{yfO#}T1<OkH{8OlJYh}~4CwP7#Z%y8?2vO!X
z@KQPgR+TC?l+50-No}cYbLv4M=*E@YiCC%A?FR@x>Q8=aYj?V6-^W{$L04GF+WM9N
zz|`B3AY<GG(b6M5JvM=!>oo!$=z_Z9=DvorZz+@q)~`{-HdB})`8iwadM-G09l)Wt
z$d~Ac`y0Jj(@OjURfA*4yfK@X{eL`q!r{NxB9u0-;!CB+Q*fczxGop$<HeDj&b&Yb
z{?Py6hb>nij|NQUT(YNb-b*3)Qt!hnQuHAZ`LaM9i>k4~K3%$rYvQX)%G;mY#>?B7
z_MguRh4`(Pgdci(g6x2=MgZRiICP1aX;!@^sHw|QT2n?bez-ewZ{>Ig+{v&W7#%m*
z9{q|rCBGM_Z1m@aJs%eol6agL@#W6tNYNLRP-z@G8gN0bs6lr7iuq2f)O)3sowMvh
z2CBLFeiQc38jrp?+~s36<1!=C%{}918D1X{FWi_~m2qP0DXZ0Icb?Q~w(ILWKnS3D
zG|4%SMkoLRYTH?cxCT7wJV4Q|mRiPinsV*^0!!u8-C(rCe&5o(^NFKyuiinxIrd>l
zLwuU7)WVr?Q~V{|2BXN1@`xYbevaLV%A@Qm=Mo3k*9nO1)1Q$LK)4m1xFm7bB+rGL
z<y^Qs>kuAo*?*CcdnXuzNW6k6H+v^7OAY8|G4bL98hR~A1O&hME`Fm`jGSgX5G>0k
zWI9)FahpYU!P{rTEkmv&d>_pcx3d)C5xBwz*(2pFw{5L&$X$kIo*C^F)b|uL5YaTA
z8lAtQGk=Gkq2-(I{wa@(@6I0DXTuV__k(g>lmVYz<*i`e+2nZ6L)JoepuLH?69cSh
zn@#cCX3r<GS2`TLlHTK9Z^dbK<_?$uN)Eg0O)2D90eyBqX%5QOSMNG%);=3WvuV7w
zl}@L&Gd4Xx^5IdEi~0#c=zXzpYYK?iNwt1Y+ydiKgW~at<(q||-yZvxFaPVL{m5Rw
zm-$~+h=Qtw8&riZ9JU_L_xIesa)6NPCV#Wa#mQBL-+nXFD6;x8`KKZaa-0OP*eV;R
zKz3oi#v%XoPqpy!?K6M<a*l5ZXLo(gNv-Fz7d;U!ogv<-rD?JC!6J+0{dX3%YZnTR
z_@m&nPPIp)cTY`kXyCX%1~w^Geb(t24VO&K{rCYc9f}X%@uv{3S~0is2Dy^$XZq+Y
zd(rlKFq+l($Vq&S@omToP3XO!l^BXP=W>lbc9r1KtI5f)?yJJNS~8+l9~*qyVfgjM
zK`lv~imnUJfU%Bx5PI<NC=Sc9>m_i-G96*D1u(A4>SATbG5qy{^CX68H_T7RBkdh&
z1be}>@U(E=rz50m(;1omRN#BipD+CQMy**b$^Gf56pTuu!!iI%!(01p&8See@Y7f)
zXfMHdk$yGuWdM+HtlXem-kx>6d}8($$jzRbUI#`h4_tRhpZ(*E%Y|yU`_PWRkUTzo
zo{=kZ3${E{>8QQvO&{e%b24E$7i9!|JdbVnDQ#PrD(5zMsmQz9p3(kRZr)p074g06
ztA$49Qa!56!PoLhn(VDq{7P&V;g>C1M9$gBd#>y#yRe^&Un@p!Ghk4_09~)3<G3P@
zj&LlNYI0mMghsrP2ds7S!!v7ry5rr(wg>YW2w;#~<9cBC=AXv8voyg><W3e9YF=Xu
z)7b`EacAOq^z*5@y-kvZ=)W}k(WnNK<WqdTUv?Ecjp+g|a|*!d*V&D-Xuyi*{A}ao
zqN)4u43i)-=;Gm=>9M)+Wr~>EMR;j3g~)Db$R|*K!gC-^)BVR{3t=;)`>^4r+9Io^
zPnOt3zHQthRRwYe({TW-Zq9<Ae$WVTNz;lj==q`(1&|gPfl_P=@>@yw`|8^qGw+^5
zR_*1HSgMsr36~6{3K8}hea=t6GIU^VE_ae2^)#yWly}?-`^vZYDrK+)Pjd7xI5NOp
zVd8&xy!Xz}&x(fk<YVYa&d|vEFL)6dPxy~3gS^dDu3G_dBUgdF9^j0Ptv7%`rxp1Z
z^+g{}qHf^inmF?`#{~xnb}T8Xvpyeec}9=0xNzA%!8_i2Q3gQnPHAvygKu|v;Ays5
zoU3@iK@d+fs5iry>J{zjtCtD9{nLBpCUkLP&=eMu?FIl?Ulb2hIRp3QxbBZ~;2mP7
zb;zCgg4wkmYed&o{SoS#s%Pue!)P2LoCNtcjV>LcrMh#xU2{a)2L`u@@&G7#VCsXd
zj@`6lM=>ToVdjtlu50NO7#xI;E@%iA9k$N(@WDDWV+`vkmB11%7^mW6GN4)-3qb2f
zKm;v7ibHFplmU?H0Nz@SKOWos__3xSswHE>oD`Lhzvc&w)|~<XR_CD(2<w~P3`c19
zHWT=qT3i3zIBXz*n(e&Z+_O6>@BTbYZgl3b$Fix--g5)j3-a^D)7?6_U6wf~TfGlx
z)=+VJ1`JQwJi8aI(YjU=eQ|3c@YP?C8Knz*%~2{}1KPcRVXtX^9y!Xm92OiSx|^85
z=LVao2D2GT<654E4s{rQaO1g0mwzGA)NsM-=Ku*&U)JFAckp9P1rn;SW=F#ISApeJ
zXufV8h&I<ivLWulk5`*qeGg>(Do-AsRP9Vy-gux4NvN{DC1DI7aBb4<2xJ;>hAWO*
zC9Dgx{3LYMsa8L3OF7f$gtD@^517_*giva$<zE*Rgr%HULrp}QTv*!0V=TMpbsaF+
zS=otSuCH><Nx4j?-dIbyIN^`NR?z;sR)mQqP!p)C5eHzk<E9(wF7GNwS%f0_1eSQK
zn}tePUp1x2v18S^aLEF|I=o<d=`GpsO5zXCewNmm371sK{lTR{m+QQo%)IMBQ96I1
z=hOTE1mc860agM^O++4QS7ff3Ty56dFhb~9(@p(o<A%Tr<O2p)D70!mEE824-CQ6h
zv<~sp(dSw?SY=eX5NfD`8cZu;UpZuK6X6Prr|^{et<}V$!u0E(`_8l)1!%R|z`&tT
zGmk0rhLL5844VY{s_tqQ+E>t0tyX-Hzy<>&$0+~?0;|wPGY~?Hss*_DKIPT35Qp=N
zngUw_i;^1WMDT>q&8_xdZW_PHHWg3QD@QsxCV#!S0@3|#t!dNd(4eeu?#2(_JGa@1
zAVTP2UIQ+eHhjf`oy*iD1Wm2^Fqm=LyG2F&@0bv_^tbR@KMHQI4MbQXJo0lnL$C-{
zH&@P_^?_Yv4QC7ZXNMT6%rcxhcIIubh9`Jq-4G2w8e1*+g*gJjfAGh8MTUlFATY;}
z499s*bco#*u{UGWKnh&G-NC0X^Q@3K+J7x8vXR;!!uRBFeQp5snFg)T&;F^;B?(F5
zRePzawx{ZzUGqk7uX)GN=bpLhx6!;EUu_wM)%N0%OEl-?dI%BKM#tn)v?w$t@ry?2
z4as}J)HlQ@Nc*oZ5g4S6HhOhPYpdZU|7EHL0Di0D2$T^k^*n*S(R#-qWMl`9xItf_
zL@K>@Y8SlU>nqZ2EsFUv&ph0oMQU=sNi@^N?B8x0{v}cHz)k}Q+&u*XcVWjXEh`_{
z>a(w|k3G`S9SyX5+L1vjgg32QS5=IT++E%?wR#Ff?v7uqeli?OxI6qmH!XTHGr4Wj
zBN7)fcIe)Q8SIC+z#l6wW+&;XgA9Bho=#H<-KPs@FG%N9BwsN?mlD;U#W%Crvx27p
zX(o!V#2c4ZnZLRN(2rPrDh1Hxv9R6QC<0qNUQ6l^^CY6^PL?VKAgTGP{H3zZ3J=Zo
zt`gP@an9S9F>pM0(se85)jfW0;iZ@X@p3<~Pj+FqE6;Lw-48WyaNKTN<Ger0jCc4&
zS1oS+J#Jx%sf^H2*KaR<WxLP(*h<4TzFRDM3!S=iWmzCTC?$XTw8K@>sx9ew4#3qU
zaPAx-!op9po-L1hjvqH(=9haj;Z<LD2}s?2z!TbUnB8qEh<OdtoG)QqYrBXE*TrUx
zy`(2$v0Bj4QV^zogQoOx)#8CQ!=yrvA99e?JK_xPx)zGH@Y~4on<Es!WjSgr)WW`~
z4gm#QgbF~b*PO(K844~0`pe+m?xT9lst&KJ!HGF|BlOM_RKI*WXP0`6djF-*1i&n7
z{Qzo;)8-MA4}st~(1{{k?cl%WprThNBJnjvSV7{u=HR~-dd>EGF!qYig@;B+po@xL
zsBAc)$m}CpwUbookAy)24egQ)u+bjY&*a8=vvl{W+P?x2Bo7TiG|qBAKqtX?-N<f-
z`g3$mQFhu`^i=dF`UdU>LVc&DT_R53LYxx6f75oPuum!j%8HtlBZF}V;b&#V(bAc2
z!@p(vvp}EW8LciwW&XNn%6e8;L>igISaRK?Ap>;!bx&*Q8LeJu%}FnE3}Uwr62yHq
zFjf9rL!{Z+2Kam<$}AKe#HT+ua-UY;M`t~#TLDl_lcl`D@}BB9seZzI?xa0Fw;XLb
zIzc#rxJRduJHcdxNlaR`l-Sps4=BDn*+9n=tbZT{5st*~zBdEW@xHmEeL3O7S|G|S
zV?jq`1AMqj32)oB@&riF3W}|2SKEBnT`wfs^p8YCYBPOx^cCj;iGF+`(FIGAJMarq
ztzUEH`Rs+69;RAZ#Ld;{)m8BC4)m)Mj<^|kPCh1PmC0Ovvw=uUX6JkA>8C)_qbs@=
zr7=aixiO;pc4_E4(^<-+piLKv(EkVe;HO|oA>VlP*?!(oJbx1ZH=bUfG~sT1kEOt8
z-8QmztS<Gm4S%lAE3<8;OHtx2^l+5Eg2)0mEx57qn$mSfl--w+tainq#82WMZAK^U
z)}|^PPto8*^B^qefMgfVJ%IWF`ELjPsk7nmm`K_TnRJ%86ZLFpa>1#oPC*CmVzL9@
zZd!O_xmI7WkBXUi%NwFVa+P<373hfgfU~7_!!te&7%h8){c+fN&SSLSat`~*G!yf*
zn*Un*_27M*uIZ<D3i?p<>Ouj~64=lf?$ibKczi}Zy6cKA1RDJmi4g$~I{nN+^AkzF
zVf%-J&K!k16W+P=<uQCp0S7rz34q%AyrY+X`%wg+drYS!Q(lAaoqiVo%RN`SP;c#p
z`p$*l_#f+V;f0;jje)b`P@Fxkf@2bo?03y`&!zc^y>FgJ+0jhJt&^uP&MtJ99S|CU
z_~ka}4F?0^1b}l$sugYR2H_V@ONv4zt|QSE#UmBO==V=VIc)FjZ4A(5#nt7}`7dW>
zML4$U#QSwVIa6nio;wJ>U<uxUW&1N}-hK4E3ExJ8rE~X(r^u=L^<|kW-IF3Ja?=zW
zLs?8;bsb7WZ5*EX2mGY6E2g?D-WH#v3T(sLxPsZ^fM=ctJo7Dz7frO^`@?p>!E&0u
z&rLggE1v(Iwo51o1^5PKuQUxgma^1D_-@u~Karjn%;&OPzG9xxs>?3SauW=c5@$cT
z9B0UA@Hz*zYZ@j|%h#vtWep>r)w3kIb>KC9rK>M0Pr5ZF>RMa<LezYAwE4Ee7Me;g
z;362P3aDs8m+Y#nsJDWYi~nbuk+i<Dp^^ULzr)bl2F!(PXM6+vIm&1&_dVttzETj7
zhL#-}6!8Oku3F=&gjLMgf_*~At1l@zQT=k|2aKKjyLhlbt3Kdz4Aj@g;>o2!*q8VE
zPCie==aO71t*N*EQ0W6jAm;JhY1vRr@m!OU!iu%MYt85=^svds@}PWWg(7k_KpdTj
z9+-c*=l1T?cvhRr^XIh4GHgyv4KiAc$>sJ1+Vutb(!+hs<^W6a8$-;?owh&C_ZMMX
zw{vcPaf*0-_)@s52QA2*r#uLy*#8Og3qX(+>2XEv=WVXZEnEn4`mB(`aaY1`L2f@6
zWcNh~o2a>x$8$of1v9VHJPpUIXu(MAl&f#CNv)Gb7Q#d(Q*`YsiOvOioce!)44hLI
z^Zo`KPBDJBg~QR-c?9DB@OIMYDKwZ?R3CjP<a(L<Dxk=%XhmMH@ORXVZ(Wusnv^(L
zrgDFm#`{zq*ahCpNaZGwtxz`0s#ov{>zKX0(gJInL6d1om<9C~!;59aY|bZiL>(Qz
zD-Jme-{owRF(Y1+Z<b@EQWC1IhppF<ANE(B#qWY#$7xVDue1+X&dP_K-_FX1udG+L
zg%8I8K^C&0n=As_sv`_w3115?1i5L?%DzTUV)7hKyMAps!_j6w6As@Ve+8@6j44<$
zpbLkgu_}k^MD5JIZ(2z)PhGjODYlfTfD|;9*DhO$RBZ5O5s_+T`p?*V!Oi%`M}3(C
zb2oqlbb5#Hgp<Fk0xy@9Dxi~1q40!m5+DLmtiK@^p$_<FYQQ%iRD2u5;{HLp=+ko_
z<qAB=nMha3jY*Sfmr}N;*55*)Zg$B}YEsM%Hs#_&*v=Z$a@NK|;&SfxDjfb1XN7Zd
zPJR)Qf#w@)1VBR&?L)BJi=eRjuJZe`fHc!Z=U#3O&BJka&Q=+q4#+vU4_N0h8?8!5
zu`<ETbMHK4K13BU8;&w%V?V}?6bB;j9m8(N<=EKlt2G1*wQ*~fJ&l@54){R<m)JH(
z<u4M^=qS*p(yy#G-kp4)a`-@S3)2?LQ}_(1OXD=(!+IB_1#CtI>&esB-1-b+DVrNe
zAcy$qZ26@DIXp_MHU86mggOer0UCK_JPMN*bbV4yIYOBE+dYd*QRKaCmRIUS6(=#h
zmLQfl#1y<1pX;cIsvYvE5)OPaL%DNqoqtuO(A~oihhA0&@CI!LQ{*Q{eaRGS^}|hy
z_Qe}vT+h(;!{ITkWETR?fbS09(18zi{lyJFIX(z;mIx|MgrkJU0)WvF3L`P9O(jo=
z{cnNxgfKTzHp~akSgx`Gq1n)M(zaQnW0a>+mpd#j36N)WR|O3<2J(TsLH@R255S@I
zb~293Aq)4V1-qmt`{Ova(>!<!%wtqo-<fw8L?<Y9BkV&u5T03|17!u%Q2K>5S8Bc`
zpLMOo#1{^wIBCZ5_cBoKZ<;4L@zUgai>SCylgZw{4Yd1FEmsKxO>wgU)hWe!+^THB
zzuaE{BUUx&oUTxr57+?Avs>|Xa?L%JM7AX#2%q<7w)O?$u4wfO2<=j*0C?y3a@a2J
z;<PrirZNfH1P#(n0^iVR<HgWkxrB#`m(nOHza>2#&1$ch$8_}6Cm^VaZ}a}kW_Yye
z6)fiwrJl6mLcGma^trqSAI5-iFlz$e_FD4e?RvY?rLGUd4i8bcf1rEnj^n0;0_~-<
zhRqKPFVF^(c5}r8V}wlF%wCQW$m6w}JwMto9X$_vknf0*_)nTZ2jw~3IIRRj(fc^i
z?Tx3U8Gold4B*gHwV}_P-Wb6(0fV*P>GC9)FGfcS$O(V>W#tf}4n8-}bR(~>cQL#{
zC)L?k`Q+A+S@!Y?#)=qgUUKzkO)Cjr@B134&45t!-bnTFp5n*6`o)jTXQ@0*Ah?k`
zG`ZP7cZa71mrITMGri|Bi5zw(P>#1SYc0k<bWqu=Mf>N~zA<~-@nO!R4r-vzfzEnt
zDC5J^7Ys+xO)IfSdIH9I5&E5jvdc}7wK-hj*&^|x{e(x?oV7dpZyt_^qvO#hjIU<W
zsO&H&hDXjQH19d$!09Sq+97`-y;rz7UOL&?%GBcwwDSJQaIHTPRfaP`hTznjN<1~r
zcs1t~n)rVddbiTM=?rn8LeLD_>aKy(dj@pWqZD<$xjVPTdf*oHBqPss;3Q2FlZSZm
zZU%3jhRK3LM`7RGc_i<O`S?e<`M3pIZX#fkFa7d6G`YYW)EnMHPXvTf>p=+vu_}aH
z0EP~Ho^`<6ef6yQaV!-@AamSqwso~uw0mm%*c<<F6odxR)M>8vu-Aj=o)sSjg!Cd^
zHn>_0-41xXcL&`J=wJO&D`KHx<E0<W6bf`P=d+6gUzWhxiLwQHHdaOQv}QXT7I8qQ
zX6GRKn!_20=4cQJthoJ>)-PgIM){&_NPIY&Liz9<McWAZ*sq`)1zYG4PgjTy7=`h{
zY=ifrNLY7;@PLhJi^NZFBzLmzRd)iNqj;h@FjyB#fdhYZ<uG^nqzm0ig4Co3gqo!C
zT&VYPr~i*odt>_FaXTX%0d-XM!B`M!q!EOTBd(O%nc&HF>oXK>3!vz*GZdYqJur7h
zIAXxSmy+*t0-10-8WtMFQJKDx;UL%T8Ah{5pO9z_eZrVeJr3mZEC*fYmJvXt69{*(
z+t&l>QlNvd{B+~JSIZ6+#UBryc^6h*jP}pfcZ|)xg^EGpzvCU}d;{-|X8bvTZlHXH
ze2FQ-V4(*L_?7L4{qhTqwk#>e*9JjR3+Yc}{ub$&{rA(Vr?sqG<sd_?EK?Ny(%}uD
z+d)hRyfhFRGIF#*?Dv!}w&IT2G2}tXqV2;KoLSXGhN+*FD|_%JO(5T4SXgI7qpW<}
zua2Z$h{RI3<DOT&8&Fia63P9VK)5(bsfxqd+b{g)uS4+Oyzq2H$2h~t;N&#eVG=Sl
zY?2_uelFF^f22C>XOR6>a0Ec0Ph$WA-R9cGmCrs2@%FW|#9R-vIW!Hz0$Tn57tv!@
z>_wGxshB|29|DxaglBKs!3=+suX*hV#(4Z&tUqY=+!1^9^g^tQi_Bpu&%aM3YMH_c
zetxY4dMma*$Ykuo`}W9q1HDve(GXf*(cNk@T*_ryF7W+O6U-xgc!^UA9DnD{mT%e!
z8PIxp^^s;gknyl=8E+V+j!e0eb_3HA_{?b+Qm5W?>#dKu0-5P@3%t9_a+p;i@rQQ7
zLlqwZ2b5cR5tyD>SOHoKJ1?`jJW{>T>dzMLmAGr@n8$q^#F|{?4URloi^}?765Oou
z0*K>T&2Y?vd>O7mJ<S9I%7zT2n?Cc`NL<Ae`7n@GyXiCC@BRq3q)I;d@^4$s2-s>8
zl!BYHCJ<|PZSvw+<=b^+EZxFB!V7g}U=AAFjFd+Av8WE0QSozm1*&l0&E09KKrwHQ
zRCn~~DcAskAT<p-vKL1=ZM<`3*P{3ZP<EKcLcOBkN&uz>$#w*l^#dJ-2%u$7TB@t?
z)9uYOSN$T{<){?o>ovOod57-&^Z_=CtZ`HVTC-Jp>KHDp^;ocBF@Eu=v+B0ky$^Im
zSWt8_4`?#kd#3XVh^KGNXK*S83y|CY+}0*zc#fTM3HWZ1pai>4f$RM8vkH?L_ZL#p
zsy*h@qx^qFyAfjYRO(!`;m3K6feR~4dsC>KZf^N1_Mlt@3y`I@hSgqnMM<E8)Ni-f
zT#s&Ga6s+K%AQIVBfoZ*cW{P%AX$ari`k(qb{l*g`}NL~Y8*oVOm~xCwLd|FX~1cM
zMW1?7Jb_Xe$D}roX(qdjJD68qq0E92qNe%Jds?_;>`Jx9?n9nv*MpZjtwM4UEg0n_
zX_q^r87xq$Z7>g|XcZmerMnq|Xw|-|I0|Ief!N15;XDipTDbz{2KEV@ncO*x_6y=s
zV0*PiPGyQ{bAxqjgY#D%Cs3I8t{o*j3%CP{EiZMh*!dk&Cjofpf_>{Va=Q>xny*&n
zv`Z2manNo~)J-;okU0xco7@FL)ah`e0?w{a@H}$J2?n5Kx<Fx=)~WbMjSg`3M=N$N
z2ah&pNNN2>`#6)-%ATL>1iy{<n6)2}+<N>Kl~BtI4JoSHN93<(=V#~VCmBSW5x>?o
zwtw(hoZ;S&ZeRLIx2K+L$@5R{UGn}opMNkw*6y_OMBe>mopPZ10FR%U@2*;<aW~`5
z6k5EiL?nr(i7bxs3(M=-jtdOLSdN)fqZxHmutCe=7jOZm!?@(Sg3iKnkNj%2PTi(%
z^KxaJP%C1{d^epiI7!>h(-mc5|CwN7xtJHR+mLX?n@)L)p|O`6DpFAH+e&_VwY9a4
zmkzGLyRZr0Ir3=$<9zc1F@vU?MAl!PJT6Kxm<U(N=U8uOgjNtgvyC_nP2CO|^wR|S
z(9;oRXr#pQ$<2tFUq4-Sz#E{Nzk*dI;r20X<5}TqL^^ZQ^OI4AEd8o135LUpYnev3
z65+R|#im1IL&OIs>SH2WLbU1TDljksN9zcV1bN5D<vSr)8Xg$0PAgtXF_E@-Lk3QG
ze((!9GoHP8Q(oqEdYEs4{Ea*rxj|vkoY)=DOXK%;TTtYo1&dd}Q`fFLp4?5Q1M=Kc
z#|+iuF*LSHVeXnwi)KEG5LHChLu$qq;%ZNUL?DMklK=a<8sW#yoHrv{GEh2Z_5|Q3
zjBdCfhJfYkcjL%@2E+^bU+I3Q-Ka-~d%Ifx_%RQ?nVNH)m$I-h+wNfAUWg^8n>rX9
zCFD`HQrRIch7-#`w49k-?<Mwt>9bjI>aGFIoKJ5RXT%xP@#NEPkNHsoqH}JpGR(kZ
zVoEMik8f+8n;Xt@i8v-0m})uxWkp0?)Mdug>%4TY-G#x>%SwTV@NfAfW->*7j^A=>
zvtuex@r1}ow-WfSl*T33OQB?KP)S6XPZ)>}CykQxqklzT-;UmXmsw57WI-TMfn%%+
zHiwMK8!R90Y-`-@P*5?*hIBm-pkS=t?A04;XpW&J!oWCX^96+yM^k4nrieLr!l*`Z
za)~}wVaA^n#u+p94b>UH;hB?v&Ls<L-|>W&Qzt!hLruwz2YWoICBY%s|J6MjxcvXv
zJL|6~!?s;B!w7@a00K%54I(KLN(^1n-HnKpC|!d{NtdEXcZYN%pmZo5g0x77G_#)p
zeZTMB`(M~=`I}2;J#{?ieO%`~BN85RURp$(HRt!*%S>u$NcRZxivCyUr&woWL%%SU
z(MI9-i*|gaueTFZx3I}UNCX7J4T6F0H3{H{P*12RD0JnxY44c$fG^YGA{TEzcEs6^
zF{FHIm7c6SU&Rl|J<^yT@jYylWPrXFhdV8h-qdO#mr=Cf^Y~Lm7DJkh(v9V@p}WaI
zB&as2vQ52M>KXGPMh^FFy_RH+Iu(1_yiS;{aC+AaWJjf2Y7w;;L-24md{mkQzivgs
z=eMPRk8Zb#r}H_4lI;=5oK&_#(6LtGvq$?p{Kk(dn!<)PLNE`}?b8eG447YRS>i{{
z^!>I$&tF`mD@xvZV2QjTA^+7m8-|uVtWJ)w(id^llwQUuPd|N(7t?A=_L+GuDF(Gk
z1}<==sKniqapqX+i#g2VyH5isU?C~3QNH7kdmL^#sAbaZexqz!ig)_K?X+aVI&mr_
zK)i<SuZ9DmL`k)&pj<}yJzE6fz6ZiBv_}$6Q4Hr%5s1RB-u<3O)a7hAnKc~pOUrsB
z2F5gntlNcDEJ!2<G*1?T1Y^B?q%sF}qKxZu$S@g`gWb(IkZim6eNc48Z^x;Q#HPDv
zO=tU)vmKvXdYGT4Ck5-yC2GC~6BiD{@=rf<B|h9|*}!Wjeaqb9SrhPqX^GzKIgNri
zLK<93vzGRS|I&E~wY)yDw|7r>h1tY&qXDWZg{=io^8y~_p$k|fb!#Y=*u}cd>ID8U
z7{W+&Jhxq~-Y}8ynPXpCWZ|G_ZD70ip`+lzfM0fWOBm&ig8+msM8b#Tr2{d%XzbK>
zgi&Gs@>FC7_wa%3&fBoov^=b;BLQdE_L*Ack8?Fr#xmoJidnJhhkH<`^4G?&Axh9=
zj5Yg?jGd!Y-|5F~(XU0u)sBNWR~XYaWYk=<ofKc`^67dgE=?2Wnj}1q%h>^*rcv7T
z`BannFBlha7?J;cE-Ff*-!C#RiiTo)dQJv2;G87N(-cH2j-YcocITpg)R{`iu*yqG
zIuIqyrSgk{mhCIxBQU`0#H|oyz3_wFO##1OIV#VN<4T@#ItgZZfLm@gs4MgDuw;J}
zZWq_M`MFfqu1asMK8YcfF9hp&XqzSn#=M##9xNITk!ZufzqmA$!QIpHbInN=J-+X^
z^5P_>jUL(|V><Y|ID=ls?&0TO)K865a86u52(g@dxe1D<;X{$FCOD?x*4EV5zA+nX
z?`xLhjqY>Hy#6AEm`vDXkhfwhC2znWmZnd4TB2BPG^0QPxA>Dmjj})OPKFYcuxMqt
z?g_z-USGCZ&S3HEsW}??szIUiU}e}mqw04-#F^N<7)9I_v|+}^G>WeR<DHvfFboh4
zaHZ#e7T^@4Jj)^|8jeXCZRm9c(-pzAI#<x%XwJ3L&v%#aNp$_+yynjlv%vuGGIAgM
zv5=BHpAM+A@ZN9dEQl?e4tYedh7IBbi+L3$KlD1O0rio1c<@$y9RRfAM#ggwi<-p+
zP!rtrCGg4IYtYmyRNKuw9>AjJ*9gkqQ2#~V9a3wxdq|_O8{S;uH>=OZCW}!k-F-^C
zUb4!M30!3oe^pu18=~jWA3t1}tutVxyqMgcUfjgm2telG9Q?ull|8p7cAq)Kgj(U%
z>~O~wt^;c{O!-7=vA}R{Uf?DR?~@tVN%1X2BRlWg14hA8958+c&2CG}AZk9wlKe14
z$4fT+WRHDAQ?<kI2lt5U8?fx9m6Vth2vR8p-)Z|UW%NMbnT_7W_|oW+%TYSS0bu7u
zJmkk^ZPLKV?&@-#`G@430jd+@LMjqD*PpAQY+|pW`V^pZ+_)h9lypf_p99xBsA^je
zqPEy!oQ<<IG_hBjZGY?>hFGNt;58mX1HtEndNQa!xTp|BBEaY67AunKMS*@kn%30f
zp-Nim67S7$Akr1#Pnec_YA?y=%79b-b<)PTd*bUM-Xka!4|r&S+nRBxq7Txcyw1YJ
zq#Z{}vT-{V>BlP9Q$l(tgORMhmS*?k4bGl{Wgr9yUtrx(-h4;IY==bJLclD(;_2&0
zn%`Lzhd-58g>0;xe+{$j#C!yARhpNw5^Hh`Z_$^rm7(XT9rKYF?AgV@^?h&n`GzAB
zIR)7nd~BcbeC+6Z)Wfxx_qE9vh4Hv)Z}`_JyM7N&IA>!2s!|qHK{Ai~oH1-asF3la
z03Lz*e6hVrVkb%*p#ur>ZAoD5NM(G?!HO;RJG(`5P0T-CUpNgL@|kJpoYH=YTq_HG
zn>aXowe<Dgw|^VAmpfJ0FChj+BH=&~!1TeJlB&o=?Hd>R(@U^gGwfu}J&3Ca3p8lf
zk8;l!bX)^)ttxaxYj^SS5g%~Nl7ZX4h^g(YwUn=E8~j2Z@9v%Z&ft!&-1J$258d6{
zYur=D_A0ApjCuE@-(-JJSNgs2vMvUYd=Lb{4b}DYUS|)=J2$ZYG-gBYrrm8bI;Vne
z6|u8KR9pM9GCcb(LOU{Ig)`RaM_I0ad>;x18@lhG?&bzVGdetBxb(+nnl+A)wD}>)
zg*c)RVk|Nw9$|lOm4)gZ_3Q8bWcohI`<KZU*3ez@;~QWZI^Ylk!k4c3oGYFoe%qRP
zr)ADQ+qFC?(BRFxtfBrnxj5$^PHV|11v;_VnCDS!2m8d(!>XYnuSXsc9eGXi@vRq!
zUbW<3LWpLSlucDNW2Vk1g&J(MOI5OCzbWp661|}?QD_+eMhtdij~>*on*LjO@)M6Z
zxEOVL*+5q0VHLn<5qFqN4p^Osq9hJwS&vuAYuo*OVbK!s<6o#u)&11$i8o)mUYt$a
zm`3}7c_`+FuptLh^E<o74_)7gMagJKCd4mdpi$%j<O+DygQV=a^Xw$i;-4xhU&t_S
z1++>-eA!$-#Xq26c)$D?wwx4ZjU(*-s@w?47C+s%Ei`KhF5Zg;)G-GDOW#(+6>DR$
z0?hLuAXo@HaD6&R{WiY*3&Wxuu8!#-$Y+MM4eOKKIsU+L-S*=61eED!FvTBOi9ccq
z@;3p;xLIyoXW$?qi`%OB;1Bew49p8hen^G~A1H1KVuJ6&fCua*Y%zaf?uTRM7tTv5
zj@@vg>VEn8#dXmszea<WHo}*2&VOjZKtTNuFWaq-R)UQ*M@_?xB!7MhcZI_PS_gmF
z<_;L!VMe!6@FNgp=$neZ-*mM|&b4w|a`TC$HI(|Uk_2LM_8V6$(J!_5B2@a8r${|P
zs<`Q6aC+q3o8HHZJk#AaLmaU|mm5c$ypP+kpox(PN55#}Q;w7eN&-93i6P)Dr!D^U
zIW4xP82S~(Ky4BHn;3^L#Ipm%=~}m@Bw?S+3S^jr75?)Z{vl9^sQZV!LgoxnstA+6
zpyR|gSc8B9Tc>H=zQ2FCQP!3Vf`m%|VdWup_Z8LNN7l&xj(;@sR>gD<dsDOU(}y2d
z*%O0MaZik+j5Q8nQx-KqeIxqm0lh)OVZcEH18cbl5m_Syqy^9{HsVQ)g``%FDi-j9
zLE<3YzeRm>MQnul?zx?+M3Y$^uUYe=!zNpU(E)wicSltqUpCd^iiyLS!TuyIX{v`_
zJikJ+_tC(*w|pwhd`od=4HsO2^D%ED_b4*GC&+HA3>!=ZoQPKO1ie)ivGug?{kle$
zU+@ko=y%4t9Zt*Cv9mb?0&clKOA6|0BZbYga37o%OVORke<tu9Q}oLpQl^*i{Z<CN
z0{^mTG#8yAPMLwHGC9JeMobR1+N7QAf$t^`cLj@`8r^4WFsZ!PQ-?DBy{hj@)a;L3
zhrEjL%a|Yb(=gh$xryBo6}@`2Xe>y<V2BB-!l``IDBR+mD`{Ufgbjwn-y^juL=wYd
zT2pP$o{qW8hU*VeLk{HUHPk4a1|Yfo$>fEo^m>MP?tIOp%QkkHDI=^%NDfD5R?#x%
zQ;E}trr5I8<iN$(+hm#n7*Ip0w1VfzQ*4PPxeCLVH@L(xAO{ky#KaloPkypMf$aHz
z{{c3mEj=EUU8VH&|9}4yh^kV+)xYcingV!=|L;FT=(nwn$IE%j|L1@G|Nrp+pB$;y
zf>@fo7^!);2O<X}xg4=YZFo?duvWqq%b|sjmi9u2fdc+?wm!e^+&uAWamPksgTBM$
z<Xkn@Pq#_*mWtRLy$aqLU*@&*c@wchZ2}SM8G)ByKiD}>+|z%K;|tu#QgXn}Ndyja
z+pp78K21xHn!50JZvdac;Ry)w4*?~2a))VAH$$b^C%IA;Hc=<r>UFKRp*H@Ab^D~O
zi({RIWUsoo%QH$P%{igGz@49%(8QqD8uIL)Ut6BaQ2J9OAV21NW_}BkH2jeTnd0GM
zCwOZ{3|UY#)sg4dd(b>TukX$<$@^jv_vV;5f)_M>EFUlI7^qoDuxqumvxk?@Z-xiy
zQ-=52XE&_oexSx&zy{5d0Iw8+V5jeWnjccE$J1Ax?m#jaoX#u>IR;&%$MvjBUrX(k
z)XC;ZPk{YvNp^~xRMyu~<RGrp^$a1Bk0y;BDBzJ!#IYldbC@_C#JjUDjsOFXp&YWP
z8pn$C<#@((+rmIm*bpNq_<_G~CEOsc8Gkk2$CgM4cLm=KXWJk76UsPf{8&EDx`U&{
zo}HJCM|{yBU_k~uNE{&o4)jp2chG<1c{3dc@IDS`A0Tj0euuOF#c;8XySc`zAMi9x
z@br`1?@~2N*eSlhGTcUIEz8$?SGk(Ln!sT+{;wGyc{nt(H-33soMXu}y!ol=@l-k)
z5T)p%P0NS=s8iMb&s&A2o29cLPlQM^Z;|fxZwpwLV)=0O<f+%1TwhmueCz`Yso-9C
znj@I4cT6oqKx9jN#w1pTM%H}h0*MJX)dbg&dfMpoN2XA?coV%lfzFR-Mt&8Z%RCo+
zgKB>lN%Ywzg5-Gjvz@}2=SmCF?fL{-SqDZ%3J~FsF(J@1Te3Rx(ov~f#<F0aBmEiN
z2Ryf(K085X%$@DOo1dTY&a~3QHPDx9AlT1K4Qu(0mO2!AI|9+|PCi?*Xu(O=5YQ-K
z&plNJr-2E|&Kp)J;#0q<JG@J%G|+LANi+qX#_x|!o~u?sB1S#}L`^tM1$<0St#W#I
z!ZmbsIJb0I<rN>PM9@tVnCbxK7U!^EhT`f5Q#_y98yp!tx(}g9pS^p|xBA94yA)^;
zAJxW2qFe7^!fNRmLdWR727zRV>5#2~z!h?$BQ$ER*NB%hNQ^5|ocqZK#gm=)Ra>v%
zp1ob@p%BU!mN<k&B8i~7Qu)0vtWbQn`$jVu=MTTnQXJrM`Xfbggo`vMTQ?O`1F%cQ
zO>Y6Kx7#-&Q#jcQvwI5IAdmxPxYkDjZ*K=?uiNQ}5Km>d^67FTS0<)GqX7qOECd1z
zH2y#!`hnLgJPozU<I8U^E5g2|1G&$C0&rGLs5dMREi{N_wp9$yNABOcnaT74?Lee4
z+~lj|zUZl_1qEC-W8i#U02UFYVE^R(3RX!8neBR=!nG09DXv;Hkg`ARCB@Ir`$emR
z#59quArN9Cn!WfE+TD6G&L#JvmxJIL+$wIe9q|@OY{%}m{_#DXd9|(Pq#ya2)UqEA
zaB))tkOaUY91$GAAKUwA#VU3%QeBQ=x9x0-MKyXQ%~3J2i(=z;+NYL+v>zWF3g%4O
z37F|R*?k3lB4!EjkQgkW!5+ux&R+|B>2J0gR?cib=EY)yfczQR`ei}0=TI;6H<fs)
z2+PAYRUfX+hf@l<z($3&&>SE*lmj6Waqoa{OhBXP!xpSC7g!yz`x`M$GG?xujP5Vr
zTBCdzoWDZ;#3nBcIMS*enF_0wbr+lYnr@tlFDe;J9_%m0+vu95Xp9G1Jo9mHI}t<Z
z8Kal0zs>HSxDCGyvqzzJ#21CO&;8*(+fAoX5$PAeskZ?R7q0J2u~{R}sFIXo9lrFG
zLK?3o5n4pTgnGNWSIYV4<9gOgsjv;+A)flEVs2u_=^OnR;Z4I|m8Fe=V&Vuci1)KC
zri!)I7_$>i@_r(D5FKzhF+>x0nFp!(FF&fIj?EZGL(jI!_w=R7oAhS)I~C7qAqZp)
z(syem92TCXuO~8FC5Kx69?r)cVr2&=h^Yj=;Ar{Yps;~V`cUBNWzwapViW1C#Uly}
z+_MpSXR^L9HQf3Dq#?Nb6S;=EufJjDUES#%OKzQYObG-A<TJf$;%e4!sXZ|VHuC8U
z)QL**yTnQFw3KMV9pZcLm=H}CAf=7Qd@(V5niA$fT9^-<Y+V1%Pv4(rB%%5ozE4+;
z82xyT^EO%zqFcVY#I*gQ@u!iCfL_sgx$`kW@(M$Av?a@6gxfFP9X37rmyc`{e>-o?
zS9*gLnDRHXog)YAh#GdVq?l5|mfZ_eQ-r3Rcc%e84NpTyp*%cI_VpCQXr(_=c%|B3
zFnz-x!?`+TrmgqIUP8_=H7~w@XL$I{Bje&#CWwJQd{@F;h9En>DD>)(ss2LFD3S+@
z{pej*jI4wf5!QG*F(iw)ws=VLd&NmqbhG}XQt6w`ONMR|+6NkOwI-6lNjZkjlhe~q
z*V+z{--)gX)zX3jUb8id+*+gJb)Vk@F)<~~%}cfCnqh_*ZT|Cl_9L}x+P<1~Cvo@k
zf3m+!e20ASAZ#XVe4PS09)p<Ed*zj0f=x8=iNq;PzCtPN1eJ{UX8LzKHl<8NZaZz-
z=62K%Yt0+AP{6h@0|y-*D%XNvO>U)HqH7e0L~7&2hr11L5=Ryuj2{MSZ4J(SQ+Z+{
z)E?Pu?iPKNgTLWwiUBdFbK-oO4T>yeWlxH`f1<;0VHVMh#v>u8a;7E=O665*$mRvh
zv`lJ<j^GCAGDysJJ&J{R0t+NbGLIT}u<@QE7+})YN{x-zRhnj;PbR}*UB!2M*Cns3
zS63STO7ds%#(0ylk}nP+&A_B0>(kG-I0*2)!JrD26zRxUCqeM^B~ZLe^(3qn_BtPG
z7!xD)n{lbfW({|Uu=CHQ6C*3}Va7dE!K@)H;N=XgQ`TyK<&2+p)93?$rS$um=K-DJ
zQqU&L*)Q#>@|$^VpZfY}D1C^K0FvkI_&(krcxy-9GpC1u!TR*3L`>`ngE=uvwra#X
z^}ie#0$=MQ5Tsy2_EBEOnV{-W`-|j-ONtVzqTks*EL=)cln#ECm>}5g_kfy~v9?HL
z@3~u8F?ACJDu&6CuHw_CCUtKq%URwj@!r}G*{q~_nlUgqMZZP<6nolAM}2Q*ImT7e
z3uekRU%!G?0em}R6%pZb(z~2Eqj;)7fV<}jtvA*7O5HQ!sK5UF;_J!zhIT)S+BS=3
z<c1|J?QL#a&<u_e_loo#g3~d)R2+Kg5Kp?Y7sg~(a$S8!N4BJgp<1tPvdp6<Zoqpm
zox`3i3$V4dp)kHsV;@ikAToL-Q@$O3fv#k*Ity#pKLN!$8o$25rKA9try`m4=J2~g
zv&>mww@L^cc8r4kAbb->vWGSVE@(O%rF<Bze&I`YvJv{>kTCLnFgnFG8?~Zfq7yub
zCw^K)4<>$m*eWB&ma(6Aq$W{sT;g9NEYY1zYw-rBB+S9XzBA30F^0MI9}NqtF=2zj
z)+|m(=V(4p@@x>{To8=P3J{eF*8H|%Pu`-kJR-qDv_1yjpr*0I1Gfr`A9WP4Lm&%E
z=zJ%icPgvJ6|a%z$eQEy%=dXvQ2jBjusT@@y@9pE<K~R}&<=%GeqUmyK?9;f3Z)~r
z5U$kVcl)KDwiMux_eK2g)g<tf?W=USg>9Yze71Ppc;OEx27i%)C5z9i1FzWH_)xRC
zNygX`C6z^$dTU)I^qw{Nw^Vn_a@~1hm`Lu!{FB+!#0zTTX~II|hoqlUct}ICo~<gB
zL`=f)5y&W{V}Fwr*`gTPJ#;jrXM;l^eF~<9iI5i)$1fyBd}~A3JAC-GJ&H5JeiUtm
zYT=&(%fs^s<nH#t?e%>~yw<o;*iyXFBgb2Q$ksWipwwP53sXY2@V=d%<|=+LWl@gU
zh`OWnk<&X(pFz>8kdOCQ3JOSi5b%F+7O(AhnR7^rJu%EDgn~eEM67)zq&$Dw{Kt*<
znOc9}3g+Q!Z)CyG*Yt7dB-Jg7k?p}*uT}I}0)gQF$K?(C@3iZA4TeqM#OY$7W#)tO
zY_&kLVhl@2jfpokl@fpu$8Idu?Q+f@7Y1c&R4k2%>a^>uVSuWjtfcAH?|Ov5pQITt
zDPaljBe9FczMd<2o+LMIPi~07(`11&J+zqDxwapNThW~ok{(6G5Fych^6$F<>SYoC
z&FG3#gFlZ{Dm8ljgP`=0B~Sk{y5zp6KO!EY{`QAV=#K+duirJ(Ik9|ua(OZtCK5X{
zHV_B)gP}^h%gnS=E!Xdb=F`nndmXa<BaB=7*Fk7r$JFlp<>Vt1ON6gf(HG$O$^3Kw
zi_yMs%L<I|<<29brH^zH>faS-N(uNm=af!$%&jn)D)rMJ#a87&=3N+v+}_R`+w`;v
zm<>7bOjbSRL9P0z&M?=|EWPL6-odsxI}@%~I*vhfF{7PD9KmI#^qqKiZ7VuJ?WS2a
zhHXVVZDh5SL{-_Pwq&OcG&=`TlIv{{?ER?pM~5Ax#Ju62{Il4nW~}TPXgo_P;okOt
z7SxJq{#CIc4poj~F;BYe=1&QAzp-MhroEGy<J<2P$bdfC=W`IxEOT(Gk@<r^Z1Omh
zkC7yFkqCs4V{L<!@<MlykJT-z1*7y*uci;@#5BSmKfP1^_L_}BwR0MtMgTfn(pzFp
zEREz%wpH81=y^y|tRdwzjR7g?lFOJ5Yut$8JGikHY@Q^V3z4LYzp(_to6SM{U=6(e
z9r2RXjr2gF?sk)o26!6S-;q2^-RvQ1UH|NB|HvPlZOPzQ41%z<o+hii(RU029XEX}
ziAY#suz9#CQ8r7$;O*CIe+iw20ct09*Uk5&`{`PtWH-2d>qy=~NOxTEOu69Q#=B_~
zKqwcZ)%%!?RE1d2dQpV}E(q{CS#S1(fM{7z{D;_wF2<^MuWpdbBlUO07=zNti5}&<
z(|u3-cSiEvFW#m4MTj8~O5l=b4)AAxAP=<G^~YDTe_4`eE6~AB`M|xoIjXx-EMB_7
zlxM$$LdAM$AC1U~<l%OSmT&_;uy*>+3&Zxv0@il%xeq^a8$>8xA!;G61HBn|ICrXl
z8y9AXmQ%nr?*0ie0=C`2YuvSc<A|xw2_0shBU-AVjP=4xY(}LVxeFUgkzW;#?jiR2
z1qm_x3LgWIKANeBZvjU+3!JC0o{<wz?_0_L52gLP(4o@VI_P)#HKl{Xa6z3>XiCR#
zqGounAg$MCze0S`^kB9K2fKwkF?xYXz&Fpw9}}e$iUi&kT?;Ssv-$;Xw?1rVKF?4f
zfB=GVe(NMZ{`aSf;7_uQD~~j}+~|#QY{!SSAI=JO(a-{S<S-N%pxH1`NDIGTt+st4
zJxpSRFm(qvC{)NxjEWU_rhf$cNVY#}J9p^k8W>U~M+M0CeAcq;?X!x+TJM+m%W1Q>
zP7H6p(=}ICbFP|jM0Bz7VfnM-Sk@I+mM8krHyhZsqk;)3G7osG9WD{k&0MZD2q0e3
zqXR&f`<?2;ocH;BA`xPGNoFAWvVF){XsloFixVAkFJ%|?{f6C!UBb}KU@flXhqMCI
zwDfvOZigav>**7Q*ExEAOzc};Y2rUtA1EW<_c;To7QROH1-J2@?Ny8>;o2|51=lko
zb1{qvl1`P`3#%H)y4l8anvaI^NP!S7g$~h7K!|2OZ2ajI{x?Lo8>t_PoK@004<r^A
zD6`(D^<Vl-tkA>7Z8A?J)2P&)STchB8i`cKxwR77L-t*LqKS)qdK<vBS<U^o{{7hN
zI42liGhY9O?=S(e&b#~bfnUN(-I{i}CoTwBP1vO-E0fHgKd}KmPIh*AmkV@@I242Z
z&&O~w9jS}IxVD#4PA_+W>e{*P6-}j4`Yrxii!Wl-7f5Qc_7t{wZNEsYdiRk%SHg>U
ztFQ@QG5Fox4ui;=)2HL*W9|*0Gk6*$8rS`*-OmrYZ%kUMbbOT{u(#0bzS08cgw$=9
z7+Nj&%zpbMwtx4?NY*Fddp-H^)H?KzP`r8tv*(Sqr?%iNs~W%+%#PsE<M?XGQ+P0H
z@`QG<RNnA+g3f5Kr9YiKmwjkbxWR07)}(Ejn+F|YOd&)IUJH^|uBP%k?+c`xyO8H0
zx}AYYL>45)I8mvam=`sAe$IzqdB)%pRpm1pwtR~US}~;>-*63Sb(TK}Q^egXrSPsO
z!B%7YOJgMDbbuI`j*CWG@6T~C7xQzhpk@f(OwW!1Q|q~yaFbv$#Pr<wTa}pOsA@Po
z4oG{J-^N0VWy5$`b&6Ib(C=BMMWdI&uNN6ETzu4fwgV}T$T!b9E?)jgxNp*EdDhao
z1?Q@M{%Q9?f%*0auaF{n8T=>?PAeuCXJ(YbT>}hNyN6)HkYx6J<xAPKR4V)QIQyv&
zAv#!IrL3~YY8oxSzEFb#fMYyvVWK~TZZ0afGHE{tGIiHgpD6KPriNc<>T~wZVMP8v
za7&|8b-azC6fFsH*>$RB4j29togj>?7*PMZ#le@DjPR8qo;B`BZOBOHLWrH`>BZFs
zq{Dm&tw0Zi_?;9CfZ&x@ygL*w@SDZU#!R`w`rMykifL!_mFC^Yt0qj(P_^%;M2A--
zgLxme`D3t=+~V!1`6F5p5=st*hRd|lE6AOW%?Rj|7*YnbqJ@Ub_gRa|&sMMyF@M?k
zby8vn+#dcj<>xKm3$DZUVk)C<q4zvFloj}7<X~F}5Q2=XT*$#-1|oE{cI)e<`c+}O
z9W3?sXV0pbjuP#=3~e>Sy8Tc5oQJE2Q=AR4v8$Y7C<-7jIYA7^XAoo0NrD<)AJN0h
zJf1$Bln&JZmR<?1d--gd!o%HLKY)B~bYAPbp~`TW#tA=L1z{a1Vz}{LL{c}bUI%R2
z2I||u?*LspkDQJA@q)b4Y8~>lyMNyNhur~ac6$Tt79;eRdKWC5{o5lx>G3lF-IV0;
zlbr4#BY~gHp%zI7Z?CL}ZO@<6=n3mmm;B8;jM;b5Q%nGrfYM39{c%AFeAK6|Cn^v^
zSnccohubm_E}BMXHBmAVwx=@c@zDzm0>1MRufHB_vy(`X<@O#>jeyI{nxnpi-W38C
z))fAL)>JPU?AaPKE-$`RZ4zZ(AiX_EWuN^$Ibg#OSm+&~1+6F5gHX{YZ$@XoGTH6E
zy-oZ$U+TXDwj5LGa$f$)$sLOI1-~6Rz1lZ+@9Ugjy&|23l|`gVb?<AheK8RcT!)#s
z8UP8qV%`6S_Xq)yuqTq$`^1RmII6#+5O#&*amSeAr=rB*^`~9)g;KyFM?(!tb7&IZ
z%Y6TS9M||OA?nVBF^j?_$KbMw(T32deE;^?Z-U+E318jAZ*0CT(y;>D>t4s3t*=U;
z$73^!mTj9xo8ksMqtY*=)Dgg?4Q!R{<?S+C92`BU?Q+y$*?Q&~r^8;q*1t~EREO^;
zj!ec#flUzoo<mmjG(3y>$m@8TYjqB#qQ3)_m3yR8JgOg)qoeiVe?{x!f6@9t5nfmJ
zI(85DfD-vdWG=^2|4Mtn2Ou~1Kfb&;xaG>#)5(82`&EBp)9KE{mG+1Z<2+bT0N`=(
z&^h)3t!X(<Xu7q{l*1s^{mQwa4ws+Gl>G8Cx12BD?%{+=AxXWI74ArED^YfvFVm8+
zwYAEPK<@EB^3b*qsTX?~sbs34O<bJRZ}QB?PG#tGA0+;!(zN0-mHZ@q^)O+Gg0N=-
zkg%s*inL0%+8tr0=vg&c(HG6rc-_M)mIVfjzF~Z>g2r2v_No1-A)*aJ)x%!m>Y-qA
z*OB6f*ReY9EO?rShap&9K|6SwY7<YPwP}N2;UI^S@8Ra_s(i)>Vd8>R8y0i-j0fNv
zGPK}D4fl=TZIGXoDRoo33+4-5y$QW))y$7miQ<@%bOGLjmZ-1=womNtX~xf_*ma)E
zI814CL<xTRm(^bvj9niw)t|(Pmt%u5)riV+tYf^or}9oSG%O+iSj~_bG-gZW6xN-K
zO}6iMiPdTU?6>$Oj$Ku4c+R!@pk#PEywLFg27L#d@y|?wuB%XC{dn;@bJE-9qSv^V
zyZp)l@LIE_<->G1-^Jxy--l;CcU-;Dws_*Qe?YGgtFcgkSTC+}J>}<ly;4!D^1zab
z{{t#P$gTVS*c}A%fB;!MyT34l>gKn2+`&F{l(Lo<_2JZFh42R46aqwSxJ=sX+XEy{
zp`#|ttQZ}Jkof(e2E`@DS4A^AGHrC1q%Ynx=pK1KIAIcY7YuugPT0JX0UY?SD^S1h
zq}b^Y=4AE2uu5*@C)AR9NalYY&RE|RB8Dw3X@X1<{3iVNQGGoPUf`M+D{fvPPrxT{
z0GO>`$I3p8tNa=I{L!-gOK>aae@MM)i>eKr66G0_43@Yr2!mUhO9mZ}{g5T&F~j7+
z28FTS_+{`SRp`~IZoE!dEOK1Q?O7jtt%W5xidBo1(YuL#dihbOPp^%0S;@OU$s>-=
zW|<M#3!$_?4C#n!D&b%+Z0jlD?l^|1cY3r_@AFP#;)mXAPZ;byiRq*1<HpjLrd|dd
zNKjqImO*uIN!C(b@2J*I`wvX>`em_2i_A7-VwsPsuL%8A6AE=A(G`6V2uSI={vm+S
zk|??VAv6@LQVGM2!#*m?x{1BVX{g5f82G+wDvhYtNDsYuI=V%d*=JfKI@5(IixeZ8
z<vNd@LiUg|3wkH`3Qjv>tj=FS7nvk-FFm?m%$^QY{=CcXPZgEG&xzPm((Y1KmR~qt
zew%$x>K@+^SD_@zSlvshW$T3{pMMhr1iFu2AitLt`!eA+Fi2l2!Xv}6R$>Ld@syz6
z#16Ikwk;C$@T~Wy!~N&ua|W|YhmIp<XE6Yx-Pn9@R|G_U0$F8zU3eV&iJZITKZu^E
z|EoXhMpDNcbnK$UG#xiW-I*qyL{@+MHPE*Ie31~wjc(>8+IMJ$3ut^Bb0RegDuCi_
z-0fz@(L&{|2Rh$8z?WW27ENMjA_)E;2T~$R*Y=y|pP~L@7mRfdp;}OM{_T7@s&^@8
zDjo)@m@$7R&x4Zku9+Z1VU~;hz*``M{5q3^+61M`gfjqMycKG?<LVCihv@deReb$?
z`FVb|Jx7lcMWuxH_4R8^6MFTBI1*gP>jgq3#^C*u=HNMkdmVw-8f514BG~VCCVNi3
zO{CmSz(!Qz2v^<<Kx=Bns4(FNE(@2IWFA#lDuhR|HiQJi2}kAz<2ubtXF=jef1*`L
zaM%d&3r8tPNye&Jt*za@PgX&qj)F6+d>83&J=yDn8?x5D{yddl`pBcBm8?qU2ks7J
zijOye`N__=-GEfH-I+=_MZ#dJp$M~-xRTTXzrI{UyWlyWB59`5!%XXae@_Wf#6>u{
zuvQd6j}eQf`buaS!Zc?wbsTZ~xO(yz-*CTQPSr0$mk}d}=2+o>GK7};FRm2<TtoGM
za6RKrE@u<n`Zrt4G+;>vE8;=o6%^5^<^WLLjz+b0+%>94?aUaAVerQo^O9*dK~_~0
zDIrmDcexjf7}0k6$v-<?@w#~D`HE2N$pFdbh;y1*R&PO5YGRBe8&jdycWmihrg>vm
zN~Y6el+PCdg$w;TO<)v<qor}62u%rAoF9`QRO($3Ge6O{5@4JD*?(6-8p*sX3<hp&
zqE;^c`w{#WMJM!_dkp5Iw=?{}DqMXzmN@TG@s{qGo4yyAVRWww$a~oYVd3JE?nbk{
z4!MB*AkN=u6fd;F(bf3W)nsX3IXkQZ29+}S(-;Dh8Zr{Z|C20Ej_}?JiVFYD^dLG|
z59`wu5%?i#eCDXS39Ez&c9b}Qo4ae--sV{p8QM{c1g*Whn&8pJqMj@I8PSezm#*+<
zdZ0ngwoJ(3itV9eKO{^jDEJVxy&fSomIXY<wlg?IB<wY47viu;!%Ah!u!EeCk6mB#
zlk$`KcqTS!y%p+i1v?6%_Mm-m_$h+rRseDgy5rYi!(o2hE(65sh}2uMAowX`+DCyI
zBYKu}i{)nCn*_V1-oMQl*NqG5TV7)mJ{cxf_`oeqC^x^z4cUkTnljeA+&VjN$DmiN
zo*mQQ*kN%6pWKmu=|$wn85-1#A@V#+$Tb*0jqdi%;UiVDAq<94*k>kSz3L>NZlnuo
z=AV?reG%Jk8zwVF|1VcpUDLWv@+)~JEfqAHmyTZ2``I=_SmK)hS{PC~{^db&or;Na
z(#&+Bw0!Hgr{|N?N|BS%KgBXM<Dz#SG+kU^t=~GL?J~hZ$LiIdzIXAr7af&>yv4m*
z`$?v_h@QQ$8+LJJtAR*u=_bfnfu|$NwfdFQi~BBx4e8;#M`F)3)E0LN?5=$Xp&!w<
z?OWutHie4Fq%=L${KO8VI^=ZIRZX1~3~U|v%j<S~8kdIlh>OZ?M&Au%yq$8%h>?JL
zB)LV~Gfd*v<ZfgD#dh=?UaFUKcqWar$O|ZRBk`T|9b#S`_UYL(TQ7#4K4B&HKW{>b
z)M%m&gxOofaR@H4A8!fvWrz(g(+#@(?k6ruU+CM_eYyx{oZ}lw<Hd?&j8t>b>oNH$
zS=Y-tJu7KG{b)%7{G<W<8rqp?Xb;N@D({N$h=n!&=@8Tlo|J>$$`V@hEx$-Lz<Pw0
z#n`wQ8KCIr=pr!MqSl^$+4$r2E!sMrdF*8mI0Z`beOb9+d4l0$J70zu<-f_Ie>v1H
zF;$^X^tW!md2_Q)(K&6wSE+M3c&gCVY*Ds8{7AeNhE~@hW+TS1_p#OS&$yf~JSqzr
zlNdEGG7HFi*oFkM#1O<H+6oK=F1upxS@-m%tNRQ?W7;(NAa;u^YI}{O!!M<2BVbM;
zT;s*PCps<<h&g9MVi9kr6^?FQyX#Fc*z^n?1IZ5ds{<cK2-O`}$?aDFzVLX$r|=g1
z-#<kgk^GPRnd8AaHCIB!Xk*}Nvgr1Ea&v9ARdo=q)%5a>7+#F#K*K4G@1rsp325$v
zSLnT3rLPb*%w(O%F2htYw_xa1n7iCkm=oYcST<oN)_}go;(h3U9k5f-Z&T=6B1X!+
zm%{G)Zbo`qKdR)E^@NH)4Q2Qd#C%lHp8Rru@a@k=vqaig*ZJBlu{hJwI#pY0;LeLo
z9b`%oBo<eZm8}IiiWT3>P^Q$qaiv6n7UEUDetBsjx@>N6R${?HuJ^S!25Kj&s?vom
zNKD;W>IU51LuXLi8Pqpn^4Zw!;o5gAFCC{hUVd0w5lfmnP^NZy$1v?wn_6)_S+uO}
zx3FDpdddJy7E}EbKk}J93F}u*q1@&*Tl#|UfzH_M9Zf^E3{*yz3Y}T#(PD@l(exCy
z6cde{I|Ohdov-Dexkn7&guIkN_wOjVMe5H+9-y6wtdgR|yLaZ9o1ac-AHKQ(6}&Ca
zHd1ub+R5IRdQ?SaqbmM=?Jn_sXVz@X!?g$}t%snaifPv2uc&PePg7=r+NaMS0#d|)
zN66YJ(62D@)`z$KewurS1rF-fRg&}!X_^ol;z1r5j2kF4-@QK-V#}T49RoTsE1$v}
zCIDHfGwVsLh%x2QA{tB{`Ty>UyXLm#(L~dRtHR5DmQ-`X4meg(zTT2?#Ta}T9$rek
z^N@J0jj5L0HzD*r$~CMz4Z9-?Rs+lxyCjL3<Leeff-kSAO)F2b*ha(e0cb|#JFZGp
zM61P>x=yCsWl`n*A?>ETGWTZ6WL);}tZ<RGOj%^7=0K4x$)@~KSA%VUGTWU&`zvTO
zF5U<V86Z-P1U&}A_3jOaO_B-Vbp?o!uRBjV>QHg^i6K#cNXlh5y3T6r#HO~^u)!Y~
zTT%U)-DN-H?ZBMnQ}@_^e%zQiuvEEr*XCcY-L*;E7zs+wr`W6b&AHM!FkZ|+7d8~K
zw$ht={zALFM?YOz5fU$qoYtOq4}SZFk*0a+3F9!ew6W`Vd>@eKg53QEY6ePZki>zJ
zCJ*l(EQyyNNMOzrizEl*9R>TJKQ0~L4jz30xon0f-28r`lR72lkY25_Geq?JD<?W&
z(@Xyi*y4~-LLgxGuNk~B@eXe<&;-BWa#R1scUiQp9`LF>1S*`N85q6e(r^uJA~`z<
z!Pw!q7gloCRFu*OW5mGQ(dH@N<N2_P)1o2?$t9925i-zgDL_T67sQ_WZa*_Y<Tn0o
z8&a1ffZ7&E9j=oJ@!p5Lu8+96g+b%55-h0&%#Op{$DIIV*KfP3y&(mbLcKZH274Yb
z*iYx=&uz4D4=jQy^08e&qn~j^o--pGR6b(2+O33L;W~Bl^O#g4AkWo;UgM1%mg=aP
z*q1V!^S>b>_3C{6hLy03BZabA9*t{_Ey07FzqmdGnyeB2h`%Pp8V~9+`9Pj3*xQB;
zMFd-R*cDOx!^K!#Dmg;uRP7ZVUjTHGxzS~*+h(_1$l6H&6Y@-D<o)=mYYn_#{3z_N
z!hTSy>6FBieEDPDp};RQNM!38*TJlh*23@rmmY9W*$$@#8urt~A@SN_cL+oH`&6<G
zQxinyo6MI{sv^t_qgWSxR|Y$;T7L}_^b0^WoLUIa`i<5aHF0%Dz`;9+Yl3Cm>jFQ`
zLkXc9r$Nnp;VqgBY4Ms=*A}D_Z9xi7@TD_J{#uamA5a~9`PTFzEUrZ^%qMd05Ap5-
z-7>E?CoBsMo&1NiA)D*4Lma?@OnIjn`*aRL!LjJEDz8)G8M{BWb<Xes-=*ctd8L=r
zq%`^|zs+TbUlhcBh+%sdv5&@di}xEPlt(B1on*jVubM0n8iSi391-g|v9Dwo8Eq=?
zwhECrZOAk*WTiYI3~eMNp!6fiqNaCzoLp;yaEG3+zUTD(R39uWRQU?Y2zFnOhEP~@
zGNu*DZ0qxFeHPeNZ~^4CrGoZJ=M|{a*BRW?KYyutmS2-`_F3SL@nkM(%!@CESpBLe
zT0poC15iC*==jr-gm@yy@-^Cp;3=kY56X|LtctB@a8~DTKO8gHjnv0^Jb44@jnuz`
ze@uiATwW<jd>>6Z)eox~274j}Yp-H|;@Bl6E62^8KY5I<1Z_E6QquU|8u1cfBnD}3
z2<4}IR^#(<oRTABM?HCRiyY6V+x%19>KFW=NTRkt*()Og(3)FV|MXe5rs$M$PwKG>
z-M&vbt|LNo!GDKX@W*;CU}Zca5RahT=t@0<VIECVtH!uxoCpzZd%3*y5BmR#+Oe;T
zf5k9xTSi?+ZGVyKj&LdkHobm_uSHlhy$+dDw5S%9PkW;VGf8B*ak3H#WKGX`UbWP`
z=}txqY?`Am`(LFxu6IE1In5{NuAB%h6uK6J;p_41`3T<93$(*7)6EXbQ$f5plz$t2
zq9U&>Ftnv3hG9b$gSfULk?uytxPUI#$Vd`<nxKEVE**ugf+&uycN!hD`J?L~gq&?n
zs$koE<{5MKRS-{IJ4e8RYnfjBML-wB&`-jl%x#9r4B>^cEOZqlPoAVcgMLRB-IW`)
z4e^91d}&x4=sq`4IQxB?=j&JH87Zlu3%OF*??}z6BC=xug}q(SV6Nuh+z#6*`5|Yi
zM6q)72k(8*^6l28$CnA__wT=@J_9DL3NCwMwqgte7pZpbQjHtCvkb0FJ~K01)Au&~
z5q*HdPB3>Rx*3jE*!fmW1@|8+GKnrX{@fxK!XaZnN>FnO@nf38TO@lL?oz51(-I0a
zt@K`UFexPx=X=?Rfv-l7iF(4HwHocM!3s33_UumgI#^S$%t&TeFOBlG8R-N1Zk$Xo
zK#ery`MzYk-I(ctP6p?&_w8+^p`+`-0CENTR;Z_iOD_BK%S)}SKT!sGn<T<7xd~T8
z)&np>1v5t{A>*Ts^9EkDdL13ajQn6SHS^(`mF9`~w3>9BzNQ&@g{O#+OB{gQZqYkc
zCu?W;BWzpP(Z?`BU<NsuK!@Y(z1D792>=DgA#|XTjI6LNE;5$PV2Qp9)CfPmyVLZF
z+bihGVfTKvi?B9?=o1R4uRgIiTp#>hh3@T{G;N$eJ13(4i*LI6fi)`%u)$mFXrp+i
zz_oX+71suvrWNobQ(nYkqLboLX7hjZwuS0vD-NPoY8k~$GiQ_Qyq((3)<Jf8?MUKY
zUi?No63V1cYsEMH-!z%i%fw?ZkqzR{WkIk}m>h0YyWdjR_M%to4|jP98y?a}FIIi~
zVm^cG!e>cd`++g?fhZ&M^IGYXF;t4&IWUAAqT6Kx2(C)iZu6#;q>KPegznTq%7)@o
zTdyg;Bw&fa{oksjz$5$BG~Pk5d|FL?()wH;&L@|Heqwd+C1ZcuvSH$vCMcH*!Sbp{
z`o7k`YtjW1u9Wr#(FC_xg0qjd>(`^u1eD}qV#pJ0>KuPyc7j&gX4NwHVIf?=o!;?I
ztjI(Pu2EzxCJKC!_?fgd{;u<Xl}5T?ec{Bf)!#fvm--m2hVKHUK8hPjm4ZO<j(O&r
z&*#OR<p(CPBK5fAcOrNZ_e~q3=fFP8!0cF?ZD1#$Q=KeXDcMR3{kDS1+L@P3<j;}`
zjGS9-UOI7bLTElFTq*5|P9{O-%o?Mg>C1JT%$p_!n`m3o<$lHli#UHUa$jzgD|O*W
zhOzw0mPEGQ`)jqwOxt^CB4hD@{RLDFX4u6U{v6j{+p2QWiDWc%+b5*@AI@bBl-np_
zw}UWJ<bwQP)hs9?^g4f3*%*2!55>3y%aJh^hA+H-(hKaj%1n*8hI!KLqw6_juftbX
ztXN!fHK56-_F0@N7ROG5x10SCME8LOUF1vneiC&OA7;PO5LsoD60Aq9=?a3=rs>I=
zh&{IeBg8DM?y4y68@_ze{8f`jmU4q3@E2cqzn^yHujGg8oU+wFZN7#!n8-1LizZ&g
zPWK62{7B-D1-5Fvk0Zv*B)SUR0^IsY+f0(g*aWHHH=lEjoC>m&hF8DaW4Y82^fuY}
zj4qA9rx=|YM^zf4s%*atx!(Z$0TW*g?^}F|^S_><J0nqRHkk21;Fb+Lz7E{J@}J4}
zhhKG8@!-5nvB`aliEmLIRwa(EirlMb(|!=Nz5P#>P|##`W6o3xCIeEtA(86E<DYZR
z3Bfs5`?N+gT-EPdj3-Hf{qcP&romT}$Rs#CO$&VNl06#ZZxYYN3l|fnl#iA<V-;p%
zmXBq!yevHFyhCAg6t!}*<mv0b9Ix<NH1@?t+ijzA?9Z01A3jKLF+F=<DOvm;>Q0Sw
zFb~Wjs~)a6@CY$jcw=>rpIWQ^A<XarQ(t0;oQlTs+4^Pm{ib8a=zH|1KIELIygr#-
zyN>Q1G3%Y}j7Kc{j`*9UzcWwgG)>kqehf2${1nBKFRX4fIHHwy;g)$#rVi$hQOeLF
zc~2Kw-)G@SXFOA20(tY(m(OE?kCGI=v5t151dGw0Bq-F~$eZ<boL5I=V^q@F;R5G5
z-yP7U<GnbLbnQAZV6^S^aJEJcKk6g_+uPhiKT3rrob|8@cC=*lDfSso0o?|AKN3_x
z@TWC>z?F0wI<<$4iF%L;S(6116DuL$!hhNQkx^KG5BS0K>(m_pr0yw?toJ~>B~KO(
zxDq$D2l66mLs@sxZ>={ZJ%Uhgr6OmpKKT{ZVuNHqlW2v&U+0D5o2iwm(=6_5L(|wy
z=<bM5s^atMs}Up)8=yacI<?f?hchI)cFKL^%)*upqMM@I2~p1$|2#gIxh<fYdu$xM
z7S`HUZ|qru*Bu9Jm0sB)Bf(g?{bW`)zsQxn@CS@ORU`(eZdl3^UFB_diyBN!;eW&y
z?rF&wy$;+JrHvL_Vn(>yu`V-^7m|nrJ4p4tes}}x#m!JLe=7}*JfPAy8^d5OF#aR%
zn5diJLwD=n#QlCv!oCvXL>~H<>QtUdHU4MXne}nj)JQ=&^>x>J?R2~lJ$Ed;J+E^c
z0?Zz9sICl&fcI5z<nzq)j)K3D+d?bg63$KUPgM%k+kiby^l*7{pmN<2++m4V!#ek)
zhkq}6LYZKg#sAZ6z`^T0wAlt;77*lH8O-Kzh567Ey(QAZIqSEt_^|Cibf<dwlvyBc
zjq|zh+e&u)`0KU5#sXgZ=;ry3%QdE@lP)lyIAc=2(RhmPU5C>8<L_&*jX$w+GfmY!
z5z~wcb$1==!}4{mOi*?s;5G2~gh5l$6PhQ1Z=W+qvuQWcruMcRiVT=V+WP(%rfoD$
zoYZI`w!Xgq`hCSfzpq3zjobYxrC6xpzTzD|NhYYF9FV$2xg_;kar3*p5`gZth&geP
zL49ZSbE`8!DHH_gUfYWzi6c*G<rk#@dMt)#v(bAvX;YxfeZINUi8aPokaivS1j-`!
zdB-bWytOjTdlFq>BHHPw%-C{GXc>-cLUU+kwp$3+#9Ja?FwajY31hkTR^Xw_BE*}5
zGg2-KXO!l6V3bD=y4lAg!yO`V1lg&~IHTj!!RT2(Dv@67BdrV>ql*<4aZ##{uLY_i
zLHj}Ka=rJz9lLTIYQOwMS*gNKzZzb*;aX`8uX7?|S|+#Y=Qy@-0#C=|9Vqx9Lio^I
zLG*=^QHd&b6P(Szb;BxaP33^~KRL!8sK*SS9j(4v*Swvy0w4-kjFt^Z*{wT}Gkd7y
zyq|hv=b0N>-y36}=*YO3DRdpQ**a^Faw06t_x!Z8AtXV63H=)V<RXl~8WpiNM(K51
zf$PNKkCW6xZM@k07Q{LW`?p8GBl9{idC2_HKHH~gR9Bpi!U(;mpEDR=S&T!weKU0B
z_;@9IVr`iIGC0!I4_ROmTc$-tJ68)^6CPIPz^0h6XR%&V?a4@**tF?HdQIBLuPvgE
z@)O*D23JGv^gk*CD%-4*)Wy58ZW-9Y0hsJpwI+5Xe#IH=qT-+LKJur|phv{H|9FK&
z2;(F!l4}a%wDSW$lm>{ApOY(cud?heRDhISith2J%?|P!s}|scwYc7DIKjKN!o5zY
z<JVSHVmoQNZvQnSuHo9Xcwlez@X^!hIYlbSMpU+ygISNp@H489hqXB+Vbm|=InK*t
zOt~$anV+LdmRHS~w&5@wVP@^l7oF?1G1=%c-^ad|&QC4PQR{vh_LlJ>N-)5QXl$0=
zozT+-I(;SeVYAAO`0hH6j1|nC)A$ntLjEqFn)rm`{H&(>5(N^n)PPD~jGoYuUj;tN
zt_-S3#H%q`)L~1&GciP^9SGL_d{n}Q-vvPLbV*UeV4=|61#yLIC-S)+Xww0GK9f6<
z*s>Fi(TL4LttCfbgzrRVq$p34V`wvjD7_Zh<^I4vZBM4OCD2SY_^WE|7cMb|&@I+I
z=X|l!8lWBWD2fkViVIh~rn7x_EoM<b7tjw05PucMKyrMVfbL!kJ7ZFtoSa?vLq?yX
zvVf^$n`CgL*j=JJ8Y-yja`Pa=I*Gl-+|*eYJ#$4kGnv}nP|b>HW?-QE%g3f$%gX8s
zm=Yr_0HW;yL{D5J+BYaM;0n>rc=GT1d8Veqh)FP}C`sIJ(SfWI4D~n!VvjdMD_<Bh
zd&yn*`q1(tjRRa9OqmaKLtJyOG`0?xMGeFBUx^JzuS;6<{v!Ggu3FUJObx6xiTJ3A
z8Y=#zbVRig?cDyeDNFc3op2pY;p$yQb$jcUJ`MFT8JT|u9`@{`S#oWICO%;2Sr{*)
zrE7^_)0<OUuftb2d<*2#B&g2d|C`c7Gta%#|5CceJrosyw1zIZ1KqX>-J{R$pOuKe
z;?WYv-JQws#$}&wlQcIF1SZD=u7ux6GSDRvOSH+hTPXV~F(2HCX7q|o^j}7c|6??m
zw*&a@t7|X9{3a#FMP6<<#;Y?q#^sySv!g>3mM{{7;s?S~Ij;7S&+kT%XgR~nNot=N
z-(5Z}DrcvVY!?L{{X80yT?<p*jpe_oIw*qB|0%luR4K%{b5{cV-n{C3x9;3vh2bT8
z!OGu?pSr?lK#^qZ5haI<r>(4B@09^!wGz<r8x`R*7?5)A=Nk2)g0|K|sCo(xc`uz^
zzAzn+cU8=2*SmqPW{{T`i4#}^JX|0@xLgup+Cip=7-%<?iUec#CqW_Je?s*NPpz-<
zGO*dr#-rr-`Lhx+G_m(-pSS;9C?s!^6baD0*kki`ll~@rRTkkkP>rRCy-}lN-KR>+
z0Aji`{}JblkShs8WL~|a-dk}%k~pL%o1eKQAJYUSCbjyd{K^n0^y<S04J$GsS?=W5
znuW&!OStA|!-C2rMfKG59^W;_yV#z&uT1iO6tJXLx?pwmZa_~UC#kCeYJWW_oCNA0
za-4=z@+UV8*VD-%noNMqHY^4DeNvCnf`mPHpLQSEAkz#?3y918)_~4v4=2VFCf~}0
zEze!R_&wL0*BJSWZI<=R-HqeF*q;4|ZNU_aVy5YT6G+aJ4o-})1l0W!S8lSTWMKgZ
zRRfL#e+){0^e!2LbkXfVJJrvsMVhy+<;ZiZeXm14px%c7w*CFh)?h5C9J(#SmS`r$
z?4R3tw_Zfegmx3CiiqfU{H=;85?6coQaMe$d5>5Pb+r|mfPG3Szr|?16dg;5a9l9<
zWWSm}u1DaWj{=+PuGGkbJN6nOeGLXBdsqGI*Jqus+v9iZ>0b~O;{&l;koX&8%6B+W
zeMXqH#MVAVw9rA9!tlBbI&JGymgIS!#@wUZH$m4%0iUg6GhfIEU^^a-ZHNA*a{{!`
z9#?0Fp?3?GHtBJ=3}J%5U8m{=zNdc<9J)A|717Mz;AU;M2AB<n8a_^Ir$wlDg{99w
zzy$(knQ7oRcar0_k9a+#h3lTtvAdl5V(<M5t^IsxM^QQYz`)Of3VLjCn*T?KbmQ&S
z2y(X5L6+lhs<zD!pn*jzn9ka9DFHTn_$|e)xbiddY&5vb-N(zx9-?z~j@d}l)RU;1
z?_c{b>Z340Hc1#Lf#mANU^gtLdE&xfV)}5FbmM!_gzK&dXVHwoRafMPu6vrJH_k}2
zzVs#YC3*^3g%;Z00r>6p=>3O%_XyA%_K^HIz!b8kxOF$7T!sY=?~jYrg?fGCl&9dz
zeYqEXo@v0N_X?=@9T{!Fc($O=7<hpj&4OzF2Bv?h$uD#@8}GxY#!2xVQFOa6`9Jjb
zWO(ve3F!A}ZJik^I4Q`Bge78pFVL0xB{4?<tW&_?hyMxJ3?%MS`5)jvf3FQ6QRZoQ
z4@w|_wlwx{&tE6JjL&Eyh)O!q!;<n{Nyi8hRqgQvEmw{=gDG+<eS_w199L6FoiBjF
z0T^=V#NgsP_Jt;Vvx1$?V?f>Y(J+M*hps%(=*!rQ^o6If{q-Rq0{>5YSN;xF*uTdZ
znMpAyN@0+#tcC1`ERhh3HbjaDQFdmA3JGZ;`%+PoCD{_jo@6OmiWo*Ad$zI8`<xki
z-|Kr_-~WK0T$gK(bDr~g?(;eK=f3Z`U|=))c-O(?kq>i0pQiS+m%WCtTlq;o&zYak
z=$!UWm5LeG9bUoSQLym>4ly7cDQ^$RR!BcxVMlY$v|XV3%FlN!=#Ggj$34K_QIyi6
z3A0^RRUqAnw;qok<eVAn)cdh>LK9nnaQ|@Thh=uN-zC*F;V^R0`Pdo$Xp@SQPp<zI
z$S>aqW};}t9<}4fp%A4_f+X;)S#7Vx;TjSxg1MI0yB>l8q(i&my5UGLFQfVFr@fMQ
zSgmhjH@J{Xi*f>WdXu}o-u8rj!>=soKB^0oY>#$7=69X5+a%F|to>yF$5_N<d@MA8
zjCGY+D>SALAXPc7YO>ZEX}q>WHwA6E3WV91!0}6GIS7XNpVle8hWee=M+*K8A)CMu
za#ymM0~6d@z+`szh}^e2kiqkIL<G<wfpzZw)OWuO4|J`5r6@Cufou<=fQvGlBw5;{
zfutP%30P<*FA`}2zZ)7NMc}0eV+se#?4tcxE#mRgw6$))fypQcy_10vn6JK|vD<zF
zsqg2vLuTqb?Q$6kG#gD+$&FgXm)fKd-)*m!Gczfu(93>(9gEXFsP>?Ti4P=7<nM;D
zG~d+4>TgrL8nh7kvzC#}l|SDPgnsPr%$&(Noc+MG8G4tP+j{d$LWdeOG)3=;h9$e}
zY6r9E3Z`Zk0ft*@Qb0+YBO@~>+AKNG)_8BrzWRXL`3WrfeBrnAUz+)D2b^P9%CK&B
zxhlcfXd#*Yd^IRPen1&H5>HeRCYPJ?x7C{dmlK)j0Xj-qS;yNs+X&6JP|uyE$)Q{U
zZZ%%|IEi{!6r#5iX4P&)%tlw!rjWtkp($iQq;t&;UT4NVY#UlXpndjau*_biD(G&n
z2ekIpj=RxP<N&nH4mx&U@}IghbNiL~Hac>L-S~&x7%q6j`L(%L+_eZDrsW_a6Ig9G
z2G$QU$^gCpl&Q(8^RN70^mf^|Rue>NVW)T9`??+J*p0FJhu!su)VrAoxg6d$v@vAb
zQr5{gs{u`?`Jgf60k_KTqP256v1h99@+*r@QwBt?akP2?QB5$`KM?h5K<OqPy9@DG
zXWP&l+uiDXf1f|~KmOmgn?DMDsXY~uWhDl=Xw;M!|Eh?6X-;`OHi(7BkrfNS!~5%<
z&@vKq5lP~eZi?>q&ypf)5P<Ih04_xX@RvFefFIT`w9#U_1c&j%+u1kJd*(3Ia(5d4
z?sxxg-LE%a`6^~Fk8>Oz4}3J&aHp&IUI9Y8H3HY*GHknn-rSWDT^Jh&_}CRcN5G00
zl*C~AD#ap9lUAcD0PWS*s9;#@<TxHdYAR^x872P?6uKR>XV4H&JulP3P^}7{CV<i&
zz`es7398o>(OD71?I(Us5G!KpCu{aWL7ni!;`PV=TClTJuZjasTX5$~I&{ZeVY`dP
z9-_}8pAL7QfE3wE4NZ}i^q#w*hrlq)4h<rIdgT|?`U~X-);@)qq=?J?!4tc3=OC@0
zcygfA-6&`bdG?2fBW(;RU~h8L;Q+*l46Da-l$zda6%=VHsS`9nFL#E%#epfCIH5FF
zMPGcU!!{r7SAj%op<t0CM2A$|#>1Ei!MDoi{P#Xo^~jTdWCSLkj_=sVn1C4D$NpBb
zng4>euWcY#W|+tOV}ea?zdY=LXO!5BIH%$K9H{)d1-gL_`*9MicaW~`b4vi3L~U{e
z$rDFDN*R3PIU8f7pEej~w1AEZy=dxZL~7Wp;_zsn_Z&@yo!Y3ulz+!{+;z3PJGHn9
zwaZ>{q;FKcQw%6ofPE$|X3RP_qvD5Er)BDX#4h;m!KbJ&pzuo{f**IAR?8Cw-kDMt
zHLpEwZ18wdh`0V(_W`umTE{sW){CUbAaBP1(7~R9W3~wj2!tXkaf0tTf8e)TNBH}l
zM&Qx3jo;?>QDp)@*VSl??5`fjfpbQod8pL^@;A!oCJrDOlr>2laGDDH_xBTh7Aq07
z>0|G!q93!%y<NBn2_p~Z0Cj%3br^vi*?W<W)<T~y&YD7m2-`&IBi@@(i#?utiL{@<
zkE6*&G#L@;f&e;R=A}J4g}i*PV+og-(8$q}^U(RB$$S)KJHz&)PwX(+4zFQ<xfIp@
zzc|f0tYtX$-Cg9N)A}vhQS4Q;3<pC<$yv2`_bXMCov%Q&bs3)KpJ_N#WPc2bHv%2@
zc~*=-szje|K`;vTEJAEB>?zUf3WU+O9?kvqy%Q2M{9bTD_$%uMLNjQ8+Bsn-Bm<Gw
z8fv=}9=iF49|!;_eY^c|x`M$&@I4L--0X643aa!L+rPnOkio6sqbn(I=J)ccK|t>T
zzvH4Hc#+|t%*RPBUq2aT_$bdF4flp0{)iR4KY|i_Jy*sR5pGqbqsA*3_Z4cgk67ks
z?ik)FJs1`1j+Co74Vlr$>&M&geUx3h)-is-x-b;TvCV<{4P$cvP$Py*fEr;u4)lF4
zPpfG9zM8<_4&e-;0tht@%DNw9cJ$p}N?E>-!c+c++=@Vp0Y&x?eZJEld`e`Jz&Gx;
znktl=>0L|_>d8A8yiJ&$6G_Ku-CpT<R`q-qqHV-l|KqwVqODmwzm(wBF*e&FVq~O9
z>(=C*8AOIT<vVTs7<Qw8!k|FwurYj)USu?d`i+OJJ@1trG?1DhRo%LUTJ^r9@SW3c
zMKl_)*A4gnhrM>b#eOWI3Q1$HgLjUf5~j7-m@_w|%b#!rtWwqOpr|rTGJ?+%qDDHL
z6zx7NLA=PBMTdU3^~v1HG|*#1-Ulp}htR-w^wcA7soQv9L$h5e<jmO(9L&6ENS9rF
zuVck>NI!pGgQgl8qhiZ6xGcVacNPH?XztA%1ZBsD(Fl@A^|)AQ0NK^28jk`|Noe#2
zI}-15wxn*T&MT(YQ<_bbqB&ETnY|9Wfj)%tDueG1eKE4yj`we)P_T<Txf6ehOb07L
ze#e<-(HpJy*k!2IuC(Hf2p?gDXK`*YB<5Xy`C8#WHIw&ICkKmb0w>BxT?Cy>yC=S&
z5uXh=`)$o(8-Hp#Z2;Lf$<>o%Ty#k=*=|SL5qEeipKB(dv4y5W`7(fdWT&G+Hu799
z;)3n`x*m(5F)0&L`=wh6R(+wIo|Jq>LR0UJIjEC(kp55paV5u-3m!idF<i<T&08;m
zj5KFis)1e)7?QMUW5_wL3nKJ(+n&D~Nd6|!JvjoH)ZOqZlhBGqDbME)_NwnDnQ1Ym
z)5gl1y*B&zway*<yMaSJ<{j>b*7X!Qy`g<P!LXwQ5*B|jWhD_Bml&Wl!k@aaSV*Kl
zPIZkCTVaM0EkcRCO-aumZ~OKLOdw^E)G>iSZG0-<ut|e{pcy|W=$4ujn=F0I-9a)U
z>`Xuv0)IwtTVUN2{M-24>^~tw>VASi3U??mL$(kFskB!<*?uLoV2C=Y^EJAER<k2c
ztof7!mG%L9QEbWJ!HQ%c(7p|90KjQip=HzbbqB}}De`^r!pxLLXm<$N7PlvJQljfv
zdA5P!^2?7*Z9wyPD*uR?Xn_Cg1V?T3YY`+J#Vhjsef+INfK&ZxcH+v^>xrFBqH=J8
zH~J;I!R$CRf)wV)2HA}>uR%5%fTcaWz{**}@p0zd=;Yuu*k89F9EhB{ez6{RS#!yA
zC8zrea9_UxtE~em{zgOi2fXibHRzsDzXZpgc*bBYr?bJ8tUS{PNY3}PF-6h`@Y(bT
zz{7N=WLBaq93`&qo?GH!sNyn1?jQWt#r0b@Sc?(;z>qXKXwD;=HRN!X-fbT$3vW#t
zPo+;DcQVSdQ)V*X+<fmLBf>l4><o6c%mPL5{T=|}r`G_4D`nk<f<)5(@SiTXG$K@_
zoeHSZLASvP@l?f=$1VbWk~oV+wB!-5+6UK_I2+}u@7Z(7a3mh<4Yb-Ki*1M3-}(;t
zcsRbMwc6-_u(lKOtW=}o?lW(kbMNBuois6tI}F88sBSbf#|F5P=WIRkqSHxdf$;A-
zWhk(C$Pe%&;c9o2&62*Y>iI_(1m9&ijf65q=8cVCr8}7mhn@MGQ*pIc!~lE;1&QmZ
zAm##$fJBNl!iEj^taP7596asx{_K#rTX%KSch2xHNqX@wjr=P$u~;@lU_eHA;Q97v
z%oYRS6`3?D#@cqtR09aM*Di)jNlp!;^`n!m_V|<%9Rzc`%>c*!1%E81gx$gaHH|Ns
z=mClnyXB79ZvBdD5XXJtuX-QIF$4L&3c@uNru-(ypq6{zm1!DX@(R!;>1iJawj=MK
zB&|$!aQ<b8Y;L?S2}G9lr}RFvv(v#mnPpk^!c&@@L=cjb<g`X#r@$%RX+ChkmrP&K
z!lIIwA--h32^S8rC9f5Z=k4Ic*htZlyqX1c+y_$4|7;?8I7L97&XpK%B6*f*>;PaQ
zfQ1QYXy#6m8f**ulPO&|DIakK-|SFonou`?>YvyH&M!I_+lYP<93!fIx{}QMy30>M
z$w@j#lZwfkY)SIbPz@|mdjrZ(yH;!Z&O+_B+A4dw+j2<H72GYh@^fEyyLbT9KFRLA
z>c%M_Hmr{XC<R!#3Ij%5FcG=Yb9Y!ri{>`cmD|}=kSoHjS`Dn*0h^r3<VzZo8wu0-
zlDMCIz`c7G1x+D|w(Fmc+RfYw*AJbN7%(<e6sxFE2!{xhktbMShSb3RH7IB0Pw0ON
zvpL36rz-@(_`7uj={G5#E1BLx47YWz0*_X$9f$~w3CvnM&E)qDj38ByuJii1zEAiV
zU+cmK@*F-RTv8@pG{&tSntCQ%fjh<XLV1b*5{O}F7wwT@*Z5&cieEsjuFQBYmy}ws
z$hN0+!eBzb^tCn3Bdd=&0>WGE#U1!D4Dkf$yVtBGcuU8h#&;fCjDaL1zsygjq_H6G
z3Yn~2+r5+k0wEp_O9(e)Gu4#h7XgBqAD}VZf`JXre~&yIX;HG;EyQDW8fZs6LnqpS
zWln`)Bc|Q&$E|X9PCfG4GI(UkJ8H!apgw-Y^{zXz6b5{C_Krce?MDOwsfhoihX*2D
zOp|y3@!M+h`R;T%8`UB97d(X92{T}{2M7?HCKlWp)^GD)SyH@s1a{S?Lh`nkF!qC3
ztR$#L`x1BSxO0C%u&NxOJZSiPlCy${f&w>?s_*22$I}nw7@k!YhU_rkPx7&s#VjOZ
znfN^0WH3*N3xH$+g1r}qyRu|U`+Lv5fK_6#LWsv6)PTZro|$bfc)Ty7<q6ZSUkn1^
zc~y_0_rvOrRR_ZCydlm)&7|T*#i61TA+<%0AUi9J_<d4yc|cFG)AqS+gaQ|kYMo$R
z!(#2>fTnnUc|8P#RH5e1c$uvwT#eYnV+&_!=O`(oi!%-n<@nG{;t9T!mzjBi8d_Dw
zVNWQ_W{XR<-KSf447Auk_Of`}y2Cr9lhU#M4;sZW{z9Demi7)an^2Uj?GbK<5X&bx
zhrKwZ3L5S`_{3U#-Z?68mvDQxQVn($2`T6x&?6s(|H!+Kf?dDQ_(4XA072ZGQ4(~>
zXPkTf?0x<xCHXKIldvHSbyCd_FeV-$EM8c@675O^%)#nnZL~-hXTKSE8#+v|P8m(_
z@0{DCq+P494cwyp49Hkb>^8zZHG4%@F-AG(+9Wzr@SWF7g9L&Y!O9ki$1MRz$&L+(
zve+-i-II=Ue|JX!4x&#d*f;vkA0WJe4?K{#9J?97D}fv}Kl!~n&_=LNldcD|L+$0K
z+uXneN>oHZd2DYie9YOzs%+CHUVvQJT@A&d{MwA^9Bd#x1WN*$M(ZF`=?ZeUEGx8@
zHQ1{27)&@ePXh~PSxtwTRWPY2cv3^pOP$9;K_E?LPY5yi#MeghadY|9gu3U|@0`oB
zltavlD&L1#y&2(|<mh9B!W8I`ViLLp`S|_qB17f1v5m`AYEM~;rOKG{PEw^-m8Y$^
zOx>5y+HHoRH=YUAgyIGfHHJ4cMe1woYHMrvG@P<A2Z^#@Uc|q2k~?*{Q9?xahGsPf
zk3LrL2I2TKWPFj;t2u)ct_eLYexJqm?kWlJZJ7vYSxRK0`c_P>d`OXY^iA<-@iWpW
z$PeZS)3WhHB(F}U-B_6WKA{v>fX3vx5!U>q_NI7ub$F<>R=hH#44EI4SiW&(`T9ub
zXa|lB{#wM%-_E0VG$ZzP(L%rVRL-cMQF*_ku*FomR}isLG=+EAAL%5Tt#vmXlQ%4n
zla>0Z(r>Xty4qe*m;p`|l?kZ6>OYc`S)W$OB3-1R^3#G;gR8_16j}QWbyMz_rAzmI
zM|oxt$L$o@0;g}0C7Bn-KjTd$wXqC&=rhd1SUijYjzDH76N4+gUHr!@18-?^uP-yk
zMp4&CoElz)m*$fA3wQ%uJTBlC)A9p<^rTWl2l>w!k$BDa;;1XR=S#<|ez7dD<4^Zh
zIEii??(->9z0+dk`Hb9cA09M}cTjbx(;7{SOU#kW15_<8drxr$E1$a3WT1b5cut*;
z^GR?v@}jMR8y`n^2N5TZ^6$y*PFiE1{XJ%_<nrESimS!_lCh7&#5c-<u|H$$9r1W8
zE`mzNzS-pI=x_FChnuYQ7RqLu_&Pa}Xbk;GXHJpiSG=O4dT;*nv0naF<`sd%Ee=*L
zxO&dM#+6NdblaCbYZXlp-c9K!xLO~JD=B(zG5pp_EEVRR7K+=v8gvPU01naNJ-<6P
zsY`bK7k>^9F5uVXY`lK*YEnaF6mw*vp>8wU@*E*|eWaW6eL3z$xjOg42RxkQ!$Q@j
zFEJV;!%R?Xf4x*(?l)#lUd#$8YtZZW?AYJ3`ZdJc(>GxjNBL6_tNZu$A@RI?AJ5*v
z=@A2~m8^^J;5Ho!lfI~pi|WBlx3)LKT)ihc)mw36H~aBwv67S`YP&pcG_CLk<+g=V
z@ufARQ)1KQDY;R8IG=Qx(vQPJsW3%;$=1#LjqZL+9KPZ;S2^?omxr6}ALpG4Am0h_
zAfAEq#`pED7V0JUeKJ!EA%5EKzq~F~vj&UxTicHR)tCEPXyYbbkRyy)-&&#&6LP%2
z%v!&7>M9|paN)?6XYoB5{LV(MEiMcrns_3ZE&Doyxc7zztMS;iMPalFOrnb8A{;6^
za7i|q+gHal)_;}Qw!XkA^sQvLlXl|f?`f<!&8|i*s@}5or-t=6&pwFMv2kRom?r(O
zR4FWd*H!$7I|F7pPi4HIv3Vc@d}Z;%VfC4u*VLgMD;cJwM`lWSBMor{cD>5w%TwS~
zIuVhs&XFoVB|Mxg@3fl2c1fMQOg{@e_7Rbp>O!UTIIU9;t?}cAJIGn(;nZg%U75v4
zG!}XyM5NB5F5D!P@daE_T}?3KRttg6a$BxWy`OCz52alRbenbH1uL+?$(Uh{F)Fl)
z*nZ~W1}xm>N}FfuMkhY=A&`kF#P1%%^_i2iEpfAEW8OvZR6Ao+j*WuNVsiQ5IaOl6
ze2w^>Tu|W3>^&;Y{IsdCrLX=&;E$_u!$G5%L!xfe(~UP4$zzASel`VGZO7a9=Z$UN
zmT@$p$5maXZ?-;woH4c_rTXQVQ)Yc};NQ>Htz-lu<}4|ae?PCNzck78jdxe+Xui3{
zknO(><C#qyPoQwE{h^Mt6}wVXMC%##j3zCatB~)Iy*@Sa<R;hh4B?zaX(19XOqy{h
zcC#uGzeV##_}8!MSFW^^11Tx}pY}V}F;)D1mf6tS*_vHa{r5rz+{VXq)L`>}9g?0N
zpY!~s5;#5f#0!SCv4ZbQxY{tm9Mv-B7U>bqv<t@V!(e3mZ}Vsnq}ARju%=93`?adg
z8%EsIzp}JkvKT9BB0<2zZBQ{I9Gizm)GNxBpImZ^QjG|L5txu0CCm*gYYs7oIUgx$
zXWv+Fq=YW1Xq5SJdqLR_U$8^H2zpW1@4K#3x_hI>@I8l8Vck})S2x!dZHXtU87J-O
z#|?V1D84<$fth9|NUN48bQ)b>AFy64H^DNPl*mQ@Ta;vOMGw#W=QAy+YDlzYHgP7R
z`NlA#%iB`RUv+#J8S*Tx_5Oj3WghWpMzJtdYfLG111R)URPX%A5%NHPV$i9BsW7pN
ziQWI|%x*tG<kjK1qRVV>M3Ek8ywrniw&>H)yx`DEmDrA7N>CQu*cW)B0_t;LBvd{R
zi^F;xk*iiD(!e9~WJ8zZuI=N>N7c4_gd1)yGuCE*&r=r|3G9|4mJ15yk3YCBa7P_v
zV8V91zx@wA=&Kip|0LpZMCac}X}@G4cEL`Mam3IbE1NisybRxt|J=N5^OWd+e92(~
zGk<f!a$^f_eBuF040iaa*}qGr{gP?`R<=;;(!Z6Z-D<2zD(qvg;lG<n`*(!@?_}Ya
zt&`naS^QQRY;7=j+*TQE;Vi>e8K5y+Ww2ESpqbh#gRL^yDgzp|vDF)Fp#gXo-715v
zGT15uh<(}W4Ytr=s|>b!13G)Vg$7$_u!RP6G$2ypFXQkg@~_BBFz}<VW2Bv<WfSxt
D_ryh$

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..c6863fe52
--- /dev/null
+++ b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon20@2x~iPhone.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon20@3x~iPhone.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon29@2x~iPhone.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon29@3x~iPhone.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon40@2x~iPhone.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon40@3x~iPhone.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon60@2x~iPhone.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon60@3x~iPhone.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon20~iPad.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon20@2x~iPad.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon29@1x~iPad.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon29@2x~iPad.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon40~iPad.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon40@2x~iPad.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon76~iPad.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon76@2x~iPad.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "AppIcon83@2x~iPad.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "AppIcon~iOS-marketing.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/newexample/ios/Demo/Assets.xcassets/Contents.json b/newexample/ios/Demo/Assets.xcassets/Contents.json
new file mode 100644
index 000000000..da4a164c9
--- /dev/null
+++ b/newexample/ios/Demo/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/newexample/ios/Demo/Assets.xcassets/close_icon.imageset/Contents.json b/newexample/ios/Demo/Assets.xcassets/close_icon.imageset/Contents.json
new file mode 100644
index 000000000..19ba2aa02
--- /dev/null
+++ b/newexample/ios/Demo/Assets.xcassets/close_icon.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "close-24px.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/newexample/ios/Demo/Assets.xcassets/close_icon.imageset/close-24px.pdf b/newexample/ios/Demo/Assets.xcassets/close_icon.imageset/close-24px.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..214a2d71629bb792bfb289bd5be78f2b1ccce12c
GIT binary patch
literal 4345
zcmeHK&u<$=6u$JrK*fImPmQciknGuAd!5*|Q#E!HqQ(%}K}A$Zo$OAWP1n2I-Eq7L
z5)>{}s(L^@a6xcEl|X=~fC~r#2h=mD61V;b{5Wt!0^aNod!1hJp`5(3ygP56-}~P8
z-mLr;cG??7tz?kGSHFJt7pZ^>-rgZ;G=Oe%w=WLBKvS0h0Nt=1!2`TIOz<{0J&Tjo
zRT7GTvjK_T>)ih7><xIT{m=Oyi_ksOx$mDb&%OTr+h4zNZf9@%&fRZEzv#|KZ(a(Y
zdF}2k=gx08uYYm#>3dhJ@4xfIttZ~Papvgim3Ke<<nZGC2V3`cJLSWL&;R`6!Kb%B
ze(r<I_IdyBhtGcb^OGyf3vI$(D@}?|60XE3?}$=Ut8!ni%Hv{U`0J6_><NSpjfOPf
zMVX2VpskCb0W}$ZV?nrq-}p)6=;Js*caMDzbcgjh6hMpP?y!Kn0)LwE)Zv!R*1QO=
zph*S2B0sOjzAeuc=p2G1I$?D)@P>X4Qj#IIW+;1@H(+k)%S`5RX5Io340*O{p;wz9
z*(UF9u1RB33GMRG8wMs1LGsbf)g=*U&7Ra1%HPsUwiP0NS$cPjeJIP!1*ql%>;#@Q
zG;ur@O=brkXeG@kX(}up2;tW$l8e@U!2AQ-3`<_nUs{S2wQzWZ?YV8)n8kKoS9Mi2
zG+ixMs)kln4MkO#aygfCITO$=CYa;(<7l!mVcLpG1EYZN6BSm7I=-N47-a+YA+s6k
z3dFnMj%|7k>z7yFrejY}*;EY&@RUufJsQtg#ul9NtFF{0HW4t};X!=-diDuN$g&w-
z&l4aEPbOx|-S<FpA2%};ED&*p%N30j3hOU!kir`8+wOW~@9%n^^OA2Nxn$BULSxoF
zY}PAmaKeHmLMQ#pOcVYloRjnbWSqw*AtRi2xL}xy0hT^BX>y%RS{5L4CA2r(6Y-&X
zxwB2OmyTYmlx5SCV}6!2E<`>vuW<o;va+V~`#0YyU|UV)ve8jHev2R2&z}Umck;rn
zd2-FHS;~b~(unHOz#kwghz5=u)}yAv@YTTU_$<v-L8rjluXo!UsSB=}N;<Qn(Wo>k
z%VDKjtyZI|PIbMA9>wt36)Y;c;Q~e=5XWfq&<t!}4l~G@Y|k5trlMdAlkAo`j_eNu
zCyr~GlskMN-w70tj06PGu*|wC&xIGnZ=*PTk6(`$NixS?P5RWJG8Zo8q$G>fvq7iA
zBzrlK{~frW<HQY1F@+`58&KRp)a4X4uIkwsjnPdRk*OH&6pF-z9l&1DamSKcv8Km*
zNzxwsHBT}V#dEsmbj`%TOwRM^n$tBC12Z|#r)y5vObpEA{QpeX<i9rR-=;E>|D^G0
zT5+e6O3UOEs+x(UszN!nYpVK)<Uxgw%5z!<X_}7mB(qIq5Xu87gK8wNfoM(up>E+v
dAe9fQg~GaPO^Y6=t>`EsGKEyp3_X=d{{m9oQ|JHy

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/darker_color.colorset/Contents.json b/newexample/ios/Demo/Assets.xcassets/darker_color.colorset/Contents.json
new file mode 100644
index 000000000..d82588e1b
--- /dev/null
+++ b/newexample/ios/Demo/Assets.xcassets/darker_color.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.200",
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.100",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/newexample/ios/Demo/Assets.xcassets/error_icon.imageset/Contents.json b/newexample/ios/Demo/Assets.xcassets/error_icon.imageset/Contents.json
new file mode 100644
index 000000000..13f7a995e
--- /dev/null
+++ b/newexample/ios/Demo/Assets.xcassets/error_icon.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "error-black-18dp.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/newexample/ios/Demo/Assets.xcassets/error_icon.imageset/error-black-18dp.pdf b/newexample/ios/Demo/Assets.xcassets/error_icon.imageset/error-black-18dp.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..7f8171cba1c19fae3107d72bd6e69a7fa7f91d5c
GIT binary patch
literal 1020
zcmZWoO-vI(6gCiJvJ%fk4?Yqq^g#Eg-L{ZILbokJC9Fj>f*8l`v|Unn>g?1MqaH8@
z^<bjms4)b+8E+B}a*#7}FkUc*7~@SzjA)FQ5NEcuY+$mP-TCJIeBXO-17<4IrG_F>
z;Pu9<e^LY#AXg@(L;~c~*eS3g=p4#Q03c`V62p|gONikVwnz?3eSMP4C`MPM>XV6w
z{YRSGTGD@d)AHpPOj=PB({0x-#t;AAzW;9aXr%q_`E^-2G2XGToP2O=rsMhi-;Y0T
z4lORtnWMQcFBj*{3)62_pBfv@=O(w7R@+D49z3-9sWrav?9z(+^UTbF%{#ZhS7%Nx
zueEfoZI9g>KlZEjL-A4mYu;>M%DfLgPJWwh*&1H|+;n`d*JzfoliT6Ozl16wMZCEf
zHKL1qaSAsydn(gaHZa1tLP#V8z?X~^egN6%2Nh%s@ty1D7kuZ>P8_Wf2jsI;Wel>3
z3K#;QdT~uevBS7)y_`chXQL#k!Z?Q%P{Sd;woQ2U25}g7a6$B>)_?&@DrFz7S{4tj
zGacc%DRSJh$YxE|;Xz=ug6k)PTcz-I+rrs_qyTGb<Scecg<9AJQIo7sn_yj^i(PH5
z@Rd*5IhSh?^0QFqUJ+7#0iwPDCMCIw#V4uLLN+C!hSX?CfzBdhWw%G>1?FghqH@u;
z+z_FKV9-ls@Ht~PaZ;i=ov9v8(G*2jH6^CUl=xWCmoDZ@SL16ShDxO11rmL6cRI1#
zzbeIfNrAYeG!{g4J*-0>>X@$cN{9tc0}F@uW18N*&rVVK{O$48!kp<IEUNNi?ZIN2
y&yG=KmoW8y(h>Ux=9EPrvV<@Y!fV4a=;R5AvU`1W8KTTn7>jjFfk1jVBmD=eNFTZY

literal 0
HcmV?d00001

diff --git a/newexample/ios/Demo/Assets.xcassets/li_colorAccent.colorset/Contents.json b/newexample/ios/Demo/Assets.xcassets/li_colorAccent.colorset/Contents.json
new file mode 100644
index 000000000..29e731933
--- /dev/null
+++ b/newexample/ios/Demo/Assets.xcassets/li_colorAccent.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.000",
+          "alpha" : "1.000",
+          "blue" : "0.000",
+          "green" : "0.977"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/newexample/ios/Demo/Assets.xcassets/li_colorBackground.colorset/Contents.json b/newexample/ios/Demo/Assets.xcassets/li_colorBackground.colorset/Contents.json
new file mode 100644
index 000000000..1acc7fa26
--- /dev/null
+++ b/newexample/ios/Demo/Assets.xcassets/li_colorBackground.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.579",
+          "alpha" : "1.000",
+          "blue" : "0.573",
+          "green" : "0.128"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/newexample/ios/Demo/Base.lproj/LaunchScreen.storyboard b/newexample/ios/Demo/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 000000000..ab8946cc1
--- /dev/null
+++ b/newexample/ios/Demo/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/newexample/ios/Demo/Base.lproj/Localizable.strings b/newexample/ios/Demo/Base.lproj/Localizable.strings
new file mode 100644
index 000000000..f4f15cbf7
--- /dev/null
+++ b/newexample/ios/Demo/Base.lproj/Localizable.strings
@@ -0,0 +1,102 @@
+"app_name" = "Kaluga Example";
+
+"feature_alerts" = "Alerts";
+"feature_architecture" = "Architecture";
+"feature_date_time_picker"= "Date Time Picker";
+"feature_bluetooth" = "Bluetooth";
+"feature_hud" = "Loading Indicator";
+"feature_keyboard" = "Keyboard";
+"feature_location" = "Location";
+"feature_permissions" = "Permissions";
+"feature_links" = "Links";
+"feature_beacons" = "Beacons";
+"feature_resources" = "Resources";
+"feature_resources_color" = "Color";
+"feature_resources_button" = "Button";
+"feature_resources_label" = "Label";
+
+"show_alert" = "Show Alert";
+"dismissible_alert" = "Dismissible Alert";
+"alert_list" = "Show Alert List";
+"show_loading_indicator_system" = "Show Loading Indicator (System)";
+"show_loading_indicator_custom" = "Show Loading Indicator (Custom)";
+
+"select_time"="Select Time";
+"select_date"="Select Date";
+"current_time"="Current Time";
+"confirm_selection"="Select";
+"cancel_selection"="Cancel";
+
+"permissions_list" = "Permissions List";
+"permissions_bluetooth" = "Bluetooth Demo";
+"permissions_calendar" = "Calendar Demo";
+"permissions_camera" = "Camera Demo";
+"permissions_contacts" = "Contacts Demo";
+"permissions_location" = "Location Demo";
+"permissions_microphone" = "Microphone Demo";
+"permissions_notifications" = "Notifications Demo";
+"permissions_storage" = "Storage Demo";
+
+"permission_unknown" = "The status of the permission is not known yet";
+"permission_allowed" = "The permission has been granted";
+"permission_requestable" = "The permission can be requested";
+"permission_denied" = "The permission has been denied";
+
+"permission_request" = "Request Permission";
+"permission_request_success" = "Permission requested successfully";
+"permission_request_failed" = "Permission request failed";
+
+"architecture_details" = "Show Details";
+"architecture_details_inverse" = "Inverse Input";
+"keyboard_manager" = "Keyboard";
+"show_keyboard" = "Show Keyboard";
+"hide_keyboard" = "Hide Keyboard";
+
+"location_background" = "Kaluga Background";
+"location_enable_background" = "Enable Background";
+"location_disable_background" = "Disable Background";
+
+"bluetooth_start_scanning" = "Start Scanning";
+"bluetooth_stop_scanning" = "Stop Scanning";
+"bluetooth_no_name" = "Unnamed Bluetooth Device";
+
+"rssi" = "%d dBm";
+"txPower" = "%s dBm";
+"distance" = "%.2f m";
+
+"bluetooth_connect" = "Connect";
+"bluetooth_disconnect" = "Disconnect";
+
+"bluetooth_connected" = "Connected";
+"bluetooth_connecting" = "Connecting";
+"bluetooth_disconnected" = "Disconnected";
+"bluetooth_disconneting" = "Disconnecting";
+"bluetooth_reconnecting" = "Reconnecting";
+"bluetooth_discovering" = "Discovering";
+
+"bluetooth_service_uuids" = "Service UUIDs: %s";
+"bluetooth_service_data" = "Service Data: %s";
+"bluetooth_manufacturer_id" = "Manufacturer Id: %d";
+"bluetooth_manufacturer_data" = "Manufacturer Data: %s";
+
+"bluetooth_more" = "More";
+
+"bluetooth_services_header" = "Services";
+"bluetooth_service" = "Service";
+"bluetooth_characteristics" = "Characteristics";
+"bluetooth_descriptors" = "Descriptors";
+"bluetooth_permissions_read" = "Read";
+"bluetooth_permissions_write" = "Write";
+"bluetooth_permissions_read_encrypted" = "Read Encrypted";
+"bluetooth_permissions_write_encrypted" = "Write Encrypted";
+
+"beacons_start_monitoring" = "Start Monitoring";
+"beacons_stop_monitoring" = "Stop Monitoring";
+
+"browser_button_text" = "Open browser";
+"links_instructions" = "Tapping \"Open browser\" will redirect you in a webpage.
+There you can find a button that if tapped will bring you back to the app passing a query.
+That query will be deserialized into a object and shown in an alert.";
+
+"feature_system" = "System";
+"network_feature" = "Network";
diff --git a/newexample/ios/Demo/Base.lproj/Main.storyboard b/newexample/ios/Demo/Base.lproj/Main.storyboard
new file mode 100644
index 000000000..c07aeb629
--- /dev/null
+++ b/newexample/ios/Demo/Base.lproj/Main.storyboard
@@ -0,0 +1,1727 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="czt-vE-Q3c">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="collection view cell content view" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Architecture Input View Controller-->
+        <scene sceneID="YDA-Hr-mSj">
+            <objects>
+                <viewController id="irm-WF-A13" customClass="ArchitectureInputViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="py6-Ar-fCs">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="r7U-VH-8wC">
+                                <rect key="frame" x="20" y="93.5" width="374" height="34"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <connections>
+                                    <outlet property="delegate" destination="irm-WF-A13" id="c0E-PN-JMr"/>
+                                </connections>
+                            </textField>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter Your Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BRD-1O-pzh">
+                                <rect key="frame" x="20" y="68" width="128.5" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter a Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e50-92-l7G">
+                                <rect key="frame" x="20" y="147.5" width="119.5" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MN6-Uw-a48">
+                                <rect key="frame" x="20" y="226" width="374" height="30"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oa5-69-XBu">
+                                        <rect key="frame" x="0.0" y="0.0" width="374" height="30"/>
+                                        <state key="normal" title="Show Details"/>
+                                        <connections>
+                                            <action selector="onShowDetailsPressedWithSender:" destination="irm-WF-A13" eventType="touchUpInside" id="5kX-rr-EdX"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                            </stackView>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="w2o-g6-GSv">
+                                <rect key="frame" x="20" y="172" width="374" height="34"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <connections>
+                                    <outlet property="delegate" destination="irm-WF-A13" id="T2c-Bl-xIV"/>
+                                </connections>
+                            </textField>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="error_icon" translatesAutoresizingMaskIntoConstraints="NO" id="nkY-wQ-Zgj">
+                                <rect key="frame" x="376" y="103.5" width="14" height="14"/>
+                                <color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="nkY-wQ-Zgj" secondAttribute="height" multiplier="1:1" id="1aJ-P0-XUj"/>
+                                </constraints>
+                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="error_icon" translatesAutoresizingMaskIntoConstraints="NO" id="9Vf-hG-a8X">
+                                <rect key="frame" x="376" y="182" width="14" height="14"/>
+                                <color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="9Vf-hG-a8X" secondAttribute="height" multiplier="1:1" id="Lpe-G7-rrQ"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="cfj-uN-qHa"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="r7U-VH-8wC" firstAttribute="trailing" secondItem="nkY-wQ-Zgj" secondAttribute="trailing" constant="4" id="29l-Wo-nAk"/>
+                            <constraint firstItem="nkY-wQ-Zgj" firstAttribute="centerY" secondItem="r7U-VH-8wC" secondAttribute="centerY" id="3ki-bz-Q5z"/>
+                            <constraint firstItem="BRD-1O-pzh" firstAttribute="top" secondItem="cfj-uN-qHa" secondAttribute="top" constant="20" id="4qy-iA-RqN"/>
+                            <constraint firstItem="w2o-g6-GSv" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="5le-Mo-cPp"/>
+                            <constraint firstItem="9Vf-hG-a8X" firstAttribute="centerY" secondItem="w2o-g6-GSv" secondAttribute="centerY" id="8in-AJ-qYx"/>
+                            <constraint firstItem="MN6-Uw-a48" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="9AT-IS-szf"/>
+                            <constraint firstItem="r7U-VH-8wC" firstAttribute="top" secondItem="BRD-1O-pzh" secondAttribute="bottom" constant="5" id="CQ8-uz-pia"/>
+                            <constraint firstItem="9Vf-hG-a8X" firstAttribute="width" secondItem="9Vf-hG-a8X" secondAttribute="height" multiplier="1:1" id="DOC-kp-U4u"/>
+                            <constraint firstItem="MN6-Uw-a48" firstAttribute="top" secondItem="w2o-g6-GSv" secondAttribute="bottom" constant="20" id="F7h-7c-fq2"/>
+                            <constraint firstItem="cfj-uN-qHa" firstAttribute="trailing" secondItem="w2o-g6-GSv" secondAttribute="trailing" constant="20" id="KZD-4u-uFu"/>
+                            <constraint firstItem="r7U-VH-8wC" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="RBw-GV-NWQ"/>
+                            <constraint firstItem="cfj-uN-qHa" firstAttribute="trailing" secondItem="MN6-Uw-a48" secondAttribute="trailing" constant="20" id="T0D-RX-rxR"/>
+                            <constraint firstItem="e50-92-l7G" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="VdD-wU-Vy9"/>
+                            <constraint firstItem="w2o-g6-GSv" firstAttribute="trailing" secondItem="9Vf-hG-a8X" secondAttribute="trailing" constant="4" id="avb-uH-j8z"/>
+                            <constraint firstItem="BRD-1O-pzh" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="c08-rF-2su"/>
+                            <constraint firstItem="cfj-uN-qHa" firstAttribute="trailing" secondItem="r7U-VH-8wC" secondAttribute="trailing" constant="20" id="gOS-oo-ZSy"/>
+                            <constraint firstItem="e50-92-l7G" firstAttribute="top" secondItem="r7U-VH-8wC" secondAttribute="bottom" constant="20" id="ivN-y3-fAz"/>
+                            <constraint firstItem="w2o-g6-GSv" firstAttribute="top" secondItem="e50-92-l7G" secondAttribute="bottom" constant="4" id="xnF-e1-LwG"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="i8W-fj-OLz"/>
+                    <connections>
+                        <outlet property="detailsButton" destination="oa5-69-XBu" id="tx2-Sn-0dP"/>
+                        <outlet property="nameError" destination="nkY-wQ-Zgj" id="01j-he-tFD"/>
+                        <outlet property="nameInput" destination="r7U-VH-8wC" id="DUN-id-71w"/>
+                        <outlet property="nameLabel" destination="BRD-1O-pzh" id="7xi-ZG-mfx"/>
+                        <outlet property="numberError" destination="9Vf-hG-a8X" id="ZUn-Be-ROg"/>
+                        <outlet property="numberInput" destination="w2o-g6-GSv" id="Z2J-h6-QOf"/>
+                        <outlet property="numberLabel" destination="e50-92-l7G" id="en5-Kb-jSu"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="HKD-7I-kf8" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2648" y="1807"/>
+        </scene>
+        <!--Architecture Details View Controller-->
+        <scene sceneID="e0z-fU-zDf">
+            <objects>
+                <viewController storyboardIdentifier="ArchitectureDetails" id="IaZ-HT-93C" customClass="ArchitectureDetailsViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="PHY-me-ogV">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jo1-3B-4UO">
+                                <rect key="frame" x="20" y="68" width="45" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P3V-58-1Kg">
+                                <rect key="frame" x="20" y="108.5" width="61.5" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yci-wv-53q">
+                                <rect key="frame" x="20" y="149" width="374" height="30"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="h7K-k3-Lq1">
+                                        <rect key="frame" x="0.0" y="0.0" width="374" height="30"/>
+                                        <state key="normal" title="Inverse Input"/>
+                                        <connections>
+                                            <action selector="onInversePressedWithSender:" destination="IaZ-HT-93C" eventType="touchUpInside" id="KpB-n8-blm"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                            </stackView>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tTy-iI-GY4">
+                                <rect key="frame" x="380" y="58" width="24" height="24"/>
+                                <state key="normal" image="close_icon"/>
+                                <connections>
+                                    <action selector="onCloseButtonPressedWithSender:" destination="IaZ-HT-93C" eventType="touchUpInside" id="Ob6-7f-nJz"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="FAp-h6-6JX"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="Yci-wv-53q" firstAttribute="top" secondItem="P3V-58-1Kg" secondAttribute="bottom" constant="20" id="4Wj-XK-4lK"/>
+                            <constraint firstItem="Yci-wv-53q" firstAttribute="leading" secondItem="PHY-me-ogV" secondAttribute="leading" constant="20" id="Hhy-2f-bEP"/>
+                            <constraint firstItem="tTy-iI-GY4" firstAttribute="top" secondItem="FAp-h6-6JX" secondAttribute="top" constant="10" id="Nma-cc-mmy"/>
+                            <constraint firstItem="Jo1-3B-4UO" firstAttribute="top" secondItem="FAp-h6-6JX" secondAttribute="top" constant="20" id="h5e-Z5-ZJG"/>
+                            <constraint firstItem="FAp-h6-6JX" firstAttribute="trailing" secondItem="Yci-wv-53q" secondAttribute="trailing" constant="20" id="j8D-he-zWs"/>
+                            <constraint firstItem="P3V-58-1Kg" firstAttribute="top" secondItem="Jo1-3B-4UO" secondAttribute="bottom" constant="20" id="lVw-ru-QeN"/>
+                            <constraint firstItem="P3V-58-1Kg" firstAttribute="leading" secondItem="FAp-h6-6JX" secondAttribute="leading" constant="20" id="swA-AQ-pJ8"/>
+                            <constraint firstItem="Jo1-3B-4UO" firstAttribute="leading" secondItem="FAp-h6-6JX" secondAttribute="leading" constant="20" id="w4u-u2-Opd"/>
+                            <constraint firstItem="FAp-h6-6JX" firstAttribute="trailing" secondItem="tTy-iI-GY4" secondAttribute="trailing" constant="10" id="xjF-rW-0zn"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="closeButton" destination="tTy-iI-GY4" id="7MU-H7-1jg"/>
+                        <outlet property="inverseButton" destination="h7K-k3-Lq1" id="9a1-fJ-EB2"/>
+                        <outlet property="nameLabel" destination="Jo1-3B-4UO" id="DU2-Ya-sSS"/>
+                        <outlet property="numberLabel" destination="P3V-58-1Kg" id="Fjz-is-4CD"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="185-UF-jAH" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3403" y="1807"/>
+        </scene>
+        <!--Location View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="LocationViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="characterWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N09-wk-m9R">
+                                <rect key="frame" x="40" y="419" width="334" height="0.0"/>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="N09-wk-m9R" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="AqD-Pg-RgE"/>
+                            <constraint firstItem="N09-wk-m9R" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="20" id="cOF-po-VVP"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="N09-wk-m9R" secondAttribute="trailing" constant="20" id="r8O-Jm-dEs"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="qiK-1i-3iO"/>
+                    <connections>
+                        <outlet property="label" destination="N09-wk-m9R" id="GgY-Zv-9MA"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2648" y="1073"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="wzc-80-TVF">
+            <objects>
+                <navigationController id="czt-vE-Q3c" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="JFR-fW-QFO">
+                        <rect key="frame" x="0.0" y="48" width="414" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="h5f-Hj-KON" kind="relationship" relationship="rootViewController" id="XVr-rN-47X"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="GFy-QJ-qwR" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-81" y="329"/>
+        </scene>
+        <!--Example View Controller-->
+        <scene sceneID="K8T-3r-eHt">
+            <objects>
+                <viewController id="h5f-Hj-KON" customClass="ExampleViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="dAg-Yn-hmm">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U2z-d2-7eZ">
+                                <rect key="frame" x="0.0" y="92" width="414" height="690"/>
+                                <color key="backgroundColor" systemColor="systemGray4Color"/>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AHr-fV-53e">
+                                <rect key="frame" x="0.0" y="782" width="414" height="80"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            </view>
+                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="NBH-Hd-b8k">
+                                <rect key="frame" x="0.0" y="782" width="414" height="80"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="80" id="rio-Sy-Vag"/>
+                                </constraints>
+                            </stackView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="7lJ-cj-k76"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="trailing" secondItem="AHr-fV-53e" secondAttribute="trailing" id="2AV-c7-Fko"/>
+                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="bottom" secondItem="AHr-fV-53e" secondAttribute="bottom" id="3Cs-qo-Ydl"/>
+                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="top" secondItem="U2z-d2-7eZ" secondAttribute="bottom" id="3Ip-Rr-F57"/>
+                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="leading" secondItem="AHr-fV-53e" secondAttribute="leading" id="8pm-ZN-qul"/>
+                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="leading" secondItem="7lJ-cj-k76" secondAttribute="leading" id="A6r-CW-MlH"/>
+                            <constraint firstItem="U2z-d2-7eZ" firstAttribute="top" secondItem="7lJ-cj-k76" secondAttribute="top" id="CD3-Zg-ht7"/>
+                            <constraint firstItem="U2z-d2-7eZ" firstAttribute="leading" secondItem="7lJ-cj-k76" secondAttribute="leading" id="DZg-rb-Arf"/>
+                            <constraint firstItem="7lJ-cj-k76" firstAttribute="trailing" secondItem="U2z-d2-7eZ" secondAttribute="trailing" id="Ee1-Mk-W0l"/>
+                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="top" secondItem="AHr-fV-53e" secondAttribute="top" id="SzZ-lL-luI"/>
+                            <constraint firstItem="7lJ-cj-k76" firstAttribute="bottom" secondItem="NBH-Hd-b8k" secondAttribute="bottom" id="gPZ-kh-FBZ"/>
+                            <constraint firstItem="7lJ-cj-k76" firstAttribute="trailing" secondItem="NBH-Hd-b8k" secondAttribute="trailing" id="o49-Qe-2g2"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="Jxb-jF-VSQ"/>
+                    <connections>
+                        <outlet property="bottomView" destination="NBH-Hd-b8k" id="uz5-Kb-6EH"/>
+                        <outlet property="containerView" destination="U2z-d2-7eZ" id="QNy-Dw-Yjm"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="J3n-co-QAY" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="815.94202898550736" y="328.79464285714283"/>
+        </scene>
+        <!--Features List View Controller-->
+        <scene sceneID="C1a-KP-3Bk">
+            <objects>
+                <tableViewController storyboardIdentifier="FeaturesList" id="D99-ng-6V8" customClass="FeaturesListViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="KZQ-Mr-INa">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="FeaturesListCell" id="C4Y-IC-Pu4" customClass="FeaturesListCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="C4Y-IC-Pu4" id="XEB-aa-Byo">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xh8-DK-zfM">
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstAttribute="trailingMargin" secondItem="Xh8-DK-zfM" secondAttribute="trailing" constant="20" id="aBe-qb-sMa"/>
+                                        <constraint firstAttribute="bottomMargin" secondItem="Xh8-DK-zfM" secondAttribute="bottom" constant="4" id="iSp-u1-YS4"/>
+                                        <constraint firstItem="Xh8-DK-zfM" firstAttribute="top" secondItem="XEB-aa-Byo" secondAttribute="topMargin" constant="4" id="po9-6M-fbu"/>
+                                        <constraint firstItem="Xh8-DK-zfM" firstAttribute="leading" secondItem="XEB-aa-Byo" secondAttribute="leadingMargin" constant="20" id="uqr-hN-rru"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="label" destination="Xh8-DK-zfM" id="aeY-0C-asT"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="D99-ng-6V8" id="v7o-jT-FXS"/>
+                            <outlet property="delegate" destination="D99-ng-6V8" id="7Ag-aq-nNQ"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="q2T-p0-bqB"/>
+                    <connections>
+                        <outlet property="view" destination="KZQ-Mr-INa" id="yKY-xs-5Bk"/>
+                        <segue destination="itP-bh-ePK" kind="show" identifier="showHUD" id="R5i-w6-hej"/>
+                        <segue destination="jUB-i9-u9F" kind="show" identifier="showAlerts" id="2vi-ed-ywq"/>
+                        <segue destination="irm-WF-A13" kind="show" identifier="showArchitecture" id="IOQ-4E-QhL"/>
+                        <segue destination="BYZ-38-t0r" kind="show" identifier="showLocation" id="25d-lm-Tpv"/>
+                        <segue destination="Hbw-co-mWZ" kind="show" identifier="showPermissions" id="gxu-od-TLe"/>
+                        <segue destination="7Rf-m0-GFx" kind="show" identifier="showKeyboard" id="IO5-8e-Q9F"/>
+                        <segue destination="Y7p-ku-8gX" kind="show" identifier="showDateTimePicker" id="wT7-jZ-xqh"/>
+                        <segue destination="VPE-Hp-Qc9" kind="show" identifier="showLinks" id="KlM-G9-P6y"/>
+                        <segue destination="NRf-rC-nl1" kind="show" identifier="showSystem" id="IT2-HT-9Hz"/>
+                        <segue destination="SGP-dn-hxw" kind="show" identifier="showBluetooth" id="Z5V-Lj-mdM"/>
+                        <segue destination="2CB-DJ-Qmw" kind="show" identifier="showBeacons" id="jYU-Fd-PgO"/>
+                        <segue destination="Tyz-Gd-0uw" kind="show" identifier="showResources" id="R7Z-R6-fGx"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="L6W-Hz-iOT" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1717" y="329"/>
+        </scene>
+        <!--Bluetooth View Controller-->
+        <scene sceneID="YuN-Fr-cmH">
+            <objects>
+                <collectionViewController id="SGP-dn-hxw" customClass="BluetoothViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="JhO-3I-v9f">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="eaf-4s-drW">
+                            <size key="itemSize" width="414" height="128"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
+                        </collectionViewFlowLayout>
+                        <cells>
+                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="BluetoothCell" id="Btz-mm-dF6" customClass="BluetoothCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="128"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="9P2-7R-gXH">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="128"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="mKE-ZX-4Qh">
+                                            <rect key="frame" x="8" y="8" width="398" height="112"/>
+                                            <subviews>
+                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="JAn-Zv-Ydc">
+                                                    <rect key="frame" x="0.0" y="0.0" width="398" height="41"/>
+                                                    <subviews>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="6jP-rv-jLh">
+                                                            <rect key="frame" x="0.0" y="0.0" width="247" height="41"/>
+                                                            <subviews>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Device Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4w3-p3-jhK">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="247" height="20.5"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <stackView opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="fhu-oD-dwi">
+                                                                    <rect key="frame" x="0.0" y="20.5" width="247" height="20.5"/>
+                                                                    <subviews>
+                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identifier" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2nS-D3-DwQ">
+                                                                            <rect key="frame" x="0.0" y="0.0" width="82.5" height="20.5"/>
+                                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                            <nil key="textColor"/>
+                                                                            <nil key="highlightedColor"/>
+                                                                        </label>
+                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rssi" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jZZ-Fe-8Dw">
+                                                                            <rect key="frame" x="82.5" y="0.0" width="82" height="20.5"/>
+                                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                            <nil key="textColor"/>
+                                                                            <nil key="highlightedColor"/>
+                                                                        </label>
+                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="txPower" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Ut-IF-FqT">
+                                                                            <rect key="frame" x="164.5" y="0.0" width="82.5" height="20.5"/>
+                                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                            <nil key="textColor"/>
+                                                                            <nil key="highlightedColor"/>
+                                                                        </label>
+                                                                    </subviews>
+                                                                </stackView>
+                                                            </subviews>
+                                                        </stackView>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="ug1-K0-1qO">
+                                                            <rect key="frame" x="251" y="0.0" width="147" height="41"/>
+                                                            <subviews>
+                                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="500" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WYm-Sz-7Ii">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="59" height="41"/>
+                                                                    <state key="normal" title="Connect"/>
+                                                                    <connections>
+                                                                        <action selector="onConnectPressed" destination="Btz-mm-dF6" eventType="touchUpInside" id="aLB-aQ-hq1"/>
+                                                                    </connections>
+                                                                </button>
+                                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="500" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9dt-Wh-qHU">
+                                                                    <rect key="frame" x="69" y="0.0" width="78" height="41"/>
+                                                                    <state key="normal" title="Disconnect"/>
+                                                                    <connections>
+                                                                        <action selector="onDisonnectPressed" destination="Btz-mm-dF6" eventType="touchUpInside" id="1HB-7H-csY"/>
+                                                                    </connections>
+                                                                </button>
+                                                            </subviews>
+                                                        </stackView>
+                                                    </subviews>
+                                                </stackView>
+                                                <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ConnectionState" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RHb-me-DDx">
+                                                    <rect key="frame" x="0.0" y="43" width="398" height="69"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1zQ-0P-HX1">
+                                                    <rect key="frame" x="0.0" y="112" width="398" height="8"/>
+                                                    <subviews>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Y82-qz-1LQ">
+                                                            <rect key="frame" x="4" y="4" width="390" height="0.0"/>
+                                                            <subviews>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ServiceId" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JK4-ty-HJe">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="0.0"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ServiceData" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gq3-zy-DEg">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="0.0"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ManufacturerId" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WY8-so-mWs">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="0.0"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ManufacturerData" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="frJ-5F-9EQ">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="0.0"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LPu-vD-hFZ">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="0.0"/>
+                                                                    <subviews>
+                                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jga-xg-Tr2">
+                                                                            <rect key="frame" x="0.0" y="0.0" width="354" height="0.0"/>
+                                                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                        </view>
+                                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O4h-41-h1Y">
+                                                                            <rect key="frame" x="354" y="0.0" width="36" height="0.0"/>
+                                                                            <state key="normal" title="More"/>
+                                                                            <connections>
+                                                                                <action selector="onMorePressed" destination="Btz-mm-dF6" eventType="touchUpInside" id="6db-qV-xSy"/>
+                                                                            </connections>
+                                                                        </button>
+                                                                    </subviews>
+                                                                </stackView>
+                                                            </subviews>
+                                                        </stackView>
+                                                    </subviews>
+                                                    <color key="backgroundColor" name="darker_color"/>
+                                                    <constraints>
+                                                        <constraint firstItem="Y82-qz-1LQ" firstAttribute="leading" secondItem="1zQ-0P-HX1" secondAttribute="leading" constant="4" id="R7v-3h-bbc"/>
+                                                        <constraint firstItem="Y82-qz-1LQ" firstAttribute="top" secondItem="1zQ-0P-HX1" secondAttribute="top" constant="4" id="ctz-es-Z0u"/>
+                                                        <constraint firstAttribute="trailing" secondItem="Y82-qz-1LQ" secondAttribute="trailing" constant="4" id="oSP-b7-5iA"/>
+                                                        <constraint firstAttribute="bottom" secondItem="Y82-qz-1LQ" secondAttribute="bottom" constant="4" id="tc7-dR-4fM"/>
+                                                    </constraints>
+                                                </view>
+                                            </subviews>
+                                        </stackView>
+                                    </subviews>
+                                    <color key="backgroundColor" name="darker_color"/>
+                                    <constraints>
+                                        <constraint firstItem="mKE-ZX-4Qh" firstAttribute="top" secondItem="9P2-7R-gXH" secondAttribute="top" constant="8" id="BYr-OP-WwL"/>
+                                        <constraint firstAttribute="trailing" secondItem="mKE-ZX-4Qh" secondAttribute="trailing" constant="8" id="PyJ-0o-ggY"/>
+                                        <constraint firstItem="mKE-ZX-4Qh" firstAttribute="leading" secondItem="9P2-7R-gXH" secondAttribute="leading" constant="8" id="bbn-ea-3CQ"/>
+                                        <constraint firstAttribute="bottom" secondItem="mKE-ZX-4Qh" secondAttribute="bottom" constant="8" id="k1R-Q5-4gy"/>
+                                    </constraints>
+                                </collectionViewCellContentView>
+                                <connections>
+                                    <outlet property="buttonContainer" destination="ug1-K0-1qO" id="b5d-Di-QnR"/>
+                                    <outlet property="connectButton" destination="WYm-Sz-7Ii" id="2rb-zR-p9w"/>
+                                    <outlet property="connectionStatus" destination="RHb-me-DDx" id="mbq-bb-hnu"/>
+                                    <outlet property="deviceIdentifier" destination="2nS-D3-DwQ" id="DeX-rU-rdq"/>
+                                    <outlet property="deviceName" destination="4w3-p3-jhK" id="LS0-vZ-fL1"/>
+                                    <outlet property="disconnectButton" destination="9dt-Wh-qHU" id="Q7y-NI-TbH"/>
+                                    <outlet property="foldOutMenu" destination="1zQ-0P-HX1" id="1dQ-AQ-yf5"/>
+                                    <outlet property="manufacturerData" destination="frJ-5F-9EQ" id="GRg-6L-oLy"/>
+                                    <outlet property="manufacturerId" destination="WY8-so-mWs" id="JSQ-fp-x9h"/>
+                                    <outlet property="moreButton" destination="O4h-41-h1Y" id="6tI-Vk-k1l"/>
+                                    <outlet property="moreButtonContainer" destination="LPu-vD-hFZ" id="JJx-wb-Kay"/>
+                                    <outlet property="rssi" destination="jZZ-Fe-8Dw" id="0jG-X3-eoZ"/>
+                                    <outlet property="serviceData" destination="Gq3-zy-DEg" id="DfL-Wk-w7S"/>
+                                    <outlet property="serviceId" destination="JK4-ty-HJe" id="xfx-As-jXx"/>
+                                    <outlet property="txPower" destination="3Ut-IF-FqT" id="ZF7-FJ-nYJ"/>
+                                </connections>
+                            </collectionViewCell>
+                        </cells>
+                        <connections>
+                            <outlet property="delegate" destination="SGP-dn-hxw" id="rYK-VL-jrX"/>
+                        </connections>
+                    </collectionView>
+                    <navigationItem key="navigationItem" id="Uqc-wm-akd"/>
+                </collectionViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="hgA-22-RJe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2648" y="2486"/>
+        </scene>
+        <!--Bluetooth Device Details View Controller-->
+        <scene sceneID="2dN-Ki-Y9V">
+            <objects>
+                <viewController storyboardIdentifier="BluetoothDeviceDetails" id="PHA-hf-85f" customClass="BluetoothDeviceDetailsViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="CtD-yu-wAr">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Device Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YXb-k7-PXE">
+                                <rect key="frame" x="8" y="56" width="398" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="dza-4j-F1E">
+                                <rect key="frame" x="8" y="80.5" width="398" height="20.5"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identifier" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ici-zY-xCM">
+                                        <rect key="frame" x="0.0" y="0.0" width="132.5" height="20.5"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rssi" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jx7-0m-oS3">
+                                        <rect key="frame" x="132.5" y="0.0" width="133" height="20.5"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Distance" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PRG-4D-Y4j">
+                                        <rect key="frame" x="265.5" y="0.0" width="132.5" height="20.5"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                            </stackView>
+                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connection Status" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lbW-oZ-Mzd">
+                                <rect key="frame" x="8" y="105" width="398" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Abi-Up-lZz">
+                                <rect key="frame" x="0.0" y="162" width="414" height="700"/>
+                                <color key="backgroundColor" name="darker_color"/>
+                                <inset key="scrollIndicatorInsets" minX="8" minY="0.0" maxX="8" maxY="0.0"/>
+                                <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Vbv-Oq-cPk">
+                                    <size key="itemSize" width="128" height="128"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells>
+                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="BluetoothServiceView" id="V8x-pa-U2S" customClass="BluetoothServiceView" customModule="Demo" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="0.0" width="189.5" height="89"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="HWZ-Jo-obc">
+                                            <rect key="frame" x="0.0" y="0.0" width="189.5" height="89"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="hon-CW-ofV">
+                                                    <rect key="frame" x="0.0" y="0.0" width="189.5" height="20.5"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="500" verticalHuggingPriority="251" text="Service" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MqO-3D-kWr">
+                                                            <rect key="frame" x="0.0" y="0.0" width="57" height="20.5"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="500" text="Service Identifier" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FIp-5m-E3e">
+                                                            <rect key="frame" x="61" y="0.0" width="128.5" height="20.5"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                </stackView>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Characteristics" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0fn-M7-8sy">
+                                                    <rect key="frame" x="0.0" y="24.5" width="189.5" height="20.5"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="vvU-BV-kwm">
+                                                    <rect key="frame" x="0.0" y="49" width="189.5" height="40"/>
+                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="40" id="XLJ-hO-nT9"/>
+                                                    </constraints>
+                                                    <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="sFG-0D-jDz">
+                                                        <size key="itemSize" width="128" height="128"/>
+                                                        <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                                        <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                                        <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                                    </collectionViewFlowLayout>
+                                                    <cells/>
+                                                    <connections>
+                                                        <outlet property="dataSource" destination="V8x-pa-U2S" id="oVo-va-ZPJ"/>
+                                                        <outlet property="delegate" destination="V8x-pa-U2S" id="7r9-pc-FpL"/>
+                                                    </connections>
+                                                </collectionView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="hon-CW-ofV" firstAttribute="top" secondItem="HWZ-Jo-obc" secondAttribute="top" id="3UV-aJ-H1j"/>
+                                                <constraint firstAttribute="trailing" secondItem="0fn-M7-8sy" secondAttribute="trailing" id="7Ao-3e-ETF"/>
+                                                <constraint firstItem="vvU-BV-kwm" firstAttribute="leading" secondItem="HWZ-Jo-obc" secondAttribute="leading" id="Fxp-my-xqq"/>
+                                                <constraint firstAttribute="trailing" secondItem="hon-CW-ofV" secondAttribute="trailing" id="LhN-Z0-41f"/>
+                                                <constraint firstAttribute="bottom" secondItem="vvU-BV-kwm" secondAttribute="bottom" id="M7t-pq-zlg"/>
+                                                <constraint firstItem="hon-CW-ofV" firstAttribute="leading" secondItem="HWZ-Jo-obc" secondAttribute="leading" id="f1c-OW-kJR"/>
+                                                <constraint firstItem="0fn-M7-8sy" firstAttribute="leading" secondItem="HWZ-Jo-obc" secondAttribute="leading" id="h9Z-tq-COb"/>
+                                                <constraint firstAttribute="trailing" secondItem="vvU-BV-kwm" secondAttribute="trailing" id="oSb-Sm-lkr"/>
+                                                <constraint firstItem="0fn-M7-8sy" firstAttribute="top" secondItem="hon-CW-ofV" secondAttribute="bottom" constant="4" id="rA0-nv-l72"/>
+                                                <constraint firstItem="vvU-BV-kwm" firstAttribute="top" secondItem="0fn-M7-8sy" secondAttribute="bottom" constant="4" id="zml-J1-sK5"/>
+                                            </constraints>
+                                        </collectionViewCellContentView>
+                                        <connections>
+                                            <outlet property="characteristicsHeader" destination="0fn-M7-8sy" id="uSf-BF-6Wl"/>
+                                            <outlet property="characteristicsList" destination="vvU-BV-kwm" id="tvV-4v-xhU"/>
+                                            <outlet property="characteristicsListHeight" destination="XLJ-hO-nT9" id="L7Y-mk-3Hw"/>
+                                            <outlet property="serviceHeader" destination="MqO-3D-kWr" id="vlE-2G-XCe"/>
+                                            <outlet property="serviceIdentifier" destination="FIp-5m-E3e" id="saI-mh-A7P"/>
+                                        </connections>
+                                    </collectionViewCell>
+                                </cells>
+                                <connections>
+                                    <outlet property="dataSource" destination="PHA-hf-85f" id="0wv-kP-CHO"/>
+                                    <outlet property="delegate" destination="PHA-hf-85f" id="Gyt-Wd-g7b"/>
+                                </connections>
+                            </collectionView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Services" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Gg-R4-tnz">
+                                <rect key="frame" x="8" y="137.5" width="414" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="0fz-zg-6Df"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="0fz-zg-6Df" firstAttribute="trailing" secondItem="YXb-k7-PXE" secondAttribute="trailing" constant="8" id="9Gy-fU-v63"/>
+                            <constraint firstItem="0fz-zg-6Df" firstAttribute="trailing" secondItem="lbW-oZ-Mzd" secondAttribute="trailing" constant="8" id="BOx-Zh-DEA"/>
+                            <constraint firstItem="YXb-k7-PXE" firstAttribute="top" secondItem="0fz-zg-6Df" secondAttribute="top" constant="8" id="FrS-Cd-JdZ"/>
+                            <constraint firstItem="0fz-zg-6Df" firstAttribute="trailing" secondItem="dza-4j-F1E" secondAttribute="trailing" constant="8" id="MTC-95-lD2"/>
+                            <constraint firstItem="dza-4j-F1E" firstAttribute="top" secondItem="YXb-k7-PXE" secondAttribute="bottom" constant="4" id="MeH-2c-CEZ"/>
+                            <constraint firstItem="Abi-Up-lZz" firstAttribute="leading" secondItem="0fz-zg-6Df" secondAttribute="leading" id="VL6-vS-zc0"/>
+                            <constraint firstItem="6Gg-R4-tnz" firstAttribute="top" secondItem="lbW-oZ-Mzd" secondAttribute="bottom" constant="12" id="ZbM-pW-5mD"/>
+                            <constraint firstItem="lbW-oZ-Mzd" firstAttribute="top" secondItem="dza-4j-F1E" secondAttribute="bottom" constant="4" id="ZdQ-kL-voF"/>
+                            <constraint firstItem="Abi-Up-lZz" firstAttribute="top" secondItem="6Gg-R4-tnz" secondAttribute="bottom" constant="4" id="aBr-TP-gTJ"/>
+                            <constraint firstItem="0fz-zg-6Df" firstAttribute="trailing" secondItem="Abi-Up-lZz" secondAttribute="trailing" id="dIc-uK-7KP"/>
+                            <constraint firstItem="lbW-oZ-Mzd" firstAttribute="leading" secondItem="0fz-zg-6Df" secondAttribute="leading" constant="8" id="dZT-DD-V6o"/>
+                            <constraint firstItem="dza-4j-F1E" firstAttribute="leading" secondItem="0fz-zg-6Df" secondAttribute="leading" constant="8" id="dm1-Hc-nJX"/>
+                            <constraint firstItem="6Gg-R4-tnz" firstAttribute="leading" secondItem="0fz-zg-6Df" secondAttribute="leading" constant="8" id="f8G-HY-mut"/>
+                            <constraint firstItem="0fz-zg-6Df" firstAttribute="bottom" secondItem="Abi-Up-lZz" secondAttribute="bottom" id="fbq-TB-En1"/>
+                            <constraint firstItem="YXb-k7-PXE" firstAttribute="leading" secondItem="0fz-zg-6Df" secondAttribute="leading" constant="8" id="r94-o4-F0p"/>
+                            <constraint firstItem="6Gg-R4-tnz" firstAttribute="trailing" secondItem="0fz-zg-6Df" secondAttribute="trailing" constant="8" id="wWF-Iv-9vU"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="connectionStatus" destination="lbW-oZ-Mzd" id="YSW-xU-hrI"/>
+                        <outlet property="deviceIdentifier" destination="Ici-zY-xCM" id="yD7-CF-wzY"/>
+                        <outlet property="deviceName" destination="YXb-k7-PXE" id="Cnm-Sn-xDR"/>
+                        <outlet property="distance" destination="PRG-4D-Y4j" id="XZU-A7-qxT"/>
+                        <outlet property="rssi" destination="jx7-0m-oS3" id="yq8-bD-Te9"/>
+                        <outlet property="servicesHeader" destination="6Gg-R4-tnz" id="PSw-gb-Vve"/>
+                        <outlet property="servicesList" destination="Abi-Up-lZz" id="ZfO-Wo-xuu"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="xwz-q1-GIQ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3403" y="2486"/>
+        </scene>
+        <!--Label View Controller-->
+        <scene sceneID="bmc-9W-Iht">
+            <objects>
+                <tableViewController id="Shd-b8-Oui" customClass="LabelViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="R3B-CF-3Y8">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="LabelListCell" id="JIc-i0-Jji" customClass="LabelListCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="50" width="414" height="37"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JIc-i0-Jji" id="Rce-Xc-u3F">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="37"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xqs-cD-B99">
+                                            <rect key="frame" x="20" y="8" width="374" height="21"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="xqs-cD-B99" firstAttribute="leading" secondItem="Rce-Xc-u3F" secondAttribute="leading" constant="20" id="B4E-c5-AtU"/>
+                                        <constraint firstAttribute="trailing" secondItem="xqs-cD-B99" secondAttribute="trailing" constant="20" id="HlY-Sd-IFs"/>
+                                        <constraint firstAttribute="bottom" secondItem="xqs-cD-B99" secondAttribute="bottom" constant="8" id="NcL-3q-hNl"/>
+                                        <constraint firstItem="xqs-cD-B99" firstAttribute="top" secondItem="Rce-Xc-u3F" secondAttribute="top" constant="8" id="hxM-IA-3Ql"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="label" destination="xqs-cD-B99" id="4Ab-vH-ItF"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="Shd-b8-Oui" id="FFi-zf-6J6"/>
+                            <outlet property="delegate" destination="Shd-b8-Oui" id="VJI-s0-Zg9"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="q9P-js-Ijt"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="6uc-Jn-oeo" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4462" y="2747"/>
+        </scene>
+        <!--Links View Controller-->
+        <scene sceneID="Qqy-hz-yQA">
+            <objects>
+                <viewController storyboardIdentifier="LinksViewController" id="VPE-Hp-Qc9" customClass="LinksViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="YWQ-0s-goi">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="V8f-1a-s94">
+                                <rect key="frame" x="10" y="404" width="394" height="30"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="G5P-AD-UrB">
+                                        <rect key="frame" x="0.0" y="0.0" width="394" height="30"/>
+                                        <connections>
+                                            <action selector="onBrowserButtonTapped:" destination="VPE-Hp-Qc9" eventType="touchUpInside" id="Med-ch-oEe"/>
+                                        </connections>
+                                    </button>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="10" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xjl-nH-qoV" userLabel="Instructions Label">
+                                        <rect key="frame" x="0.0" y="30" width="394" height="0.0"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                            </stackView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="J3P-Or-mB9"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="V8f-1a-s94" firstAttribute="centerX" secondItem="YWQ-0s-goi" secondAttribute="centerX" id="IcK-eJ-dfV"/>
+                            <constraint firstItem="J3P-Or-mB9" firstAttribute="trailing" secondItem="V8f-1a-s94" secondAttribute="trailing" constant="10" id="Mq7-W5-kMR"/>
+                            <constraint firstItem="V8f-1a-s94" firstAttribute="centerY" secondItem="YWQ-0s-goi" secondAttribute="centerY" id="WJC-yB-hcu"/>
+                            <constraint firstItem="V8f-1a-s94" firstAttribute="leading" secondItem="YWQ-0s-goi" secondAttribute="leading" constant="10" id="r9n-ph-Yss"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="xI5-GB-Ch6"/>
+                    <connections>
+                        <outlet property="browserButton" destination="G5P-AD-UrB" id="mSr-hd-xem"/>
+                        <outlet property="instructionsText" destination="Xjl-nH-qoV" id="JWi-JW-NJe"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="uPu-Qa-nUe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2634.7826086956525" y="-1770.5357142857142"/>
+        </scene>
+        <!--Keyboard Manager View Controller-->
+        <scene sceneID="i03-J0-4z5">
+            <objects>
+                <viewController id="7Rf-m0-GFx" customClass="KeyboardManagerViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="ujg-Ft-aqv">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KiQ-CF-pig">
+                                <rect key="frame" x="10" y="58" width="394" height="34"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="5KH-x9-S2x">
+                                <rect key="frame" x="10" y="102" width="394" height="30"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kY6-Kz-VM4">
+                                        <rect key="frame" x="0.0" y="0.0" width="197" height="30"/>
+                                        <state key="normal" title="Show Keyboard"/>
+                                        <connections>
+                                            <action selector="showButtonPressed" destination="7Rf-m0-GFx" eventType="touchUpInside" id="pKw-9x-kxU"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LHk-eR-LxZ">
+                                        <rect key="frame" x="197" y="0.0" width="197" height="30"/>
+                                        <state key="normal" title="Hide Keyboard"/>
+                                        <connections>
+                                            <action selector="hideButtonPressed" destination="7Rf-m0-GFx" eventType="touchUpInside" id="8qL-Di-xGc"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                            </stackView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="2a8-e0-vMR"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="2a8-e0-vMR" firstAttribute="trailing" secondItem="KiQ-CF-pig" secondAttribute="trailing" constant="10" id="0Ub-V5-Zsq"/>
+                            <constraint firstItem="KiQ-CF-pig" firstAttribute="leading" secondItem="2a8-e0-vMR" secondAttribute="leading" constant="10" id="5oQ-La-oA9"/>
+                            <constraint firstItem="5KH-x9-S2x" firstAttribute="trailing" secondItem="KiQ-CF-pig" secondAttribute="trailing" id="PUx-Tj-I19"/>
+                            <constraint firstItem="KiQ-CF-pig" firstAttribute="top" secondItem="2a8-e0-vMR" secondAttribute="top" constant="10" id="YqD-JK-hRK"/>
+                            <constraint firstItem="5KH-x9-S2x" firstAttribute="leading" secondItem="KiQ-CF-pig" secondAttribute="leading" id="biC-Co-NJa"/>
+                            <constraint firstItem="5KH-x9-S2x" firstAttribute="top" secondItem="KiQ-CF-pig" secondAttribute="bottom" constant="10" id="mIW-2P-VzJ"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="3vu-M7-Qu6"/>
+                    <connections>
+                        <outlet property="editField" destination="KiQ-CF-pig" id="t55-zo-eh8"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="4mF-Fn-ESe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2648" y="-1061"/>
+        </scene>
+        <!--Network-->
+        <scene sceneID="5O2-sw-jzu">
+            <objects>
+                <viewController title="Network" id="WNj-93-WjR" customClass="NetworkViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="dJb-b3-IqA">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XWW-83-edx">
+                                <rect key="frame" x="186" y="408.5" width="42" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="RDe-bx-yeP"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="XWW-83-edx" firstAttribute="centerX" secondItem="dJb-b3-IqA" secondAttribute="centerX" id="HSW-fU-9mQ"/>
+                            <constraint firstItem="XWW-83-edx" firstAttribute="centerY" secondItem="dJb-b3-IqA" secondAttribute="centerY" id="KfT-vh-oVi"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="KhO-Dq-z9i"/>
+                    <connections>
+                        <outlet property="networkStateText" destination="XWW-83-edx" id="CMr-SQ-r6c"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="xfC-yj-Rlg" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-829" y="-1286"/>
+        </scene>
+        <!--Network-->
+        <scene sceneID="Pxm-EF-uH3">
+            <objects>
+                <tableViewController title="Network" id="NRf-rC-nl1" customClass="SystemViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="aKd-o4-TYG">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SystemListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SystemListCell" id="a8b-dW-eKx" customClass="SystemListCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="a8b-dW-eKx" id="pjk-M2-4TV">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pnV-0z-POK">
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="pnV-0z-POK" firstAttribute="top" secondItem="pjk-M2-4TV" secondAttribute="topMargin" constant="4" id="8Vv-ED-tiH"/>
+                                        <constraint firstItem="pnV-0z-POK" firstAttribute="leading" secondItem="pjk-M2-4TV" secondAttribute="leadingMargin" constant="20" id="M8m-C1-T9f"/>
+                                        <constraint firstAttribute="bottomMargin" secondItem="pnV-0z-POK" secondAttribute="bottom" constant="4" id="tmx-vw-K26"/>
+                                        <constraint firstAttribute="trailingMargin" secondItem="pnV-0z-POK" secondAttribute="trailing" constant="20" id="zKM-Xm-22W"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="label" destination="pnV-0z-POK" id="P2Q-ur-K1W"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="NRf-rC-nl1" id="VjM-G7-bgB"/>
+                            <outlet property="delegate" destination="NRf-rC-nl1" id="NUe-AM-Xnn"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="vhK-Ur-2uE"/>
+                    <connections>
+                        <segue destination="WNj-93-WjR" kind="show" identifier="showNetwork" id="KPT-8X-U8y"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="vve-kp-l1w" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="713" y="-749"/>
+        </scene>
+        <!--Loading View Controller-->
+        <scene sceneID="vaO-15-Tqm">
+            <objects>
+                <tableViewController id="itP-bh-ePK" customClass="LoadingViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="EuU-N3-PUa">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <sections>
+                            <tableViewSection id="W1h-wG-Nuf">
+                                <cells>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="S13-rV-ghL" style="IBUITableViewCellStyleDefault" id="Qu4-gg-O0s">
+                                        <rect key="frame" x="0.0" y="50" width="414" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Qu4-gg-O0s" id="UZM-pj-sFi">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Loading Indicator with System style" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="S13-rV-ghL">
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="e31-TG-wrI" style="IBUITableViewCellStyleDefault" id="BqC-fY-hox">
+                                        <rect key="frame" x="0.0" y="93.5" width="414" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="BqC-fY-hox" id="Gsq-hn-e0Y">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Loading Indicator with Custom style" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="e31-TG-wrI">
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                        </sections>
+                        <connections>
+                            <outlet property="dataSource" destination="itP-bh-ePK" id="zhT-5T-8wj"/>
+                            <outlet property="delegate" destination="itP-bh-ePK" id="a0l-MT-IeJ"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="85A-T5-LLl"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="3c6-iN-jO2" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2649" y="-374"/>
+        </scene>
+        <!--Alerts Table View Controller-->
+        <scene sceneID="3hP-eu-S2i">
+            <objects>
+                <tableViewController id="jUB-i9-u9F" userLabel="Alerts Table View Controller" customClass="AlertsViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Uge-kX-PIL">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <sections>
+                            <tableViewSection id="Y72-DQ-hcU">
+                                <cells>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="3My-t9-uzW" style="IBUITableViewCellStyleDefault" id="4Bx-bp-v5a">
+                                        <rect key="frame" x="0.0" y="50" width="414" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4Bx-bp-v5a" id="2hB-54-3WQ">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Alert" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3My-t9-uzW">
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="Mxj-wh-MJV" style="IBUITableViewCellStyleDefault" id="l1P-Xn-VLw">
+                                        <rect key="frame" x="0.0" y="93.5" width="414" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="l1P-Xn-VLw" id="XKI-8Y-HI7">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Dismissible Alert" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Mxj-wh-MJV">
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="iW9-HH-Oc0" style="IBUITableViewCellStyleDefault" id="lMI-O8-dAX">
+                                        <rect key="frame" x="0.0" y="137" width="414" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lMI-O8-dAX" id="jWN-Fu-MOI">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Action Sheet" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="iW9-HH-Oc0">
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="BJ7-BZ-r5z" style="IBUITableViewCellStyleDefault" id="uqQ-kk-sFM">
+                                        <rect key="frame" x="0.0" y="180.5" width="414" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="uqQ-kk-sFM" id="spw-IS-5wm">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Alert with input" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="BJ7-BZ-r5z">
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                        </sections>
+                        <connections>
+                            <outlet property="dataSource" destination="jUB-i9-u9F" id="STI-kf-YSP"/>
+                            <outlet property="delegate" destination="jUB-i9-u9F" id="GWD-7e-fKW"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="IKk-fx-Nxk"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="ftd-tZ-HFo" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2648" y="329"/>
+        </scene>
+        <!--Info View Controller-->
+        <scene sceneID="S3h-yX-G9s">
+            <objects>
+                <tableViewController storyboardIdentifier="InfoViewController" id="w3O-8R-hO7" customClass="InfoViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Ak4-pT-DLg">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="InfoButtonCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="InfoButtonCell" id="3eh-xF-TU3" customClass="InfoButtonCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="50" width="414" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3eh-xF-TU3" id="cyO-Cc-dq8">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odz-vr-fX0">
+                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="odz-vr-fX0" firstAttribute="leading" secondItem="cyO-Cc-dq8" secondAttribute="leadingMargin" constant="20" id="7tZ-tH-8X0"/>
+                                        <constraint firstItem="odz-vr-fX0" firstAttribute="bottom" secondItem="cyO-Cc-dq8" secondAttribute="bottomMargin" constant="4" id="PgZ-SM-8yB"/>
+                                        <constraint firstItem="odz-vr-fX0" firstAttribute="top" secondItem="cyO-Cc-dq8" secondAttribute="topMargin" constant="4" id="i4v-3w-WXa"/>
+                                        <constraint firstAttribute="trailingMargin" secondItem="odz-vr-fX0" secondAttribute="trailing" constant="20" id="pBz-5g-kJm"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="label" destination="odz-vr-fX0" id="wXy-TH-sMq"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="w3O-8R-hO7" id="anC-9o-teZ"/>
+                            <outlet property="delegate" destination="w3O-8R-hO7" id="GRh-F8-Q1e"/>
+                        </connections>
+                    </tableView>
+                    <connections>
+                        <outlet property="view" destination="Ak4-pT-DLg" id="IV0-1H-pHf"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="s7d-U9-qTn" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="816" y="1073"/>
+        </scene>
+        <!--Permission List View Controller-->
+        <scene sceneID="bkZ-ly-rzs">
+            <objects>
+                <tableViewController storyboardIdentifier="PermissionsList" id="Hbw-co-mWZ" customClass="PermissionListViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="XuT-9Z-KBW">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PermissionsListCell" id="FrV-FL-GKa" customClass="PermissionsListCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FrV-FL-GKa" id="wA3-QT-FyZ">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nXv-Uh-BJk">
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="nXv-Uh-BJk" firstAttribute="leading" secondItem="wA3-QT-FyZ" secondAttribute="leadingMargin" constant="20" id="ZRh-C2-hyR"/>
+                                        <constraint firstItem="nXv-Uh-BJk" firstAttribute="top" secondItem="wA3-QT-FyZ" secondAttribute="topMargin" constant="4" id="f8P-04-caI"/>
+                                        <constraint firstAttribute="bottomMargin" secondItem="nXv-Uh-BJk" secondAttribute="bottom" constant="4" id="i5f-E7-LgS"/>
+                                        <constraint firstAttribute="trailingMargin" secondItem="nXv-Uh-BJk" secondAttribute="trailing" constant="20" id="yHb-gs-gT9"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="label" destination="nXv-Uh-BJk" id="wY8-Mz-6eb"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="Hbw-co-mWZ" id="NCc-db-tJQ"/>
+                            <outlet property="delegate" destination="Hbw-co-mWZ" id="uKu-2m-FoD"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="W1l-9y-sLf"/>
+                    <connections>
+                        <outlet property="view" destination="XuT-9Z-KBW" id="XPt-ms-iT5"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="XZd-qQ-l9n" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2648" y="-1728"/>
+        </scene>
+        <!--Permission View Controller-->
+        <scene sceneID="dmW-bW-tYh">
+            <objects>
+                <viewController storyboardIdentifier="Permission" id="qdv-bV-gDr" customClass="PermissionViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="V5P-78-3CC">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HOP-JE-elV">
+                                <rect key="frame" x="10" y="58" width="394" height="0.0"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tTR-3l-N9W">
+                                <rect key="frame" x="10" y="68" width="394" height="30"/>
+                                <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="15"/>
+                                <connections>
+                                    <action selector="requestPermissionWithSender:" destination="qdv-bV-gDr" eventType="touchUpInside" id="onc-6q-neg"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="vLH-pV-cQc"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="tTR-3l-N9W" firstAttribute="leading" secondItem="vLH-pV-cQc" secondAttribute="leading" constant="10" id="9Ay-Un-yf0"/>
+                            <constraint firstItem="vLH-pV-cQc" firstAttribute="trailing" secondItem="HOP-JE-elV" secondAttribute="trailing" constant="10" id="QNv-5W-BvO"/>
+                            <constraint firstItem="HOP-JE-elV" firstAttribute="leading" secondItem="vLH-pV-cQc" secondAttribute="leading" constant="10" id="WrA-tJ-815"/>
+                            <constraint firstItem="HOP-JE-elV" firstAttribute="top" secondItem="vLH-pV-cQc" secondAttribute="top" constant="10" id="l6o-4q-bKb"/>
+                            <constraint firstItem="tTR-3l-N9W" firstAttribute="top" secondItem="HOP-JE-elV" secondAttribute="bottom" constant="10" id="rU8-kd-2nc"/>
+                            <constraint firstItem="vLH-pV-cQc" firstAttribute="trailing" secondItem="tTR-3l-N9W" secondAttribute="trailing" constant="10" id="xcA-jJ-Sk5"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="permissionStateLabel" destination="HOP-JE-elV" id="aVB-1E-YJq"/>
+                        <outlet property="requestPermissionButton" destination="tTR-3l-N9W" id="PtU-uw-aJs"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="uwl-Oz-vdN" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3362" y="-1728"/>
+        </scene>
+        <!--Date Time Picker View Controller-->
+        <scene sceneID="RxC-NZ-XHu">
+            <objects>
+                <viewController id="Y7p-ku-8gX" customClass="DateTimePickerViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="CUa-6I-u96">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zPh-dc-WSn">
+                                <rect key="frame" x="20" y="58" width="374" height="30"/>
+                                <state key="normal" title="Select Date"/>
+                                <connections>
+                                    <action selector="selectDatePressed" destination="Y7p-ku-8gX" eventType="touchUpInside" id="06a-Uw-Fml"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ipx-q1-8HF">
+                                <rect key="frame" x="20" y="98" width="374" height="30"/>
+                                <state key="normal" title="Select Time"/>
+                                <connections>
+                                    <action selector="selectTimePressed" destination="Y7p-ku-8gX" eventType="touchUpInside" id="FZd-8a-5zm"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3I5-FX-ntF">
+                                <rect key="frame" x="20" y="189" width="374" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Current Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E9l-oh-DX8">
+                                <rect key="frame" x="20" y="158" width="100" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="cDV-k0-OPn"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="ipx-q1-8HF" firstAttribute="top" secondItem="zPh-dc-WSn" secondAttribute="bottom" constant="10" id="2oT-Dy-dwW"/>
+                            <constraint firstItem="cDV-k0-OPn" firstAttribute="trailing" secondItem="3I5-FX-ntF" secondAttribute="trailing" constant="20" id="3e9-nB-t7B"/>
+                            <constraint firstItem="zPh-dc-WSn" firstAttribute="leading" secondItem="cDV-k0-OPn" secondAttribute="leading" constant="20" id="66r-ZV-Hee"/>
+                            <constraint firstItem="E9l-oh-DX8" firstAttribute="leading" secondItem="cDV-k0-OPn" secondAttribute="leading" constant="20" id="9XG-2a-eFa"/>
+                            <constraint firstItem="zPh-dc-WSn" firstAttribute="top" secondItem="cDV-k0-OPn" secondAttribute="top" constant="10" id="CPJ-2x-4Zs"/>
+                            <constraint firstItem="E9l-oh-DX8" firstAttribute="top" secondItem="ipx-q1-8HF" secondAttribute="bottom" constant="30" id="JmW-Ic-3rz"/>
+                            <constraint firstItem="3I5-FX-ntF" firstAttribute="leading" secondItem="cDV-k0-OPn" secondAttribute="leading" constant="20" id="Q8F-Ve-D70"/>
+                            <constraint firstItem="3I5-FX-ntF" firstAttribute="top" secondItem="E9l-oh-DX8" secondAttribute="bottom" constant="10" id="e3H-uo-eaR"/>
+                            <constraint firstItem="cDV-k0-OPn" firstAttribute="trailing" secondItem="zPh-dc-WSn" secondAttribute="trailing" constant="20" id="odP-op-1ao"/>
+                            <constraint firstItem="ipx-q1-8HF" firstAttribute="leading" secondItem="cDV-k0-OPn" secondAttribute="leading" constant="20" id="twC-pd-zFo"/>
+                            <constraint firstItem="cDV-k0-OPn" firstAttribute="trailing" secondItem="ipx-q1-8HF" secondAttribute="trailing" constant="20" id="xsT-MP-RZA"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="Rtv-vn-95K"/>
+                    <connections>
+                        <outlet property="timeLabel" destination="3I5-FX-ntF" id="zHr-vf-Ysz"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ljl-id-804" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2648" y="2496"/>
+        </scene>
+        <!--Resources List View Controller-->
+        <scene sceneID="O9e-U5-TLS">
+            <objects>
+                <tableViewController storyboardIdentifier="ResourcesList" id="Tyz-Gd-0uw" customClass="ResourcesListViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="W41-OS-Wnx">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ResourcesListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ResourcesListCell" id="YH6-gF-Pq3" customClass="ResourcesListCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="50" width="414" height="38"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YH6-gF-Pq3" id="yfs-Dl-hfq">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="38"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="app-pb-mRq">
+                                            <rect key="frame" x="20" y="8" width="374" height="22"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="app-pb-mRq" firstAttribute="top" secondItem="yfs-Dl-hfq" secondAttribute="top" constant="8" id="LnR-f7-O31"/>
+                                        <constraint firstAttribute="trailing" secondItem="app-pb-mRq" secondAttribute="trailing" constant="20" id="MiM-l1-I4A"/>
+                                        <constraint firstItem="app-pb-mRq" firstAttribute="leading" secondItem="yfs-Dl-hfq" secondAttribute="leading" constant="20" id="SzX-aQ-jKK"/>
+                                        <constraint firstAttribute="bottom" secondItem="app-pb-mRq" secondAttribute="bottom" constant="8" id="gBc-4u-Tj1"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="label" destination="app-pb-mRq" id="SiG-Hx-XBL"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="Tyz-Gd-0uw" id="kLQ-nW-cED"/>
+                            <outlet property="delegate" destination="Tyz-Gd-0uw" id="phS-P2-bIA"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="g8g-Bn-efY"/>
+                    <connections>
+                        <segue destination="Shd-b8-Oui" kind="show" identifier="showLabel" id="XT2-bS-grd"/>
+                        <segue destination="t7d-lb-B0c" kind="show" identifier="showColor" id="efK-Tc-RgZ"/>
+                        <segue destination="vjD-in-IYI" kind="show" identifier="showButton" id="84U-QK-aOU"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="bWE-wJ-Red" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3409" y="3254"/>
+        </scene>
+        <!--Color View Controller-->
+        <scene sceneID="mC8-7P-f3D">
+            <objects>
+                <viewController id="t7d-lb-B0c" customClass="ColorViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="UDI-If-ZYb">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vMk-kn-0fZ">
+                                <rect key="frame" x="20" y="68" width="111.5" height="111.5"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="vMk-kn-0fZ" secondAttribute="height" multiplier="1:1" id="MHD-88-nbW"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="drp-Ug-4oo">
+                                <rect key="frame" x="151.5" y="68" width="111" height="111.5"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="drp-Ug-4oo" secondAttribute="height" multiplier="1:1" id="kdG-a0-CXA"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nXI-Rr-7gO">
+                                <rect key="frame" x="282.5" y="68" width="111.5" height="111.5"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="nXI-Rr-7gO" secondAttribute="height" multiplier="1:1" id="le5-b8-tQ6"/>
+                                </constraints>
+                            </view>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xMH-zh-Psg">
+                                <rect key="frame" x="20" y="199.5" width="111.5" height="34"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <connections>
+                                    <outlet property="delegate" destination="t7d-lb-B0c" id="tOV-5T-yrH"/>
+                                </connections>
+                            </textField>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ZjD-RE-7YY">
+                                <rect key="frame" x="282.5" y="199.5" width="111.5" height="34"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <connections>
+                                    <outlet property="delegate" destination="t7d-lb-B0c" id="xTC-mc-ECV"/>
+                                </connections>
+                            </textField>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="esw-DK-l9R">
+                                <rect key="frame" x="151.5" y="199.5" width="111" height="34"/>
+                                <state key="normal" title="Button"/>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hhN-sG-MX1">
+                                <rect key="frame" x="151.5" y="243.5" width="111" height="34"/>
+                                <state key="normal" title="Button"/>
+                            </button>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Wfd-TO-mb6">
+                                <rect key="frame" x="20" y="327.5" width="374" height="40"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="Fds-Tv-XCK"/>
+                                </constraints>
+                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="mPR-wz-d03">
+                                    <size key="itemSize" width="30" height="30"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells/>
+                                <connections>
+                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="eVW-e3-oEa"/>
+                                    <outlet property="delegate" destination="t7d-lb-B0c" id="fT4-Wu-OmE"/>
+                                </connections>
+                            </collectionView>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Vqu-T4-tCt">
+                                <rect key="frame" x="20" y="377.5" width="374" height="40"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="Uil-aO-Rdl"/>
+                                </constraints>
+                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="QYw-K7-DeM">
+                                    <size key="itemSize" width="30" height="30"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells/>
+                                <connections>
+                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="xhe-E4-eQS"/>
+                                    <outlet property="delegate" destination="t7d-lb-B0c" id="wDa-Fm-TeI"/>
+                                </connections>
+                            </collectionView>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="5Wf-Vi-p6l">
+                                <rect key="frame" x="20" y="427.5" width="374" height="40"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="acp-Ff-CVF"/>
+                                </constraints>
+                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="NdJ-Va-itz">
+                                    <size key="itemSize" width="30" height="30"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells/>
+                                <connections>
+                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="mC0-ID-2cV"/>
+                                    <outlet property="delegate" destination="t7d-lb-B0c" id="kd2-0O-VFj"/>
+                                </connections>
+                            </collectionView>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="QnI-8h-KFh">
+                                <rect key="frame" x="20" y="477.5" width="374" height="40"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="nOv-2g-YUy"/>
+                                </constraints>
+                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="nRP-a6-d8H">
+                                    <size key="itemSize" width="30" height="30"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells/>
+                                <connections>
+                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="HQT-iA-q7t"/>
+                                    <outlet property="delegate" destination="t7d-lb-B0c" id="u3M-Kh-aib"/>
+                                </connections>
+                            </collectionView>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="ZGw-xz-CHU">
+                                <rect key="frame" x="20" y="527.5" width="374" height="40"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="i02-WP-odT"/>
+                                </constraints>
+                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="Ita-jy-o3U">
+                                    <size key="itemSize" width="30" height="30"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells/>
+                                <connections>
+                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="j89-63-5xm"/>
+                                    <outlet property="delegate" destination="t7d-lb-B0c" id="oWy-db-Ug9"/>
+                                </connections>
+                            </collectionView>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="0QE-Vi-QK3">
+                                <rect key="frame" x="20" y="577.5" width="374" height="40"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="Ulf-J8-mJP"/>
+                                </constraints>
+                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="Nb0-Fc-dvL">
+                                    <size key="itemSize" width="30" height="30"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells/>
+                                <connections>
+                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="n4d-ki-MqJ"/>
+                                    <outlet property="delegate" destination="t7d-lb-B0c" id="etP-p6-cDG"/>
+                                </connections>
+                            </collectionView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="VBS-bC-HBG"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="ZGw-xz-CHU" firstAttribute="top" secondItem="QnI-8h-KFh" secondAttribute="bottom" constant="10" id="089-u7-9b7"/>
+                            <constraint firstItem="Vqu-T4-tCt" firstAttribute="top" secondItem="Wfd-TO-mb6" secondAttribute="bottom" constant="10" id="1B8-U1-4tG"/>
+                            <constraint firstItem="Wfd-TO-mb6" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="1id-4Q-fE4"/>
+                            <constraint firstItem="0QE-Vi-QK3" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="28m-Do-tZC"/>
+                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="leading" secondItem="drp-Ug-4oo" secondAttribute="trailing" constant="20" id="40R-Sq-kjg"/>
+                            <constraint firstItem="hhN-sG-MX1" firstAttribute="top" secondItem="esw-DK-l9R" secondAttribute="bottom" constant="10" id="4Bp-Lj-DB3"/>
+                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="ZGw-xz-CHU" secondAttribute="trailing" constant="20" id="6yv-J0-A2M"/>
+                            <constraint firstItem="0QE-Vi-QK3" firstAttribute="top" secondItem="ZGw-xz-CHU" secondAttribute="bottom" constant="10" id="81d-WR-FcG"/>
+                            <constraint firstItem="Wfd-TO-mb6" firstAttribute="top" secondItem="hhN-sG-MX1" secondAttribute="bottom" constant="50" id="CeP-Oz-NHd"/>
+                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="height" secondItem="vMk-kn-0fZ" secondAttribute="height" id="JaF-QX-R4a"/>
+                            <constraint firstItem="ZjD-RE-7YY" firstAttribute="leading" secondItem="nXI-Rr-7gO" secondAttribute="leading" id="Jc1-Ky-auh"/>
+                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="top" secondItem="vMk-kn-0fZ" secondAttribute="top" id="JnF-Ld-fdg"/>
+                            <constraint firstItem="ZGw-xz-CHU" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="Jpb-Kv-wyE"/>
+                            <constraint firstItem="esw-DK-l9R" firstAttribute="leading" secondItem="drp-Ug-4oo" secondAttribute="leading" id="L79-cu-IOU"/>
+                            <constraint firstItem="QnI-8h-KFh" firstAttribute="top" secondItem="5Wf-Vi-p6l" secondAttribute="bottom" constant="10" id="MGc-Sq-dXL"/>
+                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="Wfd-TO-mb6" secondAttribute="trailing" constant="20" id="QrS-nn-ahd"/>
+                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="width" secondItem="nXI-Rr-7gO" secondAttribute="height" multiplier="1:1" id="R2L-jA-GcK"/>
+                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="QnI-8h-KFh" secondAttribute="trailing" constant="20" id="RMr-1V-C4H"/>
+                            <constraint firstItem="vMk-kn-0fZ" firstAttribute="top" secondItem="VBS-bC-HBG" secondAttribute="top" constant="20" id="RlX-VY-KVN"/>
+                            <constraint firstItem="ZjD-RE-7YY" firstAttribute="trailing" secondItem="nXI-Rr-7gO" secondAttribute="trailing" id="SdO-AO-sqY"/>
+                            <constraint firstItem="ZjD-RE-7YY" firstAttribute="top" secondItem="nXI-Rr-7gO" secondAttribute="bottom" constant="20" id="VRd-mi-ii1"/>
+                            <constraint firstItem="hhN-sG-MX1" firstAttribute="trailing" secondItem="esw-DK-l9R" secondAttribute="trailing" id="WOa-ER-d2c"/>
+                            <constraint firstItem="xMH-zh-Psg" firstAttribute="leading" secondItem="vMk-kn-0fZ" secondAttribute="leading" id="X15-4d-pWo"/>
+                            <constraint firstItem="5Wf-Vi-p6l" firstAttribute="top" secondItem="Vqu-T4-tCt" secondAttribute="bottom" constant="10" id="XE6-kE-vUJ"/>
+                            <constraint firstItem="drp-Ug-4oo" firstAttribute="height" secondItem="vMk-kn-0fZ" secondAttribute="height" id="XTY-iJ-aP2"/>
+                            <constraint firstItem="xMH-zh-Psg" firstAttribute="trailing" secondItem="vMk-kn-0fZ" secondAttribute="trailing" id="XgL-Sp-UFK"/>
+                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="Vqu-T4-tCt" secondAttribute="trailing" constant="20" id="Z5o-0R-zUb"/>
+                            <constraint firstItem="xMH-zh-Psg" firstAttribute="top" secondItem="vMk-kn-0fZ" secondAttribute="bottom" constant="20" id="a84-ED-mSZ"/>
+                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="0QE-Vi-QK3" secondAttribute="trailing" constant="20" id="csZ-iC-q5E"/>
+                            <constraint firstItem="esw-DK-l9R" firstAttribute="trailing" secondItem="drp-Ug-4oo" secondAttribute="trailing" id="d3e-xe-oED"/>
+                            <constraint firstAttribute="trailing" secondItem="nXI-Rr-7gO" secondAttribute="trailing" constant="20" id="eQ2-AX-79E"/>
+                            <constraint firstItem="hhN-sG-MX1" firstAttribute="leading" secondItem="esw-DK-l9R" secondAttribute="leading" id="eXh-Yg-ZHk"/>
+                            <constraint firstItem="drp-Ug-4oo" firstAttribute="leading" secondItem="vMk-kn-0fZ" secondAttribute="trailing" constant="20" id="fc1-Ra-VfY"/>
+                            <constraint firstItem="drp-Ug-4oo" firstAttribute="top" secondItem="vMk-kn-0fZ" secondAttribute="top" id="h0e-1x-iCh"/>
+                            <constraint firstItem="5Wf-Vi-p6l" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="lRY-XA-2gk"/>
+                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="leading" secondItem="drp-Ug-4oo" secondAttribute="trailing" constant="20" id="n2r-o5-gAb"/>
+                            <constraint firstItem="vMk-kn-0fZ" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="oHW-xr-vk5"/>
+                            <constraint firstItem="QnI-8h-KFh" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="ojm-m1-Fxe"/>
+                            <constraint firstItem="Vqu-T4-tCt" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="pcC-Eb-ylY"/>
+                            <constraint firstItem="drp-Ug-4oo" firstAttribute="width" secondItem="vMk-kn-0fZ" secondAttribute="width" id="quN-P5-fvp"/>
+                            <constraint firstItem="drp-Ug-4oo" firstAttribute="leading" secondItem="vMk-kn-0fZ" secondAttribute="trailing" constant="20" id="s2Y-9g-c3V"/>
+                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="5Wf-Vi-p6l" secondAttribute="trailing" constant="20" id="tWI-KX-Psc"/>
+                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="width" secondItem="vMk-kn-0fZ" secondAttribute="width" id="vJq-bJ-bRr"/>
+                            <constraint firstItem="drp-Ug-4oo" firstAttribute="width" secondItem="drp-Ug-4oo" secondAttribute="height" multiplier="1:1" id="z8N-FK-TDd"/>
+                            <constraint firstItem="esw-DK-l9R" firstAttribute="top" secondItem="drp-Ug-4oo" secondAttribute="bottom" constant="20" id="zvM-58-x9R"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="0ok-kC-bk7"/>
+                    <connections>
+                        <outlet property="backdropColorBackground" destination="vMk-kn-0fZ" id="Kpa-cg-Wcv"/>
+                        <outlet property="backdropDarkenedColorsCollectionView" destination="Vqu-T4-tCt" id="XyT-bz-ven"/>
+                        <outlet property="backdropInputField" destination="xMH-zh-Psg" id="aCg-QZ-cBO"/>
+                        <outlet property="backdropLightenedColorsCollectionView" destination="Wfd-TO-mb6" id="dqJ-QL-YlC"/>
+                        <outlet property="blendModeButton" destination="esw-DK-l9R" id="WJJ-dJ-QVM"/>
+                        <outlet property="blendedColorBackground" destination="drp-Ug-4oo" id="7QG-uS-uB8"/>
+                        <outlet property="blendedDarkenedColorsCollectionView" destination="0QE-Vi-QK3" id="nPt-Qb-Vui"/>
+                        <outlet property="blendedLightenedColorsCollectionView" destination="ZGw-xz-CHU" id="2yy-RK-THc"/>
+                        <outlet property="flipButton" destination="hhN-sG-MX1" id="4YK-N8-oNw"/>
+                        <outlet property="sourceColorBackground" destination="nXI-Rr-7gO" id="cOp-GQ-TYr"/>
+                        <outlet property="sourceDarkenedColorsCollectionView" destination="QnI-8h-KFh" id="TY3-Hv-MTE"/>
+                        <outlet property="sourceInputField" destination="ZjD-RE-7YY" id="csu-eW-7yf"/>
+                        <outlet property="sourceLightenedColorsCollectionView" destination="5Wf-Vi-p6l" id="afB-Ux-nQT"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Gfo-pw-p7q" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4455.072463768116" y="4119.6428571428569"/>
+        </scene>
+        <!--Beacons View Controller-->
+        <scene sceneID="dvn-k6-9er">
+            <objects>
+                <collectionViewController id="2CB-DJ-Qmw" customClass="BeaconsViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="cYv-YE-iqg">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="inz-04-s6f">
+                            <size key="itemSize" width="414" height="128"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
+                        </collectionViewFlowLayout>
+                        <cells>
+                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="BeaconsViewCell" id="fED-Jc-30d" customClass="BeaconsViewCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="128"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="SaY-ub-Wq9">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="128"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <subviews>
+                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="IcG-Yk-e5u">
+                                            <rect key="frame" x="8" y="8" width="398" height="112"/>
+                                            <subviews>
+                                                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" id="1RE-K4-cnb">
+                                                    <rect key="frame" x="0.0" y="0.0" width="398" height="36"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Namespace" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HNq-ol-rRY">
+                                                            <rect key="frame" x="0.0" y="0.0" width="198" height="36"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QVS-It-nax">
+                                                            <rect key="frame" x="200" y="0.0" width="198" height="36"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <viewLayoutGuide key="safeArea" id="ulH-ay-Ddg"/>
+                                                </stackView>
+                                                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" id="kOa-Di-Zqh">
+                                                    <rect key="frame" x="0.0" y="38" width="398" height="36"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Instance" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ivo-uG-sYi">
+                                                            <rect key="frame" x="0.0" y="0.0" width="198" height="36"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1TX-mO-ACb">
+                                                            <rect key="frame" x="200" y="0.0" width="198" height="36"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <viewLayoutGuide key="safeArea" id="pCO-wD-q2L"/>
+                                                </stackView>
+                                                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="SET-SM-ExN">
+                                                    <rect key="frame" x="0.0" y="76" width="398" height="36"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="txPower" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dk1-m4-MzC">
+                                                            <rect key="frame" x="0.0" y="0.0" width="198" height="36"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="BQO-eA-EWc">
+                                                            <rect key="frame" x="200" y="0.0" width="198" height="36"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                </stackView>
+                                            </subviews>
+                                        </stackView>
+                                    </subviews>
+                                    <color key="backgroundColor" name="darker_color"/>
+                                    <constraints>
+                                        <constraint firstItem="IcG-Yk-e5u" firstAttribute="top" secondItem="SaY-ub-Wq9" secondAttribute="top" constant="8" id="Hev-1e-fVf"/>
+                                        <constraint firstItem="IcG-Yk-e5u" firstAttribute="leading" secondItem="SaY-ub-Wq9" secondAttribute="leading" constant="8" id="SRz-w5-zPJ"/>
+                                        <constraint firstAttribute="trailing" secondItem="IcG-Yk-e5u" secondAttribute="trailing" constant="8" id="qNx-Aa-A75"/>
+                                        <constraint firstAttribute="bottom" secondItem="IcG-Yk-e5u" secondAttribute="bottom" constant="8" id="uU1-II-FeC"/>
+                                    </constraints>
+                                </collectionViewCellContentView>
+                                <connections>
+                                    <outlet property="instanceLabel" destination="1TX-mO-ACb" id="5ng-kk-qlc"/>
+                                    <outlet property="namespaceLabel" destination="QVS-It-nax" id="NX2-2G-l9z"/>
+                                    <outlet property="txPowerLabel" destination="BQO-eA-EWc" id="Q1L-qe-uR6"/>
+                                </connections>
+                            </collectionViewCell>
+                        </cells>
+                        <connections>
+                            <outlet property="delegate" destination="2CB-DJ-Qmw" id="NOW-Hm-xOY"/>
+                        </connections>
+                    </collectionView>
+                    <navigationItem key="navigationItem" id="3FX-SL-z8l"/>
+                </collectionViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="5DO-tU-e34" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1716" y="1073"/>
+        </scene>
+        <!--Button View Controller-->
+        <scene sceneID="2tX-Kq-EFC">
+            <objects>
+                <tableViewController id="vjD-in-IYI" customClass="ButtonViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="QdK-yo-rl7">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ButtonListCell" id="5eD-3F-uwZ" customClass="ButtonListCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="50" width="414" height="42.5"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="5eD-3F-uwZ" id="a3W-P1-oQG">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="42.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D6o-XM-1n0">
+                                            <rect key="frame" x="20" y="4" width="374" height="34.5"/>
+                                            <state key="normal" title="Button"/>
+                                        </button>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstAttribute="trailing" secondItem="D6o-XM-1n0" secondAttribute="trailing" constant="20" id="PNo-qc-mbG"/>
+                                        <constraint firstAttribute="bottom" secondItem="D6o-XM-1n0" secondAttribute="bottom" constant="4" id="fEd-va-ovI"/>
+                                        <constraint firstItem="D6o-XM-1n0" firstAttribute="top" secondItem="a3W-P1-oQG" secondAttribute="top" constant="4" id="grw-9v-GFK"/>
+                                        <constraint firstItem="D6o-XM-1n0" firstAttribute="leading" secondItem="a3W-P1-oQG" secondAttribute="leading" constant="20" id="xx6-ay-ut3"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="button" destination="D6o-XM-1n0" id="mrj-AT-4Pa"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="vjD-in-IYI" id="A2O-tK-tbU"/>
+                            <outlet property="delegate" destination="vjD-in-IYI" id="h5Q-Vp-kgd"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="vMh-OB-q4F"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="tKF-tM-9id" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4461" y="3449"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="close_icon" width="24" height="24"/>
+        <image name="error_icon" width="14" height="14"/>
+        <namedColor name="darker_color">
+            <color red="0.0" green="0.0" blue="0.0" alpha="0.20000000298023224" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemGray4Color">
+            <color red="0.81960784313725488" green="0.81960784313725488" blue="0.83921568627450982" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
+</document>
diff --git a/newexample/ios/Demo/Beacons/BeaconsViewCell.swift b/newexample/ios/Demo/Beacons/BeaconsViewCell.swift
new file mode 100644
index 000000000..829f8565d
--- /dev/null
+++ b/newexample/ios/Demo/Beacons/BeaconsViewCell.swift
@@ -0,0 +1,52 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import KotlinNativeFramework
+
+class BeaconsViewCell: UICollectionViewCell {
+
+    static var identifier: String { String(describing: Self.self) }
+
+    @IBOutlet private var namespaceLabel: UILabel!
+    @IBOutlet private var instanceLabel: UILabel!
+    @IBOutlet private var txPowerLabel: UILabel!
+
+    private let disposeBag = DisposeBag()
+    private var viewModel: BeaconsListBeaconViewModel?
+
+    func configure(with viewModel: BeaconsListBeaconViewModel) {
+        self.viewModel = viewModel
+    }
+
+    func startMonitoring() {
+        viewModel?.namespace_.observe { [weak self] namespace in
+            self?.namespaceLabel.text = namespace as String?
+        }.addTo(disposeBag: disposeBag)
+
+        viewModel?.instance.observe { [weak self] instance in
+            self?.instanceLabel.text = instance as String?
+        }.addTo(disposeBag: disposeBag)
+
+        viewModel?.txPower.observe { [weak self] txPower in
+            self?.txPowerLabel.text = txPower as String?
+        }.addTo(disposeBag: disposeBag)
+    }
+
+    func stopMonitoring() {
+        disposeBag.dispose()
+    }
+}
diff --git a/newexample/ios/Demo/Beacons/BeaconsViewController.swift b/newexample/ios/Demo/Beacons/BeaconsViewController.swift
new file mode 100644
index 000000000..678e5786a
--- /dev/null
+++ b/newexample/ios/Demo/Beacons/BeaconsViewController.swift
@@ -0,0 +1,115 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import KotlinNativeFramework
+
+class BeaconsViewController: UICollectionViewController {
+
+    private var beacons = [BeaconsListBeaconViewModel]() {
+        didSet {
+            collectionView.reloadData()
+        }
+    }
+
+    private var lifecycleManager: LifecycleManager!
+
+    private lazy var flowLayout: UICollectionViewFlowLayout = {
+        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
+        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
+        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0)
+        flowLayout.minimumLineSpacing = 4
+        return flowLayout
+    }()
+
+    private lazy var viewModel = KNArchitectureFramework()
+        .createBeaconsListViewModel(
+            parent: self,
+            service: KNBeaconsFramework().service
+        )
+
+    deinit {
+        lifecycleManager.unbind()
+    }
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+
+        collectionView.collectionViewLayout = flowLayout
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+            guard let viewModel = self?.viewModel else { return [] }
+
+            return [
+                viewModel.isScanning.observe { isScanning in
+                    self?.updateNavigationItem(isScanning: isScanning as? Bool ?? false)
+                },
+                viewModel.beacons.observe { devices in
+                    self?.beacons = devices as? [BeaconsListBeaconViewModel] ?? []
+                }
+            ]
+        }
+    }
+
+    override func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return 1
+    }
+
+    override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        beacons.count
+    }
+
+    override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let beaconCell = collectionView.dequeueReusableCell(withReuseIdentifier: BeaconsViewCell.identifier, for: indexPath) as! BeaconsViewCell
+        beaconCell.configure(with: beacons[indexPath.row])
+        return beaconCell
+    }
+
+    override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        guard let cell = cell as? BeaconsViewCell else {
+            return
+        }
+
+        cell.startMonitoring()
+    }
+
+    override func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        guard let cell = cell as? BeaconsViewCell else {
+            return
+        }
+
+        cell.stopMonitoring()
+    }
+
+    override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        collectionView.deselectItem(at: indexPath, animated: true)
+    }
+
+    private func updateNavigationItem(isScanning: Bool) {
+        let title = isScanning ? "beacons_stop_monitoring" : "beacons_start_monitoring"
+        let item = UIBarButtonItem(
+            title: NSLocalizedString(title, comment: ""),
+            style: .plain,
+            target: viewModel,
+            action: #selector(viewModel.onScanPressed)
+        )
+        navigationItem.setRightBarButton(item, animated: true)
+    }
+}
diff --git a/newexample/ios/Demo/Bluetooth/BluetoothCharacteristicCell.xib b/newexample/ios/Demo/Bluetooth/BluetoothCharacteristicCell.xib
new file mode 100644
index 000000000..4708c258e
--- /dev/null
+++ b/newexample/ios/Demo/Bluetooth/BluetoothCharacteristicCell.xib
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <capability name="collection view cell content view" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="BluetoothCharacteristicView" id="B2w-ph-aZX" customClass="BluetoothCharacteristicView" customModule="Demo" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="289" height="128"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="hv0-ou-L4C">
+                <rect key="frame" x="0.0" y="0.0" width="289" height="128"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="x8j-E2-2WH">
+                        <rect key="frame" x="0.0" y="0.0" width="289" height="20.5"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="500" text="Characteristic ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ByE-q4-q83">
+                                <rect key="frame" x="0.0" y="0.0" width="131.5" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="500" verticalHuggingPriority="251" text="Characteristic Value" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HKw-U2-vku">
+                                <rect key="frame" x="135.5" y="0.0" width="153.5" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                    </stackView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Descriptors" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jx8-zE-VJ6">
+                        <rect key="frame" x="0.0" y="24.5" width="289" height="89.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="dYG-ws-kvS">
+                        <rect key="frame" x="0.0" y="118" width="289" height="10"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="10" id="rCG-m2-Lvv"/>
+                        </constraints>
+                        <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="tDK-kj-k3s">
+                            <size key="itemSize" width="128" height="128"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                        </collectionViewFlowLayout>
+                        <cells/>
+                        <connections>
+                            <outlet property="dataSource" destination="B2w-ph-aZX" id="VUf-I4-OdH"/>
+                            <outlet property="delegate" destination="B2w-ph-aZX" id="hml-oR-c06"/>
+                        </connections>
+                    </collectionView>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="x8j-E2-2WH" secondAttribute="trailing" id="GWx-fB-Lod"/>
+                    <constraint firstAttribute="bottom" secondItem="dYG-ws-kvS" secondAttribute="bottom" id="Nul-UU-dnM"/>
+                    <constraint firstItem="x8j-E2-2WH" firstAttribute="top" secondItem="hv0-ou-L4C" secondAttribute="top" id="Nzq-SC-7qn"/>
+                    <constraint firstItem="Jx8-zE-VJ6" firstAttribute="top" secondItem="x8j-E2-2WH" secondAttribute="bottom" constant="4" id="PWW-MC-0sY"/>
+                    <constraint firstAttribute="trailing" secondItem="Jx8-zE-VJ6" secondAttribute="trailing" id="diO-zf-MKF"/>
+                    <constraint firstItem="dYG-ws-kvS" firstAttribute="top" secondItem="Jx8-zE-VJ6" secondAttribute="bottom" constant="4" id="dnX-ET-cZl"/>
+                    <constraint firstItem="x8j-E2-2WH" firstAttribute="leading" secondItem="hv0-ou-L4C" secondAttribute="leading" id="dsW-ui-fOq"/>
+                    <constraint firstAttribute="trailing" secondItem="dYG-ws-kvS" secondAttribute="trailing" id="ety-Fc-owI"/>
+                    <constraint firstItem="Jx8-zE-VJ6" firstAttribute="leading" secondItem="hv0-ou-L4C" secondAttribute="leading" id="nhK-y8-Wi9"/>
+                    <constraint firstItem="dYG-ws-kvS" firstAttribute="leading" secondItem="hv0-ou-L4C" secondAttribute="leading" id="pla-ew-t28"/>
+                </constraints>
+            </collectionViewCellContentView>
+            <connections>
+                <outlet property="characteristicIdentifier" destination="ByE-q4-q83" id="RwG-nm-eD1"/>
+                <outlet property="characteristicValue" destination="HKw-U2-vku" id="H9S-GY-QH0"/>
+                <outlet property="descriptorsHeader" destination="Jx8-zE-VJ6" id="hrp-HH-maE"/>
+                <outlet property="descriptorsList" destination="dYG-ws-kvS" id="bVc-HP-xLe"/>
+                <outlet property="descriptorsListHeight" destination="rCG-m2-Lvv" id="Cyu-yO-Hpu"/>
+            </connections>
+            <point key="canvasLocation" x="746" y="154"/>
+        </collectionViewCell>
+    </objects>
+</document>
diff --git a/newexample/ios/Demo/Bluetooth/BluetoothDescriptorCell.xib b/newexample/ios/Demo/Bluetooth/BluetoothDescriptorCell.xib
new file mode 100644
index 000000000..13eae4024
--- /dev/null
+++ b/newexample/ios/Demo/Bluetooth/BluetoothDescriptorCell.xib
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="collection view cell content view" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="BluetoothDescriptorView" id="pSe-Ps-x47" customClass="BluetoothDescriptorView" customModule="Demo" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="228" height="20.5"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="ls8-b8-HAi">
+                <rect key="frame" x="0.0" y="0.0" width="228" height="20.5"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="YtP-YC-jgh">
+                        <rect key="frame" x="0.0" y="0.0" width="228" height="20.5"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="500" text="Descriptor ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5zg-aQ-Jsy">
+                                <rect key="frame" x="0.0" y="0.0" width="97" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="500" verticalHuggingPriority="251" text="Descriptor Value" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oTL-QB-D7K">
+                                <rect key="frame" x="101" y="0.0" width="127" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                    </stackView>
+                </subviews>
+                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                <constraints>
+                    <constraint firstItem="YtP-YC-jgh" firstAttribute="leading" secondItem="ls8-b8-HAi" secondAttribute="leading" id="9Zf-XW-aGF"/>
+                    <constraint firstItem="YtP-YC-jgh" firstAttribute="top" secondItem="ls8-b8-HAi" secondAttribute="top" id="KeL-6C-MSg"/>
+                    <constraint firstAttribute="trailing" secondItem="YtP-YC-jgh" secondAttribute="trailing" id="LRg-UF-Jt9"/>
+                    <constraint firstAttribute="bottom" secondItem="YtP-YC-jgh" secondAttribute="bottom" id="OtL-m0-ZY3"/>
+                </constraints>
+            </collectionViewCellContentView>
+            <connections>
+                <outlet property="descriptorIdentifier" destination="5zg-aQ-Jsy" id="5VI-Qs-wga"/>
+                <outlet property="descriptorValue" destination="oTL-QB-D7K" id="Ez6-AJ-oMg"/>
+            </connections>
+            <point key="canvasLocation" x="139" y="-198"/>
+        </collectionViewCell>
+    </objects>
+</document>
diff --git a/newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift b/newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
new file mode 100644
index 000000000..e6b178457
--- /dev/null
+++ b/newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
@@ -0,0 +1,364 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class BluetoothDeviceDetailsViewController : UIViewController, UICollectionViewDelegate, UICollectionViewDataSource {
+    
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "BluetoothDeviceDetails"
+    }
+    
+    static func create(deviceUuid: UUID, bluetooth: Bluetooth) -> BluetoothDeviceDetailsViewController {
+        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! BluetoothDeviceDetailsViewController
+        if #available(iOS 13.0, *) {
+            vc.isModalInPresentation = true
+        }
+        vc.viewModel = KNArchitectureFramework().createBluetoothDeviceDetailsViewModel(identifier: deviceUuid, bluetooth: bluetooth)
+        return vc
+    }
+    
+    var viewModel: BluetoothDeviceDetailViewModel!
+    private var lifecycleManager: LifecycleManager!
+    
+    @IBOutlet var deviceName: UILabel!
+    @IBOutlet var deviceIdentifier: UILabel!
+    @IBOutlet var rssi: UILabel!
+    @IBOutlet var distance: UILabel!
+    @IBOutlet var connectionStatus: UILabel!
+    @IBOutlet var servicesHeader: UILabel!
+    @IBOutlet var servicesList: UICollectionView!
+    
+    private var services: [BluetoothServiceViewModel] = []
+    
+    private var isInvalidating: Bool = false
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        servicesHeader.text = NSLocalizedString("bluetooth_services_header", comment: "")
+        deviceIdentifier.text = viewModel.identifierString
+        
+        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
+        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
+        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
+        flowLayout.minimumLineSpacing = 4
+        servicesList.collectionViewLayout = flowLayout
+
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
+            
+            guard let viewModel = self?.viewModel else { return []}
+            
+            return [
+            viewModel.name.observe { name in
+                self?.deviceName.text = name as String?
+            }
+            ,
+            viewModel.rssi.observe { rssiValue in
+                self?.rssi.text = rssiValue as String?
+            }
+            ,
+            viewModel.distance.observe { distanceValue in
+                self?.distance.text = distanceValue as String?
+            }
+            ,
+            viewModel.state.observe { state in
+                self?.connectionStatus.text = state as String?
+            }
+            ,
+            viewModel.services.observe { servicesList in
+                self?.services = servicesList as? [BluetoothServiceViewModel] ?? []
+                self?.servicesList.reloadData()
+                self?.servicesList.layoutIfNeeded()
+            }
+            ]
+        })
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return services.count
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let serviceCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothServiceView.Companion.identifier, for: indexPath) as! BluetoothServiceView
+        serviceCell.parent = self
+        serviceCell.service = services[indexPath.row]
+        return serviceCell
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if (!isInvalidating) {
+            (cell as? BluetoothServiceView)?.startMonitoring()
+        }
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if (!isInvalidating) {
+            (cell as? BluetoothServiceView)?.stopMonitoring()
+        }
+    }
+    
+    fileprivate func updateListSize() {
+        isInvalidating = true
+        servicesList.collectionViewLayout.invalidateLayout()
+        servicesList.layoutIfNeeded()
+        isInvalidating = false
+    }
+    
+}
+
+class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
+    
+    fileprivate struct Companion {
+        static let identifier = "BluetoothServiceView"
+    }
+    
+    fileprivate weak var parent: BluetoothDeviceDetailsViewController?
+    fileprivate var service: BluetoothServiceViewModel?
+    private let disposeBag = DisposeBag()
+    
+    private var isInvalidating: Bool = false
+
+    @IBOutlet var serviceHeader: UILabel!
+    @IBOutlet var serviceIdentifier: UILabel!
+    @IBOutlet var characteristicsHeader: UILabel!
+    @IBOutlet var characteristicsList: UICollectionView!
+    @IBOutlet var characteristicsListHeight: NSLayoutConstraint!
+    
+    private var characteristics: [BluetoothCharacteristicViewModel] = []
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        
+        serviceHeader.text = NSLocalizedString("bluetooth_service", comment: "")
+        characteristicsHeader.text = NSLocalizedString("bluetooth_characteristics", comment: "")
+        
+        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
+        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
+        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
+        flowLayout.minimumLineSpacing = 4
+        characteristicsList.collectionViewLayout = flowLayout
+        characteristicsList.dataSource = self
+        characteristicsList.delegate = self
+        characteristicsList.register(UINib(nibName: "BluetoothCharacteristicCell", bundle: nil), forCellWithReuseIdentifier: BluetoothCharacteristicView.Companion.identifier)
+    }
+    
+    fileprivate func startMonitoring() {
+        disposeBag.dispose()
+        guard let service = self.service else {
+            return
+        }
+        service.didResume()
+        
+        serviceIdentifier.text = service.uuid
+        service.characteristics.observe { [weak self] characteristics in
+            self?.characteristics = characteristics as? [BluetoothCharacteristicViewModel] ?? []
+            self?.characteristicsList.reloadData()
+            self?.updateListSize(isInvalidating: false)
+        }.addTo(disposeBag: disposeBag)
+    }
+    
+    fileprivate func stopMonitoring() {
+        service?.didPause()
+        disposeBag.dispose()
+    }
+    
+    fileprivate func updateListSize(isInvalidating: Bool) {
+        self.isInvalidating = isInvalidating
+        characteristicsList.collectionViewLayout.invalidateLayout()
+        characteristicsList.layoutIfNeeded()
+        let height = characteristicsList.contentSize.height
+        characteristicsListHeight.constant = height
+        parent?.updateListSize()
+        self.isInvalidating = false
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return characteristics.count
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let characteristicCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothCharacteristicView.Companion.identifier, for: indexPath) as! BluetoothCharacteristicView
+        characteristicCell.parent = self
+        characteristicCell.characteristic = characteristics[indexPath.row]
+        return characteristicCell
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if (!isInvalidating) {
+            (cell as? BluetoothCharacteristicView)?.startMonitoring()
+        }
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if (!isInvalidating) {
+            (cell as? BluetoothCharacteristicView)?.stopMonitoring()
+        }
+    }
+    
+    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
+        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
+        layoutIfNeeded()
+        layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
+        return layoutAttributes
+    }
+    
+}
+
+class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
+    
+    fileprivate struct Companion {
+        static let identifier = "BluetoothCharacteristicView"
+    }
+    
+    fileprivate weak var parent: BluetoothServiceView?
+    fileprivate var characteristic: BluetoothCharacteristicViewModel?
+    private let disposeBag = DisposeBag()
+    
+    private var isInvalidating: Bool = false
+    
+    @IBOutlet var characteristicIdentifier: UILabel!
+    @IBOutlet var characteristicValue: UILabel!
+    @IBOutlet var descriptorsHeader: UILabel!
+    @IBOutlet var descriptorsList: UICollectionView!
+    
+    @IBOutlet var descriptorsListHeight: NSLayoutConstraint!
+    
+    private var descriptors: [BluetoothDescriptorViewModel] = []
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        
+        descriptorsHeader.text = NSLocalizedString("bluetooth_descriptors", comment: "")
+        
+        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
+        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
+        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
+        flowLayout.minimumLineSpacing = 4
+        descriptorsList.collectionViewLayout = flowLayout
+        descriptorsList.register(UINib(nibName: "BluetoothDescriptorCell", bundle: nil), forCellWithReuseIdentifier: BluetoothDescriptorView.Companion.identifier)
+    }
+    
+    fileprivate func startMonitoring() {
+        disposeBag.dispose()
+        guard let characteristic = self.characteristic else {
+            return
+        }
+        characteristic.didResume()
+        
+        characteristicIdentifier.text = characteristic.uuid
+        characteristic.descriptors.observe { [weak self] descriptors in
+            self?.descriptors = descriptors as? [BluetoothDescriptorViewModel] ?? []
+            self?.descriptorsList.reloadData()
+            self?.updateListSize(isInvalidating: false)
+        }.addTo(disposeBag: disposeBag)
+        
+        characteristic.value.observe { [weak self] value in
+            self?.characteristicValue.text = value as String?
+        }.addTo(disposeBag: disposeBag)
+    }
+    
+    fileprivate func stopMonitoring() {
+        disposeBag.dispose()
+        characteristic?.didPause()
+    }
+    
+    private func updateListSize(isInvalidating: Bool) {
+        self.isInvalidating = isInvalidating
+        descriptorsList.collectionViewLayout.invalidateLayout()
+        descriptorsList.layoutIfNeeded()
+        let height = descriptorsList.contentSize.height
+        descriptorsListHeight.constant = height
+        parent?.updateListSize(isInvalidating: true)
+        self.isInvalidating = false
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return descriptors.count
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let descriptorCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothDescriptorView.Companion.identifier, for: indexPath) as! BluetoothDescriptorView
+        descriptorCell.descriptor = descriptors[indexPath.row]
+        return descriptorCell
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if (!isInvalidating) {
+            (cell as? BluetoothDescriptorView)?.startMonitoring()
+        }
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if (!isInvalidating) {
+            (cell as? BluetoothDescriptorView)?.stopMonitoring()
+        }
+    }
+    
+    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
+        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
+        layoutIfNeeded()
+        layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
+        return layoutAttributes
+    }
+    
+}
+
+class BluetoothDescriptorView : UICollectionViewCell {
+    
+    fileprivate struct Companion {
+        static let identifier = "BluetoothDescriptorView"
+    }
+    
+    fileprivate var descriptor: BluetoothDescriptorViewModel?
+    private let disposeBag = DisposeBag()
+    
+    @IBOutlet var descriptorIdentifier: UILabel!
+    @IBOutlet var descriptorValue: UILabel!
+    
+    fileprivate func startMonitoring() {
+        disposeBag.dispose()
+        guard let descriptor = self.descriptor else {
+            return
+        }
+        descriptor.didResume()
+        
+        descriptorIdentifier.text = descriptor.uuid
+        
+        descriptor.value.observe { [weak self] value in
+            self?.descriptorValue.text = value as String?
+        }.addTo(disposeBag: disposeBag)
+    }
+    
+    fileprivate func stopMonitoring() {
+        disposeBag.dispose()
+        descriptor?.didResume()
+    }
+    
+    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
+        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
+        layoutIfNeeded()
+        layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
+        return layoutAttributes
+    }
+}
diff --git a/newexample/ios/Demo/Bluetooth/BluetoothViewController.swift b/newexample/ios/Demo/Bluetooth/BluetoothViewController.swift
new file mode 100644
index 000000000..1e60a04b4
--- /dev/null
+++ b/newexample/ios/Demo/Bluetooth/BluetoothViewController.swift
@@ -0,0 +1,230 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class BluetoothViewController : UICollectionViewController {
+    
+    lazy var viewModel = KNArchitectureFramework().createBluetoothListViewModel(parent: self, bluetooth: KNBluetoothFramework().bluetooth) { uuid, bluetooth in
+        return BluetoothDeviceDetailsViewController.create(deviceUuid: uuid, bluetooth: bluetooth)
+    }
+    
+    private var devices: [BluetoothListDeviceViewModel] = []
+    private var lifecycleManager: LifecycleManager!
+
+    deinit {
+        lifecycleManager.unbind()
+    }
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        
+        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
+        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
+        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0)
+        flowLayout.minimumLineSpacing = 4
+        collectionView.collectionViewLayout = flowLayout
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
+            guard let viewModel = self?.viewModel else { return [] }
+            
+            return [
+                viewModel.isScanning.observe { isScanning in
+                    self?.updateNavigationItem(isScanning: isScanning as? Bool ?? false)
+                },
+                viewModel.devices.observe { devices in
+                    self?.devices = devices as? [BluetoothListDeviceViewModel] ?? []
+                    self?.collectionView?.reloadData()
+                    self?.collectionView.layoutIfNeeded()
+                },
+                viewModel.title.observe { title in
+                    self?.updateTitle(title: title as String?)
+                }
+            ]
+        })
+    }
+    
+    private func updateNavigationItem(isScanning: Bool) {
+        if (isScanning) {
+            self.navigationItem.setRightBarButton(UIBarButtonItem(title: NSLocalizedString("bluetooth_stop_scanning", comment: ""), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
+        } else {
+            self.navigationItem.setRightBarButton(UIBarButtonItem(title: NSLocalizedString("bluetooth_start_scanning", comment: ""), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
+        }
+    }
+
+    private func updateTitle(title: String?) {
+        self.title = title
+    }
+    
+    @objc private func toggleScanning() {
+        viewModel.onScanPressed()
+    }
+    
+    override func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return 1
+    }
+    
+    override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        devices.count
+    }
+    
+    override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let bluetoothCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothCell.Companion.identifier, for: indexPath) as! BluetoothCell
+        bluetoothCell.device = devices[indexPath.row]
+        return bluetoothCell
+    }
+    
+    override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        guard let btCell = cell as? BluetoothCell else {
+            return
+        }
+        
+        btCell.startMonitoring()
+    }
+    
+    override func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        guard let btCell = cell as? BluetoothCell else {
+            return
+        }
+        
+        btCell.stopMonitoring()
+    }
+    
+    override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        devices[indexPath.row].toggleFoldOut()
+        let context = UICollectionViewFlowLayoutInvalidationContext()
+        context.invalidateItems(at: [indexPath])
+        collectionView.collectionViewLayout.invalidateLayout()
+    }
+}
+
+class BluetoothCell: UICollectionViewCell {
+    
+    fileprivate struct Companion {
+        static let identifier = "BluetoothCell"
+    }
+    
+    private let disposeBag = DisposeBag()
+    
+    @IBOutlet var deviceName: UILabel!
+    @IBOutlet var deviceIdentifier: UILabel!
+    @IBOutlet var rssi: UILabel!
+    @IBOutlet var txPower: UILabel!
+    @IBOutlet var buttonContainer: UIStackView!
+    @IBOutlet var connectButton: UIButton!
+    @IBOutlet var disconnectButton: UIButton!
+    
+    @IBOutlet var connectionStatus: UILabel!
+    @IBOutlet var foldOutMenu: UIView!
+    @IBOutlet var serviceId: UILabel!
+    @IBOutlet var serviceData: UILabel!
+    @IBOutlet var manufacturerId: UILabel!
+    @IBOutlet var manufacturerData: UILabel!
+    @IBOutlet var moreButtonContainer: UIView!
+    @IBOutlet var moreButton: UIButton!
+    
+    fileprivate var device: BluetoothListDeviceViewModel? = nil
+    
+    @IBAction func onConnectPressed() {
+        device?.onConnectPressed()
+    }
+    
+    @IBAction func onDisonnectPressed() {
+        device?.onDisconnectPressed()
+    }
+    
+    @IBAction func onMorePressed() {
+        device?.onMorePressed()
+    }
+    
+    func startMonitoring() {
+        disposeBag.dispose()
+        guard let device = device else {
+            return
+        }
+        device.didResume()
+
+        deviceIdentifier.text = device.identifierString
+
+        device.name.observe { [weak self] name in
+            self?.deviceName.text = name as? String
+        }.addTo(disposeBag: disposeBag)
+
+        device.rssi.observe { [weak self] rssiValue in
+            self?.rssi.text = rssiValue as? String
+        }.addTo(disposeBag: disposeBag)
+
+        device.txPower.observe { [weak self] txPowerValue in
+            self?.txPower.text = txPowerValue as? String
+        }.addTo(disposeBag: disposeBag)
+
+        device.status.observe { [weak self] status in
+            self?.connectionStatus.text = status as? String
+        }.addTo(disposeBag: disposeBag)
+
+        device.isConnectButtonVisible.observe { [weak self] isVisible in
+            self?.buttonContainer.alpha = (isVisible as? Bool ?? false) ? 1.0 : 0.0
+        }.addTo(disposeBag: disposeBag)
+
+        device.connectButtonState.observe { [weak self] connectButtonState in
+            let state: BluetoothListDeviceViewModel.ConnectButtonState = connectButtonState as? BluetoothListDeviceViewModel.ConnectButtonState ?? BluetoothListDeviceViewModel.ConnectButtonState.disconnect
+            switch state {
+                case BluetoothListDeviceViewModel.ConnectButtonState.connect:
+                    self?.connectButton.isHidden = false
+                    self?.disconnectButton.isHidden = true
+                case BluetoothListDeviceViewModel.ConnectButtonState.disconnect:
+                    self?.connectButton.isHidden = true
+                    self?.disconnectButton.isHidden = false
+                default: ()
+            }
+        }.addTo(disposeBag: disposeBag)
+
+        device.isFoldedOut.observe { [weak self] isFoldedOut in
+            self?.foldOutMenu.isHidden = !((isFoldedOut as? Bool) ?? false)
+        }
+
+        device.isMoreButtonVisible.observe { [weak self] isMoreVisible in
+            self?.moreButtonContainer.isHidden = !(isMoreVisible as? Bool ?? false)
+        }
+
+        device.serviceUUIDs.observe { [weak self] serviceUUIDS in
+            self?.serviceId.text = serviceUUIDS as? String
+        }
+
+        device.serviceData.observe { [weak self] serviceData in
+            self?.serviceData.text = serviceData as? String
+        }
+
+        device.manufacturerId.observe { [weak self] manufacturerId in
+            self?.manufacturerId.text = manufacturerId as? String
+        }
+
+        device.manufacturerData.observe { [weak self] manufacturerData in
+            self?.manufacturerData.text = manufacturerData as? String
+        }
+    }
+    
+    func stopMonitoring() {
+        disposeBag.dispose()
+        device?.didPause()
+    }
+}
diff --git a/newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift b/newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
new file mode 100644
index 000000000..d32da17ed
--- /dev/null
+++ b/newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
@@ -0,0 +1,58 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class DateTimePickerViewController : UIViewController {
+    
+    @IBOutlet private var timeLabel: UILabel!
+    
+    lazy var viewModel = DateTimePickerViewModel(dateTimePickerPresenterBuilder: DateTimePickerPresenter.Builder(viewController: self))
+    private var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
+            guard let viewModel = self?.viewModel else {
+                return []
+            }
+            return [
+                viewModel.dateLabel.observe(onNext: { (time) in
+                    if let timeString = (time as? String) {
+                        self?.timeLabel.text = String(timeString)
+                    }
+            })
+            ]
+        })
+    }
+    
+    @IBAction
+    func selectDatePressed() {
+        viewModel.onSelectDatePressed()
+    }
+    
+    @IBAction
+    func selectTimePressed() {
+        viewModel.onSelectTimePressed()
+    }
+}
diff --git a/newexample/ios/Demo/Demo.entitlements b/newexample/ios/Demo/Demo.entitlements
new file mode 100644
index 000000000..97405eaca
--- /dev/null
+++ b/newexample/ios/Demo/Demo.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:kaluga-links.web.app</string>
+	</array>
+</dict>
+</plist>
diff --git a/newexample/ios/Demo/ExampleViewController.swift b/newexample/ios/Demo/ExampleViewController.swift
new file mode 100644
index 000000000..6b0be8f80
--- /dev/null
+++ b/newexample/ios/Demo/ExampleViewController.swift
@@ -0,0 +1,57 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class ExampleViewController : UIViewController {
+    
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let featuresList = "FeaturesList"
+        static let infoView = "InfoViewController"
+    }
+    
+    @IBOutlet weak var containerView: UIView!
+    @IBOutlet weak var bottomView: UIStackView!
+    
+    lazy var featuresListController = Const.storyboard.instantiateViewController(withIdentifier: Const.featuresList) as! FeaturesListViewController
+    lazy var infoViewController = Const.storyboard.instantiateViewController(withIdentifier: Const.infoView) as! InfoViewController
+    
+    lazy var viewModel: ExampleViewModel = KNArchitectureFramework().createExampleViewModel(parent: self,
+                                                                                                  containerView: containerView,
+                                                                                                  featuresList: { self.featuresListController },
+                                                                                                  info:  { self.infoViewController })
+    
+    var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+            guard let viewModel = self?.viewModel, let bottomView = self?.bottomView else { return [] }
+            return viewModel.observeTabs(stackView: bottomView) { (button: UIButton, action: @escaping () -> KotlinUnit) in
+                button.addAction { let _ = action() }
+            }
+        }
+    }
+    
+}
diff --git a/newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift b/newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift
new file mode 100644
index 000000000..1f6f19df9
--- /dev/null
+++ b/newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -0,0 +1,75 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class FeaturesListViewController : UITableViewController {
+    
+    private lazy var viewModel: FeatureListViewModel = KNArchitectureFramework().createFeatureListViewModel(parent: self)
+    private var lifecycleManager: LifecycleManager!
+
+    private var features = [String]()
+    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+            guard let viewModel = self?.viewModel else { return [] }
+            return [viewModel.observeFeatures() { (features: [String], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
+                self?.features = features
+                self?.onSelected = onSelected
+                self?.tableView.reloadData()
+            }]
+        }
+    }
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return features.count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: FeaturesListCell.Const.identifier, for: indexPath) as! FeaturesListCell
+        cell.label.text = features[indexPath.row]
+        return cell
+    }
+    
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        tableView.deselectRow(at: indexPath, animated: true)
+    }
+    
+}
+
+class FeaturesListCell : UITableViewCell {
+    
+    struct Const {
+        static let identifier = "FeaturesListCell"
+    }
+    
+    @IBOutlet weak var label: UILabel!
+    
+}
diff --git a/newexample/ios/Demo/Helpers/UIControl+Closure.swift b/newexample/ios/Demo/Helpers/UIControl+Closure.swift
new file mode 100644
index 000000000..de3718ea9
--- /dev/null
+++ b/newexample/ios/Demo/Helpers/UIControl+Closure.swift
@@ -0,0 +1,38 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+
+@objc class UIControlClosure: NSObject {
+    let closure: ()->()
+
+    init (_ closure: @escaping ()->()) {
+        self.closure = closure
+    }
+
+    @objc func invoke () {
+        closure()
+    }
+}
+
+extension UIControl {
+    func addAction(for controlEvents: UIControl.Event = .touchUpInside, _ closure: @escaping ()->()) {
+        let sleeve = UIControlClosure(closure)
+        addTarget(sleeve, action: #selector(UIControlClosure.invoke), for: controlEvents)
+        objc_setAssociatedObject(self, "[\(arc4random())]", sleeve, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
+    }
+}
diff --git a/newexample/ios/Demo/Info.plist b/newexample/ios/Demo/Info.plist
new file mode 100644
index 000000000..51a9d709a
--- /dev/null
+++ b/newexample/ios/Demo/Info.plist
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>com.splendo.kaluga.example</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>kalugaexample</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+    <key>NSBluetoothAlwaysUsageDescription</key>
+    <string>Demonstrate usage of Kaluga library</string>
+    <key>NSBluetoothPeripheralUsageDescription</key>
+    <string>Demonstrate usage of Kaluga library</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>Demonstrate usage of Kaluga library</string>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>Demonstrate usage of Kaluga library</string>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>Demonstrate usage of Kaluga library</string>
+	<key>NSCameraUsageDescription</key>
+	<string>Demonstrate usage of Kaluga library</string>
+	<key>NSContactsUsageDescription</key>
+	<string>Demonstrate usage of Kaluga library</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Demonstrate usage of Kaluga library</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Demonstrate usage of Kaluga library</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Demonstrate usage of Kaluga library</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Demonstrate usage of Kaluga library</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Demonstrate usage of Kaluga library</string>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/newexample/ios/Demo/Info/InfoViewController.swift b/newexample/ios/Demo/Info/InfoViewController.swift
new file mode 100644
index 000000000..e0f6825a8
--- /dev/null
+++ b/newexample/ios/Demo/Info/InfoViewController.swift
@@ -0,0 +1,79 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class InfoViewController : UITableViewController {
+    
+    private lazy var viewModel: InfoViewModel = KNArchitectureFramework().createInfoViewModel(parent: self)
+
+    private var buttons = [String]()
+    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
+    private var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+            
+            guard let viewModel = self?.viewModel else {
+                return []
+            }
+            
+            return [viewModel.observeButtons() { (buttons: [String], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
+                self?.buttons = buttons
+                self?.onSelected = onSelected
+                self?.tableView.reloadData()
+            }]
+        }
+    }
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return buttons.count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: InfoButtonCell.Const.identifier, for: indexPath) as! InfoButtonCell
+        cell.label.text = buttons[indexPath.row]
+        return cell
+    }
+    
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        tableView.deselectRow(at: indexPath, animated: true)
+    }
+    
+}
+
+class InfoButtonCell : UITableViewCell {
+    
+    struct Const {
+        static let identifier = "InfoButtonCell"
+    }
+    
+    @IBOutlet weak var label: UILabel!
+    
+}
diff --git a/newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift b/newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
new file mode 100644
index 000000000..3b973ab9b
--- /dev/null
+++ b/newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
@@ -0,0 +1,50 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class KeyboardManagerViewController : UIViewController {
+    
+    @IBOutlet private var editField: UITextField!
+    
+    private lazy var editFieldFocusHandler = {
+        return UIKitFocusHandler(view: self.editField)
+    }()
+    lazy var viewModel = KNArchitectureFramework().createKeyboardViewModel(focusHandler: self.editFieldFocusHandler)
+    private var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { return [] })
+    }
+    
+    @IBAction
+    func showButtonPressed() {
+        viewModel.onShowPressed()
+    }
+    
+    @IBAction
+    func hideButtonPressed() {
+        viewModel.onHidePressed()
+    }
+}
diff --git a/newexample/ios/Demo/Links/LinksViewController.swift b/newexample/ios/Demo/Links/LinksViewController.swift
new file mode 100644
index 000000000..9f14309e3
--- /dev/null
+++ b/newexample/ios/Demo/Links/LinksViewController.swift
@@ -0,0 +1,59 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import Foundation
+import UIKit
+import KotlinNativeFramework
+
+class LinksViewController : UIViewController {
+    
+    @IBOutlet weak var browserButton: UIButton!
+    @IBOutlet weak var instructionsText: UILabel!
+    
+    private let knArchitectureFramework = KNArchitectureFramework()
+    private lazy var viewModel: LinksViewModel = {
+        return knArchitectureFramework.createLinksViewModel(parent: self, animated: true, completion: nil)
+    }()
+    private var lifecycleManager: LifecycleManager!
+
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = knArchitectureFramework.bind(viewModel: viewModel, to: self) {
+            [
+                self.viewModel.browserButtonText.observe { buttonText in
+                    self.browserButton.setTitle(buttonText as String?, for: .normal)
+                },
+                self.viewModel.linksInstructions.observe { text in
+                    self.instructionsText.text = text as String?
+                }
+            ]
+        }
+    }
+    
+    @IBAction func onBrowserButtonTapped(_ sender: UIButton) {
+        self.viewModel.openWebPage()
+    }
+    
+    func handleIncomingLink(url: String) {
+        self.viewModel.handleIncomingLink(url: url)
+    }
+}
diff --git a/newexample/ios/Demo/LoadingIndicator/ActivityViewController.swift b/newexample/ios/Demo/LoadingIndicator/ActivityViewController.swift
new file mode 100644
index 000000000..045eea92b
--- /dev/null
+++ b/newexample/ios/Demo/LoadingIndicator/ActivityViewController.swift
@@ -0,0 +1,20 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+
+class ActivityViewController: UIViewController { }
diff --git a/newexample/ios/Demo/LoadingIndicator/ActivityViewController.xib b/newexample/ios/Demo/LoadingIndicator/ActivityViewController.xib
new file mode 100644
index 000000000..0b785d2bd
--- /dev/null
+++ b/newexample/ios/Demo/LoadingIndicator/ActivityViewController.xib
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ActivityViewController" customModule="Demo" customModuleProvider="target">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TgB-l6-eNU">
+                    <rect key="frame" x="154" y="387.5" width="106" height="121.5"/>
+                    <subviews>
+                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="j71-db-jJU">
+                            <rect key="frame" x="32" y="32" width="42" height="57.5"/>
+                            <subviews>
+                                <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="5qm-Vi-dOY">
+                                    <rect key="frame" x="2.5" y="0.0" width="37" height="37"/>
+                                </activityIndicatorView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JIh-5Z-dD6">
+                                    <rect key="frame" x="0.0" y="37" width="42" height="20.5"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                        </stackView>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="j71-db-jJU" secondAttribute="trailing" constant="32" id="6BT-5l-gL9"/>
+                        <constraint firstAttribute="bottom" secondItem="j71-db-jJU" secondAttribute="bottom" constant="32" id="7pd-TL-wQ1"/>
+                        <constraint firstItem="j71-db-jJU" firstAttribute="leading" secondItem="TgB-l6-eNU" secondAttribute="leading" constant="32" id="8YS-wM-gPL"/>
+                        <constraint firstAttribute="height" constant="200" id="nj8-gy-hKC"/>
+                        <constraint firstItem="j71-db-jJU" firstAttribute="top" secondItem="TgB-l6-eNU" secondAttribute="top" constant="32" id="pSA-of-lhb"/>
+                        <constraint firstAttribute="width" constant="200" id="wRA-be-Yeh"/>
+                    </constraints>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="nj8-gy-hKC"/>
+                            <exclude reference="wRA-be-Yeh"/>
+                        </mask>
+                    </variation>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.64653230444785281" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="TgB-l6-eNU" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="3VY-gS-uHZ"/>
+                <constraint firstItem="TgB-l6-eNU" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="DSu-Pe-vnO"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <point key="canvasLocation" x="139" y="125"/>
+        </view>
+    </objects>
+</document>
diff --git a/newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift b/newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift
new file mode 100644
index 000000000..8c2412492
--- /dev/null
+++ b/newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift
@@ -0,0 +1,44 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class LoadingViewController: UITableViewController {
+
+    private lazy var viewModel = HudViewModel(builder: HUD.Builder(viewController: self))
+    private var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { return [] }
+    }
+    
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        tableView.deselectRow(at: indexPath, animated: true)
+        switch (indexPath.row) {
+        case 0: viewModel.onShowSystemPressed()
+        case 1: viewModel.onShowCustomPressed()
+        default: ()
+        }
+    }
+}
diff --git a/newexample/ios/Demo/Location/LocationViewController.swift b/newexample/ios/Demo/Location/LocationViewController.swift
new file mode 100644
index 000000000..a2632b8af
--- /dev/null
+++ b/newexample/ios/Demo/Location/LocationViewController.swift
@@ -0,0 +1,52 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import UIKit
+import CoreLocation
+import KotlinNativeFramework
+
+class LocationViewController: UIViewController {
+
+    struct Const {
+        static let permission = LocationPermission(background: false, precise: true)
+    }
+    
+    //MARK: Properties
+    
+    @IBOutlet weak var label: UILabel!
+    
+    lazy var viewModel = KNArchitectureFramework().createLocationViewModel(permission: Const.permission, repoBuilder: KNLocationFramework().getPermissionRepoBuilder())
+    private var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self, onLifecycle: { [weak self] in
+            guard let viewModel = self?.viewModel else {
+                return []
+            }
+            return [viewModel.location.observe(onNext: { (location) in
+                self?.label.text = location as? String ?? ""
+                })]
+        })
+    }
+}
diff --git a/newexample/ios/Demo/Permissions/PermissionListViewController.swift b/newexample/ios/Demo/Permissions/PermissionListViewController.swift
new file mode 100644
index 000000000..08b634940
--- /dev/null
+++ b/newexample/ios/Demo/Permissions/PermissionListViewController.swift
@@ -0,0 +1,77 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KotlinNativeFramework
+
+class PermissionListViewController : UITableViewController {
+    
+    private lazy var viewModel: PermissionsListViewModel = KNArchitectureFramework().createPermissionListViewModel(parent: self) { (permission) -> UIViewController in
+        return PermissionViewController.create(permission: permission)
+    }
+    private var lifecycleManager: LifecycleManager!
+
+    private var permissions = [PermissionView]()
+    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+            guard let viewModel = self?.viewModel else { return [] }
+            return [viewModel.observePermissions { (permissionViews: [PermissionView], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
+                self?.permissions = permissionViews
+                self?.onSelected = onSelected
+                self?.tableView.reloadData()
+            }]
+        }
+    }
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return permissions.count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: PermissionsListCell.Const.identifier, for: indexPath) as! PermissionsListCell
+        cell.label.text = permissions[indexPath.row].title
+        return cell
+    }
+    
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        tableView.deselectRow(at: indexPath, animated: true)
+    }
+    
+}
+
+class PermissionsListCell : UITableViewCell {
+    
+    struct Const {
+        static let identifier = "PermissionsListCell"
+    }
+    
+    @IBOutlet weak var label: UILabel!
+    
+}
diff --git a/newexample/ios/Demo/Permissions/PermissionViewController.swift b/newexample/ios/Demo/Permissions/PermissionViewController.swift
new file mode 100644
index 000000000..29ce5c847
--- /dev/null
+++ b/newexample/ios/Demo/Permissions/PermissionViewController.swift
@@ -0,0 +1,87 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import Foundation
+import KotlinNativeFramework
+
+class PermissionViewController: UIViewController {
+    
+    private struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let permissionVc = "Permission"
+        
+        static let permissions = KNPermissionsFramework().getPermissions()
+    }
+    
+    static func create(permission: Permission) -> PermissionViewController {
+        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.permissionVc) as! PermissionViewController
+        vc.viewModel = KNArchitectureFramework().createPermissionViewModel(permissions: Const.permissions, permission: permission)
+        return vc
+    }
+    
+    @IBOutlet weak var permissionStateLabel: UILabel!
+    @IBOutlet weak var requestPermissionButton: UIButton!
+    
+    var viewModel: PermissionViewModel!
+    private var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        requestPermissionButton.setTitle(NSLocalizedString("permission_request", comment: ""), for: .normal)
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
+            
+            guard let viewModel = self?.viewModel else {
+                return []
+            }
+            
+            return [
+                viewModel.permissionStateMessage.observe(onNext: { (message) in
+                    self?.permissionStateLabel.text = NSLocalizedString(message as? String ?? "", comment: "")
+                    
+                }),
+                
+                viewModel.requestMessage.observe(onNext: { (optionalMessage) in
+                    guard let message = optionalMessage as? String else {
+                        return
+                    }
+                    
+                    let alert = UIAlertController(title: NSLocalizedString("permission_request", comment: ""), message: message, preferredStyle: .alert)
+                    alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default, handler: nil))
+                    self?.present(alert, animated: true, completion: nil)
+                    
+                    }),
+                
+                viewModel.showPermissionButton.observe(onNext: { (show) in 
+                    self?.requestPermissionButton.isHidden = !(show as? Bool ?? false)
+                    })
+            ]
+        })
+    }
+    
+    
+    @IBAction func requestPermission(sender: Any?) {
+        viewModel.requestPermission()
+    }
+
+}
diff --git a/newexample/ios/Demo/Resources/ButtonViewController.swift b/newexample/ios/Demo/Resources/ButtonViewController.swift
new file mode 100644
index 000000000..68871ce6f
--- /dev/null
+++ b/newexample/ios/Demo/Resources/ButtonViewController.swift
@@ -0,0 +1,68 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import KotlinNativeFramework
+
+class ButtonViewController : UITableViewController {
+    
+    private lazy var viewModel: ButtonViewModel = KNArchitectureFramework().createButtonViewModel(parent: self)
+    private var lifecycleManager: LifecycleManager!
+
+    private var buttons = [KalugaButton]()
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        tableView.allowsSelection = false
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+            guard let viewModel = self?.viewModel else { return [] }
+            return [
+                viewModel.buttons.observe { labels in
+                    self?.buttons = labels?.compactMap { $0 as?  KalugaButton } ?? []
+                    self?.tableView.reloadData()
+                }
+            ]
+        }
+    }
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return buttons.count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: ButtonListCell.Const.identifier, for: indexPath) as! ButtonListCell
+        ButtonStyleKt.bindButton(cell.button, button: buttons[indexPath.row])
+        return cell
+    }
+}
+
+class ButtonListCell : UITableViewCell {
+    
+    struct Const {
+        static let identifier = "ButtonListCell"
+    }
+    
+    @IBOutlet weak var button: UIButton!
+    
+}
diff --git a/newexample/ios/Demo/Resources/ColorViewController.swift b/newexample/ios/Demo/Resources/ColorViewController.swift
new file mode 100644
index 000000000..4f2ce7a2f
--- /dev/null
+++ b/newexample/ios/Demo/Resources/ColorViewController.swift
@@ -0,0 +1,202 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import KotlinNativeFramework
+
+class ColorViewController : UIViewController {
+    
+    @IBOutlet var backdropColorBackground: UIView!
+    @IBOutlet var sourceColorBackground: UIView!
+    @IBOutlet var blendedColorBackground: UIView!
+    
+    @IBOutlet var backdropInputField: UITextField!
+    @IBOutlet var sourceInputField: UITextField!
+    
+    @IBOutlet var blendModeButton: UIButton!
+    @IBOutlet var flipButton: UIButton!
+    
+    @IBOutlet var backdropLightenedColorsCollectionView: UICollectionView!
+    @IBOutlet var backdropDarkenedColorsCollectionView: UICollectionView!
+    @IBOutlet var sourceLightenedColorsCollectionView: UICollectionView!
+    @IBOutlet var sourceDarkenedColorsCollectionView: UICollectionView!
+    @IBOutlet var blendedLightenedColorsCollectionView: UICollectionView!
+    @IBOutlet var blendedDarkenedColorsCollectionView: UICollectionView!
+    
+    private var backdropLightenedColors: [BackgroundStyle] = []
+    private var backdropDarkenedColors: [BackgroundStyle] = []
+    private var sourceLightenedColors: [BackgroundStyle] = []
+    private var sourceDarkenedColors: [BackgroundStyle] = []
+    private var blendedLightenedColors: [BackgroundStyle] = []
+    private var blendedDarkenedColors: [BackgroundStyle] = []
+    
+    private lazy var viewModel: ColorViewModel = KNArchitectureFramework().createColorViewModel(parent: self)
+    private var lifecycleManager: LifecycleManager!
+
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        backdropLightenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
+        backdropDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
+        sourceLightenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
+        sourceDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
+        blendedLightenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
+        blendedDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+            guard let viewModel = self?.viewModel else { return [] }
+            
+            return [
+                viewModel.backdropColorBackground.observe { next in
+                    guard let backdropColorBackground = self?.backdropColorBackground, let backdropBackgroundStyle = next as? BackgroundStyle else {
+                        return
+                    }
+                    BackgroundStyleKt.applyBackgroundStyle(backdropColorBackground, style: backdropBackgroundStyle)
+                },
+                viewModel.sourceColorBackground.observe { next in
+                    guard let sourceColorBackground = self?.sourceColorBackground, let sourceBackgroundStyle = next as? BackgroundStyle else {
+                        return
+                    }
+                    BackgroundStyleKt.applyBackgroundStyle(sourceColorBackground, style: sourceBackgroundStyle)
+                },
+                viewModel.blendedColorBackground.observe { next in
+                    guard let blendedColorBackground = self?.blendedColorBackground, let blendedBackgroundStyle = next as? BackgroundStyle else {
+                        return
+                    }
+                    BackgroundStyleKt.applyBackgroundStyle(blendedColorBackground, style: blendedBackgroundStyle)
+                },
+                viewModel.backdropText.observe { text in
+                    self?.backdropInputField.text = text as String?
+                },
+                viewModel.sourceText.observe { text in
+                    self?.sourceInputField.text = text as String?
+                },
+                viewModel.blendModeButton.observe { next in
+                    guard let blendModeButton = self?.blendModeButton, let buttonStyle = next else {
+                        return
+                    }
+                    ButtonStyleKt.bindButton(blendModeButton, button: buttonStyle)
+                },
+                viewModel.lightenBackdrops.observe { next in
+                    self?.backdropLightenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.backdropLightenedColorsCollectionView?.reloadData()
+                },
+                viewModel.darkenBackdrops.observe { next in
+                    self?.backdropDarkenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.backdropDarkenedColorsCollectionView?.reloadData()
+                },
+                viewModel.lightenSource.observe { next in
+                    self?.sourceLightenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.sourceLightenedColorsCollectionView?.reloadData()
+                },
+                viewModel.darkenSource.observe { next in
+                    self?.sourceDarkenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.sourceDarkenedColorsCollectionView?.reloadData()
+                },
+                viewModel.lightenBlended.observe { next in
+                    self?.blendedLightenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.blendedLightenedColorsCollectionView?.reloadData()
+                },
+                viewModel.darkenBlended.observe { next in
+                    self?.blendedDarkenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.blendedDarkenedColorsCollectionView?.reloadData()
+                },
+            ]
+        }
+        
+        ButtonStyleKt.bindButton(flipButton, button: viewModel.flipButton)
+    }
+}
+
+extension ColorViewController : UITextFieldDelegate {
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        if textField == backdropInputField {
+            viewModel.submitBackdropText(backdropText: textField.text ?? "")
+        }
+        if textField == sourceInputField {
+            viewModel.submitSourceText(sourceText: textField.text ?? "")
+        }
+    }
+}
+
+extension ColorViewController : UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
+    
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        if collectionView == backdropLightenedColorsCollectionView {
+            return backdropLightenedColors.count
+        }
+        if collectionView == backdropDarkenedColorsCollectionView {
+            return backdropDarkenedColors.count
+        }
+        if collectionView == sourceLightenedColorsCollectionView {
+            return sourceLightenedColors.count
+        }
+        if collectionView == sourceDarkenedColorsCollectionView {
+            return sourceDarkenedColors.count
+        }
+        if collectionView == blendedLightenedColorsCollectionView {
+            return blendedLightenedColors.count
+        }
+        if collectionView == blendedDarkenedColorsCollectionView {
+            return blendedDarkenedColors.count
+        }
+        return 0
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        return CGSize.init(width: collectionView.frame.height, height: collectionView.frame.height)
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: ColorCollectionCellView.Const.identifier, for: indexPath) as! ColorCollectionCellView
+        if collectionView == backdropLightenedColorsCollectionView {
+            BackgroundStyleKt.applyBackgroundStyle(cell, style: backdropLightenedColors[indexPath.row])
+        }
+        if collectionView == backdropDarkenedColorsCollectionView {
+            BackgroundStyleKt.applyBackgroundStyle(cell, style: backdropDarkenedColors[indexPath.row])
+        }
+        if collectionView == sourceLightenedColorsCollectionView {
+            BackgroundStyleKt.applyBackgroundStyle(cell, style: sourceLightenedColors[indexPath.row])
+        }
+        if collectionView == sourceDarkenedColorsCollectionView {
+            BackgroundStyleKt.applyBackgroundStyle(cell, style: sourceDarkenedColors[indexPath.row])
+        }
+        if collectionView == blendedLightenedColorsCollectionView {
+            BackgroundStyleKt.applyBackgroundStyle(cell, style: blendedLightenedColors[indexPath.row])
+        }
+        if collectionView == blendedDarkenedColorsCollectionView {
+            BackgroundStyleKt.applyBackgroundStyle(cell, style: blendedDarkenedColors[indexPath.row])
+        }
+        return cell
+    }
+}
+
+class ColorCollectionCellView : UICollectionViewCell {
+    
+    struct Const {
+        static let identifier = "ColorCollectionCellView"
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
diff --git a/newexample/ios/Demo/Resources/LabelViewController.swift b/newexample/ios/Demo/Resources/LabelViewController.swift
new file mode 100644
index 000000000..055c3ba09
--- /dev/null
+++ b/newexample/ios/Demo/Resources/LabelViewController.swift
@@ -0,0 +1,69 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import KotlinNativeFramework
+
+class LabelViewController : UITableViewController {
+    
+    private lazy var viewModel: LabelViewModel = KNArchitectureFramework().createLabelViewModel()
+    private var lifecycleManager: LifecycleManager!
+
+    private var labels = [KalugaLabel]()
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        tableView.allowsSelection = false
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+            guard let viewModel = self?.viewModel else { return [] }
+            return [
+                viewModel.labels.observe { labels in
+                    self?.labels = labels?.compactMap { $0 as?  KalugaLabel } ?? []
+                    self?.tableView.reloadData()
+                }
+            ]
+        }
+    }
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return labels.count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: LabelListCell.Const.identifier, for: indexPath) as! LabelListCell
+        TextStyleKt.bindLabel(cell.label, label: labels[indexPath.row])
+        return cell
+    }
+}
+
+class LabelListCell : UITableViewCell {
+    
+    struct Const {
+        static let identifier = "LabelListCell"
+    }
+    
+    @IBOutlet weak var label: UILabel!
+    
+}
diff --git a/newexample/ios/Demo/Resources/ResourcesListViewController.swift b/newexample/ios/Demo/Resources/ResourcesListViewController.swift
new file mode 100644
index 000000000..906c7c6e7
--- /dev/null
+++ b/newexample/ios/Demo/Resources/ResourcesListViewController.swift
@@ -0,0 +1,74 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import KotlinNativeFramework
+
+class ResourcesListViewController : UITableViewController {
+    
+    private lazy var viewModel: ResourcesListViewModel = KNArchitectureFramework().createResourcesViewModel(parent: self)
+    private var lifecycleManager: LifecycleManager!
+
+    private var resources = [String]()
+    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+            guard let viewModel = self?.viewModel else { return [] }
+            return [viewModel.observeResources() { (resources: [String], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
+                self?.resources = resources
+                self?.onSelected = onSelected
+                self?.tableView.reloadData()
+            }]
+        }
+    }
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return resources.count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: ResourcesListCell.Const.identifier, for: indexPath) as! ResourcesListCell
+        cell.label.text = resources[indexPath.row]
+        return cell
+    }
+    
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        tableView.deselectRow(at: indexPath, animated: true)
+    }
+    
+}
+
+class ResourcesListCell : UITableViewCell {
+    
+    struct Const {
+        static let identifier = "ResourcesListCell"
+    }
+    
+    @IBOutlet weak var label: UILabel!
+    
+}
diff --git a/newexample/ios/Demo/System/Network/NetworkViewController.swift b/newexample/ios/Demo/System/Network/NetworkViewController.swift
new file mode 100644
index 000000000..a3c6c7cef
--- /dev/null
+++ b/newexample/ios/Demo/System/Network/NetworkViewController.swift
@@ -0,0 +1,48 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import Foundation
+import UIKit
+import KotlinNativeFramework
+
+class NetworkViewController : UIViewController {
+    
+    private let knArchitectureFramework = KNArchitectureFramework()
+    @IBOutlet weak var networkStateText: UILabel!
+    private var lifecycleManager: LifecycleManager!
+    
+    private lazy var viewModel: NetworkViewModel = NetworkViewModel(networkStateRepoBuilder: NetworkStateRepoBuilder())
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = knArchitectureFramework.bind(viewModel: viewModel, to: self) { [weak self] in
+            guard let viewModel = self?.viewModel else { return [] }
+            
+            return [
+                viewModel.networkState.observe { value in
+                    self?.networkStateText.text = value as? String
+                }
+            ]
+        }
+    }
+    
+}
diff --git a/newexample/ios/Demo/System/SystemViewController.swift b/newexample/ios/Demo/System/SystemViewController.swift
new file mode 100644
index 000000000..9945dfd0d
--- /dev/null
+++ b/newexample/ios/Demo/System/SystemViewController.swift
@@ -0,0 +1,83 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import Foundation
+import UIKit
+import KotlinNativeFramework
+
+class SystemViewController : UITableViewController {
+    
+    private let knArchitectureFramework = KNArchitectureFramework()
+    private lazy var viewModel: SystemViewModel = {
+        return self.knArchitectureFramework.createSystemViewModel(parent: self)
+    }()
+    
+    private var modules = [String]()
+    private var onModuleTapped: ((KotlinInt) -> KotlinUnit)? = nil
+    private var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        lifecycleManager = knArchitectureFramework.bind(viewModel: viewModel, to: self) { [weak self] in
+            guard let viewModel = self?.viewModel else {
+                return []
+            }
+            return [
+                viewModel.observeModules { (modules: [String], onButtonTapped: @escaping (KotlinInt) -> KotlinUnit) in
+                    self?.modules = modules
+                    self?.onModuleTapped = onButtonTapped
+                    self?.tableView.reloadData()
+                }
+            ]
+        }
+    }
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return modules.count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: SystemListCell.Const.identifier, for: indexPath) as! SystemListCell
+        cell.label.text = modules[indexPath.row]
+        return cell
+    }
+    
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let _ = onModuleTapped?(KotlinInt.init(int: Int32(indexPath.row)))
+        tableView.deselectRow(at: indexPath, animated: true)
+    }
+    
+}
+
+class SystemListCell : UITableViewCell {
+    
+    struct Const {
+        static let identifier = "SystemListCell"
+    }
+    
+    @IBOutlet weak var label: UILabel!
+    
+}
diff --git a/newexample/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift b/newexample/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
new file mode 100644
index 000000000..81fa29aa4
--- /dev/null
+++ b/newexample/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
@@ -0,0 +1,51 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+
+final class FittingWidthAutomaticHeightCollectionViewFlowLayout: UICollectionViewFlowLayout {
+
+    override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
+        let layoutAttributesObjects = super.layoutAttributesForElements(in: rect)?.map{ $0.copy() } as? [UICollectionViewLayoutAttributes]
+        layoutAttributesObjects?.forEach({ layoutAttributes in
+            if layoutAttributes.representedElementCategory == .cell {
+                if let newFrame = layoutAttributesForItem(at: layoutAttributes.indexPath)?.frame {
+                    layoutAttributes.frame = newFrame
+                }
+            }
+        })
+        return layoutAttributesObjects
+    }
+
+    override func layoutAttributesForItem(at indexPath: IndexPath) -> UICollectionViewLayoutAttributes? {
+        guard let collectionView = collectionView else {
+            fatalError()
+        }
+        guard let layoutAttributes = super.layoutAttributesForItem(at: indexPath)?.copy() as? UICollectionViewLayoutAttributes else {
+            return nil
+        }
+
+        layoutAttributes.frame.origin.x = sectionInset.left
+        layoutAttributes.frame.size.width = collectionView.safeAreaLayoutGuide.layoutFrame.width - sectionInset.left - sectionInset.right
+        return layoutAttributes
+    }
+
+    override func shouldInvalidateLayout(forPreferredLayoutAttributes preferredAttributes: UICollectionViewLayoutAttributes,
+             withOriginalAttributes originalAttributes: UICollectionViewLayoutAttributes) -> Bool {
+        return true
+    }
+}
diff --git a/newexample/ios/DemoTests/DemoTests.swift b/newexample/ios/DemoTests/DemoTests.swift
new file mode 100644
index 000000000..2aa6b9b30
--- /dev/null
+++ b/newexample/ios/DemoTests/DemoTests.swift
@@ -0,0 +1,46 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import XCTest
+@testable import Demo
+import KotlinNativeFramework
+
+class DemoTests: XCTestCase {
+
+    override func setUp() {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() {
+        assert(KotlinNativeFramework().hello() == "Hello from the shared module common source")
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+
+    func testPerformanceExample() {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}
diff --git a/newexample/ios/DemoTests/Info.plist b/newexample/ios/DemoTests/Info.plist
new file mode 100644
index 000000000..6c40a6cd0
--- /dev/null
+++ b/newexample/ios/DemoTests/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/newexample/ios/DemoUITests/DemoUITests.swift b/newexample/ios/DemoUITests/DemoUITests.swift
new file mode 100644
index 000000000..85a5ce551
--- /dev/null
+++ b/newexample/ios/DemoUITests/DemoUITests.swift
@@ -0,0 +1,44 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import XCTest
+
+class DemoUITests: XCTestCase {
+
+    override func setUp() {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+
+        // In UI tests it is usually best to stop immediately when a failure occurs.
+        continueAfterFailure = false
+
+        // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method.
+        XCUIApplication().launch()
+
+        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() {
+        // Use recording to get started writing UI tests.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+
+}
diff --git a/newexample/ios/DemoUITests/Info.plist b/newexample/ios/DemoUITests/Info.plist
new file mode 100644
index 000000000..6c40a6cd0
--- /dev/null
+++ b/newexample/ios/DemoUITests/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/newexample/ios/ios.xcodeproj/project.pbxproj b/newexample/ios/ios.xcodeproj/project.pbxproj
deleted file mode 100644
index d6c8d7d77..000000000
--- a/newexample/ios/ios.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,383 +0,0 @@
-    // !$*UTF8*$!
-    {
-    	archiveVersion = 1;
-    	classes = {
-    	};
-    	objectVersion = 50;
-    	objects = {
-
-    /* Begin PBXBuildFile section */
-058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
-058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
-    		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
-    		7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
-    /* End PBXBuildFile section */
-
-    /* Begin PBXCopyFilesBuildPhase section */
-    		7555FFB4242A642300829871 /* Embed Frameworks */ = {
-    			isa = PBXCopyFilesBuildPhase;
-    			buildActionMask = 2147483647;
-    			dstPath = "";
-    			dstSubfolderSpec = 10;
-    			files = (
-    			);
-    			name = "Embed Frameworks";
-    			runOnlyForDeploymentPostprocessing = 0;
-    		};
-    /* End PBXCopyFilesBuildPhase section */
-
-    /* Begin PBXFileReference section */
-    		058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
-    		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
-    		7555FF7B242A565900829871 /* ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
-    		7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
-    		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-    /* End PBXFileReference section */
-
-    /* Begin PBXFrameworksBuildPhase section */
-    		7555FF78242A565900829871 /* Frameworks */ = {
-    			isa = PBXFrameworksBuildPhase;
-    			buildActionMask = 2147483647;
-    			files = (
-    			);
-    			runOnlyForDeploymentPostprocessing = 0;
-    		};
-    /* End PBXFrameworksBuildPhase section */
-
-    /* Begin PBXGroup section */
-    		058557D7273AAEEB004C7B11 /* Preview Content */ = {
-	isa = PBXGroup;
-	children = (
-		058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */,
-	);
-	path = "Preview Content";
-	sourceTree = "<group>";
-};
-    		7555FF72242A565900829871 = {
-    			isa = PBXGroup;
-    			children = (
-    				7555FF7D242A565900829871 /* ios */,
-    				7555FF7C242A565900829871 /* Products */,
-    				7555FFB0242A642200829871 /* Frameworks */,
-    			);
-    			sourceTree = "<group>";
-    		};
-    		7555FF7C242A565900829871 /* Products */ = {
-    			isa = PBXGroup;
-    			children = (
-    				7555FF7B242A565900829871 /* ios.app */,
-    			);
-    			name = Products;
-    			sourceTree = "<group>";
-    		};
-    		7555FF7D242A565900829871 /* ios */ = {
-    			isa = PBXGroup;
-    			children = (
-    				058557BA273AAA24004C7B11 /* Assets.xcassets */,
-    				7555FF82242A565900829871 /* ContentView.swift */,
-    				7555FF8C242A565B00829871 /* Info.plist */,
-    				2152FB032600AC8F00CF470E /* iOSApp.swift */,
-		058557D7273AAEEB004C7B11 /* Preview Content */,
-    			);
-    			path = ios;
-    			sourceTree = "<group>";
-    		};
-    		7555FFB0242A642200829871 /* Frameworks */ = {
-    			isa = PBXGroup;
-    			children = (
-    			);
-    			name = Frameworks;
-    			sourceTree = "<group>";
-    		};
-    /* End PBXGroup section */
-
-    /* Begin PBXNativeTarget section */
-    		7555FF7A242A565900829871 /* ios */ = {
-    			isa = PBXNativeTarget;
-    			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "ios" */;
-    			buildPhases = (
-    				7555FFB5242A651A00829871 /* ShellScript */,
-    				7555FF77242A565900829871 /* Sources */,
-    				7555FF78242A565900829871 /* Frameworks */,
-    				7555FF79242A565900829871 /* Resources */,
-    				7555FFB4242A642300829871 /* Embed Frameworks */,
-    			);
-    			buildRules = (
-    			);
-    			dependencies = (
-    			);
-    			name = ios;
-    			productName = ios;
-    			productReference = 7555FF7B242A565900829871 /* ios.app */;
-    			productType = "com.apple.product-type.application";
-    		};
-    /* End PBXNativeTarget section */
-
-    /* Begin PBXProject section */
-    		7555FF73242A565900829871 /* Project object */ = {
-    			isa = PBXProject;
-    			attributes = {
-    				LastSwiftUpdateCheck = 1130;
-    				LastUpgradeCheck = 1130;
-    				ORGANIZATIONNAME = orgName;
-    				TargetAttributes = {
-    					7555FF7A242A565900829871 = {
-    						CreatedOnToolsVersion = 11.3.1;
-    					};
-    				};
-    			};
-    			buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "ios" */;
-    			compatibilityVersion = "Xcode 9.3";
-    			developmentRegion = en;
-    			hasScannedForEncodings = 0;
-    			knownRegions = (
-    				en,
-    				Base,
-    			);
-    			mainGroup = 7555FF72242A565900829871;
-    			productRefGroup = 7555FF7C242A565900829871 /* Products */;
-    			projectDirPath = "";
-    			projectRoot = "";
-    			targets = (
-    				7555FF7A242A565900829871 /* ios */,
-    			);
-    		};
-    /* End PBXProject section */
-
-    /* Begin PBXResourcesBuildPhase section */
-    		7555FF79242A565900829871 /* Resources */ = {
-    			isa = PBXResourcesBuildPhase;
-    			buildActionMask = 2147483647;
-    			files = (
-		058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */,
-		058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */,
-    			);
-    			runOnlyForDeploymentPostprocessing = 0;
-    		};
-    /* End PBXResourcesBuildPhase section */
-
-    /* Begin PBXShellScriptBuildPhase section */
-    		7555FFB5242A651A00829871 /* ShellScript */ = {
-    			isa = PBXShellScriptBuildPhase;
-    			buildActionMask = 2147483647;
-    			files = (
-    			);
-    			inputFileListPaths = (
-    			);
-    			inputPaths = (
-    			);
-    			outputFileListPaths = (
-    			);
-    			outputPaths = (
-    			);
-    			runOnlyForDeploymentPostprocessing = 0;
-    			shellPath = /bin/sh;
-    			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
-    		};
-    /* End PBXShellScriptBuildPhase section */
-
-    /* Begin PBXSourcesBuildPhase section */
-    		7555FF77242A565900829871 /* Sources */ = {
-    			isa = PBXSourcesBuildPhase;
-    			buildActionMask = 2147483647;
-    			files = (
-    				2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
-    				7555FF83242A565900829871 /* ContentView.swift in Sources */,
-    			);
-    			runOnlyForDeploymentPostprocessing = 0;
-    		};
-    /* End PBXSourcesBuildPhase section */
-
-    /* Begin XCBuildConfiguration section */
-    		7555FFA3242A565B00829871 /* Debug */ = {
-    			isa = XCBuildConfiguration;
-    			buildSettings = {
-    				ALWAYS_SEARCH_USER_PATHS = NO;
-    				CLANG_ANALYZER_NONNULL = YES;
-    				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-    				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-    				CLANG_CXX_LIBRARY = "libc++";
-    				CLANG_ENABLE_MODULES = YES;
-    				CLANG_ENABLE_OBJC_ARC = YES;
-    				CLANG_ENABLE_OBJC_WEAK = YES;
-    				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-    				CLANG_WARN_BOOL_CONVERSION = YES;
-    				CLANG_WARN_COMMA = YES;
-    				CLANG_WARN_CONSTANT_CONVERSION = YES;
-    				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-    				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-    				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-    				CLANG_WARN_EMPTY_BODY = YES;
-    				CLANG_WARN_ENUM_CONVERSION = YES;
-    				CLANG_WARN_INFINITE_RECURSION = YES;
-    				CLANG_WARN_INT_CONVERSION = YES;
-    				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-    				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-    				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-    				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-    				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-    				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-    				CLANG_WARN_STRICT_PROTOTYPES = YES;
-    				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-    				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-    				CLANG_WARN_UNREACHABLE_CODE = YES;
-    				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-    				COPY_PHASE_STRIP = NO;
-    				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-    				ENABLE_STRICT_OBJC_MSGSEND = YES;
-    				ENABLE_TESTABILITY = YES;
-    				GCC_C_LANGUAGE_STANDARD = gnu11;
-    				GCC_DYNAMIC_NO_PIC = NO;
-    				GCC_NO_COMMON_BLOCKS = YES;
-    				GCC_OPTIMIZATION_LEVEL = 0;
-    				GCC_PREPROCESSOR_DEFINITIONS = (
-    					"DEBUG=1",
-    					"$(inherited)",
-    				);
-    				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-    				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-    				GCC_WARN_UNDECLARED_SELECTOR = YES;
-    				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-    				GCC_WARN_UNUSED_FUNCTION = YES;
-    				GCC_WARN_UNUSED_VARIABLE = YES;
-    				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
-    				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-    				MTL_FAST_MATH = YES;
-    				ONLY_ACTIVE_ARCH = YES;
-    				SDKROOT = iphoneos;
-    				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-    				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-    			};
-    			name = Debug;
-    		};
-    		7555FFA4242A565B00829871 /* Release */ = {
-    			isa = XCBuildConfiguration;
-    			buildSettings = {
-    				ALWAYS_SEARCH_USER_PATHS = NO;
-    				CLANG_ANALYZER_NONNULL = YES;
-    				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-    				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-    				CLANG_CXX_LIBRARY = "libc++";
-    				CLANG_ENABLE_MODULES = YES;
-    				CLANG_ENABLE_OBJC_ARC = YES;
-    				CLANG_ENABLE_OBJC_WEAK = YES;
-    				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-    				CLANG_WARN_BOOL_CONVERSION = YES;
-    				CLANG_WARN_COMMA = YES;
-    				CLANG_WARN_CONSTANT_CONVERSION = YES;
-    				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-    				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-    				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-    				CLANG_WARN_EMPTY_BODY = YES;
-    				CLANG_WARN_ENUM_CONVERSION = YES;
-    				CLANG_WARN_INFINITE_RECURSION = YES;
-    				CLANG_WARN_INT_CONVERSION = YES;
-    				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-    				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-    				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-    				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-    				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-    				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-    				CLANG_WARN_STRICT_PROTOTYPES = YES;
-    				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-    				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-    				CLANG_WARN_UNREACHABLE_CODE = YES;
-    				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-    				COPY_PHASE_STRIP = NO;
-    				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-    				ENABLE_NS_ASSERTIONS = NO;
-    				ENABLE_STRICT_OBJC_MSGSEND = YES;
-    				GCC_C_LANGUAGE_STANDARD = gnu11;
-    				GCC_NO_COMMON_BLOCKS = YES;
-    				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-    				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-    				GCC_WARN_UNDECLARED_SELECTOR = YES;
-    				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-    				GCC_WARN_UNUSED_FUNCTION = YES;
-    				GCC_WARN_UNUSED_VARIABLE = YES;
-    				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
-    				MTL_ENABLE_DEBUG_INFO = NO;
-    				MTL_FAST_MATH = YES;
-    				SDKROOT = iphoneos;
-    				SWIFT_COMPILATION_MODE = wholemodule;
-    				SWIFT_OPTIMIZATION_LEVEL = "-O";
-    				VALIDATE_PRODUCT = YES;
-    			};
-    			name = Release;
-    		};
-    		7555FFA6242A565B00829871 /* Debug */ = {
-    			isa = XCBuildConfiguration;
-    			buildSettings = {
-    				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-    				CODE_SIGN_STYLE = Automatic;
-		DEVELOPMENT_ASSET_PATHS = "\"ios/Preview Content\"";
-    				ENABLE_PREVIEWS = YES;
-    				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
-    				INFOPLIST_FILE = ios/Info.plist;
-    				LD_RUNPATH_SEARCH_PATHS = (
-    					"$(inherited)",
-    					"@executable_path/Frameworks",
-    				);
-    				OTHER_LDFLAGS = (
-    					"$(inherited)",
-    					"-framework",
-    					shared,
-    				);
-    				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.ios;
-    				PRODUCT_NAME = "$(TARGET_NAME)";
-    				SWIFT_VERSION = 5.0;
-    				TARGETED_DEVICE_FAMILY = "1,2";
-    			};
-    			name = Debug;
-    		};
-    		7555FFA7242A565B00829871 /* Release */ = {
-    			isa = XCBuildConfiguration;
-    			buildSettings = {
-    				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-    				CODE_SIGN_STYLE = Automatic;
-    				DEVELOPMENT_ASSET_PATHS = "\"ios/Preview Content\"";
-    				ENABLE_PREVIEWS = YES;
-    				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
-    				INFOPLIST_FILE = ios/Info.plist;
-    				LD_RUNPATH_SEARCH_PATHS = (
-    					"$(inherited)",
-    					"@executable_path/Frameworks",
-    				);
-    				OTHER_LDFLAGS = (
-    					"$(inherited)",
-    					"-framework",
-    					shared,
-    				);
-    				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.ios;
-    				PRODUCT_NAME = "$(TARGET_NAME)";
-    				SWIFT_VERSION = 5.0;
-    				TARGETED_DEVICE_FAMILY = "1,2";
-    			};
-    			name = Release;
-    		};
-    /* End XCBuildConfiguration section */
-
-    /* Begin XCConfigurationList section */
-    		7555FF76242A565900829871 /* Build configuration list for PBXProject "ios" */ = {
-    			isa = XCConfigurationList;
-    			buildConfigurations = (
-    				7555FFA3242A565B00829871 /* Debug */,
-    				7555FFA4242A565B00829871 /* Release */,
-    			);
-    			defaultConfigurationIsVisible = 0;
-    			defaultConfigurationName = Release;
-    		};
-    		7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "ios" */ = {
-    			isa = XCConfigurationList;
-    			buildConfigurations = (
-    				7555FFA6242A565B00829871 /* Debug */,
-    				7555FFA7242A565B00829871 /* Release */,
-    			);
-    			defaultConfigurationIsVisible = 0;
-    			defaultConfigurationName = Release;
-    		};
-    /* End XCConfigurationList section */
-    	};
-    	rootObject = 7555FF73242A565900829871 /* Project object */;
-    }
\ No newline at end of file
diff --git a/newexample/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json b/newexample/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json
deleted file mode 100644
index ee7e3ca03..000000000
--- a/newexample/ios/ios/Assets.xcassets/AccentColor.colorset/Contents.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "colors" : [
-    {
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
\ No newline at end of file
diff --git a/newexample/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/newexample/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index fb88a396b..000000000
--- a/newexample/ios/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
-    {
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
\ No newline at end of file
diff --git a/newexample/ios/ios/Assets.xcassets/Contents.json b/newexample/ios/ios/Assets.xcassets/Contents.json
deleted file mode 100644
index 4aa7c5350..000000000
--- a/newexample/ios/ios/Assets.xcassets/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
\ No newline at end of file
diff --git a/newexample/ios/ios/ContentView.swift b/newexample/ios/ios/ContentView.swift
deleted file mode 100644
index 4c626ac08..000000000
--- a/newexample/ios/ios/ContentView.swift
+++ /dev/null
@@ -1,16 +0,0 @@
-import SwiftUI
-import shared
-
-struct ContentView: View {
-	let greet = Greeting().greeting()
-
-	var body: some View {
-		Text(greet)
-	}
-}
-
-struct ContentView_Previews: PreviewProvider {
-	static var previews: some View {
-		ContentView()
-	}
-}
\ No newline at end of file
diff --git a/newexample/ios/ios/Info.plist b/newexample/ios/ios/Info.plist
deleted file mode 100644
index 8044709cf..000000000
--- a/newexample/ios/ios/Info.plist
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-	</dict>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UILaunchScreen</key>
-	<dict/>
-</dict>
-</plist>
\ No newline at end of file
diff --git a/newexample/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json b/newexample/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json
deleted file mode 100644
index 4aa7c5350..000000000
--- a/newexample/ios/ios/Preview Content/Preview Assets.xcassets/Contents.json	
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
\ No newline at end of file
diff --git a/newexample/ios/ios/iOSApp.swift b/newexample/ios/ios/iOSApp.swift
deleted file mode 100644
index 0648e8602..000000000
--- a/newexample/ios/ios/iOSApp.swift
+++ /dev/null
@@ -1,10 +0,0 @@
-import SwiftUI
-
-@main
-struct iOSApp: App {
-	var body: some Scene {
-		WindowGroup {
-			ContentView()
-		}
-	}
-}
\ No newline at end of file
diff --git a/newexample/shared/build.gradle.kts b/newexample/shared/build.gradle.kts
index 39dafc51e..01ad3d30b 100644
--- a/newexample/shared/build.gradle.kts
+++ b/newexample/shared/build.gradle.kts
@@ -6,29 +6,51 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-commonComponent()
+val libraryVersion = Library.version
+val modules = listOf(
+    "alerts" to true,
+    "architecture" to true,
+    "base" to false,
+    "bluetooth" to false,
+    "beacons" to false,
+    "date-time-picker" to true,
+    "hud" to true,
+    "keyboard" to true,
+    "links" to false,
+    "location" to false,
+    "logging" to false,
+    "resources" to true,
+    "review" to true,
+    "system" to false,
+    "permissions" to false
+)
+
+commonComponent {
+    baseName = "KalugaExampleShared"
+    isStatic = false
+    transitiveExport = true
+    modules.forEach { (module, isExportable) ->
+        if (isExportable) {
+            export("com.splendo.kaluga:$module:$libraryVersion")
+        }
+    }
+}
 
 kotlin {
     sourceSets {
         getByName("commonMain") {
             dependencies {
-                val libraryVersion = Library.version
-                api("com.splendo.kaluga:alerts:$libraryVersion")
-                api("com.splendo.kaluga:architecture:$libraryVersion")
-                api("com.splendo.kaluga:base:$libraryVersion")
-                api("com.splendo.kaluga:bluetooth:$libraryVersion")
-                api("com.splendo.kaluga:beacons:$libraryVersion")
-                api("com.splendo.kaluga:date-time-picker:$libraryVersion")
-                api("com.splendo.kaluga:hud:$libraryVersion")
-                api("com.splendo.kaluga:keyboard:$libraryVersion")
-                api("com.splendo.kaluga:links:$libraryVersion")
-                api("com.splendo.kaluga:location:$libraryVersion")
-                api("com.splendo.kaluga:logging:$libraryVersion")
-                api("com.splendo.kaluga:resources:$libraryVersion")
-                api("com.splendo.kaluga:review:$libraryVersion")
-                api("com.splendo.kaluga:system:$libraryVersion")
-                api("com.splendo.kaluga:permissions:$libraryVersion")
+                modules.forEach { (module, _) ->
+                    api("com.splendo.kaluga:$module:$libraryVersion")
+                }
+                expose(Dependencies.Koin.Core)
             }
         }
     }
-}
\ No newline at end of file
+}
+
+android {
+    dependencies {
+        expose(Dependencies.Koin.Android)
+    }
+}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt b/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
similarity index 60%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
rename to newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index a2825a380..972f1dfce 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
+++ b/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -1,42 +1,35 @@
 /*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
-Copyright 2022 Splendo Consulting B.V. The Netherlands
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
 
-     http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ */
 
-*/
+@file:JvmName("AndroidDependencyInjection")
+package com.splendo.kaluga.example.shared.di
 
-package com.splendo.kaluga.example.di
-
-/* ktlint-disable no-wildcard-imports */
 import com.splendo.kaluga.alerts.AlertPresenter
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.base.singleThreadDispatcher
-import com.splendo.kaluga.bluetooth.Bluetooth
+import com.splendo.kaluga.base.ApplicationHolder
 import com.splendo.kaluga.bluetooth.BluetoothBuilder
-import com.splendo.kaluga.bluetooth.beacons.Beacons
-import com.splendo.kaluga.bluetooth.device.ConnectionSettings
-import com.splendo.kaluga.bluetooth.scanner.BaseScanner
 import com.splendo.kaluga.datetimepicker.DateTimePickerPresenter
-import com.splendo.kaluga.example.architecture.ArchitectureDetailsActivity
 import com.splendo.kaluga.example.shared.viewmodel.ExampleTabNavigation
 import com.splendo.kaluga.example.shared.viewmodel.ExampleViewModel
 import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.CloseDetailsNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
@@ -69,66 +62,24 @@ import com.splendo.kaluga.keyboard.FocusHandler
 import com.splendo.kaluga.keyboard.KeyboardManager
 import com.splendo.kaluga.links.LinksBuilder
 import com.splendo.kaluga.location.LocationStateRepoBuilder
-import com.splendo.kaluga.logging.Logger
-import com.splendo.kaluga.logging.RestrictedLogLevel
-import com.splendo.kaluga.logging.RestrictedLogger
-import com.splendo.kaluga.permissions.base.BasePermissionManager
 import com.splendo.kaluga.permissions.base.Permission
-import com.splendo.kaluga.permissions.base.Permissions
-import com.splendo.kaluga.permissions.base.PermissionsBuilder
-import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNotRegistered
 import com.splendo.kaluga.permissions.location.LocationPermission
-import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
-import com.splendo.kaluga.permissions.registerAllPermissions
 import com.splendo.kaluga.resources.StyledStringBuilder
 import com.splendo.kaluga.review.ReviewManager
 import com.splendo.kaluga.system.network.state.NetworkStateRepoBuilder
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.launch
+import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.module.Module
+import org.koin.dsl.KoinAppDeclaration
 import org.koin.dsl.module
-import kotlin.time.Duration.Companion.minutes
-
-val utilitiesModule = module {
-    single<Logger> { RestrictedLogger(RestrictedLogLevel.None) }
-    single { PermissionsBuilder() }
-    single { LocationStateRepoBuilder(
-        permissionsBuilder = {
-            val builder = get<PermissionsBuilder>()
-            builder.registerLocationPermissionIfNotRegistered(
-                settings = BasePermissionManager.Settings(logger = get())
-            )
-            Permissions(builder, it)
-        }
-    ) }
-    single {
-        BluetoothBuilder(
-            permissionsBuilder = {
-                val builder = get<PermissionsBuilder>()
-                val settings = BasePermissionManager.Settings(logger = get())
-                builder.registerBluetoothPermissionIfNotRegistered(settings = settings)
-                builder.registerLocationPermissionIfNotRegistered(settings = settings)
-                Permissions(builder, it)
-            }
-        ).create(
-            scannerSettingsBuilder = { BaseScanner.Settings(it, logger = get()) },
-            connectionSettings = ConnectionSettings(logger = get())
-        )
-    }
-    single { Beacons(get<Bluetooth>(), timeout = 1.minutes) }
-}
 
-val viewModelModule = module {
+internal val androidModule = module {
     viewModel { (navigator: Navigator<ExampleTabNavigation>) ->
-        ExampleViewModel(
-            navigator
-        )
+        ExampleViewModel(navigator)
     }
 
     viewModel { (navigator: Navigator<FeatureListNavigationAction>) ->
-        FeatureListViewModel(
-            navigator
-        )
+        FeatureListViewModel(navigator)
     }
 
     viewModel { (navigator: Navigator<InfoNavigation<*>>) ->
@@ -139,10 +90,7 @@ val viewModelModule = module {
     }
 
     viewModel { (navigator: Navigator<PermissionsListNavigationAction>) ->
-        PermissionsListViewModel(
-            get(),
-            navigator
-        )
+        PermissionsListViewModel(navigator)
     }
 
     viewModel { (permission: Permission) -> PermissionViewModel(get(), permission) }
@@ -150,17 +98,13 @@ val viewModelModule = module {
     viewModel { (permission: LocationPermission) -> LocationViewModel(permission, get()) }
 
     viewModel { (navigator: Navigator<SingleValueNavigationAction<InputDetails>>) ->
-        ArchitectureInputViewModel(
-            navigator
-        )
+        ArchitectureInputViewModel(navigator)
     }
 
-    viewModel { (initialDetail: InputDetails) ->
+    viewModel { (initialDetail: InputDetails, navigator: Navigator<CloseDetailsNavigation>) ->
         ArchitectureDetailsViewModel(
             initialDetail,
-            ActivityNavigator {
-                NavigationSpec.Close(ArchitectureDetailsActivity.resultCode)
-            }
+            navigator
         )
     }
 
@@ -199,24 +143,19 @@ val viewModelModule = module {
     }
 
     viewModel { (navigator: Navigator<BluetoothListNavigation>) ->
-        BluetoothListViewModel(
-            get(),
-            navigator
-        )
+        BluetoothListViewModel(navigator)
     }
 
     viewModel { (identifier: com.splendo.kaluga.bluetooth.device.Identifier) ->
-        BluetoothDeviceDetailViewModel(get(), identifier)
+        BluetoothDeviceDetailViewModel(identifier)
     }
 
     viewModel {
-        BeaconsListViewModel(get())
+        BeaconsListViewModel()
     }
 
     viewModel { (navigator: Navigator<ResourcesListNavigationAction>) ->
-        ResourcesListViewModel(
-            navigator
-        )
+        ResourcesListViewModel(navigator)
     }
 
     viewModel {
@@ -231,3 +170,14 @@ val viewModelModule = module {
         ButtonViewModel(StyledStringBuilder.Provider(), AlertPresenter.Builder())
     }
 }
+
+fun initKoin(customModules: List<Module> = emptyList()) = initKoin(
+    androidModule,
+    { LocationStateRepoBuilder(permissionsBuilder = it) },
+    { BluetoothBuilder(permissionsBuilder = it) },
+    customModules
+)
+
+internal actual val appDeclaration: KoinAppDeclaration = {
+    androidContext(ApplicationHolder.applicationContext)
+}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
new file mode 100644
index 000000000..13c160b79
--- /dev/null
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -0,0 +1,84 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.di
+
+import com.splendo.kaluga.bluetooth.Bluetooth
+import com.splendo.kaluga.bluetooth.BluetoothBuilder
+import com.splendo.kaluga.bluetooth.beacons.Beacons
+import com.splendo.kaluga.bluetooth.device.ConnectionSettings
+import com.splendo.kaluga.bluetooth.scanner.BaseScanner
+import com.splendo.kaluga.location.LocationStateRepoBuilder
+import com.splendo.kaluga.logging.Logger
+import com.splendo.kaluga.logging.RestrictedLogLevel
+import com.splendo.kaluga.logging.RestrictedLogger
+import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.Permissions
+import com.splendo.kaluga.permissions.base.PermissionsBuilder
+import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNotRegistered
+import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
+import org.koin.core.context.startKoin
+import org.koin.core.module.Module
+import org.koin.dsl.KoinAppDeclaration
+import org.koin.dsl.module
+import kotlin.coroutines.CoroutineContext
+import kotlin.time.Duration.Companion.minutes
+
+typealias LocationStateRepoBuilderBuilder = (suspend (CoroutineContext) -> Permissions) -> LocationStateRepoBuilder
+typealias BluetoothBuilderBuilder = (suspend (CoroutineContext) -> Permissions) -> BluetoothBuilder
+
+private fun sharedModule(
+    locationStateRepoBuilderBuilder: LocationStateRepoBuilderBuilder,
+    bluetoothBuilderBuilder: BluetoothBuilderBuilder
+) = module {
+    single<Logger> { RestrictedLogger(RestrictedLogLevel.None) }
+    single { PermissionsBuilder() }
+    single { locationStateRepoBuilderBuilder {
+            val builder = get<PermissionsBuilder>()
+            builder.registerLocationPermissionIfNotRegistered(
+                settings = BasePermissionManager.Settings(logger = get())
+            )
+            Permissions(builder, it)
+        }
+    }
+    single {
+        bluetoothBuilderBuilder {
+                val builder = get<PermissionsBuilder>()
+                val settings = BasePermissionManager.Settings(logger = get())
+                builder.registerBluetoothPermissionIfNotRegistered(settings = settings)
+                builder.registerLocationPermissionIfNotRegistered(settings = settings)
+                Permissions(builder, it)
+            }
+        .create(
+            scannerSettingsBuilder = { BaseScanner.Settings(it, logger = get()) },
+            connectionSettings = ConnectionSettings(logger = get())
+        )
+    }
+    single { Beacons(get<Bluetooth>(), timeout = 1.minutes) }
+}
+
+internal fun initKoin(
+    platformModule: Module,
+    locationStateRepoBuilderBuilder: LocationStateRepoBuilderBuilder,
+    bluetoothBuilderBuilder: BluetoothBuilderBuilder,
+    customModules: List<Module> = emptyList()
+) = startKoin {
+    appDeclaration()
+    modules(platformModule, sharedModule(locationStateRepoBuilderBuilder, bluetoothBuilderBuilder), *customModules.toTypedArray())
+}
+
+internal expect val appDeclaration: KoinAppDeclaration
diff --git a/newexample/shared/src/commonMain/kotlin/model/contacts/ContactDetails.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/contacts/ContactDetails.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/model/contacts/ContactDetails.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/contacts/ContactDetails.kt
diff --git a/newexample/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
similarity index 94%
rename from newexample/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
index 07eba41b7..2a0489501 100644
--- a/newexample/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
@@ -1,3 +1,20 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
 package com.splendo.kaluga.example.shared.stylable
 
 import com.splendo.kaluga.resources.DefaultColors
diff --git a/newexample/shared/src/commonMain/kotlin/stylable/TextStyles.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
similarity index 67%
rename from newexample/shared/src/commonMain/kotlin/stylable/TextStyles.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
index b9d04f117..34faa615a 100644
--- a/newexample/shared/src/commonMain/kotlin/stylable/TextStyles.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
@@ -1,3 +1,20 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
 package com.splendo.kaluga.example.shared.stylable
 
 import com.splendo.kaluga.resources.DefaultColors
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ExampleViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ExampleViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/alert/AlertViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/alert/AlertViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListBeaconViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListBeaconViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
similarity index 92%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
index 4f752265f..2a626d61c 100644
--- a/newexample/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
@@ -25,8 +25,12 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
-class BeaconsListViewModel(private val service: Beacons) : BaseLifecycleViewModel() {
+class BeaconsListViewModel : BaseLifecycleViewModel(), KoinComponent {
+
+    private val service: Beacons by inject()
 
     private val _isScanning = MutableStateFlow(false)
     val isScanning = _isScanning.toInitializedObservable(coroutineScope)
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
similarity index 94%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
index 68a08b032..522e649e2 100644
--- a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
@@ -43,6 +43,8 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 class DeviceDetailsSpec : NavigationBundleSpec<DeviceDetailsSpecRow<*>>(setOf(DeviceDetailsSpecRow.UUIDRow))
 
@@ -50,12 +52,13 @@ sealed class DeviceDetailsSpecRow<V>(associatedType: NavigationBundleSpecType<V>
     object UUIDRow : DeviceDetailsSpecRow<String>(NavigationBundleSpecType.StringType)
 }
 
-class BluetoothDeviceDetailViewModel(private val bluetooth: Bluetooth, private val identifier: Identifier) : BaseLifecycleViewModel() {
+class BluetoothDeviceDetailViewModel(private val identifier: Identifier) : BaseLifecycleViewModel(), KoinComponent {
 
     companion object {
         private const val rssi_frequency = 1000L
     }
 
+    private val bluetooth: Bluetooth by inject()
     private val device = bluetooth.devices()[identifier]
 
     val name = device.info().map { it.name ?: "bluetooth_no_name".localized() }.toUninitializedObservable(coroutineScope)
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt
similarity index 90%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt
index 3f87cdc8c..8c3988189 100644
--- a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt
@@ -29,11 +29,14 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 class BluetoothListNavigation(bundle: NavigationBundle<DeviceDetailsSpecRow<*>>) : NavigationAction<DeviceDetailsSpecRow<*>>(bundle)
 
-class BluetoothListViewModel(private val bluetooth: Bluetooth, navigator: Navigator<BluetoothListNavigation>) : NavigatingViewModel<BluetoothListNavigation>(navigator) {
+class BluetoothListViewModel(navigator: Navigator<BluetoothListNavigation>) : NavigatingViewModel<BluetoothListNavigation>(navigator), KoinComponent {
 
+    private val bluetooth: Bluetooth by inject()
     private val _isScanning = MutableStateFlow(false)
     val isScanning = _isScanning.toInitializedObservable(coroutineScope)
 
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothServiceViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothServiceViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/bottomsheet/BottomSheetViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactDetailsViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactDetailsViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactsListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/contacts/ContactsListViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/datetimepicker/DateTimePickerViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/datetimepicker/DateTimePickerViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/hud/HudViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/hud/HudViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt
similarity index 91%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt
index fe6b78e04..cdbdd53a3 100644
--- a/newexample/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt
@@ -34,6 +34,8 @@ import com.splendo.kaluga.permissions.registerAllPermissionsNotRegistered
 import com.splendo.kaluga.resources.localized
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 @Serializable
 enum class PermissionView(val title: String) {
@@ -52,7 +54,7 @@ class PermissionNavigationBundleSpec : NavigationBundleSpec<PermissionNavigation
 
 class PermissionsListNavigationAction(permissionView: PermissionView) : NavigationAction<PermissionNavigationBundleSpecRow>(PermissionNavigationBundleSpec().toBundle { spec -> spec.convertValue(permissionView) })
 
-class PermissionsListViewModel(private val permissionsBuilder: PermissionsBuilder, navigator: Navigator<PermissionsListNavigationAction>) : NavigatingViewModel<PermissionsListNavigationAction>(navigator) {
+class PermissionsListViewModel(navigator: Navigator<PermissionsListNavigationAction>) : NavigatingViewModel<PermissionsListNavigationAction>(navigator), KoinComponent {
 
     val permissions = observableOf(
         listOf(
@@ -66,6 +68,7 @@ class PermissionsListViewModel(private val permissionsBuilder: PermissionsBuilde
             PermissionView.Storage
         )
     )
+    private val permissionsBuilder: PermissionsBuilder by inject()
 
     fun onPermissionPressed(permissionView: PermissionView) {
         coroutineScope.launch {
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/resources/ResourcesListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/resources/ResourcesListViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt
rename to newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
new file mode 100644
index 000000000..ab8e1f8b1
--- /dev/null
+++ b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -0,0 +1,36 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.di
+
+import com.splendo.kaluga.bluetooth.BluetoothBuilder
+import com.splendo.kaluga.location.LocationStateRepoBuilder
+import org.koin.core.module.Module
+import org.koin.dsl.KoinAppDeclaration
+import org.koin.dsl.module
+
+internal val iosModule = module {  }
+
+fun initKoin(customModules: List<Module> = emptyList()) = initKoin(
+    iosModule,
+    { LocationStateRepoBuilder(permissionsBuilder = it) },
+    { BluetoothBuilder(permissionsBuilder = it) },
+    customModules
+)
+
+internal actual val appDeclaration: KoinAppDeclaration = {
+}
\ No newline at end of file
diff --git a/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
new file mode 100644
index 000000000..2fc8f1287
--- /dev/null
+++ b/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -0,0 +1,22 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.di
+
+import org.koin.dsl.KoinAppDeclaration
+
+internal actual val appDeclaration: KoinAppDeclaration = { }
diff --git a/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
new file mode 100644
index 000000000..2fc8f1287
--- /dev/null
+++ b/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -0,0 +1,22 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.di
+
+import org.koin.dsl.KoinAppDeclaration
+
+internal actual val appDeclaration: KoinAppDeclaration = { }

From fc31fcb05aa7b459cb756351a6f107b7840def40 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 9 Nov 2022 13:09:42 +0100
Subject: [PATCH 028/227] iOS continued

---
 bluetooth/build.gradle.kts                    |   3 +
 .../kotlin/device/DeviceInfo.kt               |   4 +
 .../commonMain/kotlin/device/DeviceInfo.kt    |  29 +++
 .../src/iosMain/kotlin/device/DeviceInfo.kt   |   2 +
 .../src/jsMain/kotlin/device/DeviceInfo.kt    |   3 +
 .../src/jvmMain/kotlin/device/DeviceInfo.kt   |   5 +
 .../architecture/KNArchitectureFramework.kt   | 229 ------------------
 .../android/src/main/AndroidManifest.xml      |   1 +
 .../splendo/kaluga/example/InfoFragment.kt    |  20 +-
 .../architecture/ArchitectureInputActivity.kt |   3 +-
 .../example/bluetooth/BluetoothActivity.kt    |   4 +-
 .../bluetooth/BluetoothMoreActivity.kt        |  13 +-
 .../kaluga/example/link/LinksActivity.kt      |   5 +-
 .../location/LocationBackgroundService.kt     |   6 +-
 .../permissions/PermissionsDemoActivity.kt    |  25 +-
 .../NetworkFragment.kt => NetworkActivity.kt} |  25 +-
 .../kaluga/example/system/SystemActivity.kt   |  19 +-
 ...gment_network.xml => activity_network.xml} |   0
 .../src/main/res/layout/activity_system.xml   |  17 +-
 newexample/gradle.properties                  |   2 +-
 newexample/ios/Demo.xcodeproj/project.pbxproj | 102 ++------
 .../Demo/Alerts/AlertsViewController.swift    |  10 +-
 newexample/ios/Demo/AppDelegate.swift         |   4 +-
 .../ArchitectureDetailsViewController.swift   |  25 +-
 .../ArchitectureInputViewController.swift     |  37 +--
 .../ios/Demo/Beacons/BeaconsViewCell.swift    |   2 +-
 .../Demo/Beacons/BeaconsViewController.swift  |  10 +-
 ...BluetoothDeviceDetailsViewController.swift | 101 ++++----
 .../Bluetooth/BluetoothViewController.swift   |  55 +++--
 .../DateTimePickerViewController.swift        |  24 +-
 .../ios/Demo/ExampleViewController.swift      |  57 +++--
 .../FeaturesListViewController.swift          |  61 +++--
 .../ios/Demo/Info/InfoViewController.swift    |  65 +++--
 .../KeyboardManagerViewController.swift       |  16 +-
 .../ios/Demo/Links/LinksViewController.swift  |  12 +-
 .../LoadingViewController.swift               |  12 +-
 .../Location/LocationViewController.swift     |  18 +-
 .../PermissionListViewController.swift        |  48 ++--
 .../PermissionViewController.swift            |  48 ++--
 .../Demo/Resources/ButtonViewController.swift |   6 +-
 .../Demo/Resources/ColorViewController.swift  |   6 +-
 .../Demo/Resources/LabelViewController.swift  |  10 +-
 .../ResourcesListViewController.swift         |  54 +++--
 .../Network/NetworkViewController.swift       |  11 +-
 .../Demo/System/SystemViewController.swift    |  44 ++--
 newexample/ios/DemoTests/DemoTests.swift      |   2 +-
 newexample/shared/build.gradle.kts            |   5 +-
 .../example/shared/di/DependencyInjection.kt  |  19 +-
 .../permissions/NotificationOptions.kt        |  21 ++
 .../ArchitectureInputViewModel.kt             |   2 +-
 .../viewmodel/beacons/BeaconsListViewModel.kt |  10 +-
 .../BluetoothDeviceDetailViewModel.kt         |  16 +-
 .../bluetooth/BluetoothListDeviceViewModel.kt |  13 +-
 .../bluetooth/BluetoothListViewModel.kt       |   7 +-
 .../shared/viewmodel/info/InfoViewModel.kt    |  72 ++----
 .../shared/viewmodel/link/LinksViewModel.kt   |  25 +-
 .../viewmodel/location/LocationViewModel.kt   |  18 +-
 .../permissions/PermissionViewModel.kt        |  11 +-
 .../permissions/PermissionsListViewModel.kt   |  34 ++-
 .../viewmodel/system/SystemViewModel.kt       |  11 +-
 .../system/network/NetworkViewModel.kt        |  15 +-
 .../shared/viewmodel/info/InfoNavigator.kt    |  35 +++
 .../shared/viewmodel/link/BrowserNavigator.kt |  29 +++
 .../permissions/NotificationOptions.kt        |  23 ++
 .../permissions/NotificationOptions.kt        |  21 ++
 .../permissions/NotificationOptions.kt        |  21 ++
 66 files changed, 799 insertions(+), 864 deletions(-)
 rename newexample/android/src/main/java/com/splendo/kaluga/example/system/{fragments/NetworkFragment.kt => NetworkActivity.kt} (65%)
 rename newexample/android/src/main/res/layout/{fragment_network.xml => activity_network.xml} (100%)
 create mode 100644 newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
 create mode 100644 newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoNavigator.kt
 create mode 100644 newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/BrowserNavigator.kt
 create mode 100644 newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
 create mode 100644 newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
 create mode 100644 newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt

diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts
index 5f166f78f..3074d3fbd 100644
--- a/bluetooth/build.gradle.kts
+++ b/bluetooth/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     kotlin("multiplatform")
+    kotlin("plugin.serialization")
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
@@ -20,6 +21,8 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":bluetooth-permissions", ""))
+                expose(Dependencies.KotlinX.Serialization.Core)
+                expose(Dependencies.KotlinX.Serialization.Json)
             }
         }
         commonTest {
diff --git a/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt
index b7e980e8c..c2e4cd326 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt
@@ -15,6 +15,8 @@
 
  */
 
+@file:JvmName("DeviceInfoAndroid")
+
 package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.bluetooth.randomUUIDString
@@ -23,5 +25,7 @@ actual typealias Identifier = String
 
 actual fun randomIdentifier() = randomUUIDString()
 
+actual fun identifierFromString(stringValue: String): Identifier? = stringValue
+
 actual val Identifier.stringValue: String
     get() = this
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
index 6207a2595..1bc054965 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
@@ -19,14 +19,43 @@ package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import kotlin.math.pow
 
 expect class Identifier
 
 expect fun randomIdentifier(): Identifier
 
+expect fun identifierFromString(stringValue: String): Identifier?
+
 expect val Identifier.stringValue: String
 
+@Serializable(with = IdentifierSerializer::class)
+data class SerializableIdentifier(val identifier: Identifier)
+
+val Identifier.serializable get() = SerializableIdentifier(this)
+
+open class IdentifierSerializer :
+    KSerializer<SerializableIdentifier> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("IdentifierString", PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: SerializableIdentifier) {
+        val string = value.identifier.stringValue
+        encoder.encodeString(string)
+    }
+
+    override fun deserialize(decoder: Decoder): SerializableIdentifier {
+        val string = decoder.decodeString()
+        return SerializableIdentifier(identifierFromString(string)!!)
+    }
+}
+
 expect interface DeviceWrapper {
     val name: String?
     val identifier: Identifier
diff --git a/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt
index 4ce31a414..b63fa7394 100644
--- a/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt
@@ -23,5 +23,7 @@ actual typealias Identifier = NSUUID
 
 actual fun randomIdentifier() = Identifier.UUID()
 
+actual fun identifierFromString(stringValue: String): Identifier? = NSUUID(stringValue)
+
 actual val Identifier.stringValue: String
     get() = UUIDString
diff --git a/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt
index 7ed059d60..dbd17364e 100644
--- a/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt
@@ -19,10 +19,13 @@ package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.randomUUIDString
+import com.splendo.kaluga.bluetooth.unsafeUUIDFrom
 
 actual typealias Identifier = UUID
 
 actual fun randomIdentifier() = Identifier(randomUUIDString())
 
+actual fun identifierFromString(stringValue: String): Identifier? = unsafeUUIDFrom(stringValue)
+
 actual val Identifier.stringValue: String
     get() = uuidString
diff --git a/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt
index 7ed059d60..572300133 100644
--- a/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt
@@ -15,14 +15,19 @@
 
  */
 
+@file:JvmName("DeviceInfoJVM")
+
 package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.randomUUIDString
+import com.splendo.kaluga.bluetooth.unsafeUUIDFrom
 
 actual typealias Identifier = UUID
 
 actual fun randomIdentifier() = Identifier(randomUUIDString())
 
+actual fun identifierFromString(stringValue: String): Identifier? = unsafeUUIDFrom(stringValue)
+
 actual val Identifier.stringValue: String
     get() = uuidString
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt
index a719db1ec..ea305d5d6 100644
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt
+++ b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt
@@ -82,109 +82,6 @@ import platform.UserNotifications.UNAuthorizationOptionSound
 
 class KNArchitectureFramework {
 
-    fun createExampleViewModel(
-        parent: UIViewController,
-        containerView: UIView,
-        featuresList: () -> UIViewController,
-        info: () -> UIViewController
-    ): ExampleViewModel {
-        return ExampleViewModel(
-            ViewControllerNavigator(parent) { action ->
-                NavigationSpec.Nested(
-                    NavigationSpec.Nested.Type.Replace(1),
-                    containerView,
-                    when (action) {
-                        is ExampleTabNavigation.FeatureList -> featuresList
-                        is ExampleTabNavigation.Info -> info
-                    }
-                )
-            }
-        )
-    }
-
-    fun createFeatureListViewModel(parent: UIViewController): FeatureListViewModel {
-        return FeatureListViewModel(
-            ViewControllerNavigator(parent) { action ->
-                NavigationSpec.Segue(
-                    when (action) {
-                        is FeatureListNavigationAction.Location -> "showLocation"
-                        is FeatureListNavigationAction.Permissions -> "showPermissions"
-                        is FeatureListNavigationAction.Alerts -> "showAlerts"
-                        is FeatureListNavigationAction.DateTimePicker -> "showDateTimePicker"
-                        is FeatureListNavigationAction.LoadingIndicator -> "showHUD"
-                        is FeatureListNavigationAction.Architecture -> "showArchitecture"
-                        is FeatureListNavigationAction.Keyboard -> "showKeyboard"
-                        is FeatureListNavigationAction.System -> "showSystem"
-                        is FeatureListNavigationAction.Links -> "showLinks"
-                        is FeatureListNavigationAction.Bluetooth -> "showBluetooth"
-                        is FeatureListNavigationAction.Beacons -> "showBeacons"
-                        is FeatureListNavigationAction.PlatformSpecific -> "showPlatformSpecific"
-                        is FeatureListNavigationAction.Resources -> "showResources"
-                    }
-                )
-            }
-        )
-    }
-
-    fun createInfoViewModel(parent: UIViewController): InfoViewModel {
-        return InfoViewModel(
-            ReviewManager.Builder(),
-            ViewControllerNavigator(parent) { action ->
-                when (action) {
-                    is InfoNavigation.Dialog -> {
-                        NavigationSpec.Present(
-                            true,
-                            present = {
-                                val title = action.bundle?.get(DialogSpecRow.TitleRow) ?: ""
-                                val message = action.bundle?.get(DialogSpecRow.MessageRow) ?: ""
-                                UIAlertController.alertControllerWithTitle(title, message, UIAlertControllerStyleAlert).apply {
-                                    addAction(UIAlertAction.actionWithTitle("OK", UIAlertActionStyleDefault) {})
-                                }
-                            }
-                        )
-                    }
-                    is InfoNavigation.Link -> NavigationSpec.Browser(
-                        NSURL.URLWithString(
-                            action.bundle!!.get(LinkSpecRow.LinkRow)
-                        )!!,
-                        NavigationSpec.Browser.Type.Normal
-                    )
-                    is InfoNavigation.Mail -> NavigationSpec.Email(
-                        NavigationSpec.Email.EmailSettings(
-                            to = action.bundle?.get(
-                                MailSpecRow.ToRow
-                            ) ?: emptyList(),
-                            subject = action.bundle?.get(MailSpecRow.SubjectRow)
-                        )
-                    )
-                }
-            }
-        )
-    }
-
-    fun createBluetoothListViewModel(parent: UIViewController, bluetooth: Bluetooth, createDeviceDetailsViewController: (Identifier, Bluetooth) -> UIViewController): BluetoothListViewModel {
-        return BluetoothListViewModel(
-            bluetooth,
-            ViewControllerNavigator(parent) { action ->
-                NavigationSpec.Push(
-                    push = {
-                        val bundle = action.bundle ?: return@Push UIViewController()
-                        val identifier = NSUUID(uUIDString = bundle.get(DeviceDetailsSpecRow.UUIDRow))
-                        createDeviceDetailsViewController(identifier, bluetooth)
-                    }
-                )
-            }
-        )
-    }
-
-    fun createBluetoothDeviceDetailsViewModel(identifier: Identifier, bluetooth: Bluetooth): BluetoothDeviceDetailViewModel {
-        return BluetoothDeviceDetailViewModel(bluetooth, identifier)
-    }
-
-    fun createBeaconsListViewModel(parent: UIViewController, service: Beacons): BeaconsListViewModel {
-        return BeaconsListViewModel(service)
-    }
-
     fun createPermissionListViewModel(parent: UIViewController, createPermissionViewController: (Permission) -> UIViewController): PermissionsListViewModel {
         return PermissionsListViewModel(
             ViewControllerNavigator(parent) { action ->
@@ -223,128 +120,9 @@ class KNArchitectureFramework {
         return LocationViewModel(permission, repoBuilder)
     }
 
-    fun createArchitectureInputViewModel(parent: UIViewController, createDetailsViewController: (InputDetails) -> UIViewController): ArchitectureInputViewModel {
-        return ArchitectureInputViewModel(
-            ViewControllerNavigator(parent) { action ->
-                NavigationSpec.Present(
-                    present = {
-                        createDetailsViewController(action.bundle?.get(action.type) ?: InputDetails("", 0))
-                    }
-                )
-            }
-        )
-    }
-
-    fun createArchitectureDetailsViewModel(parent: UIViewController, inputDetails: InputDetails, onDismiss: (InputDetails) -> Unit): ArchitectureDetailsViewModel {
-        return ArchitectureDetailsViewModel(
-            inputDetails,
-            ViewControllerNavigator(parent) { action ->
-                NavigationSpec.Dismiss(
-                    completion = {
-                        onDismiss(action.bundle?.get(action.type) ?: InputDetails("", 0))
-                    }
-                )
-            }
-        )
-    }
-
     fun createKeyboardViewModel(focusHandler: FocusHandler): KeyboardViewModel {
         return KeyboardViewModel(KeyboardManager.Builder(), focusHandler)
     }
-
-    fun createSystemViewModel(parent: UIViewController): SystemViewModel {
-        return SystemViewModel(
-            ViewControllerNavigator(parent) { action ->
-                when (action) {
-                    SystemNavigationActions.Network ->
-                        NavigationSpec.Segue("showNetwork")
-                }
-            }
-        )
-    }
-
-    fun createResourcesViewModel(parent: UIViewController): ResourcesListViewModel {
-        return ResourcesListViewModel(
-            ViewControllerNavigator(parent) { action ->
-                NavigationSpec.Segue(
-                    when (action) {
-                        is ResourcesListNavigationAction.Button -> "showButton"
-                        is ResourcesListNavigationAction.Color -> "showColor"
-                        is ResourcesListNavigationAction.Label -> "showLabel"
-                    }
-                )
-            }
-        )
-    }
-
-    fun createButtonViewModel(parent: UIViewController) = ButtonViewModel(
-        StyledStringBuilder.Provider(),
-        AlertPresenter.Builder(parent)
-    )
-
-    fun createLabelViewModel() = LabelViewModel(StyledStringBuilder.Provider())
-
-    fun createColorViewModel(parent: UIViewController) = ColorViewModel(AlertPresenter.Builder(parent))
-
-    fun <VM : BaseLifecycleViewModel> bind(viewModel: VM, to: UIViewController, onLifecycleChanges: onLifeCycleChanged): LifecycleManager {
-        return viewModel.addLifecycleManager(to, onLifecycleChanges)
-    }
-
-    fun createLinksViewModel(
-        parent: UIViewController,
-        animated: Boolean,
-        completion: (() -> Unit)? = null
-    ): LinksViewModel {
-        return LinksViewModel(
-            LinksBuilder(),
-            AlertPresenter.Builder(parent),
-            ViewControllerNavigator(parent) { action ->
-                when (action) {
-                    is BrowserNavigationActions.OpenWebView -> NavigationSpec.Browser(
-                        NSURL.URLWithString(action.bundle!!.get(BrowserSpecRow.UrlSpecRow))!!,
-                        NavigationSpec.Browser.Type.Normal
-                    )
-                }
-            }
-        )
-    }
-}
-
-fun ExampleViewModel.observeTabs(stackView: UIStackView, addOnPressed: (UIButton, () -> Unit) -> Unit): List<Disposable> {
-    val selectedButtonDisposeBag = DisposeBag()
-    return listOf(
-        tabs.observeInitialized { tabs ->
-            selectedButtonDisposeBag.dispose()
-            stackView.arrangedSubviews.forEach { subView -> (subView as UIView).removeFromSuperview() }
-            tabs.forEach { tab ->
-                val button = UIButton()
-                button.setTitle(tab.title, UIControlStateNormal)
-                button.setTitleColor(UIColor.systemBlueColor, UIControlStateSelected)
-                button.setTitleColor(UIColor.systemBlueColor, UIControlStateHighlighted)
-                button.setTitleColor(UIColor.grayColor, UIControlStateNormal)
-                this.tab.observeInitialized { selectedTab ->
-                    button.setSelected(selectedTab == tab)
-                }.addTo(selectedButtonDisposeBag)
-                addOnPressed(button) {
-                    this.tab.post(tab)
-                }
-                stackView.addArrangedSubview(button)
-            }
-        }
-    )
-}
-
-fun SystemViewModel.observeModules(onModuleChanged: (List<String>, (Int) -> Unit) -> Unit): Disposable =
-    modules.observeInitialized { modules ->
-        val moduleName = modules.map { it.name }
-        onModuleChanged(moduleName) { onButtonTapped(modules[it]) }
-    }
-
-fun FeatureListViewModel.observeFeatures(onFeaturesChanged: (List<String>, (Int) -> Unit) -> Unit): Disposable {
-    return feature.observeInitialized { features ->
-        val titles = features.map { feature -> feature.title }
-        onFeaturesChanged(titles) { index -> this.onFeaturePressed(features[index]) }
-    }
 }
 
 fun InfoViewModel.observeButtons(onInfoButtonsChanged: (List<String>, (Int) -> Unit) -> Unit): Disposable {
@@ -359,10 +137,3 @@ fun PermissionsListViewModel.observePermissions(onPermissionsChanged: (List<Perm
         onPermissionsChanged(permissions) { index -> this.onPermissionPressed(permissions[index]) }
     }
 }
-
-fun ResourcesListViewModel.observeResources(onResourcesChanged: (List<String>, (Int) -> Unit) -> Unit): Disposable {
-    return resources.observeInitialized { features ->
-        val titles = features.map { feature -> feature.title }
-        onResourcesChanged(titles) { index -> this.onResourceSelected(features[index]) }
-    }
-}
diff --git a/newexample/android/src/main/AndroidManifest.xml b/newexample/android/src/main/AndroidManifest.xml
index 15687a9f7..2cd6b95de 100644
--- a/newexample/android/src/main/AndroidManifest.xml
+++ b/newexample/android/src/main/AndroidManifest.xml
@@ -107,6 +107,7 @@
             android:label="@string/feature_resources_button"/>
 
         <activity android:name=".system.SystemActivity" android:label="@string/feature_system"/>
+        <activity android:name=".system.NetworkActivity" android:label="@string/network_feature"/>
 
 
         <service android:name=".location.LocationBackgroundService"/>
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
index 0520e4b2f..7f2d19139 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
@@ -29,11 +29,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
-import com.splendo.kaluga.example.shared.viewmodel.info.DialogSpecRow
+import com.splendo.kaluga.example.shared.viewmodel.info.DialogSpec
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoNavigation
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
-import com.splendo.kaluga.example.shared.viewmodel.info.LinkSpecRow
-import com.splendo.kaluga.example.shared.viewmodel.info.MailSpecRow
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import java.net.URL
@@ -45,22 +43,20 @@ class InfoFragment : KalugaViewModelFragment<InfoViewModel>(R.layout.fragment_in
             ActivityNavigator<InfoNavigation<*>> { action ->
                 when (action) {
                     is InfoNavigation.Dialog -> {
-                        val title = action.bundle?.get(DialogSpecRow.TitleRow) ?: ""
-                        val message = action.bundle?.get(DialogSpecRow.MessageRow) ?: ""
                         NavigationSpec.Dialog(
                             createDialog = {
-                                InfoDialog(title, message)
+                                InfoDialog(action.value)
                             }
                         )
                     }
                     is InfoNavigation.Link -> NavigationSpec.Browser(
-                        URL(action.bundle!!.get(LinkSpecRow.LinkRow)),
+                        URL(action.value),
                         NavigationSpec.Browser.Type.Normal
                     )
                     is InfoNavigation.Mail -> NavigationSpec.Email(
                         NavigationSpec.Email.EmailSettings(
-                            to = action.bundle?.get(MailSpecRow.ToRow) ?: emptyList(),
-                            subject = action.bundle?.get(MailSpecRow.SubjectRow)
+                            to = action.value.to,
+                            subject = action.value.subject
                         )
                     )
                 }
@@ -108,7 +104,7 @@ class InfoAdapter(private val viewModel: InfoViewModel) : RecyclerView.Adapter<I
     }
 }
 
-class InfoDialog(val title: String, val message: String) : DialogFragment() {
+class InfoDialog(private val dialogSpec: DialogSpec) : DialogFragment() {
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -117,8 +113,8 @@ class InfoDialog(val title: String, val message: String) : DialogFragment() {
     ): View? {
         val v = inflater.inflate(R.layout.dialog_info, container, false)
 
-        v.findViewById<TextView>(R.id.title).text = title
-        v.findViewById<TextView>(R.id.message).text = message
+        v.findViewById<TextView>(R.id.title).text = dialogSpec.title
+        v.findViewById<TextView>(R.id.message).text = dialogSpec.message
 
         return v
     }
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
index b4e3f51fa..3c131451e 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
@@ -31,6 +31,7 @@ import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureInputBinding
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
+import com.splendo.kaluga.example.shared.viewmodel.architecture.InputNavigation
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
@@ -48,7 +49,7 @@ class ArchitectureInputActivity : KalugaViewModelActivity<ArchitectureInputViewM
 
     override val viewModel: ArchitectureInputViewModel by viewModel {
         parametersOf(
-            ActivityNavigator<SingleValueNavigationAction<InputDetails>> {
+            ActivityNavigator<InputNavigation> {
                 NavigationSpec.Activity<ArchitectureDetailsActivity>(
                     launchType = NavigationSpec.Activity.LaunchType.ActivityContract<ArchitectureInputActivity> { contract }
                 )
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
index d07256ba2..35a75ea35 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
@@ -28,8 +28,8 @@ import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.databinding.ActivityBluetoothBinding
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListNavigation
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetails
 import kotlinx.coroutines.runBlocking
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -38,7 +38,7 @@ class BluetoothActivity : KalugaViewModelActivity<BluetoothListViewModel>() {
 
     override val viewModel: BluetoothListViewModel by viewModel {
         parametersOf(
-            ActivityNavigator<BluetoothListNavigation> {
+            ActivityNavigator<DeviceDetails> {
                 NavigationSpec.Activity<BluetoothMoreActivity>()
             }
         )
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
index 22b422dfd..49ce564ef 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
@@ -18,22 +18,21 @@
 package com.splendo.kaluga.example.bluetooth
 
 import android.os.Bundle
-import com.splendo.kaluga.architecture.navigation.toNavigationBundle
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.bluetooth.device.SerializableIdentifier
 import com.splendo.kaluga.example.databinding.ActivityBluetoothMoreBinding
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetailsSpec
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetailsSpecRow
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 class BluetoothMoreActivity : KalugaViewModelActivity<BluetoothDeviceDetailViewModel>() {
 
     override val viewModel: BluetoothDeviceDetailViewModel by viewModel {
-        val deviceDetailsSpec = DeviceDetailsSpec()
-        intent.extras?.toNavigationBundle(deviceDetailsSpec)?.let { bundle ->
-            parametersOf(bundle.get(DeviceDetailsSpecRow.UUIDRow))
-        } ?: parametersOf("")
+        parametersOf(
+            intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(SerializableIdentifier.serializer()))!!.identifier
+        )
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
index 485777505..846c75ea4 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
@@ -25,7 +25,6 @@ import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.databinding.ActivityLinkBinding
 import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
-import com.splendo.kaluga.example.shared.viewmodel.link.BrowserSpecRow
 import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -35,10 +34,10 @@ class LinksActivity : KalugaViewModelActivity<LinksViewModel>(R.layout.activity_
 
     override val viewModel: LinksViewModel by viewModel {
         parametersOf(
-            ActivityNavigator<BrowserNavigationActions<BrowserSpecRow>> {
+            ActivityNavigator<BrowserNavigationActions<*>> {
                 when (it) {
                     is BrowserNavigationActions.OpenWebView -> NavigationSpec.Browser(
-                        URL(it.bundle!!.get(BrowserSpecRow.UrlSpecRow)),
+                        URL(it.value),
                         NavigationSpec.Browser.Type.Normal
                     )
                 }
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
index d7cd3d96e..27a852cd7 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
@@ -28,10 +28,8 @@ import androidx.core.app.NotificationManagerCompat
 import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
 import com.splendo.kaluga.permissions.location.LocationPermission
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
 
-class LocationBackgroundService : androidx.lifecycle.LifecycleService(), KoinComponent {
+class LocationBackgroundService : androidx.lifecycle.LifecycleService() {
 
     companion object {
         const val notificationId = 1
@@ -43,7 +41,7 @@ class LocationBackgroundService : androidx.lifecycle.LifecycleService(), KoinCom
 
     private val notificationService by lazy { applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager }
 
-    private val viewModel = LocationViewModel(permission, get())
+    private val viewModel = LocationViewModel(permission)
 
     override fun onCreate() {
         super.onCreate()
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
index ca92bc4cd..aee8b70c2 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
@@ -22,11 +22,10 @@ import android.view.View
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.widget.AppCompatButton
-import com.splendo.kaluga.architecture.navigation.toNavigationBundle
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionNavigationBundleSpec
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionNavigationBundleSpecRow
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
 import com.splendo.kaluga.permissions.bluetooth.BluetoothPermission
@@ -43,29 +42,15 @@ import org.koin.core.parameter.parametersOf
 class PermissionsDemoActivity : KalugaViewModelActivity<PermissionViewModel>(R.layout.activity_permissions_demo) {
 
     override val viewModel: PermissionViewModel by viewModel {
-        val permissionNavSpec = PermissionNavigationBundleSpec()
-        intent.extras?.toNavigationBundle(permissionNavSpec)?.let { bundle ->
-            val permission = when (bundle.get(PermissionNavigationBundleSpecRow)) {
-                PermissionView.Bluetooth -> BluetoothPermission
-                PermissionView.Calendar -> CalendarPermission(allowWrite = true)
-                PermissionView.Camera -> CameraPermission
-                PermissionView.Contacts -> ContactsPermission(allowWrite = true)
-                PermissionView.Location -> LocationPermission(background = true, precise = true)
-                PermissionView.Microphone -> MicrophonePermission
-                PermissionView.Notifications -> NotificationsPermission()
-                PermissionView.Storage -> StoragePermission(allowWrite = true)
-            }
-            parametersOf(permission)
+        intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))?.let { permissionView ->
+            parametersOf(permissionView.permission)
         } ?: parametersOf()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val permissionNavSpec = PermissionNavigationBundleSpec()
-        intent.extras?.toNavigationBundle(permissionNavSpec)?.let { bundle ->
-            supportActionBar?.title = bundle.get(PermissionNavigationBundleSpecRow).title
-        }
+        supportActionBar?.title = intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))?.title
 
         viewModel.permissionStateMessage.observe {
             findViewById<TextView>(R.id.permissions_message).text = it
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt
similarity index 65%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
rename to newexample/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt
index 3535caea9..51d96e51f 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt
@@ -15,30 +15,25 @@
 
  */
 
-package com.splendo.kaluga.example.system.fragments
+package com.splendo.kaluga.example.system
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.databinding.FragmentNetworkBinding
+import com.splendo.kaluga.example.databinding.ActivityNetworkBinding
 import com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class NetworkFragment : KalugaViewModelFragment<NetworkViewModel>(R.layout.fragment_network) {
+class NetworkActivity : KalugaViewModelActivity<NetworkViewModel>(R.layout.activity_network) {
 
     override val viewModel: NetworkViewModel by viewModel()
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val binding = FragmentNetworkBinding.inflate(inflater)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val binding = ActivityNetworkBinding.inflate(layoutInflater, null, false)
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
-        return binding.root
+        setContentView(binding.root)
     }
-}
+
+}
\ No newline at end of file
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
index 293f385b3..4a1a63290 100644
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
+++ b/newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
@@ -20,29 +20,24 @@ package com.splendo.kaluga.example.system
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.Button
-import androidx.appcompat.widget.AppCompatButton
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.ViewListButtonBinding
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemFeatures
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationActions
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
-import com.splendo.kaluga.example.system.fragments.NetworkFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 class SystemActivity : KalugaViewModelActivity<SystemViewModel>(R.layout.activity_system) {
     override val viewModel: SystemViewModel by viewModel {
         parametersOf(
-            ActivityNavigator<SystemNavigationActions<Unit>> { action ->
+            ActivityNavigator<SystemNavigationActions> { action ->
                 when (action) {
-                    SystemNavigationActions.Network -> NavigationSpec.Fragment(
-                        R.id.system_features_fragment,
-                        createFragment = { NetworkFragment() }
-                    )
+                    SystemNavigationActions.Network -> NavigationSpec.Activity<NetworkActivity>()
                 }
             }
         )
@@ -65,7 +60,9 @@ class SystemFeatureAdapter(
     private val viewModel: SystemViewModel
 ) : RecyclerView.Adapter<SystemFeatureAdapter.SystemFeatureViewHolder>() {
 
-    inner class SystemFeatureViewHolder(val button: Button) : RecyclerView.ViewHolder(button)
+    inner class SystemFeatureViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
+        val button = binding.button
+    }
 
     var modules: List<SystemFeatures> = emptyList()
         set(newValue) {
@@ -74,8 +71,8 @@ class SystemFeatureAdapter(
         }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SystemFeatureViewHolder {
-        val button = LayoutInflater.from(parent.context).inflate(R.layout.view_list_button, parent, false) as AppCompatButton
-        return SystemFeatureViewHolder(button)
+        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return SystemFeatureViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: SystemFeatureViewHolder, position: Int) {
diff --git a/newexample/android/src/main/res/layout/fragment_network.xml b/newexample/android/src/main/res/layout/activity_network.xml
similarity index 100%
rename from newexample/android/src/main/res/layout/fragment_network.xml
rename to newexample/android/src/main/res/layout/activity_network.xml
diff --git a/newexample/android/src/main/res/layout/activity_system.xml b/newexample/android/src/main/res/layout/activity_system.xml
index bfd4af551..77a494611 100644
--- a/newexample/android/src/main/res/layout/activity_system.xml
+++ b/newexample/android/src/main/res/layout/activity_system.xml
@@ -24,19 +24,10 @@
     android:layout_gravity="center_horizontal"
     android:layout_margin="@dimen/networkLayoutsMargin">
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/system_features_fragment"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/system_features_list"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/networkFragmentsHeight"/>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/system_features_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
-    </ScrollView>
+        android:layout_height="wrap_content"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/newexample/gradle.properties b/newexample/gradle.properties
index da6d54955..938da4248 100644
--- a/newexample/gradle.properties
+++ b/newexample/gradle.properties
@@ -1,5 +1,5 @@
 #Gradle
-org.gradle.jvmargs=-Xmx3048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx3048M"
+org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4096M"
 
 #Kotlin
 kotlin.code.style=official
diff --git a/newexample/ios/Demo.xcodeproj/project.pbxproj b/newexample/ios/Demo.xcodeproj/project.pbxproj
index 6d30214da..3a1573fc1 100644
--- a/newexample/ios/Demo.xcodeproj/project.pbxproj
+++ b/newexample/ios/Demo.xcodeproj/project.pbxproj
@@ -38,7 +38,6 @@
 		7478297FCF44ED1D49525D4E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74FDC8922442294AF0776058 /* LaunchScreen.storyboard */; };
 		749B42F84CA72A5D4A0F3AD9 /* DemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */; };
 		74C75886D08DD78EA65E6DD9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 74C9C443CC304CB387AB324D /* Assets.xcassets */; };
-		74C9929AB26988E8CC66893D /* gradle.properties in Resources */ = {isa = PBXBuildFile; fileRef = 74F1F3223C9CF11420F72B08 /* gradle.properties */; };
 		74D656BE6B4BD50115400411 /* DemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 744CF99B70DA1947AA98CA3B /* DemoTests.swift */; };
 		74E6599B023623BD96737582 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74F483E9C1890D693F808DDA /* Main.storyboard */; };
 		978348A7235DF586005B140B /* PermissionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978348A6235DF586005B140B /* PermissionViewController.swift */; };
@@ -102,27 +101,18 @@
 		649979D225CC638C00348419 /* SystemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemViewController.swift; sourceTree = "<group>"; };
 		649979E625CCD37200348419 /* NetworkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkViewController.swift; sourceTree = "<group>"; };
 		740C363F8973304E72F429BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
-		741672C742FA38B5D4971C10 /* gradlew */ = {isa = PBXFileReference; lastKnownFileType = text; path = gradlew; sourceTree = "<group>"; };
-		741A9B938B05534BD1B508C6 /* settings.gradle.kts */ = {isa = PBXFileReference; lastKnownFileType = file.kts; path = settings.gradle.kts; sourceTree = "<group>"; };
 		741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoUITests.swift; sourceTree = "<group>"; };
-		741E82A1DDEE399E80A02B54 /* gradle-wrapper.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = "gradle-wrapper.jar"; sourceTree = "<group>"; };
 		7428D8755D288FD7EA2E6537 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
 		742CCE9033CEC8C8004D624F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		7433F67D6FEF093F4C827A5A /* build.gradle.kts */ = {isa = PBXFileReference; lastKnownFileType = file.kts; path = build.gradle.kts; sourceTree = "<group>"; };
 		744CF99B70DA1947AA98CA3B /* DemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoTests.swift; sourceTree = "<group>"; };
-		744F12775216AF134CBAF4E9 /* build.gradle.kts */ = {isa = PBXFileReference; lastKnownFileType = file.kts; path = build.gradle.kts; sourceTree = "<group>"; };
 		746834742E284396FD5452F4 /* DemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		746E133CAEC5C7B1D516B11F /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		74A0718952D0CC604E49709B /* DemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DemoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		74B0C3AB70AAB7878B48F6B1 /* gradle-wrapper.properties */ = {isa = PBXFileReference; lastKnownFileType = file.properties; path = "gradle-wrapper.properties"; sourceTree = "<group>"; };
 		74BBBF2C57521E71982179E0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		74BEC2BADB02749FD409313B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
 		74C07E8A2DB465B1CE47DC5E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		74C22623993814F606777266 /* KotlinNativeFramework.kt */ = {isa = PBXFileReference; lastKnownFileType = file.kt; path = KotlinNativeFramework.kt; sourceTree = "<group>"; };
 		74C710A1E2E41AF0F4A9FFC5 /* LocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationViewController.swift; sourceTree = "<group>"; };
 		74C9C443CC304CB387AB324D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		74E253D6EF4BB7BA4916943D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
-		74F1F3223C9CF11420F72B08 /* gradle.properties */ = {isa = PBXFileReference; lastKnownFileType = file.properties; path = gradle.properties; sourceTree = "<group>"; };
 		978348A6235DF586005B140B /* PermissionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -288,23 +278,6 @@
 			path = Network;
 			sourceTree = "<group>";
 		};
-		743414FDF97167BD81A5293E /* wrapper */ = {
-			isa = PBXGroup;
-			children = (
-				74B0C3AB70AAB7878B48F6B1 /* gradle-wrapper.properties */,
-				741E82A1DDEE399E80A02B54 /* gradle-wrapper.jar */,
-			);
-			path = wrapper;
-			sourceTree = "<group>";
-		};
-		743EA5EA3B99CA8E01574460 /* KotlinNativeFrameworkMain */ = {
-			isa = PBXGroup;
-			children = (
-				7470228E28317355EFB70D41 /* kotlin */,
-			);
-			path = KotlinNativeFrameworkMain;
-			sourceTree = "<group>";
-		};
 		745520950D85E4696686141D = {
 			isa = PBXGroup;
 			children = (
@@ -313,37 +286,7 @@
 				746CAD9D15ECB24F4ED84E11 /* Demo */,
 				7492DE0914511F3DC96A30A8 /* DemoTests */,
 				74D6698E6E24A4F93E6B289A /* DemoUITests */,
-				747F646D72854D37D5686909 /* KotlinNativeFramework */,
-				74588EBE65D1E22D05BFD2A5 /* Supporting Files */,
-			);
-			sourceTree = "<group>";
-		};
-		745778F955B940F5CB818364 /* gradle */ = {
-			isa = PBXGroup;
-			children = (
-				743414FDF97167BD81A5293E /* wrapper */,
-			);
-			path = gradle;
-			sourceTree = "<group>";
-		};
-		74588EBE65D1E22D05BFD2A5 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				7433F67D6FEF093F4C827A5A /* build.gradle.kts */,
-				741672C742FA38B5D4971C10 /* gradlew */,
-				745778F955B940F5CB818364 /* gradle */,
-				741A9B938B05534BD1B508C6 /* settings.gradle.kts */,
-				74F1F3223C9CF11420F72B08 /* gradle.properties */,
-			);
-			path = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		745DD28172357B2F37C397E8 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				743EA5EA3B99CA8E01574460 /* KotlinNativeFrameworkMain */,
 			);
-			path = src;
 			sourceTree = "<group>";
 		};
 		746CAD9D15ECB24F4ED84E11 /* Demo */ = {
@@ -376,14 +319,6 @@
 			path = Demo;
 			sourceTree = "<group>";
 		};
-		7470228E28317355EFB70D41 /* kotlin */ = {
-			isa = PBXGroup;
-			children = (
-				74C22623993814F606777266 /* KotlinNativeFramework.kt */,
-			);
-			path = kotlin;
-			sourceTree = "<group>";
-		};
 		747A549D9FF0D1B49E65E190 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -394,16 +329,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		747F646D72854D37D5686909 /* KotlinNativeFramework */ = {
-			isa = PBXGroup;
-			children = (
-				74E253D6EF4BB7BA4916943D /* Info.plist */,
-				74ED9583BC95062A511A899E /* Supporting Files */,
-				745DD28172357B2F37C397E8 /* src */,
-			);
-			path = KotlinNativeFramework;
-			sourceTree = "<group>";
-		};
 		7492DE0914511F3DC96A30A8 /* DemoTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -422,14 +347,6 @@
 			path = DemoUITests;
 			sourceTree = "<group>";
 		};
-		74ED9583BC95062A511A899E /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				744F12775216AF134CBAF4E9 /* build.gradle.kts */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		978348A5235DF51D005B140B /* Permissions */ = {
 			isa = PBXGroup;
 			children = (
@@ -550,7 +467,6 @@
 				7478297FCF44ED1D49525D4E /* LaunchScreen.storyboard in Resources */,
 				74E6599B023623BD96737582 /* Main.storyboard in Resources */,
 				209471EA24C07F5F001426CD /* BluetoothDescriptorCell.xib in Resources */,
-				74C9929AB26988E8CC66893D /* gradle.properties in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -580,7 +496,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/Supporting Files\"\n./gradlew :KotlinNativeFramework:embedAndSignAppleFrameworkForXcode\n";
+			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -756,10 +672,16 @@
 				DEVELOPMENT_TEAM = 2732HQPVJP;
 				FRAMEWORK_SEARCH_PATHS = (
 					$BUILT_PRODUCTS_DIR,
-					"$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = Demo/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					KalugaExampleShared,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.kaluga.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Kaluga example";
@@ -882,10 +804,16 @@
 				DEVELOPMENT_TEAM = 2732HQPVJP;
 				FRAMEWORK_SEARCH_PATHS = (
 					$BUILT_PRODUCTS_DIR,
-					"$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = Demo/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					KalugaExampleShared,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.kaluga.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Kaluga example";
diff --git a/newexample/ios/Demo/Alerts/AlertsViewController.swift b/newexample/ios/Demo/Alerts/AlertsViewController.swift
index 743ea8f06..96e81b313 100644
--- a/newexample/ios/Demo/Alerts/AlertsViewController.swift
+++ b/newexample/ios/Demo/Alerts/AlertsViewController.swift
@@ -17,21 +17,21 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class AlertsViewController: UITableViewController {
 
     private lazy var viewModel = AlertViewModel(builder: AlertPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { return [] }
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
     }
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
diff --git a/newexample/ios/Demo/AppDelegate.swift b/newexample/ios/Demo/AppDelegate.swift
index b1b416e18..cefdc285e 100644
--- a/newexample/ios/Demo/AppDelegate.swift
+++ b/newexample/ios/Demo/AppDelegate.swift
@@ -17,6 +17,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 */
 
 import UIKit
+import KalugaExampleShared
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -24,6 +25,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        DependencyInjectionKt.doInitKoin(customModules: [])
         return true
     }
     
@@ -43,7 +45,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let vc = storyboard.instantiateViewController(withIdentifier: "LinksViewController") as! LinksViewController
         self.window?.rootViewController = vc
         
-        vc.handleIncomingLink(url: stringUrl)
+//        vc.handleIncomingLink(url: stringUrl)
         return true
     }
 
diff --git a/newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift b/newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
index 577b793ef..cc6b9fcfc 100644
--- a/newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
+++ b/newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
@@ -16,7 +16,7 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ArchitectureDetailsViewController: UIViewController {
     
@@ -30,12 +30,15 @@ class ArchitectureDetailsViewController: UIViewController {
         if #available(iOS 13.0, *) {
             vc.isModalInPresentation = true
         }
-        vc.viewModel = KNArchitectureFramework().createArchitectureDetailsViewModel(parent: vc, inputDetails: inputDetails) { inputDetails in
-            onDismiss(inputDetails)
+        let navigator = ViewControllerNavigator<CloseDetailsNavigation>(parentVC: vc) { action in
+            NavigationSpec.Dismiss(toDismiss: { $0 }, animated: true) {
+                onDismiss(action.value!)
+            }
         }
+        vc.viewModel = ArchitectureDetailsViewModel(initialDetail: inputDetails, navigator: navigator)
         return vc
     }
-    
+
     var viewModel: ArchitectureDetailsViewModel!
     private var lifecycleManager: LifecycleManager!
     
@@ -47,16 +50,16 @@ class ArchitectureDetailsViewController: UIViewController {
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
-            
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+
             guard let viewModel = self?.viewModel else {
                 return []
             }
-            
+
             return [
                 viewModel.name.observe { name in
                     self?.nameLabel.text = name as? String ?? ""
@@ -67,11 +70,11 @@ class ArchitectureDetailsViewController: UIViewController {
             ]
         }
     }
-    
+
     @objc @IBAction func onInversePressed(sender: Any?) {
         viewModel.onInversePressed()
     }
-    
+
     @objc @IBAction func onCloseButtonPressed(sender: Any?) {
         viewModel.onClosePressed()
     }
diff --git a/newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift b/newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift
index d9762d316..9317cd640 100644
--- a/newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift
+++ b/newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift
@@ -16,7 +16,7 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ArchitectureInputViewController: UIViewController  {
     
@@ -29,27 +29,30 @@ class ArchitectureInputViewController: UIViewController  {
     @IBOutlet weak var numberError: UIImageView!
     
     @IBOutlet weak var detailsButton: UIButton!
-    
-    lazy var viewModel = KNArchitectureFramework().createArchitectureInputViewModel(parent: self) { [weak self] inputDetails in
-        return ArchitectureDetailsViewController.create(inputDetails: inputDetails) { [weak self] inputDetails in
-            self?.onDetailsDismissed(inputDetails: inputDetails)
+
+    lazy var navigator: ViewControllerNavigator<InputNavigation> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Present(animated: true, presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue), transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)) {
+            ArchitectureDetailsViewController.create(inputDetails: action.value!) { [weak self] inputDetails in
+                self?.onDetailsDismissed(inputDetails: inputDetails)
+            }
         }
     }
+    lazy var viewModel = ArchitectureInputViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
-        
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+
             guard let viewModel = self?.viewModel else {
                 return []
             }
-            
+
             return [
                 viewModel.nameHeader.observeInitialized { header in
                     self?.nameLabel.text = header as String?
@@ -72,30 +75,30 @@ class ArchitectureInputViewController: UIViewController  {
             ]
         }
     }
-    
+
     @objc @IBAction func onShowDetailsPressed(sender: Any?) {
         viewModel.onShowDetailsPressed()
     }
-    
+
     private func onDetailsDismissed(inputDetails: InputDetails) {
         viewModel.nameInput.post(newValue: NSString(string: inputDetails.name))
         viewModel.numberInput.post(newValue: NSString(string: "\(inputDetails.number)"))
     }
-    
+
 }
 
 extension ArchitectureInputViewController : UITextFieldDelegate {
-    
+
     func textFieldDidEndEditing(_ textField: UITextField) {
         postInput(text: textField.text ?? "", fromTextField: textField)
     }
-    
+
     func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         let resultingString = ((textField.text ?? "") as NSString).replacingCharacters(in: range, with: string)
         postInput(text: resultingString, fromTextField: textField)
         return false
     }
-    
+
     private func postInput(text: String, fromTextField textField: UITextField) {
         if (textField == nameInput) {
             viewModel.nameInput.post(newValue: NSString(string: text))
diff --git a/newexample/ios/Demo/Beacons/BeaconsViewCell.swift b/newexample/ios/Demo/Beacons/BeaconsViewCell.swift
index 829f8565d..928f6e859 100644
--- a/newexample/ios/Demo/Beacons/BeaconsViewCell.swift
+++ b/newexample/ios/Demo/Beacons/BeaconsViewCell.swift
@@ -15,7 +15,7 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class BeaconsViewCell: UICollectionViewCell {
 
diff --git a/newexample/ios/Demo/Beacons/BeaconsViewController.swift b/newexample/ios/Demo/Beacons/BeaconsViewController.swift
index 678e5786a..653f7c54a 100644
--- a/newexample/ios/Demo/Beacons/BeaconsViewController.swift
+++ b/newexample/ios/Demo/Beacons/BeaconsViewController.swift
@@ -15,7 +15,7 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class BeaconsViewController: UICollectionViewController {
 
@@ -35,11 +35,7 @@ class BeaconsViewController: UICollectionViewController {
         return flowLayout
     }()
 
-    private lazy var viewModel = KNArchitectureFramework()
-        .createBeaconsListViewModel(
-            parent: self,
-            service: KNBeaconsFramework().service
-        )
+    private lazy var viewModel = BeaconsListViewModel()
 
     deinit {
         lifecycleManager.unbind()
@@ -54,7 +50,7 @@ class BeaconsViewController: UICollectionViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
 
             return [
diff --git a/newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift b/newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
index e6b178457..cb593bf85 100644
--- a/newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
+++ b/newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
@@ -16,24 +16,24 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
-class BluetoothDeviceDetailsViewController : UIViewController, UICollectionViewDelegate, UICollectionViewDataSource {
+class BluetoothDeviceDetailsViewController : UIViewController {
     
     struct Const {
         static let storyboard = UIStoryboard(name: "Main", bundle: nil)
         static let storyboardId = "BluetoothDeviceDetails"
     }
     
-    static func create(deviceUuid: UUID, bluetooth: Bluetooth) -> BluetoothDeviceDetailsViewController {
+    static func create(identifier: UUID) -> BluetoothDeviceDetailsViewController {
         let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! BluetoothDeviceDetailsViewController
         if #available(iOS 13.0, *) {
             vc.isModalInPresentation = true
         }
-        vc.viewModel = KNArchitectureFramework().createBluetoothDeviceDetailsViewModel(identifier: deviceUuid, bluetooth: bluetooth)
+        vc.viewModel = BluetoothDeviceDetailViewModel(identifier: identifier)
         return vc
     }
-    
+
     var viewModel: BluetoothDeviceDetailViewModel!
     private var lifecycleManager: LifecycleManager!
     
@@ -46,29 +46,29 @@ class BluetoothDeviceDetailsViewController : UIViewController, UICollectionViewD
     @IBOutlet var servicesList: UICollectionView!
     
     private var services: [BluetoothServiceViewModel] = []
-    
+
     private var isInvalidating: Bool = false
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        
+
         servicesHeader.text = NSLocalizedString("bluetooth_services_header", comment: "")
         deviceIdentifier.text = viewModel.identifierString
-        
+
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
         flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
         flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
         flowLayout.minimumLineSpacing = 4
         servicesList.collectionViewLayout = flowLayout
 
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
-            
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+
             guard let viewModel = self?.viewModel else { return []}
-            
+
             return [
             viewModel.name.observe { name in
                 self?.deviceName.text = name as String?
@@ -92,32 +92,32 @@ class BluetoothDeviceDetailsViewController : UIViewController, UICollectionViewD
                 self?.servicesList.layoutIfNeeded()
             }
             ]
-        })
+        }
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return services.count
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let serviceCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothServiceView.Companion.identifier, for: indexPath) as! BluetoothServiceView
         serviceCell.parent = self
         serviceCell.service = services[indexPath.row]
         return serviceCell
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothServiceView)?.startMonitoring()
         }
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothServiceView)?.stopMonitoring()
         }
     }
-    
+
     fileprivate func updateListSize() {
         isInvalidating = true
         servicesList.collectionViewLayout.invalidateLayout()
@@ -146,13 +146,13 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
     @IBOutlet var characteristicsListHeight: NSLayoutConstraint!
     
     private var characteristics: [BluetoothCharacteristicViewModel] = []
-    
+
     override func awakeFromNib() {
         super.awakeFromNib()
-        
+
         serviceHeader.text = NSLocalizedString("bluetooth_service", comment: "")
         characteristicsHeader.text = NSLocalizedString("bluetooth_characteristics", comment: "")
-        
+
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
         flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
         flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
@@ -162,14 +162,14 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
         characteristicsList.delegate = self
         characteristicsList.register(UINib(nibName: "BluetoothCharacteristicCell", bundle: nil), forCellWithReuseIdentifier: BluetoothCharacteristicView.Companion.identifier)
     }
-    
+
     fileprivate func startMonitoring() {
         disposeBag.dispose()
         guard let service = self.service else {
             return
         }
         service.didResume()
-        
+
         serviceIdentifier.text = service.uuid
         service.characteristics.observe { [weak self] characteristics in
             self?.characteristics = characteristics as? [BluetoothCharacteristicViewModel] ?? []
@@ -177,12 +177,12 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
             self?.updateListSize(isInvalidating: false)
         }.addTo(disposeBag: disposeBag)
     }
-    
+
     fileprivate func stopMonitoring() {
         service?.didPause()
         disposeBag.dispose()
     }
-    
+
     fileprivate func updateListSize(isInvalidating: Bool) {
         self.isInvalidating = isInvalidating
         characteristicsList.collectionViewLayout.invalidateLayout()
@@ -192,30 +192,30 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
         parent?.updateListSize()
         self.isInvalidating = false
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return characteristics.count
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let characteristicCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothCharacteristicView.Companion.identifier, for: indexPath) as! BluetoothCharacteristicView
         characteristicCell.parent = self
         characteristicCell.characteristic = characteristics[indexPath.row]
         return characteristicCell
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothCharacteristicView)?.startMonitoring()
         }
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothCharacteristicView)?.stopMonitoring()
         }
     }
-    
+
     override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
         let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
         layoutIfNeeded()
@@ -225,7 +225,7 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
     
 }
 
-class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
+class BluetoothCharacteristicView : UICollectionViewCell {
     
     fileprivate struct Companion {
         static let identifier = "BluetoothCharacteristicView"
@@ -234,7 +234,7 @@ class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelega
     fileprivate weak var parent: BluetoothServiceView?
     fileprivate var characteristic: BluetoothCharacteristicViewModel?
     private let disposeBag = DisposeBag()
-    
+
     private var isInvalidating: Bool = false
     
     @IBOutlet var characteristicIdentifier: UILabel!
@@ -245,12 +245,12 @@ class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelega
     @IBOutlet var descriptorsListHeight: NSLayoutConstraint!
     
     private var descriptors: [BluetoothDescriptorViewModel] = []
-    
+
     override func awakeFromNib() {
         super.awakeFromNib()
-        
+
         descriptorsHeader.text = NSLocalizedString("bluetooth_descriptors", comment: "")
-        
+
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
         flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
         flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
@@ -258,31 +258,31 @@ class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelega
         descriptorsList.collectionViewLayout = flowLayout
         descriptorsList.register(UINib(nibName: "BluetoothDescriptorCell", bundle: nil), forCellWithReuseIdentifier: BluetoothDescriptorView.Companion.identifier)
     }
-    
+
     fileprivate func startMonitoring() {
         disposeBag.dispose()
         guard let characteristic = self.characteristic else {
             return
         }
         characteristic.didResume()
-        
+
         characteristicIdentifier.text = characteristic.uuid
         characteristic.descriptors.observe { [weak self] descriptors in
             self?.descriptors = descriptors as? [BluetoothDescriptorViewModel] ?? []
             self?.descriptorsList.reloadData()
             self?.updateListSize(isInvalidating: false)
         }.addTo(disposeBag: disposeBag)
-        
+
         characteristic.value.observe { [weak self] value in
             self?.characteristicValue.text = value as String?
         }.addTo(disposeBag: disposeBag)
     }
-    
+
     fileprivate func stopMonitoring() {
         disposeBag.dispose()
         characteristic?.didPause()
     }
-    
+
     private func updateListSize(isInvalidating: Bool) {
         self.isInvalidating = isInvalidating
         descriptorsList.collectionViewLayout.invalidateLayout()
@@ -292,36 +292,35 @@ class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelega
         parent?.updateListSize(isInvalidating: true)
         self.isInvalidating = false
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return descriptors.count
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let descriptorCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothDescriptorView.Companion.identifier, for: indexPath) as! BluetoothDescriptorView
         descriptorCell.descriptor = descriptors[indexPath.row]
         return descriptorCell
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothDescriptorView)?.startMonitoring()
         }
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothDescriptorView)?.stopMonitoring()
         }
     }
-    
+
     override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
         let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
         layoutIfNeeded()
         layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
         return layoutAttributes
     }
-    
 }
 
 class BluetoothDescriptorView : UICollectionViewCell {
@@ -342,19 +341,19 @@ class BluetoothDescriptorView : UICollectionViewCell {
             return
         }
         descriptor.didResume()
-        
+
         descriptorIdentifier.text = descriptor.uuid
-        
+
         descriptor.value.observe { [weak self] value in
             self?.descriptorValue.text = value as String?
         }.addTo(disposeBag: disposeBag)
     }
-    
+
     fileprivate func stopMonitoring() {
         disposeBag.dispose()
         descriptor?.didResume()
     }
-    
+
     override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
         let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
         layoutIfNeeded()
diff --git a/newexample/ios/Demo/Bluetooth/BluetoothViewController.swift b/newexample/ios/Demo/Bluetooth/BluetoothViewController.swift
index 1e60a04b4..82903a4b1 100644
--- a/newexample/ios/Demo/Bluetooth/BluetoothViewController.swift
+++ b/newexample/ios/Demo/Bluetooth/BluetoothViewController.swift
@@ -16,14 +16,17 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class BluetoothViewController : UICollectionViewController {
-    
-    lazy var viewModel = KNArchitectureFramework().createBluetoothListViewModel(parent: self, bluetooth: KNBluetoothFramework().bluetooth) { uuid, bluetooth in
-        return BluetoothDeviceDetailsViewController.create(deviceUuid: uuid, bluetooth: bluetooth)
+
+    lazy var navigator: ViewControllerNavigator<DeviceDetails> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Push(animated: true) {
+            BluetoothDeviceDetailsViewController.create(identifier: action.value!.identifier)
+        }
     }
-    
+    lazy var viewModel = BluetoothListViewModel(navigator: navigator)
+
     private var devices: [BluetoothListDeviceViewModel] = []
     private var lifecycleManager: LifecycleManager!
 
@@ -33,20 +36,20 @@ class BluetoothViewController : UICollectionViewController {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-        
+
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
         flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
         flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0)
         flowLayout.minimumLineSpacing = 4
         collectionView.collectionViewLayout = flowLayout
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
-            
+
             return [
                 viewModel.isScanning.observe { isScanning in
                     self?.updateNavigationItem(isScanning: isScanning as? Bool ?? false)
@@ -60,9 +63,9 @@ class BluetoothViewController : UICollectionViewController {
                     self?.updateTitle(title: title as String?)
                 }
             ]
-        })
+        }
     }
-    
+
     private func updateNavigationItem(isScanning: Bool) {
         if (isScanning) {
             self.navigationItem.setRightBarButton(UIBarButtonItem(title: NSLocalizedString("bluetooth_stop_scanning", comment: ""), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
@@ -74,41 +77,41 @@ class BluetoothViewController : UICollectionViewController {
     private func updateTitle(title: String?) {
         self.title = title
     }
-    
+
     @objc private func toggleScanning() {
         viewModel.onScanPressed()
     }
-    
+
     override func numberOfSections(in collectionView: UICollectionView) -> Int {
         return 1
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         devices.count
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let bluetoothCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothCell.Companion.identifier, for: indexPath) as! BluetoothCell
         bluetoothCell.device = devices[indexPath.row]
         return bluetoothCell
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         guard let btCell = cell as? BluetoothCell else {
             return
         }
-        
+
         btCell.startMonitoring()
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         guard let btCell = cell as? BluetoothCell else {
             return
         }
-        
+
         btCell.stopMonitoring()
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         devices[indexPath.row].toggleFoldOut()
         let context = UICollectionViewFlowLayoutInvalidationContext()
@@ -143,19 +146,19 @@ class BluetoothCell: UICollectionViewCell {
     @IBOutlet var moreButton: UIButton!
     
     fileprivate var device: BluetoothListDeviceViewModel? = nil
-    
+
     @IBAction func onConnectPressed() {
         device?.onConnectPressed()
     }
-    
+
     @IBAction func onDisonnectPressed() {
         device?.onDisconnectPressed()
     }
-    
+
     @IBAction func onMorePressed() {
         device?.onMorePressed()
     }
-    
+
     func startMonitoring() {
         disposeBag.dispose()
         guard let device = device else {
@@ -222,7 +225,7 @@ class BluetoothCell: UICollectionViewCell {
             self?.manufacturerData.text = manufacturerData as? String
         }
     }
-    
+
     func stopMonitoring() {
         disposeBag.dispose()
         device?.didPause()
diff --git a/newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift b/newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
index d32da17ed..9ee2d520e 100644
--- a/newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
+++ b/newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
@@ -16,7 +16,7 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class DateTimePickerViewController : UIViewController {
     
@@ -24,33 +24,31 @@ class DateTimePickerViewController : UIViewController {
     
     lazy var viewModel = DateTimePickerViewModel(dateTimePickerPresenterBuilder: DateTimePickerPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else {
                 return []
             }
             return [
-                viewModel.dateLabel.observe(onNext: { (time) in
-                    if let timeString = (time as? String) {
-                        self?.timeLabel.text = String(timeString)
-                    }
-            })
+                viewModel.dateLabel.observe { (time) in
+                    self?.timeLabel.text = time as? String
+                }
             ]
-        })
+        }
     }
-    
+
     @IBAction
     func selectDatePressed() {
         viewModel.onSelectDatePressed()
     }
-    
+
     @IBAction
     func selectTimePressed() {
         viewModel.onSelectTimePressed()
diff --git a/newexample/ios/Demo/ExampleViewController.swift b/newexample/ios/Demo/ExampleViewController.swift
index 6b0be8f80..d6ad2d207 100644
--- a/newexample/ios/Demo/ExampleViewController.swift
+++ b/newexample/ios/Demo/ExampleViewController.swift
@@ -16,7 +16,7 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ExampleViewController : UIViewController {
     
@@ -31,26 +31,55 @@ class ExampleViewController : UIViewController {
     
     lazy var featuresListController = Const.storyboard.instantiateViewController(withIdentifier: Const.featuresList) as! FeaturesListViewController
     lazy var infoViewController = Const.storyboard.instantiateViewController(withIdentifier: Const.infoView) as! InfoViewController
-    
-    lazy var viewModel: ExampleViewModel = KNArchitectureFramework().createExampleViewModel(parent: self,
-                                                                                                  containerView: containerView,
-                                                                                                  featuresList: { self.featuresListController },
-                                                                                                  info:  { self.infoViewController })
-    
+
+    private lazy var navigator: ViewControllerNavigator<ExampleTabNavigation> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Nested(type: NavigationSpec.NestedTypeReplace(tag: 1), containerView: self.containerView) {
+            switch action {
+            case is ExampleTabNavigation.FeatureList: return self.featuresListController
+            case is ExampleTabNavigation.Info: return self.infoViewController
+            default: return UIViewController()
+            }
+        }
+    }
+    lazy var viewModel: ExampleViewModel = ExampleViewModel(navigator: navigator)
     var lifecycleManager: LifecycleManager!
-    
+    let selectedButtonDisposeBag = DisposeBag()
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel, let bottomView = self?.bottomView else { return [] }
-            return viewModel.observeTabs(stackView: bottomView) { (button: UIButton, action: @escaping () -> KotlinUnit) in
-                button.addAction { let _ = action() }
-            }
+
+            return [
+                viewModel.tabs.observeInitialized { tabs in
+                    guard let disposeBag = self?.selectedButtonDisposeBag else { return }
+                    disposeBag.dispose()
+                    let tabs = tabs ?? []
+                    bottomView.arrangedSubviews.forEach { $0.removeFromSuperview() }
+                    for tab in tabs {
+                        guard let tab = tab as? ExampleViewModel.Tab else { return }
+                        let button = UIButton()
+                        button.setTitle(tab.title, for: .normal)
+                        button.setTitleColor(UIColor.systemBlue, for: .selected)
+                        button.setTitleColor(UIColor.systemBlue, for: .highlighted)
+                        button.setTitleColor(UIColor.gray, for: .normal)
+
+                        viewModel.tab.observeInitialized { selectedTab in
+                            button.isSelected = selectedTab == tab
+                        }.addTo(disposeBag: disposeBag)
+                        button.addAction {
+                            viewModel.tab.post(newValue: tab)
+                        }
+                        bottomView.addArrangedSubview(button)
+                    }
+
+                }
+            ]
         }
     }
     
diff --git a/newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift b/newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift
index 1f6f19df9..e520eaa27 100644
--- a/newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -16,49 +16,55 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class FeaturesListViewController : UITableViewController {
-    
-    private lazy var viewModel: FeatureListViewModel = KNArchitectureFramework().createFeatureListViewModel(parent: self)
+
+    private lazy var navigator: ViewControllerNavigator<FeatureListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Segue(identifier: action.segueKey)
+    }
+    private lazy var viewModel: FeatureListViewModel = FeatureListViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     private var features = [String]()
-    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
-    
+    private var onSelected: ((Int) -> Void)? = nil
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
-            return [viewModel.observeFeatures() { (features: [String], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
-                self?.features = features
-                self?.onSelected = onSelected
+            return [viewModel.feature.observeInitialized { next in
+                let features = next ?? []
+                self?.features = features.map { ($0 as! Feature).title }
+                self?.onSelected = { (index: Int) in
+                    viewModel.onFeaturePressed(feature: features[index] as! Feature)
+                }
                 self?.tableView.reloadData()
             }]
         }
     }
-    
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
-    
+
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return features.count
     }
-    
+
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: FeaturesListCell.Const.identifier, for: indexPath) as! FeaturesListCell
         cell.label.text = features[indexPath.row]
         return cell
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        let _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
@@ -73,3 +79,26 @@ class FeaturesListCell : UITableViewCell {
     @IBOutlet weak var label: UILabel!
     
 }
+
+private extension FeatureListNavigationAction {
+    var segueKey: String {
+        get {
+            switch self {
+            case is FeatureListNavigationAction.Alerts: return "showAlerts"
+            case is FeatureListNavigationAction.Architecture: return "showArchitecture"
+            case is FeatureListNavigationAction.Beacons: return "showBeacons"
+            case is FeatureListNavigationAction.Bluetooth: return "showBluetooth"
+            case is FeatureListNavigationAction.DateTimePicker: return "showDateTimePicker"
+            case is FeatureListNavigationAction.Keyboard: return "showKeyboard"
+            case is FeatureListNavigationAction.Links: return "showLinks"
+            case is FeatureListNavigationAction.LoadingIndicator: return "showHUD"
+            case is FeatureListNavigationAction.Location: return "showLocation"
+            case is FeatureListNavigationAction.Permissions: return "showPermissions"
+            case is FeatureListNavigationAction.PlatformSpecific: return "showPlatformSpecific"
+            case is FeatureListNavigationAction.Resources: return "showResources"
+            case is FeatureListNavigationAction.System: return "showSystem"
+            default: return ""
+            }
+        }
+    }
+}
diff --git a/newexample/ios/Demo/Info/InfoViewController.swift b/newexample/ios/Demo/Info/InfoViewController.swift
index e0f6825a8..a2f18dc06 100644
--- a/newexample/ios/Demo/Info/InfoViewController.swift
+++ b/newexample/ios/Demo/Info/InfoViewController.swift
@@ -16,53 +16,78 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import MessageUI
+import KalugaExampleShared
 
 class InfoViewController : UITableViewController {
-    
-    private lazy var viewModel: InfoViewModel = KNArchitectureFramework().createInfoViewModel(parent: self)
+
+    private lazy var navigator = InfoNavigatorKt.InfoNavigator(
+        parent: self,
+        onDialogSpec: { dialogSpec in
+            NavigationSpec.Present(
+                animated: true,
+                presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue),
+                transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)
+            ) {
+                    let alert = UIAlertController.init(title: dialogSpec.title, message: dialogSpec.message, preferredStyle: .alert)
+                    alert.addAction(UIAlertAction(title: "OK", style: .default))
+                    return alert
+                }
+        },
+        onLink: { link in NavigationSpec.Browser(url: URL(string: link)!, viewType: NavigationSpec.BrowserTypeNormal()) },
+        onMailSpec: { mailSpec in
+            let settings = NavigationSpec.Email.EmailEmailSettings(type: NavigationSpec.EmailTypePlain(), to: mailSpec.to, cc: [], bcc: [], subject: mailSpec.subject, body: nil, attachments: [])
+            return NavigationSpec.Email(emailSettings: settings, delegate: nil, animated: true)
+        }
+    )
+    private lazy var viewModel: InfoViewModel = InfoViewModel(
+        reviewManagerBuilder: ReviewManager.Builder(),
+        navigator: navigator)
 
     private var buttons = [String]()
-    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
+    private var onSelected: ((Int) -> Void)? = nil
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
-            
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+
             guard let viewModel = self?.viewModel else {
                 return []
             }
-            
-            return [viewModel.observeButtons() { (buttons: [String], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
-                self?.buttons = buttons
-                self?.onSelected = onSelected
-                self?.tableView.reloadData()
-            }]
+
+            return [
+                viewModel.buttons.observeInitialized { next in
+                    let buttons = next?.compactMap { $0 as? InfoViewModel.Button } ?? []
+                    self?.buttons = buttons.map { $0.title }
+                    self?.onSelected = { (index: Int) in viewModel.onButtonPressed(button: buttons[index]) }
+                    self?.tableView.reloadData()
+                }
+            ]
         }
     }
-    
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
-    
+
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return buttons.count
     }
-    
+
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: InfoButtonCell.Const.identifier, for: indexPath) as! InfoButtonCell
         cell.label.text = buttons[indexPath.row]
         return cell
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        let _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
diff --git a/newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift b/newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
index 3b973ab9b..8e0d31743 100644
--- a/newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
+++ b/newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
@@ -16,7 +16,7 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class KeyboardManagerViewController : UIViewController {
     
@@ -25,24 +25,24 @@ class KeyboardManagerViewController : UIViewController {
     private lazy var editFieldFocusHandler = {
         return UIKitFocusHandler(view: self.editField)
     }()
-    lazy var viewModel = KNArchitectureFramework().createKeyboardViewModel(focusHandler: self.editFieldFocusHandler)
+    lazy var viewModel = KeyboardViewModel(keyboardManagerBuilder: KeyboardManager.Builder(application: UIApplication.shared), editFieldFocusHandler: editFieldFocusHandler)
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { return [] })
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
     }
-    
+
     @IBAction
     func showButtonPressed() {
         viewModel.onShowPressed()
     }
-    
+
     @IBAction
     func hideButtonPressed() {
         viewModel.onHidePressed()
diff --git a/newexample/ios/Demo/Links/LinksViewController.swift b/newexample/ios/Demo/Links/LinksViewController.swift
index 9f14309e3..34ab58446 100644
--- a/newexample/ios/Demo/Links/LinksViewController.swift
+++ b/newexample/ios/Demo/Links/LinksViewController.swift
@@ -17,17 +17,15 @@
 
 import Foundation
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class LinksViewController : UIViewController {
     
     @IBOutlet weak var browserButton: UIButton!
     @IBOutlet weak var instructionsText: UILabel!
-    
-    private let knArchitectureFramework = KNArchitectureFramework()
-    private lazy var viewModel: LinksViewModel = {
-        return knArchitectureFramework.createLinksViewModel(parent: self, animated: true, completion: nil)
-    }()
+
+    private lazy var navigator: ViewControllerNavigator<BrowserNavigationActions<AnyObject>> = BrowserNavigatorKt.BrowserNavigator(parent: self)
+    private lazy var viewModel: LinksViewModel = LinksViewModel(linkRepoBuilder: LinksLinksBuilder(), builder: AlertPresenter.Builder(viewController: self), navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -37,7 +35,7 @@ class LinksViewController : UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        lifecycleManager = knArchitectureFramework.bind(viewModel: viewModel, to: self) {
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) {
             [
                 self.viewModel.browserButtonText.observe { buttonText in
                     self.browserButton.setTitle(buttonText as String?, for: .normal)
diff --git a/newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift b/newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift
index 8c2412492..94ce6baad 100644
--- a/newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift
+++ b/newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift
@@ -16,23 +16,23 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class LoadingViewController: UITableViewController {
 
     private lazy var viewModel = HudViewModel(builder: HUD.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { return [] }
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
         switch (indexPath.row) {
diff --git a/newexample/ios/Demo/Location/LocationViewController.swift b/newexample/ios/Demo/Location/LocationViewController.swift
index a2632b8af..2b82f3b9c 100644
--- a/newexample/ios/Demo/Location/LocationViewController.swift
+++ b/newexample/ios/Demo/Location/LocationViewController.swift
@@ -18,7 +18,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 import UIKit
 import CoreLocation
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class LocationViewController: UIViewController {
 
@@ -30,9 +30,9 @@ class LocationViewController: UIViewController {
     
     @IBOutlet weak var label: UILabel!
     
-    lazy var viewModel = KNArchitectureFramework().createLocationViewModel(permission: Const.permission, repoBuilder: KNLocationFramework().getPermissionRepoBuilder())
+    lazy var viewModel = LocationViewModel(permission: Const.permission)
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
@@ -40,13 +40,15 @@ class LocationViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        lifecycleManager = viewModel.addLifecycleManager(parent: self, onLifecycle: { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else {
                 return []
             }
-            return [viewModel.location.observe(onNext: { (location) in
-                self?.label.text = location as? String ?? ""
-                })]
-        })
+            return [
+                viewModel.location.observe { (location) in
+                    self?.label.text = location as? String ?? ""
+                }
+            ]
+        }
     }
 }
diff --git a/newexample/ios/Demo/Permissions/PermissionListViewController.swift b/newexample/ios/Demo/Permissions/PermissionListViewController.swift
index 08b634940..2fd828e7c 100644
--- a/newexample/ios/Demo/Permissions/PermissionListViewController.swift
+++ b/newexample/ios/Demo/Permissions/PermissionListViewController.swift
@@ -16,51 +16,61 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class PermissionListViewController : UITableViewController {
-    
-    private lazy var viewModel: PermissionsListViewModel = KNArchitectureFramework().createPermissionListViewModel(parent: self) { (permission) -> UIViewController in
-        return PermissionViewController.create(permission: permission)
+
+    private lazy var navigator: ViewControllerNavigator<PermissionsListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Push(animated: true) {
+            guard let permission = action.value?.permission else {
+                return UIViewController()
+            }
+
+            return PermissionViewController.create(permission: permission)
+        }
     }
+    private lazy var viewModel: PermissionsListViewModel = PermissionsListViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     private var permissions = [PermissionView]()
-    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
-    
+    private var onSelected: ((Int) -> Void)? = nil
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
-            return [viewModel.observePermissions { (permissionViews: [PermissionView], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
-                self?.permissions = permissionViews
-                self?.onSelected = onSelected
-                self?.tableView.reloadData()
-            }]
+            return [
+                viewModel.permissions.observeInitialized { next in
+                    let permissions = next?.compactMap { $0 as? PermissionView } ?? []
+                    self?.permissions = permissions
+                    self?.onSelected = { (index: Int) in viewModel.onPermissionPressed(permissionView: permissions[index]) }
+                    self?.tableView.reloadData()
+                }
+            ]
         }
     }
-    
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
-    
+
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return permissions.count
     }
-    
+
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: PermissionsListCell.Const.identifier, for: indexPath) as! PermissionsListCell
         cell.label.text = permissions[indexPath.row].title
         return cell
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        let _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
diff --git a/newexample/ios/Demo/Permissions/PermissionViewController.swift b/newexample/ios/Demo/Permissions/PermissionViewController.swift
index 29ce5c847..4bca12051 100644
--- a/newexample/ios/Demo/Permissions/PermissionViewController.swift
+++ b/newexample/ios/Demo/Permissions/PermissionViewController.swift
@@ -17,20 +17,18 @@
 
 import UIKit
 import Foundation
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class PermissionViewController: UIViewController {
     
     private struct Const {
         static let storyboard = UIStoryboard(name: "Main", bundle: nil)
         static let permissionVc = "Permission"
-        
-        static let permissions = KNPermissionsFramework().getPermissions()
     }
     
     static func create(permission: Permission) -> PermissionViewController {
         let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.permissionVc) as! PermissionViewController
-        vc.viewModel = KNArchitectureFramework().createPermissionViewModel(permissions: Const.permissions, permission: permission)
+        vc.viewModel = PermissionViewModel(permission: permission)
         return vc
     }
     
@@ -39,47 +37,47 @@ class PermissionViewController: UIViewController {
     
     var viewModel: PermissionViewModel!
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+
         requestPermissionButton.setTitle(NSLocalizedString("permission_request", comment: ""), for: .normal)
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
-            
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+
             guard let viewModel = self?.viewModel else {
                 return []
             }
-            
+
             return [
-                viewModel.permissionStateMessage.observe(onNext: { (message) in
+                viewModel.permissionStateMessage.observe { message in
                     self?.permissionStateLabel.text = NSLocalizedString(message as? String ?? "", comment: "")
-                    
-                }),
-                
-                viewModel.requestMessage.observe(onNext: { (optionalMessage) in
+
+                },
+
+                viewModel.requestMessage.observe { optionalMessage in
                     guard let message = optionalMessage as? String else {
                         return
                     }
-                    
+
                     let alert = UIAlertController(title: NSLocalizedString("permission_request", comment: ""), message: message, preferredStyle: .alert)
                     alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default, handler: nil))
                     self?.present(alert, animated: true, completion: nil)
-                    
-                    }),
-                
-                viewModel.showPermissionButton.observe(onNext: { (show) in 
+
+                },
+
+                viewModel.showPermissionButton.observe { show in
                     self?.requestPermissionButton.isHidden = !(show as? Bool ?? false)
-                    })
+                    }
             ]
-        })
+        }
     }
-    
-    
+
+
     @IBAction func requestPermission(sender: Any?) {
         viewModel.requestPermission()
     }
diff --git a/newexample/ios/Demo/Resources/ButtonViewController.swift b/newexample/ios/Demo/Resources/ButtonViewController.swift
index 68871ce6f..f00e435ff 100644
--- a/newexample/ios/Demo/Resources/ButtonViewController.swift
+++ b/newexample/ios/Demo/Resources/ButtonViewController.swift
@@ -15,11 +15,11 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ButtonViewController : UITableViewController {
     
-    private lazy var viewModel: ButtonViewModel = KNArchitectureFramework().createButtonViewModel(parent: self)
+    private lazy var viewModel: ButtonViewModel = ButtonViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider(), alertPresenterBuilder: AlertPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
 
     private var buttons = [KalugaButton]()
@@ -31,7 +31,7 @@ class ButtonViewController : UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         tableView.allowsSelection = false
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             return [
                 viewModel.buttons.observe { labels in
diff --git a/newexample/ios/Demo/Resources/ColorViewController.swift b/newexample/ios/Demo/Resources/ColorViewController.swift
index 4f2ce7a2f..c8412766a 100644
--- a/newexample/ios/Demo/Resources/ColorViewController.swift
+++ b/newexample/ios/Demo/Resources/ColorViewController.swift
@@ -15,7 +15,7 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ColorViewController : UIViewController {
     
@@ -43,7 +43,7 @@ class ColorViewController : UIViewController {
     private var blendedLightenedColors: [BackgroundStyle] = []
     private var blendedDarkenedColors: [BackgroundStyle] = []
     
-    private lazy var viewModel: ColorViewModel = KNArchitectureFramework().createColorViewModel(parent: self)
+    private lazy var viewModel: ColorViewModel = ColorViewModel(alertPresenterBuilder: AlertPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -58,7 +58,7 @@ class ColorViewController : UIViewController {
         sourceDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
         blendedLightenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
         blendedDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             
             return [
diff --git a/newexample/ios/Demo/Resources/LabelViewController.swift b/newexample/ios/Demo/Resources/LabelViewController.swift
index 055c3ba09..dd8695a79 100644
--- a/newexample/ios/Demo/Resources/LabelViewController.swift
+++ b/newexample/ios/Demo/Resources/LabelViewController.swift
@@ -15,11 +15,11 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class LabelViewController : UITableViewController {
-    
-    private lazy var viewModel: LabelViewModel = KNArchitectureFramework().createLabelViewModel()
+
+    private var viewModel: LabelViewModel = LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider())
     private var lifecycleManager: LifecycleManager!
 
     private var labels = [KalugaLabel]()
@@ -32,11 +32,11 @@ class LabelViewController : UITableViewController {
         super.viewDidLoad()
         
         tableView.allowsSelection = false
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             return [
                 viewModel.labels.observe { labels in
-                    self?.labels = labels?.compactMap { $0 as?  KalugaLabel } ?? []
+                    self?.labels = labels?.compactMap { $0 as? KalugaLabel } ?? []
                     self?.tableView.reloadData()
                 }
             ]
diff --git a/newexample/ios/Demo/Resources/ResourcesListViewController.swift b/newexample/ios/Demo/Resources/ResourcesListViewController.swift
index 906c7c6e7..40d7799a8 100644
--- a/newexample/ios/Demo/Resources/ResourcesListViewController.swift
+++ b/newexample/ios/Demo/Resources/ResourcesListViewController.swift
@@ -15,49 +15,56 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ResourcesListViewController : UITableViewController {
+
+    private lazy var navigator: ViewControllerNavigator<ResourcesListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Segue(identifier: action.segueKey)
+    }
     
-    private lazy var viewModel: ResourcesListViewModel = KNArchitectureFramework().createResourcesViewModel(parent: self)
+    private lazy var viewModel: ResourcesListViewModel = ResourcesListViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     private var resources = [String]()
-    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
-    
+    private var onSelected: ((Int) -> Void)? = nil
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
-            return [viewModel.observeResources() { (resources: [String], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
-                self?.resources = resources
-                self?.onSelected = onSelected
-                self?.tableView.reloadData()
-            }]
+            return [
+                viewModel.resources.observeInitialized { next in
+                    let resources = next ?? []
+                    self?.resources = resources.map { ($0 as! Resource).title }
+                    self?.onSelected = { (index: Int) in viewModel.onResourceSelected(resource: resources[index] as! Resource) }
+                    self?.tableView.reloadData()
+                }
+            ]
         }
     }
-    
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
-    
+
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return resources.count
     }
-    
+
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: ResourcesListCell.Const.identifier, for: indexPath) as! ResourcesListCell
         cell.label.text = resources[indexPath.row]
         return cell
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        let _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
@@ -72,3 +79,16 @@ class ResourcesListCell : UITableViewCell {
     @IBOutlet weak var label: UILabel!
     
 }
+
+private extension ResourcesListNavigationAction {
+    var segueKey: String {
+        get {
+            switch self {
+            case is ResourcesListNavigationAction.Button: return "showButton"
+            case is ResourcesListNavigationAction.Color: return "showColor"
+            case is ResourcesListNavigationAction.Label: return "showLabel"
+            default: return ""
+            }
+        }
+    }
+}
diff --git a/newexample/ios/Demo/System/Network/NetworkViewController.swift b/newexample/ios/Demo/System/Network/NetworkViewController.swift
index a3c6c7cef..ead546b08 100644
--- a/newexample/ios/Demo/System/Network/NetworkViewController.swift
+++ b/newexample/ios/Demo/System/Network/NetworkViewController.swift
@@ -17,11 +17,10 @@
 
 import Foundation
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class NetworkViewController : UIViewController {
-    
-    private let knArchitectureFramework = KNArchitectureFramework()
+
     @IBOutlet weak var networkStateText: UILabel!
     private var lifecycleManager: LifecycleManager!
     
@@ -34,12 +33,12 @@ class NetworkViewController : UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        lifecycleManager = knArchitectureFramework.bind(viewModel: viewModel, to: self) { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             
             return [
-                viewModel.networkState.observe { value in
-                    self?.networkStateText.text = value as? String
+                viewModel.networkState.observe { next in
+                    self?.networkStateText.text = next as? String
                 }
             ]
         }
diff --git a/newexample/ios/Demo/System/SystemViewController.swift b/newexample/ios/Demo/System/SystemViewController.swift
index 9945dfd0d..782e14c5b 100644
--- a/newexample/ios/Demo/System/SystemViewController.swift
+++ b/newexample/ios/Demo/System/SystemViewController.swift
@@ -17,56 +17,60 @@
 
 import Foundation
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class SystemViewController : UITableViewController {
-    
-    private let knArchitectureFramework = KNArchitectureFramework()
-    private lazy var viewModel: SystemViewModel = {
-        return self.knArchitectureFramework.createSystemViewModel(parent: self)
-    }()
-    
+
+    private lazy var navigator: ViewControllerNavigator<SystemNavigationActions> = ViewControllerNavigator(parentVC: self) { action in
+        switch action {
+        case is SystemNavigationActions.Network: return NavigationSpec.Segue(identifier: "showNetwork")
+        default: return NavigationSpec.Segue(identifier: "")
+        }
+    }
+    private lazy var viewModel: SystemViewModel = SystemViewModel(navigator: navigator)
+
     private var modules = [String]()
-    private var onModuleTapped: ((KotlinInt) -> KotlinUnit)? = nil
+    private var onModuleTapped: ((Int) -> Void)? = nil
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = knArchitectureFramework.bind(viewModel: viewModel, to: self) { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else {
                 return []
             }
             return [
-                viewModel.observeModules { (modules: [String], onButtonTapped: @escaping (KotlinInt) -> KotlinUnit) in
-                    self?.modules = modules
-                    self?.onModuleTapped = onButtonTapped
+                viewModel.modules.observeInitialized { next in
+                    let modules = next?.compactMap { $0 as? SystemFeatures } ?? []
+                    self?.modules = modules.map{ $0.name }
+                    self?.onModuleTapped = { (index: Int) in viewModel.onButtonTapped(systemFeatures: modules[index]) }
                     self?.tableView.reloadData()
                 }
             ]
         }
     }
-    
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
-    
+
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return modules.count
     }
-    
+
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: SystemListCell.Const.identifier, for: indexPath) as! SystemListCell
         cell.label.text = modules[indexPath.row]
         return cell
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onModuleTapped?(KotlinInt.init(int: Int32(indexPath.row)))
+        let _ = onModuleTapped?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
diff --git a/newexample/ios/DemoTests/DemoTests.swift b/newexample/ios/DemoTests/DemoTests.swift
index 2aa6b9b30..dbe30118f 100644
--- a/newexample/ios/DemoTests/DemoTests.swift
+++ b/newexample/ios/DemoTests/DemoTests.swift
@@ -18,7 +18,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 import XCTest
 @testable import Demo
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class DemoTests: XCTestCase {
 
diff --git a/newexample/shared/build.gradle.kts b/newexample/shared/build.gradle.kts
index 01ad3d30b..fcc1ed645 100644
--- a/newexample/shared/build.gradle.kts
+++ b/newexample/shared/build.gradle.kts
@@ -21,11 +21,12 @@ val modules = listOf(
     "logging" to false,
     "resources" to true,
     "review" to true,
-    "system" to false,
-    "permissions" to false
+    "system" to true,
+    "permissions" to true
 )
 
 commonComponent {
+    logger.lifecycle("Configure framework")
     baseName = "KalugaExampleShared"
     isStatic = false
     transitiveExport = true
diff --git a/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index 972f1dfce..4cc0062ae 100644
--- a/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -20,7 +20,6 @@ package com.splendo.kaluga.example.shared.di
 
 import com.splendo.kaluga.alerts.AlertPresenter
 import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.base.ApplicationHolder
 import com.splendo.kaluga.bluetooth.BluetoothBuilder
 import com.splendo.kaluga.datetimepicker.DateTimePickerPresenter
@@ -31,10 +30,11 @@ import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDeta
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.CloseDetailsNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
+import com.splendo.kaluga.example.shared.viewmodel.architecture.InputNavigation
 import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListNavigation
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetails
 import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
 import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewModel
@@ -43,7 +43,6 @@ import com.splendo.kaluga.example.shared.viewmodel.info.InfoNavigation
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
 import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
 import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
-import com.splendo.kaluga.example.shared.viewmodel.link.BrowserSpecRow
 import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
 import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
@@ -93,11 +92,11 @@ internal val androidModule = module {
         PermissionsListViewModel(navigator)
     }
 
-    viewModel { (permission: Permission) -> PermissionViewModel(get(), permission) }
+    viewModel { (permission: Permission) -> PermissionViewModel(permission) }
 
-    viewModel { (permission: LocationPermission) -> LocationViewModel(permission, get()) }
+    viewModel { (permission: LocationPermission) -> LocationViewModel(permission) }
 
-    viewModel { (navigator: Navigator<SingleValueNavigationAction<InputDetails>>) ->
+    viewModel { (navigator: Navigator<InputNavigation>) ->
         ArchitectureInputViewModel(navigator)
     }
 
@@ -124,7 +123,7 @@ internal val androidModule = module {
         KeyboardViewModel(keyboardBuilder, focusHandler)
     }
 
-    viewModel { (navigator: Navigator<BrowserNavigationActions<BrowserSpecRow>>) ->
+    viewModel { (navigator: Navigator<BrowserNavigationActions<*>>) ->
         LinksViewModel(
             LinksBuilder(),
             AlertPresenter.Builder(),
@@ -132,17 +131,17 @@ internal val androidModule = module {
         )
     }
 
-    viewModel { (navigator: Navigator<SystemNavigationActions<Unit>>) ->
+    viewModel { (navigator: Navigator<SystemNavigationActions>) ->
         SystemViewModel(
             navigator
         )
     }
 
     viewModel {
-        NetworkViewModel(NetworkStateRepoBuilder(get()))
+        NetworkViewModel(NetworkStateRepoBuilder())
     }
 
-    viewModel { (navigator: Navigator<BluetoothListNavigation>) ->
+    viewModel { (navigator: Navigator<DeviceDetails>) ->
         BluetoothListViewModel(navigator)
     }
 
diff --git a/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt b/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
new file mode 100644
index 000000000..5c0a64d55
--- /dev/null
+++ b/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.permissions
+
+import com.splendo.kaluga.permissions.notifications.NotificationOptions
+
+actual val notificationOptions = NotificationOptions()
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt
index 98dec51f7..49d4fa4fe 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt
@@ -37,7 +37,7 @@ class InputNavigation(inputDetails: InputDetails) : SingleValueNavigationAction<
     NavigationBundleSpecType.SerializedType(InputDetails.serializer())
 )
 
-class ArchitectureInputViewModel(navigator: Navigator<SingleValueNavigationAction<InputDetails>>) : NavigatingViewModel<SingleValueNavigationAction<InputDetails>>(navigator) {
+class ArchitectureInputViewModel(navigator: Navigator<InputNavigation>) : NavigatingViewModel<InputNavigation>(navigator) {
 
     val nameHeader = observableOf("Enter your Name")
     val numberHeader = observableOf("Enter a Number")
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
index 2a626d61c..a2551c4ef 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
@@ -62,10 +62,12 @@ class BeaconsListViewModel : BaseLifecycleViewModel(), KoinComponent {
     }
 
     fun onScanPressed() {
-        if (_isScanning.value) {
-            service.stopMonitoring()
-        } else {
-            service.startMonitoring(coroutineScope)
+        coroutineScope.launch {
+            if (_isScanning.value) {
+                service.stopMonitoring()
+            } else {
+                service.startMonitoring(coroutineScope)
+            }
         }
     }
 
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
index 522e649e2..2fd53abd0 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
@@ -17,17 +17,18 @@
 
 package com.splendo.kaluga.example.shared.viewmodel.bluetooth
 
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.observable.toUninitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.base.text.format
 import com.splendo.kaluga.bluetooth.Bluetooth
 import com.splendo.kaluga.bluetooth.device.ConnectableDeviceState
-import com.splendo.kaluga.bluetooth.device.NotConnectableDeviceState
 import com.splendo.kaluga.bluetooth.device.Identifier
+import com.splendo.kaluga.bluetooth.device.NotConnectableDeviceState
+import com.splendo.kaluga.bluetooth.device.SerializableIdentifier
+import com.splendo.kaluga.bluetooth.device.serializable
 import com.splendo.kaluga.bluetooth.device.stringValue
 import com.splendo.kaluga.bluetooth.distance
 import com.splendo.kaluga.bluetooth.get
@@ -40,17 +41,14 @@ import com.splendo.kaluga.resources.localized
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
-class DeviceDetailsSpec : NavigationBundleSpec<DeviceDetailsSpecRow<*>>(setOf(DeviceDetailsSpecRow.UUIDRow))
-
-sealed class DeviceDetailsSpecRow<V>(associatedType: NavigationBundleSpecType<V>) : NavigationBundleSpecRow<V>(associatedType) {
-    object UUIDRow : DeviceDetailsSpecRow<String>(NavigationBundleSpecType.StringType)
-}
+class DeviceDetails(value: Identifier) : SingleValueNavigationAction<SerializableIdentifier>(value.serializable, NavigationBundleSpecType.SerializedType(SerializableIdentifier.serializer()))
 
 class BluetoothDeviceDetailViewModel(private val identifier: Identifier) : BaseLifecycleViewModel(), KoinComponent {
 
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
index f4d98b64a..2eccab381 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
@@ -44,7 +44,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
-class BluetoothListDeviceViewModel(private val identifier: Identifier, bluetooth: Bluetooth, navigator: Navigator<BluetoothListNavigation>) : NavigatingViewModel<BluetoothListNavigation>(navigator) {
+class BluetoothListDeviceViewModel(private val identifier: Identifier, bluetooth: Bluetooth, navigator: Navigator<DeviceDetails>) : NavigatingViewModel<DeviceDetails>(navigator) {
 
     enum class ConnectButtonState {
         Connect,
@@ -101,16 +101,7 @@ class BluetoothListDeviceViewModel(private val identifier: Identifier, bluetooth
         device.disconnect()
     }
 
-    fun onMorePressed() =
-        navigator.navigate(
-            BluetoothListNavigation(
-                DeviceDetailsSpec().toBundle { specRow ->
-                    when (specRow) {
-                        is DeviceDetailsSpecRow.UUIDRow -> specRow.convertValue(identifier.stringValue)
-                    }
-                }
-            )
-        )
+    fun onMorePressed() = navigator.navigate(DeviceDetails(identifier))
 
     private fun parseServiceUUIDs(uuids: List<UUID>): String {
         val uuidString = uuids.fold("") { result, next ->
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt
index 8c3988189..19d3e5455 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt
@@ -17,24 +17,19 @@
 
 package com.splendo.kaluga.example.shared.viewmodel.bluetooth
 
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.NavigationBundle
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
 import com.splendo.kaluga.bluetooth.Bluetooth
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
-class BluetoothListNavigation(bundle: NavigationBundle<DeviceDetailsSpecRow<*>>) : NavigationAction<DeviceDetailsSpecRow<*>>(bundle)
-
-class BluetoothListViewModel(navigator: Navigator<BluetoothListNavigation>) : NavigatingViewModel<BluetoothListNavigation>(navigator), KoinComponent {
+class BluetoothListViewModel(navigator: Navigator<DeviceDetails>) : NavigatingViewModel<DeviceDetails>(navigator), KoinComponent {
 
     private val bluetooth: Bluetooth by inject()
     private val _isScanning = MutableStateFlow(false)
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
index 843592790..e377a01c1 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
@@ -17,43 +17,25 @@
 
 package com.splendo.kaluga.example.shared.viewmodel.info
 
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.NavigationBundle
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.toBundle
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.observable.observableOf
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
 import com.splendo.kaluga.review.ReviewManager
 import kotlinx.coroutines.launch
+import kotlinx.serialization.Serializable
 
-class DialogSpec : NavigationBundleSpec<DialogSpecRow>(setOf(DialogSpecRow.TitleRow, DialogSpecRow.MessageRow))
+@Serializable
+data class DialogSpec(val title: String, val message: String)
+@Serializable
+data class MailSpec(val to: List<String>, val subject: String)
 
-sealed class DialogSpecRow : NavigationBundleSpecRow<String>(NavigationBundleSpecType.StringType) {
-    object TitleRow : DialogSpecRow()
-    object MessageRow : DialogSpecRow()
-}
-
-class LinkSpec : NavigationBundleSpec<LinkSpecRow>(setOf(LinkSpecRow.LinkRow))
-
-sealed class LinkSpecRow : NavigationBundleSpecRow<String>(NavigationBundleSpecType.StringType) {
-    object LinkRow : LinkSpecRow()
-}
-
-class MailSpec : NavigationBundleSpec<MailSpecRow<*>>(setOf(MailSpecRow.ToRow, MailSpecRow.SubjectRow))
-
-sealed class MailSpecRow<V>(associatedType: NavigationBundleSpecType<V>) : NavigationBundleSpecRow<V>(associatedType) {
-    object ToRow : MailSpecRow<List<String>>(NavigationBundleSpecType.StringArrayType)
-    object SubjectRow : MailSpecRow<String>(NavigationBundleSpecType.StringType)
-}
-
-sealed class InfoNavigation<B : NavigationBundleSpecRow<*>>(bundle: NavigationBundle<B>) : NavigationAction<B>(bundle) {
+sealed class InfoNavigation<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
 
-    class Dialog(bundle: NavigationBundle<DialogSpecRow>) : InfoNavigation<DialogSpecRow>(bundle)
-    class Link(bundle: NavigationBundle<LinkSpecRow>) : InfoNavigation<LinkSpecRow>(bundle)
-    class Mail(bundle: NavigationBundle<MailSpecRow<*>>) : InfoNavigation<MailSpecRow<*>>(bundle)
+    class Dialog(title: String, message: String) : InfoNavigation<DialogSpec>(DialogSpec(title, message), NavigationBundleSpecType.SerializedType(DialogSpec.serializer()))
+    class Link(link: String) : InfoNavigation<String>(link, NavigationBundleSpecType.StringType)
+    class Mail(to: List<String>, subject: String) : InfoNavigation<MailSpec>(MailSpec(to, subject), NavigationBundleSpecType.SerializedType(MailSpec.serializer()))
 }
 
 class InfoViewModel(
@@ -74,36 +56,10 @@ class InfoViewModel(
 
     fun onButtonPressed(button: Button) {
         when (button) {
-            is Button.About -> InfoNavigation.Dialog(
-                DialogSpec().toBundle { row ->
-                    when (row) {
-                        is DialogSpecRow.TitleRow -> row.convertValue("About Us")
-                        is DialogSpecRow.MessageRow -> row.convertValue("Kaluga is developed by Splendo Consulting BV")
-                    }
-                }
-            )
-            is Button.Website -> InfoNavigation.Link(
-                LinkSpec().toBundle { row ->
-                    when (row) {
-                        is LinkSpecRow.LinkRow -> row.convertValue("https://kaluga.splendo.com")
-                    }
-                }
-            )
-            is Button.GitHub -> InfoNavigation.Link(
-                LinkSpec().toBundle { row ->
-                    when (row) {
-                        is LinkSpecRow.LinkRow -> row.convertValue("https://github.com/splendo/kaluga")
-                    }
-                }
-            )
-            is Button.Mail -> InfoNavigation.Mail(
-                MailSpec().toBundle { row ->
-                    when (row) {
-                        is MailSpecRow.ToRow -> row.convertValue(listOf("info@splendo.com"))
-                        is MailSpecRow.SubjectRow -> row.convertValue("Question about Kaluga")
-                    }
-                }
-            )
+            is Button.About -> InfoNavigation.Dialog("About Us", "Kaluga is developed by Splendo Consulting BV")
+            is Button.Website -> InfoNavigation.Link("https://kaluga.splendo.com")
+            is Button.GitHub -> InfoNavigation.Link("https://github.com/splendo/kaluga")
+            is Button.Mail -> InfoNavigation.Mail(listOf("info@splendo.com"), ("Question about Kaluga"))
             is Button.Review -> {
                 coroutineScope.launch {
                     reviewManager.attemptToRequestReview()
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
index f11a4c15c..a2eb9544d 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
@@ -26,6 +26,7 @@ import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.navigation.toBundle
 import com.splendo.kaluga.architecture.observable.observableOf
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
@@ -40,21 +41,15 @@ data class Repository(
     val type: String
 )
 
-class BrowserSpec : NavigationBundleSpec<BrowserSpecRow>(setOf(BrowserSpecRow.UrlSpecRow))
-
-sealed class BrowserNavigationActions<B : NavigationBundleSpecRow<*>>(bundle: NavigationBundle<B>?) : NavigationAction<B>(bundle) {
-    class OpenWebView(bundle: NavigationBundle<BrowserSpecRow>?) : BrowserNavigationActions<BrowserSpecRow>(bundle)
-}
-
-sealed class BrowserSpecRow : NavigationBundleSpecRow<String>(NavigationBundleSpecType.StringType) {
-    object UrlSpecRow : BrowserSpecRow()
+sealed class BrowserNavigationActions<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
+    class OpenWebView(url: String) : BrowserNavigationActions<String>(url, NavigationBundleSpecType.StringType)
 }
 
 class LinksViewModel(
     linkRepoBuilder: LinksBuilder,
     val builder: AlertPresenter.Builder,
-    navigator: Navigator<BrowserNavigationActions<BrowserSpecRow>>
-) : NavigatingViewModel<BrowserNavigationActions<BrowserSpecRow>>(navigator) {
+    navigator: Navigator<BrowserNavigationActions<*>>
+) : NavigatingViewModel<BrowserNavigationActions<*>>(navigator) {
 
     val browserButtonText = observableOf("browser_button_text".localized())
     val linksInstructions = observableOf("links_instructions".localized())
@@ -77,15 +72,7 @@ class LinksViewModel(
         val result = linksRepo.validateLink("https://kaluga-links.web.app")
         if (result != null) {
             navigator.navigate(
-                BrowserNavigationActions.OpenWebView(
-                    BrowserSpec().toBundle { row ->
-                        when (row) {
-                            is BrowserSpecRow.UrlSpecRow -> row.convertValue(
-                                result
-                            )
-                        }
-                    }
-                )
+                BrowserNavigationActions.OpenWebView(result)
             )
         } else {
             showAlert(
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt
index 936f18a68..7d3ec401f 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt
@@ -19,19 +19,31 @@ package com.splendo.kaluga.example.shared.viewmodel.location
 
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.base.singleThreadDispatcher
+import com.splendo.kaluga.location.BaseLocationManager
 import com.splendo.kaluga.location.Location
 import com.splendo.kaluga.location.LocationStateRepoBuilder
 import com.splendo.kaluga.location.location
+import com.splendo.kaluga.logging.Logger
 import com.splendo.kaluga.permissions.location.LocationPermission
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
-class LocationViewModel(permission: LocationPermission, repoBuilder: LocationStateRepoBuilder) : BaseLifecycleViewModel() {
+private val locationDispatcher = singleThreadDispatcher("LocationDispatcher")
 
-    private val locationStateRepo = repoBuilder.create(permission)
+class LocationViewModel(permission: LocationPermission) : BaseLifecycleViewModel(), KoinComponent {
+
+    private val logger: Logger by inject()
+    private val repoBuilder: LocationStateRepoBuilder by inject()
+    private val locationStateRepo = repoBuilder.create(
+        permission,
+        { permission, permissions -> BaseLocationManager.Settings(permission, permissions, logger = logger) },
+        coroutineScope.coroutineContext + locationDispatcher
+    )
 
     private val _location = MutableStateFlow("")
     val location = _location.toInitializedObservable(coroutineScope)
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
index 51d2289ec..1872b1dbe 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.architecture.observable.UninitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.observable.toUninitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.base.singleThreadDispatcher
 import com.splendo.kaluga.permissions.base.Permission
 import com.splendo.kaluga.permissions.base.PermissionState
 import com.splendo.kaluga.permissions.base.Permissions
@@ -30,10 +31,16 @@ import com.splendo.kaluga.resources.localized
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
-class PermissionViewModel(permissionsBuilder: PermissionsBuilder, private val permission: Permission) : BaseLifecycleViewModel() {
+private val permissionsDispatcher = singleThreadDispatcher("PermissionsDispatcher")
 
-    private val permissions = Permissions(permissionsBuilder)
+class PermissionViewModel(private val permission: Permission) : BaseLifecycleViewModel(), KoinComponent {
+
+    private val permissionsBuilder: PermissionsBuilder by inject()
+
+    private val permissions = Permissions(permissionsBuilder, coroutineScope.coroutineContext + permissionsDispatcher)
     val permissionStateMessage: UninitializedObservable<String> = permissions[permission]
         .map { permissionState ->
             when (permissionState) {
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt
index cdbdd53a3..d42361c25 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt
@@ -17,20 +17,26 @@
 
 package com.splendo.kaluga.example.shared.viewmodel.permissions
 
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.toBundle
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.observable.observableOf
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
 import com.splendo.kaluga.logging.RestrictedLogLevel
 import com.splendo.kaluga.logging.RestrictedLogger
 import com.splendo.kaluga.permissions.base.BasePermissionManager
-import com.splendo.kaluga.permissions.base.Permissions
+import com.splendo.kaluga.permissions.base.Permission
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
+import com.splendo.kaluga.permissions.bluetooth.BluetoothPermission
+import com.splendo.kaluga.permissions.calendar.CalendarPermission
+import com.splendo.kaluga.permissions.camera.CameraPermission
+import com.splendo.kaluga.permissions.contacts.ContactsPermission
+import com.splendo.kaluga.permissions.location.LocationPermission
+import com.splendo.kaluga.permissions.microphone.MicrophonePermission
+import com.splendo.kaluga.permissions.notifications.NotificationOptions
+import com.splendo.kaluga.permissions.notifications.NotificationsPermission
 import com.splendo.kaluga.permissions.registerAllPermissionsNotRegistered
+import com.splendo.kaluga.permissions.storage.StoragePermission
 import com.splendo.kaluga.resources.localized
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
@@ -46,13 +52,23 @@ enum class PermissionView(val title: String) {
     Location("permissions_location".localized()),
     Microphone("permissions_microphone".localized()),
     Notifications("permissions_notifications".localized()),
-    Storage("permissions_storage".localized())
+    Storage("permissions_storage".localized());
+
+    val permission: Permission get() = when (this) {
+        Bluetooth -> BluetoothPermission
+        Calendar -> CalendarPermission(allowWrite = true)
+        Camera -> CameraPermission
+        Contacts -> ContactsPermission(allowWrite = true)
+        Location -> LocationPermission(background = true, precise = true)
+        Microphone -> MicrophonePermission
+        Notifications -> NotificationsPermission(notificationOptions)
+        Storage -> StoragePermission(allowWrite = true)
+    }
 }
 
-object PermissionNavigationBundleSpecRow : NavigationBundleSpecRow<PermissionView>(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))
-class PermissionNavigationBundleSpec : NavigationBundleSpec<PermissionNavigationBundleSpecRow>(setOf(PermissionNavigationBundleSpecRow))
+expect val notificationOptions: NotificationOptions
 
-class PermissionsListNavigationAction(permissionView: PermissionView) : NavigationAction<PermissionNavigationBundleSpecRow>(PermissionNavigationBundleSpec().toBundle { spec -> spec.convertValue(permissionView) })
+class PermissionsListNavigationAction(permissionView: PermissionView) : SingleValueNavigationAction<PermissionView>(permissionView, NavigationBundleSpecType.SerializedType(PermissionView.serializer()))
 
 class PermissionsListViewModel(navigator: Navigator<PermissionsListNavigationAction>) : NavigatingViewModel<PermissionsListNavigationAction>(navigator), KoinComponent {
 
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
index 1dd8689b2..bec3c7dfd 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
@@ -28,16 +28,13 @@ sealed class SystemFeatures(val name: String) {
     object Network : SystemFeatures("network_feature".localized())
 }
 
-sealed class SystemNavigationActions<Value>(
-    value: Value,
-    type: NavigationBundleSpecType<Value>
-) : SingleValueNavigationAction<Value>(value, type) {
-    object Network : SystemNavigationActions<Unit>(Unit, NavigationBundleSpecType.UnitType)
+sealed class SystemNavigationActions : SingleValueNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType) {
+    object Network : SystemNavigationActions()
 }
 
 class SystemViewModel(
-    navigator: Navigator<SystemNavigationActions<Unit>>
-) : NavigatingViewModel<SystemNavigationActions<Unit>>(navigator) {
+    navigator: Navigator<SystemNavigationActions>
+) : NavigatingViewModel<SystemNavigationActions>(navigator) {
 
     val modules =
         observableOf(
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt
index f79552975..f3ae571f9 100644
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt
+++ b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt
@@ -19,12 +19,11 @@ package com.splendo.kaluga.example.shared.viewmodel.system.network
 
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.system.network.Network
+import com.splendo.kaluga.system.network.NetworkConnectionType
 import com.splendo.kaluga.system.network.state.NetworkStateRepoBuilder
 import com.splendo.kaluga.system.network.state.network
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
 class NetworkViewModel(
@@ -42,19 +41,19 @@ class NetworkViewModel(
         scope.launch {
             networkRepo.network().collect {
                 when (it) {
-                    is Network.Unknown.WithoutLastNetwork ->
+                    is NetworkConnectionType.Unknown.WithoutLastNetwork ->
                         _networkState.value =
                             "Network's state is Unknown and without the last available connection."
-                    is Network.Unknown.WithLastNetwork ->
+                    is NetworkConnectionType.Unknown.WithLastNetwork ->
                         _networkState.value =
-                            "Network's state is Unknown and with last known connection as ${it.lastKnownNetwork}."
-                    is Network.Known.Cellular ->
+                            "Network's state is Unknown and with last known connection as ${it.lastKnown}."
+                    is NetworkConnectionType.Known.Cellular ->
                         _networkState.value =
                             "Network's state is Available through Cellular."
-                    is Network.Known.Wifi ->
+                    is NetworkConnectionType.Known.Wifi ->
                         _networkState.value =
                             "Network's state is Available through WIFI."
-                    is Network.Known.Absent ->
+                    is NetworkConnectionType.Known.Absent ->
                         _networkState.value =
                             "Network's state is Absent."
                 }
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoNavigator.kt b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoNavigator.kt
new file mode 100644
index 000000000..924fa6f1b
--- /dev/null
+++ b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoNavigator.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.info
+
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.ViewControllerNavigator
+import platform.UIKit.UIViewController
+
+fun InfoNavigator(
+    parent: UIViewController,
+    onDialogSpec: (DialogSpec) -> NavigationSpec,
+    onLink: (String) -> NavigationSpec,
+    onMailSpec: (MailSpec) -> NavigationSpec
+
+) = ViewControllerNavigator<InfoNavigation<*>>(parent) { action ->
+    when (action) {
+        is InfoNavigation.Dialog -> onDialogSpec(action.value)
+        is InfoNavigation.Link -> onLink(action.value)
+        is InfoNavigation.Mail -> onMailSpec(action.value)
+    }
+}
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/BrowserNavigator.kt b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/BrowserNavigator.kt
new file mode 100644
index 000000000..9672a7e6e
--- /dev/null
+++ b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/BrowserNavigator.kt
@@ -0,0 +1,29 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.link
+
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.ViewControllerNavigator
+import platform.Foundation.NSURL
+import platform.UIKit.UIViewController
+
+fun BrowserNavigator(parent: UIViewController) = ViewControllerNavigator<BrowserNavigationActions<*>>(parent) { action ->
+    when (action) {
+        is BrowserNavigationActions.OpenWebView -> NavigationSpec.Browser(NSURL.URLWithString(action.value)!!, NavigationSpec.Browser.Type.Normal)
+    }
+}
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
new file mode 100644
index 000000000..621259f1e
--- /dev/null
+++ b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.permissions
+
+import com.splendo.kaluga.permissions.notifications.NotificationOptions
+import platform.UserNotifications.UNAuthorizationOptionAlert
+import platform.UserNotifications.UNAuthorizationOptionSound
+
+actual val notificationOptions = NotificationOptions(UNAuthorizationOptionAlert or UNAuthorizationOptionSound)
diff --git a/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt b/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
new file mode 100644
index 000000000..1ddf8c61b
--- /dev/null
+++ b/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.permissions
+
+import com.splendo.kaluga.permissions.notifications.NotificationOptions
+
+actual val notificationOptions = NotificationOptions()
\ No newline at end of file
diff --git a/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt b/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
new file mode 100644
index 000000000..5c0a64d55
--- /dev/null
+++ b/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 Splendo Consulting B.V. The Netherlands
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.permissions
+
+import com.splendo.kaluga.permissions.notifications.NotificationOptions
+
+actual val notificationOptions = NotificationOptions()

From 71f4737540ff2ba94e03022144b207f1c8abccae Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 16 Nov 2022 16:52:08 +0100
Subject: [PATCH 029/227] Move newExample to old folder

---
 {newexample => example}/.gitignore            |    0
 example/android/build.gradle                  |   92 -
 .../android/build.gradle.kts                  |    0
 example/android/proguard-rules.pro            |   21 -
 example/android/src/main/AndroidManifest.xml  |   11 +-
 .../kaluga/example/ExampleApplication.kt      |   10 +-
 .../splendo/kaluga/example/InfoFragment.kt    |   20 +-
 .../kaluga/example/alerts/AlertsActivity.kt   |    2 +-
 .../ArchitectureDetailsActivity.kt            |   10 +-
 .../architecture/ArchitectureInputActivity.kt |    3 +-
 .../example/bluetooth/BluetoothActivity.kt    |    4 +-
 .../bluetooth/BluetoothMoreActivity.kt        |   13 +-
 .../bottomSheet/BottomSheetActivity.kt        |    0
 .../bottomSheet/ui/BottomSheetLayout.kt       |    0
 .../bottomSheet/ui/BottomSheetParentLayout.kt |    0
 .../ui/BottomSheetParentSubPageLayout.kt      |    0
 .../ui/BottomSheetSubPageLayout.kt            |    0
 .../viewModel/NavigationMappers.kt            |    0
 .../example/contacts/ContactsActivity.kt      |    0
 .../contacts/ui/ContactDetailsLayout.kt       |    0
 .../example/contacts/ui/ContactsLayout.kt     |    0
 .../example/contacts/ui/ContactsListLayout.kt |    0
 .../kaluga/example/contacts/ui/Styles.kt      |    0
 .../contacts/viewModel/NavigationMappers.kt   |    0
 .../com/splendo/kaluga/example/di/Modules.kt  |  217 ---
 .../kaluga/example/link/LinksActivity.kt      |    5 +-
 .../kaluga/example/loading/LoadingActivity.kt |    2 +-
 .../location/LocationBackgroundService.kt     |    6 +-
 .../permissions/PermissionsDemoActivity.kt    |   25 +-
 .../PlatformSpecificActivity.kt               |   12 +-
 .../bottomSheet/BottomSheetActivity.kt        |   32 -
 .../bottomSheet/ui/BottomSheetLayout.kt       |   73 -
 .../bottomSheet/ui/BottomSheetParentLayout.kt |  124 --
 .../ui/BottomSheetParentSubPageLayout.kt      |   53 -
 .../ui/BottomSheetSubPageLayout.kt            |   79 -
 .../viewModel/NavigationMappers.kt            |   59 -
 .../compose/contacts/ContactsActivity.kt      |   32 -
 .../contacts/ui/ContactDetailsLayout.kt       |   97 -
 .../compose/contacts/ui/ContactsLayout.kt     |   53 -
 .../compose/contacts/ui/ContactsListLayout.kt |  100 -
 .../compose/contacts/ui/Styles.kt             |   17 -
 .../contacts/viewModel/NavigationMappers.kt   |   52 -
 .../kaluga/example/system/NetworkActivity.kt  |    0
 .../kaluga/example/system/SystemActivity.kt   |   19 +-
 .../system/fragments/NetworkFragment.kt       |   44 -
 .../src/main/res/layout/activity_location.xml |   76 +-
 .../src/main/res/layout/activity_network.xml  |    0
 .../src/main/res/layout/activity_system.xml   |   17 +-
 .../src/main/res/layout/fragment_network.xml  |   43 -
 {newexample => example}/build.gradle.kts      |    0
 {newexample => example}/gradle.properties     |    0
 .../gradle/wrapper/gradle-wrapper.jar         |  Bin
 .../gradle/wrapper/gradle-wrapper.properties  |    0
 {newexample => example}/gradlew               |    0
 {newexample => example}/gradlew.bat           |    0
 .../inspectionProfiles/Project_Default.xml    |    6 -
 example/ios/.idea/runConfigurations/Demo.xml  |   11 -
 example/ios/Demo.xcodeproj/project.pbxproj    |  102 +-
 .../Demo/Alerts/AlertsViewController.swift    |   10 +-
 example/ios/Demo/AppDelegate.swift            |    4 +-
 .../ArchitectureDetailsViewController.swift   |   25 +-
 .../ArchitectureInputViewController.swift     |   37 +-
 .../ios/Demo/Beacons/BeaconsViewCell.swift    |    2 +-
 .../Demo/Beacons/BeaconsViewController.swift  |   10 +-
 ...BluetoothDeviceDetailsViewController.swift |  101 +-
 .../Bluetooth/BluetoothViewController.swift   |   55 +-
 .../DateTimePickerViewController.swift        |   24 +-
 example/ios/Demo/ExampleViewController.swift  |   57 +-
 .../FeaturesListViewController.swift          |   61 +-
 .../ios/Demo/Info/InfoViewController.swift    |   65 +-
 .../KeyboardManagerViewController.swift       |   16 +-
 .../ios/Demo/Links/LinksViewController.swift  |   12 +-
 .../LoadingViewController.swift               |   12 +-
 .../Location/LocationViewController.swift     |   18 +-
 .../PermissionListViewController.swift        |   48 +-
 .../PermissionViewController.swift            |   48 +-
 .../Demo/Resources/ButtonViewController.swift |    6 +-
 .../Demo/Resources/ColorViewController.swift  |    6 +-
 .../Demo/Resources/LabelViewController.swift  |   10 +-
 .../ResourcesListViewController.swift         |   54 +-
 .../Network/NetworkViewController.swift       |   11 +-
 .../Demo/System/SystemViewController.swift    |   44 +-
 example/ios/DemoTests/DemoTests.swift         |    2 +-
 example/ios/KotlinNativeFramework/Info.plist  |   22 -
 .../KotlinNativeFramework/build.gradle.kts    |   52 -
 .../kotlin/KotlinNativeFramework.kt           |   28 -
 .../architecture/KNArchitectureFramework.kt   |  139 --
 .../kotlin/beacons/KNBeaconsFramework.kt      |   39 -
 .../kotlin/bluetooth/KNBluetoothFramework.kt  |   34 -
 .../kotlin/location/KNLocationFramework.kt    |    7 -
 .../permissions/KNPermissionsFramework.kt     |   29 -
 .../.idea/codeStyles/Project.xml              |  127 --
 .../.idea/codeStyles/codeStyleConfig.xml      |    5 -
 .../.idea/copyright/apache.xml                |    6 -
 .../.idea/copyright/profiles_settings.xml     |    7 -
 .../.run/Ktlint Check.run.xml                 |   23 -
 .../.run/Ktlint Format.run.xml                |   23 -
 example/ios/Supporting Files/build.gradle.kts |   41 -
 .../ios/Supporting Files/gradle.properties    |   21 -
 .../gradle/wrapper/gradle-wrapper.jar         |  Bin 54413 -> 0 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |    5 -
 example/ios/Supporting Files/gradlew          |  172 --
 .../ios/Supporting Files/settings.gradle.kts  |   61 -
 example/readme.md                             |   81 -
 {newexample => example}/settings.gradle.kts   |    0
 example/shared/build.gradle.kts               |   63 +-
 .../example/shared/di/DependencyInjection.kt  |    0
 .../BottomSheetParentSubPageViewModel.kt      |   36 -
 .../bottomSheet/BottomSheetParentViewModel.kt |   42 -
 .../BottomSheetSubPageViewModel.kt            |   41 -
 .../bottomSheet/BottomSheetViewModel.kt       |   42 -
 .../compose/contacts/model/ContactDetails.kt  |   23 -
 .../viewModel/ContactDetailsViewModel.kt      |   48 -
 .../viewModel/ContactsListViewModel.kt        |   60 -
 .../permissions/NotificationOptions.kt        |    0
 .../src/commonMain/kotlin/AlertViewModel.kt   |   96 -
 .../src/commonMain/kotlin/HelloShared.kt      |   23 -
 .../src/commonMain/kotlin/HudViewModel.kt     |   51 -
 .../example/shared/di/DependencyInjection.kt  |    0
 .../shared/model/contacts/ContactDetails.kt   |    0
 .../example/shared/stylable/ButtonStyles.kt   |    0
 .../example/shared/stylable/TextStyles.kt     |    0
 .../shared}/viewmodel/ExampleViewModel.kt     |    0
 .../shared/viewmodel/alert/AlertViewModel.kt  |    0
 .../ArchitectureDetailsViewModel.kt           |    0
 .../ArchitectureInputViewModel.kt             |    0
 .../beacons/BeaconsListBeaconViewModel.kt     |    0
 .../viewmodel/beacons/BeaconsListViewModel.kt |    0
 .../BluetoothCharacteristicViewModel.kt       |    0
 .../bluetooth/BluetoothDescriptorViewModel.kt |    0
 .../BluetoothDeviceDetailViewModel.kt         |    0
 .../bluetooth/BluetoothListDeviceViewModel.kt |    0
 .../bluetooth/BluetoothListViewModel.kt       |    0
 .../bluetooth/BluetoothServiceViewModel.kt    |    0
 .../BottomSheetParentSubPageViewModel.kt      |    0
 .../bottomsheet/BottomSheetParentViewModel.kt |    0
 .../BottomSheetSubPageViewModel.kt            |    0
 .../bottomsheet/BottomSheetViewModel.kt       |    0
 .../contacts/ContactDetailsViewModel.kt       |    0
 .../contacts/ContactsListViewModel.kt         |    0
 .../datetimepicker/DateTimePickerViewModel.kt |    0
 .../featureList/FeatureListViewModel.kt       |    0
 .../viewmodel/featureList/PlatformSpecific.kt |    0
 .../shared/viewmodel/hud/HudViewModel.kt      |    0
 .../shared/viewmodel/info/InfoViewModel.kt    |    0
 .../viewmodel/keyboard/KeyboardViewModel.kt   |    0
 .../shared/viewmodel/link/LinksViewModel.kt   |    0
 .../viewmodel/location/LocationViewModel.kt   |    0
 .../permissions/PermissionViewModel.kt        |    0
 .../permissions/PermissionsListViewModel.kt   |    0
 .../viewmodel/resources/ButtonViewModel.kt    |    0
 .../viewmodel/resources/ColorViewModel.kt     |    0
 .../viewmodel/resources/LabelViewModel.kt     |    0
 .../resources/ResourcesListViewModel.kt       |    0
 .../viewmodel/system/SystemViewModel.kt       |    0
 .../system/network/NetworkViewModel.kt        |    0
 .../kotlin/stylable/ButtonStyles.kt           |  224 ---
 .../commonMain/kotlin/stylable/TextStyles.kt  |   37 -
 .../ArchitectureInputViewModel.kt             |   85 -
 .../viewmodel/beacons/BeaconsListViewModel.kt |   76 -
 .../BluetoothDeviceDetailViewModel.kt         |  107 -
 .../bluetooth/BluetoothListDeviceViewModel.kt |  139 --
 .../bluetooth/BluetoothListViewModel.kt       |   75 -
 .../kotlin/viewmodel/info/InfoViewModel.kt    |  115 --
 .../kotlin/viewmodel/link/LinksViewModel.kt   |  115 --
 .../viewmodel/location/LocationViewModel.kt   |   61 -
 .../permissions/PermissionViewModel.kt        |   61 -
 .../permissions/PermissionsListViewModel.kt   |   66 -
 .../viewmodel/system/SystemViewModel.kt       |   54 -
 .../system/network/NetworkViewModel.kt        |   64 -
 .../example/shared/di/DependencyInjection.kt  |    0
 .../shared/viewmodel/info/InfoNavigator.kt    |    0
 .../shared/viewmodel/link/BrowserNavigator.kt |    0
 .../permissions/NotificationOptions.kt        |    0
 .../example/shared/di/DependencyInjection.kt  |    0
 .../permissions/NotificationOptions.kt        |    0
 .../example/shared/di/DependencyInjection.kt  |    0
 .../permissions/NotificationOptions.kt        |    0
 example/web/.firebaserc                       |   17 -
 example/web/.gitignore                        |   66 -
 example/web/firebase.json                     |   43 -
 .../.well-known/apple-app-site-association    |   11 -
 .../web/public/.well-known/assetlinks.json    |   12 -
 example/web/public/404.html                   |   33 -
 example/web/public/index.html                 |   29 -
 example/web/public/style.css                  |    3 -
 .../android/src/main/AndroidManifest.xml      |  117 --
 .../splendo/kaluga/example/ExampleActivity.kt |   76 -
 .../kaluga/example/ExampleApplication.kt      |   33 -
 .../kaluga/example/FeaturesListFragment.kt    |  112 --
 .../splendo/kaluga/example/InfoFragment.kt    |  121 --
 .../kaluga/example/alerts/AlertsActivity.kt   |   42 -
 .../ArchitectureDetailsActivity.kt            |   64 -
 .../architecture/ArchitectureInputActivity.kt |   75 -
 .../kaluga/example/beacons/BeaconsActivity.kt |   81 -
 .../kaluga/example/beacons/BeaconsAdapter.kt  |   64 -
 .../kaluga/example/beacons/BeaconsBinding.kt  |   31 -
 .../example/bluetooth/BluetoothActivity.kt    |   93 -
 .../example/bluetooth/BluetoothAdapter.kt     |   76 -
 .../BluetoothCharacteristicAdapter.kt         |   78 -
 .../bluetooth/BluetoothDescriptorAdapter.kt   |   77 -
 .../bluetooth/BluetoothMoreActivity.kt        |   48 -
 .../bluetooth/BluetoothServiceAdapter.kt      |   78 -
 .../datetimepicker/DateTimePickerActivity.kt  |   21 -
 .../keyboard/KeyboardManagerActivity.kt       |   46 -
 .../kaluga/example/link/LinksActivity.kt      |   78 -
 .../kaluga/example/loading/LoadingActivity.kt |   45 -
 .../example/location/LocationActivity.kt      |   61 -
 .../location/LocationBackgroundService.kt     |  103 -
 .../permissions/PermissionsDemoActivity.kt    |   69 -
 .../PermissionsDemoListActivity.kt            |   81 -
 .../PlatformSpecificActivity.kt               |   90 -
 .../example/resources/ButtonActivity.kt       |   79 -
 .../kaluga/example/resources/ColorActivity.kt |  139 --
 .../kaluga/example/resources/LabelActivity.kt |   77 -
 .../example/resources/ResourcesActivity.kt    |   75 -
 .../kaluga/example/system/SystemActivity.kt   |   89 -
 .../kaluga/example/view/ItemDecoration.kt     |   33 -
 .../src/main/res/drawable/ic_account.xml      |    5 -
 .../res/drawable/ic_launcher_foreground.xml   |   72 -
 .../main/res/drawable/ic_refresh_circle.xml   |    8 -
 .../src/main/res/drawable/ic_stop_circle.xml  |    8 -
 .../src/main/res/layout/activity_alerts.xml   |   39 -
 .../layout/activity_architecture_details.xml  |   43 -
 .../layout/activity_architecture_input.xml    |   63 -
 .../src/main/res/layout/activity_beacons.xml  |   30 -
 .../main/res/layout/activity_bluetooth.xml    |   29 -
 .../res/layout/activity_bluetooth_more.xml    |   93 -
 .../res/layout/activity_date_time_picker.xml  |   50 -
 .../src/main/res/layout/activity_example.xml  |   24 -
 .../res/layout/activity_keyboard_manager.xml  |   32 -
 .../src/main/res/layout/activity_link.xml     |   53 -
 .../src/main/res/layout/activity_loading.xml  |   27 -
 .../src/main/res/layout/activity_location.xml |   44 -
 .../src/main/res/layout/activity_main.xml     |   19 -
 .../res/layout/activity_permissions_demo.xml  |   30 -
 .../res/layout/activity_permissions_list.xml  |    9 -
 .../main/res/layout/activity_resources.xml    |   18 -
 .../res/layout/activity_resources_color.xml   |  166 --
 .../src/main/res/layout/activity_system.xml   |   33 -
 .../src/main/res/layout/beacon_item.xml       |   53 -
 .../layout/bluetooth_characteristic_item.xml  |   69 -
 .../res/layout/bluetooth_descriptor_item.xml  |   42 -
 .../src/main/res/layout/bluetooth_item.xml    |  159 --
 .../res/layout/bluetooth_service_item.xml     |   61 -
 .../src/main/res/layout/dialog_info.xml       |   27 -
 .../res/layout/fragment_features_list.xml     |    9 -
 .../src/main/res/layout/fragment_info.xml     |    9 -
 .../res/layout/loading_indicator_view_.xml    |   25 -
 .../src/main/res/layout/view_list_button.xml  |   10 -
 .../main/res/layout/view_list_text_view.xml   |   14 -
 .../layout/view_resource_list_background.xml  |    7 -
 .../src/main/res/menu/bluetooth_menu.xml      |   18 -
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |    5 -
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |    5 -
 .../src/main/res/mipmap-hdpi/ic_launcher.png  |  Bin 2147 -> 0 bytes
 .../res/mipmap-hdpi/ic_launcher_round.png     |  Bin 4049 -> 0 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  |  Bin 1422 -> 0 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     |  Bin 2536 -> 0 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png |  Bin 2990 -> 0 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    |  Bin 5845 -> 0 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    |  Bin 4620 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   |  Bin 9165 -> 0 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   |  Bin 6296 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  |  Bin 12899 -> 0 bytes
 .../src/main/res/values-night/colors.xml      |    7 -
 .../src/main/res/values-night/styles.xml      |   11 -
 .../android/src/main/res/values/colors.xml    |   30 -
 .../android/src/main/res/values/dimens.xml    |   23 -
 .../res/values/ic_launcher_background.xml     |    4 -
 .../android/src/main/res/values/strings.xml   |  112 --
 .../android/src/main/res/values/styles.xml    |   30 -
 newexample/ios/Demo.xcodeproj/project.pbxproj |  867 ---------
 .../contents.xcworkspacedata                  |    7 -
 .../xcshareddata/IDEWorkspaceChecks.plist     |    8 -
 .../xcshareddata/IDETemplateMacros.plist      |   22 -
 .../xcshareddata/xcschemes/Demo.xcscheme      |  100 -
 .../xcshareddata/xcschemes/DemoTests.xcscheme |   52 -
 .../xcschemes/DemoUITests.xcscheme            |   52 -
 .../Demo/Alerts/AlertsViewController.swift    |   47 -
 newexample/ios/Demo/AppDelegate.swift         |   82 -
 .../ArchitectureDetailsViewController.swift   |   82 -
 .../ArchitectureInputViewController.swift     |  109 --
 .../AppIcon.appiconset/AppIcon20@2x~iPad.png  |  Bin 1340 -> 0 bytes
 .../AppIcon20@2x~iPhone.png                   |  Bin 1340 -> 0 bytes
 .../AppIcon20@3x~iPhone.png                   |  Bin 2053 -> 0 bytes
 .../AppIcon.appiconset/AppIcon20~iPad.png     |  Bin 667 -> 0 bytes
 .../AppIcon.appiconset/AppIcon29@1x~iPad.png  |  Bin 927 -> 0 bytes
 .../AppIcon.appiconset/AppIcon29@2x~iPad.png  |  Bin 2021 -> 0 bytes
 .../AppIcon29@2x~iPhone.png                   |  Bin 2021 -> 0 bytes
 .../AppIcon29@3x~iPhone.png                   |  Bin 3078 -> 0 bytes
 .../AppIcon.appiconset/AppIcon40@2x~iPad.png  |  Bin 2895 -> 0 bytes
 .../AppIcon40@2x~iPhone.png                   |  Bin 2895 -> 0 bytes
 .../AppIcon40@3x~iPhone.png                   |  Bin 3972 -> 0 bytes
 .../AppIcon.appiconset/AppIcon40~iPad.png     |  Bin 1340 -> 0 bytes
 .../AppIcon60@2x~iPhone.png                   |  Bin 3972 -> 0 bytes
 .../AppIcon60@3x~iPhone.png                   |  Bin 5454 -> 0 bytes
 .../AppIcon.appiconset/AppIcon76@2x~iPad.png  |  Bin 4925 -> 0 bytes
 .../AppIcon.appiconset/AppIcon76~iPad.png     |  Bin 2700 -> 0 bytes
 .../AppIcon.appiconset/AppIcon83@2x~iPad.png  |  Bin 5338 -> 0 bytes
 .../AppIcon~iOS-marketing.png                 |  Bin 58518 -> 0 bytes
 .../AppIcon.appiconset/Contents.json          |  116 --
 .../ios/Demo/Assets.xcassets/Contents.json    |    6 -
 .../close_icon.imageset/Contents.json         |   15 -
 .../close_icon.imageset/close-24px.pdf        |  Bin 4345 -> 0 bytes
 .../darker_color.colorset/Contents.json       |   38 -
 .../error_icon.imageset/Contents.json         |   15 -
 .../error_icon.imageset/error-black-18dp.pdf  |  Bin 1020 -> 0 bytes
 .../li_colorAccent.colorset/Contents.json     |   20 -
 .../li_colorBackground.colorset/Contents.json |   20 -
 .../Demo/Base.lproj/LaunchScreen.storyboard   |   27 -
 .../ios/Demo/Base.lproj/Localizable.strings   |  102 -
 .../ios/Demo/Base.lproj/Main.storyboard       | 1727 -----------------
 .../ios/Demo/Beacons/BeaconsViewCell.swift    |   52 -
 .../Demo/Beacons/BeaconsViewController.swift  |  111 --
 .../Bluetooth/BluetoothCharacteristicCell.xib |   85 -
 .../Bluetooth/BluetoothDescriptorCell.xib     |   53 -
 ...BluetoothDeviceDetailsViewController.swift |  363 ----
 .../Bluetooth/BluetoothViewController.swift   |  233 ---
 .../DateTimePickerViewController.swift        |   56 -
 newexample/ios/Demo/Demo.entitlements         |   10 -
 .../ios/Demo/ExampleViewController.swift      |   86 -
 .../FeaturesListViewController.swift          |  104 -
 .../ios/Demo/Helpers/UIControl+Closure.swift  |   38 -
 newexample/ios/Demo/Info.plist                |   82 -
 .../ios/Demo/Info/InfoViewController.swift    |  104 -
 .../KeyboardManagerViewController.swift       |   50 -
 .../ios/Demo/Links/LinksViewController.swift  |   57 -
 .../ActivityViewController.swift              |   20 -
 .../ActivityViewController.xib                |   65 -
 .../LoadingViewController.swift               |   44 -
 .../Location/LocationViewController.swift     |   54 -
 .../PermissionListViewController.swift        |   87 -
 .../PermissionViewController.swift            |   85 -
 .../Demo/Resources/ButtonViewController.swift |   68 -
 .../Demo/Resources/ColorViewController.swift  |  202 --
 .../Demo/Resources/LabelViewController.swift  |   69 -
 .../ResourcesListViewController.swift         |   94 -
 .../Network/NetworkViewController.swift       |   47 -
 .../Demo/System/SystemViewController.swift    |   87 -
 ...omaticHeightCollectionViewFlowLayout.swift |   51 -
 newexample/ios/DemoTests/DemoTests.swift      |   46 -
 newexample/ios/DemoTests/Info.plist           |   22 -
 newexample/ios/DemoUITests/DemoUITests.swift  |   44 -
 newexample/ios/DemoUITests/Info.plist         |   22 -
 newexample/keystore/debug.keystore            |  Bin 2419 -> 0 bytes
 newexample/shared/build.gradle.kts            |   57 -
 .../src/androidLibMain/AndroidManifest.xml    |    6 -
 .../viewmodel/featureList/PlatformSpecific.kt |   57 -
 .../shared/viewmodel/ExampleViewModel.kt      |   62 -
 .../ArchitectureDetailsViewModel.kt           |   57 -
 .../beacons/BeaconsListBeaconViewModel.kt     |   47 -
 .../BluetoothCharacteristicViewModel.kt       |   75 -
 .../bluetooth/BluetoothDescriptorViewModel.kt |   60 -
 .../bluetooth/BluetoothServiceViewModel.kt    |   64 -
 .../datetimepicker/DateTimePickerViewModel.kt |   57 -
 .../featureList/FeatureListViewModel.kt       |   97 -
 .../viewmodel/featureList/PlatformSpecific.kt |   20 -
 .../viewmodel/keyboard/KeyboardViewModel.kt   |   35 -
 .../viewmodel/resources/ButtonViewModel.kt    |   86 -
 .../viewmodel/resources/ColorViewModel.kt     |  192 --
 .../viewmodel/resources/LabelViewModel.kt     |  120 --
 .../resources/ResourcesListViewModel.kt       |   37 -
 .../viewmodel/featureList/PlatformSpecific.kt |   20 -
 .../viewmodel/featureList/PlatformSpecific.kt |   20 -
 .../viewmodel/featureList/PlatformSpecific.kt |   20 -
 366 files changed, 589 insertions(+), 15902 deletions(-)
 rename {newexample => example}/.gitignore (100%)
 delete mode 100644 example/android/build.gradle
 rename {newexample => example}/android/build.gradle.kts (100%)
 delete mode 100644 example/android/proguard-rules.pro
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt (100%)
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt (100%)
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/BottomSheetActivity.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ContactsActivity.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/Styles.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt
 rename {newexample => example}/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt (100%)
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
 rename {newexample => example}/android/src/main/res/layout/activity_network.xml (100%)
 delete mode 100644 example/android/src/main/res/layout/fragment_network.xml
 rename {newexample => example}/build.gradle.kts (100%)
 rename {newexample => example}/gradle.properties (100%)
 rename {newexample => example}/gradle/wrapper/gradle-wrapper.jar (100%)
 rename {newexample => example}/gradle/wrapper/gradle-wrapper.properties (100%)
 rename {newexample => example}/gradlew (100%)
 rename {newexample => example}/gradlew.bat (100%)
 delete mode 100644 example/ios/.idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 example/ios/.idea/runConfigurations/Demo.xml
 delete mode 100644 example/ios/KotlinNativeFramework/Info.plist
 delete mode 100644 example/ios/KotlinNativeFramework/build.gradle.kts
 delete mode 100644 example/ios/KotlinNativeFramework/src/commonMain/kotlin/KotlinNativeFramework.kt
 delete mode 100644 example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt
 delete mode 100644 example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt
 delete mode 100644 example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt
 delete mode 100644 example/ios/KotlinNativeFramework/src/commonMain/kotlin/location/KNLocationFramework.kt
 delete mode 100644 example/ios/KotlinNativeFramework/src/commonMain/kotlin/permissions/KNPermissionsFramework.kt
 delete mode 100644 example/ios/Supporting Files/.idea/codeStyles/Project.xml
 delete mode 100644 example/ios/Supporting Files/.idea/codeStyles/codeStyleConfig.xml
 delete mode 100644 example/ios/Supporting Files/.idea/copyright/apache.xml
 delete mode 100644 example/ios/Supporting Files/.idea/copyright/profiles_settings.xml
 delete mode 100644 example/ios/Supporting Files/.run/Ktlint Check.run.xml
 delete mode 100644 example/ios/Supporting Files/.run/Ktlint Format.run.xml
 delete mode 100644 example/ios/Supporting Files/build.gradle.kts
 delete mode 100644 example/ios/Supporting Files/gradle.properties
 delete mode 100644 example/ios/Supporting Files/gradle/wrapper/gradle-wrapper.jar
 delete mode 100644 example/ios/Supporting Files/gradle/wrapper/gradle-wrapper.properties
 delete mode 100755 example/ios/Supporting Files/gradlew
 delete mode 100644 example/ios/Supporting Files/settings.gradle.kts
 delete mode 100644 example/readme.md
 rename {newexample => example}/settings.gradle.kts (100%)
 rename {newexample => example}/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt (100%)
 delete mode 100644 example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentSubPageViewModel.kt
 delete mode 100644 example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentViewModel.kt
 delete mode 100644 example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetSubPageViewModel.kt
 delete mode 100644 example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetViewModel.kt
 delete mode 100644 example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/model/ContactDetails.kt
 delete mode 100644 example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt
 delete mode 100644 example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt
 rename {newexample => example}/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt (100%)
 delete mode 100644 example/shared/src/commonMain/kotlin/AlertViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/HelloShared.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/HudViewModel.kt
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/contacts/ContactDetails.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/ExampleViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/architecture/ArchitectureDetailsViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/beacons/BeaconsListBeaconViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/bluetooth/BluetoothServiceViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/datetimepicker/DateTimePickerViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/featureList/FeatureListViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/featureList/PlatformSpecific.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/keyboard/KeyboardViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/resources/ButtonViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/resources/ColorViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/resources/LabelViewModel.kt (100%)
 rename example/shared/src/commonMain/kotlin/{ => com/splendo/kaluga/example/shared}/viewmodel/resources/ResourcesListViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt (100%)
 rename {newexample => example}/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt (100%)
 delete mode 100644 example/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/stylable/TextStyles.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt
 rename {newexample => example}/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt (100%)
 rename {newexample => example}/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoNavigator.kt (100%)
 rename {newexample => example}/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/BrowserNavigator.kt (100%)
 rename {newexample => example}/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt (100%)
 rename {newexample => example}/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt (100%)
 rename {newexample => example}/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt (100%)
 rename {newexample => example}/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt (100%)
 rename {newexample => example}/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt (100%)
 delete mode 100644 example/web/.firebaserc
 delete mode 100644 example/web/.gitignore
 delete mode 100644 example/web/firebase.json
 delete mode 100644 example/web/public/.well-known/apple-app-site-association
 delete mode 100644 example/web/public/.well-known/assetlinks.json
 delete mode 100644 example/web/public/404.html
 delete mode 100644 example/web/public/index.html
 delete mode 100644 example/web/public/style.css
 delete mode 100644 newexample/android/src/main/AndroidManifest.xml
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
 delete mode 100644 newexample/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt
 delete mode 100644 newexample/android/src/main/res/drawable/ic_account.xml
 delete mode 100644 newexample/android/src/main/res/drawable/ic_launcher_foreground.xml
 delete mode 100644 newexample/android/src/main/res/drawable/ic_refresh_circle.xml
 delete mode 100644 newexample/android/src/main/res/drawable/ic_stop_circle.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_alerts.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_architecture_details.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_architecture_input.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_beacons.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_bluetooth.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_bluetooth_more.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_date_time_picker.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_example.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_keyboard_manager.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_link.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_loading.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_location.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_main.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_permissions_demo.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_permissions_list.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_resources.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_resources_color.xml
 delete mode 100644 newexample/android/src/main/res/layout/activity_system.xml
 delete mode 100644 newexample/android/src/main/res/layout/beacon_item.xml
 delete mode 100644 newexample/android/src/main/res/layout/bluetooth_characteristic_item.xml
 delete mode 100644 newexample/android/src/main/res/layout/bluetooth_descriptor_item.xml
 delete mode 100644 newexample/android/src/main/res/layout/bluetooth_item.xml
 delete mode 100644 newexample/android/src/main/res/layout/bluetooth_service_item.xml
 delete mode 100644 newexample/android/src/main/res/layout/dialog_info.xml
 delete mode 100644 newexample/android/src/main/res/layout/fragment_features_list.xml
 delete mode 100644 newexample/android/src/main/res/layout/fragment_info.xml
 delete mode 100644 newexample/android/src/main/res/layout/loading_indicator_view_.xml
 delete mode 100644 newexample/android/src/main/res/layout/view_list_button.xml
 delete mode 100644 newexample/android/src/main/res/layout/view_list_text_view.xml
 delete mode 100644 newexample/android/src/main/res/layout/view_resource_list_background.xml
 delete mode 100644 newexample/android/src/main/res/menu/bluetooth_menu.xml
 delete mode 100644 newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 delete mode 100644 newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 delete mode 100644 newexample/android/src/main/res/mipmap-hdpi/ic_launcher.png
 delete mode 100644 newexample/android/src/main/res/mipmap-hdpi/ic_launcher_round.png
 delete mode 100644 newexample/android/src/main/res/mipmap-mdpi/ic_launcher.png
 delete mode 100644 newexample/android/src/main/res/mipmap-mdpi/ic_launcher_round.png
 delete mode 100644 newexample/android/src/main/res/mipmap-xhdpi/ic_launcher.png
 delete mode 100644 newexample/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 delete mode 100644 newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher.png
 delete mode 100644 newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 delete mode 100644 newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 delete mode 100644 newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 delete mode 100644 newexample/android/src/main/res/values-night/colors.xml
 delete mode 100644 newexample/android/src/main/res/values-night/styles.xml
 delete mode 100644 newexample/android/src/main/res/values/colors.xml
 delete mode 100644 newexample/android/src/main/res/values/dimens.xml
 delete mode 100644 newexample/android/src/main/res/values/ic_launcher_background.xml
 delete mode 100644 newexample/android/src/main/res/values/strings.xml
 delete mode 100644 newexample/android/src/main/res/values/styles.xml
 delete mode 100644 newexample/ios/Demo.xcodeproj/project.pbxproj
 delete mode 100644 newexample/ios/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 delete mode 100644 newexample/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 delete mode 100644 newexample/ios/Demo.xcodeproj/xcshareddata/IDETemplateMacros.plist
 delete mode 100644 newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
 delete mode 100644 newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme
 delete mode 100644 newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme
 delete mode 100644 newexample/ios/Demo/Alerts/AlertsViewController.swift
 delete mode 100644 newexample/ios/Demo/AppDelegate.swift
 delete mode 100644 newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
 delete mode 100644 newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPad.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPhone.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@3x~iPhone.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20~iPad.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@1x~iPad.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPad.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPhone.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@3x~iPhone.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPad.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPhone.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@3x~iPhone.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40~iPad.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@2x~iPhone.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@3x~iPhone.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76@2x~iPad.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76~iPad.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon83@2x~iPad.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon~iOS-marketing.png
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/Contents.json
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/close_icon.imageset/Contents.json
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/close_icon.imageset/close-24px.pdf
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/darker_color.colorset/Contents.json
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/error_icon.imageset/Contents.json
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/error_icon.imageset/error-black-18dp.pdf
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/li_colorAccent.colorset/Contents.json
 delete mode 100644 newexample/ios/Demo/Assets.xcassets/li_colorBackground.colorset/Contents.json
 delete mode 100644 newexample/ios/Demo/Base.lproj/LaunchScreen.storyboard
 delete mode 100644 newexample/ios/Demo/Base.lproj/Localizable.strings
 delete mode 100644 newexample/ios/Demo/Base.lproj/Main.storyboard
 delete mode 100644 newexample/ios/Demo/Beacons/BeaconsViewCell.swift
 delete mode 100644 newexample/ios/Demo/Beacons/BeaconsViewController.swift
 delete mode 100644 newexample/ios/Demo/Bluetooth/BluetoothCharacteristicCell.xib
 delete mode 100644 newexample/ios/Demo/Bluetooth/BluetoothDescriptorCell.xib
 delete mode 100644 newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
 delete mode 100644 newexample/ios/Demo/Bluetooth/BluetoothViewController.swift
 delete mode 100644 newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
 delete mode 100644 newexample/ios/Demo/Demo.entitlements
 delete mode 100644 newexample/ios/Demo/ExampleViewController.swift
 delete mode 100644 newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift
 delete mode 100644 newexample/ios/Demo/Helpers/UIControl+Closure.swift
 delete mode 100644 newexample/ios/Demo/Info.plist
 delete mode 100644 newexample/ios/Demo/Info/InfoViewController.swift
 delete mode 100644 newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
 delete mode 100644 newexample/ios/Demo/Links/LinksViewController.swift
 delete mode 100644 newexample/ios/Demo/LoadingIndicator/ActivityViewController.swift
 delete mode 100644 newexample/ios/Demo/LoadingIndicator/ActivityViewController.xib
 delete mode 100644 newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift
 delete mode 100644 newexample/ios/Demo/Location/LocationViewController.swift
 delete mode 100644 newexample/ios/Demo/Permissions/PermissionListViewController.swift
 delete mode 100644 newexample/ios/Demo/Permissions/PermissionViewController.swift
 delete mode 100644 newexample/ios/Demo/Resources/ButtonViewController.swift
 delete mode 100644 newexample/ios/Demo/Resources/ColorViewController.swift
 delete mode 100644 newexample/ios/Demo/Resources/LabelViewController.swift
 delete mode 100644 newexample/ios/Demo/Resources/ResourcesListViewController.swift
 delete mode 100644 newexample/ios/Demo/System/Network/NetworkViewController.swift
 delete mode 100644 newexample/ios/Demo/System/SystemViewController.swift
 delete mode 100644 newexample/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
 delete mode 100644 newexample/ios/DemoTests/DemoTests.swift
 delete mode 100644 newexample/ios/DemoTests/Info.plist
 delete mode 100644 newexample/ios/DemoUITests/DemoUITests.swift
 delete mode 100644 newexample/ios/DemoUITests/Info.plist
 delete mode 100644 newexample/keystore/debug.keystore
 delete mode 100644 newexample/shared/build.gradle.kts
 delete mode 100644 newexample/shared/src/androidLibMain/AndroidManifest.xml
 delete mode 100644 newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ExampleViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListBeaconViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothServiceViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
 delete mode 100644 newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt
 delete mode 100644 newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
 delete mode 100644 newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
 delete mode 100644 newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt

diff --git a/newexample/.gitignore b/example/.gitignore
similarity index 100%
rename from newexample/.gitignore
rename to example/.gitignore
diff --git a/example/android/build.gradle b/example/android/build.gradle
deleted file mode 100644
index 9d15f9d28..000000000
--- a/example/android/build.gradle
+++ /dev/null
@@ -1,92 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.kapt'
-    id 'org.jlleitschuh.gradle.ktlint'
-    id "org.jetbrains.kotlin.plugin.serialization"
-}
-
-//noinspection UnnecessaryQualifiedReference
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-android {
-
-    compileSdkVersion gradle.android_compile_sdk_version
-    buildToolsVersion gradle.android_build_tools_version
-    defaultConfig {
-        applicationId "com.splendo.kaluga.example"
-        minSdkVersion gradle.android_min_sdk_version
-        targetSdkVersion gradle.android_target_sdk_version
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    signingConfigs {
-        debug {
-            keyAlias "key0"
-            keyPassword "nckI1UYofHIMkOnXpmZJVA"
-            storeFile file("../keystore/debug.keystore")
-            storePassword "nckI1UYofHIMkOnXpmZJVA"
-        }
-    }
-
-    buildTypes {
-        debug {
-            signingConfig signingConfigs.debug
-        }
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    packagingOptions {
-        exclude 'META-INF/kotlinx-coroutines-core.kotlin_module'
-        exclude 'META-INF/shared_debug.kotlin_module'
-        exclude 'META-INF/kotlinx-serialization-runtime.kotlin_module'
-    }
-
-    buildFeatures.dataBinding = true
-}
-
-kotlin {
-    sourceSets.all {
-        languageSettings {
-            optIn 'kotlin.ExperimentalStdlibApi'
-        }
-    }
-}
-
-gradle.ext.component_type = gradle.ext.component_type_composeApp
-
-apply from: "../../gradle/android_compose.gradle.kts"
-
-gradle.ext.component_type = gradle.ext.component_type_default
-
-dependencies {
-    implementation "com.splendo.kaluga:architecture-compose:$gradle.ext.library_version"
-    implementation "com.splendo.kaluga:resources-compose:$gradle.ext.library_version"
-    implementation project(':shared')
-
-    implementation "androidx.fragment:fragment-ktx:$gradle.androidx_fragment_version"
-    implementation "com.google.android.gms:play-services-location:$gradle.play_services_version"
-    implementation "com.google.android.material:material:$gradle.material_version"
-    implementation "androidx.constraintlayout:constraintlayout:$gradle.androidx_constraint_layout_version"
-
-    implementation "io.insert-koin:koin-android:$gradle.koin_version"
-    implementation "androidx.lifecycle:lifecycle-service:$gradle.androidx_lifecycle_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$gradle.kotlinx_coroutines_version!!"
-    
-    implementation "androidx.compose.material:material:$gradle.androidx_compose_version"
-    implementation "androidx.navigation:navigation-compose:$gradle.androidx_navigation_compose_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:$gradle.serialization_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$gradle.serialization_version"
-
-    implementation "com.google.android.material:material:$gradle.material_version"
-    implementation "com.google.android.material:compose-theme-adapter:$gradle.material_components_adapter_version"
-}
diff --git a/newexample/android/build.gradle.kts b/example/android/build.gradle.kts
similarity index 100%
rename from newexample/android/build.gradle.kts
rename to example/android/build.gradle.kts
diff --git a/example/android/proguard-rules.pro b/example/android/proguard-rules.pro
deleted file mode 100644
index 2f9dc5a47..000000000
--- a/example/android/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/example/android/src/main/AndroidManifest.xml b/example/android/src/main/AndroidManifest.xml
index 3f7425dfa..2cd6b95de 100644
--- a/example/android/src/main/AndroidManifest.xml
+++ b/example/android/src/main/AndroidManifest.xml
@@ -44,8 +44,8 @@
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <activity android:name="com.splendo.kaluga.example.ExampleActivity"
-                  android:label="Features list"
-                  android:exported="true">
+            android:label="Features list"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -53,9 +53,9 @@
             </intent-filter>
         </activity>
         <activity android:name=".location.LocationActivity"
-                  android:label="@string/feature_location"/>
+            android:label="@string/feature_location"/>
         <activity android:name=".permissions.PermissionsDemoListActivity"
-                  android:label="@string/permissions_list"/>
+            android:label="@string/permissions_list"/>
         <activity android:name=".permissions.PermissionsDemoActivity" android:label="Permissions"/>
         <activity android:name=".alerts.AlertsActivity"
             android:label="@string/feature_alerts"/>
@@ -86,7 +86,7 @@
             android:label="@string/feature_platform_specific"/>
         <activity android:name="com.splendo.kaluga.example.contacts.ContactsActivity"
             android:label="@string/feature_platform_specific_compose_navigation"/>
-        <activity android:name="com.splendo.kaluga.example.platformspecific.compose.bottomSheet.BottomSheetActivity"
+        <activity android:name="com.splendo.kaluga.example.bottomSheet.BottomSheetActivity"
             android:label="@string/feature_platform_specific_compose_bottom_sheet"/>
 
         <activity android:name=".architecture.ArchitectureDetailsActivity"
@@ -107,6 +107,7 @@
             android:label="@string/feature_resources_button"/>
 
         <activity android:name=".system.SystemActivity" android:label="@string/feature_system"/>
+        <activity android:name=".system.NetworkActivity" android:label="@string/network_feature"/>
 
 
         <service android:name=".location.LocationBackgroundService"/>
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt b/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
index 4b3b334fe..7622e5ab7 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
@@ -20,10 +20,7 @@ package com.splendo.kaluga.example
 
 import android.app.Application
 import com.splendo.kaluga.base.ApplicationHolder
-import com.splendo.kaluga.example.di.utilitiesModule
-import com.splendo.kaluga.example.di.viewModelModule
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
+import com.splendo.kaluga.example.shared.di.initKoin
 
 class ExampleApplication : Application() {
 
@@ -31,9 +28,6 @@ class ExampleApplication : Application() {
         super.onCreate()
         ApplicationHolder.application = this
 
-        startKoin {
-            androidContext(this@ExampleApplication)
-            modules(utilitiesModule, viewModelModule)
-        }
+        initKoin()
     }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
index 0520e4b2f..7f2d19139 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
@@ -29,11 +29,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
-import com.splendo.kaluga.example.shared.viewmodel.info.DialogSpecRow
+import com.splendo.kaluga.example.shared.viewmodel.info.DialogSpec
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoNavigation
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
-import com.splendo.kaluga.example.shared.viewmodel.info.LinkSpecRow
-import com.splendo.kaluga.example.shared.viewmodel.info.MailSpecRow
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import java.net.URL
@@ -45,22 +43,20 @@ class InfoFragment : KalugaViewModelFragment<InfoViewModel>(R.layout.fragment_in
             ActivityNavigator<InfoNavigation<*>> { action ->
                 when (action) {
                     is InfoNavigation.Dialog -> {
-                        val title = action.bundle?.get(DialogSpecRow.TitleRow) ?: ""
-                        val message = action.bundle?.get(DialogSpecRow.MessageRow) ?: ""
                         NavigationSpec.Dialog(
                             createDialog = {
-                                InfoDialog(title, message)
+                                InfoDialog(action.value)
                             }
                         )
                     }
                     is InfoNavigation.Link -> NavigationSpec.Browser(
-                        URL(action.bundle!!.get(LinkSpecRow.LinkRow)),
+                        URL(action.value),
                         NavigationSpec.Browser.Type.Normal
                     )
                     is InfoNavigation.Mail -> NavigationSpec.Email(
                         NavigationSpec.Email.EmailSettings(
-                            to = action.bundle?.get(MailSpecRow.ToRow) ?: emptyList(),
-                            subject = action.bundle?.get(MailSpecRow.SubjectRow)
+                            to = action.value.to,
+                            subject = action.value.subject
                         )
                     )
                 }
@@ -108,7 +104,7 @@ class InfoAdapter(private val viewModel: InfoViewModel) : RecyclerView.Adapter<I
     }
 }
 
-class InfoDialog(val title: String, val message: String) : DialogFragment() {
+class InfoDialog(private val dialogSpec: DialogSpec) : DialogFragment() {
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -117,8 +113,8 @@ class InfoDialog(val title: String, val message: String) : DialogFragment() {
     ): View? {
         val v = inflater.inflate(R.layout.dialog_info, container, false)
 
-        v.findViewById<TextView>(R.id.title).text = title
-        v.findViewById<TextView>(R.id.message).text = message
+        v.findViewById<TextView>(R.id.title).text = dialogSpec.title
+        v.findViewById<TextView>(R.id.message).text = dialogSpec.message
 
         return v
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
index 6b6656944..5fa52e39d 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
@@ -23,7 +23,7 @@ import android.os.Bundle
 import androidx.appcompat.widget.AppCompatButton
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.AlertViewModel
+import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 @SuppressLint("SetTextI18n")
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
index 879360e98..58cffa8c6 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
@@ -19,11 +19,14 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 package com.splendo.kaluga.example.architecture
 
 import android.os.Bundle
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureDetailsBinding
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.CloseDetailsNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -37,7 +40,12 @@ class ArchitectureDetailsActivity : KalugaViewModelActivity<ArchitectureDetailsV
     override val viewModel: ArchitectureDetailsViewModel by viewModel {
         val type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
         intent.extras?.toTypedProperty(type)?.let { details ->
-            parametersOf(details)
+            parametersOf(
+                details,
+                ActivityNavigator<CloseDetailsNavigation> {
+                    NavigationSpec.Close(resultCode)
+                }
+            )
         } ?: parametersOf("", 0)
     }
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
index b4e3f51fa..3c131451e 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
@@ -31,6 +31,7 @@ import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureInputBinding
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
+import com.splendo.kaluga.example.shared.viewmodel.architecture.InputNavigation
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
@@ -48,7 +49,7 @@ class ArchitectureInputActivity : KalugaViewModelActivity<ArchitectureInputViewM
 
     override val viewModel: ArchitectureInputViewModel by viewModel {
         parametersOf(
-            ActivityNavigator<SingleValueNavigationAction<InputDetails>> {
+            ActivityNavigator<InputNavigation> {
                 NavigationSpec.Activity<ArchitectureDetailsActivity>(
                     launchType = NavigationSpec.Activity.LaunchType.ActivityContract<ArchitectureInputActivity> { contract }
                 )
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
index d07256ba2..35a75ea35 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
@@ -28,8 +28,8 @@ import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.databinding.ActivityBluetoothBinding
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListNavigation
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel
+import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetails
 import kotlinx.coroutines.runBlocking
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -38,7 +38,7 @@ class BluetoothActivity : KalugaViewModelActivity<BluetoothListViewModel>() {
 
     override val viewModel: BluetoothListViewModel by viewModel {
         parametersOf(
-            ActivityNavigator<BluetoothListNavigation> {
+            ActivityNavigator<DeviceDetails> {
                 NavigationSpec.Activity<BluetoothMoreActivity>()
             }
         )
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
index 22b422dfd..49ce564ef 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
@@ -18,22 +18,21 @@
 package com.splendo.kaluga.example.bluetooth
 
 import android.os.Bundle
-import com.splendo.kaluga.architecture.navigation.toNavigationBundle
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.bluetooth.device.SerializableIdentifier
 import com.splendo.kaluga.example.databinding.ActivityBluetoothMoreBinding
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetailsSpec
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetailsSpecRow
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 class BluetoothMoreActivity : KalugaViewModelActivity<BluetoothDeviceDetailViewModel>() {
 
     override val viewModel: BluetoothDeviceDetailViewModel by viewModel {
-        val deviceDetailsSpec = DeviceDetailsSpec()
-        intent.extras?.toNavigationBundle(deviceDetailsSpec)?.let { bundle ->
-            parametersOf(bundle.get(DeviceDetailsSpecRow.UUIDRow))
-        } ?: parametersOf("")
+        parametersOf(
+            intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(SerializableIdentifier.serializer()))!!.identifier
+        )
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt b/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
deleted file mode 100644
index f367f3c64..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/di/Modules.kt
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.di
-
-/* ktlint-disable no-wildcard-imports */
-import com.splendo.kaluga.alerts.AlertPresenter
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.base.singleThreadDispatcher
-import com.splendo.kaluga.bluetooth.Bluetooth
-import com.splendo.kaluga.bluetooth.BluetoothBuilder
-import com.splendo.kaluga.bluetooth.beacons.Beacons
-import com.splendo.kaluga.bluetooth.scanner.BaseScanner
-import com.splendo.kaluga.datetimepicker.DateTimePickerPresenter
-import com.splendo.kaluga.example.architecture.ArchitectureDetailsActivity
-import com.splendo.kaluga.example.shared.AlertViewModel
-import com.splendo.kaluga.example.shared.HudViewModel
-import com.splendo.kaluga.example.shared.viewmodel.ExampleTabNavigation
-import com.splendo.kaluga.example.shared.viewmodel.ExampleViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
-import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
-import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.info.InfoNavigation
-import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
-import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
-import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
-import com.splendo.kaluga.example.shared.viewmodel.link.BrowserSpecRow
-import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
-import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel
-import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
-import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
-import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationActions
-import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
-import com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel
-import com.splendo.kaluga.hud.HUD
-import com.splendo.kaluga.keyboard.FocusHandler
-import com.splendo.kaluga.keyboard.KeyboardManager
-import com.splendo.kaluga.links.LinksBuilder
-import com.splendo.kaluga.location.LocationStateRepoBuilder
-import com.splendo.kaluga.logging.RestrictedLogLevel
-import com.splendo.kaluga.logging.RestrictedLogger
-import com.splendo.kaluga.permissions.base.BasePermissionManager
-import com.splendo.kaluga.permissions.base.Permission
-import com.splendo.kaluga.permissions.base.Permissions
-import com.splendo.kaluga.permissions.base.PermissionsBuilder
-import com.splendo.kaluga.permissions.location.LocationPermission
-import com.splendo.kaluga.permissions.registerAllPermissions
-import com.splendo.kaluga.resources.StyledStringBuilder
-import com.splendo.kaluga.review.ReviewManager
-import com.splendo.kaluga.system.network.state.NetworkStateRepoBuilder
-import kotlin.time.Duration.Companion.minutes
-import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.dsl.module
-
-val utilitiesModule = module {
-    single {
-        Permissions(
-            PermissionsBuilder().apply {
-                registerAllPermissions(
-                    settings = BasePermissionManager.Settings(
-                        logger = RestrictedLogger(RestrictedLogLevel.Verbose)
-                    )
-                )
-            },
-            coroutineContext = singleThreadDispatcher("Permissions")
-        )
-    }
-    single { LocationStateRepoBuilder() }
-    single {
-        BluetoothBuilder().create({ BaseScanner.Settings(get()) })
-    }
-    single { Beacons(get<Bluetooth>(), timeout = 1.minutes) }
-}
-
-val viewModelModule = module {
-    viewModel { (navigator: Navigator<ExampleTabNavigation>) ->
-        ExampleViewModel(
-            navigator
-        )
-    }
-
-    viewModel { (navigator: Navigator<FeatureListNavigationAction>) ->
-        FeatureListViewModel(
-            navigator
-        )
-    }
-
-    viewModel { (navigator: Navigator<InfoNavigation<*>>) ->
-        InfoViewModel(
-            ReviewManager.Builder(),
-            navigator
-        )
-    }
-
-    viewModel { (navigator: Navigator<PermissionsListNavigationAction>) ->
-        PermissionsListViewModel(
-            navigator
-        )
-    }
-
-    viewModel { (permission: Permission) -> PermissionViewModel(get(), permission) }
-
-    viewModel { (permission: LocationPermission) -> LocationViewModel(permission, get()) }
-
-    viewModel { (navigator: Navigator<SingleValueNavigationAction<InputDetails>>) ->
-        ArchitectureInputViewModel(
-            navigator
-        )
-    }
-
-    viewModel { (initialDetail: InputDetails) ->
-        ArchitectureDetailsViewModel(
-            initialDetail,
-            ActivityNavigator {
-                NavigationSpec.Close(ArchitectureDetailsActivity.resultCode)
-            }
-        )
-    }
-
-    viewModel {
-        AlertViewModel(AlertPresenter.Builder())
-    }
-
-    viewModel {
-        DateTimePickerViewModel(DateTimePickerPresenter.Builder())
-    }
-
-    viewModel {
-        HudViewModel(HUD.Builder())
-    }
-
-    viewModel { (keyboardBuilder: KeyboardManager.Builder, focusHandler: FocusHandler) ->
-        KeyboardViewModel(keyboardBuilder, focusHandler)
-    }
-
-    viewModel { (navigator: Navigator<BrowserNavigationActions<BrowserSpecRow>>) ->
-        LinksViewModel(
-            LinksBuilder(),
-            AlertPresenter.Builder(),
-            navigator
-        )
-    }
-
-    viewModel { (navigator: Navigator<SystemNavigationActions<Unit>>) ->
-        SystemViewModel(
-            navigator
-        )
-    }
-
-    viewModel {
-        NetworkViewModel(NetworkStateRepoBuilder(get()))
-    }
-
-    viewModel { (navigator: Navigator<BluetoothListNavigation>) ->
-        BluetoothListViewModel(
-            get(),
-            navigator
-        )
-    }
-
-    viewModel { (identifier: com.splendo.kaluga.bluetooth.device.Identifier) ->
-        BluetoothDeviceDetailViewModel(get(), identifier)
-    }
-
-    viewModel {
-        BeaconsListViewModel(get())
-    }
-
-    viewModel { (navigator: Navigator<ResourcesListNavigationAction>) ->
-        ResourcesListViewModel(
-            navigator
-        )
-    }
-
-    viewModel {
-        ColorViewModel(AlertPresenter.Builder())
-    }
-
-    viewModel {
-        LabelViewModel(StyledStringBuilder.Provider())
-    }
-
-    viewModel {
-        ButtonViewModel(StyledStringBuilder.Provider(), AlertPresenter.Builder())
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
index 485777505..846c75ea4 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
@@ -25,7 +25,6 @@ import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.databinding.ActivityLinkBinding
 import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
-import com.splendo.kaluga.example.shared.viewmodel.link.BrowserSpecRow
 import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -35,10 +34,10 @@ class LinksActivity : KalugaViewModelActivity<LinksViewModel>(R.layout.activity_
 
     override val viewModel: LinksViewModel by viewModel {
         parametersOf(
-            ActivityNavigator<BrowserNavigationActions<BrowserSpecRow>> {
+            ActivityNavigator<BrowserNavigationActions<*>> {
                 when (it) {
                     is BrowserNavigationActions.OpenWebView -> NavigationSpec.Browser(
-                        URL(it.bundle!!.get(BrowserSpecRow.UrlSpecRow)),
+                        URL(it.value),
                         NavigationSpec.Browser.Type.Normal
                     )
                 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
index 1e6ea8bcf..11468040e 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
@@ -23,7 +23,7 @@ import android.os.Bundle
 import androidx.appcompat.widget.AppCompatButton
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.HudViewModel
+import com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 @SuppressLint("SetTextI18n")
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
index d7cd3d96e..27a852cd7 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
@@ -28,10 +28,8 @@ import androidx.core.app.NotificationManagerCompat
 import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
 import com.splendo.kaluga.permissions.location.LocationPermission
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
 
-class LocationBackgroundService : androidx.lifecycle.LifecycleService(), KoinComponent {
+class LocationBackgroundService : androidx.lifecycle.LifecycleService() {
 
     companion object {
         const val notificationId = 1
@@ -43,7 +41,7 @@ class LocationBackgroundService : androidx.lifecycle.LifecycleService(), KoinCom
 
     private val notificationService by lazy { applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager }
 
-    private val viewModel = LocationViewModel(permission, get())
+    private val viewModel = LocationViewModel(permission)
 
     override fun onCreate() {
         super.onCreate()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
index ca92bc4cd..aee8b70c2 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
@@ -22,11 +22,10 @@ import android.view.View
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.widget.AppCompatButton
-import com.splendo.kaluga.architecture.navigation.toNavigationBundle
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionNavigationBundleSpec
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionNavigationBundleSpecRow
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
 import com.splendo.kaluga.permissions.bluetooth.BluetoothPermission
@@ -43,29 +42,15 @@ import org.koin.core.parameter.parametersOf
 class PermissionsDemoActivity : KalugaViewModelActivity<PermissionViewModel>(R.layout.activity_permissions_demo) {
 
     override val viewModel: PermissionViewModel by viewModel {
-        val permissionNavSpec = PermissionNavigationBundleSpec()
-        intent.extras?.toNavigationBundle(permissionNavSpec)?.let { bundle ->
-            val permission = when (bundle.get(PermissionNavigationBundleSpecRow)) {
-                PermissionView.Bluetooth -> BluetoothPermission
-                PermissionView.Calendar -> CalendarPermission(allowWrite = true)
-                PermissionView.Camera -> CameraPermission
-                PermissionView.Contacts -> ContactsPermission(allowWrite = true)
-                PermissionView.Location -> LocationPermission(background = true, precise = true)
-                PermissionView.Microphone -> MicrophonePermission
-                PermissionView.Notifications -> NotificationsPermission()
-                PermissionView.Storage -> StoragePermission(allowWrite = true)
-            }
-            parametersOf(permission)
+        intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))?.let { permissionView ->
+            parametersOf(permissionView.permission)
         } ?: parametersOf()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val permissionNavSpec = PermissionNavigationBundleSpec()
-        intent.extras?.toNavigationBundle(permissionNavSpec)?.let { bundle ->
-            supportActionBar?.title = bundle.get(PermissionNavigationBundleSpecRow).title
-        }
+        supportActionBar?.title = intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))?.title
 
         viewModel.permissionStateMessage.observe {
             findViewById<TextView>(R.id.permissions_message).text = it
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
index a8a03b3ac..e47f80400 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
@@ -34,9 +34,9 @@ import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeA
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.example.platformspecific.compose.bottomSheet.BottomSheetActivity
-import com.splendo.kaluga.example.platformspecific.compose.contacts.ContactsActivity
-import com.splendo.kaluga.example.platformspecific.compose.contacts.ui.Padding
+import com.splendo.kaluga.example.bottomSheet.BottomSheetActivity
+import com.splendo.kaluga.example.contacts.ContactsActivity
+import com.splendo.kaluga.example.contacts.ui.Padding
 import com.splendo.kaluga.example.shared.viewmodel.featureList.PlatformFeatureListNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.featureList.PlatformSpecificFeaturesViewModel
 
@@ -51,8 +51,10 @@ class PlatformSpecificActivity : KalugaViewModelComposeActivity<PlatformSpecific
 
 private fun navigationMapper(action: PlatformFeatureListNavigationAction): NavigationSpec =
     when (action) {
-        is PlatformFeatureListNavigationAction.ComposeNavigation -> NavigationSpec.Activity(ContactsActivity::class.java)
-        is PlatformFeatureListNavigationAction.ComposeBottomSheet -> NavigationSpec.Activity(BottomSheetActivity::class.java)
+        is PlatformFeatureListNavigationAction.ComposeNavigation -> NavigationSpec.Activity(
+            ContactsActivity::class.java)
+        is PlatformFeatureListNavigationAction.ComposeBottomSheet -> NavigationSpec.Activity(
+            BottomSheetActivity::class.java)
     }
 
 @Composable
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/BottomSheetActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/BottomSheetActivity.kt
deleted file mode 100644
index 9f9b90ab8..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/BottomSheetActivity.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.bottomSheet
-
-import androidx.compose.runtime.Composable
-import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.example.platformspecific.compose.bottomSheet.ui.BottomSheetParentLayout
-
-class BottomSheetActivity : KalugaViewModelComposeActivity<BaseLifecycleViewModel>() {
-    override val viewModel = BaseLifecycleViewModel()
-
-    @Composable
-    override fun Layout(viewModel: BaseLifecycleViewModel) {
-        BottomSheetParentLayout()
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt
deleted file mode 100644
index f91d50da7..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetLayout.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.bottomSheet.ui
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.ModalBottomSheetState
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
-import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
-import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.example.platformspecific.compose.bottomSheet.viewModel.bottomSheetNavigationRouteMapper
-import com.splendo.kaluga.example.platformspecific.compose.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetViewModel
-
-@Composable
-fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
-    val navigator = ModalBottomSheetNavigator(
-        contentNavHostController,
-        sheetContentNavHostController,
-        sheetState,
-        rememberCoroutineScope(),
-        ::bottomSheetNavigationRouteMapper,
-    )
-
-    val viewModel = store {
-        remember {
-            BottomSheetViewModel(navigator)
-        }
-    }
-
-    ViewModelComposable(viewModel) {
-        HardwareBackButtonNavigation(onBackButtonClickHandler = { onClosePressed() })
-        Column(
-            Modifier
-                .fillMaxWidth()
-                .padding(Padding.default)
-        ) {
-            Text(text)
-            Button(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(Padding.default),
-                onClick = { onSubPagePressed() }
-            ) {
-                Text(buttonText)
-            }
-        }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt
deleted file mode 100644
index c0e9c1df9..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentLayout.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.bottomSheet.ui
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.ModalBottomSheetState
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.Text
-import androidx.compose.material.rememberModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRouteController
-import com.splendo.kaluga.architecture.compose.navigation.BottomSheetSheetContentRouteController
-import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
-import com.splendo.kaluga.architecture.compose.navigation.NavHostRouteController
-import com.splendo.kaluga.architecture.compose.navigation.NavigatingModalBottomSheetLayout
-import com.splendo.kaluga.architecture.compose.navigation.route
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.example.platformspecific.compose.bottomSheet.viewModel.bottomSheetParentNavigationRouteMapper
-import com.splendo.kaluga.example.platformspecific.compose.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentViewModel
-
-@Composable
-fun BottomSheetParentLayout() {
-    MdcTheme {
-        val bottomSheetRouteController = BottomSheetRouteController(
-            NavHostRouteController(rememberNavController()),
-            BottomSheetSheetContentRouteController(
-                rememberNavController(),
-                rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
-                rememberCoroutineScope()
-            )
-        )
-
-        bottomSheetRouteController.NavigatingModalBottomSheetLayout(
-            sheetContent = { contentNavHostController, sheetContentNavHostController, sheetState ->
-                composable(BottomSheetParentNavigation.ShowSheet.route()) {
-                    BottomSheetLayout(contentNavHostController, sheetContentNavHostController, sheetState)
-                }
-                composable(BottomSheetNavigation.SubPage.route()) {
-                    BottomSheetSubPageLayout(
-                        contentNavHostController, sheetContentNavHostController, sheetState
-                    )
-                }
-            },
-            contentRoot = { contentNavHostController, sheetContentNavHostController, sheetState ->
-                BottomSheetParentLayoutContent(contentNavHostController, sheetContentNavHostController, sheetState)
-            },
-            content = { contentNavHostController, _, _ ->
-                composable(BottomSheetParentNavigation.SubPage.route()) {
-                    BottomSheetParentSubPageLayout(contentNavHostController)
-                }
-            }
-        )
-    }
-}
-
-@Composable
-fun BottomSheetParentLayoutContent(contentNavHostController: NavHostController, sheetNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
-
-    val navigator = ModalBottomSheetNavigator(
-        NavHostRouteController(contentNavHostController),
-        BottomSheetSheetContentRouteController(
-            sheetNavHostController,
-            sheetState,
-            rememberCoroutineScope()
-        ),
-        ::bottomSheetParentNavigationRouteMapper
-    )
-
-    val viewModel = store {
-        remember {
-            BottomSheetParentViewModel(navigator)
-        }
-    }
-
-    ViewModelComposable(viewModel) {
-        Column(Modifier.fillMaxWidth()) {
-            Button(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(Padding.default),
-                onClick = { onShowSheetPressed() }
-            ) {
-                Text(sheetText)
-            }
-            Button(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(Padding.default),
-                onClick = { onSubPagePressed() }
-            ) {
-                Text(subPageText)
-            }
-        }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
deleted file mode 100644
index 1168846bb..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.bottomSheet.ui
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
-import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
-import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.example.platformspecific.compose.bottomSheet.viewModel.bottomSheetParentSubPageNavigationRouteMapper
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentSubPageViewModel
-
-@Composable
-fun BottomSheetParentSubPageLayout(navHostController: NavHostController) {
-    val navigator = RouteNavigator(
-        navHostController,
-        ::bottomSheetParentSubPageNavigationRouteMapper
-    )
-
-    val viewModel = store {
-        remember {
-            BottomSheetParentSubPageViewModel(navigator)
-        }
-    }
-
-    ViewModelComposable(viewModel) {
-        HardwareBackButtonNavigation(onBackButtonClickHandler = { viewModel.onBackPressed() })
-        Column(Modifier.fillMaxWidth()) {
-            Text(text)
-        }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt
deleted file mode 100644
index 27bc57c3f..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/ui/BottomSheetSubPageLayout.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.bottomSheet.ui
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.ModalBottomSheetState
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
-import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
-import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.example.platformspecific.compose.bottomSheet.viewModel.bottomSheetSubPageNavigationRouteMapper
-import com.splendo.kaluga.example.platformspecific.compose.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetSubPageViewModel
-
-@Composable
-fun BottomSheetSubPageLayout(
-    contentNavHostController: NavHostController,
-    sheetContentNavHostController: NavHostController,
-    sheetState: ModalBottomSheetState
-) {
-    val navigator = ModalBottomSheetNavigator(
-        contentNavHostController,
-        sheetContentNavHostController,
-        sheetState,
-        rememberCoroutineScope(),
-        ::bottomSheetSubPageNavigationRouteMapper
-    )
-
-    val viewModel = store {
-        remember {
-            BottomSheetSubPageViewModel(navigator)
-        }
-    }
-
-    ViewModelComposable(viewModel) {
-        HardwareBackButtonNavigation(onBackButtonClickHandler = { viewModel.onBackPressed() })
-        Column(
-            Modifier
-                .fillMaxWidth()
-                .padding(Padding.default)
-        ) {
-            Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
-                Button(
-                    modifier = Modifier.padding(Padding.default),
-                    onClick = { onClosePressed() }
-                ) {
-                    Text("X")
-                }
-            }
-            Text(text)
-        }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt
deleted file mode 100644
index acc30ad88..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/bottomSheet/viewModel/NavigationMappers.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.bottomSheet.viewModel
-
-import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRoute
-import com.splendo.kaluga.architecture.compose.navigation.Route
-import com.splendo.kaluga.architecture.compose.navigation.bottomSheetContent
-import com.splendo.kaluga.architecture.compose.navigation.bottomSheetSheetContent
-import com.splendo.kaluga.architecture.compose.navigation.next
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentSubPageNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetSubPageNavigation
-
-/** Maps a navigation action to a route string. */
-internal fun bottomSheetParentNavigationRouteMapper(action: BottomSheetParentNavigation): BottomSheetRoute {
-    return when (action) {
-        is BottomSheetParentNavigation.SubPage -> action.next.bottomSheetContent
-        is BottomSheetParentNavigation.ShowSheet -> action.next.bottomSheetSheetContent
-    }
-}
-
-/** Maps a navigation action to a route string. */
-internal fun bottomSheetParentSubPageNavigationRouteMapper(action: BottomSheetParentSubPageNavigation): Route {
-    return when (action) {
-        is BottomSheetParentSubPageNavigation.Back -> Route.Back
-    }
-}
-
-/** Maps a navigation action to a route string. */
-internal fun bottomSheetNavigationRouteMapper(action: BottomSheetNavigation): BottomSheetRoute {
-    return when (action) {
-        is BottomSheetNavigation.Close -> Route.Close.bottomSheetSheetContent
-        is BottomSheetNavigation.SubPage -> action.next.bottomSheetSheetContent
-    }
-}
-
-/** Maps a navigation action to a route string. */
-internal fun bottomSheetSubPageNavigationRouteMapper(action: BottomSheetSubPageNavigation): BottomSheetRoute {
-    return when (action) {
-        is BottomSheetSubPageNavigation.Close -> Route.Close.bottomSheetSheetContent
-        is BottomSheetSubPageNavigation.Back -> Route.Back.bottomSheetSheetContent
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ContactsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ContactsActivity.kt
deleted file mode 100644
index 1533bfd85..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ContactsActivity.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.contacts
-
-import androidx.compose.runtime.Composable
-import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.example.platformspecific.compose.contacts.ui.ContactsLayout
-
-class ContactsActivity : KalugaViewModelComposeActivity<BaseLifecycleViewModel>() {
-    override val viewModel = BaseLifecycleViewModel()
-
-    @Composable
-    override fun Layout(viewModel: BaseLifecycleViewModel) {
-        ContactsLayout()
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt
deleted file mode 100644
index 1ca6ee350..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactDetailsLayout.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.contacts.ui
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment.Companion.CenterHorizontally
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import androidx.navigation.NavHostController
-import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
-import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
-import com.splendo.kaluga.architecture.compose.navigation.rememberCombinedNavigator
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.platformspecific.compose.contacts.viewModel.contactDetailsNavigationActivityMapper
-import com.splendo.kaluga.example.platformspecific.compose.contacts.viewModel.contactDetailsNavigationRouteMapper
-import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsNavigation
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsViewModel
-
-@Composable
-fun ContactDetailsLayout(contactDetails: ContactDetails, navHostController: NavHostController) {
-    val routeNavigator = RouteNavigator(
-        navHostController,
-        ::contactDetailsNavigationRouteMapper
-    )
-
-    val navigator = rememberCombinedNavigator { action: ContactDetailsNavigation<*> ->
-        when (action) {
-            is ContactDetailsNavigation.Close -> routeNavigator
-            is ContactDetailsNavigation.SendEmail -> ::contactDetailsNavigationActivityMapper.toActivityNavigator()
-        }
-    }
-
-    val viewModel = store {
-        remember {
-            ContactDetailsViewModel(contactDetails, navigator)
-        }
-    }
-    ViewModelComposable(viewModel) {
-        HardwareBackButtonNavigation(::back)
-
-        Column {
-            val image = painterResource(id = R.drawable.ic_account)
-            Image(
-                modifier = Modifier
-                    .size(320.dp)
-                    .align(CenterHorizontally),
-                painter = image,
-                contentDescription = ""
-            )
-
-            Column(
-                modifier = Modifier.padding(horizontal = Padding.x2)
-                    .fillMaxWidth()
-            ) {
-                Text(text = "Name:", style = MaterialTheme.typography.h6)
-                Text(text = contactDetails.name, style = MaterialTheme.typography.body1)
-                DefaultSpacer()
-
-                Text(text = "Email:", style = MaterialTheme.typography.h6)
-                Text(text = contactDetails.email, style = MaterialTheme.typography.body1)
-                DefaultSpacer()
-
-                Button(onClick = ::sendEmail) {
-                    Text(text = sendEmailButtonText, style = MaterialTheme.typography.button)
-                }
-            }
-        }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt
deleted file mode 100644
index bed60a083..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsLayout.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.contacts.ui
-
-import androidx.compose.runtime.Composable
-import androidx.navigation.compose.rememberNavController
-import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
-import com.splendo.kaluga.architecture.compose.navigation.SetupNavHost
-import com.splendo.kaluga.architecture.compose.navigation.composable
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.example.platformspecific.compose.contacts.viewModel.contactListNavigationRouteMapper
-import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
-
-@Composable
-fun ContactsLayout() {
-    MdcTheme {
-        val navigator = RouteNavigator(
-            rememberNavController(),
-            ::contactListNavigationRouteMapper
-        )
-
-        navigator.SetupNavHost(
-            rootView = {
-                ContactsListLayout(navigator = navigator)
-            }
-        ) { navHostController ->
-            composable<ContactDetails, ContactsListNavigation.ShowContactDetails>(
-                type = NavigationBundleSpecType.SerializedType(
-                    ContactDetails.serializer()
-                )
-            ) { details ->
-                ContactDetailsLayout(details, navHostController)
-            }
-        }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt
deleted file mode 100644
index fd313db7f..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/ContactsListLayout.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.contacts.ui
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment.Companion.CenterVertically
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import com.splendo.kaluga.architecture.compose.state
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListViewModel
-
-@Composable
-fun ContactsListLayout(navigator: Navigator<ContactsListNavigation<*>>) {
-    val viewModel = store {
-        remember {
-            ContactsListViewModel(navigator)
-        }
-    }
-
-    ViewModelComposable(viewModel) {
-        val items by contacts.state()
-        LazyColumn(modifier = Modifier.padding(Padding.default)) {
-            items(items) { contactDetails ->
-                ListItem(contactDetails) {
-                    onContactClick(contactDetails)
-                }
-
-                DefaultSpacer()
-            }
-        }
-    }
-}
-
-@Composable
-private fun ListItem(
-    contactDetails: ContactDetails,
-    onClickHandler: () -> Unit
-) {
-    Row(
-        modifier = Modifier
-            .clickable(onClick = onClickHandler)
-            .fillMaxWidth()
-    ) {
-        val image = painterResource(id = R.drawable.ic_account)
-        Image(
-            modifier = Modifier.size(48.dp),
-            painter = image,
-            contentDescription = ""
-        )
-
-        DefaultSpacer()
-
-        Text(
-            modifier = Modifier.align(CenterVertically),
-            text = contactDetails.name,
-            style = MaterialTheme.typography.h5
-        )
-    }
-}
-
-@Composable
-@Preview
-private fun ListItemPreview() {
-    ListItem(ContactDetails("name", "email")) { }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/Styles.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/Styles.kt
deleted file mode 100644
index 44e415cb7..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/ui/Styles.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.splendo.kaluga.example.platformspecific.compose.contacts.ui
-
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.size
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-object Padding {
-    val default = 8.dp
-    val x2 = 16.dp
-}
-
-@Composable
-fun DefaultSpacer() {
-    Spacer(modifier = Modifier.size(Padding.default))
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt
deleted file mode 100644
index 9bd6b0092..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/compose/contacts/viewModel/NavigationMappers.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific.compose.contacts.viewModel
-
-import com.splendo.kaluga.architecture.compose.navigation.Route
-import com.splendo.kaluga.architecture.compose.navigation.next
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsNavigation
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
-
-/** Maps a navigation action to a route string. */
-internal fun contactListNavigationRouteMapper(action: ContactsListNavigation<*>): Route {
-    return when (action) {
-        is ContactsListNavigation.ShowContactDetails -> action.next
-    }
-}
-
-/** Maps a navigation action to a route string. */
-internal fun contactDetailsNavigationRouteMapper(action: ContactDetailsNavigation<*>): Route {
-    return when (action) {
-        is ContactDetailsNavigation.Close -> Route.Back
-        else -> throw IllegalStateException("Unsupported action: ${action::class.simpleName}")
-    }
-}
-
-/** Maps a navigation action to a NavigationSpec. */
-internal fun contactDetailsNavigationActivityMapper(action: ContactDetailsNavigation<*>): NavigationSpec {
-    return when (action) {
-        is ContactDetailsNavigation.SendEmail -> NavigationSpec.Email(
-            emailSettings = NavigationSpec.Email.EmailSettings(
-                type = NavigationSpec.Email.Type.Plain,
-                to = listOf(action.bundle!!.get(action.type))
-            )
-        )
-        else -> throw IllegalStateException("Unsupported action: ${action::class.simpleName}")
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt
similarity index 100%
rename from newexample/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
index 293f385b3..4a1a63290 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
@@ -20,29 +20,24 @@ package com.splendo.kaluga.example.system
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.Button
-import androidx.appcompat.widget.AppCompatButton
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.ViewListButtonBinding
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemFeatures
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationActions
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
-import com.splendo.kaluga.example.system.fragments.NetworkFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 class SystemActivity : KalugaViewModelActivity<SystemViewModel>(R.layout.activity_system) {
     override val viewModel: SystemViewModel by viewModel {
         parametersOf(
-            ActivityNavigator<SystemNavigationActions<Unit>> { action ->
+            ActivityNavigator<SystemNavigationActions> { action ->
                 when (action) {
-                    SystemNavigationActions.Network -> NavigationSpec.Fragment(
-                        R.id.system_features_fragment,
-                        createFragment = { NetworkFragment() }
-                    )
+                    SystemNavigationActions.Network -> NavigationSpec.Activity<NetworkActivity>()
                 }
             }
         )
@@ -65,7 +60,9 @@ class SystemFeatureAdapter(
     private val viewModel: SystemViewModel
 ) : RecyclerView.Adapter<SystemFeatureAdapter.SystemFeatureViewHolder>() {
 
-    inner class SystemFeatureViewHolder(val button: Button) : RecyclerView.ViewHolder(button)
+    inner class SystemFeatureViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
+        val button = binding.button
+    }
 
     var modules: List<SystemFeatures> = emptyList()
         set(newValue) {
@@ -74,8 +71,8 @@ class SystemFeatureAdapter(
         }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SystemFeatureViewHolder {
-        val button = LayoutInflater.from(parent.context).inflate(R.layout.view_list_button, parent, false) as AppCompatButton
-        return SystemFeatureViewHolder(button)
+        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return SystemFeatureViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: SystemFeatureViewHolder, position: Int) {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
deleted file mode 100644
index 3535caea9..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/system/fragments/NetworkFragment.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.system.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.databinding.FragmentNetworkBinding
-import com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class NetworkFragment : KalugaViewModelFragment<NetworkViewModel>(R.layout.fragment_network) {
-
-    override val viewModel: NetworkViewModel by viewModel()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val binding = FragmentNetworkBinding.inflate(inflater)
-        binding.lifecycleOwner = this
-        binding.viewModel = viewModel
-        return binding.root
-    }
-}
diff --git a/example/android/src/main/res/layout/activity_location.xml b/example/android/src/main/res/layout/activity_location.xml
index c8df9f909..12715da9c 100644
--- a/example/android/src/main/res/layout/activity_location.xml
+++ b/example/android/src/main/res/layout/activity_location.xml
@@ -1,42 +1,44 @@
 <?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=".LocationActivity">
+<layout>
+    <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=".LocationActivity">
 
-    <TextView
-        android:id="@id/info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:text=""
-        android:textAlignment="center"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+            android:id="@+id/info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text=""
+            android:textAlignment="center"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/enable_background"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/location_enable_background"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/disable_background" />
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/enable_background"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/location_enable_background"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/disable_background" />
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/disable_background"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:text="@string/location_disable_background"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/disable_background"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:text="@string/location_disable_background"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_network.xml b/example/android/src/main/res/layout/activity_network.xml
similarity index 100%
rename from newexample/android/src/main/res/layout/activity_network.xml
rename to example/android/src/main/res/layout/activity_network.xml
diff --git a/example/android/src/main/res/layout/activity_system.xml b/example/android/src/main/res/layout/activity_system.xml
index bfd4af551..77a494611 100644
--- a/example/android/src/main/res/layout/activity_system.xml
+++ b/example/android/src/main/res/layout/activity_system.xml
@@ -24,19 +24,10 @@
     android:layout_gravity="center_horizontal"
     android:layout_margin="@dimen/networkLayoutsMargin">
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/system_features_fragment"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/system_features_list"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/networkFragmentsHeight"/>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/system_features_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
-    </ScrollView>
+        android:layout_height="wrap_content"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/fragment_network.xml b/example/android/src/main/res/layout/fragment_network.xml
deleted file mode 100644
index 35562c4b0..000000000
--- a/example/android/src/main/res/layout/fragment_network.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-
-  -->
-
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel" />
-    </data>
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="@dimen/networkLayoutsMargin">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@{viewModel.networkState.stateFlow}"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/build.gradle.kts b/example/build.gradle.kts
similarity index 100%
rename from newexample/build.gradle.kts
rename to example/build.gradle.kts
diff --git a/newexample/gradle.properties b/example/gradle.properties
similarity index 100%
rename from newexample/gradle.properties
rename to example/gradle.properties
diff --git a/newexample/gradle/wrapper/gradle-wrapper.jar b/example/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from newexample/gradle/wrapper/gradle-wrapper.jar
rename to example/gradle/wrapper/gradle-wrapper.jar
diff --git a/newexample/gradle/wrapper/gradle-wrapper.properties b/example/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from newexample/gradle/wrapper/gradle-wrapper.properties
rename to example/gradle/wrapper/gradle-wrapper.properties
diff --git a/newexample/gradlew b/example/gradlew
similarity index 100%
rename from newexample/gradlew
rename to example/gradlew
diff --git a/newexample/gradlew.bat b/example/gradlew.bat
similarity index 100%
rename from newexample/gradlew.bat
rename to example/gradlew.bat
diff --git a/example/ios/.idea/inspectionProfiles/Project_Default.xml b/example/ios/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index d84c0b53b..000000000
--- a/example/ios/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PackageDirectoryMismatch" enabled="false" level="INFO" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/example/ios/.idea/runConfigurations/Demo.xml b/example/ios/.idea/runConfigurations/Demo.xml
deleted file mode 100644
index b23d73dae..000000000
--- a/example/ios/.idea/runConfigurations/Demo.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Demo" type="AppleRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="Demo" TARGET_NAME="Demo" CONFIG_NAME="Debug" SCHEME_NAME="Demo" IS_LOCATION_SIMULATION_ALLOWED="true" LOCATION_SCENARIO_ID="Moscow, Russia" LOCATION_SCENARIO_TYPE="1" APPLICATION_LANGUAGE="IDELaunchSchemeLanguageUseSystemLanguage" APPLICATION_REGION="" RUN_TARGET_PROJECT_NAME="Demo" RUN_TARGET_NAME="Demo" MAKE_ACTIVE="TRUE" SHOULD_DEBUG_EXTENSIONS="false">
-    <EXTENSION ID="org.jetbrains.appcode.reveal.RevealRunConfigurationExtension">
-      <REVEAL_SETTINGS autoInject="false" autoInstall="true" askToEnableAutoInstall="true" />
-    </EXTENSION>
-    <embedded_app_extension_list />
-    <method v="2">
-      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 6d30214da..3a1573fc1 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -38,7 +38,6 @@
 		7478297FCF44ED1D49525D4E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74FDC8922442294AF0776058 /* LaunchScreen.storyboard */; };
 		749B42F84CA72A5D4A0F3AD9 /* DemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */; };
 		74C75886D08DD78EA65E6DD9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 74C9C443CC304CB387AB324D /* Assets.xcassets */; };
-		74C9929AB26988E8CC66893D /* gradle.properties in Resources */ = {isa = PBXBuildFile; fileRef = 74F1F3223C9CF11420F72B08 /* gradle.properties */; };
 		74D656BE6B4BD50115400411 /* DemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 744CF99B70DA1947AA98CA3B /* DemoTests.swift */; };
 		74E6599B023623BD96737582 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74F483E9C1890D693F808DDA /* Main.storyboard */; };
 		978348A7235DF586005B140B /* PermissionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978348A6235DF586005B140B /* PermissionViewController.swift */; };
@@ -102,27 +101,18 @@
 		649979D225CC638C00348419 /* SystemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemViewController.swift; sourceTree = "<group>"; };
 		649979E625CCD37200348419 /* NetworkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkViewController.swift; sourceTree = "<group>"; };
 		740C363F8973304E72F429BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
-		741672C742FA38B5D4971C10 /* gradlew */ = {isa = PBXFileReference; lastKnownFileType = text; path = gradlew; sourceTree = "<group>"; };
-		741A9B938B05534BD1B508C6 /* settings.gradle.kts */ = {isa = PBXFileReference; lastKnownFileType = file.kts; path = settings.gradle.kts; sourceTree = "<group>"; };
 		741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoUITests.swift; sourceTree = "<group>"; };
-		741E82A1DDEE399E80A02B54 /* gradle-wrapper.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = "gradle-wrapper.jar"; sourceTree = "<group>"; };
 		7428D8755D288FD7EA2E6537 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
 		742CCE9033CEC8C8004D624F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		7433F67D6FEF093F4C827A5A /* build.gradle.kts */ = {isa = PBXFileReference; lastKnownFileType = file.kts; path = build.gradle.kts; sourceTree = "<group>"; };
 		744CF99B70DA1947AA98CA3B /* DemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoTests.swift; sourceTree = "<group>"; };
-		744F12775216AF134CBAF4E9 /* build.gradle.kts */ = {isa = PBXFileReference; lastKnownFileType = file.kts; path = build.gradle.kts; sourceTree = "<group>"; };
 		746834742E284396FD5452F4 /* DemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		746E133CAEC5C7B1D516B11F /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		74A0718952D0CC604E49709B /* DemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DemoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		74B0C3AB70AAB7878B48F6B1 /* gradle-wrapper.properties */ = {isa = PBXFileReference; lastKnownFileType = file.properties; path = "gradle-wrapper.properties"; sourceTree = "<group>"; };
 		74BBBF2C57521E71982179E0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		74BEC2BADB02749FD409313B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
 		74C07E8A2DB465B1CE47DC5E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		74C22623993814F606777266 /* KotlinNativeFramework.kt */ = {isa = PBXFileReference; lastKnownFileType = file.kt; path = KotlinNativeFramework.kt; sourceTree = "<group>"; };
 		74C710A1E2E41AF0F4A9FFC5 /* LocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationViewController.swift; sourceTree = "<group>"; };
 		74C9C443CC304CB387AB324D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		74E253D6EF4BB7BA4916943D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
-		74F1F3223C9CF11420F72B08 /* gradle.properties */ = {isa = PBXFileReference; lastKnownFileType = file.properties; path = gradle.properties; sourceTree = "<group>"; };
 		978348A6235DF586005B140B /* PermissionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -288,23 +278,6 @@
 			path = Network;
 			sourceTree = "<group>";
 		};
-		743414FDF97167BD81A5293E /* wrapper */ = {
-			isa = PBXGroup;
-			children = (
-				74B0C3AB70AAB7878B48F6B1 /* gradle-wrapper.properties */,
-				741E82A1DDEE399E80A02B54 /* gradle-wrapper.jar */,
-			);
-			path = wrapper;
-			sourceTree = "<group>";
-		};
-		743EA5EA3B99CA8E01574460 /* KotlinNativeFrameworkMain */ = {
-			isa = PBXGroup;
-			children = (
-				7470228E28317355EFB70D41 /* kotlin */,
-			);
-			path = KotlinNativeFrameworkMain;
-			sourceTree = "<group>";
-		};
 		745520950D85E4696686141D = {
 			isa = PBXGroup;
 			children = (
@@ -313,37 +286,7 @@
 				746CAD9D15ECB24F4ED84E11 /* Demo */,
 				7492DE0914511F3DC96A30A8 /* DemoTests */,
 				74D6698E6E24A4F93E6B289A /* DemoUITests */,
-				747F646D72854D37D5686909 /* KotlinNativeFramework */,
-				74588EBE65D1E22D05BFD2A5 /* Supporting Files */,
-			);
-			sourceTree = "<group>";
-		};
-		745778F955B940F5CB818364 /* gradle */ = {
-			isa = PBXGroup;
-			children = (
-				743414FDF97167BD81A5293E /* wrapper */,
-			);
-			path = gradle;
-			sourceTree = "<group>";
-		};
-		74588EBE65D1E22D05BFD2A5 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				7433F67D6FEF093F4C827A5A /* build.gradle.kts */,
-				741672C742FA38B5D4971C10 /* gradlew */,
-				745778F955B940F5CB818364 /* gradle */,
-				741A9B938B05534BD1B508C6 /* settings.gradle.kts */,
-				74F1F3223C9CF11420F72B08 /* gradle.properties */,
-			);
-			path = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		745DD28172357B2F37C397E8 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				743EA5EA3B99CA8E01574460 /* KotlinNativeFrameworkMain */,
 			);
-			path = src;
 			sourceTree = "<group>";
 		};
 		746CAD9D15ECB24F4ED84E11 /* Demo */ = {
@@ -376,14 +319,6 @@
 			path = Demo;
 			sourceTree = "<group>";
 		};
-		7470228E28317355EFB70D41 /* kotlin */ = {
-			isa = PBXGroup;
-			children = (
-				74C22623993814F606777266 /* KotlinNativeFramework.kt */,
-			);
-			path = kotlin;
-			sourceTree = "<group>";
-		};
 		747A549D9FF0D1B49E65E190 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -394,16 +329,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		747F646D72854D37D5686909 /* KotlinNativeFramework */ = {
-			isa = PBXGroup;
-			children = (
-				74E253D6EF4BB7BA4916943D /* Info.plist */,
-				74ED9583BC95062A511A899E /* Supporting Files */,
-				745DD28172357B2F37C397E8 /* src */,
-			);
-			path = KotlinNativeFramework;
-			sourceTree = "<group>";
-		};
 		7492DE0914511F3DC96A30A8 /* DemoTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -422,14 +347,6 @@
 			path = DemoUITests;
 			sourceTree = "<group>";
 		};
-		74ED9583BC95062A511A899E /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				744F12775216AF134CBAF4E9 /* build.gradle.kts */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		978348A5235DF51D005B140B /* Permissions */ = {
 			isa = PBXGroup;
 			children = (
@@ -550,7 +467,6 @@
 				7478297FCF44ED1D49525D4E /* LaunchScreen.storyboard in Resources */,
 				74E6599B023623BD96737582 /* Main.storyboard in Resources */,
 				209471EA24C07F5F001426CD /* BluetoothDescriptorCell.xib in Resources */,
-				74C9929AB26988E8CC66893D /* gradle.properties in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -580,7 +496,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/Supporting Files\"\n./gradlew :KotlinNativeFramework:embedAndSignAppleFrameworkForXcode\n";
+			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -756,10 +672,16 @@
 				DEVELOPMENT_TEAM = 2732HQPVJP;
 				FRAMEWORK_SEARCH_PATHS = (
 					$BUILT_PRODUCTS_DIR,
-					"$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = Demo/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					KalugaExampleShared,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.kaluga.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Kaluga example";
@@ -882,10 +804,16 @@
 				DEVELOPMENT_TEAM = 2732HQPVJP;
 				FRAMEWORK_SEARCH_PATHS = (
 					$BUILT_PRODUCTS_DIR,
-					"$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = Demo/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					KalugaExampleShared,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.kaluga.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Kaluga example";
diff --git a/example/ios/Demo/Alerts/AlertsViewController.swift b/example/ios/Demo/Alerts/AlertsViewController.swift
index 743ea8f06..96e81b313 100644
--- a/example/ios/Demo/Alerts/AlertsViewController.swift
+++ b/example/ios/Demo/Alerts/AlertsViewController.swift
@@ -17,21 +17,21 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class AlertsViewController: UITableViewController {
 
     private lazy var viewModel = AlertViewModel(builder: AlertPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { return [] }
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
     }
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
diff --git a/example/ios/Demo/AppDelegate.swift b/example/ios/Demo/AppDelegate.swift
index b1b416e18..cefdc285e 100644
--- a/example/ios/Demo/AppDelegate.swift
+++ b/example/ios/Demo/AppDelegate.swift
@@ -17,6 +17,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 */
 
 import UIKit
+import KalugaExampleShared
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -24,6 +25,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        DependencyInjectionKt.doInitKoin(customModules: [])
         return true
     }
     
@@ -43,7 +45,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let vc = storyboard.instantiateViewController(withIdentifier: "LinksViewController") as! LinksViewController
         self.window?.rootViewController = vc
         
-        vc.handleIncomingLink(url: stringUrl)
+//        vc.handleIncomingLink(url: stringUrl)
         return true
     }
 
diff --git a/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift b/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
index 577b793ef..cc6b9fcfc 100644
--- a/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
@@ -16,7 +16,7 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ArchitectureDetailsViewController: UIViewController {
     
@@ -30,12 +30,15 @@ class ArchitectureDetailsViewController: UIViewController {
         if #available(iOS 13.0, *) {
             vc.isModalInPresentation = true
         }
-        vc.viewModel = KNArchitectureFramework().createArchitectureDetailsViewModel(parent: vc, inputDetails: inputDetails) { inputDetails in
-            onDismiss(inputDetails)
+        let navigator = ViewControllerNavigator<CloseDetailsNavigation>(parentVC: vc) { action in
+            NavigationSpec.Dismiss(toDismiss: { $0 }, animated: true) {
+                onDismiss(action.value!)
+            }
         }
+        vc.viewModel = ArchitectureDetailsViewModel(initialDetail: inputDetails, navigator: navigator)
         return vc
     }
-    
+
     var viewModel: ArchitectureDetailsViewModel!
     private var lifecycleManager: LifecycleManager!
     
@@ -47,16 +50,16 @@ class ArchitectureDetailsViewController: UIViewController {
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
-            
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+
             guard let viewModel = self?.viewModel else {
                 return []
             }
-            
+
             return [
                 viewModel.name.observe { name in
                     self?.nameLabel.text = name as? String ?? ""
@@ -67,11 +70,11 @@ class ArchitectureDetailsViewController: UIViewController {
             ]
         }
     }
-    
+
     @objc @IBAction func onInversePressed(sender: Any?) {
         viewModel.onInversePressed()
     }
-    
+
     @objc @IBAction func onCloseButtonPressed(sender: Any?) {
         viewModel.onClosePressed()
     }
diff --git a/example/ios/Demo/Architecture/ArchitectureInputViewController.swift b/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
index d9762d316..9317cd640 100644
--- a/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
@@ -16,7 +16,7 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ArchitectureInputViewController: UIViewController  {
     
@@ -29,27 +29,30 @@ class ArchitectureInputViewController: UIViewController  {
     @IBOutlet weak var numberError: UIImageView!
     
     @IBOutlet weak var detailsButton: UIButton!
-    
-    lazy var viewModel = KNArchitectureFramework().createArchitectureInputViewModel(parent: self) { [weak self] inputDetails in
-        return ArchitectureDetailsViewController.create(inputDetails: inputDetails) { [weak self] inputDetails in
-            self?.onDetailsDismissed(inputDetails: inputDetails)
+
+    lazy var navigator: ViewControllerNavigator<InputNavigation> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Present(animated: true, presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue), transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)) {
+            ArchitectureDetailsViewController.create(inputDetails: action.value!) { [weak self] inputDetails in
+                self?.onDetailsDismissed(inputDetails: inputDetails)
+            }
         }
     }
+    lazy var viewModel = ArchitectureInputViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
-        
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+
             guard let viewModel = self?.viewModel else {
                 return []
             }
-            
+
             return [
                 viewModel.nameHeader.observeInitialized { header in
                     self?.nameLabel.text = header as String?
@@ -72,30 +75,30 @@ class ArchitectureInputViewController: UIViewController  {
             ]
         }
     }
-    
+
     @objc @IBAction func onShowDetailsPressed(sender: Any?) {
         viewModel.onShowDetailsPressed()
     }
-    
+
     private func onDetailsDismissed(inputDetails: InputDetails) {
         viewModel.nameInput.post(newValue: NSString(string: inputDetails.name))
         viewModel.numberInput.post(newValue: NSString(string: "\(inputDetails.number)"))
     }
-    
+
 }
 
 extension ArchitectureInputViewController : UITextFieldDelegate {
-    
+
     func textFieldDidEndEditing(_ textField: UITextField) {
         postInput(text: textField.text ?? "", fromTextField: textField)
     }
-    
+
     func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         let resultingString = ((textField.text ?? "") as NSString).replacingCharacters(in: range, with: string)
         postInput(text: resultingString, fromTextField: textField)
         return false
     }
-    
+
     private func postInput(text: String, fromTextField textField: UITextField) {
         if (textField == nameInput) {
             viewModel.nameInput.post(newValue: NSString(string: text))
diff --git a/example/ios/Demo/Beacons/BeaconsViewCell.swift b/example/ios/Demo/Beacons/BeaconsViewCell.swift
index 829f8565d..928f6e859 100644
--- a/example/ios/Demo/Beacons/BeaconsViewCell.swift
+++ b/example/ios/Demo/Beacons/BeaconsViewCell.swift
@@ -15,7 +15,7 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class BeaconsViewCell: UICollectionViewCell {
 
diff --git a/example/ios/Demo/Beacons/BeaconsViewController.swift b/example/ios/Demo/Beacons/BeaconsViewController.swift
index 678e5786a..653f7c54a 100644
--- a/example/ios/Demo/Beacons/BeaconsViewController.swift
+++ b/example/ios/Demo/Beacons/BeaconsViewController.swift
@@ -15,7 +15,7 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class BeaconsViewController: UICollectionViewController {
 
@@ -35,11 +35,7 @@ class BeaconsViewController: UICollectionViewController {
         return flowLayout
     }()
 
-    private lazy var viewModel = KNArchitectureFramework()
-        .createBeaconsListViewModel(
-            parent: self,
-            service: KNBeaconsFramework().service
-        )
+    private lazy var viewModel = BeaconsListViewModel()
 
     deinit {
         lifecycleManager.unbind()
@@ -54,7 +50,7 @@ class BeaconsViewController: UICollectionViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
 
             return [
diff --git a/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift b/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
index e6b178457..cb593bf85 100644
--- a/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
+++ b/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
@@ -16,24 +16,24 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
-class BluetoothDeviceDetailsViewController : UIViewController, UICollectionViewDelegate, UICollectionViewDataSource {
+class BluetoothDeviceDetailsViewController : UIViewController {
     
     struct Const {
         static let storyboard = UIStoryboard(name: "Main", bundle: nil)
         static let storyboardId = "BluetoothDeviceDetails"
     }
     
-    static func create(deviceUuid: UUID, bluetooth: Bluetooth) -> BluetoothDeviceDetailsViewController {
+    static func create(identifier: UUID) -> BluetoothDeviceDetailsViewController {
         let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! BluetoothDeviceDetailsViewController
         if #available(iOS 13.0, *) {
             vc.isModalInPresentation = true
         }
-        vc.viewModel = KNArchitectureFramework().createBluetoothDeviceDetailsViewModel(identifier: deviceUuid, bluetooth: bluetooth)
+        vc.viewModel = BluetoothDeviceDetailViewModel(identifier: identifier)
         return vc
     }
-    
+
     var viewModel: BluetoothDeviceDetailViewModel!
     private var lifecycleManager: LifecycleManager!
     
@@ -46,29 +46,29 @@ class BluetoothDeviceDetailsViewController : UIViewController, UICollectionViewD
     @IBOutlet var servicesList: UICollectionView!
     
     private var services: [BluetoothServiceViewModel] = []
-    
+
     private var isInvalidating: Bool = false
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        
+
         servicesHeader.text = NSLocalizedString("bluetooth_services_header", comment: "")
         deviceIdentifier.text = viewModel.identifierString
-        
+
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
         flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
         flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
         flowLayout.minimumLineSpacing = 4
         servicesList.collectionViewLayout = flowLayout
 
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
-            
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+
             guard let viewModel = self?.viewModel else { return []}
-            
+
             return [
             viewModel.name.observe { name in
                 self?.deviceName.text = name as String?
@@ -92,32 +92,32 @@ class BluetoothDeviceDetailsViewController : UIViewController, UICollectionViewD
                 self?.servicesList.layoutIfNeeded()
             }
             ]
-        })
+        }
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return services.count
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let serviceCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothServiceView.Companion.identifier, for: indexPath) as! BluetoothServiceView
         serviceCell.parent = self
         serviceCell.service = services[indexPath.row]
         return serviceCell
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothServiceView)?.startMonitoring()
         }
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothServiceView)?.stopMonitoring()
         }
     }
-    
+
     fileprivate func updateListSize() {
         isInvalidating = true
         servicesList.collectionViewLayout.invalidateLayout()
@@ -146,13 +146,13 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
     @IBOutlet var characteristicsListHeight: NSLayoutConstraint!
     
     private var characteristics: [BluetoothCharacteristicViewModel] = []
-    
+
     override func awakeFromNib() {
         super.awakeFromNib()
-        
+
         serviceHeader.text = NSLocalizedString("bluetooth_service", comment: "")
         characteristicsHeader.text = NSLocalizedString("bluetooth_characteristics", comment: "")
-        
+
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
         flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
         flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
@@ -162,14 +162,14 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
         characteristicsList.delegate = self
         characteristicsList.register(UINib(nibName: "BluetoothCharacteristicCell", bundle: nil), forCellWithReuseIdentifier: BluetoothCharacteristicView.Companion.identifier)
     }
-    
+
     fileprivate func startMonitoring() {
         disposeBag.dispose()
         guard let service = self.service else {
             return
         }
         service.didResume()
-        
+
         serviceIdentifier.text = service.uuid
         service.characteristics.observe { [weak self] characteristics in
             self?.characteristics = characteristics as? [BluetoothCharacteristicViewModel] ?? []
@@ -177,12 +177,12 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
             self?.updateListSize(isInvalidating: false)
         }.addTo(disposeBag: disposeBag)
     }
-    
+
     fileprivate func stopMonitoring() {
         service?.didPause()
         disposeBag.dispose()
     }
-    
+
     fileprivate func updateListSize(isInvalidating: Bool) {
         self.isInvalidating = isInvalidating
         characteristicsList.collectionViewLayout.invalidateLayout()
@@ -192,30 +192,30 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
         parent?.updateListSize()
         self.isInvalidating = false
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return characteristics.count
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let characteristicCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothCharacteristicView.Companion.identifier, for: indexPath) as! BluetoothCharacteristicView
         characteristicCell.parent = self
         characteristicCell.characteristic = characteristics[indexPath.row]
         return characteristicCell
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothCharacteristicView)?.startMonitoring()
         }
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothCharacteristicView)?.stopMonitoring()
         }
     }
-    
+
     override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
         let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
         layoutIfNeeded()
@@ -225,7 +225,7 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
     
 }
 
-class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
+class BluetoothCharacteristicView : UICollectionViewCell {
     
     fileprivate struct Companion {
         static let identifier = "BluetoothCharacteristicView"
@@ -234,7 +234,7 @@ class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelega
     fileprivate weak var parent: BluetoothServiceView?
     fileprivate var characteristic: BluetoothCharacteristicViewModel?
     private let disposeBag = DisposeBag()
-    
+
     private var isInvalidating: Bool = false
     
     @IBOutlet var characteristicIdentifier: UILabel!
@@ -245,12 +245,12 @@ class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelega
     @IBOutlet var descriptorsListHeight: NSLayoutConstraint!
     
     private var descriptors: [BluetoothDescriptorViewModel] = []
-    
+
     override func awakeFromNib() {
         super.awakeFromNib()
-        
+
         descriptorsHeader.text = NSLocalizedString("bluetooth_descriptors", comment: "")
-        
+
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
         flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
         flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
@@ -258,31 +258,31 @@ class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelega
         descriptorsList.collectionViewLayout = flowLayout
         descriptorsList.register(UINib(nibName: "BluetoothDescriptorCell", bundle: nil), forCellWithReuseIdentifier: BluetoothDescriptorView.Companion.identifier)
     }
-    
+
     fileprivate func startMonitoring() {
         disposeBag.dispose()
         guard let characteristic = self.characteristic else {
             return
         }
         characteristic.didResume()
-        
+
         characteristicIdentifier.text = characteristic.uuid
         characteristic.descriptors.observe { [weak self] descriptors in
             self?.descriptors = descriptors as? [BluetoothDescriptorViewModel] ?? []
             self?.descriptorsList.reloadData()
             self?.updateListSize(isInvalidating: false)
         }.addTo(disposeBag: disposeBag)
-        
+
         characteristic.value.observe { [weak self] value in
             self?.characteristicValue.text = value as String?
         }.addTo(disposeBag: disposeBag)
     }
-    
+
     fileprivate func stopMonitoring() {
         disposeBag.dispose()
         characteristic?.didPause()
     }
-    
+
     private func updateListSize(isInvalidating: Bool) {
         self.isInvalidating = isInvalidating
         descriptorsList.collectionViewLayout.invalidateLayout()
@@ -292,36 +292,35 @@ class BluetoothCharacteristicView : UICollectionViewCell, UICollectionViewDelega
         parent?.updateListSize(isInvalidating: true)
         self.isInvalidating = false
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return descriptors.count
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let descriptorCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothDescriptorView.Companion.identifier, for: indexPath) as! BluetoothDescriptorView
         descriptorCell.descriptor = descriptors[indexPath.row]
         return descriptorCell
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothDescriptorView)?.startMonitoring()
         }
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         if (!isInvalidating) {
             (cell as? BluetoothDescriptorView)?.stopMonitoring()
         }
     }
-    
+
     override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
         let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
         layoutIfNeeded()
         layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
         return layoutAttributes
     }
-    
 }
 
 class BluetoothDescriptorView : UICollectionViewCell {
@@ -342,19 +341,19 @@ class BluetoothDescriptorView : UICollectionViewCell {
             return
         }
         descriptor.didResume()
-        
+
         descriptorIdentifier.text = descriptor.uuid
-        
+
         descriptor.value.observe { [weak self] value in
             self?.descriptorValue.text = value as String?
         }.addTo(disposeBag: disposeBag)
     }
-    
+
     fileprivate func stopMonitoring() {
         disposeBag.dispose()
         descriptor?.didResume()
     }
-    
+
     override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
         let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
         layoutIfNeeded()
diff --git a/example/ios/Demo/Bluetooth/BluetoothViewController.swift b/example/ios/Demo/Bluetooth/BluetoothViewController.swift
index 1e60a04b4..82903a4b1 100644
--- a/example/ios/Demo/Bluetooth/BluetoothViewController.swift
+++ b/example/ios/Demo/Bluetooth/BluetoothViewController.swift
@@ -16,14 +16,17 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class BluetoothViewController : UICollectionViewController {
-    
-    lazy var viewModel = KNArchitectureFramework().createBluetoothListViewModel(parent: self, bluetooth: KNBluetoothFramework().bluetooth) { uuid, bluetooth in
-        return BluetoothDeviceDetailsViewController.create(deviceUuid: uuid, bluetooth: bluetooth)
+
+    lazy var navigator: ViewControllerNavigator<DeviceDetails> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Push(animated: true) {
+            BluetoothDeviceDetailsViewController.create(identifier: action.value!.identifier)
+        }
     }
-    
+    lazy var viewModel = BluetoothListViewModel(navigator: navigator)
+
     private var devices: [BluetoothListDeviceViewModel] = []
     private var lifecycleManager: LifecycleManager!
 
@@ -33,20 +36,20 @@ class BluetoothViewController : UICollectionViewController {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-        
+
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
         flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
         flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0)
         flowLayout.minimumLineSpacing = 4
         collectionView.collectionViewLayout = flowLayout
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
-            
+
             return [
                 viewModel.isScanning.observe { isScanning in
                     self?.updateNavigationItem(isScanning: isScanning as? Bool ?? false)
@@ -60,9 +63,9 @@ class BluetoothViewController : UICollectionViewController {
                     self?.updateTitle(title: title as String?)
                 }
             ]
-        })
+        }
     }
-    
+
     private func updateNavigationItem(isScanning: Bool) {
         if (isScanning) {
             self.navigationItem.setRightBarButton(UIBarButtonItem(title: NSLocalizedString("bluetooth_stop_scanning", comment: ""), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
@@ -74,41 +77,41 @@ class BluetoothViewController : UICollectionViewController {
     private func updateTitle(title: String?) {
         self.title = title
     }
-    
+
     @objc private func toggleScanning() {
         viewModel.onScanPressed()
     }
-    
+
     override func numberOfSections(in collectionView: UICollectionView) -> Int {
         return 1
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         devices.count
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let bluetoothCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothCell.Companion.identifier, for: indexPath) as! BluetoothCell
         bluetoothCell.device = devices[indexPath.row]
         return bluetoothCell
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         guard let btCell = cell as? BluetoothCell else {
             return
         }
-        
+
         btCell.startMonitoring()
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         guard let btCell = cell as? BluetoothCell else {
             return
         }
-        
+
         btCell.stopMonitoring()
     }
-    
+
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         devices[indexPath.row].toggleFoldOut()
         let context = UICollectionViewFlowLayoutInvalidationContext()
@@ -143,19 +146,19 @@ class BluetoothCell: UICollectionViewCell {
     @IBOutlet var moreButton: UIButton!
     
     fileprivate var device: BluetoothListDeviceViewModel? = nil
-    
+
     @IBAction func onConnectPressed() {
         device?.onConnectPressed()
     }
-    
+
     @IBAction func onDisonnectPressed() {
         device?.onDisconnectPressed()
     }
-    
+
     @IBAction func onMorePressed() {
         device?.onMorePressed()
     }
-    
+
     func startMonitoring() {
         disposeBag.dispose()
         guard let device = device else {
@@ -222,7 +225,7 @@ class BluetoothCell: UICollectionViewCell {
             self?.manufacturerData.text = manufacturerData as? String
         }
     }
-    
+
     func stopMonitoring() {
         disposeBag.dispose()
         device?.didPause()
diff --git a/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift b/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
index d32da17ed..9ee2d520e 100644
--- a/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
+++ b/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
@@ -16,7 +16,7 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class DateTimePickerViewController : UIViewController {
     
@@ -24,33 +24,31 @@ class DateTimePickerViewController : UIViewController {
     
     lazy var viewModel = DateTimePickerViewModel(dateTimePickerPresenterBuilder: DateTimePickerPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else {
                 return []
             }
             return [
-                viewModel.dateLabel.observe(onNext: { (time) in
-                    if let timeString = (time as? String) {
-                        self?.timeLabel.text = String(timeString)
-                    }
-            })
+                viewModel.dateLabel.observe { (time) in
+                    self?.timeLabel.text = time as? String
+                }
             ]
-        })
+        }
     }
-    
+
     @IBAction
     func selectDatePressed() {
         viewModel.onSelectDatePressed()
     }
-    
+
     @IBAction
     func selectTimePressed() {
         viewModel.onSelectTimePressed()
diff --git a/example/ios/Demo/ExampleViewController.swift b/example/ios/Demo/ExampleViewController.swift
index 6b0be8f80..d6ad2d207 100644
--- a/example/ios/Demo/ExampleViewController.swift
+++ b/example/ios/Demo/ExampleViewController.swift
@@ -16,7 +16,7 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ExampleViewController : UIViewController {
     
@@ -31,26 +31,55 @@ class ExampleViewController : UIViewController {
     
     lazy var featuresListController = Const.storyboard.instantiateViewController(withIdentifier: Const.featuresList) as! FeaturesListViewController
     lazy var infoViewController = Const.storyboard.instantiateViewController(withIdentifier: Const.infoView) as! InfoViewController
-    
-    lazy var viewModel: ExampleViewModel = KNArchitectureFramework().createExampleViewModel(parent: self,
-                                                                                                  containerView: containerView,
-                                                                                                  featuresList: { self.featuresListController },
-                                                                                                  info:  { self.infoViewController })
-    
+
+    private lazy var navigator: ViewControllerNavigator<ExampleTabNavigation> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Nested(type: NavigationSpec.NestedTypeReplace(tag: 1), containerView: self.containerView) {
+            switch action {
+            case is ExampleTabNavigation.FeatureList: return self.featuresListController
+            case is ExampleTabNavigation.Info: return self.infoViewController
+            default: return UIViewController()
+            }
+        }
+    }
+    lazy var viewModel: ExampleViewModel = ExampleViewModel(navigator: navigator)
     var lifecycleManager: LifecycleManager!
-    
+    let selectedButtonDisposeBag = DisposeBag()
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel, let bottomView = self?.bottomView else { return [] }
-            return viewModel.observeTabs(stackView: bottomView) { (button: UIButton, action: @escaping () -> KotlinUnit) in
-                button.addAction { let _ = action() }
-            }
+
+            return [
+                viewModel.tabs.observeInitialized { tabs in
+                    guard let disposeBag = self?.selectedButtonDisposeBag else { return }
+                    disposeBag.dispose()
+                    let tabs = tabs ?? []
+                    bottomView.arrangedSubviews.forEach { $0.removeFromSuperview() }
+                    for tab in tabs {
+                        guard let tab = tab as? ExampleViewModel.Tab else { return }
+                        let button = UIButton()
+                        button.setTitle(tab.title, for: .normal)
+                        button.setTitleColor(UIColor.systemBlue, for: .selected)
+                        button.setTitleColor(UIColor.systemBlue, for: .highlighted)
+                        button.setTitleColor(UIColor.gray, for: .normal)
+
+                        viewModel.tab.observeInitialized { selectedTab in
+                            button.isSelected = selectedTab == tab
+                        }.addTo(disposeBag: disposeBag)
+                        button.addAction {
+                            viewModel.tab.post(newValue: tab)
+                        }
+                        bottomView.addArrangedSubview(button)
+                    }
+
+                }
+            ]
         }
     }
     
diff --git a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
index 1f6f19df9..e520eaa27 100644
--- a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -16,49 +16,55 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class FeaturesListViewController : UITableViewController {
-    
-    private lazy var viewModel: FeatureListViewModel = KNArchitectureFramework().createFeatureListViewModel(parent: self)
+
+    private lazy var navigator: ViewControllerNavigator<FeatureListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Segue(identifier: action.segueKey)
+    }
+    private lazy var viewModel: FeatureListViewModel = FeatureListViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     private var features = [String]()
-    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
-    
+    private var onSelected: ((Int) -> Void)? = nil
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
-            return [viewModel.observeFeatures() { (features: [String], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
-                self?.features = features
-                self?.onSelected = onSelected
+            return [viewModel.feature.observeInitialized { next in
+                let features = next ?? []
+                self?.features = features.map { ($0 as! Feature).title }
+                self?.onSelected = { (index: Int) in
+                    viewModel.onFeaturePressed(feature: features[index] as! Feature)
+                }
                 self?.tableView.reloadData()
             }]
         }
     }
-    
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
-    
+
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return features.count
     }
-    
+
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: FeaturesListCell.Const.identifier, for: indexPath) as! FeaturesListCell
         cell.label.text = features[indexPath.row]
         return cell
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        let _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
@@ -73,3 +79,26 @@ class FeaturesListCell : UITableViewCell {
     @IBOutlet weak var label: UILabel!
     
 }
+
+private extension FeatureListNavigationAction {
+    var segueKey: String {
+        get {
+            switch self {
+            case is FeatureListNavigationAction.Alerts: return "showAlerts"
+            case is FeatureListNavigationAction.Architecture: return "showArchitecture"
+            case is FeatureListNavigationAction.Beacons: return "showBeacons"
+            case is FeatureListNavigationAction.Bluetooth: return "showBluetooth"
+            case is FeatureListNavigationAction.DateTimePicker: return "showDateTimePicker"
+            case is FeatureListNavigationAction.Keyboard: return "showKeyboard"
+            case is FeatureListNavigationAction.Links: return "showLinks"
+            case is FeatureListNavigationAction.LoadingIndicator: return "showHUD"
+            case is FeatureListNavigationAction.Location: return "showLocation"
+            case is FeatureListNavigationAction.Permissions: return "showPermissions"
+            case is FeatureListNavigationAction.PlatformSpecific: return "showPlatformSpecific"
+            case is FeatureListNavigationAction.Resources: return "showResources"
+            case is FeatureListNavigationAction.System: return "showSystem"
+            default: return ""
+            }
+        }
+    }
+}
diff --git a/example/ios/Demo/Info/InfoViewController.swift b/example/ios/Demo/Info/InfoViewController.swift
index e0f6825a8..a2f18dc06 100644
--- a/example/ios/Demo/Info/InfoViewController.swift
+++ b/example/ios/Demo/Info/InfoViewController.swift
@@ -16,53 +16,78 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import MessageUI
+import KalugaExampleShared
 
 class InfoViewController : UITableViewController {
-    
-    private lazy var viewModel: InfoViewModel = KNArchitectureFramework().createInfoViewModel(parent: self)
+
+    private lazy var navigator = InfoNavigatorKt.InfoNavigator(
+        parent: self,
+        onDialogSpec: { dialogSpec in
+            NavigationSpec.Present(
+                animated: true,
+                presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue),
+                transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)
+            ) {
+                    let alert = UIAlertController.init(title: dialogSpec.title, message: dialogSpec.message, preferredStyle: .alert)
+                    alert.addAction(UIAlertAction(title: "OK", style: .default))
+                    return alert
+                }
+        },
+        onLink: { link in NavigationSpec.Browser(url: URL(string: link)!, viewType: NavigationSpec.BrowserTypeNormal()) },
+        onMailSpec: { mailSpec in
+            let settings = NavigationSpec.Email.EmailEmailSettings(type: NavigationSpec.EmailTypePlain(), to: mailSpec.to, cc: [], bcc: [], subject: mailSpec.subject, body: nil, attachments: [])
+            return NavigationSpec.Email(emailSettings: settings, delegate: nil, animated: true)
+        }
+    )
+    private lazy var viewModel: InfoViewModel = InfoViewModel(
+        reviewManagerBuilder: ReviewManager.Builder(),
+        navigator: navigator)
 
     private var buttons = [String]()
-    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
+    private var onSelected: ((Int) -> Void)? = nil
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
-            
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+
             guard let viewModel = self?.viewModel else {
                 return []
             }
-            
-            return [viewModel.observeButtons() { (buttons: [String], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
-                self?.buttons = buttons
-                self?.onSelected = onSelected
-                self?.tableView.reloadData()
-            }]
+
+            return [
+                viewModel.buttons.observeInitialized { next in
+                    let buttons = next?.compactMap { $0 as? InfoViewModel.Button } ?? []
+                    self?.buttons = buttons.map { $0.title }
+                    self?.onSelected = { (index: Int) in viewModel.onButtonPressed(button: buttons[index]) }
+                    self?.tableView.reloadData()
+                }
+            ]
         }
     }
-    
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
-    
+
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return buttons.count
     }
-    
+
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: InfoButtonCell.Const.identifier, for: indexPath) as! InfoButtonCell
         cell.label.text = buttons[indexPath.row]
         return cell
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        let _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
diff --git a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
index 3b973ab9b..8e0d31743 100644
--- a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
+++ b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
@@ -16,7 +16,7 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class KeyboardManagerViewController : UIViewController {
     
@@ -25,24 +25,24 @@ class KeyboardManagerViewController : UIViewController {
     private lazy var editFieldFocusHandler = {
         return UIKitFocusHandler(view: self.editField)
     }()
-    lazy var viewModel = KNArchitectureFramework().createKeyboardViewModel(focusHandler: self.editFieldFocusHandler)
+    lazy var viewModel = KeyboardViewModel(keyboardManagerBuilder: KeyboardManager.Builder(application: UIApplication.shared), editFieldFocusHandler: editFieldFocusHandler)
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { return [] })
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
     }
-    
+
     @IBAction
     func showButtonPressed() {
         viewModel.onShowPressed()
     }
-    
+
     @IBAction
     func hideButtonPressed() {
         viewModel.onHidePressed()
diff --git a/example/ios/Demo/Links/LinksViewController.swift b/example/ios/Demo/Links/LinksViewController.swift
index 9f14309e3..34ab58446 100644
--- a/example/ios/Demo/Links/LinksViewController.swift
+++ b/example/ios/Demo/Links/LinksViewController.swift
@@ -17,17 +17,15 @@
 
 import Foundation
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class LinksViewController : UIViewController {
     
     @IBOutlet weak var browserButton: UIButton!
     @IBOutlet weak var instructionsText: UILabel!
-    
-    private let knArchitectureFramework = KNArchitectureFramework()
-    private lazy var viewModel: LinksViewModel = {
-        return knArchitectureFramework.createLinksViewModel(parent: self, animated: true, completion: nil)
-    }()
+
+    private lazy var navigator: ViewControllerNavigator<BrowserNavigationActions<AnyObject>> = BrowserNavigatorKt.BrowserNavigator(parent: self)
+    private lazy var viewModel: LinksViewModel = LinksViewModel(linkRepoBuilder: LinksLinksBuilder(), builder: AlertPresenter.Builder(viewController: self), navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -37,7 +35,7 @@ class LinksViewController : UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        lifecycleManager = knArchitectureFramework.bind(viewModel: viewModel, to: self) {
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) {
             [
                 self.viewModel.browserButtonText.observe { buttonText in
                     self.browserButton.setTitle(buttonText as String?, for: .normal)
diff --git a/example/ios/Demo/LoadingIndicator/LoadingViewController.swift b/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
index 8c2412492..94ce6baad 100644
--- a/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
+++ b/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
@@ -16,23 +16,23 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class LoadingViewController: UITableViewController {
 
     private lazy var viewModel = HudViewModel(builder: HUD.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { return [] }
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
         switch (indexPath.row) {
diff --git a/example/ios/Demo/Location/LocationViewController.swift b/example/ios/Demo/Location/LocationViewController.swift
index a2632b8af..2b82f3b9c 100644
--- a/example/ios/Demo/Location/LocationViewController.swift
+++ b/example/ios/Demo/Location/LocationViewController.swift
@@ -18,7 +18,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 import UIKit
 import CoreLocation
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class LocationViewController: UIViewController {
 
@@ -30,9 +30,9 @@ class LocationViewController: UIViewController {
     
     @IBOutlet weak var label: UILabel!
     
-    lazy var viewModel = KNArchitectureFramework().createLocationViewModel(permission: Const.permission, repoBuilder: KNLocationFramework().getPermissionRepoBuilder())
+    lazy var viewModel = LocationViewModel(permission: Const.permission)
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
@@ -40,13 +40,15 @@ class LocationViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        lifecycleManager = viewModel.addLifecycleManager(parent: self, onLifecycle: { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else {
                 return []
             }
-            return [viewModel.location.observe(onNext: { (location) in
-                self?.label.text = location as? String ?? ""
-                })]
-        })
+            return [
+                viewModel.location.observe { (location) in
+                    self?.label.text = location as? String ?? ""
+                }
+            ]
+        }
     }
 }
diff --git a/example/ios/Demo/Permissions/PermissionListViewController.swift b/example/ios/Demo/Permissions/PermissionListViewController.swift
index 08b634940..2fd828e7c 100644
--- a/example/ios/Demo/Permissions/PermissionListViewController.swift
+++ b/example/ios/Demo/Permissions/PermissionListViewController.swift
@@ -16,51 +16,61 @@
  */
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class PermissionListViewController : UITableViewController {
-    
-    private lazy var viewModel: PermissionsListViewModel = KNArchitectureFramework().createPermissionListViewModel(parent: self) { (permission) -> UIViewController in
-        return PermissionViewController.create(permission: permission)
+
+    private lazy var navigator: ViewControllerNavigator<PermissionsListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Push(animated: true) {
+            guard let permission = action.value?.permission else {
+                return UIViewController()
+            }
+
+            return PermissionViewController.create(permission: permission)
+        }
     }
+    private lazy var viewModel: PermissionsListViewModel = PermissionsListViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     private var permissions = [PermissionView]()
-    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
-    
+    private var onSelected: ((Int) -> Void)? = nil
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
-            return [viewModel.observePermissions { (permissionViews: [PermissionView], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
-                self?.permissions = permissionViews
-                self?.onSelected = onSelected
-                self?.tableView.reloadData()
-            }]
+            return [
+                viewModel.permissions.observeInitialized { next in
+                    let permissions = next?.compactMap { $0 as? PermissionView } ?? []
+                    self?.permissions = permissions
+                    self?.onSelected = { (index: Int) in viewModel.onPermissionPressed(permissionView: permissions[index]) }
+                    self?.tableView.reloadData()
+                }
+            ]
         }
     }
-    
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
-    
+
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return permissions.count
     }
-    
+
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: PermissionsListCell.Const.identifier, for: indexPath) as! PermissionsListCell
         cell.label.text = permissions[indexPath.row].title
         return cell
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        let _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
diff --git a/example/ios/Demo/Permissions/PermissionViewController.swift b/example/ios/Demo/Permissions/PermissionViewController.swift
index 29ce5c847..4bca12051 100644
--- a/example/ios/Demo/Permissions/PermissionViewController.swift
+++ b/example/ios/Demo/Permissions/PermissionViewController.swift
@@ -17,20 +17,18 @@
 
 import UIKit
 import Foundation
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class PermissionViewController: UIViewController {
     
     private struct Const {
         static let storyboard = UIStoryboard(name: "Main", bundle: nil)
         static let permissionVc = "Permission"
-        
-        static let permissions = KNPermissionsFramework().getPermissions()
     }
     
     static func create(permission: Permission) -> PermissionViewController {
         let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.permissionVc) as! PermissionViewController
-        vc.viewModel = KNArchitectureFramework().createPermissionViewModel(permissions: Const.permissions, permission: permission)
+        vc.viewModel = PermissionViewModel(permission: permission)
         return vc
     }
     
@@ -39,47 +37,47 @@ class PermissionViewController: UIViewController {
     
     var viewModel: PermissionViewModel!
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+
         requestPermissionButton.setTitle(NSLocalizedString("permission_request", comment: ""), for: .normal)
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self, onLifecycleChanges: { [weak self] in
-            
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+
             guard let viewModel = self?.viewModel else {
                 return []
             }
-            
+
             return [
-                viewModel.permissionStateMessage.observe(onNext: { (message) in
+                viewModel.permissionStateMessage.observe { message in
                     self?.permissionStateLabel.text = NSLocalizedString(message as? String ?? "", comment: "")
-                    
-                }),
-                
-                viewModel.requestMessage.observe(onNext: { (optionalMessage) in
+
+                },
+
+                viewModel.requestMessage.observe { optionalMessage in
                     guard let message = optionalMessage as? String else {
                         return
                     }
-                    
+
                     let alert = UIAlertController(title: NSLocalizedString("permission_request", comment: ""), message: message, preferredStyle: .alert)
                     alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default, handler: nil))
                     self?.present(alert, animated: true, completion: nil)
-                    
-                    }),
-                
-                viewModel.showPermissionButton.observe(onNext: { (show) in 
+
+                },
+
+                viewModel.showPermissionButton.observe { show in
                     self?.requestPermissionButton.isHidden = !(show as? Bool ?? false)
-                    })
+                    }
             ]
-        })
+        }
     }
-    
-    
+
+
     @IBAction func requestPermission(sender: Any?) {
         viewModel.requestPermission()
     }
diff --git a/example/ios/Demo/Resources/ButtonViewController.swift b/example/ios/Demo/Resources/ButtonViewController.swift
index 68871ce6f..f00e435ff 100644
--- a/example/ios/Demo/Resources/ButtonViewController.swift
+++ b/example/ios/Demo/Resources/ButtonViewController.swift
@@ -15,11 +15,11 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ButtonViewController : UITableViewController {
     
-    private lazy var viewModel: ButtonViewModel = KNArchitectureFramework().createButtonViewModel(parent: self)
+    private lazy var viewModel: ButtonViewModel = ButtonViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider(), alertPresenterBuilder: AlertPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
 
     private var buttons = [KalugaButton]()
@@ -31,7 +31,7 @@ class ButtonViewController : UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         tableView.allowsSelection = false
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             return [
                 viewModel.buttons.observe { labels in
diff --git a/example/ios/Demo/Resources/ColorViewController.swift b/example/ios/Demo/Resources/ColorViewController.swift
index 4f2ce7a2f..c8412766a 100644
--- a/example/ios/Demo/Resources/ColorViewController.swift
+++ b/example/ios/Demo/Resources/ColorViewController.swift
@@ -15,7 +15,7 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ColorViewController : UIViewController {
     
@@ -43,7 +43,7 @@ class ColorViewController : UIViewController {
     private var blendedLightenedColors: [BackgroundStyle] = []
     private var blendedDarkenedColors: [BackgroundStyle] = []
     
-    private lazy var viewModel: ColorViewModel = KNArchitectureFramework().createColorViewModel(parent: self)
+    private lazy var viewModel: ColorViewModel = ColorViewModel(alertPresenterBuilder: AlertPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -58,7 +58,7 @@ class ColorViewController : UIViewController {
         sourceDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
         blendedLightenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
         blendedDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             
             return [
diff --git a/example/ios/Demo/Resources/LabelViewController.swift b/example/ios/Demo/Resources/LabelViewController.swift
index 055c3ba09..dd8695a79 100644
--- a/example/ios/Demo/Resources/LabelViewController.swift
+++ b/example/ios/Demo/Resources/LabelViewController.swift
@@ -15,11 +15,11 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class LabelViewController : UITableViewController {
-    
-    private lazy var viewModel: LabelViewModel = KNArchitectureFramework().createLabelViewModel()
+
+    private var viewModel: LabelViewModel = LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider())
     private var lifecycleManager: LifecycleManager!
 
     private var labels = [KalugaLabel]()
@@ -32,11 +32,11 @@ class LabelViewController : UITableViewController {
         super.viewDidLoad()
         
         tableView.allowsSelection = false
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             return [
                 viewModel.labels.observe { labels in
-                    self?.labels = labels?.compactMap { $0 as?  KalugaLabel } ?? []
+                    self?.labels = labels?.compactMap { $0 as? KalugaLabel } ?? []
                     self?.tableView.reloadData()
                 }
             ]
diff --git a/example/ios/Demo/Resources/ResourcesListViewController.swift b/example/ios/Demo/Resources/ResourcesListViewController.swift
index 906c7c6e7..40d7799a8 100644
--- a/example/ios/Demo/Resources/ResourcesListViewController.swift
+++ b/example/ios/Demo/Resources/ResourcesListViewController.swift
@@ -15,49 +15,56 @@
 //
 
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class ResourcesListViewController : UITableViewController {
+
+    private lazy var navigator: ViewControllerNavigator<ResourcesListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
+        NavigationSpec.Segue(identifier: action.segueKey)
+    }
     
-    private lazy var viewModel: ResourcesListViewModel = KNArchitectureFramework().createResourcesViewModel(parent: self)
+    private lazy var viewModel: ResourcesListViewModel = ResourcesListViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     private var resources = [String]()
-    private var onSelected: ((KotlinInt) -> KotlinUnit)? = nil
-    
+    private var onSelected: ((Int) -> Void)? = nil
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = KNArchitectureFramework().bind(viewModel: viewModel, to: self) { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
-            return [viewModel.observeResources() { (resources: [String], onSelected: @escaping (KotlinInt) -> KotlinUnit) in
-                self?.resources = resources
-                self?.onSelected = onSelected
-                self?.tableView.reloadData()
-            }]
+            return [
+                viewModel.resources.observeInitialized { next in
+                    let resources = next ?? []
+                    self?.resources = resources.map { ($0 as! Resource).title }
+                    self?.onSelected = { (index: Int) in viewModel.onResourceSelected(resource: resources[index] as! Resource) }
+                    self?.tableView.reloadData()
+                }
+            ]
         }
     }
-    
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
-    
+
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return resources.count
     }
-    
+
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: ResourcesListCell.Const.identifier, for: indexPath) as! ResourcesListCell
         cell.label.text = resources[indexPath.row]
         return cell
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(KotlinInt.init(int: Int32(indexPath.row)))
+        let _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
@@ -72,3 +79,16 @@ class ResourcesListCell : UITableViewCell {
     @IBOutlet weak var label: UILabel!
     
 }
+
+private extension ResourcesListNavigationAction {
+    var segueKey: String {
+        get {
+            switch self {
+            case is ResourcesListNavigationAction.Button: return "showButton"
+            case is ResourcesListNavigationAction.Color: return "showColor"
+            case is ResourcesListNavigationAction.Label: return "showLabel"
+            default: return ""
+            }
+        }
+    }
+}
diff --git a/example/ios/Demo/System/Network/NetworkViewController.swift b/example/ios/Demo/System/Network/NetworkViewController.swift
index a3c6c7cef..ead546b08 100644
--- a/example/ios/Demo/System/Network/NetworkViewController.swift
+++ b/example/ios/Demo/System/Network/NetworkViewController.swift
@@ -17,11 +17,10 @@
 
 import Foundation
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class NetworkViewController : UIViewController {
-    
-    private let knArchitectureFramework = KNArchitectureFramework()
+
     @IBOutlet weak var networkStateText: UILabel!
     private var lifecycleManager: LifecycleManager!
     
@@ -34,12 +33,12 @@ class NetworkViewController : UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        lifecycleManager = knArchitectureFramework.bind(viewModel: viewModel, to: self) { [weak self] in
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             
             return [
-                viewModel.networkState.observe { value in
-                    self?.networkStateText.text = value as? String
+                viewModel.networkState.observe { next in
+                    self?.networkStateText.text = next as? String
                 }
             ]
         }
diff --git a/example/ios/Demo/System/SystemViewController.swift b/example/ios/Demo/System/SystemViewController.swift
index 9945dfd0d..782e14c5b 100644
--- a/example/ios/Demo/System/SystemViewController.swift
+++ b/example/ios/Demo/System/SystemViewController.swift
@@ -17,56 +17,60 @@
 
 import Foundation
 import UIKit
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class SystemViewController : UITableViewController {
-    
-    private let knArchitectureFramework = KNArchitectureFramework()
-    private lazy var viewModel: SystemViewModel = {
-        return self.knArchitectureFramework.createSystemViewModel(parent: self)
-    }()
-    
+
+    private lazy var navigator: ViewControllerNavigator<SystemNavigationActions> = ViewControllerNavigator(parentVC: self) { action in
+        switch action {
+        case is SystemNavigationActions.Network: return NavigationSpec.Segue(identifier: "showNetwork")
+        default: return NavigationSpec.Segue(identifier: "")
+        }
+    }
+    private lazy var viewModel: SystemViewModel = SystemViewModel(navigator: navigator)
+
     private var modules = [String]()
-    private var onModuleTapped: ((KotlinInt) -> KotlinUnit)? = nil
+    private var onModuleTapped: ((Int) -> Void)? = nil
     private var lifecycleManager: LifecycleManager!
-    
+
     deinit {
         lifecycleManager.unbind()
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        lifecycleManager = knArchitectureFramework.bind(viewModel: viewModel, to: self) { [weak self] in
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else {
                 return []
             }
             return [
-                viewModel.observeModules { (modules: [String], onButtonTapped: @escaping (KotlinInt) -> KotlinUnit) in
-                    self?.modules = modules
-                    self?.onModuleTapped = onButtonTapped
+                viewModel.modules.observeInitialized { next in
+                    let modules = next?.compactMap { $0 as? SystemFeatures } ?? []
+                    self?.modules = modules.map{ $0.name }
+                    self?.onModuleTapped = { (index: Int) in viewModel.onButtonTapped(systemFeatures: modules[index]) }
                     self?.tableView.reloadData()
                 }
             ]
         }
     }
-    
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
-    
+
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return modules.count
     }
-    
+
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: SystemListCell.Const.identifier, for: indexPath) as! SystemListCell
         cell.label.text = modules[indexPath.row]
         return cell
     }
-    
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onModuleTapped?(KotlinInt.init(int: Int32(indexPath.row)))
+        let _ = onModuleTapped?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
diff --git a/example/ios/DemoTests/DemoTests.swift b/example/ios/DemoTests/DemoTests.swift
index 2aa6b9b30..dbe30118f 100644
--- a/example/ios/DemoTests/DemoTests.swift
+++ b/example/ios/DemoTests/DemoTests.swift
@@ -18,7 +18,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 import XCTest
 @testable import Demo
-import KotlinNativeFramework
+import KalugaExampleShared
 
 class DemoTests: XCTestCase {
 
diff --git a/example/ios/KotlinNativeFramework/Info.plist b/example/ios/KotlinNativeFramework/Info.plist
deleted file mode 100644
index e1fe4cfb7..000000000
--- a/example/ios/KotlinNativeFramework/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-</dict>
-</plist>
diff --git a/example/ios/KotlinNativeFramework/build.gradle.kts b/example/ios/KotlinNativeFramework/build.gradle.kts
deleted file mode 100644
index af1919ff5..000000000
--- a/example/ios/KotlinNativeFramework/build.gradle.kts
+++ /dev/null
@@ -1,52 +0,0 @@
-buildscript {
-
-    repositories {
-        mavenCentral()
-        google()
-        gradlePluginPortal()
-    }
-}
-
-plugins {
-    kotlin("multiplatform")
-    id("org.jlleitschuh.gradle.ktlint")
-}
-
-kotlin {
-
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
-            baseName = "KotlinNativeFramework"
-            export(project(":shared"))
-            transitiveExport = true
-        }
-    }
-
-    sourceSets {
-        val commonMain by getting {
-            dependencies {
-                api(project(":shared"))
-            }
-        }
-
-        val iosX64Main by getting
-        val iosArm64Main by getting
-        val iosSimulatorArm64Main by getting
-        val iosMain by creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-        }
-    }
-}
-
-tasks.create<Delete>("cleanKotlinNativeFrameworkTest") {
-    delete = setOf(
-        "build"
-    )
-}
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/KotlinNativeFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/KotlinNativeFramework.kt
deleted file mode 100644
index 07fbb39f8..000000000
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/KotlinNativeFramework.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-import io.github.aakira.napier.DebugAntilog
-import io.github.aakira.napier.Antilog as NapierLog
-
-class KotlinNativeFramework {
-
-    fun hello() = com.splendo.kaluga.example.shared.helloCommon()
-
-    // expose a dependency to Swift as an example
-    fun logger(): NapierLog = DebugAntilog()
-}
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt
deleted file mode 100644
index ea305d5d6..000000000
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/architecture/KNArchitectureFramework.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package architecture
-
-/* ktlint-disable no-wildcard-imports */
-import com.splendo.kaluga.alerts.AlertPresenter
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.navigation.ViewControllerNavigator
-import com.splendo.kaluga.architecture.observable.Disposable
-import com.splendo.kaluga.architecture.observable.DisposeBag
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.architecture.viewmodel.LifecycleManager
-import com.splendo.kaluga.architecture.viewmodel.addLifecycleManager
-import com.splendo.kaluga.architecture.viewmodel.onLifeCycleChanged
-import com.splendo.kaluga.bluetooth.Bluetooth
-import com.splendo.kaluga.bluetooth.beacons.Beacons
-import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.example.shared.viewmodel.ExampleTabNavigation
-import com.splendo.kaluga.example.shared.viewmodel.ExampleViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
-import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetailsSpecRow
-import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.info.*
-import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
-import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
-import com.splendo.kaluga.example.shared.viewmodel.link.BrowserSpecRow
-import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
-import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionNavigationBundleSpecRow
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel
-import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
-import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
-import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationActions
-import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
-import com.splendo.kaluga.keyboard.FocusHandler
-import com.splendo.kaluga.keyboard.KeyboardManager
-import com.splendo.kaluga.links.LinksBuilder
-import com.splendo.kaluga.location.LocationStateRepoBuilder
-import com.splendo.kaluga.permissions.base.Permission
-import com.splendo.kaluga.permissions.base.Permissions
-import com.splendo.kaluga.permissions.bluetooth.BluetoothPermission
-import com.splendo.kaluga.permissions.calendar.CalendarPermission
-import com.splendo.kaluga.permissions.camera.CameraPermission
-import com.splendo.kaluga.permissions.contacts.ContactsPermission
-import com.splendo.kaluga.permissions.location.LocationPermission
-import com.splendo.kaluga.permissions.microphone.MicrophonePermission
-import com.splendo.kaluga.permissions.notifications.*
-import com.splendo.kaluga.permissions.storage.StoragePermission
-import com.splendo.kaluga.resources.StyledStringBuilder
-import com.splendo.kaluga.review.ReviewManager
-import platform.Foundation.NSURL
-import platform.Foundation.NSUUID
-import platform.UIKit.*
-import platform.UserNotifications.UNAuthorizationOptionAlert
-import platform.UserNotifications.UNAuthorizationOptionSound
-
-class KNArchitectureFramework {
-
-    fun createPermissionListViewModel(parent: UIViewController, createPermissionViewController: (Permission) -> UIViewController): PermissionsListViewModel {
-        return PermissionsListViewModel(
-            ViewControllerNavigator(parent) { action ->
-                NavigationSpec.Push(
-                    push = {
-                        val bundle = action.bundle ?: return@Push UIViewController()
-                        val permission = when (bundle.get(PermissionNavigationBundleSpecRow)) {
-                            PermissionView.Bluetooth -> BluetoothPermission
-                            PermissionView.Calendar -> CalendarPermission()
-                            PermissionView.Camera -> CameraPermission
-                            PermissionView.Contacts -> ContactsPermission()
-                            PermissionView.Location -> LocationPermission(
-                                background = true,
-                                precise = true
-                            )
-                            PermissionView.Microphone -> MicrophonePermission
-                            PermissionView.Notifications -> NotificationsPermission(
-                                NotificationOptions(
-                                    UNAuthorizationOptionAlert or UNAuthorizationOptionSound
-                                )
-                            )
-                            PermissionView.Storage -> StoragePermission()
-                        }
-                        createPermissionViewController(permission)
-                    }
-                )
-            }
-        )
-    }
-
-    fun createPermissionViewModel(permissions: Permissions, permission: Permission): PermissionViewModel {
-        return PermissionViewModel(permissions, permission)
-    }
-
-    fun createLocationViewModel(permission: LocationPermission, repoBuilder: LocationStateRepoBuilder): LocationViewModel {
-        return LocationViewModel(permission, repoBuilder)
-    }
-
-    fun createKeyboardViewModel(focusHandler: FocusHandler): KeyboardViewModel {
-        return KeyboardViewModel(KeyboardManager.Builder(), focusHandler)
-    }
-}
-
-fun InfoViewModel.observeButtons(onInfoButtonsChanged: (List<String>, (Int) -> Unit) -> Unit): Disposable {
-    return buttons.observeInitialized { buttons ->
-        val titles = buttons.map { button -> button.title }
-        onInfoButtonsChanged(titles) { index -> this.onButtonPressed(buttons[index]) }
-    }
-}
-
-fun PermissionsListViewModel.observePermissions(onPermissionsChanged: (List<PermissionView>, (Int) -> Unit) -> Unit): Disposable {
-    return permissions.observeInitialized { permissions ->
-        onPermissionsChanged(permissions) { index -> this.onPermissionPressed(permissions[index]) }
-    }
-}
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt
deleted file mode 100644
index 579ad06ea..000000000
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/beacons/KNBeaconsFramework.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.ios.beacons
-
-import com.splendo.kaluga.base.singleThreadDispatcher
-import com.splendo.kaluga.bluetooth.BluetoothBuilder
-import com.splendo.kaluga.bluetooth.beacons.Beacons
-import com.splendo.kaluga.bluetooth.device.ConnectionSettings
-import com.splendo.kaluga.bluetooth.scanner.BaseScanner
-import kotlin.time.Duration.Companion.minutes
-import kotlinx.coroutines.MainScope
-import permissions.KNPermissionsFramework
-
-class KNBeaconsFramework {
-    private val mainScope = MainScope()
-    val service = Beacons(
-        BluetoothBuilder().create(
-            { BaseScanner.Settings(KNPermissionsFramework().getPermissions()) },
-            ConnectionSettings(),
-            singleThreadDispatcher("Bluetooth")
-        ),
-        timeout = 1.minutes
-    )
-}
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt
deleted file mode 100644
index 9e55dda3e..000000000
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/bluetooth/KNBluetoothFramework.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.ios.bluetooth
-
-import com.splendo.kaluga.base.singleThreadDispatcher
-import com.splendo.kaluga.bluetooth.BluetoothBuilder
-import com.splendo.kaluga.bluetooth.device.ConnectionSettings
-import com.splendo.kaluga.bluetooth.scanner.BaseScanner
-import kotlinx.coroutines.MainScope
-import permissions.KNPermissionsFramework
-
-object KNBluetoothFramework {
-    val mainScope = MainScope()
-    val bluetooth = BluetoothBuilder().create(
-        { BaseScanner.Settings(KNPermissionsFramework().getPermissions()) },
-        ConnectionSettings(),
-        singleThreadDispatcher("Bluetooth")
-    )
-}
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/location/KNLocationFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/location/KNLocationFramework.kt
deleted file mode 100644
index 103c44292..000000000
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/location/KNLocationFramework.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package location
-
-import com.splendo.kaluga.location.LocationStateRepoBuilder
-
-class KNLocationFramework {
-    fun getPermissionRepoBuilder(): LocationStateRepoBuilder { return LocationStateRepoBuilder() }
-}
diff --git a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/permissions/KNPermissionsFramework.kt b/example/ios/KotlinNativeFramework/src/commonMain/kotlin/permissions/KNPermissionsFramework.kt
deleted file mode 100644
index 34995c691..000000000
--- a/example/ios/KotlinNativeFramework/src/commonMain/kotlin/permissions/KNPermissionsFramework.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package permissions
-
-import com.splendo.kaluga.permissions.base.Permissions
-import com.splendo.kaluga.permissions.base.PermissionsBuilder
-import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermission
-import com.splendo.kaluga.permissions.calendar.registerCalendarPermission
-import com.splendo.kaluga.permissions.camera.registerCameraPermission
-import com.splendo.kaluga.permissions.contacts.registerContactsPermission
-import com.splendo.kaluga.permissions.location.registerLocationPermission
-import com.splendo.kaluga.permissions.microphone.registerMicrophonePermission
-import com.splendo.kaluga.permissions.notifications.registerNotificationsPermission
-import com.splendo.kaluga.permissions.storage.registerStoragePermission
-
-class KNPermissionsFramework {
-    fun getPermissions(): Permissions {
-        return Permissions(
-            PermissionsBuilder().apply {
-                registerBluetoothPermission()
-                registerCameraPermission()
-                registerStoragePermission()
-                registerLocationPermission()
-                registerNotificationsPermission()
-                registerContactsPermission()
-                registerMicrophonePermission()
-                registerCalendarPermission()
-            }
-        )
-    }
-}
diff --git a/example/ios/Supporting Files/.idea/codeStyles/Project.xml b/example/ios/Supporting Files/.idea/codeStyles/Project.xml
deleted file mode 100644
index a700adc5c..000000000
--- a/example/ios/Supporting Files/.idea/codeStyles/Project.xml	
+++ /dev/null
@@ -1,127 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <MarkdownNavigatorCodeStyleSettings>
-      <option name="RIGHT_MARGIN" value="72" />
-    </MarkdownNavigatorCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/example/ios/Supporting Files/.idea/codeStyles/codeStyleConfig.xml b/example/ios/Supporting Files/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123c2..000000000
--- a/example/ios/Supporting Files/.idea/codeStyles/codeStyleConfig.xml	
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/example/ios/Supporting Files/.idea/copyright/apache.xml b/example/ios/Supporting Files/.idea/copyright/apache.xml
deleted file mode 100644
index dbcade1d8..000000000
--- a/example/ios/Supporting Files/.idea/copyright/apache.xml	
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright &amp;#36;today.year Splendo Consulting B.V. The Netherlands&#10;&#10;    Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;    you may not use this file except in compliance with the License.&#10;    You may obtain a copy of the License at&#10;&#10;      http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;    Unless required by applicable law or agreed to in writing, software&#10;    distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;    See the License for the specific language governing permissions and&#10;    limitations under the License." />
-    <option name="myName" value="apache" />
-  </copyright>
-</component>
\ No newline at end of file
diff --git a/example/ios/Supporting Files/.idea/copyright/profiles_settings.xml b/example/ios/Supporting Files/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index c553753a7..000000000
--- a/example/ios/Supporting Files/.idea/copyright/profiles_settings.xml	
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="apache">
-    <module2copyright>
-      <element module="Project Source Files" copyright="apache" />
-    </module2copyright>
-  </settings>
-</component>
\ No newline at end of file
diff --git a/example/ios/Supporting Files/.run/Ktlint Check.run.xml b/example/ios/Supporting Files/.run/Ktlint Check.run.xml
deleted file mode 100644
index fe4732494..000000000
--- a/example/ios/Supporting Files/.run/Ktlint Check.run.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktlint Check" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="ktlintCheck" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/example/ios/Supporting Files/.run/Ktlint Format.run.xml b/example/ios/Supporting Files/.run/Ktlint Format.run.xml
deleted file mode 100644
index 630b7c720..000000000
--- a/example/ios/Supporting Files/.run/Ktlint Format.run.xml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktlint Format" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="ktlintFormat" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/example/ios/Supporting Files/build.gradle.kts b/example/ios/Supporting Files/build.gradle.kts
deleted file mode 100644
index 126204c81..000000000
--- a/example/ios/Supporting Files/build.gradle.kts	
+++ /dev/null
@@ -1,41 +0,0 @@
-// TODO: To be removed once we will migrate to kotlin version 1.6.20
-// https://youtrack.jetbrains.com/issue/KT-49109#focus=Comments-27-5667134.0-0
-rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
-    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.13.2"
-}
-
-buildscript {
-    repositories {
-        mavenCentral()
-        google()
-        gradlePluginPortal()
-    }
-
-    dependencies {
-        val kalugaAndroidGradlePluginVersion = project.extra["kaluga.androidGradlePluginVersion"]
-        // mostly migrated to new style plugin declarations, but some cross plugin interaction still requires this
-        classpath("com.android.tools.build:gradle:${kalugaAndroidGradlePluginVersion}")
-    }
-}
-
-plugins {
-    kotlin("multiplatform") apply false
-}
-
-val ext = (gradle as ExtensionAware).extra
-val repo = ext["example_maven_repo"]
-logger.lifecycle("Using repo: $repo for resolving dependencies")
-
-allprojects {
-
-    repositories {
-        when(repo) {
-            null, "", "local" -> mavenLocal()
-            "none" -> {/* noop */}
-            else ->
-                maven(repo)
-        }
-        mavenCentral()
-        google()
-    }
-}
diff --git a/example/ios/Supporting Files/gradle.properties b/example/ios/Supporting Files/gradle.properties
deleted file mode 100644
index 14bb99596..000000000
--- a/example/ios/Supporting Files/gradle.properties	
+++ /dev/null
@@ -1,21 +0,0 @@
-## ## keep in sync with gradle.properties in root ## ##
-
-kotlin.code.style=official
-kotlin.mpp.stability.nowarn=true
-android.useAndroidX=true
-
-kaluga.androidGradlePluginVersion=7.3.0
-kaluga.kotlinVersion=1.6.10
-kaluga.googleServicesGradlePluginVersion=4.3.10
-kaluga.ktLintGradlePluginVersion=10.1.0
-org.gradle.jvmargs=-Xmx3048M -Dkotlin.daemon.jvm.options\="-Xmx3048M"
-
-#MPP
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.enableCInteropCommonization=true
-
-## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ##
-
-## extra properties only for example
-xcodeproj=./..
diff --git a/example/ios/Supporting Files/gradle/wrapper/gradle-wrapper.jar b/example/ios/Supporting Files/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 91ca28c8b802289c3a438766657a5e98f20eff03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54413
zcmafaV|Zr4wq`oEZQHiZj%|LijZQlLf{tz5M#r{o+fI6V=G-$g=gzrzeyqLskF}nv
zRZs0&c;EUi2L_G~0s;*U0s<oPS3p2O|JM@)1m^EsK|)Q0K}J!M2@K@>zbK}f6%Pvi
zRZ#mYf6f1oqJoH`jHHCB8l!^by~4z}yc`4LEP@;Z?bO6{g9`Hk+s@(L1jC5Tq{1Yf
z4E;CQvrx0-gF+peRxFC*gF=&$zNYk(w0q}U=WqXMz`tYs@0o%B{dRD+{C_6(f9t^g
zhmNJQv6-#;f2)f2uc{u-#*U8W&i{|ewYN^n_1~cv|1J!}zc&$eaBy{T{cEpa46s*q
zHFkD2cV;xTHFj}{*3kBt*FgS4A5SI|$F%$gB@It9FlC}D3y`sbZG{2P6gGwC$U`6O
zb_cId9AhQl#A<&=x>-x<PR7beR`q^c3z!uW<<qQ3b#P42bV*tLoyJG@=kw#)62zca
ziB;57cgT1`PV1MW$Ph8(nAQLVPD<R~csx8&vbkQbdUq$<0BlL&&sNIa_Fx*EO|2wH
zv7wF;>DD%=Ppt$;y71@Lwsl{x943#T@8*?cbR<~d`@@}4V${+r$jICUIOzgZJy_9I
zu*eA(F)$~J07zX%tmQN}1^wj+RM|9bbwhQA=xrPE*{vB_P!pPYT5{Or^m*;Qz#@Bl
zRywCG_RDyM6bf~=xn}FtiFAw|rrUxa1+z^H`j6e|GwKDuq}P)z&@J>MEhsVBvnF|O
zOEm)dADU1wi8~mX(j_8`DwMT_OUAnjb<q8m*lnB5soa{>WYer;P*^Uku_qMu3}qJU
zTAkza-K9aj&wcsGuhQ>RQoD?gz~L8RwCHOZDzhBD$az*$TQ3!uygnx_rsXG`#_x5t
zn*lb(%JI3%G<WH7a%JXZ9li8W6ON5EN|Pglokwa?O_c>^MpYp-Y(KI4@_!&kBRa3q
z|Fzn&3R%ZsoMNEn4pN3-BSw2S_{IB8RzRv(e<LB6j=Jxc5$(zV6fAu={<m+97>Q1X
zy<oN|%-)htE!Iw5q1^txZTDK}w)<j{*(KRV9Og>BQZHJ<(~PfUZ~EoI!Aj`9k<+Cy
z2DtI<+9sXQu!6&-Sk4SW3oz}?Q~mFvy(urUy<)x!KQ>#7yIPC)(ORhKl7k)4eSy~}
z7#H3KG<eM#W_(HL%sK4i-i#)x?&2lSMh)Rzy`+rI;g)R9ryH{3Z2ZoO1*}%*=Jq74
zf*QE7bT5QLH#7d|%wIx2G3l0Ewe8^_&0c;X2Et108rx97hG+`CN||CEa#eDk88z^0
zln1QTtS!dX%9RzT><|lt68$tk^`=yjev%^usOfpQ#+Tqyx|b#dVA(>fPlGuS@9ydo
z!Cs#hse9nUETfGX-7lg;F>9)+ml@M8OO^q|W~NiysX2N|2dH>qj%NM`=*d3GvES_#
zyLEHw&1Fx<-dYxCQbk_wk^CI?W44%Q9<nk4*}FJ%n#!DgiPe@I^mpYQ%%)ao7R}bY
zJXu!0wW`>!!9aJKZW-bGVhK?N;q`+Cgc*WqyXcxZ%U5Q<oYx#A&>XKu!Xn)u_dxeQ
z;uw9Vysk!3OFzUmVoe)qt3ifPin0h<DWxOngs6BTo<0WDFbKw#cE`g5geP8#>25TU
zrG*03L~0|aaBg7^YPEW^Yq3>mSNQgk-o^CEH?wXZ^QiPiuH}jGk;75PUMNquJjm$3
zLcXN*uDRf$Jukqg3;046b;3s8zkxa<Cp;VqMHuV#Kx?4%+JTOT_ZR#=k<<ca=TNd7
z5|5eUI*Fq85Xg#U+QyPb>_6yAlG{+7{81O3w96i_A$KcJhD&+oz1<>?lun#C3+X0q
zO4JxN{qZ!e#FCl@e_3G?0I^$CX6e$cy7$BL#4<`AA)Lw+k`^15pmb-447~5lkSMZ`
z>Ce|adKhb-F%yy!vx>yQbXFgHyl(an=x^zi(!-~|k;G1=E(e@JgqbAF{;nv`3i)oi
zDeT*Q+Mp{+NkURoabYb9@#Bi5FMQnBFEU?H{~9c;g3K%m{+^hNe}(MdpPb?j9`?2l
z#%AO!|2QxGq7-2Jn2|%atvGb(+?j&lmP509i5y87`9*BSY++<%%DXb)kaqG0(4Eft
zj|2!Od~2TfVTi^0dazAIeVe&b#{J4DjN6;4W;M{yWj7#<o7vi$yV=jEGb$LcDT71Y
zBI&4L8NANL_2q^G0xF_FM4g!>+oLhJ<dmfOaF_e2{oB=89iZ=pe!1cx3;3201<#Pe
zi%Mcc5`{(gBe*dT`2DB&H0HqTg7i0Z3jd7|?EfDhzdJj4dWpEXTAACs0!)ov9sVOo
zB&q5<po*XifF%x^1Dw=rmt^g1Ldxl1Fc5}<jpXIS0V;MTZ|os3m8)03jDOt$<$dR{
z)~)uCZlrLoLDWTI7X4Cvj<a2^1w1UCj%yr*KoW0PBvE<r5S=lXP+I|}1b8sEl(n`S
zx}439>yqeRaO;>?%mX>Ec{Mp~;`bo}p;`)@5dA8fNQ38FyMf;wUPOdZS{U*8SN6xa
z-kq3>*Zos!2`FMA7qjhw-`^3ci%c91Lh`;h{qX1r;x1}eW2h<eWJ5MEyj7H<z7Dwv
z3p|*dY=EGJA7{w(pzdN)cLBXOAE}LFTG+lv+JFmrvPhuCykh-fEFje4(Pjb}i=Tw;
ze2k29p}(q%a68AfU!s_oAGb#wB2n%XLmxWWyp&}!9QDymml)!M7<qGo{|B_B4U$Hi
zny)n$s<>YaE*3lTk4GwenoxQ1kHt1Lw!*N8Z%DdZSGg5~Bw}+L!1#d$u+S=Bzo7gi
zqGsBV29i)Jw(vix>De)H&<r+q)#b8Is3_xDPd4zYI1EoVN8Xx8Q4t((Hu$Mbk>PC;
z-t2OX_ak#~eSJ?Xq=q9A#0oaP*dO7*MqV;dJv|aUG00UX=cIhdaet|YEIhv6AUuyM
zH1h7fK9-AV)k8sr#POIhl+?Z^r?wI^GE)ZI=H!WR<|UI(3_YUaD#TYV$Fxd015^mT
zpy&#-IK>ahfBlJm-J(n(A%cKV;)8&Y{P!E|AHPtRHk=XqvYUX?+9po4B$0-6t<jB1
z59S*#-cJU2NmNkqcw`;&dL!G|Mlygg2if!#sIx9tjMyH#!bYQ$prQ$tqRzA7MJNW0
z;zcoo{ru7=mtBJY9Oq{{;7vgYFn7P@->74UUef${<ag!w-0d^nb>01V{QLEE8gzw*
z5nFnvJ<zyQt$)kX>|T4dlRiW9;Ed_yB{R@)fC=zo4hCtD?TPW*WJmMXYxN_&@YQYg
zBQ$XRHa&EE;YJrS{bn7q?}Y&DH*h;){5MmE(9A6aSU|W?{3Ox%5fHLFScv7O<b`eZ
z!wW&ePkY!9`$g^}DYWL~#Rg3GmP=$L0QVa~fX&YJ&2!TWRHyw8(XBcGoAXi5fudmo
zo8kP;v`Sh)+~n`EqiwVM>-txuRbPG1KQtI`Oay=IcEG=+hPhlnYC;`wSHe<UeSwC(
z`;@`Ix@gy=)$q7ULEE8mNy*vuPtr@{R6`l9-Hfe0Qz*~im6>o|XGio0aTS6&W($E$
z?N&?TK*l8;Y^-xPl-WVZwrfdiQv10<N`2d<!O8aUGZP@A{p_GdTQ8@A?eaiXdaD8m
z=uz(eib24bY{_M#u;+pc6T^eWhxYnyf@<=$H|S%5=`d0(!hi|V6A=y(4<#`q#MzrZ
z)unEXkZ}>KdsAb9u-*1co*0-Z(h#H)k{Vc5CT!708cs%sExvPC+7-^UY~jTfFq=cj
z!Dmy<+NtKp&}}$}rD{l?%MwHdpE(cPCd;-QFPk1`E5EVNY2i6E`;^aBlx4}h*l42z
zpY#2cYzC1l6EDrOY*ccb%kP;k8LHE3tP>l3iK?XZ%FI<3666yPw1rM%>eCgnv^JS_
zK7c~;g7yXt9fz@(49}Dj<i{$xLKlD|sVu*v++usuY5Ro5KHWL%^gw>7VO%+P!eEm&
z;z8UXs%NsQ%@2S5nve)@;yT^61BpVlc}=+i6{ZZ9r7<({yUYqe==9*Z+HguP3`sA&
z{`inI4G)eLieUQ*pH9M@)u7yVnWTQva;|xq&-B<>MoP(|xP(HqeCk1&h>DHNLT>Zi
zQ$uH%s6GoPAi0~)sC;`;ngsk+StYL9NFzh<o3rxz<M;q8GQN*&xhzEaW)#zm3jfq?
zlu*tsz-&Ez-&sBWVsda%q{LNOPIvyPH3fY|&tjF}aB2TGA>FEoT&Hzfma1f|tEnL0
zMWdX4(@Y*?*tM2@H<#^_l}BC&;PYJl%~E#veQ61{wG6!~nyop<^e)scV5#VkGjYc2
z$u)AW-NmMm%T7WschOnQ!Hbbw&?`oMZrJ&%dVlN3VNra1d0TKfbOz{dHfrCmJ2Jj=
zS#Gr}JQcVD?S9X!u|oQ7LZ<ZH<gqO+e+zR?DRXAOY(4{50YZvSTRsT+z@{n;59Wi7
z;7f9|sj5kYI~<3}ITa_ygJKt$h9QL%#V2pofd&*8wyi{lf(T|tqgJ^q(>+qcq{$40
ziG5=<!Z}LcRWrxlf#?0n#?8v>X^+WqeqxU00YuftU7o;db=K+Tq!y^daCZgQ)O=M}
zK>j*<3oxs=Rcr&W2h%w?0Cn3);~vqG>JO_tTOzuom^g&^vzlEjkx>Sv!@NNX%_C!v
zaMpB>%yVb}&ND9b*O>?HxQ$5-%@xMGe4XKjWh7X>CYoRI2^JIwi&3Q5UM)?G^k8;8
zmY$u;(KjZx>vb3fe2zgD7V;T2_|1KZQW$Yq%y5Ioxmna9#xktcgVitv7Sb3SlLd6D
zfmBM9Vs4rt1s0M}c_&%iP5O{Dnyp|g1(cLYz^qLqTfN6`+o}59Zlu%~oR3Q3?{Bnr
zkx+wTpeag^G12fb_%SghFcl|p2~<)Av?Agumf@v7y-)ecVs`US=q~=QG%(_RTsqQi
z%B&JdbOBOmoywgDW|DKR5>l$1^FPhxsBrja<&}*pfvE|5dQ7j<f<#qxQoe?iX)3+g
zV`WrTVz&P9(`hCu+0L@$^2R{G5!&dwL|s|6U{V}Ai)o~GuRMUh2$%A<zLay2$4M|Y
zQ{~A{BIZr6oagk&bqq+Wz@09gW}<il-g}!6#tXx&Il)vwSIenBA_}U^<5PA%r&n&n
zdP?4osMCGOG_fw<>-wV|ur%QUCRCzBR3q*X`05O3U@?#$<>@e+Zh&Z&`KfuM!0XL&
zI$gc@ZpM4o>d&5)mg7+-Mmp98K^b*28(|Ew8kW}XEV7k^<cuTPX`ieVbA*=lkYyR!
z2+y6=*3NivpPEK=c&{pE&)vda&~{p_x5mDr%V}38-|Xbm?&HI|)-KSc`PouXXaj3#
zCS5P9Xkt)S%iG%631|v#PRK}sG`H=&t&*dtrXK7CJ!haS*Ab16`1Sq*cXp?x{-gbe
zZY1lNtOJ?dJJcnBE@7{$uI_+PN3!IJS?-=}U&-3ot8g?L4=!a&B^o20FGt!NpuU<#
z+3lB7Bm#4&qTN*NW^RWCsM0&2KaD@OOq|7543LSg%ab3dM=dY9gGG@sjao&r)Z%7b
zeQt)8kU6|-&c>vnX-$onm9OtaO@NU9a|as7iA%5Wrw9*%UtJYacltplA5}gx^YQM`
zVkn`TIw~avq)mIQO0F0xg)w$c)=8~6Jl|gdqnO6<5XD)&e7<nF`_d;!>z7y<sRNVw
zRZdf9YGW&#ITM|aH%621^!JRX>pd3HOIR+ss0ikSVrWar?548HF<x)Av(9GJA<qS%
z!5mdNN4l@$cT|o0tkKu9#EfJP6awsw^d@tI*%hI^;!iz?L>Q*+hC)NPCq*;cG#B$7
z!n?{e9`&Nh-y}v=nK&PR>PFdut*q&i81Id`Z<0vXUPEbbJ|<~_D!)DJMqSF~ly$tN
zygoa)um~xdYT<7%%m!K8+V(&%83{758b0}`b&=`))Tuv_)OL6pf=XOdFk&Mfx9y{!
z6nL>V?t=#eFfM$GgGT8DgbGRCF@0ZcWaNs_#yl+6&sK~(JFwJmN-aHX{#Xkpmg;!}
zgNyYYrtZdLzW1tN#QZAh!z5>h|At3m+ryJ-DFl%V>w?cmVTxt^DsCi1ZwPaCe*D{)
z?#AZV6Debz{*D#C2>44Czy^yT3y92AYDcIXtZrK{L-XacVl$4i=X2|K=Fy5vAzhk{
zu3qG=qSb_YYh^HirWf~n!_Hn;TwV8FU9H8<Kq8j`wKdX6cUV2RHJ4#@6F&M<Lw0@W
zv$=q<#e~6L47_S3m_Rl~zl{LcZp(O9uT9V(`^aAeypX8^%{-K&saYf`qNwGpG!&ae
zSTGDj!2*_cLAuDKcn@xi;JN0*Y|1vL?T?RRdcr%9xJ{)lMt0|s0o&=%l$x46==1Y@
zJNQ~Rvo5Yx)+Jo%2MgGDoI2Gbta{8lqca^Wg?iFho^q(6D{!eW50pIJDi6GaE|+Ig
z2h+1>+=BO)XVFV`nt)b>5yACVr!b98QlLOBDY=^KS<*m9@_h3;64VhBQzb_QI)gbM
zSDto2i*iFrvxSmAIrePB3i`Ib>LdM8wXq8(R{-)P6DjUi{2;?}9S7l7bND4w%L2!;
zUh~sJ(?Yp}o!q6)2CwG*mgUUWlZ;xJZo`U`tiqa)H4j>QVC_dE7ha0)nP5mWGB268
zn~MVG<#fP#R%F=Ic@(&Va4dMk$ysM$^Avr1&hS!p=-7F>UMzd(M^N9Ijb|364}qcj
zcIIh7suk$fQE3?Z^W4XKIPh~|+3(@{8*dSo&+Kr(J4^VtC{z*_{2}ld<`+mDE2)S|
zQ}G#Q0@ffZCw!%ZGc@kNoMIdQ?1db%N1O0{IPPesUHI;(h8I}ETudk5ESK#boZgln
z(0kvE`&6z1xH!s&={%wQe;{^&5e@N0s7IqR?L*x%iXM_czI5R1aU?!bA7)#c4UN2u
zc_LZU+@elD5iZ=4*X&8%7~mA;SA$SJ-8q^tL6y)d150iM)!-ry@TI<=cnS#$kJAS#
zq%eK**T*Wi2OlJ#w+d_}4=VN^A%1O+{?`BK00wkm)g8;u?vM;RR+F1G?}({ENT3i=
zQsjJkp-dmJ&3-jMNo)wrz0!g*1z!V7D(StmL(A}gr^H-CZ~G9u?*Uhcx|x7rb`v^X
z9~QGx;wdF4VcxCmEBp$F#sms@MR?CF67)rlpMxvwhEZLgp2?wQq|ci#rLtrYRV~iR
zN?UrkDDTu114&d~Utjcyh#tXE_1x%!dY?G>qb81pWWH)Ku@Kxbnq0=zL#x@sCB(gs
zm}COI(!{6-XO5li0>1n}Wz?w7AT-Sp+=NQ1aV@fM$`PGZjs*L+H^EW&s!XafStI!S
zzgdntht=*p#R*o8-ZiSb5zf6z?TZr$^BtmIfGAGK;cdg=EyEG)fc*E<*T=#a?l=R5
zv#J;6C(umoSfc)W*EODW4z6czg3tXIm?x8{+8i^b;$|w~k)KLhJQnNW7kWXcR^sol
z1GYOp?)a+}9Dg*nJ4fy*_riThdkbHO37^csfZRGN;CvQOtRacu6uoh^gg%_oEZKDd
z?X_k67s$`|Q&huidfEonytrq!wOg07H&z@`&BU6D114p!rtT2|iukF}>k?71-3Hk<
zs6yvmsMRO%KBQ44X4_FEYW~$yx@Y9tKrQ|rC1%W$6w}-9!2%4Zk%Ny<TAeHly^`lq
z`uz(@tSf?IP1!}FM2AhEEL*<QD9uF21TQddiDWz>cTzCB=nb)r6*92_Dg+c0;a%l1
zsJ$X)i<ejw7g(!s&N-W{Lk8iAIV$l&(c0>yYR2iSh|%pIzYV1OUWER&np{w1+RXb~
zMUMRymjAw*{M)UtbT)T!kq5ZAn%n=gq3ssk3mYViE^$paZ;c^7{v<Io({7GJE*iJs
zKNm)`H!_j>XDJ`)q<}QKd2?{r9`X3mpZ{AW^UaRe2^wWxIZ$tuyKzp#!X-hXkHwfD
zj@2tA--vFi<a6!$7^{z2Eh)w`<w!o&KHyBbLcD=R#F`$fGNnpJi#jV@e4N`-*+x6L
za!@FQ`R(YAk_mA+itHQ}nxK&^Y$jx0@B!C-$NxXIXZ*vNQ4AnKKo0-n0&M@@UkOiB
zTQ?VgySXI5)?CEY^smbb#`eaR|MWOXL)QiE7{^~wdv5KVgA<V(Wtd||oOLDWL729K
zT(Vb<*rncSKUj2WF09M5siIorhn$j(+*+ZXx9nP|^L)k;>3o_6B?|I%uwD~emwn0a
z+?2Lc1xs(`H{Xu>IHXpz=@-84uw%dNV;{|c&ub|nFz(=W-t4|MME(dE4tZ<t8nPG~
z1jG5b0iGr=k*ebL+x&Dx6)LQS8#fL;wSEc&rj~w{aU22x>Qi?0CE|4_?O_dyZj1)r
zBcqB8I^Lt*#)ABdw#yq{<v}jjm(o+{?@Gd-ZbW|7Xqrw6{cZ?wxZN}}s{C0(UVzH)
z{O*9gj}@(5h`_BqjPvp&H+m0FK9rYcK0f-Hq~{GCqqg3}!-XPYDI?87O{5_k(0t<B
zvNImVUWCGcMdt-$=K=T2op51NeQL8}@I9{@`N6CF%Q4l*v8V^CDjX@=0E1EIV)|{3
z_akHe)CK^B?!(9GMWsU$L0Z?5?qc~v!*F#<ruSqw?Xay>OtNgf240Jvjm8^zdSf40
z;H)cp*rj>WhGSy|RC5A@mwnmQ`y4{O*SJ&S@UFbvLWyPdh)QnM=(+m3p;0&$^ysbZ
zJt!ZkNQ%3hOY*sF2_~-*`aP|3Jq7_<18PX*MEUH*)t{eIx%#ibC|d&^L5FwoBN}Oe
z?!)9RS@Zz%X1mqpHgym75{_BM4g)k1!L{$r4(2kL<#Oh$Ei7koqoccI3(MN1+6cDJ
zp=xQhmilz1?+ZjkX%kfn4{_6K<s&koWDNpzKV?{*Hr(+CQ<_~vlh*X=FfGisZmsWZ
zH<JVVT^|J=Pz=N+sF?U<<#Ypwm*R}s(F``3IL_PNXD{$n#vnr-`+NNHnVG}EKqYOg
zAiF~x;P|`WLI|qX6}8_WyMJEez7QIaD1~Oubp~oK_9AyX>_D{wb~rdbkh!!k!Z@cE
z^&jz55*QtsuNSlGPrU=R?}{*_8?4L7(+?>?(^3Ss)f!ou&{6<9QgH>#2$?-HfmDPN
z6oIJ$lRbDZb)h-fFEm^1-v?Slb8udG{7GhbaGD_JJ8a9f{6{TqQN;m@$&)t81k77A
z?{{)61za|e2GEq2)-OqcEjP`fhIlUs_Es-dfgX-3{S08g`w=wGj2{?`k^GD8d$}6Z
zBT0T1lNw~fuwjO5BurKM593NGYGWAK%UCYiq{$p^GoYz^Uq0$YQ$j5CBXyog8(p_E
znTC+$D`*^PFNc3Ih3b!2Lu|OOH6@46D)bbvaZHy%-9=$cz}V^|VPBpmPB6Ivzlu&c
zPq6s7(2c4=1M;xlr}bkSmo9P`DAF>?Y*K%VPsY`cVZ{mN&0I=jagJ?GA!I;R)i&@{
z0Gl^%TLf_N`)`WKs?zlWolWvEM_?<CbgD~Ar@tDCfz08xlesxW=Or&R_F}LAGh*f*
zeRy7P_352<%_f8?r!54M@mpe#`9y$f&P^a6GT6G1xUJD}n3a!^njm`lAkUM_#!tkH
zLCTB%d43i$4qrmUaDT91d+}D47!$n!6vKS<&4DrLTsY)udQ!oz-+=?9@$(+JPODqO
zQZ-X~fm3|UiU@a{SW1I<C+#6()>{vVyo(!taG$`FH2bqB`(o50pA=W34kl-qI62lt
z1~4LG_j%sR2tBFteI{&mOTRVU7AH>>-4ZCD_p6;-J<=qrod`YFBwJz(Siu(`S}&}1
z6&OVJS@(O!=HKr-Xyzuhi;swJYK*ums~y1ePdX#~*04=b9)UqHHg;*XJOxnS6XK#j
zG|O$>^2eW<v!qrVmS2A&lq9%ZRv0)daLiHA(j0#qPEItIFWXdNNQVd%29ox<RE|q%
z44BN0CzjTGb1Yq`YaA;q9oyj#+4<u9mO>2ZVczP8#$C`EpcWwPFX4^}$omn{;P(fL
z>J~%-r5}*D3$Kii<wqTU$xY&3*LHoVAL;?+M0qd*!CD;Y^Kb*t?rk@t6k~bNi|Wvd
zTP%fA-5o@BFiE)Pn`~((4J0JRF}}e365*E`&1d}z<<CBzo;6kDO6C|Y_3D(lp5Cn>
z34r@JmMW2XEa~UV{bYP=F;Y5=9miJ+Jw6tjkR+cUD5+5TuKI`mSnEaYE2=usXNBs9
zac}V13%|q&Yg6**?H9D620qj62dM+&&1&a{NjF}JqmIP1I1RGppZ|oIfR}l1>itC%
zl>ed${{_}8^}m2^br*AIX$L!Vc?Sm@H^=|LnpJg`a7EC+B;)j#9#tx-o0_e4!F5-4
zF4gA;#>*qrpow9W%tBzQ89U6hZ9g=-$gQpCh6Nv_I0X7t=th2ajJ8dBbh{i)Ok4{I
z`Gacpl?N$LjC$tp&}7Sm(?A;;Nb0>rAWPN~@3sZ~0_j5bR+dz;Qs|R|k%LdreS3Nn
zp*36^t#&ASm=jT)PIjNqaSe4mTjAzlAFr*@nQ~F+Xdh$VjHWZMKaI+s#FF#zjx)BJ
zufxkW_JQcPcHa9PviuAu$lhwPR{R{7CzMUi49=MaOA%ElpK;A)6Sgsl7lw)D$8FwE
zi(O6g;m*86kcJQ{KIT-Rv&cb<xh&Wr*)^qaS8_<m-r8}#;5p``nC@on*Sdyci5*S#
z!H^!)Y^RgSe5bQ&?NM})S*&|x5=gQJWTS~!7iSjH6ZEQ=2|qv)A@5YFi^70>v_SY4
zpm1|lSL*o_1LGOlBK0KuU2?vWcEcQ6f4;&K=&?|f`~X+s8H)se?|~2HcJo{M?Ity)
zE9U!E<?bzRzfqD8&N2z^brcEaZ$ApuF8fhWCgLooUni}8vY}R!)y(u;5%mHfPQuyy
zVc1v0J_|$in{UeA1fSuNfOw2SY(QVarc?m>KGz2^NgB6Ud;<EcG}{~)9F~!x?l0<5
zBRcLFC~|e8A2j^r1bys;O$kamW)JNBekmtRSD!)NA;NK`f1Bk$Q-1M^^}Rr9r!I$(
zio=s?guBDX%1jZ5ww?E(Vp3B+QOuwHu1=xR^;Ok`#$d_~hAR8wS-3%taDfj9qkrnN
zzn~CxE>?GcV*1xC^1RYIp&0fr;DrqWLi_Kts()-#&3|wz{wFQsKfnnsC||T?oIgUp
z{O(?Df7&vW!i#_~*@naguLLjDAz+)~*_xV2iz2?(N|0y8DMneikrT*dG`mu6vdK`%
z=&nX5{F-V!Reau}+w_V3)4?}h@A@O)6GCY7eXC{p-5~p8x<B^Y3NdHdN@$0=?SS0D
zol0A$d@lfl0#z?4h0ZgCsODi`-TB!Xqo!BDf8%`E2BT9^B59z!@BDBVPpuQhLFL8*
zg9Gt}fwp<SD*kx=;Lg3RQ*6+$^)H+cyLCF;L4LAHo4hXoyH#O=u~lM%GezzBeGqr_
zP>{cH=hNR;Sb{*XloSZ_%0ZKYG<s+(RQ%y79zqm5_Gt<`RqlyTq;ZSlt2Q`%<AjmZ
zg9a;Dwxdehyd#5=Gi3SkQd#(#NtB~`1M&JQ;q{Wp{}FHYkVs^h9M!!ytcl^Pu;$#N
z*L^iiaQBSo@2fi4a$^UveY@Wg|M#r!jwKp745RfACaQRW@h{)8q=me730x!iyv&NL
z7JG+me?z*wI6viGXtAvAsL>=w<|!vy?spR4!6mF!sXMUB5S9o_lh^g0!=2m55hGR;
z-&*BZ*&;YSo474=SAM!WzrvjmNtq17L`kxbrZ8RN419e=5CiQ-bP1j-C#@@-&5*(8
zRQdU~+e(teUf}I3tu%PB1@Tr{r=?@0KOi3+Dy8}+y#bvgeY(FdN!!`Kb>-nM;7u=6
z;0yBwOJ6OdWn0gnuM{0`*fd=C<IH)hs05srASxASix7y%Uxlxf#@}cnsUr%Wm<Z6x
zV%bZMIWKGMja_{8mfWv%3`>(f8ASnH5aNYJjpbY1apTAY$-%)uDi$%2)lpH=#)=HH
z<9JaYwPKil@QbfGOWvJ?cN6RPBr`f+jBC|-dO|W@x_Vv~)bmY(U(!cs6cnhe0z31O
z>yTtL4@KJ*ac85<Q3Il}zP?tq<}UTA3Wgea7T-ps^N_$bmZoEdF0$Y&&%&M94U~Uu
zea9XTspfoT#azJ3d)=3pDbr#kh!4fsTHc;y6X6;EO94`(VE8nf!akMNocI+dyRK(l
zY>u9|=LFST22~!<I%h$N!Lc?!!155>lb>n7IeHs)_(P_gU}|8G>{D_fJX)8BJ;Se?
z67QTTlTzZykb^4!{xF!=C}VeFd@n!9E)JAK4|vWVwWop5vSWcD<;2!88v-lS&ve7C
zuYRH^85#hGKX(Mrk};f$j_V&`Nb}MZy1mmfz(e`nnI4Vpq(R}26pZx?fq%^|(n~>*
z5a5OFtFJJfrZmgjyHbj1`9||Yp?~`p2?4NCwu_!!*4w8K`&G7U_|np&g7oY*-i;sI
zu)~kYH;FddS{7Ri#Z5)U&X3h1$Mj{{yk1Q6bh4!7!)r&rqO6K~{afz@bis?*a56i&
zxi#(<r`B~{i)4VmSjXRcMlY=1yqH0@`5t3;UOa+&F}N=rR!AMqyfw@2Kqr*1Nivr|
zN4zv&Zw_FK<#Ku(Svn(LRH`xnsz8taO+w8kUy@#Bz(ipolEQV(%R2rmdo<-selC(C
zY9mjLtTenRy;b_`oKKXEqfVY4Yh@{qDxnwym*pe|9E}7$`uy~PTL6#Oq*%1Non#9?
zkBo*5CGswwud*ci`{tUf{&*$(C7<s?xK6qjiH2+hi9%)kUXXD|e1@tb&Gg-@wG)fj
zx=pBU;x8a-`W31gNdkUeB5qA`bp(e=73ER{Z{YYy|0PFW;ij$VsS_D4A1a%qXx#zN
zOAB?r0UAPU%;jo97qc^gMW}0o0Q)7HrU8(>Ss6tkU5hDQJ0{4sKfM*ah0f$>WvuRL
zunQ-eOqa3&(rv4kiQ(N4`FO6w+nko_HggKFWx@5aYr}<~8wuEbD(Icvyl~9QL^MBt
zSvD)*C#{2}!Z55k1ukV$kcJLtW2d~%z$t0qMe(%2qG`iF9K_Gsae7OO%Tf8E>ooch
zt<FzPeT7fv_=wLK$<KHZWrqOa!y|59>Aw01`WVv6?*14e1w%Wovtj7jz_)4bGAqqo
zvTD|B4)Ls8x7-yr6%tYp)A7|A)x{WcI&|&DTQR&2ir(KGR7~_RhNOft)wS<+<i@n(
z%=m;q39CPI(p!I%y*a8DF@9T;&f~d@Q_KDHVq;OYl8@@hysfK~9-%@rr9Us3b!fjG
zUseS`Xj_(}irqET+};*9_fd{x71qg(j|a#atoT8YJMX&1P*GCBFu77>vQ*|sf;d>s
zEfl&B^*ZJp$|N`w**cXOza8(ARhJT{O3np#OlfxP9Nnle4Sto)Fv{w6ifKIN<t5YI
z06DC31oPV0(3LP<xDK-}>^f1qO*m8+MOgA1^Du!=(@MAh8)@wU8t=Ymh!iuT_lzfm
za~xEazL-0xwy9$48!+?^lBwMV{!Gx)N>}CDi?Jwax^YX@_bxl*+4itP;DrTswv~n{
zZ0P>@<U$yI%U(i1vv>EB({J9ZJ(^|ptn4ks^Z2UI&87d~J_^z0&vD2yb%*H^AE!w=
zm&FiH*c%vvm{v&i3S>_hacFH${|(2+q!`X~zn4$aJDAry>=n|{C7le(0a)nyV{kAD
zlud4-6X>1@-XZd`3SKKHm*XNn_zCyKHmf*`C_O509$iy$Wj`Sm3y?nWLCDy>MUx1x
zl-sz7^<bWNf%GOz7!u&=pKEKhg7qD$o_bm|<C~_mV-fgujwl8VR%0@_9QkEmZVd}i
z*yfbHTsJ9K)an%7I=r45IH<h<=~Z92Nc6y^L`uyir#rr+w3n~JQOc=kyy{qM3p?Hh
zsUdH22rjCs#ex5zWb_EmnB9l#tdlX=j?>{m(&NUk*%_0(G^>wLDnXW90FzNi$Tu6*
z<+{ePBD`%IByu977rI^x;gO5M)Tfa-l*A2mU-#IL2?+NXK-?np<&2rlF;5kaGGrx2
zy8Xrz`kHtTVlSSl<zq}5Nbctk_J?h>C=nlV4_oCsbwyVHG4@Adb6RWzd|Otr!LU=%
zEjM5s<z$!3(7`^n;D96cx7))3`dKI**dv-%D)^@Ec~JVDFdJf7p@}e6`K&~WZA-My
zMQxvg8tBuq@;bG8cd&k7O1qc3qPxP>Z#Ib4#jF(l!)8Na%$5VK#tzS>=05GpV?&o*
z3goH1co<u1v*m>0YR=)98rPJ~PuHvkA59KUi#i(Mq_$rApn1o&n1mUuZfFLj<DmAK
z6+)wV-J=10Tu)C@w^W^-r~iHrd3AaZ+f@5lqteb9TXQAE!{lK#B^@;wHnDB^jL3o!
zk*cLo!U?X%^*7yqWP$b{0WG`Q8;i`I(?c#J0G@RHRKxCA{i+-bX1NzW@hUI^ZPzP%
zUr>x@3;h`0^|S##QiTP8rD`r8P+#D@gvDJh>amMIl065I)PxT6Hg(lJ?X7*|XF2Le
zv36p8dWHCo)f#C&(|@i1RAag->5ch8TY!LJ3(+KBmLxyMA%8*X%_ARR*!$AL66nF=
z=D}uH)D)dKGZ5AG)8N-;Il*-QJ&d8u30&$_Q0n1B58S0ykyDAyGa+BZ>FkiOHm1*&
zNOVH;#>Hg5p?3f(7#q*dL74;$4!t?a#6cfy#}9H3IFGiCmevir5@zXQj6~)@zYrWZ
zRl*e66rj<pOeNMIq<_tJk1w=b%Kv7$>wksx-)Flr|Kzd#Bg>We+a&E{h7bKSae9P~
z(g|zuXmZ<G0ShMb{lTDxl~b1Q%vCT0il`?Hl`jbgdNk$Z_1<@r2n6%Q=foQt+CQI;
zf<p;9;gs@Nb1IQ~)fg+paEx8oQYE;7j6`eGL^&}{!xBkg+{cfluJk!rr13+0@?5M>
zD<iQeluD&`>?R*MlmoZ##+0c|cJ(O{*h(JtRdA#lChYhfsx25(Z`@AK?Q-S8_PQqk
z>|Z@Ki1=wL1_c6giS%E4YVYD|Y-{^ZzFwB*yN8-4#+TxeQ`jhks7|SBu7X|g=!_XL
z`mY=0^chZfXm%2DYHJ4z#soO7=NONxn^K3WX={dV>$CTWSZe@<81-8DVtJEw#Uhd3
zxZx+($6%4a&y_rD8a&E`4$pD6-_z<lpHF~g4ja?w`|2@>ZJ%LEE*1|!9uOm!kYXW<
zOBXZAowsX-&$5C`xgWkC43GcnY)UQt2Qkib4!!8Mh-Q!_M%5{EC=Gim@_;0+lP%O^
zG~Q$QmatQk{Mu&l{q~#kOD;T-{b1P5u7)o-QPPnqi?7~5?7%IIFKdj{;3~Hu#iS|j
z)Zoo2wjf%+rRj?vzWz(6JU`=7H}WxLF*|?WE)ci7aK?SCmd}pMW<{#1Z!_7BmVP{w
zSrG>?t}yNyCR%ZFP?;}e<OR#MAeqf!aL2HW^LVi;5p!B16$aI26;f)hf83hH<P~~C
z<7%$Qlr!ZcImJ0&B2e(1x$8k|=6Sio*)M-~awK@R!~9$tppqxxXo06FC?E<!H4UL0
z&`0ZTuckFWF`ldXfUu6)m6dGz+JQl+$XLuR1U)I))MapAjG2GMTZw$-;S%+B7j>8_
zRy67~&u11TN4UlopWGj6IokS{vB!v!n~TJYD6k?~XQkpiPMUGLG2j;lh>Eb5bLTkX
zx>CZlXdoJsiPx=E48a4Fkla>8dZYB%^;Xkd(BZK$z3J&@({A`aspC6$qnK`BWL;*O
z-nRF{XRS`3Y&b+}G&|pE1K-Ll_NpT!%4@7~l=-TtYRW0JJ!s2C-_UsRBQ=v@VQ+4>
z*6jF0;R@5XLHO^&PFyaMDvyo?-lAD(@H61l-No#t@at@Le9xOgTFqkc%07KL^&iss
z!S2Ghm)u#26D(e1Q7E;L`rxOy<PI$C^PkUgbiwV;->-N{kJ<E0h+$YMH_c#o7;q=>
zTgfw}az9=9Su?NEMMtpRlYwDxUAUr8F+P=+9pkX4%iA4&&D<|=B|~s*-U+q6cq`y*
zIE+;2rD7&D5X;VAv=5rC5&nP<KfQb#CI1H->$E9Z3HKTqIFCEV%V;b)Y|dY?8yS<c
zQ^K3wf6wb5nq%`45`%RkhwyvuHh<-n<1Yabtk~|&BskdANdKCC@)Pp+;!S+a_O3a?
z@8w&l59PlAWYU`gv{dm!2L<2qZmYl4sMiRs>n|FD?s3IO>VZ&&f)idp_7AGnwVd1Z
znBUOBA}~wogNpEWTt^1Rm-(YLftB=SU|#o&pT7vTr`bQo;=ZqJHIj2MP{JuXQPV7%
z0k$5Ha6##aGly<}u>d&d{Hkpu?ZQeL_*M%A8IaXq2SQl35yW9zs4^CZheVgHF`%r=
zs(Z|N!gU5gj-B^5{*sF>;~fauKVTq-Ml2>t>E0xl9wywD&nVYZfs1F9Lq}(clpNLz
z4O(gm_i}!k`wUo<Fu+Nk#td+~d-kOn&MpWxdqG2(^G<d(n<*23wB91Nscpx^)R;wt
z06$clCh>Kr|H#j#@XOXQ<#eDGJ=eRJjhOUtiKOG;hym-<uW>1Hu)1JYj+Kl*To<8(
za1Kf4_Y@Cy>eoC59HZ4o&xY@!G(2p^=wTCV>?rQE`Upo^pbhWdM$WP4HFdDy$HiZ~
zRUJFWTII{J$GLVWR?miDjowFk<1#foE3}C2AKTNFku+BhLUuT>?PATB?WVLzEYyu+
zM*x((pGdotzLJ{}R=OD*jUexKi`mb1MaN0Hr(Wk8-Uj0zA;^1w2rmxLI$qq68D>^$
z<m^&IWj9%(lhvNtMa#rJad*{7S)-+CQL-f2-C)+{7i>j@)~T1l@K|~@YJ6+@1vlWl
zHg5g%F{@fW5K!u>4LX8W;ua(t6YCCO_oNu}IIvI6>Fo@MilYuwUR?9p)rKNzDmTAN
zzN2d>=Za&?Z!rJFV*;mJ&-sBV80%<-HN1;ciLb*Jk^p?u<~T25%7jjFnorfr={+wm
zzl5Q6O>tsN8q*?>uSU6#xG}FpAVEQ_++@}G$?;S7owlK~@trhc#C)TeIYj^N(R&a}
zypm~c=fIs;M!YQrL}5{xl=tUU-Tfc0ZfhQuA-u5(*w5RXg!2kChQRd$Fa8xQ0CQIU
zC`cZ*!!|O!*y1k1J^m8IIi|Sl3R}gm@CC<U?zR|ZBwq?rHtG3`p*ryc(8M#%e(S{F
zv!WP^+**^(STfEod~InYWU+D4JgiPZdi+w9f{Kg=<Y<QEScW80UsFkc`hMsD{j3G9
zG-x&|-kfr9heULyN?9&6V@;$5Lcq>&;4840^9_bb9%&IZTRk#=^H0w%`5pMDCUef5
zYt-KpWp2ijh+FM`!zZ35>+7eLN;s3*P!bp%-oSx34fdTZ14Tsf2v7ZrP+mitUx$rS
zW(sOi^CFxe$g3$x45snQwPV5wpf}>5OB?}&Gh<~i(mU&ss#7;utaLZ!|KaTHniGO9
zVC9OTzuMKz)afey_{93x5S*Hfp$+r*W>O^$2ng|ik!<`U1pkxm3*)PH*d#>7md1y}
zs7u^a8zW8bvl92iN;*hfOc-=P7{lJeJ|3=NfX{<iq+%&Z>(XRXr;*W3j845SKG&%N
zuBqCtDWj<gc-<xVzIMF+wsn3^_nG5kNttj!O8ncf`+c${^D$t`qdRu_>*>KooINK1
zFPCsCWr!-8G}<sd2$cOBKyp-xL%4`vXP1R=&%+S<`;XzV4Q{{?RO>G)X*QM~34R*k
zmRmDGF*QE?jCeNfc?k{w<}@29e}W|qKJ1K|AX!htt2|B`nL=HkC4?1bEaHtGBg}V(
zl(A`6z*tck_F$4;kz-TNF%7?=20iqQo&ohf@S{_!TTXnVh}FaW2jxAh(DI0f*SDG-
z7tqf5X@p#l?7pUNI<N+*x)cgo?2n>(BGi>n_phw=lDm>2OgHx-{`T>KP2YH9Gm5ma
zb{>7>`tZ>0<F1B4IPQu;s&*$~TOh5fz8m&qy|*d&+r|}(?pA%X-kqlQmHELr`aB2H
zbY~^xkZ|n|pardT>d5K$j|s2!{^sFWQo3+xDb~#=9-jp(1y<M}Wo1&pJp}`3$LOXP
z=4&;;RmG&lXhv6rpeC`|@08=bz+~_N-5B>dI3_&RXGB~rxWSMgDCGQG)oNoc#>)td
zqE|X->35U?_M6{^lB4l(HSN|`TC2U*-`1jSQeiXPtvVXdN-?i1?d#;pw%RfQuKJ|e
zjg75M+Q4F0p@8I3ECpBhGs^kK;^0;7O@MV=sX^EJLVJf>L;Gm<fMNi79Uq~B6-sfM
zJsjTo{C!`MZbQ2@iAkjZZK7p|omNf<WJd9sz^)Z7;9^b_Pq~W|e<@+KNk^~2yu!U;
z#<359_*mC?0KtZ0zK9|xcbUq@*||=Ri_PmC6(tK`n}D*Mp<3s@xlwAY!v71}W_B_i
zFmnBnyL`sF^OyaXImk6jU5FH{px^M|O$K0La9PY<eC^94khC0IpeI8yG&tkllvV>O
z3}EbTcoom7QbI(N8ad!z(!6$!MzKaajSRb0c+ZDQ($kFT&&?GvXmu7+V3^_(VJx1z
zP-1kW_AB&<rD0|*jJZf&fLcm$FXLHgl!|1jXS`w-==%33_e5+ltRuT>_A;cxm*g`$
z#Pl@Cg{siF0ST2-w)zJkzi@X)5i@)Z;7M5ewX+xcY36IaE0#flASPY2WmF8St0am{
zV|P|j9wqcMi%r-TaU>(l*=HxnrN?&qAyzimA<rCgrnDfcQlP~&WQ98B*Pzj-S?%h0
zv9?PJ1qEEo8hEHMMpj$QpOWQVpu7n#e!4YO{l&AFtrK`G@}+E3tAVdpZVATcJOJtg
zpANQKBm~_K6Y7?vdXE$`AKtgK_J^CP!WRptQE7luIRdC^1dqWFgr?f0x%}o5xcG=f
zoFzN{*g2o}$J!#P3!H$3Ky)>@wtf;#^%{$G7i4nXu=Pp2#r@O~wi)zB>@25A*|axl
zEclXBlXx1LP3x0yrSx@s-kVW4qlF+idF+{M7RG54CgA&soDU<A`ao_T7JvjQ4IP|#
z#^YHq&OH6N!A>-3SfHW@-<?y8@^S{uXmy2(<U-!SraYP?<1ZXP=&5D%pAKG_;7>6_
z+*;{n_SixmGCeZjHmEE!IF}!#aswth_{zm5Qhj<EkL7W;9DCd;xlJX7u5jq`<QW{R
z+Q_p7?FUNpgDP63<f>0z-@I<eiLQc7iV>}pR?cu=P)HJUBClC;U+9;$#@xia30o$%
zDw%BgOl>%vRenxL#|M$s^9X}diJ9q7wI1-0n2#6>@q}rK@ng(4M68(t52H_<b*Oz<
zBOLCeuK?jO2vqGpF3!lR>Jc{f&M9NPxRr->vj-88hoI?pvpn}llcv_r0`;uN>wuE{
z&TOx_i4==o;)>V4vCqG)A!mW>dI^Ql8BmhOy$6^>OaUAnI3>mN!Zr#qo4A>BegYj`
zNG_)2Nvy2Cqxs1SF9A5HHhL7sai#Umw%K@+riaF+q)7&MUJvA&;$`(w)+B@c6!kX@
zzuY;LGu6|Q2eu^06PzSLspV2v4E?IPf`?Su_g8CX!75l)PCvyWKi4YRoRThB!-BhG
zubQ#<7oCvj@z`^<FHpmpI|N^Wm}4|L4$E%j_xv%#JtnabJp`0V1{-TS<wEKYj3kGH
z8q#tXtb+mC@R@Pg?ZUfBU*K5FogHmJ^zWF3Jp(psU*W^`SHz^>y&mPhSlbMf0<;0D
z?5&!I?<d3D5RhCB(t`|S#g+{m^H2A7A);*|qE_}!&i2&tGYNT~eXw~SjqGHEb9-G{
z7JIb{(wr5r9ED0-zmlNch=E}bg!prRZ<T&rv~STaVE_DBZo2NN9ech9GpU7A7aZ|m
z)pr&pnd?k2ih~{$%mSws8bGRW#p>nV-jh-j1g~&R(YL@c=KB_gN<hMe!^_T1?JVik
z$-M;`)m|L|=*nZXOChvge)JrfGud=D3UkNP&{TKYU>up$8abPzXZN<MwrLaKTCk(6
zojpV7o$Klw7tt}t1*o5Tl@i3~bC{7E<Ey#`o08U36s93FWKI4+$<X)qDeadZ5Y-uB
zRh6krQ59B?Fv;7HWeZL(r&P<NkFlIHkscFCa}I65L@KfAz+G1+Mk{ZEYeYe#4bYu=
zDIJTw-G?R8c!hEL@OY8IU;GJZSYmH77|o(3$|I`S82+RsO4?Gr!RextMr_2pbp?m@
z%^o`S%?GuFzF=+g@NcC{7Dn0AZuhJk1M{u=?j?C>`N|WLqxlN)ZJ+#k4UWq#WqvVD
z^|j+8f5uxTJtgcUscKTqKcr?5g-Ih3nmbvWvvEk})u-O}h$=-p4WE^qq7Z|rLas0$
zh0j&lhm@Rk(6ZF0_6^>Rd?Ni<A@Fa>-#u1y`;$9tS;~!ph8T7fLlYE{P=XtWfV0Ql
z#z{_;A%p|8+LhbZT0D_1!b}}MBx9`R9uM|+*`4l3^O(>Mk%@ha>VDY=nZMMb2TnJ=
zGlQ+#+pmE98zuFxwAQcVkH1M887y;Bz&EJ7chIQQe!pgWX>(2ruI(emhz@_6t@k8Z
zqFEyJFX2PO`$gJ6p$=ku{7!vR#u+$qo|1r;orjtp9FP^o2`2_vV;W&OT)acRXLN^m
zY8a;geAxg!nbVu|uS8>@Gvf@JoL<dDUIJjK@zOP$OK?$FWS6<_(ndt1tCyAShuf;<
z&#s*IVjSxxRgI~xl{>&GP`2v4s$Y^5vE32&l;2)`S%e#AnFI-YY7_>d#IKJI!oL6e
z_7W3e=-0iz{bmuB*HP+D{Nb;rn+RyimTFqNV9Bzpa0?l`pWmR0yQOu&9c0S*1EPr1
zdoHMYlr>BycjTm%WeVuFd|QF8I{NPT&`fm=dITj&3(<Nxe*9(Jb=CIcpBkiO!>M^q
ze2J{_2zB;wDME%}SzVWSW6)>1QtiX)Iiy^p2eT}Ii$E9w$5m)kv(3wSCNWq=#DaKZ
zs%P`#^b7F-J0DgQ1?~2M`5ClYtYN{AlU|v4pEg4z03=g6nqH`JjQuM{k`!6jaIL_F
zC;sn?1x?~uMo_DFg#y<Bn=xuK?VPe9;vmdGwrT!XQ%tR>pNeie{3udcm~M&bYJ1LI
zE%y}P9oCX3I1Y9yhF(y9Ix_=8L(p)EYr&|XZWCOb$7f2qX|A4a<Ba=u)ZPXqB|lO5
z6`mR<BIo;N!-ok*?N?h8##F_9k9w&*`)nFF{-9+kK56Ati=|ERQoN0`al3#@tF-V7
z*;$W%JxfdtIP*cVQ@E2k<<DRr#B~fMg$2QiUTZHq1vy$b5_QMNyz6fV1W~j}61=^r
z9PkGII-85PK`Y)uUNjw<0GTLl-7+l-KonwbV5#Vdn!-zFYM%G9L_h>J9bl7pt40Xr
zXUT#NMBB8I@xoIGSHAZkYdCj>eEd#>a;W-?v4k%CwBaR5N>e3IFLRbDQTH#m_H+4b
zk2UHVymC`%IqwtHUmpS1!1p-uQB`CW1Y!+VD!N4TT}D8(V0<k0mx_i{u&;TNl+}cB
zM*pK#Nj%b}?FIa-I4>IOL|&R&)Rwj@n8g@=`h&z9YTPDT+R9agnwPuM!JW~=_ya~%
zIJ*>$Fl;y7_`B7G4*P!kcy=MnNmR`(WS5_sRsvHF42NJ;EaDram5HwQ4Aw*qb<IUd
zzF_(TsDi(5YG%<)9eg4ku?>Yn0j;#)bh1lyKLg#dY<pZcY{VS^XH%T(r|b{RS%%sg
zD4+2YjW=HQ3`hZ_nM*B>jN*BMlh+fxmCL~?zB;HBWho;20WA==ci0mAqMfyG>1!HW
zO7rOga-I9bvut1Ke_1eFo9tbzsoPTXDW1Si4}w3fq^Z|5LGf&egnw%DV=b11$F=P~
z(aV+j<vt|7a<AKb09&5Cgbx_6SO#8+Q>8S}m=CkI*8=RcrT>GmuYifP%hCoKY22Z4
zmu}o08h3YhcXx-v-QC??8mDn<+}+*X{+gZH-I;G^|7=1fBveS?J$27H&wV5^V^P$!
z84?{UeYSmZ3M!@>UFoIN?GJT@IroYr;X@H~ax*CQ>b5|Xi9FXt5j`AwUPBq`0sWEJ
z3O|k+g^JKMl}L(wfCqyMdRj9yS8ncE7nI14Tv#&(?}Q7oZpti{Q{Hw&5rN-&i|=<J
zh2JE99r1I1ZNN~7$L~X+GZQ-2f58}UN6{kSp9;B@;1t>fWH`XTQSu~1jx(hqm$Ibv
zRzFW9$xf@oZAxL~wpj<0ZJ3rdPAE=0B>G+495QJ7D>=A&v^zXC9)2$$EnxQJ<^WlV
zYKCHb1ZzzB!mBEW2WE|QG@&k?VXarY?umPPQ|kziS4{EqlIxqYHP!HN!ncw6<FEHc
z&K?*TNY(I3L#5S~`8nm59Z3N%?k%$dAO=2`+h7A2ogGCJ5&pq6*3U^a)?K-(N@XLy
z0T|HP7@jdR@x7^8)?EA8^lOp@Tk&DTko-mg4gPnxe)k^j6DsCpsX6fcuS7n)Dzt)1
zI{FpMvC0kp+4YXmci^AyE|=z9G7d@Deu20}KA|<gHO@h3Ad;t&w{%?mFm@DYwVu~d
zYD~p_kn^{7V3aZT=}NC5yuBOWK+4ehHx(O+V>BKQzKjqk!M&IiOJ9M^wc~ZQ1xoaI
z;4je%ern~?qi&J?eD!vTl__*kd*nFF0n6mGEwI7%dI9rzCe~8vU1=nE&n4d&8}pdL
zaz`QAY?6K@{s2x%Sx%#(y+t6qLw==>2(gb>AksEebXv=@ht>NBpqw=mkJR(c?l7vo
z&cV)hxNoYPGqUh9KAKT)kc(NqekzE6(wjjotP(ac?`DJF=Sb7^Xet-A3PRl%n&zKk
zruT9cS~vV1{%p>OVm1-miuKr<@rotj*5gd$?K`oteNibI&K?D63RoBjw)SommJ5<4
zus$!C8aCP{JHiFn2>XpX&l&jI7E7DcTjz<J5%@V11PSB!<=xP$a0|d9SFwaHDu+(1
z2pzjDSx}t0qEj~`g0vw}cH{qPM}E%$t<(f9<N`_f1)6BOm7%(Yeyz#ow-_$w864f4
zziQv;6{7>uLYvON2{rz<)#$HNu(;ie-5$G<%eLKnTK7QXfn(UR(n+vX%aeS6!q6kv
z!3nzY76-pdJp339zsl_%EI|;ic_m56({wdc(0C5LvLULW=&tWc5PW-4;&n+hm1m`f
zzQV0T>OPSTjw=O<Ijt8jNHn2Y#BhhoWpuNb#x-#WD)zlqQ^Urv6DDU^V`>x&UF^y<
zarsYKY8}YZF+~k70=olu$b$zdLaozBE|QE@H{_R21QlD5BilYBTOyv$D5DQZ8b1r-
zIpSKX!SbA0Pb5#cT)L5!KpxX+x+8DRy&`o-nj+nmgV6-Gm%Fe91R1ca3`nt*hRS|^
z<&we;TJcUuPDqkM7k0S~cR%t7a`YP#80{BI$e=E!pY}am)2v3-Iqk2<jJOy4HE?PC
zx_o31Cky=8=YAV7Kc)z{eIn?kM{+kWAl|1403s<{dW=L_;>qvuAa1YM>xj#bh+H2V
z{b#St2<;Gg>$orQ)c2a4AwD5iPcgZ7o_}7xhO86(JSJ(q(EWKTJDl|iBjGEMbX8|P
z4PQHi+n(wZ_5QrX0?X_J)e_yGcTM#E#R^u_n8pK@l5416`c9S=q-e!%0RjoPyTliO
zkp{OC@Ep^#Ig-n!C)K0Cy%8~**Vci8F1U(viN{==KU0nAg2(+K+GD_Gu#Bx!{tmUm
zCwTrT(tCr6X8j43_n96H9%>>?4akSGMvgd+krS4wRexwZ1JxrJy!Uhz#yt$-=aq?A
z@?*)bRZxjG9OF~7d$J0cwE_^CLceRK=LvjfH-~{S><^D;6B2&p-02?cl?|$@>`Qt$
zP*iaOxg<+(rbk>34VQDQpNQ|a9*)wScu!}<{oXC87hRPqyrNWpo?#=;1%^D2n2+C*
zKKQH;?rWn-@%Y9g%NHG&lHwK9pBfV1a`!TqeU_Fv8s6_(@=RHua7`VYO|!W&WL*x=
zIWE9eQaPq3zMaXuf)D0$V`RIZ74f)0P73xpeyk4)-?8j;|K%pD$eq4j<!_Eg5Fj7~
z{~kt@vNioLj(>2%tL=;&+E91O(2p91K|85b)GQcbRe&u6Ilu@SnE={^{Ix1Eqgv8D
z4=w65+&36|;5WhBm$!n*!)ACCwT9Sip#1_z&g~E1kB=AlEhO0lu`Ls@6gw*a)lzc#
zKx!fFP%eSBBs)U>xIcQKF(r_$SWD3TD@^^2Ylm=kC*tR+I@X>&SoPZdJ2fT!ysjH%
z-U%|SznY8Fhsq7Va<NCYl?(>u%{Ad^Pvbf3IqVk{M2oD+w>MWimJA@VSZC$QooAO3
zC=DplXdkyl>mSp^$zk7&2+eoGQ6VVh_^E#Z3>tX7Dmi<2aqlM&YBmK&U}m>a%8)LQ
z8v+c}a0QtXmyd%Kc2QNGf8TK?_EK4wtRUQ*VDnf5jHa?VvH2K(FDZOjAqYufW8oIZ
z31|o~MR~T;ZS!Lz%8M0*iVARJ>_G2BXEF8<e!khhm}(V(wM<flSyYGD(LFu#N^9{J
z!g@-`Lv*9|t8C1`Xla0}hRlh5WE!q)h^ZA1<Z3nMpzmxC%<6`HpA_wM3Wo81hyIg$
zyo|P6=qr+W2e%+@GQuek<nvSE1DZU=hwvt;@++%YHHpLxqrnon1Tx3eO-EQV6t}dT
zdDfBukzN;Es`@h*aZcPDz|0%4#MlZBZ9G#$>(}6Dmn_rFV~5NI`lJjp`Mi~g7~P%H
zO`S&-)Fngo3VXDMo7ImlaZxY^s!>2|csKca6!|m7)l^M0SQT1_L~K29%x4KV8*xiu
zwP=GlyIE9YPSTC0BV`6|#)30=hJ~^aYeq7d6TNfoYUkk-^k0!(3qp(7Mo<tCl`kM5
z?Ek(b<@BA*_#GXMtqrV<9Z02Y4fU;rfa)6ua|355bK8GVD3cU4C2@c>-$|48d8Z2d
zrsfsRM)y$5)0G`fNq!V?qQ+nh0xwFbcp{nhW%vZ?h);=LxvM<B9s*@<CcsQ7lGjq2
z<14M>(pWd9FG$Bg1;@Bv)mKDW>AP{<DesOudGaS~mf;ws9Qw_p@El?l^^O{pXP>ol
zD(R~mLzdDrBv$OSi{E%OD`Ano=F^vwc)rNb*Bg3-o)bbAgYE=M<u@@wohNtK;?pBm
zx3OCb_06Qz%t}A_;60_wx}hOa`a~8`M)LlQ?(ODVMxtO?*GxV%Ss*wj6$Nb(N*7g=
z1r)g(xt2GL(xCWgF2y~6lKsk7aK1gb2<INsWWl1)ZOF43IVH_RT4rqp5$67iq{q{P
zYx3nO^}deZ&DA&NY*0g7XeEq~?N@ygDvWZ&=nXS#<!#RPHJ{>7Gj2OHY{8#pM${_^
zwkU|tnTKawxUF7vqM9UfcQ`V49zg<kCg6{erwAC-A!+jCbH;Os)I|JYRK_NT)ELi!
zQIW}pBn38&`1;0`=(o~dQ$mN7nI9yNR`QyCTON8+Vs2g(OP$cXZC}o|!gy4dX`ar1
zXJNjfw1fR?B^W%JQyl?CN!Wk0_4q$j!rzhpB$a1foJHhMS}_gvN^5FEE<G`0DO4iR
z^7TP$>78V%W)$#5ssR}Rj7E&p(4_ib^?9luZPJ%iJTvW&-U$nFYky>KJwHpEH<z^~
zb3@6W`7b9t)7fsbF2^%kK0l^TKf&w}J|nleBLx$yhva%hBICdJ!((Nu$|s&ntE>Hx
zVEC;!ETdkCnO|${Vj#CY>LLut_+c|(hpWk8HRgMGRY%E--%oKh@{KnbQ~0GZd}{b@
z`J2qHBcqqjfHk^q=uQL!>6HSSF3LXL*cCd%opM|k#=xTShX~qc<c=nT7tSW~A)V;;
zI%O9Hg|5oAH#(o3omG2dH714hP}4+HxMeamgvLTWoM(P1SM)X|yR*BGm4k<cv$?*7
z&;6*C4bYFno|nr}o!{#P;G;N&=3Ei0o(oz*U%quEG~%GO?vQeCFd%1VWaIM?Ru(q!
zQbq!yIfWTTHdI@a$ST~=W|+(vlOY^PP8^e-e5|AJCmUBw1u30!zs$vHr7<#X^dMcI
z?!;19@D29Kc%9W4&kC>xpHTW*BI!c3`)hQq{@!7^mdUaG7sFsFYnl1%blslM;?B8Q
zuifKqUAmR=>33g~#>EMNfdye#rz@IHgpM$~Z7c5@bO@S>MyFE3_F}HVNLnG0TjtXU
zJeRWH^j5w_qXb$IGs+E>daTa}XPtrUnnpTRO9NEx4g6uaFEfHP9gW;xZnJi{oqAH~
z5dHS(ch3^hbvkv@u3QPLuWa}ImaElDrmIc%5HN<^bwej}3+?g<PhsrYu;dG@tdeX|
zWi*SmxG@K@`*j7e@MMyc0pqWk_fW$${S(v^rifqFkF@F|?uol<q<4*rwfQ4OhSG>)
z-ai7D&6Iq_P(}k`i^4l?hRLbCb>X9iq2UYMl=`9U<p-#+$*%<A7q1!tCG-_U5#~C3
zoyjb3UtO8Gp|Vulu?E}*s1M*Z`(uO;DW1M#jhH>9Rf=3Y!gnJbr?eJqy>Zpp)m>Ae
zcQ4Qfs&AaE?UDTODcEj#$_n4KeERZHx-I+E5I~E#L_T3WI3cj$5EYR75<wZcQxjk&
z+Ix+Wrt)WYDXT`Uy3PFTxxqDG>H7hy%80a8Ej?<na&;?oH?zp^hl<G5zRfFFcvqn9
zOu3Mk>Y6hv+fR6wHN%_0$-xL!eI}fdjOK7(GdFD%`f%-qY@-i@fTAS&ETI99jUVg8
zslPSl#d4zbOcrgvopvB2c2A6r^pEr&Sa5I5%@1~BpGq`Wo|x=&)WnnQjE+)$^U-wW
zr2Kv?XJby(8fcn<Z38Pf_K~F@bHe}$OVF=2rqa<})pAqY(rf8iCU5uhd56_aVbu9(
zm8CX`hx_awRo?In4jq@h)lwtpAcw71s4#g-%M+BaI0#`xN&pf{+VC+M24q^+D^$I>
z8JgPn)2_#-Oh<GE#&GVA;Al214j4t)iH#7I)Vp+BW=ol9z9!)lpaHH0gy}e?AKvQm
z@H*Oa0<4EvSiN-)&rli;Z3sY&uuPwnow9ZH&W{F3T0tN#56j`jtNCh8vvy*<V;vGb
zts-y<c27Dp(I>Z+;72R6PspMfCVvtLxFHeb7d}fo(GRjm_+R(*?9QRBr+yPF(iPO~
zA4Tp1<0}#fa{v0CU6jz}q9;!3Pew>ikG1qh$5WPRTQZ~ExQH}b1hDuzRS1}65uydS
z<W&#rPGcjS6E`aeLaAz?hwO^7JB6?-**5|vBeq}LhaQdxACEm|<aXtZFo#qX*0(Rj
z;I+B#?L3gSQ;jGC*(F3|iKPDsF7?%7uAmb*@ieZc67y7|`{d}D(5|?hkT=oBCM(uH
zfoK!5pcdXhD<BnT^}EF@1f_drf-#P21+ya-hSqk5qq1aXnhWg&5<K)?GLv25qPlMM
zC*N2DH4AR+XtL=y@ul0Kd)!vmH;@n;msgpYxM4Z%Ay5uZOFT?MwmiSsJ5h-9H?Utg
zp~~ItC|V+ZOT57`&3^(+pWzfgs=e2u>~Te*3@?o8fih=mZ`iI!hL5iv3?VUBLQv0X
zLtu58MIE7Jbm?)NFUZuMN2_~eh_Sqq*56yIo!+d_zr@^c@UwR&*j!fati$W<=rGGN
zD$X`$lI%8Qe+KzBU*y3O+;f-Csr4$?3_l+uJ=K@dxOfZ?3APc5_x2R=a^kLFoxt*_
z4)nvvP+(zwlT5WYi!4l7+HKqzmXKYyM9kL5wX$dTSFSN&)*-&8Q{Q$K-})rWMin8S
zy*5G*tRYNqk7&+v;@+>~EIQgf_SB;VxRTQFcm5VtqtKZ)x=?-f+%OY(VLrXb^6*aP
zP&0Nu@~l2L!aF8i2!N~fJiHyxRl?I1QNjB)`uP_DuaU?2W;{?0#RGKTr2qH5QqdhK
zP__ojm4WV^PUgmrV)`~f>(769t3|13DrzdDeXxqN6XA|_GK*;zHU()a(20>X{y-x|
z2P6Ahq;o=)Nge`l+!+xEwY`7Q(8V=93A9C+WS^W%p&yR)eiSX+lp)?*7&WSYSh4i>
zJa6i5T9o;Cd5z%%?FhB?J{l+t_)c&_f86gZMU{HpOA=-KoU5lIL#*&CZ_66O5$3?#
ztgjGLo`Y7bj&eYnK#5x1trB_6tpu4$EomotZLb*9l6P(JmqG`{z$?lNKgq?GAVhkA
zvw!oFhLyX=$K=jTAMwDQ)E-8ZW5$X%P2$YB5aq!VAnhwGv$VR&;Ix#fu%xlG{|j_K
zbEYL&bx%*YpXcaGZj<{Y{k@rsrFKh7(|saspt?OxQ~oj_6En(&!rTZPa7fLCEU~mA
zB7tbVs=-;cnzv*#INgF_9f3OZhp8c5yk!Dy1+`uA7@eJfvd~g34~wKI1PW%h(y&nA
zRwMni12AHEw36)C4Tr-pt6s82EJa^8N#bjy??F*rg4fS@?6^MbiY3;7x=gd~G|Hi&
zwmG+pAn!aV>>nNfP7-Zn8BLbJm&7}&ZX+$|z5*5{{F}BRSxN=JKZTa#{ut$v0Z0Fs
za@UjXo#3!wACv+p9k*^9^n+(0(YKIUFo`@ib@bjz?Mh8*+V$`c%`Q>mrc5bs4aEf4
zh<Qw#XB59EBCIy}qO~a>0qtL1qNE|xQ9<lq2qQRXQzP%-f3f>JrM}qE>X>Y@dQ?%`
zBx(*|1FMzVY&~|dE^}gHJ37O9bjnk$d8vKipgcf+As(kt2cbxAR3^4d0?`}}hYO*O
z{+L&>G>AYaauAxE8=#F&u#1YGv%`d*v+EyDcU2TnqvRE33l1r}p#Vmcl%n>NrYOqV
z2Car_^^NsZ&K=a~bj%SZlfxzHAxX$>=Q|Zi;E0oyfhgGgqe1Sd5-E$8KV9=`!<Ej^
zk5o4<u=$_Fkd{Vr2I?{^3(aR4ULW^oAE_6^yD1xP>3jWZCb2crb;rvQ##iw}xm7Da
za!H${ls5Ihwxkh^D)M<4Yy3bp<-0a+&KfV@CVd9X6Q?v)$R3*rfT@jsedSEho<du6
zg(PNCcOcsfqkTtw6-{GF>V(vqv?R1E8oWV;_<hShMZoBn65&BG1e-bEJ5>{l_+_6=
zLjV^-bZU$D_ocfSpRxDGk*J>n4G6s-e>D8JK6-gA>aM^Hv8@)txvKMi7Pi#DS5Y?r
zK0%+L;QJd<B8$j_NQkI|+16qUl=B)5diU!HzDGfb+#<rX&|O*c0j|cke3p>rIPXS2
ztjWAxkSwt2xG$L)Zb7F??cjs!KCTF+D{mZ5e0^8bdu_NLgFHTnO*wx!_8#}NO^<nc
zI51TnKRCX5z+pZgiN=OO*>mu{FaYeCXGjnUgt_+B-Ru!2_Ue-0UPg2Y)K3phLmR<4
zqUCWYX!KDU!jYF6c?k;;vF@Qh^q(PWwp1ez#I+0>d7V(u_h|L+kX+MN1f5WqMLn!L
z!c(pozt7tRQi&duH8n=t-|d)c^;%K~6Kpyz(o53IQ_J+aCapAif$Ek#i0F9U>i+94
zFb=OH5(fk-o`L(o|DyQ(hlozl*2cu#)Y(D*zgNMi1Z!DTex#w#)x(8A-T=S+eByJW
z%-k&|XhdZOWjJ&(FTrZNWRm^pHEot_MRQ_?>tKQ&MB~g(&D_e>-)u|`Ot(4j=UT6?
zQ&YMi2UnCKlBpwltP!}8a2NJ`LlfL=k8SQf69U)~=G;bq9<2GU&Q#cHwL|o4?ah1`
z;fG)%t0wMC;DR?^!jCoKib_iiIjsxCSxRUgJDCE%0P;4JZhJCy)vR1%zRl>K?V6#)
z<ZsL|t=0vS0e~d;iC8t~$FgkOrRe)+&$;@JN0SQFjq{7NEbG~ZXLVB4UjK8ZIqd31
z)|KqG&AP~`Y<Dj!_d%IGRqexq^$QPjQ=&DmRhR|Zjt;r15!<O(2gN#%x{!wCBKhgr
zA0@lA)n#WD=^^Ex59K1Fzv4}WmXXU^Ot(pVHWi|k2xRy~Cog$~lFV95Lj`BgJv<j+
zGcJ9UnzqzGu;J0+rgd~}XlqzberZm;99&dHu{pyB4l}`J`Vf6kU9+IYF3Rl`k4FJO
z;e|KY?{jpMsyTIcL{9&#z|w<$gn%f7UWcI#Je}v!ebq(lBK6|9`=Xbbb4H)#LOC@Y
zbIR9qr*H;t-<inH&lstwpZS3?N|%5q5^n_o9qy3$T`w`8AyQ5y0#e>2lDi*W3q9rA
zo;yvMujs+)a&00~W<-MNj=dJ@4%tccwT<@+c$#CPR%#aE#Dra+-5eSDl^E>is2v^~
z8lgRwkpeU$|1LW4yFwA{PQ<UD^lv+w60wDFj0NCrRgmJNgpP%2mtPc+2ooe?E8*&M
z!P^QTM@9)_#BU1`#pL~@zVj<E4m*;GDZ|Id^Cycp%s>^A{<M&YZG=-$4LAbg8F2M7
z>5JY!N5PCZ=hog~|FyPPK0-i;fCl4<Kt3Dgzwh1usBK|4V?*cv_Cr+-^F#%1x>a%1
z?&@&E-)b4cK)wjXGq|?Kqv0s7y~xqvSj-NpOImt{Riam*Z!wz-coZIMuQU>M%6ben
z>P@#o^W;fizVd#?`eeEPs#Gz^ySqJn+~`Pq%-Ee6*X+E>!PJGU#rs6qu0z5{+?`-N
zxf1#+JNk7e6AoJTdQwxs&GMTq?Djch_8^xL^A;9XggtGL>!@0|BRuIdE&j$tzvt7I
zr@I@0<0io%lpF697s1|qNS|BsA>!>-9DVlgGgw2;;k;=7)3+&t!);W3ulPgR>#JiV
zUerO;WxuJqr$ghj-<V6kBRXD)Yr4<|Q<mRqYI{@#pRlKNO&^$uItUFB4^q9w2idNq
zAv>veVGfKF?O7si#mzX@GVt+F&atsB@NmBoV4dK|!owGP005$7LN7AqCG(S+={YA-
zn#I{UoP_$~Epc=j78{(!2NLN)3qSm-1&{F&1z4Dz&7Mj_+S<d@cs<O#hAwz^kK=rx
zD+WCjcaOJw^RhLB5KACsXj4V_nP{}BB-G3^bn5T4Oh?x#ZgHp-MDK8yH_aqZL?~uS
z<#QNr5?&I6XuJU&^Bl(I%b5%AgG#VY)wiuYuCQtGWg6{qC4$lk0C5i)3#`*xn;Emz
z1{9Zp^4`m!B}bL9#G`Ni5baUa>dlR^Q<h(f(x4}BRVbDg#B$=~9fy<@O;?tUy74;E
z6zlszrRLc+eC4K27rvmdE~@Pll+z56iaAv-CxG*qGHLW)v+GHpq8&Z_ax^#Yor5Va
z!&`_*6hkG0#A0xU9y8Fif^eTW!Noe+ho!_OV^VBOhY@vwrvzLP@8_45se_tFrgCt`
zGR;|yCP3=*$c9yvF;x@nIoWo})t{YzA)=PcEnyzB{H89<rL0O#g#7AzLsSU8ITD6i
zhuV@HN1#BLqD*@@cFG7Bai$3S{=>5{J=r822d4A@?Rj~xATaWewHUOus{*C|KoH`G
zHB8SUT06GpSt)}cFJ18!$Kp@r+V3tE_L^^J%9$&fcyd_AHB)WBghwqBEWW!oh@StV
zDrC?ttu4#?Aun!PhC4_KF1s2#kvIh~zds!y9#PIrnk9BWkJpq}{Hlqi+xPOR&A1oP
zB0~1tV$Zt1pQuHpJw1TAOS=3$Jl&n{n!a+&SgYVe%igUtvE>eHqKY0`e5lwAf}2x(
zP>9Wz+9uirp7<7kK0m2&Y*mzArUx%$CkV661=AIAS=V=|xY{;$B7cS5q0)=oq0uXU
z_roo90&gHSfM6@6kmB_FJZ)3y_tt0}7#PA&pWo@_qzdIMRa-;U*Dy>Oo#S_n61Fn!
z%mrH%tRmvQvg%UqN_2(C#LSxgQ>m}FKLGG=uqJQuSkk=S@c~QLi4N+>lr}QcOuP&%
zQCP^cRk&rk-@lpa0^Lcvdu`F*qE)-0$TnxJlwZf|dP~s8cjhL%>^+L~{umxl5Xr6@
z^7zVKiN1Xg;-h+kr4Yt2BzjZs-Mo54`pDbLc}fWq{34=6>U9@sBP~iWZE`+FhtU|x
zTV}ajn*Hc}Y?3agQ+bV@oIRm=qAu%|zE;hBw7kCcDx{pm!_qCxfPX3sh5^B$k_2d`
z6#rAeUZC;e-LuMZ-f?gHeZogOa*mE>ffs+waQ+fQl4YKoAyZii_!O0;h55EMzD{;)
z8lSJvv((#UqgJ?SCQFqJ-UU?2(0V{;7zT3TW`u6GH6h4m3}SuAAj_K(raGBu>|S&Q
zZGL?r9@caTbmRm7p=&Tv?Y1)60*9At38w)$(1c?4cpFY2RLyw9c<{OwQE{b@WI}FQ
zTT<2HOF4222d%k70yL~x_d#6SNz<jf^HdwD&L{J-d3=v7wI?_|I`w6EA2t68i{BF{
z)EQpNX+`o98=@oZloFyN=+qL@6>`*%@4++8gYQ8?yq0T@w~bF@a<alqN3`yJL@@%I
z-!3mpm1_(-a|CuGvKuFC432?>OH<Gl`6ts4r*Il$EeI_t-1}<{>L2)T4xj`AVps9k
z?m;<2ClJh$B6~fOYTWIV*<CP2kz|W%>T9y1BpB1*C?dgE{%lVtIjw>4MK{wP6OKTb
znbPWrkZjYCbr`GGa%Xo0h;iFPNJBI3fK5`wtJV?wq_G<_PZ<`eiKtvN$IKfyju*^t
zXc}HNg>^PPZ16m6bfTpmaW5=qoSsj>3)HS}teRa~qj+Y}<vag$>mGRE?cH!qMDBJ8
zJB!&-=MG8Tb;V4cZjI_#{>ca0VhG_P=j0kcXVX5)^Sdpk+LKNv#yhpwC$k@v^Am&!
z_cz2^4Cc{_BC!K#zN!KEkPzviUFPJ^N_L-kHG6}(X#$>Q=9?<xV=cUibF^F`0%02W
zK*fNWZN~J2X?`xv?=%O~94V!1Dndft89rV3kiLkO6nItx5;$Yic)vT@{n=tK*ig`O
zpNV#2ezngUAQIQc4L7@6b%S!?FRKhj@4_x|{7C*ax}=>!{$A(=B3)P?PkxG9gs#l!
zo6TOHo$F|IvjTC3MW%XrDoc7;m-6wb9mL(^2(>PQXY53hE?%4FW$rTHtN`!VgH72U
zRY)#?Y*pMA<)x3B-&fgWQ(TQ6S6nUeSY{9)XOo_k=j$<*mA=f+ghSALYwBw~!E<I$
zf5uM9-(Tq1HOoP;ciR+F!W|NLvHe|&i(w>gn!jtju<E_%<ELnTaP`YpQMwzSK;5`L
z2N@yBMZIhrG=_h4f`DWYsUtB2F=<9g17n)CoE(@92>bOh?6Cb-Zi3IYn*fYl()^3u
zRiX0I{5QaNPJ9w{yh4(o#$geO7b5lSh<5ZaRg9_=aFdZ<ZdoNcG$=Ak<-Uh^|KuL$
zxfbw)_(f!?$*N92fLp+gvrPGsrmR|z`i*z8#EX3RfZ<;6u9~#^5`ZG?Gm#?tyqe~3
zU(qxjoKZ}~(N#fDxuFY{IGt!s{K*!m>jxjXv(_SCv^v-{ZKQFtAA}kw=GPC7l81GY
zeP@0Da{aR#{6`lbI0ON0y#K=t|L*}MG_HSl$e{U;v=BSs{SU3(e*qa(l%rD;(zM^3
zrRgN3M#Sf(Cr9>v{FtB`8JBK?_zO+~{H_0$lLA!l{YOs9KQd4Zt<3*Ns7dVbT{1Ut
z?N9{XkN(96?r(4BH~3qeiJ_CAt+h1}O_4IUF$S(5E<k+cKXH{LrGI$V!$wdwhgw%{
z{z2R?a9ZU}6A=44Z6;8TJo9_V7;Dj5F9lApz_)KRpN@I@H^Ej6<A!>yTyo=`{^16P
z=VhDY!NxkDukQz>T`0*H=(D3G7Np*2P`s(6M*(*ZJa;?@JYj&_z`d5bap=KK37p3I
zr5#`%aC)7fUo#;*X5k7g&gQjxlC9CF{0dz<GIimXH+L0m$k}(|)MoCg-LQZ!roUW&
z@#vAfC~xGv$#p2;AaAnNI)2~unR9tWE|jEFp+&~Jj!yzN)HayrY?G!v<~ZJhmajI(
zwDju%tHqdu03a4YhC5T=92!t9K4VEc&qF;N^+?086`*ga(=*<?3B`ccd6bxhRrx*m
zl*7N7(%gt%$Ggs5x4nz)Pu-AR#W80#Sx7+jnVvao{wS0a!H=rl+Hi|+?E+Gzup+Yr
zFd5x0$^;Fn_tv`e;(a~V0HAa#NeKE?Je6H+2Oj||oGldzFxNp2I42Vd9vc^$4`MpA
zmzBv7fX_pI+vDUHba7mq@_U&v=pCo;&|+_Vc8@1)U=kE|{UBHRf!j29XQ}=|Mfy|V
zXcL)8aw3mK{1>*m2&+mf$Sc1LnyXn9lpZ!!Bl!@hnsE5px};b-b-`qne0Kh;hziNC
zXV|zH%+PE!2@<nl1^b|-jjz|2voKUf{O-_|vpyuHO5YA;etfsh+NkaMB`X`0uju9%
zl2|br2hGk(arkYBFMW`&_=#fAGKhPi;im^6yDnuwMX%+r_oCbGgY;5Bgzpe&D8uzX
zEB8N3@xSrC|Gg-yR5Vp_fMA~tqrP6MLs%ht9(wFtP~mUbq9*a_L<JmpOlb&n%QI4}
zzCT9flT!3=(3{$0uDYu!@>-IrIq!HM2+ld;VyNUZiDc@Tjt|-1&kq}>muY;TA3#Oy
zWdYGP3NOZWSWtx6?S6ES@>)_Yz%%nLG3P>Z7`SrhkZ?shTfrHkYI;2zAn8h65wV3r
z^{4izW-c9!MTge3eN=~r5aTnz6*6l#sD68kJ7Nv2wMbL~Ojj0H;M`mAvk*`Q!`KI?
z7nCYBqbu$@MSNd+O&_oWdX()8Eh|Z&v&dJPg*o-sOBb2hrin<iSW7plL|G_LORk-j
z=MkVNvLwLm8s7^YnKhVL0w(E^!%Pqp1<B;)?;MCtGtza)r^REAwC7bC!!-<2FRsUb
zq-%`r$W8xwY;;&B9o`-`uf_Y*j5bTG#f|)h<#C+;(ZW5RRik<`-iDaOylzPfv>y)<
zd(o&&kZM^<WPRaBm~&BbWOja;1503d52I3H$;ouHLRp1nRC<|4GVJ#ystjK1Y{qr{
zAA%6_R)J6?tbuhNLc794g!3!P2bhP<?GfvkhovqK?$xdl#U1p(tAq>NDtV=hufp8L
zCkKu7)k`+czHaAU567$?GPRGdkb4$37zlIuS&<&<a7CXd^*WtNoR~Unog4)=81tUk
zHS(3+GCF(BMjc_|fVx>1pgArURzoWCbyTEl9OiXZBn4p<$48-Gekh7>e)v*?{9xBt
z=|Rx!@Y3N@ffW5*5!bio$jhJ7&{!B&SkAaN`<?(;?d#D{1OMu!wgZ&lckHwW30JYA
z35U+|6PMRf#_<k|%s<>w+&3x|D^o@s{ZAuqNss8K;211tUWIi1B!%-ViYX+Ys6w)Q
z^o1{V=hK#+tt&aC(g+^bt-J9zNRdv>ZYm9KV^L0y-yoY7QVZJ_ivBS02I|mGD2;9c
zR%+KD&jdXjPiUv#t1VmFOM&=OUE2`SNm4jm&a<;ZH`cYqBZoAglCyixC?+I+<j(65
zK-~G%NA3Mn3+xlM*KKk31w$TsrHl<(?Fr(H1J5fp-?_&aKo7ssQVl}83q$zTi@EjH
z$}(q{YosIaIe8je{MEc08}<!hv)Z@UpRa}L5BVN0_`)s%<if5{I0B@rjt9Izu5-Ab
z%<Ls&-(DO^s=0<Gv7M~`izz9a1S+M#N+cp;{LaQF@#UAsL&LS2Kq9Ca1^^aoHJ+f!
z6SAdKYtI!}mu6of60SXcJMLEqpFX$D;X1>}*ScG#;?SEAFob{v0ZKw{`zw*tX}<2k
zoH(fNh!>b5w8SWSV}rQ*E24cO=_eQHWy8J!5;Y>Bh|p;|nWH|nK9+ol$k`A*u*<gV
z{nhLJW5=5>Y^Uz^%|h4Owu}Cb$zhIxlVJ8XJ0xtrErT<ARN@rbfn@c=))KIFPq0$#
zUwOC+nia-wB{RB`=h19_y^ePOE0l3W0)Hb4ByUIpd*;9Cm;ZDm@jIA0TLS}LfVQH>
zcK;34CB;ohd|^NfmVIF=XlmB5raI}nXjFz;ObQ4Mpl_`$dUe7sj!P3_WIC~I`_Xy@
z>P5*QE{RSPpuV=3z4p3}dh>Dp0=We@fdaF{sJ|+_E*#jyaTrj-6Y!GfD@#y@DUa;&
zu4Iqw5(5AamgF!2SI&WT$rvChhIB$RFFF|W6A>(L9XT{0%DM{L`knIQPC$4F`8FWb
zGlem_>>JK-Fib;g*xd<-9^&_ue95grYH>5OvTiM;#uT^LVmNXM-n8chJBD2KeDV7t
zbnv3CaiyN>w(HfGv86K5MEM{?f#BTR7**smpNZ}<p;5!;Rv}pTcUY7CpX1<o+FAEb
z*|Wc9FQoW&&fdeL$tqZ#_YqX?%NQzVUeb%$DGjxm;3^nR*N?E=JAa)|UZb_;)bgx1
z+Ui3!)I*GC^^cc@!&}<Vx-9bkWu~G47lXqBJ{42oQvvEF|2p*i(^L7&^b#d6E!qDQ
z$$NHTaIU7DVv3j<Mx;jiyO=y07!34A%W=DvI9vUC;s-0@2Z(QCt8^ZCf&gZ6mV3h`
zFkkHO@f4?rXA;i|FB2t`R1vlsK5rAY#H#l#@%wi7x9Vl~eST<9JXv=Guo@U-&X}<v
zU+lE9wm_x;9Pzx=5f+NId1yolHKRr);%|`lxNZ+9*`E5v!F0?Sg=?}3$K4D(hY9km
z84N7YMJsI$r+9^|UDa8GA!x#@s^|t`3T8(=o)mYG_T3iTm01dj`<&adj7=|?WNp(P
z&{~_-YC&V?lNmKZ7rwB46D~V}7|)SZ4a-UyKh5-<(`f`yX)?~2D~+#NadB8`b(PlA
zC5BWG?9_f+?tL8^@Vxnp9bx17ENDM)LS*}&M3uiyiU0KfmHnqu&r;EJMFn<Ya`-f6
ztQ8cqSqDs*LTKwbjh`C)lr0u?VwP0GLFSCbfwNMnQmvukkEe8718n;PP<GIjqZ+h1
zURS11f^(Nr#R=l%akK;;COKmt53Ua%59S|luZx=?9e$SvOa2g8wgX6g0$k0z23#2S
z;%c@L+YY#wTN1dcdExrvBDB%m%vhJBl)wMT-)mqb(^gu_cVO-=A|)hIh8ql_35vrl
z2Dgv_>ftm+gafRSt=6fN$(&?#6m3hF!>e$X)hF<i{_s{{hL>yCF++Qvx(<~q3esTI
zH#8Sv!WIl2<&~=B)#sz1x2=+KTHj=0v&}iAi8eD=M->H|a@Qm|CSSzH#eVIR3_Tvu
zG8S**NFbz%*X?DbDuP(oNv2;Lo@#_y4k$W+r^#TtJ8NyL&&Rk;@Q}~24`BB)bgwcp
z=a^r(K_NEukZ*|*7c2JKrm&h&NP)9<($f)eTN}3|Rt`$5uB0|!$Xr4Vn#i;muSljn
zxG?zbRD(M6+8MzGhbOn%C`M#OcRK!&ZHihwl{F+OAnR>cyg~No44>vliu$8^T!<Qf
zgXuz0!*>>>*vYQJCJg=EF^lJ*3M^=nGCw`Yg@hCmP(Gq^=eCEE1!t-2>%Al{w@*c%
zUK{maww*>K$tu;~I@ERb9*u<AZqk8-p(dr7@aOMUS}L%W8m#j-R|fQ<l%j><JvKV(
zUycd4IRPO7rKe+Z0j@my-wvdG!B!N$SoKtGETGwzrNB+N3QddWE@)@UJiVyqoi1y<
zMuXqiS3}AaVi!`(*i+u~)#9p8rK3}oWK9d--hs=&Ln}c**$3v=2(y<Yr(g;9%ACd9
zEB4ZyDc6d^eKFW?4tTT|9fX46{hb&PW2Y*hYRF*ZRk?-gH99k&OL5OQkYGgw1@T&|
z+solqOc;ok;8FIFt*v4QX^M_pYBRSXW8)QV523pyx&4|HP;(s>U@LsIJ|&@qcb!&b
zsWIvDo4#9Qbvc#IS%sV1_4>^`newSxEcE08c9?rHY2%TRJfK2}-I=Fq-C)jc`gzV(
zCn?^noD(9pAf2M<Lg}g!=|*q%z-+x<ezlUe?h&p^4GF~rgPhb#HtI9QFo=1H!3*gP
z8;=b>P$>ur0;da`>Hr>o>N@8M;X@&mkf;%2A*2CmQBXi<qa(*xDZsE{?TtL>rsJLY
zlX21ma}mKH_LgYUM-->;tt;6F?E5=fUWDwQhp*drQ%hH0<5t2m)rFP%=6aPIC0j$R
znGI0hcV~}vk?^&G`v~YCKc7#DrdMM3TcPBmxx#XUC_JVEt@k=%3-+7<3*fTcQ>f<I
z--I)}0S~iG16i01Qa(n(DfD3M3o^LGxBZRiJ{44=9j~2Ir<C&LEu#+PlU7J``0P;i
zGAIK(ycA~WMu9lFFpPsus&?ZL?t!}e0y3sT<oIrn;T&UMoMgD<c;*f9RhO%zqAJvm
zA6xNV`#MJDgE+>~?TdLjv96nb66xj=wVQfpuCD(?kzs~dUV<}P+Fpd)BOTO^<*E#H
zeE80(b~h<*Qgez(iFFOkl!G<bCqv1|(Tgy2q3|#>!6#9NZAnsxghe$L=Twi^(Q&48
z<P@rIGJ^lLU4XX#J(Ju&)~#HNc##7&|7_I<QM~WbCq}K<^3m{)#t0H3E<~plUj;Pi
zD=Mi>D0ohTj)kGLD){xu%pm|}f#ZaFPYpHtg!HB30>F1c=cP)RqzK2co`01O5qwAP
zUJm0jS0#mci>|Nu4#MF@u-%-4t>oUTnn_#3K09Hrwnw13HO@9L;wFJ*Z@=gCgpA@p
zMswqk;)PTXWuMC-<O;F_LsZQgoO*4uYx_rN7yU*WTdD84cyc{za!fi?n2ya8dvCC$
z*X)^D%Z}4$0b*J!m=xkG!C;lwOHi850Bd>^MQxyNu8_G-i3W9!MLd2>;cM+;Hf&w|
zLv{p*hArp9+h2wsMqT5WVqkkc0>1uokMox{AgAvDG^YJebD-czexMB!lJKWllLoBI
zetW2;;FKI1xNtA(Z<kUUb1?CHJ6dkP5EMnNc01l%J_3`C(|0$pVWg0+f<i$@RyNIB
z)>Wys!_un~+834+6y|uV&Lo%dKwhc<mg?zA&-#2Kkx5WdT~cW!HF|`={LZ0!67tVb
zSB-{=B&TRRqT@ILaqY0(qV0T=!cQ^r6OJ!lrbiH)V3A&s-#l|(qTb-|Y0|v@f}<=U
zaISF!8M>oDzRADYM*peh{o`-tHvwWIBIXW`PKwS3|M>CW37Z2dr!uJWNFS5UwY4;I
zNIy1^sr+@8Fob%DHRNa&G{lm?KWU7sV2x9(Ft5?QKsLXi!v6@n&Iyaz5&U*|hCz+d
z9vu60IG&ltv6+^ZmBs_aN!}p|{f(ikVl&LcB+UY;<E(~5^w&@sh<A7wBgK&zXm|WW
zp`m%DBx0|`ej6fx2Z)?DslW_i0VVS4v9QJUI!gOq@(CqTRW!o7vX<@bg{froQt|ge
z#g+@C{Z`$-p1U!c-8%bdIcod1vRD_C0j#vcXI52Z2ad*7V)4<9ajM}|;bqs}>PPz*
zj84Tm>g5~-X=GF_4JrVmtEtm=3mMEL1#z+pc~t^Iify^ft~cE=R0TymXu*iQL+XLX
zdSK$~5pglr3f@Lrcp`>==b5Z6r7c=p=@A5nX<E9Dn2IFi8c$6hIRSUL`c_y)Ujd!z
z(!-vTu-S5b<wA?ARXlMvy`TQA0B?t<8}u*spceZs(kI5>NacsPfr(5m;~ks@*Wu7A
z%WyY$Pt*RAKHz_7cghHuQqdU>hq$vD?plol_1EU(Fkgyo&Q2&2e?FT3;H%!|bhU~D
z>VX4-6}JLQz8g3%Bq}n^NhfJur~v5H0dbB^$~+7lY{f3<iahwU=HYn_kI+fKJkjT=
z!G=Olq(%<s6}~fLl>ES}E?|JnoLsAG%<m|*x-GMp`iZ9{M+4{@C5qEtmAhToUY3Xp
zCBs%867Y1LaclE)smx@$XT22AE~wUN)II#h-9*)q?CyT@UNa{=6%da9GS)Kf=?4Mk
zm5Y4n-*bpFaVoPiF})!;M-c55fD|qCxc&Uo6I8pg*#R#@_)A7$%mj&8J>l^%eu_PM
zEl0W(sbMRB3rFeYG&tR~(i2J0)RjngE`N_Jvxx!UAA1mc7J>9)`c=`}4bVbm8&{A`
z3sMPU-!r-8de=P(C@7-{GgB<5I%)x{WfzJwEvG#hn3ict8@mexdoTz*(XX!C&~}L*
z^%3eYQ8{Smsmq(GIM4d5ilDUk{t@2@*-aevxhy7yk(wH?8yFz%gOAXRbCYzm)=AsM
z?~+vo2;{-jkA%Pqwq&co;|m{=y}y2lN$QPK>G_+jP`&?U&Ubq~T`BzAj1TlC`%8+$
zzdwNf<3suPnbh&`AI7RAYuQ<#!sD|A=ky2?hca{uHsB|0VqShI1G3lG5g}9~WSvy4
zX3p~Us^f5AfXlBZ0hA;mR6aj~Q8yb^QDaS*LFQwg!!<|W!%WX9Yu}HThc7>oC9##H
zEW`}UQ%JQ38UdsxEUBrA@=6R-v1P6IoIw8$8fw6F{OSC7`cOr*u?p_0*Jvj|S)1cd
z-9T);F8F-Y_*+h-Yt9cQQq{E|y^b@r&6=Cd9j0EZL}Pj*RdyxgJentY49AyC@PM<<
zl&*aq_ubX%*pqUk<d&T)k$&QNZfp(|Cb2%8i0YEcTjvj-RgK5CL$)Y5!Gt2!HySoP
zT8o4B%jNuL=B9zzEgfm{Mb?o&hv8oZ23P?8#cPog3B2>Q^Zsi@DqhIeR&Ad)slJ2g
zmeo&+(g!tg$z1ao1a#Qq1J022mH4}<yCVa+=!u;i&p#L=@l2run=dXr&`<MdG!0uP
zOjR(_gdx?R+v9}kn9*V3BI@qouQggPg+gX=j#<eJ*Oct3B81mWQaR)i8KrWJUa<~j
zH}ISScU_b8^UsBTWvLQP#%v3g=zJo=qgoI6O1IF^uIuSk@h;u+=p0N|&+n7SiTHP=
znh!q^B=QI=Afhds8Xc3IBb&oSVP)a{oQ|RsJ4-0f&DnSt`!jlYq@VF;3B$n%$EKYm
zM)4=1ICa4xGeF=7ENVtl+{>y?AvWboI4H028;trScqDQrB36t!gs|uZS9}KG0}DD$
zf2xF}M*@VJSzEJ5>ucf+L_AtN-Ht=34g&C?oPP>W^bwoigIncKUyf61!ce!2zpcNT
zj&;rPGI~q2!Sy>Q7_lRX*DoIs-<GJgR>1Cei=Cd=+Xv4=%bn#Yqo@C=V`|QwlF0Y-
zONtrwpHQ##4}VCL-1ol(e<~KU9-ja^kryz!g!})y-2S5z2^gE$Isj8l{%tF=Rzy`r
z^RcP7vu`jHgHLKUE957n3j+BeE(bf;f)Zw($XaU6rZ26Upl#Yv28=8Y`hew{MbH>*
z-sGI6dnb5D&dUCUBS`NLAI<dcpgZY(!7=6iu-5Qc18hq0Ke2(NqTe$N7L1I2YCFRt
zv9;7B5t5)<gXqz+zm0+om3w%Th<1MrH4$kYwi4}<^CmDvI!AXzBC)c=;I?2vo?qUH
zI7RCd+iJ`!%`3E6YLqL?Dq5O!R%5Taum7>BP!Vi!2+~=AU+)^X^IpOEAn#+ab=`7c
z%7B|mZ>wU+L;^&abXKan&N)O;=XI#dTV|9OMYxYqLbt<hE1&0?n=d+5=woK=C(A<a
z7welXXh>T#GY8PP$45Rm2~of+J>>HIKIVn(uQf-rp09_MwOVIp@6!8bKV(C#(KxcW
z;Pesq(wSafCc>iJNV8sg&`!g&G55<06{_1pIoL`2<7hPvAzR1+>H<s}_O-ao=SvG-
zjFXtM*#J9rhL%)x!7vD5=#n(4L%k%+>6Rx0Ra%4j7H-<-fniv<!CaYAS_mQ9Mc*WN
z4Ms*^s+V%(u(dyyJ3i9jRvRMYDSnp<g3O9RsDo6=4)GC-F+1)8I|lx?Y?=g17O$~z
zi<%s~!uHz^6qH(B`9!<Pl4_1}<3b7FssomJk#N08YiNdJT-nIr9JQbw9UttzsK&s-
zlZt<MeW;p#>ydlm{TBr06;J-Bq8GdE^Amo)ptV>kS!Kyp*`wUx=K@{3cGZnz53`+C
zLco1jxLkLNgbEdU)pRKB#Pq(#(Jt>)Yh8M?j^w&RPUueC)X(6`@@2R~PV@G(8xPwO
z^B8^+`qZ<KUJR&Xtfi6*#7-r5sG^bvk;e-2D`|42-tR1@KStt@dv7<kC7LRnTZeRz
zFLPQb`|-OWFMWGH$!vBgb&&I*lv6kKslTD^XNmYc2{n~;FG4Z@;&<e`m!STD^{R6-
zfcnTWyXX&@!^gC=0{voz4C;bU5NDmZ@HNK%2HsR?KG_P6U{`DGbn{yu$o&d!p#pcW
z3w<r}D^?fgH>nQr$8AJ7<06J**+T8xIs)XCV6E_3W+al18!ycMqCfV>=rW0KBRjC*
zuJkvrv;t&xBpl?OB3+Li(vQsS(-TPZ)Pw2>s8(3eF3=n<!5a}32=BrvY8hRC?^3AN
z4C#4sh@e(P0B}6-%sp`f3<V@o^>*i0uqv@RM^T#Ql7(Em{(~%f2Fw|Reg@eSCey~P
zBQlW)_DioA*yxxDcER@_=C1MC{UswPMLr5BQ~T6AcRyt0W44ffJG#T~Fk}wU^aYoF
zYTayu-s?)<`2H(w+1(6X&I4?m3&8sok^jpXBB<|ZEN<gyY~yI|1dK#d1ZvN0Oo3Ca
zoj#Cv_@8;zMT)C7vp<n|PPNt`LjaBNa!MK!xoz@n-u#sE;6ei7XrKz^UAFO2%cFHv
zt7T8<A4GH=Xkk#lnS6s<Cs$OEqzT0+M<>so#?v@<uS+g3`9Ml{DZk(iz^Tl|_3=2b
zE!Nfak>R1^DdVvKoD?}3%@{}}_E7;wt9USgrfR3(w<E1|9flh%-{UXazu4s1$(DQK
zN<r2XPSwsHbRDsG*?D0NJ5IxLAFElrdJXd6x8es*+v9FGSzo*cpk%vfPchQOAX@7q
zSec`^jA!MQzr=fXU4=_h;=sKScF5zr7F~SjJ1m~S8;gvMdKPOF<hW2L)Gn#M8wWLs
zi4j|tixz>abPRhJ{#1es81yP!o4)n~CGsh2_Yj2F^z<H<d&6Yzw~*C9KqQy2y_JQR
z1~bp-2FztHE)kbYO=Y=#xt1zdRZFFE&5egMvK#0DmHHAwkL8e323HAmUyZuC{_Gmx
zTq5Cz!-+s+IHSqI==bQr9<mv7(2^~Efy;nh5TY44ft#rP6`5U}H!CWvewRj;SH>|t
zk((i&%nDLA%4KFdG96pQR26W>R2^?C1X4+a*hIzL$L=n4M7r$N<l--6`3kSFs<=;4
z!c^QLP)jG)P%~U>OTQEo+k|2~SUI{XL{ynL<b1<?(%S>SCPe%gWMMPFLO{&VN2pom
zBUCQ(30qj=YtD_6H0-ZrJ46~YY*A;?tmaGvHvS^H&FXUG4)%-a1K~ly6LYaIn+4lG
zt=wuGLw!%h=Pyz?TP=?6O-K-sT4W%_|Nl~;k~YA^_`gqfe{Xw=PWn#9f1mNz)sFuL
zJbrevo(DPgpirvGMb6ByuEPd=Rgn}fYXqeUKyM+!n(cKeo|IY%p!#va6`D8?A*{u3
zEeWw0*oylJ1X!L#OCKktX2|>-z3#>`9xr~azOH+2dXHRwdfnpri9|xmK^Q~AuY!Fg
z`9Xx?hxkJge~)NVkPQ(VaW(Ce2pXEtgY*cL8i4E<sguof7NQOg%gRLdrSvBO-7DGI
zS3O?*>)mM(iz_vdm|f@%cSb*Lw{WbShh41VGuplex9E^VvW}irx|;_{VK=N_WF39^
zH4<*peWzgc)0UQi4fBk2{FEzldDh5+KlRd!$_*@eYRMMRb1gU~9lSO_>Vh-~q|NTD
zL}X*~hgMj$*Gp5AEs~>Bbjjq7G>}>ki1VxA>@kIhLe+(EQS0mjNEP&eXs5)I;7m1a
zmK0Ly*!d~Dk4uxRIO%iZ!1-ztZxOG#W!Q_$M7_DKND0OwI+uC;PQCbQ#k#Y=^zQve
zTZVepdX>5{JSJb;DX3%3g42Wz2D@%rhIhLBaFmx#ZV8mhya}jo1u{t^tzoiQy=jJp
zjY2b7D2f$ZzJx)8fknqdD6fd5-iF8e(V}(@xe)N=fvS%{X$BRvW!N3TS8jn=P%;5j
zShSbzsLs3uqycFi3=iSvqH~}bQn1WQGOL4?trj(kl?+q2R23I42!ipQ&`I*&?G#i9
zWvNh8xoGKDt>%@i0+}j?Ykw&_2C4!aYEW0^7)h2Hi7$;qgF3;Go?bs=v)kHmvd|`R
z%(n94LdfxxZ)zh$ET8dH1F&J#O5&IcPH3=8o;%>OIT6w$P1Yz4S!}kJHNhMQ1(prc
zM-jSA-7Iq=PiqxKSWb+YbLB-)lSkD6=!`4VL~`ExISOh2ud=TI&SKfR4J08Bad&rj
zcXxMpcNgOB?w$~L7l^wPcXxw$0=$oV?)`I44)<JMS4}agV%F-fd(U+D?%r$HJL8tR
zZ|WRb%@dpQ>}b#ChS`_lBQhvb6ks?HDr3tFgkg&td19?b8=!sETXtp=&+3T$cCwZe
z0nAET-7561gsbBws$TVjP7QxY(NuBYXVn9~9%vyN-B#&tJhWgtL1B<%BTS*-2$xB`
zO)cMDHoWsm%JACZF--Pa7oP;f!n%p`*trlpvZ!HKoB={l+-(8O<V(1>;;eYv2A=ra
z3U7rSMCkP_6wAy`l|Se(&5|AefX<e<<L?*i-$3llc;BJHP2Z`%@UcH8K+jjUQa_H)
zZ{{@x^(8x!X_~&13~X9vpfX2=1%Hk)JCn2(i;EMa;!fvyd)s?!9dsx%T`owieu}#K
z*oxD5D1UZ|q%+yL3ecJ_0i^?{)&t5IOz%S{pz$ec76=a$(9EIvj!>vV1E#XA(LT!%
zjj4|~xlZ-kPLNeQLFyXb%$K}YEfCBvHA-Znw#d<Fa2jr$=3<A6i+`6mg?g|noKx7k
z>ZSI6V%3YD{Wj2@utT5Hieyofp6Qi+lz!u)htnI1GWzvQsA)baEuw9|<N0=K880Kh
zi{>+&(E@p8M+#&fsX@Kf`_YQ>VM+40YLv`3-(!Z7HKYg@+l00WGr779i-%t`kid%e
zDtbh8UfBVT3|=8FrNian@aR3*DTUy&u&05x%(Lm3yNoBZXMHWS7OjdqHp>cD>g!wK
z#~R{1`%v$IP;rBoP0B0P><;dxN9Xr+fp*s_EK3{EZ94{AV0#Mtv?;$1YaAdEiq5)g
zYME;XN9cZs$;*2p63Q9^x&>PaA1p^5m7|W?hrXp2^m;B@xg0bD?J;wIbm6O~Nq^^K
z2AYQs@7k)L#tgUkTOUHsh&*6b*EjYmwngU}qesK<d|*nxGE!skUEa?2q+~9=HMX8<
zuXaat_);B+IL4LA-S=9UxBZ<MCc!yRFT5S**cQlA@4z_3Ud!AJNr*1i(jbfPa`oC*
zJ194qXx@Z)q#v~6Z{&t=gz02-VHqZLy;1x<?uSB)OfE0`P<ox<@h%Guq@9u6_CP*r
zaS}*H$;mQm5@Z)$BhqJHMGrmBe2Gnn*GG6Yg!`k5_idhjMliK`p_*KJ*YS+%hPu|m
zS(p~zyHY*PLrLrlEQw4{Ir7&kM$w;0GZC<u@|)Afk|uZ1eQ~N;<+V5>YPWxU-z_D>
zDWr|K)XLf_3#k_9Rd;(@=P^S^?Wqlwert#9(A$*Y$s-Hy)BA0U<SN|ZiuVVa{}$)l
zP#rtvCqNjO%M<>0+Y58zs~h=YtDKxY0~BO^0&9{?6Nny;3=l59(6ec9j(79M?P1cE
zex!T%$Ta-KhjFZLHjmPl<aNxtz<W!?<d(Kowf4Uh#*6oBDQ0!2I=O-3Z(CRK8d_dM
z3ifkJ`(B)Auk0s${T3AnCcB>_D=NhJULC}i$}9Qt?nm6K6-i8&X_P+i(c*LI3mtl3
z*B+F+7pnAZ5}UU_eImDj(et;Khf-z^4uHwrA7dwAm-<fwXXbyLBQ6-Lb4X~UA<>e4
zwP1$Ov3NP5<H4vTX}YvsDkyWKX=lhbP*ZpPEDvU$c%f0fDBeIk370F4qcBO(NyMjY
zP5V#d2220)Q_6OiMuB``k0T`%OOrd2!Xg_jt;>ts+e(SvM)u!3aZMuFQq@KE-W;K6
zag=H~vzsua&4Sb$4ja>&cSJ)jjVebuj+?ivYqrwp3!5>ul`B*4hJGrF;!`FaE+wKo
z#};5)euvxC1zX0-G;AV@R(Z<YD0v@dv*<`K@6_1R(N$P@bwRt=(LlO7wV!mXo`;Ql
zKH{!AD}PSe>Ml=q_~u8mQ5<o{2A0r}^7<v0c74kSlzA>OYl;@BAkt)~#PynFX#c1K
zUQ1^_N8g+IZwUl*n0Bb-vvliVtM=zuMGU-4a8|_8f|2GEd(2zSV?aSHUN9X^GDA8M
zgTZW06m*iAy@7l>F3!7+_Y3mj^v<Kk%GW)gV5g57O?d~<fQ=$BRJ*Z&lWiA2(Gzds
z&guJj^wK({Av26-cltudcPw|&diiaFL`tikZN5GH{>jBsAux3$%U#d$BT^fTf-7{Y
z_W0l=7$ro5IDt7jp;^cWh^Zl3Ga1qFNrprdu#g=n9=KH!CjLF#ucU5gy6*uASO~|b
z7gcqm90<FT5tF8zu($CX*#gY(`4MVtsIuNPeD<)ytmvDveTCxn)=F&9P56=w7<$hK
zcd3_GuL$Dw5pIP9Cm8}-qqz&Vm@u;dd`N{B&hI=3f*2{qJ^}|Ir#nKo=tr!<W^79(
znCQhNC>K@rqe({P>;ww_q%4}@bq`ST8!0{V08YXY)5&V!>Td)?j7#K}HVaN4FU4DZ
z%|7OppQq-h`HJ<LvJ#=vT_aHFAs(S9cPmYk9ELh>;rw-B<Np9#k_xc?Qh@dU*1YlG
zX78eBZ}hi$V};V9^^7bm7mM9?ubmjFmFlqkbOP~N9P@_+YRbaA5AupJe)x$^>AfH*
z1H$ufM~W{%+b@9NK?RAp-$(P0N=b<(;wFbBN0{u5vc+>aoZ|3&^a866X@el7E8!E7
z=9V(Ma**m_{DKZit2k;ZOINI~E$|wO99by=HO{GNc1t?nl8soP@gxk8)WfxhIoxTP
zoO`RA0VCaq)&iRDN9yh_@|zqF+f07Esbhe!e-j$^PS57%mq2p=+C%0KiwV#t^%_hH
zoO?{^_yk5x<EP{(Nmu?k_{&CvoSvH+m35b4;k*@F4%uHG8n;vQXZEs8;H`=3M^<!+
zAF2+KeH0jm5WeFD=~3#eZPU0-?Mc_EUIy+m&O^$e=4mn-^>~S)haR6akK6d|#2TN&
z<UyU^nWn4vS%tT@7!7R?UFGf<`b8m5vr8L@4bVy-Hv8Hkjj&tm3-y&oF_kk=29n!w
zUQ5*&K}=NDTkxgnIm)V*uIi_7VDE3<Pky@6R<WO~q{_Apg0A~vpG1BJ@b9yGHaLW5
z&PHmiop(tGoU-@O+AyAdyaBDUZ?pPtlv?^t(d&rOLAxqFD_KK5C!E76qKq{8>fWcN
zc7QAWl)E9`!KlY>7^DNw$=yYmmRto>w0L(~fe<qA#x#J~BdDDoFVAqMf0R3=s}om$
z^o-zv?gQwoe3nsejaY%|TLZ)q*(meDEHHK%c>?|n6k2TBsyG@sI)goigj=mn)E)I*
z4_AGyEL7?(_+2z=1N@D}9$7FYdTu;%MFGP_mEJXc2OuXEcY1-$fpt8m_r2B|<~Xfs
zX@<HEA$9lItMV#MhzG*94GQsnY_)I5NDd$El|v`hkZpxxby8m&L&V~05Uw2?#zy^k
zu~z!rFYeO?u=xsr&9nT@TImm)f4O>3RQi`E-1}^9N{$(|YS@#{ZWuCxo)<O@eB3mN
zQkPy}Yk)q@O>91{k>ESD54g_LYhm~vlOK_CAJHeYFfuIVB^%cqCfvpy#sU8Do8u}#
z>>%PLKOZ^+<U?QnyE^(kM9~zL!A4vIx&Ao6f(4QqN&}%!*@LQyHN*lY2WtDww=Aez
zZcfR3<ZO?`J-mU-d(L$=CapFRT;YrYNX5pgZ9yY_+=}AgInL+|o!@$$Ef5vknKlQV
zH$#`yTBTbL(Q{4^_UiZ99jmW0-B2l%sc8~e_Eg^rrOXE%r&^!UgY6Q}t8+kJk^6x1
zZIp-*e5SW!r)n9bMLV^9rIS;~+<bvviis)`WQ^vlRrWyLbnLE6FsRr$)?DYJJLlP<
zke_5!&X5xrO(`LVVinqvZ8E3@Ha4lT>$H54o@brtL-hHorSKcsjk_ZibBKBgyHt~L
z=T6?e0oLX|h!Z3lbkPMO27MM?xn|uZAJwvmX?Yvp#lE3sQFY)xqet>`S2Y@1t)Z*&
z;*I3;Ha8DFhk=YBt~{zp=%%*fEC}_8?9=(-k7HfFeN^GrhNw4e?vx*#oMztnO*&zY
zmRT9dGI@O)t^=Wj&Og1R3b%(m*kb&yc;i`^-tqY9(0t!eyOkH<$@~1lXmm!SJllE_
zr~{a&w|8*LI>Z^h!m%YLg<I%^0D=yBrcQ)(ktHG~0}=?ePb$PhlnOGF2Ug8*ZZ{R7
zcLKM=s94mKe}Zl2bn)$MnqyGG!Yy)tAp+?D%G3iK$<{flF%NB@cViwk=%}6|-fH)$
zGVw^WK-`7r`?eI^bu#t^uDF6xWFr@zQR_g;-teodQML!;Lm$7-mq;R#U|sZE$xvd-
zW|4u{daK6_$UxNeQX6>Kv06Js7j7RaoX}ZJGYirR<#4Mghd{#;38j3|V+&=ZUq#1$
zgZb-7kV)WJUko?{R`hpSrC;w2{qa`(Z4gM5*ZL`|#8szO=PV^vpSI-^K_*OQji^J2
zZ_1142N}zG$1E0fI%uqHOhV+7%Tp{9$bAR=kRRs4{0a`r%o%$;vu!_Xgv;go)3<NX
z8?ZW_hSi5XeMP}>!B#;hC5qD-bcUrKR&Sc%Zb1Y($r78<t~mJDze)?H_8G72%B5SF
zoo^RdbPfgRZQcwGs;=5)g0IrAOjfNl$n&${XA%054veV=^L=omf#+k11Be9Nwj3>T
z=eG`X#IpBzmXm(o6NVmZdCQf6wzqawqI63v@e%3TKuF!cQ#NQbZ^?6K-3`_b=?ztW
zA>^?F#dvVH=H-r3;;5%6hTN_KVZ=ps4^YtRk>P1i>uLZ)Ii2G7V5vy;OJ0}0!g>j^
z&TY&E2!|BDIf1}U(+4G5L~X6sQ_e7In0qJmWYpn!5j|2V{1zhjZt9cdKm!we6|Pp$
z07E+C8=tOwF<<}11VgVMzV8tCg+cD_z?<utDGQoIWXP!X*!uFuP$(UYD82a)BKj6T
z_JtF4i*iOP*CZuX6hFb3zZ*6>u+$sBjwPXl^(Ge7y8-=c=fgNg@FxI1i5Y-HYQMEH
z_($je;nw`Otdhd1G{Vn*w*u@j8&T=xnL;X?H6;{=WaFY+NJfB2(xN`G)LW?4u39;x
z<VSBI+@Zkx3L@Zq0&L-$wBk+@2lBX_bujF&Ih>6?eSh3Wc@LR&yA2tJj;0{+h6rxF
zKyHo}N}@004HA(adG~0solJ(7>?LoXKoH0~bm+xItnZ;3)VJt!?ue|~2C=ylHbPP7
zv2{DH()FXXS_ho-sbto)gk|2V#;BThoE}b1Ek<DHcS#oE(%zA67@W3(m?ZI2jR^Dy
z7PWe9(1BH46K_kY-wC8US0M42sz$z_*IF)ZiBh^wmpYpj3UA^BKgIPymw8PO!{L4y
zK$YyHwkvhSph@bCkQVjSShWQQjJl>NYGT8U#0ItdHG>vOZx8JYN*5jUh5Fdr9#12^
zsEyffqFEQD(u&76zA^9Jklbiz#S|o1EET<jL4DDb0rod~uwU)f`Vg?fRrOIhbRPOD
zx93iI2NWoen?oVqD9_meBamm&CC~_EcHQatSXm5I3PCG$m<Zdn;PzW(n25CYgn-H2
zt%WwC3AbumUjld7ubD4uXC63nOvZ*W%_ur_G~<czPz!ui$_<@n9U2KEn@Njn!E<-$
zL9~)j$Z?wF<nN}$!ZjNQY{W?%gai;BdQAuGK|ZLxMoa1?-F2`+?YG5>$ujLJAVDYF
znX&4%;vPm-rT<8fDutDIPC@L=zskw49`G%}q#l$1G3atT(w70lgCyfYkg7-=+r7<t
z)IYQs_O{*>$%E`G?1NjiH)MvnKMWo-ivPSQHbk&_l5tedNp|3NbU^wk0SSXF9ohtM
zUqXiOg*8ERKx{wO%BimK)=g^?w=pxB1Vu_x<9j<dBFNP<FHQd-jrwlUA1|~FTarXL
zya7h81TgadkGbxzefOD)69CBo#P7z=%YlV~VX{b6_{yeawTQ6%;vog0V)4R~w1n;$
z!v)Z4&O>KOcU7N;(!o3~UxyO+*ZCw|jy2}V*Z22~KhmvxoTszc+#EMWXTM6QF*ks%
zW47#2B~?wS)6>_ciKe1Fu!@Tc6oN7e+6nriSU;qT7}f@DJiDF@P2jXUv|o|Wh1QPf
zLG31d>@CpThA+Ex#y)ny8wkC4x-ELYCXGm1rFI=1C4`I5qboYgDf322B_Nk@#eMZ%
znluCKW2GZ{r9HR@VY`>sNgy~s+D_GkqFyz6jgXKD)U|*eKBkJRRIz{gm3tUd*yXmR
z(O4&#ZA*us6!^O*TzpKAZ#}B5@}?f=vdnqnRmG}xyt=)2o%<9jj>-4wLP1X-bI{(n
zD9#|rN#J;G%LJ&$+Gl2eTRPx6BQC6Uc~YK?nMmktvy^E8#Y*6ZJVZ>Y(cgsVnd!tV
z!%twMNznd)?}YCWyy1-#P|2Fu%~}hcTGoy>_uawRTVl=(xo5!%F#A38L109wyh@wm
zdy+S8E_&$Gjm=7va-b7@Hv=*sNo0{i8B7=n4ex-mfg`$!n#)v@xxyQCr3m&O1Jxg!
z+FXX^jtlw=utuQ+>Yj$`9!E<5-c!|FX(~q`mvt6i*K!L(MHaqZBTtuSA9V~V9Q$G?
zC8wAV<ON8O8$6q}UeLRoPgV){ut{$0#P!o;OGE_?8qHYoE8SSrtg#yXAZPF$m|vPj
z(oz@kw_2z#nU?58i}uBJbjM~~qI_?3q_fWuM@&6R(+x8T&l{t()>|#XY=;<q!BUF6
zfZrK-Vn^$<`KJ?-4Dy8F3yY-_hK>TQD#H;;dcHVb9I7Vu2nI0hHo)!_{qIa@|2}9d
ztpC*Q{4Py~2;~6URN^4FBCBip`QDf|O_Y%iZyA0R`^MQf$ce0JuaV(_=YA`knEMXw
zP6TbjYSGXi#B4eX=QiWqb3bEw-N*a;Yg?dsVPp<w`-P!=^KFPM^$!}Ru=X@whXYmM
zsqWhWy3XCXBC4kk(;V%nw_MkJSHL$3ZJWFxB>eYFS*&AsqtW1j2D$h$*ZOdEb$8n0
zGET4Igs^cMTXWG{2#A7w_usx=KMmNfi4oAk8!MA8Y=Rh9^*r>jEV(-{I0=rc);`Y)
zm+6KHz-;MIy|@2todN&F+Yv1e&b&ZvycbTHpDoZ>FIiUn+M-=%A2C(I*^Yx@VKf(Z
zxJOny&WoWcyKo<IxFn{@-ZWPXC|6kr+G%obnVFl1K=B8_gLB&r#dNWD?|zBFKu5JI
z3y1s#r0hGp`AJh6@=e%+$Pj;cb(5sW%Ie2gSl1IBe3Gu6PdgCH;puJ4l&f!UX^}5C
zBy~21@j>dkeN^5))aV|-UBFw{?AGo?;<h~k_p>NNFFcKzk+6|gYfA#FR=y@?;3IoQ
zUMI=7lwo9gV9fRvYi}Nd)&gQw7(K3=a0#p27u6Q)7JlP#A)piUUF8B3Li&38Xk$@|
z9OR+tU~qgd3T3322E))eV)hAAHYIj$TmhH#R+C-&E-}5Qd{3B}gD{MXnsrS;{Erv1
z6IyQ=S2qD>Weqqj#Pd65rDSdK54%boN+a?=CkR|agnIP6;INm0A*4gF;G4PlA^3%b
zN{H%#wYu|!3fl*UL1~f+Iu|;cqDax?DBkZWSUQodSDL4Es@u6zA>sIm>^Aq-&X#X8
zI=#-ucD|iAodfOIY4AaBL$cFO@s(xJ#&_@ZbtU+jjSAW^g;_w`FK%aH_hAY=!MTjI
zwh_OEJ_25zTQv$#9&u0A11x_cGd92E74AbOrD`~f6Ir9ENNQAV2_J2Ig~mHWhaO5a
zc><kKTVb}h$g)^^gVhHWtQxeLKgumr6P1k{3p&HxA@qjJE2D;u&!f*|4y}7cIyUSW
znXD{vy6B91FFlD`dk3+(VO&e$#9w#8!#qwDSmtEE@$0mA^KNR?x8w|}1Y7u&taYP<
zH7{*#`$%!ICN6oF%*C8)1BIaDilgPVxEK%mOtU7LFaw<FHM1P+<p?_MZ36q@wOU6y
zeHPSD7e_pd)o#vfHnsI!WRlt`WO_wt!s@SPM&>fYG$zke^S+fBupw+klDkiljJAha
z6DnTemhkf>hv`8J*W_#wBj-2w(cVtXbkWWtE(3j@!A-IfF?`r$MhVknTs3D1N`rYN
zKth9jZtX#>v#%U@^DVN!;ni#n1)U&H_uB{6pcq7$TqXJX!Q0P7U*JUZyclb~)l*DS
zOLpoQfW_3;a0S$#V0SOwVeeqE$Hd^L`$;l<hogT43G@<XdGzDHK`K6wEQ8ktG6C`-
zqBi_4u1R)JAtxD<XJSX)%r2pAD7HD@;DL|d-Fe?`e$BXH#2VcNlnND7+Za8VPOx$A
zq}%eQlXqCL%VDQ5{u7U<ZE2dUM{Gp+_wW?d^Y_NF_Pt0DR>_~2giLYd?7!gU<Et*n
z^e$Gl#=$EoABoaXgK1(E;2wsjFehR004=l0&w}CbD2$aTA@wBk0#=T|nFgYd?BPoN
z=Me#P*;L`uUwRNj4Uo-MpA5#g7?s>YIpOs!jqSL~pI)4`YuB_<O9Sl2Rsl}>692~A
z^T#YYQ_W3Rakk}$SL&{`H8mc{>j+3eKprw6BK`$vSSIn;s31M~YlJLApJ)+Gi1{^-
zw96WnT9M0Vr_D=e=a}${raR{<xHTTNAG6M#rf#S@`wA<xEGuNz&Q~}XQpKo=Z=zQm
z&e+y(Gi|=Do=a+fKS<37LLP~4S@3WAylr*uDl*{as?uZQcz015wZ7%Tp1eMD;Q`|_
z*n@LPg2lcz9~;hNaTgxt=@}FJajS>(35Q!g+8`}vOFj1e&Or(_wp2U2aVQP0_jP57
z2(R4E(E$n<uA6zEY&4lU5f83HNjM^iVH$BDyZ9xwOwwW6=%ieb3$T2zoN?&@Wgnde
zm!J422=TMfBfGfinZ5LQ5(gt}oIBZgeJm&YTH>!xl<}Zx38wO;27wuQ`P#_j!}L<a
zPUX2M1^goZOC|B*Ql*aN#k?g+Zm&vmRSJ|(DIsx7rPa!@B^=q5q!sE4(?0L&<!4~W
z7^P9F%(y%4guO3UbgzOOG{5c?j%RSJC+mW_i(yb3fhDb5GE5={Y!_=U&VDdx$|x~5
z0o}3O%_P<uk9BZb#2tHOmP;HFZ28$J-tz6Bn|Ym5Jk@LPh$7M6unMU3%Vs2$(Uk>2
z2qr;As4D4n2X$-Jd_-!fsbu_D(64i;c4cJnP576x_>Q4WNushFwkBV!kVd(AYFXe{
zaqO5`Qfr!#ETmE(B;u_&FITotv~W}QYFCI!&ENKIb1p4fg*Yv1)EDMb==EjHHWM#{
zGMpqb2-LXdHB@D~pE3|+B392Gh4q)y9jBd$a^&cJM60VEUnLtHQD5i-X6PVF>9m_k
zDvG3P(?CzdaIrC8s4cu~N9MEb!Tt(g*GK~gIp1Gyeaw3b7<wx3DL@qRqiQW473hnM
zWm(cY3Wls;oJ2+ibs~_Njn69`wR?;U+UDS@^#vH`w3e|LIC_+=L|7Hm>#YPx_1T6i
zRi#pAMr~PJKe9P~I+ARa$a!K~)t(4LaVbjva1yd;b1Yz2$7MMc`aLmMl(a^DgN(u?
zq2o9&Gif@Tq~Yq+qDfx^F*nCnpuPv%hRFc$I!p74*quLt^M}D_rwl10uMTr!)(*=7
zSC5ea@#;l(h8<ac?STV|F*`T`Rddcsy+ZkY{;t|u=u+Z-2{P`MZD@_n0u#_;DO1Ct
zX3k>7k4T4x)(o^#l76P-GYJA(pOa&F9YT=fS<*O{4agzba^dIrh0hjls<~APlIz9{
zgRY{OMv2s|`;VCoYVj?InYoq^QWuA&*VDyOn@pPvK8l~g#1~~MGVVvtLDt}>id_Z`
zn(ihfL?Y}Y4YX335<t~h)DE2x_gnPqLl?7H3b9HaqiSs6=qQQ7ijqLh(qNL{XGIEB
zDEmPd8&{QQU``)&)Kl7dubdde`lrU49h@2kaVQBr(dMbCvJ;>m*Xx(y+bbukchHrM
zycIGp#1*K3$!(tgTsMD2VyUSg^yvCwB8*V~sACE(yq2!MS6f+gsxv^GR|Q7R_euYx
z&X+@@H?_oQddGxJYS&ZG-9O(X+l{wcw;W7srpYjZZvanY(>Q1utSiyuuonkjh5J0q
zGz6`&meSuxixIPt{UoHVupUbFKIA+3V5(?ijn}(C(v>=v?L*lJF8|yRjl-m#^|krg
zLVbFV6+VkoEGNz6he;EkP!Z6|a@n8?yCzX9>FEzLnp21JpU0x!Qee}lwVKA})LZJq
zlI|C??|;gZ8#fC3`gzDU%7R87KZyd)H__0c^T^$zo@TBKTP*i{)Gp3E0TZ}s3mKSY
zix@atp^j#QnSc5K&LsU38#{l<T7VjU+6PVt8Br#nb=$C7ozaY?K!DvXMD>Udwj%xF
zcx&l^?95uq9on1m*0gp$ruu||5MQo)XaN>|ngV5Jb#^wWH^5AdYcn_1>H~XtNwJd3
zd9&?orMSSuj=lhO?6)Ay7;gdU#E}pTBa5wFu`nejq##Xd71BHzH2XqLA<O#P*~X>5
zeLE<Rv>o;9$}~u0pEu@(?hXB_l;{jQ=7m?~mwj-ME~Tw-OHPrR7K2Xq9eCNwQO$hR
z3_A?=`FJctN<p5;O=$LYp3?Ce&@D=07#N@I#H<GQccD(|HFf2QhFt1iw-XtwL09Wu
z5<V78JqCU`vpTYC!*dzTB;$x*KwGqMB4&u$WfR*puwe>XA#yQEorVoh{RWxJbdQga
zU%K##XEPgy?E|K(=o#IPgnbk7E&5%J=VHube|2%!Qp}@LznjE%VQhJ?L(XJOmFVY~
zo-az+^5!Ck7Lo<7b~XC6JFk>17*_dY;=z!<0eSdFD2L?CSp_XB+?;N+(5;@=_Ss3&
zXse>@sA7hpq;IAeIp3hTe9^$DVYf&?)={zc9*hZAV)|UgKoD!1w{UVo8D)Htwi8*P
z%#NAn+8sd@b{h=O)dy9EGKbpyDtl@NBZw0}+Wd=@65JyQ2QgU<D>}q2ii;ot1OsAj
zUI&+Pz+NvuRv#8ugesT<<@l4L$zso0AQMh{we$tkeG*<YnUFO3a?9SA%#LKH0J7UK
ztV6ZyGcBauAWmwTNkDQNc#jJPV#2fw?ha3WxPdlx8RGR-nl(S7?59?GG*a&ILa)P}
z4aXHM@7in58)BLd4}>mpLmOT<RX~XY#V%wWess<Jj@RjSfz+i)3v``)<T&f+(nGIN
zAgeia#M88tz1y+LT{GTFH*D3dRCTT_a)crqY;nx?CU^JUm<4V(=!V0KuW3PetL+)B
zm_ZFx!Lxacx`sR9>iy8|dNYhsqhp+q*yfZA`Z)UC*(oxTNPfOFk3RXkbzAEPofVUy
zZ3A%mO?<u?)~au(+*5Z*rw4LfW0AKF1MzGsigP<l@zQc;se0YcC<xz^EIu5+L%tvC
zNr*qip+=V4(&pUzUKNO+Irqwm?`FDy7-^f>WyTRh@WdXz+zD!ogo}gbUMV!YtTNhr
zrt@3PcP%5F;_SQ>Ui`Gq-lUe&taU4*h2)6RDh@8G1$o!){k~3)DT87%tQeHYdO?B`
zAmoJvG6wWS?=0(Cj?Aqj59`p(SIEvYyPGJ<L!Yt2Z?3JON*tgVa`{%jDXmduG=GUl
zV}GM2ufyOmG0}tGy&3I`lN2uPKh1Jrrp9#k1Rt9n`94ZuUgI)KmGrt!rK)v=#^G{^
zuw!T4;(GaP2xrxjInl+F91kt|{kJ+lDTIwnjZ7SjrwsPP?I%rIccpPjUkF{UuOxx-
zE94%Gi=JAWovaOMn|o5;N5rXZL*ZY($P`#O%eUnb2vjbA(^(O#h`8ZAF1}!_>^reI
z`H<sua;P3!rCiW6{3W($?S!_%Hg+W=j)h4e?STc1u5czSSYO%Xp{M{hCmKT?Y-YCe
z!dr5x?I|WYz6Nan)x{>r?3#U2zI7k0=UmqMD35l`>3xMcWlDv$oo6;b`dZq3d!~)W
z=4Qk)lE8&>#HV>?kRLOHZYz83{u7?^KoXmM^pazj8`7O<Z{MADuVPm15k2CTB(^JI
zI<W33D`NXHhkP<H<MU20nL?(W!4rp+trKVte$?4o8M)N{ez`ZEPxjdXWo$Gb^&H%O
zSvaRji8C-mZwDes7g|sJEBKdX@=`-^1r73GxlhM_EC*Qqj9q+gLSvAi>wQ=5I!==;
zA!uN`Q#n=Drmzg}@^nG!mJp9ml3ukWk96^6*us*;&>s+7hWfLXtl?a}(|-#=P12>A
zo<n><p~@8E=Hwk*8-myurVM4y*Xc%6>n1}yqh^?9!;on?<L)IU9|rUAWY+2?quYgt
z7~2}~IXH&JPd;cn;XEc#@Y>tRd6Fk0knQSLl4vBGb87A_kJNDGyrnpmn48lz_%P{*
z_G*3D#IR<2SS54L5^h*%=)4D9NPpji7DZ5&lHD|99W86QN_(|aJ<5C~PX%YB`Qt_W
z>jF_Os@kI6R!ub4n-!orS(G6~mKL7()1g=Lf~{D!LR7#wRHfLxTjYr{*c{neyhz#U
zbm@WBKozE+kTd+h-mgF+ELWqT<ltB}!!N77<w$YixCC<EB-0G}*kk>Kin57P;0b){
zii5=(B%S(N!Z=rAFGnM6iePtvpxB_Q9-oq<TIL3qyyGB|!nS55AcZrenX~)0xJIWl
z(%bD-@^IN*LVF;^u1mA>_xH!URn2_d-H~i;lro8r{-g!k-Ydb6_w5K@FOV?zPF_hi
z%rlxBv$lQi%bjsu^7KT~@u#*c$2-;AkuP)hVEN?W5MO8C9snj*EC&|M!aK6o12q3+
z8e?+dH17E!A$tRlbJW~GtMDkMPT=m1g-v67q{sznnWOI$`g(8E!Pf!#KpO?FETxLK
z2b^8^@mE#AR1z(D<l1Ey+%PhIq_79hm+SmQ)?>T~R3!nnvq}LG2zDGoE1URR=A2SA
z%lN$#V@#E&ip_KZL}Q6mvm(dsS?oHoRf8TWL~1)4^5<3JvvVbEsQqSa3(lF*_mA$g
zv`LWarC79G<wt}`pUDDB(0dPo2iD3_$A<2&m=BVHyy%nf8bS=P460M<*7{SdOrR4x
zInb(FMuADl*%{nI?)LE(k~YB)+f#z%`}b+7RwTppIC~nDQVa%04J1VM_N5~h7SMF}
zd@v@a8A?RiC`7DCyo1G;u`ewPIP*%LY(Ykr$b+jhF4SaHwWfp-HQ54`sAkPPvHHzh
z^+7BSS{aTyW*b?KLiNOa+VhOXg72{CV8ln&!)jt<kUmlq8FB?O*48qKh+EULkQtSw
z5#gz;;L0C&;C%Ie#S($mpNh!*-YtJwXuBzz3l$nM%L&BfD`M$nL2u`KPK_Hp)4+Y(
zE{su_qaN1z`~ws^ywAb<{<Ugm`zk}a7Az`baZ6@G+<`I;B9of?2JWOuNtcuzW=WC5
zP(2HVb<4ros!Gj^kCfvUUq3`D^Bv<hPUh??k$H?4lL>)zR0J+#=6kB`SgjQZ2460W
zN%lZt%M@=EN>Wz4I;eH>C0VnDyFe)DBS_2{h6=0ZJ*w%s)QFxLq+%L%e~UQ0mM9ud
zm&|r){_<*Om%vlT(K9>dE(3AHjSYro5Y1I?Zj<P+|D7R^c9O<r7-uxjkc6v}HlAhS
z#wm3<NiTf4Ez&EMLQCoiZ}9be&&cBSsPk>MqWyHzuCE0nyCn`6eq%MEt<V<}(eA9U
zyW5LFFy3jS4I^86{01y~PeM=cEz-%Rv=ziM$)U!z`_~zE9d_B;{cvi*{k|Z23&L=!
z;@@s4b=M>(aY=M2rIzHeMds)4^Aub^iTIT|%*izG4YH;sT`D9MR(eND-SB+e66LZT
z2VX)RJsn${O{D48aUBl|(>ocol$1@glsxisc#GE*=DXHXA?|hJT#{;X{i$XibrA}X
zFHJa+ssa2$F_UC(o2k2Z0vwx%Wb(<6_bdDO#=a$0gK2NoscCr;vyx?#cF)JjM%;a|
z$^GIlIzvz%Hx3WVU481}_e4~aWcyC|j&BZ@uWW1`bH1y9EWXOxd~f-VE5DpueNofN
zv7vZeV<*!A^|36hUE;`#x%MHhL(~?eZ5fhA9Ql3KHTWoAeO-^7&|2)$IcD1r5X#-u
zN<K#%@#(9G!j^G~Pn~ukPFAJYnEW4FhTmjMK4ocSQX5rOBsY-<0@)}=dTSpo5CPlh
zy;&nJ_}DXk%W^elvnbmhO#OtN>~N0$6pHPhop@t1_d`dO3#TC0>y5jm>8;$F5_A2&
zt#=^IDfYv?JjPPTPNx2TL-Lrl82VClQSLWW_$3=XPbH}xM34)cyW5@lnxy=&h%eRq
zv2<QH(-G%+?|$Th#NG3#*>9&h^fMoxjsDnmua(>~OnX{Cq!7vM0M4Mr@_18|Y<q(B
ze*P;VGGb7)?s|MRcGL3vsq-iKA~!6P9|qZ19}gPztjTjNqbpQ_2g2Rp!t5d(G`r}!
zYNEG^5^A!yU)kR{w0|z!rjJT?@IoG-VD%2$PF$JTcSRZ~W7FOq>uSKPBKUTV$s^So
zc}JlAW&b<RUpGuOT&+_Q0DjQ{fQRQ7-kpCr*bV;_<oxeFQk6v?3_!|P;pM?;!5XE3
zs8wR68P+5twjjbu*OKsUVkyjJGCMI_bw~sYe3=-NgsH($4RMLw$-u%w(6l5khH&2k
zMhIe_B$m6&aSWUG3l-Q-4hD3Ixn?>Vz|JY#Eyup6Ny{|P_s0Pq;5*tinH+>5Xa--{
z2;?2PBs((S4{g=G`S?B3Ien`o#5DmUVwzpGuABthYG~OKIY`2<moGKpvjK8*6C{_f
zJ7EXH={r+4YG{Ziqmm6h*?g^0?L39rb)vSBF1?jZ+li&UnL?{JYgN6qfIJ2IkL}uH
zdEa%W_NKc^9C%7_c2Z&64BbTqoEk3za&+4py3I8@<_~6;gdfGRt2SIuZ`7+}$4=6h
zp}@>ms;33SN9u^I8i_H5`BQ%yOfW+N3r|ufHS_;U<aJ>;TWT5z;b14n1gX%Pn`uuO
z6#>Vl)L0*8yl|#mICWQUtgzeFp9$puHl~m&O+vj3Ox#SxQUa?fY*uK?A;00RiFg(G
zK?g=7b5~U4QIK`C*um%=Sw=OJ1eeaV@WZ%hh-3<=l<UNWacTHI(=o)Q6u<j$hKhuV
zq6CVCO<mt^25|s?yc7hUS5?3b`#GjTquFJ;yz`wSaAM3V`D#SZ)%eMxE3qhtKFvWQ
z&?>R#(Xesk%?)l4p(EpTwPvN99V@TT)!A8SeFTV+frN=r|5l?K#odjijx2nFgc3kI
zC$hVs1S-!z9><Yh`7*{x<pcOxnRAP|#DO`xZ9!==WSVG2xk}Wba-jM&TkK-a#cK*j
z$B|aw?~Rln64kj*2bnFdrqbs?XUke<tczoDu`yVZEJ)gFoj^JClEjzVdzx4~It-DE
z>xn9MZcRk0YXdYlf~8*LfH$IHKD59H&gLz<gEb&AJst$L#8oQEd^22}uWu0pTK>%6
z#mAYSRJufbRi~LRadwM*G!O2>&U<^d`@<)otXZJJxT@G}4kTx0zPDVhVXwiU)$}5Y
z`0iV`8EEh&GlUk&VY9m0Mqr*U&|^Bc?FB`<%{x-o0ATntwIA%(YDcxWs$C)%a%d_@
z?fx!Co+@3p7ha$|pWYD}p6#(PG%_h8K7sQjT_P~|3ZEH0DRxa<I6#1P*s*3Dmh3P@
zqQth%yK01Xy!oWCPg5I%G`f-ChxFv9GC{21?;^yVzma^06f9ijM+V3y0d)V3N!jR0
zxQm3Yc%$hKOT=w8Lbn)kR(`B3UuBOeIykdZCUq@K+@_!QRFbdl(*e|@P(SrxbI}I7
zGE#eRG2#<;+1L&<9SL3rl2fd8mRv?pt4l+TB6?cU*{}r5xxK3W!)S~KSY`zlU53y$
ztxG7OpkL<kL{{S)fwPGSD;NwI3uU56)|p4!MznS}l1cvs&>3~bP&&lPMj3C~!H2QD
zq>(f^RUFSqf6K3BMBFy$jiuoSE+D<Q;Fj;w3ZUCb4;D}yNl8Z)w->hEq$xLDb7{57
z<!mKz-d(7ellTaV#2{n6gYef3yuhnmJox^AJ0Hwk{__Tp@SZyYZ@A|@<9k}ev-Y?)
zP%;;c+!hV+b>0B|1pSjYJ5F@cHG%qDZ{ogL$P!BK&sR%zD`gbK#9gRZX17EtAJxN%
zys^gb2=X9=7HP}N(iRqt(tot2yyeE%s;L}AcMh;~-W~s_eAe!gIUYdQz5j~T)0trh
z>#1U$uOyyl%!Pi(gD&)uHe9Q^27_kHyFCC}n^-KL(=OxHqUfex1YS__RJh0m-S>eM
zqAk`aSev*z1lI&-?CycgDm=bdQCp}RqS0_d-4Mf&>u2KyGFxKe8JM1N{GNWw0n$FL
z1UDp(<ADwl5}kpWbq;WN#8`CXz0I&c-d9?@jR2qKTH0nkOFOz<0S~p?GluxF$pOf7
zvwT3@bSo{=ulYTgz>h0<QGowTO5~Y4Sg7YiXZnH@bN1S4duyIk*~P+e=Er@Tt?w4x
ztB;w(2LhOEga<-NNXaG@Sca25gkBj=&KZc(_9kge#GJ?=CN*Hu3SqU=!kF{~-3r;G
zGX<(KX!}DmlKdeD1D7CXQ1ft<_2YLS*@eA)CvcvA9Qb@zE#K1zGmuW`AHeukugxS`
zA-gk0FbCLIfIAVaMsHC!2{Rsn7F=mh2=!#vKySo2cXyAZIzfTGK$aEe@m3q&nq?2w
zFkrWbnHo9)I-#e`8<Jf#??bV*d`&RnNnusTm1@d3Tz&dm2>(1I2Jh9I`?IS}h4R~n
zRwRz>8?$fFMB2{UPe^$Ifl;Oc>}@Q9`|8DCeR{?LUQLPfaMsxs8ps=D_aAXORZH~<
zdcIOca-F;+D3~M+)Vi4h)I4O3<)$65yI)goQ_vk#fb;Uim>UI4Dv9#2b1;N_Wg>-F
zNwKeMKY+su#~NL0uE%_$mw1%ddX2Qs2P!ncM+>wnz}OCQX1!q~oS?OqYU;&ESAAwP
z452QWL0&u^mraF#=j_ZeBWhm&F|d!QjwRl^7=Bl7@(43=BkN=3{BRv#QHIk>Umc_w
zvP>q|q<IzG3-WE>{lJ=zs|W9%a@8%W>C@MYN1D5{(=Af31+pR#kB`cd0-YlQQTg}+
zL|_h=F9JQ|Gux5c0ehaffHNYLf8VwF+qnM6IjBEI_eceee;o;FY@#~FFVsZjBSp!j
z8V*Bgmn{RK!!zqGc;jy)z@Zjo>5{%m1?K}fLEL$l6Dl4f=ye0wNI#)2L=^K(&18Gb
zJoj8@WBB;P^T#V)I0`aDSy?$rJU{+-5472NyFp>;Vw43j@3Z=;D2eSfyw5*0Q+&ML
zsV&&*3<HCN_ZYRbQ{gMB9l1$a`w~#15^zjKaZm!;qpv-(32EHwo$OaPL@7|^9#tK&
zOJ7JR-VLv<#>c3$pa`qcaGbEB0*CA~Wp3%PkF?B87FV&rWNb|@GU$LB;l|;YutU*k
za1hjUL_BX%G^s;BuzRi4Hl?eqC2z&ZrKh1tZDwnufG$g$LX(j!h%F5(n8D@in3lnX
z(*8+3ZT6TVYRcSpM1eMeCps=Fz8q%gyM&B=a7(Vf`4k3dN$IM+`BO^_7HZq4BR|7w
z+5kOJ;9_$X%-~arA@qmXSzD|+NMh--%5-9u6t(M=f%&z$<_V#Y_lzn{E$MZZG)+A>
zu2E`_Y(MBJ2l*AqvCUmU;yBT}#oQ{V=((mC-QGJwsCOH*a;{1<C0q*jD3F=n{OETJ
zGBWT;p8pV>JRTKv7DBNG+M!XL7(^jbv&Qy-o9HNFrmN)-`D3WFtXs>1vBOJpI(=x;
zKhJlFdfMf^G#oU(w1+ucMKYPZaDp>$kt=wiYsBCjUY-uz<4JziB>6fXDS<E>LH*2Y
z&Px5y`#3!fF=c4>fCMdg-tX582pemU@ZxyFbznL8-=TTo1Sybg9>7h*J^9^~XxXJO
z`k9v~=4amxl<;FCV9h2k%?^-ZUzQy^#{JleyH23o1S{r<+t#z6jKS<9rbAM96^1iY
zi6{IjauB)U<U+9*L(E3dDT{;gWoVVr*b~jsM4(@ulmg>wBhC-_L(MzGCxhhv`?ryc
zja_Uwi7$8l!}*vjJppGyp#Wz=*?;jC*xQ&J894rql5A$2giJRtV&DWQh#(+Vs3-5_
z69_tj(>8%z1VtVp>a74r5}j2rG%&;uaTQ|fr&r%ew-HO}76i8`&ki%#)~}q4Y|d$_
zfNp9uc#$#OEca>>MaY6rF`dB|5#S)bghf>>TmmE&S~IFw;PF0UztO6+R-0!TSC?QP
z{b(RA_;q3QAPW^XN?qQqu{h<}Vfiv}Rr!lA$C79^1=U>+ng9Dh>v{`?AOZt>CrQ=o
zI}=mSnR))8fJpO->rcX?H);oqSQUZ?sR!fH2SoFdcPm5*2y<_u;4h;BqcF*XbwWSv
zcJN%!g|L(22Xp!^1?c;T&qm%rpkP&2EQC3JF+SENm$+@7#e!UKD1uQ{TDw43?!b!3
zUooS_rt=xJfa&h?c^hfV>YwQXre3qosz_^c#)FO~d!<)2o}Oxz5HWtr<)1Yw012v4
zhv0w(RfJspDnA^-6Jmr;GkWt%{mAYOm6yPb&Vl&rv@D^K&;#?=X{kaK5FhScNJ_3>
z#5u(Saisq2(<i{!jqUG!`ZD>~pVlrfG#@kLM#Ot~5rZZc%B&h1=gen?R+#t^1bYKf
zVvtefX=D$*)39e^2@!~A_}9c${Gf0?1;dk=!Itp#s%0>Io%k`9(bDeI-udd&E6Zfu
zcaiv(h`DM3W3Mfda)fYwhB=8RAPkotVt5-z21Ij~Ot9A^SK-1u*zFVK&mF?q1;|wy
zrF+XWs^5Q-%Z6I62gTwrRe#F>riVM#fv_TihxSJ6to1X7NVszgivoTa!fPfBBYj94
zuc2m<oT<6TXh&hGVE0D07(chh+D30x4^lD*TS;9OBkF1p31v!{J4IF3p}er`j|s+t
zpo%#_Laz%%axi;k2UHM!w_k}{RhoL&R`laAvhkgoyH+$zRl`)wIP{p_jKY|FPR+B1
zWqlf8Dp}Ubp%(T<{2ceup&E?sdP8pHb?A8BRxNreIYOetBMonsk_m)3`JO?|TO%Y2
z2mfITx=zShkTXKtqRy-O_sk!2Q)wKjK*uQaI7&<b|5E3vLzZ$|oT&c*`RgL|-H#p>
zL_k-<1FoORng1<?4mhs;&obz{FU8Nn!NCEK^8v2sf(p3RcQUgyq_Q_MFfy}s{Ij6C
z1Qq%CC?HgLOiG-pmT8Is450o62JZ7VJ^+xS1_-bw2K@c%H6jq8c7K8fSl+)1Koaal
zkrGnmqY{%Arg`~TieXXT&$CC0fa~W^eJ($BO8@UMDL!d2VIc)YYANBD2tS|r4>90;
z+@DGs;NHgG<Zqlm|I2@#0BFYisdNJFe?IYVLHK{7`q>W8<q&ZDrw9KnR{uBVb9eRR
zb3i3$0WI`1iPdw#1iZPw0N}T=ar~(;Z!4u|W(^2LeAbnJSvONZL*sk^-YnoEc*X_X
zDFeb_egQ2A&<C)z(KGyy2;ED-VH<XbcYtQ%1=N@EFM#X-zsNrU0>%wjH$EpvQ-Hd!
znZdIh#!H5nOStiOKNV8}QvY~=VMqtG&p$ByF&%pe_gR`|H5ULg47lk20(Xe=k8ptc
zn%EmTI7k9gNE=!IN4WnbymtsKoHn2-cL65z^9cQOSp>XFzo;!h*x1s^0U!<{Y-VZ1
zXJ7zekkYf(`@dZ3F9|?O+*dUL4K4?0@V^>I2;k-a1%ZgY9w2|C5<o~$)W*t4(#FQZ
z$@bSxb6jp7Uj&eiX9U!g{JG+QI~x3dfc|&Vsh_s@Yux=4Rfkdl$}->r0R5?80e-<R
zsx0;&tNS&ccBnr<*#ig&pd$YQ4~+WPc-9V%dX|>|&4yEwkklXmZ)!Q<V}kpq+5rKD
zG5r(XuWMK6M%$_k=pZ1#+TrKt__<7p{t`{n#^k^D_RB2i&tQfUzXbcOoaZlX>SYG)
zXBKOz|IPC2W_X!t^cgb^@D=|>r@x$f{3Y+`%NoDT^Y@JIuJ%jxe;es9vi`k<ewk+N
z8CqHMpP>JmbnPYT%X}rzs0K#=H)Q`)_L7%?KLLJP+0XJbL&<aL1_1u4eSd~+y?pp(
zzLMvMFaQ4Ve^N&L_qpIp_?I~-p5Z-B|5msE!2ixV;w8~b9r<S>JgdJE{i*){MOFSK
z{7XUfXZR-Te}aE8RelNkQV0AQ7RC0TVE^o8c!~K^RQ4GY+xed`|A+zjZ(qij@~zLP
zkS@Q0`rpM|UsnI6B;_+vw)^iA{n0%C7N~ql@KXNonIOUIHwgYg4Dcn>OOdc=rUl>M
zVEQe|u$P=Kb)TL&-2#4t^Pg0pUQ)dj%6O)#3;zwOe~`_1$@Ef`;F+l=>NlAFFbBS0
zN))`LdKnA;OjQ{B+f;z>i|wCv-CmNs46S`8X-oKRl0V+pKZ%XJWO*6G`OMOs^xG_d
zj_7<z@G^exnIJRu|C8W<wb;vure`YWjNhR8pKbLrwB;FpEbBM$|2fd*WxKtM1b8Nc
z%KP7Bzn)~h+<$(?Jgoa0=D(Wb@4L}2>-p06{fybw_P;UzX^eX5Pkcrm04%9rPFa56
zyZE<X@WRLS%#;4<Z#*xjoqw7o{EuP$rQhY5#=86ergZ<!3-g~k|HtR@XQ#<epUZRk
e2mt$U9vE2(P{3OAXSg3dkPg7#g4*-*um1-L(f}d=

diff --git a/example/ios/Supporting Files/gradle/wrapper/gradle-wrapper.properties b/example/ios/Supporting Files/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 8fad3f5a9..000000000
--- a/example/ios/Supporting Files/gradle/wrapper/gradle-wrapper.properties	
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/example/ios/Supporting Files/gradlew b/example/ios/Supporting Files/gradlew
deleted file mode 100755
index cccdd3d51..000000000
--- a/example/ios/Supporting Files/gradlew	
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/example/ios/Supporting Files/settings.gradle.kts b/example/ios/Supporting Files/settings.gradle.kts
deleted file mode 100644
index 0d17cfa52..000000000
--- a/example/ios/Supporting Files/settings.gradle.kts	
+++ /dev/null
@@ -1,61 +0,0 @@
-/***********************************************
- *
- * Changes made to this file should also be reflected in the [settings.gradle.kts] in the root of the project
- *
- ***********************************************/
-
-pluginManagement {
-
-    repositories {
-        gradlePluginPortal()
-        google()
-    }
-
-    resolutionStrategy {
-        eachPlugin {
-
-            val kalugaAndroidGradlePluginVersion = settings.extra["kaluga.androidGradlePluginVersion"]
-            val kalugaKotlinVersion = settings.extra["kaluga.kotlinVersion"]
-            val kalugaKtLintGradlePluginVersion = settings.extra["kaluga.ktLintGradlePluginVersion"]
-            val kalugaGoogleServicesGradlePluginVersion = settings.extra["kaluga.googleServicesGradlePluginVersion"]
-
-            when (requested.id.id) {
-                "org.jetbrains.kotlin.multiplatform",
-                "org.jetbrains.kotlin.plugin.serialization",
-                "org.jetbrains.kotlin.android",
-                "org.jetbrains.kotlin.kapt",
-                    -> useVersion("$kalugaKotlinVersion")
-                "com.android.library",
-                "com.android.application",
-                    -> useVersion("$kalugaAndroidGradlePluginVersion")
-                "org.jlleitschuh.gradle.ktlint",
-                "org.jlleitschuh.gradle.ktlint-idea",
-                    -> useVersion("$kalugaKtLintGradlePluginVersion")
-                "com.google.gms:google-services"
-                    -> useVersion("com.google.gms:google-services:$kalugaGoogleServicesGradlePluginVersion")
-            }
-        }
-    }
-}
-
-includeBuild("../../../convention-plugins")
-apply("../../../gradle/ext.gradle.kts")
-
-val ext = (gradle as ExtensionAware).extra
-
-when (ext["example_embedding_method"] ) {
-    "composite" -> {
-        includeBuild("../../..")
-    }
-}
-
-include(":android")
-project(":android").projectDir = file("../../android")
-
-include(":KotlinNativeFramework")
-project(":KotlinNativeFramework").projectDir = file("../KotlinNativeFramework")
-
-include(":shared")
-project(":shared").projectDir = file("../../shared")
-
-rootProject.name = file("../..").name
diff --git a/example/readme.md b/example/readme.md
deleted file mode 100644
index 6d68b4953..000000000
--- a/example/readme.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# Example project
-
-This example project has the following parts:
-- An Android app in [android](/example/android)
-- A shared code module in [shared](/example/shared). This exposes and android library, and kotlin native sourceset that depends on a common source set. These are then included in the build of the iOS and Android example apps.
-- An iOS app in [ios](/example/ios)
-
-The example app can load the main components either through your (local) maven repository, or as gradle modules.
-
-The advantage of using a gradle module is that you can edit the source of components and run them in the example right away, without needing to publish them to maven first.
-
-By default kaluga dependency is included as a composite build. You also can put the property `kaluga.exampleEmbeddingMethod=composite` in the `local.properties` file in the root of the project (this file is already generated by your IDE normally) to specify it explicitly. To enable maven use `kaluga.exampleEmbeddingMethod=maven`.
-
-You can also set the `kaluga.exampleMavenRepo` property to specify which maven repo to look in. By default this is `mavenLocal()` (this can also be used by explicitly setting the value `local`). For example to set this to the sonatype snapshot repository use:
-
-```properties
-kaluga.exampleMavenRepo=https://oss.sonatype.org/content/repositories/snapshots/
-```
-
-In conjunction, you can set the `kaluga.libraryVersion` property. This will override the version of kaluga to look for. For example:
-
-```properties
-kaluga.libraryVersion=0.2.2-SNAPSHOT
-```
-
-Please note that this also overrides the version when building kaluga itself. 
-
-### Links
-In order to make kaluga-links example work correctly, you must sign the app with a signing certificate beloging to our team or using the `debug.keystore` file we provide.
-
-#### Why?
-The goal of the example is to show the usages of `links` module, but on top of that we are also showing the flow where user are redirected to the app without being asked "Open with..." dialog.
-To do so the backend must contain in `https://whatever.domain/.well-known` two file named respectively `assetlinks.json` and `apple-app-site-association`.
-
-## Android
-`assetlinks.json` should have the following format
-
-```
-[
-  {
-    "relation": ["delegate_permission/common.handle_all_urls"],
-    "target": {
-      "namespace": "android_app",
-      "package_name": "app.package",
-      "sha256_cert_fingerprints": [
-          <sha256_fingerprint_1>,
-          ...
-          <sha256_fingerprint_n>,
-      ]
-    }
-  }
-]
-```
-[More info about Android App Links](https://developer.android.com/training/app-links).
-
-## iOS
-While `apple-app-site-association` will be
-
-```
-{
-    "applinks": {
-        "apps": [], // This array MUST be empty (for more info check Universal link's doc below). -->
-        "details": [
-            {
-                "appID": "appId",
-                "paths": ["path_1", "path_2"] // Use wildcard "*" if you accept every path.
-            }
-        ]
-    }
-}
-```
-`appId` = `teamId`.`bundleId`
-[More info about iOS Universal Links](https://developer.apple.com/ios/universal-links/).
-
-# Using IDEs
-
-The iOS app can be opened by either XCode or the KMM plugin of Android Studio. 
-
-The Android app can be opened with Android Studio, at times the latest Beta or Canary release is needed (see [DEVELOP](/DEVELOP.md))
-
-This project uses a structure created by Appcode (the Kotlin/Native plugin of Appcode is now unfortunately not recent anymore) , the root `settings.gradle.kts` file is under [Supporting Files](/example/ios/Supporting%20Files/), so this is the directory to open with Android studio. 
diff --git a/newexample/settings.gradle.kts b/example/settings.gradle.kts
similarity index 100%
rename from newexample/settings.gradle.kts
rename to example/settings.gradle.kts
diff --git a/example/shared/build.gradle.kts b/example/shared/build.gradle.kts
index be70d1e5e..fcc1ed645 100644
--- a/example/shared/build.gradle.kts
+++ b/example/shared/build.gradle.kts
@@ -1,36 +1,57 @@
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
-    id("jacoco")
     id("com.android.library")
+    id("jacoco")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-apply(from = "../../gradle/component.gradle.kts")
+val libraryVersion = Library.version
+val modules = listOf(
+    "alerts" to true,
+    "architecture" to true,
+    "base" to false,
+    "bluetooth" to false,
+    "beacons" to false,
+    "date-time-picker" to true,
+    "hud" to true,
+    "keyboard" to true,
+    "links" to false,
+    "location" to false,
+    "logging" to false,
+    "resources" to true,
+    "review" to true,
+    "system" to true,
+    "permissions" to true
+)
+
+commonComponent {
+    logger.lifecycle("Configure framework")
+    baseName = "KalugaExampleShared"
+    isStatic = false
+    transitiveExport = true
+    modules.forEach { (module, isExportable) ->
+        if (isExportable) {
+            export("com.splendo.kaluga:$module:$libraryVersion")
+        }
+    }
+}
 
 kotlin {
     sourceSets {
-        commonMain {
-            val ext = (gradle as ExtensionAware).extra
-
+        getByName("commonMain") {
             dependencies {
-                val libraryVersion = ext["library_version"]
-                api("com.splendo.kaluga:alerts:$libraryVersion")
-                api("com.splendo.kaluga:architecture:$libraryVersion")
-                api("com.splendo.kaluga:base:$libraryVersion")
-                api("com.splendo.kaluga:bluetooth:$libraryVersion")
-                api("com.splendo.kaluga:beacons:$libraryVersion")
-                api("com.splendo.kaluga:date-time-picker:$libraryVersion")
-                api("com.splendo.kaluga:hud:$libraryVersion")
-                api("com.splendo.kaluga:keyboard:$libraryVersion")
-                api("com.splendo.kaluga:links:$libraryVersion")
-                api("com.splendo.kaluga:location:$libraryVersion")
-                api("com.splendo.kaluga:logging:$libraryVersion")
-                api("com.splendo.kaluga:resources:$libraryVersion")
-                api("com.splendo.kaluga:review:$libraryVersion")
-                api("com.splendo.kaluga:system:$libraryVersion")
-                api("com.splendo.kaluga:permissions:$libraryVersion")
+                modules.forEach { (module, _) ->
+                    api("com.splendo.kaluga:$module:$libraryVersion")
+                }
+                expose(Dependencies.Koin.Core)
             }
         }
     }
 }
+
+android {
+    dependencies {
+        expose(Dependencies.Koin.Android)
+    }
+}
diff --git a/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
similarity index 100%
rename from newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
rename to example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentSubPageViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentSubPageViewModel.kt
deleted file mode 100644
index 12f9b5f96..000000000
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentSubPageViewModel.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-sealed class BottomSheetParentSubPageNavigation : NavigationAction<Nothing>(null) {
-    object Back : BottomSheetParentSubPageNavigation()
-}
-
-class BottomSheetParentSubPageViewModel(navigator: Navigator<BottomSheetParentSubPageNavigation>) : NavigatingViewModel<BottomSheetParentSubPageNavigation>(navigator) {
-
-    val text = "bottom_sheet_sub_page_title".localized()
-
-    fun onBackPressed() {
-        navigator.navigate(BottomSheetParentSubPageNavigation.Back)
-    }
-}
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentViewModel.kt
deleted file mode 100644
index 337e623dc..000000000
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetParentViewModel.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-sealed class BottomSheetParentNavigation : NavigationAction<Nothing>(null) {
-    object ShowSheet : BottomSheetParentNavigation()
-    object SubPage : BottomSheetParentNavigation()
-}
-
-class BottomSheetParentViewModel(navigator: Navigator<BottomSheetParentNavigation>) : NavigatingViewModel<BottomSheetParentNavigation>(navigator) {
-
-    val sheetText = "bottom_sheet_show_sheet".localized()
-    val subPageText = "bottom_sheet_show_sub_page".localized()
-
-    fun onShowSheetPressed() {
-        navigator.navigate(BottomSheetParentNavigation.ShowSheet)
-    }
-
-    fun onSubPagePressed() {
-        navigator.navigate(BottomSheetParentNavigation.SubPage)
-    }
-}
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetSubPageViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetSubPageViewModel.kt
deleted file mode 100644
index 07ed302ca..000000000
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetSubPageViewModel.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-sealed class BottomSheetSubPageNavigation : NavigationAction<Nothing>(null) {
-    object Back : BottomSheetSubPageNavigation()
-    object Close : BottomSheetSubPageNavigation()
-}
-
-class BottomSheetSubPageViewModel(navigator: Navigator<BottomSheetSubPageNavigation>) : NavigatingViewModel<BottomSheetSubPageNavigation>(navigator) {
-
-    val text = "bottom_sheet_sheet_sub_page_title".localized()
-
-    fun onBackPressed() {
-        navigator.navigate(BottomSheetSubPageNavigation.Back)
-    }
-
-    fun onClosePressed() {
-        navigator.navigate(BottomSheetSubPageNavigation.Close)
-    }
-}
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetViewModel.kt
deleted file mode 100644
index bec596366..000000000
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/bottomSheet/BottomSheetViewModel.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.platformspecific.compose.bottomSheet
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-sealed class BottomSheetNavigation : NavigationAction<Nothing>(null) {
-    object Close : BottomSheetNavigation()
-    object SubPage : BottomSheetNavigation()
-}
-
-class BottomSheetViewModel(navigator: Navigator<BottomSheetNavigation>) : NavigatingViewModel<BottomSheetNavigation>(navigator) {
-
-    val text = "bottom_sheet_sheet_content".localized()
-    val buttonText = "bottom_sheet_show_sub_page".localized()
-
-    fun onSubPagePressed() {
-        navigator.navigate(BottomSheetNavigation.SubPage)
-    }
-
-    fun onClosePressed() {
-        navigator.navigate(BottomSheetNavigation.Close)
-    }
-}
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/model/ContactDetails.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/model/ContactDetails.kt
deleted file mode 100644
index 3357616aa..000000000
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/model/ContactDetails.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.platformspecific.compose.contacts.model
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ContactDetails(val name: String, val email: String)
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt
deleted file mode 100644
index 7f26c543f..000000000
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactDetailsViewModel.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.platformspecific.compose.contacts.viewModel
-
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
-
-sealed class ContactDetailsNavigation<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
-    class SendEmail(email: String) : ContactDetailsNavigation<String>(
-        email,
-        NavigationBundleSpecType.StringType
-    )
-    object Close : ContactDetailsNavigation<Unit>(Unit, NavigationBundleSpecType.UnitType)
-}
-
-class ContactDetailsViewModel(
-    val contactDetails: ContactDetails,
-    navigator: Navigator<ContactDetailsNavigation<*>>
-) : NavigatingViewModel<ContactDetailsNavigation<*>>(navigator) {
-
-    val sendEmailButtonText = "Send email"
-
-    fun sendEmail() {
-        navigator.navigate(ContactDetailsNavigation.SendEmail(contactDetails.email))
-    }
-
-    fun back() {
-        navigator.navigate(ContactDetailsNavigation.Close)
-    }
-}
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt
deleted file mode 100644
index 5e66bd4b1..000000000
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/platformspecific/compose/contacts/viewModel/ContactsListViewModel.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.platformspecific.compose.contacts.viewModel
-
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.architecture.observable.FlowInitializedObservable
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-
-sealed class ContactsListNavigation<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
-    data class ShowContactDetails(val contactDetails: ContactDetails) : ContactsListNavigation<ContactDetails>(
-        contactDetails,
-        NavigationBundleSpecType.SerializedType(ContactDetails.serializer())
-    )
-}
-
-class ContactsListViewModel(
-    navigator: Navigator<ContactsListNavigation<*>>
-) : NavigatingViewModel<ContactsListNavigation<*>>(navigator) {
-    val contacts: FlowInitializedObservable<List<ContactDetails>> =
-        MutableStateFlow(emptyList<ContactDetails>())
-            .also {
-                coroutineScope.launch {
-                    it.value = loadContacts()
-                }
-            }.toInitializedObservable(coroutineScope)
-
-    private suspend fun loadContacts(): List<ContactDetails> {
-        // a real call shall happen here
-        return listOf("Alice", "Bob", "Charlie", "David").map { name ->
-            ContactDetails(name = name, email = "${name.lowercase()}@example.com")
-        }
-    }
-
-    fun onContactClick(contactDetails: ContactDetails) {
-        navigator.navigate(
-            ContactsListNavigation.ShowContactDetails(contactDetails)
-        )
-    }
-}
diff --git a/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
similarity index 100%
rename from newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
rename to example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
diff --git a/example/shared/src/commonMain/kotlin/AlertViewModel.kt b/example/shared/src/commonMain/kotlin/AlertViewModel.kt
deleted file mode 100644
index 597593330..000000000
--- a/example/shared/src/commonMain/kotlin/AlertViewModel.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.shared
-
-import com.splendo.kaluga.alerts.Alert
-import com.splendo.kaluga.alerts.BaseAlertPresenter
-import com.splendo.kaluga.alerts.buildActionSheet
-import com.splendo.kaluga.alerts.buildAlert
-import com.splendo.kaluga.alerts.buildAlertWithInput
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.logging.debug
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-class AlertViewModel(val builder: BaseAlertPresenter.Builder) : BaseLifecycleViewModel() {
-
-    fun showAlert() {
-        coroutineScope.launch {
-            val okAction = Alert.Action("OK", Alert.Action.Style.POSITIVE)
-            val cancelAction = Alert.Action("Cancel", Alert.Action.Style.NEGATIVE)
-            val alert = builder.buildAlert(this) {
-                setTitle("Hello, Kaluga 🐟")
-                setMessage("This is sample message")
-                addActions(okAction, cancelAction)
-            }
-            when (alert.show()) {
-                okAction -> debug("OK pressed")
-                cancelAction -> debug("Cancel pressed")
-            }
-        }
-    }
-
-    fun showAndDismissAfter(timeSecs: Long) {
-        coroutineScope.launch {
-            val job = launch {
-                builder.buildAlert(coroutineScope) {
-                    setTitle("Wait for $timeSecs sec...")
-                    setPositiveButton("OK")
-                }.show()
-            }
-            launch {
-                delay(timeSecs * 1_000)
-                job.cancel()
-            }
-        }
-    }
-
-    fun showAlertWithInput() {
-        coroutineScope.launch {
-            val okAction = Alert.Action("OK", Alert.Action.Style.POSITIVE)
-            val cancelAction = Alert.Action("Cancel", Alert.Action.Style.NEGATIVE)
-            val alert = builder.buildAlertWithInput(this) {
-                setTitle("Hello, Kaluga 🐟")
-                setMessage("Type something!")
-                addActions(okAction, cancelAction)
-                setTextInput(placeholder = "This is a sample hint..") {
-                    debug("Input value changed to: $it")
-                }
-            }
-            when (alert.show()) {
-                okAction -> debug("OK pressed")
-                cancelAction -> debug("Cancel pressed")
-            }
-        }
-    }
-
-    fun showAlertWithList() {
-        coroutineScope.launch {
-            builder.buildActionSheet(this) {
-                setTitle("Select an option")
-                addActions(
-                    Alert.Action("Option 1") { debug("Option 1") },
-                    Alert.Action("Option 2") { debug("Option 2") },
-                    Alert.Action("Option 3") { debug("Option 3") },
-                    Alert.Action("Option 4") { debug("Option 4") }
-                )
-            }.show()
-        }
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/HelloShared.kt b/example/shared/src/commonMain/kotlin/HelloShared.kt
deleted file mode 100644
index 725690c56..000000000
--- a/example/shared/src/commonMain/kotlin/HelloShared.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.shared
-
-fun helloCommon(): String {
-    return "Hello from the shared module common source"
-}
diff --git a/example/shared/src/commonMain/kotlin/HudViewModel.kt b/example/shared/src/commonMain/kotlin/HudViewModel.kt
deleted file mode 100644
index 35f2cbbf3..000000000
--- a/example/shared/src/commonMain/kotlin/HudViewModel.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.shared
-
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.hud.BaseHUD
-import com.splendo.kaluga.hud.HUDStyle
-import com.splendo.kaluga.hud.build
-import com.splendo.kaluga.hud.dismissAfter
-import com.splendo.kaluga.hud.presentDuring
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-class HudViewModel(val builder: BaseHUD.Builder) : BaseLifecycleViewModel() {
-
-    fun onShowSystemPressed() {
-        // SYSTEM style by default
-        // No title by default
-        coroutineScope.launch {
-            builder.build(this).present().dismissAfter(3_000)
-        }
-    }
-
-    fun onShowCustomPressed() {
-        coroutineScope.launch {
-            builder.build(this) {
-                setStyle(HUDStyle.CUSTOM)
-                setTitle("This is a custom title")
-            }.presentDuring {
-                // Simulate heavy task
-                delay(3_000)
-            }
-        }
-    }
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/contacts/ContactDetails.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/contacts/ContactDetails.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/contacts/ContactDetails.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/contacts/ContactDetails.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ExampleViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/ExampleViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ExampleViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureDetailsViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListBeaconViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListBeaconViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListBeaconViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothServiceViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothServiceViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothServiceViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/datetimepicker/DateTimePickerViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/datetimepicker/DateTimePickerViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/featureList/FeatureListViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/featureList/PlatformSpecific.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/keyboard/KeyboardViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/location/LocationViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionsListViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/resources/ButtonViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/resources/ColorViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/resources/LabelViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/resources/ResourcesListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt
similarity index 100%
rename from example/shared/src/commonMain/kotlin/viewmodel/resources/ResourcesListViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt
similarity index 100%
rename from newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/network/NetworkViewModel.kt
diff --git a/example/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt b/example/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt
deleted file mode 100644
index 07eba41b7..000000000
--- a/example/shared/src/commonMain/kotlin/stylable/ButtonStyles.kt
+++ /dev/null
@@ -1,224 +0,0 @@
-package com.splendo.kaluga.example.shared.stylable
-
-import com.splendo.kaluga.resources.DefaultColors
-import com.splendo.kaluga.resources.defaultFont
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
-import com.splendo.kaluga.resources.stylable.ButtonStateStyle
-import com.splendo.kaluga.resources.stylable.ButtonStyle
-import com.splendo.kaluga.resources.stylable.GradientStyle
-
-object ButtonStyles {
-
-    val textButton by lazy {
-        ButtonStyle(TextStyles.redText)
-    }
-    val redButton by lazy {
-        ButtonStyle(
-            TextStyles.whiteText,
-            backgroundColor = DefaultColors.red,
-            pressedBackgroundColor = DefaultColors.maroon,
-            disabledBackgroundColor = DefaultColors.lightGray
-        )
-    }
-    val roundedButton by lazy {
-        ButtonStyle(
-            defaultFont,
-            12.0f,
-            defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, BackgroundStyle.Shape.Rectangle(10.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))),
-            pressedStyle = ButtonStateStyle(DefaultColors.azure, DefaultColors.lightSkyBlue, BackgroundStyle.Shape.Rectangle(5.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT))),
-            disabledStyle = ButtonStateStyle(DefaultColors.black, DefaultColors.lightGray, BackgroundStyle.Shape.Rectangle(10.0f))
-        )
-    }
-    val ovalButton by lazy {
-        ButtonStyle(
-            defaultFont,
-            12.0f,
-            defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, BackgroundStyle.Shape.Oval),
-            pressedStyle = ButtonStateStyle(DefaultColors.azure, DefaultColors.lightSkyBlue, BackgroundStyle.Shape.Oval),
-            disabledStyle = ButtonStateStyle(DefaultColors.black, DefaultColors.lightGray, BackgroundStyle.Shape.Oval)
-        )
-    }
-    val redButtonWithStroke by lazy {
-        ButtonStyle(
-            defaultFont,
-            12.0f,
-            defaultStyle = ButtonStateStyle(
-                DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.red),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            ),
-            pressedStyle = ButtonStateStyle(
-                DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.maroon),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            ),
-            disabledStyle = ButtonStateStyle(
-                DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            )
-        )
-    }
-    val roundedButtonWithStroke by lazy {
-        ButtonStyle(
-            defaultFont,
-            12.0f,
-            defaultStyle = ButtonStateStyle(
-                DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.deepSkyBlue),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Rectangle(10.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))
-                )
-            ),
-            pressedStyle = ButtonStateStyle(
-                DefaultColors.azure,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightSkyBlue),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.azure),
-                    BackgroundStyle.Shape.Rectangle(5.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT))
-                )
-            ),
-            disabledStyle = ButtonStateStyle(
-                DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Rectangle(10.0f)
-                )
-            )
-        )
-    }
-    val ovalButtonWithStroke by lazy {
-        ButtonStyle(
-            defaultFont,
-            12.0f,
-            defaultStyle = ButtonStateStyle(
-                DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.deepSkyBlue),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Oval
-                )
-            ),
-            pressedStyle = ButtonStateStyle(
-                DefaultColors.azure,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightSkyBlue),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.azure),
-                    BackgroundStyle.Shape.Oval
-                )
-            ),
-            disabledStyle = ButtonStateStyle(
-                DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Oval
-                )
-            )
-        )
-    }
-
-    val linearGradientButton by lazy {
-        ButtonStyle(
-            defaultFont,
-            12.0f,
-            defaultStyle = ButtonStateStyle(
-                DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            ),
-            pressedStyle = ButtonStateStyle(
-                DefaultColors.azure,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            ),
-            disabledStyle = ButtonStateStyle(
-                DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.lightGray, DefaultColors.gray), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            )
-        )
-    }
-
-    val radialGradientButton by lazy {
-        ButtonStyle(
-            defaultFont,
-            12.0f,
-            defaultStyle = ButtonStateStyle(
-                DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), 50.0f, GradientStyle.CenterPoint(0.3f, 0.3f))),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            ),
-            pressedStyle = ButtonStateStyle(
-                DefaultColors.azure,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), 25.0f, GradientStyle.CenterPoint(0.6f, 0.6f))),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            ),
-            disabledStyle = ButtonStateStyle(
-                DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.lightGray, DefaultColors.gray), 50.0f)),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            )
-        )
-    }
-
-    val angularGradientButton by lazy {
-        ButtonStyle(
-            defaultFont,
-            12.0f,
-            defaultStyle = ButtonStateStyle(
-                DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), GradientStyle.CenterPoint(0.3f, 0.3f))),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            ),
-            pressedStyle = ButtonStateStyle(
-                DefaultColors.azure,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), GradientStyle.CenterPoint(0.6f, 0.6f))),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            ),
-            disabledStyle = ButtonStateStyle(
-                DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.lightGray, DefaultColors.gray))),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Rectangle()
-                )
-            )
-        )
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/stylable/TextStyles.kt b/example/shared/src/commonMain/kotlin/stylable/TextStyles.kt
deleted file mode 100644
index b9d04f117..000000000
--- a/example/shared/src/commonMain/kotlin/stylable/TextStyles.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.splendo.kaluga.example.shared.stylable
-
-import com.splendo.kaluga.resources.DefaultColors
-import com.splendo.kaluga.resources.defaultBoldFont
-import com.splendo.kaluga.resources.defaultFont
-import com.splendo.kaluga.resources.defaultItalicFont
-import com.splendo.kaluga.resources.defaultMonospaceFont
-import com.splendo.kaluga.resources.stylable.TextAlignment
-import com.splendo.kaluga.resources.stylable.TextStyle
-
-object TextStyles {
-
-    val defaultText by lazy {
-        TextStyle(defaultFont, DefaultColors.dimGray, 12.0f)
-    }
-    val defaultTitle by lazy {
-        TextStyle(defaultFont, DefaultColors.dimGray, 16.0f)
-    }
-    val defaultBoldText by lazy {
-        TextStyle(defaultBoldFont, DefaultColors.dimGray, 12.0f)
-    }
-    val defaultItalicText by lazy {
-        TextStyle(defaultItalicFont, DefaultColors.dimGray, 12.0f)
-    }
-    val defaultMonospaceText by lazy {
-        TextStyle(defaultMonospaceFont, DefaultColors.dimGray, 12.0f)
-    }
-    val whiteText by lazy {
-        TextStyle(defaultFont, DefaultColors.white, 12.0f)
-    }
-    val redText by lazy {
-        TextStyle(defaultFont, DefaultColors.red, 12.0f)
-    }
-    val oppositeText by lazy {
-        TextStyle(defaultFont, DefaultColors.dimGray, 12.0f, TextAlignment.END)
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt
deleted file mode 100644
index 98dec51f7..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/architecture/ArchitectureInputViewModel.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.architecture
-
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.architecture.observable.ObservableOptional
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.observable.toInitializedSubject
-import com.splendo.kaluga.architecture.observable.toUninitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-
-class InputNavigation(inputDetails: InputDetails) : SingleValueNavigationAction<InputDetails>(
-    inputDetails,
-    NavigationBundleSpecType.SerializedType(InputDetails.serializer())
-)
-
-class ArchitectureInputViewModel(navigator: Navigator<SingleValueNavigationAction<InputDetails>>) : NavigatingViewModel<SingleValueNavigationAction<InputDetails>>(navigator) {
-
-    val nameHeader = observableOf("Enter your Name")
-    val numberHeader = observableOf("Enter a Number")
-
-    private val _nameInput = MutableStateFlow("")
-    val nameInput = _nameInput.toInitializedSubject(coroutineScope)
-
-    private val _numberInput = MutableStateFlow("")
-    val numberInput = _numberInput.toInitializedSubject(coroutineScope)
-
-    private val _isNameValid: Flow<Boolean> get() {
-        return _nameInput.map {
-            it.isNotEmpty()
-        }
-    }
-    val isNameValid = _isNameValid.toUninitializedObservable(coroutineScope)
-
-    private val _isNumberValid: Flow<Boolean> get() {
-        return _numberInput.map {
-            it.toIntOrNull() != null
-        }
-    }
-    val isNumberValid = _isNumberValid.toUninitializedObservable(coroutineScope)
-
-    private val isValid = combine(_isNameValid, _isNumberValid) {
-        validName, validNumber ->
-        validName && validNumber
-    }
-
-    fun onShowDetailsPressed() {
-        val nameResult: ObservableOptional<String> by nameInput
-        val name: String? by nameResult
-        val numberResult: ObservableOptional<String> by numberInput
-        val number: String? by numberResult
-        coroutineScope.launch {
-            if (isValid.first()) {
-                navigator.navigate(
-                    InputNavigation(
-                        InputDetails(name ?: "", number?.toIntOrNull() ?: 0)
-                    )
-                )
-            }
-        }
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
deleted file mode 100644
index 4f752265f..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/beacons/BeaconsListViewModel.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.beacons
-
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.bluetooth.beacons.Beacons
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-
-class BeaconsListViewModel(private val service: Beacons) : BaseLifecycleViewModel() {
-
-    private val _isScanning = MutableStateFlow(false)
-    val isScanning = _isScanning.toInitializedObservable(coroutineScope)
-
-    private val _beacons = MutableStateFlow<List<BeaconsListBeaconViewModel>>(emptyList())
-    val beacons = _beacons.toInitializedObservable(coroutineScope)
-
-    override fun onResume(scope: CoroutineScope) {
-        super.onResume(scope)
-
-        scope.launch {
-            service
-                .isMonitoring()
-                .collect { _isScanning.value = it }
-        }
-
-        scope.launch {
-            service.beacons
-                .map { beacons ->
-                    beacons.map { beacon ->
-                        BeaconsListBeaconViewModel(beacon.identifier, service)
-                    }
-                }
-                .collect { beacons ->
-                    cleanDevices()
-                    _beacons.value = beacons
-                }
-        }
-    }
-
-    fun onScanPressed() {
-        if (_isScanning.value) {
-            service.stopMonitoring()
-        } else {
-            service.startMonitoring(coroutineScope)
-        }
-    }
-
-    override fun onCleared() {
-        super.onCleared()
-        cleanDevices()
-    }
-
-    private fun cleanDevices() {
-        _beacons.value.forEach { it.onCleared() }
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
deleted file mode 100644
index 68a08b032..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.bluetooth
-
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.observable.toUninitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.base.text.format
-import com.splendo.kaluga.bluetooth.Bluetooth
-import com.splendo.kaluga.bluetooth.device.ConnectableDeviceState
-import com.splendo.kaluga.bluetooth.device.NotConnectableDeviceState
-import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.bluetooth.device.stringValue
-import com.splendo.kaluga.bluetooth.distance
-import com.splendo.kaluga.bluetooth.get
-import com.splendo.kaluga.bluetooth.info
-import com.splendo.kaluga.bluetooth.rssi
-import com.splendo.kaluga.bluetooth.services
-import com.splendo.kaluga.bluetooth.state
-import com.splendo.kaluga.bluetooth.updateRssi
-import com.splendo.kaluga.resources.localized
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-
-class DeviceDetailsSpec : NavigationBundleSpec<DeviceDetailsSpecRow<*>>(setOf(DeviceDetailsSpecRow.UUIDRow))
-
-sealed class DeviceDetailsSpecRow<V>(associatedType: NavigationBundleSpecType<V>) : NavigationBundleSpecRow<V>(associatedType) {
-    object UUIDRow : DeviceDetailsSpecRow<String>(NavigationBundleSpecType.StringType)
-}
-
-class BluetoothDeviceDetailViewModel(private val bluetooth: Bluetooth, private val identifier: Identifier) : BaseLifecycleViewModel() {
-
-    companion object {
-        private const val rssi_frequency = 1000L
-    }
-
-    private val device = bluetooth.devices()[identifier]
-
-    val name = device.info().map { it.name ?: "bluetooth_no_name".localized() }.toUninitializedObservable(coroutineScope)
-    val identifierString = identifier.stringValue
-    val rssi = device.rssi().map { "rssi".localized().format(it) }.toUninitializedObservable(coroutineScope)
-    val distance = device.distance().map { "distance".localized().format(it) }.toUninitializedObservable(coroutineScope)
-    val state = device.state().map { deviceState ->
-        when (deviceState) {
-            is NotConnectableDeviceState -> ""
-            is ConnectableDeviceState.Disconnecting -> "bluetooth_disconneting"
-            is ConnectableDeviceState.Disconnected -> "bluetooth_disconnected"
-            is ConnectableDeviceState.Connected.Discovering -> "bluetooth_discovering"
-            is ConnectableDeviceState.Connected -> "bluetooth_connected"
-            is ConnectableDeviceState.Connecting -> "bluetooth_connecting"
-            is ConnectableDeviceState.Reconnecting -> "bluetooth_reconnecting"
-        }.localized()
-    }.toUninitializedObservable(coroutineScope)
-    private val _services = MutableStateFlow(
-        emptyList<BluetoothServiceViewModel>()
-    )
-    val services = _services.toInitializedObservable(coroutineScope)
-
-    override fun onResume(scope: CoroutineScope) {
-        super.onResume(scope)
-
-        scope.launch {
-            device.services().map { services -> services.map { BluetoothServiceViewModel(bluetooth, identifier, it.uuid) } }.collect {
-                cleanServices()
-                _services.value = it
-            }
-        }
-
-        scope.launch {
-            while (true) {
-                device.updateRssi()
-                delay(rssi_frequency)
-            }
-        }
-    }
-
-    override fun onCleared() {
-        super.onCleared()
-        cleanServices()
-    }
-
-    private fun cleanServices() {
-        _services.value.forEach { it.onCleared() }
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
deleted file mode 100644
index f4d98b64a..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.bluetooth
-
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.toBundle
-import com.splendo.kaluga.architecture.observable.UninitializedObservable
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.observable.toUninitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.base.text.format
-import com.splendo.kaluga.base.utils.toHexString
-import com.splendo.kaluga.bluetooth.Bluetooth
-import com.splendo.kaluga.bluetooth.UUID
-import com.splendo.kaluga.bluetooth.connect
-import com.splendo.kaluga.bluetooth.advertisement
-import com.splendo.kaluga.bluetooth.device.BaseAdvertisementData
-import com.splendo.kaluga.bluetooth.device.DeviceState
-import com.splendo.kaluga.bluetooth.device.ConnectableDeviceState
-import com.splendo.kaluga.bluetooth.device.NotConnectableDeviceState
-import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.bluetooth.device.stringValue
-import com.splendo.kaluga.bluetooth.disconnect
-import com.splendo.kaluga.bluetooth.get
-import com.splendo.kaluga.bluetooth.rssi
-import com.splendo.kaluga.bluetooth.state
-import com.splendo.kaluga.resources.localized
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-
-class BluetoothListDeviceViewModel(private val identifier: Identifier, bluetooth: Bluetooth, navigator: Navigator<BluetoothListNavigation>) : NavigatingViewModel<BluetoothListNavigation>(navigator) {
-
-    enum class ConnectButtonState {
-        Connect,
-        Disconnect
-    }
-
-    private val device = bluetooth.devices()[identifier]
-
-    val name = advertisementObservable { it.name ?: "bluetooth_no_name".localized() }
-    val identifierString = identifier.stringValue
-    val rssi = device.rssi().map { "rssi".localized().format(it) }.toUninitializedObservable(coroutineScope)
-    val isTxPowerVisible = advertisementObservable { it.txPowerLevel != Int.MIN_VALUE }
-    val txPower = advertisementObservable { if (it.txPowerLevel != Int.MIN_VALUE) "txPower".localized().format(it.txPowerLevel) else "" }
-
-    val isConnectButtonVisible = deviceStateObservable { it !is NotConnectableDeviceState }
-    val connectButtonState = deviceStateObservable {
-        when (it) {
-            is ConnectableDeviceState.Disconnected, is ConnectableDeviceState.Disconnecting -> ConnectButtonState.Connect
-            else -> ConnectButtonState.Disconnect
-        }
-    }
-    val isMoreButtonVisible = deviceStateObservable { it is ConnectableDeviceState.Connected }
-
-    val status = deviceStateObservable {
-        when (it) {
-            is NotConnectableDeviceState -> ""
-            is ConnectableDeviceState.Disconnecting -> "bluetooth_disconneting"
-            is ConnectableDeviceState.Disconnected -> "bluetooth_disconnected"
-            is ConnectableDeviceState.Connected -> "bluetooth_connected"
-            is ConnectableDeviceState.Connecting -> "bluetooth_connecting"
-            is ConnectableDeviceState.Reconnecting -> "bluetooth_reconnecting"
-        }.localized()
-    }
-    val serviceUUIDs = advertisementObservable { parseServiceUUIDs(it.serviceUUIDs) }
-    val serviceData = advertisementObservable { parseServiceData(it.serviceData) }
-    val manufacturerId = advertisementObservable { "bluetooth_manufacturer_id".localized().format(it.manufacturerId ?: -1) }
-    val manufacturerData = advertisementObservable { "bluetooth_manufacturer_data".localized().format(it.manufacturerData?.toHexString() ?: "") }
-
-    val _isFoldedOut = MutableStateFlow(false)
-    val isFoldedOut = _isFoldedOut.toInitializedObservable(coroutineScope)
-
-    private fun <T> deviceStateObservable(mapper: (DeviceState) -> T): UninitializedObservable<T> = device.state().map { mapper(it) }.toUninitializedObservable(coroutineScope)
-    private fun <T> advertisementObservable(mapper: (BaseAdvertisementData) -> T): UninitializedObservable<T> = device.advertisement().map { mapper(it) }.toUninitializedObservable(coroutineScope)
-
-    fun toggleFoldOut() = coroutineScope.launch {
-        _isFoldedOut.value = !_isFoldedOut.value
-    }
-
-    fun onConnectPressed() = coroutineScope.launch {
-        device.connect()
-    }
-
-    fun onDisconnectPressed() = coroutineScope.launch {
-        device.disconnect()
-    }
-
-    fun onMorePressed() =
-        navigator.navigate(
-            BluetoothListNavigation(
-                DeviceDetailsSpec().toBundle { specRow ->
-                    when (specRow) {
-                        is DeviceDetailsSpecRow.UUIDRow -> specRow.convertValue(identifier.stringValue)
-                    }
-                }
-            )
-        )
-
-    private fun parseServiceUUIDs(uuids: List<UUID>): String {
-        val uuidString = uuids.fold("") { result, next ->
-            if (result.isEmpty())
-                next.toString()
-            else
-                "$result, $next"
-        }
-        return "bluetooth_service_uuids".localized().format(uuidString)
-    }
-
-    private fun parseServiceData(data: Map<UUID, ByteArray?>): String {
-        val dataString = data.entries.fold("") { result, next ->
-            val nextString = "${next.key}: ${next.value?.toHexString() ?: ""}"
-            if (result.isEmpty())
-                nextString
-            else
-                "$result\n$nextString"
-        }
-        return "bluetooth_service_data".localized().format(dataString)
-    }
-
-    public override fun onCleared() {
-        super.onCleared()
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
deleted file mode 100644
index 3f87cdc8c..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/bluetooth/BluetoothListViewModel.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.bluetooth
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.NavigationBundle
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.bluetooth.Bluetooth
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapLatest
-import kotlinx.coroutines.launch
-
-class BluetoothListNavigation(bundle: NavigationBundle<DeviceDetailsSpecRow<*>>) : NavigationAction<DeviceDetailsSpecRow<*>>(bundle)
-
-class BluetoothListViewModel(private val bluetooth: Bluetooth, navigator: Navigator<BluetoothListNavigation>) : NavigatingViewModel<BluetoothListNavigation>(navigator) {
-
-    private val _isScanning = MutableStateFlow(false)
-    val isScanning = _isScanning.toInitializedObservable(coroutineScope)
-
-    val title = bluetooth.isEnabled
-        .mapLatest { if (it) "Enabled" else "Disabled" }
-        .toInitializedObservable("Initializing...", coroutineScope)
-
-    private val _devices = MutableStateFlow(emptyList<BluetoothListDeviceViewModel>())
-    val devices = _devices.toInitializedObservable(coroutineScope)
-
-    override fun onResume(scope: CoroutineScope) {
-        super.onResume(scope)
-
-        scope.launch { bluetooth.isScanning().collect { _isScanning.value = it } }
-        scope.launch {
-            bluetooth.devices().map { devices -> devices.map { BluetoothListDeviceViewModel(it.identifier, bluetooth, navigator) } }.collect { devices ->
-                cleanDevices()
-                _devices.value = devices.sortedByDescending { it.name.currentOrNull }
-            }
-        }
-    }
-
-    fun onScanPressed() {
-        if (_isScanning.value) {
-            bluetooth.stopScanning()
-        } else {
-            bluetooth.startScanning()
-        }
-    }
-
-    override fun onCleared() {
-        super.onCleared()
-        cleanDevices()
-    }
-
-    private fun cleanDevices() {
-        _devices.value.forEach { it.onCleared() }
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt
deleted file mode 100644
index 843592790..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/info/InfoViewModel.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.info
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.NavigationBundle
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.toBundle
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.review.ReviewManager
-import kotlinx.coroutines.launch
-
-class DialogSpec : NavigationBundleSpec<DialogSpecRow>(setOf(DialogSpecRow.TitleRow, DialogSpecRow.MessageRow))
-
-sealed class DialogSpecRow : NavigationBundleSpecRow<String>(NavigationBundleSpecType.StringType) {
-    object TitleRow : DialogSpecRow()
-    object MessageRow : DialogSpecRow()
-}
-
-class LinkSpec : NavigationBundleSpec<LinkSpecRow>(setOf(LinkSpecRow.LinkRow))
-
-sealed class LinkSpecRow : NavigationBundleSpecRow<String>(NavigationBundleSpecType.StringType) {
-    object LinkRow : LinkSpecRow()
-}
-
-class MailSpec : NavigationBundleSpec<MailSpecRow<*>>(setOf(MailSpecRow.ToRow, MailSpecRow.SubjectRow))
-
-sealed class MailSpecRow<V>(associatedType: NavigationBundleSpecType<V>) : NavigationBundleSpecRow<V>(associatedType) {
-    object ToRow : MailSpecRow<List<String>>(NavigationBundleSpecType.StringArrayType)
-    object SubjectRow : MailSpecRow<String>(NavigationBundleSpecType.StringType)
-}
-
-sealed class InfoNavigation<B : NavigationBundleSpecRow<*>>(bundle: NavigationBundle<B>) : NavigationAction<B>(bundle) {
-
-    class Dialog(bundle: NavigationBundle<DialogSpecRow>) : InfoNavigation<DialogSpecRow>(bundle)
-    class Link(bundle: NavigationBundle<LinkSpecRow>) : InfoNavigation<LinkSpecRow>(bundle)
-    class Mail(bundle: NavigationBundle<MailSpecRow<*>>) : InfoNavigation<MailSpecRow<*>>(bundle)
-}
-
-class InfoViewModel(
-    val reviewManagerBuilder: ReviewManager.Builder,
-    navigator: Navigator<InfoNavigation<*>>
-) : NavigatingViewModel<InfoNavigation<*>>(navigator) {
-
-    sealed class Button(val title: String) {
-        object About : Button("About")
-        object Website : Button("Kaluga.io")
-        object GitHub : Button("GitHub")
-        object Mail : Button("Contact")
-        object Review : Button("Review")
-    }
-
-    val reviewManager = reviewManagerBuilder.create()
-    val buttons = observableOf(listOf(Button.About, Button.Website, Button.GitHub, Button.Review, Button.Mail))
-
-    fun onButtonPressed(button: Button) {
-        when (button) {
-            is Button.About -> InfoNavigation.Dialog(
-                DialogSpec().toBundle { row ->
-                    when (row) {
-                        is DialogSpecRow.TitleRow -> row.convertValue("About Us")
-                        is DialogSpecRow.MessageRow -> row.convertValue("Kaluga is developed by Splendo Consulting BV")
-                    }
-                }
-            )
-            is Button.Website -> InfoNavigation.Link(
-                LinkSpec().toBundle { row ->
-                    when (row) {
-                        is LinkSpecRow.LinkRow -> row.convertValue("https://kaluga.splendo.com")
-                    }
-                }
-            )
-            is Button.GitHub -> InfoNavigation.Link(
-                LinkSpec().toBundle { row ->
-                    when (row) {
-                        is LinkSpecRow.LinkRow -> row.convertValue("https://github.com/splendo/kaluga")
-                    }
-                }
-            )
-            is Button.Mail -> InfoNavigation.Mail(
-                MailSpec().toBundle { row ->
-                    when (row) {
-                        is MailSpecRow.ToRow -> row.convertValue(listOf("info@splendo.com"))
-                        is MailSpecRow.SubjectRow -> row.convertValue("Question about Kaluga")
-                    }
-                }
-            )
-            is Button.Review -> {
-                coroutineScope.launch {
-                    reviewManager.attemptToRequestReview()
-                }
-                null
-            }
-        }?.let { navigator.navigate(it) }
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt
deleted file mode 100644
index f11a4c15c..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/link/LinksViewModel.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.link
-
-import com.splendo.kaluga.alerts.Alert
-import com.splendo.kaluga.alerts.AlertPresenter
-import com.splendo.kaluga.alerts.buildAlert
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.NavigationBundle
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.toBundle
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.links.LinksBuilder
-import com.splendo.kaluga.resources.localized
-import kotlinx.coroutines.launch
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Repository(
-    val name: String,
-    val type: String
-)
-
-class BrowserSpec : NavigationBundleSpec<BrowserSpecRow>(setOf(BrowserSpecRow.UrlSpecRow))
-
-sealed class BrowserNavigationActions<B : NavigationBundleSpecRow<*>>(bundle: NavigationBundle<B>?) : NavigationAction<B>(bundle) {
-    class OpenWebView(bundle: NavigationBundle<BrowserSpecRow>?) : BrowserNavigationActions<BrowserSpecRow>(bundle)
-}
-
-sealed class BrowserSpecRow : NavigationBundleSpecRow<String>(NavigationBundleSpecType.StringType) {
-    object UrlSpecRow : BrowserSpecRow()
-}
-
-class LinksViewModel(
-    linkRepoBuilder: LinksBuilder,
-    val builder: AlertPresenter.Builder,
-    navigator: Navigator<BrowserNavigationActions<BrowserSpecRow>>
-) : NavigatingViewModel<BrowserNavigationActions<BrowserSpecRow>>(navigator) {
-
-    val browserButtonText = observableOf("browser_button_text".localized())
-    val linksInstructions = observableOf("links_instructions".localized())
-
-    private val linksRepo = linkRepoBuilder.create()
-
-    fun showAlert(title: String, message: String, style: Alert.Action.Style) {
-        coroutineScope.launch {
-            val action = Alert.Action("Ok", style)
-            val alert = builder.buildAlert(this) {
-                setTitle(title)
-                setMessage(message)
-                addActions(action)
-            }
-            alert.show()
-        }
-    }
-
-    fun openWebPage() {
-        val result = linksRepo.validateLink("https://kaluga-links.web.app")
-        if (result != null) {
-            navigator.navigate(
-                BrowserNavigationActions.OpenWebView(
-                    BrowserSpec().toBundle { row ->
-                        when (row) {
-                            is BrowserSpecRow.UrlSpecRow -> row.convertValue(
-                                result
-                            )
-                        }
-                    }
-                )
-            )
-        } else {
-            showAlert(
-                "Error Alert",
-                "URL is invalid.",
-                Alert.Action.Style.NEGATIVE
-            )
-        }
-    }
-
-    fun handleIncomingLink(url: String) {
-        val result = linksRepo.handleIncomingLink(url, Repository.serializer())
-        if (result != null) {
-            showAlert(
-                "Alert",
-                result.toString(),
-                Alert.Action.Style.POSITIVE
-            )
-        } else {
-            showAlert(
-                "Error Alert",
-                "Query is invalid or empty.",
-                Alert.Action.Style.NEGATIVE
-            )
-        }
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt
deleted file mode 100644
index 936f18a68..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/location/LocationViewModel.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.location
-
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.location.Location
-import com.splendo.kaluga.location.LocationStateRepoBuilder
-import com.splendo.kaluga.location.location
-import com.splendo.kaluga.permissions.location.LocationPermission
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-
-class LocationViewModel(permission: LocationPermission, repoBuilder: LocationStateRepoBuilder) : BaseLifecycleViewModel() {
-
-    private val locationStateRepo = repoBuilder.create(permission)
-
-    private val _location = MutableStateFlow("")
-    val location = _location.toInitializedObservable(coroutineScope)
-
-    override fun onResume(scope: CoroutineScope) {
-        scope.launch {
-            locationStateRepo.location().map { location ->
-                when (location) {
-                    is Location.KnownLocation -> "${location.latitudeDMS} ${location.longitudeDMS}"
-                    is Location.UnknownLocation -> {
-                        val lastKnownLocation = (location as? Location.UnknownLocation.WithLastLocation)?.let {
-                            " Last Known Location: ${location.lastKnownLocation.latitudeDMS} ${location.lastKnownLocation.longitudeDMS}"
-                        }
-
-                        "Unknown Location. Reason: ${location.reason.name}${ lastKnownLocation ?: "" }"
-                    }
-                }
-            }.collect {
-                _location.value = it
-            }
-        }
-    }
-
-    public override fun onCleared() {
-        super.onCleared()
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
deleted file mode 100644
index 4f799c3d7..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionViewModel.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.permissions
-
-import com.splendo.kaluga.architecture.observable.InitializedObservable
-import com.splendo.kaluga.architecture.observable.UninitializedObservable
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.observable.toUninitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.permissions.base.Permission
-import com.splendo.kaluga.permissions.base.PermissionState
-import com.splendo.kaluga.permissions.base.Permissions
-import com.splendo.kaluga.resources.localized
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-
-class PermissionViewModel(private val permissions: Permissions, private val permission: Permission) : BaseLifecycleViewModel() {
-
-    val permissionStateMessage: UninitializedObservable<String> = permissions[permission]
-        .map { permissionState ->
-            when (permissionState) {
-                is PermissionState.Allowed -> "permission_allowed".localized()
-                is PermissionState.Denied.Requestable -> "permission_requestable".localized()
-                is PermissionState.Denied.Locked -> "permission_denied".localized()
-                is PermissionState.Initializing,
-                is PermissionState.Deinitialized,
-                is PermissionState.Uninitialized -> "permission_unknown".localized()
-            }
-        }
-        .toUninitializedObservable(coroutineScope)
-
-    val showPermissionButton: UninitializedObservable<Boolean> = permissions[permission]
-        .map { permissionState -> permissionState is PermissionState.Denied.Requestable }
-        .toUninitializedObservable(coroutineScope)
-
-    private val _requestMessage = MutableSharedFlow<String?>(0)
-    val requestMessage: InitializedObservable<String?> = _requestMessage.toInitializedObservable(null, coroutineScope)
-
-    fun requestPermission() {
-        coroutineScope.launch {
-            _requestMessage.emit((if (permissions.request(permission)) "permission_request_success" else "permission_request_failed").localized())
-            _requestMessage.emit(null)
-        }
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
deleted file mode 100644
index baf3c65b7..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/permissions/PermissionsListViewModel.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.permissions
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.toBundle
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-import kotlinx.serialization.Serializable
-
-@Serializable
-enum class PermissionView(val title: String) {
-    Bluetooth("permissions_bluetooth".localized()),
-    Calendar("permissions_calendar".localized()),
-    Camera("permissions_camera".localized()),
-    Contacts("permissions_contacts".localized()),
-    Location("permissions_location".localized()),
-    Microphone("permissions_microphone".localized()),
-    Notifications("permissions_notifications".localized()),
-    Storage("permissions_storage".localized())
-}
-
-object PermissionNavigationBundleSpecRow : NavigationBundleSpecRow<PermissionView>(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))
-class PermissionNavigationBundleSpec : NavigationBundleSpec<PermissionNavigationBundleSpecRow>(setOf(PermissionNavigationBundleSpecRow))
-
-class PermissionsListNavigationAction(permissionView: PermissionView) : NavigationAction<PermissionNavigationBundleSpecRow>(PermissionNavigationBundleSpec().toBundle { spec -> spec.convertValue(permissionView) })
-
-class PermissionsListViewModel(navigator: Navigator<PermissionsListNavigationAction>) : NavigatingViewModel<PermissionsListNavigationAction>(navigator) {
-
-    val permissions = observableOf(
-        listOf(
-            PermissionView.Bluetooth,
-            PermissionView.Calendar,
-            PermissionView.Camera,
-            PermissionView.Contacts,
-            PermissionView.Location,
-            PermissionView.Microphone,
-            PermissionView.Notifications,
-            PermissionView.Storage
-        )
-    )
-
-    fun onPermissionPressed(permissionView: PermissionView) {
-        navigator.navigate(PermissionsListNavigationAction(permissionView))
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt
deleted file mode 100644
index 1dd8689b2..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/system/SystemViewModel.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.system
-
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-sealed class SystemFeatures(val name: String) {
-    object Network : SystemFeatures("network_feature".localized())
-}
-
-sealed class SystemNavigationActions<Value>(
-    value: Value,
-    type: NavigationBundleSpecType<Value>
-) : SingleValueNavigationAction<Value>(value, type) {
-    object Network : SystemNavigationActions<Unit>(Unit, NavigationBundleSpecType.UnitType)
-}
-
-class SystemViewModel(
-    navigator: Navigator<SystemNavigationActions<Unit>>
-) : NavigatingViewModel<SystemNavigationActions<Unit>>(navigator) {
-
-    val modules =
-        observableOf(
-            listOf(
-                SystemFeatures.Network
-            )
-        )
-
-    fun onButtonTapped(systemFeatures: SystemFeatures) {
-        when (systemFeatures) {
-            is SystemFeatures.Network -> navigator.navigate(SystemNavigationActions.Network)
-        }
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt b/example/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt
deleted file mode 100644
index f79552975..000000000
--- a/example/shared/src/commonMain/kotlin/viewmodel/system/network/NetworkViewModel.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.system.network
-
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.system.network.Network
-import com.splendo.kaluga.system.network.state.NetworkStateRepoBuilder
-import com.splendo.kaluga.system.network.state.network
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.launch
-
-class NetworkViewModel(
-    networkStateRepoBuilder: NetworkStateRepoBuilder
-) : BaseLifecycleViewModel() {
-
-    private val networkRepo = networkStateRepoBuilder.create()
-
-    private val _networkState: MutableStateFlow<String?> = MutableStateFlow(null)
-    val networkState = _networkState.toInitializedObservable(coroutineScope)
-
-    override fun onResume(scope: CoroutineScope) {
-        super.onResume(scope)
-
-        scope.launch {
-            networkRepo.network().collect {
-                when (it) {
-                    is Network.Unknown.WithoutLastNetwork ->
-                        _networkState.value =
-                            "Network's state is Unknown and without the last available connection."
-                    is Network.Unknown.WithLastNetwork ->
-                        _networkState.value =
-                            "Network's state is Unknown and with last known connection as ${it.lastKnownNetwork}."
-                    is Network.Known.Cellular ->
-                        _networkState.value =
-                            "Network's state is Available through Cellular."
-                    is Network.Known.Wifi ->
-                        _networkState.value =
-                            "Network's state is Available through WIFI."
-                    is Network.Known.Absent ->
-                        _networkState.value =
-                            "Network's state is Absent."
-                }
-            }
-        }
-    }
-}
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
similarity index 100%
rename from newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
rename to example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoNavigator.kt
similarity index 100%
rename from newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoNavigator.kt
rename to example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoNavigator.kt
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/BrowserNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/BrowserNavigator.kt
similarity index 100%
rename from newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/BrowserNavigator.kt
rename to example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/BrowserNavigator.kt
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
similarity index 100%
rename from newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
rename to example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
diff --git a/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
similarity index 100%
rename from newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
rename to example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
diff --git a/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt b/example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
similarity index 100%
rename from newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
rename to example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
diff --git a/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
similarity index 100%
rename from newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
rename to example/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
diff --git a/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt b/example/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
similarity index 100%
rename from newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
rename to example/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
diff --git a/example/web/.firebaserc b/example/web/.firebaserc
deleted file mode 100644
index 1584668b8..000000000
--- a/example/web/.firebaserc
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "projects": {
-    "default": "kaluga"
-  },
-  "targets": {
-    "kaluga": {
-      "hosting": {
-        "kaluga-links-example": [
-          "kaluga-links"
-        ],
-        "kaluga-links": [
-          "kaluga"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/example/web/.gitignore b/example/web/.gitignore
deleted file mode 100644
index dbb58ffbf..000000000
--- a/example/web/.gitignore
+++ /dev/null
@@ -1,66 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-firebase-debug.log*
-firebase-debug.*.log*
-
-# Firebase cache
-.firebase/
-
-# Firebase config
-
-# Uncomment this if you'd like others to create their own Firebase project.
-# For a team working on the same Firebase project(s), it is recommended to leave
-# it commented so all members can deploy to the same project(s) in .firebaserc.
-# .firebaserc
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
diff --git a/example/web/firebase.json b/example/web/firebase.json
deleted file mode 100644
index 6684821a4..000000000
--- a/example/web/firebase.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "hosting": [
-    {
-      "target": "kaluga-links-example",
-      "public": "public",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ]
-    },
-    {
-      "target": "kaluga-links",
-      "public": "links",
-      "headers": [
-        {
-          "source": ".well-known/assetlinks.json",
-          "headers": [
-            {
-              "key": "Content-Type",
-              "value": "application/json"
-            }
-          ]
-        },
-        {
-          "source": ".well-known/apple-app-site-association",
-          "headers": [
-            {
-              "key": "Content-Type",
-              "value": "application/json"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
diff --git a/example/web/public/.well-known/apple-app-site-association b/example/web/public/.well-known/apple-app-site-association
deleted file mode 100644
index ac3cc7a35..000000000
--- a/example/web/public/.well-known/apple-app-site-association
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "applinks": {
-        "apps": [],
-        "details": [
-            {
-                "appID": "2732HQPVJP.com.splendo.kaluga.example",
-                "paths": ["*"]
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/example/web/public/.well-known/assetlinks.json b/example/web/public/.well-known/assetlinks.json
deleted file mode 100644
index 394aec1b2..000000000
--- a/example/web/public/.well-known/assetlinks.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "relation": ["delegate_permission/common.handle_all_urls"],
-    "target": {
-      "namespace": "android_app",
-      "package_name": "com.splendo.kaluga.example",
-      "sha256_cert_fingerprints": [
-          "BF:0D:B5:2E:8E:4F:9C:73:94:C7:D8:B9:27:CB:CE:AD:DA:85:45:2D:4A:E5:BF:E0:F7:17:00:18:B9:92:EA:E6"
-      ]
-    }
-  }
-]
\ No newline at end of file
diff --git a/example/web/public/404.html b/example/web/public/404.html
deleted file mode 100644
index 829eda8fd..000000000
--- a/example/web/public/404.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Page Not Found</title>
-
-    <style media="screen">
-      body { background: #ECEFF1; color: rgba(0,0,0,0.87); font-family: Roboto, Helvetica, Arial, sans-serif; margin: 0; padding: 0; }
-      #message { background: white; max-width: 360px; margin: 100px auto 16px; padding: 32px 24px 16px; border-radius: 3px; }
-      #message h3 { color: #888; font-weight: normal; font-size: 16px; margin: 16px 0 12px; }
-      #message h2 { color: #ffa100; font-weight: bold; font-size: 16px; margin: 0 0 8px; }
-      #message h1 { font-size: 22px; font-weight: 300; color: rgba(0,0,0,0.6); margin: 0 0 16px;}
-      #message p { line-height: 140%; margin: 16px 0 24px; font-size: 14px; }
-      #message a { display: block; text-align: center; background: #039be5; text-transform: uppercase; text-decoration: none; color: white; padding: 16px; border-radius: 4px; }
-      #message, #message a { box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); }
-      #load { color: rgba(0,0,0,0.4); text-align: center; font-size: 13px; }
-      @media (max-width: 600px) {
-        body, #message { margin-top: 0; background: white; box-shadow: none; }
-        body { border-top: 16px solid #ffa100; }
-      }
-    </style>
-  </head>
-  <body>
-    <div id="message">
-      <h2>404</h2>
-      <h1>Page Not Found</h1>
-      <p>The specified file was not found on this website. Please check the URL for mistakes and try again.</p>
-      <h3>Why am I seeing this?</h3>
-      <p>This page was generated by the Firebase Command-Line Interface. To modify it, edit the <code>404.html</code> file in your project's configured <code>public</code> directory.</p>
-    </div>
-  </body>
-</html>
diff --git a/example/web/public/index.html b/example/web/public/index.html
deleted file mode 100644
index 622d7d8ca..000000000
--- a/example/web/public/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-      <meta charset="utf-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1">
-      <meta name="kaluga-example" content="app-id=2732HQPVJP.com.splendo.kaluga.example, app-argument=https://kaluga-links.web.app/kalugaexample?name=Kaluga&type=Multiplatform+Library">
-
-      <title>Kaluga Example Web</title>
-    </head>
-    <body>
-        <script>
-          function openApp() {
-              window.location = "https://kaluga-links.web.app/kalugaexample?name=Kaluga&type=Multiplatform+Library";
-          }
-        </script>
-        <h1>Kaluga Links</h1>
-        <p>When "Open Kaluga Example" is tapped, the app will be opened using App Links (for android) or Universal Links (for ios) and passing a query with the values we want to deserialize into an object.</p>
-        <p>For the purpose of this demo we will pass to the app the query "name=Kaluga&type=Multiplatform Library." and we will deserialize it using kaluga-links method `handleIncomingLinks` into `Repository` class.</p>
-        <code>
-            @Serializable
-            <br/>
-            data class Repository(val name: String, val type: String)
-        </code>
-
-        <div id="open-app-div">
-            <a href="#" onclick="openApp();">Open Kaluga Example</a>
-        </div>
-    </body>
-</html>
diff --git a/example/web/public/style.css b/example/web/public/style.css
deleted file mode 100644
index 9f3a73aa0..000000000
--- a/example/web/public/style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#open-app-div {
-    text-align: center;
-}
\ No newline at end of file
diff --git a/newexample/android/src/main/AndroidManifest.xml b/newexample/android/src/main/AndroidManifest.xml
deleted file mode 100644
index 2cd6b95de..000000000
--- a/newexample/android/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.splendo.kaluga.example">
-
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-    <!-- If your app targets Android 9 or lower,  -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
-
-    <uses-permission android:name="android.permission.READ_CALENDAR"/>
-    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
-
-    <uses-permission android:name="android.permission.CAMERA"/>
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
-
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <!-- When the app is not using Custom Tabs to open a URL, Android 11 requires a "queries" tag in order to look for apps that can open a given URL.
-    In this case the query will go through the apps with an intent that refers to a browser. -->
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="https" />
-        </intent>
-    </queries>
-
-    <application
-        android:name=".ExampleApplication"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.splendo.kaluga.example.ExampleActivity"
-            android:label="Features list"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <activity android:name=".location.LocationActivity"
-            android:label="@string/feature_location"/>
-        <activity android:name=".permissions.PermissionsDemoListActivity"
-            android:label="@string/permissions_list"/>
-        <activity android:name=".permissions.PermissionsDemoActivity" android:label="Permissions"/>
-        <activity android:name=".alerts.AlertsActivity"
-            android:label="@string/feature_alerts"/>
-        <activity android:name=".datetimepicker.DateTimePickerActivity"
-            android:label="@string/feature_date_time_picker"/>
-        <activity android:name=".loading.LoadingActivity"
-            android:label="@string/feature_hud"/>
-        <activity android:name=".keyboard.KeyboardManagerActivity"
-            android:label="@string/keyboard_manager"/>
-        <activity android:name=".link.LinksActivity"
-            android:exported="true"
-            android:label="@string/feature_links"
-            android:launchMode="singleTask">
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data
-                    android:scheme="https"
-                    android:host="kaluga-links.web.app"
-                    android:pathPrefix="/kalugaexample"/>
-            </intent-filter>
-        </activity>
-        <activity android:name=".architecture.ArchitectureInputActivity"
-            android:label="@string/feature_architecture"/>
-
-        <activity android:name="com.splendo.kaluga.example.platformspecific.PlatformSpecificActivity"
-            android:label="@string/feature_platform_specific"/>
-        <activity android:name="com.splendo.kaluga.example.contacts.ContactsActivity"
-            android:label="@string/feature_platform_specific_compose_navigation"/>
-        <activity android:name="com.splendo.kaluga.example.bottomSheet.BottomSheetActivity"
-            android:label="@string/feature_platform_specific_compose_bottom_sheet"/>
-
-        <activity android:name=".architecture.ArchitectureDetailsActivity"
-            android:label="@string/feature_architecture"/>
-        <activity android:name=".bluetooth.BluetoothActivity"
-            android:label="@string/feature_bluetooth"/>
-        <activity android:name=".bluetooth.BluetoothMoreActivity"
-            android:label="@string/feature_bluetooth"/>
-        <activity android:name=".beacons.BeaconsActivity"
-            android:label="@string/feature_beacons"/>
-        <activity android:name=".resources.ResourcesActivity"
-            android:label="@string/feature_resources"/>
-        <activity android:name=".resources.ColorActivity"
-            android:label="@string/feature_resources_color"/>
-        <activity android:name=".resources.LabelActivity"
-            android:label="@string/feature_resources_label"/>
-        <activity android:name=".resources.ButtonActivity"
-            android:label="@string/feature_resources_button"/>
-
-        <activity android:name=".system.SystemActivity" android:label="@string/feature_system"/>
-        <activity android:name=".system.NetworkActivity" android:label="@string/network_feature"/>
-
-
-        <service android:name=".location.LocationBackgroundService"/>
-
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
deleted file mode 100644
index 2145a4a03..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example
-
-import android.os.Bundle
-import com.google.android.material.tabs.TabLayout
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.shared.viewmodel.ExampleTabNavigation
-import com.splendo.kaluga.example.shared.viewmodel.ExampleViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class ExampleActivity : KalugaViewModelActivity<ExampleViewModel>(R.layout.activity_example) {
-
-    override val viewModel: ExampleViewModel by viewModel {
-        parametersOf(
-            ActivityNavigator<ExampleTabNavigation> { action ->
-                when (action) {
-                    ExampleTabNavigation.FeatureList -> NavigationSpec.Fragment(
-                        R.id.example_fragment,
-                        createFragment = { FeaturesListFragment() }
-                    )
-                    ExampleTabNavigation.Info -> NavigationSpec.Fragment(
-                        R.id.example_fragment,
-                        createFragment = { InfoFragment() }
-                    )
-                }
-            }
-        )
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val tabs: TabLayout = findViewById(R.id.tabs)
-
-        viewModel.tabs.observeInitialized { exampleTabs ->
-            tabs.removeAllTabs()
-            exampleTabs.forEach { tab ->
-                tabs.addTab(tabs.newTab().setText(tab.title).setTag(tab))
-            }
-        }
-
-        tabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
-            override fun onTabReselected(tab: TabLayout.Tab?) {
-                val exampleTab = tab?.tag as? ExampleViewModel.Tab ?: return
-                viewModel.tab.post(exampleTab)
-            }
-
-            override fun onTabSelected(tab: TabLayout.Tab?) {
-                val exampleTab = tab?.tag as? ExampleViewModel.Tab ?: return
-                viewModel.tab.post(exampleTab)
-            }
-
-            override fun onTabUnselected(tab: TabLayout.Tab?) { }
-        })
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
deleted file mode 100644
index 7622e5ab7..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example
-
-import android.app.Application
-import com.splendo.kaluga.base.ApplicationHolder
-import com.splendo.kaluga.example.shared.di.initKoin
-
-class ExampleApplication : Application() {
-
-    override fun onCreate() {
-        super.onCreate()
-        ApplicationHolder.application = this
-
-        initKoin()
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
deleted file mode 100644
index 9132c61e1..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
-import com.splendo.kaluga.example.alerts.AlertsActivity
-import com.splendo.kaluga.example.architecture.ArchitectureInputActivity
-import com.splendo.kaluga.example.beacons.BeaconsActivity
-import com.splendo.kaluga.example.bluetooth.BluetoothActivity
-import com.splendo.kaluga.example.databinding.ViewListButtonBinding
-import com.splendo.kaluga.example.datetimepicker.DateTimePickerActivity
-import com.splendo.kaluga.example.keyboard.KeyboardManagerActivity
-import com.splendo.kaluga.example.link.LinksActivity
-import com.splendo.kaluga.example.loading.LoadingActivity
-import com.splendo.kaluga.example.location.LocationActivity
-import com.splendo.kaluga.example.permissions.PermissionsDemoListActivity
-import com.splendo.kaluga.example.platformspecific.PlatformSpecificActivity
-import com.splendo.kaluga.example.resources.ResourcesActivity
-import com.splendo.kaluga.example.shared.viewmodel.featureList.Feature
-import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewModel
-import com.splendo.kaluga.example.system.SystemActivity
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class FeaturesListFragment : KalugaViewModelFragment<FeatureListViewModel>(R.layout.fragment_features_list) {
-
-    override val viewModel: FeatureListViewModel by viewModel {
-        parametersOf(
-            ActivityNavigator<FeatureListNavigationAction> { action ->
-                when (action) {
-                    FeatureListNavigationAction.Location -> NavigationSpec.Activity<LocationActivity>()
-                    FeatureListNavigationAction.Permissions -> NavigationSpec.Activity<PermissionsDemoListActivity>()
-                    FeatureListNavigationAction.Alerts -> NavigationSpec.Activity<AlertsActivity>()
-                    FeatureListNavigationAction.DateTimePicker -> NavigationSpec.Activity<DateTimePickerActivity>()
-                    FeatureListNavigationAction.LoadingIndicator -> NavigationSpec.Activity<LoadingActivity>()
-                    FeatureListNavigationAction.Architecture -> NavigationSpec.Activity<ArchitectureInputActivity>()
-                    FeatureListNavigationAction.Keyboard -> NavigationSpec.Activity<KeyboardManagerActivity>()
-                    FeatureListNavigationAction.Links -> NavigationSpec.Activity<LinksActivity>()
-                    FeatureListNavigationAction.System -> NavigationSpec.Activity<SystemActivity>()
-                    FeatureListNavigationAction.Bluetooth -> NavigationSpec.Activity<BluetoothActivity>()
-                    FeatureListNavigationAction.Beacons -> NavigationSpec.Activity<BeaconsActivity>()
-                    FeatureListNavigationAction.Resources -> NavigationSpec.Activity<ResourcesActivity>()
-                    FeatureListNavigationAction.PlatformSpecific -> NavigationSpec.Activity<PlatformSpecificActivity>()
-                }
-            }
-        )
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val adapter = FeaturesAdapter(viewModel).apply {
-
-            view.findViewById<RecyclerView>(R.id.features_list).adapter = this
-        }
-        viewModel.feature.observeInitialized { adapter.features = it }
-    }
-}
-
-class FeaturesAdapter(private val viewModel: FeatureListViewModel) : RecyclerView.Adapter<FeaturesAdapter.FeatureViewHolder>() {
-
-    class FeatureViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
-        val button = binding.button
-    }
-
-    var features: List<Feature> = emptyList()
-        set(newValue) {
-            field = newValue
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FeatureViewHolder {
-        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return FeatureViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = features.size
-
-    override fun onBindViewHolder(holder: FeatureViewHolder, position: Int) {
-        features.getOrNull(position)?.let { feature ->
-            holder.button.text = feature.title
-            holder.button.setOnClickListener { viewModel.onFeaturePressed(feature) }
-        } ?: run {
-            holder.button.text = null
-            holder.button.setOnClickListener(null)
-        }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
deleted file mode 100644
index 7f2d19139..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.appcompat.widget.AppCompatButton
-import androidx.fragment.app.DialogFragment
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
-import com.splendo.kaluga.example.shared.viewmodel.info.DialogSpec
-import com.splendo.kaluga.example.shared.viewmodel.info.InfoNavigation
-import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-import java.net.URL
-
-class InfoFragment : KalugaViewModelFragment<InfoViewModel>(R.layout.fragment_info) {
-
-    override val viewModel: InfoViewModel by viewModel {
-        parametersOf(
-            ActivityNavigator<InfoNavigation<*>> { action ->
-                when (action) {
-                    is InfoNavigation.Dialog -> {
-                        NavigationSpec.Dialog(
-                            createDialog = {
-                                InfoDialog(action.value)
-                            }
-                        )
-                    }
-                    is InfoNavigation.Link -> NavigationSpec.Browser(
-                        URL(action.value),
-                        NavigationSpec.Browser.Type.Normal
-                    )
-                    is InfoNavigation.Mail -> NavigationSpec.Email(
-                        NavigationSpec.Email.EmailSettings(
-                            to = action.value.to,
-                            subject = action.value.subject
-                        )
-                    )
-                }
-            }
-        )
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-
-        super.onViewCreated(view, savedInstanceState)
-
-        val adapter = InfoAdapter(viewModel).apply {
-            view.findViewById<RecyclerView>(R.id.info_buttons)
-                .adapter = this
-        }
-        viewModel.buttons.observeInitialized { adapter.buttons = it }
-    }
-}
-
-class InfoAdapter(private val viewModel: InfoViewModel) : RecyclerView.Adapter<InfoAdapter.InfoViewHolder>() {
-
-    class InfoViewHolder(val button: AppCompatButton) : RecyclerView.ViewHolder(button)
-
-    var buttons: List<InfoViewModel.Button> = emptyList()
-        set(newValue) {
-            field = newValue
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InfoViewHolder {
-        val button = LayoutInflater.from(parent.context).inflate(R.layout.view_list_button, parent, false) as AppCompatButton
-        return InfoViewHolder(button)
-    }
-
-    override fun getItemCount(): Int = buttons.size
-
-    override fun onBindViewHolder(holder: InfoViewHolder, position: Int) {
-        buttons.getOrNull(position)?.let { button ->
-            holder.button.text = button.title
-            holder.button.setOnClickListener { viewModel.onButtonPressed(button) }
-        } ?: run {
-            holder.button.text = null
-            holder.button.setOnClickListener(null)
-        }
-    }
-}
-
-class InfoDialog(private val dialogSpec: DialogSpec) : DialogFragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val v = inflater.inflate(R.layout.dialog_info, container, false)
-
-        v.findViewById<TextView>(R.id.title).text = dialogSpec.title
-        v.findViewById<TextView>(R.id.message).text = dialogSpec.message
-
-        return v
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
deleted file mode 100644
index 5fa52e39d..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.alerts
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import androidx.appcompat.widget.AppCompatButton
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-@SuppressLint("SetTextI18n")
-class AlertsActivity : KalugaViewModelActivity<AlertViewModel>(R.layout.activity_alerts) {
-
-    override val viewModel: AlertViewModel by viewModel()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        findViewById<AppCompatButton>(R.id.btn_simple_alert).setOnClickListener { viewModel.showAlert() }
-        findViewById<AppCompatButton>(R.id.btn_dismissible_alert).setOnClickListener { viewModel.showAndDismissAfter(3) }
-        findViewById<AppCompatButton>(R.id.btn_alert_list).setOnClickListener { viewModel.showAlertWithList() }
-        findViewById<AppCompatButton>(R.id.btn_alert_input_field).setOnClickListener { viewModel.showAlertWithInput() }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
deleted file mode 100644
index 58cffa8c6..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.architecture
-
-import android.os.Bundle
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityArchitectureDetailsBinding
-import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.CloseDetailsNavigation
-import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class ArchitectureDetailsActivity : KalugaViewModelActivity<ArchitectureDetailsViewModel>() {
-
-    companion object {
-        val resultCode = 1
-    }
-
-    override val viewModel: ArchitectureDetailsViewModel by viewModel {
-        val type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
-        intent.extras?.toTypedProperty(type)?.let { details ->
-            parametersOf(
-                details,
-                ActivityNavigator<CloseDetailsNavigation> {
-                    NavigationSpec.Close(resultCode)
-                }
-            )
-        } ?: parametersOf("", 0)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val binding = ActivityArchitectureDetailsBinding.inflate(layoutInflater, null, false)
-        setContentView(binding.root)
-        binding.viewModel = viewModel
-        binding.lifecycleOwner = this
-    }
-
-    override fun onBackPressed() {
-        viewModel.onClosePressed()
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
deleted file mode 100644
index 3c131451e..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.architecture
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.result.contract.ActivityResultContract
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityArchitectureInputBinding
-import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
-import com.splendo.kaluga.example.shared.viewmodel.architecture.InputNavigation
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class ArchitectureInputActivity : KalugaViewModelActivity<ArchitectureInputViewModel>() {
-
-    inner class Contract : ActivityResultContract<Intent, InputDetails?>() {
-
-        override fun createIntent(context: Context, input: Intent): Intent = input
-
-        override fun parseResult(
-            resultCode: Int,
-            intent: Intent?
-        ): InputDetails? = intent?.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(InputDetails.serializer()))
-    }
-
-    override val viewModel: ArchitectureInputViewModel by viewModel {
-        parametersOf(
-            ActivityNavigator<InputNavigation> {
-                NavigationSpec.Activity<ArchitectureDetailsActivity>(
-                    launchType = NavigationSpec.Activity.LaunchType.ActivityContract<ArchitectureInputActivity> { contract }
-                )
-            }
-        )
-    }
-
-    private val contract = registerForActivityResult(Contract()) { inputDetails ->
-        inputDetails?.let {
-            viewModel.nameInput.post(it.name)
-            viewModel.numberInput.post(it.number.toString())
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val binding = ActivityArchitectureInputBinding.inflate(layoutInflater, null, false)
-        setContentView(binding.root)
-        binding.viewModel = viewModel
-        binding.lifecycleOwner = this
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt
deleted file mode 100644
index b1d59b78b..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsActivity.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.beacons
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import androidx.core.view.forEach
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.databinding.ActivityBeaconsBinding
-import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel
-import kotlinx.coroutines.runBlocking
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class BeaconsActivity : KalugaViewModelActivity<BeaconsListViewModel>() {
-
-    override val viewModel: BeaconsListViewModel by viewModel()
-
-    private lateinit var adapter: BeaconsAdapter
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val binding = ActivityBeaconsBinding.inflate(layoutInflater, null, false)
-        binding.viewModel = viewModel
-        binding.lifecycleOwner = this
-        setContentView(binding.root)
-        adapter = BeaconsAdapter(this)
-        binding.beaconsList.adapter = adapter
-        binding.beaconsList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
-
-        viewModel.isScanning.observe {
-            invalidateOptionsMenu()
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.bluetooth_menu, menu)
-        return true
-    }
-
-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean = runBlocking {
-        val scanning = viewModel.isScanning.current
-        menu?.forEach { item ->
-            when (item.itemId) {
-                R.id.start_scanning -> item.isVisible = !scanning
-                R.id.stop_scanning -> item.isVisible = scanning
-            }
-        }
-        super.onPrepareOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.start_scanning,
-            R.id.stop_scanning -> {
-                viewModel.onScanPressed()
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
deleted file mode 100644
index 1c76de087..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.beacons
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.example.databinding.BeaconItemBinding
-import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListBeaconViewModel
-
-class BeaconsAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BeaconsAdapter.BeaconItemViewHolder>() {
-
-    class BeaconItemViewHolder(val binding: BeaconItemBinding) : RecyclerView.ViewHolder(binding.root)
-
-    internal var beacons: List<BeaconsListBeaconViewModel> = emptyList()
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BeaconItemViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        val binding = BeaconItemBinding.inflate(inflater, parent, false)
-        binding.lifecycleOwner = lifecycleOwner
-        return BeaconItemViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int {
-        return beacons.size
-    }
-
-    override fun onBindViewHolder(holder: BeaconItemViewHolder, position: Int) {
-        val viewModel = beacons[position]
-        holder.binding.viewModel = viewModel
-    }
-
-    override fun onViewAttachedToWindow(holder: BeaconItemViewHolder) {
-        super.onViewAttachedToWindow(holder)
-
-        holder.binding.viewModel?.didResume()
-    }
-
-    override fun onViewDetachedFromWindow(holder: BeaconItemViewHolder) {
-        super.onViewDetachedFromWindow(holder)
-
-        holder.binding.viewModel?.didPause()
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
deleted file mode 100644
index 74e5ad859..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.beacons
-
-import androidx.databinding.BindingAdapter
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListBeaconViewModel
-
-object BeaconsBinding {
-    @BindingAdapter("beacons")
-    @JvmStatic
-    fun bindBeacons(view: RecyclerView, beacons: List<BeaconsListBeaconViewModel>?) {
-        val beaconsAdapter = view.adapter as? BeaconsAdapter ?: return
-        beaconsAdapter.beacons = beacons ?: emptyList()
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
deleted file mode 100644
index 35a75ea35..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothActivity.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.bluetooth
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import androidx.core.view.forEach
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.databinding.ActivityBluetoothBinding
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetails
-import kotlinx.coroutines.runBlocking
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class BluetoothActivity : KalugaViewModelActivity<BluetoothListViewModel>() {
-
-    override val viewModel: BluetoothListViewModel by viewModel {
-        parametersOf(
-            ActivityNavigator<DeviceDetails> {
-                NavigationSpec.Activity<BluetoothMoreActivity>()
-            }
-        )
-    }
-
-    private lateinit var adapter: BluetoothAdapter
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val binding = ActivityBluetoothBinding.inflate(layoutInflater, null, false)
-        binding.viewModel = viewModel
-        binding.lifecycleOwner = this
-        setContentView(binding.root)
-        adapter = BluetoothAdapter(this)
-        binding.devicesList.adapter = adapter
-        binding.devicesList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
-
-        viewModel.isScanning.observe {
-            invalidateOptionsMenu()
-        }
-
-        viewModel.title.observe(::setTitle)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.bluetooth_menu, menu)
-        return true
-    }
-
-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean = runBlocking {
-        val scanning = viewModel.isScanning.current
-        menu?.forEach { item ->
-            when (item.itemId) {
-                R.id.start_scanning -> item.isVisible = !scanning
-                R.id.stop_scanning -> item.isVisible = scanning
-            }
-        }
-        super.onPrepareOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.start_scanning,
-            R.id.stop_scanning -> {
-                viewModel.onScanPressed()
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
deleted file mode 100644
index 5010367be..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.bluetooth
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.databinding.BindingAdapter
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.example.databinding.BluetoothItemBinding
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListDeviceViewModel
-
-object DevicesBinding {
-
-    @BindingAdapter("devices")
-    @JvmStatic
-    fun bindDevices(view: RecyclerView, devices: List<BluetoothListDeviceViewModel>?) {
-        val bluetoothAdapter = view.adapter as? BluetoothAdapter
-            ?: return
-        bluetoothAdapter.bluetoothDevices = devices ?: emptyList()
-    }
-}
-
-class BluetoothAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothAdapter.BluetoothItemViewHolder>() {
-
-    class BluetoothItemViewHolder(val binding: BluetoothItemBinding) : RecyclerView.ViewHolder(binding.root)
-
-    internal var bluetoothDevices: List<BluetoothListDeviceViewModel> = emptyList()
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BluetoothItemViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        val binding = BluetoothItemBinding.inflate(inflater, parent, false)
-        binding.lifecycleOwner = lifecycleOwner
-        return BluetoothItemViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int {
-        return bluetoothDevices.size
-    }
-
-    override fun onBindViewHolder(holder: BluetoothItemViewHolder, position: Int) {
-        val viewModel = bluetoothDevices[position]
-        holder.binding.viewModel = viewModel
-    }
-
-    override fun onViewAttachedToWindow(holder: BluetoothItemViewHolder) {
-        super.onViewAttachedToWindow(holder)
-
-        holder.binding.viewModel?.didResume()
-    }
-
-    override fun onViewDetachedFromWindow(holder: BluetoothItemViewHolder) {
-        super.onViewDetachedFromWindow(holder)
-
-        holder.binding.viewModel?.didPause()
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
deleted file mode 100644
index a0b9e6322..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.bluetooth
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.databinding.BindingAdapter
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.example.databinding.BluetoothCharacteristicItemBinding
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothCharacteristicViewModel
-
-object CharacteristicsBinding {
-
-    @BindingAdapter("characteristics")
-    @JvmStatic
-    fun bindCharacteristics(view: RecyclerView, characteristics: List<BluetoothCharacteristicViewModel>?) {
-        val characteristicAdapter = view.adapter as? BluetoothCharacteristicAdapter
-            ?: return
-        characteristicAdapter.characteristics = characteristics ?: emptyList()
-    }
-}
-
-class BluetoothCharacteristicAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothCharacteristicAdapter.BluetoothCharacteristicItemViewHolder>() {
-
-    class BluetoothCharacteristicItemViewHolder(val characteristicItem: BluetoothCharacteristicItemBinding) : RecyclerView.ViewHolder(characteristicItem.root)
-
-    internal var characteristics = emptyList<BluetoothCharacteristicViewModel>()
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): BluetoothCharacteristicItemViewHolder {
-        val binding = BluetoothCharacteristicItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        binding.lifecycleOwner = lifecycleOwner
-        binding.descriptors.adapter = BluetoothDescriptorAdapter(lifecycleOwner)
-        return BluetoothCharacteristicItemViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int {
-        return characteristics.size
-    }
-
-    override fun onBindViewHolder(holder: BluetoothCharacteristicItemViewHolder, position: Int) {
-        holder.characteristicItem.viewModel = characteristics[position]
-    }
-
-    override fun onViewAttachedToWindow(holder: BluetoothCharacteristicItemViewHolder) {
-        super.onViewAttachedToWindow(holder)
-
-        holder.characteristicItem.viewModel?.didResume()
-    }
-
-    override fun onViewDetachedFromWindow(holder: BluetoothCharacteristicItemViewHolder) {
-        super.onViewDetachedFromWindow(holder)
-
-        holder.characteristicItem.viewModel?.didPause()
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
deleted file mode 100644
index e59ee3b49..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.bluetooth
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.databinding.BindingAdapter
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.example.databinding.BluetoothDescriptorItemBinding
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDescriptorViewModel
-
-object DescriptorsBinding {
-
-    @BindingAdapter("descriptors")
-    @JvmStatic
-    fun bindDescriptors(view: RecyclerView, descriptors: List<BluetoothDescriptorViewModel>?) {
-        val descriptorAdapter = view.adapter as? BluetoothDescriptorAdapter
-            ?: return
-        descriptorAdapter.descriptors = descriptors ?: emptyList()
-    }
-}
-
-class BluetoothDescriptorAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothDescriptorAdapter.BluetoothDescriptorItemViewHolder>() {
-
-    class BluetoothDescriptorItemViewHolder(val descriptorItem: BluetoothDescriptorItemBinding) : RecyclerView.ViewHolder(descriptorItem.root)
-
-    var descriptors = emptyList<BluetoothDescriptorViewModel>()
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): BluetoothDescriptorItemViewHolder {
-        val binding = BluetoothDescriptorItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        binding.lifecycleOwner = lifecycleOwner
-        return BluetoothDescriptorItemViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int {
-        return descriptors.size
-    }
-
-    override fun onBindViewHolder(holder: BluetoothDescriptorItemViewHolder, position: Int) {
-        holder.descriptorItem.viewModel = descriptors[position]
-    }
-
-    override fun onViewAttachedToWindow(holder: BluetoothDescriptorItemViewHolder) {
-        super.onViewAttachedToWindow(holder)
-
-        holder.descriptorItem.viewModel?.didResume()
-    }
-
-    override fun onViewDetachedFromWindow(holder: BluetoothDescriptorItemViewHolder) {
-        super.onViewDetachedFromWindow(holder)
-
-        holder.descriptorItem.viewModel?.didPause()
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
deleted file mode 100644
index 49ce564ef..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.bluetooth
-
-import android.os.Bundle
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.bluetooth.device.SerializableIdentifier
-import com.splendo.kaluga.example.databinding.ActivityBluetoothMoreBinding
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class BluetoothMoreActivity : KalugaViewModelActivity<BluetoothDeviceDetailViewModel>() {
-
-    override val viewModel: BluetoothDeviceDetailViewModel by viewModel {
-        parametersOf(
-            intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(SerializableIdentifier.serializer()))!!.identifier
-        )
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val binding = ActivityBluetoothMoreBinding.inflate(layoutInflater, null, false)
-        binding.viewModel = viewModel
-        binding.lifecycleOwner = this
-        setContentView(binding.root)
-
-        binding.serviceList.adapter = BluetoothServiceAdapter(this)
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
deleted file mode 100644
index 46711f70e..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.bluetooth
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.databinding.BindingAdapter
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.example.databinding.BluetoothServiceItemBinding
-import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothServiceViewModel
-
-object ServicesBinding {
-
-    @BindingAdapter("services")
-    @JvmStatic
-    fun bindServices(view: RecyclerView, services: List<BluetoothServiceViewModel>?) {
-        val serviceAdapter = view.adapter as? BluetoothServiceAdapter
-            ?: return
-        serviceAdapter.services = services ?: emptyList()
-    }
-}
-
-class BluetoothServiceAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothServiceAdapter.BluetoothServiceItemViewHolder>() {
-
-    class BluetoothServiceItemViewHolder(val serviceItem: BluetoothServiceItemBinding) : RecyclerView.ViewHolder(serviceItem.root)
-
-    internal var services: List<BluetoothServiceViewModel> = emptyList()
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): BluetoothServiceItemViewHolder {
-        val binding = BluetoothServiceItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        binding.lifecycleOwner = lifecycleOwner
-        binding.characteristicsList.adapter = BluetoothCharacteristicAdapter(lifecycleOwner)
-        return BluetoothServiceItemViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int {
-        return services.size
-    }
-
-    override fun onBindViewHolder(holder: BluetoothServiceItemViewHolder, position: Int) {
-        holder.serviceItem.viewModel = services[position]
-    }
-
-    override fun onViewAttachedToWindow(holder: BluetoothServiceItemViewHolder) {
-        super.onViewAttachedToWindow(holder)
-
-        holder.serviceItem.viewModel?.didResume()
-    }
-
-    override fun onViewDetachedFromWindow(holder: BluetoothServiceItemViewHolder) {
-        super.onViewDetachedFromWindow(holder)
-
-        holder.serviceItem.viewModel?.didPause()
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt
deleted file mode 100644
index b766243e4..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.splendo.kaluga.example.datetimepicker
-
-import android.os.Bundle
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityDateTimePickerBinding
-import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
-import org.koin.android.ext.android.inject
-
-class DateTimePickerActivity : KalugaViewModelActivity<DateTimePickerViewModel>() {
-
-    override val viewModel: DateTimePickerViewModel by inject()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val binding = ActivityDateTimePickerBinding.inflate(layoutInflater, null, false)
-        setContentView(binding.root)
-        binding.viewModel = viewModel
-        binding.lifecycleOwner = this
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
deleted file mode 100644
index 15ffc09e7..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.keyboard
-
-import android.os.Bundle
-import androidx.appcompat.widget.AppCompatButton
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
-import com.splendo.kaluga.keyboard.ViewFocusHandler
-import com.splendo.kaluga.keyboard.keyboardManagerBuilder
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class KeyboardManagerActivity : KalugaViewModelActivity<KeyboardViewModel>(R.layout.activity_keyboard_manager) {
-
-    override val viewModel: KeyboardViewModel by viewModel {
-        parametersOf(
-            keyboardManagerBuilder(),
-            ViewFocusHandler(R.id.edit_field)
-        )
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        findViewById<AppCompatButton>(R.id.btn_show_keyboard).setOnClickListener { viewModel.onShowPressed() }
-        findViewById<AppCompatButton>(R.id.btn_hide_keyboard).setOnClickListener { viewModel.onHidePressed() }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
deleted file mode 100644
index 846c75ea4..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.link
-
-import android.content.Intent
-import android.os.Bundle
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.databinding.ActivityLinkBinding
-import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
-import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-import java.net.URL
-
-class LinksActivity : KalugaViewModelActivity<LinksViewModel>(R.layout.activity_link) {
-
-    override val viewModel: LinksViewModel by viewModel {
-        parametersOf(
-            ActivityNavigator<BrowserNavigationActions<*>> {
-                when (it) {
-                    is BrowserNavigationActions.OpenWebView -> NavigationSpec.Browser(
-                        URL(it.value),
-                        NavigationSpec.Browser.Type.Normal
-                    )
-                }
-            }
-        )
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setupBindings()
-
-        handleAppLinks(intent)
-    }
-
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        intent?.let {
-            handleAppLinks(it)
-        }
-    }
-
-    private fun handleAppLinks(intent: Intent) {
-        intent.let { i ->
-            i.data?.let { uri ->
-                val url = URL(uri.scheme, uri.host, uri.path)
-                viewModel.handleIncomingLink("$url?${uri.encodedQuery}")
-            }
-        }
-    }
-
-    private fun setupBindings() {
-        val binding = ActivityLinkBinding.inflate(layoutInflater, null, false)
-        binding.viewModel = viewModel
-        binding.lifecycleOwner = this
-        setContentView(binding.root)
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
deleted file mode 100644
index 11468040e..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.loading
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import androidx.appcompat.widget.AppCompatButton
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-@SuppressLint("SetTextI18n")
-class LoadingActivity : KalugaViewModelActivity<HudViewModel>(R.layout.activity_loading) {
-
-    override val viewModel: HudViewModel by viewModel()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        findViewById<AppCompatButton>(R.id.btn_show_loading_indicator_system).setOnClickListener {
-            viewModel.onShowSystemPressed()
-        }
-
-        findViewById<AppCompatButton>(R.id.btn_show_loading_indicator_custom).setOnClickListener {
-            viewModel.onShowCustomPressed()
-        }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
deleted file mode 100644
index 0ef45e6d2..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.location
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.widget.AppCompatButton
-import androidx.appcompat.widget.AppCompatTextView
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
-import com.splendo.kaluga.permissions.location.LocationPermission
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class LocationActivity : KalugaViewModelActivity<LocationViewModel>(R.layout.activity_location) {
-
-    companion object {
-        private val permission = LocationPermission(background = false, precise = true)
-    }
-
-    override val viewModel: LocationViewModel by viewModel {
-        parametersOf(permission)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        findViewById<AppCompatButton>(R.id.enable_background).setOnClickListener {
-            startService(Intent(applicationContext, LocationBackgroundService::class.java))
-        }
-
-        findViewById<AppCompatButton>(R.id.disable_background).setOnClickListener {
-            stopService(Intent(applicationContext, LocationBackgroundService::class.java))
-        }
-
-        viewModel.location.observeInitialized {
-            val info = findViewById<AppCompatTextView>(R.id.info)
-            info.text = it
-            info.animate().withEndAction {
-                info.animate().setDuration(10000).alpha(0.12f).start()
-            }.alpha(1f).setDuration(100).start()
-        }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
deleted file mode 100644
index 27a852cd7..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.location
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
-import com.splendo.kaluga.permissions.location.LocationPermission
-
-class LocationBackgroundService : androidx.lifecycle.LifecycleService() {
-
-    companion object {
-        const val notificationId = 1
-        const val channelId = "location_channel"
-        const val channelName = "Kaluga Location"
-
-        private val permission = LocationPermission(background = true, precise = true)
-    }
-
-    private val notificationService by lazy { applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager }
-
-    private val viewModel = LocationViewModel(permission)
-
-    override fun onCreate() {
-        super.onCreate()
-
-        viewModel.location.observeInitialized { message ->
-            NotificationManagerCompat.from(applicationContext).notify(notificationId, getNotification(message))
-        }
-
-        startForeground(notificationId, getNotification(""))
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        super.onStartCommand(intent, flags, startId)
-        viewModel.didResume()
-        return START_NOT_STICKY
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        viewModel.didPause()
-        viewModel.onCleared()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            stopForeground(STOP_FOREGROUND_REMOVE)
-        } else {
-            stopForeground(true)
-        }
-        NotificationManagerCompat.from(applicationContext).cancel(notificationId)
-    }
-
-    private fun createChannelIfNeeded() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && notificationService.getNotificationChannel(
-                channelId
-            ) == null
-        ) {
-            val importance = NotificationManager.IMPORTANCE_DEFAULT
-            val channel = NotificationChannel(channelId, channelName, importance)
-            channel.setSound(null, null)
-            channel.enableVibration(false)
-            channel.setShowBadge(false)
-            notificationService.createNotificationChannel(channel)
-        }
-    }
-
-    private fun getNotification(message: String): Notification {
-        createChannelIfNeeded()
-        val builder = NotificationCompat.Builder(applicationContext, channelId)
-            .setSmallIcon(R.drawable.ic_launcher_foreground)
-            .setContentTitle(applicationContext.getString(R.string.location_background))
-            .setContentText(message)
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setSound(null)
-            .setVibrate(null)
-            .setBadgeIconType(NotificationCompat.BADGE_ICON_NONE)
-        val notification = builder.build()
-
-        notification.flags = Notification.FLAG_NO_CLEAR or Notification.FLAG_ONGOING_EVENT
-        return notification
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
deleted file mode 100644
index aee8b70c2..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- Copyright (c) 2020. Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.permissions
-
-import android.os.Bundle
-import android.view.View
-import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.widget.AppCompatButton
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
-import com.splendo.kaluga.permissions.bluetooth.BluetoothPermission
-import com.splendo.kaluga.permissions.calendar.CalendarPermission
-import com.splendo.kaluga.permissions.camera.CameraPermission
-import com.splendo.kaluga.permissions.contacts.ContactsPermission
-import com.splendo.kaluga.permissions.location.LocationPermission
-import com.splendo.kaluga.permissions.microphone.MicrophonePermission
-import com.splendo.kaluga.permissions.notifications.NotificationsPermission
-import com.splendo.kaluga.permissions.storage.StoragePermission
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class PermissionsDemoActivity : KalugaViewModelActivity<PermissionViewModel>(R.layout.activity_permissions_demo) {
-
-    override val viewModel: PermissionViewModel by viewModel {
-        intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))?.let { permissionView ->
-            parametersOf(permissionView.permission)
-        } ?: parametersOf()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        supportActionBar?.title = intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))?.title
-
-        viewModel.permissionStateMessage.observe {
-            findViewById<TextView>(R.id.permissions_message).text = it
-        }
-
-        viewModel.showPermissionButton.observe {
-            findViewById<AppCompatButton>(R.id.btn_permissions_bluetooth_request_permissions).visibility = if (it == true) View.VISIBLE else View.GONE
-        }
-
-        findViewById<AppCompatButton>(R.id.btn_permissions_bluetooth_request_permissions).setOnClickListener { viewModel.requestPermission() }
-
-        viewModel.requestMessage.observeInitialized { message ->
-            if (message != null) Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
-        }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
deleted file mode 100644
index 48fdd892b..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.permissions
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.appcompat.widget.AppCompatButton
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class PermissionsDemoListActivity : KalugaViewModelActivity<PermissionsListViewModel>(R.layout.activity_permissions_list) {
-
-    override val viewModel: PermissionsListViewModel by viewModel {
-        parametersOf(
-            ActivityNavigator<PermissionsListNavigationAction> {
-                NavigationSpec.Activity<PermissionsDemoActivity>()
-            }
-        )
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val adapter = PermissionsAdapter(viewModel).apply {
-            findViewById<RecyclerView>(R.id.permissions_list).adapter = this
-        }
-        viewModel.permissions.observeInitialized { adapter.permissions = it }
-    }
-}
-
-class PermissionsAdapter(private val viewModel: PermissionsListViewModel) : RecyclerView.Adapter<PermissionsAdapter.PermissionsViewHolder>() {
-
-    class PermissionsViewHolder(val button: AppCompatButton) : RecyclerView.ViewHolder(button)
-
-    var permissions: List<PermissionView> = emptyList()
-        set(newValue) {
-            field = newValue
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PermissionsViewHolder {
-        val button = LayoutInflater.from(parent.context).inflate(R.layout.view_list_button, parent, false) as AppCompatButton
-        return PermissionsViewHolder(button)
-    }
-
-    override fun getItemCount(): Int = permissions.size
-
-    override fun onBindViewHolder(holder: PermissionsViewHolder, position: Int) {
-        permissions.getOrNull(position)?.let { permission ->
-            holder.button.text = permission.title
-            holder.button.setOnClickListener { viewModel.onPermissionPressed(permission) }
-        } ?: run {
-            holder.button.text = null
-            holder.button.setOnClickListener(null)
-        }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
deleted file mode 100644
index e47f80400..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific
-
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.architecture.compose.state
-import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.example.bottomSheet.BottomSheetActivity
-import com.splendo.kaluga.example.contacts.ContactsActivity
-import com.splendo.kaluga.example.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.viewmodel.featureList.PlatformFeatureListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.featureList.PlatformSpecificFeaturesViewModel
-
-class PlatformSpecificActivity : KalugaViewModelComposeActivity<PlatformSpecificFeaturesViewModel>() {
-    override val viewModel = PlatformSpecificFeaturesViewModel(ActivityNavigator(::navigationMapper))
-
-    @Composable
-    override fun Layout(viewModel: PlatformSpecificFeaturesViewModel) {
-        PlatformSpecificFeaturesLayout(viewModel)
-    }
-}
-
-private fun navigationMapper(action: PlatformFeatureListNavigationAction): NavigationSpec =
-    when (action) {
-        is PlatformFeatureListNavigationAction.ComposeNavigation -> NavigationSpec.Activity(
-            ContactsActivity::class.java)
-        is PlatformFeatureListNavigationAction.ComposeBottomSheet -> NavigationSpec.Activity(
-            BottomSheetActivity::class.java)
-    }
-
-@Composable
-private fun PlatformSpecificFeaturesLayout(viewModel: PlatformSpecificFeaturesViewModel) {
-    MdcTheme {
-        ViewModelComposable(viewModel) {
-            val features by feature.state()
-            LazyColumn {
-                items(features) { item ->
-                    Button(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(Padding.default),
-                        onClick = { onFeaturePressed(item) },
-                    ) {
-                        Text(
-                            text = item.title.uppercase(),
-                            style = MaterialTheme.typography.button,
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-@Preview
-private fun PlatformSpecificFeaturesLayoutPreview() {
-    PlatformSpecificFeaturesLayout(
-        PlatformSpecificFeaturesViewModel(ActivityNavigator(::navigationMapper))
-    )
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
deleted file mode 100644
index 9a38060f6..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2022 Splendo Consulting B.V. The Netherlands
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-
-package com.splendo.kaluga.example.resources
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityResourcesBinding
-import com.splendo.kaluga.example.databinding.ViewListButtonBinding
-import com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel
-import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
-import com.splendo.kaluga.resources.dpToPixel
-import com.splendo.kaluga.resources.view.KalugaButton
-import com.splendo.kaluga.resources.view.bindButton
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class ButtonActivity : KalugaViewModelActivity<ButtonViewModel>() {
-
-    override val viewModel: ButtonViewModel by viewModel()
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val binding = ActivityResourcesBinding.inflate(layoutInflater, null, false)
-        setContentView(binding.root)
-
-        val adapter = ButtonAdapter().apply {
-
-            binding.resourcesList.adapter = this
-        }
-        viewModel.buttons.observeInitialized { adapter.buttons = it }
-        binding.resourcesList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
-    }
-}
-
-class ButtonAdapter : RecyclerView.Adapter<ButtonAdapter.ButtonViewHolder>() {
-
-    class ButtonViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
-        val button = binding.button
-    }
-
-    var buttons: List<KalugaButton> = emptyList()
-        set(newValue) {
-            field = newValue
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ButtonViewHolder {
-        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ButtonViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = buttons.size
-
-    override fun onBindViewHolder(holder: ButtonViewHolder, position: Int) {
-        buttons.getOrNull(position)?.let { button ->
-            holder.button.bindButton(button)
-        } ?: run {
-            holder.button.text = null
-            holder.button.background = null
-            holder.button.setOnClickListener(null)
-        }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
deleted file mode 100644
index 105ffca09..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2022 Splendo Consulting B.V. The Netherlands
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-
-package com.splendo.kaluga.example.resources
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
-import android.widget.Button
-import android.widget.TextView
-import androidx.databinding.BindingAdapter
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityResourcesColorBinding
-import com.splendo.kaluga.example.databinding.ViewResourceListBackgroundBinding
-import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
-import com.splendo.kaluga.resources.DefaultColors
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
-import com.splendo.kaluga.resources.view.KalugaButton
-import com.splendo.kaluga.resources.view.KalugaLabel
-import com.splendo.kaluga.resources.view.applyBackgroundStyle
-import com.splendo.kaluga.resources.view.bindButton
-import com.splendo.kaluga.resources.view.bindLabel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class ColorActivity : KalugaViewModelActivity<ColorViewModel>() {
-
-    override val viewModel: ColorViewModel by viewModel()
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val binding = ActivityResourcesColorBinding.inflate(layoutInflater, null, false)
-        binding.viewModel = viewModel
-        binding.lifecycleOwner = this
-        setContentView(binding.root)
-
-        binding.backdropEdit.setOnEditorActionListener { v, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                viewModel.submitBackdropText(v.text.toString())
-                true
-            } else {
-                false
-            }
-        }
-
-        binding.sourceEdit.setOnEditorActionListener { v, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                viewModel.submitSourceText(v.text.toString())
-                true
-            } else {
-                false
-            }
-        }
-
-        binding.backdropLighten.adapter = BackgroundAdapter()
-        binding.backdropDarken.adapter = BackgroundAdapter()
-        binding.blendedLighten.adapter = BackgroundAdapter()
-        binding.blendedDarken.adapter = BackgroundAdapter()
-        binding.sourceLighten.adapter = BackgroundAdapter()
-        binding.sourceDarken.adapter = BackgroundAdapter()
-    }
-}
-
-class BackgroundAdapter : RecyclerView.Adapter<BackgroundAdapter.BackgroundViewHolder>() {
-
-    class BackgroundViewHolder(val binding: ViewResourceListBackgroundBinding) : RecyclerView.ViewHolder(binding.root) {
-        val view = binding.root
-    }
-
-    var backgrounds: List<BackgroundStyle> = emptyList()
-        set(newValue) {
-            field = newValue
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BackgroundViewHolder {
-        val binding = ViewResourceListBackgroundBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return BackgroundViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = backgrounds.size
-
-    override fun onBindViewHolder(holder: BackgroundViewHolder, position: Int) {
-        backgrounds.getOrNull(position)?.let { background ->
-            holder.view.applyBackgroundStyle(background)
-        } ?: run {
-            holder.view.setBackgroundColor(DefaultColors.clear)
-        }
-    }
-}
-
-object ResourcesBinding {
-
-    @BindingAdapter("button")
-    @JvmStatic
-    fun bindButton(view: Button, button: KalugaButton?) {
-        button?.let {
-            view.bindButton(it)
-        }
-    }
-
-    @BindingAdapter("label")
-    @JvmStatic
-    fun bindLabel(view: TextView, label: KalugaLabel?) {
-        label?.let {
-            view.bindLabel(it)
-        }
-    }
-
-    @BindingAdapter("backgroundStyle")
-    @JvmStatic
-    fun bindBackgroundStyle(view: View, backgroundStyle: BackgroundStyle?) {
-        backgroundStyle?.let {
-            view.applyBackgroundStyle(it)
-        }
-    }
-
-    @BindingAdapter("backgrounds")
-    @JvmStatic
-    fun bindBackgrounds(recyclerView: RecyclerView, backgrounds: List<BackgroundStyle>?) {
-        val adapter = recyclerView.adapter as? BackgroundAdapter ?: return
-        adapter.backgrounds = backgrounds ?: emptyList()
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
deleted file mode 100644
index 9addfb939..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2022 Splendo Consulting B.V. The Netherlands
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-
-package com.splendo.kaluga.example.resources
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityResourcesBinding
-import com.splendo.kaluga.example.databinding.ViewListTextViewBinding
-import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
-import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
-import com.splendo.kaluga.resources.dpToPixel
-import com.splendo.kaluga.resources.view.KalugaLabel
-import com.splendo.kaluga.resources.view.bindLabel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class LabelActivity : KalugaViewModelActivity<LabelViewModel>() {
-
-    override val viewModel: LabelViewModel by viewModel()
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val binding = ActivityResourcesBinding.inflate(layoutInflater, null, false)
-        setContentView(binding.root)
-
-        val adapter = LabelAdapter().apply {
-
-            binding.resourcesList.adapter = this
-        }
-        binding.resourcesList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
-        viewModel.labels.observeInitialized { adapter.labels = it }
-    }
-}
-
-class LabelAdapter : RecyclerView.Adapter<LabelAdapter.LabelViewHolder>() {
-
-    class LabelViewHolder(val binding: ViewListTextViewBinding) : RecyclerView.ViewHolder(binding.root) {
-        val label = binding.label
-    }
-
-    var labels: List<KalugaLabel> = emptyList()
-        set(newValue) {
-            field = newValue
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LabelViewHolder {
-        val binding = ViewListTextViewBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return LabelViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = labels.size
-
-    override fun onBindViewHolder(holder: LabelViewHolder, position: Int) {
-        labels.getOrNull(position)?.let { label ->
-            holder.label.bindLabel(label)
-        } ?: run {
-            holder.label.text = null
-        }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt
deleted file mode 100644
index a587071fb..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.splendo.kaluga.example.resources
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityResourcesBinding
-import com.splendo.kaluga.example.databinding.ViewListButtonBinding
-import com.splendo.kaluga.example.shared.viewmodel.resources.Resource
-import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class ResourcesActivity : KalugaViewModelActivity<ResourcesListViewModel>() {
-    override val viewModel: ResourcesListViewModel by viewModel {
-        parametersOf(
-            ActivityNavigator<ResourcesListNavigationAction> { action ->
-                when (action) {
-                    is ResourcesListNavigationAction.Label -> NavigationSpec.Activity<LabelActivity>()
-                    is ResourcesListNavigationAction.Color -> NavigationSpec.Activity<ColorActivity>()
-                    is ResourcesListNavigationAction.Button -> NavigationSpec.Activity<ButtonActivity>()
-                }
-            }
-        )
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val binding = ActivityResourcesBinding.inflate(layoutInflater, null, false)
-        setContentView(binding.root)
-
-        val adapter = ResourcesAdapter(viewModel).apply {
-
-            binding.resourcesList.adapter = this
-        }
-        viewModel.resources.observeInitialized { adapter.resources = it }
-    }
-}
-
-class ResourcesAdapter(private val viewModel: ResourcesListViewModel) :
-    RecyclerView.Adapter<ResourcesAdapter.ResourceViewHolder>() {
-
-    class ResourceViewHolder(val binding: ViewListButtonBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        val button = binding.button
-    }
-
-    var resources: List<Resource> = emptyList()
-        set(newValue) {
-            field = newValue
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResourceViewHolder {
-        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ResourceViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = resources.size
-
-    override fun onBindViewHolder(holder: ResourceViewHolder, position: Int) {
-        resources.getOrNull(position)?.let { resource ->
-            holder.button.text = resource.title
-            holder.button.setOnClickListener { viewModel.onResourceSelected(resource) }
-        } ?: run {
-            holder.button.text = null
-            holder.button.setOnClickListener(null)
-        }
-    }
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
deleted file mode 100644
index 4a1a63290..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.system
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.databinding.ViewListButtonBinding
-import com.splendo.kaluga.example.shared.viewmodel.system.SystemFeatures
-import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationActions
-import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class SystemActivity : KalugaViewModelActivity<SystemViewModel>(R.layout.activity_system) {
-    override val viewModel: SystemViewModel by viewModel {
-        parametersOf(
-            ActivityNavigator<SystemNavigationActions> { action ->
-                when (action) {
-                    SystemNavigationActions.Network -> NavigationSpec.Activity<NetworkActivity>()
-                }
-            }
-        )
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val adapter = SystemFeatureAdapter(viewModel).apply {
-            findViewById<RecyclerView>(R.id.system_features_list).adapter = this
-        }
-
-        viewModel.modules.observeInitialized {
-            adapter.modules = it
-        }
-    }
-}
-
-class SystemFeatureAdapter(
-    private val viewModel: SystemViewModel
-) : RecyclerView.Adapter<SystemFeatureAdapter.SystemFeatureViewHolder>() {
-
-    inner class SystemFeatureViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
-        val button = binding.button
-    }
-
-    var modules: List<SystemFeatures> = emptyList()
-        set(newValue) {
-            field = newValue
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SystemFeatureViewHolder {
-        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return SystemFeatureViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: SystemFeatureViewHolder, position: Int) {
-        modules.getOrNull(position)?.let { feature ->
-            holder.button.text = feature.name
-            holder.button.setOnClickListener { viewModel.onButtonTapped(feature) }
-        } ?: run {
-            holder.button.text = null
-            holder.button.setOnClickListener(null)
-        }
-    }
-
-    override fun getItemCount(): Int = modules.size
-}
diff --git a/newexample/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt b/newexample/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt
deleted file mode 100644
index b7398e774..000000000
--- a/newexample/android/src/main/java/com/splendo/kaluga/example/view/ItemDecoration.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2022 Splendo Consulting B.V. The Netherlands
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- */
-
-package com.splendo.kaluga.example.view
-
-import android.graphics.Rect
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-
-class VerticalSpaceItemDecoration(private val verticalSpaceHeight: Int) : RecyclerView.ItemDecoration() {
-    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
-        outRect.bottom = verticalSpaceHeight
-    }
-}
-
-class HorizontalSpaceItemDecoration(private val horizontalSpaceWidth: Int) : RecyclerView.ItemDecoration() {
-    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
-        outRect.right = horizontalSpaceWidth
-    }
-}
diff --git a/newexample/android/src/main/res/drawable/ic_account.xml b/newexample/android/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 0e510741e..000000000
--- a/newexample/android/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/colorPrimary" android:pathData="M3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2L5,3c-1.11,0 -2,0.9 -2,2zM15,9c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3zM6,17c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1L6,18v-1z"/>
-</vector>
diff --git a/newexample/android/src/main/res/drawable/ic_launcher_foreground.xml b/newexample/android/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index fffaf19df..000000000
--- a/newexample/android/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="361"
-    android:viewportHeight="361">
-  <path
-      android:pathData="M0,0h361v361h-361z"
-      android:strokeWidth="1"
-      android:fillColor="#FFFFFF"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M216.166,228l49.628,0l-24.814,-42.538z"
-      android:strokeWidth="1"
-      android:fillColor="#0095D5"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M186.999,183l49.628,-0l-24.814,42.538z"
-      android:strokeWidth="1"
-      android:fillColor="#3087DB"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M186.999,178l49.628,0l-24.814,-42.538z"
-      android:strokeWidth="1"
-      android:fillColor="#557CDF"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M216.166,133l49.628,-0l-24.814,42.538z"
-      android:strokeWidth="1"
-      android:fillColor="#806EE3"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M138.333,178l42.628,0l-21.314,-36.538z"
-      android:strokeWidth="1"
-      android:fillColor="#F88909"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M159.647,219.538l-21.314,-36.538l42.628,-0z"
-      android:strokeWidth="1"
-      android:fillColor="#E47550"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M112.667,222l42.628,0l-21.314,-36.538z"
-      android:strokeWidth="1"
-      android:fillColor="#C757BC"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M87,183l42.628,-0l-21.314,36.538z"
-      android:strokeWidth="1"
-      android:fillColor="#0095D5"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M87,178l42.628,0l-21.314,-36.538z"
-      android:strokeWidth="1"
-      android:fillColor="#3087DB"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M112.667,139l42.628,-0l-21.314,36.538z"
-      android:strokeWidth="1"
-      android:fillColor="#806EE3"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-</vector>
diff --git a/newexample/android/src/main/res/drawable/ic_refresh_circle.xml b/newexample/android/src/main/res/drawable/ic_refresh_circle.xml
deleted file mode 100644
index 43bf87fcd..000000000
--- a/newexample/android/src/main/res/drawable/ic_refresh_circle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/refresh_circle.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M12 2A10 10 0 1 0 22 12A10 10 0 0 0 12 2M18 11H13L14.81 9.19A3.94 3.94 0 0 0 12 8A4 4 0 1 0 15.86 13H17.91A6 6 0 1 1 12 6A5.91 5.91 0 0 1 16.22 7.78L18 6Z" />
-</vector>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/drawable/ic_stop_circle.xml b/newexample/android/src/main/res/drawable/ic_stop_circle.xml
deleted file mode 100644
index a0770a6eb..000000000
--- a/newexample/android/src/main/res/drawable/ic_stop_circle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/stop_circle.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M9,9H15V15H9" />
-</vector>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_alerts.xml b/newexample/android/src/main/res/layout/activity_alerts.xml
deleted file mode 100644
index 74ea5dea3..000000000
--- a/newexample/android/src/main/res/layout/activity_alerts.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_simple_alert"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/show_alert"/>
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_dismissible_alert"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/dismissible_alert"/>
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_alert_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/alert_list"/>
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_alert_input_field"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/alert_input"/>
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-</androidx.core.widget.NestedScrollView>
diff --git a/newexample/android/src/main/res/layout/activity_architecture_details.xml b/newexample/android/src/main/res/layout/activity_architecture_details.xml
deleted file mode 100644
index 926bd42b8..000000000
--- a/newexample/android/src/main/res/layout/activity_architecture_details.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="10dp">
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:text="@{viewModel.name.stateFlow}" />
-
-        <TextView
-            android:id="@+id/number"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/name"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:text="@{viewModel.number.stateFlow}" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="@{view -> viewModel.onInversePressed()}"
-            app:layout_constraintTop_toBottomOf="@id/number"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:text="@string/architecture_details_inverse"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_architecture_input.xml b/newexample/android/src/main/res/layout/activity_architecture_input.xml
deleted file mode 100644
index 95c28e0ac..000000000
--- a/newexample/android/src/main/res/layout/activity_architecture_input.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel" />
-        <import type="com.splendo.kaluga.architecture.observable.BaseSubject"/>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="10dp">
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/name_input_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:hint="@{viewModel.nameHeader.liveData}"
-            app:errorEnabled="@{viewModel.isNameValid.liveData}">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/name_edit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@={viewModel.nameInput.mutableLiveData}"/>
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/number_input_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/name_input_layout"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:hint="@{viewModel.numberHeader.stateFlow}"
-            app:errorEnabled="@{viewModel.isNumberValid.stateFlow}">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/number_edit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@={viewModel.numberInput.stateFlow}" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="@{view -> viewModel.onShowDetailsPressed()}"
-            app:layout_constraintTop_toBottomOf="@id/number_input_layout"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:text="@string/architecture_details"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_beacons.xml b/newexample/android/src/main/res/layout/activity_beacons.xml
deleted file mode 100644
index 30abccc0a..000000000
--- a/newexample/android/src/main/res/layout/activity_beacons.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel" />
-
-        <import type="com.splendo.kaluga.architecture.observable.ObservableKt" />
-    </data>
-
-    <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=".BeaconsActivity">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/beacons_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:beacons="@{viewModel.beacons.stateFlow}"
-            tools:listitem="@layout/beacon_item">
-
-        </androidx.recyclerview.widget.RecyclerView>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/newexample/android/src/main/res/layout/activity_bluetooth.xml b/newexample/android/src/main/res/layout/activity_bluetooth.xml
deleted file mode 100644
index 59d229ef1..000000000
--- a/newexample/android/src/main/res/layout/activity_bluetooth.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel" />
-
-    </data>
-
-    <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=".BluetoothActivity">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/devices_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:devices="@{viewModel.devices.stateFlow}"
-            tools:listitem="@layout/bluetooth_item">
-
-        </androidx.recyclerview.widget.RecyclerView>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_bluetooth_more.xml b/newexample/android/src/main/res/layout/activity_bluetooth_more.xml
deleted file mode 100644
index 9a917b91e..000000000
--- a/newexample/android/src/main/res/layout/activity_bluetooth_more.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp">
-
-        <TextView
-            android:id="@+id/name"
-            style="@style/ListTitle"
-            android:text="@{viewModel.name.stateFlow}"
-            tools:text="@string/bluetooth_no_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <LinearLayout
-            android:id="@+id/info_row"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="@id/name"
-            app:layout_constraintStart_toStartOf="@id/name"
-            app:layout_constraintTop_toBottomOf="@id/name">
-
-            <TextView
-                android:id="@+id/identifier_field"
-                style="@style/ListSubTitle"
-                android:text="@{viewModel.identifierString}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="2" />
-
-            <TextView
-                android:id="@+id/rssi"
-                style="@style/ListSubTitle"
-                android:text="@{viewModel.rssi.stateFlow}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-            <TextView
-                android:id="@+id/distance_field"
-                style="@style/ListSubTitle"
-                android:text="@{viewModel.distance.stateFlow}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/status"
-            style="@style/ListContent"
-            android:text="@{viewModel.state.stateFlow}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/info_row"
-            android:paddingBottom="12dp"/>
-
-        <TextView
-            android:id="@+id/services_header"
-            style="@style/ListTitle"
-            android:text="@string/bluetooth_services_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/status"/>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/service_list"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@id/services_header"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:services="@{viewModel.services.stateFlow}"
-            tools:listitem="@layout/bluetooth_service_item"
-            />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_date_time_picker.xml b/newexample/android/src/main/res/layout/activity_date_time_picker.xml
deleted file mode 100644
index f92a40694..000000000
--- a/newexample/android/src/main/res/layout/activity_date_time_picker.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel" />
-
-    </data>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_select_date"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/select_date"
-            android:onClick="@{view -> viewModel.onSelectDatePressed()}"/>
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_select_time"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/select_time"
-            android:onClick="@{view -> viewModel.onSelectTimePressed()}"/>
-
-        <TextView
-            android:id="@+id/current_time"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/current_time"/>
-
-        <TextView
-            android:id="@+id/date_time"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@{viewModel.dateLabel.stateFlow}"/>
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-</androidx.core.widget.NestedScrollView>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_example.xml b/newexample/android/src/main/res/layout/activity_example.xml
deleted file mode 100644
index fecd0859d..000000000
--- a/newexample/android/src/main/res/layout/activity_example.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/example_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/tabs"/>
-
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tabs"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_keyboard_manager.xml b/newexample/android/src/main/res/layout/activity_keyboard_manager.xml
deleted file mode 100644
index 364a8b6c4..000000000
--- a/newexample/android/src/main/res/layout/activity_keyboard_manager.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <EditText
-            android:id="@+id/edit_field"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_show_keyboard"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/show_keyboard"/>
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_hide_keyboard"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/hide_keyboard"/>
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-</androidx.core.widget.NestedScrollView>
diff --git a/newexample/android/src/main/res/layout/activity_link.xml b/newexample/android/src/main/res/layout/activity_link.xml
deleted file mode 100644
index 99c88fc0b..000000000
--- a/newexample/android/src/main/res/layout/activity_link.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-
-  -->
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <Button
-            android:id="@+id/browser_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@{viewModel.browserButtonText.stateFlow}"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:onClick="@{() -> viewModel.openWebPage()}"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@{viewModel.linksInstructions.stateFlow}"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginEnd="20dp"
-            android:layout_marginStart="20dp"
-            app:layout_constraintTop_toBottomOf="@id/browser_button"
-            />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_loading.xml b/newexample/android/src/main/res/layout/activity_loading.xml
deleted file mode 100644
index 7a18b8ce4..000000000
--- a/newexample/android/src/main/res/layout/activity_loading.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_show_loading_indicator_system"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/show_loading_indicator_system"/>
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_show_loading_indicator_custom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/show_loading_indicator_custom"/>
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-</androidx.core.widget.NestedScrollView>
diff --git a/newexample/android/src/main/res/layout/activity_location.xml b/newexample/android/src/main/res/layout/activity_location.xml
deleted file mode 100644
index 12715da9c..000000000
--- a/newexample/android/src/main/res/layout/activity_location.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-    <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=".LocationActivity">
-
-        <TextView
-            android:id="@+id/info"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:text=""
-            android:textAlignment="center"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/enable_background"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/location_enable_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/disable_background" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/disable_background"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp"
-            android:text="@string/location_disable_background"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_main.xml b/newexample/android/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 875a0a8d3..000000000
--- a/newexample/android/src/main/res/layout/activity_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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".LocationActivity">
-
-    <TextView
-        android:id="@id/info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text=""
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_permissions_demo.xml b/newexample/android/src/main/res/layout/activity_permissions_demo.xml
deleted file mode 100644
index e76948d19..000000000
--- a/newexample/android/src/main/res/layout/activity_permissions_demo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/permissions_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:textAlignment="center"
-            android:padding="10dp"
-            tools:text="@string/permission_allowed" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_permissions_bluetooth_request_permissions"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/permission_request"/>
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_permissions_list.xml b/newexample/android/src/main/res/layout/activity_permissions_list.xml
deleted file mode 100644
index 9b358e3bb..000000000
--- a/newexample/android/src/main/res/layout/activity_permissions_list.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/permissions_list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
-
-</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_resources.xml b/newexample/android/src/main/res/layout/activity_resources.xml
deleted file mode 100644
index df84bfee3..000000000
--- a/newexample/android/src/main/res/layout/activity_resources.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:padding="10dp">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/resources_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
-
-        </androidx.recyclerview.widget.RecyclerView>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_resources_color.xml b/newexample/android/src/main/res/layout/activity_resources_color.xml
deleted file mode 100644
index 0c73058f8..000000000
--- a/newexample/android/src/main/res/layout/activity_resources_color.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel" />
-    </data>
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="10dp">
-
-    <View
-        android:id="@+id/backdrop"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/blended"
-        app:backgroundStyle="@{viewModel.backdropColorBackground.stateFlow}"
-        tools:background="@android:color/holo_red_dark"/>
-
-    <View
-        android:id="@+id/blended"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toEndOf="@id/backdrop"
-        app:layout_constraintEnd_toStartOf="@id/source"
-        app:backgroundStyle="@{viewModel.blendedColorBackground.stateFlow}"
-        tools:background="@android:color/holo_blue_dark"/>
-
-    <View
-        android:id="@+id/source"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toEndOf="@id/blended"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:backgroundStyle="@{viewModel.sourceColorBackground.stateFlow}"
-        tools:background="@android:color/holo_green_dark"/>
-
-    <EditText
-        android:id="@+id/backdrop_edit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@{viewModel.backdropText.stateFlow}"
-        app:layout_constraintStart_toStartOf="@id/backdrop"
-        app:layout_constraintEnd_toEndOf="@id/backdrop"
-        app:layout_constraintTop_toBottomOf="@id/backdrop"
-        android:lines="1"
-        android:inputType="text"
-        android:imeOptions="actionDone"/>
-
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/blend_mode"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        app:button="@{viewModel.blendModeButton.stateFlow}"
-        app:layout_constraintStart_toStartOf="@id/blended"
-        app:layout_constraintEnd_toEndOf="@id/blended"
-        app:layout_constraintTop_toBottomOf="@id/blended"/>
-
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/flip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        app:button="@{viewModel.flipButton}"
-        app:layout_constraintStart_toStartOf="@id/blended"
-        app:layout_constraintEnd_toEndOf="@id/blended"
-        app:layout_constraintTop_toBottomOf="@id/blend_mode"/>
-
-    <EditText
-        android:id="@+id/source_edit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@{viewModel.sourceText.stateFlow}"
-        app:layout_constraintStart_toStartOf="@id/source"
-        app:layout_constraintEnd_toEndOf="@id/source"
-        app:layout_constraintTop_toBottomOf="@id/source"
-        android:lines="1"
-        android:inputType="text"
-        android:imeOptions="actionDone"/>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/backdrop_lighten"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/flip"
-        android:orientation="horizontal"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.lightenBackdrops.stateFlow}"
-        tools:listitem="@layout/view_resource_list_background"
-        />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/backdrop_darken"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/backdrop_lighten"
-        android:orientation="horizontal"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.darkenBackdrops.stateFlow}"
-        tools:listitem="@layout/view_resource_list_background"
-        />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/source_lighten"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/backdrop_darken"
-        android:orientation="horizontal"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.lightenSource.stateFlow}"
-        tools:listitem="@layout/view_resource_list_background"
-        />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/source_darken"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/source_lighten"
-        android:orientation="horizontal"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.darkenSource.stateFlow}"
-        tools:listitem="@layout/view_resource_list_background"
-        />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/blended_lighten"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/source_darken"
-        android:orientation="horizontal"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.lightenBlended.stateFlow}"
-        tools:listitem="@layout/view_resource_list_background"
-        />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/blended_darken"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/blended_lighten"
-        android:orientation="horizontal"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.darkenBlended.stateFlow}"
-        tools:listitem="@layout/view_resource_list_background"
-        />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/activity_system.xml b/newexample/android/src/main/res/layout/activity_system.xml
deleted file mode 100644
index 77a494611..000000000
--- a/newexample/android/src/main/res/layout/activity_system.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-
-  -->
-<LinearLayout
-    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"
-    android:orientation="vertical"
-    android:layout_gravity="center_horizontal"
-    android:layout_margin="@dimen/networkLayoutsMargin">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/system_features_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/beacon_item.xml b/newexample/android/src/main/res/layout/beacon_item.xml
deleted file mode 100644
index 3313db0fc..000000000
--- a/newexample/android/src/main/res/layout/beacon_item.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout 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">
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListBeaconViewModel" />
-
-        <import type="android.view.View"/>
-        <import type="com.splendo.kaluga.architecture.observable.ObservableKt" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp" android:layout_marginTop="24dp"
-            android:layout_marginEnd="24dp"
-            android:layout_marginBottom="24dp"
-            android:orientation="vertical" android:paddingLeft="16dp"
-            android:paddingRight="16dp" app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-            <TextView
-                android:id="@+id/instance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@{viewModel.instance.stateFlow}"/>
-            <TextView
-                android:id="@+id/namespace"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@{viewModel.namespace.stateFlow}"/>
-            <TextView
-                android:id="@+id/txPower"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@{viewModel.txPower.stateFlow}"/>
-        </LinearLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/newexample/android/src/main/res/layout/bluetooth_characteristic_item.xml b/newexample/android/src/main/res/layout/bluetooth_characteristic_item.xml
deleted file mode 100644
index 283cc3671..000000000
--- a/newexample/android/src/main/res/layout/bluetooth_characteristic_item.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothCharacteristicViewModel" />
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
-
-        <TextView
-            android:id="@+id/characteristic_uuid"
-            style="@style/ListContent"
-            android:text="@{viewModel.uuid}"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/characteristic_value"/>
-
-        <TextView
-            android:id="@+id/characteristic_value"
-            style="@style/ListContent"
-            android:text="@{viewModel.value.stateFlow}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:layout_marginStart="12dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@id/characteristic_uuid"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
-        <LinearLayout
-            style="@style/ListFoldOut"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            app:layout_constraintTop_toBottomOf="@id/characteristic_uuid"
-            app:layout_constraintStart_toEndOf="parent"
-            app:layout_constraintEnd_toEndOf="parent">
-
-            <TextView
-                android:id="@+id/descriptor_header"
-                style="@style/ListSubTitle"
-                android:text="@string/bluetooth_descriptors"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/descriptors"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:descriptors="@{viewModel.descriptors.stateFlow}"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
-
-        </LinearLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/bluetooth_descriptor_item.xml b/newexample/android/src/main/res/layout/bluetooth_descriptor_item.xml
deleted file mode 100644
index 15a440e07..000000000
--- a/newexample/android/src/main/res/layout/bluetooth_descriptor_item.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDescriptorViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
-
-        <TextView
-            android:id="@+id/descriptor_uuid"
-            style="@style/ListContent"
-            android:text="@{viewModel.uuid}"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/descriptor_value"
-            app:layout_constraintBottom_toBottomOf="parent"/>
-
-        <TextView
-            android:id="@+id/descriptor_value"
-            style="@style/ListContent"
-            android:text="@{viewModel.value.stateFlow}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:layout_marginStart="12dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@id/descriptor_uuid"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/bluetooth_item.xml b/newexample/android/src/main/res/layout/bluetooth_item.xml
deleted file mode 100644
index eed0a1682..000000000
--- a/newexample/android/src/main/res/layout/bluetooth_item.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListDeviceViewModel" />
-
-        <import type="android.view.View"/>
-        <import type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListDeviceViewModel.ConnectButtonState"/>
-    </data>
-
-    <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="wrap_content"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
-        android:onClick="@{view -> viewModel.toggleFoldOut()}">
-
-        <TextView
-            android:id="@+id/name"
-            style="@style/ListTitle"
-            android:text="@{viewModel.name.stateFlow}"
-            tools:text="@string/bluetooth_no_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/button_container"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <LinearLayout
-            android:id="@+id/info_row"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="@id/name"
-            app:layout_constraintStart_toStartOf="@id/name"
-            app:layout_constraintTop_toBottomOf="@id/name">
-
-            <TextView
-                android:id="@+id/identifier"
-                style="@style/ListSubTitle"
-                android:text="@{viewModel.identifierString}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="2" />
-
-            <TextView
-                android:id="@+id/rssi"
-                style="@style/ListSubTitle"
-                android:text="@{viewModel.rssi.stateFlow}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-            <TextView
-                android:id="@+id/txPower"
-                style="@style/ListSubTitle"
-                android:text="@{viewModel.txPower.stateFlow}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:visibility="@{viewModel.isTxPowerVisible().stateFlow ? View.VISIBLE : View.GONE}"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/button_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            app:layout_constraintBottom_toBottomOf="@id/info_row"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/name"
-            app:layout_constraintTop_toTopOf="@id/name"
-            android:visibility="@{viewModel.isConnectButtonVisible().stateFlow ? View.VISIBLE : View.GONE}">
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/connect_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/bluetooth_connect"
-                android:onClick="@{view -> viewModel.onConnectPressed()}"
-                android:visibility="@{viewModel.connectButtonState.stateFlow == ConnectButtonState.Connect ? View.VISIBLE : View.GONE}"/>
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/disconnect_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/bluetooth_disconnect"
-                android:onClick="@{view -> viewModel.onDisconnectPressed()}"
-                android:visibility="@{viewModel.connectButtonState.stateFlow == ConnectButtonState.Disconnect ? View.VISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/status"
-            style="@style/ListContent"
-            android:text="@{viewModel.status.stateFlow}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/info_row"
-            android:paddingBottom="12dp"/>
-
-        <LinearLayout
-            android:id="@+id/fold_out_block"
-            style="@style/ListFoldOut"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/status"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:orientation="vertical"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:visibility="@{viewModel.isFoldedOut().stateFlow ? View.VISIBLE : View.GONE}">
-
-            <TextView
-                android:id="@+id/service_uuids"
-                style="@style/ListContent"
-                android:text="@{viewModel.serviceUUIDs.stateFlow}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:id="@+id/service_data"
-                style="@style/ListContent"
-                android:text="@{viewModel.serviceData.stateFlow}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:id="@+id/manufacturer_id"
-                style="@style/ListContent"
-                android:text="@{viewModel.manufacturerId.stateFlow}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-            <TextView
-                android:id="@+id/manufacturer_data"
-                style="@style/ListContent"
-                android:text="@{viewModel.manufacturerData.stateFlow}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/more_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/bluetooth_more"
-                android:visibility="@{viewModel.isMoreButtonVisible().stateFlow ? View.VISIBLE : View.GONE}"
-                android:onClick="@{view -> viewModel.onMorePressed()}"/>
-
-        </LinearLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/bluetooth_service_item.xml b/newexample/android/src/main/res/layout/bluetooth_service_item.xml
deleted file mode 100644
index c0d392fd4..000000000
--- a/newexample/android/src/main/res/layout/bluetooth_service_item.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <data>
-        <variable
-            name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothServiceViewModel" />
-
-    </data>
-
-    <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"
-        style="@style/ListContent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/service_header"
-            style="@style/ListSubTitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/bluetooth_service"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
-
-        <TextView
-            android:id="@+id/service_uuid"
-            style="@style/ListContent"
-            android:text="@{viewModel.uuid}"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@id/service_header"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
-        <TextView
-            android:id="@+id/characteristics_header"
-            style="@style/ListSubTitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/bluetooth_characteristics"
-            app:layout_constraintTop_toBottomOf="@id/service_header"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/characteristics_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/characteristics_header"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:characteristics="@{viewModel.characteristics.stateFlow}"
-            tools:listitem="@layout/bluetooth_characteristic_item"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/dialog_info.xml b/newexample/android/src/main/res/layout/dialog_info.xml
deleted file mode 100644
index 65879af29..000000000
--- a/newexample/android/src/main/res/layout/dialog_info.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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:textStyle="bold"
-        android:padding="10dp"/>
-
-    <TextView
-        android:id="@+id/message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:padding="10dp"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/fragment_features_list.xml b/newexample/android/src/main/res/layout/fragment_features_list.xml
deleted file mode 100644
index 25d5138a2..000000000
--- a/newexample/android/src/main/res/layout/fragment_features_list.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/features_list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
-
-</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/fragment_info.xml b/newexample/android/src/main/res/layout/fragment_info.xml
deleted file mode 100644
index 1f333028f..000000000
--- a/newexample/android/src/main/res/layout/fragment_info.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/info_buttons"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
-
-</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/loading_indicator_view_.xml b/newexample/android/src/main/res/layout/loading_indicator_view_.xml
deleted file mode 100644
index 284bfab62..000000000
--- a/newexample/android/src/main/res/layout/loading_indicator_view_.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="40dp">
-
-        <ProgressBar
-            android:id="@+id/progressBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminate="true" />
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Loading..." />
-    </LinearLayout>
-
-</FrameLayout>
diff --git a/newexample/android/src/main/res/layout/view_list_button.xml b/newexample/android/src/main/res/layout/view_list_button.xml
deleted file mode 100644
index 8f8c59399..000000000
--- a/newexample/android/src/main/res/layout/view_list_button.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-<androidx.appcompat.widget.AppCompatButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/button"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:text="Feature" />
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/view_list_text_view.xml b/newexample/android/src/main/res/layout/view_list_text_view.xml
deleted file mode 100644
index be06c5ff6..000000000
--- a/newexample/android/src/main/res/layout/view_list_text_view.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools">
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/label"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:text="Label Text"/>
-
-    </LinearLayout>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/layout/view_resource_list_background.xml b/newexample/android/src/main/res/layout/view_resource_list_background.xml
deleted file mode 100644
index c01259329..000000000
--- a/newexample/android/src/main/res/layout/view_resource_list_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools">
-    <View xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        tools:background="@android:color/holo_purple"/>
-</layout>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/menu/bluetooth_menu.xml b/newexample/android/src/main/res/menu/bluetooth_menu.xml
deleted file mode 100644
index 8aab659e7..000000000
--- a/newexample/android/src/main/res/menu/bluetooth_menu.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/start_scanning"
-        android:title="@string/bluetooth_start_scanning"
-        android:icon="@drawable/ic_refresh_circle"
-        android:iconTint="@android:color/white"
-        app:showAsAction="always"
-        />
-
-    <item android:id="@+id/stop_scanning"
-        android:title="@string/bluetooth_stop_scanning"
-        android:icon="@drawable/ic_stop_circle"
-        android:iconTint="@android:color/white"
-        app:showAsAction="always"
-        android:visible="false"
-        />
-</menu>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 7353dbd1f..000000000
--- a/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 7353dbd1f..000000000
--- a/newexample/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/mipmap-hdpi/ic_launcher.png b/newexample/android/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index b98ddc769847d26653fcd4f11b3445c20dac8e93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2147
zcmV-p2%PtcP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000OoNkl<Zc-rlp
zYitzP6~}GIR7t2>q#~MBl`6GOztEBgA1Yc^(Dp-18kAO{Eu;xjlB!jT5*pf)6sT|@
z7-I~WU}KDJ5*M7<hPFV0Q|x+e2!3HN#$La@_O5r=>-9dzv%9nNGXLH?c!6afeh{MZ
zGFSTRuI1S?_x$cT=iZsoY)XpOw5Bz!X>EQt0I5XjNv71#3Qk%QPkh>EW`KNtnrIi%
z0iqnD{qsyYQ)8z-Jbl-Y!e1o)Vxqe1*RO+Wa&mIsYs!~8mSq>u3DWKPNetCfgR(43
z$t3C%0d$GDn0BYnGXa!Nd!FZ?3ByT-$hjkmB#z_I)z!83cAsYhC^ZlW>`hicM3N|q
z=<V%2M17qLpfrYI3aGJU1VnuzjRHDOeVq%SbeGF@G+6=B2%>;GJ3HT_zRnd;;e7z;
z{W${~A0I!K?0`BtI!ZM_8Xygj21o;>0nz|zfHXi!0LbkW(9s&0kqm7C1XxKufMj_R
zAx;JtOsr5yR*szw7+#Rk+T(}UEn@HAt=RF}$h0atFs2?rEGL2IWt1HqN8WCGLRFpi
zKnMmfDRMIg)IJcvi#tsiw1jY}hQZsL62qbY@9zq#BgI5X##?9XXfXPrZ(_0Y4NKgC
z@7ipEWjF+}ITym^%o)L90}{3t+OT%p5Ox%gA{dlVkY!H@==A$8h$QM%0jP1vkEiww
zU|oqBURFeD-gw-BpRe>lbPgbN<U0uEeG~Fn`?P@0U-seG+lLfDw7=NSqWf9^@BAh9
zL}YHU!sQUuQKT7?S{q77@I+=mp4`)qlg%C&`#5C18C@s#ZMDJY5g>f>D!9E5gUfmd
z{Mij8)%duM*ql5z?jKR$gth6Q1#X{+iV{~$K)Nd5OlsV{2Sf+)VXK!!Prm|)>gRbw
z7$#1AT;YirbjIr=Xw*$WGF=3B@DT-$q614H^?w{Ub&JnABjAKpQR~47N!5MZY!T<l
zeVe3UKvKstZ+7!|reOFcoUk%4IAF8!I79{;9yqNTe1HT0!Ow2NnG*lcm6+swQT7eS
zAYR&SiV5hIJ!TBqLZ~_CRp8Te?EJF@?ah95?1Ka{yV*74QE;e!w0{sSrT{LJh@q<q
ztrb0_W=MuIaM@ps0>ov13F4K*5%xK<71&*Bj|nHNcPq!?7!#16d81&L<~blFF3g`F
zApJ-XD-RlD0;1YjVTHpbpqT7M%8Q+l{BDGfE{%pWrBME3kQwVu`#Svup5HN?5YX>3
zhRNP20DU8iY_c~R?&s98lMa$udi|75sXg)Z{p<mJ)WN_!$YInRgz)KZQkWOU7l|yP
zX7i20?-%jLyH;hznoj>H8ims>;984cJ(n6T;=q5}eW+;jCX}w9g-pLAh9Gs7L(~^0
zR{L>G$`VFN<W)B__;1tns%~N6A}gAzuEoXz0!q3($nS6`)Y&0M0VIn8{Q7#Zm#Y%1
zshR+iVfOGirJsHRsOWKHjG!(+enG;T^Jb*w8{+E0f-aQydcpK~z#4sEs>@;d+b`p5
z%dg-)Q>57U1VlVnWJ;LAVZD690<(|D334u3O;_`mY<_&DxCbeDhL~FYkqItm5S`mw
z(3^7&(gXwho<G9!*JopD^qp5AdYw1zpCk2)*0Fet0M&|p1E?oyT+;2ql9C?itbX+X
z;>j|<>5@GroJB=suof0J0;zG`|IqY;4(=8Q{H;1AQtpIfee*d?Ts#+HKfp`)Q@J%E
zpsi=^=yiwiy$=VJ^ZxYAFgQ_G&;6hQZwTK$(H{k9WBn++W)}L_K1IWCY7|}D(gcy^
zFkY}d3XtRQ7D&P9*}p>eQt`GDKR#qcx1GaV4P#15)AN4e$c?mC4IqhJY8)oTI6OeA
zZ<O|-&&9z=(k~20(Qj)oO6nFj*a_SA^|zvD+d2dd%`u&zn^C$ee=-K3f{QLR+5>p>
zcyGkye2Yw&CnTxoj-n?d;s>XV%HUFo4qSD?V{oJ8<+?~fL|6V$j}U?9uFShpm<b@)
z$sA>si)Vk>#p4%8A}?p2Ei}PSR<5<5j6_8*9m9@hhcbDpx#e0t!s3DaE<9B+2(Mp2
z*RHlGIAINuV#<$Mm7+Yl^Cj?B<FvDVvc;p^DNybh5S=$L__vY4!lT_WYv7lUb)%1@
zziI%{R9Jt(f(zyeICM5NK3^LbP}2*wnCSCiqV5csnu;0K3t#ZoEtTJ&w7^GF=<)Kw
zxGN~t`fAH`1^e^8<w^%F5_M-?#nsIX2{lCOhUgDM7Wf%2%MC+*{4i$_hEWb#ZB8X(
z69Gym1-r^Lp|YnMB=1GC$rH&=JCP(#RF0j^&NoD&p>BYMnc=axq$eSquxM>`2F3g9
zvCkmcHGk0WoslXAeD@z9?ZKf2NCTt+(g10IG(Z|44Uh(CUH~e*4*<>mT@9DZm9!BQ
zejUnSFw8xI91cfrvcFK*+}wO@&VU*l8#jcF5lG1tJ<2PYEX$&-tn5|lYg=2}g4w>*
z`vB3SCX?wZ4Ml2@f=UKaU#L%dy}pC^_;u>*tbb^rva*r_TC`@(nw6cMogF@(4}u_o
z8lKOhX~i%MT3cH?SFc|E6Y66|Mn-zdT-vHts~#lX*NC3T&CT6fRaI41Utj;P+S=Mv
zb#-;8Z<kJ|i}-x!-!nbtUf7)KPtmbcAE+<XC+gdZ6)PUPn;&0DUA}zz!=!(N=rN+D
zMBkm~S~}&+SC=hYwvhUG*S~Q=AT1!#w21VJiP0tVS=5IqUlyd?gO-{k(wf$^rnPy|
Z{trO%k^&M-hKB$E002ovPDHLkV1hat4bA`n

diff --git a/newexample/android/src/main/res/mipmap-hdpi/ic_launcher_round.png b/newexample/android/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 1e97f306ba0f955c1e4ff171abbdb8a61565aea2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4049
zcmV;?4=(VDP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000k|Nkl<Zc-rM$
z33OD|88#sSrH8193nH>vsTHvnMG<O)8wx$vwgMukP#0`1D3zijN<bqhOQ?}m76F6o
z2(l(5CIX365+EcbWRgi{CX-n*`@ZJy|3B^<UM91=2@sO_&iT%~WZt{?zu*1WJNLb-
zuDXH;0K_rGhXMEfRlk&j4Y&g$fj(onFK|!0BaCSR4K6;+_ni>k5Iqt77<#h*b!twV
zZG{+a)`R|c17bL024W-P7@`WHYiMY&Bisyhu4CUFW7qzN-Frh&n=xr)Yak{;Xa;zG
zGvXD*9)t!54g|m79~1cds13w!*5=JY=9|#kH6~v0_YlNdgdvC&zmFa4)X$EFAo$sL
zKEd@3Lc*wR*2j<_^Xt&+v_^2AjL0JC1*G@{Ou$8gXVn)(7WJ7NN~SCAfaBSDAH+5x
zF~PHb8PLG`5E4Z)^a+;lN|2K%IDZS_WW+SI05Rc+;`+qHMKXnwwMEIn&ufvCy#kH#
zwje1X!OOt>-aeACMM)BnGXPOTf-s@{SDKt4KgAPO<9566X%Uim$LIBWN01r|$br@f
zfov|D&Gyt~b>2Mt*y(d*<N_xQtr@(G_yH!9Y3yauB)&n^oG057IYN?1+fjbdYPBOT
zDM`Faq8*dZakVvaf=R-0xT>qGe|JgDO_1Xxk+Wkyr_GTQOp@JhmlYQmUoRZvMG=JU
z?rrT3IabH5*Xs}9(Bhg+5U+k7k7sIoAx8i&ni|OE^6AYoHNMz$I-R|d90#9Uv?GGJ
zblYmRI!>NE`D@{rV<HH(W=lKNo`9)Q=vS-NJDI6<h{?22dmdpSy`jC4!-MK-hr<CS
zB_$(7n;P%5FlWeY>rqQ=5~)(Dazr_7Ud@oz!F)p4o;8TZM&raX1d57^9*OFUcolQG
zT&r8N_MlWyR&0j@I}9<QFyD&VbW<%NUnG;sHbyivUcFG=Zp0gPu|zHs*lzQJ%_<IV
zm#^96NR>`FRbc}~jT7d-tAN>4WTG(lZ8?+_*}_INgTbKx=9_PB3!6Oh%vmg!zccL-
zMUK^Ze!#oF(ZTZ1R8g^VfeNb19pHDGV<yLreWh(y!v`yspwYV_YqtUByd{pHEo-#k
za)zB4KL#bhkpE^_En>D8hvxO2So1PFypXa_1*LTkI8$hYPu`J76*Oao25bg1xDQPQ
zul!g{1m&Nx!noN|82e!rY|k-($>4$XPn1#nTrjg16xGhC&Khg9{m4PnMSuQhn*99y
zu6V6Vta)XfHN((F5}3KC4s=EjY+0?1C@2v~+T)exfMdz6;My@7{C1rva*P%a%vz;{
z=RT<7@Q(#DsMWgQc%B93P76OVDN|+WfApdfN38TUX=!QQg`6~sUg&>@^Xtmd1UA?_
zFnV=0{O;3p@W5vkaJb9@nmSiRE!zDplHo9dE8_`p%)bU4pLYSz$+e;g+Mc6_u^&kT
z1dX0m1<Q77z=#t=S{bg-W%KJmuXT&ci71-o<m8MZE`IpohlD2n2OZUa#F&@I>w`7N
zbZ|csLj)0CS}y~Q*~86ND8KN<$4aP^JHS)85*!P=o+k+5Ts;VU#+r!2YYc9flv)!Y
zhsT6DQYfypL$$;ia$-_Y4vJh9L_|!2kLt5ir%rvua-xJ_4T?txy;011k6iD9C%>!;
zki%=y`T{-FYup?e!NUHSX#$^B3(ggH2gnI%QQlne`#d50a=Cr5c5i(Xa(H~Yp$<%F
zemghT!|bVz`&_+P1x|-gbka!SzP!AAOCvud*kaNFJ^7Jn1UXUQkM^n>k;7vc`Xi;$
z4Mhc3)S?SB`qd&8*v$@bXTRH+93G3hflqxpWPe5FHh6Jvby$L)N3+|XZv?H{4NK-+
zn3(zRDb7dB7}ttwYHA9Qi;e+acxRNHoP0H^n1o#%)<OR$vBDphRE8voFz=8WbQoPW
zEIscRQm4zg2<Md@1?QLjLKB2=eLty5=(k~%oV!jLmK+}cS|kU($-`+WZ{E8%>A>Uh
z#X=D0i0bO<s`~fu-zDIv`J`yWh7C92MVd$v%#FTh(nfh$atMzsmcVhTjhnrX|1F12
ztF+*Cxw(iHjvNk)Zvt=mca4(I!~ZkG3n|j51dTz5y(v=%dYuQpTBw4w*|nfjxSF*D
zf{{!+W5$dN2_sL?fddD6BSGeH1bI>5t%U}-e||+of(Wl>$hjOTXP*)C4|L2Wo6(GJ
zh)fVU>~#+X!oChQ;-3p;QOV&!PQ1Lv0TrcoD9AO7b<CkMYRi%(OZqn<Xy3klcOpTK
za0RNt?&0#CF>7j~f+AXem6gj}J$4JY54;J^wGT#xYyBU<du|W*=Y!lLGfYoc#DuNc
zdd{qzPG7SNS0u=R1PyFL(C*#4`$r<^7k~gkixw@qw+TTR85w=OUauvbiPbwiFd+;5
z&t^$fJiNUUvSb$U;yqqWzVzFcf@<;GQKA0tbg-W(;QIT%*d$6@g;<_f4=(hR7MHi#
z%dk3~&YF^v@>?N6Tog-9P3`XScr=lG(DGs(BrYp~tG+xF5y`uxU_^3cTP0wwFoLZx
z7ZfwcfPDI&BSMun4GBFT$<$^yj9ey->hE~`F|86#D(rBe+6-Tus^{cwu9JS_jW>D=
zqZmg}w{G3KU>+1P%+u^Vva>28IoE%67P93QFd&%)<Fn!H=O@93QLKL5rxD3feDFNj
zi}No;F~rW3MtJD+=t1H4^Ugu~4_c@(x!|E~mC$>AIh@kkV_jY32vR5%(xjxMu8jy{
zB>f6A>7&sS#r-%#-BzCsOVFFSN-*ghQ1ZzMI5s8=etIbf>hm$9tt<iM+(}^x(rsD{
zK1bvA8jI5llfP9&CFoD6X&ThHc_%cGfEpf$a=enQ0H@a%bD~&LQE?o(NNTi4o2Av)
zXf&FPXaw0YN=(GgLy>dss<TjIc7Zyl7V^g(<_IDb&pHlnqa6%;)`r%enPb7Fl!ol@
zNTn5qE|i2Nhf17H|1&_D-U<CSo(srw!|L;z91B5IY7`b0ZYM4pEqSoQtRvPTv&0mu
zl|~oz{JOjmIh~f5z`{Z;*p)UYdi!XA93G1Aq~Ns}p>E#f#stmyD;N)EU@aEfu{v==
zKFiXCCFoyUYN6idftRuroaP8+8oHwj%;Fukj~2}i9Xj+WD>a%Fs|g1W9vmfRi>@1)
zCUq7%Y>He;s~e<f|M|}!ZbA@|W|f-2a&$i^-X9$xsBYmD@aWYM`=k1foNzEXLl#Kj
zC(PROYOT<DMQIa_?y&R>tS!|?b=agibePR%SiXGu7~&#$xr1yi{)HD_=!GoSiCHkK
z$Heho4Cy3DN7SAj5);_uRw#HerwKV6#%6(JWhr>=R?sY)8PFa}L8hn~UUfv*D2u-j
z9rJ7~nw1tejQYMhtWUi6TM4J}VjQ$wE?18nIr2_c%{PAJfiZTiTCM(G>=u`8NJ`SG
zQZ7F-7@SbH=u~KO7>GP0MmNW~lTiENc+g^G<HLG1)LT6;al?f=@TsL$P_1*p($hL_
zg2E9Lhg$Sjo|21-(frSe6DKl}gX<b;Pmmw#Tu@LjHCja<SO&!?^9nlT6B;{cF;a!q
z9s$nIF9Mg&4Eh}_z$q<_DHPKZ?_do3gXW(@jj9I)YR_F66;boDo7a}XakVYdE`C3)
zCT`xm`90zQiAoIlBo2NgjvYJpE{DUR6}v7?PSA@)Rp3mWno$rP?-g)b<a5|#&UWb+
zlo`8}@bU&3D9~))J*GlG6FqSy=l!<>GO)V6Va=<ywpRDV6Hm~_s>HBQ6m8wQwIhCX
zl}IET#hMuhR8J2&Xg7v<F(5*lTQilZoLnJ%TxEl<5%RHMbi{zN9bH1G=!F#o<mTpX
zqp>p%BL4K;8LQbp(M@6(@LT+sRm7euGraYqGA2+&a|@D3$_+_-^m;wanl<Y=8hc3p
zBRr-|nL^KK-6E68vfJu@#8@{k{QUFJM{vyD+1Mi=jKMDH>FJ|gE?2A7qDw$d1FPO)
z&YU?f(wJASTq$nn>%@r@uf~sCOG`_4Q}}C-8>na-9`il)YwE3R%;FAoROE}gj2ky@
z7%f3EE%LV`?cpL9x)IAW&pb1n#+s6n65BpSynz_KW!J7<DYOd<N%FN5a=5XWOeR>j
zZrwZ@<Fskhu4&Fj*SMiWhtkg<eT$2W50N^OTDAjnIMd3@%ge^G^<!gf-jmc!?XK_9
zqsP6~)zww4<&me0*|<sW;>?*d((c{652CTX{`%_|_ecUZ&>25&e);8>M`4|2A=_=M
zk0OxlQmNF6)xw`?Ol)iye~ceLJ_$c=OHEDvdwqSqzpatPlY`}i9}~jKIF_DlOqc8>
z1#!<l`|Nf2**h&QZHh*t@v}{y++O3>>~qMhcye%pr_mTjjT&|Rr6h+x;)e|zMh*8x
z-}I_Np)j*bxK)zGJ7n@XXjYc@-+!Mpr|*y<Luf(%vOVY<|JY-X(VGwYOqej?nX<An
zDa*F~V)rz*RGvdJ(SD!Pr%y{qj~@LOl9|bV*`I=rA2DJC%|frFq@)Lq966F{G#Wu*
zat&9qd>|P}7LqADJNq!oIGAK*GPl?x;&G2Z{y05N+ygOS&6+i-H8nLRnz1WEl#m#b
z0aFswiWMv7qipmrZx1GGi@!A{ZqT4XoqP4_MVlV)96o&bh^(xvy;`l7d-RbJ<-44w
z$G^IQMOFG$lzx@imz<nT5AfbevXP8ef*j$IFnI7_vhCXucVpT<>FCj;c@*i$Kd~e5
zMv05jEV`GqL8SP3jiJ7%Pwe{@l7VDlGPRnQop9RJr%xYx8%tlrz{!&*PuRbI|JJIi
zDmDF_!fO?Kb%js(juZUO&jucV;D6k;bPs<&wPmqbfZC=$UVH5|TCSiiD}70Z)}S@v
zjt&n#_+Sz<J0j|CJcg&Ir+=86n|nwik<`-a9W9Wv+76-}6sGA~yWLJ(Q=qc4vKH&8
zgVZLq%`~Pj^+|n`3~k{xLLI0G957%2X;e=H?bx~pXZH{9yz|bhUw{4eg3Qd!9fgI3
z1(+&Spi`|=DwTRP6*Ga((dpNfmzP)2HR#)RtY5!=0o_Y&Fm0hWZ>K(3!P$0RvLs9i
z?zrQQPLyCW^P|0g{Sd#Q=$Dw7cpu^c8uY^tKm6pQk3RY|fzIiF_}%?<4PDFbp?hzm
zwx~^NyCp;SWhV<wq9e^VWwQeZ4!r5c8*jXY)`A&v<m7uX+|K^jovxv4=^nb5+GtOt
zM0D&lPz=cl=u{J*e){Q7v=x~^=k!1Nj*)T29Pa-CDOXZy#zpy100000NkvXXu0mjf
DXSuQ!

diff --git a/newexample/android/src/main/res/mipmap-mdpi/ic_launcher.png b/newexample/android/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 27bbf5142de0ab071112ab8ea360861e9af20e93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1422
zcmV;91#$X`P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000G5Nkl<Zc-rlm
zc}!GC9LKGoEt;CNv}v34h)u7QHfdUGqBb>+HL-uR_Ch6=#7NWnN2~U*2gM2|0v;8u
zh*hg15NJ^j>(v5*0CKOa3a+rQ3vUnDi+ykJeFuI!Zvz|FU67c*?l#>?KABB+=gs%~
zoB7Sm+nF&VS|Ydrh#|y=nV35fK2s!u0y%v>6MslP#}ghWJQgOzzT-n_n^HWf=MeI4
z-n?lT9UUDBCu17&L`}CfG5)0>2)~eqAPpl1hGC8pX?IO(U_4pucKZXwfJtmbYL?Wa
zqz(&XeY0XPi7s<PL&GBzwcctVR;(2Y#nU{`(_;ok!yS21!<Yf4va<5|iCRM%Xl!hJ
zh8VC$qJiS#;)LlMh{zErC@6R#Y9MMLY9MOhpAa<)hm8kg<w9a-cnG|N26#?@#l(ih
z<>aRn&yuzZwHtL8Y3%x58<LA<BfdT)F<`QDkPo_0m}kVEG+h7(Gl!s6Xd&p@CN&^e
zI<a}b1|3%%*q@=tw$G^mcBkqvr1eTOg;-v|?iwT37iu7vIgq|Fu=BGeCU_cl!jr!k
zg3}Zv-s$F%aa@lNe^6m>i2+TuwxDO!UZBDA66Jtg<HGBE`|wJ(66KvViVhk59p|L$
zF?_WXp1fz_-gPgyOIbk%s@oVOZBzRUe3UVOdYKK!at!`w<n9=Pjpn3DVuy#vrc*k+
zl-cWJMXnl(UKcXAXnj#^tTMxU{!_TK<9v7y%!gp<^$Rf*VH<NaKJnvxcSwh8awoQL
z)*yWog)8k2=~kf&-8Q_sQ|UJ#a-hzHbEigdWX~{cSO0=L=OMoVclI2x=Tbn<!yr#V
z;hz>Hrl|r9tlp}|nR*(h^UXM!YXr**(ikv1IIKNEVF58Pk)=8PxYq9i)oX>f<SjCF
z<^}RoJa}yjs9`VGXAWY`kLn;c?53a|@IXg-rP~K+l6*~+1C1fj*;oi32iO4_SXFBf
zyoG|1X3?p3P0EOalXfE;cCuJl+K*Xz-2vSHtAdOG1E$*m<KeB)e)~ZnsjJ`_xPd;S
z2XE}_4;n#{6}c+3>z$ApUDEEv#XU6cKGcmFxm|uzn}^YN{06S3w!zlk3SC+fG+(bA
z<6T%v_W5%lr`Cj*vw8z^XaQNxPPAB%RHebPN;TY^Ae{l5m&ZHj2mRuoIN1a0`UqOr
z)uMTI4YU<~u>AJ3-+(@29ay8zFJzcuvGVXhfPuC76e^SqW|Ps3IoO4w9;?r+WM`pE
zdI#=1sz5C1@K~1x*E27pX;rlk*=LQQ+q<FP@i8>tybq@O_n>H=zD#4`*h;o|Pai6-
z(Ri&)<qt|iu@ZU*E1dx^*@?es7{bzW6?A0!G_R@g8xZL~+zq;_6o!3Yg16H_2JB=n
z`J`CuGq9yXkNt8pW*+Pcn3m~n25^EP-Dy;eP^-r7i+;z3`T*o#HG#Q8!86!1>8jGC
za^Srq12}tw!Bd630pdj-COIWHxuiW#3nbZGL(Y(Jw@iUhr%@T@!gdnr2ahR2vZ-G0
z8|{dFAK=ORfPpN{8oM_n;<C*N(KoWFfvAE1wSoWcpS#V?&Cf;Z2ox0+y*QNt-=#rW
zS=pl;$63Tik#fO7w83h%j$~zJJt=CetE-Eh>Wb+erBYc+Oo;6u8VOe!@0(>=$Yio|
zqAhMZcVsb3mMlr==;%0OHk++9P1}fjMy&r$#{0BbEY_BmmOmCPS|m=NnCaeB#u4T(
zU%q@<N=nMx$;ruKLG1fYQbaAcjsC4B5)%_=laF%=^TNzrQOg}&yo<>~=H9GuGHJp_
cON5la0ptn$v9hKG82|tP07*qoM6N<$f*k#x5C8xG

diff --git a/newexample/android/src/main/res/mipmap-mdpi/ic_launcher_round.png b/newexample/android/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 34e8f9230872bfefa8af506e2df00be7e1846f01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2536
zcmV<E2^aQ>P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000TENkl<Zc-qZc
zdr(y86&HmVAGNhJCb4ZgrdAuvKRStN>tv?mOq-eXF=f&aO)_LAV_%cTXdYutj8S9^
zphhy7DrgWe@`zca5rc}l@&?PJ0xqz-EX#A3eX#HM>-3z<y~|zhWkKbUJM$avF5msm
z?>xWreRmfuc)$w)Vi1cEarAc@<HKX=*#+};q40%>*h&7k9I+bl1Pi)fKFQcvnrmK(
z<LC8=*AZEvP^dB(3@Q;iyf+i*p1!01(HM5@`Z-sGTtC6eNl5A%!j1qWIc>1dT%$P<
z%fw{NB=Hz7zS;YKAPM;d(xE^g5S$KZ>;#46G$)r6tT$q2iu@wp{V$MoBab){@(0H*
zxJL+{#m|i-LrnHekl&5O13ck@`yed}cCH{BT6DkrftBDth!dXVtj=03G*jd!grJ}M
z?DP4u?pq0dHNeRVSn^!_!fayP8A0%Ry@g02=AM+`Cl5|`ipcXPog;*eWw+b2c}m1g
zM}b(@^1C?8&oTM15-30D_xr(YHowE?Hf5d1_<M#+*trOsXyHUg#83(h4-apNx=!%p
z9<^@dB`nM*I1Uzz<-bU6;Y6;2&_V0}ofkTx`Bq>ol0re`1?Yu0MMH_x2>&ic>&tny
zdDe*eeF5;eqr-<|I4)#V^n#+iynKbg3!Fv{ha-t+{aGXL_5@&1?FLD{0lv)9i{ipr
z1N3ye_`OpQa{+pLdv`>5fnS<D9?!MOV&92E^&?)m{<R6Nln8O{KPE8ioe=aoqmp-_
zWlwyiga36ppdecZ2X^+0;`8HLFpv5KxuDbOZt!v;CcHrC_4;)<$j+58zEGb(09n-r
zsPDGJ`7Cjv=TGUt(Io|6T{>V9pHzX{GCRC{pcjr7YC+cSfRwif1al?t>WB7byP&Kh
zS6UbBwY9bJ;l+(BOBi1}*zge~u1w>CUmaD#KffFTx!ehdc1H?L-7^U4E;D$Fo(I?Q
zM<AeS5hXur@xi|AA$W103SLd_1!<ENzAiMv!MB9Q@OcAbEqI8+sI#;4jc`fjJYcig
z&WP20i_;HpONL<M$8uCc0g@IoTq;JPyT*i(@NX^{z}tEjT*tl-uC%4#xws92F0+7u
zL^=xFKI&x@Anf{d0D5{{@M-dJnEcUwL!ef=CS4a0pjNB%Xm#ed7cow!vqnsTD|fAo
z^+^H3A5Zmys@EMBnwc^T8hJmsbDl=>OU7_)CHT8aBZQBPdf{*BePQy1m-efm^p**v
zSIlExV2m*e812#eB+zQL^~ia=l-{~^Yq{I)R!&sFX!pSjr`2Kd98Ojlphjw8gx;<+
zgSYa)IC&PH+$|8W4uz{uR;eBmKU761K=^A~AGCKnAtz%5K0B-dqux8^%4{$gRH><{
zE5i!hxpU`-xKNDn6`;h;#>9O(O(9U=xf3dA=(5ArizaX=YQcSSy+8rikrm*rPGJP!
zQ99wZ6t#dnhZ7PVw6{8-sn&+_r*18*R;w;IH+M}~f#&AswYY$p_zF<jJl8l1$8YLI
zQKxcXj}icX&vo!h-$(2fz*l#KsYrG0HaK_1I4MdnjErU<Gv9Q2Bg|K`L?U@ItUy&&
z)w+oa*u8%Eq*V{^)o4Uf(Psm{#}Ce~7BH3Nio$YJ!YEMDX`R#%gfq29&|1CV@=afX
zyu7^lumWXeWk1G6OvhKiiy@SJdj#T6-h~C9bwuFtyl$xJHbL*XZgAXfhvCD2fr0n_
z6oJ8i{TVFRiWtES=&ffzQ3^tl!-r)WkSHv0x?>c4(+D9f`TESv%(Y<!_U_%g(&cgq
zl6b`7gZM&)K!J}MN1*R=AJlET4w|cdU@recpukARJK!@L##UbpjYH*H*pw<H|C`Jn
zs8reD*%B3OC{TdX?4D8qT#Z#pNlB0J`?<xqX{Z$|qlI!4EX$UK$*=oD4qBxJT6Wez
z-AmV@Wmhd&JNiL;?5%O@zn=(>w%Q2cLnbf$7L%V({;4!M<kT6_(>hrA?+%E;`QNA<
zp41B*w}F9yM&!Jd-^j&cZOs)^VASP<gm3y7^2@Shklk*Cp3^d@-+qHpfV`mkTn4uK
z3Whi-pwCMMzf;f(z?m9jL{&@3RzvNe9oC{zI0HR)whO9;>`@o8j*gD=$T^PT&bAUU
z?d|Pva{c$jcA{y-$#~&+Woj7i9EJK<ZjO;>ar<>CnA=7`m%Sf`_H75xfKrrz&gz5L
z^849UT?rTOm|=%>h_OCDM4v}FA_+~ML<n;gDk>`8Wmn?yRw6$?e-o|+R<UM|68az}
zbfv-!ooTHR<T)?MK5hYfTPs*@d=<5slge%I%n=2=TQUrnRaSWTl(0y|V&N!~n;|g4
z`qa!}sN2%h(|^e>z_I*xdO3Ea(#hIsDyue)1Jng_=*{aAK#gJG(&9qo^+YX&4lKR<
zE@?ojw80-P_X)^z*dkFuzttmXr{!{a6>|M<#8!aIgX-$)oq;jyg=TX*Nmc2#)&Z|n
z48V(5`bCj=wI6N_*f{bb<QT$s2TDszDSTohww2uWZ1d*LkE4qebFroLU|8D7t5M+g
zM{X&x`Y1PU+_*+`W6x^zuv9AjfX-r=o%FY4Q_r*h0pcinKE%^#wML_9{<a;fVC=Ud
zw;vI~3l}adigqfuI3pt?0XO(w_E<46U*s_o0#tcSCX+WgIXRKIVdEJ$oukF?m6w+v
zrkYFcn~&2uwrqxQqXi`;CF#Uz%A-ZDG$ke`l8b)O(9lpodr-WBbEyPNK1c?{T3<|D
zh|{#++OYXRu6m-Wsp%5y3C5*!6*eTZzP|o4a`*{xnKbUFc)_t4v9_kBrVzVTMhQwP
zs%o=fb>;;J$)K>oYDkv<DRE#{-21uM2T6%F6o<G*c-Z5a&`c@9BhJiaG#Wj{#l=TR
z<^z%Ehf{of{6iFnxNms5tE;P-yg?O;r^vk?1aogR8R9e-&Dq)6*}P}Zo>xg0$-L*V
ziI&(n87V<00UL^niVmsOY6ZEP^$2ruZ&s#w#Tw*|XTpW%DkvyO!MT4<GDy~}{0xDu
z!4y)Dty;BeQ%+9K2W@R_RR)8>LKdVIoIOE<i5K^hkjBueilJh`7QTw+pt)$yY1R3e
z@CGYn3F1-2&$e&h{(Ef4_hU0yjA777JqvF8w738n33NX=IH<(%YoswWmY%_9pJeA)
zLUSHGcyL~RGeOF%V2M!TZCJf}^;287ZvAyaLc((dx~K2xf9#k?*=OSB{Kp<*9-&Gh
ylgS=p^Mvyb{r=%QES9m~#j)`nN6*Yeoc|v$cjkX<ECkU20000<MNUMnLSTXk%;^09

diff --git a/newexample/android/src/main/res/mipmap-xhdpi/ic_launcher.png b/newexample/android/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index d5a9969b906f9d697840f076bf9d0aabc2f9350e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2990
zcmV;f3sLlmP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000YhNkl<Zc-rlq
zdvH|s701Ivu~jRr)mkW{QNc=Wp(<9ZD5FfB=^tpth>sB|bw<Y)YRf~dMM3}rMC6r(
z27zQCMoP*<VxnzAL_!jTkSKX=9=qB1W_Ppi*L^Lg=UjJFL$d5{*ivuvJ2T%|{$YRj
z_x=2S=bYcY3pXu|1q&7|Sg>Hhf&~lZ1OSXijbV~C`cfJ%56YI{|G*a<VC>iad>QIT
zsGCvgBUCp>Jh*Hqk5W!J@;M&03Uvl$LwQi{$md8>bk4Sj7v#zKuX~m9m5-lOQ7ROi
zJ9iGk;V@G~<OfRS^ZD*b=}w5!^mshq!vQ)X#`BUSiTEiog{6oWJb8lvI*%VeeqG9T
zLi9^SQCv+c9|sd~uybtH4-$DIa2y93jV3200HW<xMMcFp{PHFuOt_iZLo4cy*=%lp
z<&{^i`nrb~wfa>mRXTogUu2LlGdm`LFl7m=)#@lNE}nYPyCCwHN7dHW-hl)77=Xk8
z*zI=zjvYH@kawv7FuJm`@}~?y;s9(mn{WH}?e~y(sQ@shtgLJr1CSH||JJQr?<MaT
z00w{oU;r2Z27m!z02lxUfB|3t7yt%<0bl?a00w{oU;r+?d|nY;4q;ewy95Sc*v1D%
z5XCTjdCCXd)|g?-DpPXGGC_5@OW6Q|K?y8IE-Bf1d7wF6Tv`Z2$-f+Mvc(5}p9lpx
z7FfARmy|ZHFhZ}1Qzn2AFM&HCg5Ao)=1dc;S)xx^hl=|^;6;$U7W^)0SO9bu4xZ2I
zfhF4v;6VT_jeb~*-<_!WtNy5iPd|1kw+2+Jys)Co0vv)k_K7>;iLYI%2dkL_$<_*7
z=@SUSoV58g=Ee_t;mJ4EvJM?{0>??PZ>KHc>)5{D3|_aWOaKnQ0M8fc;J%zL8AQM@
zVh%RNpZH=OR335CSim1y0Ks+N2BCIC(z~Fc-49Q#Q1=6PF<T2p8wZA-5N!C1A?|go
z{*xZQJnd6%7gSX5fIG80VEWq~FmIO@d?689oBVMn{_aX61OpO?>M97n^IZh+EePe_
z0+O{QVKY1kdwIU0-~6cZ4p@Q5ok4)(T}R0d8}OW@OaK}?2ao2eW%EgQt?PioI)_{o
z_vBe)PCDyVJv5%gRVRcXRP;;P{HVCHg%B3`gbMG6pE(DaPkJs>15F)%xwXt)YmRvx
z>s~j29(Rf&&jBJ{$I6c^@bifIQ9Zn+8%!=9jJlAV<A<7f(Y9VJyb=fv1rS_+<p2P|
zcdrMr>*Kga7_1z;oTD2O0BPk;le|Nk5HuCpp|0bfhn;fksz?C!8b8e3*fqd>5&_99
zx5z8B;vWvkTs&~n*~<-}=?KaNH<WkFK=Y%!p!g982V-|7ydXirVOvb|N%K}{;FEec
zra2Mz<`3SDTUVRFVHcEn5)R_(eX&?S$o#18S>Fj?7y{tz6JYbI{}g0`QMRuSM4ku!
z=<*@Wmz8r32&eO7j{ilcA6{79b3p*4#hdhC?&G1SGdN&3(si6Z;T_ib;~N3sP?HO0
zpvkcSkX|Y=Kmdzd{V|W6^J(IAMzC4%;AJ{3r<#}ms38AsDoAeKpt1dU;$2;6j%z+C
z<F9HcEVs)Ax$N(begK7AdgX3Sk@td}*mnLpUvok8<y3^7QTbW7Jked7d*wV_Q{{#*
z=LPOS#s$rng|&gNTr#LFtvuy{XI5$w0zg{$wiep8K}<J1<h*HwENnZ~s-QA&#?jbY
zt8Ie{Z!A4t&;vHF0IKGI+!gse0*Gw~Ah_W>@c~2%vSdEfKfc{1z^j|}37a2P_8yD8
z3u>#~aB#0Z>B9Ss0ibhm@X)4iImaie_iFm&$x}U$d{zkUorO7me8S=mJlQ|~zA6Vi
zi!CPYfMhfu>jm8>qJH1)6qI{A+T!M+K^I6$?Uo=2VkC`VXCvuql2-Iw(4`MSt0pik
zQQNBc=K*>z2cH>zNvY8q06qdh3iu$TZh=sDate!It=eW&FzE#lmBt=YK7dYF2(I1P
z2IIE3B&;>3tn%H?kSzeB*9E=XmV@E-Cli*faBctidB^PViw&Jgr9jdHcwRY5_o?vw
zp!f311wdoJQD=csxy_K4fNp=k6HGoH91T`zUDE&@0`xc4fZ??#K)>{{xH7!?G;sQ^
z0V$9Q`}72xfT$MjH$n)_-`Hq_`BjGg9jVAR)D{pReNRVR^GD}3Lvgzkcm#0vty56<
zOcfZ8^ner!;HrK*K7eJ9gY)ovgWAvojV^grCu;tz&E3$X4}jXu!413H<z0DH?^E_O
z;hilGxIDk*f&gZJr~x0Q9@ED<sC)J()IL=S4S%QszrhEbt^<s?x-SI4oc$6A4(p(?
zy?79N=>tPT=F?dur_u@m?809D)YyM*4;|8gGbAb(fFCC`3nvlFd|G97W<Lb605>eE
zk<FJiuM)a<w1UL*;5@P`cItU;E_iD`iaCCr+Bf8VsPpw0rYk+R&d0DBxT>Ia!0s$)
zb}08&1gT2rh4JsT4KknV!@{Em2;+6C3)^MW`vIU%E~o}qOCJbs2bfkb91=ip-WwnW
zVy6iX^LbW<<$~tly{;4Xop#DA{ZUMP=U?ZP;ttTbIpqSN+tFn7`30HsY>$TnZ?_vx
z&aWO|epD@4r$NN@<ULV=x&AkU3U8qGR9qv}w$OlQ5$Ef7#d>gIy((&Rz}UQ@)8*0=
zW)LJvxxWi)cZ6V4k*a?}G|}}9HhJ~8tZf+5d{W)BRnUt$SrT}#Z2I#60DUE!KoW(7
z9>^5cIflF~a&Jy2)MA>VbIVUkI%B3vYN_ijer5kKE9Z<&&Z#t^JNI>ghZDhmvNxvr
zQ8oPjI0$|of~rO^ypbWBZ_4^DaAs}7X1D?(JhNLn2*6t(S>(3!b!?gAb!&6VwQ@~U
zEC6at?=9_yE3wEOR=a`6gHGeCC*lI2+MvbN8O9XQSMsh5z<snd>4);4b@}8+p;7Z6
z+0qR?b`Czrm3{rL_P7A9z=olu!=>z>CLY3k{{kLx==VYT1M2wZM+-962x?1tT=lly
zYe2-poNQ5~F_#`R^#j;l+b6H+C$RlZOYp!r9e1w9&np)I9q}DO0Rko;_WH-6{`u;J
z)tTRnZK(*N$2si7QI|CY_rKEx89TM|^NP|gm%Jkr1uzC{*Q(F0%Kve$fRp!Wy-6v6
zJ-T!ew+5mGdE2Kp`F@WbQ{s&M-3gl?)x<&-oV5qpk8_7B51x>zrF>uIgde}(3AgU;
zNJ^7YE9!e0fQuD11zJ3Z3`a&E&j7H0puqqz01N;FzyL4+%xngL0bpVP7yu>)fB|4)
z02lx!2H>0apLeGeKzVujbOs=~9gv%wdtb@`?BBnCDt@_x0Z0sh$z*b7XJ_A)3IO!_
zjWIK4&b%%Z3bn9Tn8bgD33;SasXC@jn>I1BcrWffG6e+%^pdh`+S=OkMNy<zH3>8h
zGyJ@tV~XNA^2Y1+LPbSI5qTEzE-e)Ru9`b{?%jF}K@emJIH*XQ0S6w@A`j>_R^$nJ
z)6~>toIQIs72vBgGczwwOF@jv$jG2K0!>`DY}q{A2}ZZuEmLRlRZ!aTcsy|C%o)?7
zMT?#zujb5|b2WLFmZBItWy+NA<L9ljX3d&?@ZiA`B;BpmYTZVoF@W+%K1Y(|IqP&f
z4|!2qTKd6*4?g%S@(6=o<d)KRN)pL&x7~Kz1R4PKvk4O>+>dE#?t%pio}NE{{=AVW
znmc)bUOYgakT(&J#-(!gM}s<|E7H@`e}IvWf1ZrG9W`}?i#(W2o{%@>QN*kNN)S~l
z%2!UDIPuz>Zo27)8*jYvhm$5vnlKVYb0-hT3-To5&8W0X5H!e`NS?cFgllZXi%ViW
k3l=O`uwcQ0#s5eA8}>&{^`cAiI{*Lx07*qoM6N<$f}7}p&;S4c

diff --git a/newexample/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/newexample/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 7b07dabf9f3f7fac6eda88ac4d0778cf7a951382..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5845
zcmV;`7Aon9P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000)8Nkl<Zc-rk<
z33L=y);0-22q?nHBBJaf!y*WX4mzXG`C*)MTxL{Ua1i}RX8t+DpolWEXk_11R!M{e
zWR0u=lszFVl7z4&B#=Gn?xefZouoUxFO}T?-pZ>`S-QKb6Chiib5AGT)m86(_ucP)
z_r0p>d+ur7S~p)C00f`~G7Iuy!hQj*$oUUA0oaCFP(6+lBsxxDE3)24IDr-H4RHJ{
z1g#rdZ?r*ZLzoR>@6l%=J{%IvURxtXG(rPvyx$gWFxp?y=Avyui$S}Nra~)4v!L0S
zS=f6@woeTE&Rlj3I#$~{oL;X8Ys$da>Nx)26YVXuFtn>^W;Cd%sHn2?@^Z;0{vJEl
z6?SYoN6)$jLQ5I(L8AZfLwg-<Cz@6axCl%R%`GyHS<Q{}ux~A=uygHX=f2NV`<gTG
z{m??uGU@<b3~+^<QSZSjYB;E-Gcs6P`ZYU82s|tLzdzbqG=l&<1IX2YfJ=3VOE@2M
zgn_lKe+{Y(XtF#n`nxmQLNucYc!4hN1nAzJQAJhE5k}V5&UN*rsf_wy(f@Cw<%oc<
z#m$YxgaIKqg4+C!s2{<NJ{p8dmHpivElLEuKr_(DO`s=W8}*^PC^rN)+C(e*`_D|T
z3!QQ|0pM$zI2x$F_;X!-ZFGE(jh<Iy)K@e?@Wna8B`7Ah+x;bWF`!Z91)(7{DzLFz
z1@JkJb2nk&tC`Rj>X*yq+IIT%={AkR2|}`^Vg?&`oKa4B6XAM)azi<D!ik)moK9j4
z?&ipU02`ISz;`!s%8?{n$q7!UGf|~db-62%Ae>OI*VD+4C-9pS<w&6<a)QlfOF%k$
z;Ep;$Br}7s5yx5@_%-u_*=#-$9v&WiN7Rv61LMhmY$3Gck&bY4qa(mzFl-m8qrlrf
z`caO}6(!u32)@_}<(QN~qtS%k)+i9NJ%axyk<Kq~!QfY^BbE;!H#hf{+oFtw1Y@yS
zy5q@|%}wVwKtA9I6Qm+lLPA2X22ILra*g;c0ME0lr6ye|Qx~`q741c=0!6qr%;-nm
z`<7^Kr=k_`+WCO+v0AN=k&!XEL83rND5a&PoiN0*81-<iV0)*cl9G~~!-o$)Sns6F
zz8rv~e?Ft0R`7ja48S=Y4#>{VUQXEg?EvA6Mx(JG9<-E={#MoFI|}%P1dIa1nKNew
z6NbX%oj=?kfEssI>*$xiy2hd)j732kzY;HI^gcN9i(5y({3syIii?X&Fc&;dSYEnx
zDOfi5+wJywqKda!fa7v;kegwHluMR+*^Oi?*zKIh^AK!QoTa6uEtZuFgt-jlt&Vu0
zwC1FIR7DQn0q0K{;p^!N_-dM;_8$f8`%&-J0Rm=fwK_dCG_;H4c_M-PO(xT8_0j#5
zi;C1v$j!9*W%S*K1Ye<Xz|3_j$k*7xZsTCXGL7F3SoVbqw1o~|G{n~hh$AE>CcY~v
z7l^92K%}4T{!TfVY;JJ7%OT;636{=M!NO0KvTX5ZD!BBksj?$BL%qSb+TE~rPZ7K^
zCkG-9>-oWP?V=eL%~Z+;KNLs*@dKrjt7Dp|%goH&gO~>Std4~cLEh?tUoP+``5F=Y
zPxlo<n%V|7D+iIQw6Z(7?fW9InB2hWZ-8UpMBvPtdO6_N6cfA~n#((2%ECOjmT3hC
z(#M`Hdf9CYTdsl9VwWsQs?}=M8#Zj{L)h-#y*tR)jAsC9*f;#49~Yi)YeES;wLBAM
zA5w!0qaZ!S%8zKN9i0D(lBXcfVFKsRAAxPf1K_&2)^G3)CKr6Mp@0XU>`k=!o7ET<
z926=Xu<XAw+V-&$t|pqHoRh4Es%Yr^`Sb4+wm7)k`cglER;zWrKcm0U;Dndf=fa4^
z8Su=CEJ(_?@O(=NOKK-~N9y@wxpQN{_H9?NEo~3>@S(sNmEcbvI(*ImZ-1Fv<p8pY
zb94BppoDyEe+f@3Qrh<8IxQd7a;K}EPA93MNH$3q<duF#jT#k<yp<%^0S@fUf}<K9
ze8E24ri2oUix1f)vwV-V)n6A@CO1nFIJP~{gU{Qt4&XdK9m-vHS)Etwo$$e;ylUVJ
zHe-zn)WuFP88JUBEcDqn%4PZ4cE4%@dd<(zzuL2B&k&C^B&eVC^z=da1%vp@QtU#G
z8D3bOUCjZbmuAAA%Lc%sK+Mku`1)g|*W`BQxRD>Vu8V8HwzBgr2atW&1Kg^3$sKn%
zIoNbaS10&<6wJ$kohM58^Ibe=f(4&=Z`<LhVqRGIJ2j!x>5Mye>=;29*IASa4nW=d
z7ZLwUa)8Ut!PK3qYTyg@`VV=aEOCIL#D&sN?IpRX!Dw&+XVHOuZQttPGjr^J3(D<f
zk~*H8W%W4v1^fGwe8^MV`Gmi9eUazLoL}fuc6y^A!n3Tb3}Rwp{^n7R3jAMMTKa`(
zxzT3=cB6w2Ts6R$Wtnw4;K?N!u=tpk-<K-Lx<(qkmv+qpoYMx*Q=ireK5yUr23*&+
zNRXWze7UjEEBHb}{&pAgx`P8nj-8jlbvYpMY#ARZ^;jq1tKy`jq=j|n0g*m!gBd$Q
zPW4NP_pONhI>8t0cPq0XLu&`C#SJ^db+tOUeM1qrkTN*MIk2yJ)UyL9A#ZvTIBSX5
z#2b@T2Je2A>(c>bBu_8hwD1WzdV6uLgdDy?16H%U-c!_+h*MHhb|A*Vwdw&;iQE<y
z&<UvyAZ}k5r}qlJU^Dj@LK)TwsyutO0%*mY0?5m<LAlccjy<n=1-~*OcLdkD#Zd09
zyHeI0T`>JSr6lkLn}^X-TIS-b@9)04m5@n3r(Lx)$m}RxzJmER4lxd?H7&vZ33&6(
zH#<5Uj%(t%3~zQ-WrYdrawIumEY=3UT(3;BNA{xhV{<Vl50--4<wk1RiWKvpZwF8m
ztm_Ay=1QHpX#4SEo?7HMfMn`{xKh4t=S1^Fd$CZX$ZUv}GNy!5pLymPnimSFri6sq
z&y5>5c1H=CE5!lS*v}6X!pJ2Vk{m!bX|n=~%`QHntzA$Et59~9=&`CqO0jPmEeU+V
zoWFd8vb1_)%uv|iAIlZ8z!!|Zr$ah5l)7N!HyT(uw*Zv6_6A$3q(rPzsT9+vPk*%5
z?5N;?0|yTD$9=U@B<Q(pGmKm;9ehEShMm>(iTg^t8IsPMfOET$QWnVqze<+gjIJgI
zmTcAd1wNmUu{hg!P|wTP%rq;+9W(kRJH1I!jYgwev}n;#PYwt?dGh37+}URhV6eJj
z_CYm_Uz;P_-o}KjGr9QCcA)y;^y%Q({ztH{A0X2PqAZ;V<y>WgOwF;vv~QLCNcPvL
zILk#@O2AVE-_XmHMMXu%b?eqWSxX5C4mf)B=y3dk$(I9c2wu9z&QG}cW0Z`mj%UMS
zNPXFF6OwT;))3hR_Iex59o?>VVl2kY=zy`F91wK)@Zl$<IKYAqxTdqhC9Qu}YQNP<
zx5WewWtQJo?yfwRw#@1GfDjwysN3m)HEY&9&8DVnJ7DkLy+fo>P_fMglTIk1*OqkI
z_T*1lpf)?P=yHSG?gpn;1x4$>fWig;E8Fy2mLLUHQUy)?y%Lt|7cC0*`o=s+*J3e<
zYO2iPzAY5AY}vBW9v$$*4?jHScDp4d;iLH`2v~O=?vY`^-={)of|j4Q)}Af^%_$Xd
zE*BV2M1gYVtFo+M-n(E)zECX*PupD}OB9HW)Z8Mh*zFkINAt>H!NnqQa$JKtK&@8m
zX3d)QghvN_{`u#<unx$RB15Ue6OSn%V7+t)JheL;v=%2=6ehUx@p-sB?Ht&Ul8A;h
zE2qhFK=Ds&(0SF1vE%~jbxBQ|fDxcJIzef2!qa=Qq37nCa6xTpP#Kz+m#4s5YXD(g
z?OGvLhy@NAGNcPu!jcQI^Vq;gkXEFC-##oAcBGf`iy1kQ*txe)!LJifLf(!H1kw%W
z#8aS}{gx!~3+I0T4pnxo_7HWfj@8MQ$25->`D-y>*{`^)gEknc)aG}PX6^0<i2@$W
ztgNimK7IQ1AgpT^V*ENV+WkhO@uZxoh`I4vNe*}eqs4%nUzTZrgvqfy_+%HSo&jST
zDj|m*bP@A?JK*!bfbrx{Rmr!eQ8IotJWrMbKG>!NJ*uCyVjJ}N@z#L4|A#c#mu+mY
zsfd)66q<^lN;ohyG_=}OL;$`)A<+>N#b!B^artEqKCyZOzhihBB<nG`Ve-AP{7M!0
zf~76K%qL}APAU|HPWI{m&5D2Xl;y2Lr`cJW`j9$BayHWp4jkzp#Hb*!2BnTc+9c6Y
z5BjN^j7vyJh(e6-BdlvJ&a*{=5Db$qMURn@G#wp*Be*RK+nPol`oGhK{Jy$hH4r~3
zrj`TfJv}C8&f$R4=uIBMSA8)NObI7_cG`jp=ELnu--#FPvjc@-#e$ING$bsoR{Ke4
ze4kS6_jEK{7p|~aEP!<uU9cNc=YkA-v)#FK=iU)LJW0}m3~}!tqjT$Yz|ftUkZo{)
zU1x)9pT*Y#U$ASl;=zs-;5HeM<EPZ=0Fs@YO<H1%&$YlGzRULNfEQP1qwGZLv$|mX
z!90%<JYZV}q+kTsXF<kbFu>-`n?E9qk^kFzS`llzdiCm2C`C);E=it1Wz#+4W-Zyd
zA*C|8<ws@0g?CPQbO0q~<^CMtNQ1{61l51vtR*|`c{e3@oT~N3$F&~8AGI_S)}Ge!
zBb(aTZbPa^2T&AGjV(a=%=s-r3knJhpM3JkbA+*{B}w8W`k<@HWJ;3j0Go^B8!2x1
z9}v(Y99?#-niD^W^$5OTBuh!6QWR*{&bsA*&t8L){b86V<XtVNC~<g<f;To+E|qFf
z77yN$=~F~>*?0ra7n=QEl)rxcdNN}BFkxIR0gE>*lkdfs&I*Mh+@H%*C?WUVTB#yB
zVB(D{FoO#nkg+DkC-{P;f0tb8(DbXIno}uD)l2^gu2P*}m!)h=D5<qvO3S1t(#rV6
zJL8-hf+W^5M6;yiWUhvl+wFE*52n?y&J5$aw<AZ6(1#sQojUctC=bZEFpGngS9E+h
zzjso}SG>hZMUXHhR<Z*wU_v&eqAayrp*U(aQqdbwcIJ@ZDum{C-rJ(6mU#cUOT{PZ
zOGQ?AaMKN0mHgJ5r97p|xiG7wqy)ml!~ad#VjgJc(E+SDXg_Jvq~F?XHl<t|A}g`G
z;IBs&eCJ#!JFkCrQ8M^dvUJg9a2g%p)F?3VE(Uj5X}xs#i5q2AvXm$(KF17Zl)Y~s
zSIU}7AsdB~JJ0Bl#s8U^nS~Q3OrUA#_Dt@3-d=j?C5nP>`T6;~#Lq;KbvdA&F3#mZ
zeOv*FAI3ub-{e`s`>~)wP0q_)tGV8VkQv)E=a8Crz|s?1UOI2bs{Fq2G}#WIggo=S
zMymdI6aB=-#zrHi-5IvtH}numqz9s-qbGB>vcCM=Qn8a3m5HYlf6SsXH|UgbW|18x
zM&$EXXBd%wMn+}H24AqQ5jT9wQh|Q-dOfUKwd!AlsaO85K|>*rJn~3?<gPTS^FmF*
za`g^A@zQ)x(E3!r9YDnyO~;$OPg(PrB_}6mJoL~*bhBQFPx=wIsZ*!Yr4!vQUc9)3
zMM1N9C<jfh#bR_tWf<yZ(K$ws4q&6d+-Nkyo;`ck5S9#6X&a-V`zKGH{1ny%+SZ%&
z{42gN`RZPI<(1zPmeZz9yI0PQlKeG7_}cUG<;!98420GvqsW?kE2nz`FpvI77&0v7
zJvV}Rtn+*Cz4to|rJ~j-kT?1>GBWfy`d=Unr%ajB&Yzp*1ICRTM~`;zb@uGpZ|KJ3
z)+mrR`f1{A*REaP6Lt(k|DKwHp+mW#3o4?aDwQhT-@2eB-62m-K-$jg-McpxUR@+<
ze{WHMVMHE$c+;j$|1z8TAGK(W1n&#)ux#0~PYE*w|9-zmzi4aIt5+{tM(dBVbRSU>
zt?;yhUVGJx2Iyhj2rGtJgFH1W;N_QJCJozT#E21N^7Hd^S#8itMGSnxf?ls&xspF@
z*sx~^tLLA8zGFj-eqjrI_St9Y2Mr!wvSi5=EU(?Is;D~k<mTqOXU&@R55kCH)!<K0
z3?4pwcsG0<uz&yl<&^1LdOi@{hz*gEk*f$BhS6<#o^$~6TKf(iI?#13kH^NwMp3ar
zKA_UO1%l5{H_%-F-o1PG5hjEUyA}1e{nAF@fB^&UXG?3t;^X5_&}u&=pqAu>%16Uh
zaCGP6v17+#5sTr33B%^L|H4KPCK^5;1P2F?NJ>h&(2|@WfKSmM6BCn&7>pt;7$$e*
zmo@miDMyYR*%e>=goK2QN=QhE7wD)t=LE+2<?No{i|yODe~K_*ShTsF)KixegrwXT
zZDd?r+({uZQ$sn9YgSTI^e{g7<(FTGcIYzmzM`ai$A4joPS|$n(4q7TL-Z?jPaHXN
zWOq?fk)V#;&A|zR&S&>{(fmFoTzcd{Ki2oQcLV%tPQc{Tl|{m^EnBv%#A3}w4=Q36
zbCZk)VbrtSMo&O=g@uKY)Eq{AWqrP@;8&xghaZ0UH=R0lA}0))J$v@wu`0|Zu560Y
zARhJ9hs4ChycsiQP?0r+`bd4fTeRcV37tE4?$if2{Cn_Yk3IJ6&p-bhU07HMEE@Q!
z!p7_fHtIRnR=Tej_U+quXyCwsw5m0j`t|^BjSYOU6G(=2=-<EpBltRy^zp)l3uj!q
zbSb^KxLEiF({h%iD;kruWOTzPT52nf`i#)f(3wo*4`hAn!1~yzf6|Z&k#>Fi_U+!S
zTQ~Y;(%*LJ(&g!`Teq%DO-<F3QewYOSHb4b?@EpkIG)--ZQ*~#(`ck?IJJ?Hk>69B
zsqNGU>I?PhP83-UN=bAxLcf0f9%a!m?78Qjn-CQhwHY0up;1O_&Ft4W+>D+oZl^OC
z=oO4++)Og_(vsS=YuBzV<Hn79i6z>BtnK$TR?3k|N$q;{=+U)z@7|Q42T@3m9XobB
zj<VGl=4q58SS2kuqns%x;kAMRCl_d7G*@*jfntQ`{FAJtHbg{3tQj+A%%2$D45GGD
zo7t!jYKq|3s+@^GF`T<&a_+|*F$~N2r{>O`J3Tr&`ap7WvVs7iMGYY`gpGh>l9sEn
z3HjvK8@LbcD+XH_>EvjtQ}A5*bWS=qwqYzA@q?&s)JDejZJIjpb>#*M<qpKDOf3;L
z4M7l|7&K_m3-jj9n}LPS_6rv-T&AlEv|25{z)ho-?y+JkPvB`|YZScdq9;@lr|WdO
z@~o^ZU3`4}WjZ#UgU&_gq;pdns4a}=JFqqe-qVaX!4V;(r_p+$wicpdC;@{uX8ic^
zFJnD1ebc5*-yA%6@Tb$bB_$<YMXt_HPfst*$;l~FC=|tH^fx-JkUpb*;^N{?A3Ag>
z3aRCrIdkUxhmJ+ZWT4a2N(Rw6>D)}yhqMIXJ>>}go&@4tN_uonDlKf#{5k_`IL*4!
ztRv9{e*XK>qeuVGi!Z+TGH$Pu(cknQe)b&g!}cA)IDIHP)&M#-orCdvM|SR@=0-LC
zI3kd7E&<X3M`vfcp_#Nd(F2Q+{*1B)F+j-%i|lds8ST@bzC+(-$LK-FWE68RJ6B*!
z2VROpXs)F_0Y_CfU1`v>XU_*&4(TB_dXGM%eP~|>c6)Y=R>14&5Wy*dj52~4sA3b|
f4-|pj=mGzKtPZqnTIC&!00000NkvXXu0mjfW*l!>

diff --git a/newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index ae0d78c8a74fa2864106d48c937a00bf147fbb16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4620
zcmZ|TcQhMp+W_zcu~*C*L9H6Kx5li|q9`?M6tx?pYOfe+sT!?SwL)o7Bac}nX7Ti~
z2})X|MvAJDgo^d`eb4#6^PTg3?|sgF-{-oo>;B{V^LM3NTbi;k@-qSe0G8XgjBNhg
zIse-9w0};5$@dQc0C@Jck-@#FrQK47CwUv4BMeuQlkMfXK_oa`K$9uVxEsU!UakYv
zfx_Ko1U10TMh{kD)icf5<m<r20sb5vkl9N(eKQUF%>fP$`m0H=<CRs4)KrSZTbfor
z5qc(%<5k3cl#AqYE#k_;E_^MGRQ9?j_hJi<qv=jbSH=G0Vj2aAq}M9gD%aje=-x6D
z_oLt|x4_$>JzKIA$y$^=dSxL&sE>4IcFp4Lt#6eh#=^|>oA1j2R?Wd47Qss1O1Fz1
zSqMpL)ZSkQ$BS^s9~Q6)l~2ZSK=pj;QtglC9Nb^Vq&YiDjD&K=&=~cAqA<(;4M@DR
zv$M6|pH!-|QF+J@u_H#4w+ER)h`)ImUvAp(M}>q|3CURmu7+spOXi-}-wzOVmvFy#
zFK+-@D;mYYCK@;Ar~0ZhjIfMbLLI!&y={pi9yiSJXh|l0dg0~I{5&IrfK*Vr@`-Gb
zgb{C9B9y$gWkAw!>XL#w1Y~4n9v3N`LUdwOwaT_+rNzY765822>8+WxB=FeeZ$(C;
zcgIV#h*wGeE;FwcC@#GT=Qkb!BV1A)w{mSc%;SQa?#V#5wzgJG%ZDWxH#Rpt&u0}B
z6!xT<Q)sL`pXUoh^#j`8;M!rh#7e8k-KBgE1-MOfb8}h$L<Yd@5&WJEcVR(+x==hn
zFZ`3n*5tsq78>h4fRvgV`Pq+I@6m#9oEmUeVO?keU>gEZ3UL#M-(mnw0jO#gfU0nS
zC|F;dD$NK0)~8_y8i~Sh(XgijMB(%z|9X5$FTw%*@7(_zF^YF(rfix_y7Fm9v)uII
z9C;uDkJ+-7?>2i6K}*<C7Z(h>6;2ex*XWUM*WM0MFPO<eje-h!S$DC6Gm+d%c1xma
zs%jsk5un_mbs%OQqT(dy;sVePpQCS?#~L&&eZH)>>l6uZRDK88a8)(V>*=`*n9IX?
z7{5?YAX9Pw9VqC^n*FgK)UqJG+L2L({$;IG?m0D0(1ktcg9<my9KOta{sUm6*7YDU
zK`csB;lnpK&4elT+&g+<Rbc1+^o_5p6Hd%>^5%tD9bC4?{yy@ZT&}@Iq5Z|ABBjB-
zK8q4|{j!CsZuBP>5niRn`(%IZPMft<$AO;Lw$o{kOx>N8W*2JOQfq~fnMWb@UBXZY
z2PLFu@l25U&;3otPGJ#jH%tbtm3rJ6Iz%<PlEI1`(_sOl8r|5e(`P0Ii9hQCe)n2%
zJC@ep@s<X3W%`wUITLJQkN<gRRa+A%82AfB*aWYt-5X*Sx@InIuA&NCHMn!G&v;E<
zgLs)Wx`n_9go6_c)DmqE$Xun=pq$Y)gr3mdgMDNIx{+453$}haHau|I&ZY*2#SBYA
z9LEKPVNl~6eSbxWu(AIWzR5QAJ^hYro~vK-Lc!llz*NfMw)T_;6PSH=vhD=G5I*`P
zB?SLa1tK0%MfCRh-M_@Ir(g3qb{(n0B;fA+FvUA;07uGCv@_g*RJiS{-|p)qO6x(p
z=h=LucMUC;j`U#GG^ryf$Tfbr*WDaqYai;8xwjGb(T3@r4;zpR?dn?_@LfJyAj*2O
zq48-$=XHYD?tsnWMFYMRC3xcjfHy+6gz4)d5jU`wVfgHVw>#qIy&b)%9`L*C1+<_a
zk>=jkPK5mqvVbl<203g=@+m`@@B#IhXUn=xu5^9;2+^;(Ty|la)5b%MrNaiE5e=Cx
z9ivXSL6${yS>uD$RH@SAVSyUvp)cEpWH3zc6bk7OBPeXVGx`SN__K~LvsR_hmv?li
zL302Is^I}U%~m&~8d#e>TjNh8gle})S7lCqRz3tpWsEX5T1kSQn&yQqsI0;Yo?;?2
z-s9Bc>X{gXxJ+tChYZD)1a#0|4eC|I_e*AUEVk6zaN@u#6|w=|;GFJ#=3xMW$R#Km
z!E+IMw0<M}D9<}tY_}f?sQA<UK+sOcdsyka#-_jtNeR^=9Zy$Z1ok-D6q_roVWPT6
zF#$Ze8I%$lSa$<Nua?e@r5C)21Qm`MOxmJXH#PpL1QC`)O9uussx>V`)kq)5C;HD|
zb?DWDttmogoIxh+9IwLyNyy4HpL;OXwWVz;QUnnkgVxY92$i#b^ZRaFl%f^9H%wvO
z0cD#4#^a-%irX<Nomo9pazXcRU7J8Psy>6n$5GDfv~y}wKUzve4s0Wm*v!re4m8%M
z11ElWRaU$a)KiyL<_3WrWq;S%K&||{4rDJYX{ud9UN}V3mE1Q)FlRS49Onr!)`lF7
zcZtpo4{BfRgJ)+6*WTdzTb}8NoSksHN(Cwy=Q6o1OEWPEmD?vauGtoi?83szk`d%B
zi_ql_GJI$K3GGlk9+(OWA11E0Z71_gbXlnzfwF@w?L{U&zo>7-b)Wq*khc6KYrgwL
zOerVi)<@m@!eD3(@4PwEQTkD%N%S$)dyPX)mG4t@;kuxvIx~ZSklPMz65(;cvz=bf
z2g}^G%PX~;Y*&>ezH4PSbwNK)vd^_*9H>(#%F&(bo^b0#?aECy;n20P3I3C7>U)(=
zQEc{uAC7vj@IiZ|@^m@6SvGd(vu;jvpSCF_(UG_5lz&^4<l?p1vRu)yCWo$%zuO-s
zQ$6&xnu{&3d7Df}K6}HjX&dl8P#U^CV$ZuL)X|E@+PA9I4``u(c}eeQM!?R8ihVAO
zwCn*D%eQUe&U=UMiI}M2E96$p0@ag>0cM4uoIYY;VCDSI>9)SY#OFBta^P%A*lA?{
z%Oib~r*w|3%Rv)ndL7^7v)ZRRzZCY*>a*cFM6E0yIIzQCURdlUDXf2ysWcCC2)*ue
z7?5$+i+k`XcEbKc#0W<ix4q-Z_mZCZo0WTra0&fregVN+rD2PJKpg$L|4dTDdcfGa
z&HV4gNX+MP)T*P2b@}7>a$HG<)7Qqf*nY}C%iHz7yL0lkEdj2Hvi|v)N6b&R1XPE}
zeY>!NN^Utazg$vswH&X>xP3nFtVy^Z?lz)96Ne(a<FC2t^i8n)l^tDtdpuu0J2EAI
z{OsKg0f@+=6Ri+f(%g+lieN>v(d|$<Wu$l(7~duT(<uF~Z`B=s<c#cxA}aK*j#)EQ
z8B9;kN?riA6*Hai6)&FG04N*&T31d^XWXpgY?wez?lfwrzGs^sN|3m-g&Kg3LM-Q3
z@^d(`D^l4`DTOXu>}W%Sp%*vQ&!(3@&=KL#2T4f*Fh(HO6dc-exUNEv_hg>E=l7s_
z@bb;-=Fia(*fwtnu~c?-is2ge=+ICXWK1)ayaGQs8-X-lejKA!faQFmLGqn)Px+De
z!M+QHnHM@mF>ce<wb$`ois{n~R%h?EMd24wx2ff6D+;Rzw;QUV&~CSLssN{WiMZno
z>cRfjG#jULidJ7yaf;i8d$c958uT*Xo_aBVV53>Pg~>#?yG!`^r&NlqjS7(K5q~eH
z75qw%k*&<*ROV!SlkMm^Ddc>-qzj<LZP81=$&W7<ly76kj;=5=3C*3__Qj~6X31XT
zheX&+4d6|pA$0_gx1#9e=xqCG{aW^IgWzL!eMoK5oT37x@F{4j07omNn?24_oxz0b
zTeDq!F3MAyx*rTpl&Y7)q9e83Zz3KG|Ijz!e38j6R01mSPt_*GU|4AP{M|V{wQ-J~
z`;oph)_@JEhN<lEdlh{|(ui8z_IK1ifh*^->n9vg!QVK?1jE!aY|k#UG=y9{;Mc77
zzS{KdAz{^Se%_R7sz4AgtNSJ2l6fXS3u+CT8@HsY8H`B=9@w|n*+!uyHQldaX|ia$
zdP9EQ>eyUQ!iiUD;~LD76kPBPP|eBuGP<`Y>9}>|X|(jOeAmZ*X!_c%khYh4ujr2!
zeK%_QcgY<3ka^Cr=_JFbz&jqU>3ff=BCNFB73rwyt2IUOxVWZSAPb*t^1xeH6@jm`
zFr$@srI9Y2%Fx$``#eBl<A$Is#nM|Od~{A5d6AI`$W@PYbE<h(#mcx{!IvM>Wl+OA
z_A?!GVPc8eM>6_uB-_aw$)Q>WvF7hUw0;-CeUEotKCLk2@|7s+%C)v99C>hmaT&m`
zHw(o45b)$Yn4NrhrUeFKryWw949?dp-b4r#p55iU{!bI(>Y$%Zfio8eRM!qwc<9C2
zG%|>)(FbgGC{RrVJP$Z8cDgg`Br~{2DNNIlHvd9>@a3W|r}){$b;O>0peQ_<VF&oN
zMjb)K^IJQmf<ZjP6;+Muu=5v!e%-aatcn7vNLQUMSKP0fZf^3@f#UwcjfV!d3x_S_
zIR4@GcnWVFn$6|_NZbVhxqdX6dI+3m%s#$+%JM+*{H;sWHd;i!ELQG%RGf^fjT9I5
zy0KGZdugtk(DEnei!Uz1I&P2F>D~f+%P`eEswVv>zD~}V#K`C`bTv^v?W@l57E2Vj
zSYi66Sms4pF07uO1c9jgPJRP5leTK$(beS9pj>7hrq1-EU7l;{NMg3X!FK3Z6EQs2
zWB#i5ji})RVx!5W;t9fQCe0WAK|_Kif=bHK;QW_2%b5VKMlfG-uUT5IUZjUhNk8uX
z<u5yQ22sV-PDzT_f@&5a2IifB)anNy3VV)p61%B9!A-@hTd`(o1UHEP_r;GjC^Cj(
zQkhp>9NxkI+d0V#T=Nv>th)dE-YAl5^I<)5Lc4D%HkMa#s;zIveuX>|y}-+DcrDE<
z9e*nGw&$PZ%ps@FA^@ZR*SntZWPe^Ss;SH(tp_r}+lQmhhxTF3og>(|R(<qEoW!93
z{jSx9#N9hPy-I-2H>Gim8ToOjS=WX{x8UUR=7CO^9d=wqY!|DFbAv)qnr8lVHAP7N
z(T+l1@yXv_$5D6()Q%@3TcQeHINv((30NO<ewqLBZFAr2lsUz1eY>%?N^7<<dVV04
zR1$W5f1lXXm@~hfC6)OH8QTMYXz@Ro_|MSzqmO@+<lhMSqmO@A{_lS)P`I*+O1am5
z2#xi3>by5^C^laKp20J0E7$+v>y%mO1~Bgn;PXS}kpTpgyMB4k`4LXqm31ml+V<7K
zxLd->20p0czBCoq(DJrs8*(pbrKbU+mvDB4w3W)hNg=1FkiCPW6k;Ks%0-Vu!7qFi
zw8a1Vbha6;T^h1AQ*F388l0iKE5Hl)8GEh74wR9Sa{N2=Y^B>6AYo7W4z!WU?=yQj
z_rtuviFSwyS*7GPO!93?5soKK@1aHOEmPCP2;$68L0P@k!;R559)nMH(t8Be0<ZuQ
z%mv_S#-|bVwPSI|>wZU2X@j-YZ^Tt2x28hDxj}sY_s$O=t`uB%Qs#}9q9{w00X+Uv
z^ZS$r&Td|~=6K}{U025_$Vw;7f7h|fquOdaAswW$$6GiG>InLle5Y8wx?=AsoAAXI
zip?L30=C6A&6uNaK4pbyzrpCXc@91AjE;`xpXW&)_qmw^uP0pL8GGC**xb_6mcb+E
z4A<q1*DxY^ujq!hiYu*O?aXH8Q(j+L+);UCur@n8+fkwu+b*uB=k9KAznOPSe0h62
zAd4$;4vUSFm60i_U!3;!_RdGw<W9t;`sz-m>Bbt7Jj|ePt#+hRhe#<FVxK&JZsq0W
z`4*K4=){n$B(2Jz;Y+RlO)ZS&SeBUGwgtCxRsWgyVy0PV48+fxBo@jo(j5JC<oOyT
z-r2O`q0$-N@agg1O5)fco8B3zFNwN$B;lfrp0l<X(W76E44yLmAv^6$Z6qv7-jWPt
znWna2Q}XaQ*S!BDl8%L+w7%M(QZ5-@K1DaiYlXBjT7imF>TviIZ6nRJE-M#79-o^-
zf;TL%AvP`>xMNczccfL11m#Cr8I@IFTAWCAS~S@$^e<{-7SSQQp7>rXl5yg+#^;8!
zxwWwlbWi20+d782i6qAmZR+P(jOhQFpk(}WAv~S9I)SOx9s4uo0o*pWG-@<_ko;c>
CE3T3N

diff --git a/newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/newexample/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index c4c0dd6c0839a36f32a19b7a6839a3a49d9e1da5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9165
zcmV;;BQo5HP)<h;3K|Lk000e1NJLTq0058x0058(1^@s6=SJeV001MDNkl<Zc-rlq
z30zZG_Q#6?ii!&^IIg&~)>^lAYHM|-?R2K2)9L@;&33G|)BWF>|JZSvwrZzSw^nhj
zifi4AqE=M&kJ>7rfIwLkWZxkRAt68l*%LhfdtUAfF$T%<5*FY4e9k8klegUaedqkn
zx%b^X@BqK@8^7@zzwsNtb<_<2e28_S*0mL5Kj*`@-2Dj&Lf}iSt2-djecJAihpUqT
z!*r|zpA94yOl%~vhlx!l_87Iv^lu~SX98P;#0o4Ps162A*Oq`Ge;-I}8nOArRuDT#
z><Y0=Vim;dh-rx#i8Vp<)<plNrJt#w-?>8fv4ZXs_dW0)Ky~F|>LAe2J0HEqJH&Po
zOC}}-JKOEsw_P?n8y+Kx*iL$EJclkkOzjUGCOp~v4MWQxiESp9PCbS_P@2eQq-LVV
zZns-8c4NQC?x(2*u(b4CHq&zpv^i&ATfq3ui{6HI!0(8K5i79+jL8ZV77*}|-L`^@
zIi?*iRYK48IqMsM_e!3J=Z?muf_6EvY#V5BV}bD`EY3j107cKu`gF7DHH@^qN%$W3
z95^$G9U-Q&@iazy_d`3kCJK{vs8i8vn!$s_EjZSp>i5Kcw(&Nsr-2S?tY@;mEWE})
zwA2p#=9td0)&|pwMcV=Ab_WK>UYN5539tES8?DFdqgLRt1}B8Nb!&NJ>_pJCWJVjI
zgl!OFuZ{T4j@QBWq!B+SuSzR&O!omecZD}Aj+C@be0XnUN9$O<f11`zI%}wMH?(Eg
zgte~sJ3M|??^jv5?T(UBc`b9po5`wuR@rOA`>r5J-;W}8&Bp8S(6p?N*rviZ8)dK5
z(dmaE*!L!r=?(I4g_YO2%|p_9ShMm*3cX(croFbkAN0;T-s^DVjf_TPC}~okPOXcq
zvMhgc;is)qb6)GXm#HyXzfPw+Q(Ro!ty8A@tk6>`l|gh`1s}3J5Yh|=LrP&`;ebvh
zuGzamtJPv*FrUI>;5(jkGho9KO;jKd2*z{@PsCmTxu^-`eH9On*C47A3Wbw8G(@Zm
zB^UDud0#^X4-b!*AR-=LURG8%xkH9CtFVQ0cEmh9Z3B^7t**+>&hA*@j7=jI3PnHi
zK9`55?I6PJj3h4k@$vBkJ4A}l7P4}4b1_v<<~2{-8hhi`*Vm_R-n==WT^AdzO6fl2
z#82_?v>%9!Mk7e2(kRk5U2OWQ-Gwfkit&wAormwl_5qPmr_(`IRn<o9qjnd{Se0)w
znO?CxiN_ZS+f}g<`=qh45sHe6=C-TMjHQ{xSu7OR-p3QbI>ZFEI<h4sBs|nEM753X
zxyBESw*OFOFc?5A7AKKD>)Pgeh}IT-h)7$>>z<Bb*hear3Pag?s)u~rR5WWenkRYP
z)A96BZEY>2rKLTKeHa%P=i64Hs|#_9DSYVan4wH05@nD+^z(WsV?!4?iG_UV>bRk-
zp`ihCb90w_HI&gxrcYH>)d)gz9SvRlq_B=TQ6H+StLx97KmQ<wsEfC>PZyKPw2u#6
z9Y2&24GRSY1xK+@J)YLH!da<QPGeW_;)Qd^7t}JDtceI|&kJhm;?Vn?;k{4i8s;c0
zEWC)dA&-SI*89}g*FVQji03<?(+KL@QmGV(_xZEOypWamIZs0uKU~p?hB?p+<>%*L
z_J|i^y^mZjpT-vrJFga!NF;FS(xvA(_d;yuWiS}_^4`aFQ>%<nE!KfV<aw*FH2~=)
zXS9$>tyV);Ru;Dz8C&-uB5NpL_i@ck^cCUxev<^Yd@c5<ZCfRV^y>{^GC5xts;sP3
z?Ay0*EcW@ylP9}!Rdw#7QmK~kQ#G77xxxVX6&lOGubiucuNPE$)b?(aKx2c^Imk^W
z>|PT|k{~%bc?I@)dV0Da7h_&%zDA=l-IL+VXlw$F#snI*(F103_HN|F3<eV%{YegA
zeJ_TZdV?7#sUCKPR(TAbHA@7LouP6yr8nX9*MfqATcpps)9SR3+uBDalg(sTL-mw+
zR+0ujf1(z`cS$+7$RjnN*O|NyP^Cl%?|)MPfB8=toV`{@@AM`nym$(r<NIXHP2-N3
zuCA_z=;-KK*!OOUY3jndYBZXSo(NwCqX`7HI`h9t!(NY7a^9e;76~AU?ALq@BbaK7
zyd#*kCfIna8eadhl(F}|DF<;)^R*t>TFv>je)BH@$Rv7qYeFWR`kI!Owj2B2<uJyE
zuN^yf^ddXX^@MoNs8quz5kinE%@?gAaeLP~Zr%I-@2VN^#@zk#BG83DPhJZ>4$$?i
zMtEm+xdos(|1O0+Q8Lg{Pgt0vhR|g~&aQLiKP%y4WF04itf+^Ii;D|C_~3&em%|tv
zz9bUKb5`MtyUc{#g$sWa!Q<<SV8>MwVvOd7&HSa2xsy0))P(}b&r(~CsgGR_nsou7
zkNyanbd4T^M?)a_EKF#Dhqbp?mBXzPwM8FA9g}kgP}nzOkjwO3Ri>GmP*haZf4LmS
z=$Cv+_Vq2-;u+!jDOU;8))&E)ZwukKn@b?K%ABbf^d=^byW5~EKCNW5k4|d_(^we~
z+HE5lfHa%>gE9XMcq$n{z4OLbrFQ{@wqm~+lq$1Esj1e(cPqs1hiP)7WF$3mIX-5>
zxk5=vNnyx<(*RjzU;YMzA(3l<Fl7DpNF@UgYs=47fttGa@?s6FU+$iJ$L|ZvwdP~$
z)u225CTK!?m;oZD4gVdO)N;-N5=wROznd!U!h<$%MH&2*qOic0a9P2GA9t?x@D8cd
zX?tq`;f%$coSZbmK!DR>j2-v7dGqFjWM@jQv#*0m@;l%`o4KhNe$G=`-23III=8&f
z<#Ww?z*u;Wz|+$L4`Unpf+6KQMp$#16zn-GYY`sS{%3uq#S3XQCfMnQ?pw210A+<5
zj|^>8R8%w)4Lk)|aH^=tW?v+o`wP`SoQdZ=i3VQWS#}pdXm9MV0Hwxg5!9RiBXX%x
z_iT_@^nj_p5_CtNxf34N3x$maQ(YNn4WFK`g7?3zXcZu|@So(MH<&#x)@{E1Oz6^$
za`vd4^BNZ|DmKYvGPrp0;>XAW0m$E3{o_aC;ASSTBO6!RXGOFG9$Q;z7a$bW$5QLS
zNE-yx@70S0PB$v*0du38z>u^NH0uNH0>lXFn9rffpyNdQe7#TX5Ikrft*d|{fyUy6
zPV9GH_o03gRcbvoPl!q9uV26ZJ+k1i4#HSBXU-gSSKV|vT@051-5_auOYpEZYey-R
z$h4Nh$HQS#=k!2WwWVlilI4MRdq|7$FkWcuFff+IxP4>9Whfnnhqcgf3F!3ZbFC8U
zAatp7UMMj}>Cq`3sDp@%xsEyrnQ%x4vHEA@#*G6AHv+1E+zw&2jRyGpap67TVQtN&
zYS2;lUYw_P*uAe`CM2KNScJ3w!Y6lYA3LTy{%4Zbt6aXesv14~%TC(fnqgWWpV`0+
zwxaICaWY2*HI8>RD2$#2h#6chDk`d)H*elBIzr#Y(eTwZD=Q0s?%KeWfR4(nhbKad
z90KUs?@A!G+}xp<hM)OC4qt!TdZVHqz))gN+Y?B-KA=^27~2>G#_Z!v$aCe|j$f%|
z3Wd%Bg!b7EA*i)x5EQirhthf!&RMCA9v$B!&Vv!sB9X{=;J|@rkcmBe_V_s}pnWSV
zD_^%-$l1NrwoV5x?J9E!9@gGITxlsT*47wc!<Y9K)HsC!>nhB}t7M=%_JU*Zu%T@4
zWH2d&PG4I=g$6!wP&l__k#Thv@H3JdVfA7`tK(gs9vr4Z`Zfyb$jHbKkO_x`GzG|C
zE|)K*`lrdg)V2w>#7G%|><mDtm7=p17C{|%v7V_cx74U8xY<rHr0*tPrJqv(Y1Z`s
zeZm@OGCE$(Mg6iVqS|He!`gz)Bo!B%bsyGqZ~(Za>)iNn5mP7g_#7qz5c&><LIIaA
zUtWt$I0O*=P&cJgxq}M<T_n{qH6CZ+u}<s7_2v%68FrYS+b!dNTLn5+I5$><cGq|(
z;h|n==R;tsN_TuLuRsNFe&rrKtnEB4wd@xGS=GYL^7C2Ztqk6oS-{RxOh`yLf=oCB
z(25l+Py+>!FGjfwP=m$@OHPYjf(LCX@j_c-n%#9?rivL|w{Fn2p9>-PCKbR24N1$t
za7Z|}<b`yRZ#d+IaDLD7Jt9uvLBoMp1d`Ej1d#J5<gmg<P;Vt+x>0HL=9CnZUayDL
z)Kr{o--EJo@9o)VpT!UL&}y~6pn!HKg#DbWgr_$ay9^N83)@Q}Thv@HiTGZ2hoC-r
zK-N6oB}xU&wh=DE6VN<PR&uFTK^+xe&&>1T3Lv!AhpM1~&gH2V>6q!M>~*3pO1akH
z)roP~_ZZ4D$wrt6q-^-y%llxO<~w%m*xm+%A>SQ<>PbVqNkWi2@GxG8*uRJuW7B#Z
z-&#lOB{<$?DWvHd&Es9}z{95X;lG0>BE(y|HZe)taX5lYc-Sc)F=@@UorEh2rZ9@v
zdT4t!a|3yGE;s3WWFRLer)2Qp!MIegFJ+`f{nM3xXt2>}6uMdi!ZD$JiE{Y0lft<r
z!~Mh+HZ+gqpQ&RsLTq$BQ$Jz6&#j}N**u67fHa}Kz>u;P$n9rWIPX3yb6YsKWQ(_v
zn?h!;j4SF4%*3;GUkIT%U)?4PFrbVnEG(>g`|Y<!Q8s*A1ITaZ&YhzPeR5X;s;t$)
zAHzyHfrqsZj|xEAV4fHzmFOXSw-g!_23j;!fp*_x+`z*M>hGt5sV4vKvAl8(Qvmb?
zJZLx#<cCXg%aa^=S!y^JA-9C-wg9NCtgP<SPd|MW*>D6P|6|9FJxspa=t>b$OFROO
zcX0_1o7NvlYMy>!nfGfnfFWrEr|?+P`U{`jId5BKWORzB;IXbymx{D^U#qttN20~V
zii!%=S6_YgxWfRE*NFrktt$Xw+P&$D6uvqy;oP>z$v~^Oxf9iLFvPEBW*KsBmli;i
zR$)0-MU@uzM#&)Tl+>fPBT~u?aj<o*HhZ3p0wfR!bgNdanvQJT6Chfu#(aMYfk*Gj
zr!aWy01re`fP_M!kpMIU*&qP<w+c{1M8s4cAl|Gzkij8<sC(*m`0(LL1Rjkm0F^6s
zuq2@h{(42oxh+qUfZC=CYg8#g@lyoIk8kDNY9n`oNz*(^Us$bWW(s&BJX_m;h+WK4
zT844j8lcL`O6{^`%P@p>`}pIJ{aOWR_wL<~kR3F*l7(qV2Y(PNga^X1Ikm1ka$sG0
zbGhHpNUOz0BPe1|f#6^N&9S`<wI{dR)V2)pw+JEU34*Q7*jNmCRn6mFb=o!)(QFph
zxMazaCmaT7_3G6Rk}ub|n#LE^X<_)G0!{&X_DmUwDKsi!Bjl~U0lGSKree}*L9$^1
zrvO#0|6kBo3+|p2Cr~pT>?wF2C)wtAu`(u&M>|`hfRAED(5N@ISsGtjT3Y-5`|nR~
z6(Dvd;(PDCH(amRyF8f;r(t}XCI!EpIh??Q`-v)5Sf1)E`=Jn$=3arylf_`7A+0ej
z7KC5^g&TlAe+86R&)O{{VivgSf~3`%m9E<B-<Lx<eS%fkpoeEpmqNeq^Wf*ohBgBz
zFE6iZ)~s3MkPSMVac_W#_1EcidF~8l$TbF-dZO5EczlSxez6j?bZ(Hcs2+ZKKMt<H
zaT!uSx(W>?3hIS4P;+Q4CjeFNSPI65`WCOPLe71mlpQ=ibF=xl>oa7~Wrw*Po+BPu
zp)<D0P)1f(RtaI^SI7osq{XdENJt2-$`GVhtCQUwOg%|DJ8(~~TL29sq3{=pS;!iQ
z2Fc%W6Ry8`nE?o`U`rMlHRg)6wxR$;E8cMn9^tY#K%JM?>R{^O<XVSkSUNi9hx$rE
zi-xyqG!SyQSq22`&VjHjxwnON6Ry^gmX>ytFfov_anEV3KEy@ghx*mk)tz;BI!8Sb
zf3Fem;j;H3ci(4;RhCARr&dGqyci2SXesZ;LQP7w`Hs=+pzhoO5PbHs%K*s^u4Ss*
ztzBESQV;JOuH+0LoHLbBY<{{_N4)JPabl7<+}R#uN$9Rt8N5231J_Qxdi5$!=Ln)~
z+#4Vwl6sKWz7mOKCl?dS@J{Np*EKIR<#;hu7GS&!*-zH8lsn*I?dFo}V5FIfQCSD#
zZ$EYk9`TwFK__s0^$zUt$JcQK(AUut%lOwdQ6u=bpdUX^lrVsKX+|RRXwQWU7jW6T
zzLbr7KAGXOXwf2kl(kP`Vc~L4rnHh1K`-L#q@c#wA70S>jF{lZ5=J=N0|-N!_(BDk
zXu~!nMw3u9$LX{k>q(AyA4|!C2<p#Hiy7_W4m>aIE`xlDIc=AbFg^Qxd5i5b^k6;%
zn75|1;;;IgIB{YFGT{tBy%Q1==5n<fYiYd>9whG98GxprDzV&YnrbzqeSFnEJk&D&
znFwmJxnWTNOLu+gT-qM`cQDk+oW8b9p&Fk1uEZ^XaOw+tqa4hwh3>oWeY3qvWP#C3
zlj^Igsvs;Z>~F|~LjWyUumH2Lz`c9-K23I{<!U$s8>ZVX$Gp&>{rM0pG^ed7kc)^n
zvKG!QSuxo^>xHx>IUrpArh~$H4yZD&y8KuVE>GjC7y8To3TUL+m4Kw}qmQ(HqxIOG
z3rC4}HhG~6U0PbI`{Ii){)kMx`|i8lTLp;b`8}V0`stBGK$W|jiCI?UAg+1VxpIfn
z_D|wO%(M`u3Y%F2DSwS^6&@z7|1ggEJX>6ppV;n@pqB3ankfUgyp$bD>)&u;_9Yf1
zamd0%h4Zo`iNm4(NfOc}D!s>3_{_{q(WFU}um;rg@y8$cYYiaWx&{Xa_av{u_4W0a
zDL|Y&+MGZ_jBRFNYa>bOnk&~>hAVPbr#l1>YxsF1y`%M#N)WGn_nz>GzMc=7f}3tH
z<9jYk;WR-1{87Z{C?*ujG|+!vo>O6d;|-ZNGBA9!`By`R4C%rC&T4C0mpOCh^dheV
z%FD~QaJskxu@7Q|mg1PL;oY~Dcn~(eqcFBj+gmjf>Z)T!mPNJ|v5_G7{M8l#s*BnW
zCWHHTGM@8?;R1)@`Te$1xJ4fpP!ix@ccI*Y;V!*e?Xe6Dm;60_`t$*0fimIHPat%8
z>7|#DwxHP9*mt=8S%VCz8pgB`=P_-sr|Gz!r0;2ek9Q6pYFSHDK*JUvYo$=V?KAsn
z`>OZAAeV5~@bM(Af7U@kjpJSHg92D^b*0pSH{$y-B9iHPMnH>1BG|TV+o#9^Wx^qV
zd}hy{jY7K5;>C-n8jZ$Ut`=BeEi^-RS7Y=h4TueCE(n^S{AiI&@UUK}{8)26M|~^#
zE-fTn`Z_4%?2mW3v%u8qixP((RjQ{IXY@XkBU~Ty2_S+xR@mr~F|gd+T*dtP^M8XZ
z&?2HktCabmSPBXX>P_AcC2s5*S3;UK5z#g?B1`XRh<TR<mJw$K$=Gn5%VmJrak65C
zMNl*2WL6MWhb;wTBlpXrl+|ckTtEx$sSQPNGQG|+=p33ZbGk-mYrl^wW9mm-0)+Y}
zE-nt2xEp~iI4YnmLVCuG8G+<=a9&>CI<5giEp&o-8#b*E`aTcRrRG>}BoO6q%5)1J
z)(aJGztucWR+4QQClfAz15{bpJ+nGJfdZHCYiTV2e7c17J_WT}hthUOW-A;ZH=T*Y
z0-{_lhhxW%?Zss3$tR!e?WlmZ=%5!~cmXr90S6Brd<hjf*V9{ZuF`)+S1@<qSIO1p
zl{m=Xq}Rld@=mP#01?B=wLGnP5?cNFLkvLj<J-Wb_1pplYMuRuDramehF{oaYm7MY
zPQ=-KsqrM_7uRb!tN)agl$gH!^2>S10100X3usFi8#{I^>Y%>FLP!|P;@S%_qLZZc
ze<1Ex)L_nn^a>r^{49wRcv!pjpH$Gv%?+!UilBPOGV&_)_)q{YV{E;s1Qr_CT&xB)
zP1~c(l`wFB9%lgg?#O|K@nTNG7p_c}kdRP7`W}DHxi4kGsl~>bA6S_=b7nu(K{+`&
zn>_&#dL7GML%fgZ|0+0zhw(yh#ekUX*L(~U=w%|WjAW~b7g`e8ys*SGTS}ODL~ICu
z=5!h7(|&vH$%Xt{EhphCJUo0q_Wktf({Z(WUuOZb)<J`|Y}qoKWMdwEN<&93yo6|>
z+_f2;TT$38%V@nftyrpM()wSA7QvyUT1&lXUrsIO@UZsEg-S~)#MSUsSXgKv8Tgyn
z_paz4iw?pWXn}!&{V|M5rP5?icp=Nl6K`Zt8HnjUVogTxKN^f4c3Z3r-upoS5{2F}
zUwrEEVvhmTlX#&MMfI+(2gGDwF)=Z?8pjyg_uZV;Kh|N)kGim-v9YnsaCRD(YewG>
zh7-?lB0l?X9Pje+5In3+`?197w4PlX8jFWJckWz=eLij4Gz7@cmGET=V-qG!Km|UC
zDDf!@g+ju0QSpBI$;)iH2A(3Fi&IrSX%B`MGGWr$pS;A^w6rwYQ%^nhB=-5ZapMAA
z4PSSJv8hw1;@U7HGcz;yqZi_Tbl1hDjx`2mhGv!*tU{@CxGuzwebv;|VD0Aw_VuJm
zlLomHzV67zaKS0^I%Mh6rL!6v8}<Cpes|7Cn6t973?F{@;j7r!qeqYK<7)PGR~W-J
z6Gx326--`7=jZ1~@m{D?!DAVDKXc{`PM#l4`#Qkg@O6inCRzx^^sv>dSHIlQ&|u^j
zUg$K&c%SU-Y}0}T3$XG$?BRzWc3V8#0)!;?7&&qzK3q2T=FOX@arI8#3v~|fgA?aZ
zo;-O8`<C`GJ9&%~fLJl@KWx}A^g<*4@sEGZmdoX8-V1dO?{nkE4bA-d^IyZh9XfO<
zdLMsx#dAwusOLiuJv0<aO-M*MpwVb}FVw-k5B|jW;lqb9^CG#@So~3yo?MA%yD2>-
zbi@;669@!iJP}V-r+M@IW6Oz&iPcl4Ou@yYMhqD;WB?bb`#n>7B$SdmCL$tYIjVR1
zi{N~xbRh48eO6LZ0vk7O{095d)86L}Erdh-0RaKS$?L;eSy}Nklo|QX=`f+oh&TSZ
zbLUb?AC9Me+1C@=r^SpcBqU@o)(k%S=%YUig+h(VJhzzlL>(Y>;cIGYs&?+&xhR}R
zdn)s~mlwhsL2m+42zecM>eQ*VSO(_@T04aIX(}ozg6-S4e}{cX`>;3d(=HEqVPm}z
zvyM=oK7DWr{6~_KlCI!N4t!SDzOyd8(IX=x6R^){-v!aW^osYnOHdCOFaX`(n28f7
zPS4NJ7vX#o9-{UMk5;S2CoQVRk01YA>@(7LL%boJTNBiM*ig1|<;wR+YTv}`q4uYH
zFzw3B%xqe;Xwl!XuZZqJ@6*Q{!nw6jhJ$YXhYcGx7Tw~}qenO3k|6ZAR{1J*`xt4z
zT~JVfPnmAVKB9fq-)g|r=YclbETIf1AocFu8&B-f3l}b&luD(1C~GI7tD>R;4jnpl
z4*Q1o(V(^rT`h&Oz#ct%455#LOeC>34rlk{1@N8OcJN>{IC=79BIy%c=lQ{afB+nd
z3T(^JWzP$Bp(XIXWE+Vwme`c**RN+_!3qmkCX<QpST7d~G2=RW_UtXv7x+_6<7nUX
zwHmJQd7zza)_N!?I5>DTR;kC19XmZGC8Y>|I+};byYST2)#2iprK3lWo{4=y`y{A6
z=$_W}5LPq?P@y({#*7)y5s1oIPsDe!ci_2n=~CqrPdxE^>;uvlC@TigzVU63@Z2$b
zkqWedY-WZKB_<{o@|wu=nnxy+q30=~@UR)zK-wpM?HL~1p$_J8AWHuuW5$e`aplUD
z44i*LA>vbf4pVh(Q+%c?GBPr2)TmLvq3}FNGp=6V9ID_FB2@dqLx&E1h`dhl^YeQw
zIyyR5AP_KhA}kg0y2w4RLyLsB%gV|iA|fK5wDGU8t!bMF(?0NPZ=%`J%*>x&z~BJ`
z2H*ufLN0I$Nh^QExhV8WR}&AB>mduL73byU!NG$E&ycpAifv5WdazBp-eKTr38G+H
z#2Qa7bn@=qyEoyJ04kM=*F`SEgY&S`($Y+uHf`F5ZHjG6+c>zR!($I3jKc%Fckezb
zC@5$Gc|U34!i66uBqRv1YK=4G_>kss$ZA3@`SZ^|i$3|}lfNN6*rudyM^nMvt34G8
zxzt2GX*xM#@ZiA+(L}6MoIZUz2Ir{Yqe6VDfA16>U-R?x@e$;!At52pU>gn}KKxN^
zQ`)vYJEG=s)D!v9S_BT{4JQyig5xu&i?(gswmv;QU4_+C6oq)F@!sf8p^Rma#Kc6^
z`t|EKW1C^y(Hn6%ZPOl|5gvQRMy!V7>Ssd&0|OuG*RS71bi=Q_^2&clMMWhR78U}=
zcPbL^OORM_uno{Nqt_wHN79QgzW6G(6}B0+9kwBD%K+N8T^{J<oAr#w-c;~~1P2GB
z8%B_(hK7cI9UmVr#B`s{)UYk@2axDB-exl_p-_kmK8aVZT)B#7Srchnh0wO^-4-(n
z+Y3ajxJLIojNDP<diLzecq0<me{<;2p&wFHQyU}_3A=)pv9pFYE01Hu7><cWN=iz@
zo;`bx4jVS?8Eg}58`4G(V_VTSW5x1)1&=*l6hKFb2itg~DYIwKe);IpqvvkixS_+$
zgMwsYLF&jbS)D%<st_F1fEgJXx+6!9{NJouvtF^|bq3S63h3;5$60UGjn*zOlNi>m
zTepV>4H`5F(|v5jdGqGI6%i3}fe39ix^>hAC@ec-c(V>un37|d7K_DL(@}?qhhLmK
zckX-&&LnIDYzyjj2GBO@cE5TZN4-%W8sA5t%O;J8MY74*s3;=$?c4XmwQJWzSj}!|
zXh4dX$5rTKMePzM>TPaQZ^O({#v&>XLEyFQ-McsZPk;K;YZRQxc+E6ijihbShxa<p
zX``MryFiycvRAKO<1zDKJrZf)8Ee<BT|=_AR1)48ucTJ1fx4w8t1#ClK-mCeVxhq&
zBhcI2ym?cN=e}mmnr{XU95|EpICzbCtrVQWv<-UR&sxV-Z{$l|buT&*3LhT|p&p41
zZBvLn{@QD=%?%3++jH^a#jMQCOf6<_=$Yul2zLNw4VAkZ%6cDkpG~&Fpm#)1gV5Z%
zbxVuqi0At1tFOL==T7T6OsJwBCxl*W5WV(pR_Qqp4+kJI9tm{;5tb84W`d!O32!(O
z{nlG=y}fno)*WZgoVlKqlqAKP63z=opipaAZEQ!Ith`kd3jzDy-rrab+3(`M*qtIw
z2n-7T;^Jb!b2xkUY$Bc$(Q$tz=lBFYSInv=<26u?!+IPRobEh0+=JAeHf}#U&jp3$
zXyWo8!8_RB-=FnL*g=my`skxCEMC0$(_OoE?LBqs6wdQ6A>mGm9g86kGadvB!wOyZ
z5n9{Oqu^)p0ZRNXuI`22rL?pZpSx1xG4NP;%teb9{d2;E34f%X2G3~<o+F+so->|1
zy@o;bns|@nC6N4S*}gZ;Onybjg2u2gS$QT4P{f{k{`u!$Ubt}Kf_3ZGh3?<K|M0P6
z$D+@jJC__26O$VsA77rFoGc<~w2Z(|OF~Y4c6N4sR#sLm0Z;bJFTaQq5)#T{V`FpA
zpFf{`{P^)`+(&3==sMgd?%UVbcRD@RRC;X2(^x?>hMw!M=(+cy*W%BE<6V%t(u{=l
zN`0(g!m*)IBs7d8qV!ShJo3uwCR?Z;qaNZ3?EIlahdxKV#;j@6roA|G=FFGS@IC$w
z|BnJP4a23?_bsqcAv}p5^HDqpJQsRS*3htF%8y<P4^A6^Wb2izVd_uQ-y!slN1z_0
z*&G8E0b&ZK%U0gX+NRjp9sf_g%4E6^1{T~m9)kiif*w1Vo{Kd!w%&#Zr=7yogBITU
zQgJ$v3e}<1BaEb-jap<3c0PIx1cBNk)W%ad#!*1V(C>_*`xs95IhY<Jh#oVLo&yg}
z2ZgCC?KD3sP6KF7r5DvtELi<%Xc<TaZ7_ww+Jfo-4Wys#Zv{$ky3d~U7~SYGeQm-M
z4^0OL${H#bEPvYJ-D&3sP_JRn*#GZNzvFKOiZv`eF!u>mws3W^0nOU%ea3b__ucmY
XlyttOFJoE*00000NkvXXu0mjfH7Bw7

diff --git a/newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 3b2da9ea10826d8f5e1181ff7411073eb43b7800..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6296
zcmc&&S5Oqplb<CDf}kJ>NR9%6<O~alWERPJ70FRSa+Dx~A4-t8WI-~E<h+QISwKmW
z(}GA4mas_N<A3*XcXd@)_jV6GGgUo3HPij;FdeI}r%p-ENDcs?)YN!ra5Z=Si>{Ge
zjRtdWqyXH3Yd%yq@}JqsCi6F1Ywp#hK=4HnxU`2@xwz-XS(ew&m{io)SK0(^rL<Tz
znh5>q-l41Ku!Y{VOJOF81_U)tQI%}3qqw2h*q>gX?sqfiNgm>=&B@qX*j32M5ToH4
zv|AsdK;uJl@L~|+^`T>Y$l_W1V$g7w9}B@NC>!-PqW{yhA^nC=Z6i2eJl{tDy-DUu
z^oN`$fhV>i#B4LzH(>@kCyipE>5C|<4U&AOe3tvT&b6oKFaAWb39+TzKHLh5UMJt7
zDWmfu*HmFCQIG3gDDr=ryAmHXdoUu?m_>XM+&C)a!aJNLLwKZLPqUrU`ZeHpmROjp
zt7{<Q?LqAI<JiR*Hj{F^BTlXQu{_I2l=qDY$$KMnOItVT{U2HJDeIHkBAy3w;b$Cb
z(ex%-&Rdms3w!$r9kR@mfb4^(Px7yImw#bsoYf_XTvot+sNvPnbO22=$tzyXf5`L#
z9;EBjQYUoV=0`+CEb>zqa_?*-&(rx+tKGt8B9)^GZWgQFh>08+7{FckJThR@(43iG
z^k~HMm$XD?vBq`hgpaWe3=dxt1_>%Dp-g{3s$HjqNS1;%ljzuvUfJHm-6~cN2nZ0E
zeik>CBy_Qi_7p}=1wk_|Ab?g3Wa;rT%Xk&)`)?EAECK@qU4Ec1&u}}fT5V6;4Y~+`
zegzJqDDwHo=V!e-W5qB$B*-1R(%qj-Qfb*(B{g!nLb<@RP{9PCpQ}i)ig|5qbJ>ZB
z*z35NEE(@pE=pk8=&>d>cDD2-(vSaw8FSDd6MRRW&*gL4PeTHLOg{-j+gLWZnZxlA
z^8!w_0I?8nZ|~h(g<3iSAl#M`>g-(VcX@t-dWuA6$<)GYAfvEt;!qO6b{~?i5QN+P
z>8eQ_zV9IPv)TLC2m};zgIWi4V0e3KPEM$D4M->hqhVLi@goEp+Q4Bb9m^J^3t_tr
zpn&Z=;PWH_&`iPy?lX0GJ7heA*r%{7krmP>Ta%Svue3u7gp7cOCJzuI0@PPt^Pd#X
z27odE5daWDz%>FuO$6Ak0Vp;2AB_Jd_Fs?qkG1|AuJ`Y^(F;+1zxN;jB$yeewK}c)
zbG9FsDgK$ks&QV)V@*SnW7=#`&KAyN7T4P^RD7(Cz7TPmZz^0dznR)BC%$+~S=U%1
zvlp~3OBIsf@ekr;3|{t$PzL>zkc%;#u^qv$ot>#|x|Za<V+Wp0J!Oi&W2%fCnlyY?
zOKV2#<u}cD(ft?fVYe-68vP;A0!ZKDluj~yOmS+yZ8(V*h?9NAhd4+m>^l(0Q(NTP
zCz=vndft~54iPVZ<b41;jd`c_PEMa#iwGo5sh<g0d~@B)n{ts|GF%)rto&Yi!vKAA
zf0_ad3;8C2JQ?6XEF$sQUYTV&Rh@Y6&63E46Q%4=xxJ18Xv~W<0ObIE{LY^i(a6Fd
z7CxhIyYo=x%XzyqlZ77AJ3g38j49Vz;ahmGpIV7{%LXjDOa(ka&+DrT+56Z&^Dy(6
z+^$WRoP<h{NDV`7LBhZ86sar8>Nd8Ss;r9YVvI=U(UCd%=)94TsfYK`msV5iKfW|$
zvI1{5uiJ2%M07P}EOJ-9m@KY$%*Z{$MDY&@H<X`oJRQA<+>*$p0MNS-YCJ)RS9PLC
zwiO5A^IvraGuD&0L^pQvVhxeQOamWd#>2i&>8n(!NhNq|DVhHf&Mh#>rKJb^dJUti
zo~Eyf!zDsv6Wws0&?B-)2X~LS=96E#qW$-H^&)5hG#jmo`kQAZiGqjOlz!w<AI<ZO
z-N_S17z&u0Vvd&%k{r*pAqRt*if`K1W+kLh_1)T@LXvf^p_3myjej&)mA6>LDTxWZ
zwtpNT+SmB;Hpfk{*W<U3o1s3a4dpY5tdAK_)({%RF6#)AWF6C<^84g2moI1!o0~=v
zuwhRB@{Vu%xVprlgAkY+M|DtrDfuze<^JZE@kGM=A_8w6hAJn-k05}#M1MDr6$KBZ
z1A+_Grj|y8EHt%7f(~**K_m;27>?u3vk_5L#qnA42Ps%B<>!uJ-H*k_elDS?RJ%#i
zj8fyOE1(2CH|{U=?&Y2!1n%Q2`#&}$POH})=lR8d!(Ga{kXbDc#g@btCH0?0X3lD>
zF<`PJAIO6?@}cIqV9Ad>ydBq-kXtn;<|A#EYP|f+>>(=2JsSm?6b%)Pc}(JufgPRs
zZ*@bh*(-$yo5(QBR<0LM+@5DWj1}I(&`flO|3qUf<SVQX&eo=}aT?LKv-E~W>j{+1
zWT3(?HKUL7MCCN91woF!>zT*%mIz#7sedzHJ=Ms^DHL_dVL}#m{~V$0xiOh1oNcUn
zqt)VfLQU_Wvz{Z6cBJ4zE<=Z^=6~b9N4<}~iOB7qDA<k|Rm?Z{Wcrx%?<iVY3kz+K
z(Z_A;DCJmaA>Nf4C%g`PpEdAMbZKs1-wJc>UXZNgjh(sk%bJZ-CH-;%$=A~vj$75+
z(-}5dMIY&6$oChJmEy~5eJ0&SVy^wa_Xxrtg6DG^g=gzVFZ<6!FG61!=Lv3Jz4s=?
zX%9v1%r2*7M~-mrX3dGcE;IDU=laK<Z<@dC5I<e|lL`Mr!)U6!)zLtNdlY;yki;Ny
zQ-?(MB#PNDiW`8mJ~$lTMVokXVgH@jcH&x9w4cvt@q4j^&lZ(0{RjQ}Ucb8rngs)6
zeo}9JY`HX^W!iYZ%3naxiDH+`oN$$W?3Bhd-LfCB*Wbc*^6w5VJE7yJEBy8jn1prb
zj+xI;1oAT3E(q+gTP%$ZK4qU8SiXr^6m}lrI$5fao2n}J9y6pVFOUq&gE@s*KT#bD
zQQ1n%Xq9C6R=Q0FX8P6-e<Tl<x7vrIdP1E!-cQjt!F}g@kC<=#J@4nKk<fHO!7jTz
z5O5pfb!*j*nF0@=AU(J>jo85;@3&QfHJ2p(;*zn)=FfM>kK`GaKK&(vRNJD8#%df*
z4e|+7T+BZ>);jM{1kQ4X!k-a0(^;|J28)Me3d~rt7s|2i+Poc!akG5qOt!eGDdt16
z`{}pj89;awL7wN!G32_*!>fDw-(H@;AQV{=P24G!HgW~aIMcNIecD;}-NHm%4oC+I
zxDhR(OS}tP<p+l%QYd^+#*!kt<lpmS9mfzl8k;y6iV8TX|F(2#vATlH`Ef<RD+T6g
z@=+|E&JE_53rs}EXa2BXQ9H-KefjHbrR!yxS|4mw);YtHd1_HJyoH>}<_aYO19Gh}
zr=yr7jMwSE%ph&Gvw`brR8XkSODba;7cbPOIE_jhr^Gf;($#+%wC6r<S?nD;e^s;b
zWjfoY_4C4&6Pvg?grXD|+)|mYuW2D3oR&rVusgD~XwkF$lX4CCe?6V!x7I=LPMyhZ
z5-_bSDgV+UMUuOqM##PNSnpT@|J!DJ3ZIcBZul8)){t~_Wb=u6u+%hmNim<CzP<c|
zTBAE{@+%A>z><V}zMKvmVyqqKwaV2G_1VZfU>~{M&I@Hl<XExJvv?nzwW=xL1C_T`
zyAWGW&5=2w#r#5`ng?0J9#ivcdBXFcm@X5Wnoc2T(1l*)gjCmQ9F7)f=??8qUEiYc
zGA)(gFerBmZNz`_c&Y>QZF#U6Jp(#3Wun?nFC48~t=)nbtv%upC+4t1@7x4(C1eEg
zndP_`HK0}k7~jRawV$qnl}P;uNzx;-=-{RLXiR2Mz3=*Qn%dMkuEOJcMKF_sWQS<g
zRS*?1g~c~u(y>9}U~a$qs7be@T-((?Eh;Q7W8?$O;Ig2pWMZ1u;G|#fJ4YJtYUK`T
zh0)j&1o(?{5M3qttKdTzZdeE{he`ZsD<DDFmx>1Gc37Hfp@SN~soAJ&Ymk4VI*C(1
zoif?lXHsP(fj}cb!ngX4ki67kgrAP#k+px830;g*q7M^)--Bg_AMq#cpUN!7ZQLSM
zrE=i37Qb=F+7iM9brWxjic32f5KDy`uQs=DS)<Ax8UmKN;7m7<A_kob*&g=^j86ce
z{pct6a*g9nR&g=ZCAzoI*!XV4!4cB+=!HbsY+QQBwCbRqWC2BHUt~4xA>#*8IMV^V
z=8$Xc&iMFO{>w_j5xaisI{ru@iOf=mp0_h#Z!;{>eznV&s_TZy^zUC{11lsTH}+>r
ze<$a{7~Gd(V|EahST#)vZq<|d28D>9A86?Uf0153{6)?8ZWnJ`FUZc>s_Dy(le=CL
z(i0v-k#d^&5p~-e;V*t@Bn?UIz+24{|9%$2J_wsN#D?(5SyyjFoy)YhSzcrTC_x#t
zHU9p~<rNwc34FbPR!Lp|ZKv2On#ioPzj_S7q`SsehC4~gzc_m{P4A8S=E3P#yTQwX
zF;}F^^RbHqesKwWrTb}tH21l#gYi-=<K8ma4Ez}>h!u=fOe-q>a3@2_xX{R(9PJgy
z&Ds(>ec4yu3^}O9DW#~Pi#C@()Nb=JECg~mfbrpg_%__S5JjLsrSy~U6|8YbODacX
zftPh+^|~`BqjWyVD<}YH^n|WyoVg4gIJXOtk!TrbvMrlRiB4ZcCL5CXZ5i=%*l1$5
z-r9<ty$|_tx3}doi*14WjP;_bdmF{G!BEyiM@4CA9XRQj+OQ;DdEc1;#L8bo*ysyW
zJ*=z6>t)LxG#FXj^EC1`12~12<jv#EahzRk>_5Bj{$T_MWxvPy)l6LGEEhNs5|co_
zR;69;-Gzil*jdpp#8hg3I0z?#bk^dSZE^2N!tvAj*WEUPS%kAQjcFIo<KF$#PdP(<
zRuV9hx*^#?lgr(hU&93Z;!zalCf+lC-l%(zvRO$MHLR?v<Pw&$M*H&o)eLm=8n`t|
zj#Z1UpS{WwLn%_Fev%S*D~bqVjy~5qJJeAHo3KFw`^UqxuD?1a-9d%iWP>GcTb#1O
z?>p?78C{6j7?)`#<`-A&lzQWq>;;7krGnKj0AdNkExA~>x}ee8Aq%%^P1&-Yar)m8
zq;is|0@aV+CCw@dY+iJ%Jo8&r>TZ{r8N$iqcJDS%mHNuka@}rLp6uqBKPry&AiJoT
z)4FJt{w&XK@;Hs2sz=LAY%bq|G(@0_5_@c#k}zGmKL1+RnB9J4*husjUjQL*4~xwE
z_jTLON?FWD^$5gAl;#@&t+&1iLf*Ec8?k@p^jW@ZWtu-Fyt*RPK+@G(fqgwR_qOtd
z;xMD!8s5h*4L!0#v+}x4)`z%sY|x#;nmF(BqaWrV%FGJysGd1<VUSR@k*{WK=TpXw
zc8=L9HI3?yZk04DNf8Isc;AgNNvZj|Pj%XnM_a<>n7dPOoFLpwWq5}Z67F+YDW4Qk
z#-?j&I<P}weJ|+s*75I4Dce)0@y$O+WFpdEE)<L6g<51+jlSKp_k;|QMmvCnzB7oZ
zo}{k@-CAg_bzuEsuWwl*&aVOMuHFpW=2}f1+jK|VHxbokn7;>7N0j8tXT>abkadFr
z!G&N?YV)sDNAT?L1M}A&#}?Myouv)USKkn@l-v&|WuA@^n2leszxH7#*ml*|tt;On
zV^LTyJL~A3&@maqk6fPqnY?~eF5RV=XtgG+!rk%R+9{{^W!+I<PJ$XlJnSC>>PO8y
za!2NOLT@)YsF9@*rzmV4Ph4f?F!Q>VkI9>PZzx~PcfHv04Vv+FbUEJHb1;1vqB3Vj
zKW8g)UK^J_2YXCiT*C*Petj_yqp8)OeI)}Q((`^hes_X1b@QAa_mB!4lPR1?Oh=qX
zS>5jaiX(e5J;v)C<lR3Ygd@Wy?;XbHBpixJJaS(@4t;#D5k?qJG*9D3%{11)o9_2^
z8V$!`#$%{zZJ&ms-W9Qu-+hPulDbwqs>pu9#Mu`h3imcN+rFic{T<7>dJ;QxWdO<*
z?`DVY(sZ9mQ4Q<{4FO=DlRo%z)BDMzEz|~)d#S<J`2Aw{mwV0DBE;c_`3Z{ovV<8t
zN=V#UMV63c2lgJ#AAaZ5-E|kLa3$mq;tm$A&BDdv*3&PW24(fyfbB6X+6n9bd$Qhs
z|B3ujilROaGs|>BE%0gG)M#%&ao=qIm2qckvS!N^3(snl<Jwv5sxk8m|G%yuyN=1Q
zs?pwB6Z~e0)0%05G7R3JY3YFoQV*<O!8uTHAnmqEfb%cq8-m9%o0u%?>%eS+X<&_3
z`*me=>?YkmMW5Vrop3vQJEcuM_ZBB6=)zwhT>46bn{%z(6gyOlr!OYb!mRG@PZNeq
z6LvDKAj=ShwbUcS>b<|59YReO`rK+v%XcO`LITDw6z64`>8BKhTNS^Zqp}Q@i(Mx8
z?<ids?RKqZD%veM+k_}6f&>bxp0X1Q7%Bb(ccX~YJ)yT=u092x4C0L%`}5Y9OxAR}
z9tk7YF}!ZlT&L4L<Y-p0uarKP<!*qD0W6_C$6mZ$UrBNj1)bgDLj|5Jy!gE&eug*C
z)d(sj<Vy%h!JgB%rZ~sojzQNmG9Nl2=a=8>MFfL<c@!fvOzp1Pacm-@<_i1Fc2{=A
zilX3)=8sj@bUm)}{;hI_9=c}d_@KY5rEjBcW-SQ;fZBHZjb?O{G$}${;;<J40CcT>
zhg_8i|0)yyKWK(vi5Td=Cs;}`wfWua>2k1+R-#|`g8;rB7kk)kdivI4os4}D<UU^V
znEt9GG@^Ls2FK38M`eb#ju<mc0O-C2mIVezMvzQ0UKrS&@SB{E4z=lkfoIe5>jjGN
zQR<klFYW-Sh)$Ts&}F4>Yj#a-EsXrVb-zvPpO&rD>f<B=kY6YFr|B6Wd?K1*vgb8%
zs{4dGKOH;~XLMfeiO<*;>2`J2B<>73p7#?$H4hC970a_w-7D{8px~e_8s3YtFf-FI
zEY=HorQkcFa7>}Y1Ei_6TeoWlrHL5@U-}pu8+Xj!4>Pa%M)Zt2pU)wzw4)>E+qXa!
z|1G)g&+MwNtx7;bk|4+u9^d_h@L=S(LACp1R}$Oousy^<5WdWD^(3wVG`c93hPR_{
zfl<=!r~S4>x3?xSbn&flhyN&dn$^BL_Q0>vZ90kFgy0ta^VjU1T0qSuR4?oXtD=r}
znvivGj;-hC-k+}hMB!nqohf;cNK&fHRR4Apr=L7Gxw*M9Ud@=Ie}vx%-*^CB)<OP_
z@D7bVPIS9m8%*1MBK)~nsQu8O3Q+2|rDnQ;Lj$e+$nMZ^$lsh%-Evc;jiJ6ilqXqJ
zFE-r`CH-LnvYEfHo*-P((2$DTo>t{ZSzwcYDHf!O9e>jOtUbw|FxZ5V>)S-$V7J!u
zcK-`yq)oer9t_6HNf&9$lR3swKB1)}o&0`d`pfHI@~GzKjF+;^%(5@vOd{c7oAFW$
z{_*W!Sq$1<Hm_6`YKL`I5~Pt|^s3QYA6{HuoGtdzbG$rjda=4-*6g)*1EOkfVqy{r
zx(v<CHsri8Z|FA@_sOU<WMpJ0Gcq#l85kJg@yv2K-Q^V4TF0Mq+w8ccmD0kji`goI
zU=_ccQ?3D13&pV9t(Y6k16*Q6jpP>(?%&@TKHEj%QR?xG5?+TJ-$zsx3^^XvlK#BD
zO@<>0ifZr5dAeI2Ln~}u=r3^35uYFivCm*!ih*vlEVKtLKCtUcu#CDBVR`-lny^AV
z%_N8;58~-NC!~cHao3()fWn4X;Zj0Y3@w@3<|>Qy^!}@zuLwPFHqTQbn^xjj$>vFp
zG%nsKu(drG3yNsZ_s6(&i$%_+D@ja4oUTKJ&4XQf>u2+|ILC}trud=`x^1YAoI*^o
zT@rCpRYq-BQC~0DyZ_vsT^e3GjWhIWQYN1Wer3w{0Zw+cPaE5%-^~<Bi##-J^S*3$
zxWt)6E({n<!r6nu4JH}y6e{b#*WXKrSNJchbTftAMiyod_IO@b-iu54^r0qDV9=6v
ztsp;#7ytLzL_TrSp-1T#dXeQ?sWKF*U(I{D^UvaKzPz0K|6BY1;UN~U5%r1omNDtS
Q`ldirP48iq%9DtH1L^tN-2eap

diff --git a/newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/newexample/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 3f94649519ade445e06a6cdd8910d1f2ddb46ed5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12899
zcmYLQRaBeZ7EFS>yE{dSYjJmXiWG-p#ft`acc-|!6etkfU5dLFC|X=@{-^u!C3#5B
zS!?U;nVm>A6<IW7Vq^dSfF>^|r2&11{P!TjLti!4?GXR~P9}LNaV@Xab0dV$xWDhv
z@z03Q;1(FwaeO93hiqaFGxMw~IR>SYt>t%pR5fF|2c*#C&xn0uyUbvuBcm9jz!5>*
zC%K_;_<H!Qd#_tun}L~@fg6@q9)X{FwjKi!n>z3Pw*<BX?$<xX3rVnf&qf>H77}zF
zOaK3)b~*~xen<^cYw19izU|pouW-(B#N7C-IC_D@RFF={Z!?oJfpE$c(%Z&tStqmJ
zEr6a;eY=_KFfZ;J*Yc2gcEq`*8P4c*9#zkt${YM!YdhY4L2*Gkqj8%)TF*SZp{RXw
zz4GuKN^4Jj?l67`E50FqE44kby|?|rGI_z+Dey5f??nacF<Z|i{$@X~C*gO7lyQ?X
z+C^2S-fV<18pSQD*Tjp7qP?oA55by-{cydsSuzgbx0kTjCB&@ifQg}wNPZLMSGs3C
zTF|}Cp<ferY*L^xkM|S3l|OnxR+t0I)levp`HQ#!FOA;!@9h=(-rA3bE~-C0mCqPy
zFTSCCpAN2kRO05Gsp{k6<$2WqYHuF7{xgWRhqxGq5)Jm)S(q|RiucZa42c7EzbnHh
z`*EM^MM6aLbX7#Oi&&O(Ehd{W$-*6#7sI}--gXik31`?YCDs;7=&UV^$ognczTd=K
zXRCC)C}tTqI!&3F6VD1kJ=XuQR}OBAz&x{Nmka}3uRLc)B5RTJXk|+N+K67hOOk37
zWQ!-xNNsW%-RBw~)%#_GjaMOLhqy?J<A4$QqbGBq<wsCAFK5Od+5k?O8s)JHZt4Zy
zir^ln_;Y4^EURB#4S8cERF+AzN?PECCt^bcrr1CFF5{1$B%l|<WH^SQ8y>S6T}5~<
zb*iwKFC@tkV#$^W3y&%+STQnt!w+8x;kwVI*!3&I8eSqk4RMP)E7f7VauX<nor)oC
znTRsU5diZ~c``7=08xSm;n6>3aa{V_S057K*s-ye6=jDy%G%ot(g%zw#&cD#dNh^6
zs>0n~a}iw{U(Rf~6ZB49yDx&zf68l@<$$!4u$kKIU|na1*GXp;X-9*Fr^6q%IGH?2
zW$;H$Rmy3xRj;|}wmc!Nv14T6snTmJEijIjamFAy^59+o+UNW7-<}UPm_Kx?@{5w>
z#72V=zVp7dMZt-r@O`)>ZR!fTO)GCUI45O_{DbH}w^X0z{rW_JW}0{F{VJ%cI$fFq
z%L_KC(DE1vKDN|2_(54kVPzo?K1lHN_4Tz@05L=2`^!F+r2^rT)A&w*(3<6@sg!jl
z=jIA0Bte1(SxI?icP=!`H=PKzsX4<DKea66<m6Z%7wV%~ss#65V!Zf~1AFom^5ByR
zj**bA_gx;Do0Y~80&p6C@(=}>DD-aCLvK_2K;PS$LmjSZe*ZGl{emul8KvV*EFOv|
z3qnhiq=2mRt;&gUi-O<tabIHNVeMKBk~1?O$*IJfWRU!;9~oQ-elk9g5FjaBrDkP4
zDHKryQQjIG8_O>5+o3;5hrQIU&>Ay0H_vy#rDd<UVVDg`rytS-6%`g1ri_e?h@*Mu
zf?3`12?#p3G5oWG@`=-7A0Hn*>r8q!OT>9+zQxTu_fb6HrV20ogx7;q0uJ`~z06~{
zd3u#z**qJ!hbcVpj=Y>Y`V?b3%|6H7NTlTDbpz|of^y;2|Gwn-{H4!zv$I;Qp!y&a
z85wE97g3y{dG#pz;>WSJF2j&*!1D;kx(*Bq0$EB)4gB<02Jt5L+B?RJE|XP0SLhp%
zFP^wDGBcm%m6ch`dbIo$X%*ndI%$dx%Fk+{Rjbfq{P4k+jS8&UHHI+KPmsf&ELzZ!
zpH=e+NRwdX<aB|j62Ez(^~=FU4rPABB&xnIOIDa%Wi0r8s%~Xv)taAAAvDl`@@KJX
zlGOMq!71DH#5F>J!p_}@0`MUvA;CGQNo0HfQk#Osuk@NcTaF<)>wKCGtZjyig>}^~
zsT-<yLX$q;`DJ2Q^F&g4q*Bemz#u6-Jw3Z$fy(7Y8Yj57J}z%pO!@d<;O?%O+xy$=
zIhf<F94|as#ID7g+uD$(=1C2wnkj^gd2DLxBMK^N4x%0k3d+~Na*=g7^1fXaw?F6)
zR{?P#0*<AuhEtfh!q;rmi+6Hm--^gw%%lDNg6-|?6R<#M9cFTxHbeEO!IujPsV-5T
zh9ZDl%+TOq=<8)a#<?7By~!H)>=$Kj;z@#qXU*heevg#w>}UxIiNnN@<(1macc={<
zu1Go+KM7aJYhwj5Vp330booBI5EP1Ktxi7g@kv5Y9W4Uvg8~BsZ-Bu`x*>WOJ#Hs+
zX?o8Hn&+y@fAEnaKpY$#o(!sa>nhibVmiB7<yuSzk3X#1qSUOc===0S9B1j1YS3N(
zyiKCQ2V?wuTR6jmQ&3Qt>GHX+HDwW0Z2bta3uyl=lIF+G<0n*Mo-OVqrRx_xlPBs*
z)))78Lb6?dRj>}d|88_)L8~i1ewsN+J0xPsu5!_iZ+=YmwPD|j=lX#jhV@akW8-|`
z&9``wI5Ywz6DkqtxY5x<!T!OU9AfugUe3t(0zVgdUk2+e)`_Jav^%$m_r7!*bKHjn
zXYge592D?RRi9B*mqAY+cM2yeI(mGw-Sr3nIgBIwlohQEF6DpBom@GROEy7hO45MI
z>ZB*D;m-(OAXUvyFOod<A8jOgNS~Y*d((>|LhVbFvg9P{@Hk%uK}u~#*+2LN@eGgF
z)paFrt=qG9cy=y)gcozsx;*9hDfEhW{F<LM+iY3ENck(|{{1%_-Wn^i{hLvkmO?P&
zs53N2v|}c9ie<|qZ8k-Ph5c}?a_2TjozPVZA=$4{T~R5mR^RY7_CI|D?#?aP97b`6
z0Zeb+Cd8!ao}%7$@lR$qW80I0-|sIt>u=N|8#pJL6&UE~DxA?TL8e-`L{iu>RwX4R
z(Py(4by_593jUS{5E~X*f@xfZKa&}le>Fp5axfiP<irjvk;4H!Do#?T@kct~{1&d?
z$ln`jcnfg@@NJQt-E_&Bn0X?!v02l{4;U#aO$AJ~E-k!H=1O8-GC3_3m?v7RU|*By
zdxrawXK!In%2SGL@xBW-yN4<@%CCo+DC!SnO1V?bk$YpET)Z7%!Xid7iRZs%8H55%
zYE)$9^|KT*Ln2*#J@YK~?nv(5^iPP@pM&eoWp;LUsETCc9WnIiGVpZXXc-vZ^M&_S
zUAp1Bx@ho(TZG8TdSbgW8#s}r)-`^V+!SX@86)x?CyIEXY1BE!bFbw~4Pj?);A~N}
zTIc{pmvQX_c1H^Mv;^ZPw9pKmn;wv^IEDDS%Wx&=yBBMbXzA%I(MkC)3%5BVSp0eV
zM~B+%kAk%pDM+nmD#u;8?WBc>uVjV1ophNL4&<m}S0nBmF-_*lS4J^*hWaduR|GLD
zbekpqq&g)2?LeRpUHZ6<AiGWS*&hF;+V3zis&7w`E<J%H%@RfDuKK|31Yw5q=;-L4
z*;Kn8UO?v!;?ks2_KDg3T$EQf_RYx>1mnN-_V6j4f@*icX0T9cmVS0`4K*cs6xe1Q
z>=rQXhv>h=+d(DiQEr5oKtEp?P^Vm%2rv~rAF-l_d-e>4^OjkPJbLAtsX3+7XptfO
zL5xdG>>XMIk3=1;_vre3ckcfX%2`Y+#-ZZdBb+)3Bf1<SnyjYhP2^PZzTN<8-tXBB
zxxC5aALVf|KuP*YJvp@L3o@PeR+c<4NG;w*ux)r%BF}2%Z`T3&Ub=EVk;o#`$V!9-
zhv0rdCS9hMr5l8o9|E!?F^mol4UH|;81iYc6Ag?}kQ#3ukzaop4DZ0LlA5knD3<^y
zE_e42FfQt#*P{9y|5I#~LfZM&(W4&UENff?@*i6Alnvu|l1IYKu9V^OSFFK<8nlxG
zXO!Ravs{E{%_LSRK>mI)DW4%LFE8%buU}S4b_uRV1U&^u6x3j@sYYEn{kIh6e=(bU
zZ~<^g&Jw;Nl^JEWPH-uRe_x#tTqJ(Zf^R)NY5rAu93p|0o4)eLf#yQ|@Zu5_-;?xF
z{g*tv4zv>!nBN(4LP8>3p2WI^1*OJ!a0RLjT7g!;PWL~UmLyyCEem!n{u-&GKgOC~
zy+ypeEhSoD0oko=WR?UcUPxC<2Yt4ye%UVSkxAJPrIeG<u>el=>(k7nQZeSIt1fTZ
z$kMkYGag{+UI_nYv1&wO0w{LvsbqzbOPS^y6=Y<Dl3x(+2q;e2<N)j(2>dPo&ew0U
zQL^xUg3MZU^A#kzT#koiGwj}77N~JRf%0ebA7XAY5{G4u4@u%jQ`?$t>q1Ce??^^~
z$+`|^C^~C->6vY0jX+Yc!eZ)v+IYw*&UKI4z<6fyIvZ+L-|XycBObF3D#F>)2Mo%9
zb<(^;WpaB4?;Dcir@<qOmZ1C=f+dE+;$I3*Mg5y+``s@c%G5|ZGE=m~T%bfN*MMlm
z0^?a?+v#cX1Nf`4fM>rORt4WGt_afKf733h6%u-q68+qXI&;6eWO$(Xoa4g8nEgtl
z_~daW3HcZY;5`DWgaD?HLw9{DZUe-EkYi2KEjWOb1bW^g2&uM@(Lz=J%|`RJCP}fJ
z8ayup_qXA4U5zcFu#nbXG$M`K2(7z?0ycluCZd;W*44DoYXMX3bmBi+_@U)QSe3g1
z=oOZjrnnuFY@dH#elkrrT^=ocdJjRu5d*ahAYGbh90y#!<)5pz5x!K%>gPr{(pGq-
z#xft-o9wsWd2%>m|2VV7dst~aPSjOvuT`4iV45eK%^yCP_~U4V#QyIH*KIw1YZ%wP
z3|DbPDSJGRy6(Xs1pyZyU&4o5NV9;>bh-2&;97QaD2{9modLo(Ko6kp4wpok<!Yhr
zUR)sv=S(PUp34?rJC}*KuVVQ2%tXZWq4rn2dS+xZ0)qjXzelJZMFWK_W|8S0E@_Pf
z1)FjO*F!t=0O!<L2R_c(zW*uRepY^?nqAOp?Kve2aC;yEiY@AUgAw{A@9gOTUhjvp
z@#OCPeE7n^G`!Op(YBIhSpWLjD(sorwa{NaeN42~y9VnQ!2$P<?0g|4iEm3o#N&A_
z^aIa%=BxA}ghkY;z}H{QhU}NF<Aua=At6I82PiesAOaPpjFD4B1Z#0>Qan7m=bdm0
zcu<)2bl%4L66~^okkE^OuV!inim6~QR?RP#HmHA;*Aqgn1-dR~I$do#*LUSZws@TB
zXEO*4S1!z(T4V&@-;p>~%Ife7F#_bVasc(;=(%+U_4V0?u^UHrLkRIvqH(=DgY!En
zp|DrC!~JyW_lP%mF|vMsv&+YDw~m#Qle09c>y?AH1^3n5+$9$Y(7J@-!-XE9>8$s*
z_lz2SS6MpXD)Cc1+O6B<3(<UO94tiLRMW(w+B{#)I1%0NN;YeI+Zv4;rA@W`r&>Jk
zD}58=6<T{~v*E6x5gnpVh-$7N4+8ryC@RreqVHn?8XO)T`qLct>ash(-%Vh{z9`{7
za3M)sq+N{_8i%9UDMw7_tFfa<;9W2?<5v9ksN{N}I0V%s-klxsQ+;gtUNqi~@>m#1
zakfYI;n)mO^br9GDI09Z;!`^%{)aQT2%KL7D-2dhXlvth3u|qT1iU{^2N;Oy8mX(#
z8Z<n;f2sGQj{a(N)w0wrm^FHe6BNtE^AD-_{hO}uxZ+LX-7-lZI6oP4ZIuBxPi>60
z$_yJ|zZAutqFcTvFJ}W&=eSO(y3K|!hziU|Lo_kj+5mqEvOGm(w_9Kw0j`#7RTi1i
zK@uMP8~KdXE`x>J=o6{ZW-YjW3OK>bbFu)w3FnLWVrbNT!%73F;S1klSZG-p8r{7(
z<SV&dHhDnWz>)lCr)Bh&nY&;CkeEeiWg-kV1PU*|L>FV2W|*$HfRr*h;hqAv<5%st
zv&Ny9b;6*)B8Yyy_^V{OTEWcikVt-RtlM(>?f!}MO(s2ww0MO_!ugV`wL^F=yt>Vf
zD<L2Q+pm#ZniKT$^*izWmoWz(J_agX(~FDpGIOv&AZwDixHun2*q3Mv*C5*}g@UQq
zr+=pf^CuES3PiC%*py6)vBn!YEW|)a!H>93G<K1W7=e|*Tq(WFols{v-`4<({U}CQ
zQ{JgtaT)0(Y4c*WKeL}vcsmds$oY3|++J=%cwY?KOF`yd=NHtn(8`Ai_~fXE67dJx
z2X!Hh+9hfdV0^_imXnI#r{<yb02c4pV^;H3!U0;ysiCG?jMAiHMEv<!)uoj+IvzV&
zF&;S|AIO%sBND-%p1>y9Exo(KJ(Muw^t&{bz(X(P?&o;M9bisk!VMD!0+=b0MpPS{
zcX++sl>y1e-xJcv1M5ufK99fF<`h7>#b{&$3MozHBv~JX75y6h%i>pLhzJ$q_n>>-
z{crT@RT2gls)NwpbP7cmt1ZOCh^wjAbxKVrKuGsmN+h!K6wcFEzmJ-CzX&Q_EG~8J
zlX^TajPG6^Z)5>!HS!_)pyu1#Thb^eT7o1%y&BJ{a~SP50!bS$mQgHQg<M1+>P#(4
z8Qo2xMhpYIm98x!0O_iMuS!@IF==Ko-1Q9J|ByCvaP&At^oSc_PZ9|!x7957f`%5D
zvEkCt04MtXazhB=6q*<`1KF?tO#Bd-C*W#@+pV6M0L%ZatbUB%vjGiJccMaDa>GE|
zY}@C(Yg!&23L-oto+7#qX)LOdm7jSQYheMwFEp91d6@hd(%qZ0z0;<6I>8rPJ$1L2
zml*)P)<^&Wn=xsulNK@`P7t7e_Fz)*_IY72F7p=YYWiM3e4%PpK@p%wwRz3YnTB_X
z0a7EHDXh`=fQIR5+@YX-qag_p8ykC}O1Cc0f(JOl);0tS7NLw)g9Q&(><ghOq$oPI
zkJ%}B=rKzSm#LFG5Cqfcc#X29i4wINq~z@prsbB^=x$ph0V?S@IMh4s7Atju<6FKr
zv4d5;Di$X{Tk`X_ZU|qze;|s*W~IPFupssRuTOk{@#TuP))auU9_Z!ueoG8MMh9r|
zRsaa6iG2p?HM12UC5kyr<$mHr4>n=N1uE3TMyZ#pYjxkI>1%Ys&Ji5Y<g!eDv|6yO
zY7Sddq|a(<208fAgAe0H-@M4`m1q+zVJUmo4{uNA%`eg56oYW0xJO=1g}g0XQ}$aQ
zjm3H7>w$RB`7%VJzk)ft0~9sJ?;Z#^%Trz!w={&G^g`Yk4IO$j?TuBn{S<=s_VyOZ
z$;sJZ(*A1^t9Bq#Veea8-+l=yx|!Ay(EcwT1C2{nq2wUkKV#Rq#wC&+W>Zb@+;%BV
zZ-(-{`Hy=Da(FH)XN0{SaNM^mBri_(%3r3eY6$tx^faSd{)GV=8X5+p3E2E+?LZS5
z9KnfV&=jDEb4sJx7X(*ph0}YN$icteeKJq*<SgUDRm{7^k!O6R?V%{Ubp(vPoY0IS
zQf{@w5-CjPQ<g1~WOAv?u428+lr{#RlvLVJbS6|vQ5a2#A;)$bvxG>?${tN;^Er{4
z66HC3;Q=~75SGuMXoNb3{>-Y7P;Qfx1Z1$ol*QF3u}J)As{4^}@+Oz7ITj6i3}2E1
zy;ToVP`USY5f2|5>kxU{YBp{lvRir*kLhZIgh^y48_JT@#~o&moj-r+vI#}Rz?jYw
z@q1#dLb_c2TGuO~mko8$&v>1xSgazVzsZV3<&h(_$DWkrp`!w2a(lEdZ&}W6u751u
zZi2@dzkJ1=OV?Iu<YgwZWPQ~73}W#j`7m_`8LcZ_vf@9sYC(9&H_8S37BSz;f$vSo
z>4#NLf4Gr-V`+FQ3=00Ql;L7yC-K|P6*B<Fap;w7Y&n3-lkCeKDXFO&*hOSd_;=l1
z_rsC!{tWhtP6wRYsZp>uj^xNs%ke-_y%E%aLu)*Bu{z06k!LC8h^93EFt^7vVPzTP
z!nX0TN8Mr0#H@LAvZ`$YHp=iD#MB$=s-hOjszp0DXqA?W*)awmK#|NRLq&ibu^@Bm
z*ti)c;Ou_Q1-{%2)ATYCHcw{}w_JUH*AQ>pn)Uj~P;U6j3cdt1sxyhlaAovBuJM%L
zU?&-)D}}X}SOR*FCP|thn`$CxUJmsAMu#JiDfKnosNuL<VlM)TT@t`gdq0-STu)Vs
zVw!2XN)3Y8>2pmG@*B0eii`JtY48XsVQx7lnx^gT-SUt{6?E=N(Cr={i1eJ1_18wk
zd>O?{@e_&l%=jvQNtg22^P!KS+wd*?RvK=JEU=b?om`&@RNa|0OuK_8t8G=Gc6xqT
z<&kf0mU4`WE)Om&q;`9Id31#~-~%iCHi>$MzMZ;UC?mKO(f;9$65h@=aJ-Psr|g<u
zCf6{k@6fmo<iE82-YlKEIZ?nQb4{igLI+6GwoDY~jh&ygz?)xU<$YjqP?F)C`gWrx
zm=}{P>Ar`m4&hTiNyy%Hb#<MM#9_DtgdwHXP>ap0iaf&JX?Vm$Mm`#!nX4O%rZW*f
zbiTP$z>O+=k968?J&qb^6I9%Er6A%jo-G~RW4sJBjdbcwbRQ{iQRW288nZ%rzqI65
z9}x|09scBLEYLZE#rh?;=QUhtVPR45`h4FHY$q#I%A5-nI_h%)ZHorg?_d)WJ|Izn
zZ4k_jMj6G0?=}fS09zXgR6GnJ1k%hIN!H5S2*GnU>TW;=swJAi$VtLq?y3<@>B_QM
zw-18(1sqq?w6lnpkG-f`11nrW?K}o_h6TY*)_T_!U$(78Y_mht>f+*J1QI^S7d}(3
z>;2L5YI?{xTMw#sf$aU+$_>aWRb!$Ei)uE@Q`ivmf=%<pi@Cdj`R@|4|B_kS)*z&g
zHvS_6ndLig(-bVDP@8VOCU+kG7cQ)7K@&yBoylR<-uCj$(7ERKUN8E5*Ww~98X6i!
z{Ewd>@J+q?LXaG4=){sa%!eR-;^A!F4`u~ARmxaZ*aOND6m^pMYRoz14xA_ViAEEq
zNuL#wFon*M$GWlx<s)L{zE6^z-g`R02TbK}QTzGFQJQNN%yH!z*nqq~j~ob_?07g5
z6<yR2y}!d-(8TsqO(B}`4upq<SaiKToz_$Q>@Qa@TINNJo`$#E{rh(_D5qks=;zM|
zCaAT`Bqj4l!y<g?i&rJU1S$+P0-owsa?yV$P@17bkTeUb%xa%P4SH^2dp5yJ`RkT=
zrJ;WidA$EYchc;s#NW(A4_}F^?L9>zop@0>J-r>zkiFR-u-;IXXpOM53)t`XeAnWI
zRUHI4YZrU?%9p9sY8ZuJ!T7E3X<hzwywIU___7j<(tIwCzMuf(wVEEFH&kI^tl!MS
z8zXN~^U=rA(B5^|aK5%f+POFeupQtn4O%6J1PrZSg;19Uj4l1ip0a8F1iZe!p2_60
zRsne+h2=U>iMf&rZpU}ZNK3PBYXwR9$z-TT%~f8apm4u;Bt>fFAje^=njKev<qdrQ
zqJInTis3l!_V$LSlL#<iTDaONj8XTkh3}#ilXw~Jc1zLxoXLe}hidcCAeC*&D0LzE
zE!0CX0y>rg{S(sC!kqthfa(?5*Vhd|&c8u|`GW3toSj@sXW<t8rJ2(o4atK({f(2J
zg|jnW;qo^xp4_&!|6`c~zL<;!W$oLfyq+H6;}mQ^$b<}*+w3(jsT!9xr9z(jA1gj1
zJz0Bo4@Nq*Sk6NGlcHst2$dC$lABwz|4O6fJh1aWmdt6A7!VJj_4)g-sB41OAL-n<
z9Lesvr*za~7Y}0BA9p;so}TTYYAQd||0)raZ0(qjsj2Z#*aGXpa=b^XV;xm}n6XMO
zT;zp$(h4Nj>5f$9kD*c=FV>|$6KvT$kIc^93kL^h+5P_ZJPq`yF@oJol`t|g`hk7R
z$c>AKkN?K%K|S$L25`2@I~6muNuSyz-e0g(ba@f{2TGw7rfnS7V4kA5s7<YYZ^16u
ze-e=4jTGEjp4w!#5^8VR4)8ako_93D+HjuY9u`%s@2(z3AK;jbyPJ70h68znp8y^{
zcV{cBS=fwqxX7|&i3qX(<mBY^sI<u;Ui_po;iU5A>d!Y%bFpf7N(87crU_C<50;mA
z80oM^)eS66hW~gt?TQ7sOe%Pn-Ny35*+lK0tWyd;1`Hzqj*LFCT0KDRJbs^;P;xt-
z`H>6O58A+AN)!8@TJUXes9lWL4|;bz#~qr+KCt@xu2l2l9br?=)WuWj&6A&2g#!I|
zyd;3B=bH~qs>`^~a?^MlTdhY?bj_<sE3unnoQd`K{28B44fQOEal>2hJE<hb^W*e+
zMOqU;XTW>+)%{jLK1v1|mz9#NA(PlI1x$JB4k%nP4>71oW5F=ZZrJQnYay!QQt|zv
zm}q#Xw2G(swI{wtos!5$cD~VODQUVAlk$Dr&SF8~xm<0Tzv)aOPMX0XzR%^vOYe(x
zPkbOZO;ihqZIUNb6P(T%&8!m?I6p#hLoD3HssV79uCL(7YRlK(NC6l0$)hUKE7)I_
z`bWnr_dzBm2l-lRxcXp6zi-;km#(@IRDD{QDrM49$%d6F!l$bjn(2+@bR^cL6x;cU
zS(OW%ot*=#DX`MWHs#4oz_4NJ@87>a2EHLoV83on;6G|6BKD7VWXR`U{m$d>GzNT;
znHb`C9VNd-YFN7pBUcvtmJ>@@U&3K`;xG%DHaM$v-W(!YUQB&`o`}NRDvXwuV)a>C
zQb)1QUuxYY$td1+Pz)UsXGpxafL6}WKaNSPm*M%F-A{GO-|tBUTxjh>Y;6@m_F0IZ
z;t4rGOyV0m#YUu7*TpH~7;XC%vjzP~O68j_bp<Xz-~v(+EY^PQes#c2*h;u^0hYXf
zuu4z2e<ZbH$P``!6eQpD3m=Xb(u}%d|6G%lbWupG5+nP`BLh79d1!Lf)2jC>+UB(N
zF^A{tk_F_?%nwN;{--T^kk&rXsKd=xu{G`AAm?$C)`42BI3t-4XJpSToT}MF5G8c<
zFnGY|l^c%~32Veo>9oYsBytH+85wV&v#HL!2{GR23(!F4t`W!Tl`kx^EzpJ|J{w>O
zV8TUq`@7yw88iC^)(+Co{wK<Y0p2Uw*w_dJI6`F|(If&t%2ZS{p`0PenK+NjSY8GH
zFNK{~X6)Vg7qzD=DT{qCu3Vw2)f>NJUTDb7Fn1yY@77sNmvol5ZWKP^`w|#C+$}wF
zZ|+!t#`6)Nf}hQJ8tYd;5o}e>pTc+L8-Ry!!BL@fG(8mcjh3W|Yu}BPeo$Zj{X0{W
zytsMI1fJ5p)?An*{a$Hjg7Y>$HuVSzO5CT~79HkYaP25X?aOMmu3!bnML>tJrY90o
z(&~q^rs+-C7<6Lpa-52Hz8YpA(-MrJ#~I>*n%C~8c|}EqbvuLeO25LqVn!>1kDhJm
zo(N5}Pu>h6OZb%Rhwpez2W<yQWC~V)i{sWcy0#Z7+CQUj<m*Phoc!6{o%`|e-}@g6
zwNom|Ft=dxuM`yd?_zUQ?(!*F2S^-3RIZzmESoX}2?=I-gId{vXPm-S@)3h|85xAl
z-v9pO1GDui+!$n^xN-WPZ^nMq*4D<L5{vr3$mO^V%pSq>*Y=J&Vr9Pg=LaBIMEet)
z)R0);trHZpj0wLFZ*7UXFF>0wFuMzSl-BQS>lRK#!_Gh$ggaOwx1*_CWm;r4&;m@b
ze}39p;W-p&m=5dPl1<~7#f!?TsK`Ls`cH@%w9EDk#V-}q!B6)W7~jDpDq$wtOsRuf
z@B-c9Js57k<3w}MFyZljjJ$NT#MIYJQ&CaTaam9KQm{WRo5#E37`$m!zzav!K{*JR
z`E{s_Jbg@2>rWgbLjy;`^T9A5O<!MsWPbjJ(-eyxX&JZi$=pL7)o`ub?^&X7)^n}Z
zAwMl8h0qqafd1c3n^;hNef@R5|I^7=h*`dfpErOvRPUwIUA-FG>Jv~q%}5fUnro~S
zkS3SZPQ$@Bun1#1M*t^^gCDV8j+oalk}9C`7GAuN!xRGG_vqMy+M;_v9h@drA^+!<
zhMGDdJbV}gDd_C%tdhTGMh1F~vRje5MRWjRzTqMUg@nie?KHds^d6ucA9;A$2b+Dl
z)nV<U8C}mJeZTXr4pg2E1iX4)Y`(gGp%PM5?clYwi=86}ApPC!dNzf&O%$LHbeah6
zuM>>Oe9=iqZKIk9=DU>A(n=9M8~Og=MQ?yrNFR4UJv9|JrpkWx)`bMW_TM)<IZ-?R
z`uzI?_cZReSgD=AGgI8;8IRc#R`vR085<hJ&wo2Fx?v~&ovqBr<`~RrFkP6G&?2MS
zL+>;hfrF~FDt&X@&nY5;-xfk>#q8{uavm=EOwrh7e~Gr;ejoxaTV#;HJxynF9W6FD
za|^Ji-XW^v>|~n2X_l$@5!74lzGllK`OhaY-mpOXg3o=w3BuFELp2*CqbctMM4#0S
zyJC^&DwJ7Jkl10h8ENX7==ksu-eEcy=`N?_?(NVe5ItAWJ;*)qEnej5*!jikA}uX#
z4j;)bs97jMx-J8qOb{Yj_w0GLJe#WJPy74run_R9w4-8=3qiVyiHSiK)~71fh{&3p
zLtu*LbJ|>B)2j!dcM{97FO3#on-hSv^a;Ql4;dwxd3is*u69NE%ivsq#Bk*+jDG*^
zF3i>%bqWDB&)3>K5n|+x?%SHFVVS>?8GZh2YP9_=r&tIN3kwU)0o%<1oW;uXo|8kG
zAcC~f=@|ge9(uq->a~_=s@&MoQ=$&Zyft@ocXx*?MSuGD+r%0Q>TL>?gLFd6^=bST
z?07o-UpqXY(~}7>jlGnd!DntIk0Si?O<Pb}-nLQ}nsf*dJ2I<Fdc7_h*aB@TJA8Qx
z8;`X{%W)GhRZs~ztYOWW`dzai75xtK<^y}qz-NX>K&r%oU8;y4PXQEiNmSi9LokOl
zOrZQ8t9--`VyYvw(tjzQA#wV}aRPM>kwS^aHO@i#BHLv@%wOmpN~4MQNy%^ECs@f1
z#8LzPtXqzBOxF_3sZbyE5cXD=gE6-M2$6zw8xgU|oWJ2MMPM*s5?W!qVJ0xoZn+ah
zl*zwsS4H6lZ3zD7LZeTTP-it`_mQl85|bCJ0lm~)K}Ei(C8&k5>Lu9s3@D0Kl{F$N
zkj3|snwq$L3w}Up7U3MIN`?yG50izfX+E7Xh)s09-hRVv3R@q<aYI=4XYX>Ztkg=t
zDlmq{Ob8e`S)!O;3u($>M;f#3!K`^07#tK&x27B#LgYd*W+iL*V;+keB#pvf)nyGe
zX{Ik^W8+o7`rluO1cGuDNy|N7U$4$^JVpGU-*sF38rK%?J<+2<x?R-Z_BeHV3P>cH
z+>hSmOZS_@N!aBrdHEUs-u%QwAamCTwqKWhU%`>&!rnr?v#%cKx46s{rmboo7n@|Q
zO=y|C4y$X>0+*@w)JMv$X3AYFS>r6i=ySi}xuexa1&h;#B=e`_ZyPOzX}sRW-r*rH
zEOy>XleH=mGIEkSHaGFK6L<>jdNg%lhVX!73RzrqKc>N;u-`~EEw=Py{BFP;y8JH?
z-Qr6Tn_`fF>!EMRK?3SicLk~4a$~rc|6>dhm&gIQhmGOnVCgxR+?JAn?}HV==r)Y#
ze@bT<EVS<CAWwV2U6`^H#xzT<ZdVG+Fb4Se_>AjKs~)~_1i^VURDG9(2~bX@vT^o~
z@e2Gx;d|M;rdwyM3=W(-{nz}x_RFzfM!$<!$Vr7}S<;sGDeKHj|78va&GyACCX<Le
zQ@q)!EWE|?&u@G5k55mVf!7%-Wj<oMF{k&)Z2TO{3oiR3i9Y5-G2ihHe?rfl*<YG2
zUO!o%>2<0VS`D*zHkAWQ?y7N$nLC%?_5{3(1Z`4z@0-2a+XttmUtT(Ufd^yrgni;d
z+s{{9PTA2PK4GJB6JKVpN%hl-ORLQM`hHUejXyV9PEKrbf)8}!uL>SJgvs06rp*p(
zt;y`^Qa2cMjl;Mv$|N`sU#Wq~I6r^>tfwVx_<nP!{o}_EyQv_eNfgqB)27jnS~oAR
zuRP2;)p{7Nh_3R7DT^<$<S&bfVC9&dg*t}Z+*~5;mxsN0*SgQ`N$B5!Dsi^P+YoOG
za=r6|gH!<u6LwGbaQ5`#g;DxnxGy}kL-vu)s?qqY@Me?zq!{~`NBIG7sq<y3TkMHa
z+{FA5zr&5+>g(B?1K!^XuJ(p|&|R0HagJ4t@)M(MVN}P5@!=~auv2d+hg}@I?2DJ0
ztmB}rnwlEXnzBMspkJ4W5CI&1n{&uV!%mNLmBRZKi~Db!;Tt14yipouYSETtawdp5
zz>_$heYG@L6aU8p0ud3BS?AB>q@AGgQ*L6pzyHuIEiDnB9)yL3&98DMg4zQGs9g_K
z4r@`YL(_w{qFN)<ia#Jvfi1{~Lt6Gt`Mt54Evs~D@>ZZQ-JcX~VMZJAQ&a?ci5MQn
z!vtY}uo@*uval0s*?zB&d7%P<|D9(!Wo+?xHS_jP?b1*@2)~#$tp-z^ng=|I0@<6$
z{p4BN)^=}nDTN#wwBe)_Ny+{o{s-_79UYyy`qp4ROl>up^^a}>SanbF-3wXHM5UyR
zHB%DVpF|!~gDI@gOiL44Uq;j?17ol1v|RtCC_mri<Jrfc5L9d~VyuwaNA@&l8HSki
z$D1Qp-P+IXaPf~^q;;YpG~YWC+jn)m86Qsd=q+!8?nvcfc@6^CZ7%;*)v0VkA@m6Z
z0?}CZ#YmQ+Pr&X)o^b`6II<H$*RhD9dp8Cr(6yak|CzK+zYfD3!&U4sC{^fOz&l^Z
zTWSPlHOaumQ{#)Xr-ui5jO3*pHd<a5G!=WCBf5#Pu?xe81SMdJu~-ngvA`ID6e?Dm
zJplob2`FRGzuZUIuh*Y}Q@52p5sH#YQh868AZ1^XLV^Yl4O`T&^QDuBX^2|^@2@X7
z3@WDNA%xpkf-|}UbRgl9TBge%835@}Xz2Iv^oKi5=8L`?;y<vrvJXj}x_0>^s7R8e
z3Sp-zw9kSk(VonwZ()x$Bw!<ui@=Cb9kwg3B#~Z3B#$*$WP7Y=ND5vvGZ<$bL2WK1
z?EuPB*`SjPc?AOkaG5<#mA=@2i4ic!KmBJLIUhF*aI<F6@H>{Ym`zs8G`)ejG;4xZ
z_;x7lY2w%a7!egEQID3)n%}7Sh?a`Ta=cO`r?)G4z(P+CZ`AFp-|+Q!t!vYzw2+A5
z2C)5xHu00+2%#snxk^_znY^jNM@wdDBRQKem-Rhb(QT}qNxm&#>-kdUPrtgl_8hmm
zjnI*}B9T8w-hyGW!a&}oc}Sb&E;KJIvCz^NY0~5WTAOa{eL{w_9ZxCv{*5!OYh<|*
zk9_``9<C?1D6oR%&)6siA+;FcFmDnaXsOAZ0LqZ{L&2smn^6aCFipGodlILe^m%7D
zW?xQv_%wh5_L^eZ5&4wvQvVz6?ckg<RSXctmym?oU2nTdu&0WsU9zh?SSKn+o~V|L
zLDboj2E<D*dkk%EnzZ^>BkW)LLimJ*g#7!T?vWMY<#M8<q6jl#2~MSzk-lJPWc<2=
z`RfyWk1QIV=UcuHIBpn7B;$A99)kjcH$o`Rw}@+_0Gb2MuSfcmpY`G|#(@5xI7_FR
z`!oYA5<g%qN6dsDuLSa|lfx6IC$qya=4J7J+ubjDScSUe5&F=Fg@mN^wu;z11*vE;
zVr5am`dmePv0DmS8(=aXA>F2O>9zGqI1UdBOM~X-M=X(kww{-3<~Jp$#Nsrdh_BW4
zN_e7yNY#~(KEN0G&08ttBW+^v6VGimDwq}nCNNR9)Z%!p?E+Ts+N8;9(u$Pq1)#;}
zxXu{ZYG0lOks%wQFny*-R7T~CxGhgmBmJPgXZiGe<~JgoiGqk|8cs`Ih|3KJ4+od}
z@bEy}=kpmls-!_P!+)_%H9zv~$W&ZagofD_K7r#{d8il#&cB~Q!ce2_uN1zs-uD41
zH~>5V)&gk#EtYP8QCIgj(to1?>SZN#Z1@yZ2T+Q7fJPhMdWX9rnrVnKRe}Xb02u{^
zC`fF#V$qIB!15z8qzAYxMmuv#X(Hy|o9s?`4OpQ>4h;>hfB}J!*_ZcrT6TmXKL0iT
zqsz?#)(~c=Z7zs4RY5?~-no9}d~S?10w*u-16mHEed9!$YP))GtRno(K(!L*D3Oed
z(CIu>Tk;~em_J)-Ix;)hZ-6fG)j$_c_>ndrplViIeM}VmMU1<bAiNWP9A!Hc*-l`f
zqkn{4R|2{*P*EoaMW=&uow~cbBQvzrFWbV=$vS>P@dJ*ts_(_tHjmiU_HWW@;In4V
zJx>rFTOyxo26%IFV6EvuiMPE3;sh&YW1y^cEO+aKp<;2Yirp{19E=WB`$E(!hXl|+
zU8<4IqJsNcgeaH)?c2BS{xb#QbwbZ)P45E$|BI4z<E-n$Y$p}C;ENsW%Ye&Imz~8c
zXSQ*U0b{slm#dfLa{u6U?819}LhcndT?69EF2qF)hwXm(X(GQ2>GJH#gyLI`%!JB?
z7)vp@BK1lkCMeZkq#mDQEpv&UA0FOu1DYhm(N!}s2bh9;LVX}z+j-7TAUCTz*4eA-
z@FP$+-}mW_QEPTMKNK7%)ha=5CM_wrk3_4Ok(Z3KqbyY3*dJ!Y7sj4(B00d|Z<s)O
z`!fm&M9v)A)#_O8hMnS2bN<;=$w<C{r1h_u?e~CdgV)io_f!`p3<#IGBR-C*BEcVy
zE85D^2Q8cr_fc7>mJw$&N22~pncY&Go+*P@(!tFX;k4Dlj%Mrcr>bv<94_%9`+1K0
zJl+Yv&lEOcPIvSnO<9|nL3zgRbio1=^;m^GiFoIT01CQDO9s%yN7&*GL{t63`lV#T
zd+W0ccbb5;(Df>u_WPp!mes`Hj+0lHhX7S^RW|VvQw2oVVjFqLaug27s*BuQ9*+0~
z(ewK`f57iBm}{MVo{7K>((Mn&Cv-#~lp=eRiUh)Gr$`$!xc*)^zqji1h?SX^rT1eM
r3c7Gtgs~ioZ4|>NXhKlDUPXz&{TQYHyL}G*^9Vp*T1Bc>!ZhfAgRjh<

diff --git a/newexample/android/src/main/res/values-night/colors.xml b/newexample/android/src/main/res/values-night/colors.xml
deleted file mode 100644
index c32882de3..000000000
--- a/newexample/android/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="text_primary">@color/white_87</color>
-    <color name="text_secondary">@color/white_54</color>
-    <color name="text_disabled">@color/white_38</color>
-    <color name="background_card">@color/black_38</color>
-</resources>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/values-night/styles.xml b/newexample/android/src/main/res/values-night/styles.xml
deleted file mode 100644
index b2a3db893..000000000
--- a/newexample/android/src/main/res/values-night/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Bridge">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
diff --git a/newexample/android/src/main/res/values/colors.xml b/newexample/android/src/main/res/values/colors.xml
deleted file mode 100644
index 28731d9b2..000000000
--- a/newexample/android/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
-    <color name="li_colorBackground">@color/colorPrimaryDark</color>
-    <color name="li_colorAccent">@color/colorAccent</color>
-
-    <color name="black_100">#FF000000</color>
-    <color name="black_87">#DE000000</color>
-    <color name="black_70">#B3000000</color>
-    <color name="black_54">#8A000000</color>
-    <color name="black_50">#80000000</color>
-    <color name="black_38">#61000000</color>
-    <color name="black_12">#1F000000</color>
-
-    <color name="white_100">#FFFFFFFF</color>
-    <color name="white_87">#DEFFFFFF</color>
-    <color name="white_70">#B3FFFFFF</color>
-    <color name="white_54">#8AFFFFFF</color>
-    <color name="white_50">#80FFFFFF</color>
-    <color name="white_38">#61FFFFFF</color>
-    <color name="white_12">#1FFFFFFF</color>
-
-    <color name="text_primary">@color/black_87</color>
-    <color name="text_secondary">@color/black_54</color>
-    <color name="text_disabled">@color/black_38</color>
-    <color name="background_card">@color/white_38</color>
-
-</resources>
diff --git a/newexample/android/src/main/res/values/dimens.xml b/newexample/android/src/main/res/values/dimens.xml
deleted file mode 100644
index 7bcd2253b..000000000
--- a/newexample/android/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-
-  -->
-
-<resources>
-    <dimen name="linksBottomMargin">250dp</dimen>
-    <dimen name="networkFragmentsHeight">500dp</dimen>
-    <dimen name="networkLayoutsMargin">10dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/values/ic_launcher_background.xml b/newexample/android/src/main/res/values/ic_launcher_background.xml
deleted file mode 100644
index c5d5899fd..000000000
--- a/newexample/android/src/main/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/newexample/android/src/main/res/values/strings.xml b/newexample/android/src/main/res/values/strings.xml
deleted file mode 100644
index 9d10a2527..000000000
--- a/newexample/android/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<resources>
-    <string name="app_name">Kaluga Example</string>
-
-    <string name="feature_alerts">Alerts</string>
-    <string name="feature_architecture">Architecture</string>
-    <string name="feature_date_time_picker">Date Time Picker</string>
-    <string name="feature_bluetooth">Bluetooth</string>
-    <string name="feature_hud">Loading Indicator</string>
-    <string name="feature_keyboard">Keyboard</string>
-    <string name="feature_links">Links</string>
-    <string name="feature_location">Location</string>
-    <string name="feature_permissions">Permissions</string>
-    <string name="feature_system">System</string>
-    <string name="feature_beacons">Beacons</string>
-    <string name="feature_platform_specific">Platform specific features</string>
-    <string name="feature_platform_specific_compose_navigation">Compose Navigation</string>
-    <string name="feature_platform_specific_compose_bottom_sheet">Compose Bottom Sheet</string>
-    <string name="feature_resources">Resources</string>
-    <string name="feature_resources_color">Color</string>
-    <string name="feature_resources_button">Button</string>
-    <string name="feature_resources_label">Label</string>
-
-    <string name="show_alert">Show Alert</string>
-    <string name="dismissible_alert">Dismissible Alert</string>
-    <string name="alert_list">Show Alert List</string>
-    <string name="alert_input">Show Alert with input</string>
-    <string name="show_loading_indicator_system">Show Loading Indicator (System)</string>
-    <string name="show_loading_indicator_custom">Show Loading Indicator (Custom)</string>
-
-    <string name="select_time">Select Time</string>
-    <string name="select_date">Select Date</string>
-    <string name="current_time">Current Time</string>
-    <string name="confirm_selection">Select</string>
-    <string name="cancel_selection">Cancel</string>
-
-    <string name="permissions_list">Permissions List</string>
-    <string name="permissions_bluetooth">Bluetooth Demo</string>
-    <string name="permissions_calendar">Calendar Demo</string>
-    <string name="permissions_camera">Camera Demo</string>
-    <string name="permissions_contacts">Contacts Demo</string>
-    <string name="permissions_location">Location Demo</string>
-    <string name="permissions_microphone">Microphone Demo</string>
-    <string name="permissions_notifications">Notifications Demo</string>
-    <string name="permissions_storage">Storage Demo</string>
-
-    <string name="permissions_unknown">The status of the permission is not known yet</string>
-    <string name="permission_allowed">The permission has been granted</string>
-    <string name="permission_requestable">The permission can be requested</string>
-    <string name="permission_denied">The permission has been denied</string>
-
-    <string name="permission_request">Request Permission</string>
-    <string name="permission_request_success">Permission requested successfully</string>
-    <string name="permission_request_failed">Permission request failed</string>
-
-    <string name="architecture_details">Show Details</string>
-    <string name="architecture_details_inverse">Inverse Input</string>
-    <string name="keyboard_manager">Keyboard</string>
-    <string name="show_keyboard">Show Keyboard</string>
-    <string name="hide_keyboard">Hide Keyboard</string>
-
-    <string name="location_background">Kaluga Background</string>
-    <string name="location_enable_background">Enable Background</string>
-    <string name="location_disable_background">Disable Background</string>
-
-    <string name="browser_button_text">Open browser</string>
-    <string name="links_instructions">Tapping \"Open browser\" will redirect you in a webpage.
-        There you can find a button that if tapped will bring you back to the app passing a query.
-        That query will be deserialized into a object and shown in an alert.
-    </string>
-
-    <string name="network_feature">Network</string>
-    <string name="bluetooth_start_scanning">Start Scanning</string>
-    <string name="bluetooth_stop_scanning">Stop Scanning</string>
-    <string name="bluetooth_no_name">Unnamed Bluetooth Device</string>
-
-    <string name="rssi">%d dBm</string>
-    <string name="txPower">%s dBm</string>
-    <string name="distance">%.2f m</string>
-
-    <string name="bluetooth_connect">Connect</string>
-    <string name="bluetooth_disconnect">Disconnect</string>
-
-    <string name="bluetooth_connected">Connected</string>
-    <string name="bluetooth_connecting">Connecting</string>
-    <string name="bluetooth_disconnected">Disconnected</string>
-    <string name="bluetooth_disconneting">Disconnecting</string>
-    <string name="bluetooth_reconnecting">Reconnecting</string>
-    <string name="bluetooth_discovering">Discovering</string>
-
-    <string name="bluetooth_service_uuids">Service UUIDs: %s</string>
-    <string name="bluetooth_service_data">Service Data: %s</string>
-    <string name="bluetooth_manufacturer_id">Manufacturer Id: %d</string>
-    <string name="bluetooth_manufacturer_data">Manufacturer Data: %s</string>
-
-    <string name="bluetooth_more">More</string>
-
-    <string name="bluetooth_services_header">Services</string>
-    <string name="bluetooth_service">Service</string>
-    <string name="bluetooth_characteristics">Characteristics</string>
-    <string name="bluetooth_descriptors">Descriptors</string>
-    <string name="bluetooth_permissions_read">Read</string>
-    <string name="bluetooth_permissions_write">Write</string>
-    <string name="bluetooth_permissions_read_encrypted">Read Encrypted</string>
-    <string name="bluetooth_permissions_write_encrypted">Write Encrypted</string>
-
-    <string name="bottom_sheet_show_sheet">Open Bottom Sheet</string>
-    <string name="bottom_sheet_show_sub_page">Open Sub Page</string>
-    <string name="bottom_sheet_sub_page_title">Sub Page</string>
-    <string name="bottom_sheet_sheet_content">This is a bottom sheet</string>
-    <string name="bottom_sheet_sheet_sub_page_title">Sheet Sub Page</string>
-
-</resources>
diff --git a/newexample/android/src/main/res/values/styles.xml b/newexample/android/src/main/res/values/styles.xml
deleted file mode 100644
index 8b5a75d76..000000000
--- a/newexample/android/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.Bridge">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-    <style name="ListTitle">
-        <item name="android:textColor">@color/text_primary</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="ListSubTitle">
-        <item name="android:textColor">@color/text_primary</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="ListContent">
-        <item name="android:textColor">@color/text_secondary</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="ListFoldOut">
-        <item name="android:background">@color/background_card</item>
-    </style>
-
-</resources>
diff --git a/newexample/ios/Demo.xcodeproj/project.pbxproj b/newexample/ios/Demo.xcodeproj/project.pbxproj
deleted file mode 100644
index 3a1573fc1..000000000
--- a/newexample/ios/Demo.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,867 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		2017B1C52400175C00F9072A /* PermissionListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2017B1C42400175C00F9072A /* PermissionListViewController.swift */; };
-		20524A24257BEA1E0054B57E /* DateTimePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */; };
-		205747572397C9C400CDE25E /* KeyboardManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */; };
-		205AF6562488F017001BD99E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 205AF6542488F017001BD99E /* Localizable.strings */; };
-		2073D0F0270303B3002CB856 /* ButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2073D0EF270303B3002CB856 /* ButtonViewController.swift */; };
-		2073D0F227032B5B002CB856 /* ColorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2073D0F127032B5B002CB856 /* ColorViewController.swift */; };
-		209471E124C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209471E024C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift */; };
-		209471E424C07EAD001426CD /* BluetoothViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209471E324C07EAD001426CD /* BluetoothViewController.swift */; };
-		209471E624C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */; };
-		209471E824C07F19001426CD /* BluetoothCharacteristicCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */; };
-		209471EA24C07F5F001426CD /* BluetoothDescriptorCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */; };
-		20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */; };
-		20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */; };
-		20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */; };
-		20C7D1D52469B25B00C9A63F /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D42469B25B00C9A63F /* InfoViewController.swift */; };
-		20C7D1D8246A93A600C9A63F /* ArchitectureInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */; };
-		20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */; };
-		20D8CD3726FE8FE200D14AC9 /* ResourcesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */; };
-		20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3826FF550100D14AC9 /* LabelViewController.swift */; };
-		4B02E504236B221B003F0B36 /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B02E503236B221B003F0B36 /* LoadingViewController.swift */; };
-		4B54CB212369DA6600B69B2D /* AlertsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B54CB202369DA6600B69B2D /* AlertsViewController.swift */; };
-		4BC0CBDF269F1D25000512A9 /* BeaconsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC0CBDD269F1D25000512A9 /* BeaconsViewController.swift */; };
-		4BC0CBE0269F1D25000512A9 /* BeaconsViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC0CBDE269F1D25000512A9 /* BeaconsViewCell.swift */; };
-		641CC0DC25CACAAD001E1CD1 /* LinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CC0DB25CACAAD001E1CD1 /* LinksViewController.swift */; };
-		649979D325CC638C00348419 /* SystemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649979D225CC638C00348419 /* SystemViewController.swift */; };
-		649979E725CCD37200348419 /* NetworkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649979E625CCD37200348419 /* NetworkViewController.swift */; };
-		7425815FF35195035A8991B0 /* LocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74C710A1E2E41AF0F4A9FFC5 /* LocationViewController.swift */; };
-		74671D1F8F6A31F1DD3F7912 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74BBBF2C57521E71982179E0 /* AppDelegate.swift */; };
-		7478297FCF44ED1D49525D4E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74FDC8922442294AF0776058 /* LaunchScreen.storyboard */; };
-		749B42F84CA72A5D4A0F3AD9 /* DemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */; };
-		74C75886D08DD78EA65E6DD9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 74C9C443CC304CB387AB324D /* Assets.xcassets */; };
-		74D656BE6B4BD50115400411 /* DemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 744CF99B70DA1947AA98CA3B /* DemoTests.swift */; };
-		74E6599B023623BD96737582 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74F483E9C1890D693F808DDA /* Main.storyboard */; };
-		978348A7235DF586005B140B /* PermissionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978348A6235DF586005B140B /* PermissionViewController.swift */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		74798B41F78378ECDB0E4BB7 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 7477FD4305C126F92DB837CC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 74555136E1B2BB715E50195E;
-			remoteInfo = Demo;
-		};
-		74D5F38618D40CB8E5FC86D8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 7477FD4305C126F92DB837CC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 74555136E1B2BB715E50195E;
-			remoteInfo = Demo;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		74A05339C53B02B14407A5BD /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 0;
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		2017B1C42400175C00F9072A /* PermissionListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionListViewController.swift; sourceTree = "<group>"; };
-		20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimePickerViewController.swift; sourceTree = "<group>"; };
-		205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardManagerViewController.swift; sourceTree = "<group>"; };
-		205AF6552488F017001BD99E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Demo/Base.lproj/Localizable.strings; sourceTree = "<group>"; };
-		2073D0EF270303B3002CB856 /* ButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonViewController.swift; sourceTree = "<group>"; };
-		2073D0F127032B5B002CB856 /* ColorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorViewController.swift; sourceTree = "<group>"; };
-		209471E024C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FittingWidthAutomaticHeightCollectionViewFlowLayout.swift; sourceTree = "<group>"; };
-		209471E324C07EAD001426CD /* BluetoothViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothViewController.swift; sourceTree = "<group>"; };
-		209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothDeviceDetailsViewController.swift; sourceTree = "<group>"; };
-		209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BluetoothCharacteristicCell.xib; sourceTree = "<group>"; };
-		209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BluetoothDescriptorCell.xib; sourceTree = "<group>"; };
-		20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleViewController.swift; sourceTree = "<group>"; };
-		20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIControl+Closure.swift"; sourceTree = "<group>"; };
-		20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturesListViewController.swift; sourceTree = "<group>"; };
-		20C7D1D42469B25B00C9A63F /* InfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoViewController.swift; sourceTree = "<group>"; };
-		20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureInputViewController.swift; sourceTree = "<group>"; };
-		20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureDetailsViewController.swift; sourceTree = "<group>"; };
-		20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesListViewController.swift; sourceTree = "<group>"; };
-		20D8CD3826FF550100D14AC9 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = "<group>"; };
-		4B02E503236B221B003F0B36 /* LoadingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
-		4B54CB202369DA6600B69B2D /* AlertsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertsViewController.swift; sourceTree = "<group>"; };
-		4BC0CBDD269F1D25000512A9 /* BeaconsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeaconsViewController.swift; sourceTree = "<group>"; };
-		4BC0CBDE269F1D25000512A9 /* BeaconsViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeaconsViewCell.swift; sourceTree = "<group>"; };
-		641CC0DB25CACAAD001E1CD1 /* LinksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinksViewController.swift; sourceTree = "<group>"; };
-		648214DD263095A900CDAE05 /* Demo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Demo.entitlements; sourceTree = "<group>"; };
-		649979D225CC638C00348419 /* SystemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemViewController.swift; sourceTree = "<group>"; };
-		649979E625CCD37200348419 /* NetworkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkViewController.swift; sourceTree = "<group>"; };
-		740C363F8973304E72F429BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
-		741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoUITests.swift; sourceTree = "<group>"; };
-		7428D8755D288FD7EA2E6537 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
-		742CCE9033CEC8C8004D624F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		744CF99B70DA1947AA98CA3B /* DemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoTests.swift; sourceTree = "<group>"; };
-		746834742E284396FD5452F4 /* DemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		746E133CAEC5C7B1D516B11F /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		74A0718952D0CC604E49709B /* DemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DemoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		74BBBF2C57521E71982179E0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		74BEC2BADB02749FD409313B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
-		74C07E8A2DB465B1CE47DC5E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		74C710A1E2E41AF0F4A9FFC5 /* LocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationViewController.swift; sourceTree = "<group>"; };
-		74C9C443CC304CB387AB324D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		978348A6235DF586005B140B /* PermissionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionViewController.swift; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		7400F8CCBEA88ECB1634EEDE /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		740935FBE067214171F75A8D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		74B635A880CB81844D31A213 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		20524A22257BEA020054B57E /* DateTimePicker */ = {
-			isa = PBXGroup;
-			children = (
-				20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */,
-			);
-			path = DateTimePicker;
-			sourceTree = "<group>";
-		};
-		205747552397C99100CDE25E /* KeyboardManager */ = {
-			isa = PBXGroup;
-			children = (
-				205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */,
-			);
-			path = KeyboardManager;
-			sourceTree = "<group>";
-		};
-		209471DF24C07DE2001426CD /* View */ = {
-			isa = PBXGroup;
-			children = (
-				209471E024C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift */,
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
-		209471E224C07E61001426CD /* Bluetooth */ = {
-			isa = PBXGroup;
-			children = (
-				209471E324C07EAD001426CD /* BluetoothViewController.swift */,
-				209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */,
-				209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */,
-				209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */,
-			);
-			path = Bluetooth;
-			sourceTree = "<group>";
-		};
-		20C7D1CD24699A5000C9A63F /* Helpers */ = {
-			isa = PBXGroup;
-			children = (
-				20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */,
-			);
-			path = Helpers;
-			sourceTree = "<group>";
-		};
-		20C7D1D02469A3C100C9A63F /* FeaturesList */ = {
-			isa = PBXGroup;
-			children = (
-				20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */,
-			);
-			path = FeaturesList;
-			sourceTree = "<group>";
-		};
-		20C7D1D32469B24C00C9A63F /* Info */ = {
-			isa = PBXGroup;
-			children = (
-				20C7D1D42469B25B00C9A63F /* InfoViewController.swift */,
-			);
-			path = Info;
-			sourceTree = "<group>";
-		};
-		20C7D1D6246A938A00C9A63F /* Architecture */ = {
-			isa = PBXGroup;
-			children = (
-				20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */,
-				20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */,
-			);
-			path = Architecture;
-			sourceTree = "<group>";
-		};
-		20D8CD3526FE8FBA00D14AC9 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */,
-				20D8CD3826FF550100D14AC9 /* LabelViewController.swift */,
-				2073D0EF270303B3002CB856 /* ButtonViewController.swift */,
-				2073D0F127032B5B002CB856 /* ColorViewController.swift */,
-			);
-			path = Resources;
-			sourceTree = "<group>";
-		};
-		4B02E502236B2206003F0B36 /* LoadingIndicator */ = {
-			isa = PBXGroup;
-			children = (
-				4B02E503236B221B003F0B36 /* LoadingViewController.swift */,
-			);
-			path = LoadingIndicator;
-			sourceTree = "<group>";
-		};
-		4B54CB1E2369DA2B00B69B2D /* Location */ = {
-			isa = PBXGroup;
-			children = (
-				74C710A1E2E41AF0F4A9FFC5 /* LocationViewController.swift */,
-			);
-			path = Location;
-			sourceTree = "<group>";
-		};
-		4B54CB1F2369DA4E00B69B2D /* Alerts */ = {
-			isa = PBXGroup;
-			children = (
-				4B54CB202369DA6600B69B2D /* AlertsViewController.swift */,
-			);
-			path = Alerts;
-			sourceTree = "<group>";
-		};
-		4BC0CBDC269F1D25000512A9 /* Beacons */ = {
-			isa = PBXGroup;
-			children = (
-				4BC0CBDD269F1D25000512A9 /* BeaconsViewController.swift */,
-				4BC0CBDE269F1D25000512A9 /* BeaconsViewCell.swift */,
-			);
-			path = Beacons;
-			sourceTree = "<group>";
-		};
-		641CC0D625CAC0A1001E1CD1 /* Links */ = {
-			isa = PBXGroup;
-			children = (
-				641CC0DB25CACAAD001E1CD1 /* LinksViewController.swift */,
-			);
-			path = Links;
-			sourceTree = "<group>";
-		};
-		649979D025CC636F00348419 /* System */ = {
-			isa = PBXGroup;
-			children = (
-				649979D125CC637600348419 /* Network */,
-				649979D225CC638C00348419 /* SystemViewController.swift */,
-			);
-			path = System;
-			sourceTree = "<group>";
-		};
-		649979D125CC637600348419 /* Network */ = {
-			isa = PBXGroup;
-			children = (
-				649979E625CCD37200348419 /* NetworkViewController.swift */,
-			);
-			path = Network;
-			sourceTree = "<group>";
-		};
-		745520950D85E4696686141D = {
-			isa = PBXGroup;
-			children = (
-				205AF6542488F017001BD99E /* Localizable.strings */,
-				747A549D9FF0D1B49E65E190 /* Products */,
-				746CAD9D15ECB24F4ED84E11 /* Demo */,
-				7492DE0914511F3DC96A30A8 /* DemoTests */,
-				74D6698E6E24A4F93E6B289A /* DemoUITests */,
-			);
-			sourceTree = "<group>";
-		};
-		746CAD9D15ECB24F4ED84E11 /* Demo */ = {
-			isa = PBXGroup;
-			children = (
-				20D8CD3526FE8FBA00D14AC9 /* Resources */,
-				648214DD263095A900CDAE05 /* Demo.entitlements */,
-				641CC0D625CAC0A1001E1CD1 /* Links */,
-				649979D025CC636F00348419 /* System */,
-				20524A22257BEA020054B57E /* DateTimePicker */,
-				4B54CB1F2369DA4E00B69B2D /* Alerts */,
-				74BBBF2C57521E71982179E0 /* AppDelegate.swift */,
-				20C7D1D6246A938A00C9A63F /* Architecture */,
-				74C9C443CC304CB387AB324D /* Assets.xcassets */,
-				209471E224C07E61001426CD /* Bluetooth */,
-				20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */,
-				4BC0CBDC269F1D25000512A9 /* Beacons */,
-				20C7D1D02469A3C100C9A63F /* FeaturesList */,
-				20C7D1CD24699A5000C9A63F /* Helpers */,
-				20C7D1D32469B24C00C9A63F /* Info */,
-				74BEC2BADB02749FD409313B /* Info.plist */,
-				205747552397C99100CDE25E /* KeyboardManager */,
-				74FDC8922442294AF0776058 /* LaunchScreen.storyboard */,
-				4B02E502236B2206003F0B36 /* LoadingIndicator */,
-				4B54CB1E2369DA2B00B69B2D /* Location */,
-				74F483E9C1890D693F808DDA /* Main.storyboard */,
-				978348A5235DF51D005B140B /* Permissions */,
-				209471DF24C07DE2001426CD /* View */,
-			);
-			path = Demo;
-			sourceTree = "<group>";
-		};
-		747A549D9FF0D1B49E65E190 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				746E133CAEC5C7B1D516B11F /* Demo.app */,
-				746834742E284396FD5452F4 /* DemoTests.xctest */,
-				74A0718952D0CC604E49709B /* DemoUITests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		7492DE0914511F3DC96A30A8 /* DemoTests */ = {
-			isa = PBXGroup;
-			children = (
-				7428D8755D288FD7EA2E6537 /* Info.plist */,
-				744CF99B70DA1947AA98CA3B /* DemoTests.swift */,
-			);
-			path = DemoTests;
-			sourceTree = "<group>";
-		};
-		74D6698E6E24A4F93E6B289A /* DemoUITests */ = {
-			isa = PBXGroup;
-			children = (
-				740C363F8973304E72F429BC /* Info.plist */,
-				741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */,
-			);
-			path = DemoUITests;
-			sourceTree = "<group>";
-		};
-		978348A5235DF51D005B140B /* Permissions */ = {
-			isa = PBXGroup;
-			children = (
-				978348A6235DF586005B140B /* PermissionViewController.swift */,
-				2017B1C42400175C00F9072A /* PermissionListViewController.swift */,
-			);
-			path = Permissions;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		74074B293DEEEE5CB9495BC2 /* DemoTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 740AC894114C7B2501D2F458 /* Build configuration list for PBXNativeTarget "DemoTests" */;
-			buildPhases = (
-				744899861837358C3FC4D6EC /* Sources */,
-				740935FBE067214171F75A8D /* Frameworks */,
-				746B879C3C63B46AE1237085 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				744683563AC18D9D78E89D91 /* PBXTargetDependency */,
-			);
-			name = DemoTests;
-			productName = DemoTests;
-			productReference = 746834742E284396FD5452F4 /* DemoTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		74555136E1B2BB715E50195E /* Demo */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 74C754F7F747073B076C3A91 /* Build configuration list for PBXNativeTarget "Demo" */;
-			buildPhases = (
-				95D0860F27D2540B00838E57 /* Compile Kotlin/Native */,
-				744156D82DB12C1F9CC3C68F /* Sources */,
-				74B635A880CB81844D31A213 /* Frameworks */,
-				746C535FD7586B544C684D34 /* Resources */,
-				74A05339C53B02B14407A5BD /* Embed Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Demo;
-			productName = Demo;
-			productReference = 746E133CAEC5C7B1D516B11F /* Demo.app */;
-			productType = "com.apple.product-type.application";
-		};
-		74F1ACA722488B68F78605D9 /* DemoUITests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7493E4639A804158022EC4C4 /* Build configuration list for PBXNativeTarget "DemoUITests" */;
-			buildPhases = (
-				74EE94DACA1A8475269C9E82 /* Sources */,
-				7400F8CCBEA88ECB1634EEDE /* Frameworks */,
-				7471171052DD797BF549D296 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				749B2B4D04F5064568547D5D /* PBXTargetDependency */,
-			);
-			name = DemoUITests;
-			productName = DemoUITests;
-			productReference = 74A0718952D0CC604E49709B /* DemoUITests.xctest */;
-			productType = "com.apple.product-type.bundle.ui-testing";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		7477FD4305C126F92DB837CC /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				ORGANIZATIONNAME = "Splendo Consulting B.V.";
-				TargetAttributes = {
-					74555136E1B2BB715E50195E = {
-						DevelopmentTeam = 2732HQPVJP;
-						ProvisioningStyle = Manual;
-					};
-				};
-			};
-			buildConfigurationList = 742F13205C35E0F5E5498808 /* Build configuration list for PBXProject "Demo" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				English,
-				en,
-				Base,
-			);
-			mainGroup = 745520950D85E4696686141D;
-			productRefGroup = 747A549D9FF0D1B49E65E190 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				74555136E1B2BB715E50195E /* Demo */,
-				74074B293DEEEE5CB9495BC2 /* DemoTests */,
-				74F1ACA722488B68F78605D9 /* DemoUITests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		746B879C3C63B46AE1237085 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		746C535FD7586B544C684D34 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				205AF6562488F017001BD99E /* Localizable.strings in Resources */,
-				209471E824C07F19001426CD /* BluetoothCharacteristicCell.xib in Resources */,
-				74C75886D08DD78EA65E6DD9 /* Assets.xcassets in Resources */,
-				7478297FCF44ED1D49525D4E /* LaunchScreen.storyboard in Resources */,
-				74E6599B023623BD96737582 /* Main.storyboard in Resources */,
-				209471EA24C07F5F001426CD /* BluetoothDescriptorCell.xib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7471171052DD797BF549D296 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		95D0860F27D2540B00838E57 /* Compile Kotlin/Native */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Compile Kotlin/Native";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		744156D82DB12C1F9CC3C68F /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				205747572397C9C400CDE25E /* KeyboardManagerViewController.swift in Sources */,
-				74671D1F8F6A31F1DD3F7912 /* AppDelegate.swift in Sources */,
-				20D8CD3726FE8FE200D14AC9 /* ResourcesListViewController.swift in Sources */,
-				209471E124C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift in Sources */,
-				2017B1C52400175C00F9072A /* PermissionListViewController.swift in Sources */,
-				978348A7235DF586005B140B /* PermissionViewController.swift in Sources */,
-				641CC0DC25CACAAD001E1CD1 /* LinksViewController.swift in Sources */,
-				2073D0F227032B5B002CB856 /* ColorViewController.swift in Sources */,
-				20524A24257BEA1E0054B57E /* DateTimePickerViewController.swift in Sources */,
-				20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */,
-				4BC0CBDF269F1D25000512A9 /* BeaconsViewController.swift in Sources */,
-				649979E725CCD37200348419 /* NetworkViewController.swift in Sources */,
-				20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */,
-				4BC0CBE0269F1D25000512A9 /* BeaconsViewCell.swift in Sources */,
-				20C7D1D8246A93A600C9A63F /* ArchitectureInputViewController.swift in Sources */,
-				20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */,
-				20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */,
-				649979D325CC638C00348419 /* SystemViewController.swift in Sources */,
-				978348A7235DF586005B140B /* PermissionViewController.swift in Sources */,
-				20C7D1D52469B25B00C9A63F /* InfoViewController.swift in Sources */,
-				4B02E504236B221B003F0B36 /* LoadingViewController.swift in Sources */,
-				7425815FF35195035A8991B0 /* LocationViewController.swift in Sources */,
-				209471E624C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift in Sources */,
-				209471E424C07EAD001426CD /* BluetoothViewController.swift in Sources */,
-				4B54CB212369DA6600B69B2D /* AlertsViewController.swift in Sources */,
-				2073D0F0270303B3002CB856 /* ButtonViewController.swift in Sources */,
-				20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		744899861837358C3FC4D6EC /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				74D656BE6B4BD50115400411 /* DemoTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		74EE94DACA1A8475269C9E82 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				749B42F84CA72A5D4A0F3AD9 /* DemoUITests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		744683563AC18D9D78E89D91 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 74555136E1B2BB715E50195E /* Demo */;
-			targetProxy = 74D5F38618D40CB8E5FC86D8 /* PBXContainerItemProxy */;
-		};
-		749B2B4D04F5064568547D5D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 74555136E1B2BB715E50195E /* Demo */;
-			targetProxy = 74798B41F78378ECDB0E4BB7 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		205AF6542488F017001BD99E /* Localizable.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				205AF6552488F017001BD99E /* Base */,
-			);
-			name = Localizable.strings;
-			sourceTree = "<group>";
-		};
-		74F483E9C1890D693F808DDA /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				74C07E8A2DB465B1CE47DC5E /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		74FDC8922442294AF0776058 /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				742CCE9033CEC8C8004D624F /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		7450045FC3F0FAB4E9E0751D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				MTL_FAST_MATH = YES;
-				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		74B72DFF132E49F15B2DF935 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
-				INFOPLIST_FILE = DemoTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUNDLE_LOADER)";
-			};
-			name = Debug;
-		};
-		74BDCF7AC0CDEAF092DB5F7F /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				DEVELOPMENT_TEAM = 2732HQPVJP;
-				FRAMEWORK_SEARCH_PATHS = (
-					$BUILT_PRODUCTS_DIR,
-					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
-				);
-				INFOPLIST_FILE = Demo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-framework",
-					KalugaExampleShared,
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.kaluga.example;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "Kaluga example";
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		74C4C9BEEE5FE949D448C58D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
-				INFOPLIST_FILE = DemoUITests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoUITests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_TARGET_NAME = Demo;
-			};
-			name = Debug;
-		};
-		74DE35733E2CD78059A3003A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
-				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-				MTL_FAST_MATH = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-			};
-			name = Debug;
-		};
-		74E9BA46A80E6C492CC81D95 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
-				INFOPLIST_FILE = DemoTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUNDLE_LOADER)";
-			};
-			name = Release;
-		};
-		74F864CC21F489CA494FD856 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
-				INFOPLIST_FILE = DemoUITests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoUITests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_TARGET_NAME = Demo;
-			};
-			name = Release;
-		};
-		74FB1F493C4D48DDF9E1C969 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = Demo/Demo.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				DEVELOPMENT_TEAM = 2732HQPVJP;
-				FRAMEWORK_SEARCH_PATHS = (
-					$BUILT_PRODUCTS_DIR,
-					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
-				);
-				INFOPLIST_FILE = Demo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-framework",
-					KalugaExampleShared,
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.kaluga.example;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "Kaluga example";
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		740AC894114C7B2501D2F458 /* Build configuration list for PBXNativeTarget "DemoTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				74B72DFF132E49F15B2DF935 /* Debug */,
-				74E9BA46A80E6C492CC81D95 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		742F13205C35E0F5E5498808 /* Build configuration list for PBXProject "Demo" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				74DE35733E2CD78059A3003A /* Debug */,
-				7450045FC3F0FAB4E9E0751D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		7493E4639A804158022EC4C4 /* Build configuration list for PBXNativeTarget "DemoUITests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				74C4C9BEEE5FE949D448C58D /* Debug */,
-				74F864CC21F489CA494FD856 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		74C754F7F747073B076C3A91 /* Build configuration list for PBXNativeTarget "Demo" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				74BDCF7AC0CDEAF092DB5F7F /* Debug */,
-				74FB1F493C4D48DDF9E1C969 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 7477FD4305C126F92DB837CC /* Project object */;
-}
diff --git a/newexample/ios/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/newexample/ios/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a62..000000000
--- a/newexample/ios/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/newexample/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/newexample/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003..000000000
--- a/newexample/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/newexample/ios/Demo.xcodeproj/xcshareddata/IDETemplateMacros.plist b/newexample/ios/Demo.xcodeproj/xcshareddata/IDETemplateMacros.plist
deleted file mode 100644
index 89382abd1..000000000
--- a/newexample/ios/Demo.xcodeproj/xcshareddata/IDETemplateMacros.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>FILEHEADER</key>
-    <string>
-//  Copyright ___YEAR___ ___ORGANIZATIONNAME___ The Netherlands
-// 
-//    Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0
-// 
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-//</string>
-</dict>
-</plist>
diff --git a/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
deleted file mode 100644
index e9ab380d8..000000000
--- a/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "74555136E1B2BB715E50195E"
-               BuildableName = "Demo.app"
-               BlueprintName = "Demo"
-               ReferencedContainer = "container:Demo.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "74074B293DEEEE5CB9495BC2"
-               BuildableName = "DemoTests.xctest"
-               BlueprintName = "DemoTests"
-               ReferencedContainer = "container:Demo.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "74F1ACA722488B68F78605D9"
-               BuildableName = "DemoUITests.xctest"
-               BlueprintName = "DemoUITests"
-               ReferencedContainer = "container:Demo.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "74555136E1B2BB715E50195E"
-            BuildableName = "Demo.app"
-            BlueprintName = "Demo"
-            ReferencedContainer = "container:Demo.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <LocationScenarioReference
-         identifier = "Moscow, Russia"
-         referenceType = "1">
-      </LocationScenarioReference>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "74555136E1B2BB715E50195E"
-            BuildableName = "Demo.app"
-            BlueprintName = "Demo"
-            ReferencedContainer = "container:Demo.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme b/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme
deleted file mode 100644
index df330714c..000000000
--- a/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1320"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "74074B293DEEEE5CB9495BC2"
-               BuildableName = "DemoTests.xctest"
-               BlueprintName = "DemoTests"
-               ReferencedContainer = "container:Demo.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme b/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme
deleted file mode 100644
index f5b5d4dc4..000000000
--- a/newexample/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1320"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "74F1ACA722488B68F78605D9"
-               BuildableName = "DemoUITests.xctest"
-               BlueprintName = "DemoUITests"
-               ReferencedContainer = "container:Demo.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/newexample/ios/Demo/Alerts/AlertsViewController.swift b/newexample/ios/Demo/Alerts/AlertsViewController.swift
deleted file mode 100644
index 96e81b313..000000000
--- a/newexample/ios/Demo/Alerts/AlertsViewController.swift
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-import UIKit
-import KalugaExampleShared
-
-class AlertsViewController: UITableViewController {
-
-    private lazy var viewModel = AlertViewModel(builder: AlertPresenter.Builder(viewController: self))
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        tableView.deselectRow(at: indexPath, animated: true)
-        switch indexPath.row {
-        case 0: viewModel.showAlert()
-        case 1: viewModel.showAndDismissAfter(timeSecs: 3)
-        case 2: viewModel.showAlertWithList()
-        case 3: viewModel.showAlertWithInput()
-        default: ()
-        }
-    }
-}
diff --git a/newexample/ios/Demo/AppDelegate.swift b/newexample/ios/Demo/AppDelegate.swift
deleted file mode 100644
index cefdc285e..000000000
--- a/newexample/ios/Demo/AppDelegate.swift
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-import UIKit
-import KalugaExampleShared
-
-@UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
-    
-    var window: UIWindow?
-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        DependencyInjectionKt.doInitKoin(customModules: [])
-        return true
-    }
-    
-    func application(_ application: UIApplication,
-                     continue userActivity: NSUserActivity,
-                     restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
-        guard let url = NSURLComponents(url: userActivity.webpageURL!, resolvingAgainstBaseURL: true) else {
-            print("Invalid url.")
-            return false
-        }
-        guard let stringUrl = url.url?.absoluteString else {
-            print("Could not retrieve string url.")
-            return false
-        }
-
-        let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        let vc = storyboard.instantiateViewController(withIdentifier: "LinksViewController") as! LinksViewController
-        self.window?.rootViewController = vc
-        
-//        vc.handleIncomingLink(url: stringUrl)
-        return true
-    }
-
-    func applicationWillResignActive(_ application: UIApplication) {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
-
-    }
-
-
-    func applicationDidEnterBackground(_ application: UIApplication) {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-
-    }
-
-
-    func applicationWillEnterForeground(_ application: UIApplication) {
-    // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
-    }
-
-
-    func applicationDidBecomeActive(_ application: UIApplication) {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-    }
-
-
-    func applicationWillTerminate(_ application: UIApplication) {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-    }
-
-
-
-}
diff --git a/newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift b/newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
deleted file mode 100644
index cc6b9fcfc..000000000
--- a/newexample/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import KalugaExampleShared
-
-class ArchitectureDetailsViewController: UIViewController {
-    
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "ArchitectureDetails"
-    }
-    
-    static func create(inputDetails: InputDetails, onDismiss: @escaping (InputDetails) -> Void) -> ArchitectureDetailsViewController {
-        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! ArchitectureDetailsViewController
-        if #available(iOS 13.0, *) {
-            vc.isModalInPresentation = true
-        }
-        let navigator = ViewControllerNavigator<CloseDetailsNavigation>(parentVC: vc) { action in
-            NavigationSpec.Dismiss(toDismiss: { $0 }, animated: true) {
-                onDismiss(action.value!)
-            }
-        }
-        vc.viewModel = ArchitectureDetailsViewModel(initialDetail: inputDetails, navigator: navigator)
-        return vc
-    }
-
-    var viewModel: ArchitectureDetailsViewModel!
-    private var lifecycleManager: LifecycleManager!
-    
-    @IBOutlet weak var nameLabel: UILabel!
-    @IBOutlet weak var numberLabel: UILabel!
-    @IBOutlet weak var inverseButton: UIButton!
-    @IBOutlet weak var closeButton: UIButton!
-    
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-
-            guard let viewModel = self?.viewModel else {
-                return []
-            }
-
-            return [
-                viewModel.name.observe { name in
-                    self?.nameLabel.text = name as? String ?? ""
-                },
-                viewModel.number.observe { number in
-                    self?.numberLabel.text = number as? String ?? ""
-                }
-            ]
-        }
-    }
-
-    @objc @IBAction func onInversePressed(sender: Any?) {
-        viewModel.onInversePressed()
-    }
-
-    @objc @IBAction func onCloseButtonPressed(sender: Any?) {
-        viewModel.onClosePressed()
-    }
-    
-}
diff --git a/newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift b/newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift
deleted file mode 100644
index 9317cd640..000000000
--- a/newexample/ios/Demo/Architecture/ArchitectureInputViewController.swift
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import KalugaExampleShared
-
-class ArchitectureInputViewController: UIViewController  {
-    
-    @IBOutlet weak var nameLabel: UILabel!
-    @IBOutlet weak var nameInput: UITextField!
-    @IBOutlet weak var nameError: UIImageView!
-    
-    @IBOutlet weak var numberLabel: UILabel!
-    @IBOutlet weak var numberInput: UITextField!
-    @IBOutlet weak var numberError: UIImageView!
-    
-    @IBOutlet weak var detailsButton: UIButton!
-
-    lazy var navigator: ViewControllerNavigator<InputNavigation> = ViewControllerNavigator(parentVC: self) { action in
-        NavigationSpec.Present(animated: true, presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue), transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)) {
-            ArchitectureDetailsViewController.create(inputDetails: action.value!) { [weak self] inputDetails in
-                self?.onDetailsDismissed(inputDetails: inputDetails)
-            }
-        }
-    }
-    lazy var viewModel = ArchitectureInputViewModel(navigator: navigator)
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-
-            guard let viewModel = self?.viewModel else {
-                return []
-            }
-
-            return [
-                viewModel.nameHeader.observeInitialized { header in
-                    self?.nameLabel.text = header as String?
-                },
-                viewModel.nameInput.observeInitialized { name in
-                    self?.nameInput.text = name as String?
-                },
-                viewModel.isNameValid.observe { isValid in
-                    self?.nameError.isHidden = isValid?.boolValue ?? false
-                },
-                viewModel.numberHeader.observeInitialized { header in
-                    self?.numberLabel.text = header as String?
-                },
-                viewModel.numberInput.observeInitialized { number in
-                    self?.numberInput.text = number as String?
-                },
-                viewModel.isNumberValid.observe { isValid in
-                    self?.numberError.isHidden = isValid?.boolValue ?? false
-                }
-            ]
-        }
-    }
-
-    @objc @IBAction func onShowDetailsPressed(sender: Any?) {
-        viewModel.onShowDetailsPressed()
-    }
-
-    private func onDetailsDismissed(inputDetails: InputDetails) {
-        viewModel.nameInput.post(newValue: NSString(string: inputDetails.name))
-        viewModel.numberInput.post(newValue: NSString(string: "\(inputDetails.number)"))
-    }
-
-}
-
-extension ArchitectureInputViewController : UITextFieldDelegate {
-
-    func textFieldDidEndEditing(_ textField: UITextField) {
-        postInput(text: textField.text ?? "", fromTextField: textField)
-    }
-
-    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
-        let resultingString = ((textField.text ?? "") as NSString).replacingCharacters(in: range, with: string)
-        postInput(text: resultingString, fromTextField: textField)
-        return false
-    }
-
-    private func postInput(text: String, fromTextField textField: UITextField) {
-        if (textField == nameInput) {
-            viewModel.nameInput.post(newValue: NSString(string: text))
-        } else if (textField == numberInput) {
-            viewModel.numberInput.post(newValue: NSString(string: text))
-        }
-    }
-}
diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPad.png
deleted file mode 100644
index 43cafa80cbfc37485e1c7d63e7df89a4f380b5c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1340
zcmV-C1;hG@P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000e
zpaTE|000010000e00000SuRAD000E9Nkl<ZSPAV{Z)_7~82{b%f48os8(Wvb*rsd~
zhMO{}(@d0XY+wRWqA`;2#gHhPKr~T4_+@GgM(_iXn5fY&45#7}HHMIhu51#PA#7}b
zL$V31<4?DCUE8hg+B@I(y54%bJ3yNdLi!}lJ<t36p67n|yw7v*mEnot9v1c<<|a_f
z5KMQ6G8N2JFx?8I8=vXH`@VwObf56Q#QS}5@SJ*t$;`rFVkCgu5}b|l7#@m9f>Mpr
zas%`RY0^|b)u%!nP7H=%^6}_AGPTex+OO?)Am1dVB(+3nLOC-UhF-&<=U4z&N8}`z
zlo(K+e*t_n2xe*hg6MhkP=^mE213~TdJ)d_OvCSu%{%9`hilEqFO<_!onrcl^HGOK
z_-)u?1H($I#4rr#dhFM?grC~p4Ua|f`{^LUQ4Zh!=EM5URv9_Hfkne6n{1sfs1j`N
zo5IkI2nNQ&IOPxH5vN&_pn8oNj$k`D_epS`L2!LvNc>6Tt6#iGe$jRH2cfaED0$G3
zbPLz|Mhh%fWh#oR!3c)~$0x)j`#UF4*OUXJDFHVa$rCs05OcjNVq)Fz17V+NQ{{Mn
z2p6w}C2L<3!p+ayz|QT+qC73?)>$N&R6~*AXI)<SrsE=RJQ%~l{z*K&AxBtS+f2v~
zehfa~7BT#c7qRa5L_17|tM#aqFm(=(MR4wV1goFO60l9r*`U#gVKPNVaLgaWcc=X_
z;Gy10II0Y&TxEi@W*qTT`(+re?@RDxyQ#FhCgBUnhk^R&&^Q|`s9J4CMU{~*sS303
zlfU=!3|yB&iUE%<HDTTIEO3{827k3%5yKSL0u?Wy?U)a<%KU^l=L$0_i%Bm^XHS+>
zHrD|y54UlCds8FIw28NDG+Ka2s3O%R>iUQSdUDfo9fv5Z{&#0a!-FF@*%peK5{isq
zX^sw`4v>E0q{->~aK{Q8E`D+rW!sA3ZQTn#HY-WTuo`6T+6Mv^q?NRVlGx1}y!e<E
zTRYtNrm;u~BCg3Epwyznjw-tdNGiLkb747o6W(4AJUvllKeajO60cd0uZPyLOt7~<
zX~*Jh+4Bp&H`eB2Pu~RE{`TX?e*$8>k|HBWK`m<*BQNF1ahSE(U2etb_rpSt(H}-&
ztlb2SHCN2Znk~p_dReqhItDwRnfE6h4>^n|TVlZH=MxkD<{vi@S+HA4EWIicwCP!V
z;LI0sd+G|{J3NBebfW9yGck-F9))$|HW5R~F{W(MrpmJ`EvPOsN!H$J%)`#^>xj>h
z8umxAk5p4l6bVxBcG7P(c}6%3%-BK*dpgG?IXtdw;BsnUD5-?5a2e?KD#_b~5Iq*D
zY$Sw-!cn-~(znEie~!Z)QXYBPYbNz3UDu{z(6Gola1MbXdBa<lTT%Y%BJdINQBk%s
zHB_Rv9Jz_37lLSer5N=;jo?Z^I$RXIm9)^o2Km6;k{}J_B60Z1RI7=V3>0g;#Zf>4
z>8aH5R}kmpQM8aDQ<JkVJ%Ckq={bE{f@;bB&-&%yEa^S<NIQ8@+W)C?R|%%x_)c{x
y-8+rCi?|HIbc>y-V5WlURv_K@Ob_1o75o=Z#fT0_E8!^s0000<MNUMnLSTX{jcf}5

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x~iPhone.png
deleted file mode 100644
index 43cafa80cbfc37485e1c7d63e7df89a4f380b5c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1340
zcmV-C1;hG@P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000e
zpaTE|000010000e00000SuRAD000E9Nkl<ZSPAV{Z)_7~82{b%f48os8(Wvb*rsd~
zhMO{}(@d0XY+wRWqA`;2#gHhPKr~T4_+@GgM(_iXn5fY&45#7}HHMIhu51#PA#7}b
zL$V31<4?DCUE8hg+B@I(y54%bJ3yNdLi!}lJ<t36p67n|yw7v*mEnot9v1c<<|a_f
z5KMQ6G8N2JFx?8I8=vXH`@VwObf56Q#QS}5@SJ*t$;`rFVkCgu5}b|l7#@m9f>Mpr
zas%`RY0^|b)u%!nP7H=%^6}_AGPTex+OO?)Am1dVB(+3nLOC-UhF-&<=U4z&N8}`z
zlo(K+e*t_n2xe*hg6MhkP=^mE213~TdJ)d_OvCSu%{%9`hilEqFO<_!onrcl^HGOK
z_-)u?1H($I#4rr#dhFM?grC~p4Ua|f`{^LUQ4Zh!=EM5URv9_Hfkne6n{1sfs1j`N
zo5IkI2nNQ&IOPxH5vN&_pn8oNj$k`D_epS`L2!LvNc>6Tt6#iGe$jRH2cfaED0$G3
zbPLz|Mhh%fWh#oR!3c)~$0x)j`#UF4*OUXJDFHVa$rCs05OcjNVq)Fz17V+NQ{{Mn
z2p6w}C2L<3!p+ayz|QT+qC73?)>$N&R6~*AXI)<SrsE=RJQ%~l{z*K&AxBtS+f2v~
zehfa~7BT#c7qRa5L_17|tM#aqFm(=(MR4wV1goFO60l9r*`U#gVKPNVaLgaWcc=X_
z;Gy10II0Y&TxEi@W*qTT`(+re?@RDxyQ#FhCgBUnhk^R&&^Q|`s9J4CMU{~*sS303
zlfU=!3|yB&iUE%<HDTTIEO3{827k3%5yKSL0u?Wy?U)a<%KU^l=L$0_i%Bm^XHS+>
zHrD|y54UlCds8FIw28NDG+Ka2s3O%R>iUQSdUDfo9fv5Z{&#0a!-FF@*%peK5{isq
zX^sw`4v>E0q{->~aK{Q8E`D+rW!sA3ZQTn#HY-WTuo`6T+6Mv^q?NRVlGx1}y!e<E
zTRYtNrm;u~BCg3Epwyznjw-tdNGiLkb747o6W(4AJUvllKeajO60cd0uZPyLOt7~<
zX~*Jh+4Bp&H`eB2Pu~RE{`TX?e*$8>k|HBWK`m<*BQNF1ahSE(U2etb_rpSt(H}-&
ztlb2SHCN2Znk~p_dReqhItDwRnfE6h4>^n|TVlZH=MxkD<{vi@S+HA4EWIicwCP!V
z;LI0sd+G|{J3NBebfW9yGck-F9))$|HW5R~F{W(MrpmJ`EvPOsN!H$J%)`#^>xj>h
z8umxAk5p4l6bVxBcG7P(c}6%3%-BK*dpgG?IXtdw;BsnUD5-?5a2e?KD#_b~5Iq*D
zY$Sw-!cn-~(znEie~!Z)QXYBPYbNz3UDu{z(6Gola1MbXdBa<lTT%Y%BJdINQBk%s
zHB_Rv9Jz_37lLSer5N=;jo?Z^I$RXIm9)^o2Km6;k{}J_B60Z1RI7=V3>0g;#Zf>4
z>8aH5R}kmpQM8aDQ<JkVJ%Ckq={bE{f@;bB&-&%yEa^S<NIQ8@+W)C?R|%%x_)c{x
y-8+rCi?|HIbc>y-V5WlURv_K@Ob_1o75o=Z#fT0_E8!^s0000<MNUMnLSTX{jcf}5

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@3x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20@3x~iPhone.png
deleted file mode 100644
index 8ed5b1e60abf4db6bd37671cd352091459c13621..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2053
zcmV+g2>SPlP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000y
zpaTE|000010000y00000s29s-000MgNkl<ZXa((A32YQq82)DV>Tb8YTe{E+1)-ot
zj&cbV1j=peg@_t8f)QiT#3)7u6CsdjA`oH%i9`aCD=LbD1`m)+?#lu~ZLnOW^r9`@
z?QYvWIy>uo1G7hGW_N06O3MDpX5RbX|Nj4d?|=XQznNu%gm4cLdk<k1pe6u!c8@1K
zobYfb+kwQ9?qm*?z)5&mvL&62k??RQbEpJP!o!j+>12$AhdY@=C2+J7&RxcEH}I&s
z?r+noGJES`GRq&{yB2T@7sRfUZWN5NVCOa`95*>tpiO2C-dmEPDBC8$KC%c6%V5uT
zCkl@?DJm5QG+G94&QFIeg~;kHB3spS#}OB{?ssBnKO-KSVZ)Ynb*kn~e!>E+j!~4A
z_q&4lhT{%=^OqBO`9!In0Y^3<*6-o5$*@`dX!&|F;8C|=YP#MP!1jX;2n2#y|64t>
z2PYvbJ4s<xVRlBQ9>Yf`hZ!<0)qtyA95$SAV(pQ7c$gq27R2_L*`mStX%+;IEeBuw
z54eMiWz5U7Ht%x4=jVmN^Orq1S=@|*nKrN*WzSJzDudV}P!0I=eRc4*@M!e$So!Bo
zj2vr5xBGPRD<<5jPg|k)mLYIzr69wf+lb(evx@TKz=bj&j+|>0yTWtRP6w=M8jKoe
zj^aml28}SGSC&4KCEHd7xUkHF-50`(*m2&C;u}8XKTCF0hBA8_kTcQ*ZvRIJa$Z3q
z805k2eP2d8%%UHR*Z*1{X54PoI9fnsdIAY0nv`0TPS0Z6bZcw2Y(Fkwo-AVdp6K|a
zpR$+ju0@{*4R~mXF-kGRFv8IaUfYjA$<I+^eEBi(#otBoB0GBv8*#PL7s(2>X-qef
z6GoF#YZ^B-1u0hPMzofr{kVXCIO{@5jdT&`E4|oJ<i@mTY*ATpXs!v}d$PovAIjMS
zcVHpV(kvNk_VU=W$06a13>wokwrNtjk0d9NQq!~;Gbu&v#(l;F>>`U;eekBDl2s&@
z^`yXy1`SCpCO>IK;LIBEb;Yvtg6;|gjxU#teZS8MS5rX3k7Ur;rZFxgr`rQ`!!>Ov
zt}y{qunivNMbtHNSbMY{^hjB3TA^GeYaIw2{xou(lD3e@8cIX_@|qUmk`ZFWXnaLt
zJhP7;gGrL2rK*2U{BjkkP7yFIL-aVuqpwdnQAvQ$n3am$JTtgMOAz!rV@?ZlK5+XM
zgk)%~r8QR#l~(ycV|^+~QjwlkGndLRN`IzR5x_+xPSsGBU5~!xM~N@l4ygQpj_vm(
z{Jai@|9aGz3CWmEECy$_&9mZU#nbO+gK+3>6@O7!>FFV|BKdt81h2YzMv^mma#3j1
zs*@LOu;hCCe@PKAL#`|@?<NU`)}<JvC%2!X7yH6h>_AGk4c?1q(RBQe7&C4S83*RV
znDZ#8pME5vbD~t5xs{YG%I}8qCLLTPa}P)jXKW?;NWNkW_cCiScVKFytZaMUkTmo)
zYH|6CVpRWr9hUr8z#3!UXBn*y)~8+z>6<^r4y{VBWv3f3W2go5kKVvLhpIz5)HW0W
zQw5)l>V_^!$^|{cq{YG!c2xdU3g1mHDz;rkpv3^ow3lMqH|I@<rb~KAhUS15hO4_N
zEtuLBN2)#e_F@C}mN#PC6?aIFnnp~(T@0)MT1nBe(dp1T{iyt<Oc3FkIb8qtGLlCZ
zK$p==cACbThLlOqNygq9*9EC2<;|rN@&}|~NM=%$XFnjG_NvVAR7Xs}RDd4q9J@3l
z=BAr4E8B`|n=gX*hii51fhsgzZG`pd*XeW#Ss$MbMrV-l&17@m9-k)RiwvWV#d{O&
zSXb=Cnc8qxzv}X1#aZRckvLy`#sy5@$X1Sx{(?a7%d5s^z+L1({mB|pm+++b?9vS-
zF!alTanK`CV}{=SVH`F-iWk|TvDrUEx*1ev&gfL=4Gca$5p9o-eRjHzBr$bgMB)Ob
z3MX_o;rV{yOZ%(Dv!m<=lx{4c!xD0n_^LZtEhHvJcPooBEDP)OHzcx=3|ed!Oz9fQ
z652g%I?T?sVe!dY)On=9n#oJWhvaChAyt5>q7`E@VAQg(=rveMVz>H_3N&92zcRKq
zR`$&$Fh&xudCv$#rje7O>yg!3Owu1pVzhw7Y9zfs$&O2|7OXCkzB-C>TgWCKs)}FQ
zR0F1EYW}b^EPB|EG>%94)+?ed*{9#>L;1E+m?zF83G9BMT*(T`Fz1n2r7=q>x3>us
zA56x(hpWNGxf9Sb74Hh8c(s&S2RtMjYDxT7Y$`#`-U>O9C>~1|J$Pv@`F_WPNis!^
z#p|p)>cE=A_4sa1PyFrn;aO7S)zFs{x?}DD`41CxewzTRF?gqB{A6>to_1m8a0>>I
zQb)6~8nTm1(6w0)z(l^7%F$g5SX^uc$-afP>Rw{RIgg|p(ak7d)9-q~B8WTnRGqZ$
zl);YHlK|Y&9%yg-2@kjT4tKQvgoiuY1MO`;;o<h);f~gy@Nh?apuO!UJlx(p+|l|I
j9`0xlw730x&cpu!>Wp>Ump=@K00000NkvXXu0mjfLomOX

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon20~iPad.png
deleted file mode 100644
index 320916c834137f9f00dcd23e016cfd079cb9b335..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 667
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOS+@4BLl<6e(pbstU$g+YJ_K+
zuP=iZkj=rs*q+J20%S1)u@n$9Ffc7(f{TbOU`DV(k`qNQ9S17m^K@|xu@HPZ#XDO#
zP^4jh<q}V0#k0=0wWj=N5R>P=*yZ6UF6eU0*RgAzOF3)d!)t5zJ06_6LxAOItHKMX
zmM9L7O%t|cWMwZh^VPX_<cO#7$&@*FGTT#vH<nyCzGGZ`{_*VU^R~v5Qn{@)KJjg0
z$r5L}`u5s|tkM)Og`10YV;$~pIFb75jC$$AFTYaM)Lt#%?Wl~d)iwLEW5c=M&-Z7V
z&1I9E&t+`2taHXX=biuGsju$}E$S}4q&YVuL-z4SiIC5FA0D1Iop)}Ugsr&1wi9tv
zC#TCs+<w5cfBGyN&uNu&w2GD13BLVaaB5F?=*i19)$S_l&q^+Nn|g&#Zpsqk(TthH
zqquuYpYHyXA(lojL_4{?Ca=^kixv9p@%wzj)Xhm#J1zMSJKG6v4l&qKXzTUHp?^lc
z*7i30Dj%b$;2Zo^zJGefo^ImZY_D>1pOUV;YkYIfdf~;VgtYgGZS=i#>~8FvCkqu$
zUX{|Uj?t3Vu{*KojpU&dwN9O1l-ZS!xHHv6#EB<Y960^-`u&QDYs(a4A3R*pKKr=x
z9V@A0pWkqA-P5=3NZ>D}FTL@?p5ksMe#if~m`*j_f3#@p!M8V=zNN)Xw5sP5y&dfN
z-)VlNAfwlMuQ#t0iWHux)x??3IQcKpDs)Mn)spJx-wkVZbdq*8<Xy9uyLC6+O813B
t&e|N4Z`&H8_nu$-FwF7)<J+wV_S+=votB#&b{>>MJYD@<);T3K0RVyy6Ab_W

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@1x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@1x~iPad.png
deleted file mode 100644
index 504cff69fe40a6dba098f726b87db33053b227fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 927
zcmV;Q17Q4#P)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000T
zpaTE|000010000T00000{j)S{0009LNkl<ZNDb{(OGs2v82;|ObY9N*7$1zFgQXGq
zSePl8OxQyS3*EGcqT0F$X;H0e(ZWpyMzo3`GAt}8ELtdP44BsRMxuO+GlSFUb)MIG
z-09vcbM-hQ5{$0qhkNgTzVAQ(ckch6!=a*_VV6y^%X)%bN_0o7o+|H-mRFX{?0z4M
zxyfK$O07-;W069{6N)a-VXVxAVCnaWfxJ^utwL>;6VRIooFBX!^&lLI!v2AQZJrc9
z-)<n{6K<sIuN|0@hQS0_*trD!v*Zk;+&GS4PZJOh5J^0K7S9K0^bXTFd@_UJN)ISu
zDorD>IMKeJ9{jK|=o)sx+@ceM&COaUMmi96&m%H=Tf}*%r+*pVKm>k<#o#ZWP!S%N
z$|y9o>UoziLNvgYr)$V11US864AFj+>`O;Zo*dQs7hoM<1THdq2jIkcn{fm&VD$<<
z{~G$@#h!yIDAFXTGi#BVBNe%rLx?^eqrr>C?8!$Ol}FWRZjpnv+=#)5h8cthuL<Kv
zZ<fHa>vsl!e>{6nqp3}gh7($G&PIpYc*|Jr41A%;Mjj?z8VY4@L>zwzoRUzWifiz7
zn(S{ZsG?X28SzUo1|W8C-+~u6#}-9aA*EnFVuaSsfO-1>5$}q~Da-4SWvapbktKYd
zCxt7F>1bHh;LKhfG+bXd8?lxvRoN&|%f*<E%52Dbr!f0;4%*{qMVyi=pli7(jISOu
zKtio2ra1pXeI_nj9Juv~J6;Kl5an0ZS(___@#5_qOMiDEVDrKKw+xEH5`oj2TOrl2
zoxRdr1=_0CkIAWWEgnwNT$@<j{pP}iI}|5Ni1O^YG93=(snA(tfUA2#oUrh68tTSN
zkYyU6F}I00@3c2$BO_f34ZmaetI+*>tqs9Q6dl|jZ#H5h#mFgcb-M9o*j~-XAmN)+
zpO4%+Iiy+n1kMk7tSeaMMDEQk!@5ZJxc_t!8jWgkPC`+U{ZGfqL}0P|<7O48WT?$k
zig;2*#jM*naXsB8J}GocG%01=DoLumTU910_&=xf4@HZ`yyyS`002ovPDHLkV1i~q
Bl0pCg

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPad.png
deleted file mode 100644
index ab7da101b5ab8605054069df4c9dc06f4908a331..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2021
zcmV<B2O9W^P)<h;3K|Lk000e1NJLTq0024w0024&1^@s6;k!yG00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000w
zpaTE|000010000w00000fMbcy000MANkl<ZXa((AX-rgC6#iy~0cHk-Q3z^9YY^*#
zf)+(uaG`ENt)@068Y}Tvt!-Mx*0i;M)Y#S5CN`#ZiCU{ojhebIxFGITF<L|skwrw9
zahQb}X5PHs_h5#3Gw;0_5(!f0B$IdVIp>~xzx$nc?tLJkiQpv==}Ul-g%|?*e`7kt
zXo%5nx&xuq?WV*DE<41i;MR0gLx|CCN}S-bLyQV;O*b{XG>pn$WP;c)<&JzUO8^P^
z@yQDb)M|6VNdY&CEGRr=<XbndZpOSGNPRtm*VbX6R*MU#{%+z8=Bpf*9)Z3Cl)mbK
z{XK=xV6)R$JUtfIFIw<S?+iF5u9pJCNAZJX26qVPkEa{4<jq*vnq9bk-6}e{CR&EK
zW@$kcuZ1lAeL$%Z^>-VqpE_{#k_k-O=8je)ccvD5HaEJ>g3l?lqahKgI3gx)%;E|w
zwq7(~_cbGOXK0~N3cL($!zSfLLvFlHfUW^`ehoL6NN?*wJt&HX%SB@gX{QWVA!%T^
z$Os^Ls0#g)!$f_80_t=D-<)V*1N~A&77{K&<^*Ae`t}dQkTeyXCzpYCQK0_W2wGnz
zx)8>A<zFjG%9}lYcOThs?xqC{TT&_i#>(Xqk~z_yF+z=?fbP2b3=bPy*cc`og`dwf
z5};~md-!L*ge-_znCtFdxE`Hl$Iz66fL<=N23F4$pKXT?em*;o8K91pA$?q=pN&zB
z$x$PQ*aJyGpn5BXP3QHTIQwok;lAF^rZC4qIwLb85g$*%S@;>p<f=FhSNS21&bxD<
z$cTD_!&}9+^-WIfJ!3@9R4pPRxq#GK8M1QKeq;C)0fBBH?3wK(cfG_#D#g0v4H%rN
zLO-wfCp<!m@zXV+E`JZYsmg0aYtwnE0H9hk!`rAgQP_7@_!v1@Y=n_yQqDB)>oO@X
zaIJ99BMS6RogMp2Om1J!^G0<u4&O0j%G+Ac`;$Fcg9ukGs7v2*eBB+|@Bq}+4eqYz
zx#NfdwifPYdW@vuaMC2L^++2_vL&(gxayM>hN0y63RXmct~>selzHK+$@;<uXmoO<
zWky05ufXW6D3Y?Df_AhQ6yJqV7uEsh#~yX*BRh&p%$~kb<0>gsw;tHo_upLygnaq*
zf<RB-v!JBL#y7^Jt2a6E+XVy0llN!(+!&zd9H`R09y?!yZZX4o=5yA>>>+c61S^bh
zVv-Vb7sVo>k0RJ%te-^ae=j$xZKyQ{zL6+Nd7qfvS`q1*i=d4UgIItB(v&$c+a$PN
zCd@uxpkc47pp6vdhi?e0^FJTjT+MPCdIhQZ0VG`BKB>bQ4a%MnU<6~9Kt)SHk)zQ>
z=IMw~l8*ViV+#UpXm(=$i5j<`;B#e~4zqfxV68GEOi4k%YrUYa+Ym7_8>$g+KtnD(
z+pic<N{U`Ek`${%Zc1P5t1w|^QgFwLJ8nB2ZcW>h36v2pUeyw#6j+%ShpOG>sQ9%M
z%6@~P8kXr3iQAQik<^>IfK@VgofQ*xTnCX}!6Y4upI9;bNHwlK6|Wz@VFZCPjvKP#
z$@d-q)r+xzJ*F2VwH7=f%v-B1s5@E>?ev9^D1`5w>Irio)sVu~CaJx{G4-{;>|_s&
z!l+kNSbDAw%sIZas16-TVo{*!x^TQVi2oj$nGk__12w4JRz~i#ty5P2`2e&`3w6#c
zHxABI9-DxutUQj6>3ozE2bEHIDNMopWI`M^-7(;1Lo1WTkFD5QCVa{8okTc#o9Eh$
zp3o?{S1&1H`6t4*{$f3hx7+WhPOB4Df0RR=Jqz*}|CH3`EdpfzWkDAuL;jd{mVFmF
ze^d-2RZ@I$=_$vw;zB*l<T4SA1O(bsCBv#w+(qZ7L}P?jiOL=K{N|`HtR-n|hi2MB
zjx9WS1j19&IXdsog3&QZjP^epd#dHg9~*-&FV~~d#y#$8Ee@={$_4Ko)4LrIDC7LW
z&>l#RX?^dsVKS^HEY}{WguN||yaO_6T(PB$6s55U8!&`5NeGMDynJsrzqW!T%`%dn
zzVcyq9Lh~C*yxox-abFv)T6w~|6{=0hiL}|R6)GfkBeu=enr^TTAZlaU+Ejm(>L9H
zhQ{+x5Itit`RbP;Dsvj-x<rp%sF6J|5*hv4D}8Ej6)99vY~i8W>VWT9JLSU1=j(jc
ze*K_;GNUH<iA2H3I4mLTR&KusSBv;%qH^bbNMm|KJ@Fm(=Qp!}VmUcN<m8){sRIQQ
z<M7u56ADR17n1|zTs>AL?jv{w6bkG#IoN_DWcSv`k%FZbsM_9szU^;MHo!{0W(sn3
z81#ENDoN@Fl0oFvy7le=kOIvs9R|u9<vA;v?_US`yU_-6oU9^6C|KD%K9L-UT3+`T
z5~zEn1Z#&b1q_+8?!>4Y=<|FAU5uXRq+Jm!1hgx5y))+wG1{5C+ZC}xjCRGYcjlZS
zMmuwNyCQao(XQC_&YUyEXlL$jSHuo6+7-LrnREUJ_Nh@QW?MpK00000NkvXXu0mjf
DDj%Wd

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x~iPhone.png
deleted file mode 100644
index ab7da101b5ab8605054069df4c9dc06f4908a331..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2021
zcmV<B2O9W^P)<h;3K|Lk000e1NJLTq0024w0024&1^@s6;k!yG00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000w
zpaTE|000010000w00000fMbcy000MANkl<ZXa((AX-rgC6#iy~0cHk-Q3z^9YY^*#
zf)+(uaG`ENt)@068Y}Tvt!-Mx*0i;M)Y#S5CN`#ZiCU{ojhebIxFGITF<L|skwrw9
zahQb}X5PHs_h5#3Gw;0_5(!f0B$IdVIp>~xzx$nc?tLJkiQpv==}Ul-g%|?*e`7kt
zXo%5nx&xuq?WV*DE<41i;MR0gLx|CCN}S-bLyQV;O*b{XG>pn$WP;c)<&JzUO8^P^
z@yQDb)M|6VNdY&CEGRr=<XbndZpOSGNPRtm*VbX6R*MU#{%+z8=Bpf*9)Z3Cl)mbK
z{XK=xV6)R$JUtfIFIw<S?+iF5u9pJCNAZJX26qVPkEa{4<jq*vnq9bk-6}e{CR&EK
zW@$kcuZ1lAeL$%Z^>-VqpE_{#k_k-O=8je)ccvD5HaEJ>g3l?lqahKgI3gx)%;E|w
zwq7(~_cbGOXK0~N3cL($!zSfLLvFlHfUW^`ehoL6NN?*wJt&HX%SB@gX{QWVA!%T^
z$Os^Ls0#g)!$f_80_t=D-<)V*1N~A&77{K&<^*Ae`t}dQkTeyXCzpYCQK0_W2wGnz
zx)8>A<zFjG%9}lYcOThs?xqC{TT&_i#>(Xqk~z_yF+z=?fbP2b3=bPy*cc`og`dwf
z5};~md-!L*ge-_znCtFdxE`Hl$Iz66fL<=N23F4$pKXT?em*;o8K91pA$?q=pN&zB
z$x$PQ*aJyGpn5BXP3QHTIQwok;lAF^rZC4qIwLb85g$*%S@;>p<f=FhSNS21&bxD<
z$cTD_!&}9+^-WIfJ!3@9R4pPRxq#GK8M1QKeq;C)0fBBH?3wK(cfG_#D#g0v4H%rN
zLO-wfCp<!m@zXV+E`JZYsmg0aYtwnE0H9hk!`rAgQP_7@_!v1@Y=n_yQqDB)>oO@X
zaIJ99BMS6RogMp2Om1J!^G0<u4&O0j%G+Ac`;$Fcg9ukGs7v2*eBB+|@Bq}+4eqYz
zx#NfdwifPYdW@vuaMC2L^++2_vL&(gxayM>hN0y63RXmct~>selzHK+$@;<uXmoO<
zWky05ufXW6D3Y?Df_AhQ6yJqV7uEsh#~yX*BRh&p%$~kb<0>gsw;tHo_upLygnaq*
zf<RB-v!JBL#y7^Jt2a6E+XVy0llN!(+!&zd9H`R09y?!yZZX4o=5yA>>>+c61S^bh
zVv-Vb7sVo>k0RJ%te-^ae=j$xZKyQ{zL6+Nd7qfvS`q1*i=d4UgIItB(v&$c+a$PN
zCd@uxpkc47pp6vdhi?e0^FJTjT+MPCdIhQZ0VG`BKB>bQ4a%MnU<6~9Kt)SHk)zQ>
z=IMw~l8*ViV+#UpXm(=$i5j<`;B#e~4zqfxV68GEOi4k%YrUYa+Ym7_8>$g+KtnD(
z+pic<N{U`Ek`${%Zc1P5t1w|^QgFwLJ8nB2ZcW>h36v2pUeyw#6j+%ShpOG>sQ9%M
z%6@~P8kXr3iQAQik<^>IfK@VgofQ*xTnCX}!6Y4upI9;bNHwlK6|Wz@VFZCPjvKP#
z$@d-q)r+xzJ*F2VwH7=f%v-B1s5@E>?ev9^D1`5w>Irio)sVu~CaJx{G4-{;>|_s&
z!l+kNSbDAw%sIZas16-TVo{*!x^TQVi2oj$nGk__12w4JRz~i#ty5P2`2e&`3w6#c
zHxABI9-DxutUQj6>3ozE2bEHIDNMopWI`M^-7(;1Lo1WTkFD5QCVa{8okTc#o9Eh$
zp3o?{S1&1H`6t4*{$f3hx7+WhPOB4Df0RR=Jqz*}|CH3`EdpfzWkDAuL;jd{mVFmF
ze^d-2RZ@I$=_$vw;zB*l<T4SA1O(bsCBv#w+(qZ7L}P?jiOL=K{N|`HtR-n|hi2MB
zjx9WS1j19&IXdsog3&QZjP^epd#dHg9~*-&FV~~d#y#$8Ee@={$_4Ko)4LrIDC7LW
z&>l#RX?^dsVKS^HEY}{WguN||yaO_6T(PB$6s55U8!&`5NeGMDynJsrzqW!T%`%dn
zzVcyq9Lh~C*yxox-abFv)T6w~|6{=0hiL}|R6)GfkBeu=enr^TTAZlaU+Ejm(>L9H
zhQ{+x5Itit`RbP;Dsvj-x<rp%sF6J|5*hv4D}8Ej6)99vY~i8W>VWT9JLSU1=j(jc
ze*K_;GNUH<iA2H3I4mLTR&KusSBv;%qH^bbNMm|KJ@Fm(=Qp!}VmUcN<m8){sRIQQ
z<M7u56ADR17n1|zTs>AL?jv{w6bkG#IoN_DWcSv`k%FZbsM_9szU^;MHo!{0W(sn3
z81#ENDoN@Fl0oFvy7le=kOIvs9R|u9<vA;v?_US`yU_-6oU9^6C|KD%K9L-UT3+`T
z5~zEn1Z#&b1q_+8?!>4Y=<|FAU5uXRq+Jm!1hgx5y))+wG1{5C+ZC}xjCRGYcjlZS
zMmuwNyCQao(XQC_&YUyEXlL$jSHuo6+7-LrnREUJ_Nh@QW?MpK00000NkvXXu0mjf
DDj%Wd

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@3x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon29@3x~iPhone.png
deleted file mode 100644
index 5018f00cce7ff541b41b84edc5088e46ee32f276..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3078
zcmcIm`9BkmA0Enz<fukwM7eS$3Cn$7o7?1=$bHTbh9aMZMTAtSgd)PnS;LIv44I?a
z9L=2^n_HXl_4(!V{Rh6^AD;K~yr1{$_5Aey;YqcIoA7W6a{&MV9y3!z+apH&gA<%b
zGpvUkbVSE|^<a7cKureszQ^&SUESNs%m)SoTt3n#0Bp(rfMZ9B?Fhn0007tv+5dGA
zg&hCY{~QzY1{DDS?ie#eJ^N_3RhL+l{n+`#;H&|ky8OvYd;%#w7UB{{eFiznw=Qf9
zu|0edU{XI@2Dve7Dpv?!O{4g)mc8L<d=$w5$X|7qZ7tUo&rC=$P3Jetp_}$_>%Yuj
z@lhk25NV3dW_M_7Q_a24@2vbeAjf|FGf0cujcSc;rN!ZukC|RDI>8~UZ!KB&Dd7^L
z@S-VN63>2~?}UODB1<llEpcc#{C{V>km6(B<7(<Y(?;4*Jk=?E1z|PV)<f$0>+5c%
z^sat|U`U48ZIibhr0EW#&WgFIxh6KP|7?G2udtQmgj&hm%f0vDwUB#4uC&e)Ss$lh
z12AXfS^zdXh%wJ`Tm~7^k;*05<kma>5%rEos!ngDnCB!u9fC}&FMa)Gx?}CdYM#_1
zdtv3_lqEH%1f(E!m9xJ?!Xe@(!ZC7or21sWT*oZDKR=-T)BK$k3h6EQA#m=TP#7yN
z82N>fbSFDoP&4{gtk%R-!c}E(W}3X)6CRG6v&_AiXkP6nr#>erYoiAh<{HGwjio#<
zrvN?!4GDr*&z~fhMXnU~#)pKe2tzUJ-!BGpX#^!8@e56sY59Ka(DLaUjVBLgUHJSM
zu1fs?mYa!)-^WpKNML02x?_yV@O2PO_4fXyTASokxCvf(#PlWxgEd2HQBF^Z{s3Gz
ztSC9p<AiQ@v)Ns{C&E^pEYT!36`v7+O&MNBF=~qCF|imL3YbS}>C@l1AMm99TB8kd
z<Pt1Ijo_Kzm)Efq({eZHhggfR!H)|HSEFn|EBJROMpu%ne-r3@_a^!GtPZr|suw+(
zL<$vc0<1(*nvj!_iO?9m7>|aYf*E-)UW>6JsIIg>`f%SyE)PoJXfr1+eUet4#EA!4
zOVliucuaW?bMH|V+{E6jDa2kCq84F1)e7Fx^vJ$7Bb8RI=$XCqA8HF*{!aaz`vMmu
znYulS%98j{HTf{OyU6{<OX{Ea0Xpf!?;t)f$jaRD7@-@nZnBqeW&Dm4x-8p9;2RUI
z_Sj@r)>nQ$bh`TmSV_;mz4?h!J1cD|DOc-Z`F&yf@f}H{wFkpKTSIbhrF<1*=srft
zo=0&OU6xm-DNFTgQ6rur2a)osTqy7pT|v9o?%nO?((th+W<#0#H`VQ1yCk@`%SUf-
z6cI7ff^Io!=i`?l_E@N?R|`Fetu6mi4Y8tcymqX&n;Cpilla)vRQVPeqBlbTzA|pB
zJOI(vPot(dtPJ%HC!1s0qtkbsD>oJr@2LN}($3w_4UuI9r>%@&svo-IZbl~}nT9hc
zCVjXaWRz~^Wx)KB23F`%x+a0Du{CRE?7nkj!U+~^v;=3w$5pW$NWIbL1XO7swr)K6
z`!1)T!GN*$&{@~VuG%7ba6x=%93?SaLF;u**u5x6C<=$vxo)iy<M!?P2)Sj?F(19C
z;8s!M7M7?Og|YZ9n`i}lx(uY*AuA9&h=^&|+ZnY(EmZMohTeLx9@rqbcRxVt!@zup
zTrv}`nJTquXB`tllQc@_@lLwAx98tjBI6G#b#caWhyt}$rx}TA#;2@DcpLt(*iZnk
z>Enx7-=iogvbqx~jn3QvMGP-jnOqKNu37YY>L~;6?}lsNMYD9x>b4RdR|)LN0Ct}C
zjl^#!9jrQ66RX1HB7sO0GMccR6us#u@u8_fkS0P)OFmN<I-8h_n)Ddc!cQ~UN^fGY
z9Adz>Oqp#C^9oKm*7E6!H6Dt(lclJbPH(fO!NsxDYtJD!D$Tum$P1#DidSS~!N2^t
z4K5G+9LkffY~QU~i<X@<|DtOUuH*wEDL0zBIamd{*(ph#eOsKszG|JScM$vA+U9(E
zac}tUDAdMzF-^3xW*&$jUr|xISO$AJj^E|!b7x+56!y3uz{wFL8I`s8HtA<d6wxxI
z8COtO(t`_JS`{`Y8LmB(zj)ogF+l}DKx4;JN`2=OIXfb!Qu}Kh&EK*Al8?1e$|(xP
zPlK>dt@x{Ika-8VeV`@pZJ4@*91rinz;S62_xg|PlhaQj;@<%2t9k6sHg}+F%~E)+
zU985Ro)RuHRx47SHGC556}S#DZCF0EFu;-7$FrI{GIEW-Rl93y#=TnUv<ek{bgDd)
zu<s3aq*WkH;h>5`b=cfSg0F8z!sJ;Z--y_=>cxy&sv<?8<prT^JnVE8MbUM_g*S<G
zj9ICJv$u*4mBVw(<|g*C3c{X$Tq<wn(ACd8f%Qi`s|l(-H<06_9r^yGdjp1^ti<^$
zk$x?&7vcf$wA;r7=A5N~-3#0c{l2%}<wW|TGAiRY-|IKVP~x6-A&dEWt}J9c@E$}v
zup;LOU89L6K@OcM#*ORiS%r&-Gk#|%ii_)CMVkMzfQB<p_{}@2;NP?8Ij(2t{l>S%
z3JTKwJ1kKSQAJC-2GJp*2&I6Z>J<~?2yNY%>g#8m1eGI9e8DxC+=Jldo#h~zKDF1i
zok=?JV+hTF-97qTH_RhHn=rKF^^}xeLI^_+foEaQvLEBzN!LH2LpEj2gMpl%-m<n)
zV-f96>Y~r<K;22UjD9<xj)<|*j~HHC-M+d2+*d9*h`dL?Pi;NydChIp&QOvbw;@^n
z*}7mTh}Zm@MFPDS5+q(d?0?TM1n>GF(wZ_D%FvYXlFoJ`%;%s3T`+3u)|~<ddHg%$
zYY)dDA!>HI7_Zkm7yb;jxXwMZqci-0r&SG0pBJ20UP|JhoZIjs=DPsw${9m};VSfO
zSq=IKLQ%E)#UuaxSue2jBUgL&v%qqvtOn|xl7)rt-=afz$8+Q@6)X#kVL~q--SGV}
zT{IEMG7$vc+9GO9{Q9(WnKjnP_W)|}dP<0RCdgP5s(@&S8rhGd|CCz(S!HY$xc~jP
z=3^RdT`m#F;aGxd>hjMQjd_2Gmy^qW-D`426SdET8L9l1;ryK4-NRO3W<MdMB8!fp
ze)XO6$nmCX#El&TgU&fq{n5qiuT<ZI5SsO+sx5Yv$1XE*%;E?Qx7m7F23<C=Gs-j6
zMa`;y=0S~*y&Y!H1u7(&g^@TUTLB$s1kz7#OT((3Ol;!8NqP_4ugVnv)CF?p<`Es*
ze_9+D<{73>#Y8LOJ(?I$6qPI0f5HpZl$%DM3RE@HafXsx8r7d+D&MTO4cv1kU5JBf
zEvL|?1Fn!jW&WLh&9Oz0aAR8soENL!L&&0g?zDNEi|qODmk&h6216@sM>SAkfY~ie
zGeZ4+!(a10Z)du5v<&+Q-xmur4=66qw9kVolwDiivFkC)TYZH+^DkD7%m=!>-pr;h
z&GF|P9}VIWc+;H;GN(c!w&vQr-Tt;U`<hnVwUn4L%$n{GN`vHzhAcALS!xS1CgZBf
zTW7X+ZUT3H%OiPku8nb=4$XZ;H7Qpe)L0}|%=D|#wxjugUsx@U$U9y;hIvr_8$IbU
zSwsc3aj}+x(gMev9dx^np0cW`BlBCh%cE=Ui^D`Utf-VPMl?+$ehL&I)=$fWq@#vP
zVfhHb%iBq*<5tNT_+ILUc)-BuF9j2xK+|4_d@6C$aeRtfFuqntRtLiSL~Z8D845Aj
zx=t$}hge+03zL^p-5H@;c=7vC*;sN!f%a|TXaU~HWrmw}7X`7Op|WxKU_xEw#IpIy
s_@}oAI~*41<5e}6{tpfG-&%XfmMK!o54m@)<DW8aW&}5^(!X{8KMn@fSO5S3

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPad.png
deleted file mode 100644
index 28aabff4a999f46dcb4c52d42721d09a939b33ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2895
zcmb_eX*|@87XBM!EMv&NWXm!n<jsV_Sh5Yq3@MD|#bnFAE3%HYtf4a2lu`)U3faas
z_Uz&vdn5|kGPwG1@BMy%_rr6Z=bZC=KIcim8tcKB_?Z9zfT8rYP0twn2Mmz2n#{Ic
zc1B=lO|&KeRHi_w_H<{xvZDpc35^D%&ol!-6Xyzm&lJrW_|E_UpaRf;CfEYn|LQ+W
zb}7#Q0AOlEX=|DV(`;BVx^qtOo$P&L4UPKiX)obC`{E=GhqwF+OJSLmEAg$t%f#mb
z64=+-25W@`tl2dCEm0Hw8%#`Sl+J~j{WUFyc}VmkbkT2PciJtaN#)Ca=hW_fXXikt
zI4RlezqO85nodtCM6c7GG7~yR%|ZejR#K*fp^8BYAS1wZ8gv@Z7`i#lWw10@IOs|T
z7t{>MNQf}<=>Ty7j-nzrtt<ZrOU;$#Q|AuD<eI`736b^C5vM78#9MHHsyDESoJ~Bu
z`CZ>&%;85eck2@#oItk6BdAbj^JQTCc2Ln$FmdQ!@Pse4w41kd(dJ2&_qM6ZNo`k5
zAs^%sA6|Qpm&4#)fWArV_M0*3zQgjH896e5*VvKWXo<W_0n61}$k7S^htmjBMtXUB
z+e>icxHPya0K1znfJ>)NjR}(Uj<PL3^fwSI0xcm<mjesFJ4u3QT*E{E`p^<pO|wvt
zmKif4<kBL{a#c&Gjbxohu@JxVi*9TQd?NOCUcExp7qxvbg7>V)9hX|`l(EtehNR{c
z>-^*YR@}zvAtc66@VO&9#QVptqV?-<EeT&Xly9wcq_UAb;LmitRDE+8#dOcJm8vGU
z^kZ6QROna8de4`|_|}QX2m2R;mN=2f$*5Wu$jH}8`x>|3rHpEv11b5+qRSkhiV<N_
ztXPu0+B%D3+aS<^xmF+{Czyi3aXE3=g82?ucX4^Alj{+K9GIN<#*4N}*KUg6You{k
z9|bjO#yo?PEX{svsQDIKh>np2CBbt?&e<mWH4Q_8($+|KH3~>i9acP0-7$*@kIn2)
z@9RL@@t4OQMsEZ#<b)|uWt_a%j3ozb_B-#)h7UxOKYALG74UXhNH}Im9CiaCfV$8F
zjMpC@R1mC$8bio*Jcr}ZM0c?M3E=MM@-w(naMiyxe4#GqJp>s}-@5W8=g@+Kx$-wF
z(ys&O@Rb+NYx{#HPB^!cm6&!_71=#ZL_xfd=XL!}!jqoY%0a@B)1;5`0ggy%+^XFy
zIeY;IRv}(<Z`Du&#ohK@!K1&+y6Rjl0TWgYEa?YqcdNLSFDL~*8eh95WlIWox^SEh
zP%%36ER>~p`+>H5b9X&>P;mI2v={8?XE&G&F0;AUGq3dS7d>eojI4TKN8XFg$HQ<<
z%(cQR_qAmHkqxo=nZ}E1R*g<OBGc&vPNEJ_g!<{=>LJr_9_ccK_>;=@>0_7-G=LA6
z8mq4pW%zn@OW0a-JI<TPrQFD5cd$<OpwFJ)Sh}y}(%d~5%dH-m=Pog2G0TAz<<3Rn
zjP8ks%_N^&Q{aTn?Lj?fTvxw|39Qfiq9p@uwnWr!Oh^_DYZ$ArtaPfkn&m!{n08L~
znbn=6b|U=><KAr^dM|;RB?$+j>ZbuSNxDG*B2wbjZXi-E^M?4V>PjiVN?&bvf`i(6
z{k|bTwCR(G3)=C@Tgy6oL&k7=s@{b5`yC|xKqFmhp8%Q|)S$sZ;M@*ScyZH56Rnyl
zTNp3D5u}GfpiJ85x#;Fpx`=aYoPi(o`(YkojUm$=QRd2nt=#XqiTsi2y9~9r^{SYX
zqiuvLYV5&08$n)X{<?kf!g-%&lHHbVx`o`pvP&I%4O%L%7mhQ-@FBo^rL5?*gD&dz
zB&PgEW!~tV>sXTjE3VKVXziiP8_TZWM~_#f%xHZzk7l1J&A{s1wJvwoWsUtkxYxtH
z_Pe?%udhoe2q_nVOjol8leD`%M_Y^xz*!%^pf<W>t+dz19*cN+SIovX*jO)|`%Jtu
zQlVCVE@krSN#ed6>{mU~Bza)=O2KoVH}oxbSX#K<(v^g#CiDTNSt2IO&H;(%*zF4M
zZ}N1|ReZP<QD|i#(NK|B|1<MtyZ!rhR1Z6Naks#8))(9m1Es9;6v^d$43+hdu0kyU
zd0$ME?qdea3=!|1eob?QxQE!EyB_cStebDy)cOm*-S~neo@67ZE3}fC(9<2bYEswC
zUla1Cz^AxP5$_}Z@O9<2SE+O<S4JAT%$aU#_iX)DmYvCj%afZjPwFi{aOBI+8w#}s
zE-wDq{yc|>e>X~R;eT+;n29QW-u$?TIVdPJ#<PxfoR1PYeo+Xh83rFUI%_#Qs(($c
zbTD;tc&WGLa^4rhSNZlitbwc+e0ax0cs4;b9wZ+l9<3yV<|;caqar5#@0vXbjf<Fs
zH9rA9Y_OPJSNjgl<0<P>^kW>oUA}wjaGR-8)OFKY{Oi3Mc|IgNBrNRBt6Ejl*<=j)
z#ozflpCY7yl9nnT6fcoeopI?UajWkJOYo&H*zi@);CHe3{UKu(w`_T?SbKc?PAIL%
zT}UY%)Il!AKxwWdVM$jH)RanLJ>I}kw|e0jwZA@Yx`B=OSve$zfpirt)fM+~4vCmM
zb;N}$;<LOyb-+_nfsMz#N|Zaoxesj#iM3$RlJx;zqdk8y3xkPG3XbI^d$0bq&g0mR
zm!zKTd^!$|>58jsc404q!&6*<l3#t1+%iI)r~T^c<j5I>SoXkZ(eCxSm7R?AuwUA;
z)wHoK>E;4E8vdV^rRgEtnE2n%Mh{#y)6W?OZ;VNr+KF&i{B~DUMS7we_O!&LQH{m~
zaT<Lk3-zmly0Yed<r8!LRDXH#ZnKl7jD49*E3fDa9)%uzBUoaY0FtZnde>vpZ|$Ld
zKLOq>(NM;0qNDEc4ep$>^_DE+gK#BAk73PCCG)(My_v#*LW~@{*32D`*XXzjxP)JQ
zSS~Tq|1spM%B7*PZc6!Kb_2GlC?~=>y6M0*S%`nX`Xb+-vs?Yh%94~ngLq+Uc`F0N
zKW{6_XTExx<<-2=S(!bl4kJygASC%Tr0ZAGIPc&>&iAAl)7tXqgN135LA)t<)!%A6
zd(g|I^hcJ5-+pR?_iMXdEq?YOQq@U>wlr(Q;wnnWWF%Y3{ZQ}rBtH^pk&VvsE)vC{
zp^zZCUi=H50i#<JxdoDT>0%e_)E3UUAa`?XUiR~Hi6)0Z{P&%_7_vxHr<JBdPM*^T
z248kB3q@JRvL$}EeoLRtdkMTP#cnf`f`wTMMhqHn9M>3BiXAQF!{cFo^j5<Lik{LX
zU)@`jhK)c$y&dq?xRhvDDt?Gnh;ceVT#Ggrr+VbljC|fJgo(|yrkt)=(|*(6<1&2r
z1ks`sMqxAb@xl{0ZQQ>_#f0umy`VHzzXAUv?OI1FW>$cg_R=r9f=5<j<@^Xkfl+R`
zOK;qUi<xRMEV~UaUmWpa5)VBS!VVSKlNHl_jhK5t^3{<~s&)4Dn~4lB2g!s?i=E>F
zwTbDUy}32PKjNOb_bPe?aqXGu|3J8GA3F5NKf)}W$a6m!I0D&KfA-qBw|-A4On$0$
zuK^ll4iC*}GlH_HPZ8%1IMuv?SX=*g37*Z`hba#(eCQq=OA!~lHXuQ!h1!Xqqbw=U
v%TUom-%e3=pn^UxLz@3<w)=NN+&TrNC*diVzUub>Nwp{)W9@P+yQqHwygM{S

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x~iPhone.png
deleted file mode 100644
index 28aabff4a999f46dcb4c52d42721d09a939b33ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2895
zcmb_eX*|@87XBM!EMv&NWXm!n<jsV_Sh5Yq3@MD|#bnFAE3%HYtf4a2lu`)U3faas
z_Uz&vdn5|kGPwG1@BMy%_rr6Z=bZC=KIcim8tcKB_?Z9zfT8rYP0twn2Mmz2n#{Ic
zc1B=lO|&KeRHi_w_H<{xvZDpc35^D%&ol!-6Xyzm&lJrW_|E_UpaRf;CfEYn|LQ+W
zb}7#Q0AOlEX=|DV(`;BVx^qtOo$P&L4UPKiX)obC`{E=GhqwF+OJSLmEAg$t%f#mb
z64=+-25W@`tl2dCEm0Hw8%#`Sl+J~j{WUFyc}VmkbkT2PciJtaN#)Ca=hW_fXXikt
zI4RlezqO85nodtCM6c7GG7~yR%|ZejR#K*fp^8BYAS1wZ8gv@Z7`i#lWw10@IOs|T
z7t{>MNQf}<=>Ty7j-nzrtt<ZrOU;$#Q|AuD<eI`736b^C5vM78#9MHHsyDESoJ~Bu
z`CZ>&%;85eck2@#oItk6BdAbj^JQTCc2Ln$FmdQ!@Pse4w41kd(dJ2&_qM6ZNo`k5
zAs^%sA6|Qpm&4#)fWArV_M0*3zQgjH896e5*VvKWXo<W_0n61}$k7S^htmjBMtXUB
z+e>icxHPya0K1znfJ>)NjR}(Uj<PL3^fwSI0xcm<mjesFJ4u3QT*E{E`p^<pO|wvt
zmKif4<kBL{a#c&Gjbxohu@JxVi*9TQd?NOCUcExp7qxvbg7>V)9hX|`l(EtehNR{c
z>-^*YR@}zvAtc66@VO&9#QVptqV?-<EeT&Xly9wcq_UAb;LmitRDE+8#dOcJm8vGU
z^kZ6QROna8de4`|_|}QX2m2R;mN=2f$*5Wu$jH}8`x>|3rHpEv11b5+qRSkhiV<N_
ztXPu0+B%D3+aS<^xmF+{Czyi3aXE3=g82?ucX4^Alj{+K9GIN<#*4N}*KUg6You{k
z9|bjO#yo?PEX{svsQDIKh>np2CBbt?&e<mWH4Q_8($+|KH3~>i9acP0-7$*@kIn2)
z@9RL@@t4OQMsEZ#<b)|uWt_a%j3ozb_B-#)h7UxOKYALG74UXhNH}Im9CiaCfV$8F
zjMpC@R1mC$8bio*Jcr}ZM0c?M3E=MM@-w(naMiyxe4#GqJp>s}-@5W8=g@+Kx$-wF
z(ys&O@Rb+NYx{#HPB^!cm6&!_71=#ZL_xfd=XL!}!jqoY%0a@B)1;5`0ggy%+^XFy
zIeY;IRv}(<Z`Du&#ohK@!K1&+y6Rjl0TWgYEa?YqcdNLSFDL~*8eh95WlIWox^SEh
zP%%36ER>~p`+>H5b9X&>P;mI2v={8?XE&G&F0;AUGq3dS7d>eojI4TKN8XFg$HQ<<
z%(cQR_qAmHkqxo=nZ}E1R*g<OBGc&vPNEJ_g!<{=>LJr_9_ccK_>;=@>0_7-G=LA6
z8mq4pW%zn@OW0a-JI<TPrQFD5cd$<OpwFJ)Sh}y}(%d~5%dH-m=Pog2G0TAz<<3Rn
zjP8ks%_N^&Q{aTn?Lj?fTvxw|39Qfiq9p@uwnWr!Oh^_DYZ$ArtaPfkn&m!{n08L~
znbn=6b|U=><KAr^dM|;RB?$+j>ZbuSNxDG*B2wbjZXi-E^M?4V>PjiVN?&bvf`i(6
z{k|bTwCR(G3)=C@Tgy6oL&k7=s@{b5`yC|xKqFmhp8%Q|)S$sZ;M@*ScyZH56Rnyl
zTNp3D5u}GfpiJ85x#;Fpx`=aYoPi(o`(YkojUm$=QRd2nt=#XqiTsi2y9~9r^{SYX
zqiuvLYV5&08$n)X{<?kf!g-%&lHHbVx`o`pvP&I%4O%L%7mhQ-@FBo^rL5?*gD&dz
zB&PgEW!~tV>sXTjE3VKVXziiP8_TZWM~_#f%xHZzk7l1J&A{s1wJvwoWsUtkxYxtH
z_Pe?%udhoe2q_nVOjol8leD`%M_Y^xz*!%^pf<W>t+dz19*cN+SIovX*jO)|`%Jtu
zQlVCVE@krSN#ed6>{mU~Bza)=O2KoVH}oxbSX#K<(v^g#CiDTNSt2IO&H;(%*zF4M
zZ}N1|ReZP<QD|i#(NK|B|1<MtyZ!rhR1Z6Naks#8))(9m1Es9;6v^d$43+hdu0kyU
zd0$ME?qdea3=!|1eob?QxQE!EyB_cStebDy)cOm*-S~neo@67ZE3}fC(9<2bYEswC
zUla1Cz^AxP5$_}Z@O9<2SE+O<S4JAT%$aU#_iX)DmYvCj%afZjPwFi{aOBI+8w#}s
zE-wDq{yc|>e>X~R;eT+;n29QW-u$?TIVdPJ#<PxfoR1PYeo+Xh83rFUI%_#Qs(($c
zbTD;tc&WGLa^4rhSNZlitbwc+e0ax0cs4;b9wZ+l9<3yV<|;caqar5#@0vXbjf<Fs
zH9rA9Y_OPJSNjgl<0<P>^kW>oUA}wjaGR-8)OFKY{Oi3Mc|IgNBrNRBt6Ejl*<=j)
z#ozflpCY7yl9nnT6fcoeopI?UajWkJOYo&H*zi@);CHe3{UKu(w`_T?SbKc?PAIL%
zT}UY%)Il!AKxwWdVM$jH)RanLJ>I}kw|e0jwZA@Yx`B=OSve$zfpirt)fM+~4vCmM
zb;N}$;<LOyb-+_nfsMz#N|Zaoxesj#iM3$RlJx;zqdk8y3xkPG3XbI^d$0bq&g0mR
zm!zKTd^!$|>58jsc404q!&6*<l3#t1+%iI)r~T^c<j5I>SoXkZ(eCxSm7R?AuwUA;
z)wHoK>E;4E8vdV^rRgEtnE2n%Mh{#y)6W?OZ;VNr+KF&i{B~DUMS7we_O!&LQH{m~
zaT<Lk3-zmly0Yed<r8!LRDXH#ZnKl7jD49*E3fDa9)%uzBUoaY0FtZnde>vpZ|$Ld
zKLOq>(NM;0qNDEc4ep$>^_DE+gK#BAk73PCCG)(My_v#*LW~@{*32D`*XXzjxP)JQ
zSS~Tq|1spM%B7*PZc6!Kb_2GlC?~=>y6M0*S%`nX`Xb+-vs?Yh%94~ngLq+Uc`F0N
zKW{6_XTExx<<-2=S(!bl4kJygASC%Tr0ZAGIPc&>&iAAl)7tXqgN135LA)t<)!%A6
zd(g|I^hcJ5-+pR?_iMXdEq?YOQq@U>wlr(Q;wnnWWF%Y3{ZQ}rBtH^pk&VvsE)vC{
zp^zZCUi=H50i#<JxdoDT>0%e_)E3UUAa`?XUiR~Hi6)0Z{P&%_7_vxHr<JBdPM*^T
z248kB3q@JRvL$}EeoLRtdkMTP#cnf`f`wTMMhqHn9M>3BiXAQF!{cFo^j5<Lik{LX
zU)@`jhK)c$y&dq?xRhvDDt?Gnh;ceVT#Ggrr+VbljC|fJgo(|yrkt)=(|*(6<1&2r
z1ks`sMqxAb@xl{0ZQQ>_#f0umy`VHzzXAUv?OI1FW>$cg_R=r9f=5<j<@^Xkfl+R`
zOK;qUi<xRMEV~UaUmWpa5)VBS!VVSKlNHl_jhK5t^3{<~s&)4Dn~4lB2g!s?i=E>F
zwTbDUy}32PKjNOb_bPe?aqXGu|3J8GA3F5NKf)}W$a6m!I0D&KfA-qBw|-A4On$0$
zuK^ll4iC*}GlH_HPZ8%1IMuv?SX=*g37*Z`hba#(eCQq=OA!~lHXuQ!h1!Xqqbw=U
v%TUom-%e3=pn^UxLz@3<w)=NN+&TrNC*diVzUub>Nwp{)W9@P+yQqHwygM{S

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@3x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40@3x~iPhone.png
deleted file mode 100644
index a5939d48495852bd69d3884da487357b4cfddc4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3972
zcmc&%={wZ#+y2NJ8NP}NQOPc%EX9{X7={tqvX-&aAiJ?|iR}9>%QQ4XhO7<3WKVWu
zY=aQSVC?+#d+|Jf!E-z>&igv=>pYJ0x?bJqaYyUws53KiG6Dd=4AxN9JFh-}!9aI@
zK7`2(ofjIrC)!T{peml}_$BT6UCzcBY^$veh@5i<fGWxXpgCt$=iodC09+`z@IM`&
z0_y+ee??Id?_mG{?SWOFJolkmH+OL5?qClrH%HebQCLUksKt11PL2Q5iA2y6^>b<q
zl0=qgH8k{|m$_oYi<ApQim?}q3p65l1;Y7)sp%TA+_!3Dt8D0}xMgs3)~2{e&OaJ9
zo#J=0e^yX3*7H_!*?WsE*~=$3#-=x$;fFpmy_{OX3=EPkG<uM=OjpReU|^gm8wwZ$
z&SZuR{J)Z6v{-@o;2+bM@Be?cv_X}9#MAe2{zbd+JH|DQe84ErmkbWme0aoyx}SCT
zt{9Fhow05v{d2umm8ugc6K}QolZSM)xHjT6ZKbuCVZqrc-rQRB#9!3_P+(&kG16YQ
z7(cdUY6|+O<+#v-Wz;g1GpHLYlUtCYhloRdO+tovG5m+KQPY*n%{t<I4(~aVvErtw
zO|v5JPul!l?#U6O#=Pp<hdw}DZHuu(sXB7*l~*54Hfd^q?Qyj+ZjOUf<_o~Nt<o+k
zgOh8?IoWl0n1;YN508!;PSPFg9&fRmxRdB6Zw-=55V_w6y2}FPJet%w3y}l#rd}BE
z7{hmw>gQ{BW76eYRSX#{z#`cAO~*(irADLH<j0FD+uRl^W8Y>jR@fDI2XAZRw(O8+
zwW8}lz{d3G+YRraA?A@~x{~V5boqkWS1lzEKKz=K5Rbn*HzMo+80Bn41R(uq(Gm@_
z#_ho{^3H8~NM>3EF=nZnNwDO}&!$VL8~tWycG<0#Us#R>YaKSUT&VGHoVaZ6g}EG`
z0>=xv{|tU^_(`31B>-gR$4yAOP??TjiBFg9X%#$6Amn??&@NE<a6+mCIDnXr3)gT3
zKHe_j!Ip%hCSE+W^i5EuX5BaQ=D=}HiW&dGDn#kenX*Ogb{Db@-;t^5nAI(yqaBv{
zhC6FgNLY||)(BMBo;jK*f3kfT=+mgD=(ZGxX+7qTrnRE9UAm?uX+Z7@B5RZKCoYrk
z4w^8vgvCd-ta)xpRF8Qj|0|o<w4=z=1naaukQR4M*rxkD%g7o?y-f*Q-$%c_@2C~e
zBEx&lq&n2`>(xDG`q}RC>4d}%Z&wX1XbAflXmhcJinP%pA*cHL^XA}XfX2SLxZx#h
z_YVuL<TQ|k^VHNW)XlH_-_<QL8-*@+>LkFe2#TTW9`x5j{#?Ii3xpOWeAAx3<BgY~
z&flm62#X5tPf<)#xz!U4u!02$L^h;Qkrc?vgoypn9lDI;iSfUyMIg*vTn5L*O2Hij
zh>43Y%B@OUxwuNIJZSgF>#4>io34m5Q>089oTj3RMOMU{2P=v>>cj+<*g5EaeW>sw
z1zZUdrsR%;Lb96Oj`U33g8!f`4a=u~Ny-K$5^+Mr48X{(63TCsxcINWlJU-3v>Yay
zyVU;d(N=;4knso{O2r^A^dn*ix)LnoT;)A*!g}q)_BR5#F(jwucdnkJ8}vkQ!W6@>
zgv$^uf;8M=7SFw#zcaEEg4jMTF>!ouu=bmd1WE!K<k`%u_(ONGA#j+LfKFBWr~1_k
zx^g{K`pBM#wgnr&ehVUZrT80)?N~kU<!XoixDMqx-W0>Q)UBW(O~7(YvnHZPOBxBS
zfWmGe#Qx*OPHPy4wMay@=55j6w#F_TLU)-;pHh+1;3-_?`#XjTmj-$Le_KmGZSkd_
z(D$WzV}n-kyp6cur{)K9xZA!;8pcCF&m2n{Y*=d%V#_Jw@dop54lY;CSHk~r9}KT6
zk;V48;)jO$RxbpgXQ%g~-bzVZh9bUjn)BZvq9nc5p5#sD-pHpwQ{aZ2O2%pTusB(3
zLb(A+^<3Tp$J)iZ139ln5kY;VcA7R>f6<z-MWsVA8k{@Yu<gJW<MLs*hBO>a?)zyS
z6$HIzrSM>G4qWb${9Kb6+DvZHXn8m&kI?va&kDP#-~35*tB*7CovuN<{#vW7`X$a?
z{#(JKWw4fqWzZ2z69vq7*@1Xswt+WK$;UM0>A;-vxgt7ZIYJuVrxD4NU~;7v+v;mg
zQOEQozRS?-SU_3t+a{4|4wi5h!$H<t!(Z)M3@ZW}3r!v`pc3JECDbzzu6(Xp`<6@@
z2DCU2^hUd^QPATxHG>;5NZYNxGP-BFdh@7VVm5o^C3ZI|?szz8w`}Wn7P7y;O7g(=
zy-N7-!q%|k{*taBr^LPV&KypDoc@6DXgs_$vz^ve;oO%M4f0*JYx7y1+UT|>_tl)*
zdrCpId4$!XUz{(Wx%xRnKWck;zq-x-t@~@`>(}=P7H#zv8Kn{>UKPKXP6$BpWj#JV
zT*qP5%|So5PZ4WE9B$8V1x%Q;BuGDTH1iH*Fv~PFmb+iol_933s5HVNx@-ehkXCfP
z&Rq5O3^Q#XelW!q<`jKO>1F40dLO*R@0alDwbG;s{UnOH!NH5n(f);h;Z~T~&s$r*
zg)VC|IDNi@+zQ=#(AB)PAdv8eq#o3uFO0OKxQ@UW-cN)42(Iqg&kJ+9A^P$2bu0PI
z?f&5_KBuAq+a3PP#Bl7c7jsA-m?tgSNYbT#p>X@eD3r2F9(z_JM<ebf$KM5VA?^~O
zPDdUqmZ;<hri^%uf_j<q{O9D}ls`2@i2^e|g$5zs9IqCm*C{!?>6wfyy*;V9n_J3@
z)KM=#ssti?d^;XhnkOKKW6OJ!vgkIP;L#5Ln`LGit;ij4QZ|R5Rg-BR6lzr48o(<p
z;82WvT@UcARkm#||M0ekc_U^{YlK*;Bh!~A(FTJv<MbF)ou1qYy^A;N$ey1DyM1l0
z8~;o0yJBIUVHd?^D`<Dn>pd}R7gJp__ks>V8l2lE?Jca6Ozs~Y_<nt_FlGiUJmz}W
z`M6MUE4?YE%N7e|T+FHbTtUz2owO67@hfV%0I3;x`F?<*WU-~*om4^c%btE(JFp2}
zJn-a1a#nK;Zo>%jumi`XoX+jhgJhnVeq%WfFKxEARMF*k2&$**Y~GJ9nGEW`wsDc%
z2fcfPsWqbNFyiyA+2s7f+fefpd~`y?(cu*KmA2S^h0|-g%8nqG-UW@2sdRHzPW||p
z9tn4B)^#a6*BTo@hL_8i_T#*ng!99WJ-v_@Q(vh%sVed^XpOFt&PZ#cD?Azbf@ed8
zySkS>5dZiltv{Ne>TCC|zk7BYCnj#NW)y2NIczd3^ny*F$D9=Q@O4I3_I`Kx$$Vbm
zW_RK`U?<j(cdcK3%(uf9Drl0#inYJe|4P0~g58XmK+&i|_%O2Cep)I?ey2Fv<j!~u
zn^AT{Td<5m){lz$I~emYb;1;0^S2fFFM9dgv>PkG$cyX?22%Qad8t7stctegd#nm%
z6vYld7cf|HneOYLOFG4R@}{OIOaDLw!rfTqVPg^9;eaSoD9nXgcTWvdZ080GE#K)H
z!lcFbMwGY8)IRo1rlpMwM;QxF^teIQTdyBZopmZnpDk)IAyo9*VH#~f(KDY9JlTbc
zC3$JNblwOkVU6xbiwC98u?)_<If?}yniRprjA<!b$*9A*RN?D7t`#P{7R9T6d_PPi
zy%*W>e~l+pZSC*UVgr>)a6IoB-7JP`YRjKhMud$wTjTX7!@N86qC=`lS?SPFxX;D7
zF#`00?#cX^yY$2u-YMuGsB|g*DfVdsrduxQ3jyM8#MAokaTH8K9VLKORI?S*sx|Ud
z_6_*M*6-L=Hb!g3O)PbIZJaQ0Dvie^=ji$+9uJqsRKDyZCKReoDmp~Q6_IcCD*DpF
zdM!Gg(;ig>bN7zk+npE2Yq}ftzQizY%(YtoP@CuN*Ojh*Y039HfH1^t1@Sy>aOU>C
z!U6GnW!~04ei=s5R0hS346qDz8yj@6J$#=8&B-7akFOxjS-@yE-(+rH^H-qqr)kMu
zAHPNw{i)cDa6yhBpLD%Anp^3{L6m#OH5(eJVsj;K3J>(b1iF&tCAg@sHZpWUh{qd#
zzfoz?u|9`C7Xye_CP|wwP~)0BS7535YiPE^IK-FSVzp?-rOG!N;^k_t1D(xWv<FMf
z?32;4Q5p^7khiSOsz$*-Kl&(mKA15(a%4|u*@Yw8iKvCGJ~QehHAml7`<D9Zr}FF*
zI{kd#<bCqShBLexsJY{j1XXu}Ym4v4H$?h*NyBH1P0bbp&>QD(xQ7;6uU-E<l!kSL
zQ~k)p4b-t->f6IO*)tEH70`0Fu%ceMy@GTMywnSVf^7|JBJP*SJErC-c<KS5Wt0Qr
z{)m<)|NFmDlJXj5@E|X%Q&wNT<oS8-3({KE$m8^9q^7kO|Lc?D<A_1r$5?BYutCw0
z=d;1+p)jNlC)WNTIUE^SV=VC4{=a@U51{KNds^?j<_$CzFq|!!-Y_DHS33d8gQ*kY
zBA_E0#twA)Yk>ES6@WmB_6O8&3-3J&osiN`W}NJ|-SP|3NvbWrhiUrHHIup$Jd*rw
zSSqm#EQmt5r5u4b<CI(%_qb!d!atdu<GNCGqXVhir}W^{LsFMExT@ay9aC+p1#YAc
z$Pje~Ho4bAhqQ9p_@fcqm&orDUuY)T;mn<wtU74cC6)v|S(e<s3%OKe3Wvo|2<Q;_
z(k_dyV`lNlXjn$;<b26T^v1K$SNhr!3SXWb6|rdxoCFDN(*)Ms-Zrmwsd;6!>PCYt
zjWj~aK7#P@sWb}ORu;}#b4dWUUARHc3sx%aT{0FxZ(L%bGz~T~GTx;L$hg6$;=~Zl
z%*;FGLv>GHEpn6<;Nn!Q-MV1q6?+MN3y^t$a9*Ir{<(Jjg$m$ozdzo|6g(j*RTBw}
q50a|hUj@Ec!|a)<{_h5Lo&mNRY-jEhSsj1B!r-Smsujvsq5lD-1*Dk(

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon40~iPad.png
deleted file mode 100644
index 43cafa80cbfc37485e1c7d63e7df89a4f380b5c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1340
zcmV-C1;hG@P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000e
zpaTE|000010000e00000SuRAD000E9Nkl<ZSPAV{Z)_7~82{b%f48os8(Wvb*rsd~
zhMO{}(@d0XY+wRWqA`;2#gHhPKr~T4_+@GgM(_iXn5fY&45#7}HHMIhu51#PA#7}b
zL$V31<4?DCUE8hg+B@I(y54%bJ3yNdLi!}lJ<t36p67n|yw7v*mEnot9v1c<<|a_f
z5KMQ6G8N2JFx?8I8=vXH`@VwObf56Q#QS}5@SJ*t$;`rFVkCgu5}b|l7#@m9f>Mpr
zas%`RY0^|b)u%!nP7H=%^6}_AGPTex+OO?)Am1dVB(+3nLOC-UhF-&<=U4z&N8}`z
zlo(K+e*t_n2xe*hg6MhkP=^mE213~TdJ)d_OvCSu%{%9`hilEqFO<_!onrcl^HGOK
z_-)u?1H($I#4rr#dhFM?grC~p4Ua|f`{^LUQ4Zh!=EM5URv9_Hfkne6n{1sfs1j`N
zo5IkI2nNQ&IOPxH5vN&_pn8oNj$k`D_epS`L2!LvNc>6Tt6#iGe$jRH2cfaED0$G3
zbPLz|Mhh%fWh#oR!3c)~$0x)j`#UF4*OUXJDFHVa$rCs05OcjNVq)Fz17V+NQ{{Mn
z2p6w}C2L<3!p+ayz|QT+qC73?)>$N&R6~*AXI)<SrsE=RJQ%~l{z*K&AxBtS+f2v~
zehfa~7BT#c7qRa5L_17|tM#aqFm(=(MR4wV1goFO60l9r*`U#gVKPNVaLgaWcc=X_
z;Gy10II0Y&TxEi@W*qTT`(+re?@RDxyQ#FhCgBUnhk^R&&^Q|`s9J4CMU{~*sS303
zlfU=!3|yB&iUE%<HDTTIEO3{827k3%5yKSL0u?Wy?U)a<%KU^l=L$0_i%Bm^XHS+>
zHrD|y54UlCds8FIw28NDG+Ka2s3O%R>iUQSdUDfo9fv5Z{&#0a!-FF@*%peK5{isq
zX^sw`4v>E0q{->~aK{Q8E`D+rW!sA3ZQTn#HY-WTuo`6T+6Mv^q?NRVlGx1}y!e<E
zTRYtNrm;u~BCg3Epwyznjw-tdNGiLkb747o6W(4AJUvllKeajO60cd0uZPyLOt7~<
zX~*Jh+4Bp&H`eB2Pu~RE{`TX?e*$8>k|HBWK`m<*BQNF1ahSE(U2etb_rpSt(H}-&
ztlb2SHCN2Znk~p_dReqhItDwRnfE6h4>^n|TVlZH=MxkD<{vi@S+HA4EWIicwCP!V
z;LI0sd+G|{J3NBebfW9yGck-F9))$|HW5R~F{W(MrpmJ`EvPOsN!H$J%)`#^>xj>h
z8umxAk5p4l6bVxBcG7P(c}6%3%-BK*dpgG?IXtdw;BsnUD5-?5a2e?KD#_b~5Iq*D
zY$Sw-!cn-~(znEie~!Z)QXYBPYbNz3UDu{z(6Gola1MbXdBa<lTT%Y%BJdINQBk%s
zHB_Rv9Jz_37lLSer5N=;jo?Z^I$RXIm9)^o2Km6;k{}J_B60Z1RI7=V3>0g;#Zf>4
z>8aH5R}kmpQM8aDQ<JkVJ%Ckq={bE{f@;bB&-&%yEa^S<NIQ8@+W)C?R|%%x_)c{x
y-8+rCi?|HIbc>y-V5WlURv_K@Ob_1o75o=Z#fT0_E8!^s0000<MNUMnLSTX{jcf}5

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@2x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@2x~iPhone.png
deleted file mode 100644
index a5939d48495852bd69d3884da487357b4cfddc4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3972
zcmc&%={wZ#+y2NJ8NP}NQOPc%EX9{X7={tqvX-&aAiJ?|iR}9>%QQ4XhO7<3WKVWu
zY=aQSVC?+#d+|Jf!E-z>&igv=>pYJ0x?bJqaYyUws53KiG6Dd=4AxN9JFh-}!9aI@
zK7`2(ofjIrC)!T{peml}_$BT6UCzcBY^$veh@5i<fGWxXpgCt$=iodC09+`z@IM`&
z0_y+ee??Id?_mG{?SWOFJolkmH+OL5?qClrH%HebQCLUksKt11PL2Q5iA2y6^>b<q
zl0=qgH8k{|m$_oYi<ApQim?}q3p65l1;Y7)sp%TA+_!3Dt8D0}xMgs3)~2{e&OaJ9
zo#J=0e^yX3*7H_!*?WsE*~=$3#-=x$;fFpmy_{OX3=EPkG<uM=OjpReU|^gm8wwZ$
z&SZuR{J)Z6v{-@o;2+bM@Be?cv_X}9#MAe2{zbd+JH|DQe84ErmkbWme0aoyx}SCT
zt{9Fhow05v{d2umm8ugc6K}QolZSM)xHjT6ZKbuCVZqrc-rQRB#9!3_P+(&kG16YQ
z7(cdUY6|+O<+#v-Wz;g1GpHLYlUtCYhloRdO+tovG5m+KQPY*n%{t<I4(~aVvErtw
zO|v5JPul!l?#U6O#=Pp<hdw}DZHuu(sXB7*l~*54Hfd^q?Qyj+ZjOUf<_o~Nt<o+k
zgOh8?IoWl0n1;YN508!;PSPFg9&fRmxRdB6Zw-=55V_w6y2}FPJet%w3y}l#rd}BE
z7{hmw>gQ{BW76eYRSX#{z#`cAO~*(irADLH<j0FD+uRl^W8Y>jR@fDI2XAZRw(O8+
zwW8}lz{d3G+YRraA?A@~x{~V5boqkWS1lzEKKz=K5Rbn*HzMo+80Bn41R(uq(Gm@_
z#_ho{^3H8~NM>3EF=nZnNwDO}&!$VL8~tWycG<0#Us#R>YaKSUT&VGHoVaZ6g}EG`
z0>=xv{|tU^_(`31B>-gR$4yAOP??TjiBFg9X%#$6Amn??&@NE<a6+mCIDnXr3)gT3
zKHe_j!Ip%hCSE+W^i5EuX5BaQ=D=}HiW&dGDn#kenX*Ogb{Db@-;t^5nAI(yqaBv{
zhC6FgNLY||)(BMBo;jK*f3kfT=+mgD=(ZGxX+7qTrnRE9UAm?uX+Z7@B5RZKCoYrk
z4w^8vgvCd-ta)xpRF8Qj|0|o<w4=z=1naaukQR4M*rxkD%g7o?y-f*Q-$%c_@2C~e
zBEx&lq&n2`>(xDG`q}RC>4d}%Z&wX1XbAflXmhcJinP%pA*cHL^XA}XfX2SLxZx#h
z_YVuL<TQ|k^VHNW)XlH_-_<QL8-*@+>LkFe2#TTW9`x5j{#?Ii3xpOWeAAx3<BgY~
z&flm62#X5tPf<)#xz!U4u!02$L^h;Qkrc?vgoypn9lDI;iSfUyMIg*vTn5L*O2Hij
zh>43Y%B@OUxwuNIJZSgF>#4>io34m5Q>089oTj3RMOMU{2P=v>>cj+<*g5EaeW>sw
z1zZUdrsR%;Lb96Oj`U33g8!f`4a=u~Ny-K$5^+Mr48X{(63TCsxcINWlJU-3v>Yay
zyVU;d(N=;4knso{O2r^A^dn*ix)LnoT;)A*!g}q)_BR5#F(jwucdnkJ8}vkQ!W6@>
zgv$^uf;8M=7SFw#zcaEEg4jMTF>!ouu=bmd1WE!K<k`%u_(ONGA#j+LfKFBWr~1_k
zx^g{K`pBM#wgnr&ehVUZrT80)?N~kU<!XoixDMqx-W0>Q)UBW(O~7(YvnHZPOBxBS
zfWmGe#Qx*OPHPy4wMay@=55j6w#F_TLU)-;pHh+1;3-_?`#XjTmj-$Le_KmGZSkd_
z(D$WzV}n-kyp6cur{)K9xZA!;8pcCF&m2n{Y*=d%V#_Jw@dop54lY;CSHk~r9}KT6
zk;V48;)jO$RxbpgXQ%g~-bzVZh9bUjn)BZvq9nc5p5#sD-pHpwQ{aZ2O2%pTusB(3
zLb(A+^<3Tp$J)iZ139ln5kY;VcA7R>f6<z-MWsVA8k{@Yu<gJW<MLs*hBO>a?)zyS
z6$HIzrSM>G4qWb${9Kb6+DvZHXn8m&kI?va&kDP#-~35*tB*7CovuN<{#vW7`X$a?
z{#(JKWw4fqWzZ2z69vq7*@1Xswt+WK$;UM0>A;-vxgt7ZIYJuVrxD4NU~;7v+v;mg
zQOEQozRS?-SU_3t+a{4|4wi5h!$H<t!(Z)M3@ZW}3r!v`pc3JECDbzzu6(Xp`<6@@
z2DCU2^hUd^QPATxHG>;5NZYNxGP-BFdh@7VVm5o^C3ZI|?szz8w`}Wn7P7y;O7g(=
zy-N7-!q%|k{*taBr^LPV&KypDoc@6DXgs_$vz^ve;oO%M4f0*JYx7y1+UT|>_tl)*
zdrCpId4$!XUz{(Wx%xRnKWck;zq-x-t@~@`>(}=P7H#zv8Kn{>UKPKXP6$BpWj#JV
zT*qP5%|So5PZ4WE9B$8V1x%Q;BuGDTH1iH*Fv~PFmb+iol_933s5HVNx@-ehkXCfP
z&Rq5O3^Q#XelW!q<`jKO>1F40dLO*R@0alDwbG;s{UnOH!NH5n(f);h;Z~T~&s$r*
zg)VC|IDNi@+zQ=#(AB)PAdv8eq#o3uFO0OKxQ@UW-cN)42(Iqg&kJ+9A^P$2bu0PI
z?f&5_KBuAq+a3PP#Bl7c7jsA-m?tgSNYbT#p>X@eD3r2F9(z_JM<ebf$KM5VA?^~O
zPDdUqmZ;<hri^%uf_j<q{O9D}ls`2@i2^e|g$5zs9IqCm*C{!?>6wfyy*;V9n_J3@
z)KM=#ssti?d^;XhnkOKKW6OJ!vgkIP;L#5Ln`LGit;ij4QZ|R5Rg-BR6lzr48o(<p
z;82WvT@UcARkm#||M0ekc_U^{YlK*;Bh!~A(FTJv<MbF)ou1qYy^A;N$ey1DyM1l0
z8~;o0yJBIUVHd?^D`<Dn>pd}R7gJp__ks>V8l2lE?Jca6Ozs~Y_<nt_FlGiUJmz}W
z`M6MUE4?YE%N7e|T+FHbTtUz2owO67@hfV%0I3;x`F?<*WU-~*om4^c%btE(JFp2}
zJn-a1a#nK;Zo>%jumi`XoX+jhgJhnVeq%WfFKxEARMF*k2&$**Y~GJ9nGEW`wsDc%
z2fcfPsWqbNFyiyA+2s7f+fefpd~`y?(cu*KmA2S^h0|-g%8nqG-UW@2sdRHzPW||p
z9tn4B)^#a6*BTo@hL_8i_T#*ng!99WJ-v_@Q(vh%sVed^XpOFt&PZ#cD?Azbf@ed8
zySkS>5dZiltv{Ne>TCC|zk7BYCnj#NW)y2NIczd3^ny*F$D9=Q@O4I3_I`Kx$$Vbm
zW_RK`U?<j(cdcK3%(uf9Drl0#inYJe|4P0~g58XmK+&i|_%O2Cep)I?ey2Fv<j!~u
zn^AT{Td<5m){lz$I~emYb;1;0^S2fFFM9dgv>PkG$cyX?22%Qad8t7stctegd#nm%
z6vYld7cf|HneOYLOFG4R@}{OIOaDLw!rfTqVPg^9;eaSoD9nXgcTWvdZ080GE#K)H
z!lcFbMwGY8)IRo1rlpMwM;QxF^teIQTdyBZopmZnpDk)IAyo9*VH#~f(KDY9JlTbc
zC3$JNblwOkVU6xbiwC98u?)_<If?}yniRprjA<!b$*9A*RN?D7t`#P{7R9T6d_PPi
zy%*W>e~l+pZSC*UVgr>)a6IoB-7JP`YRjKhMud$wTjTX7!@N86qC=`lS?SPFxX;D7
zF#`00?#cX^yY$2u-YMuGsB|g*DfVdsrduxQ3jyM8#MAokaTH8K9VLKORI?S*sx|Ud
z_6_*M*6-L=Hb!g3O)PbIZJaQ0Dvie^=ji$+9uJqsRKDyZCKReoDmp~Q6_IcCD*DpF
zdM!Gg(;ig>bN7zk+npE2Yq}ftzQizY%(YtoP@CuN*Ojh*Y039HfH1^t1@Sy>aOU>C
z!U6GnW!~04ei=s5R0hS346qDz8yj@6J$#=8&B-7akFOxjS-@yE-(+rH^H-qqr)kMu
zAHPNw{i)cDa6yhBpLD%Anp^3{L6m#OH5(eJVsj;K3J>(b1iF&tCAg@sHZpWUh{qd#
zzfoz?u|9`C7Xye_CP|wwP~)0BS7535YiPE^IK-FSVzp?-rOG!N;^k_t1D(xWv<FMf
z?32;4Q5p^7khiSOsz$*-Kl&(mKA15(a%4|u*@Yw8iKvCGJ~QehHAml7`<D9Zr}FF*
zI{kd#<bCqShBLexsJY{j1XXu}Ym4v4H$?h*NyBH1P0bbp&>QD(xQ7;6uU-E<l!kSL
zQ~k)p4b-t->f6IO*)tEH70`0Fu%ceMy@GTMywnSVf^7|JBJP*SJErC-c<KS5Wt0Qr
z{)m<)|NFmDlJXj5@E|X%Q&wNT<oS8-3({KE$m8^9q^7kO|Lc?D<A_1r$5?BYutCw0
z=d;1+p)jNlC)WNTIUE^SV=VC4{=a@U51{KNds^?j<_$CzFq|!!-Y_DHS33d8gQ*kY
zBA_E0#twA)Yk>ES6@WmB_6O8&3-3J&osiN`W}NJ|-SP|3NvbWrhiUrHHIup$Jd*rw
zSSqm#EQmt5r5u4b<CI(%_qb!d!atdu<GNCGqXVhir}W^{LsFMExT@ay9aC+p1#YAc
z$Pje~Ho4bAhqQ9p_@fcqm&orDUuY)T;mn<wtU74cC6)v|S(e<s3%OKe3Wvo|2<Q;_
z(k_dyV`lNlXjn$;<b26T^v1K$SNhr!3SXWb6|rdxoCFDN(*)Ms-Zrmwsd;6!>PCYt
zjWj~aK7#P@sWb}ORu;}#b4dWUUARHc3sx%aT{0FxZ(L%bGz~T~GTx;L$hg6$;=~Zl
z%*;FGLv>GHEpn6<;Nn!Q-MV1q6?+MN3y^t$a9*Ir{<(Jjg$m$ozdzo|6g(j*RTBw}
q50a|hUj@Ec!|a)<{_h5Lo&mNRY-jEhSsj1B!r-Smsujvsq5lD-1*Dk(

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@3x~iPhone.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon60@3x~iPhone.png
deleted file mode 100644
index bc7f781dd0b2ca730f1ec28abfe5ee49a88640ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5454
zcmeHLS6CBKltyZ3hOR^n(u-202_b-?DIFwH5D20uNN9mjLX{dt6fB4cL86q<MM01b
zk)l9E5JHtEhTcL|gdN=db|3eBzkRqfXKp#?KmWb+%|GY9jnze7E(jMB6BDoLC8Nv0
zz2dNe*nz8VH@hluV|7PZBAA%Uleza?*??!QTlS{6EiIW802{<~gm8z66|jx~4FWVK
zCgyDB|L&>CX89lca4_&xg&`A@P_wBK0vU2-$(cLl6e@k6uAAOPG*x}dasNJCfYtDI
zaa{~w46DFd0i=+*!<h4xF~zEE5##7e946Y>Sg7L~lJuOFuSb~dPh+a(Gn9(+5HR#}
zxTG3q@dSJO36EO(=PtL~%M`}=B5{OnwLQ0dkkuD4``5bvJ8m2Q_aL|-?DvMY%d66k
z`%EW~N5`GEN$1la<TW{+%p~~oeu^CHi=O+QRzV4z-6t;zF<Z<UX~^nO;%*<6;yNOO
zd;Rh$(bYhWLm-|>5N6x`nW{ocXSr{1my<~T<>vmPrz_e>yeZBK8SqZc!sFM4*L>Fv
zWDB*2L}k<iPTPW1NP_*Di#&oawf~QX$$Ke&Nsn2V(A%@shCOqNsGZMlmF1G(ttnHX
zDYvBP;fc}k3d8d~!X-Q0azh2O?NPknR}6nLJX+#6Y-{gs4OuPYQ!qYLw)g2-OM%9L
za&-=W-iIr9DhZq=!d5z5VLL;?Ob3~h6>9Sn5$=}$=)}$H@&c~sr5?RLEP~f`a@Itu
zZ*HsXxzc*>>th#r&gki}t!nxj+BX!6dM<2?+}J$+yPNiiQsc7KmKbHWAr<u}Rn#VT
zo9gi?-$EoOOEhe*HNQK0{^0#7-xc%cx!3!+|C-E$ugzv|543PlF`$=lB&>)tqHQYl
zNTe{XB00g|%zf%isZZq96wwHD)km>?T+Yq}P5#j<e6H9P7i3+fvh(8@q9cdvgolZ&
zMRaE&nSA$5*}3ysRh}JdEv1N^@lt-ylQ<~io@AG9?okn<<hE3L+JW$C$&up(@7%zx
zQ=LtA%3G;ustcvsfLu^=ccv(VJOA-PI{?<ht{GyGoD;AbJAN{{_LaWGuIKue6bk7-
zHSqK&tjgdv!#QR5Z-jKgw0^{1W0-4*QIfV9Gn%61Zhtm1XGPm#e6;MnS3lM{LV99w
z$n9-H52k9vfd1{=;Ltgq1+-X7xCtL$k{o5|n0k|G047JFPdQxJ|Kmxw58>bmdxFq0
zx~XHkoL6{YPakU%Mn?`jGF8o(EN=VxY$!<Gu}1cjzma<sWMIEEq_!@~5X_T2(<Uem
zlF18cJ0qvvB=+^z)z7-7TT#$>FZze@FQbEeIp_E6OiOpH#IDhv9+2=3clBFdC8|?Z
z!qB|otKoR9nIu}osOlSbzaK-mw=q52iKMo*@~Nfu)pGT{om+UQaPtM5*PzZ)ub2cA
z4)r%IDL-};3+B5{G{%iKclTCmS-ssJ3uub67!UGeMUP@FRQaPSY{z!5MAnHaNWPHw
zuXy<r<0d<@4W=-Bzg)OEqdzjt!SOrMdJ)vdbtG}F2lk$w>Zq_SrR78A4YDS~>i3JL
zuB}<Aibqd!w_glcwg0?hkD8hOx_#uAJZl|eGMR?6f9ogE6%|!K=ea)9ZZ=!ov{kFz
z0gh%XYgg5-&X@9uX1dk<r@J(0QsA7D@G*nZDqhtQF}X~$gZE=P;<b$Y-by*^ETQ+1
z2$oi9pT?SVOHWTE8tPai>!bJhGq|c#V(SBt&EIggD2HPD=TjG5zlyJn%=nJ5yD~-$
zTY08DW@P=)gI(%SCEjU)ay7SsC|>{cDPoH#p?xlGpY8fjkGWgZbZ3L2=zuO)mS6WT
z)1wVr@ASQKT)y|P=WqM_)h6?Gt)UX^+cc|V1RCCtdVbX}T9;FaSI2Ox#9jRTc4KCm
z%t?AeTtvq53%{|A_{tl?DvEh9N<u|7!#J0rl1sDMJ$Zs8w&M*xc}mG@CrorV=&KyO
z+_J$E{q7wn-&vyT=UjP*-PBXDT?vlNsK;Y#k{z3M{Bk9ajM(bgD~sy}B$<f>`TB$}
zEB2sz`l=j!*K>7bCizp+#TA>!dvc!Nv=Og7MZT1sxh!Cn?yVoUsN>zMQTEhHlXq_O
ze3&t&9$iSw7I{>Us{!5FZ%=}OoyAMp%I!fBRmV--R`07^*OIwXJK*(<ZX2jXLMuIw
z!J3A^d4dqXQdg2*v1@lMk1!4CHgY|wC|1u6<@I!BBNEi~=i#gE&OUyQw-l?ovUeqA
z)vdmHW75PnVvheQqOm8<!bdkCa}USkM(@>K6aCb-kuZ`p53k#RAiM(1V~4?lFfft$
zFk`F`^H>0~3E56WT`+6vR~mzXtFl-(Awx8={1>2)4G|`RP_5*}Jlbi|Gpgx5cq0<P
z<_UQccPMWvqEHK%o{BcSMNptVqe_<1<Q(SghWOR3s;H7&09{obAm>7wjc9ISKtJAz
zKeDpZx{UM=A?$8OpUkJ(4CN&D6)^6Zm66tERSnYSHIOC+Q%-@<&Xxsu%&Z17h&+V@
zETCVrU<x+}f8C2Ahu@FuK?AW}3#<JDp{^Sc1sx=|1_yQBgeYVnu|6<x<_Z|{`a6c~
zrE2AIi0y^K(Lm_9i!$ay%PhR*zueBjTmIASC=OaJal(ksUx_xHAz%&u%xNIo3Z^ud
zMdPl5VBo}m$(1@0IZyy{Q{jvKc%u@4f$PtD5I{s06n31ufZ^AVS&X1w{g)d7mfV%6
zgED=FMb;<0voX#|qfX;mBca$?4I!nwwgw#i7%~sCl|-GUkHjv(oi-tjyETQ0@1|9C
zpi*=2FZ~!B-rzobF>;a4PXI7woHHN*OOlYSy4CV8sBfGAUfEG6jp-zFAfCDKF(jQo
z4M17@-}Bh|@e@UVW`O(v0<C7@`-Z7TiIno<fGA#h)tINJfgMH-fGij#Eg(`sD6b1f
zS72ujZc`RrwyeW~Dw{kj*@X?Iltkm8<Py1vA}I^qn%>`Y@F{@P@b6Z${s8BOC@dP5
z+)CH{dA>k?tRVj+0O}~p$%aVq0W29*rWu{T3IJ6VWRO+_9Dt(4fIfWoSt0u6`YoDG
zs=EZ$n(k^=hS+R1r$=)u<!#flhl^8t#-^k#==%`l8}cr&FS)*nI>5kyVK+Vh@GU+)
zvQYl2{fYTZ)l|VuMn`^X4+g#Xc#Edu`nJ&GJATjY{gke8+FuRiO!_@WFaE^<#wG&W
zhqviWlyHeZ9>pFN_^DmO>DR!O7uL?`Z#zFsbEjvXa?bfb+I}QsWP&3x|KT6%*yDy{
zW9c&uDyaJfR~wF(Vx)0ATLGy_cjN93h!c>iuT+@Noz4#A;1iE|f1`smN|0F?{3*%a
z#6V3&(xk)CBPvde7#5C;E6>FVR}2pNe;*C;3f`y%X`h%HX!MBpby1<<@9b%vSLGQC
zjuKU6dAENPjxgfrYYad3Ju5s9Iihxhd(wA5bZQ@e`SlAcpGHraVwm~32#3sA5A5g8
z7Mq&u<;npG!(F{Ff8Oxv%(*PQ!n_Qk@1p*SsF<-4WyoAMMRcLwjPLfhMGsANo@u&6
zOI|Q{`Zwj0#f%Yq-l}_0)zZ~5X|?QcYpMC=4YnRpZpm&|6oOLxFh1X$_8L}DToQY`
z6+HjEGrxUnm-jpma56NtDFcS>lUY~q_%7>oo(lx_%Ht>Pt4}muKA_ei^hmke6&9!9
zn!3)J{q~XUg&`J|>Z?C)-u%+<axY%%q1dhzQnM=LBNMlEVQl|{#gCO`0v|G^y%bn8
zQFU0mW1|gAAROCZTS<!YmxEzWT~qkuhyzNfe((YZXiEyClqKE02*oTAB$Weaf<KH`
z1*IX4x<}dW>IOa|g$`R>Qmh}Y`f@_)PW0!%;f&U*AHA#|l!q-M?jbmu?O?A4E6W?v
z>P=yt_CF>me|{Fo+iSYN6Xbr=PJ5-zMom{r*5B5x!0f5<vP>a_KQHlEiv2x_9LN~M
z3_G|m3LB4*w;BT~ElOjQBSK!PVa~R@)c8TN732LZyaaFy&kf`4LX1-W1QULO!ya91
z3%MTGGyC=LvF?~c(67*!o<$R-j2VZAloL9WgO2OBQ?&Lv9tmCLJaZ!d!u&goWOPGh
z^9`~~NaRF~UKmv<WJNvTl^#Qlbzy(;<N82Lu$K-GF}5}09X5K`q>kmcun4y9oPn}W
zL2RR=R)4k5LHIK6#kqpPr*5AHmzxBAEy=+Z!K|>XAF|HAb+ZcOEIr4XygxYx;V~cZ
zo5u`<9|#(sS597;ge(MEU8&qmZjR8A)dTG}gdK;9=vG=bA18hLtV7K>(l`IWt#4^Z
z)NWxS!FYY?<8(olYsJ^UMNGtnEy_KQxHTITuiX`A{YcNL>+4U>kV1cr_87b1JXxIJ
z`ZcbO%}o!iGkEN))JCPCtQWEUUDBg6ZM`gyz<M90?r%J?HLw;0i(K-wo76j3T!0Pn
zs|z?@lch7^;Cv;V>-xB4ZSGEunjY)s)K??&%TZR#tKkVw8{KJ@1`qv*o;p=vOp1#(
zsH>yVh@DM6{PT|Vj~F@Pt4%-j1I8eNL+$p&+nd;;y{5c3d8quH>#a^7IWWiEjC%_W
zR<<PlHZ&Y=4A=b*CG*u+F85Td!^q^cuv(SCu8eCewA7?ql%L=Xk@jwTck%1(f0ADZ
zZ*gxo4zScFe-Yc-=)9@$LyJ@%+st7^BwZ2u9s8u9xj}#9!pc$ndFe9Pwr-tcIEWm=
zUE)LJ)yf(W^`vKV@zR~qL62R8-t(5+X#Rq0g8AL1hz{(nof?$R(%oZTb_?v2(aBp&
z5`;9{Yt|mo)6n11yA#P2Im4o;(g<wqY3&iQRDwXEYJv`XYtPT@XHu1W*T`m{t+y`6
zq{w#PSj$7+6?%6se4TymR`iLq&y410{(I}!PuX7;$2}k{j8s9DGJo$!<wY<JR9f%-
z$niDl=9Cau9}fQ-|Gwg%L~#DPNSLIOY<h6;%45A#bM<_<e=;Gyre*)4V!SDlkb$25
zpg7i}EMn6Vmw{eRu-&|;Y=O<Gc+4M~Rh>K6gRh>`IQrb8oed$O2)(_fFCHZ%SH|Eg
zx;MkB56CAkI~Z8GzHRtC#kzfo|Gl|SUl{V0{H}zgI^=38m117@SoG+=21@o4!DTU%
z%-9(`*4c|!M~6PVTsB#(-*s*tZsSPO37OL%`~Dh}ht^Dg#~Yb>e8-OlOj=ydAa6i&
zn2lw;)QPa<I`s6DWZUkwZo)7Z@lcphXvdRTu?uhsY4sbc1${3s!NB_U2^<X#X@T>H
zx+47H`lW2gLoKqZLfQ7uge7-yKJ<v|$Fufhb|jV_Um#E=i_sK{(0C^xF%TP&hPDu?
zdv<hwZW8661NiD@y;CVQ_BCx)<BMdp67ix<eF8zWA#J)B|H;6^NRmvYpvu-Ns?d~U
zcam9WX5r*eUa(!ba#|4sR0J&QkVKq>B@cp5A?cHaG(KO_>`_@9bba9(0tW@Y;N(b~
zK&VhXdw-i24qDC+K^PF*UyJx2su6_u-5*N?!-ao}!8>>U&~qUXBQb#gbjZ#`k)2O7
zs;peH8ciwbI!yz#4{lB)W^m@YOfmHh@V$2Yizp>6s+$on7RQ-fsKY@^Lmvvvx$|A1
z<Z-@XbZ~E*YbJ3zx@gY<nfgI%PXZtY<N~4Pf)Ip4KR)y4yGC~7LlCF`@%~J$0OipM
zXpzS>%(G(k%Nr0R<xMZ%9&rfeU5L0v4+d1CXk2D1r@R=Ye<-F+>~*;3{^FppO-MY9
zvVW1tF`sA2aR&6z>a`!|HseBlo6Ga%vNih?Hk%M66AA{l1M(}0gn<`Z$F^wM05?HD
z_?si41ALG`sNC@OuuCkLgvP5hs$}I}Uy3RjP!tQfjE)5jvyJcZe>KQ~whUtu1NgxN
z^=jPE2loRq<8;BH%qZy8Kjjg{>q-0`j{eUm#JoW0ukj^PsM7jo;&~a9Fq7;cGptUb
zYNF(=B_U;S#o2UD;YYfROKip|oPkj5#$oW%N@hsoSIaW2`{#WK{|jl9Z4ch-<1e8*
z`Df&9MP=(^qeLf$UIh025U-vbKX`V2X}pxE=xuuU59X|pvPOuvDPOKW*jbZf|98YX
zIu14u{F{>~q=S`PLO7@`aP&hmdhvc>OK<)MjHMObwbGmbbLLT(=`ROfRbS@Ih+|yA
z4-``Z*<~uM)D;!Ew`ukp52~0Cy>iR>hWu4y<euN@EE%6CwD=RJ_hk77NA$U(#G3VD
zh3dA!Nq3~xw|kylnSc*SG=bv>G<i>$AntNnA|5jAA210H59hg3<bcAFJQ)kc@LxA@
z98vc=&UQpbolS#!Q<2%i1Cx=!`{s00TwZn?zS#IKr?+?CTUQ~Vh$Zx0E4dO_S>g@R
zOo{<&TQLxNxyTWjib_jLf-O*(va^{!3>x?0!<|7DF2EI+XJ-2~VCDaV_+OaV6Q%vJ
V0M+K;WDbj(rp8uAr3Tky{sVnlPUrvt

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76@2x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76@2x~iPad.png
deleted file mode 100644
index 95e22a1dacf8a5cb7e612370a499dc2c2be90bf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4925
zcmds*`9D-||Hp@sETfQpEFsI#AY?2<Da2StGq&uqOC*tHDp_xP7~8~TiLomqyFvDe
zl%<d?S+X-@$y)dHxgU@3_iwoGAFgw~&vl;f<+>i{@p!$@i8VF3#l|AQ0ssKm4D@wS
zv^neVU}B_Q`QBd?rA-X(+Q!-dz}sZj6Q?t@dsSB}12<!1fDFxM0?@^H0vKo(9c>8E
z1^_^xNB@5-S$V+!xBosQXI|a_065<m=xCb-(QVi<W4XHde?NX4xR1|`TI8%ww_(@O
z<q>_z93K}hFrOPFxwNgKccD<;>uyUTsikEZJ<1*)`@?|iOrxc#vaOidPr1t<rq^qJ
z36|nqn?l?|ypBp%_a~mU*87$<m;L@z-A1bVT~6AZu2nDyW7fRb4_rxID6rbS-UVb*
zU<fxmf3f{_6K|AwJ3A1i83ssOwdYC#+yv?G0qBj&LT{_mgRWd0qoJjnx^qklU19%A
z4xyjU%ov|nzREC{)*T~s)u(G&knf6QZz>y;g5l<cZ>l=Kp?5;8lZ~ELgJ`cq-F@#1
z<vN7g^_)klzwWkuoa`^3gDN)qddmkd?OA*Hut7rHKSCIgOSiiq?i>9^_{E4E_}cax
zxeomAr(5qZb(L&io{h1vYWbKQS?jyKjU8ddIyWnJpDNA`5O<<Vj!mY-+N6D>{#4%M
z9v0QSp_iM%T7>RWHBBa&1vCMjf;KvZ9ie}yOapKtz(l<V?5VPnLqFa?Vmk**JuWi#
z<Y~NG%!&&U1ZJsE^Qo!uY6Z9PPg+L|+bs_w&ax;-MD;@<#xG#p`8|qTRi4qfo=tu6
zqd!g#_EUi5snKf>jeJv-`YNf3maB=(SMP+5L(~*Jf-?HQ#10Blyq#^>pB`_DcH`D_
zl(Pa!NVSaYY}=&>jL2HxY{W}CoUCiv0@=so-1~3k&X(~SGU|?Fk}8GCf-iwmAWqnF
zKZqJMoVPBv_Po_vYp3?8V&TMJcFn2(EA)+*l#OWaQw!l;k#T>U7eypX5#&JSm6m5v
zhWd{&?bJ}$QX|N(cjv)*#P~D&pBY)Tydsn2_GhYwTDy>v){S(}Rz~TiS93Y8YWG!d
z0KQp#XWsJmiRJq<TBFXS^TZHyD_2@+P|VW3=|`IaL&h}sZQhe5D3fJHYN<7PfB#9Y
zDJg2uY!$&aNM}`BW1u$X>nQmt-qb=ydLWGG9_L^>e(p{0wW^5aKl#-j>*0s5u1E=A
z>jQ&Dn0J?EIVKcbT<XNG)KVmv#=I?(fFGE~J>YI=v3!e5Uw)K^wzcq|D-A#P{Fzc2
zVXJmiW&Zt*zTLQ2qKj59yY9uec|A8iJL!yYxa=FIZvFrXoHVMoA}T5lhgBtDM<*Db
zk3BOz=P7A+%pIvhV)r*$>KJB&zWL=SWvLrhA?I-F8-a@1G&EMLHdW(ESF5_jYNB@Y
z-8P3rRv(8(s$l12bLV#EVytYw3g@$uq2m+&>zPYpBM1G5pPJ=u6wX>)1I_L0*enMx
zI|5~f8Q)cWNn&pyB@9lj)*PHfZ`^<5=^pbiWU33ktZ@;oR)@>?%N_XCr4rWKP)FyL
z?6I}@Df_-5cQbBfsh|x8jO3PDI#vwZMBG9*_}C0*%S?UFQXuMni#<7o(OD9`zL-cH
zb1TN5NuF+9NkR;G=al)yQQyw{JGJ}$0D!AM@`RbI1azJZr8&G+mJB_ax9+Y3g;&-z
z-t{>%;?5fmi|^)n?)o^*RQB+xjmO9b_Nwm%<6`Q>wqmf>QHy&@q2>PbNx1_@J0hyp
z#e+vQzj9_+dPe_LTxo({p~-svT#ZD%MNFOWx~WBGEk@OeY8YLUXIpMu<_|<}zb{>2
zNi6=9R4-cVtGjEulNm1G)HGV*NLhfZgNwGKGU8wvBX^RaH<r(Mq!V5%h5C?enflUA
z;Cm~06|2L_eH45;Whm|Rt;OCnGP1^zh{QaZ_OrIO_2yW=bZqyFf|GX5Ctqcs{9XL;
zvdqoH9%%DjUbPU{`jiIaOGrqn@4}w8O#8C%*9(SgK}XKyRU6<oee764=@8(2!b=yQ
zE%)69+dL&J<uhNevCVZJ7sNoG0cDx^fJ^Op61Iaduk<ywTfyY-=5`44CO(<VioE4<
z3t;XDWknQS-FCd>IC@C1AphFjXq$?12Ps<EK8a`8HP{DVqk%JZSYucO4>exrwy6~i
zn>`}bmPu;z`b_&a7^9qCUmt`~S1IHIxNEHmmXIL4b}FQTxIEK0BFpB8^*uQjPytgC
zOfx@Q8EdX(&q0RdWdF4Y?)T=}bgRW$i^wD0H96o#JT(4;ERl@XJJ8$1UqohyDS845
zG4m-VJXnFZ0UMhZR;}@L@0pMWhds>baV_ge-;*OY@zwOEx$80Pc&dn@z|})N-IR_5
zZaj){rccR%rF|45j#R5&H{fihrA?zG!tGiV%i$7>;IBSf@6k>T6)^-Cq@zv{nYq;2
z{0>IE8i)cEFM)%}!LDvWWHXw#NcF&FWND1=!pdSgRPLJK2Xtz0E{cM!IncxBzNahh
zhEYMY>HKq$z3qRZ6XA<B@=323z`-HGu8+*UA_>@j7<HYC<&6tQd<bBl&4EYB({|b`
zt3*blNPcs}dU*X0t|7tXNKNezxII>O76sv%l9|`zxR4-(IL5i+(djKs_~OkbFyA6L
zfHkSSB!(bpBa`WypafYm<!eV#60caZ33^bly8&_miey;XH-Y{bmDbns1m#Ycz}uU4
zFm9yh*_o0$DJ^-BW5_{I&|*mPd@$mu&JX(+SsepA$iGK(*1*jbKfsDpUsmMwq9;3G
zlEipCFTH{|t!zH~Y#yWm@Hopo8}!dMYfQVnn4S=&J-KBu&Zv9{ODY8$NITx0%fJLJ
zzP#z+pAaIdxEpOB;O}>N=3qi8`aqAkuVc^oc^0C(o#=Ld_y^>t?VU^Or+UP|JB;H6
ziG$IHdc>Zd9qewSw8U+a-}f|f{(zApp4$4324x?;bGb*s_Tu~co>r;^<`{}cQ$$7)
zPTjoR8=ppfk~k5f*2IR_k0o==a+Vt&%$snA`Hp#uFTR#KJB*Zx=V+yT3tYaG9IcVv
z1N!*fn_1pBYa`7yEZaO`V``4>L%sgv2If%DFTf?d1=`c*_88-yQ2#4GOLOj2A^U}>
z6y37%wUW{6cH9hQvXRT5#4iobM^(%by3L?c$gR3^d|x7@cE$0Af!xB=7@w33y8QrW
zsgt{l+BQ>}26Ym3wkrB)OKUeCWjPGb4ZHP?OM`LYCP!|zc)*+c3!1%cRS1lb$qO>}
zZVzbS`AR41nt2N9MLSD|Zwf5emZ9^i8`pCcnF1fpB3{rA5%6c5XaBmho|A9itB_cf
zrCSer^ejuUJvQ%0@BHb51czx^M`jjtDe0M@p@h4OMqts-59QsO)Ji6mthXQqsy0th
zAZmyZ4O&$(YjvnPE6n%xmgfkmjhhtgeL--d-~Oje7MvH}dL$Fz;)?nChaqfAY(6b>
z;LT&CbA+IS+)mKuGQDc!HC7?v)0%TWR`zGU??bn*HoNmXnt4t51wYVc4vjNIr*)?#
zXY2zVB$Xa-$!c8G!Rt?HY=I>w(wL)&)y}<~5AQ_iX@6XfHIP6G;m*z@U8>0vmC|qW
zE@}XMvZriP8tRL{_$jON-wY0@EnXRxGUHiJ;%>KBMlKu!Tf<#n`<*_Vot#UU^*N~E
zIp@34s3|-#26`uJ1<KMa<Emjy&TwKp#Gn`t<Xc3G)<Zu+7?T%}(9*<%i7tCn><9aV
zM*j`bWz{3q?VDh){NnE<-K<GD953UW4w6xWKd3qG2Y0q+@!M|y1s=gDpR9pH?wz(o
z4$H;|ybR_hyF-nl^wC)e`g7EtA%>x_3ur_ExZ|37q8&Q~Y*k`9{Eam;_v0g|#wQlv
z4L7IGxsMm8>Z^Lf8SfcK(Iwz0%}Ph@Veq%wn^!wo^05PspUw6*wU$d_+3cHf>T~Tc
zn+wg`N4A3cUMd)>@uV0GLBqmpWFN&h1*6t03Yzmf;@Xl1GBgwQZO_+Nx;Z2z#Np~&
znN>z>&X?#6eWS>7IUZj6@eC8*a8ct`m+dn-S8CI$#&dcjS@UNNBI@UAU?~`->aYa(
zD+_b<PYi=CmrDp*J5c?E>P=B<vi^e=J-q&_wP3~920T|Dt#k3V%J!GBu~~*#2`<Ol
zLQ6JiB=hMVLSZg!=QvbdJax=j+5BY3hA9=|AgfFN+w!rruBTeCOHU(8tuD1+@B#fo
zdImp_AEi`_?@My!I*4^vc{?@!uxiD-+xnJDv&aejuyT83RVAw}qBXXQ16r%E+U`-Y
zJ9S=vK<BQMtmlJ#ULVWuM^G1BwJb8{_n11ak6gN9Sohh$xp=@CF=}qKc*;BNv1&Lv
z3T(^nsIxGFAcvP%{hq3R8ImI%fBkyhnMH4L8hLM)sWo{rD-xJ6`Bd+fcf-@j)%b8p
z^<5D2dir@G&R6TXy>3$YhSuthum`(qR~Z(5t1$@jpgt}W+YRd^2a4bJx^-5h?af&4
zEw9+jJ_ir27MXq5zY)V*FYyO%QG3_?9t?iNB0W$N0w@$Z7&#!#?$i_!Q%nZcwM5)r
zy{J|$y%Pwq{`F3}x5emeBe$TfZN3>LBL~z-FhM0Hx=5dzsUBO48!N9(UwOy(&@40v
zmk!ElxzCc`yUDIhVp+kgu4WtWy(!Ora@-kajW#c$tMD~pgqKVPf4wKP2p$`_{sQAi
zpzhg)yu7t4WL3-C^m6=`CFZ9C>x%vSThk6~<BPfar}1kxFX+A^r4>hGT+$&kLDTwy
z6zC<Ro>iGAuX+m<oBP(E_D-(4{D^v$$*AD90*%yACZl_H64U=ouzh!NpVVgwWXQYQ
zVNw*!j~||wk3NC$$|_d4>1<=IG4q<QsPiaj^USvqdPAAL2$W&;v_FbYZ;NGhLOT66
z4aiU4CwLX#vA^X5wg^Iq(7r=lC8>!x@}nHC4zw2~F`ZGKR8m@BU0N4Kz_KVz@{9j%
z3;2rvjP~gigkEzCrb%)kv%i>e#WuE|rYLpe-Dt#FzJM@cd}=QY7f`_eS6n^5NYYdo
zDaF&ho%lEf`cj&<!lMy{umNPm5k@=za<~7(36s(GUM~o*G4qQA;(ZY^Oit`l+nCE)
zq$g{8iFgp)m44>HUYDNcpG}is;UcwUg3-_*tP3V{gU#)!&x^m&1eCQ)<z5nMX`K!M
zV-!IcT>#Hal&fCXDL(2%*ujgEO$})c4Y7{aB1oO@AL)kS-s!3!J;CiIz^X5^kS$pI
z--3kk!<YXSt_hd;exW5){acLTKcpnmQ?`A1nuz;bq!1%bBTbCD(YQtM;ACM8p=HTv
z9#eQH)P;hrqfZFLQ?Xy!wwSF3sflj6SqX$%GA&t5?|<+c!Q^X*S;&3bakUpN@K=9`
z=E5z32i0%K69zP#aqOhe6~_HR2w7S@8+=APTAf~jjF!u~VoHhNC*Ah+R=6;PK9WC8
zr-6C=hyW;lSZ1b#36_=8fv!0l2NH08*Ca5pw{}k3qRp1-ZeB*(4~SeBdhnZ~nGV&e
zFGh;D@hn1SCZ|B=3vI)(Kfs3qX_<P#2y*+s^baT(IPAGD&Zh}gKKNP?@!&I`2>gLu
zsL=@>m2s?-^R76)f0r(5aDgp^1Ibq^#fdk$oVNblbKwbjrIUJL+7}ZJFS_@bvmgBf
z<o0XXZ}+yn!>RhBgyBAGex#~Q8V|RdYx~D?#+z4yOTQu>US=fT-Tn2hQouH}&slZC
zrEm{XqqbpI;9znzXYfV%R}cR{>1Y2~`-Bc##ZM*y7wDF-KkW*5>6TKT2bR5LQXs&$
zI9r(%GC{TI?>b>>i@}-8x?znjdAX~S^aGHgW*vF@0SVxS8H~fxBzRgPgu_ve--FN;
z3-BlJ$bF6n`1fDe7&B(bLgOFD+B0MsGESEIh_&ZXTMT!_+W*^A9zHWBNH-66`W*iK
Ohh?B^qEmIlG5p`T!8Mlv

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon76~iPad.png
deleted file mode 100644
index b18c4f9f4832f1c68e6b10d5534598ab5a58c251..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2700
zcmbuB=OY`68pac=f^w{itya_wV((Fe*t?F^W5k|qjb5u(tdz92BWmy2mI}33m8ucc
zE@FjfjcTdue7W}zI3J$(dEVdq<@xxc%uMue({RuL0D#+Y16_+7NBkpds+&2SV=i`M
z6rNhfS^z*Zn)cF_@@7|bw}X2a8v{gdGBp60<OQI(Nx&O%+z0?5!;<}vAh6{B&;K0d
zg0>a`0MIpDSIa64NPGbDWx=!mK0D!Aaa<jew~Y;ykLd{bur2Hd=Qb>;F}!P0`=<Ky
zcASlu0fV(Q24;?;5%mhfRPdYezj*V4iB8aE0uaj*!k(7?(be~8%V#pLTfyU?=yZGn
zcfVc~W*V1w?tJv|{P%VAb)*luDaT0#JFwIP?r5f|c`I#-F|;SN2h8Zgf>%S_N@E1-
z1uggg3y{VLl`Xxze*MF<IP~j$??f9x(LaluHv65$p2i<BSEpFsR$)cyl9^ca8O6E}
zy8IHUR59qSyDMJFWu)C1&=c3KShM0w$>#YhJY-2%C0i|9C=a1r)cG5%uE;eom<W}x
zlNiX-Z*96l`;Av@O9c0BnNOPSG12Ha`=zhdm#Vk78e@5RPln~L_jk9UopJ3^g30qM
zM`CH%^vekzUVd|W!hU2R?hWT(kVWXjG~<GAYSndIvfGjf?vz)(ZNSL#cefqT7lA5Z
zodp?%LP-qL@)Qms+|?ZRi9-G8s9)netKAy`6*e-gZzeRT&lO*9-G>eRW$%6`O<0H5
zk?1~J%99Hldhj5|+WD{#lD<rx`SL$sH92K`sl+ei^!=R3Rt4%RIC1AP8=msCZS%j`
z0O}2JXO;~`>|U``vzV%bSJ)gyrp8Fx?spj>)$$1fPfM(DWPLh&6VzUdCTsr8ac`iS
zQ%$63SM&IfS_7M>lJ>i?3uI=`!x|KnLWns(dn~OG4-eE9Vk@!@m{<jiDL?U~l|Jp@
z%ov|>3V?Am6-uLJ$j{C|8vc~8vQVE%g0vZ1wHA=$^->vVR15dgY;;VglSH#tKeO5u
z?Oj*lN6H5DOF=!wx<q2402dPJF^|G)Y-GP=L``oiWjdEh-#NM`4SbxmSzGf}JqXwB
zxx5U09L3SIwr+zc+}<gLbf46FsK(9r@(Q)YKT+q>Joxm1d?z^GZ&p3@R3wQs75!xW
z;a^}&4;6Em-O4_<3G<jO(ntUm;zD+i{*0)-VhH2w4p2V0&o|(DJSJ`@OO;=wJdBEa
zNV`!fA9p^R>YW8SU-+`-Fky%sElT{t$fa2CRA@u=KRS&_crFH6@f2_xS)_`}i%Xa`
zzWX$+Stpj3Vk9L%c_st#mhpRz!CPeKG_|r;=!)Lud?TwLNj1stv^C}F*!;UMv>BF-
z7a~owmC8`Jcvc3}ml0Q3Cb1o|ifI^7k8tk&sJ7<ne3Hssf3J06OLBAblt8uj^KlYm
zGuoMgcUOvhlP*{R{j9UeF(W}ha7I!t(Jef9fH)f!3UWFE)^85#F?Yo-cTk*0iM^7`
zgHUb+8`&ia2n~W-8V`IDP`)Nc@0U7(ELqS(c|7R%9B9C26(cHg@{sqMBKfgVd!`8b
z$vORaF;hvIiT)F=FXzADlmUI0gI!LhXj2{iF~V!XM+*(2F5GSj$SN<twgGJU(9Yx+
zXmFje;%_jWD(E$#Eg!HN6r#CvsH{7d0Qkjztn(mhDg7b6l06HH{m2wbZ3<%YCu@_0
zeix~7K9eaObrc$cJzcDk>%f*%7;i5X$?`i)WBlo<Vbm=rxF6>NTE-Eh+OSpYOq{;h
z#cK_b7!|Qce%W=!OA1w2=7AWEl-zIhfBQBzI&Vt%dvxcBDChU;TM`=72jkhEl>(aF
zOIwq4u(IiJ!FkcK)|i><^W~qit#Q@R<6b03G}4&XzIpJgJn3MHf;j+qrI&HZW}Z$N
z)OLMn$=dXh&=q!7cgCexsWRi<Ti%G)#)(m3rqf6-TS>%A?&%!x$VD~jLcz7g^OfxQ
z`f-gg(>Ce@c6sT<mEJcT2UdRwaj4Ln@dueXzRjuF62Moa)Vht^5?K07{Au^(|JEnP
zF=Xu0x^k;p@R!bwiaUTTO-lG|5PiQ;dDUn~!!v{+Jzi=;CwU3~adkGPVgmN3T5r3k
zi+x$t#o+iQ#mkvScOjEHp54SFE6z*8;uNV;Ot%*>ITlcEgILQ~?Fh84GsFT+Cnoet
z3jEfqVjEvXKxHOV@CGktB6PxjBU1+?ee_wO-lQ*ITcz)rURh)`Y!8J$Gw9x!`r%&$
z%{k;OLN4Ix_M4;w5%;EH8j~pymnJs@w_U1li15GTE9OR93P@cSN=V`Abz9E}hBK80
zs=%E$Z9|r=m=Qb$xGVLS1W>!)+y%1jv37RINxi&VY&D$`F<>APX7iL;&&PXBHW8iB
z6&ibBW;E>nDm3}5v$k?9xpFbhP9IlOu(XUK?)E?F2`iPXsUbkkTk7UxXG>qCc5@ZL
zsh6vy;tDz&QoZ|R=h*Lm&+vi1Yh8aJa{INe*0ZT9j(7WPTbOT}UFu-V+}JU=|IE^E
z@0)j;8&F03oxVF+4%1%wst6bY)6vi0`0YD8<;X{9$+6U<<Rq#&gv6|ZR=;dWuVHRT
zsxBrAvdkqeBp}$fIgzU^CJL$SCcIMKr*3K!E?E)8J1I|z9^?n(tY8<7wx7WHUPC`W
z$A)jN|H;`c8_SYwONOk?Eao#6^>-!b6M9QX^|_Vi(x$TRbe0YbRqC^(MONLjJun*X
zfVwB&j&5HYuB=xJ7XHMO;@Usj*@Cmu74E4jVKWSo9v4!>eZJJIT<sJPWzaXGJ38)c
zN-w7WvSWe5Mjqo`LTe)Ft;bq8j~%ndxAKd0dt_NVNSFdVn`s%9TSz?vp=&RP2K5z6
zuD4&iI!>%dSCv?o#fwM<VNXjPcIs?3j;59|5YYVha)>Jy&rxPilhmW+nLuhdeLrhy
z(D7Vq8D4#uZ(nv9n0Neb)TZsUtf6CvI5thgSOR14xG6cT*KVdh59(Y<##4s{1uMQk
zUXd%87CeE%+Z8mB@f|ME!Vq4@Fc#J4@spo-Cc6AHVQMUq;uKBdGe7(0bxlMbEcR|o
z;+z|wO6U7N^UDS;!swz^<rw;9B#<liXr#-Ulp<&&3-1u^qZ<z(IGtE4dP-^y>0pGO
z))%q&A5?*-uR|7FS;L!{1f%Vy<G{x}^~4SVi9WbyDsIm&AwSa~68u_2%{a<tMqSHW
z)>BVCv5~#r!|7#o>Qbh4_aky<Bj3L8Ap9x4)uETgtkInx><e282uy@;3mtJ)!6jJl
z8sD~x4{JvH3LCaafZr228g9Lg>{PUUAnACQjY?><h0i*Y55TNJD*6D#nM^e9z8Pcm
zx0Z^;0*u&1?sT<b)IabsWYy7wzk2V*?8Zp*_lPt^=F)=&$kI06CH)Hk7I3)+5=0cG
UC$vYO|ML>U@0;j0XuHJy7s}ofi~s-t

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon83@2x~iPad.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon83@2x~iPad.png
deleted file mode 100644
index a531c53a2fb8b89f5bc9b83d8490816539da4024..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5338
zcmeHLX*d*KxJSsItRY*{*#1bC5M!5ZvPE`9BvCO;$SD3oc7wt&vSi=0%#5WdGInDN
zV~d!f8M|f}?sT8$-uvl(xu5Tc_q^|U&wI{!&wHNd{C>|#um+iOvI(=%(a~|5-8QnN
z>9W7V!c1$y0+w4e#ptVVrB6rKkjj2?pNZDL`S6~ZkChdj9L;8-qmT2WW29O1G!do=
z9UVg<!+(3q3eWwI{dZ6xJ8y%Ij?c=>NZ<Yi{cktcH2!Zwr;BsPFBRAg^thOeE+Q`=
z^%*toZ*9vZn@zlJ$awKJ#>kF8`MSfl`s0*J7GWzko1a;Q@!S^}+qdIi71nPxepW;)
zpa;6eNVku$VZrS=1;uDzlTDJ`3oI6Qc6Ow(IJm#Bp(A3J&iJ1DHTM;6&ij^^c&?<G
z(Df%6vHZhudw5h#n1iD~;qw1?{<j(^2ul75mEtBbJSvwui<LH}3qKm-<>Ab*V@diV
z)GvMO-oc4v`Dvw8n}lkCX_C_GV5O?jt)0$<))3MR(^Qa4b3y#x2#Gme2I<WN-(@dS
zUf+6OFOvrEF5K_4p6mp*1^<AS>l7|v@B!e#3h7hE&)X`IfkK(tiN%>WEs_dxe5JN@
z2}a6i8DF2yV1J(JvbgQ=DV&YyyOlSMD8zNIEOGfBi6Ng6s#V-9+jB;fHAM(3+v}wv
zX_nmC6nO8Qe`1*g!FxZdf+3qg|Cj*u9F|j;yespv{<ln$c7sg5l3YS}HF>R`fHWND
zWUCJAMdBm?riJ<s<l5}4u&Ihe{8hdr*Z0ab_I893pNmMsp!2<2NcP6W`nkanaOqOT
zbT0VfEhItWtJ=&MtjhQ4^*b0XQ}rBufIv5E4|~94q!Je#e(bXHtS9&woIV0~<oZ?`
zeaA3AZfmeQ_Ie@XUE83(#I$=+?=m<~jy#^K8F~e~3ih4GxNT!7zXm&5SP{CH$vHtm
zSH@pfn)Zx{`Mtz-wa`zIp2SSfarqt!@ELoy?8s%y@^?MAMBKWhVZ5i8zVYf0%0qu8
zCXPP0>Z>-`ui?}ho>u?u)8yX2pR8&KYkO_HY)d8S9*YDk5taqb`{A<oVp6`~OEQ|k
zYF)OvC_~KoDRl#Fp$&Pz!4jT73k_s*2g1{EIg=Z_uooo#+oF}x_V6_DZ=Q<I{7X?m
zcX`2~(pFV1kgH9BN5La_W@K0{S5C|7qLXd*xf|czKn`q4aI@~7Qh#9;>g?h;(}4P;
zUVBCtV4zKp34hP$FHAW%m!AD|Reb^04+w4NsKEK(2<y_&o%_K>3h?tnMIOU?>N`yG
zkGH0D&R=7P2C1`q9_Cz^k;#PcFq#beYH0KvhVxs`k^$<X(UIO9l_k)=^&VNT#H{LV
zkMNM3h!p7f%}%1j?GVv1^4mHjt3>I7R!A(*4YQyISCfw^@T*$ijLMcXRYO2RnGjeo
zx>T34KM*&@yCy0^km3$%`2<*QXl>Fb#RFca=r{Wf7hPIi8(<B_Y^lWGEx+JiG0T}Y
zgR<S!?Z|&J&zz8Yn%V4enBu6>++7gvdxKfqU)vLBN@&wj0y6Mv3(4|GUeHhMk9pUg
z=%e*S(-g;?-na1h-(SVQ9E;SvIVki(iE<SR+2^qFyAoR8<bv)K@Xl!2_&Vg+xYdg2
z?kdziYUQ4Tfc0qjRaW_FWM0$BdhWHG;~(60<5Fd#Ph(UK1?ZpK@RlXXzwtVci4xn+
zhih|zyPL%GfMIeo)a3)_LN8nCu^l_((is=Nj(mS{;S9tru6|T1|2wCyiWHytu7kX4
zYGbH%QL_{Lvx9El1%T(8v(5+OO=8hOa8>6hwG#%@Wt9Fjcq4&0a89&7Bgrf))9{5E
zLeIFAewF^wjLZ<2U3y^-GLw4;N?|Oy#Mq*?RL?LuG7T+XC=yk-aEu7COSH%3FMKm1
ztXFrE%|TiL`(Fa7J#X$lOYI2Z&h4MEHv^=|{QEO*w~E_l_b}zTfW*!)Nh0LyX?DK3
zwB+fVgBp*7tfP0j^H&2vp7P?XSB^2`xC*Flf1DFt>C?{irkKI|y7jd-JO0OW;{~rw
z7bm6>5O<Au9^+_0a=t4=$M+I+hHbKoWCK~reCkjG>3i;KYju6idULb`@aVDO7%uDZ
zEwOgB;}kPG;?(fRWOz*^&(ouck}D`LQ@TaI<NO^AqkJ+CfmDh|Sou)GPLlH^vh2(1
z;4>**WPiFIFbozN8Zx*aj8=D8D++-)QIK~}z+FnKB@}XyN*rE&tN}l+b{;&mk*DDv
za^%FGL?K(GRXdk8k*>lXm+~H1<lBeb?Xv_z9_raSl@LKBhyB_$$ZjkgOl-s%K$|v|
zvu+x15dEkxD{X*hrTGy9yI+qluukG=J3Zu9XDR|8B^UuoV-{Oa60A1x5AdrKgmn;u
zN|lrWq;-5`=tT1ez!~C;Uk9yR|Lc2KgUI_<vjsB;Q9f5pj_{WSMpY0&ebqTe1qn%a
z=5thFoZ8g+l7wQnA}|C%K^DKVl-nT?8xMkEX*bX%88A?b$iZHc?>mtJjc_b3pRlgj
z({H~%NxPLmIHmuR;HTxgkRwB&Z-|YsCYGX^E^91ZheF#?=l$XBsAGRpvw>B<mejHu
zmxHzv3hhDBln?Y<^~SGPzq<GEBT75$xK|E2Ia0GV^ZTfhHtj?xX8zIofIrd&hf|`$
zC&gt~!9|Fs=m%L3@x(HxP2vv<S>+>icy~Z<uM!<GHsbWW9#c*{tzI_fk;mcgP~rSd
zd_h_?zkUM-P9XlGkbf&+T^|O9K*VS{6;`QhVR6)n5vRzDAdm(v8)b)_eBy91qUod&
zGfyDiqPe&na(HpLr?jQ&tb<UKBTlayFk4`VI~Bf`cQ<<q*Q(o7nW4!00Wqi5Q11B=
zjh(DD-*o{xp5#*5q{{@U^9nM6<7zM@n0n$fO+msg4HCYdMTpozNUBazfj*|cbc>0g
zE?&K9^!X2nCW>ql-2EWf;aRncJTCHdg{_AYT!}bt)f)mq$})<cQ#Gp)Dwsj=5tH{1
zV{VFORaE!)ep<c^-dQ=ck|a&G8^PV9h;Be%vQL&1o~W`P>~OhSrI@Ju?6$rH?Kmcq
zkD-9DFKXrjIzu}B;lt_tjCX!yM~W&R8SPDP*f!@$%tk1Xb7jfv!R8KKtYdb}gmx$>
zn=H4eKF-gWNq*_5Z7KR8Oz2wS&FXm*+pA9eD^Mee+l>F>red}jDW`!~Uag)4icOP@
z>i$jAoa=wT7w3OO=)Acss6`#vT`Dl^dym>YAw-R~?5JT?erU6UE-`)k>AN}K{>M+g
z9X;@a0qACEmXl*>?s=-bw}ZO+u6B@3(pNGp8EE#VR=&%-&J@C*(}R&8zB$$CbNcGT
z=%?L_@#57@)l$V02B&ZJ$R`7hmZ{>_jF38Ax_!>7Lc8naw-~FY2u4w6Y*+mpr2`gW
zXj7{kJXo03jgK^6>ejDBrQhU<>pc*@!jtiJ7-djFoO_B-GET#GIA(Y0Hn_IEEIRXl
z-pC-SU7I^E8veNRHN_-A<VirrF`>Zea&=_)%tV)}V0O|D$#PI~b40vg%4NDW*Eh7g
z_MwN~Nj)mJaeI~3`lfeDZNZ==sG0`@a(RMZd27Z$TIKqkb6`BqO~32yt+pra;TfY!
zcifK;p>0qq6#cO?n_UW!OvxV0((8K#EfK#^^(sA!0C|-{^ov1F`?Fq07y5j2L~%dx
z^<cd?Cay3YW__a}7WnFRf$%%$-2;dFfsBFg*A~s5?BChb$e0T&pios_>^H^KuX&!Y
zuGQsGa%j#~WA#Q@2MMG%tVi1IJKhlLsFWFetqnMw$f*r~piMSkp7uggG#)Rr&^wzU
zJ1F}7B{ZTi`}E6aSmC1yRhMI5xIJ6(v0tXboWP2lrB>}F9}Wk=g2?wi`M@X-H)y1k
zkU+?bliBz-nXZ<rned6#m7fEiJ|4|`Mdv;q65-D{>;=lppuF_0IdH1E`Nd~d*#VA?
z_{Cl1J3UZ>mhL1!+jpZPoA`fFn1)j6vLnl?$0;H#<?l@u#WZ-kX2F}i;WsBfKzB%0
zzd&tgUi=mTZe6Xhw0C*wLq*5y6xN3&%UQA8FxVu}<K30bWyo2iX?9h1jn!z|2i+#1
z?LCgQJ;k9_<EMP7K+#=_7-?o})SdinK_(24=p-SSoc!f^7NOoh*iic<!2hsMkx1F5
z+mgQUP9Gq<dRf0W+L<9?YqclykMII1vQ&6>bCMMHIPxyA<6K5Q;gi+QznW>JXgz0_
z>feuS5&$b_V6CthR}A@pwnrJRZQ<sSe0d7DQ5juwMKXN5wY@6mK-pniRw)*)dbpV3
z@)Yvrv(h!JNfV_K5l*}s^QS|}-pOE6zm_AyV<Hpw&Tf7_{2xvcHq5#!hs_1UH-W}B
zZ9cgL%FNjAMj*n5wRH8Vog7|V+j%KJaw_^Wb}nxjNBsrpcwl%~CtTxs2gk|{ej+2s
zpP@MsQMR$pRfVAN@Z|1f<kWR2IT`{aD>8Qb4J~#y@aEaa8mYQZtlXD=499vsP%bY!
zz;^id<i6<%7wj&&ND%P~@FqU$XFity*-T24uj)-%%p3o1rX8dvB$Bf6<;=?JaU#f$
zQ|4};MU985VGsInFQ|XmXzIOc%TiGMuS7}4{ErN~%ByN)l9(Z$EMe5?Nw%gA81c00
zxR`my@Z<c}c$|0Jep~<hiQ4?~AX2$j{40h#;wdlefGQA__a~pgG!9s0cGU9Blb;{M
zAN?qT4qr3BhOrRhT?26naw1rm7_R*Ra4AG%-(bet1mUi1Qpc5o@oqJ4&qzM&;^?+y
z&*^HRR_$*lMmiO%CG^8vb{v8nzar#1AVEqp*I?7;l^!na0qA)vfwHn}Rj;!~e4@m(
z(F6OJGgMpZt<YboTa}uMT|1w|tR?Q9mQu(eH`D-X3BLrvVtaXHPr#Q+SXt=rTjenI
zBEoF|fHTt+qJbUpch~~s&ZN}hJ_H_!HM==OjzEg?RM(KDK#Mm-=-Mh<KD6^q`6Hz*
z@LABXlsA_q3l1k36h4U?+TYWWhZr~}whHn+zU|UM)E$En1IrNT;!<Z98i_dABc(d7
z$5cR}qG6wRGFFTxSPURXv2Z?a8sz3cJEKBs1YcqUjPS%z3UZpxm_T%(>6z$JT%;6W
z5{I7|^J~P8<j-E8`Z@U*;!V0hdsn~^8Zq!w=naQ%5<Amjq5BLf2}FBH8SIY&b)E%|
zy_HHNIshTUum-VIVu6LX7cG2a#Bbp#4(AwT%MITk+5@|KUqgv}_Fg(PO5j2pp7tvs
z5Z6=o)q9@r-1Ma&vG<Y=prm3VQCpM7N&xFl{mIbb#vZxgDs%)5cdyrDpeCy(tthm}
ze`0Uwj42KW2^vqabHbWKfQzNjVTO#qi0m<2<IpgM>maOGo`bl!gCVUHBszX#7K$gn
zPNRjEQOJ=d)Dyo5s%z{JZpz&N1VCxmL5YfT%`GB0Totr7Jh*i&jwr^WDa+x5LRUZ)
zpSva6;qo1U5Xj8rY#<m?M?n&XaM|Lh2+vhj0<oQf)P6KM`w?|qy?2BEEl8jk;md)V
ze^!K6y6oOtia>M7+PSq5#V%?3U1&x{v_Lzjo1q2zLu)44MBSh8PsD<$k&#`+=O~Vz
zMlB17;0J_@R*P&Q>R2@Qz*K$GP4K)qNcf*g-1>pikaJX^t3Dp(t0;UA|Cg)_O5!UU
z!4Mk?a`;2yptv-F_~8%cvfFRRLZ{$QdDSKJt(Cn@MkjZJ`_V<kVsH+mH#PE_^mnb?
z%T~H}OJ^q97yCxYn}Ow0QL7GS_P{7&C4J7rPJ5uZS++6uVJGw>a&={QHisIE<~YHa
zMU+TibBm%eqzL2hmXHhV*ZmOXL}<tT4)i1HynLuVB&x#P?d|W$lm<7MS~#lk`wzqw
zab|WoV^vZzGyk~(691j)?q9jZdIx)biUe4N`848!BsOsNVP}qkxH|K<-Q_(CX1t<m
zd!XU-wTX}`40^0Q6F@fw$w6zJ4r0k`VgwHhw*Fe8+&_xzfvj;zN_Gp3_eIR!pJ*VA
zv!hO5&STs@4!oo$b*L(_dAMp_qVOdOmBo=TctGx=t%vi2am9Nzz$0`7jjp!`Q6d?c
zj<wBu*In{XBDH)&UMFEZ`JA3xM1}EYzy$T5C~?xa*I2{|aPHAq&8ji?oP{A>zbvP-
z>R=+>e+67EQ++h1ti*5|<j&a8p~{#BA1^fSX=jnp47>RCaGYB&$o&5o_`lZRL_EQo
VB4cf=BlY)#(aacRRBPZF{U1D*U$6iG

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon~iOS-marketing.png b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/AppIcon~iOS-marketing.png
deleted file mode 100644
index b9ba557d546bc3c84c1e77bb31bf42ceef0b2202..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 58518
zcmeF3Wk6J0`}T(sq(neUMY@z0RJue3qy!8Q5JVaY=^jRDkd*H3knSNwl$P$HySrxQ
z-2>?3IsfnPr}N=>V2)?@UTgNc*0p~3b&t<81t|i&n|L4)h(JdAkunH`3H*o&!nq9m
z3qr;A3H_UaguDa@^feIw^eq<fJHMW)jJ~`)h!yx52ZZ5eboT#X0KeS?{sDo&iQwO_
zV1g1a{qJY=f7~Sd!2$w_gJd2_Jh#VK9Y2CRe^GUK!b11>$E_$OaSW}G-mRHD{BC&O
zh_xqO2ZR-<dc;rH;fZymYuA#M@B(!oZ>CGv*HY7^mtRjtjTL!r^I%@$VJ+^ydE>>k
zhu`V57++Mck64?05?2oED>mM!6+NMl$u`d0s~LQl9Y3<7hGk@hO995Abp!qV$D`MY
z+&#aDZ~gt+*<aBhqQ$6xC=SBFB>L-*dJK$fpsR8`boBpx8(ML&+x>sN<mPq>%m}&_
zsr&HJzuv_S6J+wQmp~ZUn9?AA?w{`7|F}QkUT{GJ|9%O46(<N}p&f!t{LkA10e6@C
z@0T!d0YjOrXC$Hj_aGTTs+ayfA^gBl>Y*~skNz=k;BKWsg_r-H3iJRh#N9C6E``c@
z|NC8nK-vWVnrYfe^iZ&wqlk$Ano#t+026)lUoVOOH_`w282_8-f2^1Pp6Gw9m;a>W
zZ(;gRI{uT6^BMSWGyHp9{O3CUu`d2|9sk%;|Fd`h*i!$Kj{l_NzXQuZ&Yl0A4F7S!
z|L+L?_W}Pu*6|Ox@}G44CmrWA@E^VVn+^VlN&m4f{==mI*i!%F(SL8L|AGI1Y^nd>
zrGr#}h=J~Zb)HAhX@3O=80xxvh!<kvVf$R+<iy#hy)mu_6nQuqrYQa=b8m_5QHps*
z2I|7>O?t67kDg3IkXlW%;WwCqeOkiAhrpAqawIIj2S+3UeN6c3=@!vM&l3w{+&lH)
z85Z)LDY5#U-qG$un4Y<yu;(AqATosZY(Lxz1!>^WYD*<17K&3JR~rk({gUm(k_OGj
ze!2X=;>vrx_BYQso1~iG+sbI+@UwB7yovIsZiAN>a)Pdb-o^=h|NQ5DEhG}VYf?0i
zZ^NaFZV`2pUsry88$aSh%jdFU{S!veJsTs+Kk%g9w?6ewGtb-uyb!g9bP@wBa*mvk
z9v;z$o(>q?PH*Eyz6bny-_6hU({ueincnYy)?rK$;><qN{<av|9<LSNL~g`N15Dj^
zl0w4&rcQvOLVt)h3YJN~u+~Eh#yQoCk;h1&mV}W;Hg+r0Vf=4>ICB(EHsEDt-rU^_
zJf*<Ew4~*>am<p7)rkERZb%PDzq81t-M~M062uD~ngnl^gDvRX#LX~$+smS{Vd`Nq
z-wl~I(0^GJ>&hP<Vj)F4x6~qNs_)|;Q(qo-+_O9RvHldBHFe~D!IZBj2-nT9ok8i(
zy+A4WM?=0CK%53z`DuWU<Ie3w+C;MVf<C$8dZk%8AH;0#C*Nye1SQ{#`S$Vm4PmNk
z&qXs2yKdI37RY7>TDDh2w#UjgTiO^3dY8Dt;=aRQHjz;Q^}JtEvh)(aZw<_5v8npd
z)}`meTW44L`r<+|?O#n{%EIpD)lf~+E9~9qho_B$_bFK9$>oSz5K5|j!vEEuJH^qZ
zn@oHBGT-cYo-Bj1N^j506n>h!=LI}dY8AQ4ISwO_X^X&E9$3@nDO0}jz(5x}?hw=c
z7HQ};)$&?-g#kM)p7inu<<jb2NK=s2I%mXGicZ9C2O$n^cXfTPgC36~JH*`a72ZM$
zBdAfp-2dk9X9veayrwslkFWI2gMk2dmIBzQ^YDfh!tddZncY%~b7+*ws}aBa`XJ@?
zSfBM(-yo3p_Ubjt-zz1^06GXa3AZ;`_D#tgri|!<)$De<v59_ggT>xUQ%xWH{$?J7
zXWLQ=^WuqQeqvJ<HJsVW{^8FM9LV`y)72likiwR43#;6k4D&O-q_O8CV6VM(kgfNO
zxWC;>T!w_0{Q6x%=Hdk_$0zO?kwTzk;mU7+7U8T)J<4JO@?&F7(2<8ueLsF<?T&!M
zYV_2+@Xq5{gLo3Tn?AX2FwJzg0&fN(n5(v&d1^+)<Zqq=J;mu;7voB}rKsC?l)cx{
z)8FfqOq=3)Y~S+{n=Lij_!&*t^jpj^(n!JD=gbP6w!HRU$;=p&-MS>Kzh^>QGI7*7
zQcG_iY2bLjlu16RK3pzgVq>BCGKDvc%ncs{lauT=&*(eqQ?vdw*ldP09x#=&CD%xQ
zzd?`~wA|!%+SmJ0{h$HoA!dS(;acXLtH|S7qvEH!W0-YwtASJnKKW-)z2kMemPdA;
zDDoS)ZZNe?mOqtYC<b1vsZ6WT=tz-S8cS5TmMSaGVK+R=r4x%3v)wVoUV;&eHAmjX
z|0FAr_~*~shtC*6`EHE`zo!BN^O&X3Qa;rBz#ieaB_$=K3(?fKxpds$prv(BUqep6
zGp*-H{ECCAH6}S%0Xf9!N(3daR>vX@lK+&{`>?K3%l^n$6ujIQm>|A+93l228-5|E
zcm^KdLm61OU3I>W@uV<Xejx7d$MVfb5(Uz_xs{1GMTms-!PhgXF0V0kb3vz4e044E
z!ufac11ac;#4%7MurPrN50tfJdG3Qf5VGa;Y5#56HhjIQqNi#HWv*Ki{o;nVpsskN
zq~zW(D$h0!V6~cc@cp_hH#sR4x7~2OdLVO|{fg%&@d0pH|Kn{4%KrI4!3-7-Es+M)
zW^{B`*TqiZ^5MWdd8OTx%ID$Bu99L4>z2c{do}k44rX=7?tK)G#MJL#3;p%(-P@Zy
z?>eAv>!=r2+~U#Vw5?#I!?(Gx=Ng~4Z;_0KVTB7TGd;drhkzAbg*~Qq25%{J-I^JU
zE{57M3OgXi+XIPL&09R?<2HMwjxLwLTx&RMz>;#79k5HDZ6d&puXhL#V@ub=5Dr@h
z{8snHRT`hM<7kLwsirF!z>=_xtHkT0>sL1J%hvFQ^&*Y;zt8P(Sy@R*m|u!HUwf!f
zN8ahLi@5BsUoxfXIg|QNwC__97f+NEcZrL?m>d{R<JrI5$?)=V`c^$oA)K3Ar9qtN
zM^yb5?|9KtihbwENflieDVaSJ_I<26vx0IIC-P0{71rte)Cqrkc0n-1lNQ~5XN3mu
zPJew0TwJ%+8v6%eR&cCTZsXGw4AM=wg@085!V@F*rl-3&4C}NJg7mWayt4Sy{r#}h
zo0KKlksAF90c;oIg+#57jfBBuo8`5nn|HX2c1B-m%eiPh6b^91f||6n=ziBsBX>;3
z$J}OlHod{;?2Yg|iotMvLVEx%J?Uzjn(-Oqb5`=p8Q_zB6{zrWD%tE?L7R%wW6gL!
z`9rH+OtU)lx}ERrUF>*2PaF*TG3IMPpU7IcIK>JKpDcaL8UN6v#vORq_{+yqv<Beu
zdC4Qz;sdP{V`JH9@TX&`z2?g&HV(IOGDQ+f62zeN#T_0aDn~nnPrDdFA9+apn;f7;
zz7Hz{&86bBu$8c`3otVyKS%<WfQag1SsO7W-lr*(kt}xA>eUbXQGx3$WUQyW^sVam
zg058cB2@Ka1c4vWU1>3e3a#IXc*`(Mv$oIbt-rg<=RaR_Evy=BpdPZ_S@ysLBqF0i
zWFa3KhRkex=MkmAj{p2+j3C8<%0eTL6KypE2GI|rx6ktNPUnPm0<f%YkSRA0fK5oR
zQQkR)y#I)alMm}<G~vv+NPPd~!L6krgiY1n<x{us{(e8(E62X-+E^~hX=-n68*i0Y
zTF{+2J#ljIF_ZTrvl<6)xw^0&@8U@E_?z0$WL2o}p=QWyjCguaPheeP2QujnvQVkP
zI4QU`NeJUTYMPS0*s|I}{cux0i{tnwsIr&0PuA+uGBbca(P9v}$!OzD5lKhtNTIrD
zmh-L*aCJ92e0!O>^hiw`I&7|b|2YJfWH%WxP30gfa5Gv81jv9GY6#}63GA261=xu$
zVc{_<vf&?$ead*(R`Ac(ex3(Dv;gp5&KwO8;zh|x1NE5Mam5k6jwE}Uu3Lvql2W8U
z$2?YhZ&omJ%&H_7RsHC6ZCbBj6g%``G;w7N>4S;zC#3Iw7O%q^Ff|Vi-5YnH`W_Rb
zo|-3#df+Bt7tyw<)HnBYMYs3J4eJzKlhRTYfPLjg(q(DTBSRkC$BL8qDyxS5>#$oA
zyBhK-jB<DB*H+A|s6RNQA^9>!K6KYrgJr3+u0inK_QOVwQ&VRQ7{?uzl}8f>)&us5
zEnd=2EJe*6zTTmRNHvBI!u!QsH@R#a4(IP}kaU8MIk;252&o-^rkJ7#0eNrEUVFWc
z8SjY7wMOkpLTUv94;R$;;PzKI=W_?fI%qkD$tzryzskks!{FTGr%|b*j#Dw4%GF4f
zRKzZy*bX)((T}+L?1N~giKtf1PnQg{^vyLyQOYO<cNrC5y;jp>6c;53i|g@ZHW)wR
zg^bY+nuC12*~Lq_I8rR}g}f9)t~DxU&bG)9ikh;V$8{wZ`&)U%vU;lo&lO>q2{d3X
zZ7bMY<C&Qd1;m=9cvXf<2qlEbp5d~$_z-45!czEWnk92+TVFG8GtQf@&;8IFKk&RP
zecP<5$ML^T6)LbJ&_T~laxD=W1j6ao<^D2>o7x_SRE#l4!CY*ZM0QTTo1<RO832p<
zZJN?!=<qy2OXkY%0i~mj3FC|M^&)9yDG1AwN@)ZlUW?XE9CfZm>$I9uip;ug6S5?`
zH)pE#4{4*yy{m+8mX&0&6z={qzB3sbPi^6?uCL~9zkR)`uAX&A9<}fpa$>tRP0a_n
z89_C_4q96o*}5C`;Z>F`UrC_20_M|GgeRd|X6)LYv~e%VD=I6?rg!v42>Q3Ls6d3Y
zM0C&*#KPR>mNxm2MroZ|Rr?*0kqE7bjAY*`;gQag1WIU(IaioZXyvDSe9^y5JTS#~
z=f8McGIqcBrK&B-JE%n>$1#wa;E};(uN?kBRm!M+EBeCj-2Q9$Cj=_h@gxOH#W?}P
zCj7J$6BGr<{Di=8^#MI=Duo@0Wxfi{YTKDlhmkJz-+K4HP%Fagqg(X%k~m6eGQF|%
z+!LOvJiwN$k6jxEVa1R4-CpyV@T2OFs=nk}s}7^LRC}B>W-z1Pj}g6PS&sE2z~|?C
ztFfSCo4SeTCy?wevyf6nU&fCo4QX8<doUP-$i6!L#Z8XBnj6xYCZg{{J?Ce|qkk-x
zUg%#=G%>kiYs_!`%b7I=KkUAX>qaDZO|pb*^Jf(2Q7?4gUl2Jwz-)Ba4&PAAZcK%<
z>B;g&&OpGY{S-EB6WCkJ9YUt@{sVZIwLvJbdc77ulH35df(<%|D>mMnsI2Qvb{s^i
zIKENqy|?MfV+gGhzCpY7r3Ux;OTv(&1C;`La}uJE02z?GZu0eXO=yN3RE#TbxE29S
zahK@;7tUeCj(5)L!){9O4LrHHH>@OPJt%#47yWX3FG$=}=A#-HSdjHhl7B)M39<O3
zIT)rf%04b~jJpoo8$yY#3G~pNtn99k`rn`kjk4kxTk3=0y;&-BgUL6;^BX<H%>nb|
z*gJKX1#3cJh|@{Y;MLd$;mPQnAtKBVYyR5S_ZY7qvqrH}v9c;7H!H-I+9zC_W{+DK
z<K9|!2C}cEF&@?3!TI3<0;}QP5)KcF^V(xuHMpNC8eh{hhBc}7;}yGOMM#yfOFI_f
zD8+TLuc~HIKb;<(Y)`EOV~QWn`xCR_G0J^SSup9;8~+3;ulHrUMG<Kud7}o9eqe9x
ztoO+nB2m@er+i7!4>w<=It;VdT5A>L-k2rd3aAO&Td~Ig=i?n_AdXs)9&3W*-5jnW
zptYQmu~^%p_C_O?5oouoE+!rx{x^6$FkEI}xI9YJ0-ZQDhWk5wB?kpT-7Oh{fGk&3
z^>-6L=CPwYsqRZ!qGf=#F4GI05LC}x8tF>NJqngqM(t1fciUeBV^9D`9!-VU6*=;s
zraC$}dIpjpl=ZRIZF+~dm$wbu=}h&xxZB>#-Vh1ji>!@}DWJueoUb9-Bg3rYZVq?@
z7b#3}kIyms;(q5zs>{&=am1@-$V@gB_L`TL_D_Zv)8-i6b;{}qU#w5%VAV3^@%LD;
zg~vArcOGJD5PQcYmpusR@7-RNw%<OkKF)xgrg0L&D~vlB*7P~KQ~Sn(b;{B#=z_9<
zgPL5L{hL{=c%Jf2JHpK-r@v&mtb9Rmn?%tK@qctV2|jar?2)C3y3^x&yh3xt1;){k
z(C&BYxVEv1z!_t!VSfh8K09dj6}0ghJ^d<I`2vN4LL2qCp(Lsmxlf<A9ZFMF_~353
zsd8Y%-}2N~)IQl#7~WPh1N7ruob|WQ#rgQf;93V*#6zZj-nFUkdka(C&BK@@YsCyk
zJ|wMNyFVF54!EVuy6t=5Zh4Ur_FNSG<pS00w}ti&_iY?XSibBRuyX5I%gwhhJon83
zZ`G3l`>jT>hgKD15RcueSX>j>Ra2&`Bm=^pC?*vvwc7KP;AL*{LfFs0q?yy8AtL~(
z(34?oH9$>3N5q5y+e|=B3E&O>3dJ2R;^Xr{ObF-S5S5<iNaj>De<GZIq0GIp)E1A_
z^?yFH*1=`7g1(riJn5puMy^dai<lwraSF9-VvP)z&b;H9$yZ)8Go*pao+<MKR&6Jd
zkdfVQOfC!4UbC02*tK87q*Xb;Kc&POx|TT(d2^K}@MTi_i<OwPw%GL)mm?bo*6hr-
zlr_1N2)r?8CxB<P$0bH&Z>s!$mV?O*9{|tQNP4jW9F|iLs}?_by=y_XKy1R$i(~@h
zcSN&&1<ZBniojO1Xm#p_#_8n!TSVp?ewBv44~V?o#mkR^RyPoVBmKI|+ckO$Slx9x
zpAc2Tq?moS=?EAuDVY-fviZ%^JL<rhVAyx-R2o;fI!kGUM6fwv85kyPVmy2O#Y?5z
z2O^L5UIDP8f|lD-PVRIR)nBl)mu`$wF&<|$Ng$PZv~el$=5+$8*OP0}FO5o`RWs9g
z=aiSqNLrx+4m$K}E@YW9=JSoNHP~-ij@#AhUV9Y+vT#Di1t3FtHMcV^tz};p8y#Wf
znCHB-wi4jfsy8H!Knww{#&r|x{TiR#z^QbPrXxhGH%>m}bdu&HVJ8mpGje{DfO?k}
zXX$|D{&xxo4tjuj-9($$;Ufjs9PFQ`Cs{&Mrw^}#fTe>mxz%HVFRX{R=U_DMw2P?5
zk1r6&xVncH<Gz!mOXXPU3S42hd`pm~FwtW58cFlacTOj+bW7hQml53<U<vZWxe@)P
z^<Rq57kah3g0Bv1WoW^*&xnr6)YU9!ogTXhtkX4SWElx3<}sT%I1y%9!`TPkxb;4w
zHe=6k_edHBA7qwVu~OIFe0s<?A^eD0aYlHWZFsX9ici|S3XC!zBG=RUQ$UOHj|{t|
zoVnkHw}_`l5|f%n>)=iHSpjkp4H?aNS~>eiE$8Rn&;v)}xHl$mgF%H)<fSBt(cbq#
zT^LI64T|#<nSikV=8A2>F1)!7*x(PJa-W*jgYny4o3fLRPY7x+!LDuOXkMZ=PbaWv
zDfhOU&67*$+#&MzcY};1Kvomj2A4d|)OM1PFTHv!WiwJMcs_hP`YbN-w!vd20d|B1
z5l>72RQMRTrLB=|GkG`y-kq;Sw5XF5sA$tV(zN9VN!wmXV(`^nf4J|FH7Ph|sAm%#
zhwvQVs#$G2SRp_Qv9?zPQ4;nu?eTqE0i&t)5?T*rx&U$FKfEz+&zRI(_Tu*akYDfA
zUMWSkIk$*|Y2m!$sFzshLYxO-><;_rXlr$DkK4ooD{7QcF|XJ74aNBX?T$;TD{~Rn
zD>5=`_VY#X9em7WRwBM;Bly^t1PK0)(Ma%S?k&5+h$`V*_>o<e0k7ebPdnn6^qqhP
zgGwOI9)$mR1m|<T%KXbyGkluH0!(G|P6p)BOT@dD%M=tpKEYFHC&T95;CfsZh*X^@
zK}`tkZPgL4jLYuB{Y&k?*p!7(lBo#mfY&KEFh6n>F4yY&*e&0JQm+1Z`~Y$b;9h^r
zah$|~zH=q<g&YrsQ_8=7%k=efEb+Nd4u|VV6|5Ntb8*C$I*+a@-*EcmT54-R9+(0h
z88eR@Ijl%kIW})Cco4P}uOMS~+R#rue}HDzhf!w3hr!73lEjY=>4yz$;l?!VZ{Emj
z#wT*R6MZ&8W8A2&rE7H2MfHSXnBtQe-Wc-_Y4z4?AS23jbrau5!*<*GZ#p?W?W6`C
z<ya-b(e70M4K52J5T0+wZ_4!NwN+a!FK#fpWIx!L(FWld;vIURP6-=0wa$F9D1r;~
zw-yJsnQ%~i<#H)`jd%Dh9RKOaVGgLxCvDOlFv%S!3!jewldLn_k?>v5tCCXUq{`M=
zE*-9xJx;JD^*r$#+`OW_(N(fQN;xJT$6v?tlK?q)o)#lJHwG_J2Bz^rLPS%`9s4E4
zDi}d>TPz;1Pyd$TTmAdy=coCA&dg5px@mfhATEdFQs#4mEDzamd4O?b$8c!JWT<rj
z$?)CrE)8ZFK{k5jq<(7z_PP9pW|L!fZr?Xe7+d>w*CV&Mi7+jhx=lq_k7*n$k@VgF
zSA_#~P98tTDvFF&P>LO?X?X;u-B76qm0-p5_8*LrG_cw}H&}mixVQdttvf9@`PsVD
zkH+$f<=}3pJT&;7&NLiZ;2KvD(YH^wJgz$`QM4};j7jsQ$Y$oKf!y9nHs{{!ObL?r
z9<oy9j_NV@?yb<^JFnzkyTJ!F|G?G1kWq&@KdwdB-&En0%Edz6^~McTd|$tY{t-AK
zb}2+`-JEdN8&Xy(^SXT;cVv+2;7eO!@bO7S=}e-F6S!=jk{LM8F6B=m5OQ`8WVSy+
z3b7Rwac<+s-j|xJD=w9<jM%&nf2V-uh?ZlhN<<5um9Ah`E;S=Qb)xGdUFLh*=rh-l
zJ9q3D9-znT4o3I~BM0w>keaw%gRv_uY{gDLJ$Af11lBchbm`B4e}xPxCVMw(e45IU
zA(U=zPGF)=OS)?7*_-2Z6--Nx&9>5xp7E3fi_X0Y(~|N9X|L6S-U2^vG+i8ftVvC2
zb<;zXJjRp(xlhcAc@OAvG0g1Ir^S3pV|*sfYXpo#@C}pDl)d9-T=Q7Lb76+Ihv64+
z_zsVnM{1xVQ!how?kouY5oYlpXH2rQ>6mPzslDXf8wWm%U}?|!HZjzq$R4h)za8HZ
zU*RMY46-oqjPvGy>q{k4u7(=jgX$dHvE&w73r|hYy@-_(?#A^yTv>=gc)pO_15TLO
zu1piJs=)<IabxrozsfI(DO~oh@5emtMV`JxRX9@c1D@DKv=2_N^xAC6I&7k8?ic8s
zQE0m3W5@%0dURDu93PaT19|Lei)a+B#Mzuti7VQ-5T=md8~J|WihnvjwmfY3ZHkjd
zv=YWnC4*CuYYkVqL>|5(z3{|sa(6LJ<Y7h%n1(CeFaqt)@i`u6QX7X{`S(8rqwkl?
zJqgrvaeqJZkWb?pC@F^L@>oPYMf%XMmFm5~{UwuI!@|g1fh^j$zQjgaXEgH|zG>Vd
zaZ*X4s<Zs)P#siK&^N%sL?xCoF5fw#SRVhSFTlVOZQZnGY0Z4w>niVPpvXsxDwV~k
zaJyRX`cN!y3%Bysyo$aw2;l?#G2J#d3twg3)%V{N!S$XzE~;eqtz*h?)2SwF&QIBV
z3&ber9OTz`pZpLz-gj^!+baDYst+o%hG+Exlbs$T7TPDp<sQIZx+C^zMA6G^?8=ZS
z^u-wiRh62&?D7Py#_zP22Ir#A7-%*MHJ0eaTPKS}&Usc6i`L9;RJ;k!<so=6(jHU4
zKND9pS8PEp<Y@ZJ&)I0oe|}UyqIHOJH>YO7l(_rDOYj5WvJXT#m%bolR&qf+_Lk@P
zBB+7a0T0|j#Qz~(>Va!2td#xwuX!`l_&d>?es-&Ua;h~o(N)5gF;(5=_s&c*7rx6a
zOrop6=RFn4@+1l>-a00MDoOk3c;gDoN`^I)h=ac5yMcn0E`0vL3Nhnf&K>{KW_%8v
z3vDi$F_<*NttmQ=%`z^4<+1x_|CZ-#zvWqxbnqEO=e2Q}2kB;3u9$UAIt`e;)HQJ{
zL>n)c2c8I-xL#*Y!8I_pyHK&pZFkpDYcL@2=dO@Ipz5f=;#$Pv2|<L~kon>n#E@86
zv~vDQFt1u);u>5iirq*;wD?$i1-fH-$nU}CM7O*{2RV5ZAs{b(vc0nX{JBzu6#7lz
z&Q3mPw;Uyrka7ESAg1^i{oX0nX!)-x5oJpoN#zo!C6)N~uo#JxX<;4HsmXHK<`nCl
zbFb_Gcx8N1X&Q#zn^(Qd51K{eo11WE6@eOyp$lT%@Kilg>~S!&O2h((6|37m8RhEW
zToP?!nN`pz7b|N}b1sxtQHinT379sdclph;t|->yH6KG#p=_a1CfIOqwy2LDnTI7@
zlDrP_BGCQnF~eVuIb@{nVJ)RP6{87Cjj;inU43FVG_HPB{dL-}ha6F>PslnA3MK}C
z`pj_)E?h9@(RcaDQMg5Z2sF@f0zsxM;$JO(nNtRT80ZK5@x*W8vhpO_G`AquptsZ^
z*n1C6LrWs7Z<Z9C1Kzy@hzYR1hVh3+%p-wwZfbS%&H?YZgF*<+DWj9c8>m}Ry_yx~
zx{&(l7pD&yN7Po)-L3a+@xaOvEpawBA5z2mKj}7H>VsAcxr>bw(_(11M7<%!ig$!5
z)s%QR&6B-5wCzQXUjfAWWWT@)xq}w#qYVu++}||g`<*kIG2wkHzkEYahL74;Lj#l4
z462oH8oo}A`1YY9tcVh^&OlWJQ-H-cMt%Tj7ln;OQB2&X*eGld4!_*!;bsav*JaI1
zTp8dT!qT>h-s8tRmV%2{C{GY|4+LHpX!UJ=&yv*Lz6T%$i`NfPCCQO6c(+0iOC|EI
zj1;@T0+(A!M98e?hL<Y`k+?M`x_|_Tb=XP@L%0JYQWFGFWIP)Oo`lfb!d9o>bSm|j
zH)@l)Bi{N$F~zSNe7>u729N<_g9;bc8bfLlu(4B_RM<NJ$FK#HWR3$N_$puS&1~SJ
zLYr(`bt8HLf==TOEXLo2j>~GVF5yCRZ~%yrr(wGAaxdo!T@OqYE!$-)=6Sa{%B@*t
zQw`W|HISjJN^76+q0YF#XB#1mxT-qYoG0G{80bWU`b$*emuM1}zm$5-Tr#99j<`yt
z#Avngj^?%g>nWF)7bf~cu_BVD5kG9|M`#S>_8Dewn%cZ4g{I6Aq2%l2R$mSt4w;)7
z2bWz%jDqIJG=aE)QUuGgiRr)?4}dfr0*-~T1w^lbB;u*Q+rEHu0rY0jZiVKTRX>KR
z^Q4+pqeLSqLr>lM8x6X-uw(cY^waeUt==N%>Rkp2w?6f^<#R9>Ljz}__@5{I*WIeY
zA5_=}P!_FeY~8_|y8TW7+R(^s+qn(DveK#Vs!pS9yuNE6NfNm&gukl*bk-6*g=X-@
zh5=^U_mi6nV5VIiVvv-94b8x=VY}~%-Oyip_q<j$2se*3L&_;TAxCda^mU?$jKtRD
zYA|oILxDp!)5ML>3>Kf5oQ@3tuW~Q9G0gHkz$A~JiI8nOJk)E77R~3Z$E&F#2*iAj
z#u`~ieR+VFUVo4F(rdrHw9TO#XWoyiZNI5T4<z)~m!D4$te;xWkVxFPI%6R{`7Mfi
zxIzlz7b%%q>$x1IgAcQBQONTEj$B!7y({nCcN&OO-tibnIPhb4Wil`UCl}@38whRX
zd4<Ca4zlm~A^NX+LJc0=dwt{D0<rqrvXP&Esr75XNf+N#ClZv6(s2W*v&410cfd8n
z`WNJE91&}8uLkemSU%$$iYR<<6Hmer2YleN3-0c#xUwDl0bo%FkM{$~0vh3O?=9Rf
zQmTEskAO@pc9#25D9)yfwE&j-<hP~%>F{l&vuuQG>wuE8xDejG65PjZ2g6k~vu_up
z=^iNQ37i3|6UL(bw0KmY-sB*7ktc)5NXu0--j@}?WkRFIsQFP@-D%zR!jd_8v0D5f
z(Bin4)TMLcT=4?J<?Qyb?)`1Wm}<~zHEju3C&K`F*&wn}?}f6?TL9}1?o8izG3F|C
z+nYV(8nPIaWKBNF0M^(%I<7WDsYiA>nDW>-OpN4e+24IIRL~|VQSaPolYh*Kmg;uB
ze10PqY~V<0=_XBLiwT(O%~29Fia%O?^$nVBaF%Z7eRX6svqLMjeiv7-6u%Z%)*9RH
z39dci&k>f#*POZW5AS)n+MAmjg+0N)|Mnqa+V%QnQ`4UAT*wum9&uJgzyC7!DVuy(
zHSA%w*9Sf?AQJLZ8ZgvP<b?0Q!BWfBvw<h0J0kw#yQp)WrUP_(g99kU?HznJX_>M-
z`R%AVk*?`NU4WrZsHmCs)>NC!6#yT^<(anDb~|f<MdnG9!%S95F;h7ewTg*XTi5`=
z@ew<7foN6D(%c#-n8)lqds3t0l41||={hg*78w5YQMA=EL#+k%R{_3wwpg%AMntQ7
z%q~peX~HnaL=s=4Pb#;uIlL{zOgOchN1mQ``@%?rzE_z;$E5^yA#tu$o_A+-cxE`4
zw|7Mt8k{|0pPS&F4Ibh_fQ`m9dT_ms4C}X#hHHM^aYJq&oQ%vG)+!eT3;+Hu0N1<U
zC^N1G$E1It{vaOF@WSf_>CQpGh|C1zpcu1Jh!wp3@rbO9WzzxdC`ybrhz<Iw<yz5B
zp)1z0#^*r~+tX^0F#gf?<!yJX`=5bgU$6c)HEV1!#hOwm$b0|PQ?$zcj_vN4KEk}Z
z>GB+$;A>;g2XEQ%SHRVNkpFOoz^0x7=h2CVSIsBJuYOqXdacA|5_jDq_~9X*kG9n>
z^UJK-9P+=fJ`_R+W;$#U95>SD!WFDOyzOCcR(+;Qi`*yR#Qb<0ShU{7jgfW4_D1TV
z_exeMMvl^(h!9if?pnj;+gTCtWC)giH7?~UYmVRQD&J~=tYsT~!LaX_33KI<7rhK(
z^iv9p)T39|?CqqgV@oUs2g8o%?P~FBDzhGs2=1C+inOw;yg~z%nkNhx_yap@a?lpL
z?jtXQ|EvzMDN>khE{Nkg1E-1FGFen+oH$n8oOb+u7KXEu;05!b)LY}%FogJIjZU7?
z=TW3u&lc~<xO>?J@?b_=z6LaYE`W{yfO#}T1<OkH{8OlJYh}~4CwP7#Z%y8?2vO!X
z@KQPgR+TC?l+50-No}cYbLv4M=*E@YiCC%A?FR@x>Q8=aYj?V6-^W{$L04GF+WM9N
zz|`B3AY<GG(b6M5JvM=!>oo!$=z_Z9=DvorZz+@q)~`{-HdB})`8iwadM-G09l)Wt
z$d~Ac`y0Jj(@OjURfA*4yfK@X{eL`q!r{NxB9u0-;!CB+Q*fczxGop$<HeDj&b&Yb
z{?Py6hb>nij|NQUT(YNb-b*3)Qt!hnQuHAZ`LaM9i>k4~K3%$rYvQX)%G;mY#>?B7
z_MguRh4`(Pgdci(g6x2=MgZRiICP1aX;!@^sHw|QT2n?bez-ewZ{>Ig+{v&W7#%m*
z9{q|rCBGM_Z1m@aJs%eol6agL@#W6tNYNLRP-z@G8gN0bs6lr7iuq2f)O)3sowMvh
z2CBLFeiQc38jrp?+~s36<1!=C%{}918D1X{FWi_~m2qP0DXZ0Icb?Q~w(ILWKnS3D
zG|4%SMkoLRYTH?cxCT7wJV4Q|mRiPinsV*^0!!u8-C(rCe&5o(^NFKyuiinxIrd>l
zLwuU7)WVr?Q~V{|2BXN1@`xYbevaLV%A@Qm=Mo3k*9nO1)1Q$LK)4m1xFm7bB+rGL
z<y^Qs>kuAo*?*CcdnXuzNW6k6H+v^7OAY8|G4bL98hR~A1O&hME`Fm`jGSgX5G>0k
zWI9)FahpYU!P{rTEkmv&d>_pcx3d)C5xBwz*(2pFw{5L&$X$kIo*C^F)b|uL5YaTA
z8lAtQGk=Gkq2-(I{wa@(@6I0DXTuV__k(g>lmVYz<*i`e+2nZ6L)JoepuLH?69cSh
zn@#cCX3r<GS2`TLlHTK9Z^dbK<_?$uN)Eg0O)2D90eyBqX%5QOSMNG%);=3WvuV7w
zl}@L&Gd4Xx^5IdEi~0#c=zXzpYYK?iNwt1Y+ydiKgW~at<(q||-yZvxFaPVL{m5Rw
zm-$~+h=Qtw8&riZ9JU_L_xIesa)6NPCV#Wa#mQBL-+nXFD6;x8`KKZaa-0OP*eV;R
zKz3oi#v%XoPqpy!?K6M<a*l5ZXLo(gNv-Fz7d;U!ogv<-rD?JC!6J+0{dX3%YZnTR
z_@m&nPPIp)cTY`kXyCX%1~w^Geb(t24VO&K{rCYc9f}X%@uv{3S~0is2Dy^$XZq+Y
zd(rlKFq+l($Vq&S@omToP3XO!l^BXP=W>lbc9r1KtI5f)?yJJNS~8+l9~*qyVfgjM
zK`lv~imnUJfU%Bx5PI<NC=Sc9>m_i-G96*D1u(A4>SATbG5qy{^CX68H_T7RBkdh&
z1be}>@U(E=rz50m(;1omRN#BipD+CQMy**b$^Gf56pTuu!!iI%!(01p&8See@Y7f)
zXfMHdk$yGuWdM+HtlXem-kx>6d}8($$jzRbUI#`h4_tRhpZ(*E%Y|yU`_PWRkUTzo
zo{=kZ3${E{>8QQvO&{e%b24E$7i9!|JdbVnDQ#PrD(5zMsmQz9p3(kRZr)p074g06
ztA$49Qa!56!PoLhn(VDq{7P&V;g>C1M9$gBd#>y#yRe^&Un@p!Ghk4_09~)3<G3P@
zj&LlNYI0mMghsrP2ds7S!!v7ry5rr(wg>YW2w;#~<9cBC=AXv8voyg><W3e9YF=Xu
z)7b`EacAOq^z*5@y-kvZ=)W}k(WnNK<WqdTUv?Ecjp+g|a|*!d*V&D-Xuyi*{A}ao
zqN)4u43i)-=;Gm=>9M)+Wr~>EMR;j3g~)Db$R|*K!gC-^)BVR{3t=;)`>^4r+9Io^
zPnOt3zHQthRRwYe({TW-Zq9<Ae$WVTNz;lj==q`(1&|gPfl_P=@>@yw`|8^qGw+^5
zR_*1HSgMsr36~6{3K8}hea=t6GIU^VE_ae2^)#yWly}?-`^vZYDrK+)Pjd7xI5NOp
zVd8&xy!Xz}&x(fk<YVYa&d|vEFL)6dPxy~3gS^dDu3G_dBUgdF9^j0Ptv7%`rxp1Z
z^+g{}qHf^inmF?`#{~xnb}T8Xvpyeec}9=0xNzA%!8_i2Q3gQnPHAvygKu|v;Ays5
zoU3@iK@d+fs5iry>J{zjtCtD9{nLBpCUkLP&=eMu?FIl?Ulb2hIRp3QxbBZ~;2mP7
zb;zCgg4wkmYed&o{SoS#s%Pue!)P2LoCNtcjV>LcrMh#xU2{a)2L`u@@&G7#VCsXd
zj@`6lM=>ToVdjtlu50NO7#xI;E@%iA9k$N(@WDDWV+`vkmB11%7^mW6GN4)-3qb2f
zKm;v7ibHFplmU?H0Nz@SKOWos__3xSswHE>oD`Lhzvc&w)|~<XR_CD(2<w~P3`c19
zHWT=qT3i3zIBXz*n(e&Z+_O6>@BTbYZgl3b$Fix--g5)j3-a^D)7?6_U6wf~TfGlx
z)=+VJ1`JQwJi8aI(YjU=eQ|3c@YP?C8Knz*%~2{}1KPcRVXtX^9y!Xm92OiSx|^85
z=LVao2D2GT<654E4s{rQaO1g0mwzGA)NsM-=Ku*&U)JFAckp9P1rn;SW=F#ISApeJ
zXufV8h&I<ivLWulk5`*qeGg>(Do-AsRP9Vy-gux4NvN{DC1DI7aBb4<2xJ;>hAWO*
zC9Dgx{3LYMsa8L3OF7f$gtD@^517_*giva$<zE*Rgr%HULrp}QTv*!0V=TMpbsaF+
zS=otSuCH><Nx4j?-dIbyIN^`NR?z;sR)mQqP!p)C5eHzk<E9(wF7GNwS%f0_1eSQK
zn}tePUp1x2v18S^aLEF|I=o<d=`GpsO5zXCewNmm371sK{lTR{m+QQo%)IMBQ96I1
z=hOTE1mc860agM^O++4QS7ff3Ty56dFhb~9(@p(o<A%Tr<O2p)D70!mEE824-CQ6h
zv<~sp(dSw?SY=eX5NfD`8cZu;UpZuK6X6Prr|^{et<}V$!u0E(`_8l)1!%R|z`&tT
zGmk0rhLL5844VY{s_tqQ+E>t0tyX-Hzy<>&$0+~?0;|wPGY~?Hss*_DKIPT35Qp=N
zngUw_i;^1WMDT>q&8_xdZW_PHHWg3QD@QsxCV#!S0@3|#t!dNd(4eeu?#2(_JGa@1
zAVTP2UIQ+eHhjf`oy*iD1Wm2^Fqm=LyG2F&@0bv_^tbR@KMHQI4MbQXJo0lnL$C-{
zH&@P_^?_Yv4QC7ZXNMT6%rcxhcIIubh9`Jq-4G2w8e1*+g*gJjfAGh8MTUlFATY;}
z499s*bco#*u{UGWKnh&G-NC0X^Q@3K+J7x8vXR;!!uRBFeQp5snFg)T&;F^;B?(F5
zRePzawx{ZzUGqk7uX)GN=bpLhx6!;EUu_wM)%N0%OEl-?dI%BKM#tn)v?w$t@ry?2
z4as}J)HlQ@Nc*oZ5g4S6HhOhPYpdZU|7EHL0Di0D2$T^k^*n*S(R#-qWMl`9xItf_
zL@K>@Y8SlU>nqZ2EsFUv&ph0oMQU=sNi@^N?B8x0{v}cHz)k}Q+&u*XcVWjXEh`_{
z>a(w|k3G`S9SyX5+L1vjgg32QS5=IT++E%?wR#Ff?v7uqeli?OxI6qmH!XTHGr4Wj
zBN7)fcIe)Q8SIC+z#l6wW+&;XgA9Bho=#H<-KPs@FG%N9BwsN?mlD;U#W%Crvx27p
zX(o!V#2c4ZnZLRN(2rPrDh1Hxv9R6QC<0qNUQ6l^^CY6^PL?VKAgTGP{H3zZ3J=Zo
zt`gP@an9S9F>pM0(se85)jfW0;iZ@X@p3<~Pj+FqE6;Lw-48WyaNKTN<Ger0jCc4&
zS1oS+J#Jx%sf^H2*KaR<WxLP(*h<4TzFRDM3!S=iWmzCTC?$XTw8K@>sx9ew4#3qU
zaPAx-!op9po-L1hjvqH(=9haj;Z<LD2}s?2z!TbUnB8qEh<OdtoG)QqYrBXE*TrUx
zy`(2$v0Bj4QV^zogQoOx)#8CQ!=yrvA99e?JK_xPx)zGH@Y~4on<Es!WjSgr)WW`~
z4gm#QgbF~b*PO(K844~0`pe+m?xT9lst&KJ!HGF|BlOM_RKI*WXP0`6djF-*1i&n7
z{Qzo;)8-MA4}st~(1{{k?cl%WprThNBJnjvSV7{u=HR~-dd>EGF!qYig@;B+po@xL
zsBAc)$m}CpwUbookAy)24egQ)u+bjY&*a8=vvl{W+P?x2Bo7TiG|qBAKqtX?-N<f-
z`g3$mQFhu`^i=dF`UdU>LVc&DT_R53LYxx6f75oPuum!j%8HtlBZF}V;b&#V(bAc2
z!@p(vvp}EW8LciwW&XNn%6e8;L>igISaRK?Ap>;!bx&*Q8LeJu%}FnE3}Uwr62yHq
zFjf9rL!{Z+2Kam<$}AKe#HT+ua-UY;M`t~#TLDl_lcl`D@}BB9seZzI?xa0Fw;XLb
zIzc#rxJRduJHcdxNlaR`l-Sps4=BDn*+9n=tbZT{5st*~zBdEW@xHmEeL3O7S|G|S
zV?jq`1AMqj32)oB@&riF3W}|2SKEBnT`wfs^p8YCYBPOx^cCj;iGF+`(FIGAJMarq
ztzUEH`Rs+69;RAZ#Ld;{)m8BC4)m)Mj<^|kPCh1PmC0Ovvw=uUX6JkA>8C)_qbs@=
zr7=aixiO;pc4_E4(^<-+piLKv(EkVe;HO|oA>VlP*?!(oJbx1ZH=bUfG~sT1kEOt8
z-8QmztS<Gm4S%lAE3<8;OHtx2^l+5Eg2)0mEx57qn$mSfl--w+tainq#82WMZAK^U
z)}|^PPto8*^B^qefMgfVJ%IWF`ELjPsk7nmm`K_TnRJ%86ZLFpa>1#oPC*CmVzL9@
zZd!O_xmI7WkBXUi%NwFVa+P<373hfgfU~7_!!te&7%h8){c+fN&SSLSat`~*G!yf*
zn*Un*_27M*uIZ<D3i?p<>Ouj~64=lf?$ibKczi}Zy6cKA1RDJmi4g$~I{nN+^AkzF
zVf%-J&K!k16W+P=<uQCp0S7rz34q%AyrY+X`%wg+drYS!Q(lAaoqiVo%RN`SP;c#p
z`p$*l_#f+V;f0;jje)b`P@Fxkf@2bo?03y`&!zc^y>FgJ+0jhJt&^uP&MtJ99S|CU
z_~ka}4F?0^1b}l$sugYR2H_V@ONv4zt|QSE#UmBO==V=VIc)FjZ4A(5#nt7}`7dW>
zML4$U#QSwVIa6nio;wJ>U<uxUW&1N}-hK4E3ExJ8rE~X(r^u=L^<|kW-IF3Ja?=zW
zLs?8;bsb7WZ5*EX2mGY6E2g?D-WH#v3T(sLxPsZ^fM=ctJo7Dz7frO^`@?p>!E&0u
z&rLggE1v(Iwo51o1^5PKuQUxgma^1D_-@u~Karjn%;&OPzG9xxs>?3SauW=c5@$cT
z9B0UA@Hz*zYZ@j|%h#vtWep>r)w3kIb>KC9rK>M0Pr5ZF>RMa<LezYAwE4Ee7Me;g
z;362P3aDs8m+Y#nsJDWYi~nbuk+i<Dp^^ULzr)bl2F!(PXM6+vIm&1&_dVttzETj7
zhL#-}6!8Oku3F=&gjLMgf_*~At1l@zQT=k|2aKKjyLhlbt3Kdz4Aj@g;>o2!*q8VE
zPCie==aO71t*N*EQ0W6jAm;JhY1vRr@m!OU!iu%MYt85=^svds@}PWWg(7k_KpdTj
z9+-c*=l1T?cvhRr^XIh4GHgyv4KiAc$>sJ1+Vutb(!+hs<^W6a8$-;?owh&C_ZMMX
zw{vcPaf*0-_)@s52QA2*r#uLy*#8Og3qX(+>2XEv=WVXZEnEn4`mB(`aaY1`L2f@6
zWcNh~o2a>x$8$of1v9VHJPpUIXu(MAl&f#CNv)Gb7Q#d(Q*`YsiOvOioce!)44hLI
z^Zo`KPBDJBg~QR-c?9DB@OIMYDKwZ?R3CjP<a(L<Dxk=%XhmMH@ORXVZ(Wusnv^(L
zrgDFm#`{zq*ahCpNaZGwtxz`0s#ov{>zKX0(gJInL6d1om<9C~!;59aY|bZiL>(Qz
zD-Jme-{owRF(Y1+Z<b@EQWC1IhppF<ANE(B#qWY#$7xVDue1+X&dP_K-_FX1udG+L
zg%8I8K^C&0n=As_sv`_w3115?1i5L?%DzTUV)7hKyMAps!_j6w6As@Ve+8@6j44<$
zpbLkgu_}k^MD5JIZ(2z)PhGjODYlfTfD|;9*DhO$RBZ5O5s_+T`p?*V!Oi%`M}3(C
zb2oqlbb5#Hgp<Fk0xy@9Dxi~1q40!m5+DLmtiK@^p$_<FYQQ%iRD2u5;{HLp=+ko_
z<qAB=nMha3jY*Sfmr}N;*55*)Zg$B}YEsM%Hs#_&*v=Z$a@NK|;&SfxDjfb1XN7Zd
zPJR)Qf#w@)1VBR&?L)BJi=eRjuJZe`fHc!Z=U#3O&BJka&Q=+q4#+vU4_N0h8?8!5
zu`<ETbMHK4K13BU8;&w%V?V}?6bB;j9m8(N<=EKlt2G1*wQ*~fJ&l@54){R<m)JH(
z<u4M^=qS*p(yy#G-kp4)a`-@S3)2?LQ}_(1OXD=(!+IB_1#CtI>&esB-1-b+DVrNe
zAcy$qZ26@DIXp_MHU86mggOer0UCK_JPMN*bbV4yIYOBE+dYd*QRKaCmRIUS6(=#h
zmLQfl#1y<1pX;cIsvYvE5)OPaL%DNqoqtuO(A~oihhA0&@CI!LQ{*Q{eaRGS^}|hy
z_Qe}vT+h(;!{ITkWETR?fbS09(18zi{lyJFIX(z;mIx|MgrkJU0)WvF3L`P9O(jo=
z{cnNxgfKTzHp~akSgx`Gq1n)M(zaQnW0a>+mpd#j36N)WR|O3<2J(TsLH@R255S@I
zb~293Aq)4V1-qmt`{Ova(>!<!%wtqo-<fw8L?<Y9BkV&u5T03|17!u%Q2K>5S8Bc`
zpLMOo#1{^wIBCZ5_cBoKZ<;4L@zUgai>SCylgZw{4Yd1FEmsKxO>wgU)hWe!+^THB
zzuaE{BUUx&oUTxr57+?Avs>|Xa?L%JM7AX#2%q<7w)O?$u4wfO2<=j*0C?y3a@a2J
z;<PrirZNfH1P#(n0^iVR<HgWkxrB#`m(nOHza>2#&1$ch$8_}6Cm^VaZ}a}kW_Yye
z6)fiwrJl6mLcGma^trqSAI5-iFlz$e_FD4e?RvY?rLGUd4i8bcf1rEnj^n0;0_~-<
zhRqKPFVF^(c5}r8V}wlF%wCQW$m6w}JwMto9X$_vknf0*_)nTZ2jw~3IIRRj(fc^i
z?Tx3U8Gold4B*gHwV}_P-Wb6(0fV*P>GC9)FGfcS$O(V>W#tf}4n8-}bR(~>cQL#{
zC)L?k`Q+A+S@!Y?#)=qgUUKzkO)Cjr@B134&45t!-bnTFp5n*6`o)jTXQ@0*Ah?k`
zG`ZP7cZa71mrITMGri|Bi5zw(P>#1SYc0k<bWqu=Mf>N~zA<~-@nO!R4r-vzfzEnt
zDC5J^7Ys+xO)IfSdIH9I5&E5jvdc}7wK-hj*&^|x{e(x?oV7dpZyt_^qvO#hjIU<W
zsO&H&hDXjQH19d$!09Sq+97`-y;rz7UOL&?%GBcwwDSJQaIHTPRfaP`hTznjN<1~r
zcs1t~n)rVddbiTM=?rn8LeLD_>aKy(dj@pWqZD<$xjVPTdf*oHBqPss;3Q2FlZSZm
zZU%3jhRK3LM`7RGc_i<O`S?e<`M3pIZX#fkFa7d6G`YYW)EnMHPXvTf>p=+vu_}aH
z0EP~Ho^`<6ef6yQaV!-@AamSqwso~uw0mm%*c<<F6odxR)M>8vu-Aj=o)sSjg!Cd^
zHn>_0-41xXcL&`J=wJO&D`KHx<E0<W6bf`P=d+6gUzWhxiLwQHHdaOQv}QXT7I8qQ
zX6GRKn!_20=4cQJthoJ>)-PgIM){&_NPIY&Liz9<McWAZ*sq`)1zYG4PgjTy7=`h{
zY=ifrNLY7;@PLhJi^NZFBzLmzRd)iNqj;h@FjyB#fdhYZ<uG^nqzm0ig4Co3gqo!C
zT&VYPr~i*odt>_FaXTX%0d-XM!B`M!q!EOTBd(O%nc&HF>oXK>3!vz*GZdYqJur7h
zIAXxSmy+*t0-10-8WtMFQJKDx;UL%T8Ah{5pO9z_eZrVeJr3mZEC*fYmJvXt69{*(
z+t&l>QlNvd{B+~JSIZ6+#UBryc^6h*jP}pfcZ|)xg^EGpzvCU}d;{-|X8bvTZlHXH
ze2FQ-V4(*L_?7L4{qhTqwk#>e*9JjR3+Yc}{ub$&{rA(Vr?sqG<sd_?EK?Ny(%}uD
z+d)hRyfhFRGIF#*?Dv!}w&IT2G2}tXqV2;KoLSXGhN+*FD|_%JO(5T4SXgI7qpW<}
zua2Z$h{RI3<DOT&8&Fia63P9VK)5(bsfxqd+b{g)uS4+Oyzq2H$2h~t;N&#eVG=Sl
zY?2_uelFF^f22C>XOR6>a0Ec0Ph$WA-R9cGmCrs2@%FW|#9R-vIW!Hz0$Tn57tv!@
z>_wGxshB|29|DxaglBKs!3=+suX*hV#(4Z&tUqY=+!1^9^g^tQi_Bpu&%aM3YMH_c
zetxY4dMma*$Ykuo`}W9q1HDve(GXf*(cNk@T*_ryF7W+O6U-xgc!^UA9DnD{mT%e!
z8PIxp^^s;gknyl=8E+V+j!e0eb_3HA_{?b+Qm5W?>#dKu0-5P@3%t9_a+p;i@rQQ7
zLlqwZ2b5cR5tyD>SOHoKJ1?`jJW{>T>dzMLmAGr@n8$q^#F|{?4URloi^}?765Oou
z0*K>T&2Y?vd>O7mJ<S9I%7zT2n?Cc`NL<Ae`7n@GyXiCC@BRq3q)I;d@^4$s2-s>8
zl!BYHCJ<|PZSvw+<=b^+EZxFB!V7g}U=AAFjFd+Av8WE0QSozm1*&l0&E09KKrwHQ
zRCn~~DcAskAT<p-vKL1=ZM<`3*P{3ZP<EKcLcOBkN&uz>$#w*l^#dJ-2%u$7TB@t?
z)9uYOSN$T{<){?o>ovOod57-&^Z_=CtZ`HVTC-Jp>KHDp^;ocBF@Eu=v+B0ky$^Im
zSWt8_4`?#kd#3XVh^KGNXK*S83y|CY+}0*zc#fTM3HWZ1pai>4f$RM8vkH?L_ZL#p
zsy*h@qx^qFyAfjYRO(!`;m3K6feR~4dsC>KZf^N1_Mlt@3y`I@hSgqnMM<E8)Ni-f
zT#s&Ga6s+K%AQIVBfoZ*cW{P%AX$ari`k(qb{l*g`}NL~Y8*oVOm~xCwLd|FX~1cM
zMW1?7Jb_Xe$D}roX(qdjJD68qq0E92qNe%Jds?_;>`Jx9?n9nv*MpZjtwM4UEg0n_
zX_q^r87xq$Z7>g|XcZmerMnq|Xw|-|I0|Ief!N15;XDipTDbz{2KEV@ncO*x_6y=s
zV0*PiPGyQ{bAxqjgY#D%Cs3I8t{o*j3%CP{EiZMh*!dk&Cjofpf_>{Va=Q>xny*&n
zv`Z2manNo~)J-;okU0xco7@FL)ah`e0?w{a@H}$J2?n5Kx<Fx=)~WbMjSg`3M=N$N
z2ah&pNNN2>`#6)-%ATL>1iy{<n6)2}+<N>Kl~BtI4JoSHN93<(=V#~VCmBSW5x>?o
zwtw(hoZ;S&ZeRLIx2K+L$@5R{UGn}opMNkw*6y_OMBe>mopPZ10FR%U@2*;<aW~`5
z6k5EiL?nr(i7bxs3(M=-jtdOLSdN)fqZxHmutCe=7jOZm!?@(Sg3iKnkNj%2PTi(%
z^KxaJP%C1{d^epiI7!>h(-mc5|CwN7xtJHR+mLX?n@)L)p|O`6DpFAH+e&_VwY9a4
zmkzGLyRZr0Ir3=$<9zc1F@vU?MAl!PJT6Kxm<U(N=U8uOgjNtgvyC_nP2CO|^wR|S
z(9;oRXr#pQ$<2tFUq4-Sz#E{Nzk*dI;r20X<5}TqL^^ZQ^OI4AEd8o135LUpYnev3
z65+R|#im1IL&OIs>SH2WLbU1TDljksN9zcV1bN5D<vSr)8Xg$0PAgtXF_E@-Lk3QG
ze((!9GoHP8Q(oqEdYEs4{Ea*rxj|vkoY)=DOXK%;TTtYo1&dd}Q`fFLp4?5Q1M=Kc
z#|+iuF*LSHVeXnwi)KEG5LHChLu$qq;%ZNUL?DMklK=a<8sW#yoHrv{GEh2Z_5|Q3
zjBdCfhJfYkcjL%@2E+^bU+I3Q-Ka-~d%Ifx_%RQ?nVNH)m$I-h+wNfAUWg^8n>rX9
zCFD`HQrRIch7-#`w49k-?<Mwt>9bjI>aGFIoKJ5RXT%xP@#NEPkNHsoqH}JpGR(kZ
zVoEMik8f+8n;Xt@i8v-0m})uxWkp0?)Mdug>%4TY-G#x>%SwTV@NfAfW->*7j^A=>
zvtuex@r1}ow-WfSl*T33OQB?KP)S6XPZ)>}CykQxqklzT-;UmXmsw57WI-TMfn%%+
zHiwMK8!R90Y-`-@P*5?*hIBm-pkS=t?A04;XpW&J!oWCX^96+yM^k4nrieLr!l*`Z
za)~}wVaA^n#u+p94b>UH;hB?v&Ls<L-|>W&Qzt!hLruwz2YWoICBY%s|J6MjxcvXv
zJL|6~!?s;B!w7@a00K%54I(KLN(^1n-HnKpC|!d{NtdEXcZYN%pmZo5g0x77G_#)p
zeZTMB`(M~=`I}2;J#{?ieO%`~BN85RURp$(HRt!*%S>u$NcRZxivCyUr&woWL%%SU
z(MI9-i*|gaueTFZx3I}UNCX7J4T6F0H3{H{P*12RD0JnxY44c$fG^YGA{TEzcEs6^
zF{FHIm7c6SU&Rl|J<^yT@jYylWPrXFhdV8h-qdO#mr=Cf^Y~Lm7DJkh(v9V@p}WaI
zB&as2vQ52M>KXGPMh^FFy_RH+Iu(1_yiS;{aC+AaWJjf2Y7w;;L-24md{mkQzivgs
z=eMPRk8Zb#r}H_4lI;=5oK&_#(6LtGvq$?p{Kk(dn!<)PLNE`}?b8eG447YRS>i{{
z^!>I$&tF`mD@xvZV2QjTA^+7m8-|uVtWJ)w(id^llwQUuPd|N(7t?A=_L+GuDF(Gk
z1}<==sKniqapqX+i#g2VyH5isU?C~3QNH7kdmL^#sAbaZexqz!ig)_K?X+aVI&mr_
zK)i<SuZ9DmL`k)&pj<}yJzE6fz6ZiBv_}$6Q4Hr%5s1RB-u<3O)a7hAnKc~pOUrsB
z2F5gntlNcDEJ!2<G*1?T1Y^B?q%sF}qKxZu$S@g`gWb(IkZim6eNc48Z^x;Q#HPDv
zO=tU)vmKvXdYGT4Ck5-yC2GC~6BiD{@=rf<B|h9|*}!Wjeaqb9SrhPqX^GzKIgNri
zLK<93vzGRS|I&E~wY)yDw|7r>h1tY&qXDWZg{=io^8y~_p$k|fb!#Y=*u}cd>ID8U
z7{W+&Jhxq~-Y}8ynPXpCWZ|G_ZD70ip`+lzfM0fWOBm&ig8+msM8b#Tr2{d%XzbK>
zgi&Gs@>FC7_wa%3&fBoov^=b;BLQdE_L*Ack8?Fr#xmoJidnJhhkH<`^4G?&Axh9=
zj5Yg?jGd!Y-|5F~(XU0u)sBNWR~XYaWYk=<ofKc`^67dgE=?2Wnj}1q%h>^*rcv7T
z`BannFBlha7?J;cE-Ff*-!C#RiiTo)dQJv2;G87N(-cH2j-YcocITpg)R{`iu*yqG
zIuIqyrSgk{mhCIxBQU`0#H|oyz3_wFO##1OIV#VN<4T@#ItgZZfLm@gs4MgDuw;J}
zZWq_M`MFfqu1asMK8YcfF9hp&XqzSn#=M##9xNITk!ZufzqmA$!QIpHbInN=J-+X^
z^5P_>jUL(|V><Y|ID=ls?&0TO)K865a86u52(g@dxe1D<;X{$FCOD?x*4EV5zA+nX
z?`xLhjqY>Hy#6AEm`vDXkhfwhC2znWmZnd4TB2BPG^0QPxA>Dmjj})OPKFYcuxMqt
z?g_z-USGCZ&S3HEsW}??szIUiU}e}mqw04-#F^N<7)9I_v|+}^G>WeR<DHvfFboh4
zaHZ#e7T^@4Jj)^|8jeXCZRm9c(-pzAI#<x%XwJ3L&v%#aNp$_+yynjlv%vuGGIAgM
zv5=BHpAM+A@ZN9dEQl?e4tYedh7IBbi+L3$KlD1O0rio1c<@$y9RRfAM#ggwi<-p+
zP!rtrCGg4IYtYmyRNKuw9>AjJ*9gkqQ2#~V9a3wxdq|_O8{S;uH>=OZCW}!k-F-^C
zUb4!M30!3oe^pu18=~jWA3t1}tutVxyqMgcUfjgm2telG9Q?ull|8p7cAq)Kgj(U%
z>~O~wt^;c{O!-7=vA}R{Uf?DR?~@tVN%1X2BRlWg14hA8958+c&2CG}AZk9wlKe14
z$4fT+WRHDAQ?<kI2lt5U8?fx9m6Vth2vR8p-)Z|UW%NMbnT_7W_|oW+%TYSS0bu7u
zJmkk^ZPLKV?&@-#`G@430jd+@LMjqD*PpAQY+|pW`V^pZ+_)h9lypf_p99xBsA^je
zqPEy!oQ<<IG_hBjZGY?>hFGNt;58mX1HtEndNQa!xTp|BBEaY67AunKMS*@kn%30f
zp-Nim67S7$Akr1#Pnec_YA?y=%79b-b<)PTd*bUM-Xka!4|r&S+nRBxq7Txcyw1YJ
zq#Z{}vT-{V>BlP9Q$l(tgORMhmS*?k4bGl{Wgr9yUtrx(-h4;IY==bJLclD(;_2&0
zn%`Lzhd-58g>0;xe+{$j#C!yARhpNw5^Hh`Z_$^rm7(XT9rKYF?AgV@^?h&n`GzAB
zIR)7nd~BcbeC+6Z)Wfxx_qE9vh4Hv)Z}`_JyM7N&IA>!2s!|qHK{Ai~oH1-asF3la
z03Lz*e6hVrVkb%*p#ur>ZAoD5NM(G?!HO;RJG(`5P0T-CUpNgL@|kJpoYH=YTq_HG
zn>aXowe<Dgw|^VAmpfJ0FChj+BH=&~!1TeJlB&o=?Hd>R(@U^gGwfu}J&3Ca3p8lf
zk8;l!bX)^)ttxaxYj^SS5g%~Nl7ZX4h^g(YwUn=E8~j2Z@9v%Z&ft!&-1J$258d6{
zYur=D_A0ApjCuE@-(-JJSNgs2vMvUYd=Lb{4b}DYUS|)=J2$ZYG-gBYrrm8bI;Vne
z6|u8KR9pM9GCcb(LOU{Ig)`RaM_I0ad>;x18@lhG?&bzVGdetBxb(+nnl+A)wD}>)
zg*c)RVk|Nw9$|lOm4)gZ_3Q8bWcohI`<KZU*3ez@;~QWZI^Ylk!k4c3oGYFoe%qRP
zr)ADQ+qFC?(BRFxtfBrnxj5$^PHV|11v;_VnCDS!2m8d(!>XYnuSXsc9eGXi@vRq!
zUbW<3LWpLSlucDNW2Vk1g&J(MOI5OCzbWp661|}?QD_+eMhtdij~>*on*LjO@)M6Z
zxEOVL*+5q0VHLn<5qFqN4p^Osq9hJwS&vuAYuo*OVbK!s<6o#u)&11$i8o)mUYt$a
zm`3}7c_`+FuptLh^E<o74_)7gMagJKCd4mdpi$%j<O+DygQV=a^Xw$i;-4xhU&t_S
z1++>-eA!$-#Xq26c)$D?wwx4ZjU(*-s@w?47C+s%Ei`KhF5Zg;)G-GDOW#(+6>DR$
z0?hLuAXo@HaD6&R{WiY*3&Wxuu8!#-$Y+MM4eOKKIsU+L-S*=61eED!FvTBOi9ccq
z@;3p;xLIyoXW$?qi`%OB;1Bew49p8hen^G~A1H1KVuJ6&fCua*Y%zaf?uTRM7tTv5
zj@@vg>VEn8#dXmszea<WHo}*2&VOjZKtTNuFWaq-R)UQ*M@_?xB!7MhcZI_PS_gmF
z<_;L!VMe!6@FNgp=$neZ-*mM|&b4w|a`TC$HI(|Uk_2LM_8V6$(J!_5B2@a8r${|P
zs<`Q6aC+q3o8HHZJk#AaLmaU|mm5c$ypP+kpox(PN55#}Q;w7eN&-93i6P)Dr!D^U
zIW4xP82S~(Ky4BHn;3^L#Ipm%=~}m@Bw?S+3S^jr75?)Z{vl9^sQZV!LgoxnstA+6
zpyR|gSc8B9Tc>H=zQ2FCQP!3Vf`m%|VdWup_Z8LNN7l&xj(;@sR>gD<dsDOU(}y2d
z*%O0MaZik+j5Q8nQx-KqeIxqm0lh)OVZcEH18cbl5m_Syqy^9{HsVQ)g``%FDi-j9
zLE<3YzeRm>MQnul?zx?+M3Y$^uUYe=!zNpU(E)wicSltqUpCd^iiyLS!TuyIX{v`_
zJikJ+_tC(*w|pwhd`od=4HsO2^D%ED_b4*GC&+HA3>!=ZoQPKO1ie)ivGug?{kle$
zU+@ko=y%4t9Zt*Cv9mb?0&clKOA6|0BZbYga37o%OVORke<tu9Q}oLpQl^*i{Z<CN
z0{^mTG#8yAPMLwHGC9JeMobR1+N7QAf$t^`cLj@`8r^4WFsZ!PQ-?DBy{hj@)a;L3
zhrEjL%a|Yb(=gh$xryBo6}@`2Xe>y<V2BB-!l``IDBR+mD`{Ufgbjwn-y^juL=wYd
zT2pP$o{qW8hU*VeLk{HUHPk4a1|Yfo$>fEo^m>MP?tIOp%QkkHDI=^%NDfD5R?#x%
zQ;E}trr5I8<iN$(+hm#n7*Ip0w1VfzQ*4PPxeCLVH@L(xAO{ky#KaloPkypMf$aHz
z{{c3mEj=EUU8VH&|9}4yh^kV+)xYcingV!=|L;FT=(nwn$IE%j|L1@G|Nrp+pB$;y
zf>@fo7^!);2O<X}xg4=YZFo?duvWqq%b|sjmi9u2fdc+?wm!e^+&uAWamPksgTBM$
z<Xkn@Pq#_*mWtRLy$aqLU*@&*c@wchZ2}SM8G)ByKiD}>+|z%K;|tu#QgXn}Ndyja
z+pp78K21xHn!50JZvdac;Ry)w4*?~2a))VAH$$b^C%IA;Hc=<r>UFKRp*H@Ab^D~O
zi({RIWUsoo%QH$P%{igGz@49%(8QqD8uIL)Ut6BaQ2J9OAV21NW_}BkH2jeTnd0GM
zCwOZ{3|UY#)sg4dd(b>TukX$<$@^jv_vV;5f)_M>EFUlI7^qoDuxqumvxk?@Z-xiy
zQ-=52XE&_oexSx&zy{5d0Iw8+V5jeWnjccE$J1Ax?m#jaoX#u>IR;&%$MvjBUrX(k
z)XC;ZPk{YvNp^~xRMyu~<RGrp^$a1Bk0y;BDBzJ!#IYldbC@_C#JjUDjsOFXp&YWP
z8pn$C<#@((+rmIm*bpNq_<_G~CEOsc8Gkk2$CgM4cLm=KXWJk76UsPf{8&EDx`U&{
zo}HJCM|{yBU_k~uNE{&o4)jp2chG<1c{3dc@IDS`A0Tj0euuOF#c;8XySc`zAMi9x
z@br`1?@~2N*eSlhGTcUIEz8$?SGk(Ln!sT+{;wGyc{nt(H-33soMXu}y!ol=@l-k)
z5T)p%P0NS=s8iMb&s&A2o29cLPlQM^Z;|fxZwpwLV)=0O<f+%1TwhmueCz`Yso-9C
znj@I4cT6oqKx9jN#w1pTM%H}h0*MJX)dbg&dfMpoN2XA?coV%lfzFR-Mt&8Z%RCo+
zgKB>lN%Ywzg5-Gjvz@}2=SmCF?fL{-SqDZ%3J~FsF(J@1Te3Rx(ov~f#<F0aBmEiN
z2Ryf(K085X%$@DOo1dTY&a~3QHPDx9AlT1K4Qu(0mO2!AI|9+|PCi?*Xu(O=5YQ-K
z&plNJr-2E|&Kp)J;#0q<JG@J%G|+LANi+qX#_x|!o~u?sB1S#}L`^tM1$<0St#W#I
z!ZmbsIJb0I<rN>PM9@tVnCbxK7U!^EhT`f5Q#_y98yp!tx(}g9pS^p|xBA94yA)^;
zAJxW2qFe7^!fNRmLdWR727zRV>5#2~z!h?$BQ$ER*NB%hNQ^5|ocqZK#gm=)Ra>v%
zp1ob@p%BU!mN<k&B8i~7Qu)0vtWbQn`$jVu=MTTnQXJrM`Xfbggo`vMTQ?O`1F%cQ
zO>Y6Kx7#-&Q#jcQvwI5IAdmxPxYkDjZ*K=?uiNQ}5Km>d^67FTS0<)GqX7qOECd1z
zH2y#!`hnLgJPozU<I8U^E5g2|1G&$C0&rGLs5dMREi{N_wp9$yNABOcnaT74?Lee4
z+~lj|zUZl_1qEC-W8i#U02UFYVE^R(3RX!8neBR=!nG09DXv;Hkg`ARCB@Ir`$emR
z#59quArN9Cn!WfE+TD6G&L#JvmxJIL+$wIe9q|@OY{%}m{_#DXd9|(Pq#ya2)UqEA
zaB))tkOaUY91$GAAKUwA#VU3%QeBQ=x9x0-MKyXQ%~3J2i(=z;+NYL+v>zWF3g%4O
z37F|R*?k3lB4!EjkQgkW!5+ux&R+|B>2J0gR?cib=EY)yfczQR`ei}0=TI;6H<fs)
z2+PAYRUfX+hf@l<z($3&&>SE*lmj6Waqoa{OhBXP!xpSC7g!yz`x`M$GG?xujP5Vr
zTBCdzoWDZ;#3nBcIMS*enF_0wbr+lYnr@tlFDe;J9_%m0+vu95Xp9G1Jo9mHI}t<Z
z8Kal0zs>HSxDCGyvqzzJ#21CO&;8*(+fAoX5$PAeskZ?R7q0J2u~{R}sFIXo9lrFG
zLK?3o5n4pTgnGNWSIYV4<9gOgsjv;+A)flEVs2u_=^OnR;Z4I|m8Fe=V&Vuci1)KC
zri!)I7_$>i@_r(D5FKzhF+>x0nFp!(FF&fIj?EZGL(jI!_w=R7oAhS)I~C7qAqZp)
z(syem92TCXuO~8FC5Kx69?r)cVr2&=h^Yj=;Ar{Yps;~V`cUBNWzwapViW1C#Uly}
z+_MpSXR^L9HQf3Dq#?Nb6S;=EufJjDUES#%OKzQYObG-A<TJf$;%e4!sXZ|VHuC8U
z)QL**yTnQFw3KMV9pZcLm=H}CAf=7Qd@(V5niA$fT9^-<Y+V1%Pv4(rB%%5ozE4+;
z82xyT^EO%zqFcVY#I*gQ@u!iCfL_sgx$`kW@(M$Av?a@6gxfFP9X37rmyc`{e>-o?
zS9*gLnDRHXog)YAh#GdVq?l5|mfZ_eQ-r3Rcc%e84NpTyp*%cI_VpCQXr(_=c%|B3
zFnz-x!?`+TrmgqIUP8_=H7~w@XL$I{Bje&#CWwJQd{@F;h9En>DD>)(ss2LFD3S+@
z{pej*jI4wf5!QG*F(iw)ws=VLd&NmqbhG}XQt6w`ONMR|+6NkOwI-6lNjZkjlhe~q
z*V+z{--)gX)zX3jUb8id+*+gJb)Vk@F)<~~%}cfCnqh_*ZT|Cl_9L}x+P<1~Cvo@k
zf3m+!e20ASAZ#XVe4PS09)p<Ed*zj0f=x8=iNq;PzCtPN1eJ{UX8LzKHl<8NZaZz-
z=62K%Yt0+AP{6h@0|y-*D%XNvO>U)HqH7e0L~7&2hr11L5=Ryuj2{MSZ4J(SQ+Z+{
z)E?Pu?iPKNgTLWwiUBdFbK-oO4T>yeWlxH`f1<;0VHVMh#v>u8a;7E=O665*$mRvh
zv`lJ<j^GCAGDysJJ&J{R0t+NbGLIT}u<@QE7+})YN{x-zRhnj;PbR}*UB!2M*Cns3
zS63STO7ds%#(0ylk}nP+&A_B0>(kG-I0*2)!JrD26zRxUCqeM^B~ZLe^(3qn_BtPG
z7!xD)n{lbfW({|Uu=CHQ6C*3}Va7dE!K@)H;N=XgQ`TyK<&2+p)93?$rS$um=K-DJ
zQqU&L*)Q#>@|$^VpZfY}D1C^K0FvkI_&(krcxy-9GpC1u!TR*3L`>`ngE=uvwra#X
z^}ie#0$=MQ5Tsy2_EBEOnV{-W`-|j-ONtVzqTks*EL=)cln#ECm>}5g_kfy~v9?HL
z@3~u8F?ACJDu&6CuHw_CCUtKq%URwj@!r}G*{q~_nlUgqMZZP<6nolAM}2Q*ImT7e
z3uekRU%!G?0em}R6%pZb(z~2Eqj;)7fV<}jtvA*7O5HQ!sK5UF;_J!zhIT)S+BS=3
z<c1|J?QL#a&<u_e_loo#g3~d)R2+Kg5Kp?Y7sg~(a$S8!N4BJgp<1tPvdp6<Zoqpm
zox`3i3$V4dp)kHsV;@ikAToL-Q@$O3fv#k*Ity#pKLN!$8o$25rKA9try`m4=J2~g
zv&>mww@L^cc8r4kAbb->vWGSVE@(O%rF<Bze&I`YvJv{>kTCLnFgnFG8?~Zfq7yub
zCw^K)4<>$m*eWB&ma(6Aq$W{sT;g9NEYY1zYw-rBB+S9XzBA30F^0MI9}NqtF=2zj
z)+|m(=V(4p@@x>{To8=P3J{eF*8H|%Pu`-kJR-qDv_1yjpr*0I1Gfr`A9WP4Lm&%E
z=zJ%icPgvJ6|a%z$eQEy%=dXvQ2jBjusT@@y@9pE<K~R}&<=%GeqUmyK?9;f3Z)~r
z5U$kVcl)KDwiMux_eK2g)g<tf?W=USg>9Yze71Ppc;OEx27i%)C5z9i1FzWH_)xRC
zNygX`C6z^$dTU)I^qw{Nw^Vn_a@~1hm`Lu!{FB+!#0zTTX~II|hoqlUct}ICo~<gB
zL`=f)5y&W{V}Fwr*`gTPJ#;jrXM;l^eF~<9iI5i)$1fyBd}~A3JAC-GJ&H5JeiUtm
zYT=&(%fs^s<nH#t?e%>~yw<o;*iyXFBgb2Q$ksWipwwP53sXY2@V=d%<|=+LWl@gU
zh`OWnk<&X(pFz>8kdOCQ3JOSi5b%F+7O(AhnR7^rJu%EDgn~eEM67)zq&$Dw{Kt*<
znOc9}3g+Q!Z)CyG*Yt7dB-Jg7k?p}*uT}I}0)gQF$K?(C@3iZA4TeqM#OY$7W#)tO
zY_&kLVhl@2jfpokl@fpu$8Idu?Q+f@7Y1c&R4k2%>a^>uVSuWjtfcAH?|Ov5pQITt
zDPaljBe9FczMd<2o+LMIPi~07(`11&J+zqDxwapNThW~ok{(6G5Fych^6$F<>SYoC
z&FG3#gFlZ{Dm8ljgP`=0B~Sk{y5zp6KO!EY{`QAV=#K+duirJ(Ik9|ua(OZtCK5X{
zHV_B)gP}^h%gnS=E!Xdb=F`nndmXa<BaB=7*Fk7r$JFlp<>Vt1ON6gf(HG$O$^3Kw
zi_yMs%L<I|<<29brH^zH>faS-N(uNm=af!$%&jn)D)rMJ#a87&=3N+v+}_R`+w`;v
zm<>7bOjbSRL9P0z&M?=|EWPL6-odsxI}@%~I*vhfF{7PD9KmI#^qqKiZ7VuJ?WS2a
zhHXVVZDh5SL{-_Pwq&OcG&=`TlIv{{?ER?pM~5Ax#Ju62{Il4nW~}TPXgo_P;okOt
z7SxJq{#CIc4poj~F;BYe=1&QAzp-MhroEGy<J<2P$bdfC=W`IxEOT(Gk@<r^Z1Omh
zkC7yFkqCs4V{L<!@<MlykJT-z1*7y*uci;@#5BSmKfP1^_L_}BwR0MtMgTfn(pzFp
zEREz%wpH81=y^y|tRdwzjR7g?lFOJ5Yut$8JGikHY@Q^V3z4LYzp(_to6SM{U=6(e
z9r2RXjr2gF?sk)o26!6S-;q2^-RvQ1UH|NB|HvPlZOPzQ41%z<o+hii(RU029XEX}
ziAY#suz9#CQ8r7$;O*CIe+iw20ct09*Uk5&`{`PtWH-2d>qy=~NOxTEOu69Q#=B_~
zKqwcZ)%%!?RE1d2dQpV}E(q{CS#S1(fM{7z{D;_wF2<^MuWpdbBlUO07=zNti5}&<
z(|u3-cSiEvFW#m4MTj8~O5l=b4)AAxAP=<G^~YDTe_4`eE6~AB`M|xoIjXx-EMB_7
zlxM$$LdAM$AC1U~<l%OSmT&_;uy*>+3&Zxv0@il%xeq^a8$>8xA!;G61HBn|ICrXl
z8y9AXmQ%nr?*0ie0=C`2YuvSc<A|xw2_0shBU-AVjP=4xY(}LVxeFUgkzW;#?jiR2
z1qm_x3LgWIKANeBZvjU+3!JC0o{<wz?_0_L52gLP(4o@VI_P)#HKl{Xa6z3>XiCR#
zqGounAg$MCze0S`^kB9K2fKwkF?xYXz&Fpw9}}e$iUi&kT?;Ssv-$;Xw?1rVKF?4f
zfB=GVe(NMZ{`aSf;7_uQD~~j}+~|#QY{!SSAI=JO(a-{S<S-N%pxH1`NDIGTt+st4
zJxpSRFm(qvC{)NxjEWU_rhf$cNVY#}J9p^k8W>U~M+M0CeAcq;?X!x+TJM+m%W1Q>
zP7H6p(=}ICbFP|jM0Bz7VfnM-Sk@I+mM8krHyhZsqk;)3G7osG9WD{k&0MZD2q0e3
zqXR&f`<?2;ocH;BA`xPGNoFAWvVF){XsloFixVAkFJ%|?{f6C!UBb}KU@flXhqMCI
zwDfvOZigav>**7Q*ExEAOzc};Y2rUtA1EW<_c;To7QROH1-J2@?Ny8>;o2|51=lko
zb1{qvl1`P`3#%H)y4l8anvaI^NP!S7g$~h7K!|2OZ2ajI{x?Lo8>t_PoK@004<r^A
zD6`(D^<Vl-tkA>7Z8A?J)2P&)STchB8i`cKxwR77L-t*LqKS)qdK<vBS<U^o{{7hN
zI42liGhY9O?=S(e&b#~bfnUN(-I{i}CoTwBP1vO-E0fHgKd}KmPIh*AmkV@@I242Z
z&&O~w9jS}IxVD#4PA_+W>e{*P6-}j4`Yrxii!Wl-7f5Qc_7t{wZNEsYdiRk%SHg>U
ztFQ@QG5Fox4ui;=)2HL*W9|*0Gk6*$8rS`*-OmrYZ%kUMbbOT{u(#0bzS08cgw$=9
z7+Nj&%zpbMwtx4?NY*Fddp-H^)H?KzP`r8tv*(Sqr?%iNs~W%+%#PsE<M?XGQ+P0H
z@`QG<RNnA+g3f5Kr9YiKmwjkbxWR07)}(Ejn+F|YOd&)IUJH^|uBP%k?+c`xyO8H0
zx}AYYL>45)I8mvam=`sAe$IzqdB)%pRpm1pwtR~US}~;>-*63Sb(TK}Q^egXrSPsO
z!B%7YOJgMDbbuI`j*CWG@6T~C7xQzhpk@f(OwW!1Q|q~yaFbv$#Pr<wTa}pOsA@Po
z4oG{J-^N0VWy5$`b&6Ib(C=BMMWdI&uNN6ETzu4fwgV}T$T!b9E?)jgxNp*EdDhao
z1?Q@M{%Q9?f%*0auaF{n8T=>?PAeuCXJ(YbT>}hNyN6)HkYx6J<xAPKR4V)QIQyv&
zAv#!IrL3~YY8oxSzEFb#fMYyvVWK~TZZ0afGHE{tGIiHgpD6KPriNc<>T~wZVMP8v
za7&|8b-azC6fFsH*>$RB4j29togj>?7*PMZ#le@DjPR8qo;B`BZOBOHLWrH`>BZFs
zq{Dm&tw0Zi_?;9CfZ&x@ygL*w@SDZU#!R`w`rMykifL!_mFC^Yt0qj(P_^%;M2A--
zgLxme`D3t=+~V!1`6F5p5=st*hRd|lE6AOW%?Rj|7*YnbqJ@Ub_gRa|&sMMyF@M?k
zby8vn+#dcj<>xKm3$DZUVk)C<q4zvFloj}7<X~F}5Q2=XT*$#-1|oE{cI)e<`c+}O
z9W3?sXV0pbjuP#=3~e>Sy8Tc5oQJE2Q=AR4v8$Y7C<-7jIYA7^XAoo0NrD<)AJN0h
zJf1$Bln&JZmR<?1d--gd!o%HLKY)B~bYAPbp~`TW#tA=L1z{a1Vz}{LL{c}bUI%R2
z2I||u?*LspkDQJA@q)b4Y8~>lyMNyNhur~ac6$Tt79;eRdKWC5{o5lx>G3lF-IV0;
zlbr4#BY~gHp%zI7Z?CL}ZO@<6=n3mmm;B8;jM;b5Q%nGrfYM39{c%AFeAK6|Cn^v^
zSnccohubm_E}BMXHBmAVwx=@c@zDzm0>1MRufHB_vy(`X<@O#>jeyI{nxnpi-W38C
z))fAL)>JPU?AaPKE-$`RZ4zZ(AiX_EWuN^$Ibg#OSm+&~1+6F5gHX{YZ$@XoGTH6E
zy-oZ$U+TXDwj5LGa$f$)$sLOI1-~6Rz1lZ+@9Ugjy&|23l|`gVb?<AheK8RcT!)#s
z8UP8qV%`6S_Xq)yuqTq$`^1RmII6#+5O#&*amSeAr=rB*^`~9)g;KyFM?(!tb7&IZ
z%Y6TS9M||OA?nVBF^j?_$KbMw(T32deE;^?Z-U+E318jAZ*0CT(y;>D>t4s3t*=U;
z$73^!mTj9xo8ksMqtY*=)Dgg?4Q!R{<?S+C92`BU?Q+y$*?Q&~r^8;q*1t~EREO^;
zj!ec#flUzoo<mmjG(3y>$m@8TYjqB#qQ3)_m3yR8JgOg)qoeiVe?{x!f6@9t5nfmJ
zI(85DfD-vdWG=^2|4Mtn2Ou~1Kfb&;xaG>#)5(82`&EBp)9KE{mG+1Z<2+bT0N`=(
z&^h)3t!X(<Xu7q{l*1s^{mQwa4ws+Gl>G8Cx12BD?%{+=AxXWI74ArED^YfvFVm8+
zwYAEPK<@EB^3b*qsTX?~sbs34O<bJRZ}QB?PG#tGA0+;!(zN0-mHZ@q^)O+Gg0N=-
zkg%s*inL0%+8tr0=vg&c(HG6rc-_M)mIVfjzF~Z>g2r2v_No1-A)*aJ)x%!m>Y-qA
z*OB6f*ReY9EO?rShap&9K|6SwY7<YPwP}N2;UI^S@8Ra_s(i)>Vd8>R8y0i-j0fNv
zGPK}D4fl=TZIGXoDRoo33+4-5y$QW))y$7miQ<@%bOGLjmZ-1=womNtX~xf_*ma)E
zI814CL<xTRm(^bvj9niw)t|(Pmt%u5)riV+tYf^or}9oSG%O+iSj~_bG-gZW6xN-K
zO}6iMiPdTU?6>$Oj$Ku4c+R!@pk#PEywLFg27L#d@y|?wuB%XC{dn;@bJE-9qSv^V
zyZp)l@LIE_<->G1-^Jxy--l;CcU-;Dws_*Qe?YGgtFcgkSTC+}J>}<ly;4!D^1zab
z{{t#P$gTVS*c}A%fB;!MyT34l>gKn2+`&F{l(Lo<_2JZFh42R46aqwSxJ=sX+XEy{
zp`#|ttQZ}Jkof(e2E`@DS4A^AGHrC1q%Ynx=pK1KIAIcY7YuugPT0JX0UY?SD^S1h
zq}b^Y=4AE2uu5*@C)AR9NalYY&RE|RB8Dw3X@X1<{3iVNQGGoPUf`M+D{fvPPrxT{
z0GO>`$I3p8tNa=I{L!-gOK>aae@MM)i>eKr66G0_43@Yr2!mUhO9mZ}{g5T&F~j7+
z28FTS_+{`SRp`~IZoE!dEOK1Q?O7jtt%W5xidBo1(YuL#dihbOPp^%0S;@OU$s>-=
zW|<M#3!$_?4C#n!D&b%+Z0jlD?l^|1cY3r_@AFP#;)mXAPZ;byiRq*1<HpjLrd|dd
zNKjqImO*uIN!C(b@2J*I`wvX>`em_2i_A7-VwsPsuL%8A6AE=A(G`6V2uSI={vm+S
zk|??VAv6@LQVGM2!#*m?x{1BVX{g5f82G+wDvhYtNDsYuI=V%d*=JfKI@5(IixeZ8
z<vNd@LiUg|3wkH`3Qjv>tj=FS7nvk-FFm?m%$^QY{=CcXPZgEG&xzPm((Y1KmR~qt
zew%$x>K@+^SD_@zSlvshW$T3{pMMhr1iFu2AitLt`!eA+Fi2l2!Xv}6R$>Ld@syz6
z#16Ikwk;C$@T~Wy!~N&ua|W|YhmIp<XE6Yx-Pn9@R|G_U0$F8zU3eV&iJZITKZu^E
z|EoXhMpDNcbnK$UG#xiW-I*qyL{@+MHPE*Ie31~wjc(>8+IMJ$3ut^Bb0RegDuCi_
z-0fz@(L&{|2Rh$8z?WW27ENMjA_)E;2T~$R*Y=y|pP~L@7mRfdp;}OM{_T7@s&^@8
zDjo)@m@$7R&x4Zku9+Z1VU~;hz*``M{5q3^+61M`gfjqMycKG?<LVCihv@deReb$?
z`FVb|Jx7lcMWuxH_4R8^6MFTBI1*gP>jgq3#^C*u=HNMkdmVw-8f514BG~VCCVNi3
zO{CmSz(!Qz2v^<<Kx=Bns4(FNE(@2IWFA#lDuhR|HiQJi2}kAz<2ubtXF=jef1*`L
zaM%d&3r8tPNye&Jt*za@PgX&qj)F6+d>83&J=yDn8?x5D{yddl`pBcBm8?qU2ks7J
zijOye`N__=-GEfH-I+=_MZ#dJp$M~-xRTTXzrI{UyWlyWB59`5!%XXae@_Wf#6>u{
zuvQd6j}eQf`buaS!Zc?wbsTZ~xO(yz-*CTQPSr0$mk}d}=2+o>GK7};FRm2<TtoGM
za6RKrE@u<n`Zrt4G+;>vE8;=o6%^5^<^WLLjz+b0+%>94?aUaAVerQo^O9*dK~_~0
zDIrmDcexjf7}0k6$v-<?@w#~D`HE2N$pFdbh;y1*R&PO5YGRBe8&jdycWmihrg>vm
zN~Y6el+PCdg$w;TO<)v<qor}62u%rAoF9`QRO($3Ge6O{5@4JD*?(6-8p*sX3<hp&
zqE;^c`w{#WMJM!_dkp5Iw=?{}DqMXzmN@TG@s{qGo4yyAVRWww$a~oYVd3JE?nbk{
z4!MB*AkN=u6fd;F(bf3W)nsX3IXkQZ29+}S(-;Dh8Zr{Z|C20Ej_}?JiVFYD^dLG|
z59`wu5%?i#eCDXS39Ez&c9b}Qo4ae--sV{p8QM{c1g*Whn&8pJqMj@I8PSezm#*+<
zdZ0ngwoJ(3itV9eKO{^jDEJVxy&fSomIXY<wlg?IB<wY47viu;!%Ah!u!EeCk6mB#
zlk$`KcqTS!y%p+i1v?6%_Mm-m_$h+rRseDgy5rYi!(o2hE(65sh}2uMAowX`+DCyI
zBYKu}i{)nCn*_V1-oMQl*NqG5TV7)mJ{cxf_`oeqC^x^z4cUkTnljeA+&VjN$DmiN
zo*mQQ*kN%6pWKmu=|$wn85-1#A@V#+$Tb*0jqdi%;UiVDAq<94*k>kSz3L>NZlnuo
z=AV?reG%Jk8zwVF|1VcpUDLWv@+)~JEfqAHmyTZ2``I=_SmK)hS{PC~{^db&or;Na
z(#&+Bw0!Hgr{|N?N|BS%KgBXM<Dz#SG+kU^t=~GL?J~hZ$LiIdzIXAr7af&>yv4m*
z`$?v_h@QQ$8+LJJtAR*u=_bfnfu|$NwfdFQi~BBx4e8;#M`F)3)E0LN?5=$Xp&!w<
z?OWutHie4Fq%=L${KO8VI^=ZIRZX1~3~U|v%j<S~8kdIlh>OZ?M&Au%yq$8%h>?JL
zB)LV~Gfd*v<ZfgD#dh=?UaFUKcqWar$O|ZRBk`T|9b#S`_UYL(TQ7#4K4B&HKW{>b
z)M%m&gxOofaR@H4A8!fvWrz(g(+#@(?k6ruU+CM_eYyx{oZ}lw<Hd?&j8t>b>oNH$
zS=Y-tJu7KG{b)%7{G<W<8rqp?Xb;N@D({N$h=n!&=@8Tlo|J>$$`V@hEx$-Lz<Pw0
z#n`wQ8KCIr=pr!MqSl^$+4$r2E!sMrdF*8mI0Z`beOb9+d4l0$J70zu<-f_Ie>v1H
zF;$^X^tW!md2_Q)(K&6wSE+M3c&gCVY*Ds8{7AeNhE~@hW+TS1_p#OS&$yf~JSqzr
zlNdEGG7HFi*oFkM#1O<H+6oK=F1upxS@-m%tNRQ?W7;(NAa;u^YI}{O!!M<2BVbM;
zT;s*PCps<<h&g9MVi9kr6^?FQyX#Fc*z^n?1IZ5ds{<cK2-O`}$?aDFzVLX$r|=g1
z-#<kgk^GPRnd8AaHCIB!Xk*}Nvgr1Ea&v9ARdo=q)%5a>7+#F#K*K4G@1rsp325$v
zSLnT3rLPb*%w(O%F2htYw_xa1n7iCkm=oYcST<oN)_}go;(h3U9k5f-Z&T=6B1X!+
zm%{G)Zbo`qKdR)E^@NH)4Q2Qd#C%lHp8Rru@a@k=vqaig*ZJBlu{hJwI#pY0;LeLo
z9b`%oBo<eZm8}IiiWT3>P^Q$qaiv6n7UEUDetBsjx@>N6R${?HuJ^S!25Kj&s?vom
zNKD;W>IU51LuXLi8Pqpn^4Zw!;o5gAFCC{hUVd0w5lfmnP^NZy$1v?wn_6)_S+uO}
zx3FDpdddJy7E}EbKk}J93F}u*q1@&*Tl#|UfzH_M9Zf^E3{*yz3Y}T#(PD@l(exCy
z6cde{I|Ohdov-Dexkn7&guIkN_wOjVMe5H+9-y6wtdgR|yLaZ9o1ac-AHKQ(6}&Ca
zHd1ub+R5IRdQ?SaqbmM=?Jn_sXVz@X!?g$}t%snaifPv2uc&PePg7=r+NaMS0#d|)
zN66YJ(62D@)`z$KewurS1rF-fRg&}!X_^ol;z1r5j2kF4-@QK-V#}T49RoTsE1$v}
zCIDHfGwVsLh%x2QA{tB{`Ty>UyXLm#(L~dRtHR5DmQ-`X4meg(zTT2?#Ta}T9$rek
z^N@J0jj5L0HzD*r$~CMz4Z9-?Rs+lxyCjL3<Leeff-kSAO)F2b*ha(e0cb|#JFZGp
zM61P>x=yCsWl`n*A?>ETGWTZ6WL);}tZ<RGOj%^7=0K4x$)@~KSA%VUGTWU&`zvTO
zF5U<V86Z-P1U&}A_3jOaO_B-Vbp?o!uRBjV>QHg^i6K#cNXlh5y3T6r#HO~^u)!Y~
zTT%U)-DN-H?ZBMnQ}@_^e%zQiuvEEr*XCcY-L*;E7zs+wr`W6b&AHM!FkZ|+7d8~K
zw$ht={zALFM?YOz5fU$qoYtOq4}SZFk*0a+3F9!ew6W`Vd>@eKg53QEY6ePZki>zJ
zCJ*l(EQyyNNMOzrizEl*9R>TJKQ0~L4jz30xon0f-28r`lR72lkY25_Geq?JD<?W&
z(@Xyi*y4~-LLgxGuNk~B@eXe<&;-BWa#R1scUiQp9`LF>1S*`N85q6e(r^uJA~`z<
z!Pw!q7gloCRFu*OW5mGQ(dH@N<N2_P)1o2?$t9925i-zgDL_T67sQ_WZa*_Y<Tn0o
z8&a1ffZ7&E9j=oJ@!p5Lu8+96g+b%55-h0&%#Op{$DIIV*KfP3y&(mbLcKZH274Yb
z*iYx=&uz4D4=jQy^08e&qn~j^o--pGR6b(2+O33L;W~Bl^O#g4AkWo;UgM1%mg=aP
z*q1V!^S>b>_3C{6hLy03BZabA9*t{_Ey07FzqmdGnyeB2h`%Pp8V~9+`9Pj3*xQB;
zMFd-R*cDOx!^K!#Dmg;uRP7ZVUjTHGxzS~*+h(_1$l6H&6Y@-D<o)=mYYn_#{3z_N
z!hTSy>6FBieEDPDp};RQNM!38*TJlh*23@rmmY9W*$$@#8urt~A@SN_cL+oH`&6<G
zQxinyo6MI{sv^t_qgWSxR|Y$;T7L}_^b0^WoLUIa`i<5aHF0%Dz`;9+Yl3Cm>jFQ`
zLkXc9r$Nnp;VqgBY4Ms=*A}D_Z9xi7@TD_J{#uamA5a~9`PTFzEUrZ^%qMd05Ap5-
z-7>E?CoBsMo&1NiA)D*4Lma?@OnIjn`*aRL!LjJEDz8)G8M{BWb<Xes-=*ctd8L=r
zq%`^|zs+TbUlhcBh+%sdv5&@di}xEPlt(B1on*jVubM0n8iSi391-g|v9Dwo8Eq=?
zwhECrZOAk*WTiYI3~eMNp!6fiqNaCzoLp;yaEG3+zUTD(R39uWRQU?Y2zFnOhEP~@
zGNu*DZ0qxFeHPeNZ~^4CrGoZJ=M|{a*BRW?KYyutmS2-`_F3SL@nkM(%!@CESpBLe
zT0poC15iC*==jr-gm@yy@-^Cp;3=kY56X|LtctB@a8~DTKO8gHjnv0^Jb44@jnuz`
ze@uiATwW<jd>>6Z)eox~274j}Yp-H|;@Bl6E62^8KY5I<1Z_E6QquU|8u1cfBnD}3
z2<4}IR^#(<oRTABM?HCRiyY6V+x%19>KFW=NTRkt*()Og(3)FV|MXe5rs$M$PwKG>
z-M&vbt|LNo!GDKX@W*;CU}Zca5RahT=t@0<VIECVtH!uxoCpzZd%3*y5BmR#+Oe;T
zf5k9xTSi?+ZGVyKj&LdkHobm_uSHlhy$+dDw5S%9PkW;VGf8B*ak3H#WKGX`UbWP`
z=}txqY?`Am`(LFxu6IE1In5{NuAB%h6uK6J;p_41`3T<93$(*7)6EXbQ$f5plz$t2
zq9U&>Ftnv3hG9b$gSfULk?uytxPUI#$Vd`<nxKEVE**ugf+&uycN!hD`J?L~gq&?n
zs$koE<{5MKRS-{IJ4e8RYnfjBML-wB&`-jl%x#9r4B>^cEOZqlPoAVcgMLRB-IW`)
z4e^91d}&x4=sq`4IQxB?=j&JH87Zlu3%OF*??}z6BC=xug}q(SV6Nuh+z#6*`5|Yi
zM6q)72k(8*^6l28$CnA__wT=@J_9DL3NCwMwqgte7pZpbQjHtCvkb0FJ~K01)Au&~
z5q*HdPB3>Rx*3jE*!fmW1@|8+GKnrX{@fxK!XaZnN>FnO@nf38TO@lL?oz51(-I0a
zt@K`UFexPx=X=?Rfv-l7iF(4HwHocM!3s33_UumgI#^S$%t&TeFOBlG8R-N1Zk$Xo
zK#ery`MzYk-I(ctP6p?&_w8+^p`+`-0CENTR;Z_iOD_BK%S)}SKT!sGn<T<7xd~T8
z)&np>1v5t{A>*Ts^9EkDdL13ajQn6SHS^(`mF9`~w3>9BzNQ&@g{O#+OB{gQZqYkc
zCu?W;BWzpP(Z?`BU<NsuK!@Y(z1D792>=DgA#|XTjI6LNE;5$PV2Qp9)CfPmyVLZF
z+bihGVfTKvi?B9?=o1R4uRgIiTp#>hh3@T{G;N$eJ13(4i*LI6fi)`%u)$mFXrp+i
zz_oX+71suvrWNobQ(nYkqLboLX7hjZwuS0vD-NPoY8k~$GiQ_Qyq((3)<Jf8?MUKY
zUi?No63V1cYsEMH-!z%i%fw?ZkqzR{WkIk}m>h0YyWdjR_M%to4|jP98y?a}FIIi~
zVm^cG!e>cd`++g?fhZ&M^IGYXF;t4&IWUAAqT6Kx2(C)iZu6#;q>KPegznTq%7)@o
zTdyg;Bw&fa{oksjz$5$BG~Pk5d|FL?()wH;&L@|Heqwd+C1ZcuvSH$vCMcH*!Sbp{
z`o7k`YtjW1u9Wr#(FC_xg0qjd>(`^u1eD}qV#pJ0>KuPyc7j&gX4NwHVIf?=o!;?I
ztjI(Pu2EzxCJKC!_?fgd{;u<Xl}5T?ec{Bf)!#fvm--m2hVKHUK8hPjm4ZO<j(O&r
z&*#OR<p(CPBK5fAcOrNZ_e~q3=fFP8!0cF?ZD1#$Q=KeXDcMR3{kDS1+L@P3<j;}`
zjGS9-UOI7bLTElFTq*5|P9{O-%o?Mg>C1JT%$p_!n`m3o<$lHli#UHUa$jzgD|O*W
zhOzw0mPEGQ`)jqwOxt^CB4hD@{RLDFX4u6U{v6j{+p2QWiDWc%+b5*@AI@bBl-np_
zw}UWJ<bwQP)hs9?^g4f3*%*2!55>3y%aJh^hA+H-(hKaj%1n*8hI!KLqw6_juftbX
ztXN!fHK56-_F0@N7ROG5x10SCME8LOUF1vneiC&OA7;PO5LsoD60Aq9=?a3=rs>I=
zh&{IeBg8DM?y4y68@_ze{8f`jmU4q3@E2cqzn^yHujGg8oU+wFZN7#!n8-1LizZ&g
zPWK62{7B-D1-5Fvk0Zv*B)SUR0^IsY+f0(g*aWHHH=lEjoC>m&hF8DaW4Y82^fuY}
zj4qA9rx=|YM^zf4s%*atx!(Z$0TW*g?^}F|^S_><J0nqRHkk21;Fb+Lz7E{J@}J4}
zhhKG8@!-5nvB`aliEmLIRwa(EirlMb(|!=Nz5P#>P|##`W6o3xCIeEtA(86E<DYZR
z3Bfs5`?N+gT-EPdj3-Hf{qcP&romT}$Rs#CO$&VNl06#ZZxYYN3l|fnl#iA<V-;p%
zmXBq!yevHFyhCAg6t!}*<mv0b9Ix<NH1@?t+ijzA?9Z01A3jKLF+F=<DOvm;>Q0Sw
zFb~Wjs~)a6@CY$jcw=>rpIWQ^A<XarQ(t0;oQlTs+4^Pm{ib8a=zH|1KIELIygr#-
zyN>Q1G3%Y}j7Kc{j`*9UzcWwgG)>kqehf2${1nBKFRX4fIHHwy;g)$#rVi$hQOeLF
zc~2Kw-)G@SXFOA20(tY(m(OE?kCGI=v5t151dGw0Bq-F~$eZ<boL5I=V^q@F;R5G5
z-yP7U<GnbLbnQAZV6^S^aJEJcKk6g_+uPhiKT3rrob|8@cC=*lDfSso0o?|AKN3_x
z@TWC>z?F0wI<<$4iF%L;S(6116DuL$!hhNQkx^KG5BS0K>(m_pr0yw?toJ~>B~KO(
zxDq$D2l66mLs@sxZ>={ZJ%Uhgr6OmpKKT{ZVuNHqlW2v&U+0D5o2iwm(=6_5L(|wy
z=<bM5s^atMs}Up)8=yacI<?f?hchI)cFKL^%)*upqMM@I2~p1$|2#gIxh<fYdu$xM
z7S`HUZ|qru*Bu9Jm0sB)Bf(g?{bW`)zsQxn@CS@ORU`(eZdl3^UFB_diyBN!;eW&y
z?rF&wy$;+JrHvL_Vn(>yu`V-^7m|nrJ4p4tes}}x#m!JLe=7}*JfPAy8^d5OF#aR%
zn5diJLwD=n#QlCv!oCvXL>~H<>QtUdHU4MXne}nj)JQ=&^>x>J?R2~lJ$Ed;J+E^c
z0?Zz9sICl&fcI5z<nzq)j)K3D+d?bg63$KUPgM%k+kiby^l*7{pmN<2++m4V!#ek)
zhkq}6LYZKg#sAZ6z`^T0wAlt;77*lH8O-Kzh567Ey(QAZIqSEt_^|Cibf<dwlvyBc
zjq|zh+e&u)`0KU5#sXgZ=;ry3%QdE@lP)lyIAc=2(RhmPU5C>8<L_&*jX$w+GfmY!
z5z~wcb$1==!}4{mOi*?s;5G2~gh5l$6PhQ1Z=W+qvuQWcruMcRiVT=V+WP(%rfoD$
zoYZI`w!Xgq`hCSfzpq3zjobYxrC6xpzTzD|NhYYF9FV$2xg_;kar3*p5`gZth&geP
zL49ZSbE`8!DHH_gUfYWzi6c*G<rk#@dMt)#v(bAvX;YxfeZINUi8aPokaivS1j-`!
zdB-bWytOjTdlFq>BHHPw%-C{GXc>-cLUU+kwp$3+#9Ja?FwajY31hkTR^Xw_BE*}5
zGg2-KXO!l6V3bD=y4lAg!yO`V1lg&~IHTj!!RT2(Dv@67BdrV>ql*<4aZ##{uLY_i
zLHj}Ka=rJz9lLTIYQOwMS*gNKzZzb*;aX`8uX7?|S|+#Y=Qy@-0#C=|9Vqx9Lio^I
zLG*=^QHd&b6P(Szb;BxaP33^~KRL!8sK*SS9j(4v*Swvy0w4-kjFt^Z*{wT}Gkd7y
zyq|hv=b0N>-y36}=*YO3DRdpQ**a^Faw06t_x!Z8AtXV63H=)V<RXl~8WpiNM(K51
zf$PNKkCW6xZM@k07Q{LW`?p8GBl9{idC2_HKHH~gR9Bpi!U(;mpEDR=S&T!weKU0B
z_;@9IVr`iIGC0!I4_ROmTc$-tJ68)^6CPIPz^0h6XR%&V?a4@**tF?HdQIBLuPvgE
z@)O*D23JGv^gk*CD%-4*)Wy58ZW-9Y0hsJpwI+5Xe#IH=qT-+LKJur|phv{H|9FK&
z2;(F!l4}a%wDSW$lm>{ApOY(cud?heRDhISith2J%?|P!s}|scwYc7DIKjKN!o5zY
z<JVSHVmoQNZvQnSuHo9Xcwlez@X^!hIYlbSMpU+ygISNp@H489hqXB+Vbm|=InK*t
zOt~$anV+LdmRHS~w&5@wVP@^l7oF?1G1=%c-^ad|&QC4PQR{vh_LlJ>N-)5QXl$0=
zozT+-I(;SeVYAAO`0hH6j1|nC)A$ntLjEqFn)rm`{H&(>5(N^n)PPD~jGoYuUj;tN
zt_-S3#H%q`)L~1&GciP^9SGL_d{n}Q-vvPLbV*UeV4=|61#yLIC-S)+Xww0GK9f6<
z*s>Fi(TL4LttCfbgzrRVq$p34V`wvjD7_Zh<^I4vZBM4OCD2SY_^WE|7cMb|&@I+I
z=X|l!8lWBWD2fkViVIh~rn7x_EoM<b7tjw05PucMKyrMVfbL!kJ7ZFtoSa?vLq?yX
zvVf^$n`CgL*j=JJ8Y-yja`Pa=I*Gl-+|*eYJ#$4kGnv}nP|b>HW?-QE%g3f$%gX8s
zm=Yr_0HW;yL{D5J+BYaM;0n>rc=GT1d8Veqh)FP}C`sIJ(SfWI4D~n!VvjdMD_<Bh
zd&yn*`q1(tjRRa9OqmaKLtJyOG`0?xMGeFBUx^JzuS;6<{v!Ggu3FUJObx6xiTJ3A
z8Y=#zbVRig?cDyeDNFc3op2pY;p$yQb$jcUJ`MFT8JT|u9`@{`S#oWICO%;2Sr{*)
zrE7^_)0<OUuftb2d<*2#B&g2d|C`c7Gta%#|5CceJrosyw1zIZ1KqX>-J{R$pOuKe
z;?WYv-JQws#$}&wlQcIF1SZD=u7ux6GSDRvOSH+hTPXV~F(2HCX7q|o^j}7c|6??m
zw*&a@t7|X9{3a#FMP6<<#;Y?q#^sySv!g>3mM{{7;s?S~Ij;7S&+kT%XgR~nNot=N
z-(5Z}DrcvVY!?L{{X80yT?<p*jpe_oIw*qB|0%luR4K%{b5{cV-n{C3x9;3vh2bT8
z!OGu?pSr?lK#^qZ5haI<r>(4B@09^!wGz<r8x`R*7?5)A=Nk2)g0|K|sCo(xc`uz^
zzAzn+cU8=2*SmqPW{{T`i4#}^JX|0@xLgup+Cip=7-%<?iUec#CqW_Je?s*NPpz-<
zGO*dr#-rr-`Lhx+G_m(-pSS;9C?s!^6baD0*kki`ll~@rRTkkkP>rRCy-}lN-KR>+
z0Aji`{}JblkShs8WL~|a-dk}%k~pL%o1eKQAJYUSCbjyd{K^n0^y<S04J$GsS?=W5
znuW&!OStA|!-C2rMfKG59^W;_yV#z&uT1iO6tJXLx?pwmZa_~UC#kCeYJWW_oCNA0
za-4=z@+UV8*VD-%noNMqHY^4DeNvCnf`mPHpLQSEAkz#?3y918)_~4v4=2VFCf~}0
zEze!R_&wL0*BJSWZI<=R-HqeF*q;4|ZNU_aVy5YT6G+aJ4o-})1l0W!S8lSTWMKgZ
zRRfL#e+){0^e!2LbkXfVJJrvsMVhy+<;ZiZeXm14px%c7w*CFh)?h5C9J(#SmS`r$
z?4R3tw_Zfegmx3CiiqfU{H=;85?6coQaMe$d5>5Pb+r|mfPG3Szr|?16dg;5a9l9<
zWWSm}u1DaWj{=+PuGGkbJN6nOeGLXBdsqGI*Jqus+v9iZ>0b~O;{&l;koX&8%6B+W
zeMXqH#MVAVw9rA9!tlBbI&JGymgIS!#@wUZH$m4%0iUg6GhfIEU^^a-ZHNA*a{{!`
z9#?0Fp?3?GHtBJ=3}J%5U8m{=zNdc<9J)A|717Mz;AU;M2AB<n8a_^Ir$wlDg{99w
zzy$(knQ7oRcar0_k9a+#h3lTtvAdl5V(<M5t^IsxM^QQYz`)Of3VLjCn*T?KbmQ&S
z2y(X5L6+lhs<zD!pn*jzn9ka9DFHTn_$|e)xbiddY&5vb-N(zx9-?z~j@d}l)RU;1
z?_c{b>Z340Hc1#Lf#mANU^gtLdE&xfV)}5FbmM!_gzK&dXVHwoRafMPu6vrJH_k}2
zzVs#YC3*^3g%;Z00r>6p=>3O%_XyA%_K^HIz!b8kxOF$7T!sY=?~jYrg?fGCl&9dz
zeYqEXo@v0N_X?=@9T{!Fc($O=7<hpj&4OzF2Bv?h$uD#@8}GxY#!2xVQFOa6`9Jjb
zWO(ve3F!A}ZJik^I4Q`Bge78pFVL0xB{4?<tW&_?hyMxJ3?%MS`5)jvf3FQ6QRZoQ
z4@w|_wlwx{&tE6JjL&Eyh)O!q!;<n{Nyi8hRqgQvEmw{=gDG+<eS_w199L6FoiBjF
z0T^=V#NgsP_Jt;Vvx1$?V?f>Y(J+M*hps%(=*!rQ^o6If{q-Rq0{>5YSN;xF*uTdZ
znMpAyN@0+#tcC1`ERhh3HbjaDQFdmA3JGZ;`%+PoCD{_jo@6OmiWo*Ad$zI8`<xki
z-|Kr_-~WK0T$gK(bDr~g?(;eK=f3Z`U|=))c-O(?kq>i0pQiS+m%WCtTlq;o&zYak
z=$!UWm5LeG9bUoSQLym>4ly7cDQ^$RR!BcxVMlY$v|XV3%FlN!=#Ggj$34K_QIyi6
z3A0^RRUqAnw;qok<eVAn)cdh>LK9nnaQ|@Thh=uN-zC*F;V^R0`Pdo$Xp@SQPp<zI
z$S>aqW};}t9<}4fp%A4_f+X;)S#7Vx;TjSxg1MI0yB>l8q(i&my5UGLFQfVFr@fMQ
zSgmhjH@J{Xi*f>WdXu}o-u8rj!>=soKB^0oY>#$7=69X5+a%F|to>yF$5_N<d@MA8
zjCGY+D>SALAXPc7YO>ZEX}q>WHwA6E3WV91!0}6GIS7XNpVle8hWee=M+*K8A)CMu
za#ymM0~6d@z+`szh}^e2kiqkIL<G<wfpzZw)OWuO4|J`5r6@Cufou<=fQvGlBw5;{
zfutP%30P<*FA`}2zZ)7NMc}0eV+se#?4tcxE#mRgw6$))fypQcy_10vn6JK|vD<zF
zsqg2vLuTqb?Q$6kG#gD+$&FgXm)fKd-)*m!Gczfu(93>(9gEXFsP>?Ti4P=7<nM;D
zG~d+4>TgrL8nh7kvzC#}l|SDPgnsPr%$&(Noc+MG8G4tP+j{d$LWdeOG)3=;h9$e}
zY6r9E3Z`Zk0ft*@Qb0+YBO@~>+AKNG)_8BrzWRXL`3WrfeBrnAUz+)D2b^P9%CK&B
zxhlcfXd#*Yd^IRPen1&H5>HeRCYPJ?x7C{dmlK)j0Xj-qS;yNs+X&6JP|uyE$)Q{U
zZZ%%|IEi{!6r#5iX4P&)%tlw!rjWtkp($iQq;t&;UT4NVY#UlXpndjau*_biD(G&n
z2ekIpj=RxP<N&nH4mx&U@}IghbNiL~Hac>L-S~&x7%q6j`L(%L+_eZDrsW_a6Ig9G
z2G$QU$^gCpl&Q(8^RN70^mf^|Rue>NVW)T9`??+J*p0FJhu!su)VrAoxg6d$v@vAb
zQr5{gs{u`?`Jgf60k_KTqP256v1h99@+*r@QwBt?akP2?QB5$`KM?h5K<OqPy9@DG
zXWP&l+uiDXf1f|~KmOmgn?DMDsXY~uWhDl=Xw;M!|Eh?6X-;`OHi(7BkrfNS!~5%<
z&@vKq5lP~eZi?>q&ypf)5P<Ih04_xX@RvFefFIT`w9#U_1c&j%+u1kJd*(3Ia(5d4
z?sxxg-LE%a`6^~Fk8>Oz4}3J&aHp&IUI9Y8H3HY*GHknn-rSWDT^Jh&_}CRcN5G00
zl*C~AD#ap9lUAcD0PWS*s9;#@<TxHdYAR^x872P?6uKR>XV4H&JulP3P^}7{CV<i&
zz`es7398o>(OD71?I(Us5G!KpCu{aWL7ni!;`PV=TClTJuZjasTX5$~I&{ZeVY`dP
z9-_}8pAL7QfE3wE4NZ}i^q#w*hrlq)4h<rIdgT|?`U~X-);@)qq=?J?!4tc3=OC@0
zcygfA-6&`bdG?2fBW(;RU~h8L;Q+*l46Da-l$zda6%=VHsS`9nFL#E%#epfCIH5FF
zMPGcU!!{r7SAj%op<t0CM2A$|#>1Ei!MDoi{P#Xo^~jTdWCSLkj_=sVn1C4D$NpBb
zng4>euWcY#W|+tOV}ea?zdY=LXO!5BIH%$K9H{)d1-gL_`*9MicaW~`b4vi3L~U{e
z$rDFDN*R3PIU8f7pEej~w1AEZy=dxZL~7Wp;_zsn_Z&@yo!Y3ulz+!{+;z3PJGHn9
zwaZ>{q;FKcQw%6ofPE$|X3RP_qvD5Er)BDX#4h;m!KbJ&pzuo{f**IAR?8Cw-kDMt
zHLpEwZ18wdh`0V(_W`umTE{sW){CUbAaBP1(7~R9W3~wj2!tXkaf0tTf8e)TNBH}l
zM&Qx3jo;?>QDp)@*VSl??5`fjfpbQod8pL^@;A!oCJrDOlr>2laGDDH_xBTh7Aq07
z>0|G!q93!%y<NBn2_p~Z0Cj%3br^vi*?W<W)<T~y&YD7m2-`&IBi@@(i#?utiL{@<
zkE6*&G#L@;f&e;R=A}J4g}i*PV+og-(8$q}^U(RB$$S)KJHz&)PwX(+4zFQ<xfIp@
zzc|f0tYtX$-Cg9N)A}vhQS4Q;3<pC<$yv2`_bXMCov%Q&bs3)KpJ_N#WPc2bHv%2@
zc~*=-szje|K`;vTEJAEB>?zUf3WU+O9?kvqy%Q2M{9bTD_$%uMLNjQ8+Bsn-Bm<Gw
z8fv=}9=iF49|!;_eY^c|x`M$&@I4L--0X643aa!L+rPnOkio6sqbn(I=J)ccK|t>T
zzvH4Hc#+|t%*RPBUq2aT_$bdF4flp0{)iR4KY|i_Jy*sR5pGqbqsA*3_Z4cgk67ks
z?ik)FJs1`1j+Co74Vlr$>&M&geUx3h)-is-x-b;TvCV<{4P$cvP$Py*fEr;u4)lF4
zPpfG9zM8<_4&e-;0tht@%DNw9cJ$p}N?E>-!c+c++=@Vp0Y&x?eZJEld`e`Jz&Gx;
znktl=>0L|_>d8A8yiJ&$6G_Ku-CpT<R`q-qqHV-l|KqwVqODmwzm(wBF*e&FVq~O9
z>(=C*8AOIT<vVTs7<Qw8!k|FwurYj)USu?d`i+OJJ@1trG?1DhRo%LUTJ^r9@SW3c
zMKl_)*A4gnhrM>b#eOWI3Q1$HgLjUf5~j7-m@_w|%b#!rtWwqOpr|rTGJ?+%qDDHL
z6zx7NLA=PBMTdU3^~v1HG|*#1-Ulp}htR-w^wcA7soQv9L$h5e<jmO(9L&6ENS9rF
zuVck>NI!pGgQgl8qhiZ6xGcVacNPH?XztA%1ZBsD(Fl@A^|)AQ0NK^28jk`|Noe#2
zI}-15wxn*T&MT(YQ<_bbqB&ETnY|9Wfj)%tDueG1eKE4yj`we)P_T<Txf6ehOb07L
ze#e<-(HpJy*k!2IuC(Hf2p?gDXK`*YB<5Xy`C8#WHIw&ICkKmb0w>BxT?Cy>yC=S&
z5uXh=`)$o(8-Hp#Z2;Lf$<>o%Ty#k=*=|SL5qEeipKB(dv4y5W`7(fdWT&G+Hu799
z;)3n`x*m(5F)0&L`=wh6R(+wIo|Jq>LR0UJIjEC(kp55paV5u-3m!idF<i<T&08;m
zj5KFis)1e)7?QMUW5_wL3nKJ(+n&D~Nd6|!JvjoH)ZOqZlhBGqDbME)_NwnDnQ1Ym
z)5gl1y*B&zway*<yMaSJ<{j>b*7X!Qy`g<P!LXwQ5*B|jWhD_Bml&Wl!k@aaSV*Kl
zPIZkCTVaM0EkcRCO-aumZ~OKLOdw^E)G>iSZG0-<ut|e{pcy|W=$4ujn=F0I-9a)U
z>`Xuv0)IwtTVUN2{M-24>^~tw>VASi3U??mL$(kFskB!<*?uLoV2C=Y^EJAER<k2c
ztof7!mG%L9QEbWJ!HQ%c(7p|90KjQip=HzbbqB}}De`^r!pxLLXm<$N7PlvJQljfv
zdA5P!^2?7*Z9wyPD*uR?Xn_Cg1V?T3YY`+J#Vhjsef+INfK&ZxcH+v^>xrFBqH=J8
zH~J;I!R$CRf)wV)2HA}>uR%5%fTcaWz{**}@p0zd=;Yuu*k89F9EhB{ez6{RS#!yA
zC8zrea9_UxtE~em{zgOi2fXibHRzsDzXZpgc*bBYr?bJ8tUS{PNY3}PF-6h`@Y(bT
zz{7N=WLBaq93`&qo?GH!sNyn1?jQWt#r0b@Sc?(;z>qXKXwD;=HRN!X-fbT$3vW#t
zPo+;DcQVSdQ)V*X+<fmLBf>l4><o6c%mPL5{T=|}r`G_4D`nk<f<)5(@SiTXG$K@_
zoeHSZLASvP@l?f=$1VbWk~oV+wB!-5+6UK_I2+}u@7Z(7a3mh<4Yb-Ki*1M3-}(;t
zcsRbMwc6-_u(lKOtW=}o?lW(kbMNBuois6tI}F88sBSbf#|F5P=WIRkqSHxdf$;A-
zWhk(C$Pe%&;c9o2&62*Y>iI_(1m9&ijf65q=8cVCr8}7mhn@MGQ*pIc!~lE;1&QmZ
zAm##$fJBNl!iEj^taP7596asx{_K#rTX%KSch2xHNqX@wjr=P$u~;@lU_eHA;Q97v
z%oYRS6`3?D#@cqtR09aM*Di)jNlp!;^`n!m_V|<%9Rzc`%>c*!1%E81gx$gaHH|Ns
z=mClnyXB79ZvBdD5XXJtuX-QIF$4L&3c@uNru-(ypq6{zm1!DX@(R!;>1iJawj=MK
zB&|$!aQ<b8Y;L?S2}G9lr}RFvv(v#mnPpk^!c&@@L=cjb<g`X#r@$%RX+ChkmrP&K
z!lIIwA--h32^S8rC9f5Z=k4Ic*htZlyqX1c+y_$4|7;?8I7L97&XpK%B6*f*>;PaQ
zfQ1QYXy#6m8f**ulPO&|DIakK-|SFonou`?>YvyH&M!I_+lYP<93!fIx{}QMy30>M
z$w@j#lZwfkY)SIbPz@|mdjrZ(yH;!Z&O+_B+A4dw+j2<H72GYh@^fEyyLbT9KFRLA
z>c%M_Hmr{XC<R!#3Ij%5FcG=Yb9Y!ri{>`cmD|}=kSoHjS`Dn*0h^r3<VzZo8wu0-
zlDMCIz`c7G1x+D|w(Fmc+RfYw*AJbN7%(<e6sxFE2!{xhktbMShSb3RH7IB0Pw0ON
zvpL36rz-@(_`7uj={G5#E1BLx47YWz0*_X$9f$~w3CvnM&E)qDj38ByuJii1zEAiV
zU+cmK@*F-RTv8@pG{&tSntCQ%fjh<XLV1b*5{O}F7wwT@*Z5&cieEsjuFQBYmy}ws
z$hN0+!eBzb^tCn3Bdd=&0>WGE#U1!D4Dkf$yVtBGcuU8h#&;fCjDaL1zsygjq_H6G
z3Yn~2+r5+k0wEp_O9(e)Gu4#h7XgBqAD}VZf`JXre~&yIX;HG;EyQDW8fZs6LnqpS
zWln`)Bc|Q&$E|X9PCfG4GI(UkJ8H!apgw-Y^{zXz6b5{C_Krce?MDOwsfhoihX*2D
zOp|y3@!M+h`R;T%8`UB97d(X92{T}{2M7?HCKlWp)^GD)SyH@s1a{S?Lh`nkF!qC3
ztR$#L`x1BSxO0C%u&NxOJZSiPlCy${f&w>?s_*22$I}nw7@k!YhU_rkPx7&s#VjOZ
znfN^0WH3*N3xH$+g1r}qyRu|U`+Lv5fK_6#LWsv6)PTZro|$bfc)Ty7<q6ZSUkn1^
zc~y_0_rvOrRR_ZCydlm)&7|T*#i61TA+<%0AUi9J_<d4yc|cFG)AqS+gaQ|kYMo$R
z!(#2>fTnnUc|8P#RH5e1c$uvwT#eYnV+&_!=O`(oi!%-n<@nG{;t9T!mzjBi8d_Dw
zVNWQ_W{XR<-KSf447Auk_Of`}y2Cr9lhU#M4;sZW{z9Demi7)an^2Uj?GbK<5X&bx
zhrKwZ3L5S`_{3U#-Z?68mvDQxQVn($2`T6x&?6s(|H!+Kf?dDQ_(4XA072ZGQ4(~>
zXPkTf?0x<xCHXKIldvHSbyCd_FeV-$EM8c@675O^%)#nnZL~-hXTKSE8#+v|P8m(_
z@0{DCq+P494cwyp49Hkb>^8zZHG4%@F-AG(+9Wzr@SWF7g9L&Y!O9ki$1MRz$&L+(
zve+-i-II=Ue|JX!4x&#d*f;vkA0WJe4?K{#9J?97D}fv}Kl!~n&_=LNldcD|L+$0K
z+uXneN>oHZd2DYie9YOzs%+CHUVvQJT@A&d{MwA^9Bd#x1WN*$M(ZF`=?ZeUEGx8@
zHQ1{27)&@ePXh~PSxtwTRWPY2cv3^pOP$9;K_E?LPY5yi#MeghadY|9gu3U|@0`oB
zltavlD&L1#y&2(|<mh9B!W8I`ViLLp`S|_qB17f1v5m`AYEM~;rOKG{PEw^-m8Y$^
zOx>5y+HHoRH=YUAgyIGfHHJ4cMe1woYHMrvG@P<A2Z^#@Uc|q2k~?*{Q9?xahGsPf
zk3LrL2I2TKWPFj;t2u)ct_eLYexJqm?kWlJZJ7vYSxRK0`c_P>d`OXY^iA<-@iWpW
z$PeZS)3WhHB(F}U-B_6WKA{v>fX3vx5!U>q_NI7ub$F<>R=hH#44EI4SiW&(`T9ub
zXa|lB{#wM%-_E0VG$ZzP(L%rVRL-cMQF*_ku*FomR}isLG=+EAAL%5Tt#vmXlQ%4n
zla>0Z(r>Xty4qe*m;p`|l?kZ6>OYc`S)W$OB3-1R^3#G;gR8_16j}QWbyMz_rAzmI
zM|oxt$L$o@0;g}0C7Bn-KjTd$wXqC&=rhd1SUijYjzDH76N4+gUHr!@18-?^uP-yk
zMp4&CoElz)m*$fA3wQ%uJTBlC)A9p<^rTWl2l>w!k$BDa;;1XR=S#<|ez7dD<4^Zh
zIEii??(->9z0+dk`Hb9cA09M}cTjbx(;7{SOU#kW15_<8drxr$E1$a3WT1b5cut*;
z^GR?v@}jMR8y`n^2N5TZ^6$y*PFiE1{XJ%_<nrESimS!_lCh7&#5c-<u|H$$9r1W8
zE`mzNzS-pI=x_FChnuYQ7RqLu_&Pa}Xbk;GXHJpiSG=O4dT;*nv0naF<`sd%Ee=*L
zxO&dM#+6NdblaCbYZXlp-c9K!xLO~JD=B(zG5pp_EEVRR7K+=v8gvPU01naNJ-<6P
zsY`bK7k>^9F5uVXY`lK*YEnaF6mw*vp>8wU@*E*|eWaW6eL3z$xjOg42RxkQ!$Q@j
zFEJV;!%R?Xf4x*(?l)#lUd#$8YtZZW?AYJ3`ZdJc(>GxjNBL6_tNZu$A@RI?AJ5*v
z=@A2~m8^^J;5Ho!lfI~pi|WBlx3)LKT)ihc)mw36H~aBwv67S`YP&pcG_CLk<+g=V
z@ufARQ)1KQDY;R8IG=Qx(vQPJsW3%;$=1#LjqZL+9KPZ;S2^?omxr6}ALpG4Am0h_
zAfAEq#`pED7V0JUeKJ!EA%5EKzq~F~vj&UxTicHR)tCEPXyYbbkRyy)-&&#&6LP%2
z%v!&7>M9|paN)?6XYoB5{LV(MEiMcrns_3ZE&Doyxc7zztMS;iMPalFOrnb8A{;6^
za7i|q+gHal)_;}Qw!XkA^sQvLlXl|f?`f<!&8|i*s@}5or-t=6&pwFMv2kRom?r(O
zR4FWd*H!$7I|F7pPi4HIv3Vc@d}Z;%VfC4u*VLgMD;cJwM`lWSBMor{cD>5w%TwS~
zIuVhs&XFoVB|Mxg@3fl2c1fMQOg{@e_7Rbp>O!UTIIU9;t?}cAJIGn(;nZg%U75v4
zG!}XyM5NB5F5D!P@daE_T}?3KRttg6a$BxWy`OCz52alRbenbH1uL+?$(Uh{F)Fl)
z*nZ~W1}xm>N}FfuMkhY=A&`kF#P1%%^_i2iEpfAEW8OvZR6Ao+j*WuNVsiQ5IaOl6
ze2w^>Tu|W3>^&;Y{IsdCrLX=&;E$_u!$G5%L!xfe(~UP4$zzASel`VGZO7a9=Z$UN
zmT@$p$5maXZ?-;woH4c_rTXQVQ)Yc};NQ>Htz-lu<}4|ae?PCNzck78jdxe+Xui3{
zknO(><C#qyPoQwE{h^Mt6}wVXMC%##j3zCatB~)Iy*@Sa<R;hh4B?zaX(19XOqy{h
zcC#uGzeV##_}8!MSFW^^11Tx}pY}V}F;)D1mf6tS*_vHa{r5rz+{VXq)L`>}9g?0N
zpY!~s5;#5f#0!SCv4ZbQxY{tm9Mv-B7U>bqv<t@V!(e3mZ}Vsnq}ARju%=93`?adg
z8%EsIzp}JkvKT9BB0<2zZBQ{I9Gizm)GNxBpImZ^QjG|L5txu0CCm*gYYs7oIUgx$
zXWv+Fq=YW1Xq5SJdqLR_U$8^H2zpW1@4K#3x_hI>@I8l8Vck})S2x!dZHXtU87J-O
z#|?V1D84<$fth9|NUN48bQ)b>AFy64H^DNPl*mQ@Ta;vOMGw#W=QAy+YDlzYHgP7R
z`NlA#%iB`RUv+#J8S*Tx_5Oj3WghWpMzJtdYfLG111R)URPX%A5%NHPV$i9BsW7pN
ziQWI|%x*tG<kjK1qRVV>M3Ek8ywrniw&>H)yx`DEmDrA7N>CQu*cW)B0_t;LBvd{R
zi^F;xk*iiD(!e9~WJ8zZuI=N>N7c4_gd1)yGuCE*&r=r|3G9|4mJ15yk3YCBa7P_v
zV8V91zx@wA=&Kip|0LpZMCac}X}@G4cEL`Mam3IbE1NisybRxt|J=N5^OWd+e92(~
zGk<f!a$^f_eBuF040iaa*}qGr{gP?`R<=;;(!Z6Z-D<2zD(qvg;lG<n`*(!@?_}Ya
zt&`naS^QQRY;7=j+*TQE;Vi>e8K5y+Ww2ESpqbh#gRL^yDgzp|vDF)Fp#gXo-715v
zGT15uh<(}W4Ytr=s|>b!13G)Vg$7$_u!RP6G$2ypFXQkg@~_BBFz}<VW2Bv<WfSxt
D_ryh$

diff --git a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index c6863fe52..000000000
--- a/newexample/ios/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "AppIcon20@2x~iPhone.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "AppIcon20@3x~iPhone.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "AppIcon29@2x~iPhone.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "AppIcon29@3x~iPhone.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "AppIcon40@2x~iPhone.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "AppIcon40@3x~iPhone.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "AppIcon60@2x~iPhone.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "AppIcon60@3x~iPhone.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "AppIcon20~iPad.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "AppIcon20@2x~iPad.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "AppIcon29@1x~iPad.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "AppIcon29@2x~iPad.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "AppIcon40~iPad.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "AppIcon40@2x~iPad.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "AppIcon76~iPad.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "AppIcon76@2x~iPad.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "AppIcon83@2x~iPad.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "AppIcon~iOS-marketing.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/newexample/ios/Demo/Assets.xcassets/Contents.json b/newexample/ios/Demo/Assets.xcassets/Contents.json
deleted file mode 100644
index da4a164c9..000000000
--- a/newexample/ios/Demo/Assets.xcassets/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/newexample/ios/Demo/Assets.xcassets/close_icon.imageset/Contents.json b/newexample/ios/Demo/Assets.xcassets/close_icon.imageset/Contents.json
deleted file mode 100644
index 19ba2aa02..000000000
--- a/newexample/ios/Demo/Assets.xcassets/close_icon.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "close-24px.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
diff --git a/newexample/ios/Demo/Assets.xcassets/close_icon.imageset/close-24px.pdf b/newexample/ios/Demo/Assets.xcassets/close_icon.imageset/close-24px.pdf
deleted file mode 100644
index 214a2d71629bb792bfb289bd5be78f2b1ccce12c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4345
zcmeHK&u<$=6u$JrK*fImPmQciknGuAd!5*|Q#E!HqQ(%}K}A$Zo$OAWP1n2I-Eq7L
z5)>{}s(L^@a6xcEl|X=~fC~r#2h=mD61V;b{5Wt!0^aNod!1hJp`5(3ygP56-}~P8
z-mLr;cG??7tz?kGSHFJt7pZ^>-rgZ;G=Oe%w=WLBKvS0h0Nt=1!2`TIOz<{0J&Tjo
zRT7GTvjK_T>)ih7><xIT{m=Oyi_ksOx$mDb&%OTr+h4zNZf9@%&fRZEzv#|KZ(a(Y
zdF}2k=gx08uYYm#>3dhJ@4xfIttZ~Papvgim3Ke<<nZGC2V3`cJLSWL&;R`6!Kb%B
ze(r<I_IdyBhtGcb^OGyf3vI$(D@}?|60XE3?}$=Ut8!ni%Hv{U`0J6_><NSpjfOPf
zMVX2VpskCb0W}$ZV?nrq-}p)6=;Js*caMDzbcgjh6hMpP?y!Kn0)LwE)Zv!R*1QO=
zph*S2B0sOjzAeuc=p2G1I$?D)@P>X4Qj#IIW+;1@H(+k)%S`5RX5Io340*O{p;wz9
z*(UF9u1RB33GMRG8wMs1LGsbf)g=*U&7Ra1%HPsUwiP0NS$cPjeJIP!1*ql%>;#@Q
zG;ur@O=brkXeG@kX(}up2;tW$l8e@U!2AQ-3`<_nUs{S2wQzWZ?YV8)n8kKoS9Mi2
zG+ixMs)kln4MkO#aygfCITO$=CYa;(<7l!mVcLpG1EYZN6BSm7I=-N47-a+YA+s6k
z3dFnMj%|7k>z7yFrejY}*;EY&@RUufJsQtg#ul9NtFF{0HW4t};X!=-diDuN$g&w-
z&l4aEPbOx|-S<FpA2%};ED&*p%N30j3hOU!kir`8+wOW~@9%n^^OA2Nxn$BULSxoF
zY}PAmaKeHmLMQ#pOcVYloRjnbWSqw*AtRi2xL}xy0hT^BX>y%RS{5L4CA2r(6Y-&X
zxwB2OmyTYmlx5SCV}6!2E<`>vuW<o;va+V~`#0YyU|UV)ve8jHev2R2&z}Umck;rn
zd2-FHS;~b~(unHOz#kwghz5=u)}yAv@YTTU_$<v-L8rjluXo!UsSB=}N;<Qn(Wo>k
z%VDKjtyZI|PIbMA9>wt36)Y;c;Q~e=5XWfq&<t!}4l~G@Y|k5trlMdAlkAo`j_eNu
zCyr~GlskMN-w70tj06PGu*|wC&xIGnZ=*PTk6(`$NixS?P5RWJG8Zo8q$G>fvq7iA
zBzrlK{~frW<HQY1F@+`58&KRp)a4X4uIkwsjnPdRk*OH&6pF-z9l&1DamSKcv8Km*
zNzxwsHBT}V#dEsmbj`%TOwRM^n$tBC12Z|#r)y5vObpEA{QpeX<i9rR-=;E>|D^G0
zT5+e6O3UOEs+x(UszN!nYpVK)<Uxgw%5z!<X_}7mB(qIq5Xu87gK8wNfoM(up>E+v
dAe9fQg~GaPO^Y6=t>`EsGKEyp3_X=d{{m9oQ|JHy

diff --git a/newexample/ios/Demo/Assets.xcassets/darker_color.colorset/Contents.json b/newexample/ios/Demo/Assets.xcassets/darker_color.colorset/Contents.json
deleted file mode 100644
index d82588e1b..000000000
--- a/newexample/ios/Demo/Assets.xcassets/darker_color.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "0.200",
-          "blue" : "0.000",
-          "green" : "0.000",
-          "red" : "0.000"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "0.100",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/newexample/ios/Demo/Assets.xcassets/error_icon.imageset/Contents.json b/newexample/ios/Demo/Assets.xcassets/error_icon.imageset/Contents.json
deleted file mode 100644
index 13f7a995e..000000000
--- a/newexample/ios/Demo/Assets.xcassets/error_icon.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "error-black-18dp.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
diff --git a/newexample/ios/Demo/Assets.xcassets/error_icon.imageset/error-black-18dp.pdf b/newexample/ios/Demo/Assets.xcassets/error_icon.imageset/error-black-18dp.pdf
deleted file mode 100644
index 7f8171cba1c19fae3107d72bd6e69a7fa7f91d5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1020
zcmZWoO-vI(6gCiJvJ%fk4?Yqq^g#Eg-L{ZILbokJC9Fj>f*8l`v|Unn>g?1MqaH8@
z^<bjms4)b+8E+B}a*#7}FkUc*7~@SzjA)FQ5NEcuY+$mP-TCJIeBXO-17<4IrG_F>
z;Pu9<e^LY#AXg@(L;~c~*eS3g=p4#Q03c`V62p|gONikVwnz?3eSMP4C`MPM>XV6w
z{YRSGTGD@d)AHpPOj=PB({0x-#t;AAzW;9aXr%q_`E^-2G2XGToP2O=rsMhi-;Y0T
z4lORtnWMQcFBj*{3)62_pBfv@=O(w7R@+D49z3-9sWrav?9z(+^UTbF%{#ZhS7%Nx
zueEfoZI9g>KlZEjL-A4mYu;>M%DfLgPJWwh*&1H|+;n`d*JzfoliT6Ozl16wMZCEf
zHKL1qaSAsydn(gaHZa1tLP#V8z?X~^egN6%2Nh%s@ty1D7kuZ>P8_Wf2jsI;Wel>3
z3K#;QdT~uevBS7)y_`chXQL#k!Z?Q%P{Sd;woQ2U25}g7a6$B>)_?&@DrFz7S{4tj
zGacc%DRSJh$YxE|;Xz=ug6k)PTcz-I+rrs_qyTGb<Scecg<9AJQIo7sn_yj^i(PH5
z@Rd*5IhSh?^0QFqUJ+7#0iwPDCMCIw#V4uLLN+C!hSX?CfzBdhWw%G>1?FghqH@u;
z+z_FKV9-ls@Ht~PaZ;i=ov9v8(G*2jH6^CUl=xWCmoDZ@SL16ShDxO11rmL6cRI1#
zzbeIfNrAYeG!{g4J*-0>>X@$cN{9tc0}F@uW18N*&rVVK{O$48!kp<IEUNNi?ZIN2
y&yG=KmoW8y(h>Ux=9EPrvV<@Y!fV4a=;R5AvU`1W8KTTn7>jjFfk1jVBmD=eNFTZY

diff --git a/newexample/ios/Demo/Assets.xcassets/li_colorAccent.colorset/Contents.json b/newexample/ios/Demo/Assets.xcassets/li_colorAccent.colorset/Contents.json
deleted file mode 100644
index 29e731933..000000000
--- a/newexample/ios/Demo/Assets.xcassets/li_colorAccent.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "colors" : [
-    {
-      "idiom" : "universal",
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "red" : "0.000",
-          "alpha" : "1.000",
-          "blue" : "0.000",
-          "green" : "0.977"
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/newexample/ios/Demo/Assets.xcassets/li_colorBackground.colorset/Contents.json b/newexample/ios/Demo/Assets.xcassets/li_colorBackground.colorset/Contents.json
deleted file mode 100644
index 1acc7fa26..000000000
--- a/newexample/ios/Demo/Assets.xcassets/li_colorBackground.colorset/Contents.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "colors" : [
-    {
-      "idiom" : "universal",
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "red" : "0.579",
-          "alpha" : "1.000",
-          "blue" : "0.573",
-          "green" : "0.128"
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/newexample/ios/Demo/Base.lproj/LaunchScreen.storyboard b/newexample/ios/Demo/Base.lproj/LaunchScreen.storyboard
deleted file mode 100644
index ab8946cc1..000000000
--- a/newexample/ios/Demo/Base.lproj/LaunchScreen.storyboard
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-</document>
diff --git a/newexample/ios/Demo/Base.lproj/Localizable.strings b/newexample/ios/Demo/Base.lproj/Localizable.strings
deleted file mode 100644
index f4f15cbf7..000000000
--- a/newexample/ios/Demo/Base.lproj/Localizable.strings
+++ /dev/null
@@ -1,102 +0,0 @@
-"app_name" = "Kaluga Example";
-
-"feature_alerts" = "Alerts";
-"feature_architecture" = "Architecture";
-"feature_date_time_picker"= "Date Time Picker";
-"feature_bluetooth" = "Bluetooth";
-"feature_hud" = "Loading Indicator";
-"feature_keyboard" = "Keyboard";
-"feature_location" = "Location";
-"feature_permissions" = "Permissions";
-"feature_links" = "Links";
-"feature_beacons" = "Beacons";
-"feature_resources" = "Resources";
-"feature_resources_color" = "Color";
-"feature_resources_button" = "Button";
-"feature_resources_label" = "Label";
-
-"show_alert" = "Show Alert";
-"dismissible_alert" = "Dismissible Alert";
-"alert_list" = "Show Alert List";
-"show_loading_indicator_system" = "Show Loading Indicator (System)";
-"show_loading_indicator_custom" = "Show Loading Indicator (Custom)";
-
-"select_time"="Select Time";
-"select_date"="Select Date";
-"current_time"="Current Time";
-"confirm_selection"="Select";
-"cancel_selection"="Cancel";
-
-"permissions_list" = "Permissions List";
-"permissions_bluetooth" = "Bluetooth Demo";
-"permissions_calendar" = "Calendar Demo";
-"permissions_camera" = "Camera Demo";
-"permissions_contacts" = "Contacts Demo";
-"permissions_location" = "Location Demo";
-"permissions_microphone" = "Microphone Demo";
-"permissions_notifications" = "Notifications Demo";
-"permissions_storage" = "Storage Demo";
-
-"permission_unknown" = "The status of the permission is not known yet";
-"permission_allowed" = "The permission has been granted";
-"permission_requestable" = "The permission can be requested";
-"permission_denied" = "The permission has been denied";
-
-"permission_request" = "Request Permission";
-"permission_request_success" = "Permission requested successfully";
-"permission_request_failed" = "Permission request failed";
-
-"architecture_details" = "Show Details";
-"architecture_details_inverse" = "Inverse Input";
-"keyboard_manager" = "Keyboard";
-"show_keyboard" = "Show Keyboard";
-"hide_keyboard" = "Hide Keyboard";
-
-"location_background" = "Kaluga Background";
-"location_enable_background" = "Enable Background";
-"location_disable_background" = "Disable Background";
-
-"bluetooth_start_scanning" = "Start Scanning";
-"bluetooth_stop_scanning" = "Stop Scanning";
-"bluetooth_no_name" = "Unnamed Bluetooth Device";
-
-"rssi" = "%d dBm";
-"txPower" = "%s dBm";
-"distance" = "%.2f m";
-
-"bluetooth_connect" = "Connect";
-"bluetooth_disconnect" = "Disconnect";
-
-"bluetooth_connected" = "Connected";
-"bluetooth_connecting" = "Connecting";
-"bluetooth_disconnected" = "Disconnected";
-"bluetooth_disconneting" = "Disconnecting";
-"bluetooth_reconnecting" = "Reconnecting";
-"bluetooth_discovering" = "Discovering";
-
-"bluetooth_service_uuids" = "Service UUIDs: %s";
-"bluetooth_service_data" = "Service Data: %s";
-"bluetooth_manufacturer_id" = "Manufacturer Id: %d";
-"bluetooth_manufacturer_data" = "Manufacturer Data: %s";
-
-"bluetooth_more" = "More";
-
-"bluetooth_services_header" = "Services";
-"bluetooth_service" = "Service";
-"bluetooth_characteristics" = "Characteristics";
-"bluetooth_descriptors" = "Descriptors";
-"bluetooth_permissions_read" = "Read";
-"bluetooth_permissions_write" = "Write";
-"bluetooth_permissions_read_encrypted" = "Read Encrypted";
-"bluetooth_permissions_write_encrypted" = "Write Encrypted";
-
-"beacons_start_monitoring" = "Start Monitoring";
-"beacons_stop_monitoring" = "Stop Monitoring";
-
-"browser_button_text" = "Open browser";
-"links_instructions" = "Tapping \"Open browser\" will redirect you in a webpage.
-There you can find a button that if tapped will bring you back to the app passing a query.
-That query will be deserialized into a object and shown in an alert.";
-
-"feature_system" = "System";
-"network_feature" = "Network";
diff --git a/newexample/ios/Demo/Base.lproj/Main.storyboard b/newexample/ios/Demo/Base.lproj/Main.storyboard
deleted file mode 100644
index c07aeb629..000000000
--- a/newexample/ios/Demo/Base.lproj/Main.storyboard
+++ /dev/null
@@ -1,1727 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="czt-vE-Q3c">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
-        <capability name="Named colors" minToolsVersion="9.0"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
-        <capability name="collection view cell content view" minToolsVersion="11.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Architecture Input View Controller-->
-        <scene sceneID="YDA-Hr-mSj">
-            <objects>
-                <viewController id="irm-WF-A13" customClass="ArchitectureInputViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="py6-Ar-fCs">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="r7U-VH-8wC">
-                                <rect key="frame" x="20" y="93.5" width="374" height="34"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits"/>
-                                <connections>
-                                    <outlet property="delegate" destination="irm-WF-A13" id="c0E-PN-JMr"/>
-                                </connections>
-                            </textField>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter Your Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BRD-1O-pzh">
-                                <rect key="frame" x="20" y="68" width="128.5" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter a Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e50-92-l7G">
-                                <rect key="frame" x="20" y="147.5" width="119.5" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MN6-Uw-a48">
-                                <rect key="frame" x="20" y="226" width="374" height="30"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oa5-69-XBu">
-                                        <rect key="frame" x="0.0" y="0.0" width="374" height="30"/>
-                                        <state key="normal" title="Show Details"/>
-                                        <connections>
-                                            <action selector="onShowDetailsPressedWithSender:" destination="irm-WF-A13" eventType="touchUpInside" id="5kX-rr-EdX"/>
-                                        </connections>
-                                    </button>
-                                </subviews>
-                            </stackView>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="w2o-g6-GSv">
-                                <rect key="frame" x="20" y="172" width="374" height="34"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits"/>
-                                <connections>
-                                    <outlet property="delegate" destination="irm-WF-A13" id="T2c-Bl-xIV"/>
-                                </connections>
-                            </textField>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="error_icon" translatesAutoresizingMaskIntoConstraints="NO" id="nkY-wQ-Zgj">
-                                <rect key="frame" x="376" y="103.5" width="14" height="14"/>
-                                <color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="nkY-wQ-Zgj" secondAttribute="height" multiplier="1:1" id="1aJ-P0-XUj"/>
-                                </constraints>
-                            </imageView>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="error_icon" translatesAutoresizingMaskIntoConstraints="NO" id="9Vf-hG-a8X">
-                                <rect key="frame" x="376" y="182" width="14" height="14"/>
-                                <color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="9Vf-hG-a8X" secondAttribute="height" multiplier="1:1" id="Lpe-G7-rrQ"/>
-                                </constraints>
-                            </imageView>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="cfj-uN-qHa"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="r7U-VH-8wC" firstAttribute="trailing" secondItem="nkY-wQ-Zgj" secondAttribute="trailing" constant="4" id="29l-Wo-nAk"/>
-                            <constraint firstItem="nkY-wQ-Zgj" firstAttribute="centerY" secondItem="r7U-VH-8wC" secondAttribute="centerY" id="3ki-bz-Q5z"/>
-                            <constraint firstItem="BRD-1O-pzh" firstAttribute="top" secondItem="cfj-uN-qHa" secondAttribute="top" constant="20" id="4qy-iA-RqN"/>
-                            <constraint firstItem="w2o-g6-GSv" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="5le-Mo-cPp"/>
-                            <constraint firstItem="9Vf-hG-a8X" firstAttribute="centerY" secondItem="w2o-g6-GSv" secondAttribute="centerY" id="8in-AJ-qYx"/>
-                            <constraint firstItem="MN6-Uw-a48" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="9AT-IS-szf"/>
-                            <constraint firstItem="r7U-VH-8wC" firstAttribute="top" secondItem="BRD-1O-pzh" secondAttribute="bottom" constant="5" id="CQ8-uz-pia"/>
-                            <constraint firstItem="9Vf-hG-a8X" firstAttribute="width" secondItem="9Vf-hG-a8X" secondAttribute="height" multiplier="1:1" id="DOC-kp-U4u"/>
-                            <constraint firstItem="MN6-Uw-a48" firstAttribute="top" secondItem="w2o-g6-GSv" secondAttribute="bottom" constant="20" id="F7h-7c-fq2"/>
-                            <constraint firstItem="cfj-uN-qHa" firstAttribute="trailing" secondItem="w2o-g6-GSv" secondAttribute="trailing" constant="20" id="KZD-4u-uFu"/>
-                            <constraint firstItem="r7U-VH-8wC" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="RBw-GV-NWQ"/>
-                            <constraint firstItem="cfj-uN-qHa" firstAttribute="trailing" secondItem="MN6-Uw-a48" secondAttribute="trailing" constant="20" id="T0D-RX-rxR"/>
-                            <constraint firstItem="e50-92-l7G" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="VdD-wU-Vy9"/>
-                            <constraint firstItem="w2o-g6-GSv" firstAttribute="trailing" secondItem="9Vf-hG-a8X" secondAttribute="trailing" constant="4" id="avb-uH-j8z"/>
-                            <constraint firstItem="BRD-1O-pzh" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="c08-rF-2su"/>
-                            <constraint firstItem="cfj-uN-qHa" firstAttribute="trailing" secondItem="r7U-VH-8wC" secondAttribute="trailing" constant="20" id="gOS-oo-ZSy"/>
-                            <constraint firstItem="e50-92-l7G" firstAttribute="top" secondItem="r7U-VH-8wC" secondAttribute="bottom" constant="20" id="ivN-y3-fAz"/>
-                            <constraint firstItem="w2o-g6-GSv" firstAttribute="top" secondItem="e50-92-l7G" secondAttribute="bottom" constant="4" id="xnF-e1-LwG"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" id="i8W-fj-OLz"/>
-                    <connections>
-                        <outlet property="detailsButton" destination="oa5-69-XBu" id="tx2-Sn-0dP"/>
-                        <outlet property="nameError" destination="nkY-wQ-Zgj" id="01j-he-tFD"/>
-                        <outlet property="nameInput" destination="r7U-VH-8wC" id="DUN-id-71w"/>
-                        <outlet property="nameLabel" destination="BRD-1O-pzh" id="7xi-ZG-mfx"/>
-                        <outlet property="numberError" destination="9Vf-hG-a8X" id="ZUn-Be-ROg"/>
-                        <outlet property="numberInput" destination="w2o-g6-GSv" id="Z2J-h6-QOf"/>
-                        <outlet property="numberLabel" destination="e50-92-l7G" id="en5-Kb-jSu"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="HKD-7I-kf8" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2648" y="1807"/>
-        </scene>
-        <!--Architecture Details View Controller-->
-        <scene sceneID="e0z-fU-zDf">
-            <objects>
-                <viewController storyboardIdentifier="ArchitectureDetails" id="IaZ-HT-93C" customClass="ArchitectureDetailsViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="PHY-me-ogV">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jo1-3B-4UO">
-                                <rect key="frame" x="20" y="68" width="45" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P3V-58-1Kg">
-                                <rect key="frame" x="20" y="108.5" width="61.5" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yci-wv-53q">
-                                <rect key="frame" x="20" y="149" width="374" height="30"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="h7K-k3-Lq1">
-                                        <rect key="frame" x="0.0" y="0.0" width="374" height="30"/>
-                                        <state key="normal" title="Inverse Input"/>
-                                        <connections>
-                                            <action selector="onInversePressedWithSender:" destination="IaZ-HT-93C" eventType="touchUpInside" id="KpB-n8-blm"/>
-                                        </connections>
-                                    </button>
-                                </subviews>
-                            </stackView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tTy-iI-GY4">
-                                <rect key="frame" x="380" y="58" width="24" height="24"/>
-                                <state key="normal" image="close_icon"/>
-                                <connections>
-                                    <action selector="onCloseButtonPressedWithSender:" destination="IaZ-HT-93C" eventType="touchUpInside" id="Ob6-7f-nJz"/>
-                                </connections>
-                            </button>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="FAp-h6-6JX"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="Yci-wv-53q" firstAttribute="top" secondItem="P3V-58-1Kg" secondAttribute="bottom" constant="20" id="4Wj-XK-4lK"/>
-                            <constraint firstItem="Yci-wv-53q" firstAttribute="leading" secondItem="PHY-me-ogV" secondAttribute="leading" constant="20" id="Hhy-2f-bEP"/>
-                            <constraint firstItem="tTy-iI-GY4" firstAttribute="top" secondItem="FAp-h6-6JX" secondAttribute="top" constant="10" id="Nma-cc-mmy"/>
-                            <constraint firstItem="Jo1-3B-4UO" firstAttribute="top" secondItem="FAp-h6-6JX" secondAttribute="top" constant="20" id="h5e-Z5-ZJG"/>
-                            <constraint firstItem="FAp-h6-6JX" firstAttribute="trailing" secondItem="Yci-wv-53q" secondAttribute="trailing" constant="20" id="j8D-he-zWs"/>
-                            <constraint firstItem="P3V-58-1Kg" firstAttribute="top" secondItem="Jo1-3B-4UO" secondAttribute="bottom" constant="20" id="lVw-ru-QeN"/>
-                            <constraint firstItem="P3V-58-1Kg" firstAttribute="leading" secondItem="FAp-h6-6JX" secondAttribute="leading" constant="20" id="swA-AQ-pJ8"/>
-                            <constraint firstItem="Jo1-3B-4UO" firstAttribute="leading" secondItem="FAp-h6-6JX" secondAttribute="leading" constant="20" id="w4u-u2-Opd"/>
-                            <constraint firstItem="FAp-h6-6JX" firstAttribute="trailing" secondItem="tTy-iI-GY4" secondAttribute="trailing" constant="10" id="xjF-rW-0zn"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="closeButton" destination="tTy-iI-GY4" id="7MU-H7-1jg"/>
-                        <outlet property="inverseButton" destination="h7K-k3-Lq1" id="9a1-fJ-EB2"/>
-                        <outlet property="nameLabel" destination="Jo1-3B-4UO" id="DU2-Ya-sSS"/>
-                        <outlet property="numberLabel" destination="P3V-58-1Kg" id="Fjz-is-4CD"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="185-UF-jAH" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3403" y="1807"/>
-        </scene>
-        <!--Location View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="LocationViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="characterWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N09-wk-m9R">
-                                <rect key="frame" x="40" y="419" width="334" height="0.0"/>
-                                <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="N09-wk-m9R" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="AqD-Pg-RgE"/>
-                            <constraint firstItem="N09-wk-m9R" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="20" id="cOF-po-VVP"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="N09-wk-m9R" secondAttribute="trailing" constant="20" id="r8O-Jm-dEs"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" id="qiK-1i-3iO"/>
-                    <connections>
-                        <outlet property="label" destination="N09-wk-m9R" id="GgY-Zv-9MA"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2648" y="1073"/>
-        </scene>
-        <!--Navigation Controller-->
-        <scene sceneID="wzc-80-TVF">
-            <objects>
-                <navigationController id="czt-vE-Q3c" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="JFR-fW-QFO">
-                        <rect key="frame" x="0.0" y="48" width="414" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="h5f-Hj-KON" kind="relationship" relationship="rootViewController" id="XVr-rN-47X"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="GFy-QJ-qwR" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-81" y="329"/>
-        </scene>
-        <!--Example View Controller-->
-        <scene sceneID="K8T-3r-eHt">
-            <objects>
-                <viewController id="h5f-Hj-KON" customClass="ExampleViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="dAg-Yn-hmm">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U2z-d2-7eZ">
-                                <rect key="frame" x="0.0" y="92" width="414" height="690"/>
-                                <color key="backgroundColor" systemColor="systemGray4Color"/>
-                            </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AHr-fV-53e">
-                                <rect key="frame" x="0.0" y="782" width="414" height="80"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                            </view>
-                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="NBH-Hd-b8k">
-                                <rect key="frame" x="0.0" y="782" width="414" height="80"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="80" id="rio-Sy-Vag"/>
-                                </constraints>
-                            </stackView>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="7lJ-cj-k76"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="trailing" secondItem="AHr-fV-53e" secondAttribute="trailing" id="2AV-c7-Fko"/>
-                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="bottom" secondItem="AHr-fV-53e" secondAttribute="bottom" id="3Cs-qo-Ydl"/>
-                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="top" secondItem="U2z-d2-7eZ" secondAttribute="bottom" id="3Ip-Rr-F57"/>
-                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="leading" secondItem="AHr-fV-53e" secondAttribute="leading" id="8pm-ZN-qul"/>
-                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="leading" secondItem="7lJ-cj-k76" secondAttribute="leading" id="A6r-CW-MlH"/>
-                            <constraint firstItem="U2z-d2-7eZ" firstAttribute="top" secondItem="7lJ-cj-k76" secondAttribute="top" id="CD3-Zg-ht7"/>
-                            <constraint firstItem="U2z-d2-7eZ" firstAttribute="leading" secondItem="7lJ-cj-k76" secondAttribute="leading" id="DZg-rb-Arf"/>
-                            <constraint firstItem="7lJ-cj-k76" firstAttribute="trailing" secondItem="U2z-d2-7eZ" secondAttribute="trailing" id="Ee1-Mk-W0l"/>
-                            <constraint firstItem="NBH-Hd-b8k" firstAttribute="top" secondItem="AHr-fV-53e" secondAttribute="top" id="SzZ-lL-luI"/>
-                            <constraint firstItem="7lJ-cj-k76" firstAttribute="bottom" secondItem="NBH-Hd-b8k" secondAttribute="bottom" id="gPZ-kh-FBZ"/>
-                            <constraint firstItem="7lJ-cj-k76" firstAttribute="trailing" secondItem="NBH-Hd-b8k" secondAttribute="trailing" id="o49-Qe-2g2"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" id="Jxb-jF-VSQ"/>
-                    <connections>
-                        <outlet property="bottomView" destination="NBH-Hd-b8k" id="uz5-Kb-6EH"/>
-                        <outlet property="containerView" destination="U2z-d2-7eZ" id="QNy-Dw-Yjm"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="J3n-co-QAY" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="815.94202898550736" y="328.79464285714283"/>
-        </scene>
-        <!--Features List View Controller-->
-        <scene sceneID="C1a-KP-3Bk">
-            <objects>
-                <tableViewController storyboardIdentifier="FeaturesList" id="D99-ng-6V8" customClass="FeaturesListViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="KZQ-Mr-INa">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="FeaturesListCell" id="C4Y-IC-Pu4" customClass="FeaturesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="C4Y-IC-Pu4" id="XEB-aa-Byo">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xh8-DK-zfM">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                            <nil key="textColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstAttribute="trailingMargin" secondItem="Xh8-DK-zfM" secondAttribute="trailing" constant="20" id="aBe-qb-sMa"/>
-                                        <constraint firstAttribute="bottomMargin" secondItem="Xh8-DK-zfM" secondAttribute="bottom" constant="4" id="iSp-u1-YS4"/>
-                                        <constraint firstItem="Xh8-DK-zfM" firstAttribute="top" secondItem="XEB-aa-Byo" secondAttribute="topMargin" constant="4" id="po9-6M-fbu"/>
-                                        <constraint firstItem="Xh8-DK-zfM" firstAttribute="leading" secondItem="XEB-aa-Byo" secondAttribute="leadingMargin" constant="20" id="uqr-hN-rru"/>
-                                    </constraints>
-                                </tableViewCellContentView>
-                                <connections>
-                                    <outlet property="label" destination="Xh8-DK-zfM" id="aeY-0C-asT"/>
-                                </connections>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="D99-ng-6V8" id="v7o-jT-FXS"/>
-                            <outlet property="delegate" destination="D99-ng-6V8" id="7Ag-aq-nNQ"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="q2T-p0-bqB"/>
-                    <connections>
-                        <outlet property="view" destination="KZQ-Mr-INa" id="yKY-xs-5Bk"/>
-                        <segue destination="itP-bh-ePK" kind="show" identifier="showHUD" id="R5i-w6-hej"/>
-                        <segue destination="jUB-i9-u9F" kind="show" identifier="showAlerts" id="2vi-ed-ywq"/>
-                        <segue destination="irm-WF-A13" kind="show" identifier="showArchitecture" id="IOQ-4E-QhL"/>
-                        <segue destination="BYZ-38-t0r" kind="show" identifier="showLocation" id="25d-lm-Tpv"/>
-                        <segue destination="Hbw-co-mWZ" kind="show" identifier="showPermissions" id="gxu-od-TLe"/>
-                        <segue destination="7Rf-m0-GFx" kind="show" identifier="showKeyboard" id="IO5-8e-Q9F"/>
-                        <segue destination="Y7p-ku-8gX" kind="show" identifier="showDateTimePicker" id="wT7-jZ-xqh"/>
-                        <segue destination="VPE-Hp-Qc9" kind="show" identifier="showLinks" id="KlM-G9-P6y"/>
-                        <segue destination="NRf-rC-nl1" kind="show" identifier="showSystem" id="IT2-HT-9Hz"/>
-                        <segue destination="SGP-dn-hxw" kind="show" identifier="showBluetooth" id="Z5V-Lj-mdM"/>
-                        <segue destination="2CB-DJ-Qmw" kind="show" identifier="showBeacons" id="jYU-Fd-PgO"/>
-                        <segue destination="Tyz-Gd-0uw" kind="show" identifier="showResources" id="R7Z-R6-fGx"/>
-                    </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="L6W-Hz-iOT" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1717" y="329"/>
-        </scene>
-        <!--Bluetooth View Controller-->
-        <scene sceneID="YuN-Fr-cmH">
-            <objects>
-                <collectionViewController id="SGP-dn-hxw" customClass="BluetoothViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="JhO-3I-v9f">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="eaf-4s-drW">
-                            <size key="itemSize" width="414" height="128"/>
-                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                            <inset key="sectionInset" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
-                        </collectionViewFlowLayout>
-                        <cells>
-                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="BluetoothCell" id="Btz-mm-dF6" customClass="BluetoothCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="128"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="9P2-7R-gXH">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="128"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="mKE-ZX-4Qh">
-                                            <rect key="frame" x="8" y="8" width="398" height="112"/>
-                                            <subviews>
-                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="JAn-Zv-Ydc">
-                                                    <rect key="frame" x="0.0" y="0.0" width="398" height="41"/>
-                                                    <subviews>
-                                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="6jP-rv-jLh">
-                                                            <rect key="frame" x="0.0" y="0.0" width="247" height="41"/>
-                                                            <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Device Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4w3-p3-jhK">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="247" height="20.5"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <stackView opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="fhu-oD-dwi">
-                                                                    <rect key="frame" x="0.0" y="20.5" width="247" height="20.5"/>
-                                                                    <subviews>
-                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identifier" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2nS-D3-DwQ">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="82.5" height="20.5"/>
-                                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                            <nil key="textColor"/>
-                                                                            <nil key="highlightedColor"/>
-                                                                        </label>
-                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rssi" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jZZ-Fe-8Dw">
-                                                                            <rect key="frame" x="82.5" y="0.0" width="82" height="20.5"/>
-                                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                            <nil key="textColor"/>
-                                                                            <nil key="highlightedColor"/>
-                                                                        </label>
-                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="txPower" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Ut-IF-FqT">
-                                                                            <rect key="frame" x="164.5" y="0.0" width="82.5" height="20.5"/>
-                                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                            <nil key="textColor"/>
-                                                                            <nil key="highlightedColor"/>
-                                                                        </label>
-                                                                    </subviews>
-                                                                </stackView>
-                                                            </subviews>
-                                                        </stackView>
-                                                        <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="ug1-K0-1qO">
-                                                            <rect key="frame" x="251" y="0.0" width="147" height="41"/>
-                                                            <subviews>
-                                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="500" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WYm-Sz-7Ii">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="59" height="41"/>
-                                                                    <state key="normal" title="Connect"/>
-                                                                    <connections>
-                                                                        <action selector="onConnectPressed" destination="Btz-mm-dF6" eventType="touchUpInside" id="aLB-aQ-hq1"/>
-                                                                    </connections>
-                                                                </button>
-                                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="500" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9dt-Wh-qHU">
-                                                                    <rect key="frame" x="69" y="0.0" width="78" height="41"/>
-                                                                    <state key="normal" title="Disconnect"/>
-                                                                    <connections>
-                                                                        <action selector="onDisonnectPressed" destination="Btz-mm-dF6" eventType="touchUpInside" id="1HB-7H-csY"/>
-                                                                    </connections>
-                                                                </button>
-                                                            </subviews>
-                                                        </stackView>
-                                                    </subviews>
-                                                </stackView>
-                                                <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ConnectionState" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RHb-me-DDx">
-                                                    <rect key="frame" x="0.0" y="43" width="398" height="69"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1zQ-0P-HX1">
-                                                    <rect key="frame" x="0.0" y="112" width="398" height="8"/>
-                                                    <subviews>
-                                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Y82-qz-1LQ">
-                                                            <rect key="frame" x="4" y="4" width="390" height="0.0"/>
-                                                            <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ServiceId" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JK4-ty-HJe">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="0.0"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ServiceData" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gq3-zy-DEg">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="0.0"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ManufacturerId" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WY8-so-mWs">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="0.0"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ManufacturerData" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="frJ-5F-9EQ">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="0.0"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
-                                                                <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LPu-vD-hFZ">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="0.0"/>
-                                                                    <subviews>
-                                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jga-xg-Tr2">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="354" height="0.0"/>
-                                                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                        </view>
-                                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O4h-41-h1Y">
-                                                                            <rect key="frame" x="354" y="0.0" width="36" height="0.0"/>
-                                                                            <state key="normal" title="More"/>
-                                                                            <connections>
-                                                                                <action selector="onMorePressed" destination="Btz-mm-dF6" eventType="touchUpInside" id="6db-qV-xSy"/>
-                                                                            </connections>
-                                                                        </button>
-                                                                    </subviews>
-                                                                </stackView>
-                                                            </subviews>
-                                                        </stackView>
-                                                    </subviews>
-                                                    <color key="backgroundColor" name="darker_color"/>
-                                                    <constraints>
-                                                        <constraint firstItem="Y82-qz-1LQ" firstAttribute="leading" secondItem="1zQ-0P-HX1" secondAttribute="leading" constant="4" id="R7v-3h-bbc"/>
-                                                        <constraint firstItem="Y82-qz-1LQ" firstAttribute="top" secondItem="1zQ-0P-HX1" secondAttribute="top" constant="4" id="ctz-es-Z0u"/>
-                                                        <constraint firstAttribute="trailing" secondItem="Y82-qz-1LQ" secondAttribute="trailing" constant="4" id="oSP-b7-5iA"/>
-                                                        <constraint firstAttribute="bottom" secondItem="Y82-qz-1LQ" secondAttribute="bottom" constant="4" id="tc7-dR-4fM"/>
-                                                    </constraints>
-                                                </view>
-                                            </subviews>
-                                        </stackView>
-                                    </subviews>
-                                    <color key="backgroundColor" name="darker_color"/>
-                                    <constraints>
-                                        <constraint firstItem="mKE-ZX-4Qh" firstAttribute="top" secondItem="9P2-7R-gXH" secondAttribute="top" constant="8" id="BYr-OP-WwL"/>
-                                        <constraint firstAttribute="trailing" secondItem="mKE-ZX-4Qh" secondAttribute="trailing" constant="8" id="PyJ-0o-ggY"/>
-                                        <constraint firstItem="mKE-ZX-4Qh" firstAttribute="leading" secondItem="9P2-7R-gXH" secondAttribute="leading" constant="8" id="bbn-ea-3CQ"/>
-                                        <constraint firstAttribute="bottom" secondItem="mKE-ZX-4Qh" secondAttribute="bottom" constant="8" id="k1R-Q5-4gy"/>
-                                    </constraints>
-                                </collectionViewCellContentView>
-                                <connections>
-                                    <outlet property="buttonContainer" destination="ug1-K0-1qO" id="b5d-Di-QnR"/>
-                                    <outlet property="connectButton" destination="WYm-Sz-7Ii" id="2rb-zR-p9w"/>
-                                    <outlet property="connectionStatus" destination="RHb-me-DDx" id="mbq-bb-hnu"/>
-                                    <outlet property="deviceIdentifier" destination="2nS-D3-DwQ" id="DeX-rU-rdq"/>
-                                    <outlet property="deviceName" destination="4w3-p3-jhK" id="LS0-vZ-fL1"/>
-                                    <outlet property="disconnectButton" destination="9dt-Wh-qHU" id="Q7y-NI-TbH"/>
-                                    <outlet property="foldOutMenu" destination="1zQ-0P-HX1" id="1dQ-AQ-yf5"/>
-                                    <outlet property="manufacturerData" destination="frJ-5F-9EQ" id="GRg-6L-oLy"/>
-                                    <outlet property="manufacturerId" destination="WY8-so-mWs" id="JSQ-fp-x9h"/>
-                                    <outlet property="moreButton" destination="O4h-41-h1Y" id="6tI-Vk-k1l"/>
-                                    <outlet property="moreButtonContainer" destination="LPu-vD-hFZ" id="JJx-wb-Kay"/>
-                                    <outlet property="rssi" destination="jZZ-Fe-8Dw" id="0jG-X3-eoZ"/>
-                                    <outlet property="serviceData" destination="Gq3-zy-DEg" id="DfL-Wk-w7S"/>
-                                    <outlet property="serviceId" destination="JK4-ty-HJe" id="xfx-As-jXx"/>
-                                    <outlet property="txPower" destination="3Ut-IF-FqT" id="ZF7-FJ-nYJ"/>
-                                </connections>
-                            </collectionViewCell>
-                        </cells>
-                        <connections>
-                            <outlet property="delegate" destination="SGP-dn-hxw" id="rYK-VL-jrX"/>
-                        </connections>
-                    </collectionView>
-                    <navigationItem key="navigationItem" id="Uqc-wm-akd"/>
-                </collectionViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="hgA-22-RJe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2648" y="2486"/>
-        </scene>
-        <!--Bluetooth Device Details View Controller-->
-        <scene sceneID="2dN-Ki-Y9V">
-            <objects>
-                <viewController storyboardIdentifier="BluetoothDeviceDetails" id="PHA-hf-85f" customClass="BluetoothDeviceDetailsViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="CtD-yu-wAr">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Device Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YXb-k7-PXE">
-                                <rect key="frame" x="8" y="56" width="398" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="dza-4j-F1E">
-                                <rect key="frame" x="8" y="80.5" width="398" height="20.5"/>
-                                <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identifier" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ici-zY-xCM">
-                                        <rect key="frame" x="0.0" y="0.0" width="132.5" height="20.5"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rssi" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jx7-0m-oS3">
-                                        <rect key="frame" x="132.5" y="0.0" width="133" height="20.5"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Distance" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PRG-4D-Y4j">
-                                        <rect key="frame" x="265.5" y="0.0" width="132.5" height="20.5"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                            </stackView>
-                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connection Status" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lbW-oZ-Mzd">
-                                <rect key="frame" x="8" y="105" width="398" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Abi-Up-lZz">
-                                <rect key="frame" x="0.0" y="162" width="414" height="700"/>
-                                <color key="backgroundColor" name="darker_color"/>
-                                <inset key="scrollIndicatorInsets" minX="8" minY="0.0" maxX="8" maxY="0.0"/>
-                                <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Vbv-Oq-cPk">
-                                    <size key="itemSize" width="128" height="128"/>
-                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                </collectionViewFlowLayout>
-                                <cells>
-                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="BluetoothServiceView" id="V8x-pa-U2S" customClass="BluetoothServiceView" customModule="Demo" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="189.5" height="89"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="HWZ-Jo-obc">
-                                            <rect key="frame" x="0.0" y="0.0" width="189.5" height="89"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="hon-CW-ofV">
-                                                    <rect key="frame" x="0.0" y="0.0" width="189.5" height="20.5"/>
-                                                    <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="500" verticalHuggingPriority="251" text="Service" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MqO-3D-kWr">
-                                                            <rect key="frame" x="0.0" y="0.0" width="57" height="20.5"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="500" text="Service Identifier" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FIp-5m-E3e">
-                                                            <rect key="frame" x="61" y="0.0" width="128.5" height="20.5"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                    </subviews>
-                                                </stackView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Characteristics" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0fn-M7-8sy">
-                                                    <rect key="frame" x="0.0" y="24.5" width="189.5" height="20.5"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="vvU-BV-kwm">
-                                                    <rect key="frame" x="0.0" y="49" width="189.5" height="40"/>
-                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="40" id="XLJ-hO-nT9"/>
-                                                    </constraints>
-                                                    <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="sFG-0D-jDz">
-                                                        <size key="itemSize" width="128" height="128"/>
-                                                        <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                                        <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                                        <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                                    </collectionViewFlowLayout>
-                                                    <cells/>
-                                                    <connections>
-                                                        <outlet property="dataSource" destination="V8x-pa-U2S" id="oVo-va-ZPJ"/>
-                                                        <outlet property="delegate" destination="V8x-pa-U2S" id="7r9-pc-FpL"/>
-                                                    </connections>
-                                                </collectionView>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="hon-CW-ofV" firstAttribute="top" secondItem="HWZ-Jo-obc" secondAttribute="top" id="3UV-aJ-H1j"/>
-                                                <constraint firstAttribute="trailing" secondItem="0fn-M7-8sy" secondAttribute="trailing" id="7Ao-3e-ETF"/>
-                                                <constraint firstItem="vvU-BV-kwm" firstAttribute="leading" secondItem="HWZ-Jo-obc" secondAttribute="leading" id="Fxp-my-xqq"/>
-                                                <constraint firstAttribute="trailing" secondItem="hon-CW-ofV" secondAttribute="trailing" id="LhN-Z0-41f"/>
-                                                <constraint firstAttribute="bottom" secondItem="vvU-BV-kwm" secondAttribute="bottom" id="M7t-pq-zlg"/>
-                                                <constraint firstItem="hon-CW-ofV" firstAttribute="leading" secondItem="HWZ-Jo-obc" secondAttribute="leading" id="f1c-OW-kJR"/>
-                                                <constraint firstItem="0fn-M7-8sy" firstAttribute="leading" secondItem="HWZ-Jo-obc" secondAttribute="leading" id="h9Z-tq-COb"/>
-                                                <constraint firstAttribute="trailing" secondItem="vvU-BV-kwm" secondAttribute="trailing" id="oSb-Sm-lkr"/>
-                                                <constraint firstItem="0fn-M7-8sy" firstAttribute="top" secondItem="hon-CW-ofV" secondAttribute="bottom" constant="4" id="rA0-nv-l72"/>
-                                                <constraint firstItem="vvU-BV-kwm" firstAttribute="top" secondItem="0fn-M7-8sy" secondAttribute="bottom" constant="4" id="zml-J1-sK5"/>
-                                            </constraints>
-                                        </collectionViewCellContentView>
-                                        <connections>
-                                            <outlet property="characteristicsHeader" destination="0fn-M7-8sy" id="uSf-BF-6Wl"/>
-                                            <outlet property="characteristicsList" destination="vvU-BV-kwm" id="tvV-4v-xhU"/>
-                                            <outlet property="characteristicsListHeight" destination="XLJ-hO-nT9" id="L7Y-mk-3Hw"/>
-                                            <outlet property="serviceHeader" destination="MqO-3D-kWr" id="vlE-2G-XCe"/>
-                                            <outlet property="serviceIdentifier" destination="FIp-5m-E3e" id="saI-mh-A7P"/>
-                                        </connections>
-                                    </collectionViewCell>
-                                </cells>
-                                <connections>
-                                    <outlet property="dataSource" destination="PHA-hf-85f" id="0wv-kP-CHO"/>
-                                    <outlet property="delegate" destination="PHA-hf-85f" id="Gyt-Wd-g7b"/>
-                                </connections>
-                            </collectionView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Services" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Gg-R4-tnz">
-                                <rect key="frame" x="8" y="137.5" width="414" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="0fz-zg-6Df"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="0fz-zg-6Df" firstAttribute="trailing" secondItem="YXb-k7-PXE" secondAttribute="trailing" constant="8" id="9Gy-fU-v63"/>
-                            <constraint firstItem="0fz-zg-6Df" firstAttribute="trailing" secondItem="lbW-oZ-Mzd" secondAttribute="trailing" constant="8" id="BOx-Zh-DEA"/>
-                            <constraint firstItem="YXb-k7-PXE" firstAttribute="top" secondItem="0fz-zg-6Df" secondAttribute="top" constant="8" id="FrS-Cd-JdZ"/>
-                            <constraint firstItem="0fz-zg-6Df" firstAttribute="trailing" secondItem="dza-4j-F1E" secondAttribute="trailing" constant="8" id="MTC-95-lD2"/>
-                            <constraint firstItem="dza-4j-F1E" firstAttribute="top" secondItem="YXb-k7-PXE" secondAttribute="bottom" constant="4" id="MeH-2c-CEZ"/>
-                            <constraint firstItem="Abi-Up-lZz" firstAttribute="leading" secondItem="0fz-zg-6Df" secondAttribute="leading" id="VL6-vS-zc0"/>
-                            <constraint firstItem="6Gg-R4-tnz" firstAttribute="top" secondItem="lbW-oZ-Mzd" secondAttribute="bottom" constant="12" id="ZbM-pW-5mD"/>
-                            <constraint firstItem="lbW-oZ-Mzd" firstAttribute="top" secondItem="dza-4j-F1E" secondAttribute="bottom" constant="4" id="ZdQ-kL-voF"/>
-                            <constraint firstItem="Abi-Up-lZz" firstAttribute="top" secondItem="6Gg-R4-tnz" secondAttribute="bottom" constant="4" id="aBr-TP-gTJ"/>
-                            <constraint firstItem="0fz-zg-6Df" firstAttribute="trailing" secondItem="Abi-Up-lZz" secondAttribute="trailing" id="dIc-uK-7KP"/>
-                            <constraint firstItem="lbW-oZ-Mzd" firstAttribute="leading" secondItem="0fz-zg-6Df" secondAttribute="leading" constant="8" id="dZT-DD-V6o"/>
-                            <constraint firstItem="dza-4j-F1E" firstAttribute="leading" secondItem="0fz-zg-6Df" secondAttribute="leading" constant="8" id="dm1-Hc-nJX"/>
-                            <constraint firstItem="6Gg-R4-tnz" firstAttribute="leading" secondItem="0fz-zg-6Df" secondAttribute="leading" constant="8" id="f8G-HY-mut"/>
-                            <constraint firstItem="0fz-zg-6Df" firstAttribute="bottom" secondItem="Abi-Up-lZz" secondAttribute="bottom" id="fbq-TB-En1"/>
-                            <constraint firstItem="YXb-k7-PXE" firstAttribute="leading" secondItem="0fz-zg-6Df" secondAttribute="leading" constant="8" id="r94-o4-F0p"/>
-                            <constraint firstItem="6Gg-R4-tnz" firstAttribute="trailing" secondItem="0fz-zg-6Df" secondAttribute="trailing" constant="8" id="wWF-Iv-9vU"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="connectionStatus" destination="lbW-oZ-Mzd" id="YSW-xU-hrI"/>
-                        <outlet property="deviceIdentifier" destination="Ici-zY-xCM" id="yD7-CF-wzY"/>
-                        <outlet property="deviceName" destination="YXb-k7-PXE" id="Cnm-Sn-xDR"/>
-                        <outlet property="distance" destination="PRG-4D-Y4j" id="XZU-A7-qxT"/>
-                        <outlet property="rssi" destination="jx7-0m-oS3" id="yq8-bD-Te9"/>
-                        <outlet property="servicesHeader" destination="6Gg-R4-tnz" id="PSw-gb-Vve"/>
-                        <outlet property="servicesList" destination="Abi-Up-lZz" id="ZfO-Wo-xuu"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="xwz-q1-GIQ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3403" y="2486"/>
-        </scene>
-        <!--Label View Controller-->
-        <scene sceneID="bmc-9W-Iht">
-            <objects>
-                <tableViewController id="Shd-b8-Oui" customClass="LabelViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="R3B-CF-3Y8">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="LabelListCell" id="JIc-i0-Jji" customClass="LabelListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="37"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JIc-i0-Jji" id="Rce-Xc-u3F">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="37"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xqs-cD-B99">
-                                            <rect key="frame" x="20" y="8" width="374" height="21"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                            <nil key="textColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstItem="xqs-cD-B99" firstAttribute="leading" secondItem="Rce-Xc-u3F" secondAttribute="leading" constant="20" id="B4E-c5-AtU"/>
-                                        <constraint firstAttribute="trailing" secondItem="xqs-cD-B99" secondAttribute="trailing" constant="20" id="HlY-Sd-IFs"/>
-                                        <constraint firstAttribute="bottom" secondItem="xqs-cD-B99" secondAttribute="bottom" constant="8" id="NcL-3q-hNl"/>
-                                        <constraint firstItem="xqs-cD-B99" firstAttribute="top" secondItem="Rce-Xc-u3F" secondAttribute="top" constant="8" id="hxM-IA-3Ql"/>
-                                    </constraints>
-                                </tableViewCellContentView>
-                                <connections>
-                                    <outlet property="label" destination="xqs-cD-B99" id="4Ab-vH-ItF"/>
-                                </connections>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="Shd-b8-Oui" id="FFi-zf-6J6"/>
-                            <outlet property="delegate" destination="Shd-b8-Oui" id="VJI-s0-Zg9"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="q9P-js-Ijt"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="6uc-Jn-oeo" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="4462" y="2747"/>
-        </scene>
-        <!--Links View Controller-->
-        <scene sceneID="Qqy-hz-yQA">
-            <objects>
-                <viewController storyboardIdentifier="LinksViewController" id="VPE-Hp-Qc9" customClass="LinksViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="YWQ-0s-goi">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="V8f-1a-s94">
-                                <rect key="frame" x="10" y="404" width="394" height="30"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="G5P-AD-UrB">
-                                        <rect key="frame" x="0.0" y="0.0" width="394" height="30"/>
-                                        <connections>
-                                            <action selector="onBrowserButtonTapped:" destination="VPE-Hp-Qc9" eventType="touchUpInside" id="Med-ch-oEe"/>
-                                        </connections>
-                                    </button>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="10" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xjl-nH-qoV" userLabel="Instructions Label">
-                                        <rect key="frame" x="0.0" y="30" width="394" height="0.0"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                            </stackView>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="J3P-Or-mB9"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="V8f-1a-s94" firstAttribute="centerX" secondItem="YWQ-0s-goi" secondAttribute="centerX" id="IcK-eJ-dfV"/>
-                            <constraint firstItem="J3P-Or-mB9" firstAttribute="trailing" secondItem="V8f-1a-s94" secondAttribute="trailing" constant="10" id="Mq7-W5-kMR"/>
-                            <constraint firstItem="V8f-1a-s94" firstAttribute="centerY" secondItem="YWQ-0s-goi" secondAttribute="centerY" id="WJC-yB-hcu"/>
-                            <constraint firstItem="V8f-1a-s94" firstAttribute="leading" secondItem="YWQ-0s-goi" secondAttribute="leading" constant="10" id="r9n-ph-Yss"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" id="xI5-GB-Ch6"/>
-                    <connections>
-                        <outlet property="browserButton" destination="G5P-AD-UrB" id="mSr-hd-xem"/>
-                        <outlet property="instructionsText" destination="Xjl-nH-qoV" id="JWi-JW-NJe"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="uPu-Qa-nUe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2634.7826086956525" y="-1770.5357142857142"/>
-        </scene>
-        <!--Keyboard Manager View Controller-->
-        <scene sceneID="i03-J0-4z5">
-            <objects>
-                <viewController id="7Rf-m0-GFx" customClass="KeyboardManagerViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="ujg-Ft-aqv">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KiQ-CF-pig">
-                                <rect key="frame" x="10" y="58" width="394" height="34"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits"/>
-                            </textField>
-                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="5KH-x9-S2x">
-                                <rect key="frame" x="10" y="102" width="394" height="30"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kY6-Kz-VM4">
-                                        <rect key="frame" x="0.0" y="0.0" width="197" height="30"/>
-                                        <state key="normal" title="Show Keyboard"/>
-                                        <connections>
-                                            <action selector="showButtonPressed" destination="7Rf-m0-GFx" eventType="touchUpInside" id="pKw-9x-kxU"/>
-                                        </connections>
-                                    </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LHk-eR-LxZ">
-                                        <rect key="frame" x="197" y="0.0" width="197" height="30"/>
-                                        <state key="normal" title="Hide Keyboard"/>
-                                        <connections>
-                                            <action selector="hideButtonPressed" destination="7Rf-m0-GFx" eventType="touchUpInside" id="8qL-Di-xGc"/>
-                                        </connections>
-                                    </button>
-                                </subviews>
-                            </stackView>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="2a8-e0-vMR"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="2a8-e0-vMR" firstAttribute="trailing" secondItem="KiQ-CF-pig" secondAttribute="trailing" constant="10" id="0Ub-V5-Zsq"/>
-                            <constraint firstItem="KiQ-CF-pig" firstAttribute="leading" secondItem="2a8-e0-vMR" secondAttribute="leading" constant="10" id="5oQ-La-oA9"/>
-                            <constraint firstItem="5KH-x9-S2x" firstAttribute="trailing" secondItem="KiQ-CF-pig" secondAttribute="trailing" id="PUx-Tj-I19"/>
-                            <constraint firstItem="KiQ-CF-pig" firstAttribute="top" secondItem="2a8-e0-vMR" secondAttribute="top" constant="10" id="YqD-JK-hRK"/>
-                            <constraint firstItem="5KH-x9-S2x" firstAttribute="leading" secondItem="KiQ-CF-pig" secondAttribute="leading" id="biC-Co-NJa"/>
-                            <constraint firstItem="5KH-x9-S2x" firstAttribute="top" secondItem="KiQ-CF-pig" secondAttribute="bottom" constant="10" id="mIW-2P-VzJ"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" id="3vu-M7-Qu6"/>
-                    <connections>
-                        <outlet property="editField" destination="KiQ-CF-pig" id="t55-zo-eh8"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="4mF-Fn-ESe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2648" y="-1061"/>
-        </scene>
-        <!--Network-->
-        <scene sceneID="5O2-sw-jzu">
-            <objects>
-                <viewController title="Network" id="WNj-93-WjR" customClass="NetworkViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="dJb-b3-IqA">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XWW-83-edx">
-                                <rect key="frame" x="186" y="408.5" width="42" height="21"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="RDe-bx-yeP"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="XWW-83-edx" firstAttribute="centerX" secondItem="dJb-b3-IqA" secondAttribute="centerX" id="HSW-fU-9mQ"/>
-                            <constraint firstItem="XWW-83-edx" firstAttribute="centerY" secondItem="dJb-b3-IqA" secondAttribute="centerY" id="KfT-vh-oVi"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" id="KhO-Dq-z9i"/>
-                    <connections>
-                        <outlet property="networkStateText" destination="XWW-83-edx" id="CMr-SQ-r6c"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="xfC-yj-Rlg" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-829" y="-1286"/>
-        </scene>
-        <!--Network-->
-        <scene sceneID="Pxm-EF-uH3">
-            <objects>
-                <tableViewController title="Network" id="NRf-rC-nl1" customClass="SystemViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="aKd-o4-TYG">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SystemListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SystemListCell" id="a8b-dW-eKx" customClass="SystemListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="a8b-dW-eKx" id="pjk-M2-4TV">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pnV-0z-POK">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                            <nil key="textColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstItem="pnV-0z-POK" firstAttribute="top" secondItem="pjk-M2-4TV" secondAttribute="topMargin" constant="4" id="8Vv-ED-tiH"/>
-                                        <constraint firstItem="pnV-0z-POK" firstAttribute="leading" secondItem="pjk-M2-4TV" secondAttribute="leadingMargin" constant="20" id="M8m-C1-T9f"/>
-                                        <constraint firstAttribute="bottomMargin" secondItem="pnV-0z-POK" secondAttribute="bottom" constant="4" id="tmx-vw-K26"/>
-                                        <constraint firstAttribute="trailingMargin" secondItem="pnV-0z-POK" secondAttribute="trailing" constant="20" id="zKM-Xm-22W"/>
-                                    </constraints>
-                                </tableViewCellContentView>
-                                <connections>
-                                    <outlet property="label" destination="pnV-0z-POK" id="P2Q-ur-K1W"/>
-                                </connections>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="NRf-rC-nl1" id="VjM-G7-bgB"/>
-                            <outlet property="delegate" destination="NRf-rC-nl1" id="NUe-AM-Xnn"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="vhK-Ur-2uE"/>
-                    <connections>
-                        <segue destination="WNj-93-WjR" kind="show" identifier="showNetwork" id="KPT-8X-U8y"/>
-                    </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="vve-kp-l1w" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="713" y="-749"/>
-        </scene>
-        <!--Loading View Controller-->
-        <scene sceneID="vaO-15-Tqm">
-            <objects>
-                <tableViewController id="itP-bh-ePK" customClass="LoadingViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="EuU-N3-PUa">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <sections>
-                            <tableViewSection id="W1h-wG-Nuf">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="S13-rV-ghL" style="IBUITableViewCellStyleDefault" id="Qu4-gg-O0s">
-                                        <rect key="frame" x="0.0" y="50" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Qu4-gg-O0s" id="UZM-pj-sFi">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Loading Indicator with System style" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="S13-rV-ghL">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="e31-TG-wrI" style="IBUITableViewCellStyleDefault" id="BqC-fY-hox">
-                                        <rect key="frame" x="0.0" y="93.5" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="BqC-fY-hox" id="Gsq-hn-e0Y">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Loading Indicator with Custom style" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="e31-TG-wrI">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="itP-bh-ePK" id="zhT-5T-8wj"/>
-                            <outlet property="delegate" destination="itP-bh-ePK" id="a0l-MT-IeJ"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="85A-T5-LLl"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="3c6-iN-jO2" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2649" y="-374"/>
-        </scene>
-        <!--Alerts Table View Controller-->
-        <scene sceneID="3hP-eu-S2i">
-            <objects>
-                <tableViewController id="jUB-i9-u9F" userLabel="Alerts Table View Controller" customClass="AlertsViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Uge-kX-PIL">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <sections>
-                            <tableViewSection id="Y72-DQ-hcU">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="3My-t9-uzW" style="IBUITableViewCellStyleDefault" id="4Bx-bp-v5a">
-                                        <rect key="frame" x="0.0" y="50" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4Bx-bp-v5a" id="2hB-54-3WQ">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Alert" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3My-t9-uzW">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="Mxj-wh-MJV" style="IBUITableViewCellStyleDefault" id="l1P-Xn-VLw">
-                                        <rect key="frame" x="0.0" y="93.5" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="l1P-Xn-VLw" id="XKI-8Y-HI7">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Dismissible Alert" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Mxj-wh-MJV">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="iW9-HH-Oc0" style="IBUITableViewCellStyleDefault" id="lMI-O8-dAX">
-                                        <rect key="frame" x="0.0" y="137" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lMI-O8-dAX" id="jWN-Fu-MOI">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Action Sheet" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="iW9-HH-Oc0">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="BJ7-BZ-r5z" style="IBUITableViewCellStyleDefault" id="uqQ-kk-sFM">
-                                        <rect key="frame" x="0.0" y="180.5" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="uqQ-kk-sFM" id="spw-IS-5wm">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Alert with input" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="BJ7-BZ-r5z">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="jUB-i9-u9F" id="STI-kf-YSP"/>
-                            <outlet property="delegate" destination="jUB-i9-u9F" id="GWD-7e-fKW"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="IKk-fx-Nxk"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="ftd-tZ-HFo" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2648" y="329"/>
-        </scene>
-        <!--Info View Controller-->
-        <scene sceneID="S3h-yX-G9s">
-            <objects>
-                <tableViewController storyboardIdentifier="InfoViewController" id="w3O-8R-hO7" customClass="InfoViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Ak4-pT-DLg">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="InfoButtonCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="InfoButtonCell" id="3eh-xF-TU3" customClass="InfoButtonCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3eh-xF-TU3" id="cyO-Cc-dq8">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odz-vr-fX0">
-                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                            <nil key="textColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstItem="odz-vr-fX0" firstAttribute="leading" secondItem="cyO-Cc-dq8" secondAttribute="leadingMargin" constant="20" id="7tZ-tH-8X0"/>
-                                        <constraint firstItem="odz-vr-fX0" firstAttribute="bottom" secondItem="cyO-Cc-dq8" secondAttribute="bottomMargin" constant="4" id="PgZ-SM-8yB"/>
-                                        <constraint firstItem="odz-vr-fX0" firstAttribute="top" secondItem="cyO-Cc-dq8" secondAttribute="topMargin" constant="4" id="i4v-3w-WXa"/>
-                                        <constraint firstAttribute="trailingMargin" secondItem="odz-vr-fX0" secondAttribute="trailing" constant="20" id="pBz-5g-kJm"/>
-                                    </constraints>
-                                </tableViewCellContentView>
-                                <connections>
-                                    <outlet property="label" destination="odz-vr-fX0" id="wXy-TH-sMq"/>
-                                </connections>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="w3O-8R-hO7" id="anC-9o-teZ"/>
-                            <outlet property="delegate" destination="w3O-8R-hO7" id="GRh-F8-Q1e"/>
-                        </connections>
-                    </tableView>
-                    <connections>
-                        <outlet property="view" destination="Ak4-pT-DLg" id="IV0-1H-pHf"/>
-                    </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="s7d-U9-qTn" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="816" y="1073"/>
-        </scene>
-        <!--Permission List View Controller-->
-        <scene sceneID="bkZ-ly-rzs">
-            <objects>
-                <tableViewController storyboardIdentifier="PermissionsList" id="Hbw-co-mWZ" customClass="PermissionListViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="XuT-9Z-KBW">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PermissionsListCell" id="FrV-FL-GKa" customClass="PermissionsListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FrV-FL-GKa" id="wA3-QT-FyZ">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nXv-Uh-BJk">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                            <nil key="textColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstItem="nXv-Uh-BJk" firstAttribute="leading" secondItem="wA3-QT-FyZ" secondAttribute="leadingMargin" constant="20" id="ZRh-C2-hyR"/>
-                                        <constraint firstItem="nXv-Uh-BJk" firstAttribute="top" secondItem="wA3-QT-FyZ" secondAttribute="topMargin" constant="4" id="f8P-04-caI"/>
-                                        <constraint firstAttribute="bottomMargin" secondItem="nXv-Uh-BJk" secondAttribute="bottom" constant="4" id="i5f-E7-LgS"/>
-                                        <constraint firstAttribute="trailingMargin" secondItem="nXv-Uh-BJk" secondAttribute="trailing" constant="20" id="yHb-gs-gT9"/>
-                                    </constraints>
-                                </tableViewCellContentView>
-                                <connections>
-                                    <outlet property="label" destination="nXv-Uh-BJk" id="wY8-Mz-6eb"/>
-                                </connections>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="Hbw-co-mWZ" id="NCc-db-tJQ"/>
-                            <outlet property="delegate" destination="Hbw-co-mWZ" id="uKu-2m-FoD"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="W1l-9y-sLf"/>
-                    <connections>
-                        <outlet property="view" destination="XuT-9Z-KBW" id="XPt-ms-iT5"/>
-                    </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="XZd-qQ-l9n" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2648" y="-1728"/>
-        </scene>
-        <!--Permission View Controller-->
-        <scene sceneID="dmW-bW-tYh">
-            <objects>
-                <viewController storyboardIdentifier="Permission" id="qdv-bV-gDr" customClass="PermissionViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="V5P-78-3CC">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HOP-JE-elV">
-                                <rect key="frame" x="10" y="58" width="394" height="0.0"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tTR-3l-N9W">
-                                <rect key="frame" x="10" y="68" width="394" height="30"/>
-                                <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="15"/>
-                                <connections>
-                                    <action selector="requestPermissionWithSender:" destination="qdv-bV-gDr" eventType="touchUpInside" id="onc-6q-neg"/>
-                                </connections>
-                            </button>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="vLH-pV-cQc"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="tTR-3l-N9W" firstAttribute="leading" secondItem="vLH-pV-cQc" secondAttribute="leading" constant="10" id="9Ay-Un-yf0"/>
-                            <constraint firstItem="vLH-pV-cQc" firstAttribute="trailing" secondItem="HOP-JE-elV" secondAttribute="trailing" constant="10" id="QNv-5W-BvO"/>
-                            <constraint firstItem="HOP-JE-elV" firstAttribute="leading" secondItem="vLH-pV-cQc" secondAttribute="leading" constant="10" id="WrA-tJ-815"/>
-                            <constraint firstItem="HOP-JE-elV" firstAttribute="top" secondItem="vLH-pV-cQc" secondAttribute="top" constant="10" id="l6o-4q-bKb"/>
-                            <constraint firstItem="tTR-3l-N9W" firstAttribute="top" secondItem="HOP-JE-elV" secondAttribute="bottom" constant="10" id="rU8-kd-2nc"/>
-                            <constraint firstItem="vLH-pV-cQc" firstAttribute="trailing" secondItem="tTR-3l-N9W" secondAttribute="trailing" constant="10" id="xcA-jJ-Sk5"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="permissionStateLabel" destination="HOP-JE-elV" id="aVB-1E-YJq"/>
-                        <outlet property="requestPermissionButton" destination="tTR-3l-N9W" id="PtU-uw-aJs"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="uwl-Oz-vdN" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3362" y="-1728"/>
-        </scene>
-        <!--Date Time Picker View Controller-->
-        <scene sceneID="RxC-NZ-XHu">
-            <objects>
-                <viewController id="Y7p-ku-8gX" customClass="DateTimePickerViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="CUa-6I-u96">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zPh-dc-WSn">
-                                <rect key="frame" x="20" y="58" width="374" height="30"/>
-                                <state key="normal" title="Select Date"/>
-                                <connections>
-                                    <action selector="selectDatePressed" destination="Y7p-ku-8gX" eventType="touchUpInside" id="06a-Uw-Fml"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ipx-q1-8HF">
-                                <rect key="frame" x="20" y="98" width="374" height="30"/>
-                                <state key="normal" title="Select Time"/>
-                                <connections>
-                                    <action selector="selectTimePressed" destination="Y7p-ku-8gX" eventType="touchUpInside" id="FZd-8a-5zm"/>
-                                </connections>
-                            </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3I5-FX-ntF">
-                                <rect key="frame" x="20" y="189" width="374" height="21"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Current Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E9l-oh-DX8">
-                                <rect key="frame" x="20" y="158" width="100" height="21"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="cDV-k0-OPn"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="ipx-q1-8HF" firstAttribute="top" secondItem="zPh-dc-WSn" secondAttribute="bottom" constant="10" id="2oT-Dy-dwW"/>
-                            <constraint firstItem="cDV-k0-OPn" firstAttribute="trailing" secondItem="3I5-FX-ntF" secondAttribute="trailing" constant="20" id="3e9-nB-t7B"/>
-                            <constraint firstItem="zPh-dc-WSn" firstAttribute="leading" secondItem="cDV-k0-OPn" secondAttribute="leading" constant="20" id="66r-ZV-Hee"/>
-                            <constraint firstItem="E9l-oh-DX8" firstAttribute="leading" secondItem="cDV-k0-OPn" secondAttribute="leading" constant="20" id="9XG-2a-eFa"/>
-                            <constraint firstItem="zPh-dc-WSn" firstAttribute="top" secondItem="cDV-k0-OPn" secondAttribute="top" constant="10" id="CPJ-2x-4Zs"/>
-                            <constraint firstItem="E9l-oh-DX8" firstAttribute="top" secondItem="ipx-q1-8HF" secondAttribute="bottom" constant="30" id="JmW-Ic-3rz"/>
-                            <constraint firstItem="3I5-FX-ntF" firstAttribute="leading" secondItem="cDV-k0-OPn" secondAttribute="leading" constant="20" id="Q8F-Ve-D70"/>
-                            <constraint firstItem="3I5-FX-ntF" firstAttribute="top" secondItem="E9l-oh-DX8" secondAttribute="bottom" constant="10" id="e3H-uo-eaR"/>
-                            <constraint firstItem="cDV-k0-OPn" firstAttribute="trailing" secondItem="zPh-dc-WSn" secondAttribute="trailing" constant="20" id="odP-op-1ao"/>
-                            <constraint firstItem="ipx-q1-8HF" firstAttribute="leading" secondItem="cDV-k0-OPn" secondAttribute="leading" constant="20" id="twC-pd-zFo"/>
-                            <constraint firstItem="cDV-k0-OPn" firstAttribute="trailing" secondItem="ipx-q1-8HF" secondAttribute="trailing" constant="20" id="xsT-MP-RZA"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" id="Rtv-vn-95K"/>
-                    <connections>
-                        <outlet property="timeLabel" destination="3I5-FX-ntF" id="zHr-vf-Ysz"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Ljl-id-804" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2648" y="2496"/>
-        </scene>
-        <!--Resources List View Controller-->
-        <scene sceneID="O9e-U5-TLS">
-            <objects>
-                <tableViewController storyboardIdentifier="ResourcesList" id="Tyz-Gd-0uw" customClass="ResourcesListViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="W41-OS-Wnx">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ResourcesListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ResourcesListCell" id="YH6-gF-Pq3" customClass="ResourcesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="38"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YH6-gF-Pq3" id="yfs-Dl-hfq">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="38"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="app-pb-mRq">
-                                            <rect key="frame" x="20" y="8" width="374" height="22"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                            <nil key="textColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstItem="app-pb-mRq" firstAttribute="top" secondItem="yfs-Dl-hfq" secondAttribute="top" constant="8" id="LnR-f7-O31"/>
-                                        <constraint firstAttribute="trailing" secondItem="app-pb-mRq" secondAttribute="trailing" constant="20" id="MiM-l1-I4A"/>
-                                        <constraint firstItem="app-pb-mRq" firstAttribute="leading" secondItem="yfs-Dl-hfq" secondAttribute="leading" constant="20" id="SzX-aQ-jKK"/>
-                                        <constraint firstAttribute="bottom" secondItem="app-pb-mRq" secondAttribute="bottom" constant="8" id="gBc-4u-Tj1"/>
-                                    </constraints>
-                                </tableViewCellContentView>
-                                <connections>
-                                    <outlet property="label" destination="app-pb-mRq" id="SiG-Hx-XBL"/>
-                                </connections>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="Tyz-Gd-0uw" id="kLQ-nW-cED"/>
-                            <outlet property="delegate" destination="Tyz-Gd-0uw" id="phS-P2-bIA"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="g8g-Bn-efY"/>
-                    <connections>
-                        <segue destination="Shd-b8-Oui" kind="show" identifier="showLabel" id="XT2-bS-grd"/>
-                        <segue destination="t7d-lb-B0c" kind="show" identifier="showColor" id="efK-Tc-RgZ"/>
-                        <segue destination="vjD-in-IYI" kind="show" identifier="showButton" id="84U-QK-aOU"/>
-                    </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="bWE-wJ-Red" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3409" y="3254"/>
-        </scene>
-        <!--Color View Controller-->
-        <scene sceneID="mC8-7P-f3D">
-            <objects>
-                <viewController id="t7d-lb-B0c" customClass="ColorViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="UDI-If-ZYb">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vMk-kn-0fZ">
-                                <rect key="frame" x="20" y="68" width="111.5" height="111.5"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="vMk-kn-0fZ" secondAttribute="height" multiplier="1:1" id="MHD-88-nbW"/>
-                                </constraints>
-                            </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="drp-Ug-4oo">
-                                <rect key="frame" x="151.5" y="68" width="111" height="111.5"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="drp-Ug-4oo" secondAttribute="height" multiplier="1:1" id="kdG-a0-CXA"/>
-                                </constraints>
-                            </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nXI-Rr-7gO">
-                                <rect key="frame" x="282.5" y="68" width="111.5" height="111.5"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="nXI-Rr-7gO" secondAttribute="height" multiplier="1:1" id="le5-b8-tQ6"/>
-                                </constraints>
-                            </view>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xMH-zh-Psg">
-                                <rect key="frame" x="20" y="199.5" width="111.5" height="34"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits"/>
-                                <connections>
-                                    <outlet property="delegate" destination="t7d-lb-B0c" id="tOV-5T-yrH"/>
-                                </connections>
-                            </textField>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ZjD-RE-7YY">
-                                <rect key="frame" x="282.5" y="199.5" width="111.5" height="34"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits"/>
-                                <connections>
-                                    <outlet property="delegate" destination="t7d-lb-B0c" id="xTC-mc-ECV"/>
-                                </connections>
-                            </textField>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="esw-DK-l9R">
-                                <rect key="frame" x="151.5" y="199.5" width="111" height="34"/>
-                                <state key="normal" title="Button"/>
-                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hhN-sG-MX1">
-                                <rect key="frame" x="151.5" y="243.5" width="111" height="34"/>
-                                <state key="normal" title="Button"/>
-                            </button>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Wfd-TO-mb6">
-                                <rect key="frame" x="20" y="327.5" width="374" height="40"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="Fds-Tv-XCK"/>
-                                </constraints>
-                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="mPR-wz-d03">
-                                    <size key="itemSize" width="30" height="30"/>
-                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                </collectionViewFlowLayout>
-                                <cells/>
-                                <connections>
-                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="eVW-e3-oEa"/>
-                                    <outlet property="delegate" destination="t7d-lb-B0c" id="fT4-Wu-OmE"/>
-                                </connections>
-                            </collectionView>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Vqu-T4-tCt">
-                                <rect key="frame" x="20" y="377.5" width="374" height="40"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="Uil-aO-Rdl"/>
-                                </constraints>
-                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="QYw-K7-DeM">
-                                    <size key="itemSize" width="30" height="30"/>
-                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                </collectionViewFlowLayout>
-                                <cells/>
-                                <connections>
-                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="xhe-E4-eQS"/>
-                                    <outlet property="delegate" destination="t7d-lb-B0c" id="wDa-Fm-TeI"/>
-                                </connections>
-                            </collectionView>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="5Wf-Vi-p6l">
-                                <rect key="frame" x="20" y="427.5" width="374" height="40"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="acp-Ff-CVF"/>
-                                </constraints>
-                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="NdJ-Va-itz">
-                                    <size key="itemSize" width="30" height="30"/>
-                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                </collectionViewFlowLayout>
-                                <cells/>
-                                <connections>
-                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="mC0-ID-2cV"/>
-                                    <outlet property="delegate" destination="t7d-lb-B0c" id="kd2-0O-VFj"/>
-                                </connections>
-                            </collectionView>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="QnI-8h-KFh">
-                                <rect key="frame" x="20" y="477.5" width="374" height="40"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="nOv-2g-YUy"/>
-                                </constraints>
-                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="nRP-a6-d8H">
-                                    <size key="itemSize" width="30" height="30"/>
-                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                </collectionViewFlowLayout>
-                                <cells/>
-                                <connections>
-                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="HQT-iA-q7t"/>
-                                    <outlet property="delegate" destination="t7d-lb-B0c" id="u3M-Kh-aib"/>
-                                </connections>
-                            </collectionView>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="ZGw-xz-CHU">
-                                <rect key="frame" x="20" y="527.5" width="374" height="40"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="i02-WP-odT"/>
-                                </constraints>
-                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="Ita-jy-o3U">
-                                    <size key="itemSize" width="30" height="30"/>
-                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                </collectionViewFlowLayout>
-                                <cells/>
-                                <connections>
-                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="j89-63-5xm"/>
-                                    <outlet property="delegate" destination="t7d-lb-B0c" id="oWy-db-Ug9"/>
-                                </connections>
-                            </collectionView>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="0QE-Vi-QK3">
-                                <rect key="frame" x="20" y="577.5" width="374" height="40"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="Ulf-J8-mJP"/>
-                                </constraints>
-                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="Nb0-Fc-dvL">
-                                    <size key="itemSize" width="30" height="30"/>
-                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                </collectionViewFlowLayout>
-                                <cells/>
-                                <connections>
-                                    <outlet property="dataSource" destination="t7d-lb-B0c" id="n4d-ki-MqJ"/>
-                                    <outlet property="delegate" destination="t7d-lb-B0c" id="etP-p6-cDG"/>
-                                </connections>
-                            </collectionView>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="VBS-bC-HBG"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="ZGw-xz-CHU" firstAttribute="top" secondItem="QnI-8h-KFh" secondAttribute="bottom" constant="10" id="089-u7-9b7"/>
-                            <constraint firstItem="Vqu-T4-tCt" firstAttribute="top" secondItem="Wfd-TO-mb6" secondAttribute="bottom" constant="10" id="1B8-U1-4tG"/>
-                            <constraint firstItem="Wfd-TO-mb6" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="1id-4Q-fE4"/>
-                            <constraint firstItem="0QE-Vi-QK3" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="28m-Do-tZC"/>
-                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="leading" secondItem="drp-Ug-4oo" secondAttribute="trailing" constant="20" id="40R-Sq-kjg"/>
-                            <constraint firstItem="hhN-sG-MX1" firstAttribute="top" secondItem="esw-DK-l9R" secondAttribute="bottom" constant="10" id="4Bp-Lj-DB3"/>
-                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="ZGw-xz-CHU" secondAttribute="trailing" constant="20" id="6yv-J0-A2M"/>
-                            <constraint firstItem="0QE-Vi-QK3" firstAttribute="top" secondItem="ZGw-xz-CHU" secondAttribute="bottom" constant="10" id="81d-WR-FcG"/>
-                            <constraint firstItem="Wfd-TO-mb6" firstAttribute="top" secondItem="hhN-sG-MX1" secondAttribute="bottom" constant="50" id="CeP-Oz-NHd"/>
-                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="height" secondItem="vMk-kn-0fZ" secondAttribute="height" id="JaF-QX-R4a"/>
-                            <constraint firstItem="ZjD-RE-7YY" firstAttribute="leading" secondItem="nXI-Rr-7gO" secondAttribute="leading" id="Jc1-Ky-auh"/>
-                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="top" secondItem="vMk-kn-0fZ" secondAttribute="top" id="JnF-Ld-fdg"/>
-                            <constraint firstItem="ZGw-xz-CHU" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="Jpb-Kv-wyE"/>
-                            <constraint firstItem="esw-DK-l9R" firstAttribute="leading" secondItem="drp-Ug-4oo" secondAttribute="leading" id="L79-cu-IOU"/>
-                            <constraint firstItem="QnI-8h-KFh" firstAttribute="top" secondItem="5Wf-Vi-p6l" secondAttribute="bottom" constant="10" id="MGc-Sq-dXL"/>
-                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="Wfd-TO-mb6" secondAttribute="trailing" constant="20" id="QrS-nn-ahd"/>
-                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="width" secondItem="nXI-Rr-7gO" secondAttribute="height" multiplier="1:1" id="R2L-jA-GcK"/>
-                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="QnI-8h-KFh" secondAttribute="trailing" constant="20" id="RMr-1V-C4H"/>
-                            <constraint firstItem="vMk-kn-0fZ" firstAttribute="top" secondItem="VBS-bC-HBG" secondAttribute="top" constant="20" id="RlX-VY-KVN"/>
-                            <constraint firstItem="ZjD-RE-7YY" firstAttribute="trailing" secondItem="nXI-Rr-7gO" secondAttribute="trailing" id="SdO-AO-sqY"/>
-                            <constraint firstItem="ZjD-RE-7YY" firstAttribute="top" secondItem="nXI-Rr-7gO" secondAttribute="bottom" constant="20" id="VRd-mi-ii1"/>
-                            <constraint firstItem="hhN-sG-MX1" firstAttribute="trailing" secondItem="esw-DK-l9R" secondAttribute="trailing" id="WOa-ER-d2c"/>
-                            <constraint firstItem="xMH-zh-Psg" firstAttribute="leading" secondItem="vMk-kn-0fZ" secondAttribute="leading" id="X15-4d-pWo"/>
-                            <constraint firstItem="5Wf-Vi-p6l" firstAttribute="top" secondItem="Vqu-T4-tCt" secondAttribute="bottom" constant="10" id="XE6-kE-vUJ"/>
-                            <constraint firstItem="drp-Ug-4oo" firstAttribute="height" secondItem="vMk-kn-0fZ" secondAttribute="height" id="XTY-iJ-aP2"/>
-                            <constraint firstItem="xMH-zh-Psg" firstAttribute="trailing" secondItem="vMk-kn-0fZ" secondAttribute="trailing" id="XgL-Sp-UFK"/>
-                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="Vqu-T4-tCt" secondAttribute="trailing" constant="20" id="Z5o-0R-zUb"/>
-                            <constraint firstItem="xMH-zh-Psg" firstAttribute="top" secondItem="vMk-kn-0fZ" secondAttribute="bottom" constant="20" id="a84-ED-mSZ"/>
-                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="0QE-Vi-QK3" secondAttribute="trailing" constant="20" id="csZ-iC-q5E"/>
-                            <constraint firstItem="esw-DK-l9R" firstAttribute="trailing" secondItem="drp-Ug-4oo" secondAttribute="trailing" id="d3e-xe-oED"/>
-                            <constraint firstAttribute="trailing" secondItem="nXI-Rr-7gO" secondAttribute="trailing" constant="20" id="eQ2-AX-79E"/>
-                            <constraint firstItem="hhN-sG-MX1" firstAttribute="leading" secondItem="esw-DK-l9R" secondAttribute="leading" id="eXh-Yg-ZHk"/>
-                            <constraint firstItem="drp-Ug-4oo" firstAttribute="leading" secondItem="vMk-kn-0fZ" secondAttribute="trailing" constant="20" id="fc1-Ra-VfY"/>
-                            <constraint firstItem="drp-Ug-4oo" firstAttribute="top" secondItem="vMk-kn-0fZ" secondAttribute="top" id="h0e-1x-iCh"/>
-                            <constraint firstItem="5Wf-Vi-p6l" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="lRY-XA-2gk"/>
-                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="leading" secondItem="drp-Ug-4oo" secondAttribute="trailing" constant="20" id="n2r-o5-gAb"/>
-                            <constraint firstItem="vMk-kn-0fZ" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="oHW-xr-vk5"/>
-                            <constraint firstItem="QnI-8h-KFh" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="ojm-m1-Fxe"/>
-                            <constraint firstItem="Vqu-T4-tCt" firstAttribute="leading" secondItem="VBS-bC-HBG" secondAttribute="leading" constant="20" id="pcC-Eb-ylY"/>
-                            <constraint firstItem="drp-Ug-4oo" firstAttribute="width" secondItem="vMk-kn-0fZ" secondAttribute="width" id="quN-P5-fvp"/>
-                            <constraint firstItem="drp-Ug-4oo" firstAttribute="leading" secondItem="vMk-kn-0fZ" secondAttribute="trailing" constant="20" id="s2Y-9g-c3V"/>
-                            <constraint firstItem="VBS-bC-HBG" firstAttribute="trailing" secondItem="5Wf-Vi-p6l" secondAttribute="trailing" constant="20" id="tWI-KX-Psc"/>
-                            <constraint firstItem="nXI-Rr-7gO" firstAttribute="width" secondItem="vMk-kn-0fZ" secondAttribute="width" id="vJq-bJ-bRr"/>
-                            <constraint firstItem="drp-Ug-4oo" firstAttribute="width" secondItem="drp-Ug-4oo" secondAttribute="height" multiplier="1:1" id="z8N-FK-TDd"/>
-                            <constraint firstItem="esw-DK-l9R" firstAttribute="top" secondItem="drp-Ug-4oo" secondAttribute="bottom" constant="20" id="zvM-58-x9R"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" id="0ok-kC-bk7"/>
-                    <connections>
-                        <outlet property="backdropColorBackground" destination="vMk-kn-0fZ" id="Kpa-cg-Wcv"/>
-                        <outlet property="backdropDarkenedColorsCollectionView" destination="Vqu-T4-tCt" id="XyT-bz-ven"/>
-                        <outlet property="backdropInputField" destination="xMH-zh-Psg" id="aCg-QZ-cBO"/>
-                        <outlet property="backdropLightenedColorsCollectionView" destination="Wfd-TO-mb6" id="dqJ-QL-YlC"/>
-                        <outlet property="blendModeButton" destination="esw-DK-l9R" id="WJJ-dJ-QVM"/>
-                        <outlet property="blendedColorBackground" destination="drp-Ug-4oo" id="7QG-uS-uB8"/>
-                        <outlet property="blendedDarkenedColorsCollectionView" destination="0QE-Vi-QK3" id="nPt-Qb-Vui"/>
-                        <outlet property="blendedLightenedColorsCollectionView" destination="ZGw-xz-CHU" id="2yy-RK-THc"/>
-                        <outlet property="flipButton" destination="hhN-sG-MX1" id="4YK-N8-oNw"/>
-                        <outlet property="sourceColorBackground" destination="nXI-Rr-7gO" id="cOp-GQ-TYr"/>
-                        <outlet property="sourceDarkenedColorsCollectionView" destination="QnI-8h-KFh" id="TY3-Hv-MTE"/>
-                        <outlet property="sourceInputField" destination="ZjD-RE-7YY" id="csu-eW-7yf"/>
-                        <outlet property="sourceLightenedColorsCollectionView" destination="5Wf-Vi-p6l" id="afB-Ux-nQT"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Gfo-pw-p7q" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="4455.072463768116" y="4119.6428571428569"/>
-        </scene>
-        <!--Beacons View Controller-->
-        <scene sceneID="dvn-k6-9er">
-            <objects>
-                <collectionViewController id="2CB-DJ-Qmw" customClass="BeaconsViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="cYv-YE-iqg">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="inz-04-s6f">
-                            <size key="itemSize" width="414" height="128"/>
-                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                            <inset key="sectionInset" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
-                        </collectionViewFlowLayout>
-                        <cells>
-                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="BeaconsViewCell" id="fED-Jc-30d" customClass="BeaconsViewCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="128"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="SaY-ub-Wq9">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="128"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <subviews>
-                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="IcG-Yk-e5u">
-                                            <rect key="frame" x="8" y="8" width="398" height="112"/>
-                                            <subviews>
-                                                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" id="1RE-K4-cnb">
-                                                    <rect key="frame" x="0.0" y="0.0" width="398" height="36"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Namespace" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HNq-ol-rRY">
-                                                            <rect key="frame" x="0.0" y="0.0" width="198" height="36"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QVS-It-nax">
-                                                            <rect key="frame" x="200" y="0.0" width="198" height="36"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                    </subviews>
-                                                    <viewLayoutGuide key="safeArea" id="ulH-ay-Ddg"/>
-                                                </stackView>
-                                                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" id="kOa-Di-Zqh">
-                                                    <rect key="frame" x="0.0" y="38" width="398" height="36"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Instance" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ivo-uG-sYi">
-                                                            <rect key="frame" x="0.0" y="0.0" width="198" height="36"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1TX-mO-ACb">
-                                                            <rect key="frame" x="200" y="0.0" width="198" height="36"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                    </subviews>
-                                                    <viewLayoutGuide key="safeArea" id="pCO-wD-q2L"/>
-                                                </stackView>
-                                                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="SET-SM-ExN">
-                                                    <rect key="frame" x="0.0" y="76" width="398" height="36"/>
-                                                    <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="txPower" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dk1-m4-MzC">
-                                                            <rect key="frame" x="0.0" y="0.0" width="198" height="36"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="BQO-eA-EWc">
-                                                            <rect key="frame" x="200" y="0.0" width="198" height="36"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                    </subviews>
-                                                </stackView>
-                                            </subviews>
-                                        </stackView>
-                                    </subviews>
-                                    <color key="backgroundColor" name="darker_color"/>
-                                    <constraints>
-                                        <constraint firstItem="IcG-Yk-e5u" firstAttribute="top" secondItem="SaY-ub-Wq9" secondAttribute="top" constant="8" id="Hev-1e-fVf"/>
-                                        <constraint firstItem="IcG-Yk-e5u" firstAttribute="leading" secondItem="SaY-ub-Wq9" secondAttribute="leading" constant="8" id="SRz-w5-zPJ"/>
-                                        <constraint firstAttribute="trailing" secondItem="IcG-Yk-e5u" secondAttribute="trailing" constant="8" id="qNx-Aa-A75"/>
-                                        <constraint firstAttribute="bottom" secondItem="IcG-Yk-e5u" secondAttribute="bottom" constant="8" id="uU1-II-FeC"/>
-                                    </constraints>
-                                </collectionViewCellContentView>
-                                <connections>
-                                    <outlet property="instanceLabel" destination="1TX-mO-ACb" id="5ng-kk-qlc"/>
-                                    <outlet property="namespaceLabel" destination="QVS-It-nax" id="NX2-2G-l9z"/>
-                                    <outlet property="txPowerLabel" destination="BQO-eA-EWc" id="Q1L-qe-uR6"/>
-                                </connections>
-                            </collectionViewCell>
-                        </cells>
-                        <connections>
-                            <outlet property="delegate" destination="2CB-DJ-Qmw" id="NOW-Hm-xOY"/>
-                        </connections>
-                    </collectionView>
-                    <navigationItem key="navigationItem" id="3FX-SL-z8l"/>
-                </collectionViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="5DO-tU-e34" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1716" y="1073"/>
-        </scene>
-        <!--Button View Controller-->
-        <scene sceneID="2tX-Kq-EFC">
-            <objects>
-                <tableViewController id="vjD-in-IYI" customClass="ButtonViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="QdK-yo-rl7">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ButtonListCell" id="5eD-3F-uwZ" customClass="ButtonListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="42.5"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="5eD-3F-uwZ" id="a3W-P1-oQG">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="42.5"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D6o-XM-1n0">
-                                            <rect key="frame" x="20" y="4" width="374" height="34.5"/>
-                                            <state key="normal" title="Button"/>
-                                        </button>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstAttribute="trailing" secondItem="D6o-XM-1n0" secondAttribute="trailing" constant="20" id="PNo-qc-mbG"/>
-                                        <constraint firstAttribute="bottom" secondItem="D6o-XM-1n0" secondAttribute="bottom" constant="4" id="fEd-va-ovI"/>
-                                        <constraint firstItem="D6o-XM-1n0" firstAttribute="top" secondItem="a3W-P1-oQG" secondAttribute="top" constant="4" id="grw-9v-GFK"/>
-                                        <constraint firstItem="D6o-XM-1n0" firstAttribute="leading" secondItem="a3W-P1-oQG" secondAttribute="leading" constant="20" id="xx6-ay-ut3"/>
-                                    </constraints>
-                                </tableViewCellContentView>
-                                <connections>
-                                    <outlet property="button" destination="D6o-XM-1n0" id="mrj-AT-4Pa"/>
-                                </connections>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="vjD-in-IYI" id="A2O-tK-tbU"/>
-                            <outlet property="delegate" destination="vjD-in-IYI" id="h5Q-Vp-kgd"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="vMh-OB-q4F"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="tKF-tM-9id" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="4461" y="3449"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="close_icon" width="24" height="24"/>
-        <image name="error_icon" width="14" height="14"/>
-        <namedColor name="darker_color">
-            <color red="0.0" green="0.0" blue="0.0" alpha="0.20000000298023224" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-        <systemColor name="systemGray4Color">
-            <color red="0.81960784313725488" green="0.81960784313725488" blue="0.83921568627450982" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
-    </resources>
-</document>
diff --git a/newexample/ios/Demo/Beacons/BeaconsViewCell.swift b/newexample/ios/Demo/Beacons/BeaconsViewCell.swift
deleted file mode 100644
index 928f6e859..000000000
--- a/newexample/ios/Demo/Beacons/BeaconsViewCell.swift
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-//  Copyright 2022 Splendo Consulting B.V. The Netherlands
-//
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-//
-
-import UIKit
-import KalugaExampleShared
-
-class BeaconsViewCell: UICollectionViewCell {
-
-    static var identifier: String { String(describing: Self.self) }
-
-    @IBOutlet private var namespaceLabel: UILabel!
-    @IBOutlet private var instanceLabel: UILabel!
-    @IBOutlet private var txPowerLabel: UILabel!
-
-    private let disposeBag = DisposeBag()
-    private var viewModel: BeaconsListBeaconViewModel?
-
-    func configure(with viewModel: BeaconsListBeaconViewModel) {
-        self.viewModel = viewModel
-    }
-
-    func startMonitoring() {
-        viewModel?.namespace_.observe { [weak self] namespace in
-            self?.namespaceLabel.text = namespace as String?
-        }.addTo(disposeBag: disposeBag)
-
-        viewModel?.instance.observe { [weak self] instance in
-            self?.instanceLabel.text = instance as String?
-        }.addTo(disposeBag: disposeBag)
-
-        viewModel?.txPower.observe { [weak self] txPower in
-            self?.txPowerLabel.text = txPower as String?
-        }.addTo(disposeBag: disposeBag)
-    }
-
-    func stopMonitoring() {
-        disposeBag.dispose()
-    }
-}
diff --git a/newexample/ios/Demo/Beacons/BeaconsViewController.swift b/newexample/ios/Demo/Beacons/BeaconsViewController.swift
deleted file mode 100644
index 653f7c54a..000000000
--- a/newexample/ios/Demo/Beacons/BeaconsViewController.swift
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-//  Copyright 2022 Splendo Consulting B.V. The Netherlands
-//
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-//
-
-import UIKit
-import KalugaExampleShared
-
-class BeaconsViewController: UICollectionViewController {
-
-    private var beacons = [BeaconsListBeaconViewModel]() {
-        didSet {
-            collectionView.reloadData()
-        }
-    }
-
-    private var lifecycleManager: LifecycleManager!
-
-    private lazy var flowLayout: UICollectionViewFlowLayout = {
-        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
-        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
-        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0)
-        flowLayout.minimumLineSpacing = 4
-        return flowLayout
-    }()
-
-    private lazy var viewModel = BeaconsListViewModel()
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-
-        collectionView.collectionViewLayout = flowLayout
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else { return [] }
-
-            return [
-                viewModel.isScanning.observe { isScanning in
-                    self?.updateNavigationItem(isScanning: isScanning as? Bool ?? false)
-                },
-                viewModel.beacons.observe { devices in
-                    self?.beacons = devices as? [BeaconsListBeaconViewModel] ?? []
-                }
-            ]
-        }
-    }
-
-    override func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return 1
-    }
-
-    override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        beacons.count
-    }
-
-    override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let beaconCell = collectionView.dequeueReusableCell(withReuseIdentifier: BeaconsViewCell.identifier, for: indexPath) as! BeaconsViewCell
-        beaconCell.configure(with: beacons[indexPath.row])
-        return beaconCell
-    }
-
-    override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        guard let cell = cell as? BeaconsViewCell else {
-            return
-        }
-
-        cell.startMonitoring()
-    }
-
-    override func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        guard let cell = cell as? BeaconsViewCell else {
-            return
-        }
-
-        cell.stopMonitoring()
-    }
-
-    override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        collectionView.deselectItem(at: indexPath, animated: true)
-    }
-
-    private func updateNavigationItem(isScanning: Bool) {
-        let title = isScanning ? "beacons_stop_monitoring" : "beacons_start_monitoring"
-        let item = UIBarButtonItem(
-            title: NSLocalizedString(title, comment: ""),
-            style: .plain,
-            target: viewModel,
-            action: #selector(viewModel.onScanPressed)
-        )
-        navigationItem.setRightBarButton(item, animated: true)
-    }
-}
diff --git a/newexample/ios/Demo/Bluetooth/BluetoothCharacteristicCell.xib b/newexample/ios/Demo/Bluetooth/BluetoothCharacteristicCell.xib
deleted file mode 100644
index 4708c258e..000000000
--- a/newexample/ios/Demo/Bluetooth/BluetoothCharacteristicCell.xib
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
-        <capability name="collection view cell content view" minToolsVersion="11.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="BluetoothCharacteristicView" id="B2w-ph-aZX" customClass="BluetoothCharacteristicView" customModule="Demo" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="289" height="128"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="hv0-ou-L4C">
-                <rect key="frame" x="0.0" y="0.0" width="289" height="128"/>
-                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                <subviews>
-                    <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="x8j-E2-2WH">
-                        <rect key="frame" x="0.0" y="0.0" width="289" height="20.5"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="500" text="Characteristic ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ByE-q4-q83">
-                                <rect key="frame" x="0.0" y="0.0" width="131.5" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="500" verticalHuggingPriority="251" text="Characteristic Value" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HKw-U2-vku">
-                                <rect key="frame" x="135.5" y="0.0" width="153.5" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                    </stackView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Descriptors" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jx8-zE-VJ6">
-                        <rect key="frame" x="0.0" y="24.5" width="289" height="89.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                        <nil key="textColor"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                    <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="dYG-ws-kvS">
-                        <rect key="frame" x="0.0" y="118" width="289" height="10"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="10" id="rCG-m2-Lvv"/>
-                        </constraints>
-                        <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="tDK-kj-k3s">
-                            <size key="itemSize" width="128" height="128"/>
-                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                            <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                        </collectionViewFlowLayout>
-                        <cells/>
-                        <connections>
-                            <outlet property="dataSource" destination="B2w-ph-aZX" id="VUf-I4-OdH"/>
-                            <outlet property="delegate" destination="B2w-ph-aZX" id="hml-oR-c06"/>
-                        </connections>
-                    </collectionView>
-                </subviews>
-                <constraints>
-                    <constraint firstAttribute="trailing" secondItem="x8j-E2-2WH" secondAttribute="trailing" id="GWx-fB-Lod"/>
-                    <constraint firstAttribute="bottom" secondItem="dYG-ws-kvS" secondAttribute="bottom" id="Nul-UU-dnM"/>
-                    <constraint firstItem="x8j-E2-2WH" firstAttribute="top" secondItem="hv0-ou-L4C" secondAttribute="top" id="Nzq-SC-7qn"/>
-                    <constraint firstItem="Jx8-zE-VJ6" firstAttribute="top" secondItem="x8j-E2-2WH" secondAttribute="bottom" constant="4" id="PWW-MC-0sY"/>
-                    <constraint firstAttribute="trailing" secondItem="Jx8-zE-VJ6" secondAttribute="trailing" id="diO-zf-MKF"/>
-                    <constraint firstItem="dYG-ws-kvS" firstAttribute="top" secondItem="Jx8-zE-VJ6" secondAttribute="bottom" constant="4" id="dnX-ET-cZl"/>
-                    <constraint firstItem="x8j-E2-2WH" firstAttribute="leading" secondItem="hv0-ou-L4C" secondAttribute="leading" id="dsW-ui-fOq"/>
-                    <constraint firstAttribute="trailing" secondItem="dYG-ws-kvS" secondAttribute="trailing" id="ety-Fc-owI"/>
-                    <constraint firstItem="Jx8-zE-VJ6" firstAttribute="leading" secondItem="hv0-ou-L4C" secondAttribute="leading" id="nhK-y8-Wi9"/>
-                    <constraint firstItem="dYG-ws-kvS" firstAttribute="leading" secondItem="hv0-ou-L4C" secondAttribute="leading" id="pla-ew-t28"/>
-                </constraints>
-            </collectionViewCellContentView>
-            <connections>
-                <outlet property="characteristicIdentifier" destination="ByE-q4-q83" id="RwG-nm-eD1"/>
-                <outlet property="characteristicValue" destination="HKw-U2-vku" id="H9S-GY-QH0"/>
-                <outlet property="descriptorsHeader" destination="Jx8-zE-VJ6" id="hrp-HH-maE"/>
-                <outlet property="descriptorsList" destination="dYG-ws-kvS" id="bVc-HP-xLe"/>
-                <outlet property="descriptorsListHeight" destination="rCG-m2-Lvv" id="Cyu-yO-Hpu"/>
-            </connections>
-            <point key="canvasLocation" x="746" y="154"/>
-        </collectionViewCell>
-    </objects>
-</document>
diff --git a/newexample/ios/Demo/Bluetooth/BluetoothDescriptorCell.xib b/newexample/ios/Demo/Bluetooth/BluetoothDescriptorCell.xib
deleted file mode 100644
index 13eae4024..000000000
--- a/newexample/ios/Demo/Bluetooth/BluetoothDescriptorCell.xib
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
-        <capability name="collection view cell content view" minToolsVersion="11.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="BluetoothDescriptorView" id="pSe-Ps-x47" customClass="BluetoothDescriptorView" customModule="Demo" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="228" height="20.5"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="ls8-b8-HAi">
-                <rect key="frame" x="0.0" y="0.0" width="228" height="20.5"/>
-                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                <subviews>
-                    <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="YtP-YC-jgh">
-                        <rect key="frame" x="0.0" y="0.0" width="228" height="20.5"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="500" text="Descriptor ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5zg-aQ-Jsy">
-                                <rect key="frame" x="0.0" y="0.0" width="97" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" alpha="0.69999999999999996" contentMode="left" horizontalHuggingPriority="500" verticalHuggingPriority="251" text="Descriptor Value" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oTL-QB-D7K">
-                                <rect key="frame" x="101" y="0.0" width="127" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                    </stackView>
-                </subviews>
-                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                <constraints>
-                    <constraint firstItem="YtP-YC-jgh" firstAttribute="leading" secondItem="ls8-b8-HAi" secondAttribute="leading" id="9Zf-XW-aGF"/>
-                    <constraint firstItem="YtP-YC-jgh" firstAttribute="top" secondItem="ls8-b8-HAi" secondAttribute="top" id="KeL-6C-MSg"/>
-                    <constraint firstAttribute="trailing" secondItem="YtP-YC-jgh" secondAttribute="trailing" id="LRg-UF-Jt9"/>
-                    <constraint firstAttribute="bottom" secondItem="YtP-YC-jgh" secondAttribute="bottom" id="OtL-m0-ZY3"/>
-                </constraints>
-            </collectionViewCellContentView>
-            <connections>
-                <outlet property="descriptorIdentifier" destination="5zg-aQ-Jsy" id="5VI-Qs-wga"/>
-                <outlet property="descriptorValue" destination="oTL-QB-D7K" id="Ez6-AJ-oMg"/>
-            </connections>
-            <point key="canvasLocation" x="139" y="-198"/>
-        </collectionViewCell>
-    </objects>
-</document>
diff --git a/newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift b/newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
deleted file mode 100644
index cb593bf85..000000000
--- a/newexample/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import KalugaExampleShared
-
-class BluetoothDeviceDetailsViewController : UIViewController {
-    
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "BluetoothDeviceDetails"
-    }
-    
-    static func create(identifier: UUID) -> BluetoothDeviceDetailsViewController {
-        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! BluetoothDeviceDetailsViewController
-        if #available(iOS 13.0, *) {
-            vc.isModalInPresentation = true
-        }
-        vc.viewModel = BluetoothDeviceDetailViewModel(identifier: identifier)
-        return vc
-    }
-
-    var viewModel: BluetoothDeviceDetailViewModel!
-    private var lifecycleManager: LifecycleManager!
-    
-    @IBOutlet var deviceName: UILabel!
-    @IBOutlet var deviceIdentifier: UILabel!
-    @IBOutlet var rssi: UILabel!
-    @IBOutlet var distance: UILabel!
-    @IBOutlet var connectionStatus: UILabel!
-    @IBOutlet var servicesHeader: UILabel!
-    @IBOutlet var servicesList: UICollectionView!
-    
-    private var services: [BluetoothServiceViewModel] = []
-
-    private var isInvalidating: Bool = false
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-
-        servicesHeader.text = NSLocalizedString("bluetooth_services_header", comment: "")
-        deviceIdentifier.text = viewModel.identifierString
-
-        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
-        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
-        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
-        flowLayout.minimumLineSpacing = 4
-        servicesList.collectionViewLayout = flowLayout
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-
-            guard let viewModel = self?.viewModel else { return []}
-
-            return [
-            viewModel.name.observe { name in
-                self?.deviceName.text = name as String?
-            }
-            ,
-            viewModel.rssi.observe { rssiValue in
-                self?.rssi.text = rssiValue as String?
-            }
-            ,
-            viewModel.distance.observe { distanceValue in
-                self?.distance.text = distanceValue as String?
-            }
-            ,
-            viewModel.state.observe { state in
-                self?.connectionStatus.text = state as String?
-            }
-            ,
-            viewModel.services.observe { servicesList in
-                self?.services = servicesList as? [BluetoothServiceViewModel] ?? []
-                self?.servicesList.reloadData()
-                self?.servicesList.layoutIfNeeded()
-            }
-            ]
-        }
-    }
-
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return services.count
-    }
-
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let serviceCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothServiceView.Companion.identifier, for: indexPath) as! BluetoothServiceView
-        serviceCell.parent = self
-        serviceCell.service = services[indexPath.row]
-        return serviceCell
-    }
-
-    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
-            (cell as? BluetoothServiceView)?.startMonitoring()
-        }
-    }
-
-    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
-            (cell as? BluetoothServiceView)?.stopMonitoring()
-        }
-    }
-
-    fileprivate func updateListSize() {
-        isInvalidating = true
-        servicesList.collectionViewLayout.invalidateLayout()
-        servicesList.layoutIfNeeded()
-        isInvalidating = false
-    }
-    
-}
-
-class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
-    
-    fileprivate struct Companion {
-        static let identifier = "BluetoothServiceView"
-    }
-    
-    fileprivate weak var parent: BluetoothDeviceDetailsViewController?
-    fileprivate var service: BluetoothServiceViewModel?
-    private let disposeBag = DisposeBag()
-    
-    private var isInvalidating: Bool = false
-
-    @IBOutlet var serviceHeader: UILabel!
-    @IBOutlet var serviceIdentifier: UILabel!
-    @IBOutlet var characteristicsHeader: UILabel!
-    @IBOutlet var characteristicsList: UICollectionView!
-    @IBOutlet var characteristicsListHeight: NSLayoutConstraint!
-    
-    private var characteristics: [BluetoothCharacteristicViewModel] = []
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-
-        serviceHeader.text = NSLocalizedString("bluetooth_service", comment: "")
-        characteristicsHeader.text = NSLocalizedString("bluetooth_characteristics", comment: "")
-
-        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
-        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
-        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
-        flowLayout.minimumLineSpacing = 4
-        characteristicsList.collectionViewLayout = flowLayout
-        characteristicsList.dataSource = self
-        characteristicsList.delegate = self
-        characteristicsList.register(UINib(nibName: "BluetoothCharacteristicCell", bundle: nil), forCellWithReuseIdentifier: BluetoothCharacteristicView.Companion.identifier)
-    }
-
-    fileprivate func startMonitoring() {
-        disposeBag.dispose()
-        guard let service = self.service else {
-            return
-        }
-        service.didResume()
-
-        serviceIdentifier.text = service.uuid
-        service.characteristics.observe { [weak self] characteristics in
-            self?.characteristics = characteristics as? [BluetoothCharacteristicViewModel] ?? []
-            self?.characteristicsList.reloadData()
-            self?.updateListSize(isInvalidating: false)
-        }.addTo(disposeBag: disposeBag)
-    }
-
-    fileprivate func stopMonitoring() {
-        service?.didPause()
-        disposeBag.dispose()
-    }
-
-    fileprivate func updateListSize(isInvalidating: Bool) {
-        self.isInvalidating = isInvalidating
-        characteristicsList.collectionViewLayout.invalidateLayout()
-        characteristicsList.layoutIfNeeded()
-        let height = characteristicsList.contentSize.height
-        characteristicsListHeight.constant = height
-        parent?.updateListSize()
-        self.isInvalidating = false
-    }
-
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return characteristics.count
-    }
-
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let characteristicCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothCharacteristicView.Companion.identifier, for: indexPath) as! BluetoothCharacteristicView
-        characteristicCell.parent = self
-        characteristicCell.characteristic = characteristics[indexPath.row]
-        return characteristicCell
-    }
-
-    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
-            (cell as? BluetoothCharacteristicView)?.startMonitoring()
-        }
-    }
-
-    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
-            (cell as? BluetoothCharacteristicView)?.stopMonitoring()
-        }
-    }
-
-    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
-        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
-        layoutIfNeeded()
-        layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
-        return layoutAttributes
-    }
-    
-}
-
-class BluetoothCharacteristicView : UICollectionViewCell {
-    
-    fileprivate struct Companion {
-        static let identifier = "BluetoothCharacteristicView"
-    }
-    
-    fileprivate weak var parent: BluetoothServiceView?
-    fileprivate var characteristic: BluetoothCharacteristicViewModel?
-    private let disposeBag = DisposeBag()
-
-    private var isInvalidating: Bool = false
-    
-    @IBOutlet var characteristicIdentifier: UILabel!
-    @IBOutlet var characteristicValue: UILabel!
-    @IBOutlet var descriptorsHeader: UILabel!
-    @IBOutlet var descriptorsList: UICollectionView!
-    
-    @IBOutlet var descriptorsListHeight: NSLayoutConstraint!
-    
-    private var descriptors: [BluetoothDescriptorViewModel] = []
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-
-        descriptorsHeader.text = NSLocalizedString("bluetooth_descriptors", comment: "")
-
-        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
-        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
-        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
-        flowLayout.minimumLineSpacing = 4
-        descriptorsList.collectionViewLayout = flowLayout
-        descriptorsList.register(UINib(nibName: "BluetoothDescriptorCell", bundle: nil), forCellWithReuseIdentifier: BluetoothDescriptorView.Companion.identifier)
-    }
-
-    fileprivate func startMonitoring() {
-        disposeBag.dispose()
-        guard let characteristic = self.characteristic else {
-            return
-        }
-        characteristic.didResume()
-
-        characteristicIdentifier.text = characteristic.uuid
-        characteristic.descriptors.observe { [weak self] descriptors in
-            self?.descriptors = descriptors as? [BluetoothDescriptorViewModel] ?? []
-            self?.descriptorsList.reloadData()
-            self?.updateListSize(isInvalidating: false)
-        }.addTo(disposeBag: disposeBag)
-
-        characteristic.value.observe { [weak self] value in
-            self?.characteristicValue.text = value as String?
-        }.addTo(disposeBag: disposeBag)
-    }
-
-    fileprivate func stopMonitoring() {
-        disposeBag.dispose()
-        characteristic?.didPause()
-    }
-
-    private func updateListSize(isInvalidating: Bool) {
-        self.isInvalidating = isInvalidating
-        descriptorsList.collectionViewLayout.invalidateLayout()
-        descriptorsList.layoutIfNeeded()
-        let height = descriptorsList.contentSize.height
-        descriptorsListHeight.constant = height
-        parent?.updateListSize(isInvalidating: true)
-        self.isInvalidating = false
-    }
-
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return descriptors.count
-    }
-
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let descriptorCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothDescriptorView.Companion.identifier, for: indexPath) as! BluetoothDescriptorView
-        descriptorCell.descriptor = descriptors[indexPath.row]
-        return descriptorCell
-    }
-
-    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
-            (cell as? BluetoothDescriptorView)?.startMonitoring()
-        }
-    }
-
-    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
-            (cell as? BluetoothDescriptorView)?.stopMonitoring()
-        }
-    }
-
-    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
-        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
-        layoutIfNeeded()
-        layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
-        return layoutAttributes
-    }
-}
-
-class BluetoothDescriptorView : UICollectionViewCell {
-    
-    fileprivate struct Companion {
-        static let identifier = "BluetoothDescriptorView"
-    }
-    
-    fileprivate var descriptor: BluetoothDescriptorViewModel?
-    private let disposeBag = DisposeBag()
-    
-    @IBOutlet var descriptorIdentifier: UILabel!
-    @IBOutlet var descriptorValue: UILabel!
-    
-    fileprivate func startMonitoring() {
-        disposeBag.dispose()
-        guard let descriptor = self.descriptor else {
-            return
-        }
-        descriptor.didResume()
-
-        descriptorIdentifier.text = descriptor.uuid
-
-        descriptor.value.observe { [weak self] value in
-            self?.descriptorValue.text = value as String?
-        }.addTo(disposeBag: disposeBag)
-    }
-
-    fileprivate func stopMonitoring() {
-        disposeBag.dispose()
-        descriptor?.didResume()
-    }
-
-    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
-        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
-        layoutIfNeeded()
-        layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
-        return layoutAttributes
-    }
-}
diff --git a/newexample/ios/Demo/Bluetooth/BluetoothViewController.swift b/newexample/ios/Demo/Bluetooth/BluetoothViewController.swift
deleted file mode 100644
index 82903a4b1..000000000
--- a/newexample/ios/Demo/Bluetooth/BluetoothViewController.swift
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import KalugaExampleShared
-
-class BluetoothViewController : UICollectionViewController {
-
-    lazy var navigator: ViewControllerNavigator<DeviceDetails> = ViewControllerNavigator(parentVC: self) { action in
-        NavigationSpec.Push(animated: true) {
-            BluetoothDeviceDetailsViewController.create(identifier: action.value!.identifier)
-        }
-    }
-    lazy var viewModel = BluetoothListViewModel(navigator: navigator)
-
-    private var devices: [BluetoothListDeviceViewModel] = []
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-
-        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
-        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
-        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0)
-        flowLayout.minimumLineSpacing = 4
-        collectionView.collectionViewLayout = flowLayout
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else { return [] }
-
-            return [
-                viewModel.isScanning.observe { isScanning in
-                    self?.updateNavigationItem(isScanning: isScanning as? Bool ?? false)
-                },
-                viewModel.devices.observe { devices in
-                    self?.devices = devices as? [BluetoothListDeviceViewModel] ?? []
-                    self?.collectionView?.reloadData()
-                    self?.collectionView.layoutIfNeeded()
-                },
-                viewModel.title.observe { title in
-                    self?.updateTitle(title: title as String?)
-                }
-            ]
-        }
-    }
-
-    private func updateNavigationItem(isScanning: Bool) {
-        if (isScanning) {
-            self.navigationItem.setRightBarButton(UIBarButtonItem(title: NSLocalizedString("bluetooth_stop_scanning", comment: ""), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
-        } else {
-            self.navigationItem.setRightBarButton(UIBarButtonItem(title: NSLocalizedString("bluetooth_start_scanning", comment: ""), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
-        }
-    }
-
-    private func updateTitle(title: String?) {
-        self.title = title
-    }
-
-    @objc private func toggleScanning() {
-        viewModel.onScanPressed()
-    }
-
-    override func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return 1
-    }
-
-    override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        devices.count
-    }
-
-    override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let bluetoothCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothCell.Companion.identifier, for: indexPath) as! BluetoothCell
-        bluetoothCell.device = devices[indexPath.row]
-        return bluetoothCell
-    }
-
-    override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        guard let btCell = cell as? BluetoothCell else {
-            return
-        }
-
-        btCell.startMonitoring()
-    }
-
-    override func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        guard let btCell = cell as? BluetoothCell else {
-            return
-        }
-
-        btCell.stopMonitoring()
-    }
-
-    override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        devices[indexPath.row].toggleFoldOut()
-        let context = UICollectionViewFlowLayoutInvalidationContext()
-        context.invalidateItems(at: [indexPath])
-        collectionView.collectionViewLayout.invalidateLayout()
-    }
-}
-
-class BluetoothCell: UICollectionViewCell {
-    
-    fileprivate struct Companion {
-        static let identifier = "BluetoothCell"
-    }
-    
-    private let disposeBag = DisposeBag()
-    
-    @IBOutlet var deviceName: UILabel!
-    @IBOutlet var deviceIdentifier: UILabel!
-    @IBOutlet var rssi: UILabel!
-    @IBOutlet var txPower: UILabel!
-    @IBOutlet var buttonContainer: UIStackView!
-    @IBOutlet var connectButton: UIButton!
-    @IBOutlet var disconnectButton: UIButton!
-    
-    @IBOutlet var connectionStatus: UILabel!
-    @IBOutlet var foldOutMenu: UIView!
-    @IBOutlet var serviceId: UILabel!
-    @IBOutlet var serviceData: UILabel!
-    @IBOutlet var manufacturerId: UILabel!
-    @IBOutlet var manufacturerData: UILabel!
-    @IBOutlet var moreButtonContainer: UIView!
-    @IBOutlet var moreButton: UIButton!
-    
-    fileprivate var device: BluetoothListDeviceViewModel? = nil
-
-    @IBAction func onConnectPressed() {
-        device?.onConnectPressed()
-    }
-
-    @IBAction func onDisonnectPressed() {
-        device?.onDisconnectPressed()
-    }
-
-    @IBAction func onMorePressed() {
-        device?.onMorePressed()
-    }
-
-    func startMonitoring() {
-        disposeBag.dispose()
-        guard let device = device else {
-            return
-        }
-        device.didResume()
-
-        deviceIdentifier.text = device.identifierString
-
-        device.name.observe { [weak self] name in
-            self?.deviceName.text = name as? String
-        }.addTo(disposeBag: disposeBag)
-
-        device.rssi.observe { [weak self] rssiValue in
-            self?.rssi.text = rssiValue as? String
-        }.addTo(disposeBag: disposeBag)
-
-        device.txPower.observe { [weak self] txPowerValue in
-            self?.txPower.text = txPowerValue as? String
-        }.addTo(disposeBag: disposeBag)
-
-        device.status.observe { [weak self] status in
-            self?.connectionStatus.text = status as? String
-        }.addTo(disposeBag: disposeBag)
-
-        device.isConnectButtonVisible.observe { [weak self] isVisible in
-            self?.buttonContainer.alpha = (isVisible as? Bool ?? false) ? 1.0 : 0.0
-        }.addTo(disposeBag: disposeBag)
-
-        device.connectButtonState.observe { [weak self] connectButtonState in
-            let state: BluetoothListDeviceViewModel.ConnectButtonState = connectButtonState as? BluetoothListDeviceViewModel.ConnectButtonState ?? BluetoothListDeviceViewModel.ConnectButtonState.disconnect
-            switch state {
-                case BluetoothListDeviceViewModel.ConnectButtonState.connect:
-                    self?.connectButton.isHidden = false
-                    self?.disconnectButton.isHidden = true
-                case BluetoothListDeviceViewModel.ConnectButtonState.disconnect:
-                    self?.connectButton.isHidden = true
-                    self?.disconnectButton.isHidden = false
-                default: ()
-            }
-        }.addTo(disposeBag: disposeBag)
-
-        device.isFoldedOut.observe { [weak self] isFoldedOut in
-            self?.foldOutMenu.isHidden = !((isFoldedOut as? Bool) ?? false)
-        }
-
-        device.isMoreButtonVisible.observe { [weak self] isMoreVisible in
-            self?.moreButtonContainer.isHidden = !(isMoreVisible as? Bool ?? false)
-        }
-
-        device.serviceUUIDs.observe { [weak self] serviceUUIDS in
-            self?.serviceId.text = serviceUUIDS as? String
-        }
-
-        device.serviceData.observe { [weak self] serviceData in
-            self?.serviceData.text = serviceData as? String
-        }
-
-        device.manufacturerId.observe { [weak self] manufacturerId in
-            self?.manufacturerId.text = manufacturerId as? String
-        }
-
-        device.manufacturerData.observe { [weak self] manufacturerData in
-            self?.manufacturerData.text = manufacturerData as? String
-        }
-    }
-
-    func stopMonitoring() {
-        disposeBag.dispose()
-        device?.didPause()
-    }
-}
diff --git a/newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift b/newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
deleted file mode 100644
index 9ee2d520e..000000000
--- a/newexample/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import KalugaExampleShared
-
-class DateTimePickerViewController : UIViewController {
-    
-    @IBOutlet private var timeLabel: UILabel!
-    
-    lazy var viewModel = DateTimePickerViewModel(dateTimePickerPresenterBuilder: DateTimePickerPresenter.Builder(viewController: self))
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else {
-                return []
-            }
-            return [
-                viewModel.dateLabel.observe { (time) in
-                    self?.timeLabel.text = time as? String
-                }
-            ]
-        }
-    }
-
-    @IBAction
-    func selectDatePressed() {
-        viewModel.onSelectDatePressed()
-    }
-
-    @IBAction
-    func selectTimePressed() {
-        viewModel.onSelectTimePressed()
-    }
-}
diff --git a/newexample/ios/Demo/Demo.entitlements b/newexample/ios/Demo/Demo.entitlements
deleted file mode 100644
index 97405eaca..000000000
--- a/newexample/ios/Demo/Demo.entitlements
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.developer.associated-domains</key>
-	<array>
-		<string>applinks:kaluga-links.web.app</string>
-	</array>
-</dict>
-</plist>
diff --git a/newexample/ios/Demo/ExampleViewController.swift b/newexample/ios/Demo/ExampleViewController.swift
deleted file mode 100644
index d6ad2d207..000000000
--- a/newexample/ios/Demo/ExampleViewController.swift
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import KalugaExampleShared
-
-class ExampleViewController : UIViewController {
-    
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let featuresList = "FeaturesList"
-        static let infoView = "InfoViewController"
-    }
-    
-    @IBOutlet weak var containerView: UIView!
-    @IBOutlet weak var bottomView: UIStackView!
-    
-    lazy var featuresListController = Const.storyboard.instantiateViewController(withIdentifier: Const.featuresList) as! FeaturesListViewController
-    lazy var infoViewController = Const.storyboard.instantiateViewController(withIdentifier: Const.infoView) as! InfoViewController
-
-    private lazy var navigator: ViewControllerNavigator<ExampleTabNavigation> = ViewControllerNavigator(parentVC: self) { action in
-        NavigationSpec.Nested(type: NavigationSpec.NestedTypeReplace(tag: 1), containerView: self.containerView) {
-            switch action {
-            case is ExampleTabNavigation.FeatureList: return self.featuresListController
-            case is ExampleTabNavigation.Info: return self.infoViewController
-            default: return UIViewController()
-            }
-        }
-    }
-    lazy var viewModel: ExampleViewModel = ExampleViewModel(navigator: navigator)
-    var lifecycleManager: LifecycleManager!
-    let selectedButtonDisposeBag = DisposeBag()
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel, let bottomView = self?.bottomView else { return [] }
-
-            return [
-                viewModel.tabs.observeInitialized { tabs in
-                    guard let disposeBag = self?.selectedButtonDisposeBag else { return }
-                    disposeBag.dispose()
-                    let tabs = tabs ?? []
-                    bottomView.arrangedSubviews.forEach { $0.removeFromSuperview() }
-                    for tab in tabs {
-                        guard let tab = tab as? ExampleViewModel.Tab else { return }
-                        let button = UIButton()
-                        button.setTitle(tab.title, for: .normal)
-                        button.setTitleColor(UIColor.systemBlue, for: .selected)
-                        button.setTitleColor(UIColor.systemBlue, for: .highlighted)
-                        button.setTitleColor(UIColor.gray, for: .normal)
-
-                        viewModel.tab.observeInitialized { selectedTab in
-                            button.isSelected = selectedTab == tab
-                        }.addTo(disposeBag: disposeBag)
-                        button.addAction {
-                            viewModel.tab.post(newValue: tab)
-                        }
-                        bottomView.addArrangedSubview(button)
-                    }
-
-                }
-            ]
-        }
-    }
-    
-}
diff --git a/newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift b/newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift
deleted file mode 100644
index e520eaa27..000000000
--- a/newexample/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import KalugaExampleShared
-
-class FeaturesListViewController : UITableViewController {
-
-    private lazy var navigator: ViewControllerNavigator<FeatureListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
-        NavigationSpec.Segue(identifier: action.segueKey)
-    }
-    private lazy var viewModel: FeatureListViewModel = FeatureListViewModel(navigator: navigator)
-    private var lifecycleManager: LifecycleManager!
-
-    private var features = [String]()
-    private var onSelected: ((Int) -> Void)? = nil
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else { return [] }
-            return [viewModel.feature.observeInitialized { next in
-                let features = next ?? []
-                self?.features = features.map { ($0 as! Feature).title }
-                self?.onSelected = { (index: Int) in
-                    viewModel.onFeaturePressed(feature: features[index] as! Feature)
-                }
-                self?.tableView.reloadData()
-            }]
-        }
-    }
-
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return features.count
-    }
-
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: FeaturesListCell.Const.identifier, for: indexPath) as! FeaturesListCell
-        cell.label.text = features[indexPath.row]
-        return cell
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(indexPath.row)
-        tableView.deselectRow(at: indexPath, animated: true)
-    }
-    
-}
-
-class FeaturesListCell : UITableViewCell {
-    
-    struct Const {
-        static let identifier = "FeaturesListCell"
-    }
-    
-    @IBOutlet weak var label: UILabel!
-    
-}
-
-private extension FeatureListNavigationAction {
-    var segueKey: String {
-        get {
-            switch self {
-            case is FeatureListNavigationAction.Alerts: return "showAlerts"
-            case is FeatureListNavigationAction.Architecture: return "showArchitecture"
-            case is FeatureListNavigationAction.Beacons: return "showBeacons"
-            case is FeatureListNavigationAction.Bluetooth: return "showBluetooth"
-            case is FeatureListNavigationAction.DateTimePicker: return "showDateTimePicker"
-            case is FeatureListNavigationAction.Keyboard: return "showKeyboard"
-            case is FeatureListNavigationAction.Links: return "showLinks"
-            case is FeatureListNavigationAction.LoadingIndicator: return "showHUD"
-            case is FeatureListNavigationAction.Location: return "showLocation"
-            case is FeatureListNavigationAction.Permissions: return "showPermissions"
-            case is FeatureListNavigationAction.PlatformSpecific: return "showPlatformSpecific"
-            case is FeatureListNavigationAction.Resources: return "showResources"
-            case is FeatureListNavigationAction.System: return "showSystem"
-            default: return ""
-            }
-        }
-    }
-}
diff --git a/newexample/ios/Demo/Helpers/UIControl+Closure.swift b/newexample/ios/Demo/Helpers/UIControl+Closure.swift
deleted file mode 100644
index de3718ea9..000000000
--- a/newexample/ios/Demo/Helpers/UIControl+Closure.swift
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-
-@objc class UIControlClosure: NSObject {
-    let closure: ()->()
-
-    init (_ closure: @escaping ()->()) {
-        self.closure = closure
-    }
-
-    @objc func invoke () {
-        closure()
-    }
-}
-
-extension UIControl {
-    func addAction(for controlEvents: UIControl.Event = .touchUpInside, _ closure: @escaping ()->()) {
-        let sleeve = UIControlClosure(closure)
-        addTarget(sleeve, action: #selector(UIControlClosure.invoke), for: controlEvents)
-        objc_setAssociatedObject(self, "[\(arc4random())]", sleeve, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-    }
-}
diff --git a/newexample/ios/Demo/Info.plist b/newexample/ios/Demo/Info.plist
deleted file mode 100644
index 51a9d709a..000000000
--- a/newexample/ios/Demo/Info.plist
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>com.splendo.kaluga.example</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>kalugaexample</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-    <key>NSBluetoothAlwaysUsageDescription</key>
-    <string>Demonstrate usage of Kaluga library</string>
-    <key>NSBluetoothPeripheralUsageDescription</key>
-    <string>Demonstrate usage of Kaluga library</string>
-	<key>NSCalendarsUsageDescription</key>
-	<string>Demonstrate usage of Kaluga library</string>
-	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>Demonstrate usage of Kaluga library</string>
-	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>Demonstrate usage of Kaluga library</string>
-	<key>NSCameraUsageDescription</key>
-	<string>Demonstrate usage of Kaluga library</string>
-	<key>NSContactsUsageDescription</key>
-	<string>Demonstrate usage of Kaluga library</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>Demonstrate usage of Kaluga library</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Demonstrate usage of Kaluga library</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Demonstrate usage of Kaluga library</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>Demonstrate usage of Kaluga library</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Demonstrate usage of Kaluga library</string>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/newexample/ios/Demo/Info/InfoViewController.swift b/newexample/ios/Demo/Info/InfoViewController.swift
deleted file mode 100644
index a2f18dc06..000000000
--- a/newexample/ios/Demo/Info/InfoViewController.swift
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import MessageUI
-import KalugaExampleShared
-
-class InfoViewController : UITableViewController {
-
-    private lazy var navigator = InfoNavigatorKt.InfoNavigator(
-        parent: self,
-        onDialogSpec: { dialogSpec in
-            NavigationSpec.Present(
-                animated: true,
-                presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue),
-                transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)
-            ) {
-                    let alert = UIAlertController.init(title: dialogSpec.title, message: dialogSpec.message, preferredStyle: .alert)
-                    alert.addAction(UIAlertAction(title: "OK", style: .default))
-                    return alert
-                }
-        },
-        onLink: { link in NavigationSpec.Browser(url: URL(string: link)!, viewType: NavigationSpec.BrowserTypeNormal()) },
-        onMailSpec: { mailSpec in
-            let settings = NavigationSpec.Email.EmailEmailSettings(type: NavigationSpec.EmailTypePlain(), to: mailSpec.to, cc: [], bcc: [], subject: mailSpec.subject, body: nil, attachments: [])
-            return NavigationSpec.Email(emailSettings: settings, delegate: nil, animated: true)
-        }
-    )
-    private lazy var viewModel: InfoViewModel = InfoViewModel(
-        reviewManagerBuilder: ReviewManager.Builder(),
-        navigator: navigator)
-
-    private var buttons = [String]()
-    private var onSelected: ((Int) -> Void)? = nil
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-
-            guard let viewModel = self?.viewModel else {
-                return []
-            }
-
-            return [
-                viewModel.buttons.observeInitialized { next in
-                    let buttons = next?.compactMap { $0 as? InfoViewModel.Button } ?? []
-                    self?.buttons = buttons.map { $0.title }
-                    self?.onSelected = { (index: Int) in viewModel.onButtonPressed(button: buttons[index]) }
-                    self?.tableView.reloadData()
-                }
-            ]
-        }
-    }
-
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return buttons.count
-    }
-
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: InfoButtonCell.Const.identifier, for: indexPath) as! InfoButtonCell
-        cell.label.text = buttons[indexPath.row]
-        return cell
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(indexPath.row)
-        tableView.deselectRow(at: indexPath, animated: true)
-    }
-    
-}
-
-class InfoButtonCell : UITableViewCell {
-    
-    struct Const {
-        static let identifier = "InfoButtonCell"
-    }
-    
-    @IBOutlet weak var label: UILabel!
-    
-}
diff --git a/newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift b/newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
deleted file mode 100644
index 8e0d31743..000000000
--- a/newexample/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import KalugaExampleShared
-
-class KeyboardManagerViewController : UIViewController {
-    
-    @IBOutlet private var editField: UITextField!
-    
-    private lazy var editFieldFocusHandler = {
-        return UIKitFocusHandler(view: self.editField)
-    }()
-    lazy var viewModel = KeyboardViewModel(keyboardManagerBuilder: KeyboardManager.Builder(application: UIApplication.shared), editFieldFocusHandler: editFieldFocusHandler)
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
-    }
-
-    @IBAction
-    func showButtonPressed() {
-        viewModel.onShowPressed()
-    }
-
-    @IBAction
-    func hideButtonPressed() {
-        viewModel.onHidePressed()
-    }
-}
diff --git a/newexample/ios/Demo/Links/LinksViewController.swift b/newexample/ios/Demo/Links/LinksViewController.swift
deleted file mode 100644
index 34ab58446..000000000
--- a/newexample/ios/Demo/Links/LinksViewController.swift
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import Foundation
-import UIKit
-import KalugaExampleShared
-
-class LinksViewController : UIViewController {
-    
-    @IBOutlet weak var browserButton: UIButton!
-    @IBOutlet weak var instructionsText: UILabel!
-
-    private lazy var navigator: ViewControllerNavigator<BrowserNavigationActions<AnyObject>> = BrowserNavigatorKt.BrowserNavigator(parent: self)
-    private lazy var viewModel: LinksViewModel = LinksViewModel(linkRepoBuilder: LinksLinksBuilder(), builder: AlertPresenter.Builder(viewController: self), navigator: navigator)
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) {
-            [
-                self.viewModel.browserButtonText.observe { buttonText in
-                    self.browserButton.setTitle(buttonText as String?, for: .normal)
-                },
-                self.viewModel.linksInstructions.observe { text in
-                    self.instructionsText.text = text as String?
-                }
-            ]
-        }
-    }
-    
-    @IBAction func onBrowserButtonTapped(_ sender: UIButton) {
-        self.viewModel.openWebPage()
-    }
-    
-    func handleIncomingLink(url: String) {
-        self.viewModel.handleIncomingLink(url: url)
-    }
-}
diff --git a/newexample/ios/Demo/LoadingIndicator/ActivityViewController.swift b/newexample/ios/Demo/LoadingIndicator/ActivityViewController.swift
deleted file mode 100644
index 045eea92b..000000000
--- a/newexample/ios/Demo/LoadingIndicator/ActivityViewController.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-
-class ActivityViewController: UIViewController { }
diff --git a/newexample/ios/Demo/LoadingIndicator/ActivityViewController.xib b/newexample/ios/Demo/LoadingIndicator/ActivityViewController.xib
deleted file mode 100644
index 0b785d2bd..000000000
--- a/newexample/ios/Demo/LoadingIndicator/ActivityViewController.xib
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ActivityViewController" customModule="Demo" customModuleProvider="target">
-            <connections>
-                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TgB-l6-eNU">
-                    <rect key="frame" x="154" y="387.5" width="106" height="121.5"/>
-                    <subviews>
-                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="j71-db-jJU">
-                            <rect key="frame" x="32" y="32" width="42" height="57.5"/>
-                            <subviews>
-                                <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="5qm-Vi-dOY">
-                                    <rect key="frame" x="2.5" y="0.0" width="37" height="37"/>
-                                </activityIndicatorView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JIh-5Z-dD6">
-                                    <rect key="frame" x="0.0" y="37" width="42" height="20.5"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <nil key="textColor"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                            </subviews>
-                        </stackView>
-                    </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                    <constraints>
-                        <constraint firstAttribute="trailing" secondItem="j71-db-jJU" secondAttribute="trailing" constant="32" id="6BT-5l-gL9"/>
-                        <constraint firstAttribute="bottom" secondItem="j71-db-jJU" secondAttribute="bottom" constant="32" id="7pd-TL-wQ1"/>
-                        <constraint firstItem="j71-db-jJU" firstAttribute="leading" secondItem="TgB-l6-eNU" secondAttribute="leading" constant="32" id="8YS-wM-gPL"/>
-                        <constraint firstAttribute="height" constant="200" id="nj8-gy-hKC"/>
-                        <constraint firstItem="j71-db-jJU" firstAttribute="top" secondItem="TgB-l6-eNU" secondAttribute="top" constant="32" id="pSA-of-lhb"/>
-                        <constraint firstAttribute="width" constant="200" id="wRA-be-Yeh"/>
-                    </constraints>
-                    <variation key="default">
-                        <mask key="constraints">
-                            <exclude reference="nj8-gy-hKC"/>
-                            <exclude reference="wRA-be-Yeh"/>
-                        </mask>
-                    </variation>
-                </view>
-            </subviews>
-            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.64653230444785281" colorSpace="custom" customColorSpace="sRGB"/>
-            <constraints>
-                <constraint firstItem="TgB-l6-eNU" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="3VY-gS-uHZ"/>
-                <constraint firstItem="TgB-l6-eNU" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="DSu-Pe-vnO"/>
-            </constraints>
-            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
-            <point key="canvasLocation" x="139" y="125"/>
-        </view>
-    </objects>
-</document>
diff --git a/newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift b/newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift
deleted file mode 100644
index 94ce6baad..000000000
--- a/newexample/ios/Demo/LoadingIndicator/LoadingViewController.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import KalugaExampleShared
-
-class LoadingViewController: UITableViewController {
-
-    private lazy var viewModel = HudViewModel(builder: HUD.Builder(viewController: self))
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        tableView.deselectRow(at: indexPath, animated: true)
-        switch (indexPath.row) {
-        case 0: viewModel.onShowSystemPressed()
-        case 1: viewModel.onShowCustomPressed()
-        default: ()
-        }
-    }
-}
diff --git a/newexample/ios/Demo/Location/LocationViewController.swift b/newexample/ios/Demo/Location/LocationViewController.swift
deleted file mode 100644
index 2b82f3b9c..000000000
--- a/newexample/ios/Demo/Location/LocationViewController.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-import UIKit
-import CoreLocation
-import KalugaExampleShared
-
-class LocationViewController: UIViewController {
-
-    struct Const {
-        static let permission = LocationPermission(background: false, precise: true)
-    }
-    
-    //MARK: Properties
-    
-    @IBOutlet weak var label: UILabel!
-    
-    lazy var viewModel = LocationViewModel(permission: Const.permission)
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else {
-                return []
-            }
-            return [
-                viewModel.location.observe { (location) in
-                    self?.label.text = location as? String ?? ""
-                }
-            ]
-        }
-    }
-}
diff --git a/newexample/ios/Demo/Permissions/PermissionListViewController.swift b/newexample/ios/Demo/Permissions/PermissionListViewController.swift
deleted file mode 100644
index 2fd828e7c..000000000
--- a/newexample/ios/Demo/Permissions/PermissionListViewController.swift
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import KalugaExampleShared
-
-class PermissionListViewController : UITableViewController {
-
-    private lazy var navigator: ViewControllerNavigator<PermissionsListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
-        NavigationSpec.Push(animated: true) {
-            guard let permission = action.value?.permission else {
-                return UIViewController()
-            }
-
-            return PermissionViewController.create(permission: permission)
-        }
-    }
-    private lazy var viewModel: PermissionsListViewModel = PermissionsListViewModel(navigator: navigator)
-    private var lifecycleManager: LifecycleManager!
-
-    private var permissions = [PermissionView]()
-    private var onSelected: ((Int) -> Void)? = nil
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else { return [] }
-            return [
-                viewModel.permissions.observeInitialized { next in
-                    let permissions = next?.compactMap { $0 as? PermissionView } ?? []
-                    self?.permissions = permissions
-                    self?.onSelected = { (index: Int) in viewModel.onPermissionPressed(permissionView: permissions[index]) }
-                    self?.tableView.reloadData()
-                }
-            ]
-        }
-    }
-
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return permissions.count
-    }
-
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: PermissionsListCell.Const.identifier, for: indexPath) as! PermissionsListCell
-        cell.label.text = permissions[indexPath.row].title
-        return cell
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(indexPath.row)
-        tableView.deselectRow(at: indexPath, animated: true)
-    }
-    
-}
-
-class PermissionsListCell : UITableViewCell {
-    
-    struct Const {
-        static let identifier = "PermissionsListCell"
-    }
-    
-    @IBOutlet weak var label: UILabel!
-    
-}
diff --git a/newexample/ios/Demo/Permissions/PermissionViewController.swift b/newexample/ios/Demo/Permissions/PermissionViewController.swift
deleted file mode 100644
index 4bca12051..000000000
--- a/newexample/ios/Demo/Permissions/PermissionViewController.swift
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-import Foundation
-import KalugaExampleShared
-
-class PermissionViewController: UIViewController {
-    
-    private struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let permissionVc = "Permission"
-    }
-    
-    static func create(permission: Permission) -> PermissionViewController {
-        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.permissionVc) as! PermissionViewController
-        vc.viewModel = PermissionViewModel(permission: permission)
-        return vc
-    }
-    
-    @IBOutlet weak var permissionStateLabel: UILabel!
-    @IBOutlet weak var requestPermissionButton: UIButton!
-    
-    var viewModel: PermissionViewModel!
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        requestPermissionButton.setTitle(NSLocalizedString("permission_request", comment: ""), for: .normal)
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-
-            guard let viewModel = self?.viewModel else {
-                return []
-            }
-
-            return [
-                viewModel.permissionStateMessage.observe { message in
-                    self?.permissionStateLabel.text = NSLocalizedString(message as? String ?? "", comment: "")
-
-                },
-
-                viewModel.requestMessage.observe { optionalMessage in
-                    guard let message = optionalMessage as? String else {
-                        return
-                    }
-
-                    let alert = UIAlertController(title: NSLocalizedString("permission_request", comment: ""), message: message, preferredStyle: .alert)
-                    alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default, handler: nil))
-                    self?.present(alert, animated: true, completion: nil)
-
-                },
-
-                viewModel.showPermissionButton.observe { show in
-                    self?.requestPermissionButton.isHidden = !(show as? Bool ?? false)
-                    }
-            ]
-        }
-    }
-
-
-    @IBAction func requestPermission(sender: Any?) {
-        viewModel.requestPermission()
-    }
-
-}
diff --git a/newexample/ios/Demo/Resources/ButtonViewController.swift b/newexample/ios/Demo/Resources/ButtonViewController.swift
deleted file mode 100644
index f00e435ff..000000000
--- a/newexample/ios/Demo/Resources/ButtonViewController.swift
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//  Copyright 2022 Splendo Consulting B.V. The Netherlands
-// 
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0
-// 
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-//
-
-import UIKit
-import KalugaExampleShared
-
-class ButtonViewController : UITableViewController {
-    
-    private lazy var viewModel: ButtonViewModel = ButtonViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider(), alertPresenterBuilder: AlertPresenter.Builder(viewController: self))
-    private var lifecycleManager: LifecycleManager!
-
-    private var buttons = [KalugaButton]()
-    
-    deinit {
-        lifecycleManager.unbind()
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        tableView.allowsSelection = false
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else { return [] }
-            return [
-                viewModel.buttons.observe { labels in
-                    self?.buttons = labels?.compactMap { $0 as?  KalugaButton } ?? []
-                    self?.tableView.reloadData()
-                }
-            ]
-        }
-    }
-    
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-    
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return buttons.count
-    }
-    
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: ButtonListCell.Const.identifier, for: indexPath) as! ButtonListCell
-        ButtonStyleKt.bindButton(cell.button, button: buttons[indexPath.row])
-        return cell
-    }
-}
-
-class ButtonListCell : UITableViewCell {
-    
-    struct Const {
-        static let identifier = "ButtonListCell"
-    }
-    
-    @IBOutlet weak var button: UIButton!
-    
-}
diff --git a/newexample/ios/Demo/Resources/ColorViewController.swift b/newexample/ios/Demo/Resources/ColorViewController.swift
deleted file mode 100644
index c8412766a..000000000
--- a/newexample/ios/Demo/Resources/ColorViewController.swift
+++ /dev/null
@@ -1,202 +0,0 @@
-//
-//  Copyright 2022 Splendo Consulting B.V. The Netherlands
-// 
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0
-// 
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-//
-
-import UIKit
-import KalugaExampleShared
-
-class ColorViewController : UIViewController {
-    
-    @IBOutlet var backdropColorBackground: UIView!
-    @IBOutlet var sourceColorBackground: UIView!
-    @IBOutlet var blendedColorBackground: UIView!
-    
-    @IBOutlet var backdropInputField: UITextField!
-    @IBOutlet var sourceInputField: UITextField!
-    
-    @IBOutlet var blendModeButton: UIButton!
-    @IBOutlet var flipButton: UIButton!
-    
-    @IBOutlet var backdropLightenedColorsCollectionView: UICollectionView!
-    @IBOutlet var backdropDarkenedColorsCollectionView: UICollectionView!
-    @IBOutlet var sourceLightenedColorsCollectionView: UICollectionView!
-    @IBOutlet var sourceDarkenedColorsCollectionView: UICollectionView!
-    @IBOutlet var blendedLightenedColorsCollectionView: UICollectionView!
-    @IBOutlet var blendedDarkenedColorsCollectionView: UICollectionView!
-    
-    private var backdropLightenedColors: [BackgroundStyle] = []
-    private var backdropDarkenedColors: [BackgroundStyle] = []
-    private var sourceLightenedColors: [BackgroundStyle] = []
-    private var sourceDarkenedColors: [BackgroundStyle] = []
-    private var blendedLightenedColors: [BackgroundStyle] = []
-    private var blendedDarkenedColors: [BackgroundStyle] = []
-    
-    private lazy var viewModel: ColorViewModel = ColorViewModel(alertPresenterBuilder: AlertPresenter.Builder(viewController: self))
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        backdropLightenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
-        backdropDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
-        sourceLightenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
-        sourceDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
-        blendedLightenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
-        blendedDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else { return [] }
-            
-            return [
-                viewModel.backdropColorBackground.observe { next in
-                    guard let backdropColorBackground = self?.backdropColorBackground, let backdropBackgroundStyle = next as? BackgroundStyle else {
-                        return
-                    }
-                    BackgroundStyleKt.applyBackgroundStyle(backdropColorBackground, style: backdropBackgroundStyle)
-                },
-                viewModel.sourceColorBackground.observe { next in
-                    guard let sourceColorBackground = self?.sourceColorBackground, let sourceBackgroundStyle = next as? BackgroundStyle else {
-                        return
-                    }
-                    BackgroundStyleKt.applyBackgroundStyle(sourceColorBackground, style: sourceBackgroundStyle)
-                },
-                viewModel.blendedColorBackground.observe { next in
-                    guard let blendedColorBackground = self?.blendedColorBackground, let blendedBackgroundStyle = next as? BackgroundStyle else {
-                        return
-                    }
-                    BackgroundStyleKt.applyBackgroundStyle(blendedColorBackground, style: blendedBackgroundStyle)
-                },
-                viewModel.backdropText.observe { text in
-                    self?.backdropInputField.text = text as String?
-                },
-                viewModel.sourceText.observe { text in
-                    self?.sourceInputField.text = text as String?
-                },
-                viewModel.blendModeButton.observe { next in
-                    guard let blendModeButton = self?.blendModeButton, let buttonStyle = next else {
-                        return
-                    }
-                    ButtonStyleKt.bindButton(blendModeButton, button: buttonStyle)
-                },
-                viewModel.lightenBackdrops.observe { next in
-                    self?.backdropLightenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
-                    self?.backdropLightenedColorsCollectionView?.reloadData()
-                },
-                viewModel.darkenBackdrops.observe { next in
-                    self?.backdropDarkenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
-                    self?.backdropDarkenedColorsCollectionView?.reloadData()
-                },
-                viewModel.lightenSource.observe { next in
-                    self?.sourceLightenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
-                    self?.sourceLightenedColorsCollectionView?.reloadData()
-                },
-                viewModel.darkenSource.observe { next in
-                    self?.sourceDarkenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
-                    self?.sourceDarkenedColorsCollectionView?.reloadData()
-                },
-                viewModel.lightenBlended.observe { next in
-                    self?.blendedLightenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
-                    self?.blendedLightenedColorsCollectionView?.reloadData()
-                },
-                viewModel.darkenBlended.observe { next in
-                    self?.blendedDarkenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
-                    self?.blendedDarkenedColorsCollectionView?.reloadData()
-                },
-            ]
-        }
-        
-        ButtonStyleKt.bindButton(flipButton, button: viewModel.flipButton)
-    }
-}
-
-extension ColorViewController : UITextFieldDelegate {
-    func textFieldDidEndEditing(_ textField: UITextField) {
-        if textField == backdropInputField {
-            viewModel.submitBackdropText(backdropText: textField.text ?? "")
-        }
-        if textField == sourceInputField {
-            viewModel.submitSourceText(sourceText: textField.text ?? "")
-        }
-    }
-}
-
-extension ColorViewController : UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
-    
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        if collectionView == backdropLightenedColorsCollectionView {
-            return backdropLightenedColors.count
-        }
-        if collectionView == backdropDarkenedColorsCollectionView {
-            return backdropDarkenedColors.count
-        }
-        if collectionView == sourceLightenedColorsCollectionView {
-            return sourceLightenedColors.count
-        }
-        if collectionView == sourceDarkenedColorsCollectionView {
-            return sourceDarkenedColors.count
-        }
-        if collectionView == blendedLightenedColorsCollectionView {
-            return blendedLightenedColors.count
-        }
-        if collectionView == blendedDarkenedColorsCollectionView {
-            return blendedDarkenedColors.count
-        }
-        return 0
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        return CGSize.init(width: collectionView.frame.height, height: collectionView.frame.height)
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: ColorCollectionCellView.Const.identifier, for: indexPath) as! ColorCollectionCellView
-        if collectionView == backdropLightenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: backdropLightenedColors[indexPath.row])
-        }
-        if collectionView == backdropDarkenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: backdropDarkenedColors[indexPath.row])
-        }
-        if collectionView == sourceLightenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: sourceLightenedColors[indexPath.row])
-        }
-        if collectionView == sourceDarkenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: sourceDarkenedColors[indexPath.row])
-        }
-        if collectionView == blendedLightenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: blendedLightenedColors[indexPath.row])
-        }
-        if collectionView == blendedDarkenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: blendedDarkenedColors[indexPath.row])
-        }
-        return cell
-    }
-}
-
-class ColorCollectionCellView : UICollectionViewCell {
-    
-    struct Const {
-        static let identifier = "ColorCollectionCellView"
-    }
-    
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-}
diff --git a/newexample/ios/Demo/Resources/LabelViewController.swift b/newexample/ios/Demo/Resources/LabelViewController.swift
deleted file mode 100644
index dd8695a79..000000000
--- a/newexample/ios/Demo/Resources/LabelViewController.swift
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-//  Copyright 2022 Splendo Consulting B.V. The Netherlands
-// 
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0
-// 
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-//
-
-import UIKit
-import KalugaExampleShared
-
-class LabelViewController : UITableViewController {
-
-    private var viewModel: LabelViewModel = LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider())
-    private var lifecycleManager: LifecycleManager!
-
-    private var labels = [KalugaLabel]()
-    
-    deinit {
-        lifecycleManager.unbind()
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        tableView.allowsSelection = false
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else { return [] }
-            return [
-                viewModel.labels.observe { labels in
-                    self?.labels = labels?.compactMap { $0 as? KalugaLabel } ?? []
-                    self?.tableView.reloadData()
-                }
-            ]
-        }
-    }
-    
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-    
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return labels.count
-    }
-    
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: LabelListCell.Const.identifier, for: indexPath) as! LabelListCell
-        TextStyleKt.bindLabel(cell.label, label: labels[indexPath.row])
-        return cell
-    }
-}
-
-class LabelListCell : UITableViewCell {
-    
-    struct Const {
-        static let identifier = "LabelListCell"
-    }
-    
-    @IBOutlet weak var label: UILabel!
-    
-}
diff --git a/newexample/ios/Demo/Resources/ResourcesListViewController.swift b/newexample/ios/Demo/Resources/ResourcesListViewController.swift
deleted file mode 100644
index 40d7799a8..000000000
--- a/newexample/ios/Demo/Resources/ResourcesListViewController.swift
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-//  Copyright 2022 Splendo Consulting B.V. The Netherlands
-// 
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0
-// 
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-//
-
-import UIKit
-import KalugaExampleShared
-
-class ResourcesListViewController : UITableViewController {
-
-    private lazy var navigator: ViewControllerNavigator<ResourcesListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
-        NavigationSpec.Segue(identifier: action.segueKey)
-    }
-    
-    private lazy var viewModel: ResourcesListViewModel = ResourcesListViewModel(navigator: navigator)
-    private var lifecycleManager: LifecycleManager!
-
-    private var resources = [String]()
-    private var onSelected: ((Int) -> Void)? = nil
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else { return [] }
-            return [
-                viewModel.resources.observeInitialized { next in
-                    let resources = next ?? []
-                    self?.resources = resources.map { ($0 as! Resource).title }
-                    self?.onSelected = { (index: Int) in viewModel.onResourceSelected(resource: resources[index] as! Resource) }
-                    self?.tableView.reloadData()
-                }
-            ]
-        }
-    }
-
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return resources.count
-    }
-
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: ResourcesListCell.Const.identifier, for: indexPath) as! ResourcesListCell
-        cell.label.text = resources[indexPath.row]
-        return cell
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(indexPath.row)
-        tableView.deselectRow(at: indexPath, animated: true)
-    }
-    
-}
-
-class ResourcesListCell : UITableViewCell {
-    
-    struct Const {
-        static let identifier = "ResourcesListCell"
-    }
-    
-    @IBOutlet weak var label: UILabel!
-    
-}
-
-private extension ResourcesListNavigationAction {
-    var segueKey: String {
-        get {
-            switch self {
-            case is ResourcesListNavigationAction.Button: return "showButton"
-            case is ResourcesListNavigationAction.Color: return "showColor"
-            case is ResourcesListNavigationAction.Label: return "showLabel"
-            default: return ""
-            }
-        }
-    }
-}
diff --git a/newexample/ios/Demo/System/Network/NetworkViewController.swift b/newexample/ios/Demo/System/Network/NetworkViewController.swift
deleted file mode 100644
index ead546b08..000000000
--- a/newexample/ios/Demo/System/Network/NetworkViewController.swift
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import Foundation
-import UIKit
-import KalugaExampleShared
-
-class NetworkViewController : UIViewController {
-
-    @IBOutlet weak var networkStateText: UILabel!
-    private var lifecycleManager: LifecycleManager!
-    
-    private lazy var viewModel: NetworkViewModel = NetworkViewModel(networkStateRepoBuilder: NetworkStateRepoBuilder())
-    
-    deinit {
-        lifecycleManager.unbind()
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else { return [] }
-            
-            return [
-                viewModel.networkState.observe { next in
-                    self?.networkStateText.text = next as? String
-                }
-            ]
-        }
-    }
-    
-}
diff --git a/newexample/ios/Demo/System/SystemViewController.swift b/newexample/ios/Demo/System/SystemViewController.swift
deleted file mode 100644
index 782e14c5b..000000000
--- a/newexample/ios/Demo/System/SystemViewController.swift
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import Foundation
-import UIKit
-import KalugaExampleShared
-
-class SystemViewController : UITableViewController {
-
-    private lazy var navigator: ViewControllerNavigator<SystemNavigationActions> = ViewControllerNavigator(parentVC: self) { action in
-        switch action {
-        case is SystemNavigationActions.Network: return NavigationSpec.Segue(identifier: "showNetwork")
-        default: return NavigationSpec.Segue(identifier: "")
-        }
-    }
-    private lazy var viewModel: SystemViewModel = SystemViewModel(navigator: navigator)
-
-    private var modules = [String]()
-    private var onModuleTapped: ((Int) -> Void)? = nil
-    private var lifecycleManager: LifecycleManager!
-
-    deinit {
-        lifecycleManager.unbind()
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
-            guard let viewModel = self?.viewModel else {
-                return []
-            }
-            return [
-                viewModel.modules.observeInitialized { next in
-                    let modules = next?.compactMap { $0 as? SystemFeatures } ?? []
-                    self?.modules = modules.map{ $0.name }
-                    self?.onModuleTapped = { (index: Int) in viewModel.onButtonTapped(systemFeatures: modules[index]) }
-                    self?.tableView.reloadData()
-                }
-            ]
-        }
-    }
-
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return modules.count
-    }
-
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: SystemListCell.Const.identifier, for: indexPath) as! SystemListCell
-        cell.label.text = modules[indexPath.row]
-        return cell
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onModuleTapped?(indexPath.row)
-        tableView.deselectRow(at: indexPath, animated: true)
-    }
-    
-}
-
-class SystemListCell : UITableViewCell {
-    
-    struct Const {
-        static let identifier = "SystemListCell"
-    }
-    
-    @IBOutlet weak var label: UILabel!
-    
-}
diff --git a/newexample/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift b/newexample/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
deleted file mode 100644
index 81fa29aa4..000000000
--- a/newexample/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-import UIKit
-
-final class FittingWidthAutomaticHeightCollectionViewFlowLayout: UICollectionViewFlowLayout {
-
-    override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
-        let layoutAttributesObjects = super.layoutAttributesForElements(in: rect)?.map{ $0.copy() } as? [UICollectionViewLayoutAttributes]
-        layoutAttributesObjects?.forEach({ layoutAttributes in
-            if layoutAttributes.representedElementCategory == .cell {
-                if let newFrame = layoutAttributesForItem(at: layoutAttributes.indexPath)?.frame {
-                    layoutAttributes.frame = newFrame
-                }
-            }
-        })
-        return layoutAttributesObjects
-    }
-
-    override func layoutAttributesForItem(at indexPath: IndexPath) -> UICollectionViewLayoutAttributes? {
-        guard let collectionView = collectionView else {
-            fatalError()
-        }
-        guard let layoutAttributes = super.layoutAttributesForItem(at: indexPath)?.copy() as? UICollectionViewLayoutAttributes else {
-            return nil
-        }
-
-        layoutAttributes.frame.origin.x = sectionInset.left
-        layoutAttributes.frame.size.width = collectionView.safeAreaLayoutGuide.layoutFrame.width - sectionInset.left - sectionInset.right
-        return layoutAttributes
-    }
-
-    override func shouldInvalidateLayout(forPreferredLayoutAttributes preferredAttributes: UICollectionViewLayoutAttributes,
-             withOriginalAttributes originalAttributes: UICollectionViewLayoutAttributes) -> Bool {
-        return true
-    }
-}
diff --git a/newexample/ios/DemoTests/DemoTests.swift b/newexample/ios/DemoTests/DemoTests.swift
deleted file mode 100644
index dbe30118f..000000000
--- a/newexample/ios/DemoTests/DemoTests.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-import XCTest
-@testable import Demo
-import KalugaExampleShared
-
-class DemoTests: XCTestCase {
-
-    override func setUp() {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-    }
-
-    func testExample() {
-        assert(KotlinNativeFramework().hello() == "Hello from the shared module common source")
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-
-}
diff --git a/newexample/ios/DemoTests/Info.plist b/newexample/ios/DemoTests/Info.plist
deleted file mode 100644
index 6c40a6cd0..000000000
--- a/newexample/ios/DemoTests/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/newexample/ios/DemoUITests/DemoUITests.swift b/newexample/ios/DemoUITests/DemoUITests.swift
deleted file mode 100644
index 85a5ce551..000000000
--- a/newexample/ios/DemoUITests/DemoUITests.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-import XCTest
-
-class DemoUITests: XCTestCase {
-
-    override func setUp() {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-
-        // In UI tests it is usually best to stop immediately when a failure occurs.
-        continueAfterFailure = false
-
-        // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method.
-        XCUIApplication().launch()
-
-        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
-    }
-
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-    }
-
-    func testExample() {
-        // Use recording to get started writing UI tests.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-
-}
diff --git a/newexample/ios/DemoUITests/Info.plist b/newexample/ios/DemoUITests/Info.plist
deleted file mode 100644
index 6c40a6cd0..000000000
--- a/newexample/ios/DemoUITests/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/newexample/keystore/debug.keystore b/newexample/keystore/debug.keystore
deleted file mode 100644
index 38a87ac589bd046c4a57ae014ae5850c828d9679..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2419
zcmY+EXEYlM8^<HdD6S%A?R||T6+8B5RMl!xZH=ncVcaUB1PM{AD5}~jLamyK)vIWU
zRc&lFi&U-Jqr|A&_dV}>@3|kI^PKbh|DWgM4}oX(12TaScvg8R>+eJiagT$EnJE{~
zDhS52!hYe?2t35&UlGI}jEC6%!WVzddFZMCU9qz<0dw)-Lj)eYhfsjB{U85&E)3>%
z?B@O<ND<iAm6BA>VK|B0U@$6yAV8Zn7!U5Mv|M{l+g)_qs*(`Lkp21Ds(e>Wp4;ED
zWwXXg(|NW^-_i`F*n$*J%$;V2X7s7w4}>nH$6fh2G!$B-XnA_q-YV8~d3q5ZKwqCu
z6E`w=_<O=D&Ud(>#@yzO9YV_{9RWZY3|p04AA)N`mmDZP+w&0y<-wWp5rMs&AQ|b?
zfj#fi*l+bo5k`DHg-cK$Y>(Yoqqvj-j6R1Sa@@q3DAH$V^A9tar+Fulv$;QuwLI1_
z@@*<GsG+c2K(%ji;r`yG`xb<~M{X(OJG^nbkPQiJw8)cBTR}V@)5VJGZ;w6V@yC|7
zxGE~>sDFB4<h{h_&vDNg781E9BteGe=ks&OEsErcPO$-|E=78$sCmAe(`6IZ(5Tn`
z`pqaYKe$r`ohDjqQ?n-FNWdl!XkG04<3Z?@)h502=ER=9znHHxtWj%&`shRn%Q=#`
zVHTr`Ee!k3?rL=~e|zBO*lotQeKb}z9&eqk#f@V-Q}XIE@R_&I<CrZigV6IjlB7_E
z_auDZyet{EC)Z6Jlb3CgDc9zhlV85m+jF*Jk07aOA-ZoTpeT)zCMWHhHl5DGlGK5y
z@FJTFn<0`UODpnl$!#oSHYH2oxh3`P>vQ>tYLlA&kymU>V>I`HQPa)b0*-3;99_Tm
z9|pzu?c^1Mon4%DK|V+3BQ1#~Q>MOduu^dtEz97y*ZDUA7ABX@TJAJR1}TV0)4Q1d
zhyqJNcuk3ZU#@SgVaaO;+75^tMQ65l+X*c6QgwZxyzKb4&OBFP>3JC(EQH56O55Z^
zjKXFQk}u-kL=&*x#n3QjGKn$JMg_8oJ?6}@xfeml6%}%pYl<XSzL8<FHar?qx}V!W
z&<in)Ef+n6_z7onf7rHiMH=<DGS|c!1a+PD&`(Nv%qR6-(1j|1z8qHeVEUA!vEM>#
z5M0SoQ%Hu!-?nfd9_0$EAtUsst{S>Ndw5XijoD5J86V6KxpqXkR_vnMIxQ#4KEz2n
z#yWs{I$>`M_p0F%8S#!3jAqw&>=un6_oA8_Cl0;BzZ{9nG?1!R3P0GnxzT@F8KnRb
zhevsZOr@52UR-}9>ihJ?yxL4X2QGfN@eUP!?}-sJF>CTsC-o##rk*9?C2Neq`>sS|
zsde`bTo&$3HqbSYqwzI5|M~%dcoFv9A>7A`WymB4`evPk;`2w32k;jqNr*;M-ge~N
zyZM5g@~qvWo-R`+G<^GhSd-<cPHTNTTVk=Nk9_ikeDSw1kZt=1JvE=i?DU_F-en()
z9<?G?6qmfbV-(+@LAXK7SA!=cE#1(A5o3*qs&q0fY2GWf4Mmtzb<BUBCN<|@l{g4e
z11w8MhxSk2VJ^$QQVW4})=-ggUbfl0jHTn6rGk2=p0N>?xE0=zu%IfMmr2X|%8vb~
zUS09KE^;Ed>)?oY4thmWC^2eS8X<kwn<jZDS^vu+AlTGdcs?kmZ$?qO8`}HcI3IeY
z&^kv29lzs*%MfXxR+)w0yLx6f!Op0biGw4@K9779O)w-M&@t!quf@$mV(4vQwRG~+
zp>q*P6SY5Q_$go0=e}|b$kFuwJVgH}j_Tc;SFX6>Zm!`8i*~!wcMbxE*RmH~r<_eb
zjYK2(|5ha{FOp4^1#lbS0l)$f2#J3J7?KyveaYvphd5Flsg6QwYH6WVH8l`;P{H3N
zW@s)Rl<^Ct0+|56R{TE+)4%Kr{f}MU0@C{gJH*OxjuB?(v%7sJ^wzunYu89T$Xe9F
zd=#s`%Rx#lGFByAP#)~!Z#PMPI;yl;)<e6mB7D@u)wXR>fmTOr^)qtgGcI0XhXp+d
z-+D3Nw;#UQOCLzX6iy2}_3P2=4Gs@K3$5DcxI9aJk&RV|;T^lS?L{wf&0cD53$Y`i
z%SYzn@|%~L`m~l$UbCwwGn4h-pYcSm&8_acFNv2X7L%zUS9M5ny{VZ};f+JA<X5k7
z2f@HCH@68@#)QsMHOYK0#8It0bv>~m%>Oqy{R9QeJGvyTOhU-kokT+#>*7p|w4uA-
zKr-9Vf_Sbm45V2wJ2ZaoNK;GOiH#D<lo?k1bh^dqD#KIV_Dv2p%xY4p&l?^9(Y|z6
zaY(oSvCe{&>0tI=@8im`Mf!sKGx&K!@0rU1bsraEhrVUjJ9c_>Yw9-^)&wCXbd#If
z)jTIPTwA}1bS~f2;Y;WM+n-J;Ir*ckB;(*#z76B0rW@~hmIu1AqgUK&B`Iwe3i{Kk
zEUrBsrz)R`9Or7u4(?hN?JiU_c`i2Q&EBwhK@AhFk##PbGj8#g^{Tsaq_PKc!wy)v
z(E2RIeS9{RHpm>`Jo*z4*-*b*ZJGTAMHtomqT72N9-5cKTD}ONG}=^PP9Y13G?v!Y
z42{@zR!Rdl0@v<}3vqT#wGsN%wnd=?%NjDiR+~KU_H&nsSSM&GsTOR-a(o}!ko+>>
z_4O&G?(VxU)TE#s;;ds}{rptNGO1)>&CJX-c`0MXz|A%{UYqDrASpX6;+ectOKcb}
z@IdeiMERZSW)CJ&#+w<<%?d9Cf<;$mSc-XLqPbT(h9mnrGV&BUWC4pu>NaE?^MEHi
zNhj%euHpu5>(mJ1?(YZ`(;F2lLoTB*RlS#a<_|Lu@(H_^DSghv(g`+Y&0<D@5#Id4
z2(bxNIQerOV{Y*Ev026Uf{;~@0j0bQJu9PwpidECo{M!=W5yGs9kS4w-9y)2<Zgp9
zm?xZ8_=G#ix@F@mdOuTffF5bO(VLnfrQ*;yg)a=Y^OgLV@B~)4gqm>YW6Q|-2v^Cn
z3stlb`}{t5aB>zpyH+uZ;TZNUHP>tE<paJ1-f`J0Fb!CT%;hy9hd<>w{V828#BS$D
zennMYHMiLiI7X5XdI$*wD-@#02?7d10AOBy6kO2loCu7bDcmcT9y`NRxey8F<zkuB
aw+G(&S)6j5{`RupuIS1%1_)vz=KcljmUG$w

diff --git a/newexample/shared/build.gradle.kts b/newexample/shared/build.gradle.kts
deleted file mode 100644
index fcc1ed645..000000000
--- a/newexample/shared/build.gradle.kts
+++ /dev/null
@@ -1,57 +0,0 @@
-plugins {
-    kotlin("multiplatform")
-    kotlin("plugin.serialization")
-    id("com.android.library")
-    id("jacoco")
-    id("org.jlleitschuh.gradle.ktlint")
-}
-
-val libraryVersion = Library.version
-val modules = listOf(
-    "alerts" to true,
-    "architecture" to true,
-    "base" to false,
-    "bluetooth" to false,
-    "beacons" to false,
-    "date-time-picker" to true,
-    "hud" to true,
-    "keyboard" to true,
-    "links" to false,
-    "location" to false,
-    "logging" to false,
-    "resources" to true,
-    "review" to true,
-    "system" to true,
-    "permissions" to true
-)
-
-commonComponent {
-    logger.lifecycle("Configure framework")
-    baseName = "KalugaExampleShared"
-    isStatic = false
-    transitiveExport = true
-    modules.forEach { (module, isExportable) ->
-        if (isExportable) {
-            export("com.splendo.kaluga:$module:$libraryVersion")
-        }
-    }
-}
-
-kotlin {
-    sourceSets {
-        getByName("commonMain") {
-            dependencies {
-                modules.forEach { (module, _) ->
-                    api("com.splendo.kaluga:$module:$libraryVersion")
-                }
-                expose(Dependencies.Koin.Core)
-            }
-        }
-    }
-}
-
-android {
-    dependencies {
-        expose(Dependencies.Koin.Android)
-    }
-}
diff --git a/newexample/shared/src/androidLibMain/AndroidManifest.xml b/newexample/shared/src/androidLibMain/AndroidManifest.xml
deleted file mode 100644
index f595a3b11..000000000
--- a/newexample/shared/src/androidLibMain/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest package="com.splendo.kaluga.example.shared"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        >
-</manifest>
-
-
diff --git a/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
deleted file mode 100644
index 8d35888bc..000000000
--- a/newexample/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.featureList
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-actual val showPlatformSpecificFeatures: Boolean = true
-
-sealed class PlatformFeatureListNavigationAction : NavigationAction<Nothing>(null) {
-    object ComposeNavigation : PlatformFeatureListNavigationAction()
-    object ComposeBottomSheet : PlatformFeatureListNavigationAction()
-}
-
-sealed class PlatformFeature(val title: String) {
-    object ComposeNavigation : PlatformFeature("feature_platform_specific_compose_navigation".localized())
-    object ComposeBottomSheet : PlatformFeature("feature_platform_specific_compose_bottom_sheet".localized())
-}
-
-class PlatformSpecificFeaturesViewModel(
-    navigator: Navigator<PlatformFeatureListNavigationAction>
-) : NavigatingViewModel<PlatformFeatureListNavigationAction>(navigator) {
-
-    val feature = observableOf(
-        listOf(
-            PlatformFeature.ComposeNavigation,
-            PlatformFeature.ComposeBottomSheet
-        )
-    )
-
-    fun onFeaturePressed(feature: PlatformFeature) {
-        navigator.navigate(
-            when (feature) {
-                is PlatformFeature.ComposeNavigation -> PlatformFeatureListNavigationAction.ComposeNavigation
-                is PlatformFeature.ComposeBottomSheet -> PlatformFeatureListNavigationAction.ComposeBottomSheet
-            }
-        )
-    }
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ExampleViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ExampleViewModel.kt
deleted file mode 100644
index 0d04f4d26..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ExampleViewModel.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.observable.toInitializedSubject
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.launch
-
-sealed class ExampleTabNavigation : NavigationAction<Nothing>(null) {
-
-    object FeatureList : ExampleTabNavigation()
-    object Info : ExampleTabNavigation()
-}
-
-class ExampleViewModel(navigator: Navigator<ExampleTabNavigation>) : NavigatingViewModel<ExampleTabNavigation>(navigator) {
-
-    sealed class Tab(val title: String) {
-        object FeatureList : Tab("Features")
-        object Info : Tab("About")
-    }
-
-    val tabs = observableOf(listOf(Tab.FeatureList, Tab.Info))
-
-    private val _tab = MutableStateFlow<Tab>(Tab.FeatureList)
-    val tab = _tab.toInitializedSubject(coroutineScope)
-
-    override fun onResume(scope: CoroutineScope) {
-        super.onResume(scope)
-        scope.launch(Dispatchers.Main.immediate) {
-            _tab.collect { currentTab ->
-                navigator.navigate(
-                    when (currentTab) {
-                        is Tab.FeatureList -> ExampleTabNavigation.FeatureList
-                        is Tab.Info -> ExampleTabNavigation.Info
-                    }
-                )
-            }
-        }
-    }
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
deleted file mode 100644
index 89e7ca1ad..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.architecture
-
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.architecture.observable.InitializedObservable
-import com.splendo.kaluga.architecture.observable.subjectOf
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class InputDetails(
-    val name: String,
-    val number: Int
-)
-
-class CloseDetailsNavigation(inputDetails: InputDetails) : SingleValueNavigationAction<InputDetails>(
-    inputDetails,
-    NavigationBundleSpecType.SerializedType(InputDetails.serializer())
-)
-
-class ArchitectureDetailsViewModel(initialDetail: InputDetails, navigator: Navigator<CloseDetailsNavigation>) : NavigatingViewModel<CloseDetailsNavigation>(navigator) {
-
-    private val _name = subjectOf(initialDetail.name)
-    val name: InitializedObservable<String> = _name
-    private val _number = subjectOf(initialDetail.number.toString())
-    val number: InitializedObservable<String> = _number
-
-    private var nameResult: String by _name.valueDelegate
-    private var numberResult: String by _number.valueDelegate
-
-    fun onInversePressed() {
-        nameResult = nameResult.reversed()
-        numberResult = numberResult.reversed()
-    }
-
-    fun onClosePressed() {
-        navigator.navigate(CloseDetailsNavigation(InputDetails(nameResult, numberResult.toIntOrNull() ?: 0)))
-    }
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListBeaconViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListBeaconViewModel.kt
deleted file mode 100644
index de8408407..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListBeaconViewModel.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.beacons
-
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.base.text.format
-import com.splendo.kaluga.bluetooth.beacons.BeaconInfo
-import com.splendo.kaluga.bluetooth.beacons.Beacons
-import com.splendo.kaluga.bluetooth.beacons.get
-import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.resources.localized
-import kotlinx.coroutines.flow.map
-
-class BeaconsListBeaconViewModel(identifier: Identifier, service: Beacons) : BaseLifecycleViewModel() {
-
-    private val beacon = service.beacons[identifier]
-
-    private fun <T> beaconInfoObservable(mapper: (BeaconInfo?) -> T) = beacon
-        .map { mapper(it) }
-        .toInitializedObservable(null, coroutineScope)
-
-    val namespace = beaconInfoObservable { it?.beaconID?.namespace ?: "" }
-    val instance = beaconInfoObservable { it?.beaconID?.instance ?: "" }
-    val txPower = beaconInfoObservable {
-        it?.txPower?.let { txPower ->
-            "txPower".localized().format(txPower)
-        } ?: ""
-    }
-
-    public override fun onCleared() = super.onCleared()
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
deleted file mode 100644
index 9e7ee26a8..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothCharacteristicViewModel.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.bluetooth
-
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.observable.toUninitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.base.utils.toHexString
-import com.splendo.kaluga.bluetooth.Bluetooth
-import com.splendo.kaluga.bluetooth.Characteristic
-import com.splendo.kaluga.bluetooth.UUID
-import com.splendo.kaluga.bluetooth.characteristics
-import com.splendo.kaluga.bluetooth.descriptors
-import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.bluetooth.get
-import com.splendo.kaluga.bluetooth.services
-import com.splendo.kaluga.bluetooth.uuidString
-import com.splendo.kaluga.bluetooth.value
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.emptyFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-
-class BluetoothCharacteristicViewModel(private val bluetooth: Bluetooth, private val deviceIdentifier: Identifier, private val serviceUUID: UUID, private val characteristicUUID: UUID) : BaseLifecycleViewModel() {
-
-    private val characteristic: Flow<Characteristic?> get() = bluetooth.devices()[deviceIdentifier].services()[serviceUUID].characteristics()[characteristicUUID]
-
-    val uuid = characteristicUUID.uuidString
-    val value = characteristic.value().map { it?.toHexString() ?: "" }.toUninitializedObservable(coroutineScope)
-
-    private val _descriptors = MutableStateFlow(emptyList<BluetoothDescriptorViewModel>())
-    val descriptors = _descriptors.toInitializedObservable(coroutineScope)
-
-    override fun onResume(scope: CoroutineScope) {
-        super.onResume(scope)
-
-        scope.launch { characteristic.flatMapLatest { characteristic -> characteristic?.let { flowOf(it) } ?: emptyFlow() }.first().readValue() }
-        scope.launch {
-            characteristic.descriptors().map { descriptors -> descriptors.map { BluetoothDescriptorViewModel(bluetooth, deviceIdentifier, serviceUUID, characteristicUUID, it.uuid) } }.collect {
-                clearDescriptors()
-                _descriptors.value = it
-            }
-        }
-    }
-
-    public override fun onCleared() {
-        super.onCleared()
-        clearDescriptors()
-    }
-
-    private fun clearDescriptors() {
-        _descriptors.value.forEach { it.onCleared() }
-    }
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
deleted file mode 100644
index 513be4486..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDescriptorViewModel.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.bluetooth
-
-import com.splendo.kaluga.architecture.observable.toUninitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.base.utils.toHexString
-import com.splendo.kaluga.bluetooth.Bluetooth
-import com.splendo.kaluga.bluetooth.Descriptor
-import com.splendo.kaluga.bluetooth.UUID
-import com.splendo.kaluga.bluetooth.characteristics
-import com.splendo.kaluga.bluetooth.descriptors
-import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.bluetooth.get
-import com.splendo.kaluga.bluetooth.services
-import com.splendo.kaluga.bluetooth.uuidString
-import com.splendo.kaluga.bluetooth.value
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emptyFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-
-class BluetoothDescriptorViewModel(private val bluetooth: Bluetooth, private val deviceIdentifier: Identifier, private val serviceUUID: UUID, private val characteristicUUID: UUID, private val descriptorUUID: UUID) : BaseLifecycleViewModel() {
-
-    private val descriptor: Flow<Descriptor?> get() = bluetooth.devices()[deviceIdentifier].services()[serviceUUID].characteristics()[characteristicUUID].descriptors()[descriptorUUID]
-
-    val uuid = descriptorUUID.uuidString
-    val value = descriptor.value().map { it?.toHexString() ?: "" }.toUninitializedObservable(coroutineScope)
-
-    override fun onResume(scope: CoroutineScope) {
-        super.onResume(scope)
-
-        scope.launch {
-            descriptor.flatMapLatest { descriptor -> descriptor?.let { flowOf(it) } ?: emptyFlow() }.first().readValue()
-        }
-    }
-
-    public override fun onCleared() {
-        super.onCleared()
-    }
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothServiceViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothServiceViewModel.kt
deleted file mode 100644
index ec7e7bb66..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothServiceViewModel.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.bluetooth
-
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.bluetooth.Bluetooth
-import com.splendo.kaluga.bluetooth.Service
-import com.splendo.kaluga.bluetooth.UUID
-import com.splendo.kaluga.bluetooth.characteristics
-import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.bluetooth.get
-import com.splendo.kaluga.bluetooth.services
-import com.splendo.kaluga.bluetooth.uuidString
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-
-class BluetoothServiceViewModel(private val bluetooth: Bluetooth, private val deviceIdentifier: Identifier, private val serviceUUID: UUID) : BaseLifecycleViewModel() {
-
-    private val service: Flow<Service?> get() = bluetooth.devices()[deviceIdentifier].services()[serviceUUID]
-
-    val uuid = serviceUUID.uuidString
-    private val _characteristics = MutableStateFlow(emptyList<BluetoothCharacteristicViewModel>())
-    val characteristics = _characteristics.toInitializedObservable(coroutineScope)
-
-    override fun onResume(scope: CoroutineScope) {
-        super.onResume(scope)
-
-        scope.launch {
-            service.characteristics().map { characteristics -> characteristics.map { BluetoothCharacteristicViewModel(bluetooth, deviceIdentifier, serviceUUID, it.uuid) } }.collect {
-                cleanCharacteristics()
-                _characteristics.value = it
-            }
-        }
-    }
-
-    public override fun onCleared() {
-        super.onCleared()
-        cleanCharacteristics()
-    }
-
-    private fun cleanCharacteristics() {
-        _characteristics.value.forEach { it.onCleared() }
-    }
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
deleted file mode 100644
index 0a72e95f4..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.splendo.kaluga.example.shared.viewmodel.datetimepicker
-
-import com.splendo.kaluga.architecture.observable.toUninitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.base.text.DateFormatStyle
-import com.splendo.kaluga.base.text.KalugaDateFormatter
-import com.splendo.kaluga.base.utils.DefaultKalugaDate
-import com.splendo.kaluga.datetimepicker.DateTimePickerPresenter
-import com.splendo.kaluga.datetimepicker.buildDatePicker
-import com.splendo.kaluga.datetimepicker.buildTimePicker
-import com.splendo.kaluga.resources.localized
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-
-class DateTimePickerViewModel(val dateTimePickerPresenterBuilder: DateTimePickerPresenter.Builder) : BaseLifecycleViewModel() {
-
-    companion object {
-        private val formatter = KalugaDateFormatter.dateTimeFormat(DateFormatStyle.Long, DateFormatStyle.Long)
-    }
-
-    private val selectedDate = MutableStateFlow(
-        DefaultKalugaDate.now().apply {
-            second = 0
-            millisecond = 0
-        }
-    )
-    val dateLabel = selectedDate.map { formatter.format(it) }.toUninitializedObservable(coroutineScope)
-
-    fun onSelectDatePressed() {
-        coroutineScope.launch {
-            dateTimePickerPresenterBuilder.buildDatePicker(
-                this,
-                DefaultKalugaDate.epoch(),
-                DefaultKalugaDate.now()
-            ) {
-                setSelectedDate(this@DateTimePickerViewModel.selectedDate.value)
-                setCancelButtonTitle("cancel_selection".localized())
-                setConfirmButtonTitle("confirm_selection".localized())
-            }.show()?.let {
-                selectedDate.value = it
-            }
-        }
-    }
-
-    fun onSelectTimePressed() {
-        coroutineScope.launch {
-            dateTimePickerPresenterBuilder.buildTimePicker(this) {
-                setSelectedDate(this@DateTimePickerViewModel.selectedDate.value)
-                setCancelButtonTitle("cancel_selection".localized())
-                setConfirmButtonTitle("confirm_selection".localized())
-            }.show()?.let {
-                selectedDate.value = it
-            }
-        }
-    }
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
deleted file mode 100644
index 08f4211b8..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.featureList
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-sealed class FeatureListNavigationAction : NavigationAction<Nothing>(null) {
-    object Location : FeatureListNavigationAction()
-    object Permissions : FeatureListNavigationAction()
-    object Alerts : FeatureListNavigationAction()
-    object DateTimePicker : FeatureListNavigationAction()
-    object LoadingIndicator : FeatureListNavigationAction()
-    object Architecture : FeatureListNavigationAction()
-    object Bluetooth : FeatureListNavigationAction()
-    object Keyboard : FeatureListNavigationAction()
-    object Links : FeatureListNavigationAction()
-    object System : FeatureListNavigationAction()
-    object Beacons : FeatureListNavigationAction()
-    object Resources : FeatureListNavigationAction()
-    object PlatformSpecific : FeatureListNavigationAction()
-}
-
-sealed class Feature(val title: String) {
-    object Alerts : Feature("feature_alerts".localized())
-    object Architecture : Feature("feature_architecture".localized())
-    object Bluetooth : Feature("feature_bluetooth".localized())
-    object DateTimePicker : Feature("feature_date_time_picker".localized())
-    object Keyboard : Feature("feature_keyboard".localized())
-    object LoadingIndicator : Feature("feature_hud".localized())
-    object Location : Feature("feature_location".localized())
-    object Permissions : Feature("feature_permissions".localized())
-    object Links : Feature("feature_links".localized())
-    object System : Feature("feature_system".localized())
-    object Beacons : Feature("feature_beacons".localized())
-    object Resource : Feature("feature_resources".localized())
-    object PlatformSpecific : Feature("feature_platform_specific".localized())
-}
-
-class FeatureListViewModel(navigator: Navigator<FeatureListNavigationAction>) : NavigatingViewModel<FeatureListNavigationAction>(navigator) {
-
-    val feature = observableOf(
-        listOfNotNull(
-            Feature.Alerts,
-            Feature.Architecture,
-            Feature.Bluetooth,
-            Feature.DateTimePicker,
-            Feature.Keyboard,
-            Feature.Links,
-            Feature.LoadingIndicator,
-            Feature.Location,
-            Feature.Permissions,
-            Feature.System,
-            Feature.Beacons,
-            Feature.Resource,
-            Feature.PlatformSpecific.takeIf { showPlatformSpecificFeatures }
-        )
-    )
-
-    fun onFeaturePressed(feature: Feature) {
-        navigator.navigate(
-            when (feature) {
-                is Feature.Alerts -> FeatureListNavigationAction.Alerts
-                is Feature.Architecture -> FeatureListNavigationAction.Architecture
-                is Feature.Bluetooth -> FeatureListNavigationAction.Bluetooth
-                is Feature.DateTimePicker -> FeatureListNavigationAction.DateTimePicker
-                is Feature.Keyboard -> FeatureListNavigationAction.Keyboard
-                is Feature.Links -> FeatureListNavigationAction.Links
-                is Feature.LoadingIndicator -> FeatureListNavigationAction.LoadingIndicator
-                is Feature.Location -> FeatureListNavigationAction.Location
-                is Feature.Permissions -> FeatureListNavigationAction.Permissions
-                is Feature.System -> FeatureListNavigationAction.System
-                is Feature.Beacons -> FeatureListNavigationAction.Beacons
-                is Feature.Resource -> FeatureListNavigationAction.Resources
-                is Feature.PlatformSpecific -> FeatureListNavigationAction.PlatformSpecific
-            }
-        )
-    }
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
deleted file mode 100644
index 3852fd997..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.featureList
-
-expect val showPlatformSpecificFeatures: Boolean
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
deleted file mode 100644
index c177e9aa4..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.keyboard
-
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.keyboard.BaseKeyboardManager
-import com.splendo.kaluga.keyboard.FocusHandler
-
-class KeyboardViewModel(keyboardManagerBuilder: BaseKeyboardManager.Builder, private val editFieldFocusHandler: FocusHandler) : BaseLifecycleViewModel() {
-
-    private val keyboardManager: BaseKeyboardManager = keyboardManagerBuilder.create(coroutineScope)
-
-    fun onShowPressed() {
-        keyboardManager.show(editFieldFocusHandler)
-    }
-
-    fun onHidePressed() {
-        keyboardManager.hide()
-    }
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
deleted file mode 100644
index 82651eee9..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.resources
-
-import com.splendo.kaluga.alerts.AlertPresenter
-import com.splendo.kaluga.alerts.buildAlert
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.example.shared.stylable.ButtonStyles
-import com.splendo.kaluga.resources.StringStyleAttribute
-import com.splendo.kaluga.resources.StyledStringBuilder
-import com.splendo.kaluga.resources.stylable.ButtonStyle
-import com.splendo.kaluga.resources.styled
-import com.splendo.kaluga.resources.view.KalugaButton
-import kotlinx.coroutines.launch
-
-class ButtonViewModel(
-    styledStringBuilderProvider: StyledStringBuilder.Provider,
-    val alertPresenterBuilder: AlertPresenter.Builder
-) : BaseLifecycleViewModel() {
-
-    val buttons = observableOf(
-        listOf(
-            "Text Button".toButton(ButtonStyles.textButton),
-            "Red Button".toButton(ButtonStyles.redButton),
-            "Rounded Button".toButton(ButtonStyles.roundedButton),
-            "Oval Button".toButton(ButtonStyles.ovalButton),
-            "Stroke Button".toButton(ButtonStyles.redButtonWithStroke),
-            "Rounded Stroke Button".toButton(ButtonStyles.roundedButtonWithStroke),
-            "Oval Stroke Button".toButton(ButtonStyles.ovalButtonWithStroke),
-            "Linear Gradient Button".toButton(ButtonStyles.linearGradientButton),
-            "Radial Gradient Button".toButton(ButtonStyles.radialGradientButton),
-            "Angular Gradient Button".toButton(ButtonStyles.angularGradientButton),
-            "Disabled Button".toButton(ButtonStyles.redButton, false),
-            listOf(
-                KalugaButton.Styled(
-                    "Styled Button".styled(
-                        styledStringBuilderProvider,
-                        ButtonStyles.textButton.getStateTextStyle(
-                            isEnabled = true,
-                            isPressed = false
-                        ),
-                        StringStyleAttribute.CharacterStyleAttribute.Strikethrough
-                    ),
-                    ButtonStyles.textButton
-                ) {
-                    showAlert("Styled Button")
-                }
-            )
-        ).flatten()
-    )
-
-    private fun showAlert(message: String) {
-        coroutineScope.launch {
-            alertPresenterBuilder.buildAlert(this) {
-                setTitle("Button Pressed")
-                setMessage(message)
-                setNeutralButton("Ok")
-            }.show()
-        }
-    }
-
-    private fun String.toButton(
-        style: ButtonStyle,
-        isEnabled: Boolean = true
-    ): List<KalugaButton.Plain> = listOf(
-        KalugaButton.Plain(this, style, isEnabled) {
-            showAlert(this)
-        }
-    )
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
deleted file mode 100644
index bf184ac0f..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.resources
-
-import com.splendo.kaluga.alerts.Alert
-import com.splendo.kaluga.alerts.AlertPresenter
-import com.splendo.kaluga.alerts.buildActionSheet
-import com.splendo.kaluga.alerts.buildAlert
-import com.splendo.kaluga.architecture.observable.InitializedObservable
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.example.shared.stylable.ButtonStyles
-import com.splendo.kaluga.resources.DefaultColors
-import com.splendo.kaluga.resources.KalugaColor
-import com.splendo.kaluga.resources.burn
-import com.splendo.kaluga.resources.colorBlend
-import com.splendo.kaluga.resources.colorFrom
-import com.splendo.kaluga.resources.darken
-import com.splendo.kaluga.resources.darkenBy
-import com.splendo.kaluga.resources.difference
-import com.splendo.kaluga.resources.dodge
-import com.splendo.kaluga.resources.exclude
-import com.splendo.kaluga.resources.hardLight
-import com.splendo.kaluga.resources.hexString
-import com.splendo.kaluga.resources.hue
-import com.splendo.kaluga.resources.lighten
-import com.splendo.kaluga.resources.lightenBy
-import com.splendo.kaluga.resources.luminate
-import com.splendo.kaluga.resources.multiply
-import com.splendo.kaluga.resources.normal
-import com.splendo.kaluga.resources.overlay
-import com.splendo.kaluga.resources.saturate
-import com.splendo.kaluga.resources.screen
-import com.splendo.kaluga.resources.softLight
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
-import com.splendo.kaluga.resources.view.KalugaButton
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
-
-enum class SelectableBlendMode {
-    NORMAL,
-    MULTIPLY,
-    SCREEN,
-    OVERLAY,
-    DARKEN,
-    LIGHTEN,
-    HARD_LIGHT,
-    SOFT_LIGHT,
-    DODGE,
-    BURN,
-    DIFFERENCE,
-    EXCLUSION,
-    HUE,
-    SATURATION,
-    LUMINATE,
-    COLOR_BLEND;
-}
-
-class ColorViewModel(
-    val alertPresenterBuilder: AlertPresenter.Builder
-) : BaseLifecycleViewModel() {
-
-    private val backdropColor = MutableStateFlow(DefaultColors.mediumPurple)
-    private val sourceColor = MutableStateFlow(DefaultColors.darkCyan)
-    private val blendMode = MutableStateFlow(SelectableBlendMode.NORMAL)
-    private val blendedColor = combine(backdropColor, sourceColor, blendMode) { backdrop, source, blendMode ->
-        when (blendMode) {
-            SelectableBlendMode.NORMAL -> backdrop normal source
-            SelectableBlendMode.MULTIPLY -> backdrop multiply source
-            SelectableBlendMode.SCREEN -> backdrop screen source
-            SelectableBlendMode.OVERLAY -> backdrop overlay source
-            SelectableBlendMode.DARKEN -> backdrop darken source
-            SelectableBlendMode.LIGHTEN -> backdrop lighten source
-            SelectableBlendMode.HARD_LIGHT -> backdrop hardLight source
-            SelectableBlendMode.SOFT_LIGHT -> backdrop softLight source
-            SelectableBlendMode.DODGE -> backdrop dodge source
-            SelectableBlendMode.BURN -> backdrop burn source
-            SelectableBlendMode.DIFFERENCE -> backdrop difference source
-            SelectableBlendMode.EXCLUSION -> backdrop exclude source
-            SelectableBlendMode.HUE -> backdrop hue source
-            SelectableBlendMode.SATURATION -> backdrop saturate source
-            SelectableBlendMode.LUMINATE -> backdrop luminate source
-            SelectableBlendMode.COLOR_BLEND -> backdrop colorBlend source
-        }
-    }.stateIn(coroutineScope, SharingStarted.Lazily, DefaultColors.clear)
-
-    val backdropColorBackground = backdropColor.backgroundStyleObservable
-    val sourceColorBackground = sourceColor.backgroundStyleObservable
-    val blendedColorBackground = blendedColor.backgroundStyleObservable
-
-    val backdropText = backdropColor.map { it.hexString }.toInitializedObservable("", coroutineScope)
-    val sourceText = sourceColor.map { it.hexString }.toInitializedObservable("", coroutineScope)
-
-    val lightenBackdrops = backdropColor.lightenList()
-    val darkenBackdrops = backdropColor.darkenList()
-    val lightenSource = sourceColor.lightenList()
-    val darkenSource = sourceColor.darkenList()
-    val lightenBlended = blendedColor.lightenList()
-    val darkenBlended = blendedColor.darkenList()
-
-    private val steps = (1..10).map { it.toDouble() / 10.0 }
-    private fun Flow<KalugaColor>.lightenList() = map { color ->
-        steps.map {
-            BackgroundStyle(
-                BackgroundStyle.FillStyle.Solid(color.lightenBy(it))
-            )
-        }
-    }.toInitializedObservable(emptyList(), coroutineScope)
-    private fun Flow<KalugaColor>.darkenList() = map { color ->
-        steps.map {
-            BackgroundStyle(
-                BackgroundStyle.FillStyle.Solid(color.darkenBy(it))
-            )
-        }
-    }.toInitializedObservable(emptyList(), coroutineScope)
-
-    fun submitBackdropText(backdropText: String) {
-        submitColorText(backdropText) {
-            backdropColor.value = it
-        }
-    }
-
-    fun submitSourceText(sourceText: String) {
-        submitColorText(sourceText) {
-            sourceColor.value = it
-        }
-    }
-
-    val blendModeButton = blendMode.map { currentlySelectedBlendMode ->
-        KalugaButton.Plain(
-            currentlySelectedBlendMode.name,
-            ButtonStyles.redButton
-        ) {
-            alertPresenterBuilder.buildActionSheet(coroutineScope) {
-                addActions(
-                    SelectableBlendMode.values().map { selectableBlendMode ->
-                        Alert.Action(selectableBlendMode.name) {
-                            blendMode.value = selectableBlendMode
-                        }
-                    }
-                )
-            }.showAsync()
-        }
-    }.toInitializedObservable<KalugaButton>(KalugaButton.Plain("", ButtonStyles.redButton, false) {}, coroutineScope)
-
-    val flipButton: KalugaButton = KalugaButton.Plain(
-        "Flip",
-        ButtonStyles.textButton
-    ) {
-        val sourceColor = sourceColor.value
-        this.sourceColor.value = backdropColor.value
-        backdropColor.value = sourceColor
-    }
-
-    private fun submitColorText(colorText: String, onColorParsed: (KalugaColor) -> Unit) {
-        colorFrom(colorText)?.let { onColorParsed(it) } ?: run {
-            coroutineScope.launch {
-                alertPresenterBuilder.buildAlert(coroutineScope) {
-                    setTitle("Invalid color")
-                    setMessage("The text submitted is not a color")
-                    setNeutralButton("OK")
-                }.show()
-            }
-        }
-    }
-
-    private val Flow<KalugaColor>.backgroundStyleObservable: InitializedObservable<BackgroundStyle> get() = map {
-        BackgroundStyle(
-            BackgroundStyle.FillStyle.Solid(it)
-        )
-    }.toInitializedObservable(BackgroundStyle(BackgroundStyle.FillStyle.Solid(DefaultColors.clear)), coroutineScope)
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
deleted file mode 100644
index 1e8fda99b..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.resources
-
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.example.shared.stylable.TextStyles
-import com.splendo.kaluga.resources.DefaultColors
-import com.splendo.kaluga.resources.StringStyleAttribute
-import com.splendo.kaluga.resources.StyledStringBuilder
-import com.splendo.kaluga.resources.attributeSubstring
-import com.splendo.kaluga.resources.defaultBoldFont
-import com.splendo.kaluga.resources.stylable.TextAlignment
-import com.splendo.kaluga.resources.styled
-import com.splendo.kaluga.resources.view.KalugaLabel
-
-class LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider) : BaseLifecycleViewModel() {
-
-    companion object {
-        val loremIpsumParagraph0 = listOf(
-            "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
-            "Etiam et est quis lectus bibendum tempor.",
-            "Interdum et malesuada fames ac ante ipsum primis in faucibus.",
-            "Donec convallis metus efficitur mattis accumsan.",
-            "Pellentesque efficitur elit felis, vitae dictum sem vehicula eu.",
-            "In hac habitasse platea dictumst. Donec sollicitudin eleifend dui, sit amet viverra ex sollicitudin nec.",
-            "Sed at faucibus orci.",
-            "Vivamus ultricies purus eu nisi blandit, nec ullamcorper felis facilisis.",
-            "Duis accumsan dolor dignissim massa malesuada, in blandit sapien vestibulum."
-        ).joinToString(" ")
-        val loremIpsumParagraph1 = listOf(
-            "Duis eget leo commodo, consequat felis sed, vehicula justo.",
-            "Morbi facilisis facilisis varius.",
-            "Donec efficitur pretium pharetra.",
-            "Praesent ut lorem commodo, efficitur lectus quis, dapibus augue.",
-            "Quisque sed maximus quam.",
-            "Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Suspendisse ullamcorper, augue id blandit lobortis, arcu enim pellentesque felis, quis ultrices urna nibh et nibh.",
-            "Donec et velit faucibus, luctus massa congue, ornare odio.",
-            "Vestibulum interdum nec metus at eleifend.",
-            "Mauris finibus magna eu dolor dignissim elementum at vitae enim.",
-            "Nunc posuere, enim eu hendrerit volutpat, sapien lacus blandit dolor, eu faucibus nisl ex sed enim.",
-            "Praesent in ligula eu nulla semper posuere sollicitudin et nunc."
-        ).joinToString(" ")
-        val loremIpsumParagraph2 = listOf(
-            "Aenean eget quam eu diam volutpat tincidunt.",
-            "Pellentesque maximus tristique mi, eget pellentesque risus volutpat et.",
-            "Duis id ultrices mi.",
-            "Praesent nec orci at nisl pulvinar lobortis ut sit amet purus.",
-            "In id fermentum mi.",
-            "Nunc vel nunc nisi.",
-            "Vestibulum malesuada ultricies dui a blandit."
-        ).joinToString(" ")
-        val loremIpsum = listOf(loremIpsumParagraph0, loremIpsumParagraph1, loremIpsumParagraph2).joinToString("\n")
-    }
-
-    val labels = observableOf(
-        listOf(
-            KalugaLabel.Plain("Default Text", TextStyles.defaultText),
-            KalugaLabel.Plain("Title Text", TextStyles.defaultTitle),
-            KalugaLabel.Plain("Bold Text", TextStyles.defaultBoldText),
-            KalugaLabel.Plain("Italic Text", TextStyles.defaultItalicText),
-            KalugaLabel.Plain("Monospace Text", TextStyles.defaultMonospaceText),
-            KalugaLabel.Plain("Red Text", TextStyles.redText),
-            KalugaLabel.Plain("Opposite Aligned Text", TextStyles.oppositeText),
-            KalugaLabel.Styled("Foreground Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, StringStyleAttribute.CharacterStyleAttribute.ForegroundColor(DefaultColors.deepSkyBlue))),
-            KalugaLabel.Styled("Background Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, StringStyleAttribute.CharacterStyleAttribute.BackgroundColor(DefaultColors.deepSkyBlue))),
-            KalugaLabel.Styled("Partial Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.TextStyle(TextStyles.redText), IntRange(0, 13)) })),
-            KalugaLabel.Styled("Font Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Font(defaultBoldFont, 12.0f), IntRange(0, 10)) })),
-            KalugaLabel.Styled("Stroke Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Stroke(2.0f, DefaultColors.limeGreen), IntRange(0, 12)) })),
-            KalugaLabel.Styled("Subscript Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.SubScript, IntRange(0, 15)) })),
-            KalugaLabel.Styled("Superscript Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.SuperScript, IntRange(0, 17)) })),
-            KalugaLabel.Styled("Shadow Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Shadow(DefaultColors.dimGray, 2.0f, 2.0f, 5.0f), IntRange(0, 12)) })),
-            KalugaLabel.Styled("Kerning Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Kerning(0.08f), IntRange(0, 13)) })),
-            KalugaLabel.Styled("Underline Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Underline, IntRange(0, 15)) })),
-            KalugaLabel.Styled("Strikethrough Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, { Pair(StringStyleAttribute.CharacterStyleAttribute.Strikethrough, IntRange(0, 20)) })),
-            KalugaLabel.Styled("Link Styled text".styled(styledStringBuilderProvider, TextStyles.defaultText, DefaultColors.limeGreen, { Pair(StringStyleAttribute.Link("https://kaluga.splendo.com"), IntRange(0, 10)) })),
-            KalugaLabel.Styled(loremIpsum.styled(styledStringBuilderProvider, TextStyles.defaultText, StringStyleAttribute.ParagraphStyleAttribute.LineSpacing(5.0f, 10.0f, 6.0f))),
-            KalugaLabel.Styled(
-                loremIpsum.styled(
-                    styledStringBuilderProvider,
-                    TextStyles.defaultText,
-                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.LeadingIndent(10.0f)) }
-                ),
-            ),
-            KalugaLabel.Styled(
-                loremIpsum.styled(
-                    styledStringBuilderProvider,
-                    TextStyles.defaultText,
-                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.Alignment(TextAlignment.END)) }
-                ),
-            ),
-            KalugaLabel.Styled(
-                loremIpsum.styled(
-                    styledStringBuilderProvider,
-                    TextStyles.defaultText,
-                    { attributeSubstring(this, StringStyleAttribute.ParagraphStyleAttribute.LineSpacing(2.0f, 4.0f, 1.0f)) },
-                    { attributeSubstring(loremIpsumParagraph0, StringStyleAttribute.CharacterStyleAttribute.BackgroundColor(DefaultColors.deepSkyBlue)) },
-                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.LeadingIndent(10.0f)) },
-                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.Alignment(TextAlignment.END)) },
-                    { attributeSubstring(loremIpsumParagraph2, StringStyleAttribute.CharacterStyleAttribute.Kerning(0.08f)) }
-                ),
-            )
-        )
-    )
-}
diff --git a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt b/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt
deleted file mode 100644
index 7162feb76..000000000
--- a/newexample/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.splendo.kaluga.example.shared.viewmodel.resources
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-sealed class ResourcesListNavigationAction : NavigationAction<Nothing>(null) {
-
-    object Color : ResourcesListNavigationAction()
-    object Button : ResourcesListNavigationAction()
-    object Label : ResourcesListNavigationAction()
-}
-
-enum class Resource(private val titleKey: String) {
-    COLOR("feature_resources_color"),
-    BUTTON("feature_resources_button"),
-    LABEL("feature_resources_label");
-
-    val title: String get() = titleKey.localized()
-}
-
-class ResourcesListViewModel(navigator: Navigator<ResourcesListNavigationAction>) : NavigatingViewModel<ResourcesListNavigationAction>(navigator) {
-
-    val resources = observableOf(Resource.values().toList())
-
-    fun onResourceSelected(resource: Resource) {
-        navigator.navigate(
-            when (resource) {
-                Resource.COLOR -> ResourcesListNavigationAction.Color
-                Resource.BUTTON -> ResourcesListNavigationAction.Button
-                Resource.LABEL -> ResourcesListNavigationAction.Label
-            }
-        )
-    }
-}
diff --git a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
deleted file mode 100644
index f00fd3397..000000000
--- a/newexample/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.featureList
-
-actual val showPlatformSpecificFeatures: Boolean = false
diff --git a/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
deleted file mode 100644
index f00fd3397..000000000
--- a/newexample/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.featureList
-
-actual val showPlatformSpecificFeatures: Boolean = false
diff --git a/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
deleted file mode 100644
index f00fd3397..000000000
--- a/newexample/shared/src/jvmMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.featureList
-
-actual val showPlatformSpecificFeatures: Boolean = false

From f4c677a5b25a4acd4154b6411439a3d9afc84ef1 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 16 Nov 2022 17:44:10 +0100
Subject: [PATCH 030/227] Fix for iOS

---
 .../system/network/NetworkManager.kt          | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
index 6db6c4028..0cb610db7 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
+++ b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
@@ -25,6 +25,7 @@ import kotlinx.cinterop.alloc
 import kotlinx.cinterop.asStableRef
 import kotlinx.cinterop.nativeHeap
 import kotlinx.cinterop.ptr
+import kotlinx.cinterop.reinterpret
 import kotlinx.cinterop.staticCFunction
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
@@ -57,7 +58,16 @@ import platform.SystemConfiguration.SCNetworkReachabilitySetCallback
 import platform.SystemConfiguration.SCNetworkReachabilitySetDispatchQueue
 import platform.SystemConfiguration.kSCNetworkReachabilityFlagsIsWWAN
 import platform.SystemConfiguration.kSCNetworkReachabilityFlagsReachable
+import platform.darwin.DISPATCH_QUEUE_PRIORITY_DEFAULT
+import platform.darwin.DISPATCH_QUEUE_SERIAL
+import platform.darwin.DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL
 import platform.darwin.dispatch_get_main_queue
+import platform.darwin.dispatch_qos_class_t
+import platform.darwin.dispatch_queue_attr_make_with_qos_class
+import platform.darwin.dispatch_queue_attr_tVar
+import platform.darwin.dispatch_queue_create
+import platform.darwin.dispatch_queue_serial_t
+import platform.posix.QOS_CLASS_UTILITY
 
 actual class DefaultNetworkManager internal constructor(
     private val appleNetworkManager: AppleNetworkManager
@@ -84,20 +94,24 @@ actual class DefaultNetworkManager internal constructor(
 
         private val networkChannel = Channel<NetworkConnectionType>(Channel.UNLIMITED)
         override val network: Flow<NetworkConnectionType> = networkChannel.receiveAsFlow()
+        private val networkMonitor = object : nw_path_monitor_update_handler_t {
+            override fun invoke(network: nw_path_t) {
+                checkReachability(network)
+            }
+        }
         private val nwPathMonitor: nw_path_monitor_t = nw_path_monitor_create().apply {
+            val queue = dispatch_queue_create("com.splendo.kaluga.system.network", dispatch_queue_attr_make_with_qos_class(
+                null,
+                QOS_CLASS_UTILITY,
+                DISPATCH_QUEUE_PRIORITY_DEFAULT
+            ))
             nw_path_monitor_set_queue(
                 this,
-                dispatch_get_main_queue()
+                queue
             )
             nw_path_monitor_set_update_handler(this, networkMonitor)
         }
 
-        private val networkMonitor = object : nw_path_monitor_update_handler_t {
-            override fun invoke(network: nw_path_t) {
-                checkReachability(network)
-            }
-        }
-
         override suspend fun startMonitoring() {
             nw_path_monitor_start(nwPathMonitor)
         }

From 4f0c903bb1da9fa4a14017e1bdfff0b4f580ef11 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 18 Nov 2022 11:39:24 +0100
Subject: [PATCH 031/227] PR remarks

---
 DEVELOP.md                                    | 18 ++++----
 alerts/build.gradle.kts                       |  4 +-
 architecture-compose/build.gradle.kts         |  6 +--
 architecture/build.gradle.kts                 | 20 +++------
 base-permissions/build.gradle.kts             |  2 -
 base/build.gradle.kts                         | 11 ++---
 bluetooth/build.gradle.kts                    |  4 +-
 build.gradle.kts                              |  6 ---
 calendar-permissions/build.gradle.kts         |  2 -
 hud/build.gradle.kts                          |  4 +-
 kaluga-library-components/settings/gradle.kts | 30 -------------
 .../src/main/kotlin/AndroidCommon.kt          | 42 +++++++++----------
 .../src/main/kotlin/AndroidCompose.kt         | 10 ++---
 .../src/main/kotlin/Component.kt              | 14 +++----
 .../src/main/kotlin/Dependencies.kt           | 14 +++----
 .../src/main/kotlin/Library.kt                |  3 ++
 keyboard-compose/build.gradle.kts             |  6 +--
 links/build.gradle.kts                        |  2 +-
 location-permissions/build.gradle.kts         |  2 +-
 location/build.gradle.kts                     |  4 +-
 logging/build.gradle.kts                      |  8 ++--
 resources-compose/build.gradle.kts            | 10 ++---
 resources/build.gradle.kts                    |  4 +-
 review/build.gradle.kts                       |  4 +-
 scientific/build.gradle.kts                   |  4 +-
 test-utils-base/build.gradle.kts              | 10 ++---
 test-utils-koin/build.gradle.kts              |  3 +-
 27 files changed, 99 insertions(+), 148 deletions(-)

diff --git a/DEVELOP.md b/DEVELOP.md
index fdca1ea6f..e454f6ce3 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -1,6 +1,6 @@
 ## Build instructions
 
-This project uses Android Studio. You might need a canary version at times. Check [gradle/ext.gradle](gradle/ext.gradle.kts) to see which Android gradle plugin is used, as this determines compatability with Android Studio versions. You can check the [Android Gradle plugin release notes](https://developer.android.com/studio/releases/gradle-plugin), the [Android Studio release notes](https://developer.android.com/studio/releases) and the [Android Studio Preview Release Updates](https://androidstudio.googleblog.com/) pages to see which version to use.
+This project uses Android Studio. You might need a canary version at times. Check [`kaluga.androidGradlePluginVersion` in gradle.properties](gradle.properties) to see which Android gradle plugin is used, as this determines compatability with Android Studio versions. You can check the [Android Gradle plugin release notes](https://developer.android.com/studio/releases/gradle-plugin), the [Android Studio release notes](https://developer.android.com/studio/releases) and the [Android Studio Preview Release Updates](https://androidstudio.googleblog.com/) pages to see which version to use.
 
 You can also check the Kotlin version, and if needed align this with the Kotlin plugin version for Android Studio under `Android Studio` -> `Preferences` -> `Languages & Frameworks` -> `Kotlin`.
 
@@ -20,7 +20,7 @@ If a purely common test does not work, you can make the test's class `open` or `
 
 By extending `BaseTest` you can avoid a lot of boilerplate to make tests behave cross-platform (e.g. enableing the coroutines debugger).
 
-There are specialized test classes in the [`test-utils`](test-utils/) module, e.g. for testings `Flows`, `ViewModel`s etc. 
+There are specialized test classes in the [`test-utils`](test-utils/) modules, e.g. for testings `Flows`, `ViewModel`s etc. 
 
 ### Android tests
 
@@ -39,7 +39,7 @@ Make sure you have the Simulator setup with a working target device. For now you
 
 The `ioTest` task supports the `--tests` flag like other Gradle tasks to filter which tests to run.
 
-Note that for kaluga iOS tests run on a background thread, in order to have a properly working Main dispatchers (and align better with Android). How this works is described in [`test-utils`](test-utils/)
+Note that for kaluga iOS tests run on a background thread, in order to have a properly working Main dispatchers (and align better with Android). How this works is described in [`test-utils-base`](test-utils-base/)
 
 ## Architecture
 
@@ -84,14 +84,14 @@ If you want to publish with a specific version string, you can override this val
 kaluga.libraryVersion=0.1.0-special-build
 ```
 
-if this property is not set the version string is a combination of the version number, the current git branch (unless that branch is `master`, `main` or `develop`) and `-SNAPSHOT` (unless the `MAVEN_CENTRAL_RELEASE` environment variable is set to `true`). The exact implementation of this can be found in [gradle/gitBranch.gradle.kts](gradle/gitBranch.gradle.kts).
+if this property is not set the version string is a combination of the base version number defined in [kaluga-library-components/src/main/kotlin/Library](kaluga-library-components/src/main/kotlin/Library]), the current git branch (unless that branch is `master`, `main` or `develop`) and `-SNAPSHOT` (unless the `MAVEN_CENTRAL_RELEASE` environment variable is set to `true`). The exact implementation of this can be found in [kaluga-library-components/src/main/kotlin/GitBranch.kt](kaluga-library-components/src/main/kotlin/GitBranch.kt).
 
-For example if the version in `ext.gradle` is `1.1` and `feature/123_fix_bug` is the current branch the resulting version will be `1.1-feature-123_fix_bug-SNAPSHOT`.
+For example if the base version is `1.1` and `feature/123_fix_bug` is the current branch the resulting version will be `1.1-feature-123_fix_bug-SNAPSHOT`.
 
 #### Local Testing
 
 Before doing any publishing, make sure that changes are working with the one available in [Nexus Repository Manager](`oss.sonatype.org`).
-Just adding the following code inside the `local.properties` file you can test both Android and iOS example app in `kaluga/example/ios/Supporting\ Files`.
+Just adding the following code inside the `local.properties` file you can test both Android and iOS example app in `kaluga/example/`.
 ```
 kaluga.exampleEmbeddingMethod=composite
 kaluga.exampleMavenRepo=https://oss.sonatype.org/service/local/repositories/comsplendo-REPO_NUMBER/content/
@@ -133,10 +133,10 @@ Projects publishing to Sonatype's release repository need to be manually closed
 
 #### Increase version after publishing
 
-In case this has not been done yet, bump the version at [gradle/ext.gradle](gradle/ext.gradle.kts) in the `develop` branch to start the next development iteration.
+In case this has not been done yet, bump the base version at [kaluga-library-components/src/main/kotlin/Library](kaluga-library-components/src/main/kotlin/Library]) in the `develop` branch to start the next development iteration.
 
-```sh
-library_version = 'X.X.X'
+```kotlin
+private val baseVersion = "X.X.X"
 ```
 
 ## Code conventions
diff --git a/alerts/build.gradle.kts b/alerts/build.gradle.kts
index 09602afd9..f469ee5a7 100644
--- a/alerts/build.gradle.kts
+++ b/alerts/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
 }
 
 dependencies {
-    implement(Dependencies.AndroidX.Fragment)
-    implementForTest(Dependencies.AndroidX.FragmentKtx)
+    implementationDependency(Dependencies.AndroidX.Fragment)
+    testImplementationDependency(Dependencies.AndroidX.FragmentKtx)
 }
 
 publishableComponent()
diff --git a/architecture-compose/build.gradle.kts b/architecture-compose/build.gradle.kts
index 1b311bbdb..78a53fcfa 100644
--- a/architecture-compose/build.gradle.kts
+++ b/architecture-compose/build.gradle.kts
@@ -29,7 +29,7 @@ composeAndroidComponent()
 dependencies {
     api(project(":base"))
     api(project(":architecture"))
-    implement(Dependencies.AndroidX.Compose.Material)
-    implement(Dependencies.AndroidX.Navigation.Compose)
-    implement(Dependencies.KotlinX.Coroutines.Core)
+    implementationDependency(Dependencies.AndroidX.Compose.Material)
+    implementationDependency(Dependencies.AndroidX.Navigation.Compose)
+    implementationDependency(Dependencies.KotlinX.Coroutines.Core)
 }
diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts
index b539bf767..1a640ce64 100644
--- a/architecture/build.gradle.kts
+++ b/architecture/build.gradle.kts
@@ -10,28 +10,20 @@ plugins {
 publishableComponent()
 
 dependencies {
-    val ext = (gradle as ExtensionAware).extra
-    val kotlin_version: String by ext
-    val androidx_lifecycle_version: String by ext
-    val androidx_browser_version: String by ext
-
     api("org.jetbrains.kotlin:kotlin-reflect:${Library.kotlinVersion}")
-    expose(Dependencies.AndroidX.Lifecycle.Runtime)
-    expose(Dependencies.AndroidX.Lifecycle.ViewModel)
-    expose(Dependencies.AndroidX.Lifecycle.LiveData)
-    implement(Dependencies.AndroidX.Browser)
+    apiDependency(Dependencies.AndroidX.Lifecycle.Runtime)
+    apiDependency(Dependencies.AndroidX.Lifecycle.ViewModel)
+    apiDependency(Dependencies.AndroidX.Lifecycle.LiveData)
+    implementationDependency(Dependencies.AndroidX.Browser)
 }
 
 kotlin {
     sourceSets {
-        val ext = (gradle as ExtensionAware).extra
-        val serialization_version: String by ext
-
         getByName("commonMain") {
             dependencies {
                 implementation(project(":base", ""))
-                expose(Dependencies.KotlinX.Serialization.Core)
-                expose(Dependencies.KotlinX.Serialization.Json)
+                apiDependency(Dependencies.KotlinX.Serialization.Core)
+                apiDependency(Dependencies.KotlinX.Serialization.Json)
             }
         }
 
diff --git a/base-permissions/build.gradle.kts b/base-permissions/build.gradle.kts
index 23ee29621..3abc214e3 100644
--- a/base-permissions/build.gradle.kts
+++ b/base-permissions/build.gradle.kts
@@ -11,8 +11,6 @@ publishableComponent()
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
                 api(project(":logging", ""))
                 api(project(":base", ""))
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index f965cef72..3690f3367 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -10,16 +10,13 @@ publishableComponent()
 
 kotlin {
     sourceSets {
-
-        val ext = (gradle as ExtensionAware).extra
-
         getByName("commonMain") {
             dependencies {
                 implementation(project(":logging", ""))
-                expose(Dependencies.Stately.Common)
-                expose(Dependencies.Stately.Isolate)
-                expose(Dependencies.Stately.IsoCollections)
-                expose(Dependencies.Stately.Concurrency)
+                apiDependency(Dependencies.Stately.Common)
+                apiDependency(Dependencies.Stately.Isolate)
+                apiDependency(Dependencies.Stately.IsoCollections)
+                apiDependency(Dependencies.Stately.Concurrency)
             }
         }
         getByName("jsMain") {
diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts
index 837d47951..c4a447507 100644
--- a/bluetooth/build.gradle.kts
+++ b/bluetooth/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 publishableComponent()
 
 dependencies {
-    implement(Dependencies.BLEScanner)
+    implementationDependency(Dependencies.BLEScanner)
     implementation(project(":location", ""))
 }
 
@@ -18,7 +18,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":bluetooth-permissions", ""))
-                implement(Dependencies.Stately.Concurrency)
+                implementationDependency(Dependencies.Stately.Concurrency)
             }
         }
         commonTest {
diff --git a/build.gradle.kts b/build.gradle.kts
index 8c7ea7583..717388183 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,12 +24,6 @@ plugins {
     id("org.jetbrains.kotlinx.binary-compatibility-validator")
 }
 
-// TODO: To be removed once we will migrate to kotlin version 1.6.20
-// https://youtrack.jetbrains.com/issue/KT-49109#focus=Comments-27-5667134.0-0
-rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin>() {
-    rootProject.extensions.getByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java).nodeVersion = "16.13.2"
-}
-
 allprojects {
     repositories {
         mavenCentral()
diff --git a/calendar-permissions/build.gradle.kts b/calendar-permissions/build.gradle.kts
index cbf121810..e149787d0 100644
--- a/calendar-permissions/build.gradle.kts
+++ b/calendar-permissions/build.gradle.kts
@@ -11,8 +11,6 @@ publishableComponent()
 kotlin {
     sourceSets {
         getByName("commonMain") {
-            val ext = (gradle as ExtensionAware).extra
-
             dependencies {
                 api(project(":base-permissions", ""))
             }
diff --git a/hud/build.gradle.kts b/hud/build.gradle.kts
index bc017b374..3b0898e46 100644
--- a/hud/build.gradle.kts
+++ b/hud/build.gradle.kts
@@ -9,8 +9,8 @@ plugins {
 publishableComponent()
 
 dependencies {
-    implement(Dependencies.AndroidX.Fragment)
-    implementForDebug(Dependencies.AndroidX.FragmentKtx)
+    implementationDependency(Dependencies.AndroidX.Fragment)
+    debugImplementationDependency(Dependencies.AndroidX.FragmentKtx)
 }
 
 kotlin {
diff --git a/kaluga-library-components/settings/gradle.kts b/kaluga-library-components/settings/gradle.kts
index 39e6b7b2a..ac8878b62 100644
--- a/kaluga-library-components/settings/gradle.kts
+++ b/kaluga-library-components/settings/gradle.kts
@@ -21,34 +21,4 @@ pluginManagement {
         gradlePluginPortal()
         google()
     }
-
-    // resolutionStrategy {
-    //     eachPlugin {
-    //
-    //         val kalugaAndroidGradlePluginVersion =
-    //             settings.extra["kaluga.androidGradlePluginVersion"]
-    //         val kalugaKotlinVersion = settings.extra["kaluga.kotlinVersion"]
-    //         val kalugaKtLintGradlePluginVersion = settings.extra["kaluga.ktLintGradlePluginVersion"]
-    //         val kalugaGoogleServicesGradlePluginVersion = settings.extra["kaluga.googleServicesGradlePluginVersion"]
-    //         val kalugaBinaryCompatibilityValidatorVersion = settings.extra["kaluga.binaryCompatibilityValidatorVersion"]
-    //
-    //         when (requested.id.id) {
-    //             "org.jetbrains.kotlin.multiplatform",
-    //             "org.jetbrains.kotlin.plugin.serialization",
-    //             "org.jetbrains.kotlin.android",
-    //             "org.jetbrains.kotlin.kapt",
-    //             -> useVersion("$kalugaKotlinVersion")
-    //             "com.android.library",
-    //             "com.android.application",
-    //             -> useVersion("$kalugaAndroidGradlePluginVersion")
-    //             "org.jlleitschuh.gradle.ktlint",
-    //             "org.jlleitschuh.gradle.ktlint-idea",
-    //             -> useVersion("$kalugaKtLintGradlePluginVersion")
-    //             "com.google.gms:google-services"
-    //             -> useVersion("com.google.gms:google-services:$kalugaGoogleServicesGradlePluginVersion")
-    //             "org.jetbrains.kotlinx.binary-compatibility-validator"
-    //             -> useVersion("$kalugaBinaryCompatibilityValidatorVersion")
-    //         }
-    //     }
-    // }
 }
diff --git a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
index 365e527c1..3691a83fd 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
@@ -25,27 +25,27 @@ fun org.gradle.api.Project.commonAndroidComponent(type: ComponentType = Componen
     }
 
     dependencies {
-        implement(Dependencies.KotlinX.Coroutines.Android)
-        implement(Dependencies.AndroidX.AppCompat)
-
-        implementForTest(Dependencies.JUnit)
-        implementForTest(Dependencies.Mockito.Core)
-        implementForTest(Dependencies.Kotlin.Test)
-        implementForTest(Dependencies.Kotlin.JUnit)
-
-        implementForAndroidTest(Dependencies.Mockito.Android)
-        implementForAndroidTest(Dependencies.ByteBuddy.Android)
-        implementForAndroidTest(Dependencies.ByteBuddy.Agent)
-
-        implementForAndroidTest(Dependencies.AndroidX.Test.Core)
-        implementForAndroidTest(Dependencies.AndroidX.Test.CoreKtx)
-        implementForAndroidTest(Dependencies.AndroidX.Test.UIAutomator)
-        implementForAndroidTest(Dependencies.AndroidX.Test.Rules)
-        implementForAndroidTest(Dependencies.AndroidX.Test.JUnit)
-        implementForAndroidTest(Dependencies.AndroidX.Test.Runner)
-        implementForAndroidTest(Dependencies.AndroidX.Test.Espresso)
-        implementForAndroidTest(Dependencies.Kotlin.Test)
-        implementForAndroidTest(Dependencies.Kotlin.JUnit)
+        implementationDependency(Dependencies.KotlinX.Coroutines.Android)
+        implementationDependency(Dependencies.AndroidX.AppCompat)
+
+        testImplementationDependency(Dependencies.JUnit)
+        testImplementationDependency(Dependencies.Mockito.Core)
+        testImplementationDependency(Dependencies.Kotlin.Test)
+        testImplementationDependency(Dependencies.Kotlin.JUnit)
+
+        androidTestImplementationDependency(Dependencies.Mockito.Android)
+        androidTestImplementationDependency(Dependencies.ByteBuddy.Android)
+        androidTestImplementationDependency(Dependencies.ByteBuddy.Agent)
+
+        androidTestImplementationDependency(Dependencies.AndroidX.Test.Core)
+        androidTestImplementationDependency(Dependencies.AndroidX.Test.CoreKtx)
+        androidTestImplementationDependency(Dependencies.AndroidX.Test.UIAutomator)
+        androidTestImplementationDependency(Dependencies.AndroidX.Test.Rules)
+        androidTestImplementationDependency(Dependencies.AndroidX.Test.JUnit)
+        androidTestImplementationDependency(Dependencies.AndroidX.Test.Runner)
+        androidTestImplementationDependency(Dependencies.AndroidX.Test.Espresso)
+        androidTestImplementationDependency(Dependencies.Kotlin.Test)
+        androidTestImplementationDependency(Dependencies.Kotlin.JUnit)
     }
 }
 
diff --git a/kaluga-library-components/src/main/kotlin/AndroidCompose.kt b/kaluga-library-components/src/main/kotlin/AndroidCompose.kt
index 2f3997033..1112b7c80 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidCompose.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidCompose.kt
@@ -22,11 +22,11 @@ fun org.gradle.api.Project.composeAndroidComponent(type: ComponentType.Compose =
     version = Library.version
     commonAndroidComponent(type)
     dependencies {
-        implement(Dependencies.AndroidX.Compose.Foundation)
-        implement(Dependencies.AndroidX.Compose.UI)
-        implement(Dependencies.AndroidX.Compose.UITooling)
-        implement(Dependencies.AndroidX.Lifecycle.ViewModelCompose)
-        implement(Dependencies.AndroidX.Activity.Compose)
+        implementationDependency(Dependencies.AndroidX.Compose.Foundation)
+        implementationDependency(Dependencies.AndroidX.Compose.UI)
+        implementationDependency(Dependencies.AndroidX.Compose.UITooling)
+        implementationDependency(Dependencies.AndroidX.Lifecycle.ViewModelCompose)
+        implementationDependency(Dependencies.AndroidX.Activity.Compose)
     }
 
     kotlinAndroid {
diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index f0899920e..3e49adf2e 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -125,7 +125,7 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Pr
 
     val commonMain = sourceSets.getByName("commonMain").apply {
         dependencies {
-            implement(Dependencies.KotlinX.Coroutines.Core)
+            implementationDependency(Dependencies.KotlinX.Coroutines.Core)
         }
     }
 
@@ -137,14 +137,14 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Pr
         }
     }
 
-    val jvmMain = sourceSets.getByName("jvmMain").apply {
+    sourceSets.getByName("jvmMain").apply {
         dependencies {
             implementation(kotlin("stdlib"))
-            implement(Dependencies.KotlinX.Coroutines.Swing)
+            implementationDependency(Dependencies.KotlinX.Coroutines.Swing)
         }
     }
 
-    val jvmTest = sourceSets.getByName("jvmTest").apply {
+    sourceSets.getByName("jvmTest").apply {
         dependsOn(commonTest)
         dependencies {
             implementation(kotlin("test"))
@@ -152,14 +152,14 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Pr
         }
     }
 
-    val jsMain = sourceSets.getByName("jsMain").apply {
+    sourceSets.getByName("jsMain").apply {
         dependencies {
             implementation(kotlin("stdlib-js"))
-            implement(Dependencies.KotlinX.Coroutines.Js)
+            implementationDependency(Dependencies.KotlinX.Coroutines.Js)
         }
     }
 
-    val jsTest = sourceSets.getByName("jsTest").apply {
+    sourceSets.getByName("jsTest").apply {
         dependencies {
             implementation(kotlin("test-js"))
         }
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index 9548006d6..1723996fc 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -22,22 +22,22 @@ data class Dependency(private val group: String, private val name: String, priva
     val notation = "$group:$name${version?.let { ":$it" } ?: ""}"
 }
 
-fun KotlinDependencyHandler.expose(dependency: Dependency) = api(dependency.notation)
-fun KotlinDependencyHandler.implement(dependency: Dependency) = implementation(dependency.notation)
+fun KotlinDependencyHandler.apiDependency(dependency: Dependency) = api(dependency.notation)
+fun KotlinDependencyHandler.implementationDependency(dependency: Dependency) = implementation(dependency.notation)
 
-fun DependencyHandler.expose(dependency: Dependency) {
+fun DependencyHandler.apiDependency(dependency: Dependency) {
     add("api", dependency.notation)
 }
-fun DependencyHandler.implement(dependency: Dependency) {
+fun DependencyHandler.implementationDependency(dependency: Dependency) {
     add("implementation", dependency.notation)
 }
-fun DependencyHandler.implementForDebug(dependency: Dependency) {
+fun DependencyHandler.debugImplementationDependency(dependency: Dependency) {
     add("debugImplementation", dependency.notation)
 }
-fun DependencyHandler.implementForTest(dependency: Dependency) {
+fun DependencyHandler.testImplementationDependency(dependency: Dependency) {
     add("testImplementation", dependency.notation)
 }
-fun DependencyHandler.implementForAndroidTest(dependency: Dependency) {
+fun DependencyHandler.androidTestImplementationDependency(dependency: Dependency) {
     add("androidTestImplementation", dependency.notation)
 }
 
diff --git a/kaluga-library-components/src/main/kotlin/Library.kt b/kaluga-library-components/src/main/kotlin/Library.kt
index 72556cc8b..9aaac8215 100644
--- a/kaluga-library-components/src/main/kotlin/Library.kt
+++ b/kaluga-library-components/src/main/kotlin/Library.kt
@@ -25,6 +25,9 @@ import java.io.IOException
 
 private val libraries: MutableMap<Project, Library> = mutableMapOf()
 
+/**
+ * Gets a [Library] for the [Project]. Only creates a new instance of the Library if none exist yet, to speed up the build process
+ */
 val Project.Library get() = libraries.getOrPut(this) { Library(this) }
 
 class Library(project: Project) {
diff --git a/keyboard-compose/build.gradle.kts b/keyboard-compose/build.gradle.kts
index 31e426241..d9d6d203f 100644
--- a/keyboard-compose/build.gradle.kts
+++ b/keyboard-compose/build.gradle.kts
@@ -11,7 +11,7 @@ composeAndroidComponent()
 dependencies {
     implementation(project(":base"))
     api(project(":keyboard"))
-    implement(Dependencies.AndroidX.Compose.UI)
-    implement(Dependencies.AndroidX.Compose.UITooling)
-    implement(Dependencies.KotlinX.Coroutines.Core)
+    implementationDependency(Dependencies.AndroidX.Compose.UI)
+    implementationDependency(Dependencies.AndroidX.Compose.UITooling)
+    implementationDependency(Dependencies.KotlinX.Coroutines.Core)
 }
diff --git a/links/build.gradle.kts b/links/build.gradle.kts
index 047717774..e89046cea 100644
--- a/links/build.gradle.kts
+++ b/links/build.gradle.kts
@@ -33,7 +33,7 @@ kotlin {
                 implementation(project(":base", ""))
                 implementation(project(":logging", ""))
                 implementation(project(":architecture", ""))
-                expose(Dependencies.KotlinX.Serialization.Core)
+                apiDependency(Dependencies.KotlinX.Serialization.Core)
             }
         }
         commonTest {
diff --git a/location-permissions/build.gradle.kts b/location-permissions/build.gradle.kts
index 83a274afd..961396e82 100644
--- a/location-permissions/build.gradle.kts
+++ b/location-permissions/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 publishableComponent()
 
 dependencies {
-    implement(Dependencies.Android.PlayServices.Location)
+    implementationDependency(Dependencies.Android.PlayServices.Location)
 }
 
 kotlin {
diff --git a/location/build.gradle.kts b/location/build.gradle.kts
index cd8654057..3ea167fac 100644
--- a/location/build.gradle.kts
+++ b/location/build.gradle.kts
@@ -9,8 +9,8 @@ plugins {
 publishableComponent()
 
 dependencies {
-    implement(Dependencies.Android.PlayServices.Location)
-    implement(Dependencies.KotlinX.Coroutines.PlayServices)
+    implementationDependency(Dependencies.Android.PlayServices.Location)
+    implementationDependency(Dependencies.KotlinX.Coroutines.PlayServices)
 }
 
 kotlin {
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
index b06cc6050..48f7cc9f0 100644
--- a/logging/build.gradle.kts
+++ b/logging/build.gradle.kts
@@ -12,14 +12,14 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implement(Dependencies.Napier)
-                implement(Dependencies.Stately.Concurrency)
+                implementationDependency(Dependencies.Napier)
+                implementationDependency(Dependencies.Stately.Concurrency)
             }
         }
         commonTest {
             dependencies {
-                implement(Dependencies.Stately.Isolate)
-                implement(Dependencies.Stately.IsoCollections)
+                implementationDependency(Dependencies.Stately.Isolate)
+                implementationDependency(Dependencies.Stately.IsoCollections)
                 api(project(":test-utils-base", ""))
             }
         }
diff --git a/resources-compose/build.gradle.kts b/resources-compose/build.gradle.kts
index ecc878677..aa6839737 100644
--- a/resources-compose/build.gradle.kts
+++ b/resources-compose/build.gradle.kts
@@ -28,9 +28,9 @@ composeAndroidComponent()
 dependencies {
     implementation(project(":base"))
     api(project(":resources"))
-    implement(Dependencies.AndroidX.Compose.Foundation)
-    implement(Dependencies.AndroidX.Compose.Material)
-    implement(Dependencies.AndroidX.Compose.UI)
-    implement(Dependencies.AndroidX.Compose.UITooling)
-    implement(Dependencies.KotlinX.Coroutines.Core)
+    implementationDependency(Dependencies.AndroidX.Compose.Foundation)
+    implementationDependency(Dependencies.AndroidX.Compose.Material)
+    implementationDependency(Dependencies.AndroidX.Compose.UI)
+    implementationDependency(Dependencies.AndroidX.Compose.UITooling)
+    implementationDependency(Dependencies.KotlinX.Coroutines.Core)
 }
diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts
index 309e4eb81..a0094f6f5 100644
--- a/resources/build.gradle.kts
+++ b/resources/build.gradle.kts
@@ -15,8 +15,8 @@ kotlin {
             dependencies {
                 implementation(project(":base", ""))
                 implementation(project(":logging", ""))
-                expose(Dependencies.KotlinX.Serialization.Core)
-                expose(Dependencies.KotlinX.Serialization.Json)
+                apiDependency(Dependencies.KotlinX.Serialization.Core)
+                apiDependency(Dependencies.KotlinX.Serialization.Json)
             }
         }
 
diff --git a/review/build.gradle.kts b/review/build.gradle.kts
index 5c3b98ab1..587f4033f 100644
--- a/review/build.gradle.kts
+++ b/review/build.gradle.kts
@@ -9,8 +9,8 @@ plugins {
 publishableComponent()
 
 dependencies {
-    implement(Dependencies.Android.Play.Core)
-    implement(Dependencies.Android.Play.CoreKtx)
+    implementationDependency(Dependencies.Android.Play.Core)
+    implementationDependency(Dependencies.Android.Play.CoreKtx)
 }
 
 kotlin {
diff --git a/scientific/build.gradle.kts b/scientific/build.gradle.kts
index 2cd1a9c5c..9aeceeeb9 100644
--- a/scientific/build.gradle.kts
+++ b/scientific/build.gradle.kts
@@ -14,8 +14,8 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(project(":base"))
-                expose(Dependencies.KotlinX.Serialization.Core)
-                expose(Dependencies.KotlinX.Serialization.Json)
+                apiDependency(Dependencies.KotlinX.Serialization.Core)
+                apiDependency(Dependencies.KotlinX.Serialization.Json)
             }
         }
         commonTest {
diff --git a/test-utils-base/build.gradle.kts b/test-utils-base/build.gradle.kts
index 4e93e3911..b030465c3 100644
--- a/test-utils-base/build.gradle.kts
+++ b/test-utils-base/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 publishableComponent()
 
 dependencies {
-    expose(Dependencies.AndroidX.ArchCore)
+    apiDependency(Dependencies.AndroidX.ArchCore)
 }
 
 kotlin {
@@ -38,8 +38,8 @@ kotlin {
 
         getByName("jvmMain") {
             dependencies {
-                expose(Dependencies.KotlinX.Coroutines.Test)
-                expose(Dependencies.KotlinX.Coroutines.Debug)
+                apiDependency(Dependencies.KotlinX.Coroutines.Test)
+                apiDependency(Dependencies.KotlinX.Coroutines.Debug)
             }
         }
     }
@@ -47,7 +47,7 @@ kotlin {
 
 android {
     dependencies {
-        expose(Dependencies.KotlinX.Coroutines.Test)
-        expose(Dependencies.KotlinX.Coroutines.Debug)
+        apiDependency(Dependencies.KotlinX.Coroutines.Test)
+        apiDependency(Dependencies.KotlinX.Coroutines.Debug)
     }
 }
diff --git a/test-utils-koin/build.gradle.kts b/test-utils-koin/build.gradle.kts
index 90c147628..a68d2b538 100644
--- a/test-utils-koin/build.gradle.kts
+++ b/test-utils-koin/build.gradle.kts
@@ -11,11 +11,10 @@ publishableComponent()
 kotlin {
     sourceSets {
         commonMain {
-            val ext = (gradle as ExtensionAware).extra
             dependencies {
                 api(project(":test-utils-base"))
                 api(project(":test-utils-architecture"))
-                expose(Dependencies.Koin.Core)
+                apiDependency(Dependencies.Koin.Core)
             }
         }
         commonTest {

From 580422e49bab638612507112f5c78c370715976b Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 18 Nov 2022 12:22:36 +0100
Subject: [PATCH 032/227] Lint Fixes

---
 example/android/build.gradle.kts                 |  3 +--
 .../architecture/ArchitectureDetailsActivity.kt  |  2 +-
 .../architecture/ArchitectureInputActivity.kt    |  1 -
 .../permissions/PermissionsDemoActivity.kt       |  8 --------
 .../platformspecific/PlatformSpecificActivity.kt |  6 ++----
 .../kaluga/example/system/NetworkActivity.kt     |  3 +--
 .../example/shared/di/DependencyInjection.kt     | 16 ++++++++--------
 .../bluetooth/BluetoothDeviceDetailViewModel.kt  |  2 --
 .../bluetooth/BluetoothListDeviceViewModel.kt    |  7 +++----
 .../shared/viewmodel/link/LinksViewModel.kt      |  5 -----
 .../example/shared/di/DependencyInjection.kt     |  4 ++--
 .../viewmodel/permissions/NotificationOptions.kt |  2 +-
 12 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/example/android/build.gradle.kts b/example/android/build.gradle.kts
index f412f6a3c..3f8678faf 100644
--- a/example/android/build.gradle.kts
+++ b/example/android/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-
 group = Library.group
 version = Library.version
 
@@ -96,4 +95,4 @@ dependencies {
 
     implementationDependency(Dependencies.KotlinX.Serialization.Core)
     implementationDependency(Dependencies.KotlinX.Serialization.Json)
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
index 58cffa8c6..241d9bb64 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
@@ -21,8 +21,8 @@ package com.splendo.kaluga.example.architecture
 import android.os.Bundle
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureDetailsBinding
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
index 3c131451e..6b9e74d07 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
@@ -25,7 +25,6 @@ import androidx.activity.result.contract.ActivityResultContract
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureInputBinding
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
index aee8b70c2..0738ec653 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
@@ -28,14 +28,6 @@ import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
-import com.splendo.kaluga.permissions.bluetooth.BluetoothPermission
-import com.splendo.kaluga.permissions.calendar.CalendarPermission
-import com.splendo.kaluga.permissions.camera.CameraPermission
-import com.splendo.kaluga.permissions.contacts.ContactsPermission
-import com.splendo.kaluga.permissions.location.LocationPermission
-import com.splendo.kaluga.permissions.microphone.MicrophonePermission
-import com.splendo.kaluga.permissions.notifications.NotificationsPermission
-import com.splendo.kaluga.permissions.storage.StoragePermission
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
index e47f80400..210183171 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
@@ -51,10 +51,8 @@ class PlatformSpecificActivity : KalugaViewModelComposeActivity<PlatformSpecific
 
 private fun navigationMapper(action: PlatformFeatureListNavigationAction): NavigationSpec =
     when (action) {
-        is PlatformFeatureListNavigationAction.ComposeNavigation -> NavigationSpec.Activity(
-            ContactsActivity::class.java)
-        is PlatformFeatureListNavigationAction.ComposeBottomSheet -> NavigationSpec.Activity(
-            BottomSheetActivity::class.java)
+        is PlatformFeatureListNavigationAction.ComposeNavigation -> NavigationSpec.Activity<ContactsActivity>()
+        is PlatformFeatureListNavigationAction.ComposeBottomSheet -> NavigationSpec.Activity<BottomSheetActivity>()
     }
 
 @Composable
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt
index 51d96e51f..127e4494b 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/system/NetworkActivity.kt
@@ -35,5 +35,4 @@ class NetworkActivity : KalugaViewModelActivity<NetworkViewModel>(R.layout.activ
         binding.viewModel = viewModel
         setContentView(binding.root)
     }
-
-}
\ No newline at end of file
+}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index 13c160b79..eb42b05d7 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -47,7 +47,8 @@ private fun sharedModule(
 ) = module {
     single<Logger> { RestrictedLogger(RestrictedLogLevel.None) }
     single { PermissionsBuilder() }
-    single { locationStateRepoBuilderBuilder {
+    single {
+        locationStateRepoBuilderBuilder {
             val builder = get<PermissionsBuilder>()
             builder.registerLocationPermissionIfNotRegistered(
                 settings = BasePermissionManager.Settings(logger = get())
@@ -57,13 +58,12 @@ private fun sharedModule(
     }
     single {
         bluetoothBuilderBuilder {
-                val builder = get<PermissionsBuilder>()
-                val settings = BasePermissionManager.Settings(logger = get())
-                builder.registerBluetoothPermissionIfNotRegistered(settings = settings)
-                builder.registerLocationPermissionIfNotRegistered(settings = settings)
-                Permissions(builder, it)
-            }
-        .create(
+            val builder = get<PermissionsBuilder>()
+            val settings = BasePermissionManager.Settings(logger = get())
+            builder.registerBluetoothPermissionIfNotRegistered(settings = settings)
+            builder.registerLocationPermissionIfNotRegistered(settings = settings)
+            Permissions(builder, it)
+        }.create(
             scannerSettingsBuilder = { BaseScanner.Settings(it, logger = get()) },
             connectionSettings = ConnectionSettings(logger = get())
         )
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
index 2fd53abd0..fb46dfd0c 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothDeviceDetailViewModel.kt
@@ -43,8 +43,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.SerialDescriptor
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
index 2eccab381..6dc37ecdb 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
@@ -18,7 +18,6 @@
 package com.splendo.kaluga.example.shared.viewmodel.bluetooth
 
 import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.toBundle
 import com.splendo.kaluga.architecture.observable.UninitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.observable.toUninitializedObservable
@@ -27,13 +26,13 @@ import com.splendo.kaluga.base.text.format
 import com.splendo.kaluga.base.utils.toHexString
 import com.splendo.kaluga.bluetooth.Bluetooth
 import com.splendo.kaluga.bluetooth.UUID
-import com.splendo.kaluga.bluetooth.connect
 import com.splendo.kaluga.bluetooth.advertisement
+import com.splendo.kaluga.bluetooth.connect
 import com.splendo.kaluga.bluetooth.device.BaseAdvertisementData
-import com.splendo.kaluga.bluetooth.device.DeviceState
 import com.splendo.kaluga.bluetooth.device.ConnectableDeviceState
-import com.splendo.kaluga.bluetooth.device.NotConnectableDeviceState
+import com.splendo.kaluga.bluetooth.device.DeviceState
 import com.splendo.kaluga.bluetooth.device.Identifier
+import com.splendo.kaluga.bluetooth.device.NotConnectableDeviceState
 import com.splendo.kaluga.bluetooth.device.stringValue
 import com.splendo.kaluga.bluetooth.disconnect
 import com.splendo.kaluga.bluetooth.get
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
index a2eb9544d..9f503c379 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
@@ -20,14 +20,9 @@ package com.splendo.kaluga.example.shared.viewmodel.link
 import com.splendo.kaluga.alerts.Alert
 import com.splendo.kaluga.alerts.AlertPresenter
 import com.splendo.kaluga.alerts.buildAlert
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.NavigationBundle
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.architecture.navigation.toBundle
 import com.splendo.kaluga.architecture.observable.observableOf
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
 import com.splendo.kaluga.links.LinksBuilder
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index ab8e1f8b1..886a84ce3 100644
--- a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -23,7 +23,7 @@ import org.koin.core.module.Module
 import org.koin.dsl.KoinAppDeclaration
 import org.koin.dsl.module
 
-internal val iosModule = module {  }
+internal val iosModule = module { }
 
 fun initKoin(customModules: List<Module> = emptyList()) = initKoin(
     iosModule,
@@ -33,4 +33,4 @@ fun initKoin(customModules: List<Module> = emptyList()) = initKoin(
 )
 
 internal actual val appDeclaration: KoinAppDeclaration = {
-}
\ No newline at end of file
+}
diff --git a/example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt b/example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
index 1ddf8c61b..5c0a64d55 100644
--- a/example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
+++ b/example/shared/src/jsMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationOptions.kt
@@ -18,4 +18,4 @@ package com.splendo.kaluga.example.shared.viewmodel.permissions
 
 import com.splendo.kaluga.permissions.notifications.NotificationOptions
 
-actual val notificationOptions = NotificationOptions()
\ No newline at end of file
+actual val notificationOptions = NotificationOptions()

From 7e073c98465b81187c443c605977ba937e7e19f1 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 21 Nov 2022 17:09:29 +0100
Subject: [PATCH 033/227] Adding compose for architecture

---
 .../navigation/ModalBottomSheetNavigator.kt   |   7 +-
 .../architecture/compose/navigation/Route.kt  |  31 ++++-
 .../compose/navigation/RouteNavigator.kt      |  24 +++-
 example/android/build.gradle.kts              |   1 +
 example/android/src/main/AndroidManifest.xml  |   4 +-
 .../splendo/kaluga/example/ExampleActivity.kt |   2 +
 .../ArchitectureActivity.kt}                  |  21 +--
 .../ArchitectureDetailsActivity.kt            |  15 +-
 .../compose/ArchitectureDetailsLayout.kt}     |  24 ++--
 .../compose/ArchitectureLayout.kt             | 128 ++++++++++++++++++
 .../compose}/BottomSheetLayout.kt             |  18 ++-
 .../compose}/BottomSheetSubPageLayout.kt      |   9 +-
 .../compose}/NavigationMappers.kt             |  21 +--
 .../bottomSheet/ui/BottomSheetParentLayout.kt | 124 -----------------
 .../Constants.kt}                             |  21 +--
 .../contacts/ui/ContactDetailsLayout.kt       |  97 -------------
 .../example/contacts/ui/ContactsLayout.kt     |  53 --------
 .../example/contacts/ui/ContactsListLayout.kt | 100 --------------
 .../kaluga/example/contacts/ui/Styles.kt      |  17 ---
 .../contacts/viewModel/NavigationMappers.kt   |  52 -------
 .../{ => featurelist}/FeaturesListFragment.kt |  33 +++--
 .../kaluga/example/{ => info}/InfoFragment.kt |  26 ++--
 .../location/LocationBackgroundService.kt     |   1 +
 .../PlatformSpecificActivity.kt               |  88 ------------
 .../layout/activity_architecture_details.xml  |  10 ++
 .../layout/activity_architecture_input.xml    |  20 ++-
 .../android/src/main/res/values/strings.xml   |   3 +
 .../ios/Demo/Base.lproj/Localizable.strings   |   2 +
 .../example/shared/di/DependencyInjection.kt  |  12 +-
 .../ComposeOrAndroidUISelectionViewModel.kt   |  56 ++++++++
 .../viewmodel/featureList/PlatformSpecific.kt |  39 +-----
 .../example/shared/stylable/ButtonStyles.kt   |  10 ++
 .../ArchitectureDetailsViewModel.kt           |  18 ++-
 ...tViewModel.kt => ArchitectureViewModel.kt} |  29 ++--
 .../BottomSheetSubPageViewModel.kt            |   2 +-
 .../BottomSheetViewModel.kt                   |   2 +-
 .../BottomSheetParentSubPageViewModel.kt      |  36 -----
 .../bottomsheet/BottomSheetParentViewModel.kt |  42 ------
 .../contacts/ContactDetailsViewModel.kt       |  48 -------
 .../contacts/ContactsListViewModel.kt         |  60 --------
 .../ui/SwiftUIOrUIKitSelectionViewModel.kt    |  56 ++++++++
 .../src/main/kotlin/AndroidCommon.kt          |  16 ++-
 .../src/main/kotlin/AndroidDatabinding.kt     |  26 ++++
 .../src/main/kotlin/Component.kt              |   1 +
 .../src/main/kotlin/Publish.kt                |   3 +-
 .../build.gradle.kts                          |  25 ++--
 .../androidLibAndroidTest/AndroidManifest.xml |   6 +
 .../kotlin/TestActivity.kt                    |  27 ++++
 .../src/androidLibMain/AndroidManifest.xml    |   2 +
 .../src/androidLibMain/kotlin/Binding.kt      | 107 +++++++++++++++
 settings.gradle.kts                           |   1 +
 51 files changed, 675 insertions(+), 901 deletions(-)
 rename example/android/src/main/java/com/splendo/kaluga/example/architecture/{ArchitectureInputActivity.kt => androidui/ArchitectureActivity.kt} (76%)
 rename example/android/src/main/java/com/splendo/kaluga/example/architecture/{ => androidui}/ArchitectureDetailsActivity.kt (80%)
 rename example/android/src/main/java/com/splendo/kaluga/example/{bottomSheet/ui/BottomSheetParentSubPageLayout.kt => architecture/compose/ArchitectureDetailsLayout.kt} (67%)
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
 rename example/android/src/main/java/com/splendo/kaluga/example/{bottomSheet/ui => architecture/compose}/BottomSheetLayout.kt (84%)
 rename example/android/src/main/java/com/splendo/kaluga/example/{bottomSheet/ui => architecture/compose}/BottomSheetSubPageLayout.kt (89%)
 rename example/android/src/main/java/com/splendo/kaluga/example/{bottomSheet/viewModel => architecture/compose}/NavigationMappers.kt (64%)
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt
 rename example/android/src/main/java/com/splendo/kaluga/example/{contacts/ContactsActivity.kt => compose/Constants.kt} (58%)
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt
 rename example/android/src/main/java/com/splendo/kaluga/example/{ => featurelist}/FeaturesListFragment.kt (83%)
 rename example/android/src/main/java/com/splendo/kaluga/example/{ => info}/InfoFragment.kt (84%)
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
 create mode 100644 example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/ComposeOrAndroidUISelectionViewModel.kt
 rename example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/{ArchitectureInputViewModel.kt => ArchitectureViewModel.kt} (65%)
 rename example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/{bottomsheet => architecture}/BottomSheetSubPageViewModel.kt (95%)
 rename example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/{bottomsheet => architecture}/BottomSheetViewModel.kt (95%)
 delete mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt
 delete mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt
 create mode 100644 example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ui/SwiftUIOrUIKitSelectionViewModel.kt
 create mode 100644 kaluga-library-components/src/main/kotlin/AndroidDatabinding.kt
 rename example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt => resources-databinding/build.gradle.kts (51%)
 create mode 100644 resources-databinding/src/androidLibAndroidTest/AndroidManifest.xml
 create mode 100644 resources-databinding/src/androidLibAndroidTest/kotlin/TestActivity.kt
 create mode 100644 resources-databinding/src/androidLibMain/AndroidManifest.xml
 create mode 100644 resources-databinding/src/androidLibMain/kotlin/Binding.kt

diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
index 5824e9590..b0296905c 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
@@ -78,7 +78,12 @@ class BottomSheetSheetContentRouteController(
         sheetContentRouteController.navigate(newRoute)
     }
 
-    override fun back(): Boolean = navHostController.popBackStack() || kotlin.run {
+    override fun back(result: Map<String, Any?>): Boolean = if (navHostController.backQueue.isNotEmpty()) {
+        navHostController.previousBackStackEntry?.savedStateHandle?.let { savedStateHandle ->
+            result.entries.forEach { (key, value) -> savedStateHandle[key] = value }
+        }
+        navHostController.popBackStack()
+    } else {
         close()
         true
     }
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
index 2de890d34..934d5f3c2 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.architecture.compose.navigation
 
+import androidx.activity.result.ActivityResultLauncher
 import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
@@ -168,6 +169,11 @@ private val NavigationBundleValue<*>.routeArgument: String?
  */
 sealed class Route {
 
+    companion object {
+        val Back = Back(emptyMap())
+        val PopToRoot = PopToRoot(emptyMap())
+    }
+
     /**
      * Route that navigates to a new screen using a [NavigationAction]
      */
@@ -201,10 +207,12 @@ sealed class Route {
 
     /**
      * Route that navigates back to the screen associated with a [NavigationAction]
-     * @param routeAction The [Action] associated with the screen to navigate back to
+     * @param routeAction The [Action] associated with the screen to navigate back to.
+     * @param result A map of values to store in the [androidx.lifecycle.SavedStateHandle] of the screen to navigate back to.
      */
     data class PopTo<SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>>(
-        override val routeAction: Action
+        override val routeAction: Action,
+        val result: Map<String, Any?> = emptyMap()
     ) : Navigate<SpecRow, Action>()
 
     /**
@@ -225,18 +233,33 @@ sealed class Route {
 
     /**
      * Navigates back one step in the hierarchy
+     * @param result A map of values to store in the [androidx.lifecycle.SavedStateHandle] of the previous screen.
      */
-    object Back : Route()
+    data class Back(val result: Map<String, Any?> = emptyMap()) : Route()
 
     /**
      * Navigates to the Root of a navigation stack
+     * @param result A map of values to store in the [androidx.lifecycle.SavedStateHandle] of the root screen.
      */
-    object PopToRoot : Route()
+    data class PopToRoot(val result: Map<String, Any?> = emptyMap()) : Route()
 
     /**
      * Closes all screens in the navigation stack
      */
     object Close : Route()
+
+    /**
+     * Navigates using an [ActivityResultLauncher] and a valid [input].
+     * @param activityResultLauncher The launcher to launch with. This should have been created using [androidx.activity.compose.rememberLauncherForActivityResult]
+     * @param input The input to be provided to [activityResultLauncher]
+     */
+    data class Launcher<I>(val activityResultLauncher: ActivityResultLauncher<I>, val input: I) : Route() {
+
+        /**
+         * Launches the [activityResultLauncher] with [input]
+         */
+        fun launch() = activityResultLauncher.launch(input)
+    }
 }
 
 /**
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
index 9ad98e38a..97be678cc 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
@@ -24,7 +24,7 @@ sealed interface RouteController {
     /**
      * Navigates back
      */
-    fun back(): Boolean
+    fun back(result: Map<String, Any?> = emptyMap()): Boolean
 
     /**
      * Closes this RouteController
@@ -59,18 +59,34 @@ class NavHostRouteController(
                 navHostController.navigate(newRoute.route)
             }
             is Route.PopTo<*, *> -> {
+                navHostController.getBackStackEntry(newRoute.route).savedStateHandle.let { savedStateHandle ->
+                    newRoute.result.entries.forEach { (key, value) -> savedStateHandle[key] = value }
+                }
                 navHostController.popBackStack(newRoute.route, false)
             }
             is Route.PopToIncluding<*, *> -> {
                 navHostController.popBackStack(newRoute.route, true)
             }
-            is Route.Back -> back()
-            is Route.PopToRoot -> navHostController.popBackStack(ROOT_VIEW, false)
+            is Route.Back -> back(newRoute.result)
+            is Route.PopToRoot -> {
+                navHostController.getBackStackEntry(ROOT_VIEW).savedStateHandle.let { savedStateHandle ->
+                    newRoute.result.entries.forEach { (key, value) -> savedStateHandle[key] = value }
+                }
+                navHostController.popBackStack(ROOT_VIEW, false)
+            }
             is Route.Close -> close()
+            is Route.Launcher<*> -> newRoute.launch()
+        }
+    }
+
+    override fun back(result: Map<String, Any?>): Boolean = if (navHostController.backQueue.isNotEmpty()){
+        navHostController.previousBackStackEntry?.savedStateHandle?.let { savedStateHandle ->
+            result.entries.forEach { (key, value) -> savedStateHandle[key] = value }
         }
+        navHostController.popBackStack()
     }
+    else { parentRouteController?.back(result) ?: false }
 
-    override fun back(): Boolean = navHostController.popBackStack() || parentRouteController?.back() ?: false
     override fun close() {
         navHostController.popBackStack(ROOT_VIEW, true)
         parentRouteController?.close()
diff --git a/example/android/build.gradle.kts b/example/android/build.gradle.kts
index 3f8678faf..8ade69aeb 100644
--- a/example/android/build.gradle.kts
+++ b/example/android/build.gradle.kts
@@ -75,6 +75,7 @@ dependencies {
     val libraryVersion = Library.version
     implementation("com.splendo.kaluga:architecture-compose:$libraryVersion")
     implementation("com.splendo.kaluga:resources-compose:$libraryVersion")
+    implementation("com.splendo.kaluga:resources-databinding:$libraryVersion")
     implementation(project(":shared"))
 
     implementationDependency(Dependencies.AndroidX.Compose.UI)
diff --git a/example/android/src/main/AndroidManifest.xml b/example/android/src/main/AndroidManifest.xml
index 2cd6b95de..b9c064c37 100644
--- a/example/android/src/main/AndroidManifest.xml
+++ b/example/android/src/main/AndroidManifest.xml
@@ -79,7 +79,7 @@
                     android:pathPrefix="/kalugaexample"/>
             </intent-filter>
         </activity>
-        <activity android:name=".architecture.ArchitectureInputActivity"
+        <activity android:name=".architecture.androidui.ArchitectureActivity"
             android:label="@string/feature_architecture"/>
 
         <activity android:name="com.splendo.kaluga.example.platformspecific.PlatformSpecificActivity"
@@ -89,7 +89,7 @@
         <activity android:name="com.splendo.kaluga.example.bottomSheet.BottomSheetActivity"
             android:label="@string/feature_platform_specific_compose_bottom_sheet"/>
 
-        <activity android:name=".architecture.ArchitectureDetailsActivity"
+        <activity android:name=".architecture.androidui.ArchitectureDetailsActivity"
             android:label="@string/feature_architecture"/>
         <activity android:name=".bluetooth.BluetoothActivity"
             android:label="@string/feature_bluetooth"/>
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
index 2145a4a03..935054c51 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/ExampleActivity.kt
@@ -23,6 +23,8 @@ import com.google.android.material.tabs.TabLayout
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.featurelist.FeaturesListFragment
+import com.splendo.kaluga.example.info.InfoFragment
 import com.splendo.kaluga.example.shared.viewmodel.ExampleTabNavigation
 import com.splendo.kaluga.example.shared.viewmodel.ExampleViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureActivity.kt
similarity index 76%
rename from example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureActivity.kt
index 6b9e74d07..c5d3e8dd1 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureActivity.kt
@@ -16,7 +16,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
-package com.splendo.kaluga.example.architecture
+package com.splendo.kaluga.example.architecture.androidui
 
 import android.content.Context
 import android.content.Intent
@@ -28,13 +28,13 @@ import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureInputBinding
-import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
-import com.splendo.kaluga.example.shared.viewmodel.architecture.InputNavigation
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
-class ArchitectureInputActivity : KalugaViewModelActivity<ArchitectureInputViewModel>() {
+class ArchitectureActivity : KalugaViewModelActivity<ArchitectureViewModel>() {
 
     inner class Contract : ActivityResultContract<Intent, InputDetails?>() {
 
@@ -46,12 +46,15 @@ class ArchitectureInputActivity : KalugaViewModelActivity<ArchitectureInputViewM
         ): InputDetails? = intent?.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(InputDetails.serializer()))
     }
 
-    override val viewModel: ArchitectureInputViewModel by viewModel {
+    override val viewModel: ArchitectureViewModel by viewModel {
         parametersOf(
-            ActivityNavigator<InputNavigation> {
-                NavigationSpec.Activity<ArchitectureDetailsActivity>(
-                    launchType = NavigationSpec.Activity.LaunchType.ActivityContract<ArchitectureInputActivity> { contract }
-                )
+            ActivityNavigator<ArchitectureNavigationAction<*>> { action ->
+                when (action) {
+                    is ArchitectureNavigationAction.Details -> NavigationSpec.Activity<ArchitectureDetailsActivity>(
+                        launchType = NavigationSpec.Activity.LaunchType.ActivityContract<ArchitectureActivity> { contract }
+                    )
+                    is ArchitectureNavigationAction.BottomSheet -> throw java.lang.RuntimeException()
+                }
             }
         )
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureDetailsActivity.kt
similarity index 80%
rename from example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureDetailsActivity.kt
index 241d9bb64..b43381841 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureDetailsActivity.kt
@@ -16,7 +16,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
-package com.splendo.kaluga.example.architecture
+package com.splendo.kaluga.example.architecture.androidui
 
 import android.os.Bundle
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
@@ -25,8 +25,8 @@ import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureDetailsBinding
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.CloseDetailsNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -42,8 +42,13 @@ class ArchitectureDetailsActivity : KalugaViewModelActivity<ArchitectureDetailsV
         intent.extras?.toTypedProperty(type)?.let { details ->
             parametersOf(
                 details,
-                ActivityNavigator<CloseDetailsNavigation> {
-                    NavigationSpec.Close(resultCode)
+                ActivityNavigator<ArchitectureDetailsNavigationAction<*>> { action ->
+                    when (action) {
+                        is ArchitectureDetailsNavigationAction.Close -> NavigationSpec.Close()
+                        is ArchitectureDetailsNavigationAction.FinishWithDetails -> NavigationSpec.Close(
+                            resultCode
+                        )
+                    }
                 }
             )
         } ?: parametersOf("", 0)
@@ -59,6 +64,6 @@ class ArchitectureDetailsActivity : KalugaViewModelActivity<ArchitectureDetailsV
     }
 
     override fun onBackPressed() {
-        viewModel.onClosePressed()
+        viewModel.onBackPressed()
     }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
similarity index 67%
rename from example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
index 20f93e69c..b6b2ebc97 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
@@ -15,39 +15,37 @@
 
  */
 
-package com.splendo.kaluga.example.bottomSheet.ui
+package com.splendo.kaluga.example.architecture.compose
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
 import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.example.bottomSheet.viewModel.bottomSheetParentSubPageNavigationRouteMapper
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentSubPageViewModel
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
+import com.splendo.kaluga.example.bottomSheet.viewModel.architectureDetailsNavigationRouteMapper
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 
 @Composable
-fun BottomSheetParentSubPageLayout(navHostController: NavHostController) {
+fun ArchitectureDetailsLayout(inputDetails: InputDetails, navHostController: NavHostController) {
     val navigator = RouteNavigator(
         navHostController,
-        ::bottomSheetParentSubPageNavigationRouteMapper
+        ::architectureDetailsNavigationRouteMapper
     )
 
-    val viewModel = store {
-        remember {
-            BottomSheetParentSubPageViewModel(navigator)
-        }
+    val viewModel = storeAndRemember {
+        ArchitectureDetailsViewModel(inputDetails, navigator)
     }
 
     ViewModelComposable(viewModel) {
         HardwareBackButtonNavigation(onBackButtonClickHandler = { viewModel.onBackPressed() })
         Column(Modifier.fillMaxWidth()) {
-            Text(text)
+            Text("")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
new file mode 100644
index 000000000..b4d6b3c52
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
@@ -0,0 +1,128 @@
+package com.splendo.kaluga.example.architecture.compose
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Button
+import androidx.compose.material.ModalBottomSheetState
+import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.material.Text
+import androidx.compose.material.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import com.google.android.material.composethemeadapter.MdcTheme
+import com.splendo.kaluga.architecture.compose.mutableState
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRouteController
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetSheetContentRouteController
+import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
+import com.splendo.kaluga.architecture.compose.navigation.NavHostRouteController
+import com.splendo.kaluga.architecture.compose.navigation.NavigatingModalBottomSheetLayout
+import com.splendo.kaluga.architecture.compose.navigation.composable
+import com.splendo.kaluga.architecture.compose.navigation.route
+import com.splendo.kaluga.architecture.compose.state
+import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.example.bottomSheet.ui.BottomSheetLayout
+import com.splendo.kaluga.example.bottomSheet.ui.BottomSheetSubPageLayout
+import com.splendo.kaluga.example.bottomSheet.viewModel.architectureNavigationRouteMapper
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavigation
+import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
+import com.splendo.kaluga.resources.compose.Composable
+
+class ArchitectureActivity : AppCompatActivity() {
+
+    @SuppressLint("MissingSuperCall") // Lint bug
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            CompositionLocalProvider(
+                LocalAppCompatActivity provides this
+            ) {
+                ArchitectureLayout()
+            }
+        }
+    }
+}
+
+@Composable
+fun ArchitectureLayout() {
+    MdcTheme {
+        val architectureRouteController = BottomSheetRouteController(
+            NavHostRouteController(rememberNavController()),
+            BottomSheetSheetContentRouteController(
+                rememberNavController(),
+                rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
+                rememberCoroutineScope()
+            )
+        )
+
+        architectureRouteController.NavigatingModalBottomSheetLayout(
+            sheetContent = { contentNavHostController, sheetContentNavHostController, sheetState ->
+                composable(ArchitectureNavigationAction.BottomSheet.route()) {
+                    BottomSheetLayout(contentNavHostController, sheetContentNavHostController, sheetState)
+                }
+                composable(BottomSheetNavigation.SubPage.route()) {
+                    BottomSheetSubPageLayout(
+                        contentNavHostController, sheetContentNavHostController, sheetState
+                    )
+                }
+            },
+            contentRoot = { contentNavHostController, sheetContentNavHostController, sheetState ->
+                ArchitectureLayoutLayoutContent(contentNavHostController, sheetContentNavHostController, sheetState)
+            },
+            content = { contentNavHostController, _, _ ->
+                composable<InputDetails, ArchitectureNavigationAction.Details>(
+                    type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
+                ) { inputDetails ->
+                    ArchitectureDetailsLayout(inputDetails, contentNavHostController)
+                }
+            }
+        )
+    }
+}
+
+@Composable
+fun ArchitectureLayoutLayoutContent(contentNavHostController: NavHostController, sheetNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
+
+    val navigator = ModalBottomSheetNavigator(
+        NavHostRouteController(contentNavHostController),
+        BottomSheetSheetContentRouteController(
+            sheetNavHostController,
+            sheetState,
+            rememberCoroutineScope()
+        ),
+        ::architectureNavigationRouteMapper
+    )
+
+    val viewModel = storeAndRemember {
+        ArchitectureViewModel(navigator)
+    }
+
+    ViewModelComposable(viewModel) {
+        val nameInput = viewModel.nameInput.mutableState()
+        val isNameValid by viewModel.isNameValid.state()
+        val numberInput = viewModel.numberInput.mutableState()
+        val isNumberValid by viewModel.isNumberValid.state()
+
+        Column(Modifier.fillMaxWidth()) {
+            viewModel.showDetailsButton.Composable(modifier = Modifier.fillMaxWidth())
+        }
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
similarity index 84%
rename from example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
index 7b77eb5f9..9db22a4e9 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
@@ -24,17 +24,17 @@ import androidx.compose.material.Button
 import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
 import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.bottomSheet.viewModel.bottomSheetNavigationRouteMapper
-import com.splendo.kaluga.example.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetViewModel
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetViewModel
 
 @Composable
 fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
@@ -46,10 +46,8 @@ fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentN
         ::bottomSheetNavigationRouteMapper,
     )
 
-    val viewModel = store {
-        remember {
-            BottomSheetViewModel(navigator)
-        }
+    val viewModel = storeAndRemember {
+        BottomSheetViewModel(navigator)
     }
 
     ViewModelComposable(viewModel) {
@@ -57,13 +55,13 @@ fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentN
         Column(
             Modifier
                 .fillMaxWidth()
-                .padding(Padding.default)
+                .padding(Constants.Padding.default)
         ) {
             Text(text)
             Button(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(Padding.default),
+                    .padding(Constants.Padding.default),
                 onClick = { onSubPagePressed() }
             ) {
                 Text(buttonText)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
similarity index 89%
rename from example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
index 76fce4ae4..ce2829ab6 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
@@ -29,14 +29,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
 import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.store
 import com.splendo.kaluga.example.bottomSheet.viewModel.bottomSheetSubPageNavigationRouteMapper
-import com.splendo.kaluga.example.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetSubPageViewModel
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageViewModel
 
 @Composable
 fun BottomSheetSubPageLayout(
@@ -63,11 +64,11 @@ fun BottomSheetSubPageLayout(
         Column(
             Modifier
                 .fillMaxWidth()
-                .padding(Padding.default)
+                .padding(Constants.Padding.default)
         ) {
             Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
                 Button(
-                    modifier = Modifier.padding(Padding.default),
+                    modifier = Modifier.padding(Constants.Padding.default),
                     onClick = { onClosePressed() }
                 ) {
                     Text("X")
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt
similarity index 64%
rename from example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt
index 616631770..3f62ed35d 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/viewModel/NavigationMappers.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt
@@ -22,23 +22,24 @@ import com.splendo.kaluga.architecture.compose.navigation.Route
 import com.splendo.kaluga.architecture.compose.navigation.bottomSheetContent
 import com.splendo.kaluga.architecture.compose.navigation.bottomSheetSheetContent
 import com.splendo.kaluga.architecture.compose.navigation.next
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentSubPageNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetSubPageNavigation
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavigation
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageNavigation
 
 /** Maps a navigation action to a route string. */
-internal fun bottomSheetParentNavigationRouteMapper(action: BottomSheetParentNavigation): BottomSheetRoute {
+internal fun architectureNavigationRouteMapper(action: ArchitectureNavigationAction<*>): BottomSheetRoute {
     return when (action) {
-        is BottomSheetParentNavigation.SubPage -> action.next.bottomSheetContent
-        is BottomSheetParentNavigation.ShowSheet -> action.next.bottomSheetSheetContent
+        is ArchitectureNavigationAction.Details -> action.next.bottomSheetContent
+        is ArchitectureNavigationAction.BottomSheet -> action.next.bottomSheetSheetContent
     }
 }
 
 /** Maps a navigation action to a route string. */
-internal fun bottomSheetParentSubPageNavigationRouteMapper(action: BottomSheetParentSubPageNavigation): Route {
+internal fun architectureDetailsNavigationRouteMapper(action: ArchitectureDetailsNavigationAction<*>): Route {
     return when (action) {
-        is BottomSheetParentSubPageNavigation.Back -> Route.Back
+        is ArchitectureDetailsNavigationAction.FinishWithDetails -> Route.Back(mapOf("" to action.value))
+        is ArchitectureDetailsNavigationAction.Close -> Route.Back
     }
 }
 
@@ -54,6 +55,6 @@ internal fun bottomSheetNavigationRouteMapper(action: BottomSheetNavigation): Bo
 internal fun bottomSheetSubPageNavigationRouteMapper(action: BottomSheetSubPageNavigation): BottomSheetRoute {
     return when (action) {
         is BottomSheetSubPageNavigation.Close -> Route.Close.bottomSheetSheetContent
-        is BottomSheetSubPageNavigation.Back -> Route.Back.bottomSheetSheetContent
+        is BottomSheetSubPageNavigation.Back -> Route.Back().bottomSheetSheetContent
     }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt
deleted file mode 100644
index 63e4549ab..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/ui/BottomSheetParentLayout.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.bottomSheet.ui
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.ModalBottomSheetState
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.Text
-import androidx.compose.material.rememberModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRouteController
-import com.splendo.kaluga.architecture.compose.navigation.BottomSheetSheetContentRouteController
-import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
-import com.splendo.kaluga.architecture.compose.navigation.NavHostRouteController
-import com.splendo.kaluga.architecture.compose.navigation.NavigatingModalBottomSheetLayout
-import com.splendo.kaluga.architecture.compose.navigation.route
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.example.bottomSheet.viewModel.bottomSheetParentNavigationRouteMapper
-import com.splendo.kaluga.example.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentNavigation
-import com.splendo.kaluga.example.shared.viewmodel.bottomsheet.BottomSheetParentViewModel
-
-@Composable
-fun BottomSheetParentLayout() {
-    MdcTheme {
-        val bottomSheetRouteController = BottomSheetRouteController(
-            NavHostRouteController(rememberNavController()),
-            BottomSheetSheetContentRouteController(
-                rememberNavController(),
-                rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
-                rememberCoroutineScope()
-            )
-        )
-
-        bottomSheetRouteController.NavigatingModalBottomSheetLayout(
-            sheetContent = { contentNavHostController, sheetContentNavHostController, sheetState ->
-                composable(BottomSheetParentNavigation.ShowSheet.route()) {
-                    BottomSheetLayout(contentNavHostController, sheetContentNavHostController, sheetState)
-                }
-                composable(BottomSheetNavigation.SubPage.route()) {
-                    BottomSheetSubPageLayout(
-                        contentNavHostController, sheetContentNavHostController, sheetState
-                    )
-                }
-            },
-            contentRoot = { contentNavHostController, sheetContentNavHostController, sheetState ->
-                BottomSheetParentLayoutContent(contentNavHostController, sheetContentNavHostController, sheetState)
-            },
-            content = { contentNavHostController, _, _ ->
-                composable(BottomSheetParentNavigation.SubPage.route()) {
-                    BottomSheetParentSubPageLayout(contentNavHostController)
-                }
-            }
-        )
-    }
-}
-
-@Composable
-fun BottomSheetParentLayoutContent(contentNavHostController: NavHostController, sheetNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
-
-    val navigator = ModalBottomSheetNavigator(
-        NavHostRouteController(contentNavHostController),
-        BottomSheetSheetContentRouteController(
-            sheetNavHostController,
-            sheetState,
-            rememberCoroutineScope()
-        ),
-        ::bottomSheetParentNavigationRouteMapper
-    )
-
-    val viewModel = store {
-        remember {
-            BottomSheetParentViewModel(navigator)
-        }
-    }
-
-    ViewModelComposable(viewModel) {
-        Column(Modifier.fillMaxWidth()) {
-            Button(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(Padding.default),
-                onClick = { onShowSheetPressed() }
-            ) {
-                Text(sheetText)
-            }
-            Button(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(Padding.default),
-                onClick = { onSubPagePressed() }
-            ) {
-                Text(subPageText)
-            }
-        }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/compose/Constants.kt
similarity index 58%
rename from example/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/compose/Constants.kt
index 01d6d45f2..3d8fafd3d 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/contacts/ContactsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/compose/Constants.kt
@@ -15,18 +15,23 @@
 
  */
 
-package com.splendo.kaluga.example.contacts
+package com.splendo.kaluga.example.compose
 
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
-import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.example.contacts.ui.ContactsLayout
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 
-class ContactsActivity : KalugaViewModelComposeActivity<BaseLifecycleViewModel>() {
-    override val viewModel = BaseLifecycleViewModel()
+object Constants {
+
+    object Padding {
+        val default = 8.dp
+        val x2 = 16.dp
+    }
 
     @Composable
-    override fun Layout(viewModel: BaseLifecycleViewModel) {
-        ContactsLayout()
+    fun DefaultSpacer() {
+        Spacer(modifier = Modifier.size(Padding.default))
     }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt
deleted file mode 100644
index c5b96f85c..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactDetailsLayout.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.contacts.ui
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment.Companion.CenterHorizontally
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import androidx.navigation.NavHostController
-import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
-import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
-import com.splendo.kaluga.architecture.compose.navigation.rememberCombinedNavigator
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.contacts.viewModel.contactDetailsNavigationActivityMapper
-import com.splendo.kaluga.example.contacts.viewModel.contactDetailsNavigationRouteMapper
-import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsNavigation
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsViewModel
-
-@Composable
-fun ContactDetailsLayout(contactDetails: ContactDetails, navHostController: NavHostController) {
-    val routeNavigator = RouteNavigator(
-        navHostController,
-        ::contactDetailsNavigationRouteMapper
-    )
-
-    val navigator = rememberCombinedNavigator { action: ContactDetailsNavigation<*> ->
-        when (action) {
-            is ContactDetailsNavigation.Close -> routeNavigator
-            is ContactDetailsNavigation.SendEmail -> ::contactDetailsNavigationActivityMapper.toActivityNavigator()
-        }
-    }
-
-    val viewModel = store {
-        remember {
-            ContactDetailsViewModel(contactDetails, navigator)
-        }
-    }
-    ViewModelComposable(viewModel) {
-        HardwareBackButtonNavigation(::back)
-
-        Column {
-            val image = painterResource(id = R.drawable.ic_account)
-            Image(
-                modifier = Modifier
-                    .size(320.dp)
-                    .align(CenterHorizontally),
-                painter = image,
-                contentDescription = ""
-            )
-
-            Column(
-                modifier = Modifier.padding(horizontal = Padding.x2)
-                    .fillMaxWidth()
-            ) {
-                Text(text = "Name:", style = MaterialTheme.typography.h6)
-                Text(text = contactDetails.name, style = MaterialTheme.typography.body1)
-                DefaultSpacer()
-
-                Text(text = "Email:", style = MaterialTheme.typography.h6)
-                Text(text = contactDetails.email, style = MaterialTheme.typography.body1)
-                DefaultSpacer()
-
-                Button(onClick = ::sendEmail) {
-                    Text(text = sendEmailButtonText, style = MaterialTheme.typography.button)
-                }
-            }
-        }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt
deleted file mode 100644
index a5c221458..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsLayout.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.contacts.ui
-
-import androidx.compose.runtime.Composable
-import androidx.navigation.compose.rememberNavController
-import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
-import com.splendo.kaluga.architecture.compose.navigation.SetupNavHost
-import com.splendo.kaluga.architecture.compose.navigation.composable
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.example.contacts.viewModel.contactListNavigationRouteMapper
-import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
-
-@Composable
-fun ContactsLayout() {
-    MdcTheme {
-        val navigator = RouteNavigator(
-            rememberNavController(),
-            ::contactListNavigationRouteMapper
-        )
-
-        navigator.SetupNavHost(
-            rootView = {
-                ContactsListLayout(navigator = navigator)
-            }
-        ) { navHostController ->
-            composable<ContactDetails, ContactsListNavigation.ShowContactDetails>(
-                type = NavigationBundleSpecType.SerializedType(
-                    ContactDetails.serializer()
-                )
-            ) { details ->
-                ContactDetailsLayout(details, navHostController)
-            }
-        }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt
deleted file mode 100644
index 2e72cd4e3..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/ContactsListLayout.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.contacts.ui
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment.Companion.CenterVertically
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import com.splendo.kaluga.architecture.compose.state
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListViewModel
-
-@Composable
-fun ContactsListLayout(navigator: Navigator<ContactsListNavigation<*>>) {
-    val viewModel = store {
-        remember {
-            ContactsListViewModel(navigator)
-        }
-    }
-
-    ViewModelComposable(viewModel) {
-        val items by contacts.state()
-        LazyColumn(modifier = Modifier.padding(Padding.default)) {
-            items(items) { contactDetails ->
-                ListItem(contactDetails) {
-                    onContactClick(contactDetails)
-                }
-
-                DefaultSpacer()
-            }
-        }
-    }
-}
-
-@Composable
-private fun ListItem(
-    contactDetails: ContactDetails,
-    onClickHandler: () -> Unit
-) {
-    Row(
-        modifier = Modifier
-            .clickable(onClick = onClickHandler)
-            .fillMaxWidth()
-    ) {
-        val image = painterResource(id = R.drawable.ic_account)
-        Image(
-            modifier = Modifier.size(48.dp),
-            painter = image,
-            contentDescription = ""
-        )
-
-        DefaultSpacer()
-
-        Text(
-            modifier = Modifier.align(CenterVertically),
-            text = contactDetails.name,
-            style = MaterialTheme.typography.h5
-        )
-    }
-}
-
-@Composable
-@Preview
-private fun ListItemPreview() {
-    ListItem(ContactDetails("name", "email")) { }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt
deleted file mode 100644
index 4bac3e533..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/contacts/ui/Styles.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.splendo.kaluga.example.contacts.ui
-
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.size
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-object Padding {
-    val default = 8.dp
-    val x2 = 16.dp
-}
-
-@Composable
-fun DefaultSpacer() {
-    Spacer(modifier = Modifier.size(Padding.default))
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt
deleted file mode 100644
index 09e1f9b2d..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/contacts/viewModel/NavigationMappers.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.contacts.viewModel
-
-import com.splendo.kaluga.architecture.compose.navigation.Route
-import com.splendo.kaluga.architecture.compose.navigation.next
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactDetailsNavigation
-import com.splendo.kaluga.example.shared.viewmodel.contacts.ContactsListNavigation
-
-/** Maps a navigation action to a route string. */
-internal fun contactListNavigationRouteMapper(action: ContactsListNavigation<*>): Route {
-    return when (action) {
-        is ContactsListNavigation.ShowContactDetails -> action.next
-    }
-}
-
-/** Maps a navigation action to a route string. */
-internal fun contactDetailsNavigationRouteMapper(action: ContactDetailsNavigation<*>): Route {
-    return when (action) {
-        is ContactDetailsNavigation.Close -> Route.Back
-        else -> throw IllegalStateException("Unsupported action: ${action::class.simpleName}")
-    }
-}
-
-/** Maps a navigation action to a NavigationSpec. */
-internal fun contactDetailsNavigationActivityMapper(action: ContactDetailsNavigation<*>): NavigationSpec {
-    return when (action) {
-        is ContactDetailsNavigation.SendEmail -> NavigationSpec.Email(
-            emailSettings = NavigationSpec.Email.EmailSettings(
-                type = NavigationSpec.Email.Type.Plain,
-                to = listOf(action.bundle!!.get(action.type))
-            )
-        )
-        else -> throw IllegalStateException("Unsupported action: ${action::class.simpleName}")
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
similarity index 83%
rename from example/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
index 9132c61e1..9d0e40fd8 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/FeaturesListFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
@@ -1,22 +1,21 @@
 /*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
-Copyright 2022 Splendo Consulting B.V. The Netherlands
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
 
-     http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ */
 
-*/
-
-package com.splendo.kaluga.example
+package com.splendo.kaluga.example.featurelist
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -26,8 +25,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
+import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.alerts.AlertsActivity
-import com.splendo.kaluga.example.architecture.ArchitectureInputActivity
+import com.splendo.kaluga.example.architecture.androidui.ArchitectureActivity
 import com.splendo.kaluga.example.beacons.BeaconsActivity
 import com.splendo.kaluga.example.bluetooth.BluetoothActivity
 import com.splendo.kaluga.example.databinding.ViewListButtonBinding
@@ -37,7 +37,6 @@ import com.splendo.kaluga.example.link.LinksActivity
 import com.splendo.kaluga.example.loading.LoadingActivity
 import com.splendo.kaluga.example.location.LocationActivity
 import com.splendo.kaluga.example.permissions.PermissionsDemoListActivity
-import com.splendo.kaluga.example.platformspecific.PlatformSpecificActivity
 import com.splendo.kaluga.example.resources.ResourcesActivity
 import com.splendo.kaluga.example.shared.viewmodel.featureList.Feature
 import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
@@ -57,14 +56,14 @@ class FeaturesListFragment : KalugaViewModelFragment<FeatureListViewModel>(R.lay
                     FeatureListNavigationAction.Alerts -> NavigationSpec.Activity<AlertsActivity>()
                     FeatureListNavigationAction.DateTimePicker -> NavigationSpec.Activity<DateTimePickerActivity>()
                     FeatureListNavigationAction.LoadingIndicator -> NavigationSpec.Activity<LoadingActivity>()
-                    FeatureListNavigationAction.Architecture -> NavigationSpec.Activity<ArchitectureInputActivity>()
+                    FeatureListNavigationAction.Architecture -> NavigationSpec.Activity<ArchitectureActivity>()
                     FeatureListNavigationAction.Keyboard -> NavigationSpec.Activity<KeyboardManagerActivity>()
                     FeatureListNavigationAction.Links -> NavigationSpec.Activity<LinksActivity>()
                     FeatureListNavigationAction.System -> NavigationSpec.Activity<SystemActivity>()
                     FeatureListNavigationAction.Bluetooth -> NavigationSpec.Activity<BluetoothActivity>()
                     FeatureListNavigationAction.Beacons -> NavigationSpec.Activity<BeaconsActivity>()
                     FeatureListNavigationAction.Resources -> NavigationSpec.Activity<ResourcesActivity>()
-                    FeatureListNavigationAction.PlatformSpecific -> NavigationSpec.Activity<PlatformSpecificActivity>()
+                    FeatureListNavigationAction.PlatformSpecific -> throw java.lang.RuntimeException("Not supported")
                 }
             }
         )
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt
similarity index 84%
rename from example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt
index 7f2d19139..a1cb3c4f9 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/InfoFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt
@@ -1,22 +1,21 @@
 /*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
-Copyright 2022 Splendo Consulting B.V. The Netherlands
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
 
-     http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ */
 
-*/
-
-package com.splendo.kaluga.example
+package com.splendo.kaluga.example.info
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -29,6 +28,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
+import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.shared.viewmodel.info.DialogSpec
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoNavigation
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
index 27a852cd7..13e52d6f8 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
@@ -66,6 +66,7 @@ class LocationBackgroundService : androidx.lifecycle.LifecycleService() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             stopForeground(STOP_FOREGROUND_REMOVE)
         } else {
+            @Suppress("DEPRECATION")
             stopForeground(true)
         }
         NotificationManagerCompat.from(applicationContext).cancel(notificationId)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
deleted file mode 100644
index 210183171..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/platformspecific/PlatformSpecificActivity.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.platformspecific
-
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.architecture.compose.state
-import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
-import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.example.bottomSheet.BottomSheetActivity
-import com.splendo.kaluga.example.contacts.ContactsActivity
-import com.splendo.kaluga.example.contacts.ui.Padding
-import com.splendo.kaluga.example.shared.viewmodel.featureList.PlatformFeatureListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.featureList.PlatformSpecificFeaturesViewModel
-
-class PlatformSpecificActivity : KalugaViewModelComposeActivity<PlatformSpecificFeaturesViewModel>() {
-    override val viewModel = PlatformSpecificFeaturesViewModel(ActivityNavigator(::navigationMapper))
-
-    @Composable
-    override fun Layout(viewModel: PlatformSpecificFeaturesViewModel) {
-        PlatformSpecificFeaturesLayout(viewModel)
-    }
-}
-
-private fun navigationMapper(action: PlatformFeatureListNavigationAction): NavigationSpec =
-    when (action) {
-        is PlatformFeatureListNavigationAction.ComposeNavigation -> NavigationSpec.Activity<ContactsActivity>()
-        is PlatformFeatureListNavigationAction.ComposeBottomSheet -> NavigationSpec.Activity<BottomSheetActivity>()
-    }
-
-@Composable
-private fun PlatformSpecificFeaturesLayout(viewModel: PlatformSpecificFeaturesViewModel) {
-    MdcTheme {
-        ViewModelComposable(viewModel) {
-            val features by feature.state()
-            LazyColumn {
-                items(features) { item ->
-                    Button(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(Padding.default),
-                        onClick = { onFeaturePressed(item) },
-                    ) {
-                        Text(
-                            text = item.title.uppercase(),
-                            style = MaterialTheme.typography.button,
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-@Preview
-private fun PlatformSpecificFeaturesLayoutPreview() {
-    PlatformSpecificFeaturesLayout(
-        PlatformSpecificFeaturesViewModel(ActivityNavigator(::navigationMapper))
-    )
-}
diff --git a/example/android/src/main/res/layout/activity_architecture_details.xml b/example/android/src/main/res/layout/activity_architecture_details.xml
index 926bd42b8..584254b5a 100644
--- a/example/android/src/main/res/layout/activity_architecture_details.xml
+++ b/example/android/src/main/res/layout/activity_architecture_details.xml
@@ -31,6 +31,7 @@
             android:text="@{viewModel.number.stateFlow}" />
 
         <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/inverse_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:onClick="@{view -> viewModel.onInversePressed()}"
@@ -39,5 +40,14 @@
             app:layout_constraintEnd_toEndOf="parent"
             android:text="@string/architecture_details_inverse"/>
 
+        <androidx.appcompat.widget.AppCompatButton
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="@{view -> viewModel.onFinishPressed()}"
+            app:layout_constraintTop_toBottomOf="@id/inverse_button"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:text="@string/architecture_finish"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_architecture_input.xml b/example/android/src/main/res/layout/activity_architecture_input.xml
index 95c28e0ac..c13f8c6c5 100644
--- a/example/android/src/main/res/layout/activity_architecture_input.xml
+++ b/example/android/src/main/res/layout/activity_architecture_input.xml
@@ -4,7 +4,7 @@
     <data>
         <variable
             name="viewModel"
-            type="com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel" />
+            type="com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureViewModel" />
         <import type="com.splendo.kaluga.architecture.observable.BaseSubject"/>
 
     </data>
@@ -21,7 +21,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:hint="@{viewModel.nameHeader.liveData}"
+            android:hint="@{viewModel.namePlaceholder}"
             app:errorEnabled="@{viewModel.isNameValid.liveData}">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -39,7 +39,7 @@
             app:layout_constraintTop_toBottomOf="@id/name_input_layout"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:hint="@{viewModel.numberHeader.stateFlow}"
+            android:hint="@{viewModel.numberPlaceholder}"
             app:errorEnabled="@{viewModel.isNumberValid.stateFlow}">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -51,13 +51,21 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/show_details_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:onClick="@{view -> viewModel.onShowDetailsPressed()}"
+            app:kalugaButton="@{viewModel.showDetailsButton}"
             app:layout_constraintTop_toBottomOf="@id/number_input_layout"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:text="@string/architecture_details"/>
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:kalugaButton="@{viewModel.showBottomSheetButton}"
+            app:layout_constraintTop_toBottomOf="@id/show_details_button"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/values/strings.xml b/example/android/src/main/res/values/strings.xml
index 9d10a2527..b36b28e53 100644
--- a/example/android/src/main/res/values/strings.xml
+++ b/example/android/src/main/res/values/strings.xml
@@ -52,8 +52,11 @@
     <string name="permission_request_success">Permission requested successfully</string>
     <string name="permission_request_failed">Permission request failed</string>
 
+    <string name="architecture_name_input_placeholder">Enter your Name</string>
+    <string name="architecture_number_input_placeholder">Enter a number</string>
     <string name="architecture_details">Show Details</string>
     <string name="architecture_details_inverse">Inverse Input</string>
+    <string name="architecture_finish">Finish</string>
     <string name="keyboard_manager">Keyboard</string>
     <string name="show_keyboard">Show Keyboard</string>
     <string name="hide_keyboard">Hide Keyboard</string>
diff --git a/example/ios/Demo/Base.lproj/Localizable.strings b/example/ios/Demo/Base.lproj/Localizable.strings
index f4f15cbf7..120761c50 100644
--- a/example/ios/Demo/Base.lproj/Localizable.strings
+++ b/example/ios/Demo/Base.lproj/Localizable.strings
@@ -46,6 +46,8 @@
 "permission_request_success" = "Permission requested successfully";
 "permission_request_failed" = "Permission request failed";
 
+"architecture_name_input_placeholder" = "Enter your Name";
+"architecture_number_input_placeholder" = "Enter a number";
 "architecture_details" = "Show Details";
 "architecture_details_inverse" = "Inverse Input";
 "keyboard_manager" = "Keyboard";
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index 4cc0062ae..7de7b218d 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -26,11 +26,11 @@ import com.splendo.kaluga.datetimepicker.DateTimePickerPresenter
 import com.splendo.kaluga.example.shared.viewmodel.ExampleTabNavigation
 import com.splendo.kaluga.example.shared.viewmodel.ExampleViewModel
 import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
-import com.splendo.kaluga.example.shared.viewmodel.architecture.CloseDetailsNavigation
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
-import com.splendo.kaluga.example.shared.viewmodel.architecture.InputNavigation
 import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel
@@ -96,11 +96,11 @@ internal val androidModule = module {
 
     viewModel { (permission: LocationPermission) -> LocationViewModel(permission) }
 
-    viewModel { (navigator: Navigator<InputNavigation>) ->
-        ArchitectureInputViewModel(navigator)
+    viewModel { (navigator: Navigator<ArchitectureNavigationAction<*>>) ->
+        ArchitectureViewModel(navigator)
     }
 
-    viewModel { (initialDetail: InputDetails, navigator: Navigator<CloseDetailsNavigation>) ->
+    viewModel { (initialDetail: InputDetails, navigator: Navigator<ArchitectureDetailsNavigationAction<*>>) ->
         ArchitectureDetailsViewModel(
             initialDetail,
             navigator
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/ComposeOrAndroidUISelectionViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/ComposeOrAndroidUISelectionViewModel.kt
new file mode 100644
index 000000000..2761e90f7
--- /dev/null
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/ComposeOrAndroidUISelectionViewModel.kt
@@ -0,0 +1,56 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.compose
+
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+
+sealed class ComposeOrAndroidUINavigationAction : SingleValueNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType) {
+    object Compose : ComposeOrAndroidUINavigationAction()
+    object AndroidUI : ComposeOrAndroidUINavigationAction()
+}
+
+sealed class UIType(val title: String) {
+    object Compose : UIType("android_ui_compose".localized())
+    object AndroidUI : UIType("android_ui_legacy".localized())
+}
+
+class ComposeOrAndroidUISelectionViewModel(
+    navigator: Navigator<ComposeOrAndroidUINavigationAction>
+) : NavigatingViewModel<ComposeOrAndroidUINavigationAction>(navigator) {
+
+    val uiTypes = observableOf(
+        listOf(
+            UIType.Compose,
+            UIType.AndroidUI
+        )
+    )
+
+    fun onUITypePressed(feature: UIType) {
+        navigator.navigate(
+            when (feature) {
+                is UIType.Compose -> ComposeOrAndroidUINavigationAction.Compose
+                is UIType.AndroidUI -> ComposeOrAndroidUINavigationAction.AndroidUI
+            }
+        )
+    }
+}
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
index 8d35888bc..f00fd3397 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/PlatformSpecific.kt
@@ -17,41 +17,4 @@
 
 package com.splendo.kaluga.example.shared.viewmodel.featureList
 
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.observable.observableOf
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-actual val showPlatformSpecificFeatures: Boolean = true
-
-sealed class PlatformFeatureListNavigationAction : NavigationAction<Nothing>(null) {
-    object ComposeNavigation : PlatformFeatureListNavigationAction()
-    object ComposeBottomSheet : PlatformFeatureListNavigationAction()
-}
-
-sealed class PlatformFeature(val title: String) {
-    object ComposeNavigation : PlatformFeature("feature_platform_specific_compose_navigation".localized())
-    object ComposeBottomSheet : PlatformFeature("feature_platform_specific_compose_bottom_sheet".localized())
-}
-
-class PlatformSpecificFeaturesViewModel(
-    navigator: Navigator<PlatformFeatureListNavigationAction>
-) : NavigatingViewModel<PlatformFeatureListNavigationAction>(navigator) {
-
-    val feature = observableOf(
-        listOf(
-            PlatformFeature.ComposeNavigation,
-            PlatformFeature.ComposeBottomSheet
-        )
-    )
-
-    fun onFeaturePressed(feature: PlatformFeature) {
-        navigator.navigate(
-            when (feature) {
-                is PlatformFeature.ComposeNavigation -> PlatformFeatureListNavigationAction.ComposeNavigation
-                is PlatformFeature.ComposeBottomSheet -> PlatformFeatureListNavigationAction.ComposeBottomSheet
-            }
-        )
-    }
-}
+actual val showPlatformSpecificFeatures: Boolean = false
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
index 2a0489501..ead0a8223 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
@@ -26,6 +26,16 @@ import com.splendo.kaluga.resources.stylable.GradientStyle
 
 object ButtonStyles {
 
+    val default by lazy {
+        ButtonStyle(
+            TextStyles.whiteText,
+            backgroundColor = DefaultColors.mediumBlue,
+            pressedBackgroundColor = DefaultColors.darkBlue,
+            disabledBackgroundColor = DefaultColors.lightSlateGray,
+            shape = BackgroundStyle.Shape.Rectangle(10.0f)
+        )
+    }
+
     val textButton by lazy {
         ButtonStyle(TextStyles.redText)
     }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
index 89e7ca1ad..4e5e7066b 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
@@ -31,12 +31,12 @@ data class InputDetails(
     val number: Int
 )
 
-class CloseDetailsNavigation(inputDetails: InputDetails) : SingleValueNavigationAction<InputDetails>(
-    inputDetails,
-    NavigationBundleSpecType.SerializedType(InputDetails.serializer())
-)
+sealed class ArchitectureDetailsNavigationAction<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
+    object Close : ArchitectureDetailsNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType)
+    class FinishWithDetails(details: InputDetails) : ArchitectureDetailsNavigationAction<InputDetails>(details, NavigationBundleSpecType.SerializedType(InputDetails.serializer()))
+}
 
-class ArchitectureDetailsViewModel(initialDetail: InputDetails, navigator: Navigator<CloseDetailsNavigation>) : NavigatingViewModel<CloseDetailsNavigation>(navigator) {
+class ArchitectureDetailsViewModel(initialDetail: InputDetails, navigator: Navigator<ArchitectureDetailsNavigationAction<*>>) : NavigatingViewModel<ArchitectureDetailsNavigationAction<*>>(navigator) {
 
     private val _name = subjectOf(initialDetail.name)
     val name: InitializedObservable<String> = _name
@@ -51,7 +51,11 @@ class ArchitectureDetailsViewModel(initialDetail: InputDetails, navigator: Navig
         numberResult = numberResult.reversed()
     }
 
-    fun onClosePressed() {
-        navigator.navigate(CloseDetailsNavigation(InputDetails(nameResult, numberResult.toIntOrNull() ?: 0)))
+    fun onBackPressed() {
+        navigator.navigate(ArchitectureDetailsNavigationAction.Close)
+    }
+
+    fun onFinishPressed() {
+        navigator.navigate(ArchitectureDetailsNavigationAction.FinishWithDetails(InputDetails(nameResult, numberResult.toIntOrNull() ?: 0)))
     }
 }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt
similarity index 65%
rename from example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt
index 49d4fa4fe..9993ff153 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureInputViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt
@@ -21,10 +21,12 @@ import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.observable.ObservableOptional
-import com.splendo.kaluga.architecture.observable.observableOf
 import com.splendo.kaluga.architecture.observable.toInitializedSubject
 import com.splendo.kaluga.architecture.observable.toUninitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
+import com.splendo.kaluga.resources.localized
+import com.splendo.kaluga.resources.view.KalugaButton
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
@@ -32,15 +34,15 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
-class InputNavigation(inputDetails: InputDetails) : SingleValueNavigationAction<InputDetails>(
-    inputDetails,
-    NavigationBundleSpecType.SerializedType(InputDetails.serializer())
-)
+sealed class ArchitectureNavigationAction<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
+    class Details(inputDetails: InputDetails) : ArchitectureNavigationAction<InputDetails>(inputDetails, NavigationBundleSpecType.SerializedType(InputDetails.serializer()))
+    object BottomSheet : ArchitectureNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType)
+}
 
-class ArchitectureInputViewModel(navigator: Navigator<InputNavigation>) : NavigatingViewModel<InputNavigation>(navigator) {
+class ArchitectureViewModel(navigator: Navigator<ArchitectureNavigationAction<*>>) : NavigatingViewModel<ArchitectureNavigationAction<*>>(navigator) {
 
-    val nameHeader = observableOf("Enter your Name")
-    val numberHeader = observableOf("Enter a Number")
+    val namePlaceholder = "architecture_name_input_placeholder".localized()
+    val numberPlaceholder = "architecture_number_input_placeholder".localized()
 
     private val _nameInput = MutableStateFlow("")
     val nameInput = _nameInput.toInitializedSubject(coroutineScope)
@@ -67,7 +69,10 @@ class ArchitectureInputViewModel(navigator: Navigator<InputNavigation>) : Naviga
         validName && validNumber
     }
 
-    fun onShowDetailsPressed() {
+    val showDetailsButton = KalugaButton.Plain("architecture_details".localized(), ButtonStyles.default, action = this::onShowDetailsPressed)
+    val showBottomSheetButton = KalugaButton.Plain("bottom_sheet_show_sheet".localized(), ButtonStyles.default, action = this::onShowBottomSheetPressed)
+
+    private fun onShowDetailsPressed() {
         val nameResult: ObservableOptional<String> by nameInput
         val name: String? by nameResult
         val numberResult: ObservableOptional<String> by numberInput
@@ -75,11 +80,15 @@ class ArchitectureInputViewModel(navigator: Navigator<InputNavigation>) : Naviga
         coroutineScope.launch {
             if (isValid.first()) {
                 navigator.navigate(
-                    InputNavigation(
+                    ArchitectureNavigationAction.Details(
                         InputDetails(name ?: "", number?.toIntOrNull() ?: 0)
                     )
                 )
             }
         }
     }
+
+    private fun onShowBottomSheetPressed() {
+        navigator.navigate(ArchitectureNavigationAction.BottomSheet)
+    }
 }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetSubPageViewModel.kt
similarity index 95%
rename from example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetSubPageViewModel.kt
index 43b564cbb..4e0cf8cfe 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetSubPageViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetSubPageViewModel.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.example.shared.viewmodel.bottomsheet
+package com.splendo.kaluga.example.shared.viewmodel.architecture
 
 import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.Navigator
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetViewModel.kt
similarity index 95%
rename from example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetViewModel.kt
rename to example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetViewModel.kt
index c6f5a0694..2836c4699 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetViewModel.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.example.shared.viewmodel.bottomsheet
+package com.splendo.kaluga.example.shared.viewmodel.architecture
 
 import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.Navigator
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
deleted file mode 100644
index 744b64c5e..000000000
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentSubPageViewModel.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.bottomsheet
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-sealed class BottomSheetParentSubPageNavigation : NavigationAction<Nothing>(null) {
-    object Back : BottomSheetParentSubPageNavigation()
-}
-
-class BottomSheetParentSubPageViewModel(navigator: Navigator<BottomSheetParentSubPageNavigation>) : NavigatingViewModel<BottomSheetParentSubPageNavigation>(navigator) {
-
-    val text = "bottom_sheet_sub_page_title".localized()
-
-    fun onBackPressed() {
-        navigator.navigate(BottomSheetParentSubPageNavigation.Back)
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
deleted file mode 100644
index 2a7e00d61..000000000
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bottomsheet/BottomSheetParentViewModel.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.bottomsheet
-
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.resources.localized
-
-sealed class BottomSheetParentNavigation : NavigationAction<Nothing>(null) {
-    object ShowSheet : BottomSheetParentNavigation()
-    object SubPage : BottomSheetParentNavigation()
-}
-
-class BottomSheetParentViewModel(navigator: Navigator<BottomSheetParentNavigation>) : NavigatingViewModel<BottomSheetParentNavigation>(navigator) {
-
-    val sheetText = "bottom_sheet_show_sheet".localized()
-    val subPageText = "bottom_sheet_show_sub_page".localized()
-
-    fun onShowSheetPressed() {
-        navigator.navigate(BottomSheetParentNavigation.ShowSheet)
-    }
-
-    fun onSubPagePressed() {
-        navigator.navigate(BottomSheetParentNavigation.SubPage)
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt
deleted file mode 100644
index 6a712ec93..000000000
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactDetailsViewModel.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.contacts
-
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
-
-sealed class ContactDetailsNavigation<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
-    class SendEmail(email: String) : ContactDetailsNavigation<String>(
-        email,
-        NavigationBundleSpecType.StringType
-    )
-    object Close : ContactDetailsNavigation<Unit>(Unit, NavigationBundleSpecType.UnitType)
-}
-
-class ContactDetailsViewModel(
-    val contactDetails: ContactDetails,
-    navigator: Navigator<ContactDetailsNavigation<*>>
-) : NavigatingViewModel<ContactDetailsNavigation<*>>(navigator) {
-
-    val sendEmailButtonText = "Send email"
-
-    fun sendEmail() {
-        navigator.navigate(ContactDetailsNavigation.SendEmail(contactDetails.email))
-    }
-
-    fun back() {
-        navigator.navigate(ContactDetailsNavigation.Close)
-    }
-}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt
deleted file mode 100644
index cb0ebb93c..000000000
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/contacts/ContactsListViewModel.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.example.shared.viewmodel.contacts
-
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.architecture.observable.FlowInitializedObservable
-import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.example.shared.model.contacts.ContactDetails
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-
-sealed class ContactsListNavigation<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
-    data class ShowContactDetails(val contactDetails: ContactDetails) : ContactsListNavigation<ContactDetails>(
-        contactDetails,
-        NavigationBundleSpecType.SerializedType(ContactDetails.serializer())
-    )
-}
-
-class ContactsListViewModel(
-    navigator: Navigator<ContactsListNavigation<*>>
-) : NavigatingViewModel<ContactsListNavigation<*>>(navigator) {
-    val contacts: FlowInitializedObservable<List<ContactDetails>> =
-        MutableStateFlow(emptyList<ContactDetails>())
-            .also {
-                coroutineScope.launch {
-                    it.value = loadContacts()
-                }
-            }.toInitializedObservable(coroutineScope)
-
-    private suspend fun loadContacts(): List<ContactDetails> {
-        // a real call shall happen here
-        return listOf("Alice", "Bob", "Charlie", "David").map { name ->
-            ContactDetails(name = name, email = "${name.lowercase()}@example.com")
-        }
-    }
-
-    fun onContactClick(contactDetails: ContactDetails) {
-        navigator.navigate(
-            ContactsListNavigation.ShowContactDetails(contactDetails)
-        )
-    }
-}
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ui/SwiftUIOrUIKitSelectionViewModel.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ui/SwiftUIOrUIKitSelectionViewModel.kt
new file mode 100644
index 000000000..cd247b87f
--- /dev/null
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ui/SwiftUIOrUIKitSelectionViewModel.kt
@@ -0,0 +1,56 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.ui
+
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.observableOf
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.resources.localized
+
+sealed class SwiftUIOrUIKitNavigationAction : SingleValueNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType) {
+    object SwiftUI : SwiftUIOrUIKitNavigationAction()
+    object UIKit : SwiftUIOrUIKitNavigationAction()
+}
+
+sealed class UIType(val title: String) {
+    object SwiftUI : UIType("ios_swift_ui".localized())
+    object UIKit : UIType("ios_ui_kit".localized())
+}
+
+class SwiftUIOrUIKitSelectionViewModel(
+    navigator: Navigator<SwiftUIOrUIKitNavigationAction>
+) : NavigatingViewModel<SwiftUIOrUIKitNavigationAction>(navigator) {
+
+    val uiTypes = observableOf(
+        listOf(
+            UIType.SwiftUI,
+            UIType.UIKit
+        )
+    )
+
+    fun onUITypePressed(feature: UIType) {
+        navigator.navigate(
+            when (feature) {
+                is UIType.SwiftUI -> SwiftUIOrUIKitNavigationAction.SwiftUI
+                is UIType.UIKit -> SwiftUIOrUIKitNavigationAction.UIKit
+            }
+        )
+    }
+}
diff --git a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
index 90a5717da..1834113ae 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
@@ -71,8 +71,12 @@ fun LibraryExtension.androidCommon(project: org.gradle.api.Project, componentTyp
         getByName("main") {
             manifest.srcFile("src/androidLibMain/AndroidManifest.xml")
             res.srcDir("src/androidLibMain/res")
-            if (componentType is ComponentType.Compose) {
-                java.srcDir("src/androidLibMain/kotlin")
+            when (componentType) {
+                is ComponentType.Compose,
+                is ComponentType.DataBinding -> {
+                    java.srcDir("src/androidLibMain/kotlin")
+                }
+                is ComponentType.Default -> {}
             }
         }
         getByName("androidTest") {
@@ -106,6 +110,14 @@ fun LibraryExtension.androidCommon(project: org.gradle.api.Project, componentTyp
                 kotlinCompilerExtensionVersion = LibraryImpl.Android.composeCompiler
             }
         }
+        is ComponentType.DataBinding -> {
+            project.logger.lifecycle("This project module is a Databinding only module")
+            buildFeatures {
+                dataBinding {
+                    enable = true
+                }
+            }
+        }
         is ComponentType.Default-> {}
     }
 }
diff --git a/kaluga-library-components/src/main/kotlin/AndroidDatabinding.kt b/kaluga-library-components/src/main/kotlin/AndroidDatabinding.kt
new file mode 100644
index 000000000..5a15541b2
--- /dev/null
+++ b/kaluga-library-components/src/main/kotlin/AndroidDatabinding.kt
@@ -0,0 +1,26 @@
+import org.gradle.kotlin.dsl.dependencies
+
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+fun org.gradle.api.Project.databindingAndroidComponent() {
+    group = Library.group
+    version = Library.version
+    commonAndroidComponent(ComponentType.DataBinding)
+
+    publish(ComponentType.DataBinding)
+}
\ No newline at end of file
diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index 03f6c34a1..50e118936 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTes
 sealed class ComponentType {
     object Default : ComponentType()
     object Compose : ComponentType()
+    object DataBinding : ComponentType()
 }
 
 fun Project.commonComponent(iosExport: (Framework.() -> Unit)? = null) {
diff --git a/kaluga-library-components/src/main/kotlin/Publish.kt b/kaluga-library-components/src/main/kotlin/Publish.kt
index daa9b1345..6aae56f54 100644
--- a/kaluga-library-components/src/main/kotlin/Publish.kt
+++ b/kaluga-library-components/src/main/kotlin/Publish.kt
@@ -24,7 +24,8 @@ fun Project.publish(componentType: ComponentType = ComponentType.Default) {
             publications {
                 logger.lifecycle("This project module will be published as: $componentType")
                 when (componentType) {
-                    is ComponentType.Compose -> {
+                    is ComponentType.Compose,
+                    is ComponentType.DataBinding -> {
                         create("release", MavenPublication::class.java) {
                             from(components.getByName("release"))
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt b/resources-databinding/build.gradle.kts
similarity index 51%
rename from example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt
rename to resources-databinding/build.gradle.kts
index 298917892..e7646c771 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bottomSheet/BottomSheetActivity.kt
+++ b/resources-databinding/build.gradle.kts
@@ -15,18 +15,19 @@
 
  */
 
-package com.splendo.kaluga.example.bottomSheet
-
-import androidx.compose.runtime.Composable
-import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.example.bottomSheet.ui.BottomSheetParentLayout
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    kotlin("kapt")
+    id("jacoco")
+    id("convention.publication")
+    id("org.jlleitschuh.gradle.ktlint")
+}
 
-class BottomSheetActivity : KalugaViewModelComposeActivity<BaseLifecycleViewModel>() {
-    override val viewModel = BaseLifecycleViewModel()
+databindingAndroidComponent()
 
-    @Composable
-    override fun Layout(viewModel: BaseLifecycleViewModel) {
-        BottomSheetParentLayout()
-    }
+dependencies {
+    implementation(project(":base"))
+    api(project(":resources"))
+    implementationDependency(Dependencies.Android.Material)
 }
diff --git a/resources-databinding/src/androidLibAndroidTest/AndroidManifest.xml b/resources-databinding/src/androidLibAndroidTest/AndroidManifest.xml
new file mode 100644
index 000000000..875652172
--- /dev/null
+++ b/resources-databinding/src/androidLibAndroidTest/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest package="com.splendo.kaluga.resources.databinding"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:theme="@style/Theme.AppCompat">
+        <activity android:name=".TestActivity"/>
+    </application>
+</manifest>
diff --git a/resources-databinding/src/androidLibAndroidTest/kotlin/TestActivity.kt b/resources-databinding/src/androidLibAndroidTest/kotlin/TestActivity.kt
new file mode 100644
index 000000000..f6633c7f9
--- /dev/null
+++ b/resources-databinding/src/androidLibAndroidTest/kotlin/TestActivity.kt
@@ -0,0 +1,27 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+*/
+
+package com.splendo.kaluga.resources.databinding
+
+import androidx.appcompat.app.AppCompatActivity
+
+class TestActivity : AppCompatActivity()
+
+class CorrectlySetupTest {
+    @kotlin.test.Test
+    fun testSetup() = assert(true)
+}
diff --git a/resources-databinding/src/androidLibMain/AndroidManifest.xml b/resources-databinding/src/androidLibMain/AndroidManifest.xml
new file mode 100644
index 000000000..76def87be
--- /dev/null
+++ b/resources-databinding/src/androidLibMain/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest package="com.splendo.kaluga.resources.databinding"
+          xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/resources-databinding/src/androidLibMain/kotlin/Binding.kt b/resources-databinding/src/androidLibMain/kotlin/Binding.kt
new file mode 100644
index 000000000..25e9163ad
--- /dev/null
+++ b/resources-databinding/src/androidLibMain/kotlin/Binding.kt
@@ -0,0 +1,107 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.resources.databinding
+
+import android.util.TypedValue
+import android.view.Gravity
+import android.view.View
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.widget.TextViewCompat
+import androidx.databinding.BindingAdapter
+import com.google.android.material.textfield.TextInputLayout
+import com.splendo.kaluga.resources.Image
+import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.view.KalugaButton
+import com.splendo.kaluga.resources.view.KalugaLabel
+import com.splendo.kaluga.resources.view.alignment
+import com.splendo.kaluga.resources.view.applyBackgroundStyle
+import com.splendo.kaluga.resources.view.applyTextStyle
+import com.splendo.kaluga.resources.view.bindButton
+import com.splendo.kaluga.resources.view.bindLabel
+import com.splendo.kaluga.resources.view.gravity
+import kotlin.math.max
+
+object Binding {
+
+    @BindingAdapter("backgroundStyle")
+    @JvmStatic
+    fun bindBackground(view: View, backgroundStyle: BackgroundStyle) {
+        view.applyBackgroundStyle(backgroundStyle)
+    }
+
+    @BindingAdapter("image")
+    @JvmStatic
+    fun bindImage(view: ImageView, image: Image?) {
+        view.setImageDrawable(image?.drawable)
+    }
+
+    @BindingAdapter("kalugaButton")
+    @JvmStatic
+    fun bindKalugaButton(button: Button, kalugaButton: KalugaButton?) {
+        kalugaButton?.let {
+            button.bindButton(it)
+        }
+    }
+
+    @BindingAdapter("kalugaLabel")
+    @JvmStatic
+    fun bindKalugaLabel(view: TextView, kalugaLabel: KalugaLabel?) {
+        kalugaLabel?.let {
+            view.bindLabel(it)
+        }
+    }
+
+    @BindingAdapter("textStyle")
+    @JvmStatic
+    fun bindTextStyle(textView: TextView, textStyle: TextStyle?) {
+        textStyle?.let {
+            textView.applyTextStyle(textStyle)
+        }
+    }
+
+    @BindingAdapter("autoTextStyle", "autoTextMinScalingFactor")
+    @JvmStatic
+    fun bindAutoTextStyle(textView: TextView, autoTextStyle: TextStyle?, autoTextMinScalingFactor: Float) {
+        autoTextStyle?.let {
+            textView.applyTextStyle(it)
+            TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(textView, max(1, (it.size * autoTextMinScalingFactor).toInt()), it.size.toInt(), 1, TypedValue.COMPLEX_UNIT_SP)
+            textView.gravity = Gravity.CENTER_VERTICAL or it.alignment.alignment(textView.context).gravity
+        }
+    }
+
+    @BindingAdapter("textStyle")
+    @JvmStatic
+    fun bindTextInputLayoutTextStyle(textView: TextInputLayout, textStyle: TextStyle) {
+        textView.editText?.applyTextStyle(textStyle)
+    }
+
+    @BindingAdapter("prefixTextStyle")
+    @JvmStatic
+    fun bindPrefixTextStyle(textView: TextInputLayout, textStyle: TextStyle) {
+        textView.prefixTextView.applyTextStyle(textStyle)
+    }
+
+    @BindingAdapter("suffixTextStyle")
+    @JvmStatic
+    fun bindSuffixTextStyle(textView: TextInputLayout, textStyle: TextStyle) {
+        textView.suffixTextView.applyTextStyle(textStyle)
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 22490cf3a..7f1f0775f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -79,6 +79,7 @@ include(":keyboard-compose")
 include(":links")
 include(":resources")
 include(":resources-compose")
+include(":resources-databinding")
 include(":review")
 include(":scientific")
 include(":system")

From ba3a00167bbe72e456e7442bc49fd919c442c2e5 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 22 Nov 2022 17:34:03 +0100
Subject: [PATCH 034/227] Fixed navigation and updating Android example
 databinding

---
 .../navigation/ModalBottomSheetNavigator.kt   |   6 +-
 .../architecture/compose/navigation/Route.kt  |  32 +++-
 .../compose/navigation/RouteNavigator.kt      |  71 ++++++--
 architecture/build.gradle.kts                 |   1 +
 .../kotlin/lifecycle/LifecycleSubscribable.kt |   4 +-
 .../kotlin/navigation/NavigationSpec.kt       |  45 ++++-
 .../kotlin/navigation/Navigator.kt            |  66 ++++---
 .../KalugaViewModelDialogFragment.kt          |  14 ++
 .../KalugaViewModelLifecycleObserver.kt       |   5 +-
 .../kotlin/viewmodel/LifecycleViewModel.kt    |   3 +-
 example/android/build.gradle.kts              |   4 +
 example/android/src/main/AndroidManifest.xml  | 123 +++++++++----
 .../kaluga/example/alerts/AlertsActivity.kt   |  43 +----
 .../example/alerts/compose/AlertsLayout.kt    |  80 +++++++++
 .../example/alerts/xml/XMLAlertsActivity.kt   |  24 +++
 .../ArchitectureActivity.kt}                  |  23 ++-
 .../compose/ArchitectureDetailsLayout.kt      |  13 +-
 .../compose/ArchitectureLayout.kt             |  95 +++++++++--
 .../architecture/compose/BottomSheetLayout.kt |  17 +-
 .../compose/BottomSheetSubPageLayout.kt       |   4 +-
 .../architecture/compose/NavigationMappers.kt |   4 +-
 .../ArchitectureDetailsActivity.kt            |   2 +-
 .../xml/BottomSheetRootDialogFragment.kt      | 131 ++++++++++++++
 .../xml/BottomSheetSubPageFragment.kt         |  67 ++++++++
 .../XMLArchitectureActivity.kt}               |   8 +-
 .../kaluga/example/beacons/BeaconsAdapter.kt  |  10 ++
 .../example/bluetooth/BluetoothAdapter.kt     |  21 ++-
 .../BluetoothCharacteristicAdapter.kt         |  21 ++-
 .../bluetooth/BluetoothDescriptorAdapter.kt   |  21 ++-
 .../bluetooth/BluetoothServiceAdapter.kt      |  21 ++-
 .../example/compose/ComposeOrXMLActivity.kt   | 101 +++++++++++
 .../datetimepicker/DateTimePickerActivity.kt  |  35 ++--
 .../compose/DateTimePickerLayout.kt           |  86 ++++++++++
 .../xml/XMLDateTimePickerActivity.kt          |  38 +++++
 .../featurelist/FeaturesListFragment.kt       |  44 +++--
 .../kaluga/example/info/InfoFragment.kt       |  32 +++-
 .../example/keyboard/KeyboardActivity.kt      |  24 +++
 .../keyboard/KeyboardManagerActivity.kt       |  46 -----
 .../keyboard/compose/KeyboardLayout.kt        | 111 ++++++++++++
 .../keyboard/xml/XMLKeyboardActivity.kt       |  48 ++++++
 .../kaluga/example/link/LinksActivity.kt      |   2 +-
 .../kaluga/example/loading/LoadingActivity.kt |  51 ++----
 .../example/loading/compose/LoadingLayout.kt  |  78 +++++++++
 .../example/loading/xml/XMLLoadingActivity.kt |  41 +++++
 .../example/location/LocationActivity.kt      |  18 +-
 ...sDemoActivity.kt => PermissionActivity.kt} |  22 +--
 ...Activity.kt => PermissionsListActivity.kt} |  24 ++-
 .../example/resources/ResourcesActivity.kt    |  85 ++-------
 .../resources/compose/ButtonsLayout.kt        |  60 +++++++
 .../example/resources/compose/ColorsLayout.kt | 161 ++++++++++++++++++
 .../example/resources/compose/LabelsLayout.kt |  57 +++++++
 .../resources/compose/ResourcesLayout.kt      | 113 ++++++++++++
 .../ButtonsActivity.kt}                       |  54 +++---
 .../ColorsActivity.kt}                        |  79 +++------
 .../LabelsActivity.kt}                        |  54 +++---
 .../resources/xml/XMLResourcesActivity.kt     |  99 +++++++++++
 .../kaluga/example/system/SystemActivity.kt   |  32 ++--
 .../src/main/res/layout/activity_alerts.xml   |  69 ++++----
 .../layout/activity_architecture_details.xml  |   6 +-
 .../layout/activity_architecture_input.xml    |   3 +-
 .../src/main/res/layout/activity_button.xml   |  24 +++
 .../layout/activity_compose_or_android_ui.xml |  24 +++
 .../res/layout/activity_date_time_picker.xml  |  14 +-
 .../res/layout/activity_keyboard_manager.xml  |  55 +++---
 .../src/main/res/layout/activity_label.xml    |  24 +++
 .../src/main/res/layout/activity_loading.xml  |  45 ++---
 .../src/main/res/layout/activity_location.xml |   5 +
 .../main/res/layout/activity_permission.xml   |  42 +++++
 .../res/layout/activity_permissions_demo.xml  |  30 ----
 .../res/layout/activity_permissions_list.xml  |  22 ++-
 .../main/res/layout/activity_resources.xml    |   8 +-
 .../res/layout/activity_resources_color.xml   |  16 +-
 .../src/main/res/layout/activity_system.xml   |  52 +++---
 .../main/res/layout/fragment_bottom_sheet.xml |  29 ++++
 .../res/layout/fragment_bottom_sheet_root.xml |   9 +
 .../layout/fragment_bottom_sheet_sub_page.xml |  30 ++++
 .../res/layout/fragment_features_list.xml     |  23 ++-
 .../src/main/res/layout/fragment_info.xml     |  22 ++-
 .../android/src/main/res/values/strings.xml   |   2 +
 .../example/shared/di/DependencyInjection.kt  |  18 ++
 ...l.kt => ComposeOrXMLSelectionViewModel.kt} |  20 +--
 .../example/shared/stylable/ButtonStyles.kt   |  10 +-
 .../shared/viewmodel/alert/AlertViewModel.kt  |  19 ++-
 .../ArchitectureDetailsViewModel.kt           |  13 +-
 .../architecture/ArchitectureViewModel.kt     |   5 +-
 .../architecture/BottomSheetViewModel.kt      |   6 +-
 .../datetimepicker/DateTimePickerViewModel.kt |  10 +-
 .../shared/viewmodel/hud/HudViewModel.kt      |   7 +-
 .../viewmodel/keyboard/KeyboardViewModel.kt   |   7 +-
 .../permissions/PermissionViewModel.kt        |   1 +
 .../viewmodel/system/SystemViewModel.kt       |   2 +-
 .../src/main/kotlin/Dependencies.kt           |   1 +
 .../kotlin/ComposeClearFocusHandler.kt        |   2 +-
 .../kotlin/ClearFocusHandler.kt               |   6 +-
 .../androidLibMain/kotlin/KeyboardManager.kt  |   9 +-
 95 files changed, 2491 insertions(+), 773 deletions(-)
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt
 rename example/android/src/main/java/com/splendo/kaluga/example/{beacons/BeaconsBinding.kt => architecture/ArchitectureActivity.kt} (55%)
 rename example/android/src/main/java/com/splendo/kaluga/example/architecture/{androidui => xml}/ArchitectureDetailsActivity.kt (97%)
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetSubPageFragment.kt
 rename example/android/src/main/java/com/splendo/kaluga/example/architecture/{androidui/ArchitectureActivity.kt => xml/XMLArchitectureActivity.kt} (91%)
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/xml/XMLDateTimePickerActivity.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardActivity.kt
 delete mode 100644 example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/loading/xml/XMLLoadingActivity.kt
 rename example/android/src/main/java/com/splendo/kaluga/example/permissions/{PermissionsDemoActivity.kt => PermissionActivity.kt} (67%)
 rename example/android/src/main/java/com/splendo/kaluga/example/permissions/{PermissionsDemoListActivity.kt => PermissionsListActivity.kt} (77%)
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ButtonsLayout.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/resources/compose/LabelsLayout.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
 rename example/android/src/main/java/com/splendo/kaluga/example/resources/{ButtonActivity.kt => xml/ButtonsActivity.kt} (58%)
 rename example/android/src/main/java/com/splendo/kaluga/example/resources/{ColorActivity.kt => xml/ColorsActivity.kt} (63%)
 rename example/android/src/main/java/com/splendo/kaluga/example/resources/{LabelActivity.kt => xml/LabelsActivity.kt} (57%)
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt
 create mode 100644 example/android/src/main/res/layout/activity_button.xml
 create mode 100644 example/android/src/main/res/layout/activity_compose_or_android_ui.xml
 create mode 100644 example/android/src/main/res/layout/activity_label.xml
 create mode 100644 example/android/src/main/res/layout/activity_permission.xml
 delete mode 100644 example/android/src/main/res/layout/activity_permissions_demo.xml
 create mode 100644 example/android/src/main/res/layout/fragment_bottom_sheet.xml
 create mode 100644 example/android/src/main/res/layout/fragment_bottom_sheet_root.xml
 create mode 100644 example/android/src/main/res/layout/fragment_bottom_sheet_sub_page.xml
 rename example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/{ComposeOrAndroidUISelectionViewModel.kt => ComposeOrXMLSelectionViewModel.kt} (67%)

diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
index b0296905c..f6bbefd1f 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
@@ -78,10 +78,8 @@ class BottomSheetSheetContentRouteController(
         sheetContentRouteController.navigate(newRoute)
     }
 
-    override fun back(result: Map<String, Any?>): Boolean = if (navHostController.backQueue.isNotEmpty()) {
-        navHostController.previousBackStackEntry?.savedStateHandle?.let { savedStateHandle ->
-            result.entries.forEach { (key, value) -> savedStateHandle[key] = value }
-        }
+    override fun back(result: Route.Result): Boolean = if (navHostController.backQueue.isNotEmpty()) {
+        navHostController.previousBackStackEntry?.setResult(result)
         navHostController.popBackStack()
     } else {
         close()
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
index 934d5f3c2..2aca3c577 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
@@ -19,10 +19,13 @@ package com.splendo.kaluga.architecture.compose.navigation
 
 import androidx.activity.result.ActivityResultLauncher
 import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.NavigationBundle
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationBundleValue
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationSpec
+import com.splendo.kaluga.architecture.navigation.toBundle
 import com.splendo.kaluga.base.text.KalugaDateFormatter
 import com.splendo.kaluga.base.text.iso8601Pattern
 import kotlinx.serialization.builtins.BooleanArraySerializer
@@ -170,8 +173,16 @@ private val NavigationBundleValue<*>.routeArgument: String?
 sealed class Route {
 
     companion object {
-        val Back = Back(emptyMap())
-        val PopToRoot = PopToRoot(emptyMap())
+        val Back = Back()
+        val PopToRoot = PopToRoot()
+    }
+
+    sealed class Result {
+        companion object {
+            const val KEY = "com.splendo.kaluga.architecture.compose.navigation.Route.Result.KEY"
+        }
+        object Empty: Result()
+        data class Data<SpecRow : NavigationBundleSpecRow<*>, Bundle : NavigationBundle<SpecRow>>(val bundle: Bundle) : Result()
     }
 
     /**
@@ -208,11 +219,14 @@ sealed class Route {
     /**
      * Route that navigates back to the screen associated with a [NavigationAction]
      * @param routeAction The [Action] associated with the screen to navigate back to.
-     * @param result A map of values to store in the [androidx.lifecycle.SavedStateHandle] of the screen to navigate back to.
+     * @param result The [Result] to be provided to the screen to navigate back to.
      */
-    data class PopTo<SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>>(
+    data class PopTo<
+        SpecRow : NavigationBundleSpecRow<*>,
+        Action : NavigationAction<SpecRow>,
+        >(
         override val routeAction: Action,
-        val result: Map<String, Any?> = emptyMap()
+        val result: Result = Result.Empty
     ) : Navigate<SpecRow, Action>()
 
     /**
@@ -233,15 +247,15 @@ sealed class Route {
 
     /**
      * Navigates back one step in the hierarchy
-     * @param result A map of values to store in the [androidx.lifecycle.SavedStateHandle] of the previous screen.
+     * @param result The [Result] to provide to the previous view.
      */
-    data class Back(val result: Map<String, Any?> = emptyMap()) : Route()
+    data class Back(val result: Result = Result.Empty) : Route()
 
     /**
      * Navigates to the Root of a navigation stack
-     * @param result A map of values to store in the [androidx.lifecycle.SavedStateHandle] of the root screen.
+     * @param result The [Result] to provide to the root view.
      */
-    data class PopToRoot(val result: Map<String, Any?> = emptyMap()) : Route()
+    data class PopToRoot(val result: Result = Result.Empty) : Route()
 
     /**
      * Closes all screens in the navigation stack
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
index 97be678cc..4a0951bfe 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
@@ -1,15 +1,26 @@
 package com.splendo.kaluga.architecture.compose.navigation
 
+import android.os.Bundle
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
+import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.NavigationBundle
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationSpec
+import com.splendo.kaluga.architecture.navigation.toBundle
+import com.splendo.kaluga.architecture.navigation.toNavigationBundle
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
 
 /**
  * Controller for navigating to a [Route]
@@ -24,7 +35,7 @@ sealed interface RouteController {
     /**
      * Navigates back
      */
-    fun back(result: Map<String, Any?> = emptyMap()): Boolean
+    fun back(result: Route.Result): Boolean
 
     /**
      * Closes this RouteController
@@ -46,6 +57,7 @@ class NavHostRouteController(
     internal val navHostController: NavHostController,
     private val parentRouteController: RouteController? = null
 ) : RouteController {
+
     override fun navigate(newRoute: Route) {
         when (newRoute) {
             is Route.NextRoute<*, *> -> navHostController.navigate(newRoute.route) {
@@ -59,9 +71,7 @@ class NavHostRouteController(
                 navHostController.navigate(newRoute.route)
             }
             is Route.PopTo<*, *> -> {
-                navHostController.getBackStackEntry(newRoute.route).savedStateHandle.let { savedStateHandle ->
-                    newRoute.result.entries.forEach { (key, value) -> savedStateHandle[key] = value }
-                }
+                navHostController.getBackStackEntry(newRoute.route).setResult(newRoute.result)
                 navHostController.popBackStack(newRoute.route, false)
             }
             is Route.PopToIncluding<*, *> -> {
@@ -69,9 +79,7 @@ class NavHostRouteController(
             }
             is Route.Back -> back(newRoute.result)
             is Route.PopToRoot -> {
-                navHostController.getBackStackEntry(ROOT_VIEW).savedStateHandle.let { savedStateHandle ->
-                    newRoute.result.entries.forEach { (key, value) -> savedStateHandle[key] = value }
-                }
+                navHostController.getBackStackEntry(ROOT_VIEW).setResult(newRoute.result)
                 navHostController.popBackStack(ROOT_VIEW, false)
             }
             is Route.Close -> close()
@@ -79,10 +87,8 @@ class NavHostRouteController(
         }
     }
 
-    override fun back(result: Map<String, Any?>): Boolean = if (navHostController.backQueue.isNotEmpty()){
-        navHostController.previousBackStackEntry?.savedStateHandle?.let { savedStateHandle ->
-            result.entries.forEach { (key, value) -> savedStateHandle[key] = value }
-        }
+    override fun back(result: Route.Result): Boolean = if (navHostController.backQueue.isNotEmpty()){
+        navHostController.previousBackStackEntry?.setResult(result)
         navHostController.popBackStack()
     }
     else { parentRouteController?.back(result) ?: false }
@@ -191,3 +197,46 @@ fun RouteController.SetupNavHost(
         builder = { builder(this@SetupNavHost) }
     )
 }
+
+/**
+ * Handles a [Route.Result] matching a given [NavigationBundleSpec]
+ * @param spec The [NavigationBundleSpec] used to create the [Route.Result]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received result
+ */
+@Composable
+fun <R : NavigationBundleSpecRow<*>> NavHostController.HandleResult(
+    spec: NavigationBundleSpec<R>,
+    retain: Boolean = false,
+    onResult: @Composable NavigationBundle<R>.() -> Unit
+) = HandleResult(retain) { toNavigationBundle(spec).onResult() }
+
+/**
+ * Handles a [Route.Result] matching a given [NavigationBundleSpecType]
+ * Requires that the [Route.Result] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType]
+ * @param type The [NavigationBundleSpecType] stored in the result
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received result
+ */
+@Composable
+fun <R> NavHostController.HandleResult(
+    type: NavigationBundleSpecType<R>,
+    retain: Boolean = false,
+    onResult: @Composable R.() -> Unit
+) = HandleResult(retain) { toTypedProperty(type).onResult() }
+
+@Composable
+internal fun NavHostController.HandleResult(retain: Boolean = false, onResult: @Composable Bundle.() -> Unit) {
+    val result = currentBackStackEntry?.savedStateHandle?.getStateFlow<Bundle?>(Route.Result.KEY, null)?.collectAsState()
+    result?.value?.let {
+        onResult(it)
+        if (!retain) {
+            currentBackStackEntry?.savedStateHandle?.remove<Bundle>(Route.Result.KEY)
+        }
+    }
+}
+
+internal fun NavBackStackEntry.setResult(result: Route.Result) = when (result) {
+    is Route.Result.Empty -> savedStateHandle.remove(Route.Result.KEY)
+    is Route.Result.Data<*, *> -> savedStateHandle[Route.Result.KEY] = result.bundle.toBundle()
+}
diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts
index 9cfd9b4f1..13f728e7c 100644
--- a/architecture/build.gradle.kts
+++ b/architecture/build.gradle.kts
@@ -15,6 +15,7 @@ dependencies {
     apiDependency(Dependencies.AndroidX.Lifecycle.Runtime)
     apiDependency(Dependencies.AndroidX.Lifecycle.ViewModel)
     apiDependency(Dependencies.AndroidX.Lifecycle.LiveData)
+    apiDependency(Dependencies.Android.Material)
     implementationDependency(Dependencies.AndroidX.Browser)
     implementationDependency(Dependencies.KotlinX.AtomicFu)
 }
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt
index 018968f6d..3027859d5 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt
@@ -28,7 +28,8 @@ interface LifecycleSubscribable : LifecycleSubscribableMarker {
     data class LifecycleManager(
         val activity: Activity?,
         val lifecycleOwner: LifecycleOwner,
-        val fragmentManager: FragmentManager
+        val fragmentManager: FragmentManager,
+        val childFragmentManager: FragmentManager? = null
     )
 
     val manager: LifecycleManager?
@@ -65,3 +66,4 @@ open class LifecycleSubscriber : LifecycleSubscribable {
  */
 fun LifecycleSubscribable.subscribe(activity: AppCompatActivity) = subscribe(LifecycleSubscribable.LifecycleManager(activity, activity, activity.supportFragmentManager))
 fun LifecycleSubscribable.subscribe(activity: Activity?, owner: LifecycleOwner, fragmentManager: FragmentManager) = subscribe(LifecycleSubscribable.LifecycleManager(activity, owner, fragmentManager))
+fun LifecycleSubscribable.subscribe(activity: Activity?, owner: LifecycleOwner, parentFragmentManager: FragmentManager, childFragmentManager: FragmentManager?) = subscribe(LifecycleSubscribable.LifecycleManager(activity, owner, parentFragmentManager, childFragmentManager))
diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
index 25113c022..634062f68 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
@@ -25,6 +25,8 @@ import androidx.annotation.AnimRes
 import androidx.annotation.AnimatorRes
 import androidx.annotation.IdRes
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import java.net.URL
 import kotlin.reflect.KClass
 import kotlin.reflect.safeCast
@@ -109,6 +111,7 @@ sealed class NavigationSpec {
      * @param tag Optional tag of the fragment transaction
      * @param backStackSettings The [BackStackSettings] of the transaction. Defaults to [BackStackSettings.DontAdd]
      * @param animationSettings Optional [AnimationSettings] for the transaction
+     * @param getFragmentManager Optional getter for the [FragmentManager] to handle showing the [Fragment]
      * @param createFragment Function to create the [androidx.fragment.app.Fragment]
      */
     data class Fragment(
@@ -117,6 +120,7 @@ sealed class NavigationSpec {
         val tag: String? = null,
         val backStackSettings: BackStackSettings = BackStackSettings.DontAdd,
         val animationSettings: AnimationSettings? = null,
+        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager },
         val createFragment: () -> androidx.fragment.app.Fragment
     ) : NavigationSpec() {
 
@@ -169,21 +173,56 @@ sealed class NavigationSpec {
     /**
      * Removes a [Fragment] with a given tag
      * @param tag The tag of the [Fragment] to remove
+     * @param getFragmentManager Optional getter for the [FragmentManager] to handle removing the [Fragment]
      */
-    data class RemoveFragment(val tag: String) : NavigationSpec()
+    data class RemoveFragment(
+        val tag: String,
+        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+    ) : NavigationSpec()
+
+    /**
+     * Pops a [Fragment] from the backstack
+     * @param immediate If `true` the transaction should execute without waiting for pending transactions
+     * @param getFragmentManager Optional getter for the [FragmentManager] to handle popping the [Fragment]
+     */
+    data class PopFragment(
+        val immediate: Boolean = false,
+        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+    ) : NavigationSpec()
+
+    /**
+     * Pops a [Fragment] from the backstack
+     * @param immediate If `true` the transaction should execute without waiting for pending transactions
+     * @param getFragmentManager Optional getter for the [FragmentManager] to handle popping the [Fragment]
+     */
+    data class PopFragmentTo(
+        val name: String,
+        val inclusive: Boolean,
+        val immediate: Boolean = false,
+        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+    ) : NavigationSpec()
 
     /**
      * Shows a [DialogFragment]
      * @param tag Optional tag to add to the Dialog
+     * @param getFragmentManager Optional getter for the [FragmentManager] to handle showing the [DialogFragment]
      * @param createDialog Function to create the [DialogFragment] to display
      */
-    data class Dialog(val tag: String? = null, val createDialog: () -> DialogFragment) : NavigationSpec()
+    data class Dialog(
+        val tag: String? = null,
+        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager },
+        val createDialog: () -> DialogFragment
+    ) : NavigationSpec()
 
     /**
      * Dismisses a [DialogFragment] with a given Tag
      * @param tag The tag of the [DialogFragment] to remove
+     * @param getFragmentManager Optional getter for the [FragmentManager] to handle removing the [DialogFragment]
      */
-    data class DismissDialog(val tag: String) : NavigationSpec()
+    data class DismissDialog(
+        val tag: String,
+        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+    ) : NavigationSpec()
 
     /**
      * Shows the Camera
diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index 83da65992..e91a5f52a 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -24,6 +24,7 @@ import android.provider.MediaStore
 import android.provider.Settings
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscriber
@@ -50,6 +51,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
             is NavigationSpec.Close -> closeActivity(spec, bundle)
             is NavigationSpec.Fragment -> navigateToFragment(spec)
             is NavigationSpec.RemoveFragment -> removeFragment(spec)
+            is NavigationSpec.PopFragment -> popFragment(spec)
+            is NavigationSpec.PopFragmentTo -> popFragmentTo(spec)
             is NavigationSpec.Dialog -> navigateToDialog(spec)
             is NavigationSpec.DismissDialog -> dismissDialog(spec)
             is NavigationSpec.Camera -> navigateToCamera(spec)
@@ -100,8 +103,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToFragment(fragmentSpec: NavigationSpec.Fragment) {
-        assert(manager?.fragmentManager != null)
-        val fragmentManager = manager?.fragmentManager ?: return
+        assert(manager != null)
+        val fragmentManager = fragmentSpec.getFragmentManager(manager!!)
         val transaction = fragmentManager.beginTransaction().let {
             when (val backtrackSettings = fragmentSpec.backStackSettings) {
                 is NavigationSpec.Fragment.BackStackSettings.Add -> it.addToBackStack(
@@ -138,8 +141,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun removeFragment(removeFragmentSpec: NavigationSpec.RemoveFragment) {
-        assert(manager?.fragmentManager != null)
-        val fragmentManager = manager?.fragmentManager ?: return
+        assert(manager != null)
+        val fragmentManager = removeFragmentSpec.getFragmentManager(manager!!)
         val fragment = fragmentManager.findFragmentByTag(removeFragmentSpec.tag) ?: return
 
         val transaction = fragmentManager.beginTransaction()
@@ -147,15 +150,36 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         transaction.commit()
     }
 
+    private fun popFragment(popFragmentSpec: NavigationSpec.PopFragment) {
+        assert(manager != null)
+        val fragmentManager = popFragmentSpec.getFragmentManager(manager!!)
+        if (popFragmentSpec.immediate) {
+            fragmentManager.popBackStackImmediate()
+        } else {
+            fragmentManager.popBackStack()
+        }
+    }
+
+    private fun popFragmentTo(popToFragmentSpec: NavigationSpec.PopFragmentTo) {
+        assert(manager != null)
+        val fragmentManager = popToFragmentSpec.getFragmentManager(manager!!)
+        val flags = if (popToFragmentSpec.inclusive) FragmentManager.POP_BACK_STACK_INCLUSIVE else 0
+        if (popToFragmentSpec.immediate) {
+            fragmentManager.popBackStackImmediate(popToFragmentSpec.name, flags)
+        } else {
+            fragmentManager.popBackStack(popToFragmentSpec.name, flags)
+        }
+    }
+
     private fun navigateToDialog(dialogSpec: NavigationSpec.Dialog) {
-        assert(manager?.fragmentManager != null)
-        val fragmentManager = manager?.fragmentManager ?: return
+        assert(manager != null)
+        val fragmentManager = dialogSpec.getFragmentManager(manager!!)
         dialogSpec.createDialog().show(fragmentManager, dialogSpec.tag)
     }
 
     private fun dismissDialog(spec: NavigationSpec.DismissDialog) {
-        assert(manager?.fragmentManager != null)
-        val fragmentManager = manager?.fragmentManager ?: return
+        assert(manager != null)
+        val fragmentManager = spec.getFragmentManager(manager!!)
         val dialog = fragmentManager.findFragmentByTag(spec.tag) as? DialogFragment ?: return
         dialog.dismiss()
     }
@@ -198,11 +222,13 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
                 )
             }
         }.apply {
-            data = Uri.parse("mailto:")
-            type = when (settings.type) {
-                is NavigationSpec.Email.Type.Plain -> "text/plain"
-                is NavigationSpec.Email.Type.Stylized -> "*/*"
-            }
+            setDataAndType(
+                Uri.parse("mailto:"),
+                when (settings.type) {
+                    is NavigationSpec.Email.Type.Plain -> "text/plain"
+                    is NavigationSpec.Email.Type.Stylized -> "*/*"
+                }
+            )
             if (settings.to.isNotEmpty()) {
                 putExtra(Intent.EXTRA_EMAIL, settings.to.toTypedArray())
             }
@@ -303,12 +329,14 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
             }
         }.apply {
             val recipients = settings.recipients.fold("") { acc, recipient -> if (acc.isNotEmpty()) "$acc;$recipient" else recipient }
-            data = Uri.parse("smsto:$recipients")
-            type = when (settings.type) {
-                is NavigationSpec.TextMessenger.Type.Plain -> "text/plain"
-                is NavigationSpec.TextMessenger.Type.Image -> "image/*"
-                is NavigationSpec.TextMessenger.Type.Video -> "video/*"
-            }
+            setDataAndType(
+                Uri.parse("smsto:$recipients"),
+                when (settings.type) {
+                    is NavigationSpec.TextMessenger.Type.Plain -> "text/plain"
+                    is NavigationSpec.TextMessenger.Type.Image -> "image/*"
+                    is NavigationSpec.TextMessenger.Type.Video -> "video/*"
+                }
+            )
             settings.subject?.let { putExtra("subject", it) }
             settings.body?.let { putExtra("sms_body", it) }
         }
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt
index cde1ef316..aa55c4c82 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.architecture.viewmodel
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.DialogFragment
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 /**
  * Convenience [DialogFragment] that is bound to a [LifecycleViewModel]
@@ -33,3 +34,16 @@ abstract class KalugaViewModelDialogFragment<VM : BaseLifecycleViewModel> : Dial
         viewModel.bind(this)
     }
 }
+
+/**
+ * Convenience [BottomSheetDialogFragment] that is bound to a [LifecycleViewModel]
+ */
+abstract class KalugaViewModelBottomSheetDialogFragment<VM : BaseLifecycleViewModel> : BottomSheetDialogFragment() {
+
+    abstract val viewModel: VM
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewModel.bind(this)
+    }
+}
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
index 920a9a660..b250df5a5 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
@@ -42,7 +42,8 @@ class KalugaViewModelLifecycleObserver<VM : BaseLifecycleViewModel> internal con
     private val viewModel: VM,
     private val activity: Activity?,
     private val lifecycleOwner: LifecycleOwner,
-    private val fragmentManager: FragmentManager
+    private val fragmentManager: FragmentManager,
+    private val childFragmentManager: FragmentManager? = null
 ) : DefaultLifecycleObserver {
 
     private val lifecycleSubscribables: List<LifecycleSubscribable> by lazy {
@@ -58,7 +59,7 @@ class KalugaViewModelLifecycleObserver<VM : BaseLifecycleViewModel> internal con
     }
 
     override fun onCreate(owner: LifecycleOwner) {
-        lifecycleSubscribables.forEach { it.subscribe(activity, lifecycleOwner, fragmentManager) }
+        lifecycleSubscribables.forEach { it.subscribe(activity, lifecycleOwner, fragmentManager, childFragmentManager) }
     }
 
     override fun onDestroy(owner: LifecycleOwner) {
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
index 84fa66e1d..cc3504412 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -45,6 +45,7 @@ fun <VM : BaseLifecycleViewModel> VM.bind(activity: AppCompatActivity) {
  */
 fun <VM : BaseLifecycleViewModel> VM.bind(fragment: Fragment): Boolean {
     val fragmentManager = fragment.parentFragmentManager
-    fragment.lifecycle.addObserver(KalugaViewModelLifecycleObserver(this, fragment.activity, fragment.viewLifecycleOwner, fragmentManager))
+    val childFragmentManager = fragment.childFragmentManager
+    fragment.lifecycle.addObserver(KalugaViewModelLifecycleObserver(this, fragment.activity, fragment.viewLifecycleOwner, fragmentManager, childFragmentManager))
     return true
 }
diff --git a/example/android/build.gradle.kts b/example/android/build.gradle.kts
index 8ade69aeb..e3a82bbea 100644
--- a/example/android/build.gradle.kts
+++ b/example/android/build.gradle.kts
@@ -67,6 +67,7 @@ kotlin {
         languageSettings {
             optIn("kotlin.ExperimentalStdlibApi")
             optIn("androidx.compose.material.ExperimentalMaterialApi")
+            optIn("androidx.compose.ui.ExperimentalComposeUiApi")
         }
     }
 }
@@ -74,6 +75,7 @@ kotlin {
 dependencies {
     val libraryVersion = Library.version
     implementation("com.splendo.kaluga:architecture-compose:$libraryVersion")
+    implementation("com.splendo.kaluga:keyboard-compose:$libraryVersion")
     implementation("com.splendo.kaluga:resources-compose:$libraryVersion")
     implementation("com.splendo.kaluga:resources-databinding:$libraryVersion")
     implementation(project(":shared"))
@@ -96,4 +98,6 @@ dependencies {
 
     implementationDependency(Dependencies.KotlinX.Serialization.Core)
     implementationDependency(Dependencies.KotlinX.Serialization.Json)
+
+    implementationDependency(Dependencies.Koin.AndroidXCompose)
 }
diff --git a/example/android/src/main/AndroidManifest.xml b/example/android/src/main/AndroidManifest.xml
index b9c064c37..ad9739cb0 100644
--- a/example/android/src/main/AndroidManifest.xml
+++ b/example/android/src/main/AndroidManifest.xml
@@ -45,7 +45,8 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity android:name="com.splendo.kaluga.example.ExampleActivity"
             android:label="Features list"
-            android:exported="true">
+            android:exported="true"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -53,22 +54,55 @@
             </intent-filter>
         </activity>
         <activity android:name=".location.LocationActivity"
-            android:label="@string/feature_location"/>
-        <activity android:name=".permissions.PermissionsDemoListActivity"
-            android:label="@string/permissions_list"/>
-        <activity android:name=".permissions.PermissionsDemoActivity" android:label="Permissions"/>
+            android:label="@string/feature_location"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".permissions.PermissionsListActivity"
+            android:label="@string/permissions_list"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".permissions.PermissionActivity"
+            android:label="Permissions"
+            android:screenOrientation="portrait"/>
         <activity android:name=".alerts.AlertsActivity"
-            android:label="@string/feature_alerts"/>
+            android:label="@string/feature_alerts"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".alerts.xml.XMLAlertsActivity"
+            android:label="@string/feature_alerts"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".alerts.compose.ComposeAlertsActivity"
+            android:label="@string/feature_alerts"
+            android:screenOrientation="portrait"/>
         <activity android:name=".datetimepicker.DateTimePickerActivity"
-            android:label="@string/feature_date_time_picker"/>
+            android:label="@string/feature_date_time_picker"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".datetimepicker.xml.XMLDateTimePickerActivity"
+            android:label="@string/feature_date_time_picker"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".datetimepicker.compose.ComposeDateTimePickerActivity"
+            android:label="@string/feature_date_time_picker"
+            android:screenOrientation="portrait"/>
         <activity android:name=".loading.LoadingActivity"
-            android:label="@string/feature_hud"/>
-        <activity android:name=".keyboard.KeyboardManagerActivity"
-            android:label="@string/keyboard_manager"/>
+            android:label="@string/feature_hud"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".loading.xml.XMLLoadingActivity"
+            android:label="@string/feature_hud"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".loading.compose.ComposeLoadingActivity"
+            android:label="@string/feature_hud"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".keyboard.KeyboardActivity"
+            android:label="@string/keyboard_manager"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".keyboard.xml.XMLKeyboardActivity"
+            android:label="@string/keyboard_manager"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".keyboard.compose.ComposeKeyboardActivity"
+            android:label="@string/keyboard_manager"
+            android:screenOrientation="portrait"/>
         <activity android:name=".link.LinksActivity"
             android:exported="true"
             android:label="@string/feature_links"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait">
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -79,35 +113,52 @@
                     android:pathPrefix="/kalugaexample"/>
             </intent-filter>
         </activity>
-        <activity android:name=".architecture.androidui.ArchitectureActivity"
-            android:label="@string/feature_architecture"/>
-
-        <activity android:name="com.splendo.kaluga.example.platformspecific.PlatformSpecificActivity"
-            android:label="@string/feature_platform_specific"/>
-        <activity android:name="com.splendo.kaluga.example.contacts.ContactsActivity"
-            android:label="@string/feature_platform_specific_compose_navigation"/>
-        <activity android:name="com.splendo.kaluga.example.bottomSheet.BottomSheetActivity"
-            android:label="@string/feature_platform_specific_compose_bottom_sheet"/>
-
-        <activity android:name=".architecture.androidui.ArchitectureDetailsActivity"
-            android:label="@string/feature_architecture"/>
+        <activity android:name=".architecture.ArchitectureActivity"
+            android:label="@string/feature_architecture"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".architecture.xml.XMLArchitectureActivity"
+            android:label="@string/feature_architecture"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".architecture.compose.ComposeArchitectureActivity"
+            android:label="@string/feature_architecture"
+            android:screenOrientation="portrait"/>
+
+        <activity android:name=".architecture.xml.ArchitectureDetailsActivity"
+            android:label="@string/feature_architecture"
+            android:screenOrientation="portrait"/>
         <activity android:name=".bluetooth.BluetoothActivity"
-            android:label="@string/feature_bluetooth"/>
+            android:label="@string/feature_bluetooth"
+            android:screenOrientation="portrait"/>
         <activity android:name=".bluetooth.BluetoothMoreActivity"
-            android:label="@string/feature_bluetooth"/>
+            android:label="@string/feature_bluetooth"
+            android:screenOrientation="portrait"/>
         <activity android:name=".beacons.BeaconsActivity"
-            android:label="@string/feature_beacons"/>
+            android:label="@string/feature_beacons"
+            android:screenOrientation="portrait"/>
         <activity android:name=".resources.ResourcesActivity"
-            android:label="@string/feature_resources"/>
-        <activity android:name=".resources.ColorActivity"
-            android:label="@string/feature_resources_color"/>
-        <activity android:name=".resources.LabelActivity"
-            android:label="@string/feature_resources_label"/>
-        <activity android:name=".resources.ButtonActivity"
-            android:label="@string/feature_resources_button"/>
-
-        <activity android:name=".system.SystemActivity" android:label="@string/feature_system"/>
-        <activity android:name=".system.NetworkActivity" android:label="@string/network_feature"/>
+            android:label="@string/feature_resources"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".resources.xml.XMLResourcesActivity"
+            android:label="@string/feature_resources"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".resources.compose.ComposeResourcesActivity"
+            android:label="@string/feature_resources"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".resources.xml.ColorActivity"
+            android:label="@string/feature_resources_color"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".resources.xml.LabelActivity"
+            android:label="@string/feature_resources_label"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".resources.xml.ButtonActivity"
+            android:label="@string/feature_resources_button"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".system.SystemActivity"
+            android:label="@string/feature_system"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".system.NetworkActivity"
+            android:label="@string/network_feature"
+            android:screenOrientation="portrait"/>
 
 
         <service android:name=".location.LocationBackgroundService"/>
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
index 5fa52e39d..c588684e4 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
@@ -1,42 +1,7 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
 package com.splendo.kaluga.example.alerts
 
-import android.annotation.SuppressLint
-import android.os.Bundle
-import androidx.appcompat.widget.AppCompatButton
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-@SuppressLint("SetTextI18n")
-class AlertsActivity : KalugaViewModelActivity<AlertViewModel>(R.layout.activity_alerts) {
-
-    override val viewModel: AlertViewModel by viewModel()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+import com.splendo.kaluga.example.alerts.compose.ComposeAlertsActivity
+import com.splendo.kaluga.example.alerts.xml.XMLAlertsActivity
+import com.splendo.kaluga.example.compose.ComposeOrXMLActivity
 
-        findViewById<AppCompatButton>(R.id.btn_simple_alert).setOnClickListener { viewModel.showAlert() }
-        findViewById<AppCompatButton>(R.id.btn_dismissible_alert).setOnClickListener { viewModel.showAndDismissAfter(3) }
-        findViewById<AppCompatButton>(R.id.btn_alert_list).setOnClickListener { viewModel.showAlertWithList() }
-        findViewById<AppCompatButton>(R.id.btn_alert_input_field).setOnClickListener { viewModel.showAlertWithInput() }
-    }
-}
+class AlertsActivity : ComposeOrXMLActivity<ComposeAlertsActivity, XMLAlertsActivity>(ComposeAlertsActivity::class.java, XMLAlertsActivity::class.java)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
new file mode 100644
index 000000000..c6468b7c3
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
@@ -0,0 +1,80 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.alerts.compose
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import com.google.android.material.composethemeadapter.MdcTheme
+import com.splendo.kaluga.alerts.alertPresenterBuilder
+import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
+import com.splendo.kaluga.resources.compose.Composable
+
+class ComposeAlertsActivity : AppCompatActivity() {
+    @SuppressLint("MissingSuperCall") // Lint bug
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            CompositionLocalProvider(
+                LocalAppCompatActivity provides this
+            ) {
+                AlertsLayout()
+            }
+        }
+    }
+}
+
+@Composable
+fun AlertsLayout() {
+    MdcTheme {
+        val activity = LocalAppCompatActivity.current!!
+        val viewModel = storeAndRemember {
+            AlertViewModel(activity.alertPresenterBuilder())
+        }
+
+        ViewModelComposable(viewModel) {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(Constants.Padding.default)
+                    .verticalScroll(rememberScrollState())
+            ) {
+                showAlertButton.Composable(modifier = Modifier.fillMaxWidth())
+                showAndDismissAfter3SecondsButton.Composable(modifier = Modifier.fillMaxWidth())
+                showAlertWithInputButton.Composable(modifier = Modifier.fillMaxWidth())
+                showAlertWithListButton.Composable(modifier = Modifier.fillMaxWidth())
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt
new file mode 100644
index 000000000..b5d877ed5
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt
@@ -0,0 +1,24 @@
+package com.splendo.kaluga.example.alerts.xml
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.LayoutInflater
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityAlertsBinding
+import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+@SuppressLint("SetTextI18n")
+class XMLAlertsActivity : KalugaViewModelActivity<AlertViewModel>() {
+
+    override val viewModel: AlertViewModel by viewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityAlertsBinding.inflate(LayoutInflater.from(this), null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureActivity.kt
similarity index 55%
rename from example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureActivity.kt
index 74e5ad859..dcaef43b6 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsBinding.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureActivity.kt
@@ -15,17 +15,16 @@
 
  */
 
-package com.splendo.kaluga.example.beacons
+package com.splendo.kaluga.example.architecture
 
-import androidx.databinding.BindingAdapter
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListBeaconViewModel
+import com.splendo.kaluga.example.architecture.compose.ComposeArchitectureActivity
+import com.splendo.kaluga.example.architecture.xml.XMLArchitectureActivity
+import com.splendo.kaluga.example.compose.ComposeOrXMLActivity
 
-object BeaconsBinding {
-    @BindingAdapter("beacons")
-    @JvmStatic
-    fun bindBeacons(view: RecyclerView, beacons: List<BeaconsListBeaconViewModel>?) {
-        val beaconsAdapter = view.adapter as? BeaconsAdapter ?: return
-        beaconsAdapter.beacons = beacons ?: emptyList()
-    }
-}
+class ArchitectureActivity : ComposeOrXMLActivity<
+        ComposeArchitectureActivity,
+        XMLArchitectureActivity
+        >(
+    ComposeArchitectureActivity::class.java,
+    XMLArchitectureActivity::class.java
+)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
index b6b2ebc97..7ce473bdf 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
@@ -21,15 +21,17 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
 import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
+import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
-import com.splendo.kaluga.example.bottomSheet.viewModel.architectureDetailsNavigationRouteMapper
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
+import com.splendo.kaluga.resources.compose.Composable
 
 @Composable
 fun ArchitectureDetailsLayout(inputDetails: InputDetails, navHostController: NavHostController) {
@@ -43,9 +45,14 @@ fun ArchitectureDetailsLayout(inputDetails: InputDetails, navHostController: Nav
     }
 
     ViewModelComposable(viewModel) {
-        HardwareBackButtonNavigation(onBackButtonClickHandler = { viewModel.onBackPressed() })
+        val nameText by name.state()
+        val numberText by number.state()
+        HardwareBackButtonNavigation(onBackButtonClickHandler = { onBackPressed() })
         Column(Modifier.fillMaxWidth()) {
-            Text("")
+            Text(nameText)
+            Text(numberText)
+            inverseButton.Composable(modifier = Modifier.fillMaxWidth())
+            finishButton.Composable(modifier = Modifier.fillMaxWidth())
         }
     }
 }
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
index b4d6b3c52..08025e907 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
@@ -1,15 +1,38 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
 package com.splendo.kaluga.example.architecture.compose
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.view.KeyEvent
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
 import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
@@ -17,7 +40,13 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -25,6 +54,7 @@ import com.google.android.material.composethemeadapter.MdcTheme
 import com.splendo.kaluga.architecture.compose.mutableState
 import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRouteController
 import com.splendo.kaluga.architecture.compose.navigation.BottomSheetSheetContentRouteController
+import com.splendo.kaluga.architecture.compose.navigation.HandleResult
 import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.navigation.NavHostRouteController
 import com.splendo.kaluga.architecture.compose.navigation.NavigatingModalBottomSheetLayout
@@ -35,9 +65,6 @@ import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.example.bottomSheet.ui.BottomSheetLayout
-import com.splendo.kaluga.example.bottomSheet.ui.BottomSheetSubPageLayout
-import com.splendo.kaluga.example.bottomSheet.viewModel.architectureNavigationRouteMapper
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureViewModel
@@ -45,7 +72,7 @@ import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavig
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import com.splendo.kaluga.resources.compose.Composable
 
-class ArchitectureActivity : AppCompatActivity() {
+class ComposeArchitectureActivity : AppCompatActivity() {
 
     @SuppressLint("MissingSuperCall") // Lint bug
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -116,13 +143,55 @@ fun ArchitectureLayoutLayoutContent(contentNavHostController: NavHostController,
     }
 
     ViewModelComposable(viewModel) {
-        val nameInput = viewModel.nameInput.mutableState()
-        val isNameValid by viewModel.isNameValid.state()
-        val numberInput = viewModel.numberInput.mutableState()
-        val isNumberValid by viewModel.isNumberValid.state()
+        val nameInput = nameInput.mutableState()
+        val isNameValid by isNameValid.state()
+        val numberInput = numberInput.mutableState()
+        val isNumberValid by isNumberValid.state()
 
-        Column(Modifier.fillMaxWidth()) {
-            viewModel.showDetailsButton.Composable(modifier = Modifier.fillMaxWidth())
+        val focusManager = LocalFocusManager.current
+
+        contentNavHostController.HandleResult(NavigationBundleSpecType.SerializedType(InputDetails.serializer())) {
+            nameInput.value = name
+            numberInput.value = number.toString()
+        }
+
+        Column(
+            verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+            modifier = Modifier
+                .fillMaxWidth()
+                .verticalScroll(rememberScrollState())
+        ) {
+            OutlinedTextField(
+                value = nameInput.value,
+                onValueChange = { nameInput.value = it },
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .onPreviewKeyEvent {
+                        if (it.key == Key.Tab && it.nativeKeyEvent.action == KeyEvent.ACTION_DOWN) {
+                            focusManager.moveFocus(FocusDirection.Down)
+                            true
+                        } else {
+                            false
+                        }
+                    },
+                isError = !isNameValid,
+                placeholder = { Text(namePlaceholder) },
+                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+                keyboardActions = KeyboardActions(
+                    onNext = { focusManager.moveFocus(FocusDirection.Down) }
+                )
+            )
+            OutlinedTextField(
+                value = numberInput.value,
+                onValueChange = { numberInput.value = it },
+                modifier = Modifier.fillMaxWidth(),
+                isError = !isNumberValid,
+                placeholder = { Text(numberPlaceholder) },
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number, imeAction = ImeAction.Done),
+                keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() })
+            )
+            showDetailsButton.Composable(modifier = Modifier.fillMaxWidth())
+            showBottomSheetButton.Composable(modifier = Modifier.fillMaxWidth())
         }
     }
 }
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
index 9db22a4e9..cadbb695b 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
@@ -15,26 +15,24 @@
 
  */
 
-package com.splendo.kaluga.example.bottomSheet.ui
+package com.splendo.kaluga.example.architecture.compose
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
 import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
 import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
-import com.splendo.kaluga.example.bottomSheet.viewModel.bottomSheetNavigationRouteMapper
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetViewModel
+import com.splendo.kaluga.resources.compose.Composable
 
 @Composable
 fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
@@ -58,14 +56,9 @@ fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentN
                 .padding(Constants.Padding.default)
         ) {
             Text(text)
-            Button(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(Constants.Padding.default),
-                onClick = { onSubPagePressed() }
-            ) {
-                Text(buttonText)
-            }
+            button.Composable(modifier = Modifier
+                .fillMaxWidth()
+                .padding(Constants.Padding.default))
         }
     }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
index ce2829ab6..565771345 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.example.bottomSheet.ui
+package com.splendo.kaluga.example.architecture.compose
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -29,13 +29,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
 import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.store
-import com.splendo.kaluga.example.bottomSheet.viewModel.bottomSheetSubPageNavigationRouteMapper
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageViewModel
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt
index 3f62ed35d..4f8b2cc52 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.example.bottomSheet.viewModel
+package com.splendo.kaluga.example.architecture.compose
 
 import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRoute
 import com.splendo.kaluga.architecture.compose.navigation.Route
@@ -38,7 +38,7 @@ internal fun architectureNavigationRouteMapper(action: ArchitectureNavigationAct
 /** Maps a navigation action to a route string. */
 internal fun architectureDetailsNavigationRouteMapper(action: ArchitectureDetailsNavigationAction<*>): Route {
     return when (action) {
-        is ArchitectureDetailsNavigationAction.FinishWithDetails -> Route.Back(mapOf("" to action.value))
+        is ArchitectureDetailsNavigationAction.FinishWithDetails -> Route.Back(Route.Result.Data(action.bundle!!))
         is ArchitectureDetailsNavigationAction.Close -> Route.Back
     }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureDetailsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/ArchitectureDetailsActivity.kt
similarity index 97%
rename from example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureDetailsActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/ArchitectureDetailsActivity.kt
index b43381841..652cdfe3c 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureDetailsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/ArchitectureDetailsActivity.kt
@@ -16,7 +16,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
-package com.splendo.kaluga.example.architecture.androidui
+package com.splendo.kaluga.example.architecture.xml
 
 import android.os.Bundle
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
new file mode 100644
index 000000000..7a8aef287
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
@@ -0,0 +1,131 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.architecture.xml
+
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelBottomSheetDialogFragment
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.FragmentBottomSheetBinding
+import com.splendo.kaluga.example.databinding.FragmentBottomSheetRootBinding
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavigation
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageNavigation
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class BottomSheetRootDialogFragment : KalugaViewModelBottomSheetDialogFragment<BottomSheetViewModel>() {
+
+    companion object {
+        val TAG = BottomSheetRootDialogFragment::class.simpleName.orEmpty()
+    }
+
+    private val subPageNavigator = ActivityNavigator<BottomSheetSubPageNavigation> { action ->
+        when (action) {
+            is BottomSheetSubPageNavigation.Back -> NavigationSpec.PopFragment(true) { childFragmentManager!! }
+            is BottomSheetSubPageNavigation.Close -> NavigationSpec.DismissDialog(TAG)
+        }
+    }
+    override val viewModel: BottomSheetViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<BottomSheetNavigation> { action ->
+                when (action) {
+                    is BottomSheetNavigation.Close -> NavigationSpec.DismissDialog(TAG)
+                    is BottomSheetNavigation.SubPage -> NavigationSpec.Fragment(R.id.fragment_container_view, backStackSettings = NavigationSpec.Fragment.BackStackSettings.Add(), getFragmentManager = { childFragmentManager!! }) {
+                        BottomSheetSubPageFragment(subPageNavigator)
+                    }
+                }
+            }
+        )
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        val binding = FragmentBottomSheetRootBinding.inflate(inflater, container, false)
+        if (savedInstanceState == null) {
+            childFragmentManager.commit {
+                addToBackStack(null)
+                add(binding.fragmentContainerView.id, BottomSheetFragment(viewModel))
+            }
+        }
+
+        viewLifecycleOwner.lifecycle.addObserver(object : DefaultLifecycleObserver {
+            override fun onCreate(owner: LifecycleOwner) {
+                super.onCreate(owner)
+
+                subPageNavigator.subscribe(LifecycleSubscribable.LifecycleManager(activity, viewLifecycleOwner, parentFragmentManager, childFragmentManager))
+            }
+
+            override fun onDestroy(owner: LifecycleOwner) {
+                super.onDestroy(owner)
+
+                subPageNavigator.unsubscribe()
+            }
+        })
+
+        return binding.root
+    }
+}
+
+class BottomSheetFragment(val viewModel: BottomSheetViewModel) : Fragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        val binding = FragmentBottomSheetBinding.inflate(inflater, container, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        return binding.root
+    }
+
+    override fun onResume() {
+        super.onResume()
+        view?.let {
+            it.isFocusableInTouchMode = true
+            it.requestFocus()
+            it.setOnKeyListener { _, keyCode, _ ->
+                if (keyCode == KeyEvent.KEYCODE_BACK) {
+                    viewModel.onClosePressed()
+                    true
+                } else {
+                    false
+                }
+            }
+        }
+    }
+
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetSubPageFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetSubPageFragment.kt
new file mode 100644
index 000000000..27ebdf191
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetSubPageFragment.kt
@@ -0,0 +1,67 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.architecture.xml
+
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.example.databinding.FragmentBottomSheetSubPageBinding
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageNavigation
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class BottomSheetSubPageFragment(private val navigator: Navigator<BottomSheetSubPageNavigation>) : Fragment() {
+
+    val viewModel: BottomSheetSubPageViewModel by viewModel {
+        parametersOf(navigator)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        val binding = FragmentBottomSheetSubPageBinding.inflate(inflater, container, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        return binding.root
+    }
+
+    override fun onResume() {
+        super.onResume()
+        view?.let {
+            it.isFocusableInTouchMode = true
+            it.requestFocus()
+            it.setOnKeyListener { _, keyCode, _ ->
+                if (keyCode == KeyEvent.KEYCODE_BACK) {
+                    viewModel.onBackPressed()
+                    true
+                } else {
+                    false
+                }
+            }
+        }
+    }
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt
similarity index 91%
rename from example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt
index c5d3e8dd1..5243e1dbd 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/androidui/ArchitectureActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt
@@ -16,7 +16,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
-package com.splendo.kaluga.example.architecture.androidui
+package com.splendo.kaluga.example.architecture.xml
 
 import android.content.Context
 import android.content.Intent
@@ -34,7 +34,7 @@ import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
-class ArchitectureActivity : KalugaViewModelActivity<ArchitectureViewModel>() {
+class XMLArchitectureActivity : KalugaViewModelActivity<ArchitectureViewModel>() {
 
     inner class Contract : ActivityResultContract<Intent, InputDetails?>() {
 
@@ -51,9 +51,9 @@ class ArchitectureActivity : KalugaViewModelActivity<ArchitectureViewModel>() {
             ActivityNavigator<ArchitectureNavigationAction<*>> { action ->
                 when (action) {
                     is ArchitectureNavigationAction.Details -> NavigationSpec.Activity<ArchitectureDetailsActivity>(
-                        launchType = NavigationSpec.Activity.LaunchType.ActivityContract<ArchitectureActivity> { contract }
+                        launchType = NavigationSpec.Activity.LaunchType.ActivityContract<XMLArchitectureActivity> { contract }
                     )
-                    is ArchitectureNavigationAction.BottomSheet -> throw java.lang.RuntimeException()
+                    is ArchitectureNavigationAction.BottomSheet -> NavigationSpec.Dialog(BottomSheetRootDialogFragment.TAG) { BottomSheetRootDialogFragment() }
                 }
             }
         )
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
index 1c76de087..378d5bb15 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.example.beacons
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
 import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.example.databinding.BeaconItemBinding
@@ -26,6 +27,15 @@ import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListBeaconView
 
 class BeaconsAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BeaconsAdapter.BeaconItemViewHolder>() {
 
+    companion object {
+        @BindingAdapter("beacons")
+        @JvmStatic
+        fun bindBeacons(view: RecyclerView, beacons: List<BeaconsListBeaconViewModel>?) {
+            val beaconsAdapter = view.adapter as? BeaconsAdapter ?: return
+            beaconsAdapter.beacons = beacons ?: emptyList()
+        }
+    }
+
     class BeaconItemViewHolder(val binding: BeaconItemBinding) : RecyclerView.ViewHolder(binding.root)
 
     internal var beacons: List<BeaconsListBeaconViewModel> = emptyList()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
index 5010367be..f63f2a0db 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
@@ -25,19 +25,18 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.example.databinding.BluetoothItemBinding
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListDeviceViewModel
 
-object DevicesBinding {
-
-    @BindingAdapter("devices")
-    @JvmStatic
-    fun bindDevices(view: RecyclerView, devices: List<BluetoothListDeviceViewModel>?) {
-        val bluetoothAdapter = view.adapter as? BluetoothAdapter
-            ?: return
-        bluetoothAdapter.bluetoothDevices = devices ?: emptyList()
-    }
-}
-
 class BluetoothAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothAdapter.BluetoothItemViewHolder>() {
 
+    companion object {
+        @BindingAdapter("devices")
+        @JvmStatic
+        fun bindDevices(view: RecyclerView, devices: List<BluetoothListDeviceViewModel>?) {
+            val bluetoothAdapter = view.adapter as? BluetoothAdapter
+                ?: return
+            bluetoothAdapter.bluetoothDevices = devices ?: emptyList()
+        }
+    }
+
     class BluetoothItemViewHolder(val binding: BluetoothItemBinding) : RecyclerView.ViewHolder(binding.root)
 
     internal var bluetoothDevices: List<BluetoothListDeviceViewModel> = emptyList()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
index a0b9e6322..3b25b9260 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
@@ -25,19 +25,18 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.example.databinding.BluetoothCharacteristicItemBinding
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothCharacteristicViewModel
 
-object CharacteristicsBinding {
-
-    @BindingAdapter("characteristics")
-    @JvmStatic
-    fun bindCharacteristics(view: RecyclerView, characteristics: List<BluetoothCharacteristicViewModel>?) {
-        val characteristicAdapter = view.adapter as? BluetoothCharacteristicAdapter
-            ?: return
-        characteristicAdapter.characteristics = characteristics ?: emptyList()
-    }
-}
-
 class BluetoothCharacteristicAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothCharacteristicAdapter.BluetoothCharacteristicItemViewHolder>() {
 
+    companion object {
+        @BindingAdapter("characteristics")
+        @JvmStatic
+        fun bindCharacteristics(view: RecyclerView, characteristics: List<BluetoothCharacteristicViewModel>?) {
+            val characteristicAdapter = view.adapter as? BluetoothCharacteristicAdapter
+                ?: return
+            characteristicAdapter.characteristics = characteristics ?: emptyList()
+        }
+    }
+
     class BluetoothCharacteristicItemViewHolder(val characteristicItem: BluetoothCharacteristicItemBinding) : RecyclerView.ViewHolder(characteristicItem.root)
 
     internal var characteristics = emptyList<BluetoothCharacteristicViewModel>()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
index e59ee3b49..d44545dd6 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
@@ -25,19 +25,18 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.example.databinding.BluetoothDescriptorItemBinding
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDescriptorViewModel
 
-object DescriptorsBinding {
-
-    @BindingAdapter("descriptors")
-    @JvmStatic
-    fun bindDescriptors(view: RecyclerView, descriptors: List<BluetoothDescriptorViewModel>?) {
-        val descriptorAdapter = view.adapter as? BluetoothDescriptorAdapter
-            ?: return
-        descriptorAdapter.descriptors = descriptors ?: emptyList()
-    }
-}
-
 class BluetoothDescriptorAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothDescriptorAdapter.BluetoothDescriptorItemViewHolder>() {
 
+    companion object {
+        @BindingAdapter("descriptors")
+        @JvmStatic
+        fun bindDescriptors(view: RecyclerView, descriptors: List<BluetoothDescriptorViewModel>?) {
+            val descriptorAdapter = view.adapter as? BluetoothDescriptorAdapter
+                ?: return
+            descriptorAdapter.descriptors = descriptors ?: emptyList()
+        }
+    }
+
     class BluetoothDescriptorItemViewHolder(val descriptorItem: BluetoothDescriptorItemBinding) : RecyclerView.ViewHolder(descriptorItem.root)
 
     var descriptors = emptyList<BluetoothDescriptorViewModel>()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
index 46711f70e..9182132a9 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
@@ -25,19 +25,18 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.example.databinding.BluetoothServiceItemBinding
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothServiceViewModel
 
-object ServicesBinding {
-
-    @BindingAdapter("services")
-    @JvmStatic
-    fun bindServices(view: RecyclerView, services: List<BluetoothServiceViewModel>?) {
-        val serviceAdapter = view.adapter as? BluetoothServiceAdapter
-            ?: return
-        serviceAdapter.services = services ?: emptyList()
-    }
-}
-
 class BluetoothServiceAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothServiceAdapter.BluetoothServiceItemViewHolder>() {
 
+    companion object {
+        @BindingAdapter("services")
+        @JvmStatic
+        fun bindServices(view: RecyclerView, services: List<BluetoothServiceViewModel>?) {
+            val serviceAdapter = view.adapter as? BluetoothServiceAdapter
+                ?: return
+            serviceAdapter.services = services ?: emptyList()
+        }
+    }
+
     class BluetoothServiceItemViewHolder(val serviceItem: BluetoothServiceItemBinding) : RecyclerView.ViewHolder(serviceItem.root)
 
     internal var services: List<BluetoothServiceViewModel> = emptyList()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt
new file mode 100644
index 000000000..91ab8e40a
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt
@@ -0,0 +1,101 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.compose
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.BindingAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityComposeOrAndroidUiBinding
+import com.splendo.kaluga.example.databinding.ViewListButtonBinding
+import com.splendo.kaluga.example.shared.viewmodel.compose.ComposeOrXMLNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.compose.ComposeOrXMLSelectionViewModel
+import com.splendo.kaluga.example.shared.viewmodel.compose.UIType
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+abstract class ComposeOrXMLActivity<ComposeActivity : AppCompatActivity, XMLActivity : AppCompatActivity>(
+    composeActivityClass: Class<ComposeActivity>,
+    XMLActivityClass: Class<XMLActivity>
+) : KalugaViewModelActivity<ComposeOrXMLSelectionViewModel>() {
+
+    override val viewModel: ComposeOrXMLSelectionViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<ComposeOrXMLNavigationAction> { action ->
+                when (action) {
+                    is ComposeOrXMLNavigationAction.Compose -> NavigationSpec.Activity(composeActivityClass)
+                    is ComposeOrXMLNavigationAction.XML -> NavigationSpec.Activity(XMLActivityClass)
+                }
+            }
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityComposeOrAndroidUiBinding.inflate(LayoutInflater.from(this), null, false)
+        binding.uiTypesList.adapter = UITypesAdapter(viewModel)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+    }
+}
+
+class UITypesAdapter(private val viewModel: ComposeOrXMLSelectionViewModel) : RecyclerView.Adapter<UITypesAdapter.UITypesViewHolder>() {
+
+    companion object {
+        @BindingAdapter("uiTypes")
+        @JvmStatic
+        fun bindUITypes(view: RecyclerView, uiTypes: List<UIType>?) {
+            val adapter = (view.adapter as? UITypesAdapter) ?: return
+            adapter.uiTypes = uiTypes.orEmpty()
+        }
+    }
+
+    class UITypesViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
+        val button = binding.button
+    }
+
+    var uiTypes: List<UIType> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UITypesViewHolder {
+        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return UITypesViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = uiTypes.size
+
+    override fun onBindViewHolder(holder: UITypesViewHolder, position: Int) {
+        uiTypes.getOrNull(position)?.let { uiType ->
+            holder.button.text = uiType.title
+            holder.button.setOnClickListener { viewModel.onUITypePressed(uiType) }
+        } ?: run {
+            holder.button.text = null
+            holder.button.setOnClickListener(null)
+        }
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt
index b766243e4..8566707a1 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/DateTimePickerActivity.kt
@@ -1,21 +1,24 @@
-package com.splendo.kaluga.example.datetimepicker
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-import android.os.Bundle
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityDateTimePickerBinding
-import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
-import org.koin.android.ext.android.inject
+      http://www.apache.org/licenses/LICENSE-2.0
 
-class DateTimePickerActivity : KalugaViewModelActivity<DateTimePickerViewModel>() {
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
-    override val viewModel: DateTimePickerViewModel by inject()
+ */
+
+package com.splendo.kaluga.example.datetimepicker
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+import com.splendo.kaluga.example.compose.ComposeOrXMLActivity
+import com.splendo.kaluga.example.datetimepicker.compose.ComposeDateTimePickerActivity
+import com.splendo.kaluga.example.datetimepicker.xml.XMLDateTimePickerActivity
 
-        val binding = ActivityDateTimePickerBinding.inflate(layoutInflater, null, false)
-        setContentView(binding.root)
-        binding.viewModel = viewModel
-        binding.lifecycleOwner = this
-    }
-}
+class DateTimePickerActivity : ComposeOrXMLActivity<ComposeDateTimePickerActivity, XMLDateTimePickerActivity>(ComposeDateTimePickerActivity::class.java, XMLDateTimePickerActivity::class.java)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
new file mode 100644
index 000000000..1d08774f9
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
@@ -0,0 +1,86 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.datetimepicker.compose
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import com.google.android.material.composethemeadapter.MdcTheme
+import com.splendo.kaluga.architecture.compose.state
+import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
+import com.splendo.kaluga.datetimepicker.datePickerPresenterBuilder
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
+import com.splendo.kaluga.resources.compose.Composable
+
+class ComposeDateTimePickerActivity : AppCompatActivity() {
+    @SuppressLint("MissingSuperCall") // Lint bug
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            CompositionLocalProvider(
+                LocalAppCompatActivity provides this
+            ) {
+                DateTimePickerLayout()
+            }
+        }
+    }
+}
+
+@Composable
+fun DateTimePickerLayout() {
+    MdcTheme {
+        val activity = LocalAppCompatActivity.current!!
+        val viewModel = storeAndRemember {
+            DateTimePickerViewModel(activity.datePickerPresenterBuilder())
+        }
+
+        ViewModelComposable(viewModel) {
+
+            val dateLabel by dateLabel.state()
+
+            Column(
+                verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(Constants.Padding.default)
+                    .verticalScroll(rememberScrollState())
+            ) {
+                selectDateButton.Composable(modifier = Modifier.fillMaxWidth())
+                selectTimeButton.Composable(modifier = Modifier.fillMaxWidth())
+                Text(currentTimeTitle)
+                Text(dateLabel)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/xml/XMLDateTimePickerActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/xml/XMLDateTimePickerActivity.kt
new file mode 100644
index 000000000..8f64071ae
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/xml/XMLDateTimePickerActivity.kt
@@ -0,0 +1,38 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.datetimepicker.xml
+
+import android.os.Bundle
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityDateTimePickerBinding
+import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
+import org.koin.android.ext.android.inject
+
+class XMLDateTimePickerActivity : KalugaViewModelActivity<DateTimePickerViewModel>() {
+
+    override val viewModel: DateTimePickerViewModel by inject()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityDateTimePickerBinding.inflate(layoutInflater, null, false)
+        setContentView(binding.root)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
index 9d0e40fd8..c43782406 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
@@ -21,22 +21,23 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
-import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.alerts.AlertsActivity
-import com.splendo.kaluga.example.architecture.androidui.ArchitectureActivity
+import com.splendo.kaluga.example.architecture.ArchitectureActivity
 import com.splendo.kaluga.example.beacons.BeaconsActivity
 import com.splendo.kaluga.example.bluetooth.BluetoothActivity
+import com.splendo.kaluga.example.databinding.FragmentFeaturesListBinding
 import com.splendo.kaluga.example.databinding.ViewListButtonBinding
 import com.splendo.kaluga.example.datetimepicker.DateTimePickerActivity
-import com.splendo.kaluga.example.keyboard.KeyboardManagerActivity
+import com.splendo.kaluga.example.keyboard.KeyboardActivity
 import com.splendo.kaluga.example.link.LinksActivity
 import com.splendo.kaluga.example.loading.LoadingActivity
 import com.splendo.kaluga.example.location.LocationActivity
-import com.splendo.kaluga.example.permissions.PermissionsDemoListActivity
+import com.splendo.kaluga.example.permissions.PermissionsListActivity
 import com.splendo.kaluga.example.resources.ResourcesActivity
 import com.splendo.kaluga.example.shared.viewmodel.featureList.Feature
 import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
@@ -45,19 +46,19 @@ import com.splendo.kaluga.example.system.SystemActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
-class FeaturesListFragment : KalugaViewModelFragment<FeatureListViewModel>(R.layout.fragment_features_list) {
+class FeaturesListFragment : KalugaViewModelFragment<FeatureListViewModel>() {
 
     override val viewModel: FeatureListViewModel by viewModel {
         parametersOf(
             ActivityNavigator<FeatureListNavigationAction> { action ->
                 when (action) {
                     FeatureListNavigationAction.Location -> NavigationSpec.Activity<LocationActivity>()
-                    FeatureListNavigationAction.Permissions -> NavigationSpec.Activity<PermissionsDemoListActivity>()
+                    FeatureListNavigationAction.Permissions -> NavigationSpec.Activity<PermissionsListActivity>()
                     FeatureListNavigationAction.Alerts -> NavigationSpec.Activity<AlertsActivity>()
                     FeatureListNavigationAction.DateTimePicker -> NavigationSpec.Activity<DateTimePickerActivity>()
                     FeatureListNavigationAction.LoadingIndicator -> NavigationSpec.Activity<LoadingActivity>()
                     FeatureListNavigationAction.Architecture -> NavigationSpec.Activity<ArchitectureActivity>()
-                    FeatureListNavigationAction.Keyboard -> NavigationSpec.Activity<KeyboardManagerActivity>()
+                    FeatureListNavigationAction.Keyboard -> NavigationSpec.Activity<KeyboardActivity>()
                     FeatureListNavigationAction.Links -> NavigationSpec.Activity<LinksActivity>()
                     FeatureListNavigationAction.System -> NavigationSpec.Activity<SystemActivity>()
                     FeatureListNavigationAction.Bluetooth -> NavigationSpec.Activity<BluetoothActivity>()
@@ -69,19 +70,32 @@ class FeaturesListFragment : KalugaViewModelFragment<FeatureListViewModel>(R.lay
         )
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val adapter = FeaturesAdapter(viewModel).apply {
-
-            view.findViewById<RecyclerView>(R.id.features_list).adapter = this
-        }
-        viewModel.feature.observeInitialized { adapter.features = it }
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        val binding = FragmentFeaturesListBinding.inflate(inflater, container, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = viewLifecycleOwner
+        binding.featuresList.adapter = FeaturesAdapter(viewModel)
+        return binding.root
     }
 }
 
 class FeaturesAdapter(private val viewModel: FeatureListViewModel) : RecyclerView.Adapter<FeaturesAdapter.FeatureViewHolder>() {
 
+    companion object {
+        @BindingAdapter("features")
+        @JvmStatic
+        fun bindFeatures(view: RecyclerView, features: List<Feature>?) {
+            val adapter = (view.adapter as? FeaturesAdapter) ?: return
+            adapter.features = features.orEmpty()
+        }
+    }
+
     class FeatureViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
         val button = binding.button
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt
index a1cb3c4f9..8eb83a976 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt
@@ -23,12 +23,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatButton
+import androidx.databinding.BindingAdapter
 import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelFragment
 import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.FragmentInfoBinding
 import com.splendo.kaluga.example.shared.viewmodel.info.DialogSpec
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoNavigation
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
@@ -64,20 +66,32 @@ class InfoFragment : KalugaViewModelFragment<InfoViewModel>(R.layout.fragment_in
         )
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-
-        super.onViewCreated(view, savedInstanceState)
-
-        val adapter = InfoAdapter(viewModel).apply {
-            view.findViewById<RecyclerView>(R.id.info_buttons)
-                .adapter = this
-        }
-        viewModel.buttons.observeInitialized { adapter.buttons = it }
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        val binding = FragmentInfoBinding.inflate(inflater, container, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = viewLifecycleOwner
+        binding.infoButtons.adapter = InfoAdapter(viewModel)
+        return binding.root
     }
 }
 
 class InfoAdapter(private val viewModel: InfoViewModel) : RecyclerView.Adapter<InfoAdapter.InfoViewHolder>() {
 
+    companion object {
+        @BindingAdapter("infoButtons")
+        @JvmStatic
+        fun bindInfoButtons(view: RecyclerView, infoButtons: List<InfoViewModel.Button>?) {
+            val adapter = (view.adapter as? InfoAdapter) ?: return
+            adapter.buttons = infoButtons.orEmpty()
+        }
+    }
+
     class InfoViewHolder(val button: AppCompatButton) : RecyclerView.ViewHolder(button)
 
     var buttons: List<InfoViewModel.Button> = emptyList()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardActivity.kt
new file mode 100644
index 000000000..f3a19a0ed
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardActivity.kt
@@ -0,0 +1,24 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.keyboard
+
+import com.splendo.kaluga.example.compose.ComposeOrXMLActivity
+import com.splendo.kaluga.example.keyboard.compose.ComposeKeyboardActivity
+import com.splendo.kaluga.example.keyboard.xml.XMLKeyboardActivity
+
+class KeyboardActivity : ComposeOrXMLActivity<ComposeKeyboardActivity, XMLKeyboardActivity>(ComposeKeyboardActivity::class.java, XMLKeyboardActivity::class.java)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
deleted file mode 100644
index 15ffc09e7..000000000
--- a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/KeyboardManagerActivity.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-
-Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-package com.splendo.kaluga.example.keyboard
-
-import android.os.Bundle
-import androidx.appcompat.widget.AppCompatButton
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
-import com.splendo.kaluga.keyboard.ViewFocusHandler
-import com.splendo.kaluga.keyboard.keyboardManagerBuilder
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class KeyboardManagerActivity : KalugaViewModelActivity<KeyboardViewModel>(R.layout.activity_keyboard_manager) {
-
-    override val viewModel: KeyboardViewModel by viewModel {
-        parametersOf(
-            keyboardManagerBuilder(),
-            ViewFocusHandler(R.id.edit_field)
-        )
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        findViewById<AppCompatButton>(R.id.btn_show_keyboard).setOnClickListener { viewModel.onShowPressed() }
-        findViewById<AppCompatButton>(R.id.btn_hide_keyboard).setOnClickListener { viewModel.onHidePressed() }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
new file mode 100644
index 000000000..423c1914e
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
@@ -0,0 +1,111 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.keyboard.compose
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.input.ImeAction
+import com.google.android.material.composethemeadapter.MdcTheme
+import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
+import com.splendo.kaluga.keyboard.KeyboardManager
+import com.splendo.kaluga.keyboard.compose.ComposeClearFocusHandler
+import com.splendo.kaluga.keyboard.compose.ComposeFocusHandler
+import com.splendo.kaluga.resources.compose.Composable
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class ComposeKeyboardActivity : AppCompatActivity() {
+    @SuppressLint("MissingSuperCall") // Lint bug
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            CompositionLocalProvider(
+                LocalAppCompatActivity provides this
+            ) {
+                KeyboardLayout()
+            }
+        }
+    }
+}
+
+@Composable
+fun KeyboardLayout() {
+    MdcTheme {
+        val focusHandler = LocalFocusManager.current
+        val viewModel = storeAndRemember {
+            KeyboardViewModel(
+                KeyboardManager.Builder(
+                    clearFocusHandler = ComposeClearFocusHandler(MutableStateFlow(focusHandler))
+                ),
+                ComposeFocusHandler(FocusRequester.Default)
+            )
+        }
+
+        ViewModelComposable(viewModel) {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(Constants.Padding.default)
+                    .verticalScroll(rememberScrollState())
+            ) {
+                var text by remember {
+                    mutableStateOf("")
+                }
+                OutlinedTextField(
+                    value = text,
+                    onValueChange = { text = it },
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .focusRequester(FocusRequester.Default),
+                    keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+                    keyboardActions = KeyboardActions(
+                        onDone = { focusHandler.clearFocus() }
+                    )
+                )
+                showButton.Composable(modifier = Modifier.fillMaxWidth())
+                hideButton.Composable(modifier = Modifier.fillMaxWidth())
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt
new file mode 100644
index 000000000..dc16bdf35
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt
@@ -0,0 +1,48 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.keyboard.xml
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.ActivityKeyboardManagerBinding
+import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
+import com.splendo.kaluga.keyboard.ViewFocusHandler
+import com.splendo.kaluga.keyboard.keyboardManagerBuilder
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class XMLKeyboardActivity : KalugaViewModelActivity<KeyboardViewModel>() {
+
+    override val viewModel: KeyboardViewModel by viewModel {
+        parametersOf(
+            keyboardManagerBuilder(),
+            ViewFocusHandler(R.id.edit_field)
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityKeyboardManagerBinding.inflate(LayoutInflater.from(this), null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
index 846c75ea4..478d6ee72 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
@@ -30,7 +30,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import java.net.URL
 
-class LinksActivity : KalugaViewModelActivity<LinksViewModel>(R.layout.activity_link) {
+class LinksActivity : KalugaViewModelActivity<LinksViewModel>() {
 
     override val viewModel: LinksViewModel by viewModel {
         parametersOf(
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
index 11468040e..89a0bf9e0 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/loading/LoadingActivity.kt
@@ -1,45 +1,24 @@
 /*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
-Copyright 2022 Splendo Consulting B.V. The Netherlands
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
 
-     http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
+ */
 
 package com.splendo.kaluga.example.loading
 
-import android.annotation.SuppressLint
-import android.os.Bundle
-import androidx.appcompat.widget.AppCompatButton
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
-import com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-@SuppressLint("SetTextI18n")
-class LoadingActivity : KalugaViewModelActivity<HudViewModel>(R.layout.activity_loading) {
-
-    override val viewModel: HudViewModel by viewModel()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        findViewById<AppCompatButton>(R.id.btn_show_loading_indicator_system).setOnClickListener {
-            viewModel.onShowSystemPressed()
-        }
+import com.splendo.kaluga.example.compose.ComposeOrXMLActivity
+import com.splendo.kaluga.example.loading.compose.ComposeLoadingActivity
+import com.splendo.kaluga.example.loading.xml.XMLLoadingActivity
 
-        findViewById<AppCompatButton>(R.id.btn_show_loading_indicator_custom).setOnClickListener {
-            viewModel.onShowCustomPressed()
-        }
-    }
-}
+class LoadingActivity : ComposeOrXMLActivity<ComposeLoadingActivity, XMLLoadingActivity>(ComposeLoadingActivity::class.java, XMLLoadingActivity::class.java)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
new file mode 100644
index 000000000..8c2af595f
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
@@ -0,0 +1,78 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.loading.compose
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import com.google.android.material.composethemeadapter.MdcTheme
+import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel
+import com.splendo.kaluga.hud.hudBuilder
+import com.splendo.kaluga.resources.compose.Composable
+
+class ComposeLoadingActivity : AppCompatActivity() {
+    @SuppressLint("MissingSuperCall") // Lint bug
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            CompositionLocalProvider(
+                LocalAppCompatActivity provides this
+            ) {
+                LoadingLayout()
+            }
+        }
+    }
+}
+
+@Composable
+fun LoadingLayout() {
+    MdcTheme {
+        val activity = LocalAppCompatActivity.current!!
+        val viewModel = storeAndRemember {
+            HudViewModel(activity.hudBuilder())
+        }
+
+        ViewModelComposable(viewModel) {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(Constants.Padding.default)
+                    .verticalScroll(rememberScrollState())
+            ) {
+                showSystemButton.Composable(modifier = Modifier.fillMaxWidth())
+                showCustomButton.Composable(modifier = Modifier.fillMaxWidth())
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/loading/xml/XMLLoadingActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/loading/xml/XMLLoadingActivity.kt
new file mode 100644
index 000000000..23da2a9fb
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/loading/xml/XMLLoadingActivity.kt
@@ -0,0 +1,41 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.loading.xml
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.LayoutInflater
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityLoadingBinding
+import com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+@SuppressLint("SetTextI18n")
+class XMLLoadingActivity : KalugaViewModelActivity<HudViewModel>() {
+
+    override val viewModel: HudViewModel by viewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityLoadingBinding.inflate(LayoutInflater.from(this), null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
index 0ef45e6d2..e8d73e09d 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
@@ -20,16 +20,15 @@ package com.splendo.kaluga.example.location
 
 import android.content.Intent
 import android.os.Bundle
-import androidx.appcompat.widget.AppCompatButton
-import androidx.appcompat.widget.AppCompatTextView
+import android.view.LayoutInflater
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.ActivityLocationBinding
 import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
 import com.splendo.kaluga.permissions.location.LocationPermission
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
-class LocationActivity : KalugaViewModelActivity<LocationViewModel>(R.layout.activity_location) {
+class LocationActivity : KalugaViewModelActivity<LocationViewModel>() {
 
     companion object {
         private val permission = LocationPermission(background = false, precise = true)
@@ -42,16 +41,21 @@ class LocationActivity : KalugaViewModelActivity<LocationViewModel>(R.layout.act
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        findViewById<AppCompatButton>(R.id.enable_background).setOnClickListener {
+        val binding = ActivityLocationBinding.inflate(LayoutInflater.from(this), null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+
+        binding.enableBackground.setOnClickListener {
             startService(Intent(applicationContext, LocationBackgroundService::class.java))
         }
 
-        findViewById<AppCompatButton>(R.id.disable_background).setOnClickListener {
+        binding.disableBackground.setOnClickListener {
             stopService(Intent(applicationContext, LocationBackgroundService::class.java))
         }
 
         viewModel.location.observeInitialized {
-            val info = findViewById<AppCompatTextView>(R.id.info)
+            val info = binding.info
             info.text = it
             info.animate().withEndAction {
                 info.animate().setDuration(10000).alpha(0.12f).start()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionActivity.kt
similarity index 67%
rename from example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionActivity.kt
index 0738ec653..f822454de 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionActivity.kt
@@ -18,20 +18,19 @@
 package com.splendo.kaluga.example.permissions
 
 import android.os.Bundle
-import android.view.View
-import android.widget.TextView
+import android.view.LayoutInflater
 import android.widget.Toast
-import androidx.appcompat.widget.AppCompatButton
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.ActivityPermissionBinding
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
-class PermissionsDemoActivity : KalugaViewModelActivity<PermissionViewModel>(R.layout.activity_permissions_demo) {
+class PermissionActivity : KalugaViewModelActivity<PermissionViewModel>() {
 
     override val viewModel: PermissionViewModel by viewModel {
         intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))?.let { permissionView ->
@@ -42,17 +41,12 @@ class PermissionsDemoActivity : KalugaViewModelActivity<PermissionViewModel>(R.l
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        supportActionBar?.title = intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))?.title
+        val binding = ActivityPermissionBinding.inflate(LayoutInflater.from(this), null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
 
-        viewModel.permissionStateMessage.observe {
-            findViewById<TextView>(R.id.permissions_message).text = it
-        }
-
-        viewModel.showPermissionButton.observe {
-            findViewById<AppCompatButton>(R.id.btn_permissions_bluetooth_request_permissions).visibility = if (it == true) View.VISIBLE else View.GONE
-        }
-
-        findViewById<AppCompatButton>(R.id.btn_permissions_bluetooth_request_permissions).setOnClickListener { viewModel.requestPermission() }
+        supportActionBar?.title = viewModel.title
 
         viewModel.requestMessage.observeInitialized { message ->
             if (message != null) Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsListActivity.kt
similarity index 77%
rename from example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsListActivity.kt
index 48fdd892b..ec3f4fdcb 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoListActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsListActivity.kt
@@ -21,23 +21,25 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatButton
+import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.ActivityPermissionsListBinding
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
-class PermissionsDemoListActivity : KalugaViewModelActivity<PermissionsListViewModel>(R.layout.activity_permissions_list) {
+class PermissionsListActivity : KalugaViewModelActivity<PermissionsListViewModel>() {
 
     override val viewModel: PermissionsListViewModel by viewModel {
         parametersOf(
             ActivityNavigator<PermissionsListNavigationAction> {
-                NavigationSpec.Activity<PermissionsDemoActivity>()
+                NavigationSpec.Activity<PermissionActivity>()
             }
         )
     }
@@ -45,15 +47,25 @@ class PermissionsDemoListActivity : KalugaViewModelActivity<PermissionsListViewM
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val adapter = PermissionsAdapter(viewModel).apply {
-            findViewById<RecyclerView>(R.id.permissions_list).adapter = this
-        }
-        viewModel.permissions.observeInitialized { adapter.permissions = it }
+        val binding = ActivityPermissionsListBinding.inflate(LayoutInflater.from(this), null, false)
+        binding.permissionsList.adapter = PermissionsAdapter(viewModel)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
     }
 }
 
 class PermissionsAdapter(private val viewModel: PermissionsListViewModel) : RecyclerView.Adapter<PermissionsAdapter.PermissionsViewHolder>() {
 
+    companion object {
+        @BindingAdapter("permissions")
+        @JvmStatic
+        fun bindPermissions(view: RecyclerView, permissions: List<PermissionView>?) {
+            val adapter = (view.adapter as? PermissionsAdapter) ?: return
+            adapter.permissions = permissions.orEmpty()
+        }
+    }
+
     class PermissionsViewHolder(val button: AppCompatButton) : RecyclerView.ViewHolder(button)
 
     var permissions: List<PermissionView> = emptyList()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt
index a587071fb..2861e0680 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/ResourcesActivity.kt
@@ -1,75 +1,24 @@
-package com.splendo.kaluga.example.resources
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityResourcesBinding
-import com.splendo.kaluga.example.databinding.ViewListButtonBinding
-import com.splendo.kaluga.example.shared.viewmodel.resources.Resource
-import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class ResourcesActivity : KalugaViewModelActivity<ResourcesListViewModel>() {
-    override val viewModel: ResourcesListViewModel by viewModel {
-        parametersOf(
-            ActivityNavigator<ResourcesListNavigationAction> { action ->
-                when (action) {
-                    is ResourcesListNavigationAction.Label -> NavigationSpec.Activity<LabelActivity>()
-                    is ResourcesListNavigationAction.Color -> NavigationSpec.Activity<ColorActivity>()
-                    is ResourcesListNavigationAction.Button -> NavigationSpec.Activity<ButtonActivity>()
-                }
-            }
-        )
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
-        val binding = ActivityResourcesBinding.inflate(layoutInflater, null, false)
-        setContentView(binding.root)
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-        val adapter = ResourcesAdapter(viewModel).apply {
+      http://www.apache.org/licenses/LICENSE-2.0
 
-            binding.resourcesList.adapter = this
-        }
-        viewModel.resources.observeInitialized { adapter.resources = it }
-    }
-}
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
-class ResourcesAdapter(private val viewModel: ResourcesListViewModel) :
-    RecyclerView.Adapter<ResourcesAdapter.ResourceViewHolder>() {
+ */
 
-    class ResourceViewHolder(val binding: ViewListButtonBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        val button = binding.button
-    }
-
-    var resources: List<Resource> = emptyList()
-        set(newValue) {
-            field = newValue
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResourceViewHolder {
-        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ResourceViewHolder(binding)
-    }
+package com.splendo.kaluga.example.resources
 
-    override fun getItemCount(): Int = resources.size
+import com.splendo.kaluga.example.compose.ComposeOrXMLActivity
+import com.splendo.kaluga.example.resources.compose.ComposeResourcesActivity
+import com.splendo.kaluga.example.resources.xml.XMLResourcesActivity
 
-    override fun onBindViewHolder(holder: ResourceViewHolder, position: Int) {
-        resources.getOrNull(position)?.let { resource ->
-            holder.button.text = resource.title
-            holder.button.setOnClickListener { viewModel.onResourceSelected(resource) }
-        } ?: run {
-            holder.button.text = null
-            holder.button.setOnClickListener(null)
-        }
-    }
-}
+class ResourcesActivity : ComposeOrXMLActivity<ComposeResourcesActivity, XMLResourcesActivity>(ComposeResourcesActivity::class.java, XMLResourcesActivity::class.java)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ButtonsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ButtonsLayout.kt
new file mode 100644
index 000000000..076f9e170
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ButtonsLayout.kt
@@ -0,0 +1,60 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.resources.compose
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import com.splendo.kaluga.alerts.alertPresenterBuilder
+import com.splendo.kaluga.architecture.compose.state
+import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel
+import com.splendo.kaluga.resources.StyledStringBuilder
+import com.splendo.kaluga.resources.compose.Composable
+
+@Composable
+fun ButtonsLayout() {
+    val activity = LocalAppCompatActivity.current!!
+    val viewModel = storeAndRemember {
+        ButtonViewModel(StyledStringBuilder.Provider(), activity.alertPresenterBuilder())
+    }
+
+    ViewModelComposable(viewModel) {
+        val buttons by buttons.state()
+        Column(
+            verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(Constants.Padding.default)
+                .verticalScroll(rememberScrollState())
+        ) {
+            buttons.forEach {
+                it.Composable(modifier = Modifier.fillMaxWidth())
+            }
+        }
+    }
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
new file mode 100644
index 000000000..cad02e808
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
@@ -0,0 +1,161 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+  
+ */
+
+package com.splendo.kaluga.example.resources.compose
+
+import android.view.KeyEvent
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.unit.dp
+import com.splendo.kaluga.alerts.alertPresenterBuilder
+import com.splendo.kaluga.architecture.compose.state
+import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
+import com.splendo.kaluga.resources.compose.Composable
+import com.splendo.kaluga.resources.compose.backgroundStyle
+import com.splendo.kaluga.resources.stylable.BackgroundStyle
+
+@Composable
+fun ColorsLayout() {
+    val activity = LocalAppCompatActivity.current!!
+    val viewModel = storeAndRemember {
+        ColorViewModel(activity.alertPresenterBuilder())
+    }
+    
+    ViewModelComposable(viewModel) {
+        Column(
+            verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(Constants.Padding.default)
+                .verticalScroll(rememberScrollState())
+        ) {
+            val mainColorSize = 80.dp
+            val backdropText by backdropText.state()
+            val sourceText by sourceText.state()
+            val backdropColorBackground by backdropColorBackground.state()
+            val blendedColorBackground by blendedColorBackground.state()
+            val sourceColorBackground by sourceColorBackground.state()
+            val blendModeButton by blendModeButton.state()
+            val lightenBackdrops by lightenBackdrops.state()
+            val darkenBackdrops by darkenBackdrops.state()
+            val lightenSource by lightenSource.state()
+            val darkenSource by darkenSource.state()
+            val lightenBlended by lightenBlended.state()
+            val darkenBlended by darkenBlended.state()
+
+            val focusManager = LocalFocusManager.current
+
+            Row(Modifier.fillMaxWidth()) {
+                Column(Modifier.width(mainColorSize)) {
+                    var backdropTempText by remember { mutableStateOf(backdropText) }
+                    Box(modifier = Modifier
+                        .size(mainColorSize)
+                        .backgroundStyle(backdropColorBackground))
+                    OutlinedTextField(
+                        value = backdropTempText,
+                        onValueChange = { backdropTempText = it },
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .onFocusChanged { if (!it.hasFocus) submitBackdropText(backdropTempText) },
+                        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+                        keyboardActions = KeyboardActions(
+                            onDone = { focusManager.clearFocus() }
+                        )
+                    )
+                }
+                Spacer(modifier = Modifier.weight(1.0f))
+                Box(modifier = Modifier
+                    .size(mainColorSize)
+                    .backgroundStyle(blendedColorBackground))
+                Spacer(modifier = Modifier.weight(1.0f))
+                Column(Modifier.width(mainColorSize)) {
+                    var sourceTempText by remember { mutableStateOf(sourceText) }
+                    Box(modifier = Modifier
+                        .size(mainColorSize)
+                        .backgroundStyle(sourceColorBackground))
+                    OutlinedTextField(
+                        value = sourceTempText,
+                        onValueChange = { sourceTempText = it },
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .onFocusChanged { if (!it.hasFocus) submitSourceText(sourceTempText) },
+                        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+                        keyboardActions = KeyboardActions(
+                            onDone = { focusManager.clearFocus() }
+                        )
+                    )
+                }
+            }
+
+            blendModeButton.Composable(modifier = Modifier.fillMaxWidth())
+            flipButton.Composable(modifier = Modifier.fillMaxWidth())
+
+            ListOfColors(lightenBackdrops)
+            ListOfColors(darkenBackdrops)
+            ListOfColors(lightenSource)
+            ListOfColors(darkenSource)
+            ListOfColors(lightenBlended)
+            ListOfColors(darkenBlended)
+        }
+    }
+}
+
+@Composable
+fun ListOfColors(list: List<BackgroundStyle>) {
+    Row(
+        Modifier
+            .fillMaxWidth()
+            .horizontalScroll(rememberScrollState())) {
+        list.forEach {
+            Box(modifier = Modifier
+                .size(40.dp)
+                .backgroundStyle(it))
+        }
+    }
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/LabelsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/LabelsLayout.kt
new file mode 100644
index 000000000..ab6db0c93
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/LabelsLayout.kt
@@ -0,0 +1,57 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.resources.compose
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import com.splendo.kaluga.architecture.compose.state
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
+import com.splendo.kaluga.resources.StyledStringBuilder
+import com.splendo.kaluga.resources.compose.Composable
+
+@Composable
+fun LabelsLayout() {
+    val viewModel = storeAndRemember {
+        LabelViewModel(StyledStringBuilder.Provider())
+    }
+
+    ViewModelComposable(viewModel) {
+        val labels by labels.state()
+        Column(
+            verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(Constants.Padding.default)
+                .verticalScroll(rememberScrollState())
+        ) {
+            labels.forEach {
+                it.Composable(modifier = Modifier.fillMaxWidth())
+            }
+        }
+    }
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
new file mode 100644
index 000000000..c17eb39be
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
@@ -0,0 +1,113 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.resources.compose
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Button
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import com.google.android.material.composethemeadapter.MdcTheme
+import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
+import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
+import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
+import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
+import com.splendo.kaluga.architecture.compose.navigation.SetupNavHost
+import com.splendo.kaluga.architecture.compose.navigation.next
+import com.splendo.kaluga.architecture.compose.navigation.route
+import com.splendo.kaluga.architecture.compose.state
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.example.compose.Constants
+
+class ComposeResourcesActivity : AppCompatActivity() {
+    @SuppressLint("MissingSuperCall") // Lint bug
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            CompositionLocalProvider(
+                LocalAppCompatActivity provides this
+            ) {
+                ResourcesLayout()
+            }
+        }
+    }
+}
+
+@Composable
+fun ResourcesLayout() {
+    MdcTheme {
+        val navigator = RouteNavigator<ResourcesListNavigationAction>(rememberNavController()) { action ->
+            when (action) {
+                is ResourcesListNavigationAction.Button -> action.next
+                is ResourcesListNavigationAction.Color -> action.next
+                is ResourcesListNavigationAction.Label -> action.next
+            }
+        }
+
+        navigator.SetupNavHost(
+            rootView = {
+                ResourcesListLayout(navigator = navigator)
+            }
+        ) {
+            composable(ResourcesListNavigationAction.Button.route()) { ButtonsLayout() }
+            composable(ResourcesListNavigationAction.Color.route()) { ColorsLayout() }
+            composable(ResourcesListNavigationAction.Label.route()) { LabelsLayout() }
+        }
+    }
+}
+
+@Composable
+fun ResourcesListLayout(navigator: Navigator<ResourcesListNavigationAction>) {
+    val viewModel = storeAndRemember {
+        ResourcesListViewModel(navigator)
+    }
+    ViewModelComposable(viewModel) {
+        Column(
+            verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(Constants.Padding.default)
+                .verticalScroll(rememberScrollState())
+        ) {
+            val resources by resources.state()
+            resources.forEach {
+                Button(
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = { onResourceSelected(it) }) {
+                    Text(it.title)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonsActivity.kt
similarity index 58%
rename from example/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonsActivity.kt
index 9a38060f6..e914534b1 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/ButtonActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonsActivity.kt
@@ -1,27 +1,29 @@
 /*
- * Copyright 2022 Splendo Consulting B.V. The Netherlands
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
  */
 
-package com.splendo.kaluga.example.resources
+package com.splendo.kaluga.example.resources.xml
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityResourcesBinding
+import com.splendo.kaluga.example.databinding.ActivityButtonBinding
 import com.splendo.kaluga.example.databinding.ViewListButtonBinding
 import com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel
 import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
@@ -36,20 +38,26 @@ class ButtonActivity : KalugaViewModelActivity<ButtonViewModel>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val binding = ActivityResourcesBinding.inflate(layoutInflater, null, false)
+        val binding = ActivityButtonBinding.inflate(layoutInflater, null, false)
+        binding.buttonsList.adapter = ButtonAdapter()
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
         setContentView(binding.root)
-
-        val adapter = ButtonAdapter().apply {
-
-            binding.resourcesList.adapter = this
-        }
-        viewModel.buttons.observeInitialized { adapter.buttons = it }
-        binding.resourcesList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
+        binding.buttonsList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
     }
 }
 
 class ButtonAdapter : RecyclerView.Adapter<ButtonAdapter.ButtonViewHolder>() {
 
+    companion object {
+        @BindingAdapter("buttons")
+        @JvmStatic
+        fun bindButtons(view: RecyclerView, buttons: List<KalugaButton>?) {
+            val adapter = (view.adapter as? ButtonAdapter) ?: return
+            adapter.buttons = buttons.orEmpty()
+        }
+    }
+
     class ButtonViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
         val button = binding.button
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
similarity index 63%
rename from example/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
index 105ffca09..b3b296c9c 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/ColorActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
@@ -1,28 +1,26 @@
 /*
- * Copyright 2022 Splendo Consulting B.V. The Netherlands
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
  */
 
-package com.splendo.kaluga.example.resources
+package com.splendo.kaluga.example.resources.xml
 
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import android.widget.Button
-import android.widget.TextView
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
@@ -31,11 +29,7 @@ import com.splendo.kaluga.example.databinding.ViewResourceListBackgroundBinding
 import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
 import com.splendo.kaluga.resources.DefaultColors
 import com.splendo.kaluga.resources.stylable.BackgroundStyle
-import com.splendo.kaluga.resources.view.KalugaButton
-import com.splendo.kaluga.resources.view.KalugaLabel
 import com.splendo.kaluga.resources.view.applyBackgroundStyle
-import com.splendo.kaluga.resources.view.bindButton
-import com.splendo.kaluga.resources.view.bindLabel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class ColorActivity : KalugaViewModelActivity<ColorViewModel>() {
@@ -78,6 +72,15 @@ class ColorActivity : KalugaViewModelActivity<ColorViewModel>() {
 
 class BackgroundAdapter : RecyclerView.Adapter<BackgroundAdapter.BackgroundViewHolder>() {
 
+    companion object {
+        @BindingAdapter("backgroundStyles")
+        @JvmStatic
+        fun bindBackgroundStyles(view: RecyclerView, backgroundStyles: List<BackgroundStyle>?) {
+            val adapter = (view.adapter as? BackgroundAdapter) ?: return
+            adapter.backgrounds = backgroundStyles.orEmpty()
+        }
+    }
+
     class BackgroundViewHolder(val binding: ViewResourceListBackgroundBinding) : RecyclerView.ViewHolder(binding.root) {
         val view = binding.root
     }
@@ -103,37 +106,3 @@ class BackgroundAdapter : RecyclerView.Adapter<BackgroundAdapter.BackgroundViewH
         }
     }
 }
-
-object ResourcesBinding {
-
-    @BindingAdapter("button")
-    @JvmStatic
-    fun bindButton(view: Button, button: KalugaButton?) {
-        button?.let {
-            view.bindButton(it)
-        }
-    }
-
-    @BindingAdapter("label")
-    @JvmStatic
-    fun bindLabel(view: TextView, label: KalugaLabel?) {
-        label?.let {
-            view.bindLabel(it)
-        }
-    }
-
-    @BindingAdapter("backgroundStyle")
-    @JvmStatic
-    fun bindBackgroundStyle(view: View, backgroundStyle: BackgroundStyle?) {
-        backgroundStyle?.let {
-            view.applyBackgroundStyle(it)
-        }
-    }
-
-    @BindingAdapter("backgrounds")
-    @JvmStatic
-    fun bindBackgrounds(recyclerView: RecyclerView, backgrounds: List<BackgroundStyle>?) {
-        val adapter = recyclerView.adapter as? BackgroundAdapter ?: return
-        adapter.backgrounds = backgrounds ?: emptyList()
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/LabelsActivity.kt
similarity index 57%
rename from example/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/resources/xml/LabelsActivity.kt
index 9addfb939..b761ad0e5 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/LabelActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/LabelsActivity.kt
@@ -1,27 +1,29 @@
 /*
- * Copyright 2022 Splendo Consulting B.V. The Netherlands
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
  */
 
-package com.splendo.kaluga.example.resources
+package com.splendo.kaluga.example.resources.xml
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.databinding.ActivityResourcesBinding
+import com.splendo.kaluga.example.databinding.ActivityLabelBinding
 import com.splendo.kaluga.example.databinding.ViewListTextViewBinding
 import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
 import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
@@ -36,20 +38,26 @@ class LabelActivity : KalugaViewModelActivity<LabelViewModel>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val binding = ActivityResourcesBinding.inflate(layoutInflater, null, false)
+        val binding = ActivityLabelBinding.inflate(layoutInflater, null, false)
+        binding.labelsList.adapter = LabelAdapter()
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
         setContentView(binding.root)
-
-        val adapter = LabelAdapter().apply {
-
-            binding.resourcesList.adapter = this
-        }
-        binding.resourcesList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
-        viewModel.labels.observeInitialized { adapter.labels = it }
+        binding.labelsList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
     }
 }
 
 class LabelAdapter : RecyclerView.Adapter<LabelAdapter.LabelViewHolder>() {
 
+    companion object {
+        @BindingAdapter("labels")
+        @JvmStatic
+        fun bindLabels(view: RecyclerView, labels: List<KalugaLabel>?) {
+            val adapter = (view.adapter as? LabelAdapter) ?: return
+            adapter.labels = labels.orEmpty()
+        }
+    }
+
     class LabelViewHolder(val binding: ViewListTextViewBinding) : RecyclerView.ViewHolder(binding.root) {
         val label = binding.label
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt
new file mode 100644
index 000000000..71b32caf5
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt
@@ -0,0 +1,99 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.resources.xml
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityResourcesBinding
+import com.splendo.kaluga.example.databinding.ViewListButtonBinding
+import com.splendo.kaluga.example.shared.viewmodel.resources.Resource
+import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class XMLResourcesActivity : KalugaViewModelActivity<ResourcesListViewModel>() {
+    override val viewModel: ResourcesListViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<ResourcesListNavigationAction> { action ->
+                when (action) {
+                    is ResourcesListNavigationAction.Label -> NavigationSpec.Activity<LabelActivity>()
+                    is ResourcesListNavigationAction.Color -> NavigationSpec.Activity<ColorActivity>()
+                    is ResourcesListNavigationAction.Button -> NavigationSpec.Activity<ButtonActivity>()
+                }
+            }
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityResourcesBinding.inflate(layoutInflater, null, false)
+        binding.resourcesList.adapter = ResourcesAdapter(viewModel)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+    }
+}
+
+class ResourcesAdapter(private val viewModel: ResourcesListViewModel) :
+    RecyclerView.Adapter<ResourcesAdapter.ResourceViewHolder>() {
+
+    companion object {
+        @BindingAdapter("resources")
+        @JvmStatic
+        fun bindResources(view: RecyclerView, resources: List<Resource>?) {
+            val adapter = (view.adapter as? ResourcesAdapter) ?: return
+            adapter.resources = resources.orEmpty()
+        }
+    }
+
+    class ResourceViewHolder(val binding: ViewListButtonBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+        val button = binding.button
+    }
+
+    var resources: List<Resource> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResourceViewHolder {
+        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ResourceViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = resources.size
+
+    override fun onBindViewHolder(holder: ResourceViewHolder, position: Int) {
+        resources.getOrNull(position)?.let { resource ->
+            holder.button.text = resource.title
+            holder.button.setOnClickListener { viewModel.onResourceSelected(resource) }
+        } ?: run {
+            holder.button.text = null
+            holder.button.setOnClickListener(null)
+        }
+    }
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
index 4a1a63290..631ef9267 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
@@ -20,11 +20,12 @@ package com.splendo.kaluga.example.system
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
+import com.splendo.kaluga.example.databinding.ActivitySystemBinding
 import com.splendo.kaluga.example.databinding.ViewListButtonBinding
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemFeatures
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationActions
@@ -32,7 +33,7 @@ import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
-class SystemActivity : KalugaViewModelActivity<SystemViewModel>(R.layout.activity_system) {
+class SystemActivity : KalugaViewModelActivity<SystemViewModel>() {
     override val viewModel: SystemViewModel by viewModel {
         parametersOf(
             ActivityNavigator<SystemNavigationActions> { action ->
@@ -46,13 +47,11 @@ class SystemActivity : KalugaViewModelActivity<SystemViewModel>(R.layout.activit
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val adapter = SystemFeatureAdapter(viewModel).apply {
-            findViewById<RecyclerView>(R.id.system_features_list).adapter = this
-        }
-
-        viewModel.modules.observeInitialized {
-            adapter.modules = it
-        }
+        val binding = ActivitySystemBinding.inflate(LayoutInflater.from(this), null, false)
+        binding.systemFeaturesList.adapter = SystemFeatureAdapter(viewModel)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
     }
 }
 
@@ -60,11 +59,20 @@ class SystemFeatureAdapter(
     private val viewModel: SystemViewModel
 ) : RecyclerView.Adapter<SystemFeatureAdapter.SystemFeatureViewHolder>() {
 
+    companion object {
+        @BindingAdapter("systemFeatures")
+        @JvmStatic
+        fun bindSystemFeatures(view: RecyclerView, resources: List<SystemFeatures>?) {
+            val adapter = (view.adapter as? SystemFeatureAdapter) ?: return
+            adapter.systemFeatures = resources.orEmpty()
+        }
+    }
+
     inner class SystemFeatureViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
         val button = binding.button
     }
 
-    var modules: List<SystemFeatures> = emptyList()
+    var systemFeatures: List<SystemFeatures> = emptyList()
         set(newValue) {
             field = newValue
             notifyDataSetChanged()
@@ -76,7 +84,7 @@ class SystemFeatureAdapter(
     }
 
     override fun onBindViewHolder(holder: SystemFeatureViewHolder, position: Int) {
-        modules.getOrNull(position)?.let { feature ->
+        systemFeatures.getOrNull(position)?.let { feature ->
             holder.button.text = feature.name
             holder.button.setOnClickListener { viewModel.onButtonTapped(feature) }
         } ?: run {
@@ -85,5 +93,5 @@ class SystemFeatureAdapter(
         }
     }
 
-    override fun getItemCount(): Int = modules.size
+    override fun getItemCount(): Int = systemFeatures.size
 }
diff --git a/example/android/src/main/res/layout/activity_alerts.xml b/example/android/src/main/res/layout/activity_alerts.xml
index 74ea5dea3..8176a84d6 100644
--- a/example/android/src/main/res/layout/activity_alerts.xml
+++ b/example/android/src/main/res/layout/activity_alerts.xml
@@ -1,39 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel" />
+    </data>
+    <androidx.core.widget.NestedScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_simple_alert"
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/show_alert"/>
+            android:orientation="vertical"
+            android:padding="10dp">
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_dismissible_alert"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/dismissible_alert"/>
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_simple_alert"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:kalugaButton="@{viewModel.showAlertButton}"/>
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_alert_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/alert_list"/>
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_dismissible_alert"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                app:kalugaButton="@{viewModel.showAndDismissAfter3SecondsButton}"/>
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_alert_input_field"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/alert_input"/>
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_alert_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                app:kalugaButton="@{viewModel.showAlertWithInputButton}"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_alert_input_field"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                app:kalugaButton="@{viewModel.showAlertWithListButton}"/>
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
-</androidx.core.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_architecture_details.xml b/example/android/src/main/res/layout/activity_architecture_details.xml
index 584254b5a..eda34f47b 100644
--- a/example/android/src/main/res/layout/activity_architecture_details.xml
+++ b/example/android/src/main/res/layout/activity_architecture_details.xml
@@ -34,20 +34,18 @@
             android:id="@+id/inverse_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:onClick="@{view -> viewModel.onInversePressed()}"
             app:layout_constraintTop_toBottomOf="@id/number"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:text="@string/architecture_details_inverse"/>
+            app:kalugaButton="@{viewModel.inverseButton}"/>
 
         <androidx.appcompat.widget.AppCompatButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:onClick="@{view -> viewModel.onFinishPressed()}"
             app:layout_constraintTop_toBottomOf="@id/inverse_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:text="@string/architecture_finish"/>
+            app:kalugaButton="@{viewModel.finishButton}"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_architecture_input.xml b/example/android/src/main/res/layout/activity_architecture_input.xml
index c13f8c6c5..cb65056fe 100644
--- a/example/android/src/main/res/layout/activity_architecture_input.xml
+++ b/example/android/src/main/res/layout/activity_architecture_input.xml
@@ -65,7 +65,8 @@
             app:kalugaButton="@{viewModel.showBottomSheetButton}"
             app:layout_constraintTop_toBottomOf="@id/show_details_button"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="10dp"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_button.xml b/example/android/src/main/res/layout/activity_button.xml
new file mode 100644
index 000000000..71b53f2d6
--- /dev/null
+++ b/example/android/src/main/res/layout/activity_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:padding="10dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/buttons_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:buttons="@{viewModel.buttons.stateFlow}">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_compose_or_android_ui.xml b/example/android/src/main/res/layout/activity_compose_or_android_ui.xml
new file mode 100644
index 000000000..ff40589c6
--- /dev/null
+++ b/example/android/src/main/res/layout/activity_compose_or_android_ui.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.compose.ComposeOrXMLSelectionViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:padding="10dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/ui_types_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:uiTypes="@{viewModel.uiTypes.stateFlow}">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_date_time_picker.xml b/example/android/src/main/res/layout/activity_date_time_picker.xml
index f92a40694..891c345a7 100644
--- a/example/android/src/main/res/layout/activity_date_time_picker.xml
+++ b/example/android/src/main/res/layout/activity_date_time_picker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
         <variable
@@ -16,27 +16,27 @@
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="10dp">
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_select_date"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/select_date"
-            android:onClick="@{view -> viewModel.onSelectDatePressed()}"/>
+            app:kalugaButton="@{viewModel.selectDateButton}"/>
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_select_time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/select_time"
-            android:onClick="@{view -> viewModel.onSelectTimePressed()}"/>
+            app:kalugaButton="@{viewModel.selectTimeButton}"
+            android:layout_marginTop="10dp"/>
 
         <TextView
             android:id="@+id/current_time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/current_time"/>
+            android:text="@{viewModel.currentTimeTitle}"/>
 
         <TextView
             android:id="@+id/date_time"
diff --git a/example/android/src/main/res/layout/activity_keyboard_manager.xml b/example/android/src/main/res/layout/activity_keyboard_manager.xml
index 364a8b6c4..d00e58dc9 100644
--- a/example/android/src/main/res/layout/activity_keyboard_manager.xml
+++ b/example/android/src/main/res/layout/activity_keyboard_manager.xml
@@ -1,32 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel" />
+    </data>
+    <androidx.core.widget.NestedScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <EditText
-            android:id="@+id/edit_field"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+        android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_show_keyboard"
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/show_keyboard"/>
+            android:orientation="vertical">
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_hide_keyboard"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/hide_keyboard"/>
+            <EditText
+                android:id="@+id/edit_field"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_show_keyboard"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:kalugaButton="@{viewModel.showButton}"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_hide_keyboard"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:kalugaButton="@{viewModel.hideButton}"/>
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
-</androidx.core.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_label.xml b/example/android/src/main/res/layout/activity_label.xml
new file mode 100644
index 000000000..c6f98eebb
--- /dev/null
+++ b/example/android/src/main/res/layout/activity_label.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:padding="10dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/labels_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:labels="@{viewModel.labels.stateFlow}">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_loading.xml b/example/android/src/main/res/layout/activity_loading.xml
index 7a18b8ce4..2722291fa 100644
--- a/example/android/src/main/res/layout/activity_loading.xml
+++ b/example/android/src/main/res/layout/activity_loading.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel" />
+    </data>
+    <androidx.core.widget.NestedScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_show_loading_indicator_system"
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/show_loading_indicator_system"/>
+            android:orientation="vertical">
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_show_loading_indicator_custom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/show_loading_indicator_custom"/>
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_show_loading_indicator_system"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:kalugaButton="@{viewModel.showSystemButton}"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_show_loading_indicator_custom"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:kalugaButton="@{viewModel.showCustomButton}"/>
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
-</androidx.core.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_location.xml b/example/android/src/main/res/layout/activity_location.xml
index 12715da9c..1d3606d13 100644
--- a/example/android/src/main/res/layout/activity_location.xml
+++ b/example/android/src/main/res/layout/activity_location.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel" />
+    </data>
     <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"
diff --git a/example/android/src/main/res/layout/activity_permission.xml b/example/android/src/main/res/layout/activity_permission.xml
new file mode 100644
index 000000000..fabe68966
--- /dev/null
+++ b/example/android/src/main/res/layout/activity_permission.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel" />
+
+        <import type="android.view.View"/>
+    </data>
+    <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/permissions_message"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="20sp"
+                android:textAlignment="center"
+                android:padding="10dp"
+                android:text="@{viewModel.permissionStateMessage.stateFlow}"
+                tools:text="@string/permission_allowed" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_permissions_bluetooth_request_permissions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/permission_request"
+                android:visibility="@{ viewModel.showPermissionButton.stateFlow ? View.VISIBLE : View.GONE }"
+                android:onClick="@{ view -> viewModel.requestPermission() }"/>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </androidx.core.widget.NestedScrollView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_permissions_demo.xml b/example/android/src/main/res/layout/activity_permissions_demo.xml
deleted file mode 100644
index e76948d19..000000000
--- a/example/android/src/main/res/layout/activity_permissions_demo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/permissions_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:textAlignment="center"
-            android:padding="10dp"
-            tools:text="@string/permission_allowed" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_permissions_bluetooth_request_permissions"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/permission_request"/>
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_permissions_list.xml b/example/android/src/main/res/layout/activity_permissions_list.xml
index 9b358e3bb..a18fb68bc 100644
--- a/example/android/src/main/res/layout/activity_permissions_list.xml
+++ b/example/android/src/main/res/layout/activity_permissions_list.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/permissions_list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListViewModel" />
+    </data>
+    <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/permissions_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:permissions="@{viewModel.permissions.stateFlow}">
 
-</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
+    </androidx.recyclerview.widget.RecyclerView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_resources.xml b/example/android/src/main/res/layout/activity_resources.xml
index df84bfee3..d5e34f08e 100644
--- a/example/android/src/main/res/layout/activity_resources.xml
+++ b/example/android/src/main/res/layout/activity_resources.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel" />
+    </data>
     <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -10,7 +15,8 @@
             android:id="@+id/resources_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:resources="@{viewModel.resources.stateFlow}">
 
         </androidx.recyclerview.widget.RecyclerView>
 
diff --git a/example/android/src/main/res/layout/activity_resources_color.xml b/example/android/src/main/res/layout/activity_resources_color.xml
index 0c73058f8..94bb0c0cd 100644
--- a/example/android/src/main/res/layout/activity_resources_color.xml
+++ b/example/android/src/main/res/layout/activity_resources_color.xml
@@ -61,7 +61,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        app:button="@{viewModel.blendModeButton.stateFlow}"
+        app:kalugaButton="@{viewModel.blendModeButton.stateFlow}"
         app:layout_constraintStart_toStartOf="@id/blended"
         app:layout_constraintEnd_toEndOf="@id/blended"
         app:layout_constraintTop_toBottomOf="@id/blended"/>
@@ -71,7 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        app:button="@{viewModel.flipButton}"
+        app:kalugaButton="@{viewModel.flipButton}"
         app:layout_constraintStart_toStartOf="@id/blended"
         app:layout_constraintEnd_toEndOf="@id/blended"
         app:layout_constraintTop_toBottomOf="@id/blend_mode"/>
@@ -97,7 +97,7 @@
         app:layout_constraintTop_toBottomOf="@id/flip"
         android:orientation="horizontal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.lightenBackdrops.stateFlow}"
+        app:backgroundStyles="@{viewModel.lightenBackdrops.stateFlow}"
         tools:listitem="@layout/view_resource_list_background"
         />
 
@@ -109,7 +109,7 @@
         app:layout_constraintTop_toBottomOf="@id/backdrop_lighten"
         android:orientation="horizontal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.darkenBackdrops.stateFlow}"
+        app:backgroundStyles="@{viewModel.darkenBackdrops.stateFlow}"
         tools:listitem="@layout/view_resource_list_background"
         />
 
@@ -121,7 +121,7 @@
         app:layout_constraintTop_toBottomOf="@id/backdrop_darken"
         android:orientation="horizontal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.lightenSource.stateFlow}"
+        app:backgroundStyles="@{viewModel.lightenSource.stateFlow}"
         tools:listitem="@layout/view_resource_list_background"
         />
 
@@ -133,7 +133,7 @@
         app:layout_constraintTop_toBottomOf="@id/source_lighten"
         android:orientation="horizontal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.darkenSource.stateFlow}"
+        app:backgroundStyles="@{viewModel.darkenSource.stateFlow}"
         tools:listitem="@layout/view_resource_list_background"
         />
 
@@ -145,7 +145,7 @@
         app:layout_constraintTop_toBottomOf="@id/source_darken"
         android:orientation="horizontal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.lightenBlended.stateFlow}"
+        app:backgroundStyles="@{viewModel.lightenBlended.stateFlow}"
         tools:listitem="@layout/view_resource_list_background"
         />
 
@@ -157,7 +157,7 @@
         app:layout_constraintTop_toBottomOf="@id/blended_lighten"
         android:orientation="horizontal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:backgrounds="@{viewModel.darkenBlended.stateFlow}"
+        app:backgroundStyles="@{viewModel.darkenBlended.stateFlow}"
         tools:listitem="@layout/view_resource_list_background"
         />
 
diff --git a/example/android/src/main/res/layout/activity_system.xml b/example/android/src/main/res/layout/activity_system.xml
index 77a494611..6fcd59fdf 100644
--- a/example/android/src/main/res/layout/activity_system.xml
+++ b/example/android/src/main/res/layout/activity_system.xml
@@ -1,33 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-
-  -->
-<LinearLayout
-    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"
-    android:orientation="vertical"
-    android:layout_gravity="center_horizontal"
-    android:layout_margin="@dimen/networkLayoutsMargin">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/system_features_list"
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel" />
+    </data>
+    <LinearLayout
+        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="wrap_content"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="@dimen/networkLayoutsMargin">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/system_features_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:systemFeatures="@{viewModel.systemFeatures.stateFlow}"/>
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/fragment_bottom_sheet.xml b/example/android/src/main/res/layout/fragment_bottom_sheet.xml
new file mode 100644
index 000000000..0c8adee8f
--- /dev/null
+++ b/example/android/src/main/res/layout/fragment_bottom_sheet.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            android:text="@{viewModel.text}"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/text"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="10dp"
+            app:kalugaButton="@{viewModel.button}"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/fragment_bottom_sheet_root.xml b/example/android/src/main/res/layout/fragment_bottom_sheet_root.xml
new file mode 100644
index 000000000..137e1ce4c
--- /dev/null
+++ b/example/android/src/main/res/layout/fragment_bottom_sheet_root.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/fragment_container_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    </androidx.fragment.app.FragmentContainerView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/fragment_bottom_sheet_sub_page.xml b/example/android/src/main/res/layout/fragment_bottom_sheet_sub_page.xml
new file mode 100644
index 000000000..1625f839f
--- /dev/null
+++ b/example/android/src/main/res/layout/fragment_bottom_sheet_sub_page.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/close_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="X"
+            android:background="?android:attr/selectableItemBackground"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:onClick="@{view -> viewModel.onClosePressed()}"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@{viewModel.text}"
+            app:layout_constraintTop_toBottomOf="@id/close_button"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/fragment_features_list.xml b/example/android/src/main/res/layout/fragment_features_list.xml
index 25d5138a2..e101f7efd 100644
--- a/example/android/src/main/res/layout/fragment_features_list.xml
+++ b/example/android/src/main/res/layout/fragment_features_list.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/features_list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewModel" />
+    </data>
+    <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/features_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="10dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:features="@{viewModel.feature.stateFlow}">
 
-</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
+    </androidx.recyclerview.widget.RecyclerView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/fragment_info.xml b/example/android/src/main/res/layout/fragment_info.xml
index 1f333028f..798d885f2 100644
--- a/example/android/src/main/res/layout/fragment_info.xml
+++ b/example/android/src/main/res/layout/fragment_info.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/info_buttons"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel" />
+    </data>
+    <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/info_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:infoButtons="@{viewModel.buttons.stateFlow}">
 
-</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
+    </androidx.recyclerview.widget.RecyclerView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/values/strings.xml b/example/android/src/main/res/values/strings.xml
index b36b28e53..57804e927 100644
--- a/example/android/src/main/res/values/strings.xml
+++ b/example/android/src/main/res/values/strings.xml
@@ -112,4 +112,6 @@
     <string name="bottom_sheet_sheet_content">This is a bottom sheet</string>
     <string name="bottom_sheet_sheet_sub_page_title">Sheet Sub Page</string>
 
+    <string name="android_ui_compose">Compose Implementation</string>
+    <string name="android_ui_xml">XML Implementation</string>
 </resources>
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index 7de7b218d..0c82a2d00 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -30,11 +30,17 @@ import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDeta
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavigation
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageNavigation
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageViewModel
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListViewModel
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDeviceDetailViewModel
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewModel
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetails
+import com.splendo.kaluga.example.shared.viewmodel.compose.ComposeOrXMLNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.compose.ComposeOrXMLSelectionViewModel
 import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
 import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewModel
@@ -88,6 +94,10 @@ internal val androidModule = module {
         )
     }
 
+    viewModel { (navigator: Navigator<ComposeOrXMLNavigationAction>) ->
+        ComposeOrXMLSelectionViewModel(navigator)
+    }
+
     viewModel { (navigator: Navigator<PermissionsListNavigationAction>) ->
         PermissionsListViewModel(navigator)
     }
@@ -107,6 +117,14 @@ internal val androidModule = module {
         )
     }
 
+    viewModel { (navigator: Navigator<BottomSheetNavigation>) ->
+        BottomSheetViewModel(navigator)
+    }
+
+    viewModel { (navigator: Navigator<BottomSheetSubPageNavigation>) ->
+        BottomSheetSubPageViewModel(navigator)
+    }
+
     viewModel {
         AlertViewModel(AlertPresenter.Builder())
     }
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/ComposeOrAndroidUISelectionViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/ComposeOrXMLSelectionViewModel.kt
similarity index 67%
rename from example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/ComposeOrAndroidUISelectionViewModel.kt
rename to example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/ComposeOrXMLSelectionViewModel.kt
index 2761e90f7..dc9f30a63 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/ComposeOrAndroidUISelectionViewModel.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/compose/ComposeOrXMLSelectionViewModel.kt
@@ -24,32 +24,32 @@ import com.splendo.kaluga.architecture.observable.observableOf
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
 import com.splendo.kaluga.resources.localized
 
-sealed class ComposeOrAndroidUINavigationAction : SingleValueNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType) {
-    object Compose : ComposeOrAndroidUINavigationAction()
-    object AndroidUI : ComposeOrAndroidUINavigationAction()
+sealed class ComposeOrXMLNavigationAction : SingleValueNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType) {
+    object Compose : ComposeOrXMLNavigationAction()
+    object XML : ComposeOrXMLNavigationAction()
 }
 
 sealed class UIType(val title: String) {
     object Compose : UIType("android_ui_compose".localized())
-    object AndroidUI : UIType("android_ui_legacy".localized())
+    object XML : UIType("android_ui_xml".localized())
 }
 
-class ComposeOrAndroidUISelectionViewModel(
-    navigator: Navigator<ComposeOrAndroidUINavigationAction>
-) : NavigatingViewModel<ComposeOrAndroidUINavigationAction>(navigator) {
+class ComposeOrXMLSelectionViewModel(
+    navigator: Navigator<ComposeOrXMLNavigationAction>
+) : NavigatingViewModel<ComposeOrXMLNavigationAction>(navigator) {
 
     val uiTypes = observableOf(
         listOf(
             UIType.Compose,
-            UIType.AndroidUI
+            UIType.XML
         )
     )
 
     fun onUITypePressed(feature: UIType) {
         navigator.navigate(
             when (feature) {
-                is UIType.Compose -> ComposeOrAndroidUINavigationAction.Compose
-                is UIType.AndroidUI -> ComposeOrAndroidUINavigationAction.AndroidUI
+                is UIType.Compose -> ComposeOrXMLNavigationAction.Compose
+                is UIType.XML -> ComposeOrXMLNavigationAction.XML
             }
         )
     }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
index ead0a8223..fc82372e8 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
@@ -28,11 +28,11 @@ object ButtonStyles {
 
     val default by lazy {
         ButtonStyle(
-            TextStyles.whiteText,
-            backgroundColor = DefaultColors.mediumBlue,
-            pressedBackgroundColor = DefaultColors.darkBlue,
-            disabledBackgroundColor = DefaultColors.lightSlateGray,
-            shape = BackgroundStyle.Shape.Rectangle(10.0f)
+            TextStyles.defaultTitle,
+            backgroundColor = DefaultColors.lightGray,
+            pressedBackgroundColor = DefaultColors.gray,
+            disabledBackgroundColor = DefaultColors.dimGray,
+            shape = BackgroundStyle.Shape.Rectangle(4.0f)
         )
     }
 
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
index 5fe15bade..ef647044d 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
@@ -24,13 +24,18 @@ import com.splendo.kaluga.alerts.buildActionSheet
 import com.splendo.kaluga.alerts.buildAlert
 import com.splendo.kaluga.alerts.buildAlertWithInput
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.logging.debug
+import com.splendo.kaluga.resources.localized
+import com.splendo.kaluga.resources.view.KalugaButton
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
-class AlertViewModel(val builder: BaseAlertPresenter.Builder) : BaseLifecycleViewModel() {
+class AlertViewModel(val builder: BaseAlertPresenter.Builder, dismissTime: Duration = 3.seconds) : BaseLifecycleViewModel() {
 
-    fun showAlert() {
+    val showAlertButton = KalugaButton.Plain("show_alert".localized(), ButtonStyles.default) {
         coroutineScope.launch {
             val okAction = Alert.Action("OK", Alert.Action.Style.POSITIVE)
             val cancelAction = Alert.Action("Cancel", Alert.Action.Style.NEGATIVE)
@@ -46,22 +51,22 @@ class AlertViewModel(val builder: BaseAlertPresenter.Builder) : BaseLifecycleVie
         }
     }
 
-    fun showAndDismissAfter(timeSecs: Long) {
+    val showAndDismissAfter3SecondsButton = KalugaButton.Plain("dismissible_alert".localized(), ButtonStyles.default) {
         coroutineScope.launch {
             val job = launch {
                 builder.buildAlert(coroutineScope) {
-                    setTitle("Wait for $timeSecs sec...")
+                    setTitle("Wait for ${dismissTime.inWholeSeconds} sec...")
                     setPositiveButton("OK")
                 }.show()
             }
             launch {
-                delay(timeSecs * 1_000)
+                delay(dismissTime)
                 job.cancel()
             }
         }
     }
 
-    fun showAlertWithInput() {
+    val showAlertWithInputButton = KalugaButton.Plain("alert_list".localized(), ButtonStyles.default) {
         coroutineScope.launch {
             val okAction = Alert.Action("OK", Alert.Action.Style.POSITIVE)
             val cancelAction = Alert.Action("Cancel", Alert.Action.Style.NEGATIVE)
@@ -80,7 +85,7 @@ class AlertViewModel(val builder: BaseAlertPresenter.Builder) : BaseLifecycleVie
         }
     }
 
-    fun showAlertWithList() {
+    val showAlertWithListButton = KalugaButton.Plain("alert_input".localized(), ButtonStyles.default) {
         coroutineScope.launch {
             builder.buildActionSheet(this) {
                 setTitle("Select an option")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
index 4e5e7066b..9128b50c2 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
@@ -23,6 +23,9 @@ import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.observable.InitializedObservable
 import com.splendo.kaluga.architecture.observable.subjectOf
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
+import com.splendo.kaluga.resources.localized
+import com.splendo.kaluga.resources.view.KalugaButton
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -46,16 +49,16 @@ class ArchitectureDetailsViewModel(initialDetail: InputDetails, navigator: Navig
     private var nameResult: String by _name.valueDelegate
     private var numberResult: String by _number.valueDelegate
 
-    fun onInversePressed() {
+    val inverseButton = KalugaButton.Plain("architecture_details_inverse".localized(), ButtonStyles.default) {
         nameResult = nameResult.reversed()
         numberResult = numberResult.reversed()
     }
 
-    fun onBackPressed() {
-        navigator.navigate(ArchitectureDetailsNavigationAction.Close)
+    val finishButton = KalugaButton.Plain("architecture_finish".localized(), ButtonStyles.default) {
+        navigator.navigate(ArchitectureDetailsNavigationAction.FinishWithDetails(InputDetails(nameResult, numberResult.toIntOrNull() ?: 0)))
     }
 
-    fun onFinishPressed() {
-        navigator.navigate(ArchitectureDetailsNavigationAction.FinishWithDetails(InputDetails(nameResult, numberResult.toIntOrNull() ?: 0)))
+    fun onBackPressed() {
+        navigator.navigate(ArchitectureDetailsNavigationAction.Close)
     }
 }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt
index 9993ff153..53a89bc80 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt
@@ -21,6 +21,7 @@ import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.observable.ObservableOptional
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedSubject
 import com.splendo.kaluga.architecture.observable.toUninitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
@@ -55,14 +56,14 @@ class ArchitectureViewModel(navigator: Navigator<ArchitectureNavigationAction<*>
             it.isNotEmpty()
         }
     }
-    val isNameValid = _isNameValid.toUninitializedObservable(coroutineScope)
+    val isNameValid = _isNameValid.toInitializedObservable(false, coroutineScope)
 
     private val _isNumberValid: Flow<Boolean> get() {
         return _numberInput.map {
             it.toIntOrNull() != null
         }
     }
-    val isNumberValid = _isNumberValid.toUninitializedObservable(coroutineScope)
+    val isNumberValid = _isNumberValid.toInitializedObservable(false, coroutineScope)
 
     private val isValid = combine(_isNameValid, _isNumberValid) {
         validName, validNumber ->
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetViewModel.kt
index 2836c4699..0a865f8fb 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetViewModel.kt
@@ -20,7 +20,9 @@ package com.splendo.kaluga.example.shared.viewmodel.architecture
 import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.resources.localized
+import com.splendo.kaluga.resources.view.KalugaButton
 
 sealed class BottomSheetNavigation : NavigationAction<Nothing>(null) {
     object Close : BottomSheetNavigation()
@@ -30,9 +32,7 @@ sealed class BottomSheetNavigation : NavigationAction<Nothing>(null) {
 class BottomSheetViewModel(navigator: Navigator<BottomSheetNavigation>) : NavigatingViewModel<BottomSheetNavigation>(navigator) {
 
     val text = "bottom_sheet_sheet_content".localized()
-    val buttonText = "bottom_sheet_show_sub_page".localized()
-
-    fun onSubPagePressed() {
+    val button = KalugaButton.Plain("bottom_sheet_show_sub_page".localized(), ButtonStyles.default) {
         navigator.navigate(BottomSheetNavigation.SubPage)
     }
 
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
index 0a72e95f4..8bfd03c1f 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
@@ -1,5 +1,6 @@
 package com.splendo.kaluga.example.shared.viewmodel.datetimepicker
 
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.observable.toUninitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.base.text.DateFormatStyle
@@ -8,7 +9,9 @@ import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.datetimepicker.DateTimePickerPresenter
 import com.splendo.kaluga.datetimepicker.buildDatePicker
 import com.splendo.kaluga.datetimepicker.buildTimePicker
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.resources.localized
+import com.splendo.kaluga.resources.view.KalugaButton
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
@@ -25,9 +28,10 @@ class DateTimePickerViewModel(val dateTimePickerPresenterBuilder: DateTimePicker
             millisecond = 0
         }
     )
-    val dateLabel = selectedDate.map { formatter.format(it) }.toUninitializedObservable(coroutineScope)
+    val currentTimeTitle = "current_time".localized()
+    val dateLabel = selectedDate.map { formatter.format(it) }.toInitializedObservable("", coroutineScope)
 
-    fun onSelectDatePressed() {
+    val selectDateButton = KalugaButton.Plain("select_date".localized(), ButtonStyles.default) {
         coroutineScope.launch {
             dateTimePickerPresenterBuilder.buildDatePicker(
                 this,
@@ -43,7 +47,7 @@ class DateTimePickerViewModel(val dateTimePickerPresenterBuilder: DateTimePicker
         }
     }
 
-    fun onSelectTimePressed() {
+    val selectTimeButton = KalugaButton.Plain("select_time".localized(), ButtonStyles.default) {
         coroutineScope.launch {
             dateTimePickerPresenterBuilder.buildTimePicker(this) {
                 setSelectedDate(this@DateTimePickerViewModel.selectedDate.value)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
index 6f7d4d03f..01293ceb3 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
@@ -19,17 +19,20 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 package com.splendo.kaluga.example.shared.viewmodel.hud
 
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.hud.BaseHUD
 import com.splendo.kaluga.hud.HUDStyle
 import com.splendo.kaluga.hud.build
 import com.splendo.kaluga.hud.dismissAfter
 import com.splendo.kaluga.hud.presentDuring
+import com.splendo.kaluga.resources.localized
+import com.splendo.kaluga.resources.view.KalugaButton
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 class HudViewModel(val builder: BaseHUD.Builder) : BaseLifecycleViewModel() {
 
-    fun onShowSystemPressed() {
+    val showSystemButton = KalugaButton.Plain("show_loading_indicator_system".localized(), ButtonStyles.default) {
         // SYSTEM style by default
         // No title by default
         coroutineScope.launch {
@@ -37,7 +40,7 @@ class HudViewModel(val builder: BaseHUD.Builder) : BaseLifecycleViewModel() {
         }
     }
 
-    fun onShowCustomPressed() {
+    val showCustomButton = KalugaButton.Plain("show_loading_indicator_custom".localized(), ButtonStyles.default) {
         coroutineScope.launch {
             builder.build(this) {
                 setStyle(HUDStyle.CUSTOM)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
index c177e9aa4..1fca5c7fb 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
@@ -18,18 +18,21 @@
 package com.splendo.kaluga.example.shared.viewmodel.keyboard
 
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.keyboard.BaseKeyboardManager
 import com.splendo.kaluga.keyboard.FocusHandler
+import com.splendo.kaluga.resources.localized
+import com.splendo.kaluga.resources.view.KalugaButton
 
 class KeyboardViewModel(keyboardManagerBuilder: BaseKeyboardManager.Builder, private val editFieldFocusHandler: FocusHandler) : BaseLifecycleViewModel() {
 
     private val keyboardManager: BaseKeyboardManager = keyboardManagerBuilder.create(coroutineScope)
 
-    fun onShowPressed() {
+    val showButton = KalugaButton.Plain("show_keyboard".localized(), ButtonStyles.default) {
         keyboardManager.show(editFieldFocusHandler)
     }
 
-    fun onHidePressed() {
+    val hideButton = KalugaButton.Plain("hide_keyboard".localized(), ButtonStyles.default) {
         keyboardManager.hide()
     }
 }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
index 1872b1dbe..429fcacb5 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/PermissionViewModel.kt
@@ -38,6 +38,7 @@ private val permissionsDispatcher = singleThreadDispatcher("PermissionsDispatche
 
 class PermissionViewModel(private val permission: Permission) : BaseLifecycleViewModel(), KoinComponent {
 
+    val title = permission.name
     private val permissionsBuilder: PermissionsBuilder by inject()
 
     private val permissions = Permissions(permissionsBuilder, coroutineScope.coroutineContext + permissionsDispatcher)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
index bec3c7dfd..1a6ae21ba 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/system/SystemViewModel.kt
@@ -36,7 +36,7 @@ class SystemViewModel(
     navigator: Navigator<SystemNavigationActions>
 ) : NavigatingViewModel<SystemNavigationActions>(navigator) {
 
-    val modules =
+    val systemFeatures =
         observableOf(
             listOf(
                 SystemFeatures.Network
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index 15f243def..77faf8d0f 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -159,6 +159,7 @@ object Dependencies {
         private const val group = "io.insert-koin"
         private const val version = "3.2.2"
         val Android = Dependency(group, "koin-android", version)
+        val AndroidXCompose = Dependency(group, "koin-androidx-compose", version)
         val Core = Dependency(group, "koin-core", version)
     }
 
diff --git a/keyboard-compose/src/androidLibMain/kotlin/ComposeClearFocusHandler.kt b/keyboard-compose/src/androidLibMain/kotlin/ComposeClearFocusHandler.kt
index 02f1b0339..806a5dd6b 100644
--- a/keyboard-compose/src/androidLibMain/kotlin/ComposeClearFocusHandler.kt
+++ b/keyboard-compose/src/androidLibMain/kotlin/ComposeClearFocusHandler.kt
@@ -23,7 +23,7 @@ import com.splendo.kaluga.keyboard.ClearFocusHandler
 import kotlinx.coroutines.flow.StateFlow
 
 class ComposeClearFocusHandler(private val focusManager: StateFlow<FocusManager>) : ClearFocusHandler {
-    override fun clearFocus(activity: Activity) {
+    override fun clearFocus(activity: Activity?) {
         focusManager.value.clearFocus(true)
     }
 }
diff --git a/keyboard/src/androidLibMain/kotlin/ClearFocusHandler.kt b/keyboard/src/androidLibMain/kotlin/ClearFocusHandler.kt
index 0b77bb506..e9342038b 100644
--- a/keyboard/src/androidLibMain/kotlin/ClearFocusHandler.kt
+++ b/keyboard/src/androidLibMain/kotlin/ClearFocusHandler.kt
@@ -20,11 +20,11 @@ package com.splendo.kaluga.keyboard
 import android.app.Activity
 
 interface ClearFocusHandler {
-    fun clearFocus(activity: Activity)
+    fun clearFocus(activity: Activity?)
 }
 
 class ViewClearFocusHandler : ClearFocusHandler {
-    override fun clearFocus(activity: Activity) {
-        activity.currentFocus?.clearFocus()
+    override fun clearFocus(activity: Activity?) {
+        activity?.currentFocus?.clearFocus()
     }
 }
diff --git a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
index 3fb0bbbbb..f331f5bdc 100644
--- a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
@@ -40,14 +40,13 @@ actual class KeyboardManager(
     }
 
     override fun show(focusHandler: FocusHandler) {
-        lifecycleManagerObserver.manager?.activity?.let {
-            focusHandler.requestFocus(it)
-        }
+        focusHandler.requestFocus(lifecycleManagerObserver.manager?.activity)
     }
 
     override fun hide() {
-        lifecycleManagerObserver.manager?.activity?.let { activity ->
-            clearFocusHandler.clearFocus(activity)
+        val managedActivity = lifecycleManagerObserver.manager?.activity
+        clearFocusHandler.clearFocus(managedActivity)
+        managedActivity?.let { activity ->
             val inputMethodManager = activity.getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager
             inputMethodManager?.let {
                 if (it.isAcceptingText) {

From e039af4ed1dbedd6742a10801b48289e1e42d8a0 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 25 Nov 2022 14:33:37 +0100
Subject: [PATCH 035/227] Refactoring Navigation/Architecture for Compose

To deal with Configuration changes
---
 .../ComposableLifecycleSubscribable.kt        |  42 ++++
 .../compose/navigation/CombinedNavigator.kt   |  32 +--
 .../navigation/ModalBottomSheetNavigator.kt   | 222 +++++++++++-------
 .../compose/navigation/RouteNavigator.kt      | 138 ++++++-----
 .../compose/viewModel/ViewModelComposable.kt  |  95 +++++++-
 .../compose/ArchitectureDetailsLayout.kt      |  18 +-
 .../compose/ArchitectureLayout.kt             | 181 +++++++-------
 .../architecture/compose/BottomSheetLayout.kt |  23 +-
 .../compose/BottomSheetSubPageLayout.kt       |  26 +-
 .../resources/compose/ResourcesLayout.kt      |  72 +++---
 10 files changed, 489 insertions(+), 360 deletions(-)
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt

diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
new file mode 100644
index 000000000..b1c18d25d
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
@@ -0,0 +1,42 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.compose.lifecycle
+
+import androidx.compose.runtime.Composable
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import kotlin.reflect.KMutableProperty1
+import kotlin.reflect.KProperty1
+import kotlin.reflect.KVisibility
+import kotlin.reflect.full.isSubtypeOf
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.full.starProjectedType
+
+interface ComposableLifecycleSubscribable : LifecycleSubscribableMarker {
+    val modifier: @Composable (@Composable () -> Unit) -> Unit
+}
+
+@Suppress("UNCHECKED_CAST")
+internal val <VM : BaseLifecycleViewModel> VM.ComposableLifecycleSubscribable: List<ComposableLifecycleSubscribable> get() = this::class.memberProperties
+    .filter { it !is KMutableProperty1 }
+    .mapNotNull { it as? KProperty1<VM, Any?> }
+    .filter {
+        it.getter.visibility == KVisibility.PUBLIC &&
+            it.getter.returnType.isSubtypeOf(LifecycleSubscribableMarker::class.starProjectedType)
+    }
+    .mapNotNull { it.getter(this) as? ComposableLifecycleSubscribable }
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt
index 8aab5cf6e..5f0e02193 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt
@@ -26,34 +26,4 @@ import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.navigation.Navigator
 
-/** Routes navigation actions to underlying navigators defined by [navigatorForAction]. */
-class CombinedNavigator<A : NavigationAction<*>>(
-    private val navigatorForAction: CombinedNavigator<A>.(A) -> Navigator<A>
-) : Navigator<A>, LifecycleSubscribable by LifecycleSubscriber() {
-
-    /** @return [ActivityNavigator] constructed with this navigation mapper.*/
-    fun ((A) -> NavigationSpec).toActivityNavigator() = ActivityNavigator(this)
-
-    override fun navigate(action: A) {
-        val navigator = navigatorForAction(action)
-        if (navigator is LifecycleSubscribable && navigator.manager == null) {
-            // navigator depends on the lifecycle but was not subscribed yet
-            manager?.let { manager ->
-                with(navigator) {
-                    subscribe(manager)
-                    navigate(action)
-                    unsubscribe()
-                }
-            }
-        } else {
-            navigator.navigate(action)
-        }
-    }
-}
-
-@Composable
-fun <A : NavigationAction<*>> rememberCombinedNavigator(
-    navigatorForAction: CombinedNavigator<A>.(A) -> Navigator<A>
-): Navigator<A> =
-    remember { CombinedNavigator(navigatorForAction) }
-        .apply { bind() }
+
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
index f6bbefd1f..db1a45c4a 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
@@ -5,14 +5,20 @@ import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.material.ModalBottomSheetLayout
 import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
 import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.Navigator
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 
 /**
@@ -55,82 +61,136 @@ class BottomSheetRouteController(
     }
 }
 
-/**
- * A [RouteController] used for navigating the sheet content in a [ModalBottomSheetLayout]
- * @param navHostController The [NavHostController] to navigate the sheet content
- * @param sheetState The [ModalBottomSheetState] associated with the [ModalBottomSheetLayout]
- * @param coroutineScope A [CoroutineScope] used for navigation actions
- */
 class BottomSheetSheetContentRouteController(
-    internal val navHostController: NavHostController,
-    internal val sheetState: ModalBottomSheetState,
-    private val coroutineScope: CoroutineScope
+    val navHostController: StateFlow<NavHostController?>,
+    private val sheetState: SheetState
 ) : RouteController {
 
     private val sheetContentRouteController = NavHostRouteController(navHostController, this)
 
     override fun navigate(newRoute: Route) {
         if (!sheetState.isVisible) {
-            coroutineScope.launch {
-                sheetState.animateTo(ModalBottomSheetValue.Expanded)
-            }
+            sheetState.show(ModalBottomSheetValue.Expanded)
         }
         sheetContentRouteController.navigate(newRoute)
     }
 
-    override fun back(result: Route.Result): Boolean = if (navHostController.backQueue.isNotEmpty()) {
-        navHostController.previousBackStackEntry?.setResult(result)
-        navHostController.popBackStack()
-    } else {
-        close()
-        true
+    override fun back(result: Route.Result): Boolean {
+        val navHostController = navHostController.value
+        return if (navHostController != null && navHostController.backQueue.isNotEmpty()) {
+            navHostController.previousBackStackEntry?.setResult(result)
+            navHostController.popBackStack()
+        } else {
+            close()
+            true
+        }
     }
 
     override fun close() {
-        coroutineScope.launch {
-            sheetState.hide()
-        }
+        sheetState.hide()
     }
 }
 
-/**
- * A [Navigator] for a [ModalBottomSheetLayout]
- * @param routeController The [BottomSheetRouteController] used for navigating.
- * @param navigationMapper A mapper that converts an [NavigationAction] handled by this navigator into a [BottomSheetRoute]
- */
-class ModalBottomSheetNavigator<A : NavigationAction<*>>(
-    internal val routeController: BottomSheetRouteController,
+interface SheetState {
+    val isVisible: Boolean
+    fun show(value: ModalBottomSheetValue)
+    fun hide()
+}
+
+private object EmptySheetState : SheetState {
+    override val isVisible: Boolean = false
+    override fun show(value: ModalBottomSheetValue) {}
+    override fun hide() {}
+}
+
+private data class SheetStateState(
+    val state: ModalBottomSheetState,
+    val coroutineScope: CoroutineScope?
+) : SheetState {
+    override val isVisible: Boolean get() = state.isVisible
+    override fun show(value: ModalBottomSheetValue) {
+        coroutineScope?.launch { state.animateTo(value)  }
+    }
+
+    override fun hide() {
+        coroutineScope?.launch { state.hide() }
+    }
+}
+
+sealed class ModalBottomSheetNavigator<A : NavigationAction<*>>(
     private val navigationMapper: (A) -> BottomSheetRoute
-) : Navigator<A> {
-
-    constructor(
-        contentNavHostController: NavHostController,
-        sheetContentNavHostController: NavHostController,
-        sheetState: ModalBottomSheetState,
-        coroutineScope: CoroutineScope,
-        navigationMapper: (A) -> BottomSheetRoute
-    ) : this(
-        BottomSheetRouteController(
-            NavHostRouteController(contentNavHostController),
-            BottomSheetSheetContentRouteController(
-                sheetContentNavHostController,
-                sheetState,
-                coroutineScope
-            )
-        ),
-        navigationMapper
+) : Navigator<A>, ComposableLifecycleSubscribable {
+
+    abstract val routeController: BottomSheetRouteController
+
+    override fun navigate(action: A) = routeController.navigate(navigationMapper(action))
+}
+
+class NavHostModalBottomSheetNavigator<A : NavigationAction<*>>(
+    navigationMapper: (A) -> BottomSheetRoute,
+    contentBuilder: BottomSheetContentBuilder,
+    sheetContentBuilder: BottomSheetContentBuilder,
+    private val initialSheetValue: ModalBottomSheetValue = ModalBottomSheetValue.Hidden
+) : ModalBottomSheetNavigator<A>(navigationMapper) {
+    private val contentNavHostController = MutableStateFlow<NavHostController?>(null)
+    private val sheetContentNavHostController = MutableStateFlow<NavHostController?>(null)
+    private val sheetState = MutableStateFlow<SheetState>(EmptySheetState)
+    override val routeController = BottomSheetRouteController(
+        NavHostRouteController(contentNavHostController),
+        BottomSheetSheetContentRouteController(
+            sheetContentNavHostController,
+            object : SheetState {
+                override val isVisible: Boolean = sheetState.value.isVisible
+                override fun show(value: ModalBottomSheetValue) = sheetState.value.show(value)
+                override fun hide() = sheetState.value.hide()
+            }
+        )
     )
 
-    constructor(
-        contentRouteController: RouteController,
-        sheetContentRouteController: BottomSheetSheetContentRouteController,
-        navigationMapper: (A) -> BottomSheetRoute
-    ) : this(
-        BottomSheetRouteController(contentRouteController, sheetContentRouteController),
-        navigationMapper
+    override val modifier: @Composable (@Composable () -> Unit) -> Unit = @Composable { content ->
+        val contentNavController = rememberNavController()
+        val sheetContentNavController = rememberNavController()
+        val modalBottomSheetState = rememberModalBottomSheetState(initialValue = initialSheetValue)
+        val coroutineScope = rememberCoroutineScope()
+        contentNavHostController.tryEmit(contentNavController)
+        sheetContentNavHostController.tryEmit(sheetContentNavController)
+        sheetState.tryEmit(SheetStateState(modalBottomSheetState, coroutineScope))
+        SetupNavigatingModalBottomSheetLayout(
+            routeController.sheetContentRouteController,
+            contentNavController,
+            sheetContentNavController,
+            sheetContentBuilder,
+            content,
+            contentBuilder,
+            modalBottomSheetState
+        )
+    }
+}
+
+class NavHostModalBottomSheetContentNavigator<A : NavigationAction<*>>(
+    contentNavHostController: NavHostController,
+    sheetContentNavHostController: NavHostController,
+    sheetState: ModalBottomSheetState,
+    navigationMapper: (A) -> BottomSheetRoute,
+) : ModalBottomSheetNavigator<A>(navigationMapper) {
+
+    private val sheetStateState = MutableStateFlow<SheetState>(SheetStateState(sheetState, null))
+    override val routeController = BottomSheetRouteController(
+        NavHostRouteController(MutableStateFlow(contentNavHostController)),
+        BottomSheetSheetContentRouteController(
+            MutableStateFlow(sheetContentNavHostController),
+            object : SheetState {
+                override val isVisible: Boolean = sheetStateState.value.isVisible
+                override fun show(value: ModalBottomSheetValue) = sheetStateState.value.show(value)
+                override fun hide() = sheetStateState.value.hide()
+            }
+        )
     )
 
-    override fun navigate(action: A) = routeController.navigate(navigationMapper(action))
+    override val modifier: @Composable (@Composable () -> Unit) -> Unit = @Composable { content ->
+        sheetStateState.tryEmit(SheetStateState(sheetState, rememberCoroutineScope()))
+        content()
+    }
 }
 
 typealias BottomSheetRootContentBuilder = (contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) -> Unit
@@ -143,57 +203,39 @@ typealias BottomSheetContentBuilder = NavGraphBuilder.(contentNavHostController:
  * @param content The [BottomSheetContentBuilder] for building the navigation content of the [ModalBottomSheetLayout]
  */
 @Composable
-fun <A : NavigationAction<*>> ModalBottomSheetNavigator<A>.NavigatingModalBottomSheetLayout(
+private fun SetupNavigatingModalBottomSheetLayout(
+    sheetContentRouteController: RouteController,
+    contentNavHostController: NavHostController,
+    sheetContentNavHostController: NavHostController,
     sheetContent: BottomSheetContentBuilder,
-    contentRoot: @Composable BottomSheetRootContentBuilder,
-    content: BottomSheetContentBuilder
-) = routeController.NavigatingModalBottomSheetLayout(
-    sheetContent = sheetContent,
-    contentRoot = contentRoot,
-    content = content
-)
-
-/**
- * Creates a [ModalBottomSheetLayout] that supports navigation using a [ModalBottomSheetNavigator]
- * @param sheetContent The [BottomSheetContentBuilder] for building the navigation sheet content of the [ModalBottomSheetLayout]
- * @param contentRoot The [BottomSheetRootContentBuilder] for building the root view of the content of the [ModalBottomSheetLayout]
- * @param content The [BottomSheetContentBuilder] for building the navigation content of the [ModalBottomSheetLayout]
- */
-@Composable
-fun BottomSheetRouteController.NavigatingModalBottomSheetLayout(
-    sheetContent: BottomSheetContentBuilder,
-    contentRoot: @Composable BottomSheetRootContentBuilder,
-    content: BottomSheetContentBuilder
+    contentRoot: @Composable () -> Unit,
+    content: BottomSheetContentBuilder,
+    sheetState: ModalBottomSheetState
 ) = ModalBottomSheetLayout(
     sheetContent = {
-        if (sheetContentRouteController.sheetState.isVisible) {
+        if (sheetState.isVisible) {
             HardwareBackButtonNavigation(onBackButtonClickHandler = sheetContentRouteController::close)
         }
         Box(Modifier.defaultMinSize(minHeight = 1.dp)) {
-            sheetContentRouteController.SetupNavHost { sheetContentNavHostController ->
+            SetupNavHost(sheetContentNavHostController) { navHostController ->
                 sheetContent(
-                    contentRouteController.navHostController,
-                    sheetContentNavHostController,
-                    sheetContentRouteController.sheetState
+                    contentNavHostController,
+                    navHostController,
+                    sheetState
                 )
             }
         }
     },
-    sheetState = sheetContentRouteController.sheetState,
+    sheetState = sheetState,
 ) {
-    contentRouteController.SetupNavHost(
-        rootView = { navHostController ->
-            contentRoot(
-                navHostController,
-                sheetContentRouteController.navHostController,
-                sheetContentRouteController.sheetState
-            )
-        }
+    SetupNavHost(
+        navHostController = contentNavHostController,
+        rootView = contentRoot
     ) { navHostController ->
         content(
             navHostController,
-            sheetContentRouteController.navHostController,
-            sheetContentRouteController.sheetState
+            sheetContentNavHostController,
+            sheetState
         )
     }
 }
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
index 4a0951bfe..b05dd2131 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
@@ -11,6 +11,8 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
 import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.NavigationBundle
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
@@ -21,6 +23,8 @@ import com.splendo.kaluga.architecture.navigation.SingleValueNavigationSpec
 import com.splendo.kaluga.architecture.navigation.toBundle
 import com.splendo.kaluga.architecture.navigation.toNavigationBundle
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 
 /**
  * Controller for navigating to a [Route]
@@ -43,22 +47,18 @@ sealed interface RouteController {
     fun close()
 }
 
-internal val RouteController.navHostController get() = when (this) {
-    is NavHostRouteController -> navHostController
-    is BottomSheetSheetContentRouteController -> navHostController
-}
-
 /**
  * A [RouteController] managed by a [NavHostController]
- * @param navHostController The [NavHostController] managing the route stack
+ * @param navHostController A [StateFlow] indicating the current [NavHostController] managing the route stack
  * @param parentRouteController The [NavHostController] that is a parent to the [navHostController] if it exists
  */
 class NavHostRouteController(
-    internal val navHostController: NavHostController,
+    internal val navHostController: StateFlow<NavHostController?>,
     private val parentRouteController: RouteController? = null
 ) : RouteController {
 
     override fun navigate(newRoute: Route) {
+        val navHostController = navHostController.value ?: return
         when (newRoute) {
             is Route.NextRoute<*, *> -> navHostController.navigate(newRoute.route) {
                 launchSingleTop = true
@@ -87,14 +87,18 @@ class NavHostRouteController(
         }
     }
 
-    override fun back(result: Route.Result): Boolean = if (navHostController.backQueue.isNotEmpty()){
-        navHostController.previousBackStackEntry?.setResult(result)
-        navHostController.popBackStack()
+    override fun back(result: Route.Result): Boolean {
+        val navHostController = navHostController.value
+        return if (navHostController != null && navHostController.backQueue.isNotEmpty()) {
+            navHostController.previousBackStackEntry?.setResult(result)
+            navHostController.popBackStack()
+        } else {
+            parentRouteController?.back(result) ?: false
+        }
     }
-    else { parentRouteController?.back(result) ?: false }
 
     override fun close() {
-        navHostController.popBackStack(ROOT_VIEW, true)
+        navHostController.value?.popBackStack(ROOT_VIEW, true)
         parentRouteController?.close()
     }
 }
@@ -104,100 +108,94 @@ typealias RouteContentBuilder = NavGraphBuilder.(NavHostController) -> Unit
 
 /**
  * A Navigator managed by a [RouteController]
- * @param routeController The [RouteController] managing this navigation
  * @param navigationMapper A mapper that converts an [NavigationAction] handled by this navigator into a [Route]
  */
-open class RouteNavigator<A : NavigationAction<*>>(
-    internal val routeController: RouteController,
+sealed class RouteNavigator<A : NavigationAction<*>>(
     private val navigationMapper: (A) -> Route
-) : Navigator<A> {
+) : Navigator<A>, ComposableLifecycleSubscribable {
 
-    constructor(
-        navHostController: NavHostController,
-        navigationMapper: (A) -> Route
-    ) : this(NavHostRouteController(navHostController), navigationMapper)
+    abstract val routeController: RouteController
 
     override fun navigate(action: A) {
         routeController.navigate(navigationMapper(action))
     }
 }
 
-/**
- * Creates a a [NavHost] for a given [RouteNavigator]
- * @param builder The [RouteContentBuilder] for building the content of the [NavHost]
- */
-@Composable
-fun <A : NavigationAction<*>> RouteNavigator<A>.SetupNavHost(builder: RouteContentBuilder) = routeController.SetupNavHost(builder)
+class NavHostRouteNavigator<A : NavigationAction<*>>(
+    navigationMapper: (A) -> Route,
+    parentRouteController: RouteController? = null,
+    builder: RouteContentBuilder
+) : RouteNavigator<A>(navigationMapper) {
+
+    private val navHostController = MutableStateFlow<NavHostController?>(null)
+    override val routeController: RouteController = NavHostRouteController(navHostController, parentRouteController)
+
+    override val modifier: @Composable (@Composable () -> Unit) -> Unit = @Composable { content ->
+        val navController = rememberNavController()
+        navHostController.tryEmit(navController)
+        SetupNavHost(
+            navHostController = navController,
+            rootView = content,
+            builder = builder
+        )
+    }
+}
 
-/**
- * Creates a a [NavHost] for a given [RouteController]
- * @param builder The [RouteContentBuilder] for building the content of the [NavHost]
- */
-@Composable
-fun RouteController.SetupNavHost(builder: RouteContentBuilder) {
-    SetupNavHost(startDestination = ROOT_VIEW) {
-        composable(ROOT_VIEW) {
-            Spacer(modifier = Modifier.fillMaxWidth())
-        }
-        builder(navHostController)
+class NavHostContentRouteNavigator<A : NavigationAction<*>>(
+    navHostController: NavHostController,
+    parentRouteController: RouteController? = null,
+    navigationMapper: (A) -> Route
+) : RouteNavigator<A>(navigationMapper) {
+
+    override val routeController: RouteController = NavHostRouteController(MutableStateFlow(navHostController), parentRouteController)
+
+    override val modifier: @Composable (@Composable () -> Unit) -> Unit = @Composable { content ->
+        content()
     }
 }
 
-/**
- * Creates a a [NavHost] for a given [RouteNavigator]
- * @param rootView The [RouteRootContentBuilder] for the initial view of the [NavHost]
- * @param builder The [RouteContentBuilder] for building the content of the [NavHost]
- */
 @Composable
-fun <A : NavigationAction<*>> RouteNavigator<A>.SetupNavHost(
-    rootView: @Composable RouteRootContentBuilder,
+fun SetupNavHost(
+    navHostController: NavHostController,
     builder: RouteContentBuilder
-) = routeController.SetupNavHost(rootView, builder)
+) = SetupNavHost(
+    navHostController = navHostController,
+    rootView = { Spacer(modifier = Modifier.fillMaxWidth()) },
+    builder
+)
 
-/**
- * Creates a a [NavHost] for a given [RouteController]
- * @param rootView The [RouteRootContentBuilder] for the initial view of the [NavHost]
- * @param builder The [RouteContentBuilder] for building the content of the [NavHost]
- */
 @Composable
-fun RouteController.SetupNavHost(
-    rootView: @Composable RouteRootContentBuilder,
+fun SetupNavHost(
+    navHostController: NavHostController,
+    rootView: @Composable () -> Unit,
     builder: RouteContentBuilder
+) = SetupNavHost(
+    navHostController = navHostController,
+    startDestination = ROOT_VIEW
 ) {
-    SetupNavHost(startDestination = ROOT_VIEW) {
-        composable(ROOT_VIEW, content = { rootView(navHostController) })
-        builder(navHostController)
-    }
+    composable(ROOT_VIEW, content = { rootView() })
+    builder(navHostController)
 }
 
-/**
- * Creates a a [NavHost] for a given [RouteNavigator]
- * @param startDestination The start destination of the [NavHost]
- * @param builder The [RouteContentBuilder] for building the content of the [NavHost]
- */
-@Composable
-fun <A : NavigationAction<*>> RouteNavigator<A>.SetupNavHost(
-    startDestination: String,
-    builder: NavGraphBuilder.(RouteController) -> Unit
-) = routeController.SetupNavHost(startDestination, builder)
-
 /**
  * Creates a a [NavHost] for a given [RouteController]
  * @param startDestination The start destination of the [NavHost]
  * @param builder The [RouteContentBuilder] for building the content of the [NavHost]
  */
 @Composable
-fun RouteController.SetupNavHost(
+fun SetupNavHost(
+    navHostController: NavHostController,
     startDestination: String,
-    builder: NavGraphBuilder.(RouteController) -> Unit
+    builder: NavGraphBuilder.() -> Unit
 ) {
     NavHost(
         navController = navHostController,
         startDestination = startDestination,
-        builder = { builder(this@SetupNavHost) }
+        builder = { builder() }
     )
 }
 
+
 /**
  * Handles a [Route.Result] matching a given [NavigationBundleSpec]
  * @param spec The [NavigationBundleSpec] used to create the [Route.Result]
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index 95904cfad..65da486c9 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -1,16 +1,31 @@
 package com.splendo.kaluga.architecture.compose.viewModel
 
+import android.content.Context
+import android.content.ContextWrapper
+import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisallowComposableCalls
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
+import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.subscribe
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import kotlin.reflect.KMutableProperty1
+import kotlin.reflect.KProperty1
+import kotlin.reflect.KVisibility
+import kotlin.reflect.full.isSubtypeOf
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.full.starProjectedType
 
 /**
  * Composable which manages [viewModel] lifecycle and optionally adds it to local [ViewModelStore].
@@ -22,15 +37,51 @@ fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
     viewModel: ViewModel,
     content: @Composable (ViewModel.() -> Unit)? = null
 ) {
-    viewModel.linkLifecycle()
-    content?.invoke(viewModel)
+    LocalContext.current.activity?.let {
+        ViewModelComposable(it, it.supportFragmentManager, viewModel, content)
+    }
+}
+
+@Composable
+fun <ViewModel : BaseLifecycleViewModel> FragmentViewModelComposable(
+    fragmentManager: FragmentManager,
+    viewModel: ViewModel,
+    content: @Composable (ViewModel.() -> Unit)? = null
+) = ViewModelComposable(LocalContext.current.activity, fragmentManager, viewModel, content)
+
+@Composable
+private fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
+    activity: AppCompatActivity?,
+    fragmentManager: FragmentManager,
+    viewModel: ViewModel,
+    content: @Composable (ViewModel.() -> Unit)? = null
+) {
+    viewModel.linkLifecycle(activity, fragmentManager)
+    val composeLifecycleSubscribables = viewModel.ComposableLifecycleSubscribable
+    if (composeLifecycleSubscribables.isEmpty()) {
+        content?.invoke(viewModel)
+    } else {
+        val modifier = viewModel.ComposableLifecycleSubscribable.reduceRight { new, acc ->
+            object : ComposableLifecycleSubscribable {
+                override val modifier: @Composable (@Composable () -> Unit) -> Unit = { content ->
+                    new.modifier { acc.modifier(content) }
+                }
+            }
+        }
+        modifier.modifier { content?.invoke(viewModel) }
+    }
 }
 
 /**
  * Stores a view model in the local [ViewModelStore]. Use if the view model
  * was created manually and is not located in Activity/Fragment [ViewModelStore].
  */
-@Composable fun <VM : BaseLifecycleViewModel> store(provider: @Composable () -> VM): VM =
+@Composable
+@Deprecated(
+    "Does not work for configuration changes (e.g. rotation).",
+replaceWith = ReplaceWith("viewModel()", "androidx.lifecycle.viewmodel.compose.viewModel")
+)
+fun <VM : BaseLifecycleViewModel> store(provider: @Composable () -> VM): VM =
     provider().also { handleLocalViewModelStore(it) }
 
 /**
@@ -39,6 +90,10 @@ fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
  * provider will only be evaluated during the composition. Recomposition will always return the value produced by provider.
  */
 @Composable
+@Deprecated(
+    "Does not work for configuration changes (e.g. rotation).",
+    replaceWith = ReplaceWith("viewModel()", "androidx.lifecycle.viewmodel.compose.viewModel")
+)
 fun <VM : BaseLifecycleViewModel> storeAndRemember(provider: @DisallowComposableCalls () -> VM): VM = store {
     remember(provider)
 }
@@ -49,6 +104,10 @@ fun <VM : BaseLifecycleViewModel> storeAndRemember(provider: @DisallowComposable
  * provider will only be evaluated during the composition. Recomposition will always return the value produced by provider.
  */
 @Composable
+@Deprecated(
+    "Does not work for configuration changes (e.g. rotation).",
+    replaceWith = ReplaceWith("viewModel()", "androidx.lifecycle.viewmodel.compose.viewModel")
+)
 fun <VM : BaseLifecycleViewModel> storeAndRemember(key: Any?, provider: @DisallowComposableCalls () -> VM): VM = store {
     remember(key, provider)
 }
@@ -91,10 +150,10 @@ private fun rememberComposableViewModelStoreOwner(viewModel: BaseLifecycleViewMo
 }
 
 @Composable
-private fun <VM : BaseLifecycleViewModel> VM.linkLifecycle(): VM {
+private fun <VM : BaseLifecycleViewModel> VM.linkLifecycle(activity: AppCompatActivity?, fragmentManager: FragmentManager): VM {
     val lifecycle = LocalLifecycleOwner.current.lifecycle
     DisposableEffect(Unit) {
-        val observer = VmObserver(this@linkLifecycle)
+        val observer = VmObserver(this@linkLifecycle, activity, fragmentManager)
 
         lifecycle.addObserver(observer)
 
@@ -106,9 +165,25 @@ private fun <VM : BaseLifecycleViewModel> VM.linkLifecycle(): VM {
     return this
 }
 
-private class VmObserver<VM : BaseLifecycleViewModel>(private val viewModel: VM) : DefaultLifecycleObserver {
+private class VmObserver<VM : BaseLifecycleViewModel>(private val viewModel: VM, private val activity: AppCompatActivity?, private val fragmentManager: FragmentManager) : DefaultLifecycleObserver {
     private var resumed = false
 
+    private val lifecycleSubscribables: List<LifecycleSubscribable> by lazy {
+        @Suppress("UNCHECKED_CAST")
+        viewModel::class.memberProperties
+            .filter { it !is KMutableProperty1 }
+            .mapNotNull { it as? KProperty1<VM, Any?> }
+            .filter {
+                it.getter.visibility == KVisibility.PUBLIC &&
+                    it.getter.returnType.isSubtypeOf(LifecycleSubscribableMarker::class.starProjectedType)
+            }
+            .mapNotNull { it.getter(viewModel) as? LifecycleSubscribable }
+    }
+
+    override fun onCreate(owner: LifecycleOwner) {
+        lifecycleSubscribables.forEach { it.subscribe(activity, owner, fragmentManager) }
+    }
+
     override fun onResume(owner: LifecycleOwner) {
         viewModel.didResume().also { resumed = true }
     }
@@ -120,5 +195,13 @@ private class VmObserver<VM : BaseLifecycleViewModel>(private val viewModel: VM)
         if (resumed) {
             viewModel.didPause()
         }
+        lifecycleSubscribables.forEach { it.unsubscribe() }
     }
 }
+
+private val Context.activity: AppCompatActivity? get() = when (this) {
+    is AppCompatActivity -> this
+    is ContextWrapper -> baseContext.activity // recursive lookup
+    else -> null
+}
+
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
index 7ce473bdf..3e95524f9 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
@@ -25,6 +25,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
+import com.splendo.kaluga.architecture.compose.navigation.NavHostContentRouteNavigator
 import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
 import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
@@ -32,16 +33,19 @@ import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import com.splendo.kaluga.resources.compose.Composable
+import org.koin.androidx.compose.koinViewModel
+import org.koin.core.parameter.parametersOf
 
 @Composable
 fun ArchitectureDetailsLayout(inputDetails: InputDetails, navHostController: NavHostController) {
-    val navigator = RouteNavigator(
-        navHostController,
-        ::architectureDetailsNavigationRouteMapper
-    )
-
-    val viewModel = storeAndRemember {
-        ArchitectureDetailsViewModel(inputDetails, navigator)
+    val viewModel = koinViewModel<ArchitectureDetailsViewModel> {
+        parametersOf(
+            inputDetails,
+            NavHostContentRouteNavigator(
+                navHostController,
+                navigationMapper = ::architectureDetailsNavigationRouteMapper
+            )
+        )
     }
 
     ViewModelComposable(viewModel) {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
index 08025e907..972fa14c1 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
@@ -56,8 +56,8 @@ import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRouteContro
 import com.splendo.kaluga.architecture.compose.navigation.BottomSheetSheetContentRouteController
 import com.splendo.kaluga.architecture.compose.navigation.HandleResult
 import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
+import com.splendo.kaluga.architecture.compose.navigation.NavHostModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.navigation.NavHostRouteController
-import com.splendo.kaluga.architecture.compose.navigation.NavigatingModalBottomSheetLayout
 import com.splendo.kaluga.architecture.compose.navigation.composable
 import com.splendo.kaluga.architecture.compose.navigation.route
 import com.splendo.kaluga.architecture.compose.state
@@ -71,6 +71,8 @@ import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureView
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import com.splendo.kaluga.resources.compose.Composable
+import org.koin.androidx.compose.koinViewModel
+import org.koin.core.parameter.parametersOf
 
 class ComposeArchitectureActivity : AppCompatActivity() {
 
@@ -91,107 +93,94 @@ class ComposeArchitectureActivity : AppCompatActivity() {
 @Composable
 fun ArchitectureLayout() {
     MdcTheme {
-        val architectureRouteController = BottomSheetRouteController(
-            NavHostRouteController(rememberNavController()),
-            BottomSheetSheetContentRouteController(
-                rememberNavController(),
-                rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
-                rememberCoroutineScope()
+        val viewModel = koinViewModel<ArchitectureViewModel> {
+            parametersOf(
+                NavHostModalBottomSheetNavigator<ArchitectureNavigationAction<*>>(
+                    navigationMapper = ::architectureNavigationRouteMapper,
+                    contentBuilder = { contentNavHostController, _, _ ->
+                        composable<InputDetails, ArchitectureNavigationAction.Details>(
+                            type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
+                        ) { inputDetails ->
+                            ArchitectureDetailsLayout(inputDetails, contentNavHostController)
+                        }
+                    },
+                    sheetContentBuilder = { contentNavHostController, sheetContentNavHostController, sheetState ->
+                        composable(ArchitectureNavigationAction.BottomSheet.route()) {
+                            BottomSheetLayout(
+                                contentNavHostController,
+                                sheetContentNavHostController,
+                                sheetState
+                            )
+                        }
+                        composable(BottomSheetNavigation.SubPage.route()) {
+                            BottomSheetSubPageLayout(
+                                contentNavHostController, sheetContentNavHostController, sheetState
+                            )
+                        }
+                    },
+                    initialSheetValue = ModalBottomSheetValue.Hidden
+                )
             )
-        )
-
-        architectureRouteController.NavigatingModalBottomSheetLayout(
-            sheetContent = { contentNavHostController, sheetContentNavHostController, sheetState ->
-                composable(ArchitectureNavigationAction.BottomSheet.route()) {
-                    BottomSheetLayout(contentNavHostController, sheetContentNavHostController, sheetState)
-                }
-                composable(BottomSheetNavigation.SubPage.route()) {
-                    BottomSheetSubPageLayout(
-                        contentNavHostController, sheetContentNavHostController, sheetState
-                    )
-                }
-            },
-            contentRoot = { contentNavHostController, sheetContentNavHostController, sheetState ->
-                ArchitectureLayoutLayoutContent(contentNavHostController, sheetContentNavHostController, sheetState)
-            },
-            content = { contentNavHostController, _, _ ->
-                composable<InputDetails, ArchitectureNavigationAction.Details>(
-                    type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
-                ) { inputDetails ->
-                    ArchitectureDetailsLayout(inputDetails, contentNavHostController)
-                }
-            }
-        )
-    }
-}
-
-@Composable
-fun ArchitectureLayoutLayoutContent(contentNavHostController: NavHostController, sheetNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
-
-    val navigator = ModalBottomSheetNavigator(
-        NavHostRouteController(contentNavHostController),
-        BottomSheetSheetContentRouteController(
-            sheetNavHostController,
-            sheetState,
-            rememberCoroutineScope()
-        ),
-        ::architectureNavigationRouteMapper
-    )
-
-    val viewModel = storeAndRemember {
-        ArchitectureViewModel(navigator)
-    }
-
-    ViewModelComposable(viewModel) {
-        val nameInput = nameInput.mutableState()
-        val isNameValid by isNameValid.state()
-        val numberInput = numberInput.mutableState()
-        val isNumberValid by isNumberValid.state()
-
-        val focusManager = LocalFocusManager.current
-
-        contentNavHostController.HandleResult(NavigationBundleSpecType.SerializedType(InputDetails.serializer())) {
-            nameInput.value = name
-            numberInput.value = number.toString()
         }
 
-        Column(
-            verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
-            modifier = Modifier
-                .fillMaxWidth()
-                .verticalScroll(rememberScrollState())
-        ) {
-            OutlinedTextField(
-                value = nameInput.value,
-                onValueChange = { nameInput.value = it },
+        ViewModelComposable(viewModel) {
+            val nameInput = nameInput.mutableState()
+            val isNameValid by isNameValid.state()
+            val numberInput = numberInput.mutableState()
+            val isNumberValid by isNumberValid.state()
+
+            val focusManager = LocalFocusManager.current
+
+//            contentNavHostController.HandleResult(
+//                NavigationBundleSpecType.SerializedType(
+//                    InputDetails.serializer()
+//                )
+//            ) {
+//                nameInput.value = name
+//                numberInput.value = number.toString()
+//            }
+
+            Column(
+                verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
                 modifier = Modifier
                     .fillMaxWidth()
-                    .onPreviewKeyEvent {
-                        if (it.key == Key.Tab && it.nativeKeyEvent.action == KeyEvent.ACTION_DOWN) {
-                            focusManager.moveFocus(FocusDirection.Down)
-                            true
-                        } else {
-                            false
-                        }
-                    },
-                isError = !isNameValid,
-                placeholder = { Text(namePlaceholder) },
-                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
-                keyboardActions = KeyboardActions(
-                    onNext = { focusManager.moveFocus(FocusDirection.Down) }
+                    .verticalScroll(rememberScrollState())
+            ) {
+                OutlinedTextField(
+                    value = nameInput.value,
+                    onValueChange = { nameInput.value = it },
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .onPreviewKeyEvent {
+                            if (it.key == Key.Tab && it.nativeKeyEvent.action == KeyEvent.ACTION_DOWN) {
+                                focusManager.moveFocus(FocusDirection.Down)
+                                true
+                            } else {
+                                false
+                            }
+                        },
+                    isError = !isNameValid,
+                    placeholder = { Text(namePlaceholder) },
+                    keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+                    keyboardActions = KeyboardActions(
+                        onNext = { focusManager.moveFocus(FocusDirection.Down) }
+                    )
                 )
-            )
-            OutlinedTextField(
-                value = numberInput.value,
-                onValueChange = { numberInput.value = it },
-                modifier = Modifier.fillMaxWidth(),
-                isError = !isNumberValid,
-                placeholder = { Text(numberPlaceholder) },
-                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number, imeAction = ImeAction.Done),
-                keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() })
-            )
-            showDetailsButton.Composable(modifier = Modifier.fillMaxWidth())
-            showBottomSheetButton.Composable(modifier = Modifier.fillMaxWidth())
+                OutlinedTextField(
+                    value = numberInput.value,
+                    onValueChange = { numberInput.value = it },
+                    modifier = Modifier.fillMaxWidth(),
+                    isError = !isNumberValid,
+                    placeholder = { Text(numberPlaceholder) },
+                    keyboardOptions = KeyboardOptions(
+                        keyboardType = KeyboardType.Number,
+                        imeAction = ImeAction.Done
+                    ),
+                    keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() })
+                )
+                showDetailsButton.Composable(modifier = Modifier.fillMaxWidth())
+                showBottomSheetButton.Composable(modifier = Modifier.fillMaxWidth())
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
index cadbb695b..5eec979e0 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
@@ -28,24 +28,27 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
 import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
+import com.splendo.kaluga.architecture.compose.navigation.NavHostModalBottomSheetContentNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetViewModel
 import com.splendo.kaluga.resources.compose.Composable
+import org.koin.androidx.compose.koinViewModel
+import org.koin.core.parameter.parametersOf
 
 @Composable
 fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
-    val navigator = ModalBottomSheetNavigator(
-        contentNavHostController,
-        sheetContentNavHostController,
-        sheetState,
-        rememberCoroutineScope(),
-        ::bottomSheetNavigationRouteMapper,
-    )
-
-    val viewModel = storeAndRemember {
-        BottomSheetViewModel(navigator)
+    val viewModel = koinViewModel<BottomSheetViewModel> {
+        parametersOf(
+            NavHostModalBottomSheetContentNavigator<BottomSheetNavigation>(
+                contentNavHostController,
+                sheetContentNavHostController,
+                sheetState,
+                ::bottomSheetNavigationRouteMapper
+            )
+        )
     }
 
     ViewModelComposable(viewModel) {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
index 565771345..16b5d70d0 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
@@ -32,10 +32,15 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
 import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
+import com.splendo.kaluga.architecture.compose.navigation.NavHostModalBottomSheetContentNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.compose.viewModel.store
 import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavigation
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageViewModel
+import org.koin.androidx.compose.koinViewModel
+import org.koin.core.parameter.parametersOf
 
 @Composable
 fun BottomSheetSubPageLayout(
@@ -43,18 +48,15 @@ fun BottomSheetSubPageLayout(
     sheetContentNavHostController: NavHostController,
     sheetState: ModalBottomSheetState
 ) {
-    val navigator = ModalBottomSheetNavigator(
-        contentNavHostController,
-        sheetContentNavHostController,
-        sheetState,
-        rememberCoroutineScope(),
-        ::bottomSheetSubPageNavigationRouteMapper
-    )
-
-    val viewModel = store {
-        remember {
-            BottomSheetSubPageViewModel(navigator)
-        }
+    val viewModel = koinViewModel<BottomSheetSubPageViewModel> {
+        parametersOf(
+            NavHostModalBottomSheetContentNavigator(
+                contentNavHostController,
+                sheetContentNavHostController,
+                sheetState,
+                ::bottomSheetSubPageNavigationRouteMapper
+            )
+        )
     }
 
     ViewModelComposable(viewModel) {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
index c17eb39be..86a20688c 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.google.android.material.composethemeadapter.MdcTheme
+import com.splendo.kaluga.architecture.compose.navigation.NavHostRouteNavigator
 import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
@@ -48,6 +49,8 @@ import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.example.compose.Constants
+import org.koin.androidx.compose.koinViewModel
+import org.koin.core.parameter.parametersOf
 
 class ComposeResourcesActivity : AppCompatActivity() {
     @SuppressLint("MissingSuperCall") // Lint bug
@@ -67,45 +70,38 @@ class ComposeResourcesActivity : AppCompatActivity() {
 @Composable
 fun ResourcesLayout() {
     MdcTheme {
-        val navigator = RouteNavigator<ResourcesListNavigationAction>(rememberNavController()) { action ->
-            when (action) {
-                is ResourcesListNavigationAction.Button -> action.next
-                is ResourcesListNavigationAction.Color -> action.next
-                is ResourcesListNavigationAction.Label -> action.next
-            }
-        }
-
-        navigator.SetupNavHost(
-            rootView = {
-                ResourcesListLayout(navigator = navigator)
-            }
-        ) {
-            composable(ResourcesListNavigationAction.Button.route()) { ButtonsLayout() }
-            composable(ResourcesListNavigationAction.Color.route()) { ColorsLayout() }
-            composable(ResourcesListNavigationAction.Label.route()) { LabelsLayout() }
+        val viewModel = koinViewModel<ResourcesListViewModel> {
+            parametersOf(
+                NavHostRouteNavigator<ResourcesListNavigationAction>(
+                    navigationMapper = { action ->
+                        when (action) {
+                            is ResourcesListNavigationAction.Button -> action.next
+                            is ResourcesListNavigationAction.Color -> action.next
+                            is ResourcesListNavigationAction.Label -> action.next
+                        }
+                    }
+                ) {
+                    composable(ResourcesListNavigationAction.Button.route()) { ButtonsLayout() }
+                    composable(ResourcesListNavigationAction.Color.route()) { ColorsLayout() }
+                    composable(ResourcesListNavigationAction.Label.route()) { LabelsLayout() }
+                }
+            )
         }
-    }
-}
-
-@Composable
-fun ResourcesListLayout(navigator: Navigator<ResourcesListNavigationAction>) {
-    val viewModel = storeAndRemember {
-        ResourcesListViewModel(navigator)
-    }
-    ViewModelComposable(viewModel) {
-        Column(
-            verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(Constants.Padding.default)
-                .verticalScroll(rememberScrollState())
-        ) {
-            val resources by resources.state()
-            resources.forEach {
-                Button(
-                    modifier = Modifier.fillMaxWidth(),
-                    onClick = { onResourceSelected(it) }) {
-                    Text(it.title)
+        ViewModelComposable(viewModel) {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(Constants.Padding.default)
+                    .verticalScroll(rememberScrollState())
+            ) {
+                val resources by resources.state()
+                resources.forEach {
+                    Button(
+                        modifier = Modifier.fillMaxWidth(),
+                        onClick = { onResourceSelected(it) }) {
+                        Text(it.title)
+                    }
                 }
             }
         }

From f6e14031718c9f3103daa8415348e75d9cf36f3f Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 25 Nov 2022 23:54:34 +0100
Subject: [PATCH 036/227] Make Architecture Compose work for Configuration
 changes

---
 .../ComposableLifecycleSubscribable.kt        |   2 +-
 .../navigation/ModalBottomSheetNavigator.kt   | 249 +++++++++++-------
 .../compose/navigation/RouteNavigator.kt      | 135 +++++++---
 .../compose/viewModel/ViewModelComposable.kt  |   6 +-
 example/android/src/main/AndroidManifest.xml  |  64 ++---
 .../example/alerts/compose/AlertsLayout.kt    |  13 +-
 .../compose/ArchitectureDetailsLayout.kt      |  13 +-
 .../compose/ArchitectureLayout.kt             |  41 +--
 .../architecture/compose/BottomSheetLayout.kt |  16 +-
 .../compose/BottomSheetSubPageLayout.kt       |  18 +-
 .../compose/DateTimePickerLayout.kt           |   8 +-
 .../keyboard/compose/KeyboardLayout.kt        |  12 +-
 .../example/loading/compose/LoadingLayout.kt  |  13 +-
 .../resources/compose/ButtonsLayout.kt        |  10 +-
 .../example/resources/compose/ColorsLayout.kt |  18 +-
 .../example/resources/compose/LabelsLayout.kt |   7 +-
 .../resources/compose/ResourcesLayout.kt      |  11 +-
 .../shared/viewmodel/alert/AlertViewModel.kt  |   4 +-
 .../src/main/kotlin/Dependencies.kt           |   2 +-
 19 files changed, 346 insertions(+), 296 deletions(-)

diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
index b1c18d25d..40f0d8404 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
@@ -28,7 +28,7 @@ import kotlin.reflect.full.memberProperties
 import kotlin.reflect.full.starProjectedType
 
 interface ComposableLifecycleSubscribable : LifecycleSubscribableMarker {
-    val modifier: @Composable (@Composable () -> Unit) -> Unit
+    val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit
 }
 
 @Suppress("UNCHECKED_CAST")
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
index db1a45c4a..7445b907c 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
@@ -1,24 +1,33 @@
 package com.splendo.kaluga.architecture.compose.navigation
 
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.ModalBottomSheetLayout
 import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.ModalBottomSheetValue
 import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
 import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
 /**
@@ -61,22 +70,49 @@ class BottomSheetRouteController(
     }
 }
 
+class BottomSheetContentNavHostRouteController(
+    provider: StateFlow<BottomSheetNavigatorState?>,
+    parent: RouteController? = null,
+) : NavHostProvidingRouteController<BottomSheetNavigatorState>(provider, parent) {
+    override fun BottomSheetNavigatorState.provide(): NavHostController = contentNavHostController
+}
+
+class BottomSheetSheetContentNavHostRouteController(
+    provider: StateFlow<BottomSheetNavigatorState?>,
+    parent: RouteController? = null,
+) : NavHostProvidingRouteController<BottomSheetNavigatorState>(provider, parent) {
+    override fun BottomSheetNavigatorState.provide(): NavHostController = sheetContentNavHostController
+}
+
+fun <A : NavigationAction<*>> BottomSheetContentRouteNavigator(
+    bottomSheetNavigator: StateFlow<BottomSheetNavigatorState?>,
+    parentRouteController: RouteController? = null,
+    navigationMapper: (A) -> Route
+): NavHostProvidingContentRouteNavigator<A, BottomSheetNavigatorState> = NavHostProvidingContentRouteNavigator(
+    BottomSheetContentNavHostRouteController(bottomSheetNavigator, parentRouteController),
+    navigationMapper
+)
+
 class BottomSheetSheetContentRouteController(
-    val navHostController: StateFlow<NavHostController?>,
-    private val sheetState: SheetState
+    private val bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
+    private val coroutineScope: StateFlow<CoroutineScope?>
 ) : RouteController {
 
-    private val sheetContentRouteController = NavHostRouteController(navHostController, this)
+    private val sheetContentRouteController = BottomSheetSheetContentNavHostRouteController(bottomSheetNavigatorState, this)
 
     override fun navigate(newRoute: Route) {
-        if (!sheetState.isVisible) {
-            sheetState.show(ModalBottomSheetValue.Expanded)
+        bottomSheetNavigatorState.value?.let { (_, _, sheetState) ->
+            if (!sheetState.isVisible) {
+                coroutineScope.value?.launch {
+                    sheetState.animateTo(ModalBottomSheetValue.Expanded)
+                }
+            }
         }
         sheetContentRouteController.navigate(newRoute)
     }
 
     override fun back(result: Route.Result): Boolean {
-        val navHostController = navHostController.value
+        val navHostController = bottomSheetNavigatorState.value?.contentNavHostController
         return if (navHostController != null && navHostController.backQueue.isNotEmpty()) {
             navHostController.previousBackStackEntry?.setResult(result)
             navHostController.popBackStack()
@@ -87,33 +123,11 @@ class BottomSheetSheetContentRouteController(
     }
 
     override fun close() {
-        sheetState.hide()
-    }
-}
-
-interface SheetState {
-    val isVisible: Boolean
-    fun show(value: ModalBottomSheetValue)
-    fun hide()
-}
-
-private object EmptySheetState : SheetState {
-    override val isVisible: Boolean = false
-    override fun show(value: ModalBottomSheetValue) {}
-    override fun hide() {}
-}
-
-private data class SheetStateState(
-    val state: ModalBottomSheetState,
-    val coroutineScope: CoroutineScope?
-) : SheetState {
-    override val isVisible: Boolean get() = state.isVisible
-    override fun show(value: ModalBottomSheetValue) {
-        coroutineScope?.launch { state.animateTo(value)  }
-    }
-
-    override fun hide() {
-        coroutineScope?.launch { state.hide() }
+        bottomSheetNavigatorState.value?.let { (_, _, sheetState) ->
+            coroutineScope.value?.launch {
+                sheetState.hide()
+            }
+        }
     }
 }
 
@@ -129,72 +143,79 @@ sealed class ModalBottomSheetNavigator<A : NavigationAction<*>>(
 class NavHostModalBottomSheetNavigator<A : NavigationAction<*>>(
     navigationMapper: (A) -> BottomSheetRoute,
     contentBuilder: BottomSheetContentBuilder,
+    contentRootResultHandlers: List<NavHostRootResultHandler<*, *>> = emptyList(),
     sheetContentBuilder: BottomSheetContentBuilder,
     private val initialSheetValue: ModalBottomSheetValue = ModalBottomSheetValue.Hidden
 ) : ModalBottomSheetNavigator<A>(navigationMapper) {
-    private val contentNavHostController = MutableStateFlow<NavHostController?>(null)
-    private val sheetContentNavHostController = MutableStateFlow<NavHostController?>(null)
-    private val sheetState = MutableStateFlow<SheetState>(EmptySheetState)
+
+    private val bottomSheetNavigationState = MutableStateFlow<BottomSheetNavigatorState?>(null)
+    private val sheetStateCoroutineScope = MutableStateFlow<CoroutineScope?>(null)
     override val routeController = BottomSheetRouteController(
-        NavHostRouteController(contentNavHostController),
+        BottomSheetContentNavHostRouteController(bottomSheetNavigationState),
         BottomSheetSheetContentRouteController(
-            sheetContentNavHostController,
-            object : SheetState {
-                override val isVisible: Boolean = sheetState.value.isVisible
-                override fun show(value: ModalBottomSheetValue) = sheetState.value.show(value)
-                override fun hide() = sheetState.value.hide()
-            }
+            bottomSheetNavigationState,
+            sheetStateCoroutineScope
         )
     )
 
-    override val modifier: @Composable (@Composable () -> Unit) -> Unit = @Composable { content ->
+    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         val contentNavController = rememberNavController()
-        val sheetContentNavController = rememberNavController()
-        val modalBottomSheetState = rememberModalBottomSheetState(initialValue = initialSheetValue)
-        val coroutineScope = rememberCoroutineScope()
-        contentNavHostController.tryEmit(contentNavController)
-        sheetContentNavHostController.tryEmit(sheetContentNavController)
-        sheetState.tryEmit(SheetStateState(modalBottomSheetState, coroutineScope))
+        bottomSheetNavigationState.tryEmit(
+            BottomSheetNavigatorState(
+                contentNavController,
+                rememberNavController(),
+                rememberModalBottomSheetState(initialValue = initialSheetValue)
+            )
+        )
+        sheetStateCoroutineScope.tryEmit(rememberCoroutineScope())
         SetupNavigatingModalBottomSheetLayout(
+            bottomSheetNavigationState,
             routeController.sheetContentRouteController,
-            contentNavController,
-            sheetContentNavController,
             sheetContentBuilder,
-            content,
-            contentBuilder,
-            modalBottomSheetState
+            {
+                contentRootResultHandlers.forEach { 
+                    it.HandleResult(viewModel = this, navHostController = contentNavController)
+                }
+                content()
+            },
+            contentBuilder
         )
     }
 }
 
 class NavHostModalBottomSheetContentNavigator<A : NavigationAction<*>>(
-    contentNavHostController: NavHostController,
-    sheetContentNavHostController: NavHostController,
-    sheetState: ModalBottomSheetState,
+    bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
     navigationMapper: (A) -> BottomSheetRoute,
 ) : ModalBottomSheetNavigator<A>(navigationMapper) {
 
-    private val sheetStateState = MutableStateFlow<SheetState>(SheetStateState(sheetState, null))
+    private val sheetStateCoroutineScope = MutableStateFlow<CoroutineScope?>(null)
+
+
     override val routeController = BottomSheetRouteController(
-        NavHostRouteController(MutableStateFlow(contentNavHostController)),
+        BottomSheetContentNavHostRouteController(bottomSheetNavigatorState),
         BottomSheetSheetContentRouteController(
-            MutableStateFlow(sheetContentNavHostController),
-            object : SheetState {
-                override val isVisible: Boolean = sheetStateState.value.isVisible
-                override fun show(value: ModalBottomSheetValue) = sheetStateState.value.show(value)
-                override fun hide() = sheetStateState.value.hide()
-            }
+            bottomSheetNavigatorState,
+            sheetStateCoroutineScope
         )
     )
 
-    override val modifier: @Composable (@Composable () -> Unit) -> Unit = @Composable { content ->
-        sheetStateState.tryEmit(SheetStateState(sheetState, rememberCoroutineScope()))
+    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+        sheetStateCoroutineScope.tryEmit(rememberCoroutineScope())
         content()
     }
 }
 
-typealias BottomSheetRootContentBuilder = (contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) -> Unit
-typealias BottomSheetContentBuilder = NavGraphBuilder.(contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) -> Unit
+data class BottomSheetNavigatorState(
+    val contentNavHostController: NavHostController,
+    val sheetContentNavHostController: NavHostController,
+    val sheetState: ModalBottomSheetState
+    )
+
+fun StateFlow<BottomSheetNavigatorState?>.contentNavHostControllerState(coroutineScope: CoroutineScope) = map { it?.contentNavHostController }.stateIn(coroutineScope, SharingStarted.Lazily, null)
+fun StateFlow<BottomSheetNavigatorState?>.sheetContentNavHostControllerState(coroutineScope: CoroutineScope) = map { it?.sheetContentNavHostController }.stateIn(coroutineScope, SharingStarted.Lazily, null)
+
+typealias BottomSheetRootContentBuilder = (bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>) -> Unit
+typealias BottomSheetContentBuilder = NavGraphBuilder.(bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>) -> Unit
 
 /**
  * Creates a [ModalBottomSheetLayout] that supports navigation using a [ModalBottomSheetNavigator]
@@ -204,38 +225,72 @@ typealias BottomSheetContentBuilder = NavGraphBuilder.(contentNavHostController:
  */
 @Composable
 private fun SetupNavigatingModalBottomSheetLayout(
+    bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>,
     sheetContentRouteController: RouteController,
-    contentNavHostController: NavHostController,
-    sheetContentNavHostController: NavHostController,
     sheetContent: BottomSheetContentBuilder,
     contentRoot: @Composable () -> Unit,
-    content: BottomSheetContentBuilder,
-    sheetState: ModalBottomSheetState
-) = ModalBottomSheetLayout(
-    sheetContent = {
-        if (sheetState.isVisible) {
-            HardwareBackButtonNavigation(onBackButtonClickHandler = sheetContentRouteController::close)
-        }
-        Box(Modifier.defaultMinSize(minHeight = 1.dp)) {
-            SetupNavHost(sheetContentNavHostController) { navHostController ->
-                sheetContent(
-                    contentNavHostController,
-                    navHostController,
-                    sheetState
+    content: BottomSheetContentBuilder
+) {
+    val currentBottomSheetNavigationState by bottomSheetNavigationState.collectAsState()
+    currentBottomSheetNavigationState?.let { navigationState ->
+        ModalBottomSheetLayout(
+            sheetContent = {
+                if (navigationState.sheetState.isVisible) {
+                    HardwareBackButtonNavigation(onBackButtonClickHandler = sheetContentRouteController::close)
+                }
+                Box(Modifier.defaultMinSize(minHeight = 1.dp)) {
+                    SetupNavHost(
+                        bottomSheetNavigatorState = bottomSheetNavigationState,
+                        navHostController = { sheetContentNavHostController },
+                    ) {state ->
+                        sheetContent(
+                            state
+                        )
+                    }
+                }
+            },
+            sheetState = navigationState.sheetState,
+        ) {
+            SetupNavHost(
+                bottomSheetNavigatorState = bottomSheetNavigationState,
+                navHostController = { contentNavHostController },
+                rootView = contentRoot
+            ) { state ->
+                content(
+                    state
                 )
             }
         }
-    },
-    sheetState = sheetState,
-) {
-    SetupNavHost(
-        navHostController = contentNavHostController,
-        rootView = contentRoot
-    ) { navHostController ->
-        content(
-            navHostController,
-            sheetContentNavHostController,
-            sheetState
-        )
     }
 }
+
+@Composable
+fun SetupNavHost(
+    bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
+    navHostController: BottomSheetNavigatorState.() -> NavHostController,
+    builder: BottomSheetContentBuilder
+) = SetupNavHost(
+    bottomSheetNavigatorState = bottomSheetNavigatorState,
+    navHostController = navHostController,
+    rootView = { Spacer(modifier = Modifier.fillMaxWidth()) },
+    builder
+)
+
+@Composable
+fun SetupNavHost(
+    bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
+    navHostController: BottomSheetNavigatorState.() -> NavHostController,
+    rootView: @Composable () -> Unit,
+    builder: BottomSheetContentBuilder
+) {
+    val currentBottomSheetNavigatorState by bottomSheetNavigatorState.collectAsState()
+    currentBottomSheetNavigatorState?.let {
+        SetupNavHost(
+            navHostController = it.navHostController(),
+            startDestination = ROOT_VIEW
+        ) {
+            composable(ROOT_VIEW, content = { rootView() })
+            builder(bottomSheetNavigatorState)
+        }
+    }
+}
\ No newline at end of file
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
index b05dd2131..616fdea97 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavGraphBuilder
@@ -23,8 +24,10 @@ import com.splendo.kaluga.architecture.navigation.SingleValueNavigationSpec
 import com.splendo.kaluga.architecture.navigation.toBundle
 import com.splendo.kaluga.architecture.navigation.toNavigationBundle
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.serialization.KSerializer
 
 /**
  * Controller for navigating to a [Route]
@@ -47,18 +50,15 @@ sealed interface RouteController {
     fun close()
 }
 
-/**
- * A [RouteController] managed by a [NavHostController]
- * @param navHostController A [StateFlow] indicating the current [NavHostController] managing the route stack
- * @param parentRouteController The [NavHostController] that is a parent to the [navHostController] if it exists
- */
-class NavHostRouteController(
-    internal val navHostController: StateFlow<NavHostController?>,
+sealed class NavHostProvidingRouteController<Provider>(
+    private val provider: StateFlow<Provider?>,
     private val parentRouteController: RouteController? = null
 ) : RouteController {
 
+    abstract fun Provider.provide(): NavHostController
+
     override fun navigate(newRoute: Route) {
-        val navHostController = navHostController.value ?: return
+        val navHostController = provider.value?.provide() ?: return
         when (newRoute) {
             is Route.NextRoute<*, *> -> navHostController.navigate(newRoute.route) {
                 launchSingleTop = true
@@ -88,7 +88,7 @@ class NavHostRouteController(
     }
 
     override fun back(result: Route.Result): Boolean {
-        val navHostController = navHostController.value
+        val navHostController = provider.value?.provide()
         return if (navHostController != null && navHostController.backQueue.isNotEmpty()) {
             navHostController.previousBackStackEntry?.setResult(result)
             navHostController.popBackStack()
@@ -98,13 +98,19 @@ class NavHostRouteController(
     }
 
     override fun close() {
-        navHostController.value?.popBackStack(ROOT_VIEW, true)
+        provider.value?.provide()?.popBackStack(ROOT_VIEW, true)
         parentRouteController?.close()
     }
 }
 
-typealias RouteRootContentBuilder = (NavHostController) -> Unit
-typealias RouteContentBuilder = NavGraphBuilder.(NavHostController) -> Unit
+class NavHostRouteController(
+    provider: StateFlow<NavHostController?>,
+    parentRouteController: RouteController? = null
+) : NavHostProvidingRouteController<NavHostController>(provider, parentRouteController) {
+    override fun NavHostController.provide(): NavHostController = this
+}
+
+typealias RouteContentBuilder = NavGraphBuilder.(StateFlow<NavHostController?>) -> Unit
 
 /**
  * A Navigator managed by a [RouteController]
@@ -124,39 +130,51 @@ sealed class RouteNavigator<A : NavigationAction<*>>(
 class NavHostRouteNavigator<A : NavigationAction<*>>(
     navigationMapper: (A) -> Route,
     parentRouteController: RouteController? = null,
+    rootResultHandlers: List<NavHostRootResultHandler<*, *>> = emptyList(),
     builder: RouteContentBuilder
 ) : RouteNavigator<A>(navigationMapper) {
 
     private val navHostController = MutableStateFlow<NavHostController?>(null)
     override val routeController: RouteController = NavHostRouteController(navHostController, parentRouteController)
 
-    override val modifier: @Composable (@Composable () -> Unit) -> Unit = @Composable { content ->
+    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         val navController = rememberNavController()
         navHostController.tryEmit(navController)
         SetupNavHost(
-            navHostController = navController,
-            rootView = content,
+            navHostController = navHostController,
+            rootView = {
+                rootResultHandlers.forEach { resultHandler ->
+                    resultHandler.HandleResult(viewModel = this, navHostController = navController)
+                }
+                content()
+                       },
             builder = builder
         )
     }
 }
 
-class NavHostContentRouteNavigator<A : NavigationAction<*>>(
-    navHostController: NavHostController,
-    parentRouteController: RouteController? = null,
+class NavHostProvidingContentRouteNavigator<A : NavigationAction<*>, Provider>(
+    override val routeController: NavHostProvidingRouteController<Provider>,
     navigationMapper: (A) -> Route
 ) : RouteNavigator<A>(navigationMapper) {
 
-    override val routeController: RouteController = NavHostRouteController(MutableStateFlow(navHostController), parentRouteController)
-
-    override val modifier: @Composable (@Composable () -> Unit) -> Unit = @Composable { content ->
+    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         content()
     }
 }
 
+fun <A : NavigationAction<*>> NavHostContentRouteNavigator(
+    navHostController: StateFlow<NavHostController?>,
+    parentRouteController: RouteController? = null,
+    navigationMapper: (A) -> Route
+): NavHostProvidingContentRouteNavigator<A, NavHostController> = NavHostProvidingContentRouteNavigator(
+    NavHostRouteController(navHostController, parentRouteController),
+    navigationMapper
+)
+
 @Composable
 fun SetupNavHost(
-    navHostController: NavHostController,
+    navHostController: StateFlow<NavHostController?>,
     builder: RouteContentBuilder
 ) = SetupNavHost(
     navHostController = navHostController,
@@ -166,15 +184,20 @@ fun SetupNavHost(
 
 @Composable
 fun SetupNavHost(
-    navHostController: NavHostController,
+    navHostController: StateFlow<NavHostController?>,
     rootView: @Composable () -> Unit,
     builder: RouteContentBuilder
-) = SetupNavHost(
-    navHostController = navHostController,
-    startDestination = ROOT_VIEW
 ) {
-    composable(ROOT_VIEW, content = { rootView() })
-    builder(navHostController)
+    val currentNavHostController by navHostController.collectAsState()
+    currentNavHostController?.let {
+        SetupNavHost(
+            navHostController = it,
+            startDestination = ROOT_VIEW
+        ) {
+            composable(ROOT_VIEW, content = { rootView() })
+            builder(navHostController)
+        }
+    }
 }
 
 /**
@@ -195,6 +218,56 @@ fun SetupNavHost(
     )
 }
 
+sealed class NavHostRootResultHandler<ViewModel: BaseLifecycleViewModel, R> {
+    abstract val viewModelClass: Class<ViewModel>
+    abstract val retain: Boolean
+    abstract val onResult: ViewModel.(R) -> Unit
+    @Composable
+    internal abstract fun NavHostController.HandleResult(callback: (R) -> Unit)
+
+    data class Bundle<ViewModel: BaseLifecycleViewModel, R : NavigationBundleSpecRow<*>>(
+        override val viewModelClass: Class<ViewModel>,
+        val spec: NavigationBundleSpec<R>,
+        override val retain: Boolean = false,
+        override val onResult: ViewModel.(NavigationBundle<R>) -> Unit
+    ) : NavHostRootResultHandler<ViewModel, NavigationBundle<R>>() {
+        @Composable
+        override fun NavHostController.HandleResult(callback: (NavigationBundle<R>) -> Unit) = HandleResult(spec, retain) { callback(this) }
+    }
+
+    data class Type<ViewModel: BaseLifecycleViewModel, R>(
+        override val viewModelClass: Class<ViewModel>,
+        val spec: NavigationBundleSpecType<R>,
+        override val retain: Boolean,
+        override val onResult: ViewModel.(R) -> Unit
+    ) : NavHostRootResultHandler<ViewModel, R>() {
+
+        @Composable
+        override fun NavHostController.HandleResult(callback: (R) -> Unit) = HandleResult(spec, retain) { callback(this) }
+    }
+
+    @Composable
+    internal fun HandleResult(viewModel: BaseLifecycleViewModel, navHostController: NavHostController) {
+        viewModelClass.cast(viewModel)?.let { vm ->
+            navHostController.HandleResult { vm.onResult(it) }
+        }
+    }
+}
+
+inline fun <reified ViewModel : BaseLifecycleViewModel, R : NavigationBundleSpecRow<*>> NavigationBundleSpec<R>.NavHostRootResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(NavigationBundle<R>) -> Unit
+) = NavHostRootResultHandler.Bundle(ViewModel::class.java, this, retain, onResult)
+
+inline fun <reified ViewModel : BaseLifecycleViewModel, R> NavigationBundleSpecType<R>.NavHostRootResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(R) -> Unit
+) = NavHostRootResultHandler.Type(ViewModel::class.java, this, retain, onResult)
+
+inline fun <reified ViewModel : BaseLifecycleViewModel, R> KSerializer<R>.NavHostRootResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(R) -> Unit
+) = NavHostRootResultHandler.Type(ViewModel::class.java, NavigationBundleSpecType.SerializedType(this), retain, onResult)
 
 /**
  * Handles a [Route.Result] matching a given [NavigationBundleSpec]
@@ -206,7 +279,7 @@ fun SetupNavHost(
 fun <R : NavigationBundleSpecRow<*>> NavHostController.HandleResult(
     spec: NavigationBundleSpec<R>,
     retain: Boolean = false,
-    onResult: @Composable NavigationBundle<R>.() -> Unit
+    onResult: NavigationBundle<R>.() -> Unit
 ) = HandleResult(retain) { toNavigationBundle(spec).onResult() }
 
 /**
@@ -220,11 +293,11 @@ fun <R : NavigationBundleSpecRow<*>> NavHostController.HandleResult(
 fun <R> NavHostController.HandleResult(
     type: NavigationBundleSpecType<R>,
     retain: Boolean = false,
-    onResult: @Composable R.() -> Unit
+    onResult: R.() -> Unit
 ) = HandleResult(retain) { toTypedProperty(type).onResult() }
 
 @Composable
-internal fun NavHostController.HandleResult(retain: Boolean = false, onResult: @Composable Bundle.() -> Unit) {
+internal fun NavHostController.HandleResult(retain: Boolean = false, onResult: Bundle.() -> Unit) {
     val result = currentBackStackEntry?.savedStateHandle?.getStateFlow<Bundle?>(Route.Result.KEY, null)?.collectAsState()
     result?.value?.let {
         onResult(it)
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index 65da486c9..5408b0ec0 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -63,12 +63,12 @@ private fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
     } else {
         val modifier = viewModel.ComposableLifecycleSubscribable.reduceRight { new, acc ->
             object : ComposableLifecycleSubscribable {
-                override val modifier: @Composable (@Composable () -> Unit) -> Unit = { content ->
-                    new.modifier { acc.modifier(content) }
+                override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = { content ->
+                    new.modifier(this) { acc.modifier(this, content) }
                 }
             }
         }
-        modifier.modifier { content?.invoke(viewModel) }
+        modifier.modifier(viewModel) { content?.invoke(viewModel) }
     }
 }
 
diff --git a/example/android/src/main/AndroidManifest.xml b/example/android/src/main/AndroidManifest.xml
index ad9739cb0..99fa7584b 100644
--- a/example/android/src/main/AndroidManifest.xml
+++ b/example/android/src/main/AndroidManifest.xml
@@ -46,7 +46,7 @@
         <activity android:name="com.splendo.kaluga.example.ExampleActivity"
             android:label="Features list"
             android:exported="true"
-            android:screenOrientation="portrait">
+            android:screenOrientation="fullSensor">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -55,54 +55,54 @@
         </activity>
         <activity android:name=".location.LocationActivity"
             android:label="@string/feature_location"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".permissions.PermissionsListActivity"
             android:label="@string/permissions_list"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".permissions.PermissionActivity"
             android:label="Permissions"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".alerts.AlertsActivity"
             android:label="@string/feature_alerts"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".alerts.xml.XMLAlertsActivity"
             android:label="@string/feature_alerts"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".alerts.compose.ComposeAlertsActivity"
             android:label="@string/feature_alerts"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".datetimepicker.DateTimePickerActivity"
             android:label="@string/feature_date_time_picker"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".datetimepicker.xml.XMLDateTimePickerActivity"
             android:label="@string/feature_date_time_picker"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".datetimepicker.compose.ComposeDateTimePickerActivity"
             android:label="@string/feature_date_time_picker"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".loading.LoadingActivity"
             android:label="@string/feature_hud"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".loading.xml.XMLLoadingActivity"
             android:label="@string/feature_hud"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".loading.compose.ComposeLoadingActivity"
             android:label="@string/feature_hud"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".keyboard.KeyboardActivity"
             android:label="@string/keyboard_manager"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".keyboard.xml.XMLKeyboardActivity"
             android:label="@string/keyboard_manager"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".keyboard.compose.ComposeKeyboardActivity"
             android:label="@string/keyboard_manager"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".link.LinksActivity"
             android:exported="true"
             android:label="@string/feature_links"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait">
+            android:screenOrientation="fullSensor">
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -115,50 +115,50 @@
         </activity>
         <activity android:name=".architecture.ArchitectureActivity"
             android:label="@string/feature_architecture"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".architecture.xml.XMLArchitectureActivity"
             android:label="@string/feature_architecture"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".architecture.compose.ComposeArchitectureActivity"
             android:label="@string/feature_architecture"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
 
         <activity android:name=".architecture.xml.ArchitectureDetailsActivity"
             android:label="@string/feature_architecture"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".bluetooth.BluetoothActivity"
             android:label="@string/feature_bluetooth"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".bluetooth.BluetoothMoreActivity"
             android:label="@string/feature_bluetooth"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".beacons.BeaconsActivity"
             android:label="@string/feature_beacons"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".resources.ResourcesActivity"
             android:label="@string/feature_resources"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".resources.xml.XMLResourcesActivity"
             android:label="@string/feature_resources"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".resources.compose.ComposeResourcesActivity"
             android:label="@string/feature_resources"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".resources.xml.ColorActivity"
             android:label="@string/feature_resources_color"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".resources.xml.LabelActivity"
             android:label="@string/feature_resources_label"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".resources.xml.ButtonActivity"
             android:label="@string/feature_resources_button"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".system.SystemActivity"
             android:label="@string/feature_system"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".system.NetworkActivity"
             android:label="@string/network_feature"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="fullSensor"/>
 
 
         <service android:name=".location.LocationBackgroundService"/>
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
index c6468b7c3..d4c536a79 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
@@ -31,13 +31,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.alerts.alertPresenterBuilder
-import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
 import com.splendo.kaluga.resources.compose.Composable
+import org.koin.androidx.compose.koinViewModel
 
 class ComposeAlertsActivity : AppCompatActivity() {
     @SuppressLint("MissingSuperCall") // Lint bug
@@ -45,9 +43,7 @@ class ComposeAlertsActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            CompositionLocalProvider(
-                LocalAppCompatActivity provides this
-            ) {
+            CompositionLocalProvider {
                 AlertsLayout()
             }
         }
@@ -57,10 +53,7 @@ class ComposeAlertsActivity : AppCompatActivity() {
 @Composable
 fun AlertsLayout() {
     MdcTheme {
-        val activity = LocalAppCompatActivity.current!!
-        val viewModel = storeAndRemember {
-            AlertViewModel(activity.alertPresenterBuilder())
-        }
+        val viewModel = koinViewModel<AlertViewModel>()
 
         ViewModelComposable(viewModel) {
             Column(
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
index 3e95524f9..d90cfa198 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
@@ -23,26 +23,25 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetContentRouteNavigator
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetNavigatorState
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
-import com.splendo.kaluga.architecture.compose.navigation.NavHostContentRouteNavigator
-import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
 import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import com.splendo.kaluga.resources.compose.Composable
+import kotlinx.coroutines.flow.StateFlow
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 @Composable
-fun ArchitectureDetailsLayout(inputDetails: InputDetails, navHostController: NavHostController) {
+fun ArchitectureDetailsLayout(inputDetails: InputDetails, bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>) {
     val viewModel = koinViewModel<ArchitectureDetailsViewModel> {
         parametersOf(
             inputDetails,
-            NavHostContentRouteNavigator(
-                navHostController,
+            BottomSheetContentRouteNavigator(
+                bottomSheetNavigatorState,
                 navigationMapper = ::architectureDetailsNavigationRouteMapper
             )
         )
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
index 972fa14c1..1baaa606b 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
@@ -30,15 +30,12 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.ModalBottomSheetValue
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
-import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.input.key.Key
@@ -47,23 +44,16 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
-import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
 import com.google.android.material.composethemeadapter.MdcTheme
 import com.splendo.kaluga.architecture.compose.mutableState
-import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRouteController
-import com.splendo.kaluga.architecture.compose.navigation.BottomSheetSheetContentRouteController
-import com.splendo.kaluga.architecture.compose.navigation.HandleResult
-import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.navigation.NavHostModalBottomSheetNavigator
-import com.splendo.kaluga.architecture.compose.navigation.NavHostRouteController
+import com.splendo.kaluga.architecture.compose.navigation.NavHostRootResultHandler
 import com.splendo.kaluga.architecture.compose.navigation.composable
 import com.splendo.kaluga.architecture.compose.navigation.route
 import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureNavigationAction
@@ -95,26 +85,30 @@ fun ArchitectureLayout() {
     MdcTheme {
         val viewModel = koinViewModel<ArchitectureViewModel> {
             parametersOf(
-                NavHostModalBottomSheetNavigator<ArchitectureNavigationAction<*>>(
+                NavHostModalBottomSheetNavigator(
                     navigationMapper = ::architectureNavigationRouteMapper,
-                    contentBuilder = { contentNavHostController, _, _ ->
+                    contentBuilder = { bottomSheetNavigationState ->
                         composable<InputDetails, ArchitectureNavigationAction.Details>(
                             type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
                         ) { inputDetails ->
-                            ArchitectureDetailsLayout(inputDetails, contentNavHostController)
+                            ArchitectureDetailsLayout(inputDetails, bottomSheetNavigationState)
                         }
                     },
-                    sheetContentBuilder = { contentNavHostController, sheetContentNavHostController, sheetState ->
+                    contentRootResultHandlers = listOf(
+                        InputDetails.serializer().NavHostRootResultHandler<ArchitectureViewModel, InputDetails> {
+                            nameInput.post(it.name)
+                            numberInput.post(it.number.toString())
+                        }
+                    ),
+                    sheetContentBuilder = { bottomSheetNavigationState ->
                         composable(ArchitectureNavigationAction.BottomSheet.route()) {
                             BottomSheetLayout(
-                                contentNavHostController,
-                                sheetContentNavHostController,
-                                sheetState
+                                bottomSheetNavigationState
                             )
                         }
                         composable(BottomSheetNavigation.SubPage.route()) {
                             BottomSheetSubPageLayout(
-                                contentNavHostController, sheetContentNavHostController, sheetState
+                                bottomSheetNavigationState
                             )
                         }
                     },
@@ -131,15 +125,6 @@ fun ArchitectureLayout() {
 
             val focusManager = LocalFocusManager.current
 
-//            contentNavHostController.HandleResult(
-//                NavigationBundleSpecType.SerializedType(
-//                    InputDetails.serializer()
-//                )
-//            ) {
-//                nameInput.value = name
-//                numberInput.value = number.toString()
-//            }
-
             Column(
                 verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
                 modifier = Modifier
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
index 5eec979e0..ddc837b76 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
@@ -20,32 +20,26 @@ package com.splendo.kaluga.example.architecture.compose
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetNavigatorState
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
-import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.navigation.NavHostModalBottomSheetContentNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.compose.Constants
-import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetViewModel
 import com.splendo.kaluga.resources.compose.Composable
+import kotlinx.coroutines.flow.StateFlow
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 @Composable
-fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
+fun BottomSheetLayout(bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>) {
     val viewModel = koinViewModel<BottomSheetViewModel> {
         parametersOf(
-            NavHostModalBottomSheetContentNavigator<BottomSheetNavigation>(
-                contentNavHostController,
-                sheetContentNavHostController,
-                sheetState,
+            NavHostModalBottomSheetContentNavigator(
+                bottomSheetNavigationState,
                 ::bottomSheetNavigationRouteMapper
             )
         )
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
index 16b5d70d0..d33cd851b 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
@@ -23,37 +23,27 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Button
-import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetNavigatorState
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
-import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.navigation.NavHostModalBottomSheetContentNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.store
 import com.splendo.kaluga.example.compose.Constants
-import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavigation
-import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageViewModel
+import kotlinx.coroutines.flow.StateFlow
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 @Composable
 fun BottomSheetSubPageLayout(
-    contentNavHostController: NavHostController,
-    sheetContentNavHostController: NavHostController,
-    sheetState: ModalBottomSheetState
+    bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>
 ) {
     val viewModel = koinViewModel<BottomSheetSubPageViewModel> {
         parametersOf(
             NavHostModalBottomSheetContentNavigator(
-                contentNavHostController,
-                sheetContentNavHostController,
-                sheetState,
+                bottomSheetNavigationState,
                 ::bottomSheetSubPageNavigationRouteMapper
             )
         )
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
index 1d08774f9..09307a1b3 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
@@ -36,11 +36,10 @@ import com.google.android.material.composethemeadapter.MdcTheme
 import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
-import com.splendo.kaluga.datetimepicker.datePickerPresenterBuilder
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
 import com.splendo.kaluga.resources.compose.Composable
+import org.koin.androidx.compose.koinViewModel
 
 class ComposeDateTimePickerActivity : AppCompatActivity() {
     @SuppressLint("MissingSuperCall") // Lint bug
@@ -60,10 +59,7 @@ class ComposeDateTimePickerActivity : AppCompatActivity() {
 @Composable
 fun DateTimePickerLayout() {
     MdcTheme {
-        val activity = LocalAppCompatActivity.current!!
-        val viewModel = storeAndRemember {
-            DateTimePickerViewModel(activity.datePickerPresenterBuilder())
-        }
+        val viewModel = koinViewModel<DateTimePickerViewModel>()
 
         ViewModelComposable(viewModel) {
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
index 423c1914e..2f7036a0f 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
@@ -42,9 +42,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.ImeAction
 import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
 import com.splendo.kaluga.keyboard.KeyboardManager
@@ -52,6 +50,8 @@ import com.splendo.kaluga.keyboard.compose.ComposeClearFocusHandler
 import com.splendo.kaluga.keyboard.compose.ComposeFocusHandler
 import com.splendo.kaluga.resources.compose.Composable
 import kotlinx.coroutines.flow.MutableStateFlow
+import org.koin.androidx.compose.koinViewModel
+import org.koin.core.parameter.parametersOf
 
 class ComposeKeyboardActivity : AppCompatActivity() {
     @SuppressLint("MissingSuperCall") // Lint bug
@@ -59,9 +59,7 @@ class ComposeKeyboardActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            CompositionLocalProvider(
-                LocalAppCompatActivity provides this
-            ) {
+            CompositionLocalProvider {
                 KeyboardLayout()
             }
         }
@@ -72,8 +70,8 @@ class ComposeKeyboardActivity : AppCompatActivity() {
 fun KeyboardLayout() {
     MdcTheme {
         val focusHandler = LocalFocusManager.current
-        val viewModel = storeAndRemember {
-            KeyboardViewModel(
+        val viewModel = koinViewModel<KeyboardViewModel> {
+            parametersOf(
                 KeyboardManager.Builder(
                     clearFocusHandler = ComposeClearFocusHandler(MutableStateFlow(focusHandler))
                 ),
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
index 8c2af595f..61a4c6d98 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
@@ -31,13 +31,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel
-import com.splendo.kaluga.hud.hudBuilder
 import com.splendo.kaluga.resources.compose.Composable
+import org.koin.androidx.compose.koinViewModel
 
 class ComposeLoadingActivity : AppCompatActivity() {
     @SuppressLint("MissingSuperCall") // Lint bug
@@ -45,9 +43,7 @@ class ComposeLoadingActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            CompositionLocalProvider(
-                LocalAppCompatActivity provides this
-            ) {
+            CompositionLocalProvider {
                 LoadingLayout()
             }
         }
@@ -57,10 +53,7 @@ class ComposeLoadingActivity : AppCompatActivity() {
 @Composable
 fun LoadingLayout() {
     MdcTheme {
-        val activity = LocalAppCompatActivity.current!!
-        val viewModel = storeAndRemember {
-            HudViewModel(activity.hudBuilder())
-        }
+        val viewModel = koinViewModel<HudViewModel>()
 
         ViewModelComposable(viewModel) {
             Column(
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ButtonsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ButtonsLayout.kt
index 076f9e170..6eed87299 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ButtonsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ButtonsLayout.kt
@@ -26,22 +26,16 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import com.splendo.kaluga.alerts.alertPresenterBuilder
 import com.splendo.kaluga.architecture.compose.state
-import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel
-import com.splendo.kaluga.resources.StyledStringBuilder
 import com.splendo.kaluga.resources.compose.Composable
+import org.koin.androidx.compose.koinViewModel
 
 @Composable
 fun ButtonsLayout() {
-    val activity = LocalAppCompatActivity.current!!
-    val viewModel = storeAndRemember {
-        ButtonViewModel(StyledStringBuilder.Provider(), activity.alertPresenterBuilder())
-    }
+    val viewModel = koinViewModel<ButtonViewModel>()
 
     ViewModelComposable(viewModel) {
         val buttons by buttons.state()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
index cad02e808..00eef8809 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.example.resources.compose
 
-import android.view.KeyEvent
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -25,7 +24,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -34,38 +32,28 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.input.key.Key
-import androidx.compose.ui.input.key.key
-import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
-import com.splendo.kaluga.alerts.alertPresenterBuilder
 import com.splendo.kaluga.architecture.compose.state
-import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
 import com.splendo.kaluga.resources.compose.Composable
 import com.splendo.kaluga.resources.compose.backgroundStyle
 import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import org.koin.androidx.compose.koinViewModel
 
 @Composable
 fun ColorsLayout() {
-    val activity = LocalAppCompatActivity.current!!
-    val viewModel = storeAndRemember {
-        ColorViewModel(activity.alertPresenterBuilder())
-    }
+    val viewModel = koinViewModel<ColorViewModel>()
     
     ViewModelComposable(viewModel) {
         Column(
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/LabelsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/LabelsLayout.kt
index ab6db0c93..091fcd546 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/LabelsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/LabelsLayout.kt
@@ -28,17 +28,14 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
-import com.splendo.kaluga.resources.StyledStringBuilder
 import com.splendo.kaluga.resources.compose.Composable
+import org.koin.androidx.compose.koinViewModel
 
 @Composable
 fun LabelsLayout() {
-    val viewModel = storeAndRemember {
-        LabelViewModel(StyledStringBuilder.Provider())
-    }
+    val viewModel = koinViewModel<LabelViewModel>()
 
     ViewModelComposable(viewModel) {
         val labels by labels.state()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
index 86a20688c..3dcee4363 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
@@ -34,21 +34,16 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
 import com.google.android.material.composethemeadapter.MdcTheme
 import com.splendo.kaluga.architecture.compose.navigation.NavHostRouteNavigator
-import com.splendo.kaluga.architecture.compose.navigation.RouteNavigator
-import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
-import com.splendo.kaluga.architecture.compose.viewModel.storeAndRemember
-import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
-import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
-import com.splendo.kaluga.architecture.compose.navigation.SetupNavHost
 import com.splendo.kaluga.architecture.compose.navigation.next
 import com.splendo.kaluga.architecture.compose.navigation.route
 import com.splendo.kaluga.architecture.compose.state
+import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
index ef647044d..8c0a48ef4 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
@@ -66,7 +66,7 @@ class AlertViewModel(val builder: BaseAlertPresenter.Builder, dismissTime: Durat
         }
     }
 
-    val showAlertWithInputButton = KalugaButton.Plain("alert_list".localized(), ButtonStyles.default) {
+    val showAlertWithInputButton = KalugaButton.Plain("alert_input".localized(), ButtonStyles.default) {
         coroutineScope.launch {
             val okAction = Alert.Action("OK", Alert.Action.Style.POSITIVE)
             val cancelAction = Alert.Action("Cancel", Alert.Action.Style.NEGATIVE)
@@ -85,7 +85,7 @@ class AlertViewModel(val builder: BaseAlertPresenter.Builder, dismissTime: Durat
         }
     }
 
-    val showAlertWithListButton = KalugaButton.Plain("alert_input".localized(), ButtonStyles.default) {
+    val showAlertWithListButton = KalugaButton.Plain("alert_list".localized(), ButtonStyles.default) {
         coroutineScope.launch {
             builder.buildActionSheet(this) {
                 setTitle("Select an option")
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index 77faf8d0f..e6b8900d8 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -131,7 +131,7 @@ object Dependencies {
         }
         object Navigation {
             private const val group = "$groupBase.navigation"
-            private const val version = "2.5.2"
+            private const val version = "2.5.3"
 
             val Compose = Dependency(group, "navigation-compose", version)
         }

From 0cb26b69126d4a5804f8ecbb4ba7bdfe636ba89b Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 28 Nov 2022 12:25:48 +0100
Subject: [PATCH 037/227] Make KeyboardManager support Compose properly

---
 .../kaluga/example/ExampleApplication.kt      | 23 +++++++-
 .../keyboard/compose/KeyboardLayout.kt        | 13 ++---
 .../keyboard/xml/XMLKeyboardActivity.kt       | 13 +++--
 .../example/shared/di/DependencyInjection.kt  |  7 ---
 .../viewmodel/keyboard/KeyboardViewModel.kt   |  4 +-
 keyboard-compose/build.gradle.kts             |  4 +-
 .../kotlin/ComposeClearFocusHandler.kt        | 29 ----------
 .../kotlin/ComposeFocusHandler.kt             |  7 +--
 .../kotlin/ComposeKeyboardManager.kt          | 57 +++++++++++++++++++
 .../kotlin/ClearFocusHandler.kt               | 30 ----------
 .../src/androidLibMain/kotlin/FocusHandler.kt |  6 +-
 .../androidLibMain/kotlin/KeyboardManager.kt  | 22 ++++---
 .../kotlin/AndroidKeyboardManagerTests.kt     | 10 ++--
 .../commonMain/kotlin/BaseKeyboardManager.kt  | 31 +++-------
 .../commonTest/kotlin/KeyboardManagerTests.kt |  8 +--
 keyboard/src/iosMain/kotlin/FocusHandler.kt   |  6 +-
 .../src/iosMain/kotlin/KeyboardManager.kt     |  8 +--
 .../iosTest/kotlin/KeyboardManagerTests.kt    | 10 ++--
 keyboard/src/jsMain/kotlin/FocusHandler.kt    | 20 -------
 keyboard/src/jsMain/kotlin/KeyboardManager.kt |  6 +-
 keyboard/src/jvmMain/kotlin/FocusHandler.kt   | 20 -------
 .../src/jvmMain/kotlin/KeyboardManager.kt     |  8 +--
 .../androidLibMain/kotlin/MockFocusHandler.kt | 35 ------------
 .../src/commonMain/kotlin/MockFocusHandler.kt | 14 +----
 .../commonMain/kotlin/MockKeyboardManager.kt  | 18 +++---
 .../commonTest/kotlin/MockFocusHandlerTest.kt | 10 ++--
 .../kotlin/MockKeyboardManagerTest.kt         |  5 +-
 .../src/iosMain/kotlin/MockFocusHandler.kt    | 34 -----------
 .../src/jsMain/kotlin/MockFocusHandler.kt     | 30 ----------
 .../src/jvmMain/kotlin/MockFocusHandler.kt    | 30 ----------
 30 files changed, 162 insertions(+), 356 deletions(-)
 delete mode 100644 keyboard-compose/src/androidLibMain/kotlin/ComposeClearFocusHandler.kt
 create mode 100644 keyboard-compose/src/androidLibMain/kotlin/ComposeKeyboardManager.kt
 delete mode 100644 keyboard/src/androidLibMain/kotlin/ClearFocusHandler.kt
 delete mode 100644 keyboard/src/jsMain/kotlin/FocusHandler.kt
 delete mode 100644 keyboard/src/jvmMain/kotlin/FocusHandler.kt
 delete mode 100644 test-utils-keyboard/src/androidLibMain/kotlin/MockFocusHandler.kt
 delete mode 100644 test-utils-keyboard/src/iosMain/kotlin/MockFocusHandler.kt
 delete mode 100644 test-utils-keyboard/src/jsMain/kotlin/MockFocusHandler.kt
 delete mode 100644 test-utils-keyboard/src/jvmMain/kotlin/MockFocusHandler.kt

diff --git a/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt b/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
index 7622e5ab7..ae7c5c228 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/ExampleApplication.kt
@@ -20,7 +20,17 @@ package com.splendo.kaluga.example
 
 import android.app.Application
 import com.splendo.kaluga.base.ApplicationHolder
+import com.splendo.kaluga.example.keyboard.compose.composeKeyboardViewModel
+import com.splendo.kaluga.example.keyboard.xml.XMLKeyboardActivity
 import com.splendo.kaluga.example.shared.di.initKoin
+import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
+import com.splendo.kaluga.keyboard.ViewFocusHandler
+import com.splendo.kaluga.keyboard.ViewKeyboardManager
+import com.splendo.kaluga.keyboard.compose.ComposeFocusHandler
+import com.splendo.kaluga.keyboard.compose.ComposeKeyboardManager
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
 
 class ExampleApplication : Application() {
 
@@ -28,6 +38,17 @@ class ExampleApplication : Application() {
         super.onCreate()
         ApplicationHolder.application = this
 
-        initKoin()
+        initKoin(
+            listOf(
+                module {
+                    viewModel(named(composeKeyboardViewModel)) { (keyboardBuilder: ComposeKeyboardManager.Builder, focusHandler: ComposeFocusHandler) ->
+                        KeyboardViewModel(keyboardBuilder, focusHandler)
+                    }
+                    viewModel(named(XMLKeyboardActivity.viewModelName)) { (keyboardBuilder: ViewKeyboardManager.Builder, focusHandler: ViewFocusHandler) ->
+                        KeyboardViewModel(keyboardBuilder, focusHandler)
+                    }
+                }
+            )
+        )
     }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
index 2f7036a0f..eeff64946 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
@@ -45,13 +45,14 @@ import com.google.android.material.composethemeadapter.MdcTheme
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
-import com.splendo.kaluga.keyboard.KeyboardManager
-import com.splendo.kaluga.keyboard.compose.ComposeClearFocusHandler
 import com.splendo.kaluga.keyboard.compose.ComposeFocusHandler
+import com.splendo.kaluga.keyboard.compose.ComposeKeyboardManager
 import com.splendo.kaluga.resources.compose.Composable
-import kotlinx.coroutines.flow.MutableStateFlow
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
+import org.koin.core.qualifier.named
+
+val composeKeyboardViewModel = "ComposeKeyboardViewModel"
 
 class ComposeKeyboardActivity : AppCompatActivity() {
     @SuppressLint("MissingSuperCall") // Lint bug
@@ -70,11 +71,9 @@ class ComposeKeyboardActivity : AppCompatActivity() {
 fun KeyboardLayout() {
     MdcTheme {
         val focusHandler = LocalFocusManager.current
-        val viewModel = koinViewModel<KeyboardViewModel> {
+        val viewModel = koinViewModel<KeyboardViewModel<ComposeFocusHandler>>(named(composeKeyboardViewModel)) {
             parametersOf(
-                KeyboardManager.Builder(
-                    clearFocusHandler = ComposeClearFocusHandler(MutableStateFlow(focusHandler))
-                ),
+                ComposeKeyboardManager.Builder(),
                 ComposeFocusHandler(FocusRequester.Default)
             )
         }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt
index dc16bdf35..342a627ea 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt
@@ -24,15 +24,20 @@ import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.databinding.ActivityKeyboardManagerBinding
 import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
 import com.splendo.kaluga.keyboard.ViewFocusHandler
-import com.splendo.kaluga.keyboard.keyboardManagerBuilder
+import com.splendo.kaluga.keyboard.ViewKeyboardManager
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
+import org.koin.core.qualifier.named
 
-class XMLKeyboardActivity : KalugaViewModelActivity<KeyboardViewModel>() {
+class XMLKeyboardActivity : KalugaViewModelActivity<KeyboardViewModel<ViewFocusHandler>>() {
 
-    override val viewModel: KeyboardViewModel by viewModel {
+    companion object {
+        const val viewModelName = "ViewKeyboardViewModel"
+    }
+
+    override val viewModel: KeyboardViewModel<ViewFocusHandler> by viewModel(named(viewModelName)) {
         parametersOf(
-            keyboardManagerBuilder(),
+            ViewKeyboardManager.Builder(),
             ViewFocusHandler(R.id.edit_field)
         )
     }
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index 0c82a2d00..4fc65982a 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -47,7 +47,6 @@ import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewMo
 import com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoNavigation
 import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
-import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
 import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
 import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
 import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
@@ -63,8 +62,6 @@ import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
 import com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel
 import com.splendo.kaluga.hud.HUD
-import com.splendo.kaluga.keyboard.FocusHandler
-import com.splendo.kaluga.keyboard.KeyboardManager
 import com.splendo.kaluga.links.LinksBuilder
 import com.splendo.kaluga.location.LocationStateRepoBuilder
 import com.splendo.kaluga.permissions.base.Permission
@@ -137,10 +134,6 @@ internal val androidModule = module {
         HudViewModel(HUD.Builder())
     }
 
-    viewModel { (keyboardBuilder: KeyboardManager.Builder, focusHandler: FocusHandler) ->
-        KeyboardViewModel(keyboardBuilder, focusHandler)
-    }
-
     viewModel { (navigator: Navigator<BrowserNavigationActions<*>>) ->
         LinksViewModel(
             LinksBuilder(),
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
index 1fca5c7fb..79a6f4293 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
@@ -24,9 +24,9 @@ import com.splendo.kaluga.keyboard.FocusHandler
 import com.splendo.kaluga.resources.localized
 import com.splendo.kaluga.resources.view.KalugaButton
 
-class KeyboardViewModel(keyboardManagerBuilder: BaseKeyboardManager.Builder, private val editFieldFocusHandler: FocusHandler) : BaseLifecycleViewModel() {
+class KeyboardViewModel<FH : FocusHandler>(val keyboardManagerBuilder: BaseKeyboardManager.Builder<FH>, private val editFieldFocusHandler: FH) : BaseLifecycleViewModel() {
 
-    private val keyboardManager: BaseKeyboardManager = keyboardManagerBuilder.create(coroutineScope)
+    private val keyboardManager: BaseKeyboardManager<FH> = keyboardManagerBuilder.create(coroutineScope)
 
     val showButton = KalugaButton.Plain("show_keyboard".localized(), ButtonStyles.default) {
         keyboardManager.show(editFieldFocusHandler)
diff --git a/keyboard-compose/build.gradle.kts b/keyboard-compose/build.gradle.kts
index d9d6d203f..2488de54d 100644
--- a/keyboard-compose/build.gradle.kts
+++ b/keyboard-compose/build.gradle.kts
@@ -11,7 +11,5 @@ composeAndroidComponent()
 dependencies {
     implementation(project(":base"))
     api(project(":keyboard"))
-    implementationDependency(Dependencies.AndroidX.Compose.UI)
-    implementationDependency(Dependencies.AndroidX.Compose.UITooling)
-    implementationDependency(Dependencies.KotlinX.Coroutines.Core)
+    api(project(":architecture-compose"))
 }
diff --git a/keyboard-compose/src/androidLibMain/kotlin/ComposeClearFocusHandler.kt b/keyboard-compose/src/androidLibMain/kotlin/ComposeClearFocusHandler.kt
deleted file mode 100644
index 806a5dd6b..000000000
--- a/keyboard-compose/src/androidLibMain/kotlin/ComposeClearFocusHandler.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.keyboard.compose
-
-import android.app.Activity
-import androidx.compose.ui.focus.FocusManager
-import com.splendo.kaluga.keyboard.ClearFocusHandler
-import kotlinx.coroutines.flow.StateFlow
-
-class ComposeClearFocusHandler(private val focusManager: StateFlow<FocusManager>) : ClearFocusHandler {
-    override fun clearFocus(activity: Activity?) {
-        focusManager.value.clearFocus(true)
-    }
-}
diff --git a/keyboard-compose/src/androidLibMain/kotlin/ComposeFocusHandler.kt b/keyboard-compose/src/androidLibMain/kotlin/ComposeFocusHandler.kt
index 650bb9dcc..052b9c513 100644
--- a/keyboard-compose/src/androidLibMain/kotlin/ComposeFocusHandler.kt
+++ b/keyboard-compose/src/androidLibMain/kotlin/ComposeFocusHandler.kt
@@ -17,12 +17,7 @@
 
 package com.splendo.kaluga.keyboard.compose
 
-import android.app.Activity
 import androidx.compose.ui.focus.FocusRequester
 import com.splendo.kaluga.keyboard.FocusHandler
 
-class ComposeFocusHandler(private val focusRequester: FocusRequester) : FocusHandler {
-    override fun requestFocus(activity: Activity?) {
-        focusRequester.requestFocus()
-    }
-}
+class ComposeFocusHandler(val focusRequester: FocusRequester) : FocusHandler
diff --git a/keyboard-compose/src/androidLibMain/kotlin/ComposeKeyboardManager.kt b/keyboard-compose/src/androidLibMain/kotlin/ComposeKeyboardManager.kt
new file mode 100644
index 000000000..afb71838d
--- /dev/null
+++ b/keyboard-compose/src/androidLibMain/kotlin/ComposeKeyboardManager.kt
@@ -0,0 +1,57 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.keyboard.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.focus.FocusManager
+import androidx.compose.ui.platform.LocalFocusManager
+import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.keyboard.BaseKeyboardManager
+import kotlinx.coroutines.CoroutineScope
+import java.util.WeakHashMap
+
+class ComposeKeyboardManager(internal var currentFocusManager: FocusManager? = null) : BaseKeyboardManager<ComposeFocusHandler> {
+
+    class Builder : BaseKeyboardManager.Builder<ComposeFocusHandler>,
+        ComposableLifecycleSubscribable {
+
+        private val builtManagers = WeakHashMap<Int, ComposeKeyboardManager>()
+
+        override fun create(coroutineScope: CoroutineScope): BaseKeyboardManager<ComposeFocusHandler> = ComposeKeyboardManager().also {
+            builtManagers[it.hashCode()] = it
+        }
+
+        override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = { content ->
+            val focusManager = LocalFocusManager.current
+            builtManagers.values.forEach {
+                it.currentFocusManager = focusManager
+            }
+            content()
+        }
+
+    }
+
+    override fun show(focusHandler: ComposeFocusHandler) {
+        focusHandler.focusRequester.requestFocus()
+    }
+
+    override fun hide() {
+        currentFocusManager?.clearFocus()
+    }
+}
diff --git a/keyboard/src/androidLibMain/kotlin/ClearFocusHandler.kt b/keyboard/src/androidLibMain/kotlin/ClearFocusHandler.kt
deleted file mode 100644
index e9342038b..000000000
--- a/keyboard/src/androidLibMain/kotlin/ClearFocusHandler.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.keyboard
-
-import android.app.Activity
-
-interface ClearFocusHandler {
-    fun clearFocus(activity: Activity?)
-}
-
-class ViewClearFocusHandler : ClearFocusHandler {
-    override fun clearFocus(activity: Activity?) {
-        activity?.currentFocus?.clearFocus()
-    }
-}
diff --git a/keyboard/src/androidLibMain/kotlin/FocusHandler.kt b/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
index 2f9bb8410..c9ce25cc7 100644
--- a/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
+++ b/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
@@ -24,14 +24,10 @@ import android.view.inputmethod.InputMethod.SHOW_EXPLICIT
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.IdRes
 
-actual interface FocusHandler {
-    fun requestFocus(activity: Activity?)
-}
-
 class ViewFocusHandler(
     @IdRes private val id: Int
 ) : FocusHandler {
-    override fun requestFocus(activity: Activity?) {
+    fun requestFocus(activity: Activity?) {
         if (activity == null)
             return
         val view = activity.findViewById<View>(id) ?: return
diff --git a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
index f331f5bdc..ed8a45924 100644
--- a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
@@ -26,27 +26,25 @@ import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromC
 import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
 import kotlinx.coroutines.CoroutineScope
 
-actual class KeyboardManager(
+class ViewKeyboardManager(
     private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver(),
-    private val clearFocusHandler: ClearFocusHandler,
     coroutineScope: CoroutineScope
-) : BaseKeyboardManager, CoroutineScope by coroutineScope {
+) : BaseKeyboardManager<ViewFocusHandler>, CoroutineScope by coroutineScope {
 
-    actual class Builder(
-        private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver(),
-        private val clearFocusHandler: ClearFocusHandler = ViewClearFocusHandler()
-    ) : BaseKeyboardManager.Builder, LifecycleSubscribable by lifecycleManagerObserver {
-        actual override fun create(coroutineScope: CoroutineScope) = KeyboardManager(lifecycleManagerObserver, clearFocusHandler, coroutineScope)
+    class Builder(
+        private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
+    ) : BaseKeyboardManager.Builder<ViewFocusHandler>, LifecycleSubscribable by lifecycleManagerObserver {
+        override fun create(coroutineScope: CoroutineScope) = ViewKeyboardManager(lifecycleManagerObserver, coroutineScope)
     }
 
-    override fun show(focusHandler: FocusHandler) {
+    override fun show(focusHandler: ViewFocusHandler) {
         focusHandler.requestFocus(lifecycleManagerObserver.manager?.activity)
     }
 
     override fun hide() {
         val managedActivity = lifecycleManagerObserver.manager?.activity
-        clearFocusHandler.clearFocus(managedActivity)
         managedActivity?.let { activity ->
+            activity.currentFocus?.clearFocus()
             val inputMethodManager = activity.getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager
             inputMethodManager?.let {
                 if (it.isAcceptingText) {
@@ -66,6 +64,6 @@ actual class KeyboardManager(
  * which can automatically track which Activity is active for it.
  *
  */
-fun AppCompatActivity.keyboardManagerBuilder(clearFocusHandler: ClearFocusHandler = ViewClearFocusHandler()): KeyboardManager.Builder = getOrPutAndRemoveOnDestroyFromCache {
-    KeyboardManager.Builder(lifecycleManagerObserver(), clearFocusHandler)
+fun AppCompatActivity.keyboardManagerBuilder(): ViewKeyboardManager.Builder = getOrPutAndRemoveOnDestroyFromCache {
+    ViewKeyboardManager.Builder(lifecycleManagerObserver())
 }
diff --git a/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt b/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt
index 0dfb8d86a..7ffa25c6e 100644
--- a/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt
+++ b/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt
@@ -25,20 +25,20 @@ import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.keyboard.AndroidKeyboardManagerTests.AndroidKeyboardTestContext
 import kotlinx.coroutines.CoroutineScope
 import org.mockito.ArgumentMatchers
-import org.mockito.Mockito.`when`
 import org.mockito.Mockito.eq
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.verify
+import org.mockito.Mockito.`when`
 
-class AndroidKeyboardManagerTests : KeyboardManagerTests<AndroidKeyboardTestContext>() {
+class AndroidKeyboardManagerTests : KeyboardManagerTests<ViewFocusHandler, AndroidKeyboardTestContext>() {
 
     companion object {
         private const val viewId = 1
     }
 
-    inner class AndroidKeyboardTestContext(coroutineScope: CoroutineScope) : KeyboardTestContext(), CoroutineScope by coroutineScope {
+    inner class AndroidKeyboardTestContext(coroutineScope: CoroutineScope) : KeyboardTestContext<ViewFocusHandler>(), CoroutineScope by coroutineScope {
         override val focusHandler get() = ViewFocusHandler(viewId)
-        override lateinit var builder: KeyboardManager.Builder
+        override lateinit var builder: ViewKeyboardManager.Builder
 
         val mockActivity: Activity = mock(Activity::class.java)
         var mockView: View = mock(View::class.java)
@@ -70,7 +70,7 @@ class AndroidKeyboardManagerTests : KeyboardManagerTests<AndroidKeyboardTestCont
             `when`(mockDecorView.windowToken).thenReturn(mockWindowToken)
             `when`(mockInputMethodManager.isAcceptingText).thenReturn(true)
 
-            builder = KeyboardManager.Builder()
+            builder = ViewKeyboardManager.Builder()
 
             builder.subscribe(
                 LifecycleSubscribable.LifecycleManager(
diff --git a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
index c118dcb49..71b892de8 100644
--- a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
+++ b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
@@ -24,50 +24,35 @@ import kotlinx.coroutines.CoroutineScope
 /**
  * Common interface which handles the focus on a view.
  */
-expect interface FocusHandler
+interface FocusHandler
 
 /**
  * Interface that defines the actions available for the Keyboard Manager
  */
-interface BaseKeyboardManager {
+interface BaseKeyboardManager<FH : FocusHandler> {
 
     /**
-     * Base KeyboardManager builder class, which used to create an KeyboardManager
-     *
-     * @see KeyboardManager
+     * Base KeyboardManager builder class, which used to create a [BaseKeyboardManager]
      */
-    interface Builder : LifecycleSubscribableMarker {
+    interface Builder<FH: FocusHandler> : LifecycleSubscribableMarker {
 
         /**
          * Creates KeyboardManager object
          *
          * @return The KeyboardManager object
          */
-        fun create(coroutineScope: CoroutineScope): BaseKeyboardManager
+        fun create(coroutineScope: CoroutineScope): BaseKeyboardManager<FH>
     }
 
     /**
-     * Shows the keyboard for a given [KeyboardHostingView]
+     * Shows the keyboard for a given [FocusHandler]
      *
-     * @param keyboardHostingView The view for which the keyboard will be shown
+     * @param focusHandler The [FocusHandler] for which the keyboard will be shown
      */
-    fun show(focusHandler: FocusHandler)
+    fun show(focusHandler: FH)
 
     /**
      * Dismisses the current keyboard
      */
     fun hide()
 }
-
-/**
- * Manager for Showing and Hiding the Keyboard.
- */
-expect class KeyboardManager : BaseKeyboardManager {
-
-    /**
-     * Builder for creating a [KeyboardManager].
-     */
-    class Builder : BaseKeyboardManager.Builder {
-        override fun create(coroutineScope: CoroutineScope): KeyboardManager
-    }
-}
diff --git a/keyboard/src/commonTest/kotlin/KeyboardManagerTests.kt b/keyboard/src/commonTest/kotlin/KeyboardManagerTests.kt
index a987a7f2d..80159c7fa 100644
--- a/keyboard/src/commonTest/kotlin/KeyboardManagerTests.kt
+++ b/keyboard/src/commonTest/kotlin/KeyboardManagerTests.kt
@@ -21,11 +21,11 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.yield
 import kotlin.test.Test
 
-abstract class KeyboardManagerTests<KTC : KeyboardTestContext> : UIThreadTest<KTC>() {
+abstract class KeyboardManagerTests<FH : FocusHandler, KTC : KeyboardTestContext<FH>> : UIThreadTest<KTC>() {
 
-    abstract class KeyboardTestContext : TestContext, CoroutineScope {
-        abstract val builder: KeyboardManager.Builder
-        abstract val focusHandler: FocusHandler
+    abstract class KeyboardTestContext<FH : FocusHandler> : TestContext, CoroutineScope {
+        abstract val builder: BaseKeyboardManager.Builder<FH>
+        abstract val focusHandler: FH
 
         abstract fun verifyShow()
         abstract fun verifyDismiss()
diff --git a/keyboard/src/iosMain/kotlin/FocusHandler.kt b/keyboard/src/iosMain/kotlin/FocusHandler.kt
index 145757b73..6b30daad3 100644
--- a/keyboard/src/iosMain/kotlin/FocusHandler.kt
+++ b/keyboard/src/iosMain/kotlin/FocusHandler.kt
@@ -19,12 +19,8 @@ package com.splendo.kaluga.keyboard
 
 import platform.UIKit.UIView
 
-actual interface FocusHandler {
-    fun requestFocus()
-}
-
 class UIKitFocusHandler(val view: UIView) : FocusHandler {
-    override fun requestFocus() {
+    fun requestFocus() {
         if (view.canBecomeFirstResponder) {
             view.becomeFirstResponder()
         }
diff --git a/keyboard/src/iosMain/kotlin/KeyboardManager.kt b/keyboard/src/iosMain/kotlin/KeyboardManager.kt
index 4f0d605a6..095bd639a 100644
--- a/keyboard/src/iosMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/iosMain/kotlin/KeyboardManager.kt
@@ -22,13 +22,13 @@ import kotlinx.coroutines.CoroutineScope
 import platform.UIKit.UIApplication
 import platform.darwin.sel_registerName
 
-actual class KeyboardManager(private val application: UIApplication) : BaseKeyboardManager {
+class UIKitKeyboardManager(private val application: UIApplication) : BaseKeyboardManager<UIKitFocusHandler> {
 
-    actual class Builder(private val application: UIApplication = UIApplication.sharedApplication) : BaseKeyboardManager.Builder {
-        actual override fun create(coroutineScope: CoroutineScope) = KeyboardManager(application)
+    class Builder(private val application: UIApplication = UIApplication.sharedApplication) : BaseKeyboardManager.Builder<UIKitFocusHandler> {
+        override fun create(coroutineScope: CoroutineScope) = UIKitKeyboardManager(application)
     }
 
-    override fun show(focusHandler: FocusHandler) {
+    override fun show(focusHandler: UIKitFocusHandler) {
         focusHandler.requestFocus()
     }
 
diff --git a/keyboard/src/iosTest/kotlin/KeyboardManagerTests.kt b/keyboard/src/iosTest/kotlin/KeyboardManagerTests.kt
index db8c0e6b7..c8bbdc7ac 100644
--- a/keyboard/src/iosTest/kotlin/KeyboardManagerTests.kt
+++ b/keyboard/src/iosTest/kotlin/KeyboardManagerTests.kt
@@ -1,21 +1,21 @@
 package com.splendo.kaluga.keyboard
 
-import com.splendo.kaluga.keyboard.IOSKeyboardManagerTests.IOSKeyboardTestContext
+import com.splendo.kaluga.keyboard.UIKitKeyboardManagerTests.IOSKeyboardTestContext
 import kotlinx.coroutines.CoroutineScope
 import platform.CoreGraphics.CGRectMake
 import platform.UIKit.UIApplication
 import platform.UIKit.UITextField
 import kotlin.test.assertTrue
 
-class IOSKeyboardManagerTests : KeyboardManagerTests<IOSKeyboardTestContext>() {
+class UIKitKeyboardManagerTests : KeyboardManagerTests<UIKitFocusHandler, IOSKeyboardTestContext>() {
 
-    class IOSKeyboardTestContext(coroutineScope: CoroutineScope) : KeyboardTestContext(), CoroutineScope by coroutineScope {
+    class IOSKeyboardTestContext(coroutineScope: CoroutineScope) : KeyboardTestContext<UIKitFocusHandler>(), CoroutineScope by coroutineScope {
         private val application = UIApplication.sharedApplication
         val textField = MockTextField()
 
-        override val builder get() = KeyboardManager.Builder(application)
+        override val builder get() = UIKitKeyboardManager.Builder(application)
 
-        override val focusHandler: FocusHandler
+        override val focusHandler: UIKitFocusHandler
             get() = UIKitFocusHandler(textField)
 
         override fun verifyShow() {
diff --git a/keyboard/src/jsMain/kotlin/FocusHandler.kt b/keyboard/src/jsMain/kotlin/FocusHandler.kt
deleted file mode 100644
index 28e5a9b54..000000000
--- a/keyboard/src/jsMain/kotlin/FocusHandler.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.keyboard
-
-actual interface FocusHandler
diff --git a/keyboard/src/jsMain/kotlin/KeyboardManager.kt b/keyboard/src/jsMain/kotlin/KeyboardManager.kt
index 5c5d33ceb..930e0cf06 100644
--- a/keyboard/src/jsMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/jsMain/kotlin/KeyboardManager.kt
@@ -20,10 +20,10 @@ package com.splendo.kaluga.keyboard
 
 import kotlinx.coroutines.CoroutineScope
 
-actual class KeyboardManager : BaseKeyboardManager {
+class KeyboardManager : BaseKeyboardManager<FocusHandler> {
 
-    actual class Builder : BaseKeyboardManager.Builder {
-        actual override fun create(coroutineScope: CoroutineScope) = KeyboardManager()
+    class Builder : BaseKeyboardManager.Builder<FocusHandler> {
+        override fun create(coroutineScope: CoroutineScope) = KeyboardManager()
     }
 
     override fun show(focusHandler: FocusHandler) {
diff --git a/keyboard/src/jvmMain/kotlin/FocusHandler.kt b/keyboard/src/jvmMain/kotlin/FocusHandler.kt
deleted file mode 100644
index 28e5a9b54..000000000
--- a/keyboard/src/jvmMain/kotlin/FocusHandler.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.keyboard
-
-actual interface FocusHandler
diff --git a/keyboard/src/jvmMain/kotlin/KeyboardManager.kt b/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
index 5c5d33ceb..1397fd243 100644
--- a/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
@@ -20,10 +20,10 @@ package com.splendo.kaluga.keyboard
 
 import kotlinx.coroutines.CoroutineScope
 
-actual class KeyboardManager : BaseKeyboardManager {
+class KeyboardManager : BaseKeyboardManager<FocusHandler> {
 
-    actual class Builder : BaseKeyboardManager.Builder {
-        actual override fun create(coroutineScope: CoroutineScope) = KeyboardManager()
+    class Builder : BaseKeyboardManager.Builder<FocusHandler> {
+        override fun create(coroutineScope: CoroutineScope) = KeyboardManager()
     }
 
     override fun show(focusHandler: FocusHandler) {
@@ -33,4 +33,4 @@ actual class KeyboardManager : BaseKeyboardManager {
     override fun hide() {
         TODO("not implemented") // To change body of created functions use File | Settings | File Templates.
     }
-}
+}
\ No newline at end of file
diff --git a/test-utils-keyboard/src/androidLibMain/kotlin/MockFocusHandler.kt b/test-utils-keyboard/src/androidLibMain/kotlin/MockFocusHandler.kt
deleted file mode 100644
index db83ac39d..000000000
--- a/test-utils-keyboard/src/androidLibMain/kotlin/MockFocusHandler.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.test.keyboard
-
-import android.app.Activity
-import com.splendo.kaluga.keyboard.FocusHandler
-
-actual class MockFocusHandler : BaseMockFocusHandler(), FocusHandler {
-    override fun requestFocus(activity: Activity?) {
-        super.giveFocus()
-    }
-
-    actual fun simulateGiveFocus() {
-        requestFocus(activity = null)
-    }
-
-    actual fun simulateRemoveFocus() {
-        super.removeFocus()
-    }
-}
diff --git a/test-utils-keyboard/src/commonMain/kotlin/MockFocusHandler.kt b/test-utils-keyboard/src/commonMain/kotlin/MockFocusHandler.kt
index 67570307e..5aa6ab1cc 100644
--- a/test-utils-keyboard/src/commonMain/kotlin/MockFocusHandler.kt
+++ b/test-utils-keyboard/src/commonMain/kotlin/MockFocusHandler.kt
@@ -19,23 +19,15 @@ package com.splendo.kaluga.test.keyboard
 
 import com.splendo.kaluga.keyboard.FocusHandler
 
-open class BaseMockFocusHandler {
+class MockFocusHandler : FocusHandler {
     var isFocused: Boolean = false
         private set
 
-    protected fun giveFocus() {
+    fun giveFocus() {
         isFocused = true
     }
 
-    protected fun removeFocus() {
+    fun removeFocus() {
         isFocused = false
     }
 }
-
-/**
- * Mock implementation of [FocusHandler]
- */
-expect class MockFocusHandler constructor() : BaseMockFocusHandler, FocusHandler {
-    fun simulateGiveFocus()
-    fun simulateRemoveFocus()
-}
diff --git a/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt b/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt
index d01faef82..443de0cce 100644
--- a/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt
+++ b/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt
@@ -28,18 +28,18 @@ import kotlinx.coroutines.CoroutineScope
  * Mock implementation of [BaseKeyboardManager]
  * @param setupMocks If `true` configure mocks to display the keyboard
  */
-class MockKeyboardManager(setupMocks: Boolean = true) : BaseKeyboardManager {
+class MockKeyboardManager<FH : FocusHandler>(setupMocks: Boolean = true) : BaseKeyboardManager<FH> {
 
     /**
      * Mock implementation of [BaseKeyboardManager.Builder]
      * @param setupMocks If `true` sets up [createMock] to build [MockKeyboardManager]
      */
-    class Builder(setupMocks: Boolean = true) : BaseKeyboardManager.Builder {
+    class Builder<FH : FocusHandler>(setupMocks: Boolean = true) : BaseKeyboardManager.Builder<FH> {
 
         /**
          * List of created [MockKeyboardManager]
          */
-        val builtKeyboardManagers = mutableListOf<MockKeyboardManager>()
+        val builtKeyboardManagers = mutableListOf<MockKeyboardManager<FH>>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
@@ -49,20 +49,20 @@ class MockKeyboardManager(setupMocks: Boolean = true) : BaseKeyboardManager {
         init {
             if (setupMocks) {
                 createMock.on().doExecute { _ ->
-                    MockKeyboardManager(setupMocks).also {
+                    MockKeyboardManager<FH>(setupMocks).also {
                         builtKeyboardManagers.add(it)
                     }
                 }
             }
         }
 
-        override fun create(coroutineScope: CoroutineScope): MockKeyboardManager = createMock.call(coroutineScope)
+        override fun create(coroutineScope: CoroutineScope): MockKeyboardManager<FH> = createMock.call(coroutineScope)
     }
 
     /**
      * Gets the current [FocusHandler]
      */
-    var focusHandler: FocusHandler? = null
+    var focusHandler: FH? = null
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [show]
@@ -78,16 +78,16 @@ class MockKeyboardManager(setupMocks: Boolean = true) : BaseKeyboardManager {
         if (setupMocks) {
             showMock.on().doExecute { (focusHandler) ->
                 this.focusHandler = focusHandler
-                (focusHandler as? MockFocusHandler)?.simulateGiveFocus()
+                (focusHandler as? MockFocusHandler)?.giveFocus()
             }
             hideMock.on().doExecute {
-                (focusHandler as? MockFocusHandler)?.simulateRemoveFocus()
+                (focusHandler as? MockFocusHandler)?.removeFocus()
                 focusHandler = null
             }
         }
     }
 
-    override fun show(focusHandler: FocusHandler): Unit = showMock.call(focusHandler)
+    override fun show(focusHandler: FH): Unit = showMock.call(focusHandler)
 
     override fun hide(): Unit = hideMock.call()
 }
diff --git a/test-utils-keyboard/src/commonTest/kotlin/MockFocusHandlerTest.kt b/test-utils-keyboard/src/commonTest/kotlin/MockFocusHandlerTest.kt
index 7a7e1f569..4f24c4ec3 100644
--- a/test-utils-keyboard/src/commonTest/kotlin/MockFocusHandlerTest.kt
+++ b/test-utils-keyboard/src/commonTest/kotlin/MockFocusHandlerTest.kt
@@ -30,17 +30,17 @@ class MockFocusHandlerTest {
     @Test
     fun test_give_focus() = testFocusHandler {
         assertFalse(isFocused)
-        simulateGiveFocus()
+        giveFocus()
         assertTrue(isFocused)
     }
 
     @Test
     fun test_remove_focus() = testFocusHandler {
         assertFalse(isFocused)
-        simulateGiveFocus()
+        giveFocus()
         assertTrue(isFocused)
 
-        simulateRemoveFocus()
+        removeFocus()
         assertFalse(isFocused)
     }
 
@@ -48,10 +48,10 @@ class MockFocusHandlerTest {
     fun test_give_remove_multiple_times() = testFocusHandler {
         assertFalse(isFocused)
         repeat(10) {
-            simulateGiveFocus()
+            giveFocus()
             assertTrue(isFocused)
 
-            simulateRemoveFocus()
+            removeFocus()
             assertFalse(isFocused)
         }
     }
diff --git a/test-utils-keyboard/src/commonTest/kotlin/MockKeyboardManagerTest.kt b/test-utils-keyboard/src/commonTest/kotlin/MockKeyboardManagerTest.kt
index 7ecb61f4a..571ffa946 100644
--- a/test-utils-keyboard/src/commonTest/kotlin/MockKeyboardManagerTest.kt
+++ b/test-utils-keyboard/src/commonTest/kotlin/MockKeyboardManagerTest.kt
@@ -18,7 +18,6 @@
 package com.splendo.kaluga.test.keyboard
 
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.keyboard.FocusHandler
 import com.splendo.kaluga.test.architecture.UIThreadViewModelTest
 import com.splendo.kaluga.test.base.mock.verify
 import kotlinx.coroutines.CoroutineScope
@@ -28,7 +27,7 @@ import kotlin.test.assertTrue
 
 class MockKeyboardManagerTest : UIThreadViewModelTest<MockKeyboardManagerTest.TestContext, MockKeyboardManagerTest.ViewModel>() {
 
-    class ViewModel(keyboardManagerBuilder: MockKeyboardManager.Builder, val focusHandler: FocusHandler) : BaseLifecycleViewModel() {
+    class ViewModel(keyboardManagerBuilder: MockKeyboardManager.Builder<MockFocusHandler>, val focusHandler: MockFocusHandler) : BaseLifecycleViewModel() {
 
         val keyboardManager = keyboardManagerBuilder.create(coroutineScope)
 
@@ -38,7 +37,7 @@ class MockKeyboardManagerTest : UIThreadViewModelTest<MockKeyboardManagerTest.Te
 
     class TestContext : ViewModelTestContext<ViewModel> {
         val mockFocusHandler = MockFocusHandler()
-        val keyboardManagerBuilder = MockKeyboardManager.Builder()
+        val keyboardManagerBuilder = MockKeyboardManager.Builder<MockFocusHandler>()
         override val viewModel: ViewModel = ViewModel(keyboardManagerBuilder, mockFocusHandler)
     }
 
diff --git a/test-utils-keyboard/src/iosMain/kotlin/MockFocusHandler.kt b/test-utils-keyboard/src/iosMain/kotlin/MockFocusHandler.kt
deleted file mode 100644
index 746028c9a..000000000
--- a/test-utils-keyboard/src/iosMain/kotlin/MockFocusHandler.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.test.keyboard
-
-import com.splendo.kaluga.keyboard.FocusHandler
-
-actual class MockFocusHandler : BaseMockFocusHandler(), FocusHandler {
-    override fun requestFocus() {
-        super.giveFocus()
-    }
-
-    actual fun simulateGiveFocus() {
-        requestFocus()
-    }
-
-    actual fun simulateRemoveFocus() {
-        super.removeFocus()
-    }
-}
diff --git a/test-utils-keyboard/src/jsMain/kotlin/MockFocusHandler.kt b/test-utils-keyboard/src/jsMain/kotlin/MockFocusHandler.kt
deleted file mode 100644
index cc2dc3dba..000000000
--- a/test-utils-keyboard/src/jsMain/kotlin/MockFocusHandler.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.test.keyboard
-
-import com.splendo.kaluga.keyboard.FocusHandler
-
-actual class MockFocusHandler : BaseMockFocusHandler(), FocusHandler {
-    actual fun simulateGiveFocus() {
-        super.giveFocus()
-    }
-
-    actual fun simulateRemoveFocus() {
-        super.removeFocus()
-    }
-}
diff --git a/test-utils-keyboard/src/jvmMain/kotlin/MockFocusHandler.kt b/test-utils-keyboard/src/jvmMain/kotlin/MockFocusHandler.kt
deleted file mode 100644
index cc2dc3dba..000000000
--- a/test-utils-keyboard/src/jvmMain/kotlin/MockFocusHandler.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.test.keyboard
-
-import com.splendo.kaluga.keyboard.FocusHandler
-
-actual class MockFocusHandler : BaseMockFocusHandler(), FocusHandler {
-    actual fun simulateGiveFocus() {
-        super.giveFocus()
-    }
-
-    actual fun simulateRemoveFocus() {
-        super.removeFocus()
-    }
-}

From cee1f25bd8fa4970974c48b8ac4c5ba269d16427 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 29 Nov 2022 11:13:21 +0100
Subject: [PATCH 038/227] Cleanup, restructuring files & bottom sheet bugfix

---
 .../architecture/compose/ContextExtensions.kt |  28 ++
 .../navigation/BottomSheetNavigator.kt        | 163 ++++++++++
 .../navigation/BottomSheetNavigatorState.kt   |  37 +++
 .../compose/navigation/BottomSheetRoute.kt    |  47 +++
 ...gator.kt => BottomSheetRouteController.kt} |  22 +-
 .../navigation/ModalBottomSheetNavigator.kt   | 296 -----------------
 .../navigation/NavigationExtensions.kt        |   4 +-
 .../architecture/compose/navigation/Route.kt  |   4 +-
 .../compose/navigation/RouteController.kt     | 213 ++++++++++++
 .../compose/navigation/RouteNavigator.kt      | 304 ++++--------------
 .../compose/navigation/SetupNavHost.kt        |  99 ++++++
 .../compose/navigation/result/HandleResult.kt |  70 ++++
 .../navigation/result/NavHostResultHandler.kt |  96 ++++++
 .../compose/navigation/result/setResult.kt    |  27 ++
 .../compose/viewModel/ViewModelComposable.kt  |  19 +-
 .../compose/ArchitectureDetailsLayout.kt      |   4 +-
 .../compose/ArchitectureLayout.kt             |  22 +-
 .../architecture/compose/BottomSheetLayout.kt |   6 +-
 .../compose/BottomSheetSubPageLayout.kt       |   6 +-
 .../resources/compose/ResourcesLayout.kt      |   4 +-
 .../kotlin/ComposeKeyboardManager.kt          |   4 +-
 .../commonMain/kotlin/BaseKeyboardManager.kt  |   2 +-
 .../src/jvmMain/kotlin/KeyboardManager.kt     |   2 +-
 .../system/network/NetworkManager.kt          |  19 +-
 test-utils-system/build.gradle.kts            |   2 +-
 .../kotlin/network/MockNetworkManager.kt      |   1 -
 26 files changed, 902 insertions(+), 599 deletions(-)
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
 rename architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/{CombinedNavigator.kt => BottomSheetRouteController.kt} (54%)
 delete mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/SetupNavHost.kt
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/setResult.kt

diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
new file mode 100644
index 000000000..ec1510662
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
@@ -0,0 +1,28 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.compose
+
+import android.content.Context
+import android.content.ContextWrapper
+import androidx.appcompat.app.AppCompatActivity
+
+internal val Context.activity: AppCompatActivity? get() = when (this) {
+    is AppCompatActivity -> this
+    is ContextWrapper -> baseContext.activity // recursive lookup
+    else -> null
+}
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
new file mode 100644
index 000000000..4d640ad1e
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
@@ -0,0 +1,163 @@
+package com.splendo.kaluga.architecture.compose.navigation
+
+import android.util.Log
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.material.ModalBottomSheetLayout
+import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.material.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.navigation.compose.rememberNavController
+import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
+import com.splendo.kaluga.architecture.compose.navigation.result.NavHostResultHandler
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+/**
+ * A Navigator managed by a [BottomSheetRouteController]
+ * @param navigationMapper A mapper that converts an [NavigationAction] handled by this navigator into a [BottomSheetRoute]
+ */
+sealed class BottomSheetNavigator<A : NavigationAction<*>>(
+    private val navigationMapper: (A) -> BottomSheetRoute
+) : Navigator<A>, ComposableLifecycleSubscribable {
+
+    abstract val routeController: BottomSheetRouteController
+
+    override fun navigate(action: A) = routeController.navigate(navigationMapper(action))
+}
+
+/**
+ * A [BottomSheetNavigator] that creates and manages a [ModalBottomSheetLayout]. This should be on top of any [ModalBottomSheetNavigator]
+ * @param navigationMapper Maps [A] to a [BottomSheetRoute] to be navigated to.
+ * @param initialSheetValue The [ModalBottomSheetValue] the [ModalBottomSheetLayout] should default to.
+ * @param parentRouteController A [RouteController] managing the parent view of the [ModalBottomSheetLayout]
+ * @param contentRootResultHandlers A list of [NavHostResultHandler] to be added to the root view of the content.
+ * @param contentBuilder The [BottomSheetContentBuilder] describing the navigation graph of the content.
+ * @param sheetContentBuilder The [BottomSheetContentBuilder] describing the navigation graph of the sheet content.
+ */
+class RootModalBottomSheetNavigator<A : NavigationAction<*>>(
+    navigationMapper: (A) -> BottomSheetRoute,
+    private val initialSheetValue: ModalBottomSheetValue = ModalBottomSheetValue.Hidden,
+    parentRouteController: RouteController? = null,
+    contentRootResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
+    contentBuilder: BottomSheetContentBuilder,
+    sheetContentBuilder: BottomSheetContentBuilder
+) : BottomSheetNavigator<A>(navigationMapper) {
+
+    private val bottomSheetNavigationState = MutableStateFlow<BottomSheetNavigatorState?>(null)
+    private val sheetStateCoroutineScope = MutableStateFlow<CoroutineScope?>(null)
+    override val routeController = BottomSheetRouteController(
+        BottomSheetContentRouteController(bottomSheetNavigationState, parentRouteController),
+        BottomSheetSheetContentRouteController(
+            bottomSheetNavigationState,
+            sheetStateCoroutineScope
+        )
+    )
+
+    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+        val contentNavController = rememberNavController()
+        bottomSheetNavigationState.tryEmit(
+            BottomSheetNavigatorState(
+                contentNavController,
+                rememberNavController(),
+                rememberModalBottomSheetState(initialValue = initialSheetValue)
+            )
+        )
+        sheetStateCoroutineScope.tryEmit(rememberCoroutineScope())
+        SetupNavigatingModalBottomSheetLayout(
+            bottomSheetNavigationState,
+            routeController.sheetContentRouteController,
+            sheetContentBuilder,
+            {
+                contentRootResultHandlers.forEach {
+                    it.HandleResult(viewModel = this, navHostController = contentNavController)
+                }
+                content()
+            },
+            contentBuilder
+        )
+    }
+}
+
+/**
+ * A [BottomSheetNavigator] that is managed by a [ModalBottomSheetLayout].
+ * @param bottomSheetNavigatorState The [BottomSheetNavigatorState] controlling the routes.
+ * @param contentResultHandlers A list of [NavHostResultHandler] to be added to the content of this navigator.
+ * @param sheetContentResultHandlers A list of [NavHostResultHandler] to be added to the sheet content of this navigator.
+ * @param navigationMapper Maps [A] to a [BottomSheetRoute] to be navigated to.
+ */
+class ModalBottomSheetNavigator<A : NavigationAction<*>>(
+    bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
+    contentResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
+    sheetContentResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
+    navigationMapper: (A) -> BottomSheetRoute,
+) : BottomSheetNavigator<A>(navigationMapper) {
+
+    private val sheetStateCoroutineScope = MutableStateFlow<CoroutineScope?>(null)
+
+    override val routeController = BottomSheetRouteController(
+        BottomSheetContentRouteController(bottomSheetNavigatorState),
+        BottomSheetSheetContentRouteController(
+            bottomSheetNavigatorState,
+            sheetStateCoroutineScope
+        )
+    )
+
+    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+        sheetStateCoroutineScope.tryEmit(rememberCoroutineScope())
+        routeController.contentRouteController.AddResultHandlers(viewModel = this, resultHandlers = contentResultHandlers)
+        routeController.sheetContentRouteController.sheetContentRouteController.AddResultHandlers(viewModel = this, resultHandlers = sheetContentResultHandlers)
+        content()
+    }
+}
+
+@Composable
+private fun SetupNavigatingModalBottomSheetLayout(
+    bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>,
+    sheetContentRouteController: RouteController,
+    sheetContent: BottomSheetContentBuilder,
+    contentRoot: @Composable () -> Unit,
+    content: BottomSheetContentBuilder
+) {
+    val currentBottomSheetNavigationState by bottomSheetNavigationState.collectAsState()
+    currentBottomSheetNavigationState?.let { navigationState ->
+        ModalBottomSheetLayout(
+            sheetContent = {
+                if (navigationState.sheetState.isVisible) {
+                    HardwareBackButtonNavigation(onBackButtonClickHandler = sheetContentRouteController::close)
+                }
+                Box(Modifier.defaultMinSize(minHeight = 1.dp)) {
+                    Log.d("TEST", "SetupNavigatingModalBottomSheetLayout ${navigationState.sheetContentNavHostController}")
+                    SetupNavHost(
+                        bottomSheetNavigatorState = bottomSheetNavigationState,
+                        navHostController = { sheetContentNavHostController },
+                    ) { state ->
+                        sheetContent(
+                            state
+                        )
+                    }
+                }
+            },
+            sheetState = navigationState.sheetState,
+        ) {
+            SetupNavHost(
+                bottomSheetNavigatorState = bottomSheetNavigationState,
+                navHostController = { contentNavHostController },
+                rootView = contentRoot
+            ) { state ->
+                content(
+                    state
+                )
+            }
+        }
+    }
+}
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt
new file mode 100644
index 000000000..8bc399798
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt
@@ -0,0 +1,37 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.compose.navigation
+
+import androidx.compose.material.ModalBottomSheetState
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import kotlinx.coroutines.flow.StateFlow
+
+/**
+ * The State of a [BottomSheetNavigator]
+ * @param contentNavHostController The [NavHostController] managing the content of the bottom sheet.
+ * @param sheetContentNavHostController The [NavHostController] managing the sheet content of the bottom sheet.
+ * @param sheetState The [ModalBottomSheetState] of the bottom sheet.
+ */
+data class BottomSheetNavigatorState(
+    val contentNavHostController: NavHostController,
+    val sheetContentNavHostController: NavHostController,
+    val sheetState: ModalBottomSheetState
+)
+
+typealias BottomSheetContentBuilder = NavGraphBuilder.(bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>) -> Unit
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
new file mode 100644
index 000000000..254a89db3
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
@@ -0,0 +1,47 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.compose.navigation
+
+import androidx.compose.material.ModalBottomSheetLayout
+
+/**
+ * Route for navigating a [ModalBottomSheetLayout] using a [BottomSheetSheetContentRouteController]
+ */
+sealed class BottomSheetRoute {
+    /**
+     * Navigates within the sheet content of the [ModalBottomSheetLayout]
+     * @param route The [Route] to navigate
+     */
+    data class SheetContent(val route: Route) : BottomSheetRoute()
+
+    /**
+     * Navigates within the content of the [ModalBottomSheetLayout]
+     * @param route The [Route] to navigate
+     */
+    data class Content(val route: Route) : BottomSheetRoute()
+}
+
+/**
+ * Converts a [Route] to a [BottomSheetRoute.SheetContent] route
+ */
+val Route.bottomSheetSheetContent get() = BottomSheetRoute.SheetContent(this)
+
+/**
+ * Converts a [Route] to a [BottomSheetRoute.Content] route
+ */
+val Route.bottomSheetContent get() = BottomSheetRoute.Content(this)
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt
similarity index 54%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt
rename to architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt
index 5f0e02193..f29530abb 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt
@@ -17,13 +17,17 @@
 
 package com.splendo.kaluga.architecture.compose.navigation
 
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscriber
-import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.navigation.Navigator
-
+import androidx.compose.material.ModalBottomSheetLayout
 
+/**
+ * A controller that handles the [Route] for a [ModalBottomSheetLayout]
+ */
+class BottomSheetRouteController(
+    internal val contentRouteController: RouteController,
+    internal val sheetContentRouteController: BottomSheetSheetContentRouteController
+) {
+    fun navigate(route: BottomSheetRoute) = when (route) {
+        is BottomSheetRoute.SheetContent -> sheetContentRouteController.navigate(route.route)
+        is BottomSheetRoute.Content -> contentRouteController.navigate(route.route)
+    }
+}
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
deleted file mode 100644
index 7445b907c..000000000
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator.kt
+++ /dev/null
@@ -1,296 +0,0 @@
-package com.splendo.kaluga.architecture.compose.navigation
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.ModalBottomSheetLayout
-import androidx.compose.material.ModalBottomSheetState
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.rememberModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
-import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
-
-/**
- * Route for navigating a [ModalBottomSheetLayout] using a [BottomSheetSheetContentRouteController]
- */
-sealed class BottomSheetRoute {
-    /**
-     * Navigates within the sheet content of the [ModalBottomSheetLayout]
-     * @param route The [Route] to navigate
-     */
-    data class SheetContent(val route: Route) : BottomSheetRoute()
-
-    /**
-     * Navigates within the content of the [ModalBottomSheetLayout]
-     * @param route The [Route] to navigate
-     */
-    data class Content(val route: Route) : BottomSheetRoute()
-}
-
-/**
- * Converts a [Route] to a [BottomSheetRoute.SheetContent] route
- */
-val Route.bottomSheetSheetContent get() = BottomSheetRoute.SheetContent(this)
-
-/**
- * Converts a [Route] to a [BottomSheetRoute.Content] route
- */
-val Route.bottomSheetContent get() = BottomSheetRoute.Content(this)
-
-/**
- * A controller that handles the [Route] for a [ModalBottomSheetLayout]
- */
-class BottomSheetRouteController(
-    internal val contentRouteController: RouteController,
-    internal val sheetContentRouteController: BottomSheetSheetContentRouteController
-) {
-    fun navigate(route: BottomSheetRoute) = when (route) {
-        is BottomSheetRoute.SheetContent -> sheetContentRouteController.navigate(route.route)
-        is BottomSheetRoute.Content -> contentRouteController.navigate(route.route)
-    }
-}
-
-class BottomSheetContentNavHostRouteController(
-    provider: StateFlow<BottomSheetNavigatorState?>,
-    parent: RouteController? = null,
-) : NavHostProvidingRouteController<BottomSheetNavigatorState>(provider, parent) {
-    override fun BottomSheetNavigatorState.provide(): NavHostController = contentNavHostController
-}
-
-class BottomSheetSheetContentNavHostRouteController(
-    provider: StateFlow<BottomSheetNavigatorState?>,
-    parent: RouteController? = null,
-) : NavHostProvidingRouteController<BottomSheetNavigatorState>(provider, parent) {
-    override fun BottomSheetNavigatorState.provide(): NavHostController = sheetContentNavHostController
-}
-
-fun <A : NavigationAction<*>> BottomSheetContentRouteNavigator(
-    bottomSheetNavigator: StateFlow<BottomSheetNavigatorState?>,
-    parentRouteController: RouteController? = null,
-    navigationMapper: (A) -> Route
-): NavHostProvidingContentRouteNavigator<A, BottomSheetNavigatorState> = NavHostProvidingContentRouteNavigator(
-    BottomSheetContentNavHostRouteController(bottomSheetNavigator, parentRouteController),
-    navigationMapper
-)
-
-class BottomSheetSheetContentRouteController(
-    private val bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
-    private val coroutineScope: StateFlow<CoroutineScope?>
-) : RouteController {
-
-    private val sheetContentRouteController = BottomSheetSheetContentNavHostRouteController(bottomSheetNavigatorState, this)
-
-    override fun navigate(newRoute: Route) {
-        bottomSheetNavigatorState.value?.let { (_, _, sheetState) ->
-            if (!sheetState.isVisible) {
-                coroutineScope.value?.launch {
-                    sheetState.animateTo(ModalBottomSheetValue.Expanded)
-                }
-            }
-        }
-        sheetContentRouteController.navigate(newRoute)
-    }
-
-    override fun back(result: Route.Result): Boolean {
-        val navHostController = bottomSheetNavigatorState.value?.contentNavHostController
-        return if (navHostController != null && navHostController.backQueue.isNotEmpty()) {
-            navHostController.previousBackStackEntry?.setResult(result)
-            navHostController.popBackStack()
-        } else {
-            close()
-            true
-        }
-    }
-
-    override fun close() {
-        bottomSheetNavigatorState.value?.let { (_, _, sheetState) ->
-            coroutineScope.value?.launch {
-                sheetState.hide()
-            }
-        }
-    }
-}
-
-sealed class ModalBottomSheetNavigator<A : NavigationAction<*>>(
-    private val navigationMapper: (A) -> BottomSheetRoute
-) : Navigator<A>, ComposableLifecycleSubscribable {
-
-    abstract val routeController: BottomSheetRouteController
-
-    override fun navigate(action: A) = routeController.navigate(navigationMapper(action))
-}
-
-class NavHostModalBottomSheetNavigator<A : NavigationAction<*>>(
-    navigationMapper: (A) -> BottomSheetRoute,
-    contentBuilder: BottomSheetContentBuilder,
-    contentRootResultHandlers: List<NavHostRootResultHandler<*, *>> = emptyList(),
-    sheetContentBuilder: BottomSheetContentBuilder,
-    private val initialSheetValue: ModalBottomSheetValue = ModalBottomSheetValue.Hidden
-) : ModalBottomSheetNavigator<A>(navigationMapper) {
-
-    private val bottomSheetNavigationState = MutableStateFlow<BottomSheetNavigatorState?>(null)
-    private val sheetStateCoroutineScope = MutableStateFlow<CoroutineScope?>(null)
-    override val routeController = BottomSheetRouteController(
-        BottomSheetContentNavHostRouteController(bottomSheetNavigationState),
-        BottomSheetSheetContentRouteController(
-            bottomSheetNavigationState,
-            sheetStateCoroutineScope
-        )
-    )
-
-    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
-        val contentNavController = rememberNavController()
-        bottomSheetNavigationState.tryEmit(
-            BottomSheetNavigatorState(
-                contentNavController,
-                rememberNavController(),
-                rememberModalBottomSheetState(initialValue = initialSheetValue)
-            )
-        )
-        sheetStateCoroutineScope.tryEmit(rememberCoroutineScope())
-        SetupNavigatingModalBottomSheetLayout(
-            bottomSheetNavigationState,
-            routeController.sheetContentRouteController,
-            sheetContentBuilder,
-            {
-                contentRootResultHandlers.forEach { 
-                    it.HandleResult(viewModel = this, navHostController = contentNavController)
-                }
-                content()
-            },
-            contentBuilder
-        )
-    }
-}
-
-class NavHostModalBottomSheetContentNavigator<A : NavigationAction<*>>(
-    bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
-    navigationMapper: (A) -> BottomSheetRoute,
-) : ModalBottomSheetNavigator<A>(navigationMapper) {
-
-    private val sheetStateCoroutineScope = MutableStateFlow<CoroutineScope?>(null)
-
-
-    override val routeController = BottomSheetRouteController(
-        BottomSheetContentNavHostRouteController(bottomSheetNavigatorState),
-        BottomSheetSheetContentRouteController(
-            bottomSheetNavigatorState,
-            sheetStateCoroutineScope
-        )
-    )
-
-    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
-        sheetStateCoroutineScope.tryEmit(rememberCoroutineScope())
-        content()
-    }
-}
-
-data class BottomSheetNavigatorState(
-    val contentNavHostController: NavHostController,
-    val sheetContentNavHostController: NavHostController,
-    val sheetState: ModalBottomSheetState
-    )
-
-fun StateFlow<BottomSheetNavigatorState?>.contentNavHostControllerState(coroutineScope: CoroutineScope) = map { it?.contentNavHostController }.stateIn(coroutineScope, SharingStarted.Lazily, null)
-fun StateFlow<BottomSheetNavigatorState?>.sheetContentNavHostControllerState(coroutineScope: CoroutineScope) = map { it?.sheetContentNavHostController }.stateIn(coroutineScope, SharingStarted.Lazily, null)
-
-typealias BottomSheetRootContentBuilder = (bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>) -> Unit
-typealias BottomSheetContentBuilder = NavGraphBuilder.(bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>) -> Unit
-
-/**
- * Creates a [ModalBottomSheetLayout] that supports navigation using a [ModalBottomSheetNavigator]
- * @param sheetContent The [BottomSheetContentBuilder] for building the navigation sheet content of the [ModalBottomSheetLayout]
- * @param contentRoot The [BottomSheetRootContentBuilder] for building the root view of the content of the [ModalBottomSheetLayout]
- * @param content The [BottomSheetContentBuilder] for building the navigation content of the [ModalBottomSheetLayout]
- */
-@Composable
-private fun SetupNavigatingModalBottomSheetLayout(
-    bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>,
-    sheetContentRouteController: RouteController,
-    sheetContent: BottomSheetContentBuilder,
-    contentRoot: @Composable () -> Unit,
-    content: BottomSheetContentBuilder
-) {
-    val currentBottomSheetNavigationState by bottomSheetNavigationState.collectAsState()
-    currentBottomSheetNavigationState?.let { navigationState ->
-        ModalBottomSheetLayout(
-            sheetContent = {
-                if (navigationState.sheetState.isVisible) {
-                    HardwareBackButtonNavigation(onBackButtonClickHandler = sheetContentRouteController::close)
-                }
-                Box(Modifier.defaultMinSize(minHeight = 1.dp)) {
-                    SetupNavHost(
-                        bottomSheetNavigatorState = bottomSheetNavigationState,
-                        navHostController = { sheetContentNavHostController },
-                    ) {state ->
-                        sheetContent(
-                            state
-                        )
-                    }
-                }
-            },
-            sheetState = navigationState.sheetState,
-        ) {
-            SetupNavHost(
-                bottomSheetNavigatorState = bottomSheetNavigationState,
-                navHostController = { contentNavHostController },
-                rootView = contentRoot
-            ) { state ->
-                content(
-                    state
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun SetupNavHost(
-    bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
-    navHostController: BottomSheetNavigatorState.() -> NavHostController,
-    builder: BottomSheetContentBuilder
-) = SetupNavHost(
-    bottomSheetNavigatorState = bottomSheetNavigatorState,
-    navHostController = navHostController,
-    rootView = { Spacer(modifier = Modifier.fillMaxWidth()) },
-    builder
-)
-
-@Composable
-fun SetupNavHost(
-    bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
-    navHostController: BottomSheetNavigatorState.() -> NavHostController,
-    rootView: @Composable () -> Unit,
-    builder: BottomSheetContentBuilder
-) {
-    val currentBottomSheetNavigatorState by bottomSheetNavigatorState.collectAsState()
-    currentBottomSheetNavigatorState?.let {
-        SetupNavHost(
-            navHostController = it.navHostController(),
-            startDestination = ROOT_VIEW
-        ) {
-            composable(ROOT_VIEW, content = { rootView() })
-            builder(bottomSheetNavigatorState)
-        }
-    }
-}
\ No newline at end of file
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
index f120ae28d..a8dc7374b 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
@@ -5,9 +5,11 @@ import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import com.splendo.kaluga.architecture.compose.activity
 import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
 import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
@@ -20,7 +22,7 @@ import kotlinx.coroutines.launch
  */
 @Composable
 fun LifecycleSubscribable.bind(): LifecycleSubscribable {
-    LocalAppCompatActivity.current?.let { activity ->
+    LocalContext.current.activity?.let { activity ->
         DisposableEffect(Unit) {
             subscribe(activity)
 
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
index 2aca3c577..30222f5eb 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
@@ -24,8 +24,6 @@ import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationBundleValue
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationSpec
-import com.splendo.kaluga.architecture.navigation.toBundle
 import com.splendo.kaluga.base.text.KalugaDateFormatter
 import com.splendo.kaluga.base.text.iso8601Pattern
 import kotlinx.serialization.builtins.BooleanArraySerializer
@@ -181,7 +179,7 @@ sealed class Route {
         companion object {
             const val KEY = "com.splendo.kaluga.architecture.compose.navigation.Route.Result.KEY"
         }
-        object Empty: Result()
+        object Empty : Result()
         data class Data<SpecRow : NavigationBundleSpecRow<*>, Bundle : NavigationBundle<SpecRow>>(val bundle: Bundle) : Result()
     }
 
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
new file mode 100644
index 000000000..56ae84cb0
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
@@ -0,0 +1,213 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.compose.navigation
+
+import androidx.compose.material.ModalBottomSheetState
+import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.navigation.NavDestination
+import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.compose.navigation.result.NavHostResultHandler
+import com.splendo.kaluga.architecture.compose.navigation.result.setResult
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+
+/**
+ * Controller for navigating to a [Route]
+ */
+sealed interface RouteController {
+
+    @Composable
+    fun AddResultHandlers(viewModel: BaseLifecycleViewModel, resultHandlers: List<NavHostResultHandler<*, *>>)
+
+    /**
+     * Navigates to a [Route]
+     * @param newRoute The [Route] to navigate to
+     */
+    fun navigate(newRoute: Route)
+
+    /**
+     * Navigates back
+     */
+    fun back(result: Route.Result): Boolean
+
+    /**
+     * Closes this RouteController
+     */
+    fun close()
+}
+
+/**
+ * Abstract [RouteController] that navigates on a [NavHostController] provided by a [Provider]
+ * @param provider The [Provider] of the [NavHostController]
+ * @param parentRouteController An optional parent [RouteController] managing this controller.
+ */
+sealed class ProvidingNavHostRouteController<Provider>(
+    private val provider: StateFlow<Provider?>,
+    private val parentRouteController: RouteController? = null
+) : RouteController {
+
+    /**
+     * Converts [Provider] into a [NavHostController]
+     */
+    abstract fun Provider.provide(): NavHostController
+
+    override fun navigate(newRoute: Route) {
+        val navHostController = provider.value?.provide() ?: return
+        when (newRoute) {
+            is Route.NextRoute<*, *> -> navHostController.navigate(newRoute.route) {
+                launchSingleTop = true
+            }
+            is Route.FromRoute<*, *> -> navHostController.navigate(newRoute.route) {
+                popUpTo(newRoute.from)
+            }
+            is Route.Replace<*, *> -> {
+                navHostController.popBackStack()
+                navHostController.navigate(newRoute.route)
+            }
+            is Route.PopTo<*, *> -> {
+                navHostController.getBackStackEntry(newRoute.route).setResult(newRoute.result)
+                navHostController.popBackStack(newRoute.route, false)
+            }
+            is Route.PopToIncluding<*, *> -> {
+                navHostController.popBackStack(newRoute.route, true)
+            }
+            is Route.Back -> back(newRoute.result)
+            is Route.PopToRoot -> {
+                navHostController.getBackStackEntry(ROOT_VIEW).setResult(newRoute.result)
+                navHostController.popBackStack(ROOT_VIEW, false)
+            }
+            is Route.Close -> close()
+            is Route.Launcher<*> -> newRoute.launch()
+        }
+    }
+
+    override fun back(result: Route.Result): Boolean {
+        val navHostController = provider.value?.provide()
+        return if (navHostController != null && navHostController.backQueue.isNotEmpty()) {
+            navHostController.previousBackStackEntry?.setResult(result)
+            navHostController.popBackStack()
+        } else {
+            parentRouteController?.back(result) ?: false
+        }
+    }
+
+    override fun close() {
+        provider.value?.provide()?.popBackStack(ROOT_VIEW, true)
+        parentRouteController?.close()
+    }
+
+    @Composable
+    override fun AddResultHandlers(viewModel: BaseLifecycleViewModel, resultHandlers: List<NavHostResultHandler<*, *>>) {
+        if (resultHandlers.isNotEmpty()) {
+            val currentProvider by provider.collectAsState()
+            currentProvider?.provide()?.let { currentNavHostController ->
+                resultHandlers.forEach {
+                    it.HandleResult(viewModel = viewModel, navHostController = currentNavHostController)
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Simple [ProvidingNavHostRouteController] where the provider is a flow of [NavHostController]
+ * @param provider The flow of [NavHostController] to be managed by this Route Controller
+ * @param parentRouteController An optional parent [RouteController] managing this controller.
+ */
+class NavHostRouteController(
+    provider: StateFlow<NavHostController?>,
+    parentRouteController: RouteController? = null
+) : ProvidingNavHostRouteController<NavHostController>(provider, parentRouteController) {
+    override fun NavHostController.provide(): NavHostController = this
+}
+
+/**
+ * [ProvidingNavHostRouteController] where the [NavHostController] is provided by the content of a [BottomSheetNavigatorState]
+ * @param provider The flow of [BottomSheetNavigatorState] where the [BottomSheetNavigatorState.contentNavHostController] is to be managed by this Route Controller
+ * @param parentRouteController An optional parent [RouteController] managing this controller.
+ */
+class BottomSheetContentRouteController(
+    provider: StateFlow<BottomSheetNavigatorState?>,
+    parentRouteController: RouteController? = null,
+) : ProvidingNavHostRouteController<BottomSheetNavigatorState>(provider, parentRouteController) {
+    override fun BottomSheetNavigatorState.provide(): NavHostController = contentNavHostController
+}
+
+/**
+ * [RouteController] for the sheet content of a [BottomSheetNavigatorState]
+ * @param bottomSheetNavigatorState The flow of [BottomSheetNavigatorState] where the [BottomSheetNavigatorState.sheetContentNavHostController] is to be managed by this Route Controller
+ * @param coroutineScope A flow of [CoroutineScope] for managing the [ModalBottomSheetState].
+ */
+class BottomSheetSheetContentRouteController(
+    private val bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
+    private val coroutineScope: StateFlow<CoroutineScope?>
+) : RouteController {
+
+    inner class NavHostRouteController : ProvidingNavHostRouteController<BottomSheetNavigatorState>(bottomSheetNavigatorState) {
+        override fun BottomSheetNavigatorState.provide(): NavHostController = sheetContentNavHostController
+    }
+
+    internal val sheetContentRouteController = NavHostRouteController()
+
+    override fun navigate(newRoute: Route) {
+        bottomSheetNavigatorState.value?.let { (_, _, sheetState) ->
+            if (!sheetState.isVisible) {
+                coroutineScope.value?.launch {
+                    sheetState.animateTo(ModalBottomSheetValue.Expanded)
+                }
+            }
+        }
+        when (newRoute) {
+            is Route.Close -> close()
+            is Route.Back -> back(newRoute.result)
+            is Route.PopToRoot -> close()
+            else -> sheetContentRouteController.navigate(newRoute)
+        }
+    }
+
+    override fun back(result: Route.Result): Boolean {
+        val navHostController = bottomSheetNavigatorState.value?.sheetContentNavHostController
+        val rootRoute = NavDestination.createRoute(ROOT_VIEW).hashCode()
+        return if (navHostController != null && navHostController.backQueue.isNotEmpty() && navHostController.previousBackStackEntry?.destination?.id != rootRoute) {
+            navHostController.previousBackStackEntry?.setResult(result)
+            navHostController.popBackStack()
+        } else {
+            close()
+            true
+        }
+    }
+
+    override fun close() {
+        bottomSheetNavigatorState.value?.let { (_, sheetContentNavHostController, sheetState) ->
+            sheetContentNavHostController.popBackStack(ROOT_VIEW, false)
+            coroutineScope.value?.launch {
+                sheetState.hide()
+            }
+        }
+    }
+
+    @Composable
+    override fun AddResultHandlers(viewModel: BaseLifecycleViewModel, resultHandlers: List<NavHostResultHandler<*, *>>) {
+        sheetContentRouteController.AddResultHandlers(viewModel = viewModel, resultHandlers = resultHandlers)
+    }
+}
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
index 616fdea97..1c9853686 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
@@ -1,114 +1,19 @@
 package com.splendo.kaluga.architecture.compose.navigation
 
-import android.os.Bundle
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.navigation.NavBackStackEntry
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
+import com.splendo.kaluga.architecture.compose.navigation.result.NavHostResultHandler
 import com.splendo.kaluga.architecture.navigation.NavigationAction
-import com.splendo.kaluga.architecture.navigation.NavigationBundle
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationSpec
-import com.splendo.kaluga.architecture.navigation.toBundle
-import com.splendo.kaluga.architecture.navigation.toNavigationBundle
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.serialization.KSerializer
-
-/**
- * Controller for navigating to a [Route]
- */
-sealed interface RouteController {
-    /**
-     * Navigates to a [Route]
-     * @param newRoute The [Route] to navigate to
-     */
-    fun navigate(newRoute: Route)
-
-    /**
-     * Navigates back
-     */
-    fun back(result: Route.Result): Boolean
-
-    /**
-     * Closes this RouteController
-     */
-    fun close()
-}
-
-sealed class NavHostProvidingRouteController<Provider>(
-    private val provider: StateFlow<Provider?>,
-    private val parentRouteController: RouteController? = null
-) : RouteController {
-
-    abstract fun Provider.provide(): NavHostController
-
-    override fun navigate(newRoute: Route) {
-        val navHostController = provider.value?.provide() ?: return
-        when (newRoute) {
-            is Route.NextRoute<*, *> -> navHostController.navigate(newRoute.route) {
-                launchSingleTop = true
-            }
-            is Route.FromRoute<*, *> -> navHostController.navigate(newRoute.route) {
-                popUpTo(newRoute.from)
-            }
-            is Route.Replace<*, *> -> {
-                navHostController.popBackStack()
-                navHostController.navigate(newRoute.route)
-            }
-            is Route.PopTo<*, *> -> {
-                navHostController.getBackStackEntry(newRoute.route).setResult(newRoute.result)
-                navHostController.popBackStack(newRoute.route, false)
-            }
-            is Route.PopToIncluding<*, *> -> {
-                navHostController.popBackStack(newRoute.route, true)
-            }
-            is Route.Back -> back(newRoute.result)
-            is Route.PopToRoot -> {
-                navHostController.getBackStackEntry(ROOT_VIEW).setResult(newRoute.result)
-                navHostController.popBackStack(ROOT_VIEW, false)
-            }
-            is Route.Close -> close()
-            is Route.Launcher<*> -> newRoute.launch()
-        }
-    }
-
-    override fun back(result: Route.Result): Boolean {
-        val navHostController = provider.value?.provide()
-        return if (navHostController != null && navHostController.backQueue.isNotEmpty()) {
-            navHostController.previousBackStackEntry?.setResult(result)
-            navHostController.popBackStack()
-        } else {
-            parentRouteController?.back(result) ?: false
-        }
-    }
-
-    override fun close() {
-        provider.value?.provide()?.popBackStack(ROOT_VIEW, true)
-        parentRouteController?.close()
-    }
-}
-
-class NavHostRouteController(
-    provider: StateFlow<NavHostController?>,
-    parentRouteController: RouteController? = null
-) : NavHostProvidingRouteController<NavHostController>(provider, parentRouteController) {
-    override fun NavHostController.provide(): NavHostController = this
-}
 
 typealias RouteContentBuilder = NavGraphBuilder.(StateFlow<NavHostController?>) -> Unit
 
@@ -120,6 +25,9 @@ sealed class RouteNavigator<A : NavigationAction<*>>(
     private val navigationMapper: (A) -> Route
 ) : Navigator<A>, ComposableLifecycleSubscribable {
 
+    /**
+     * [RouteController] managing the [Route] navigation
+     */
     abstract val routeController: RouteController
 
     override fun navigate(action: A) {
@@ -127,11 +35,18 @@ sealed class RouteNavigator<A : NavigationAction<*>>(
     }
 }
 
-class NavHostRouteNavigator<A : NavigationAction<*>>(
+/**
+ * A [RouteNavigator] that creates and manages a [NavHost]. This should be on top of any [NavHostRouteNavigator]
+ * @param navigationMapper Maps [A] to a [Route] to be navigated to.
+ * @param parentRouteController A [RouteController] managing the parent layout of the [NavHost].
+ * @param rootResultHandlers A list of [NavHostResultHandler] to be added to the root view.
+ * @param contentBuilder The [RouteContentBuilder] describing the navigation graph
+ */
+class RootNavHostRouteNavigator<A : NavigationAction<*>>(
     navigationMapper: (A) -> Route,
     parentRouteController: RouteController? = null,
-    rootResultHandlers: List<NavHostRootResultHandler<*, *>> = emptyList(),
-    builder: RouteContentBuilder
+    rootResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
+    contentBuilder: RouteContentBuilder
 ) : RouteNavigator<A>(navigationMapper) {
 
     private val navHostController = MutableStateFlow<NavHostController?>(null)
@@ -147,167 +62,82 @@ class NavHostRouteNavigator<A : NavigationAction<*>>(
                     resultHandler.HandleResult(viewModel = this, navHostController = navController)
                 }
                 content()
-                       },
-            builder = builder
+            },
+            builder = contentBuilder
         )
     }
 }
 
-class NavHostProvidingContentRouteNavigator<A : NavigationAction<*>, Provider>(
-    override val routeController: NavHostProvidingRouteController<Provider>,
+/**
+ * A [RouteNavigator] that is managed by a [NavHost]
+ * @param routeController The [ProvidingNavHostRouteController] controlling the route.
+ * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
+ * @param navigationMapper Maps [A] to a [Route] to be navigated to.
+ */
+sealed class ProvidingNavHostRouteNavigator<A : NavigationAction<*>, Provider>(
+    override val routeController: ProvidingNavHostRouteController<Provider>,
+    resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     navigationMapper: (A) -> Route
 ) : RouteNavigator<A>(navigationMapper) {
 
     override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+        routeController.AddResultHandlers(viewModel = this, resultHandlers = resultHandlers)
         content()
     }
 }
 
-fun <A : NavigationAction<*>> NavHostContentRouteNavigator(
+/**
+ * A [RouteNavigator] that navigates for a flow of [NavHostController]
+ * @param navHostController The flow of [NavHostController] to manage this navigator
+ * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
+ * @param navigationMapper Maps [A] to a [Route] to be navigated to.
+ */
+class NavHostRouteNavigator<A : NavigationAction<*>> (
     navHostController: StateFlow<NavHostController?>,
+    resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     parentRouteController: RouteController? = null,
     navigationMapper: (A) -> Route
-): NavHostProvidingContentRouteNavigator<A, NavHostController> = NavHostProvidingContentRouteNavigator(
+) : ProvidingNavHostRouteNavigator<A, NavHostController>(
     NavHostRouteController(navHostController, parentRouteController),
+    resultHandlers,
     navigationMapper
 )
 
-@Composable
-fun SetupNavHost(
-    navHostController: StateFlow<NavHostController?>,
-    builder: RouteContentBuilder
-) = SetupNavHost(
-    navHostController = navHostController,
-    rootView = { Spacer(modifier = Modifier.fillMaxWidth()) },
-    builder
-)
-
-@Composable
-fun SetupNavHost(
-    navHostController: StateFlow<NavHostController?>,
-    rootView: @Composable () -> Unit,
-    builder: RouteContentBuilder
-) {
-    val currentNavHostController by navHostController.collectAsState()
-    currentNavHostController?.let {
-        SetupNavHost(
-            navHostController = it,
-            startDestination = ROOT_VIEW
-        ) {
-            composable(ROOT_VIEW, content = { rootView() })
-            builder(navHostController)
-        }
-    }
-}
-
 /**
- * Creates a a [NavHost] for a given [RouteController]
- * @param startDestination The start destination of the [NavHost]
- * @param builder The [RouteContentBuilder] for building the content of the [NavHost]
+ * A [RouteNavigator] that navigates for the content of a flow of [BottomSheetNavigatorState]
+ * @param bottomSheetNavigator The flow of [BottomSheetNavigatorState] to manage this navigator
+ * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
+ * @param navigationMapper Maps [A] to a [Route] to be navigated to.
  */
-@Composable
-fun SetupNavHost(
-    navHostController: NavHostController,
-    startDestination: String,
-    builder: NavGraphBuilder.() -> Unit
-) {
-    NavHost(
-        navController = navHostController,
-        startDestination = startDestination,
-        builder = { builder() }
-    )
-}
-
-sealed class NavHostRootResultHandler<ViewModel: BaseLifecycleViewModel, R> {
-    abstract val viewModelClass: Class<ViewModel>
-    abstract val retain: Boolean
-    abstract val onResult: ViewModel.(R) -> Unit
-    @Composable
-    internal abstract fun NavHostController.HandleResult(callback: (R) -> Unit)
-
-    data class Bundle<ViewModel: BaseLifecycleViewModel, R : NavigationBundleSpecRow<*>>(
-        override val viewModelClass: Class<ViewModel>,
-        val spec: NavigationBundleSpec<R>,
-        override val retain: Boolean = false,
-        override val onResult: ViewModel.(NavigationBundle<R>) -> Unit
-    ) : NavHostRootResultHandler<ViewModel, NavigationBundle<R>>() {
-        @Composable
-        override fun NavHostController.HandleResult(callback: (NavigationBundle<R>) -> Unit) = HandleResult(spec, retain) { callback(this) }
-    }
-
-    data class Type<ViewModel: BaseLifecycleViewModel, R>(
-        override val viewModelClass: Class<ViewModel>,
-        val spec: NavigationBundleSpecType<R>,
-        override val retain: Boolean,
-        override val onResult: ViewModel.(R) -> Unit
-    ) : NavHostRootResultHandler<ViewModel, R>() {
-
-        @Composable
-        override fun NavHostController.HandleResult(callback: (R) -> Unit) = HandleResult(spec, retain) { callback(this) }
-    }
-
-    @Composable
-    internal fun HandleResult(viewModel: BaseLifecycleViewModel, navHostController: NavHostController) {
-        viewModelClass.cast(viewModel)?.let { vm ->
-            navHostController.HandleResult { vm.onResult(it) }
-        }
-    }
-}
-
-inline fun <reified ViewModel : BaseLifecycleViewModel, R : NavigationBundleSpecRow<*>> NavigationBundleSpec<R>.NavHostRootResultHandler(
-    retain: Boolean = false,
-    noinline onResult: ViewModel.(NavigationBundle<R>) -> Unit
-) = NavHostRootResultHandler.Bundle(ViewModel::class.java, this, retain, onResult)
-
-inline fun <reified ViewModel : BaseLifecycleViewModel, R> NavigationBundleSpecType<R>.NavHostRootResultHandler(
-    retain: Boolean = false,
-    noinline onResult: ViewModel.(R) -> Unit
-) = NavHostRootResultHandler.Type(ViewModel::class.java, this, retain, onResult)
-
-inline fun <reified ViewModel : BaseLifecycleViewModel, R> KSerializer<R>.NavHostRootResultHandler(
-    retain: Boolean = false,
-    noinline onResult: ViewModel.(R) -> Unit
-) = NavHostRootResultHandler.Type(ViewModel::class.java, NavigationBundleSpecType.SerializedType(this), retain, onResult)
+class BottomSheetContentNavHostRouteNavigator<A : NavigationAction<*>> (
+    bottomSheetNavigator: StateFlow<BottomSheetNavigatorState?>,
+    resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
+    parentRouteController: RouteController? = null,
+    navigationMapper: (A) -> Route
+) : ProvidingNavHostRouteNavigator<A, BottomSheetNavigatorState>(
+    BottomSheetContentRouteController(bottomSheetNavigator, parentRouteController),
+    resultHandlers,
+    navigationMapper
+)
 
 /**
- * Handles a [Route.Result] matching a given [NavigationBundleSpec]
- * @param spec The [NavigationBundleSpec] used to create the [Route.Result]
- * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
- * @param onResult Method for handling the received result
+ * A [RouteNavigator] that navigates for the sheet content of a flow of [BottomSheetNavigatorState]
+ * @param bottomSheetNavigator The flow of [BottomSheetNavigatorState] to manage this navigator
+ * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
+ * @param navigationMapper Maps [A] to a [Route] to be navigated to.
  */
-@Composable
-fun <R : NavigationBundleSpecRow<*>> NavHostController.HandleResult(
-    spec: NavigationBundleSpec<R>,
-    retain: Boolean = false,
-    onResult: NavigationBundle<R>.() -> Unit
-) = HandleResult(retain) { toNavigationBundle(spec).onResult() }
+class BottomSheetSheetContentNavHostRouteNavigator<A : NavigationAction<*>> (
+    bottomSheetNavigator: StateFlow<BottomSheetNavigatorState?>,
+    resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
+    navigationMapper: (A) -> Route
+) : RouteNavigator<A>(navigationMapper) {
 
-/**
- * Handles a [Route.Result] matching a given [NavigationBundleSpecType]
- * Requires that the [Route.Result] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType]
- * @param type The [NavigationBundleSpecType] stored in the result
- * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
- * @param onResult Method for handling the received result
- */
-@Composable
-fun <R> NavHostController.HandleResult(
-    type: NavigationBundleSpecType<R>,
-    retain: Boolean = false,
-    onResult: R.() -> Unit
-) = HandleResult(retain) { toTypedProperty(type).onResult() }
+    private val coroutineScopeState = MutableStateFlow<CoroutineScope?>(null)
+    override val routeController = BottomSheetSheetContentRouteController(bottomSheetNavigator, coroutineScopeState)
 
-@Composable
-internal fun NavHostController.HandleResult(retain: Boolean = false, onResult: Bundle.() -> Unit) {
-    val result = currentBackStackEntry?.savedStateHandle?.getStateFlow<Bundle?>(Route.Result.KEY, null)?.collectAsState()
-    result?.value?.let {
-        onResult(it)
-        if (!retain) {
-            currentBackStackEntry?.savedStateHandle?.remove<Bundle>(Route.Result.KEY)
-        }
+    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+        coroutineScopeState.tryEmit(rememberCoroutineScope())
+        routeController.sheetContentRouteController.AddResultHandlers(viewModel = this, resultHandlers = resultHandlers)
+        content()
     }
 }
-
-internal fun NavBackStackEntry.setResult(result: Route.Result) = when (result) {
-    is Route.Result.Empty -> savedStateHandle.remove(Route.Result.KEY)
-    is Route.Result.Data<*, *> -> savedStateHandle[Route.Result.KEY] = result.bundle.toBundle()
-}
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/SetupNavHost.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/SetupNavHost.kt
new file mode 100644
index 000000000..fa62eb0f2
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/SetupNavHost.kt
@@ -0,0 +1,99 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.compose.navigation
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import kotlinx.coroutines.flow.StateFlow
+
+/**
+ * Creates a a [NavHost] for a given [NavHostController] flow
+ * @param navHostController A [StateFlow] of [NavHostController] to be managed by the [NavHost]
+ * @param rootView The Composable view to display as the root of the [NavHost]
+ * @param builder The [RouteContentBuilder] for building the content of the [NavHost]
+ */
+@Composable
+fun SetupNavHost(
+    navHostController: StateFlow<NavHostController?>,
+    rootView: @Composable () -> Unit = { Spacer(modifier = Modifier.fillMaxWidth()) },
+    builder: RouteContentBuilder
+) {
+    val currentNavHostController by navHostController.collectAsState()
+    currentNavHostController?.let {
+        SetupNavHost(
+            navHostController = it,
+            startDestination = ROOT_VIEW
+        ) {
+            composable(ROOT_VIEW, content = { rootView() })
+            builder(navHostController)
+        }
+    }
+}
+
+/**
+ * Creates a a [NavHost] for a given [BottomSheetNavigatorState] flow
+ * @param bottomSheetNavigatorState A [StateFlow] of [BottomSheetNavigatorState] to be managed by the [NavHost]
+ * @param navHostController Converts a [BottomSheetNavigatorState] into a [NavHostController]
+ * @param rootView The Composable view to display as the root of the [NavHost]
+ * @param builder The [RouteContentBuilder] for building the content of the [NavHost]
+ */
+@Composable
+fun SetupNavHost(
+    bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
+    navHostController: BottomSheetNavigatorState.() -> NavHostController,
+    rootView: @Composable () -> Unit = { Spacer(modifier = Modifier.fillMaxWidth()) },
+    builder: BottomSheetContentBuilder
+) {
+    val currentBottomSheetNavigatorState by bottomSheetNavigatorState.collectAsState()
+    currentBottomSheetNavigatorState?.let {
+        SetupNavHost(
+            navHostController = it.navHostController(),
+            startDestination = ROOT_VIEW
+        ) {
+            composable(ROOT_VIEW, content = { rootView() })
+            builder(bottomSheetNavigatorState)
+        }
+    }
+}
+
+/**
+ * Creates a a [NavHost] for a given [NavHostController]
+ * @param navHostController The [NavHostController] tp be managed by the [NavHost]
+ * @param startDestination The start destination of the [NavHost]
+ * @param builder The [RouteContentBuilder] for building the content of the [NavHost]
+ */
+@Composable
+fun SetupNavHost(
+    navHostController: NavHostController,
+    startDestination: String,
+    builder: NavGraphBuilder.() -> Unit
+) {
+    NavHost(
+        navController = navHostController,
+        startDestination = startDestination,
+        builder = { builder() }
+    )
+}
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
new file mode 100644
index 000000000..4b82bc022
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
@@ -0,0 +1,70 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.compose.navigation.result
+
+import android.os.Bundle
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.navigation.NavBackStackEntry
+import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.compose.navigation.Route
+import com.splendo.kaluga.architecture.navigation.NavigationBundle
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationSpec
+import com.splendo.kaluga.architecture.navigation.toNavigationBundle
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
+
+/**
+ * Handles a [Route.Result] matching a given [NavigationBundleSpec]
+ * @param spec The [NavigationBundleSpec] used to create the [Route.Result]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received result
+ */
+@Composable
+fun <R : NavigationBundleSpecRow<*>> NavHostController.HandleResult(
+    spec: NavigationBundleSpec<R>,
+    retain: Boolean = false,
+    onResult: NavigationBundle<R>.() -> Unit
+) = HandleResult(retain) { toNavigationBundle(spec).onResult() }
+
+/**
+ * Handles a [Route.Result] matching a given [NavigationBundleSpecType]
+ * Requires that the [Route.Result] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType]
+ * @param type The [NavigationBundleSpecType] stored in the result
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received result
+ */
+@Composable
+fun <R> NavHostController.HandleResult(
+    type: NavigationBundleSpecType<R>,
+    retain: Boolean = false,
+    onResult: R.() -> Unit
+) = HandleResult(retain) { toTypedProperty(type).onResult() }
+
+@Composable
+internal fun NavHostController.HandleResult(retain: Boolean = false, onResult: Bundle.() -> Unit) {
+    val result = currentBackStackEntry?.savedStateHandle?.getStateFlow<Bundle?>(Route.Result.KEY, null)?.collectAsState()
+    result?.value?.let {
+        onResult(it)
+        if (!retain) {
+            currentBackStackEntry?.savedStateHandle?.remove<Bundle>(Route.Result.KEY)
+        }
+    }
+}
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
new file mode 100644
index 000000000..7d20f6d68
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
@@ -0,0 +1,96 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.compose.navigation.result
+
+import androidx.compose.runtime.Composable
+import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.navigation.NavigationBundle
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import kotlinx.serialization.KSerializer
+
+/**
+ * A Handler that will allow a [NavHostController] to handle Result of a given type [R] to be received by a given [ViewModel]
+ */
+sealed class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, R> {
+    abstract val viewModelClass: Class<ViewModel>
+    abstract val retain: Boolean
+    abstract val onResult: ViewModel.(R) -> Unit
+    @Composable
+    internal abstract fun NavHostController.HandleResult(callback: (R) -> Unit)
+
+    /**
+     * [NavHostResultHandler] that handles a result of a [NavigationBundle]
+     */
+    data class Bundle<ViewModel : BaseLifecycleViewModel, R : NavigationBundleSpecRow<*>>(
+        override val viewModelClass: Class<ViewModel>,
+        val spec: NavigationBundleSpec<R>,
+        override val retain: Boolean = false,
+        override val onResult: ViewModel.(NavigationBundle<R>) -> Unit
+    ) : NavHostResultHandler<ViewModel, NavigationBundle<R>>() {
+        @Composable
+        override fun NavHostController.HandleResult(callback: (NavigationBundle<R>) -> Unit) = HandleResult(spec, retain) { callback(this) }
+    }
+
+    /**
+     * [NavHostResultHandler] that handles a result of a [NavigationBundleSpecType]
+     */
+    data class Type<ViewModel : BaseLifecycleViewModel, R>(
+        override val viewModelClass: Class<ViewModel>,
+        val spec: NavigationBundleSpecType<R>,
+        override val retain: Boolean,
+        override val onResult: ViewModel.(R) -> Unit
+    ) : NavHostResultHandler<ViewModel, R>() {
+
+        @Composable
+        override fun NavHostController.HandleResult(callback: (R) -> Unit) = HandleResult(spec, retain) { callback(this) }
+    }
+
+    @Composable
+    internal fun HandleResult(viewModel: BaseLifecycleViewModel, navHostController: NavHostController) {
+        viewModelClass.cast(viewModel)?.let { vm ->
+            navHostController.HandleResult { vm.onResult(it) }
+        }
+    }
+}
+
+/**
+ * Creates a [NavHostResultHandler.Bundle] of [R] for this [NavigationBundleSpec]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel, R : NavigationBundleSpecRow<*>> NavigationBundleSpec<R>.NavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(NavigationBundle<R>) -> Unit
+) = NavHostResultHandler.Bundle(ViewModel::class.java, this, retain, onResult)
+
+/**
+ * Creates a [NavHostResultHandler.Type] of [R] for this [NavigationBundleSpecType]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel, R> NavigationBundleSpecType<R>.NavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(R) -> Unit
+) = NavHostResultHandler.Type(ViewModel::class.java, this, retain, onResult)
+
+/**
+ * Creates a [NavHostResultHandler.Type] of [R] for this [KSerializer]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel, R> KSerializer<R>.NavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(R) -> Unit
+) = NavHostResultHandler.Type(ViewModel::class.java, NavigationBundleSpecType.SerializedType(this), retain, onResult)
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/setResult.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/setResult.kt
new file mode 100644
index 000000000..9c4768945
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/setResult.kt
@@ -0,0 +1,27 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.compose.navigation.result
+
+import androidx.navigation.NavBackStackEntry
+import com.splendo.kaluga.architecture.compose.navigation.Route
+import com.splendo.kaluga.architecture.navigation.toBundle
+
+internal fun NavBackStackEntry.setResult(result: Route.Result) = when (result) {
+    is Route.Result.Empty -> savedStateHandle.remove(Route.Result.KEY)
+    is Route.Result.Data<*, *> -> savedStateHandle[Route.Result.KEY] = result.bundle.toBundle()
+}
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index 5408b0ec0..1f328e64b 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -1,7 +1,5 @@
 package com.splendo.kaluga.architecture.compose.viewModel
 
-import android.content.Context
-import android.content.ContextWrapper
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisallowComposableCalls
@@ -15,6 +13,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
+import com.splendo.kaluga.architecture.compose.activity
 import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
@@ -57,11 +56,13 @@ private fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
     content: @Composable (ViewModel.() -> Unit)? = null
 ) {
     viewModel.linkLifecycle(activity, fragmentManager)
-    val composeLifecycleSubscribables = viewModel.ComposableLifecycleSubscribable
+    val composeLifecycleSubscribables = remember(viewModel) {
+        viewModel.ComposableLifecycleSubscribable
+    }
     if (composeLifecycleSubscribables.isEmpty()) {
         content?.invoke(viewModel)
     } else {
-        val modifier = viewModel.ComposableLifecycleSubscribable.reduceRight { new, acc ->
+        val modifier = composeLifecycleSubscribables.reduceRight { new, acc ->
             object : ComposableLifecycleSubscribable {
                 override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = { content ->
                     new.modifier(this) { acc.modifier(this, content) }
@@ -79,7 +80,7 @@ private fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
 @Composable
 @Deprecated(
     "Does not work for configuration changes (e.g. rotation).",
-replaceWith = ReplaceWith("viewModel()", "androidx.lifecycle.viewmodel.compose.viewModel")
+    replaceWith = ReplaceWith("viewModel()", "androidx.lifecycle.viewmodel.compose.viewModel")
 )
 fun <VM : BaseLifecycleViewModel> store(provider: @Composable () -> VM): VM =
     provider().also { handleLocalViewModelStore(it) }
@@ -154,7 +155,6 @@ private fun <VM : BaseLifecycleViewModel> VM.linkLifecycle(activity: AppCompatAc
     val lifecycle = LocalLifecycleOwner.current.lifecycle
     DisposableEffect(Unit) {
         val observer = VmObserver(this@linkLifecycle, activity, fragmentManager)
-
         lifecycle.addObserver(observer)
 
         onDispose {
@@ -198,10 +198,3 @@ private class VmObserver<VM : BaseLifecycleViewModel>(private val viewModel: VM,
         lifecycleSubscribables.forEach { it.unsubscribe() }
     }
 }
-
-private val Context.activity: AppCompatActivity? get() = when (this) {
-    is AppCompatActivity -> this
-    is ContextWrapper -> baseContext.activity // recursive lookup
-    else -> null
-}
-
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
index d90cfa198..68771cece 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
@@ -23,7 +23,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import com.splendo.kaluga.architecture.compose.navigation.BottomSheetContentRouteNavigator
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetContentNavHostRouteNavigator
 import com.splendo.kaluga.architecture.compose.navigation.BottomSheetNavigatorState
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
 import com.splendo.kaluga.architecture.compose.state
@@ -40,7 +40,7 @@ fun ArchitectureDetailsLayout(inputDetails: InputDetails, bottomSheetNavigatorSt
     val viewModel = koinViewModel<ArchitectureDetailsViewModel> {
         parametersOf(
             inputDetails,
-            BottomSheetContentRouteNavigator(
+            BottomSheetContentNavHostRouteNavigator(
                 bottomSheetNavigatorState,
                 navigationMapper = ::architectureDetailsNavigationRouteMapper
             )
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
index 1baaa606b..8e0113a22 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
@@ -30,7 +30,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.ModalBottomSheetValue
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -47,9 +46,9 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.navigation.compose.composable
 import com.google.android.material.composethemeadapter.MdcTheme
 import com.splendo.kaluga.architecture.compose.mutableState
-import com.splendo.kaluga.architecture.compose.navigation.NavHostModalBottomSheetNavigator
-import com.splendo.kaluga.architecture.compose.navigation.NavHostRootResultHandler
+import com.splendo.kaluga.architecture.compose.navigation.RootModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.navigation.composable
+import com.splendo.kaluga.architecture.compose.navigation.result.NavHostResultHandler
 import com.splendo.kaluga.architecture.compose.navigation.route
 import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
@@ -85,8 +84,14 @@ fun ArchitectureLayout() {
     MdcTheme {
         val viewModel = koinViewModel<ArchitectureViewModel> {
             parametersOf(
-                NavHostModalBottomSheetNavigator(
+                RootModalBottomSheetNavigator(
                     navigationMapper = ::architectureNavigationRouteMapper,
+                    contentRootResultHandlers = listOf(
+                        InputDetails.serializer().NavHostResultHandler<ArchitectureViewModel, InputDetails> {
+                            nameInput.post(it.name)
+                            numberInput.post(it.number.toString())
+                        }
+                    ),
                     contentBuilder = { bottomSheetNavigationState ->
                         composable<InputDetails, ArchitectureNavigationAction.Details>(
                             type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
@@ -94,12 +99,6 @@ fun ArchitectureLayout() {
                             ArchitectureDetailsLayout(inputDetails, bottomSheetNavigationState)
                         }
                     },
-                    contentRootResultHandlers = listOf(
-                        InputDetails.serializer().NavHostRootResultHandler<ArchitectureViewModel, InputDetails> {
-                            nameInput.post(it.name)
-                            numberInput.post(it.number.toString())
-                        }
-                    ),
                     sheetContentBuilder = { bottomSheetNavigationState ->
                         composable(ArchitectureNavigationAction.BottomSheet.route()) {
                             BottomSheetLayout(
@@ -111,8 +110,7 @@ fun ArchitectureLayout() {
                                 bottomSheetNavigationState
                             )
                         }
-                    },
-                    initialSheetValue = ModalBottomSheetValue.Hidden
+                    }
                 )
             )
         }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
index ddc837b76..ef48b3cca 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
@@ -25,7 +25,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.splendo.kaluga.architecture.compose.navigation.BottomSheetNavigatorState
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
-import com.splendo.kaluga.architecture.compose.navigation.NavHostModalBottomSheetContentNavigator
+import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetViewModel
@@ -38,9 +38,9 @@ import org.koin.core.parameter.parametersOf
 fun BottomSheetLayout(bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>) {
     val viewModel = koinViewModel<BottomSheetViewModel> {
         parametersOf(
-            NavHostModalBottomSheetContentNavigator(
+            ModalBottomSheetNavigator(
                 bottomSheetNavigationState,
-                ::bottomSheetNavigationRouteMapper
+                navigationMapper = ::bottomSheetNavigationRouteMapper
             )
         )
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
index d33cd851b..e40808ed2 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
@@ -28,7 +28,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.splendo.kaluga.architecture.compose.navigation.BottomSheetNavigatorState
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
-import com.splendo.kaluga.architecture.compose.navigation.NavHostModalBottomSheetContentNavigator
+import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageViewModel
@@ -42,9 +42,9 @@ fun BottomSheetSubPageLayout(
 ) {
     val viewModel = koinViewModel<BottomSheetSubPageViewModel> {
         parametersOf(
-            NavHostModalBottomSheetContentNavigator(
+            ModalBottomSheetNavigator(
                 bottomSheetNavigationState,
-                ::bottomSheetSubPageNavigationRouteMapper
+                navigationMapper = ::bottomSheetSubPageNavigationRouteMapper
             )
         )
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
index 3dcee4363..07d80b6a4 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
@@ -35,7 +35,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.composable
 import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.architecture.compose.navigation.NavHostRouteNavigator
+import com.splendo.kaluga.architecture.compose.navigation.RootNavHostRouteNavigator
 import com.splendo.kaluga.architecture.compose.navigation.next
 import com.splendo.kaluga.architecture.compose.navigation.route
 import com.splendo.kaluga.architecture.compose.state
@@ -67,7 +67,7 @@ fun ResourcesLayout() {
     MdcTheme {
         val viewModel = koinViewModel<ResourcesListViewModel> {
             parametersOf(
-                NavHostRouteNavigator<ResourcesListNavigationAction>(
+                RootNavHostRouteNavigator<ResourcesListNavigationAction>(
                     navigationMapper = { action ->
                         when (action) {
                             is ResourcesListNavigationAction.Button -> action.next
diff --git a/keyboard-compose/src/androidLibMain/kotlin/ComposeKeyboardManager.kt b/keyboard-compose/src/androidLibMain/kotlin/ComposeKeyboardManager.kt
index afb71838d..27638c75a 100644
--- a/keyboard-compose/src/androidLibMain/kotlin/ComposeKeyboardManager.kt
+++ b/keyboard-compose/src/androidLibMain/kotlin/ComposeKeyboardManager.kt
@@ -28,8 +28,7 @@ import java.util.WeakHashMap
 
 class ComposeKeyboardManager(internal var currentFocusManager: FocusManager? = null) : BaseKeyboardManager<ComposeFocusHandler> {
 
-    class Builder : BaseKeyboardManager.Builder<ComposeFocusHandler>,
-        ComposableLifecycleSubscribable {
+    class Builder : BaseKeyboardManager.Builder<ComposeFocusHandler>, ComposableLifecycleSubscribable {
 
         private val builtManagers = WeakHashMap<Int, ComposeKeyboardManager>()
 
@@ -44,7 +43,6 @@ class ComposeKeyboardManager(internal var currentFocusManager: FocusManager? = n
             }
             content()
         }
-
     }
 
     override fun show(focusHandler: ComposeFocusHandler) {
diff --git a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
index 71b892de8..54a699a26 100644
--- a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
+++ b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
@@ -34,7 +34,7 @@ interface BaseKeyboardManager<FH : FocusHandler> {
     /**
      * Base KeyboardManager builder class, which used to create a [BaseKeyboardManager]
      */
-    interface Builder<FH: FocusHandler> : LifecycleSubscribableMarker {
+    interface Builder<FH : FocusHandler> : LifecycleSubscribableMarker {
 
         /**
          * Creates KeyboardManager object
diff --git a/keyboard/src/jvmMain/kotlin/KeyboardManager.kt b/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
index 1397fd243..930e0cf06 100644
--- a/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
@@ -33,4 +33,4 @@ class KeyboardManager : BaseKeyboardManager<FocusHandler> {
     override fun hide() {
         TODO("not implemented") // To change body of created functions use File | Settings | File Templates.
     }
-}
\ No newline at end of file
+}
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
index 0cb610db7..c34a5f09b 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
+++ b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
@@ -25,7 +25,6 @@ import kotlinx.cinterop.alloc
 import kotlinx.cinterop.asStableRef
 import kotlinx.cinterop.nativeHeap
 import kotlinx.cinterop.ptr
-import kotlinx.cinterop.reinterpret
 import kotlinx.cinterop.staticCFunction
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
@@ -59,14 +58,9 @@ import platform.SystemConfiguration.SCNetworkReachabilitySetDispatchQueue
 import platform.SystemConfiguration.kSCNetworkReachabilityFlagsIsWWAN
 import platform.SystemConfiguration.kSCNetworkReachabilityFlagsReachable
 import platform.darwin.DISPATCH_QUEUE_PRIORITY_DEFAULT
-import platform.darwin.DISPATCH_QUEUE_SERIAL
-import platform.darwin.DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL
 import platform.darwin.dispatch_get_main_queue
-import platform.darwin.dispatch_qos_class_t
 import platform.darwin.dispatch_queue_attr_make_with_qos_class
-import platform.darwin.dispatch_queue_attr_tVar
 import platform.darwin.dispatch_queue_create
-import platform.darwin.dispatch_queue_serial_t
 import platform.posix.QOS_CLASS_UTILITY
 
 actual class DefaultNetworkManager internal constructor(
@@ -100,11 +94,14 @@ actual class DefaultNetworkManager internal constructor(
             }
         }
         private val nwPathMonitor: nw_path_monitor_t = nw_path_monitor_create().apply {
-            val queue = dispatch_queue_create("com.splendo.kaluga.system.network", dispatch_queue_attr_make_with_qos_class(
-                null,
-                QOS_CLASS_UTILITY,
-                DISPATCH_QUEUE_PRIORITY_DEFAULT
-            ))
+            val queue = dispatch_queue_create(
+                "com.splendo.kaluga.system.network",
+                dispatch_queue_attr_make_with_qos_class(
+                    null,
+                    QOS_CLASS_UTILITY,
+                    DISPATCH_QUEUE_PRIORITY_DEFAULT
+                )
+            )
             nw_path_monitor_set_queue(
                 this,
                 queue
diff --git a/test-utils-system/build.gradle.kts b/test-utils-system/build.gradle.kts
index 5a488a166..3ed49f0a7 100644
--- a/test-utils-system/build.gradle.kts
+++ b/test-utils-system/build.gradle.kts
@@ -20,4 +20,4 @@ kotlin {
             dependencies {}
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
index 321404f15..33ee86793 100644
--- a/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
@@ -78,4 +78,3 @@ class MockBaseNetworkManager(initialNetworkConnectionType: NetworkConnectionType
     val stopMonitoringMock = ::stopMonitoring.mock()
     override suspend fun stopMonitoring(): Unit = stopMonitoringMock.call()
 }
-

From d255b8b8740972323785d4ab7a0b194256464dc8 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 29 Nov 2022 17:50:59 +0100
Subject: [PATCH 039/227] Added proper non-NavHost navigation for compose

---
 architecture-compose/build.gradle.kts         |   1 +
 .../architecture/compose/ContextExtensions.kt |   2 +-
 .../navigation/BottomSheetNavigator.kt        |  40 +-
 .../compose/navigation/BottomSheetRoute.kt    |  11 +-
 .../compose/navigation/ComposableNavSpec.kt   | 412 ++++++++++++++++++
 ...uteNavigator.kt => ComposableNavigator.kt} |  83 ++--
 .../architecture/compose/navigation/Route.kt  |  18 +-
 .../compose/navigation/RouteController.kt     |   1 -
 .../navigation/result/NavHostResultHandler.kt |  16 +-
 .../kotlin/navigation/NavigationSpec.kt       | 148 ++++++-
 .../kotlin/navigation/Navigator.kt            |  91 +---
 11 files changed, 654 insertions(+), 169 deletions(-)
 create mode 100644 architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
 rename architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/{RouteNavigator.kt => ComposableNavigator.kt} (58%)

diff --git a/architecture-compose/build.gradle.kts b/architecture-compose/build.gradle.kts
index a0d6d2170..bd978363d 100644
--- a/architecture-compose/build.gradle.kts
+++ b/architecture-compose/build.gradle.kts
@@ -32,4 +32,5 @@ dependencies {
     implementationDependency(Dependencies.AndroidX.Compose.Material)
     implementationDependency(Dependencies.AndroidX.Navigation.Compose)
     implementationDependency(Dependencies.KotlinX.Coroutines.Core)
+    implementationDependency(Dependencies.AndroidX.Browser)
 }
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
index ec1510662..2097c341b 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
@@ -21,7 +21,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import androidx.appcompat.app.AppCompatActivity
 
-internal val Context.activity: AppCompatActivity? get() = when (this) {
+val Context.activity: AppCompatActivity? get() = when (this) {
     is AppCompatActivity -> this
     is ContextWrapper -> baseContext.activity // recursive lookup
     else -> null
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
index 4d640ad1e..d152d26a6 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
@@ -27,17 +27,41 @@ import kotlinx.coroutines.flow.StateFlow
  * @param navigationMapper A mapper that converts an [NavigationAction] handled by this navigator into a [BottomSheetRoute]
  */
 sealed class BottomSheetNavigator<A : NavigationAction<*>>(
-    private val navigationMapper: (A) -> BottomSheetRoute
+    private val navigationMapper: @Composable (A) -> BottomSheetComposableNavSpec
 ) : Navigator<A>, ComposableLifecycleSubscribable {
 
     abstract val routeController: BottomSheetRouteController
 
-    override fun navigate(action: A) = routeController.navigate(navigationMapper(action))
+    private val actionState = MutableStateFlow<A?>(null)
+
+    override fun navigate(action: A) {
+        actionState.value = action
+    }
+
+    final override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+        SetupNavigationAction()
+        contentModifier(content)
+    }
+
+    abstract val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit
+
+    @Composable
+    protected fun BaseLifecycleViewModel.SetupNavigationAction() {
+        val currentAction by actionState.collectAsState()
+        currentAction?.let { action ->
+            when (val spec = navigationMapper(action)) {
+                is BottomSheetRoute -> routeController.navigate(spec)
+                is BottomSheetLaunchedNavigation -> spec.launchedNavigation.Launch(this)
+            }
+            actionState.tryEmit(null)
+        }
+    }
+
 }
 
 /**
  * A [BottomSheetNavigator] that creates and manages a [ModalBottomSheetLayout]. This should be on top of any [ModalBottomSheetNavigator]
- * @param navigationMapper Maps [A] to a [BottomSheetRoute] to be navigated to.
+ * @param navigationMapper Maps [A] to a [BottomSheetComposableNavSpec] to be navigated to.
  * @param initialSheetValue The [ModalBottomSheetValue] the [ModalBottomSheetLayout] should default to.
  * @param parentRouteController A [RouteController] managing the parent view of the [ModalBottomSheetLayout]
  * @param contentRootResultHandlers A list of [NavHostResultHandler] to be added to the root view of the content.
@@ -45,7 +69,7 @@ sealed class BottomSheetNavigator<A : NavigationAction<*>>(
  * @param sheetContentBuilder The [BottomSheetContentBuilder] describing the navigation graph of the sheet content.
  */
 class RootModalBottomSheetNavigator<A : NavigationAction<*>>(
-    navigationMapper: (A) -> BottomSheetRoute,
+    navigationMapper: @Composable (A) -> BottomSheetComposableNavSpec,
     private val initialSheetValue: ModalBottomSheetValue = ModalBottomSheetValue.Hidden,
     parentRouteController: RouteController? = null,
     contentRootResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
@@ -63,7 +87,7 @@ class RootModalBottomSheetNavigator<A : NavigationAction<*>>(
         )
     )
 
-    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+    override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         val contentNavController = rememberNavController()
         bottomSheetNavigationState.tryEmit(
             BottomSheetNavigatorState(
@@ -93,13 +117,13 @@ class RootModalBottomSheetNavigator<A : NavigationAction<*>>(
  * @param bottomSheetNavigatorState The [BottomSheetNavigatorState] controlling the routes.
  * @param contentResultHandlers A list of [NavHostResultHandler] to be added to the content of this navigator.
  * @param sheetContentResultHandlers A list of [NavHostResultHandler] to be added to the sheet content of this navigator.
- * @param navigationMapper Maps [A] to a [BottomSheetRoute] to be navigated to.
+ * @param navigationMapper Maps [A] to a [BottomSheetComposableNavSpec] to be navigated to.
  */
 class ModalBottomSheetNavigator<A : NavigationAction<*>>(
     bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
     contentResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     sheetContentResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
-    navigationMapper: (A) -> BottomSheetRoute,
+    navigationMapper: @Composable (A) -> BottomSheetComposableNavSpec
 ) : BottomSheetNavigator<A>(navigationMapper) {
 
     private val sheetStateCoroutineScope = MutableStateFlow<CoroutineScope?>(null)
@@ -112,7 +136,7 @@ class ModalBottomSheetNavigator<A : NavigationAction<*>>(
         )
     )
 
-    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+    override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         sheetStateCoroutineScope.tryEmit(rememberCoroutineScope())
         routeController.contentRouteController.AddResultHandlers(viewModel = this, resultHandlers = contentResultHandlers)
         routeController.sheetContentRouteController.sheetContentRouteController.AddResultHandlers(viewModel = this, resultHandlers = sheetContentResultHandlers)
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
index 254a89db3..311115e3b 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
@@ -19,10 +19,12 @@ package com.splendo.kaluga.architecture.compose.navigation
 
 import androidx.compose.material.ModalBottomSheetLayout
 
+sealed class BottomSheetComposableNavSpec
+
 /**
  * Route for navigating a [ModalBottomSheetLayout] using a [BottomSheetSheetContentRouteController]
  */
-sealed class BottomSheetRoute {
+sealed class BottomSheetRoute : BottomSheetComposableNavSpec() {
     /**
      * Navigates within the sheet content of the [ModalBottomSheetLayout]
      * @param route The [Route] to navigate
@@ -36,6 +38,8 @@ sealed class BottomSheetRoute {
     data class Content(val route: Route) : BottomSheetRoute()
 }
 
+data class BottomSheetLaunchedNavigation(val launchedNavigation: ComposableNavSpec.LaunchedNavigation) : BottomSheetComposableNavSpec()
+
 /**
  * Converts a [Route] to a [BottomSheetRoute.SheetContent] route
  */
@@ -45,3 +49,8 @@ val Route.bottomSheetSheetContent get() = BottomSheetRoute.SheetContent(this)
  * Converts a [Route] to a [BottomSheetRoute.Content] route
  */
 val Route.bottomSheetContent get() = BottomSheetRoute.Content(this)
+
+/**
+ * Converts a [ComposableNavSpec.LaunchedNavigation] to a [BottomSheetLaunchedNavigation]
+ */
+val ComposableNavSpec.LaunchedNavigation.bottomSheetComposable get() = BottomSheetLaunchedNavigation(this)
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
new file mode 100644
index 000000000..bb0e2be3d
--- /dev/null
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
@@ -0,0 +1,412 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.compose.navigation
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.PickVisualMediaRequest
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import androidx.fragment.app.DialogFragment
+import com.splendo.kaluga.architecture.compose.activity
+import com.splendo.kaluga.architecture.navigation.IntentFlag
+import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.NavigationBundle
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.navigation.toBundle
+import com.splendo.kaluga.architecture.navigation.toFlags
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import java.net.URL
+import kotlin.reflect.KClass
+import kotlin.reflect.safeCast
+
+/**
+ * Spec for navigating with a [ComposableNavigator]
+ */
+sealed class ComposableNavSpec {
+
+    companion object {
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to open the camera to take a picture.
+         * @param uri The [Uri] where the taken picture should be stored.
+         * @param onResult Returns `true` if a picture was taken successfully.
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> TakePicture(uri: Uri?, noinline onResult: VM.(Boolean) -> Unit) = Launcher(
+            VM::class,
+            ActivityResultContracts.TakePicture(),
+            { uri },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to open the camera to capture a video.
+         * @param uri The [Uri] where the captured video should be stored.
+         * @param onResult Returns `true` if a video was captured successfully.
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> CaptureVideo(uri: Uri?, noinline onResult: VM.(Boolean) -> Unit) = Launcher(
+            VM::class,
+            ActivityResultContracts.CaptureVideo(),
+            { uri },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.IntentLauncher] to open the email app.
+         * @param settings The [NavigationSpec.Email.EmailSettings] to apply to the email.
+         */
+        fun SendEmail(settings: NavigationSpec.Email.EmailSettings) = IntentLauncher { settings.intent }
+
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to open Photo app to pick an image or video
+         * @param type The [ActivityResultContracts.PickVisualMedia.VisualMediaType] to be selected.
+         * @param onResult Returns an [Uri] of the image or video selected, or `null` if nothing was selected.
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> PickVisualMedia(type: ActivityResultContracts.PickVisualMedia.VisualMediaType = ActivityResultContracts.PickVisualMedia.ImageAndVideo,
+            noinline onResult: VM.(Uri?) -> Unit) = Launcher(
+            VM::class,
+            ActivityResultContracts.PickVisualMedia(),
+            { PickVisualMediaRequest(mediaType = type) },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to open Photo app to pick a number of images or videos
+         * @param type The [ActivityResultContracts.PickVisualMedia.VisualMediaType] to be selected.
+         * @param onResult Returns a list of [Uri] of the images or videos selected.
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> PickMultipleVisualMedia(maxItems: Int? = null, type: ActivityResultContracts.PickVisualMedia.VisualMediaType = ActivityResultContracts.PickVisualMedia.ImageAndVideo,
+            noinline onResult: VM.(List<Uri>) -> Unit) = Launcher(
+            VM::class,
+            maxItems?.let { ActivityResultContracts.PickMultipleVisualMedia(it) } ?: ActivityResultContracts.PickMultipleVisualMedia(),
+            { PickVisualMediaRequest(mediaType = type) },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to open the file manager app to pick a file.
+         * @param types List of mime types allowed to be selected.
+         * @param onResult Returns an [Uri] of the file selected, or `null` if nothing was selected.
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> OpenDocument(types: List<String>, noinline onResult: VM.(Uri?) -> Unit) = Launcher(
+            VM::class,
+            ActivityResultContracts.OpenDocument(),
+            { types.toTypedArray() },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to open the file manager app to pick a number of files.
+         * @param types List of mime types allowed to be selected.
+         * @param onResult Returns a list of [Uri] of the documents selected.
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> OpenMultipleDocument(types: List<String>, noinline onResult: VM.(List<Uri>) -> Unit) = Launcher(
+            VM::class,
+            ActivityResultContracts.OpenMultipleDocuments(),
+            { types.toTypedArray() },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to open create a new file.
+         * @param fileName The suggested name of the file.
+         * @param mimeType The mime type of the file.
+         * @param onResult Returns the [Uri] of the document created.
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> CreateDocument(fileName: String, mimeType: String, noinline onResult: VM.(Uri?) -> Unit) = Launcher(
+            VM::class,
+            ActivityResultContracts.CreateDocument(mimeType),
+            { fileName },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to open the file manager app to pick a folder.
+         * @param startingLocation Optional [Uri] of the folder to start in.
+         * @param onResult Returns an [Uri] of the folder selected, or `null` if nothing was selected.
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> OpenDocumentTree(startingLocation: Uri? = null, noinline onResult: VM.(Uri?) -> Unit) = Launcher(
+            VM::class,
+            ActivityResultContracts.OpenDocumentTree(),
+            { startingLocation },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to open the contacts list to select a contact.
+         * @param onResult Returns an [Uri] of the contact selected, or `null` if nothing was selected.
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> PickContact(noinline onResult: VM.(Uri?) -> Unit) = Launcher(
+            VM::class,
+            ActivityResultContracts.PickContact(),
+            { null },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to request a permission.
+         * @param permission Key of the permission to be requested. E.g. [android.Manifest.permission.ACCESS_COARSE_LOCATION].
+         * @param onResult Returns `true` if the permission was granted, `false` otherwise.
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> RequestPermission(permission: String, noinline onResult: VM.(Boolean) -> Unit) = Launcher(
+            VM::class,
+            ActivityResultContracts.RequestPermission(),
+            { permission },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.Launcher] to request multiple permissions.
+         * @param permissions Keys of the permission to be requested. E.g. [android.Manifest.permission.ACCESS_COARSE_LOCATION].
+         * @param onResult Returns map containing whether the permission was granted for each permission in [permissions].
+         */
+        inline fun <reified VM : BaseLifecycleViewModel> RequestMultiplePermissions(permissions: List<String>, noinline onResult: VM.(Map<String, Boolean>) -> Unit) = Launcher(
+            VM::class,
+            ActivityResultContracts.RequestMultiplePermissions(),
+            { permissions.toTypedArray() },
+            onResult
+        )
+
+        /**
+         * Creates a [ComposableNavSpec.IntentLauncher] to the phone screen.
+         * @param phoneNumber The phoneNumber to dial.
+         * @param type The [NavigationSpec.Phone.Type] to apply.
+         */
+        fun Phone(phoneNumber: String, type: NavigationSpec.Phone.Type) = IntentLauncher {
+            val intent = when (type) {
+                is NavigationSpec.Phone.Type.Dial -> Intent(Intent.ACTION_DIAL)
+                is NavigationSpec.Phone.Type.Call -> Intent(Intent.ACTION_CALL)
+            }.apply {
+                data = Uri.parse("tel:${phoneNumber}")
+            }
+            if (intent.resolveActivity(packageManager) != null) intent else null
+        }
+
+        /**
+         * Creates a [ComposableNavSpec.IntentLauncher] to the settings screen.
+         * @param type The [NavigationSpec.Settings.Type] to apply.
+         */
+        fun Settings(type: NavigationSpec.Settings.Type) = IntentLauncher {
+            val intent = type.intent(this)
+            if (intent.resolveActivity(packageManager) != null) intent else null
+        }
+
+        /**
+         * Creates a [ComposableNavSpec.IntentLauncher] to the text messages screen.
+         * @param settings The [NavigationSpec.TextMessenger.TextMessengerSettings] to apply.
+         */
+        fun Messenger(settings: NavigationSpec.TextMessenger.TextMessengerSettings) = IntentLauncher {
+            val intent = settings.intent
+            if (intent.resolveActivity(packageManager) != null) intent else null
+        }
+
+        /**
+         * Creates a [ComposableNavSpec.IntentLauncher] to the browser.
+         * @param url The [URL] to open.
+         * @param type The [NavigationSpec.Browser.Type] to apply.
+         */
+        fun Browser(url: URL, type: NavigationSpec.Browser.Type = NavigationSpec.Browser.Type.Normal) = IntentLauncher {
+            val intent = when (type) {
+                is NavigationSpec.Browser.Type.CustomTab -> {
+                    val builder = CustomTabsIntent.Builder()
+                    builder.build().intent.apply {
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                        data = Uri.parse(url.toURI().toString())
+                    }
+                }
+                is NavigationSpec.Browser.Type.Normal -> {
+                    val uri = Uri.parse(url.toURI().toString())
+                    Intent(Intent.ACTION_VIEW, uri)
+                }
+            }
+            if (intent.resolveActivity(packageManager) != null) intent else null
+        }
+    }
+
+    /**
+     * A [ComposableNavSpec] that launched into a new screen.
+     */
+    sealed class LaunchedNavigation : ComposableNavSpec() {
+        @Composable
+        protected abstract fun createLauncher(viewModel: BaseLifecycleViewModel): () -> Unit
+
+        /**
+         * Launch this [LaunchedNavigation] for a given [viewModel].
+         */
+        @Composable
+        fun Launch(viewModel: BaseLifecycleViewModel) {
+            val launcher = createLauncher(viewModel)
+            LaunchedEffect(launcher) {
+                launcher.invoke()
+            }
+        }
+    }
+
+    /**
+     * Navigates using an [ActivityResultLauncher] and a valid input.
+     * @param viewModelClass The class of the ViewModel the result of this launcher is to be applied to.
+     * @param activityResultContract The [ActivityResultContract] to launch with.
+     * @param getInput The input to be provided to [activityResultContract]
+     * @param onResult Callback to handle the result of [activityResultContract]
+     */
+    data class Launcher<VM : BaseLifecycleViewModel, I, O>(
+        val viewModelClass: KClass<VM>,
+        val activityResultContract: ActivityResultContract<I, O>,
+        val getInput: @Composable () -> I?,
+        val onResult: VM.(O) -> Unit
+    ) : LaunchedNavigation() {
+
+        @Composable
+        override fun createLauncher(viewModel: BaseLifecycleViewModel): () -> Unit {
+            val launcher = rememberLauncherForActivityResult(activityResultContract) { result ->
+                viewModelClass.safeCast(viewModel)?.let {
+                    it.onResult(result)
+                }
+            }
+            val input = getInput()
+            return {
+                input?.let {
+                    launcher.launch(it)
+                }
+            }
+        }
+    }
+
+    /**
+     * Closes the current [android.app.Activity]
+     * @param result Optional result code and
+     */
+    data class CloseActivity(val result: Pair<Int, NavigationBundle<*>?>? = null) : LaunchedNavigation() {
+        @Composable
+        override fun createLauncher(viewModel: BaseLifecycleViewModel): () -> Unit {
+            val activity = LocalContext.current.activity ?: return {}
+            return {
+                result?.let { (resultCode, bundle) ->
+                    val data = Intent().apply {
+                        bundle?.let {
+                            putExtras(it.toBundle())
+                        }
+                    }
+                    activity.setResult(resultCode, data)
+                }
+                activity.finish()
+            }
+        }
+    }
+
+    /**
+     * Shows a [DialogFragment]
+     * @param tag Optional tag to add to the Dialog
+     * @param createDialog Function to create the [DialogFragment] to display
+     */
+    data class Dialog(
+        val tag: String? = null,
+        val createDialog: () -> DialogFragment
+    ) : LaunchedNavigation() {
+
+        @Composable
+        override fun createLauncher(viewModel: BaseLifecycleViewModel): () -> Unit {
+            val fragmentManager = LocalContext.current.activity?.supportFragmentManager ?: return {}
+            return {
+                createDialog().show(fragmentManager, tag)
+            }
+        }
+    }
+
+    /**
+     * Navigates according to a given [Intent]
+     * @param createIntent Creates the [Intent] to navigate to
+     */
+    data class IntentLauncher(val createIntent: @Composable Activity.() -> Intent?) : LaunchedNavigation() {
+
+        @Composable
+        override fun createLauncher(viewModel: BaseLifecycleViewModel): () -> Unit {
+            val context = LocalContext.current
+            val intent = context.activity?.intent ?: return {}
+            return {
+                context.startActivity(intent)
+            }
+        }
+    }
+}
+
+/**
+ * Creates a [ComposableNavSpec.Launcher] that takes the [SingleValueNavigationAction.value] as the input of its [ActivityResultContract].
+ * @param activityResultContract The [ActivityResultContract] to launch.
+ * @param onResult The result received after the launched screen has completed.
+ */
+inline fun <reified VM : BaseLifecycleViewModel, I, O> SingleValueNavigationAction<I>.Launcher(
+    activityResultContract: ActivityResultContract<I, O>,
+    noinline onResult: VM.(O) -> Unit
+) = ComposableNavSpec.Launcher(VM::class, activityResultContract, { value }, onResult)
+
+/**
+ * Creates a [ComposableNavSpec.Launcher] that takes an [Intent] containing the [NavigationAction.bundle] as the input of its [ActivityResultContract].
+ * @param activityResultContract The [ActivityResultContract] to launch.
+ * @param flags A set of [IntentFlag] to be applied to the next screen.
+ * @param onResult The result received after the launched screen has completed.
+ */
+inline fun <reified A : Activity, reified VM : BaseLifecycleViewModel, O> NavigationAction<*>.Launcher(
+    activityResultContract: ActivityResultContract<Intent, O>,
+    flags: Set<IntentFlag> = emptySet(),
+    noinline onResult: VM.(O) -> Unit
+) {
+    val getInput = @Composable {
+        LocalContext.current.activity?.let { activity ->
+            Intent(activity, A::class.java).apply {
+                bundle?.let {
+                    putExtras(it.toBundle())
+                }
+                this.flags = flags.toFlags()
+            }
+        }
+    }
+    ComposableNavSpec.Launcher(VM::class, activityResultContract, getInput, onResult)
+}
+
+/**
+ * Creates a [ComposableNavSpec.IntentLauncher] to show a given [Activity]
+ * @param flags A set of [IntentFlag] to be applied to the next screen.
+ */
+inline fun <reified  A : Activity> NavigationAction<*>.ShowActivity(
+    flags: Set<IntentFlag> = emptySet()
+) = ComposableNavSpec.IntentLauncher {
+    Intent(this, A::class.java).apply {
+        bundle?.let {
+            putExtras(it.toBundle())
+        }
+        this.flags = flags.toFlags()
+    }
+}
+
+/**
+ * Creates a [ComposableNavSpec.CloseActivity] for a given result code.
+ * @param resultCode If not `null`, this will set the [NavigationAction.bundle] as the result of the activity.
+ */
+fun NavigationAction<*>.CloseActivity(resultCode: Int?) = ComposableNavSpec.CloseActivity(
+    resultCode?.let { it to bundle }
+)
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
similarity index 58%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
rename to architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
index 1c9853686..33613cc13 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
@@ -1,6 +1,8 @@
 package com.splendo.kaluga.architecture.compose.navigation
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
@@ -21,8 +23,8 @@ typealias RouteContentBuilder = NavGraphBuilder.(StateFlow<NavHostController?>)
  * A Navigator managed by a [RouteController]
  * @param navigationMapper A mapper that converts an [NavigationAction] handled by this navigator into a [Route]
  */
-sealed class RouteNavigator<A : NavigationAction<*>>(
-    private val navigationMapper: (A) -> Route
+sealed class ComposableNavigator<A : NavigationAction<*>>(
+    private val navigationMapper: @Composable (A) -> ComposableNavSpec
 ) : Navigator<A>, ComposableLifecycleSubscribable {
 
     /**
@@ -30,29 +32,50 @@ sealed class RouteNavigator<A : NavigationAction<*>>(
      */
     abstract val routeController: RouteController
 
+    private val actionState = MutableStateFlow<A?>(null)
+
     override fun navigate(action: A) {
-        routeController.navigate(navigationMapper(action))
+        actionState.value = action
+    }
+
+    final override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+        SetupNavigationAction()
+        contentModifier(content)
+    }
+
+    abstract val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit
+
+    @Composable
+    protected fun BaseLifecycleViewModel.SetupNavigationAction() {
+        val currentAction by actionState.collectAsState()
+        currentAction?.let { action ->
+            when (val spec = navigationMapper(action)) {
+                is Route -> routeController.navigate(spec)
+                is ComposableNavSpec.LaunchedNavigation -> spec.Launch(this)
+            }
+            actionState.tryEmit(null)
+        }
     }
 }
 
 /**
- * A [RouteNavigator] that creates and manages a [NavHost]. This should be on top of any [NavHostRouteNavigator]
- * @param navigationMapper Maps [A] to a [Route] to be navigated to.
+ * A [ComposableNavigator] that creates and manages a [NavHost]. This should be on top of any [NavHostComposableNavigator]
+ * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
  * @param parentRouteController A [RouteController] managing the parent layout of the [NavHost].
  * @param rootResultHandlers A list of [NavHostResultHandler] to be added to the root view.
  * @param contentBuilder The [RouteContentBuilder] describing the navigation graph
  */
-class RootNavHostRouteNavigator<A : NavigationAction<*>>(
-    navigationMapper: (A) -> Route,
+class RootNavHostComposableNavigator<A : NavigationAction<*>>(
+    navigationMapper: @Composable (A) -> ComposableNavSpec,
     parentRouteController: RouteController? = null,
     rootResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     contentBuilder: RouteContentBuilder
-) : RouteNavigator<A>(navigationMapper) {
+) : ComposableNavigator<A>(navigationMapper) {
 
     private val navHostController = MutableStateFlow<NavHostController?>(null)
     override val routeController: RouteController = NavHostRouteController(navHostController, parentRouteController)
 
-    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+    override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         val navController = rememberNavController()
         navHostController.tryEmit(navController)
         SetupNavHost(
@@ -69,73 +92,73 @@ class RootNavHostRouteNavigator<A : NavigationAction<*>>(
 }
 
 /**
- * A [RouteNavigator] that is managed by a [NavHost]
+ * A [ComposableNavigator] that is managed by a [NavHost]
  * @param routeController The [ProvidingNavHostRouteController] controlling the route.
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
  * @param navigationMapper Maps [A] to a [Route] to be navigated to.
  */
-sealed class ProvidingNavHostRouteNavigator<A : NavigationAction<*>, Provider>(
+sealed class ProvidingNavHostComposableNavigator<A : NavigationAction<*>, Provider>(
     override val routeController: ProvidingNavHostRouteController<Provider>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
-    navigationMapper: (A) -> Route
-) : RouteNavigator<A>(navigationMapper) {
+    navigationMapper: @Composable (A) -> ComposableNavSpec
+) : ComposableNavigator<A>(navigationMapper) {
 
-    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+    override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         routeController.AddResultHandlers(viewModel = this, resultHandlers = resultHandlers)
         content()
     }
 }
 
 /**
- * A [RouteNavigator] that navigates for a flow of [NavHostController]
+ * A [ComposableNavigator] that navigates for a flow of [NavHostController]
  * @param navHostController The flow of [NavHostController] to manage this navigator
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
- * @param navigationMapper Maps [A] to a [Route] to be navigated to.
+ * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
  */
-class NavHostRouteNavigator<A : NavigationAction<*>> (
+class NavHostComposableNavigator<A : NavigationAction<*>> (
     navHostController: StateFlow<NavHostController?>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     parentRouteController: RouteController? = null,
-    navigationMapper: (A) -> Route
-) : ProvidingNavHostRouteNavigator<A, NavHostController>(
+    navigationMapper: @Composable (A) -> ComposableNavSpec
+) : ProvidingNavHostComposableNavigator<A, NavHostController>(
     NavHostRouteController(navHostController, parentRouteController),
     resultHandlers,
     navigationMapper
 )
 
 /**
- * A [RouteNavigator] that navigates for the content of a flow of [BottomSheetNavigatorState]
+ * A [ComposableNavigator] that navigates for the content of a flow of [BottomSheetNavigatorState]
  * @param bottomSheetNavigator The flow of [BottomSheetNavigatorState] to manage this navigator
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
- * @param navigationMapper Maps [A] to a [Route] to be navigated to.
+ * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
  */
-class BottomSheetContentNavHostRouteNavigator<A : NavigationAction<*>> (
+class BottomSheetContentNavHostComposableNavigator<A : NavigationAction<*>> (
     bottomSheetNavigator: StateFlow<BottomSheetNavigatorState?>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     parentRouteController: RouteController? = null,
-    navigationMapper: (A) -> Route
-) : ProvidingNavHostRouteNavigator<A, BottomSheetNavigatorState>(
+    navigationMapper: @Composable (A) -> ComposableNavSpec
+) : ProvidingNavHostComposableNavigator<A, BottomSheetNavigatorState>(
     BottomSheetContentRouteController(bottomSheetNavigator, parentRouteController),
     resultHandlers,
     navigationMapper
 )
 
 /**
- * A [RouteNavigator] that navigates for the sheet content of a flow of [BottomSheetNavigatorState]
+ * A [ComposableNavigator] that navigates for the sheet content of a flow of [BottomSheetNavigatorState]
  * @param bottomSheetNavigator The flow of [BottomSheetNavigatorState] to manage this navigator
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
- * @param navigationMapper Maps [A] to a [Route] to be navigated to.
+ * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
  */
-class BottomSheetSheetContentNavHostRouteNavigator<A : NavigationAction<*>> (
+class BottomSheetSheetContentNavHostComposableNavigator<A : NavigationAction<*>> (
     bottomSheetNavigator: StateFlow<BottomSheetNavigatorState?>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
-    navigationMapper: (A) -> Route
-) : RouteNavigator<A>(navigationMapper) {
+    navigationMapper: @Composable (A) -> ComposableNavSpec
+) : ComposableNavigator<A>(navigationMapper) {
 
     private val coroutineScopeState = MutableStateFlow<CoroutineScope?>(null)
     override val routeController = BottomSheetSheetContentRouteController(bottomSheetNavigator, coroutineScopeState)
 
-    override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+    override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         coroutineScopeState.tryEmit(rememberCoroutineScope())
         routeController.sheetContentRouteController.AddResultHandlers(viewModel = this, resultHandlers = resultHandlers)
         content()
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
index 30222f5eb..c9f985f70 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.architecture.compose.navigation
 
-import androidx.activity.result.ActivityResultLauncher
 import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.NavigationBundle
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
@@ -168,7 +167,7 @@ private val NavigationBundleValue<*>.routeArgument: String?
 /**
  * Route for navigating within a [RouteController].
  */
-sealed class Route {
+sealed class Route : ComposableNavSpec() {
 
     companion object {
         val Back = Back()
@@ -259,19 +258,6 @@ sealed class Route {
      * Closes all screens in the navigation stack
      */
     object Close : Route()
-
-    /**
-     * Navigates using an [ActivityResultLauncher] and a valid [input].
-     * @param activityResultLauncher The launcher to launch with. This should have been created using [androidx.activity.compose.rememberLauncherForActivityResult]
-     * @param input The input to be provided to [activityResultLauncher]
-     */
-    data class Launcher<I>(val activityResultLauncher: ActivityResultLauncher<I>, val input: I) : Route() {
-
-        /**
-         * Launches the [activityResultLauncher] with [input]
-         */
-        fun launch() = activityResultLauncher.launch(input)
-    }
 }
 
 /**
@@ -284,7 +270,7 @@ val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> A
 
 /**
  * Creates a [Route.FromRoute] from [Action]
- * @param from The string route to navigate from
+ * @param route The string route to navigate from
  */
 fun <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> Action.from(route: String) =
     Route.FromRoute(this, route)
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
index 56ae84cb0..5b131bb9f 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
@@ -97,7 +97,6 @@ sealed class ProvidingNavHostRouteController<Provider>(
                 navHostController.popBackStack(ROOT_VIEW, false)
             }
             is Route.Close -> close()
-            is Route.Launcher<*> -> newRoute.launch()
         }
     }
 
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
index 7d20f6d68..18bcd6fde 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
@@ -25,12 +25,14 @@ import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import kotlinx.serialization.KSerializer
+import kotlin.reflect.KClass
+import kotlin.reflect.safeCast
 
 /**
  * A Handler that will allow a [NavHostController] to handle Result of a given type [R] to be received by a given [ViewModel]
  */
 sealed class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, R> {
-    abstract val viewModelClass: Class<ViewModel>
+    abstract val viewModelClass: KClass<ViewModel>
     abstract val retain: Boolean
     abstract val onResult: ViewModel.(R) -> Unit
     @Composable
@@ -40,7 +42,7 @@ sealed class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, R> {
      * [NavHostResultHandler] that handles a result of a [NavigationBundle]
      */
     data class Bundle<ViewModel : BaseLifecycleViewModel, R : NavigationBundleSpecRow<*>>(
-        override val viewModelClass: Class<ViewModel>,
+        override val viewModelClass: KClass<ViewModel>,
         val spec: NavigationBundleSpec<R>,
         override val retain: Boolean = false,
         override val onResult: ViewModel.(NavigationBundle<R>) -> Unit
@@ -53,7 +55,7 @@ sealed class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, R> {
      * [NavHostResultHandler] that handles a result of a [NavigationBundleSpecType]
      */
     data class Type<ViewModel : BaseLifecycleViewModel, R>(
-        override val viewModelClass: Class<ViewModel>,
+        override val viewModelClass: KClass<ViewModel>,
         val spec: NavigationBundleSpecType<R>,
         override val retain: Boolean,
         override val onResult: ViewModel.(R) -> Unit
@@ -65,7 +67,7 @@ sealed class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, R> {
 
     @Composable
     internal fun HandleResult(viewModel: BaseLifecycleViewModel, navHostController: NavHostController) {
-        viewModelClass.cast(viewModel)?.let { vm ->
+        viewModelClass.safeCast(viewModel)?.let { vm ->
             navHostController.HandleResult { vm.onResult(it) }
         }
     }
@@ -77,7 +79,7 @@ sealed class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, R> {
 inline fun <reified ViewModel : BaseLifecycleViewModel, R : NavigationBundleSpecRow<*>> NavigationBundleSpec<R>.NavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(NavigationBundle<R>) -> Unit
-) = NavHostResultHandler.Bundle(ViewModel::class.java, this, retain, onResult)
+) = NavHostResultHandler.Bundle(ViewModel::class, this, retain, onResult)
 
 /**
  * Creates a [NavHostResultHandler.Type] of [R] for this [NavigationBundleSpecType]
@@ -85,7 +87,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, R : NavigationBundleSpec
 inline fun <reified ViewModel : BaseLifecycleViewModel, R> NavigationBundleSpecType<R>.NavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(R) -> Unit
-) = NavHostResultHandler.Type(ViewModel::class.java, this, retain, onResult)
+) = NavHostResultHandler.Type(ViewModel::class, this, retain, onResult)
 
 /**
  * Creates a [NavHostResultHandler.Type] of [R] for this [KSerializer]
@@ -93,4 +95,4 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, R> NavigationBundleSpecT
 inline fun <reified ViewModel : BaseLifecycleViewModel, R> KSerializer<R>.NavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(R) -> Unit
-) = NavHostResultHandler.Type(ViewModel::class.java, NavigationBundleSpecType.SerializedType(this), retain, onResult)
+) = NavHostResultHandler.Type(ViewModel::class, NavigationBundleSpecType.SerializedType(this), retain, onResult)
diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
index 634062f68..67bf7dbbf 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
@@ -273,7 +273,44 @@ sealed class NavigationSpec {
             val subject: String? = null,
             val body: String? = null,
             val attachments: List<Uri> = emptyList()
-        )
+        ) {
+            val intent get() = when (attachments.size) {
+                0 -> Intent(Intent.ACTION_SEND)
+                1 -> Intent(Intent.ACTION_SEND).apply {
+                    putExtra(
+                        Intent.EXTRA_STREAM,
+                        attachments[0]
+                    )
+                }
+                else -> Intent(Intent.ACTION_SEND_MULTIPLE).apply {
+                    putExtra(
+                        Intent.EXTRA_STREAM,
+                        ArrayList(
+                            attachments
+                        )
+                    )
+                }
+            }.apply {
+                setDataAndType(
+                    Uri.parse("mailto:"),
+                    when (this@EmailSettings.type) {
+                        is Type.Plain -> "text/plain"
+                        is Type.Stylized -> "*/*"
+                    }
+                )
+                if (to.isNotEmpty()) {
+                    putExtra(Intent.EXTRA_EMAIL, to.toTypedArray())
+                }
+                if (cc.isNotEmpty()) {
+                    putExtra(Intent.EXTRA_CC, cc.toTypedArray())
+                }
+                if (bcc.isNotEmpty()) {
+                    putExtra(Intent.EXTRA_BCC, bcc.toTypedArray())
+                }
+                subject?.let { putExtra(Intent.EXTRA_SUBJECT, it) }
+                body?.let { putExtra(Intent.EXTRA_TEXT, it) }
+            }
+        }
     }
 
     /**
@@ -320,21 +357,68 @@ sealed class NavigationSpec {
      */
     data class Settings(val type: Type) : NavigationSpec() {
         sealed class Type {
-            object General : Type()
-            object Wireless : Type()
-            object AirplaneMode : Type()
-            object Wifi : Type()
-            object Apn : Type()
-            object Bluetooth : Type()
-            object Date : Type()
-            object Locale : Type()
-            object InputMethod : Type()
-            object Display : Type()
-            object Security : Type()
-            object LocationSource : Type()
-            object InternalStorage : Type()
-            object MemoryCard : Type()
-            object AppDetails : Type()
+
+            abstract fun intent(activity: android.app.Activity): Intent
+
+            object General : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_SETTINGS)
+            }
+            object Wireless : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_WIRELESS_SETTINGS)
+            }
+            object AirplaneMode : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_AIRPLANE_MODE_SETTINGS)
+            }
+            object Wifi : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_WIFI_SETTINGS)
+            }
+
+            object Apn : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_APN_SETTINGS)
+            }
+
+            object Bluetooth : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_BLUETOOTH_SETTINGS)
+            }
+
+            object Date : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_DATE_SETTINGS)
+            }
+
+            object Locale : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_LOCALE_SETTINGS)
+            }
+
+            object InputMethod : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_INPUT_METHOD_SETTINGS)
+            }
+
+            object Display : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_DISPLAY_SETTINGS)
+            }
+
+            object Security : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_SECURITY_SETTINGS)
+            }
+
+            object LocationSource : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)
+            }
+
+            object InternalStorage : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS)
+            }
+
+            object MemoryCard : Type() {
+                override fun intent(activity: android.app.Activity): Intent = Intent(android.provider.Settings.ACTION_MEMORY_CARD_SETTINGS)
+            }
+
+            object AppDetails : Type() {
+                override fun intent(activity: android.app.Activity): Intent {
+                    val uri = Uri.fromParts("package", activity.packageName, null)
+                    return Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS, uri)
+                }
+            }
         }
     }
 
@@ -360,7 +444,37 @@ sealed class NavigationSpec {
          * @param body Optional body of the message
          * @param attachments List of [Uri] pointing to attachments to add
          */
-        data class TextMessengerSettings(val type: Type = Type.Plain, val recipients: List<String>, val subject: String? = null, val body: String? = null, val attachments: List<Uri> = emptyList())
+        data class TextMessengerSettings(val type: Type = Type.Plain, val recipients: List<String>, val subject: String? = null, val body: String? = null, val attachments: List<Uri> = emptyList()) {
+            val intent: Intent = when (attachments.size) {
+                0 -> Intent(Intent.ACTION_SEND)
+                1 -> Intent(Intent.ACTION_SEND).apply {
+                    putExtra(
+                        Intent.EXTRA_STREAM,
+                        attachments[0]
+                    )
+                }
+                else -> Intent(Intent.ACTION_SEND_MULTIPLE).apply {
+                    putExtra(
+                        Intent.EXTRA_STREAM,
+                        ArrayList(
+                            attachments
+                        )
+                    )
+                }
+            }.apply {
+                val recipients = recipients.fold("") { acc, recipient -> if (acc.isNotEmpty()) "$acc;$recipient" else recipient }
+                setDataAndType(
+                    Uri.parse("smsto:$recipients"),
+                    when (this@TextMessengerSettings.type) {
+                        is Type.Plain -> "text/plain"
+                        is Type.Image -> "image/*"
+                        is Type.Video -> "video/*"
+                    }
+                )
+                subject?.let { putExtra("subject", it) }
+                body?.let { putExtra("sms_body", it) }
+            }
+        }
     }
 
     /**
diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index e91a5f52a..b81aec084 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -21,7 +21,6 @@ import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.net.Uri
 import android.provider.MediaStore
-import android.provider.Settings
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
@@ -204,43 +203,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     private fun navigateToEmail(emailSpec: NavigationSpec.Email) {
         assert(manager?.activity != null)
         val activity = manager?.activity ?: return
-        val settings = emailSpec.emailSettings
-        val intent = when (settings.attachments.size) {
-            0 -> Intent(Intent.ACTION_SEND)
-            1 -> Intent(Intent.ACTION_SEND).apply {
-                putExtra(
-                    Intent.EXTRA_STREAM,
-                    settings.attachments[0]
-                )
-            }
-            else -> Intent(Intent.ACTION_SEND_MULTIPLE).apply {
-                putExtra(
-                    Intent.EXTRA_STREAM,
-                    ArrayList(
-                        settings.attachments
-                    )
-                )
-            }
-        }.apply {
-            setDataAndType(
-                Uri.parse("mailto:"),
-                when (settings.type) {
-                    is NavigationSpec.Email.Type.Plain -> "text/plain"
-                    is NavigationSpec.Email.Type.Stylized -> "*/*"
-                }
-            )
-            if (settings.to.isNotEmpty()) {
-                putExtra(Intent.EXTRA_EMAIL, settings.to.toTypedArray())
-            }
-            if (settings.cc.isNotEmpty()) {
-                putExtra(Intent.EXTRA_CC, settings.cc.toTypedArray())
-            }
-            if (settings.bcc.isNotEmpty()) {
-                putExtra(Intent.EXTRA_BCC, settings.bcc.toTypedArray())
-            }
-            settings.subject?.let { putExtra(Intent.EXTRA_SUBJECT, it) }
-            settings.body?.let { putExtra(Intent.EXTRA_TEXT, it) }
-        }
+        val intent = emailSpec.emailSettings.intent
 
         intent.resolveActivity(activity.packageManager)?.let {
             activity.startActivity(intent)
@@ -281,26 +244,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     private fun navigateToSettings(settingsSpec: NavigationSpec.Settings) {
         assert(manager?.activity != null)
         val activity = manager?.activity ?: return
-        val intent = when (settingsSpec.type) {
-            is NavigationSpec.Settings.Type.General -> Intent(Settings.ACTION_SETTINGS)
-            is NavigationSpec.Settings.Type.Wireless -> Intent(Settings.ACTION_WIRELESS_SETTINGS)
-            is NavigationSpec.Settings.Type.AirplaneMode -> Intent(Settings.ACTION_AIRPLANE_MODE_SETTINGS)
-            is NavigationSpec.Settings.Type.Wifi -> Intent(Settings.ACTION_WIFI_SETTINGS)
-            is NavigationSpec.Settings.Type.Apn -> Intent(Settings.ACTION_APN_SETTINGS)
-            is NavigationSpec.Settings.Type.Bluetooth -> Intent(Settings.ACTION_BLUETOOTH_SETTINGS)
-            is NavigationSpec.Settings.Type.Date -> Intent(Settings.ACTION_DATE_SETTINGS)
-            is NavigationSpec.Settings.Type.Locale -> Intent(Settings.ACTION_LOCALE_SETTINGS)
-            is NavigationSpec.Settings.Type.InputMethod -> Intent(Settings.ACTION_INPUT_METHOD_SETTINGS)
-            is NavigationSpec.Settings.Type.Display -> Intent(Settings.ACTION_DISPLAY_SETTINGS)
-            is NavigationSpec.Settings.Type.Security -> Intent(Settings.ACTION_SECURITY_SETTINGS)
-            is NavigationSpec.Settings.Type.LocationSource -> Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
-            is NavigationSpec.Settings.Type.InternalStorage -> Intent(Settings.ACTION_INTERNAL_STORAGE_SETTINGS)
-            is NavigationSpec.Settings.Type.MemoryCard -> Intent(Settings.ACTION_MEMORY_CARD_SETTINGS)
-            is NavigationSpec.Settings.Type.AppDetails -> {
-                val uri = Uri.fromParts("package", activity.packageName, null)
-                Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, uri)
-            }
-        }
+        val intent = settingsSpec.type.intent(activity)
 
         intent.resolveActivity(activity.packageManager)?.let {
             activity.startActivity(intent)
@@ -310,36 +254,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     private fun navigateToMessenger(messengerSpec: NavigationSpec.TextMessenger) {
         assert(manager?.activity != null)
         val activity = manager?.activity ?: return
-        val settings = messengerSpec.settings
-        val intent = when (settings.attachments.size) {
-            0 -> Intent(Intent.ACTION_SEND)
-            1 -> Intent(Intent.ACTION_SEND).apply {
-                putExtra(
-                    Intent.EXTRA_STREAM,
-                    settings.attachments[0]
-                )
-            }
-            else -> Intent(Intent.ACTION_SEND_MULTIPLE).apply {
-                putExtra(
-                    Intent.EXTRA_STREAM,
-                    ArrayList(
-                        settings.attachments
-                    )
-                )
-            }
-        }.apply {
-            val recipients = settings.recipients.fold("") { acc, recipient -> if (acc.isNotEmpty()) "$acc;$recipient" else recipient }
-            setDataAndType(
-                Uri.parse("smsto:$recipients"),
-                when (settings.type) {
-                    is NavigationSpec.TextMessenger.Type.Plain -> "text/plain"
-                    is NavigationSpec.TextMessenger.Type.Image -> "image/*"
-                    is NavigationSpec.TextMessenger.Type.Video -> "video/*"
-                }
-            )
-            settings.subject?.let { putExtra("subject", it) }
-            settings.body?.let { putExtra("sms_body", it) }
-        }
+        val intent = messengerSpec.settings.intent
 
         intent.resolveActivity(activity.packageManager)?.let {
             activity.startActivity(intent)

From 2bee0d6df001961e6a7751a02329dbc7547f9d72 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 29 Nov 2022 19:52:42 +0100
Subject: [PATCH 040/227] Fix example

---
 .../architecture/compose/ArchitectureDetailsLayout.kt      | 7 ++++---
 .../example/architecture/compose/ArchitectureLayout.kt     | 4 ++--
 .../example/architecture/compose/BottomSheetLayout.kt      | 5 +++--
 .../architecture/compose/BottomSheetSubPageLayout.kt       | 5 +++--
 .../kaluga/example/resources/compose/ResourcesLayout.kt    | 4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
index 68771cece..08db0afed 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
@@ -23,11 +23,12 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import com.splendo.kaluga.architecture.compose.navigation.BottomSheetContentNavHostRouteNavigator
+import com.splendo.kaluga.architecture.compose.navigation.BottomSheetContentNavHostComposableNavigator
 import com.splendo.kaluga.architecture.compose.navigation.BottomSheetNavigatorState
 import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavigation
 import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
 import com.splendo.kaluga.example.shared.viewmodel.architecture.InputDetails
 import com.splendo.kaluga.resources.compose.Composable
@@ -40,9 +41,9 @@ fun ArchitectureDetailsLayout(inputDetails: InputDetails, bottomSheetNavigatorSt
     val viewModel = koinViewModel<ArchitectureDetailsViewModel> {
         parametersOf(
             inputDetails,
-            BottomSheetContentNavHostRouteNavigator(
+            BottomSheetContentNavHostComposableNavigator<ArchitectureDetailsNavigationAction<*>>(
                 bottomSheetNavigatorState,
-                navigationMapper = ::architectureDetailsNavigationRouteMapper
+                navigationMapper = { architectureDetailsNavigationRouteMapper(it) }
             )
         )
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
index 8e0113a22..4d9723070 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
@@ -84,8 +84,8 @@ fun ArchitectureLayout() {
     MdcTheme {
         val viewModel = koinViewModel<ArchitectureViewModel> {
             parametersOf(
-                RootModalBottomSheetNavigator(
-                    navigationMapper = ::architectureNavigationRouteMapper,
+                RootModalBottomSheetNavigator<ArchitectureNavigationAction<*>>(
+                    navigationMapper = { architectureNavigationRouteMapper(it) },
                     contentRootResultHandlers = listOf(
                         InputDetails.serializer().NavHostResultHandler<ArchitectureViewModel, InputDetails> {
                             nameInput.post(it.name)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
index ef48b3cca..c42a353fd 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
@@ -28,6 +28,7 @@ import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavi
 import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetViewModel
 import com.splendo.kaluga.resources.compose.Composable
 import kotlinx.coroutines.flow.StateFlow
@@ -38,9 +39,9 @@ import org.koin.core.parameter.parametersOf
 fun BottomSheetLayout(bottomSheetNavigationState: StateFlow<BottomSheetNavigatorState?>) {
     val viewModel = koinViewModel<BottomSheetViewModel> {
         parametersOf(
-            ModalBottomSheetNavigator(
+            ModalBottomSheetNavigator<BottomSheetNavigation>(
                 bottomSheetNavigationState,
-                navigationMapper = ::bottomSheetNavigationRouteMapper
+                navigationMapper = { bottomSheetNavigationRouteMapper(it) }
             )
         )
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
index e40808ed2..6eee11da9 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetSubPageLayout.kt
@@ -31,6 +31,7 @@ import com.splendo.kaluga.architecture.compose.navigation.HardwareBackButtonNavi
 import com.splendo.kaluga.architecture.compose.navigation.ModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageNavigation
 import com.splendo.kaluga.example.shared.viewmodel.architecture.BottomSheetSubPageViewModel
 import kotlinx.coroutines.flow.StateFlow
 import org.koin.androidx.compose.koinViewModel
@@ -42,9 +43,9 @@ fun BottomSheetSubPageLayout(
 ) {
     val viewModel = koinViewModel<BottomSheetSubPageViewModel> {
         parametersOf(
-            ModalBottomSheetNavigator(
+            ModalBottomSheetNavigator<BottomSheetSubPageNavigation>(
                 bottomSheetNavigationState,
-                navigationMapper = ::bottomSheetSubPageNavigationRouteMapper
+                navigationMapper = { bottomSheetSubPageNavigationRouteMapper(it) }
             )
         )
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
index 07d80b6a4..a46d6f9cc 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
@@ -35,7 +35,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.composable
 import com.google.android.material.composethemeadapter.MdcTheme
-import com.splendo.kaluga.architecture.compose.navigation.RootNavHostRouteNavigator
+import com.splendo.kaluga.architecture.compose.navigation.RootNavHostComposableNavigator
 import com.splendo.kaluga.architecture.compose.navigation.next
 import com.splendo.kaluga.architecture.compose.navigation.route
 import com.splendo.kaluga.architecture.compose.state
@@ -67,7 +67,7 @@ fun ResourcesLayout() {
     MdcTheme {
         val viewModel = koinViewModel<ResourcesListViewModel> {
             parametersOf(
-                RootNavHostRouteNavigator<ResourcesListNavigationAction>(
+                RootNavHostComposableNavigator<ResourcesListNavigationAction>(
                     navigationMapper = { action ->
                         when (action) {
                             is ResourcesListNavigationAction.Button -> action.next

From 39af7542e1c381d9d7569ca0776cb62fbe51c277 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 30 Nov 2022 00:07:38 +0100
Subject: [PATCH 041/227] Added support for non-NavHost navigation on Compose

---
 .../navigation/BottomSheetNavigator.kt        | 13 ++--
 .../compose/navigation/ComposableNavSpec.kt   | 67 ++++++++++++-------
 .../compose/navigation/ComposableNavigator.kt | 10 ++-
 .../example/alerts/compose/AlertsLayout.kt    |  2 +-
 .../example/alerts/xml/XMLAlertsActivity.kt   |  2 +-
 .../architecture/ArchitectureActivity.kt      |  6 +-
 .../compose/ArchitectureDetailsLayout.kt      |  2 +-
 .../compose/ArchitectureLayout.kt             |  2 +-
 .../architecture/compose/BottomSheetLayout.kt |  8 ++-
 .../xml/BottomSheetRootDialogFragment.kt      |  1 -
 .../xml/XMLArchitectureActivity.kt            |  6 +-
 .../example/compose/ComposeOrXMLActivity.kt   |  2 +-
 .../compose/DateTimePickerLayout.kt           |  2 +-
 .../xml/XMLDateTimePickerActivity.kt          |  2 +-
 .../keyboard/compose/KeyboardLayout.kt        |  2 +-
 .../keyboard/xml/XMLKeyboardActivity.kt       |  2 +-
 .../kaluga/example/link/LinksActivity.kt      |  1 -
 .../example/loading/compose/LoadingLayout.kt  |  2 +-
 .../example/loading/xml/XMLLoadingActivity.kt |  2 +-
 .../example/permissions/PermissionActivity.kt |  1 -
 .../example/resources/compose/ColorsLayout.kt | 45 ++++++++-----
 .../resources/compose/ResourcesLayout.kt      |  5 +-
 .../architecture/ArchitectureViewModel.kt     |  1 -
 .../datetimepicker/DateTimePickerViewModel.kt |  1 -
 24 files changed, 108 insertions(+), 79 deletions(-)

diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
index d152d26a6..31e05c28c 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
@@ -1,12 +1,12 @@
 package com.splendo.kaluga.architecture.compose.navigation
 
-import android.util.Log
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.material.ModalBottomSheetLayout
 import androidx.compose.material.ModalBottomSheetValue
 import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
@@ -48,15 +48,17 @@ sealed class BottomSheetNavigator<A : NavigationAction<*>>(
     @Composable
     protected fun BaseLifecycleViewModel.SetupNavigationAction() {
         val currentAction by actionState.collectAsState()
+        val onDispose: () -> Unit = { actionState.compareAndSet(currentAction, null) }
         currentAction?.let { action ->
             when (val spec = navigationMapper(action)) {
-                is BottomSheetRoute -> routeController.navigate(spec)
-                is BottomSheetLaunchedNavigation -> spec.launchedNavigation.Launch(this)
+                is BottomSheetRoute -> LaunchedEffect(spec) {
+                    routeController.navigate(spec)
+                    onDispose()
+                }
+                is BottomSheetLaunchedNavigation -> spec.launchedNavigation.Launch(this, onDispose)
             }
-            actionState.tryEmit(null)
         }
     }
-
 }
 
 /**
@@ -160,7 +162,6 @@ private fun SetupNavigatingModalBottomSheetLayout(
                     HardwareBackButtonNavigation(onBackButtonClickHandler = sheetContentRouteController::close)
                 }
                 Box(Modifier.defaultMinSize(minHeight = 1.dp)) {
-                    Log.d("TEST", "SetupNavigatingModalBottomSheetLayout ${navigationState.sheetContentNavHostController}")
                     SetupNavHost(
                         bottomSheetNavigatorState = bottomSheetNavigationState,
                         navHostController = { sheetContentNavHostController },
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
index bb0e2be3d..e224dd173 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
@@ -20,7 +20,6 @@ package com.splendo.kaluga.architecture.compose.navigation
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
-import android.os.Bundle
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.PickVisualMediaRequest
@@ -28,8 +27,7 @@ import androidx.activity.result.contract.ActivityResultContract
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.platform.LocalContext
 import androidx.fragment.app.DialogFragment
 import com.splendo.kaluga.architecture.compose.activity
@@ -86,8 +84,10 @@ sealed class ComposableNavSpec {
          * @param type The [ActivityResultContracts.PickVisualMedia.VisualMediaType] to be selected.
          * @param onResult Returns an [Uri] of the image or video selected, or `null` if nothing was selected.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> PickVisualMedia(type: ActivityResultContracts.PickVisualMedia.VisualMediaType = ActivityResultContracts.PickVisualMedia.ImageAndVideo,
-            noinline onResult: VM.(Uri?) -> Unit) = Launcher(
+        inline fun <reified VM : BaseLifecycleViewModel> PickVisualMedia(
+            type: ActivityResultContracts.PickVisualMedia.VisualMediaType = ActivityResultContracts.PickVisualMedia.ImageAndVideo,
+            noinline onResult: VM.(Uri?) -> Unit
+        ) = Launcher(
             VM::class,
             ActivityResultContracts.PickVisualMedia(),
             { PickVisualMediaRequest(mediaType = type) },
@@ -99,8 +99,11 @@ sealed class ComposableNavSpec {
          * @param type The [ActivityResultContracts.PickVisualMedia.VisualMediaType] to be selected.
          * @param onResult Returns a list of [Uri] of the images or videos selected.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> PickMultipleVisualMedia(maxItems: Int? = null, type: ActivityResultContracts.PickVisualMedia.VisualMediaType = ActivityResultContracts.PickVisualMedia.ImageAndVideo,
-            noinline onResult: VM.(List<Uri>) -> Unit) = Launcher(
+        inline fun <reified VM : BaseLifecycleViewModel> PickMultipleVisualMedia(
+            maxItems: Int? = null,
+            type: ActivityResultContracts.PickVisualMedia.VisualMediaType = ActivityResultContracts.PickVisualMedia.ImageAndVideo,
+            noinline onResult: VM.(List<Uri>) -> Unit
+        ) = Launcher(
             VM::class,
             maxItems?.let { ActivityResultContracts.PickMultipleVisualMedia(it) } ?: ActivityResultContracts.PickMultipleVisualMedia(),
             { PickVisualMediaRequest(mediaType = type) },
@@ -201,7 +204,7 @@ sealed class ComposableNavSpec {
                 is NavigationSpec.Phone.Type.Dial -> Intent(Intent.ACTION_DIAL)
                 is NavigationSpec.Phone.Type.Call -> Intent(Intent.ACTION_CALL)
             }.apply {
-                data = Uri.parse("tel:${phoneNumber}")
+                data = Uri.parse("tel:$phoneNumber")
             }
             if (intent.resolveActivity(packageManager) != null) intent else null
         }
@@ -252,16 +255,20 @@ sealed class ComposableNavSpec {
      */
     sealed class LaunchedNavigation : ComposableNavSpec() {
         @Composable
-        protected abstract fun createLauncher(viewModel: BaseLifecycleViewModel): () -> Unit
+        protected abstract fun createLauncher(viewModel: BaseLifecycleViewModel, onDispose: () -> Unit): () -> Unit
 
         /**
          * Launch this [LaunchedNavigation] for a given [viewModel].
          */
         @Composable
-        fun Launch(viewModel: BaseLifecycleViewModel) {
-            val launcher = createLauncher(viewModel)
-            LaunchedEffect(launcher) {
+        fun Launch(viewModel: BaseLifecycleViewModel, onDispose: () -> Unit) {
+            val launcher = createLauncher(viewModel, onDispose)
+            // Ensure only launched once
+            DisposableEffect(viewModel) {
                 launcher.invoke()
+                onDispose {
+                    onDispose()
+                }
             }
         }
     }
@@ -281,10 +288,11 @@ sealed class ComposableNavSpec {
     ) : LaunchedNavigation() {
 
         @Composable
-        override fun createLauncher(viewModel: BaseLifecycleViewModel): () -> Unit {
+        override fun createLauncher(viewModel: BaseLifecycleViewModel, onDispose: () -> Unit): () -> Unit {
             val launcher = rememberLauncherForActivityResult(activityResultContract) { result ->
                 viewModelClass.safeCast(viewModel)?.let {
                     it.onResult(result)
+                    onDispose()
                 }
             }
             val input = getInput()
@@ -302,8 +310,8 @@ sealed class ComposableNavSpec {
      */
     data class CloseActivity(val result: Pair<Int, NavigationBundle<*>?>? = null) : LaunchedNavigation() {
         @Composable
-        override fun createLauncher(viewModel: BaseLifecycleViewModel): () -> Unit {
-            val activity = LocalContext.current.activity ?: return {}
+        override fun createLauncher(viewModel: BaseLifecycleViewModel, onDispose: () -> Unit): () -> Unit {
+            val activity = LocalContext.current.activity
             return {
                 result?.let { (resultCode, bundle) ->
                     val data = Intent().apply {
@@ -311,9 +319,10 @@ sealed class ComposableNavSpec {
                             putExtras(it.toBundle())
                         }
                     }
-                    activity.setResult(resultCode, data)
+                    activity?.setResult(resultCode, data)
                 }
-                activity.finish()
+                activity?.finish()
+                onDispose()
             }
         }
     }
@@ -329,10 +338,13 @@ sealed class ComposableNavSpec {
     ) : LaunchedNavigation() {
 
         @Composable
-        override fun createLauncher(viewModel: BaseLifecycleViewModel): () -> Unit {
-            val fragmentManager = LocalContext.current.activity?.supportFragmentManager ?: return {}
+        override fun createLauncher(viewModel: BaseLifecycleViewModel, onDispose: () -> Unit): () -> Unit {
+            val fragmentManager = LocalContext.current.activity?.supportFragmentManager
             return {
-                createDialog().show(fragmentManager, tag)
+                fragmentManager?.let {
+                    createDialog().show(it, tag)
+                }
+                onDispose()
             }
         }
     }
@@ -344,11 +356,14 @@ sealed class ComposableNavSpec {
     data class IntentLauncher(val createIntent: @Composable Activity.() -> Intent?) : LaunchedNavigation() {
 
         @Composable
-        override fun createLauncher(viewModel: BaseLifecycleViewModel): () -> Unit {
+        override fun createLauncher(viewModel: BaseLifecycleViewModel, onDispose: () -> Unit): () -> Unit {
             val context = LocalContext.current
-            val intent = context.activity?.intent ?: return {}
+            val intent = context.activity?.intent
             return {
-                context.startActivity(intent)
+                intent?.let {
+                    context.startActivity(it)
+                }
+                onDispose()
             }
         }
     }
@@ -374,7 +389,7 @@ inline fun <reified A : Activity, reified VM : BaseLifecycleViewModel, O> Naviga
     activityResultContract: ActivityResultContract<Intent, O>,
     flags: Set<IntentFlag> = emptySet(),
     noinline onResult: VM.(O) -> Unit
-) {
+): ComposableNavSpec.Launcher<VM, Intent, O> {
     val getInput = @Composable {
         LocalContext.current.activity?.let { activity ->
             Intent(activity, A::class.java).apply {
@@ -385,14 +400,14 @@ inline fun <reified A : Activity, reified VM : BaseLifecycleViewModel, O> Naviga
             }
         }
     }
-    ComposableNavSpec.Launcher(VM::class, activityResultContract, getInput, onResult)
+    return ComposableNavSpec.Launcher(VM::class, activityResultContract, getInput, onResult)
 }
 
 /**
  * Creates a [ComposableNavSpec.IntentLauncher] to show a given [Activity]
  * @param flags A set of [IntentFlag] to be applied to the next screen.
  */
-inline fun <reified  A : Activity> NavigationAction<*>.ShowActivity(
+inline fun <reified A : Activity> NavigationAction<*>.ShowActivity(
     flags: Set<IntentFlag> = emptySet()
 ) = ComposableNavSpec.IntentLauncher {
     Intent(this, A::class.java).apply {
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
index 33613cc13..6f6776607 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
@@ -1,6 +1,7 @@
 package com.splendo.kaluga.architecture.compose.navigation
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
@@ -48,12 +49,15 @@ sealed class ComposableNavigator<A : NavigationAction<*>>(
     @Composable
     protected fun BaseLifecycleViewModel.SetupNavigationAction() {
         val currentAction by actionState.collectAsState()
+        val onDispose: () -> Unit = { actionState.compareAndSet(currentAction, null) }
         currentAction?.let { action ->
             when (val spec = navigationMapper(action)) {
-                is Route -> routeController.navigate(spec)
-                is ComposableNavSpec.LaunchedNavigation -> spec.Launch(this)
+                is Route -> LaunchedEffect(spec) {
+                    routeController.navigate(spec)
+                    onDispose()
+                }
+                is ComposableNavSpec.LaunchedNavigation -> spec.Launch(this, onDispose)
             }
-            actionState.tryEmit(null)
         }
     }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
index d4c536a79..2b66b51f4 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
@@ -70,4 +70,4 @@ fun AlertsLayout() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt
index b5d877ed5..d4063c934 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt
@@ -21,4 +21,4 @@ class XMLAlertsActivity : KalugaViewModelActivity<AlertViewModel>() {
         binding.lifecycleOwner = this
         setContentView(binding.root)
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureActivity.kt
index dcaef43b6..a1832ff92 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureActivity.kt
@@ -22,9 +22,9 @@ import com.splendo.kaluga.example.architecture.xml.XMLArchitectureActivity
 import com.splendo.kaluga.example.compose.ComposeOrXMLActivity
 
 class ArchitectureActivity : ComposeOrXMLActivity<
-        ComposeArchitectureActivity,
-        XMLArchitectureActivity
-        >(
+    ComposeArchitectureActivity,
+    XMLArchitectureActivity
+    >(
     ComposeArchitectureActivity::class.java,
     XMLArchitectureActivity::class.java
 )
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
index 08db0afed..59ece7342 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureDetailsLayout.kt
@@ -59,4 +59,4 @@ fun ArchitectureDetailsLayout(inputDetails: InputDetails, bottomSheetNavigatorSt
             finishButton.Composable(modifier = Modifier.fillMaxWidth())
         }
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
index 4d9723070..d106a51bf 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
@@ -166,4 +166,4 @@ fun ArchitectureLayout() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
index c42a353fd..b597575f4 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/BottomSheetLayout.kt
@@ -54,9 +54,11 @@ fun BottomSheetLayout(bottomSheetNavigationState: StateFlow<BottomSheetNavigator
                 .padding(Constants.Padding.default)
         ) {
             Text(text)
-            button.Composable(modifier = Modifier
-                .fillMaxWidth()
-                .padding(Constants.Padding.default))
+            button.Composable(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(Constants.Padding.default)
+            )
         }
     }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
index 7a8aef287..070510dde 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
@@ -127,5 +127,4 @@ class BottomSheetFragment(val viewModel: BottomSheetViewModel) : Fragment() {
             }
         }
     }
-
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt
index 5243e1dbd..2bab6aa53 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt
@@ -36,14 +36,16 @@ import org.koin.core.parameter.parametersOf
 
 class XMLArchitectureActivity : KalugaViewModelActivity<ArchitectureViewModel>() {
 
-    inner class Contract : ActivityResultContract<Intent, InputDetails?>() {
+    class Contract : ActivityResultContract<Intent, InputDetails?>() {
 
         override fun createIntent(context: Context, input: Intent): Intent = input
 
         override fun parseResult(
             resultCode: Int,
             intent: Intent?
-        ): InputDetails? = intent?.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(InputDetails.serializer()))
+        ): InputDetails? {
+            return intent?.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(InputDetails.serializer()))
+        }
     }
 
     override val viewModel: ArchitectureViewModel by viewModel {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt
index 91ab8e40a..498a9baee 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt
@@ -98,4 +98,4 @@ class UITypesAdapter(private val viewModel: ComposeOrXMLSelectionViewModel) : Re
             holder.button.setOnClickListener(null)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
index 09307a1b3..c46df491b 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
@@ -79,4 +79,4 @@ fun DateTimePickerLayout() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/xml/XMLDateTimePickerActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/xml/XMLDateTimePickerActivity.kt
index 8f64071ae..7eacb2047 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/xml/XMLDateTimePickerActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/xml/XMLDateTimePickerActivity.kt
@@ -35,4 +35,4 @@ class XMLDateTimePickerActivity : KalugaViewModelActivity<DateTimePickerViewMode
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
index eeff64946..1a75ca067 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
@@ -105,4 +105,4 @@ fun KeyboardLayout() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt
index 342a627ea..c077f9ef9 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/xml/XMLKeyboardActivity.kt
@@ -50,4 +50,4 @@ class XMLKeyboardActivity : KalugaViewModelActivity<KeyboardViewModel<ViewFocusH
         binding.lifecycleOwner = this
         setContentView(binding.root)
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
index 478d6ee72..05abdd6ef 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/link/LinksActivity.kt
@@ -22,7 +22,6 @@ import android.os.Bundle
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.databinding.ActivityLinkBinding
 import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
 import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
index 61a4c6d98..c65ecefc8 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
@@ -68,4 +68,4 @@ fun LoadingLayout() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/loading/xml/XMLLoadingActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/loading/xml/XMLLoadingActivity.kt
index 23da2a9fb..22994bb1c 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/loading/xml/XMLLoadingActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/loading/xml/XMLLoadingActivity.kt
@@ -38,4 +38,4 @@ class XMLLoadingActivity : KalugaViewModelActivity<HudViewModel>() {
         binding.lifecycleOwner = this
         setContentView(binding.root)
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionActivity.kt
index f822454de..19143a8e0 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionActivity.kt
@@ -23,7 +23,6 @@ import android.widget.Toast
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
-import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.databinding.ActivityPermissionBinding
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
index 00eef8809..efa799999 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
@@ -1,18 +1,18 @@
 /*
  Copyright 2022 Splendo Consulting B.V. The Netherlands
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.example.resources.compose
@@ -54,7 +54,7 @@ import org.koin.androidx.compose.koinViewModel
 @Composable
 fun ColorsLayout() {
     val viewModel = koinViewModel<ColorViewModel>()
-    
+
     ViewModelComposable(viewModel) {
         Column(
             verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
@@ -82,9 +82,11 @@ fun ColorsLayout() {
             Row(Modifier.fillMaxWidth()) {
                 Column(Modifier.width(mainColorSize)) {
                     var backdropTempText by remember { mutableStateOf(backdropText) }
-                    Box(modifier = Modifier
-                        .size(mainColorSize)
-                        .backgroundStyle(backdropColorBackground))
+                    Box(
+                        modifier = Modifier
+                            .size(mainColorSize)
+                            .backgroundStyle(backdropColorBackground)
+                    )
                     OutlinedTextField(
                         value = backdropTempText,
                         onValueChange = { backdropTempText = it },
@@ -98,15 +100,19 @@ fun ColorsLayout() {
                     )
                 }
                 Spacer(modifier = Modifier.weight(1.0f))
-                Box(modifier = Modifier
-                    .size(mainColorSize)
-                    .backgroundStyle(blendedColorBackground))
+                Box(
+                    modifier = Modifier
+                        .size(mainColorSize)
+                        .backgroundStyle(blendedColorBackground)
+                )
                 Spacer(modifier = Modifier.weight(1.0f))
                 Column(Modifier.width(mainColorSize)) {
                     var sourceTempText by remember { mutableStateOf(sourceText) }
-                    Box(modifier = Modifier
-                        .size(mainColorSize)
-                        .backgroundStyle(sourceColorBackground))
+                    Box(
+                        modifier = Modifier
+                            .size(mainColorSize)
+                            .backgroundStyle(sourceColorBackground)
+                    )
                     OutlinedTextField(
                         value = sourceTempText,
                         onValueChange = { sourceTempText = it },
@@ -139,11 +145,14 @@ fun ListOfColors(list: List<BackgroundStyle>) {
     Row(
         Modifier
             .fillMaxWidth()
-            .horizontalScroll(rememberScrollState())) {
+            .horizontalScroll(rememberScrollState())
+    ) {
         list.forEach {
-            Box(modifier = Modifier
-                .size(40.dp)
-                .backgroundStyle(it))
+            Box(
+                modifier = Modifier
+                    .size(40.dp)
+                    .backgroundStyle(it)
+            )
         }
     }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
index a46d6f9cc..5da2a0cf0 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
@@ -94,11 +94,12 @@ fun ResourcesLayout() {
                 resources.forEach {
                     Button(
                         modifier = Modifier.fillMaxWidth(),
-                        onClick = { onResourceSelected(it) }) {
+                        onClick = { onResourceSelected(it) }
+                    ) {
                         Text(it.title)
                     }
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt
index 53a89bc80..8a0e2755f 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureViewModel.kt
@@ -23,7 +23,6 @@ import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.observable.ObservableOptional
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedSubject
-import com.splendo.kaluga.architecture.observable.toUninitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
 import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.resources.localized
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
index 8bfd03c1f..7aa6d0265 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
@@ -1,7 +1,6 @@
 package com.splendo.kaluga.example.shared.viewmodel.datetimepicker
 
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
-import com.splendo.kaluga.architecture.observable.toUninitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.base.text.DateFormatStyle
 import com.splendo.kaluga.base.text.KalugaDateFormatter

From 77b3e101cc78f94d875851b0650b0f08fb52686a Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 30 Nov 2022 13:03:23 +0100
Subject: [PATCH 042/227] More documentation

+ Some convenience methods
---
 architecture-compose/README.md                | 297 ++----------------
 .../navigation/BottomSheetNavigator.kt        |  30 +-
 .../compose/navigation/ComposableNavSpec.kt   |   7 +-
 .../compose/navigation/ComposableNavigator.kt |  43 ++-
 .../architecture/compose/navigation/Route.kt  |  11 +-
 .../compose/navigation/RouteController.kt     |   5 +
 .../compose/navigation/result/HandleResult.kt |   2 +
 .../navigation/result/NavHostResultHandler.kt |   2 +-
 .../KalugaViewModelComposeActivity.kt         |  32 +-
 .../compose/viewModel/ViewModelComposable.kt  |  25 +-
 .../architecture/compose/NavigationMappers.kt |   5 +-
 11 files changed, 164 insertions(+), 295 deletions(-)

diff --git a/architecture-compose/README.md b/architecture-compose/README.md
index 6aa131ba8..1a86c1f00 100644
--- a/architecture-compose/README.md
+++ b/architecture-compose/README.md
@@ -12,284 +12,49 @@ repositories {
 // ...
 dependencies {
     // ...
-    implementation("com.splendo.kaluga.architecture.compose:$kalugaVersion")
+    implementation("com.splendo.kaluga.architecture-compose:$kalugaVersion")
 }
 ```
 
 ## Usage
-### Examples
 
-#### Display content using a local data model 
+Compose architecture can be easily used by any Composable function.
+To do so, simply create a `BaseLifecycleViewModel`, preferably using a composable method that retains the viewModel on configuration changes such as [`androidx.lifecycle.viewmodel.compose.viewModel()`](https://developer.android.com/reference/kotlin/androidx/lifecycle/viewmodel/compose/package-summary#viewModel(androidx.lifecycle.ViewModelStoreOwner,kotlin.String,androidx.lifecycle.ViewModelProvider.Factory,androidx.lifecycle.viewmodel.CreationExtras)) or [`org.koin.androidx.compose.koinViewModel`](https://insert-koin.io/docs/reference/koin-android/compose#viewmodel-for-composable)
+Then wrap the ViewModel using the `ViewModelComposable` wrapping function.
 
-```kotlin
-// View model that expose contact details fields and handle user actions
-class ContactDetailsViewModel(
-    //...
-) {
-    val contactEmail: String // ...
-    
-    fun sendEmail() {
-        // send an email    
-    }
-    
-    fun onBackPressed() {
-        // handle the back button 
-    }
-}
+`ViewModelComposable` will automatically bind to all `LifecycleSubscribables` publicly exposed by the ViewModel using the activity that hosts the Composable.
+`FragmentViewModelComposable` can be called instead to provide an additional `FragmentManager` to bind to.
 
-// Contact details UI
-@Composable
-fun ContactDetailsLayout(
-    contactDetails: ContactDetails, 
-    navigator: Navigator<ContactDetailsNavigation<*>>
-) {
-    // Create a view model and store it in a local ViewModelStore to ensure cleanup
-    val viewModel = store {
-        remember {
-            ContactDetailsViewModel(contactDetails, navigator)
-        }
-    }
+A `KalugaViewModelComposeActivity` can be declared to automatically create a `BaseLifecycleViewModel` and wrap it in `ViewModelComposable` as the Content of the activity.
 
-    ViewModelComposable(viewModel) {
-        // Add a hardware back button handler  
-        HardwareBackButtonNavigation(::onBackPressed)
-        
-        Column {
-            // Use the view model fields to render content
-            Text(text = contactEmail)
-            
-            // Use the view model methods to handle user actions
-            Button(onClick = ::sendEmail) {
-                // ...
-            }
-        }
-    }
-}
-```
+### ComposableLifecycleSubscribable
+This Kaluga library adds a new `LifecycleSubscribableMarker`: `ComposableLifecycleSubscribable`.
+The `ComposableLifecycleSubscribable` provides a modifying function to wrap around a composable view.
+`ViewModelComposable` will automatically modify its content with all `ComposableLifecycleSubscribable` publicly exposed by the provided `BaseLifecycleViewModel`.
 
-#### Set up NavHost navigation
+### Navigation
+Navigation in Compose is quite different from regular Android navigation. Therefore `com.splendo.kaluga.architecture.navigation.ActivityNavigator` is not recommended as a `Navigator`.
+Instead this library introduces several new Navigators.
 
-```kotlin
-// Define an action mapper for a route navigator
-fun listRouteMapper(action: ContactsListNavigation<*>): String = 
-    when (action) {
-        is ContactsListNavigation.ShowContactDetails -> action.next
-        //...
-    }
+#### ComposableNavigator
+The `ComposableNavigator` navigates by mapping the `com.splendo.kaluga.architecture.navigation.NavigationAction` to a `ComposableNavSpec`.
+A `ComposableNavSpec` can either be a `Route` that is managed by a `NavHost` or a `ComposableNavSpec.LaunchedNavigation` that launches into a new screen.
+For `Route` convenience methods exist as extensions of the NavigationAction to easily declare them (e.g. `next`, `from()`, `back`, etc).
 
-fun detailRouteMapper(action: ContactDetailsNavigation<*>): Route {
-    return when (action) {
-        is ContactDetailsNavigation.Close -> Route.Back
-    }
-}
+When `Route` is included in the Navigator a `NavHost` needs to be set up to support the Routes.
+This can be done by declaring `RootNavHostComposableNavigator` as the `ComposableNavigator` of the top view in the navigation graph.
+Using `com.splendo.kaluga.architecture.compose.navigation.composable` can easily add `com.splendo.kaluga.architecture.navigation.NavigationAction` to the navigation graph.
+The route string of a `NavigationAction` can be generated using `com.splendo.kaluga.architecture.compose.navigation.route()`.
 
-// Root view of the Activity. Contains a navigation graph with destinations
-@Composable
-fun ContactsLayout() { 
-    val routeController = NavHostRouteController(rememberNavHostController())
-    // set up nav host with routes
-    routeController.SetupNavHost(
-            rootView = { navHostController ->
-                // Display a contact list
-                ContactsListLayout(navHostController)
-            }
-        ) { navHostController ->
-            composable<ContactDetails, ContactsListNavigation.ShowContactDetails>(
-                type = NavigationBundleSpecType.SerializedType(
-                    ContactDetails.serializer()
-                )
-            ) { details ->
-                ContactDetailsLayout(details, navHostController)
-            }
-        }
-}
-
-@Composable
-fun ContactsListLayout(navHostController: NavHostController) {
-    // Construct a route navigator
-    val routeNavigator = RouteNavigator(
-            rememberNavController(),
-        ::listRouteMapper
-    )
-  
-    // Setup Contact List view
-}
-
-@Composable
-fun ContactDetailsLayout(contactDetails: ContactDetails, navHostController: NavHostController) {
-    val routeNavigator = RouteNavigator(
-        navHostController,
-        ::detailRouteMapper
-    )
-    
-    // Setup Details View
-    // No need to set up NavHost since it is managed by the parent
-}
-```
-
-You can also call `SetupNavHost` directly from a `RouteNavigator`, bearing in mind that the navHostController linked to the Navigator can only be setup once.
-
-#### Mix NavHost and Kaluga navigation
-
-Sometimes it's necessary to mix a route navigation within the same activity and navigate to 
-other activities
-
-```kotlin
-internal fun activityMapper(action: ContactsNavigation<*>): NavigationSpec =
-    when (action) {
-        is SendEmail -> NavigationSpec.Email(/* ... */)
-        //...
-    }
-
-@Composable
-fun ContactsLayout() { 
-    //...
-    
-    // create a mixed route-activity navigator
-    val combinedNavigator = rememberCombinedNavigator { action: ContactsNavigation<*> ->
-        when (action) {
-            // actions which are redirected to `routeNavigator`
-            is ShowContactsList, is ShowContactDetails, is Close -> routeNavigator
-            // actions which are redirected to an activity navigator
-            is SendEmail -> ::activityMapper.toActivityNavigator()
-        }
-    }
-    
-    routeNavigator.SetupNavHost( 
-        //...
-        composable(route<ShowContactDetails>("{json}")) {
-            //...
-            ContactDetailsLayout(details, combinedNavigator)
-        }
-    )
-}
-
-class ContactDetailsViewModel(
-    private val contactDetails: ContactDetails,
-    private val navigator: Navigator<ContactDetailsNavigation<*>>
-) {
-    //...
-    // opens another activity
-    fun sendEmail() = navigator.navigate(SendEmail(contactDetails.email))
-    // navigates NavHost graph
-    fun onBackPressed() = navigator.navigate(Close)
-}  
-```
+Subviews of the NavHost should use `NavHostComposableNavigator` as a Navigator instead, where `navHostController` is the StateFlow provided by `RootNavHostComposableNavigator.contentBuilder`.
 
-#### Modal Bottom Sheet
+If no `Route` navigation is used, it is recommended to use `LaunchedComposableNavigator` since this does not set up the unnecessary NavHost.
 
-A special case is provided for using `ModalBottomSheet` navigation
-
-````kotlin
-internal fun bottomSheetParentNavigationRouteMapper(action: BottomSheetParentNavigation): BottomSheetRoute {
-    return when (action) {
-        is BottomSheetParentNavigation.SubPage -> action.next.bottomSheetContent
-        is BottomSheetParentNavigation.ShowSheet -> action.next.bottomSheetSheetContent
-    }
-}
-
-internal fun bottomSheetParentSubPageNavigationRouteMapper(action: BottomSheetParentSubPageNavigation): Route {
-    return when (action) {
-        is BottomSheetParentSubPageNavigation.Back -> Route.Back
-    }
-}
-
-internal fun bottomSheetNavigationRouteMapper(action: BottomSheetNavigation): BottomSheetRoute {
-    return when (action) {
-        is BottomSheetNavigation.Close -> Route.Close.bottomSheetSheetContent
-        is BottomSheetNavigation.SubPage -> action.next.bottomSheetSheetContent
-    }
-}
-
-internal fun bottomSheetSubPageNavigationRouteMapper(action: BottomSheetSubPageNavigation): BottomSheetRoute {
-    return when (action) {
-        is BottomSheetSubPageNavigation.Close -> Route.Close.bottomSheetSheetContent
-        is BottomSheetSubPageNavigation.Back -> Route.Back.bottomSheetSheetContent
-    }
-}
-
-@Composable
-fun BottomSheetParentLayout() {
-  val bottomSheetRouteController = BottomSheetRouteController(
-    NavHostRouteController(rememberNavController()),
-    BottomSheetSheetContentRouteController(
-      rememberNavController(),
-      rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
-      rememberCoroutineScope()
-    )
-  )
-
-  bottomSheetRouteController.NavigatingModalBottomSheetLayout(
-    sheetContent = { contentNavHostController, sheetContentNavHostController, sheetState ->
-                    composable(BottomSheetParentNavigation.ShowSheet.route()) {
-                      BottomSheetLayout(contentNavHostController, sheetContentNavHostController, sheetState)
-                    }
-                    composable(BottomSheetNavigation.SubPage.route()) {
-                      BottomSheetSubPageLayout(
-                        contentNavHostController, sheetContentNavHostController, sheetState
-                      )
-                    }
-                   },
-    contentRoot = { contentNavHostController, sheetContentNavHostController, sheetState ->
-                   BottomSheetParentLayoutContent(contentNavHostController, sheetContentNavHostController, sheetState)
-                  },
-    content = { contentNavHostController, _, _ ->
-               composable(BottomSheetParentNavigation.SubPage.route()) {
-                 BottomSheetParentSubPageLayout(contentNavHostController)
-               }
-              }
-  )
-}
-
-@Composable
-fun BottomSheetParentLayoutContent(contentNavHostController: NavHostController, sheetNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
-
-  val navigator = ModalBottomSheetNavigator(
-    NavHostRouteController(contentNavHostController),
-    BottomSheetSheetContentRouteController(
-      sheetNavHostController,
-      sheetState,
-      rememberCoroutineScope()
-    ),
-    ::bottomSheetParentNavigationRouteMapper
-  )
-  // Show Content View
-}
-
-@Composable
-fun BottomSheetParentSubPageLayout(navHostController: NavHostController) {
-    val navigator = RouteNavigator(
-        navHostController,
-        ::bottomSheetParentSubPageNavigationRouteMapper
-    )
-  
-  // Show Content Sub View
-}
-
-@Composable
-fun BottomSheetLayout(contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
-    val navigator = ModalBottomSheetNavigator(
-        contentNavHostController,
-        sheetContentNavHostController,
-        sheetState,
-        rememberCoroutineScope(),
-        ::bottomSheetNavigationRouteMapper,
-    )
-  
-  // Show Bottom Sheet Content
-}
-
-@Composable
-fun BottomSheetSubPageLayout(contentNavHostController: NavHostController, sheetContentNavHostController: NavHostController, sheetState: ModalBottomSheetState) {
-    val navigator = ModalBottomSheetNavigator(
-        contentNavHostController,
-        sheetContentNavHostController,
-        sheetState,
-        rememberCoroutineScope(),
-        ::bottomSheetSubPageNavigationRouteMapper
-    )
-  
-  // Show Bottom Sheet Sub Content
-}
-````
+#### BottomSheetNavigator
+In addition to `ComposableNavigator` a `BottomSheetNavigator` can be declared. This navigator hosts a `ModalBottomSheetLayout` that has a NavHost for both its content and sheetContent.
+Instead of `ComposableNavSpec` the `BottomSheetNavigator` maps actions to `BottomSheetComposableNavSpec`.
+The equivalent of `RootNavHostComposableNavigator` is `RootModalBottomSheetNavigator` and of `NavHostComposableNavigator` is `ModalBottomSheetNavigator`.
+In addition the subviews of both content and sheetContent in `RootModalBottomSheetNavigator` can declare a `ComposableNavigator` to only navigate within their own NavHost by using `BottomSheetContentNavHostComposableNavigator` and `BottomSheetSheetContentNavHostComposableNavigator` respectively.
 
+#### Result
+When navigating back in a NavHost the bundle of the NavigationAction will be provided to the parent view. To handle these results, provide a (list of) `NavHostResultHandler` to the view that should receive the result.
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
index 31e05c28c..dc8e578ce 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
@@ -39,21 +39,29 @@ sealed class BottomSheetNavigator<A : NavigationAction<*>>(
     }
 
     final override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+        // Make sure Navigation actions are launched
         SetupNavigationAction()
+        // Actually modify the content
         contentModifier(content)
     }
 
-    abstract val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit
+    protected abstract val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit
 
     @Composable
     protected fun BaseLifecycleViewModel.SetupNavigationAction() {
         val currentAction by actionState.collectAsState()
-        val onDispose: () -> Unit = { actionState.compareAndSet(currentAction, null) }
+        // If there is a current action, render it
         currentAction?.let { action ->
+            // We should only set the actionState back to null when navigation has completed.
+            // Otherwise some logic may break, such as with rememberLauncherForActivityResult.
+            val onDispose: () -> Unit = { actionState.compareAndSet(currentAction, null) }
             when (val spec = navigationMapper(action)) {
-                is BottomSheetRoute -> LaunchedEffect(spec) {
-                    routeController.navigate(spec)
-                    onDispose()
+                is BottomSheetRoute -> {
+                    // Navigate the route controller using a LaunchedEffect to ensure it only fires once.
+                    LaunchedEffect(this, spec) {
+                        routeController.navigate(spec)
+                        onDispose()
+                    }
                 }
                 is BottomSheetLaunchedNavigation -> spec.launchedNavigation.Launch(this, onDispose)
             }
@@ -91,6 +99,7 @@ class RootModalBottomSheetNavigator<A : NavigationAction<*>>(
 
     override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         val contentNavController = rememberNavController()
+        // Update the bottomSheetNavigationState to the current state.
         bottomSheetNavigationState.tryEmit(
             BottomSheetNavigatorState(
                 contentNavController,
@@ -99,11 +108,14 @@ class RootModalBottomSheetNavigator<A : NavigationAction<*>>(
             )
         )
         sheetStateCoroutineScope.tryEmit(rememberCoroutineScope())
+
+        // Show a ModalBottomSheetLayout for the content
         SetupNavigatingModalBottomSheetLayout(
             bottomSheetNavigationState,
             routeController.sheetContentRouteController,
             sheetContentBuilder,
             {
+                // Handle results of the Content Root
                 contentRootResultHandlers.forEach {
                     it.HandleResult(viewModel = this, navHostController = contentNavController)
                 }
@@ -140,8 +152,11 @@ class ModalBottomSheetNavigator<A : NavigationAction<*>>(
 
     override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         sheetStateCoroutineScope.tryEmit(rememberCoroutineScope())
+        // Handle results for both content and sheetContent
         routeController.contentRouteController.AddResultHandlers(viewModel = this, resultHandlers = contentResultHandlers)
         routeController.sheetContentRouteController.sheetContentRouteController.AddResultHandlers(viewModel = this, resultHandlers = sheetContentResultHandlers)
+
+        // Render content
         content()
     }
 }
@@ -158,10 +173,14 @@ private fun SetupNavigatingModalBottomSheetLayout(
     currentBottomSheetNavigationState?.let { navigationState ->
         ModalBottomSheetLayout(
             sheetContent = {
+                // Add a default BackButton behaviour that closes the sheet content
                 if (navigationState.sheetState.isVisible) {
                     HardwareBackButtonNavigation(onBackButtonClickHandler = sheetContentRouteController::close)
                 }
+
+                // Need a small Root Layout to render the NavHost properly
                 Box(Modifier.defaultMinSize(minHeight = 1.dp)) {
+                    // Add NavHost to manage the SheetContent navigation
                     SetupNavHost(
                         bottomSheetNavigatorState = bottomSheetNavigationState,
                         navHostController = { sheetContentNavHostController },
@@ -174,6 +193,7 @@ private fun SetupNavigatingModalBottomSheetLayout(
             },
             sheetState = navigationState.sheetState,
         ) {
+            // Add NavHost to manage the Content navigation
             SetupNavHost(
                 bottomSheetNavigatorState = bottomSheetNavigationState,
                 navHostController = { contentNavHostController },
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
index e224dd173..6f224ad71 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
@@ -264,7 +264,7 @@ sealed class ComposableNavSpec {
         fun Launch(viewModel: BaseLifecycleViewModel, onDispose: () -> Unit) {
             val launcher = createLauncher(viewModel, onDispose)
             // Ensure only launched once
-            DisposableEffect(viewModel) {
+            DisposableEffect(viewModel, this) {
                 launcher.invoke()
                 onDispose {
                     onDispose()
@@ -289,12 +289,17 @@ sealed class ComposableNavSpec {
 
         @Composable
         override fun createLauncher(viewModel: BaseLifecycleViewModel, onDispose: () -> Unit): () -> Unit {
+            // Create a ManagedActivityResultLauncher to hadle the contract.
+            // This launcher needs to remain in the Compose stack since otherwise onResult will not return.
+            // Therefore only call onDispose when onResult is received.
             val launcher = rememberLauncherForActivityResult(activityResultContract) { result ->
                 viewModelClass.safeCast(viewModel)?.let {
                     it.onResult(result)
                     onDispose()
                 }
             }
+
+            // Get the input
             val input = getInput()
             return {
                 input?.let {
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
index 6f6776607..fb6ca09d8 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
@@ -31,7 +31,7 @@ sealed class ComposableNavigator<A : NavigationAction<*>>(
     /**
      * [RouteController] managing the [Route] navigation
      */
-    abstract val routeController: RouteController
+    abstract val routeController: RouteController?
 
     private val actionState = MutableStateFlow<A?>(null)
 
@@ -40,7 +40,9 @@ sealed class ComposableNavigator<A : NavigationAction<*>>(
     }
 
     final override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+        // Make sure Navigation actions are launched
         SetupNavigationAction()
+        // Actually modify the content
         contentModifier(content)
     }
 
@@ -49,12 +51,18 @@ sealed class ComposableNavigator<A : NavigationAction<*>>(
     @Composable
     protected fun BaseLifecycleViewModel.SetupNavigationAction() {
         val currentAction by actionState.collectAsState()
-        val onDispose: () -> Unit = { actionState.compareAndSet(currentAction, null) }
+        // If there is a current action, render it
         currentAction?.let { action ->
+            // We should only set the actionState back to null when navigation has completed.
+            // Otherwise some logic may break, such as with rememberLauncherForActivityResult.
+            val onDispose: () -> Unit = { actionState.compareAndSet(currentAction, null) }
             when (val spec = navigationMapper(action)) {
-                is Route -> LaunchedEffect(spec) {
-                    routeController.navigate(spec)
-                    onDispose()
+                is Route -> {
+                    // Navigate the route controller using a LaunchedEffect to ensure it only fires once.
+                    LaunchedEffect(this, spec) {
+                        routeController?.navigate(spec)
+                        onDispose()
+                    }
                 }
                 is ComposableNavSpec.LaunchedNavigation -> spec.Launch(this, onDispose)
             }
@@ -81,13 +89,19 @@ class RootNavHostComposableNavigator<A : NavigationAction<*>>(
 
     override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         val navController = rememberNavController()
+        // Update the NavHostController to the current state
         navHostController.tryEmit(navController)
+
+        // Show a NavHost displaying the content
         SetupNavHost(
             navHostController = navHostController,
             rootView = {
+                // Handle results of the Root View
                 rootResultHandlers.forEach { resultHandler ->
                     resultHandler.HandleResult(viewModel = this, navHostController = navController)
                 }
+
+                // Render original content
                 content()
             },
             builder = contentBuilder
@@ -108,6 +122,7 @@ sealed class ProvidingNavHostComposableNavigator<A : NavigationAction<*>, Provid
 ) : ComposableNavigator<A>(navigationMapper) {
 
     override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
+        // Add Result Handlers
         routeController.AddResultHandlers(viewModel = this, resultHandlers = resultHandlers)
         content()
     }
@@ -119,7 +134,7 @@ sealed class ProvidingNavHostComposableNavigator<A : NavigationAction<*>, Provid
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
  * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
  */
-class NavHostComposableNavigator<A : NavigationAction<*>> (
+class NavHostComposableNavigator<A : NavigationAction<*>>(
     navHostController: StateFlow<NavHostController?>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     parentRouteController: RouteController? = null,
@@ -136,7 +151,7 @@ class NavHostComposableNavigator<A : NavigationAction<*>> (
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
  * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
  */
-class BottomSheetContentNavHostComposableNavigator<A : NavigationAction<*>> (
+class BottomSheetContentNavHostComposableNavigator<A : NavigationAction<*>>(
     bottomSheetNavigator: StateFlow<BottomSheetNavigatorState?>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     parentRouteController: RouteController? = null,
@@ -153,7 +168,7 @@ class BottomSheetContentNavHostComposableNavigator<A : NavigationAction<*>> (
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
  * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
  */
-class BottomSheetSheetContentNavHostComposableNavigator<A : NavigationAction<*>> (
+class BottomSheetSheetContentNavHostComposableNavigator<A : NavigationAction<*>>(
     bottomSheetNavigator: StateFlow<BottomSheetNavigatorState?>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     navigationMapper: @Composable (A) -> ComposableNavSpec
@@ -164,7 +179,19 @@ class BottomSheetSheetContentNavHostComposableNavigator<A : NavigationAction<*>>
 
     override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         coroutineScopeState.tryEmit(rememberCoroutineScope())
+        // Add Result Handlers for SheetContent
         routeController.sheetContentRouteController.AddResultHandlers(viewModel = this, resultHandlers = resultHandlers)
         content()
     }
 }
+
+/**
+ * A [ComposableNavigator] that only supports [ComposableNavSpec.LaunchedNavigation] navigation.
+ * @param navigationMapper Maps [A] to a [ComposableNavSpec.LaunchedNavigation] to be navigated to.
+ */
+class LaunchedComposableNavigator<A : NavigationAction<*>>(
+    navigationMapper: @Composable (A) -> ComposableNavSpec.LaunchedNavigation
+) : ComposableNavigator<A>(navigationMapper) {
+    override val routeController: RouteController? = null
+    override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content -> content() }
+}
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
index c9f985f70..7ed6977af 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
@@ -289,7 +289,8 @@ val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> A
  */
 val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> Action.popTo
     get() = Route.PopTo(
-        this
+        this,
+        bundle?.let { Route.Result.Data(it) } ?: Route.Result.Empty
     )
 
 /**
@@ -307,3 +308,11 @@ val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> A
     get() = Route.Replace(
         this
     )
+
+/**
+ * Creates a [Route.Back] from [Action]
+ */
+val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> Action.back
+    get() = Route.Back(
+        bundle?.let { Route.Result.Data(it) } ?: Route.Result.Empty
+    )
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
index 5b131bb9f..7465d0774 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
@@ -176,6 +176,8 @@ class BottomSheetSheetContentRouteController(
                 }
             }
         }
+
+        // We should call our own back/close mechanisms since the ROOT_VIEW needs to be retained.
         when (newRoute) {
             is Route.Close -> close()
             is Route.Back -> back(newRoute.result)
@@ -187,6 +189,8 @@ class BottomSheetSheetContentRouteController(
     override fun back(result: Route.Result): Boolean {
         val navHostController = bottomSheetNavigatorState.value?.sheetContentNavHostController
         val rootRoute = NavDestination.createRoute(ROOT_VIEW).hashCode()
+        // If navigating back to anything but the ROOT_VIEW, just go back
+        // Otherwise, close the BottomSheet
         return if (navHostController != null && navHostController.backQueue.isNotEmpty() && navHostController.previousBackStackEntry?.destination?.id != rootRoute) {
             navHostController.previousBackStackEntry?.setResult(result)
             navHostController.popBackStack()
@@ -198,6 +202,7 @@ class BottomSheetSheetContentRouteController(
 
     override fun close() {
         bottomSheetNavigatorState.value?.let { (_, sheetContentNavHostController, sheetState) ->
+            // Make sure we're back at the ROOT_VIEW before hiding the sheet
             sheetContentNavHostController.popBackStack(ROOT_VIEW, false)
             coroutineScope.value?.launch {
                 sheetState.hide()
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
index 4b82bc022..fdb05af4a 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
@@ -60,9 +60,11 @@ fun <R> NavHostController.HandleResult(
 
 @Composable
 internal fun NavHostController.HandleResult(retain: Boolean = false, onResult: Bundle.() -> Unit) {
+    // Check if we have a result in the current BackStack.
     val result = currentBackStackEntry?.savedStateHandle?.getStateFlow<Bundle?>(Route.Result.KEY, null)?.collectAsState()
     result?.value?.let {
         onResult(it)
+        // If retain is set we keep the result, otherwise clean up.
         if (!retain) {
             currentBackStackEntry?.savedStateHandle?.remove<Bundle>(Route.Result.KEY)
         }
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
index 18bcd6fde..6a34866d9 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
@@ -29,7 +29,7 @@ import kotlin.reflect.KClass
 import kotlin.reflect.safeCast
 
 /**
- * A Handler that will allow a [NavHostController] to handle Result of a given type [R] to be received by a given [ViewModel]
+ * A Handler that will allow a [NavHostController] to handle [Route.Result] of a given type [R] to be received by a given [ViewModel]
  */
 sealed class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, R> {
     abstract val viewModelClass: KClass<ViewModel>
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
index c9e3187f2..b69797c79 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
@@ -26,16 +26,15 @@ import androidx.compose.runtime.CompositionLocal
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.staticCompositionLocalOf
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 
 /** A [CompositionLocal] containing the current activity. */
 val LocalAppCompatActivity = staticCompositionLocalOf<AppCompatActivity?> { null }
 
 /**
- * An implementation of [KalugaViewModelActivity] which provides a [CompositionLocal] containing
- * the current activity.
+ * An implementation of [AppCompatActivity] which creates a [VM] and renders it using [ViewModelComposable].
+ * Also provides a reference to this [AppCompatActivity] using [LocalAppCompatActivity].
  */
-abstract class KalugaViewModelComposeActivity<VM : BaseLifecycleViewModel> : KalugaViewModelActivity<VM>() {
+abstract class KalugaViewModelComposeActivity<VM : BaseLifecycleViewModel> : AppCompatActivity() {
 
     @SuppressLint("MissingSuperCall") // Lint bug
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -45,11 +44,32 @@ abstract class KalugaViewModelComposeActivity<VM : BaseLifecycleViewModel> : Kal
             CompositionLocalProvider(
                 LocalAppCompatActivity provides this
             ) {
-                Layout(viewModel)
+                RootView {
+                    ViewModelComposable(viewModel = createViewModel()) {
+                        Layout()
+                    }
+                }
             }
         }
     }
 
+    /**
+     * Wrapper view to contain the ViewModel.
+     */
     @Composable
-    protected abstract fun Layout(viewModel: VM)
+    protected open fun RootView(content: @Composable () -> Unit) {
+        content()
+    }
+
+    /**
+     * Creates the [VM]. Vms should be stores so they can be retained, e.g using [androidx.lifecycle.viewmodel.compose.viewModel]
+     */
+    @Composable
+    protected abstract fun createViewModel(): VM
+
+    /**
+     * Creates the layout associated with a [VM]
+     */
+    @Composable
+    protected abstract fun VM.Layout()
 }
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index 1f328e64b..3b2d84f20 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -27,8 +27,9 @@ import kotlin.reflect.full.memberProperties
 import kotlin.reflect.full.starProjectedType
 
 /**
- * Composable which manages [viewModel] lifecycle and optionally adds it to local [ViewModelStore].
- * @param viewModel view model to manage
+ * Composable which manages [viewModel] lifecycle and binds to all its publically exposed [LifecycleSubscribable].
+ * This automatically modifies the content using [ComposableLifecycleSubscribable.modifier].
+ * @param viewModel [BaseLifecycleViewModel] to manage
  * @param content content based on [viewModel]
  */
 @Composable
@@ -41,10 +42,17 @@ fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
     }
 }
 
+/**
+ * Composable which manages [viewModel] lifecycle and binds to all its [LifecycleSubscribable] using [fragmentManager].
+ * This automatically modifies the content using [ComposableLifecycleSubscribable.modifier].
+ * @param viewModel [BaseLifecycleViewModel] to manage
+ * @param fragmentManager The [FragmentManager] to bind to all [LifecycleSubscribable] publically exposed by the [viewModel].
+ * @param content content based on [viewModel]
+ */
 @Composable
 fun <ViewModel : BaseLifecycleViewModel> FragmentViewModelComposable(
-    fragmentManager: FragmentManager,
     viewModel: ViewModel,
+    fragmentManager: FragmentManager,
     content: @Composable (ViewModel.() -> Unit)? = null
 ) = ViewModelComposable(LocalContext.current.activity, fragmentManager, viewModel, content)
 
@@ -55,17 +63,24 @@ private fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
     viewModel: ViewModel,
     content: @Composable (ViewModel.() -> Unit)? = null
 ) {
+    // Link the ViewModel to existing LifecycleSubsctibable
     viewModel.linkLifecycle(activity, fragmentManager)
+
+    // Get a List of all ComposableLifecycleSubscribable of the viewModel.
+    // Since these are static properties, a remember can be used.
     val composeLifecycleSubscribables = remember(viewModel) {
         viewModel.ComposableLifecycleSubscribable
     }
+    // If no ComposableLifecycleSubscribable available, just show content
     if (composeLifecycleSubscribables.isEmpty()) {
         content?.invoke(viewModel)
     } else {
+        // Otherwise, modify the content using the modifier of all ComposableLifecycleSubscribable
+        // Reduce right so the first ComposableLifecycleSubscribable acts as the first modifier (since we're wrapping)
         val modifier = composeLifecycleSubscribables.reduceRight { new, acc ->
             object : ComposableLifecycleSubscribable {
-                override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = { content ->
-                    new.modifier(this) { acc.modifier(this, content) }
+                override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = { modifiedContent ->
+                    new.modifier(this) { acc.modifier(this, modifiedContent) }
                 }
             }
         }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt
index 4f8b2cc52..ae73898ec 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/NavigationMappers.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.example.architecture.compose
 
 import com.splendo.kaluga.architecture.compose.navigation.BottomSheetRoute
 import com.splendo.kaluga.architecture.compose.navigation.Route
+import com.splendo.kaluga.architecture.compose.navigation.back
 import com.splendo.kaluga.architecture.compose.navigation.bottomSheetContent
 import com.splendo.kaluga.architecture.compose.navigation.bottomSheetSheetContent
 import com.splendo.kaluga.architecture.compose.navigation.next
@@ -38,8 +39,8 @@ internal fun architectureNavigationRouteMapper(action: ArchitectureNavigationAct
 /** Maps a navigation action to a route string. */
 internal fun architectureDetailsNavigationRouteMapper(action: ArchitectureDetailsNavigationAction<*>): Route {
     return when (action) {
-        is ArchitectureDetailsNavigationAction.FinishWithDetails -> Route.Back(Route.Result.Data(action.bundle!!))
-        is ArchitectureDetailsNavigationAction.Close -> Route.Back
+        is ArchitectureDetailsNavigationAction.FinishWithDetails -> action.back
+        is ArchitectureDetailsNavigationAction.Close -> action.back
     }
 }
 

From 01b8b3d3c969f083870f60097cc36b064c09cc73 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 25 Nov 2022 10:01:04 +0100
Subject: [PATCH 043/227] Tracking example changes on iOS

---
 example/ios/Demo.xcodeproj/project.pbxproj    |   4 +-
 .../Demo/Alerts/AlertsViewController.swift    |  31 +-
 .../ArchitectureDetailsViewController.swift   |  15 +-
 .../ArchitectureInputViewController.swift     |  35 +--
 .../ios/Demo/Base.lproj/Localizable.strings   |   1 +
 example/ios/Demo/Base.lproj/Main.storyboard   | 289 +++++++-----------
 .../DateTimePickerViewController.swift        |  17 +-
 .../FeaturesListViewController.swift          |  33 +-
 .../KeyboardManagerViewController.swift       |  16 +-
 .../LoadingViewController.swift               |  16 +-
 .../Demo/System/SystemViewController.swift    |  18 +-
 .../shared/viewmodel/alert/AlertViewModel.kt  |   6 +-
 .../ArchitectureDetailsNavigator.kt           |  33 ++
 .../architecture/ArchitectureNavigator.kt     |  33 ++
 .../architecture/BottomSheetNavigator.kt      |  33 ++
 .../BottomSheetSubPageNavigator.kt            |  33 ++
 16 files changed, 332 insertions(+), 281 deletions(-)
 create mode 100644 example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsNavigator.kt
 create mode 100644 example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureNavigator.kt
 create mode 100644 example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetNavigator.kt
 create mode 100644 example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetSubPageNavigator.kt

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 3a1573fc1..0fa9bd9d5 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -675,7 +675,7 @@
 					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = Demo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -807,7 +807,7 @@
 					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = Demo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/example/ios/Demo/Alerts/AlertsViewController.swift b/example/ios/Demo/Alerts/AlertsViewController.swift
index 96e81b313..11c301548 100644
--- a/example/ios/Demo/Alerts/AlertsViewController.swift
+++ b/example/ios/Demo/Alerts/AlertsViewController.swift
@@ -19,7 +19,21 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 import UIKit
 import KalugaExampleShared
 
-class AlertsViewController: UITableViewController {
+class AlertsViewController: UIViewController {
+
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "AlertsViewController"
+    }
+
+    static func instantiate() -> AlertsViewController {
+        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! AlertsViewController
+    }
+
+    @IBOutlet var showAlertButton: UIButton!
+    @IBOutlet var showAndDismissButton: UIButton!
+    @IBOutlet var showAlertWithInputButton: UIButton!
+    @IBOutlet var showAlertWithListButton: UIButton!
 
     private lazy var viewModel = AlertViewModel(builder: AlertPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
@@ -32,16 +46,9 @@ class AlertsViewController: UITableViewController {
         super.viewDidLoad()
 
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        tableView.deselectRow(at: indexPath, animated: true)
-        switch indexPath.row {
-        case 0: viewModel.showAlert()
-        case 1: viewModel.showAndDismissAfter(timeSecs: 3)
-        case 2: viewModel.showAlertWithList()
-        case 3: viewModel.showAlertWithInput()
-        default: ()
-        }
+        ButtonStyleKt.bindButton(showAlertButton, button: viewModel.showAlertButton)
+        ButtonStyleKt.bindButton(showAndDismissButton, button: viewModel.showAndDismissAfter3SecondsButton)
+        ButtonStyleKt.bindButton(showAlertWithInputButton, button: viewModel.showAlertWithInputButton)
+        ButtonStyleKt.bindButton(showAlertWithListButton, button: viewModel.showAlertWithListButton)
     }
 }
diff --git a/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift b/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
index cc6b9fcfc..49382fa68 100644
--- a/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
@@ -30,10 +30,12 @@ class ArchitectureDetailsViewController: UIViewController {
         if #available(iOS 13.0, *) {
             vc.isModalInPresentation = true
         }
-        let navigator = ViewControllerNavigator<CloseDetailsNavigation>(parentVC: vc) { action in
+        let navigator = ArchitectureDetailsNavigatorKt.ArchitectureDetailsViewControllerNavigator(parent: vc) { details in
             NavigationSpec.Dismiss(toDismiss: { $0 }, animated: true) {
-                onDismiss(action.value!)
+                onDismiss(details)
             }
+        } onClose: {
+            NavigationSpec.Dismiss(toDismiss: { $0 }, animated: true)
         }
         vc.viewModel = ArchitectureDetailsViewModel(initialDetail: inputDetails, navigator: navigator)
         return vc
@@ -69,14 +71,9 @@ class ArchitectureDetailsViewController: UIViewController {
                 }
             ]
         }
-    }
-
-    @objc @IBAction func onInversePressed(sender: Any?) {
-        viewModel.onInversePressed()
-    }
 
-    @objc @IBAction func onCloseButtonPressed(sender: Any?) {
-        viewModel.onClosePressed()
+        ButtonStyleKt.bindButton(inverseButton, button: viewModel.inverseButton)
+        ButtonStyleKt.bindButton(closeButton, button: viewModel.finishButton)
     }
     
 }
diff --git a/example/ios/Demo/Architecture/ArchitectureInputViewController.swift b/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
index 9317cd640..3df2de0dc 100644
--- a/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
@@ -18,7 +18,7 @@
 import UIKit
 import KalugaExampleShared
 
-class ArchitectureInputViewController: UIViewController  {
+class ArchitectureViewController: UIViewController  {
     
     @IBOutlet weak var nameLabel: UILabel!
     @IBOutlet weak var nameInput: UITextField!
@@ -30,14 +30,18 @@ class ArchitectureInputViewController: UIViewController  {
     
     @IBOutlet weak var detailsButton: UIButton!
 
-    lazy var navigator: ViewControllerNavigator<InputNavigation> = ViewControllerNavigator(parentVC: self) { action in
-        NavigationSpec.Present(animated: true, presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue), transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)) {
-            ArchitectureDetailsViewController.create(inputDetails: action.value!) { [weak self] inputDetails in
-                self?.onDetailsDismissed(inputDetails: inputDetails)
+    lazy var navigator = ArchitectureNavigatorKt.ArchitectureViewControllerNavigator(
+        parent: self,
+        onDetails: { inputDetails in
+            NavigationSpec.Present(animated: true, presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue), transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)) {
+                ArchitectureDetailsViewController.create(inputDetails: inputDetails) { [weak self] resultDetails in
+                    self?.onDetailsDismissed(inputDetails: resultDetails)
+                }
             }
-        }
-    }
-    lazy var viewModel = ArchitectureInputViewModel(navigator: navigator)
+        },
+        onBottomSheet: { fatalError("ToDo") }
+    )
+    lazy var viewModel = ArchitectureViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -54,18 +58,12 @@ class ArchitectureInputViewController: UIViewController  {
             }
 
             return [
-                viewModel.nameHeader.observeInitialized { header in
-                    self?.nameLabel.text = header as String?
-                },
                 viewModel.nameInput.observeInitialized { name in
                     self?.nameInput.text = name as String?
                 },
                 viewModel.isNameValid.observe { isValid in
                     self?.nameError.isHidden = isValid?.boolValue ?? false
                 },
-                viewModel.numberHeader.observeInitialized { header in
-                    self?.numberLabel.text = header as String?
-                },
                 viewModel.numberInput.observeInitialized { number in
                     self?.numberInput.text = number as String?
                 },
@@ -74,10 +72,9 @@ class ArchitectureInputViewController: UIViewController  {
                 }
             ]
         }
-    }
-
-    @objc @IBAction func onShowDetailsPressed(sender: Any?) {
-        viewModel.onShowDetailsPressed()
+        nameLabel.text = viewModel.namePlaceholder
+        numberLabel.text = viewModel.numberPlaceholder
+        ButtonStyleKt.bindButton(detailsButton, button: viewModel.showDetailsButton)
     }
 
     private func onDetailsDismissed(inputDetails: InputDetails) {
@@ -87,7 +84,7 @@ class ArchitectureInputViewController: UIViewController  {
 
 }
 
-extension ArchitectureInputViewController : UITextFieldDelegate {
+extension ArchitectureViewController : UITextFieldDelegate {
 
     func textFieldDidEndEditing(_ textField: UITextField) {
         postInput(text: textField.text ?? "", fromTextField: textField)
diff --git a/example/ios/Demo/Base.lproj/Localizable.strings b/example/ios/Demo/Base.lproj/Localizable.strings
index 120761c50..1fda4e7ee 100644
--- a/example/ios/Demo/Base.lproj/Localizable.strings
+++ b/example/ios/Demo/Base.lproj/Localizable.strings
@@ -18,6 +18,7 @@
 "show_alert" = "Show Alert";
 "dismissible_alert" = "Dismissible Alert";
 "alert_list" = "Show Alert List";
+"alert_input" = "Show Alert with input";
 "show_loading_indicator_system" = "Show Loading Indicator (System)";
 "show_loading_indicator_custom" = "Show Loading Indicator (Custom)";
 
diff --git a/example/ios/Demo/Base.lproj/Main.storyboard b/example/ios/Demo/Base.lproj/Main.storyboard
index c07aeb629..9e5381194 100644
--- a/example/ios/Demo/Base.lproj/Main.storyboard
+++ b/example/ios/Demo/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="czt-vE-Q3c">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="czt-vE-Q3c">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -11,10 +11,10 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Architecture Input View Controller-->
+        <!--Architecture View Controller-->
         <scene sceneID="YDA-Hr-mSj">
             <objects>
-                <viewController id="irm-WF-A13" customClass="ArchitectureInputViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="irm-WF-A13" customClass="ArchitectureViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="py6-Ar-fCs">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -45,9 +45,6 @@
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oa5-69-XBu">
                                         <rect key="frame" x="0.0" y="0.0" width="374" height="30"/>
                                         <state key="normal" title="Show Details"/>
-                                        <connections>
-                                            <action selector="onShowDetailsPressedWithSender:" destination="irm-WF-A13" eventType="touchUpInside" id="5kX-rr-EdX"/>
-                                        </connections>
                                     </button>
                                 </subviews>
                             </stackView>
@@ -132,42 +129,34 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yci-wv-53q">
-                                <rect key="frame" x="20" y="149" width="374" height="30"/>
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Yci-wv-53q">
+                                <rect key="frame" x="20" y="149" width="374" height="70"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="h7K-k3-Lq1">
                                         <rect key="frame" x="0.0" y="0.0" width="374" height="30"/>
                                         <state key="normal" title="Inverse Input"/>
-                                        <connections>
-                                            <action selector="onInversePressedWithSender:" destination="IaZ-HT-93C" eventType="touchUpInside" id="KpB-n8-blm"/>
-                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ueh-wW-yRS">
+                                        <rect key="frame" x="0.0" y="40" width="374" height="30"/>
+                                        <state key="normal" title="Finish"/>
                                     </button>
                                 </subviews>
                             </stackView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tTy-iI-GY4">
-                                <rect key="frame" x="380" y="58" width="24" height="24"/>
-                                <state key="normal" image="close_icon"/>
-                                <connections>
-                                    <action selector="onCloseButtonPressedWithSender:" destination="IaZ-HT-93C" eventType="touchUpInside" id="Ob6-7f-nJz"/>
-                                </connections>
-                            </button>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="FAp-h6-6JX"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="Yci-wv-53q" firstAttribute="top" secondItem="P3V-58-1Kg" secondAttribute="bottom" constant="20" id="4Wj-XK-4lK"/>
                             <constraint firstItem="Yci-wv-53q" firstAttribute="leading" secondItem="PHY-me-ogV" secondAttribute="leading" constant="20" id="Hhy-2f-bEP"/>
-                            <constraint firstItem="tTy-iI-GY4" firstAttribute="top" secondItem="FAp-h6-6JX" secondAttribute="top" constant="10" id="Nma-cc-mmy"/>
                             <constraint firstItem="Jo1-3B-4UO" firstAttribute="top" secondItem="FAp-h6-6JX" secondAttribute="top" constant="20" id="h5e-Z5-ZJG"/>
                             <constraint firstItem="FAp-h6-6JX" firstAttribute="trailing" secondItem="Yci-wv-53q" secondAttribute="trailing" constant="20" id="j8D-he-zWs"/>
                             <constraint firstItem="P3V-58-1Kg" firstAttribute="top" secondItem="Jo1-3B-4UO" secondAttribute="bottom" constant="20" id="lVw-ru-QeN"/>
                             <constraint firstItem="P3V-58-1Kg" firstAttribute="leading" secondItem="FAp-h6-6JX" secondAttribute="leading" constant="20" id="swA-AQ-pJ8"/>
                             <constraint firstItem="Jo1-3B-4UO" firstAttribute="leading" secondItem="FAp-h6-6JX" secondAttribute="leading" constant="20" id="w4u-u2-Opd"/>
-                            <constraint firstItem="FAp-h6-6JX" firstAttribute="trailing" secondItem="tTy-iI-GY4" secondAttribute="trailing" constant="10" id="xjF-rW-0zn"/>
                         </constraints>
                     </view>
                     <connections>
-                        <outlet property="closeButton" destination="tTy-iI-GY4" id="7MU-H7-1jg"/>
+                        <outlet property="closeButton" destination="Ueh-wW-yRS" id="PIF-m9-rhs"/>
                         <outlet property="inverseButton" destination="h7K-k3-Lq1" id="9a1-fJ-EB2"/>
                         <outlet property="nameLabel" destination="Jo1-3B-4UO" id="DU2-Ya-sSS"/>
                         <outlet property="numberLabel" destination="P3V-58-1Kg" id="Fjz-is-4CD"/>
@@ -317,8 +306,6 @@
                     <navigationItem key="navigationItem" id="q2T-p0-bqB"/>
                     <connections>
                         <outlet property="view" destination="KZQ-Mr-INa" id="yKY-xs-5Bk"/>
-                        <segue destination="itP-bh-ePK" kind="show" identifier="showHUD" id="R5i-w6-hej"/>
-                        <segue destination="jUB-i9-u9F" kind="show" identifier="showAlerts" id="2vi-ed-ywq"/>
                         <segue destination="irm-WF-A13" kind="show" identifier="showArchitecture" id="IOQ-4E-QhL"/>
                         <segue destination="BYZ-38-t0r" kind="show" identifier="showLocation" id="25d-lm-Tpv"/>
                         <segue destination="Hbw-co-mWZ" kind="show" identifier="showPermissions" id="gxu-od-TLe"/>
@@ -329,12 +316,70 @@
                         <segue destination="SGP-dn-hxw" kind="show" identifier="showBluetooth" id="Z5V-Lj-mdM"/>
                         <segue destination="2CB-DJ-Qmw" kind="show" identifier="showBeacons" id="jYU-Fd-PgO"/>
                         <segue destination="Tyz-Gd-0uw" kind="show" identifier="showResources" id="R7Z-R6-fGx"/>
+                        <segue destination="Bdl-Gs-l66" kind="show" identifier="showHUD" id="Cfy-9E-GEn"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="L6W-Hz-iOT" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="1717" y="329"/>
         </scene>
+        <!--Alerts View Controller-->
+        <scene sceneID="jM1-Hq-mZj">
+            <objects>
+                <viewController storyboardIdentifier="AlertsViewController" id="glu-AJ-X8B" customClass="AlertsViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="ktG-9N-tXm">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ofd-Ey-gUI">
+                                <rect key="frame" x="10" y="58" width="394" height="35"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hza-lz-LVr">
+                                <rect key="frame" x="10" y="103" width="394" height="35"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aQC-6a-AUR">
+                                <rect key="frame" x="10" y="148" width="394" height="35"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Mi-5W-uJp">
+                                <rect key="frame" x="10" y="193" width="394" height="35"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="tbU-9u-dgY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="ofd-Ey-gUI" firstAttribute="leading" secondItem="tbU-9u-dgY" secondAttribute="leading" constant="10" id="8Hh-hV-R77"/>
+                            <constraint firstItem="ofd-Ey-gUI" firstAttribute="top" secondItem="tbU-9u-dgY" secondAttribute="top" constant="10" id="B4G-bJ-qRN"/>
+                            <constraint firstItem="tbU-9u-dgY" firstAttribute="trailing" secondItem="aQC-6a-AUR" secondAttribute="trailing" constant="10" id="FYG-xF-aBv"/>
+                            <constraint firstItem="aQC-6a-AUR" firstAttribute="top" secondItem="Hza-lz-LVr" secondAttribute="bottom" constant="10" id="Hfy-4n-aFi"/>
+                            <constraint firstItem="tbU-9u-dgY" firstAttribute="trailing" secondItem="ofd-Ey-gUI" secondAttribute="trailing" constant="10" id="Ia3-fw-WQd"/>
+                            <constraint firstItem="tbU-9u-dgY" firstAttribute="trailing" secondItem="2Mi-5W-uJp" secondAttribute="trailing" constant="10" id="QgT-hn-9My"/>
+                            <constraint firstItem="tbU-9u-dgY" firstAttribute="trailing" secondItem="Hza-lz-LVr" secondAttribute="trailing" constant="10" id="Xso-64-p7l"/>
+                            <constraint firstItem="2Mi-5W-uJp" firstAttribute="top" secondItem="aQC-6a-AUR" secondAttribute="bottom" constant="10" id="fK6-Lh-GPM"/>
+                            <constraint firstItem="Hza-lz-LVr" firstAttribute="leading" secondItem="tbU-9u-dgY" secondAttribute="leading" constant="10" id="fZQ-oI-Qmc"/>
+                            <constraint firstItem="Hza-lz-LVr" firstAttribute="top" secondItem="ofd-Ey-gUI" secondAttribute="bottom" constant="10" id="nsK-kQ-Kvt"/>
+                            <constraint firstItem="2Mi-5W-uJp" firstAttribute="leading" secondItem="tbU-9u-dgY" secondAttribute="leading" constant="10" id="p8X-d6-yUr"/>
+                            <constraint firstItem="aQC-6a-AUR" firstAttribute="leading" secondItem="tbU-9u-dgY" secondAttribute="leading" constant="10" id="qhi-KV-Of8"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="showAlertButton" destination="ofd-Ey-gUI" id="NBV-bR-bQs"/>
+                        <outlet property="showAlertWithInputButton" destination="aQC-6a-AUR" id="Hhj-IM-5sr"/>
+                        <outlet property="showAlertWithListButton" destination="2Mi-5W-uJp" id="RfK-FE-1z5"/>
+                        <outlet property="showAndDismissButton" destination="Hza-lz-LVr" id="WfB-qn-4mw"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="IhH-mW-4kH" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2613" y="329"/>
+        </scene>
         <!--Bluetooth View Controller-->
         <scene sceneID="YuN-Fr-cmH">
             <objects>
@@ -803,16 +848,10 @@
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kY6-Kz-VM4">
                                         <rect key="frame" x="0.0" y="0.0" width="197" height="30"/>
                                         <state key="normal" title="Show Keyboard"/>
-                                        <connections>
-                                            <action selector="showButtonPressed" destination="7Rf-m0-GFx" eventType="touchUpInside" id="pKw-9x-kxU"/>
-                                        </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LHk-eR-LxZ">
                                         <rect key="frame" x="197" y="0.0" width="197" height="30"/>
                                         <state key="normal" title="Hide Keyboard"/>
-                                        <connections>
-                                            <action selector="hideButtonPressed" destination="7Rf-m0-GFx" eventType="touchUpInside" id="8qL-Di-xGc"/>
-                                        </connections>
                                     </button>
                                 </subviews>
                             </stackView>
@@ -831,6 +870,8 @@
                     <navigationItem key="navigationItem" id="3vu-M7-Qu6"/>
                     <connections>
                         <outlet property="editField" destination="KiQ-CF-pig" id="t55-zo-eh8"/>
+                        <outlet property="hideButton" destination="LHk-eR-LxZ" id="t5z-YS-YAA"/>
+                        <outlet property="showButton" destination="kY6-Kz-VM4" id="NhF-Vm-7FE"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4mF-Fn-ESe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -918,156 +959,44 @@
             <point key="canvasLocation" x="713" y="-749"/>
         </scene>
         <!--Loading View Controller-->
-        <scene sceneID="vaO-15-Tqm">
-            <objects>
-                <tableViewController id="itP-bh-ePK" customClass="LoadingViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="EuU-N3-PUa">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <sections>
-                            <tableViewSection id="W1h-wG-Nuf">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="S13-rV-ghL" style="IBUITableViewCellStyleDefault" id="Qu4-gg-O0s">
-                                        <rect key="frame" x="0.0" y="50" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Qu4-gg-O0s" id="UZM-pj-sFi">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Loading Indicator with System style" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="S13-rV-ghL">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="e31-TG-wrI" style="IBUITableViewCellStyleDefault" id="BqC-fY-hox">
-                                        <rect key="frame" x="0.0" y="93.5" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="BqC-fY-hox" id="Gsq-hn-e0Y">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Loading Indicator with Custom style" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="e31-TG-wrI">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="itP-bh-ePK" id="zhT-5T-8wj"/>
-                            <outlet property="delegate" destination="itP-bh-ePK" id="a0l-MT-IeJ"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="85A-T5-LLl"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="3c6-iN-jO2" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2649" y="-374"/>
-        </scene>
-        <!--Alerts Table View Controller-->
-        <scene sceneID="3hP-eu-S2i">
+        <scene sceneID="kYO-hI-MfB">
             <objects>
-                <tableViewController id="jUB-i9-u9F" userLabel="Alerts Table View Controller" customClass="AlertsViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Uge-kX-PIL">
+                <viewController id="Bdl-Gs-l66" customClass="LoadingViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="b9N-r2-D7a">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lsK-x5-RrK">
+                                <rect key="frame" x="10" y="58" width="394" height="35"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WRm-Bs-dlq">
+                                <rect key="frame" x="10" y="103" width="394" height="35"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="FKf-h7-3wX"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <sections>
-                            <tableViewSection id="Y72-DQ-hcU">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="3My-t9-uzW" style="IBUITableViewCellStyleDefault" id="4Bx-bp-v5a">
-                                        <rect key="frame" x="0.0" y="50" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4Bx-bp-v5a" id="2hB-54-3WQ">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Alert" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3My-t9-uzW">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="Mxj-wh-MJV" style="IBUITableViewCellStyleDefault" id="l1P-Xn-VLw">
-                                        <rect key="frame" x="0.0" y="93.5" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="l1P-Xn-VLw" id="XKI-8Y-HI7">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Dismissible Alert" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Mxj-wh-MJV">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="iW9-HH-Oc0" style="IBUITableViewCellStyleDefault" id="lMI-O8-dAX">
-                                        <rect key="frame" x="0.0" y="137" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lMI-O8-dAX" id="jWN-Fu-MOI">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Action Sheet" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="iW9-HH-Oc0">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="BJ7-BZ-r5z" style="IBUITableViewCellStyleDefault" id="uqQ-kk-sFM">
-                                        <rect key="frame" x="0.0" y="180.5" width="414" height="43.5"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="uqQ-kk-sFM" id="spw-IS-5wm">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show Alert with input" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="BJ7-BZ-r5z">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="jUB-i9-u9F" id="STI-kf-YSP"/>
-                            <outlet property="delegate" destination="jUB-i9-u9F" id="GWD-7e-fKW"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="IKk-fx-Nxk"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="ftd-tZ-HFo" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+                        <constraints>
+                            <constraint firstItem="lsK-x5-RrK" firstAttribute="top" secondItem="FKf-h7-3wX" secondAttribute="top" constant="10" id="13l-pA-8Wh"/>
+                            <constraint firstItem="lsK-x5-RrK" firstAttribute="leading" secondItem="FKf-h7-3wX" secondAttribute="leading" constant="10" id="5pl-Of-UlI"/>
+                            <constraint firstItem="FKf-h7-3wX" firstAttribute="trailing" secondItem="lsK-x5-RrK" secondAttribute="trailing" constant="10" id="Abh-hQ-U3O"/>
+                            <constraint firstItem="FKf-h7-3wX" firstAttribute="trailing" secondItem="WRm-Bs-dlq" secondAttribute="trailing" constant="10" id="WdS-kd-Oin"/>
+                            <constraint firstItem="WRm-Bs-dlq" firstAttribute="leading" secondItem="FKf-h7-3wX" secondAttribute="leading" constant="10" id="cRa-a8-hUc"/>
+                            <constraint firstItem="WRm-Bs-dlq" firstAttribute="top" secondItem="lsK-x5-RrK" secondAttribute="bottom" constant="10" id="kjy-rL-4kU"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="r8o-36-4aX"/>
+                    <connections>
+                        <outlet property="customButton" destination="WRm-Bs-dlq" id="fNu-69-WTl"/>
+                        <outlet property="systemButton" destination="lsK-x5-RrK" id="AZJ-hS-CCM"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="8LC-yF-hin" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2648" y="329"/>
+            <point key="canvasLocation" x="3265" y="-352"/>
         </scene>
         <!--Info View Controller-->
         <scene sceneID="S3h-yX-G9s">
@@ -1219,16 +1148,10 @@
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zPh-dc-WSn">
                                 <rect key="frame" x="20" y="58" width="374" height="30"/>
                                 <state key="normal" title="Select Date"/>
-                                <connections>
-                                    <action selector="selectDatePressed" destination="Y7p-ku-8gX" eventType="touchUpInside" id="06a-Uw-Fml"/>
-                                </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ipx-q1-8HF">
                                 <rect key="frame" x="20" y="98" width="374" height="30"/>
                                 <state key="normal" title="Select Time"/>
-                                <connections>
-                                    <action selector="selectTimePressed" destination="Y7p-ku-8gX" eventType="touchUpInside" id="FZd-8a-5zm"/>
-                                </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3I5-FX-ntF">
                                 <rect key="frame" x="20" y="189" width="374" height="21"/>
@@ -1261,6 +1184,9 @@
                     </view>
                     <navigationItem key="navigationItem" id="Rtv-vn-95K"/>
                     <connections>
+                        <outlet property="currentTimeLabel" destination="E9l-oh-DX8" id="3T8-dr-Kls"/>
+                        <outlet property="dateButton" destination="zPh-dc-WSn" id="fN4-oN-Z9L"/>
+                        <outlet property="timeButton" destination="ipx-q1-8HF" id="79a-Ao-Cl3"/>
                         <outlet property="timeLabel" destination="3I5-FX-ntF" id="zHr-vf-Ysz"/>
                     </connections>
                 </viewController>
@@ -1712,7 +1638,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="close_icon" width="24" height="24"/>
         <image name="error_icon" width="14" height="14"/>
         <namedColor name="darker_color">
             <color red="0.0" green="0.0" blue="0.0" alpha="0.20000000298023224" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift b/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
index 9ee2d520e..f189e466c 100644
--- a/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
+++ b/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
@@ -19,8 +19,11 @@ import UIKit
 import KalugaExampleShared
 
 class DateTimePickerViewController : UIViewController {
-    
+
+    @IBOutlet private var currentTimeLabel: UILabel!
     @IBOutlet private var timeLabel: UILabel!
+    @IBOutlet private var dateButton: UIButton!
+    @IBOutlet private var timeButton: UIButton!
     
     lazy var viewModel = DateTimePickerViewModel(dateTimePickerPresenterBuilder: DateTimePickerPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
@@ -42,15 +45,9 @@ class DateTimePickerViewController : UIViewController {
                 }
             ]
         }
-    }
-
-    @IBAction
-    func selectDatePressed() {
-        viewModel.onSelectDatePressed()
-    }
 
-    @IBAction
-    func selectTimePressed() {
-        viewModel.onSelectTimePressed()
+        currentTimeLabel.text = viewModel.currentTimeTitle
+        ButtonStyleKt.bindButton(dateButton, button: viewModel.selectDateButton)
+        ButtonStyleKt.bindButton(timeButton, button: viewModel.selectTimeButton)
     }
 }
diff --git a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
index e520eaa27..ffc992232 100644
--- a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -21,7 +21,7 @@ import KalugaExampleShared
 class FeaturesListViewController : UITableViewController {
 
     private lazy var navigator: ViewControllerNavigator<FeatureListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
-        NavigationSpec.Segue(identifier: action.segueKey)
+        action.spec
     }
     private lazy var viewModel: FeatureListViewModel = FeatureListViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
@@ -81,23 +81,24 @@ class FeaturesListCell : UITableViewCell {
 }
 
 private extension FeatureListNavigationAction {
-    var segueKey: String {
+    var spec: NavigationSpec {
         get {
+            let storyboard = UIStoryboard(name: "Main", bundle: nil)
             switch self {
-            case is FeatureListNavigationAction.Alerts: return "showAlerts"
-            case is FeatureListNavigationAction.Architecture: return "showArchitecture"
-            case is FeatureListNavigationAction.Beacons: return "showBeacons"
-            case is FeatureListNavigationAction.Bluetooth: return "showBluetooth"
-            case is FeatureListNavigationAction.DateTimePicker: return "showDateTimePicker"
-            case is FeatureListNavigationAction.Keyboard: return "showKeyboard"
-            case is FeatureListNavigationAction.Links: return "showLinks"
-            case is FeatureListNavigationAction.LoadingIndicator: return "showHUD"
-            case is FeatureListNavigationAction.Location: return "showLocation"
-            case is FeatureListNavigationAction.Permissions: return "showPermissions"
-            case is FeatureListNavigationAction.PlatformSpecific: return "showPlatformSpecific"
-            case is FeatureListNavigationAction.Resources: return "showResources"
-            case is FeatureListNavigationAction.System: return "showSystem"
-            default: return ""
+            case is FeatureListNavigationAction.Alerts: return NavigationSpec.Push(animated: true) { AlertsViewController.instantiate() }
+            case is FeatureListNavigationAction.Architecture: return NavigationSpec.Segue(identifier: "showArchitecture")
+            case is FeatureListNavigationAction.Beacons: return NavigationSpec.Segue(identifier: "showBeacons")
+            case is FeatureListNavigationAction.Bluetooth: return NavigationSpec.Segue(identifier: "showBluetooth")
+            case is FeatureListNavigationAction.DateTimePicker: return NavigationSpec.Segue(identifier: "showDateTimePicker")
+            case is FeatureListNavigationAction.Keyboard: return NavigationSpec.Segue(identifier: "showKeyboard")
+            case is FeatureListNavigationAction.Links: return NavigationSpec.Segue(identifier: "showLinks")
+            case is FeatureListNavigationAction.LoadingIndicator: return NavigationSpec.Segue(identifier: "showHUD")
+            case is FeatureListNavigationAction.Location: return NavigationSpec.Segue(identifier: "showLocation")
+            case is FeatureListNavigationAction.Permissions: return NavigationSpec.Segue(identifier: "showPermissions")
+            case is FeatureListNavigationAction.PlatformSpecific: return NavigationSpec.Segue(identifier: "showPlatformSpecific")
+            case is FeatureListNavigationAction.Resources: return NavigationSpec.Segue(identifier: "showResources")
+            case is FeatureListNavigationAction.System: return NavigationSpec.Segue(identifier: "showSystem")
+            default: fatalError("Unknown action")
             }
         }
     }
diff --git a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
index 8e0d31743..94d32eda7 100644
--- a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
+++ b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
@@ -21,11 +21,13 @@ import KalugaExampleShared
 class KeyboardManagerViewController : UIViewController {
     
     @IBOutlet private var editField: UITextField!
+    @IBOutlet private var showButton: UIButton!
+    @IBOutlet private var hideButton: UIButton!
     
     private lazy var editFieldFocusHandler = {
         return UIKitFocusHandler(view: self.editField)
     }()
-    lazy var viewModel = KeyboardViewModel(keyboardManagerBuilder: KeyboardManager.Builder(application: UIApplication.shared), editFieldFocusHandler: editFieldFocusHandler)
+    lazy var viewModel = KeyboardViewModel(keyboardManagerBuilder: UIKitKeyboardManager.Builder(application: UIApplication.shared), editFieldFocusHandler: editFieldFocusHandler)
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -36,15 +38,7 @@ class KeyboardManagerViewController : UIViewController {
         super.viewDidLoad()
 
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
-    }
-
-    @IBAction
-    func showButtonPressed() {
-        viewModel.onShowPressed()
-    }
-
-    @IBAction
-    func hideButtonPressed() {
-        viewModel.onHidePressed()
+        ButtonStyleKt.bindButton(showButton, button: viewModel.showButton)
+        ButtonStyleKt.bindButton(hideButton, button: viewModel.hideButton)
     }
 }
diff --git a/example/ios/Demo/LoadingIndicator/LoadingViewController.swift b/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
index 94ce6baad..73dce2fe1 100644
--- a/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
+++ b/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
@@ -18,7 +18,10 @@
 import UIKit
 import KalugaExampleShared
 
-class LoadingViewController: UITableViewController {
+class LoadingViewController: UIViewController {
+
+    @IBOutlet private var systemButton: UIButton!
+    @IBOutlet private var customButton: UIButton!
 
     private lazy var viewModel = HudViewModel(builder: HUD.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
@@ -31,14 +34,7 @@ class LoadingViewController: UITableViewController {
         super.viewDidLoad()
 
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        tableView.deselectRow(at: indexPath, animated: true)
-        switch (indexPath.row) {
-        case 0: viewModel.onShowSystemPressed()
-        case 1: viewModel.onShowCustomPressed()
-        default: ()
-        }
+        ButtonStyleKt.bindButton(systemButton, button: viewModel.showSystemButton)
+        ButtonStyleKt.bindButton(customButton, button: viewModel.showCustomButton)
     }
 }
diff --git a/example/ios/Demo/System/SystemViewController.swift b/example/ios/Demo/System/SystemViewController.swift
index 782e14c5b..0f8cf0bcb 100644
--- a/example/ios/Demo/System/SystemViewController.swift
+++ b/example/ios/Demo/System/SystemViewController.swift
@@ -29,8 +29,8 @@ class SystemViewController : UITableViewController {
     }
     private lazy var viewModel: SystemViewModel = SystemViewModel(navigator: navigator)
 
-    private var modules = [String]()
-    private var onModuleTapped: ((Int) -> Void)? = nil
+    private var systemFeatures = [String]()
+    private var onSystemFeatureTapped: ((Int) -> Void)? = nil
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -45,10 +45,10 @@ class SystemViewController : UITableViewController {
                 return []
             }
             return [
-                viewModel.modules.observeInitialized { next in
-                    let modules = next?.compactMap { $0 as? SystemFeatures } ?? []
-                    self?.modules = modules.map{ $0.name }
-                    self?.onModuleTapped = { (index: Int) in viewModel.onButtonTapped(systemFeatures: modules[index]) }
+                viewModel.systemFeatures.observeInitialized { next in
+                    let systemFeatures = next?.compactMap { $0 as? SystemFeatures } ?? []
+                    self?.systemFeatures = systemFeatures.map{ $0.name }
+                    self?.onSystemFeatureTapped = { (index: Int) in viewModel.onButtonTapped(systemFeatures: systemFeatures[index]) }
                     self?.tableView.reloadData()
                 }
             ]
@@ -60,17 +60,17 @@ class SystemViewController : UITableViewController {
     }
 
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return modules.count
+        return systemFeatures.count
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: SystemListCell.Const.identifier, for: indexPath) as! SystemListCell
-        cell.label.text = modules[indexPath.row]
+        cell.label.text = systemFeatures[indexPath.row]
         return cell
     }
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onModuleTapped?(indexPath.row)
+        let _ = onSystemFeatureTapped?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
     
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
index 8c0a48ef4..3f5616681 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
@@ -33,7 +33,11 @@ import kotlinx.coroutines.launch
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
-class AlertViewModel(val builder: BaseAlertPresenter.Builder, dismissTime: Duration = 3.seconds) : BaseLifecycleViewModel() {
+class AlertViewModel(val builder: BaseAlertPresenter.Builder) : BaseLifecycleViewModel() {
+
+    companion object {
+        private val dismissTime: Duration = 3.seconds
+    }
 
     val showAlertButton = KalugaButton.Plain("show_alert".localized(), ButtonStyles.default) {
         coroutineScope.launch {
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsNavigator.kt
new file mode 100644
index 000000000..e61aae475
--- /dev/null
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsNavigator.kt
@@ -0,0 +1,33 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.architecture
+
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.ViewControllerNavigator
+import platform.UIKit.UIViewController
+
+fun ArchitectureDetailsViewControllerNavigator(
+    parent: UIViewController,
+    onFinishWithDetails: (InputDetails) -> NavigationSpec,
+    onClose: () -> NavigationSpec
+) = ViewControllerNavigator<ArchitectureDetailsNavigationAction<*>>(parent) { action ->
+    when (action) {
+        is ArchitectureDetailsNavigationAction.FinishWithDetails -> onFinishWithDetails(action.value)
+        is ArchitectureDetailsNavigationAction.Close -> onClose()
+    }
+}
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureNavigator.kt
new file mode 100644
index 000000000..0c0e85735
--- /dev/null
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureNavigator.kt
@@ -0,0 +1,33 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.architecture
+
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.ViewControllerNavigator
+import platform.UIKit.UIViewController
+
+fun ArchitectureViewControllerNavigator(
+    parent: UIViewController,
+    onDetails: (InputDetails) -> NavigationSpec,
+    onBottomSheet: () -> NavigationSpec
+) = ViewControllerNavigator<ArchitectureNavigationAction<*>>(parent) { action ->
+    when (action) {
+        is ArchitectureNavigationAction.Details -> onDetails(action.value)
+        is ArchitectureNavigationAction.BottomSheet -> onBottomSheet()
+    }
+}
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetNavigator.kt
new file mode 100644
index 000000000..de8dbee20
--- /dev/null
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetNavigator.kt
@@ -0,0 +1,33 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.architecture
+
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.ViewControllerNavigator
+import platform.UIKit.UIViewController
+
+fun BottomSheetViewControllerNavigator(
+    parent: UIViewController,
+    onClose: () -> NavigationSpec,
+    onSubPage: () -> NavigationSpec
+) = ViewControllerNavigator<BottomSheetNavigation>(parent) { action ->
+    when (action) {
+        is BottomSheetNavigation.Close -> onClose()
+        is BottomSheetNavigation.SubPage -> onSubPage()
+    }
+}
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetSubPageNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetSubPageNavigator.kt
new file mode 100644
index 000000000..b322bca78
--- /dev/null
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/BottomSheetSubPageNavigator.kt
@@ -0,0 +1,33 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.architecture
+
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.ViewControllerNavigator
+import platform.UIKit.UIViewController
+
+fun BottomSheetSubPageViewControllerNavigator(
+    parent: UIViewController,
+    onClose: () -> NavigationSpec,
+    onBack: () -> NavigationSpec
+) = ViewControllerNavigator<BottomSheetSubPageNavigation>(parent) { action ->
+    when (action) {
+        is BottomSheetSubPageNavigation.Close -> onClose()
+        is BottomSheetSubPageNavigation.Back -> onBack()
+    }
+}

From 4e3cb4f8cbbacaaa09ad8df27d9e8468c31e45a0 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 30 Nov 2022 16:30:00 +0100
Subject: [PATCH 044/227] Added remaining Architecture UIKit logic

---
 .../kotlin/navigation/NavigationSpec.kt       |   6 +-
 .../iosMain/kotlin/navigation/Navigator.kt    |  11 ++
 example/ios/Demo.xcodeproj/project.pbxproj    |   8 ++
 .../ArchitectureDetailsViewController.swift   |  12 +-
 .../ArchitectureInputViewController.swift     |  22 +++-
 .../BottomSheetSubPageViewController.swift    |  74 ++++++++++++
 .../BottomSheetViewController.swift           |  72 ++++++++++++
 .../ios/Demo/Base.lproj/Localizable.strings   |   7 ++
 example/ios/Demo/Base.lproj/Main.storyboard   | 111 +++++++++++++++---
 9 files changed, 300 insertions(+), 23 deletions(-)
 create mode 100644 example/ios/Demo/Architecture/BottomSheetSubPageViewController.swift
 create mode 100644 example/ios/Demo/Architecture/BottomSheetViewController.swift

diff --git a/architecture/src/iosMain/kotlin/navigation/NavigationSpec.kt b/architecture/src/iosMain/kotlin/navigation/NavigationSpec.kt
index 0954f120e..083c57078 100644
--- a/architecture/src/iosMain/kotlin/navigation/NavigationSpec.kt
+++ b/architecture/src/iosMain/kotlin/navigation/NavigationSpec.kt
@@ -62,15 +62,17 @@ sealed class NavigationSpec {
      * Navigates to a new view controller by pushing it on top of the parents [UINavigationController]
      * @param animated Specifies whether transition should be animated
      * @param push Function to create the [UIViewController] to push
+     * @param completion Optional function to call when push has completed
      */
-    data class Push(val animated: Boolean = true, val push: () -> UIViewController) : NavigationSpec()
+    data class Push(val animated: Boolean = true, val push: () -> UIViewController, val completion: (() -> Unit)? = null) : NavigationSpec()
 
     /**
      * Pops the viewController on the parents [UINavigationController].
      * @param to Optional [UIViewController] to pop to. If not provided the viewcontroller on top is popped.
      * @param animated Specifies whether transition should be animated
+     * @param completion Optional function to call when pop has completed
      */
-    data class Pop(val to: UIViewController? = null, val animated: Boolean = true) : NavigationSpec()
+    data class Pop(val to: UIViewController? = null, val animated: Boolean = true, val completion: (() -> Unit)? = null) : NavigationSpec()
 
     /**
      * Lets the parent present a [UIViewController] using [UIViewController.presentViewController].
diff --git a/architecture/src/iosMain/kotlin/navigation/Navigator.kt b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
index 260578141..2cebdf3f8 100644
--- a/architecture/src/iosMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
@@ -25,6 +25,7 @@ import platform.Foundation.NSURL
 import platform.Foundation.numberWithInt
 import platform.MessageUI.MFMailComposeViewController
 import platform.MessageUI.MFMessageComposeViewController
+import platform.QuartzCore.CATransaction
 import platform.SafariServices.SFSafariViewController
 import platform.StoreKit.SKStoreProductParameterAdvertisingPartnerToken
 import platform.StoreKit.SKStoreProductParameterAffiliateToken
@@ -112,15 +113,25 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
     private fun pushViewController(pushSpec: NavigationSpec.Push) {
         val parent = assertParent() ?: return
         assert(parent.navigationController != null)
+        CATransaction.begin()
+        CATransaction.setCompletionBlock {
+            pushSpec.completion?.invoke()
+        }
         parent.navigationController?.pushViewController(pushSpec.push(), pushSpec.animated)
+        CATransaction.commit()
     }
 
     private fun popViewController(popSpec: NavigationSpec.Pop) {
         val parent = assertParent() ?: return
         assert(parent.navigationController != null)
+        CATransaction.begin()
+        CATransaction.setCompletionBlock {
+            popSpec.completion?.invoke()
+        }
         popSpec.to?.let {
             parent.navigationController?.popToViewController(it, popSpec.animated)
         } ?: parent.navigationController?.popViewControllerAnimated(popSpec.animated)
+        CATransaction.commit()
     }
 
     private fun presentViewController(presentSpec: NavigationSpec.Present) {
diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 0fa9bd9d5..e8c51a639 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -24,6 +24,8 @@
 		20C7D1D52469B25B00C9A63F /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D42469B25B00C9A63F /* InfoViewController.swift */; };
 		20C7D1D8246A93A600C9A63F /* ArchitectureInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */; };
 		20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */; };
+		20CA2905293796C5007E4079 /* BottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20CA2904293796C5007E4079 /* BottomSheetViewController.swift */; };
+		20CA2907293796D7007E4079 /* BottomSheetSubPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */; };
 		20D8CD3726FE8FE200D14AC9 /* ResourcesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */; };
 		20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3826FF550100D14AC9 /* LabelViewController.swift */; };
 		4B02E504236B221B003F0B36 /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B02E503236B221B003F0B36 /* LoadingViewController.swift */; };
@@ -90,6 +92,8 @@
 		20C7D1D42469B25B00C9A63F /* InfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoViewController.swift; sourceTree = "<group>"; };
 		20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureInputViewController.swift; sourceTree = "<group>"; };
 		20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureDetailsViewController.swift; sourceTree = "<group>"; };
+		20CA2904293796C5007E4079 /* BottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetViewController.swift; sourceTree = "<group>"; };
+		20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetSubPageViewController.swift; sourceTree = "<group>"; };
 		20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesListViewController.swift; sourceTree = "<group>"; };
 		20D8CD3826FF550100D14AC9 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = "<group>"; };
 		4B02E503236B221B003F0B36 /* LoadingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
@@ -205,6 +209,8 @@
 			children = (
 				20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */,
 				20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */,
+				20CA2904293796C5007E4079 /* BottomSheetViewController.swift */,
+				20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */,
 			);
 			path = Architecture;
 			sourceTree = "<group>";
@@ -520,6 +526,7 @@
 				20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */,
 				4BC0CBE0269F1D25000512A9 /* BeaconsViewCell.swift in Sources */,
 				20C7D1D8246A93A600C9A63F /* ArchitectureInputViewController.swift in Sources */,
+				20CA2905293796C5007E4079 /* BottomSheetViewController.swift in Sources */,
 				20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */,
 				20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */,
 				649979D325CC638C00348419 /* SystemViewController.swift in Sources */,
@@ -529,6 +536,7 @@
 				7425815FF35195035A8991B0 /* LocationViewController.swift in Sources */,
 				209471E624C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift in Sources */,
 				209471E424C07EAD001426CD /* BluetoothViewController.swift in Sources */,
+				20CA2907293796D7007E4079 /* BottomSheetSubPageViewController.swift in Sources */,
 				4B54CB212369DA6600B69B2D /* AlertsViewController.swift in Sources */,
 				2073D0F0270303B3002CB856 /* ButtonViewController.swift in Sources */,
 				20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */,
diff --git a/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift b/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
index 49382fa68..f4ca69754 100644
--- a/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
@@ -31,11 +31,11 @@ class ArchitectureDetailsViewController: UIViewController {
             vc.isModalInPresentation = true
         }
         let navigator = ArchitectureDetailsNavigatorKt.ArchitectureDetailsViewControllerNavigator(parent: vc) { details in
-            NavigationSpec.Dismiss(toDismiss: { $0 }, animated: true) {
+            NavigationSpec.Pop(to: nil, animated: true) {
                 onDismiss(details)
             }
         } onClose: {
-            NavigationSpec.Dismiss(toDismiss: { $0 }, animated: true)
+            NavigationSpec.Pop(to: nil, animated: true)
         }
         vc.viewModel = ArchitectureDetailsViewModel(initialDetail: inputDetails, navigator: navigator)
         return vc
@@ -56,6 +56,10 @@ class ArchitectureDetailsViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        navigationItem.hidesBackButton = true
+        let newBackButton = UIBarButtonItem(title: "Back", style: .plain, target: self, action: #selector(didDismiss))
+        self.navigationItem.leftBarButtonItem = newBackButton
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
 
             guard let viewModel = self?.viewModel else {
@@ -75,5 +79,9 @@ class ArchitectureDetailsViewController: UIViewController {
         ButtonStyleKt.bindButton(inverseButton, button: viewModel.inverseButton)
         ButtonStyleKt.bindButton(closeButton, button: viewModel.finishButton)
     }
+
+    @objc func didDismiss() {
+        viewModel.onBackPressed()
+    }
     
 }
diff --git a/example/ios/Demo/Architecture/ArchitectureInputViewController.swift b/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
index 3df2de0dc..04149aefc 100644
--- a/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
@@ -29,17 +29,34 @@ class ArchitectureViewController: UIViewController  {
     @IBOutlet weak var numberError: UIImageView!
     
     @IBOutlet weak var detailsButton: UIButton!
+    @IBOutlet weak var bottomSheetButton: UIButton!
 
     lazy var navigator = ArchitectureNavigatorKt.ArchitectureViewControllerNavigator(
         parent: self,
         onDetails: { inputDetails in
-            NavigationSpec.Present(animated: true, presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue), transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)) {
+            NavigationSpec.Push(
+                animated: true
+            ) {
                 ArchitectureDetailsViewController.create(inputDetails: inputDetails) { [weak self] resultDetails in
                     self?.onDetailsDismissed(inputDetails: resultDetails)
                 }
             }
         },
-        onBottomSheet: { fatalError("ToDo") }
+        onBottomSheet: {
+            NavigationSpec.Present(
+                animated: true,
+                presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue),
+                transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)
+            ) {
+                let vc = BottomSheetViewController.create()
+                let nav = UINavigationController(rootViewController: vc)
+                if let sheet = nav.sheetPresentationController {
+                    sheet.detents = [.medium()]
+                }
+                nav.isModalInPresentation = true
+                return nav
+            }
+        }
     )
     lazy var viewModel = ArchitectureViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
@@ -75,6 +92,7 @@ class ArchitectureViewController: UIViewController  {
         nameLabel.text = viewModel.namePlaceholder
         numberLabel.text = viewModel.numberPlaceholder
         ButtonStyleKt.bindButton(detailsButton, button: viewModel.showDetailsButton)
+        ButtonStyleKt.bindButton(bottomSheetButton, button: viewModel.showBottomSheetButton)
     }
 
     private func onDetailsDismissed(inputDetails: InputDetails) {
diff --git a/example/ios/Demo/Architecture/BottomSheetSubPageViewController.swift b/example/ios/Demo/Architecture/BottomSheetSubPageViewController.swift
new file mode 100644
index 000000000..3d5cddee7
--- /dev/null
+++ b/example/ios/Demo/Architecture/BottomSheetSubPageViewController.swift
@@ -0,0 +1,74 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KalugaExampleShared
+
+class BottomSheetSubPageViewController: UIViewController, UISheetPresentationControllerDelegate {
+
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "BottomSheetSubPage"
+    }
+
+    static func create() -> BottomSheetSubPageViewController {
+        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! BottomSheetSubPageViewController
+        let navigator = BottomSheetSubPageNavigatorKt.BottomSheetSubPageViewControllerNavigator(parent: vc, onClose: {
+            NavigationSpec.Dismiss(toDismiss: { viewController in
+                viewController.navigationController!
+            }, animated: true)
+        }, onBack: {
+            NavigationSpec.Pop(to: nil, animated: true)
+        })
+        vc.viewModel = BottomSheetSubPageViewModel(navigator: navigator)
+        return vc
+    }
+
+    var viewModel: BottomSheetSubPageViewModel!
+    private var lifecycleManager: LifecycleManager!
+
+    @IBOutlet weak var label: UILabel!
+
+    deinit {
+        lifecycleManager.unbind()
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        navigationItem.hidesBackButton = true
+        let newBackButton = UIBarButtonItem(title: "Back", style: .plain, target: self, action: #selector(didDismiss))
+        self.navigationItem.leftBarButtonItem = newBackButton
+        let closeButton = UIBarButtonItem(title: "Close", style: .plain, target: self, action: #selector(didClose))
+        self.navigationItem.rightBarButtonItem = closeButton
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) {
+            return []
+        }
+
+        label.text = viewModel.text
+    }
+
+    @objc func didDismiss() {
+        viewModel.onBackPressed()
+    }
+
+    @objc func didClose() {
+        viewModel.onClosePressed()
+    }
+
+}
diff --git a/example/ios/Demo/Architecture/BottomSheetViewController.swift b/example/ios/Demo/Architecture/BottomSheetViewController.swift
new file mode 100644
index 000000000..c34aa3b71
--- /dev/null
+++ b/example/ios/Demo/Architecture/BottomSheetViewController.swift
@@ -0,0 +1,72 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+import UIKit
+import KalugaExampleShared
+
+class BottomSheetViewController: UIViewController, UISheetPresentationControllerDelegate {
+
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "BottomSheet"
+    }
+
+    static func create() -> BottomSheetViewController {
+        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! BottomSheetViewController
+        let navigator = BottomSheetNavigatorKt.BottomSheetViewControllerNavigator(parent: vc, onClose: {
+            NavigationSpec.Dismiss(toDismiss: { viewController in
+                viewController.navigationController!
+            }, animated: true)
+        }, onSubPage: {
+            NavigationSpec.Push(animated: true) {
+                BottomSheetSubPageViewController.create()
+            }
+        })
+        vc.viewModel = BottomSheetViewModel(navigator: navigator)
+        return vc
+    }
+
+    var viewModel: BottomSheetViewModel!
+    private var lifecycleManager: LifecycleManager!
+
+    @IBOutlet weak var label: UILabel!
+    @IBOutlet weak var button: UIButton!
+
+    deinit {
+        lifecycleManager.unbind()
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        navigationItem.hidesBackButton = true
+        let newBackButton = UIBarButtonItem(title: "Back", style: .plain, target: self, action: #selector(didDismiss))
+        self.navigationItem.leftBarButtonItem = newBackButton
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) {
+            return []
+        }
+
+        label.text = viewModel.text
+        ButtonStyleKt.bindButton(button, button: viewModel.button)
+    }
+
+    @objc func didDismiss() {
+        viewModel.onClosePressed()
+    }
+
+}
diff --git a/example/ios/Demo/Base.lproj/Localizable.strings b/example/ios/Demo/Base.lproj/Localizable.strings
index 1fda4e7ee..91aa9e3c2 100644
--- a/example/ios/Demo/Base.lproj/Localizable.strings
+++ b/example/ios/Demo/Base.lproj/Localizable.strings
@@ -51,6 +51,7 @@
 "architecture_number_input_placeholder" = "Enter a number";
 "architecture_details" = "Show Details";
 "architecture_details_inverse" = "Inverse Input";
+"architecture_finish" = "Finish";
 "keyboard_manager" = "Keyboard";
 "show_keyboard" = "Show Keyboard";
 "hide_keyboard" = "Hide Keyboard";
@@ -93,6 +94,12 @@
 "bluetooth_permissions_read_encrypted" = "Read Encrypted";
 "bluetooth_permissions_write_encrypted" = "Write Encrypted";
 
+"bottom_sheet_show_sheet" = "Open Bottom Sheet";
+"bottom_sheet_show_sub_page" = "Open Sub Page";
+"bottom_sheet_sub_page_title" = "Sub Page";
+"bottom_sheet_sheet_content" = "This is a bottom sheet";
+"bottom_sheet_sheet_sub_page_title" = "Sheet Sub Page";
+
 "beacons_start_monitoring" = "Start Monitoring";
 "beacons_stop_monitoring" = "Stop Monitoring";
 
diff --git a/example/ios/Demo/Base.lproj/Main.storyboard b/example/ios/Demo/Base.lproj/Main.storyboard
index 9e5381194..9bb0564f9 100644
--- a/example/ios/Demo/Base.lproj/Main.storyboard
+++ b/example/ios/Demo/Base.lproj/Main.storyboard
@@ -39,13 +39,18 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MN6-Uw-a48">
-                                <rect key="frame" x="20" y="226" width="374" height="30"/>
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="MN6-Uw-a48">
+                                <rect key="frame" x="20" y="226" width="374" height="74.5"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oa5-69-XBu">
                                         <rect key="frame" x="0.0" y="0.0" width="374" height="30"/>
                                         <state key="normal" title="Show Details"/>
                                     </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e4B-Xc-pFl">
+                                        <rect key="frame" x="0.0" y="40" width="374" height="34.5"/>
+                                        <state key="normal" title="Button"/>
+                                        <buttonConfiguration key="configuration" style="plain" title="Show Bottom Sheet"/>
+                                    </button>
                                 </subviews>
                             </stackView>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="w2o-g6-GSv">
@@ -96,6 +101,7 @@
                     </view>
                     <navigationItem key="navigationItem" id="i8W-fj-OLz"/>
                     <connections>
+                        <outlet property="bottomSheetButton" destination="e4B-Xc-pFl" id="5vg-QY-9H9"/>
                         <outlet property="detailsButton" destination="oa5-69-XBu" id="tx2-Sn-0dP"/>
                         <outlet property="nameError" destination="nkY-wQ-Zgj" id="01j-he-tFD"/>
                         <outlet property="nameInput" destination="r7U-VH-8wC" id="DUN-id-71w"/>
@@ -166,6 +172,77 @@
             </objects>
             <point key="canvasLocation" x="3403" y="1807"/>
         </scene>
+        <!--Bottom Sheet View Controller-->
+        <scene sceneID="k1C-DV-Ij9">
+            <objects>
+                <viewController storyboardIdentifier="BottomSheet" id="fiw-qq-Xu5" customClass="BottomSheetViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="UU5-YE-d66">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CDI-RS-TLW">
+                                <rect key="frame" x="10" y="58" width="394" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gk4-Rk-33n">
+                                <rect key="frame" x="10" y="89" width="394" height="35"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="Rz2-Sp-lZY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="CDI-RS-TLW" firstAttribute="leading" secondItem="Rz2-Sp-lZY" secondAttribute="leading" constant="10" id="5YD-dg-0Nl"/>
+                            <constraint firstItem="gk4-Rk-33n" firstAttribute="top" secondItem="CDI-RS-TLW" secondAttribute="bottom" constant="10" id="9at-CW-EGw"/>
+                            <constraint firstItem="Rz2-Sp-lZY" firstAttribute="trailing" secondItem="gk4-Rk-33n" secondAttribute="trailing" constant="10" id="epb-1i-haj"/>
+                            <constraint firstItem="CDI-RS-TLW" firstAttribute="top" secondItem="Rz2-Sp-lZY" secondAttribute="top" constant="10" id="kPE-GT-jht"/>
+                            <constraint firstItem="Rz2-Sp-lZY" firstAttribute="trailing" secondItem="CDI-RS-TLW" secondAttribute="trailing" constant="10" id="qaS-HH-WaX"/>
+                            <constraint firstItem="gk4-Rk-33n" firstAttribute="leading" secondItem="Rz2-Sp-lZY" secondAttribute="leading" constant="10" id="uX1-jh-3AH"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="button" destination="gk4-Rk-33n" id="blB-QK-0oz"/>
+                        <outlet property="label" destination="CDI-RS-TLW" id="GkV-ql-1Mo"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="cjx-s0-WCw" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4162" y="1807"/>
+        </scene>
+        <!--Bottom Sheet Sub Page View Controller-->
+        <scene sceneID="BHv-wA-usk">
+            <objects>
+                <viewController storyboardIdentifier="BottomSheetSubPage" id="bW7-4b-VX5" customClass="BottomSheetSubPageViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="9K7-5O-A2Y">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yfV-jw-v2k">
+                                <rect key="frame" x="10" y="58" width="394" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="JHp-yh-fYw"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="yfV-jw-v2k" firstAttribute="top" secondItem="JHp-yh-fYw" secondAttribute="top" constant="10" id="DPS-0N-Ljp"/>
+                            <constraint firstItem="yfV-jw-v2k" firstAttribute="leading" secondItem="JHp-yh-fYw" secondAttribute="leading" constant="10" id="cZx-HR-Srr"/>
+                            <constraint firstItem="JHp-yh-fYw" firstAttribute="trailing" secondItem="yfV-jw-v2k" secondAttribute="trailing" constant="10" id="wIQ-Im-unA"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="label" destination="yfV-jw-v2k" id="ULK-io-yRa"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="qu6-UR-Et7" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4907" y="1807"/>
+        </scene>
         <!--Location View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
@@ -273,14 +350,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="FeaturesListCell" id="C4Y-IC-Pu4" customClass="FeaturesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="C4Y-IC-Pu4" id="XEB-aa-Byo">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xh8-DK-zfM">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21.5"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -919,14 +996,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SystemListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SystemListCell" id="a8b-dW-eKx" customClass="SystemListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="52"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="a8b-dW-eKx" id="pjk-M2-4TV">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pnV-0z-POK">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1008,14 +1085,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="InfoButtonCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="InfoButtonCell" id="3eh-xF-TU3" customClass="InfoButtonCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="44"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="43"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3eh-xF-TU3" id="cyO-Cc-dq8">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odz-vr-fX0">
-                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1056,14 +1133,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PermissionsListCell" id="FrV-FL-GKa" customClass="PermissionsListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="52"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FrV-FL-GKa" id="wA3-QT-FyZ">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nXv-Uh-BJk">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1204,14 +1281,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ResourcesListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ResourcesListCell" id="YH6-gF-Pq3" customClass="ResourcesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="38"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="37"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YH6-gF-Pq3" id="yfs-Dl-hfq">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="38"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="37"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="app-pb-mRq">
-                                            <rect key="frame" x="20" y="8" width="374" height="22"/>
+                                            <rect key="frame" x="20" y="8" width="374" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>

From 75ed31499ffd64d26640c517e59abfe4c102badd Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 30 Nov 2022 16:45:54 +0100
Subject: [PATCH 045/227] Fixed buttons not styling

---
 example/ios/Demo/Base.lproj/Main.storyboard | 88 ++++++++++-----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/example/ios/Demo/Base.lproj/Main.storyboard b/example/ios/Demo/Base.lproj/Main.storyboard
index 9bb0564f9..a1d91ea68 100644
--- a/example/ios/Demo/Base.lproj/Main.storyboard
+++ b/example/ios/Demo/Base.lproj/Main.storyboard
@@ -40,16 +40,16 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="MN6-Uw-a48">
-                                <rect key="frame" x="20" y="226" width="374" height="74.5"/>
+                                <rect key="frame" x="20" y="226" width="374" height="78"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oa5-69-XBu">
-                                        <rect key="frame" x="0.0" y="0.0" width="374" height="30"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oa5-69-XBu">
+                                        <rect key="frame" x="0.0" y="0.0" width="374" height="34"/>
                                         <state key="normal" title="Show Details"/>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e4B-Xc-pFl">
-                                        <rect key="frame" x="0.0" y="40" width="374" height="34.5"/>
-                                        <state key="normal" title="Button"/>
-                                        <buttonConfiguration key="configuration" style="plain" title="Show Bottom Sheet"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e4B-Xc-pFl">
+                                        <rect key="frame" x="0.0" y="44" width="374" height="34"/>
+                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                        <state key="normal" title="Show Bottom Sheet"/>
                                     </button>
                                 </subviews>
                             </stackView>
@@ -136,14 +136,14 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Yci-wv-53q">
-                                <rect key="frame" x="20" y="149" width="374" height="70"/>
+                                <rect key="frame" x="20" y="149" width="374" height="78"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="h7K-k3-Lq1">
-                                        <rect key="frame" x="0.0" y="0.0" width="374" height="30"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="h7K-k3-Lq1">
+                                        <rect key="frame" x="0.0" y="0.0" width="374" height="34"/>
                                         <state key="normal" title="Inverse Input"/>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ueh-wW-yRS">
-                                        <rect key="frame" x="0.0" y="40" width="374" height="30"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ueh-wW-yRS">
+                                        <rect key="frame" x="0.0" y="44" width="374" height="34"/>
                                         <state key="normal" title="Finish"/>
                                     </button>
                                 </subviews>
@@ -186,10 +186,10 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gk4-Rk-33n">
-                                <rect key="frame" x="10" y="89" width="394" height="35"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gk4-Rk-33n">
+                                <rect key="frame" x="10" y="89" width="394" height="34"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
                             </button>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Rz2-Sp-lZY"/>
@@ -408,25 +408,25 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ofd-Ey-gUI">
-                                <rect key="frame" x="10" y="58" width="394" height="35"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ofd-Ey-gUI">
+                                <rect key="frame" x="10" y="58" width="394" height="34"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hza-lz-LVr">
-                                <rect key="frame" x="10" y="103" width="394" height="35"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hza-lz-LVr">
+                                <rect key="frame" x="10" y="102" width="394" height="34"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aQC-6a-AUR">
-                                <rect key="frame" x="10" y="148" width="394" height="35"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aQC-6a-AUR">
+                                <rect key="frame" x="10" y="146" width="394" height="34"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Mi-5W-uJp">
-                                <rect key="frame" x="10" y="193" width="394" height="35"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Mi-5W-uJp">
+                                <rect key="frame" x="10" y="190" width="394" height="34"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
                             </button>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="tbU-9u-dgY"/>
@@ -920,14 +920,14 @@
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="5KH-x9-S2x">
-                                <rect key="frame" x="10" y="102" width="394" height="30"/>
+                                <rect key="frame" x="10" y="102" width="394" height="34"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kY6-Kz-VM4">
-                                        <rect key="frame" x="0.0" y="0.0" width="197" height="30"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kY6-Kz-VM4">
+                                        <rect key="frame" x="0.0" y="0.0" width="197" height="34"/>
                                         <state key="normal" title="Show Keyboard"/>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LHk-eR-LxZ">
-                                        <rect key="frame" x="197" y="0.0" width="197" height="30"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LHk-eR-LxZ">
+                                        <rect key="frame" x="197" y="0.0" width="197" height="34"/>
                                         <state key="normal" title="Hide Keyboard"/>
                                     </button>
                                 </subviews>
@@ -1043,15 +1043,15 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lsK-x5-RrK">
-                                <rect key="frame" x="10" y="58" width="394" height="35"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lsK-x5-RrK">
+                                <rect key="frame" x="10" y="58" width="394" height="34"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WRm-Bs-dlq">
-                                <rect key="frame" x="10" y="103" width="394" height="35"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WRm-Bs-dlq">
+                                <rect key="frame" x="10" y="102" width="394" height="34"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
                             </button>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="FKf-h7-3wX"/>
@@ -1222,22 +1222,22 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zPh-dc-WSn">
-                                <rect key="frame" x="20" y="58" width="374" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zPh-dc-WSn">
+                                <rect key="frame" x="20" y="58" width="374" height="34"/>
                                 <state key="normal" title="Select Date"/>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ipx-q1-8HF">
-                                <rect key="frame" x="20" y="98" width="374" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ipx-q1-8HF">
+                                <rect key="frame" x="20" y="102" width="374" height="34"/>
                                 <state key="normal" title="Select Time"/>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3I5-FX-ntF">
-                                <rect key="frame" x="20" y="189" width="374" height="21"/>
+                                <rect key="frame" x="20" y="197" width="374" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Current Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E9l-oh-DX8">
-                                <rect key="frame" x="20" y="158" width="100" height="21"/>
+                                <rect key="frame" x="20" y="166" width="100" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>

From 3eeeb0ba22a8422d0470220b9af60c62f11bd9eb Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 30 Nov 2022 17:38:31 +0100
Subject: [PATCH 046/227] Add KalugaSwiftUI

---
 .gitignore                                    |   2 +
 .gitmodules                                   |   3 +
 example/ios/Demo.xcodeproj/project.pbxproj    | 174 +++++++++++++++++-
 .../xcshareddata/swiftpm/Package.resolved     |  14 ++
 example/ios/Kaluga-SwiftUI                    |   1 +
 example/ios/kaluga.sourcery.yml               |  19 ++
 6 files changed, 205 insertions(+), 8 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 example/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
 create mode 160000 example/ios/Kaluga-SwiftUI
 create mode 100644 example/ios/kaluga.sourcery.yml

diff --git a/.gitignore b/.gitignore
index a8f2d60d7..27701c557 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,5 @@ projectFilesBackup*/
 google-services.json
 
 *.framework
+
+example/ios/Generated/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..1a8a51182
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "example/ios/Kaluga-SwiftUI"]
+	path = example/ios/Kaluga-SwiftUI
+	url = https://github.com/splendo/kaluga-swiftui.git
diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index e8c51a639..a67a777c3 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -3,11 +3,15 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		008D2380957750839A7B501C /* Navigation.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1AD210B87A46DBD057A7D28 /* Navigation.generated.swift */; };
+		1529FF0B35BD7AB3B6E838A9 /* UninitializedSubject.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8165D122BD8D8848D7242385 /* UninitializedSubject.generated.swift */; };
+		1E3CD7CB5C78456A64FD6847 /* LifecycleViewModel.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8678F48E60D40E6AB06177C /* LifecycleViewModel.generated.swift */; };
 		2017B1C52400175C00F9072A /* PermissionListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2017B1C42400175C00F9072A /* PermissionListViewController.swift */; };
+		2034C13A2937B494003A6D19 /* PartialSheet in Frameworks */ = {isa = PBXBuildFile; productRef = 2034C1392937B494003A6D19 /* PartialSheet */; };
 		20524A24257BEA1E0054B57E /* DateTimePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */; };
 		205747572397C9C400CDE25E /* KeyboardManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */; };
 		205AF6562488F017001BD99E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 205AF6542488F017001BD99E /* Localizable.strings */; };
@@ -28,13 +32,21 @@
 		20CA2907293796D7007E4079 /* BottomSheetSubPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */; };
 		20D8CD3726FE8FE200D14AC9 /* ResourcesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */; };
 		20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3826FF550100D14AC9 /* LabelViewController.swift */; };
+		2EF7D8289105AC623E600829 /* UninitializedObservable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 744B1E9043B534F8B9BD501C /* UninitializedObservable.generated.swift */; };
+		300D5D65F49D6711AC8FF5DA /* Subject.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7A59766D89528BA5F4327BD /* Subject.generated.swift */; };
+		319A4712667C1DC1B422411A /* KalugaLabel+SwiftUI.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCF6BD3638095E5452785FF3 /* KalugaLabel+SwiftUI.generated.swift */; };
+		37B9F4481D30F2FC895AB554 /* PlatformValueMapper.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DA3213EF5694917A0138255 /* PlatformValueMapper.generated.swift */; };
+		42B12B5CFE87189A5F539B92 /* HasDefaultValue.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27D181CE83615D345BB56946 /* HasDefaultValue.generated.swift */; };
 		4B02E504236B221B003F0B36 /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B02E503236B221B003F0B36 /* LoadingViewController.swift */; };
 		4B54CB212369DA6600B69B2D /* AlertsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B54CB202369DA6600B69B2D /* AlertsViewController.swift */; };
 		4BC0CBDF269F1D25000512A9 /* BeaconsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC0CBDD269F1D25000512A9 /* BeaconsViewController.swift */; };
 		4BC0CBE0269F1D25000512A9 /* BeaconsViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC0CBDE269F1D25000512A9 /* BeaconsViewCell.swift */; };
+		62D65713EC7DD3C712D864BB /* ListSubject.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC460D671184DBFD03C42FB /* ListSubject.generated.swift */; };
 		641CC0DC25CACAAD001E1CD1 /* LinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CC0DB25CACAAD001E1CD1 /* LinksViewController.swift */; };
 		649979D325CC638C00348419 /* SystemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649979D225CC638C00348419 /* SystemViewController.swift */; };
 		649979E725CCD37200348419 /* NetworkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649979E625CCD37200348419 /* NetworkViewController.swift */; };
+		6BBAC6F7C1C74608F52D7FF7 /* PlatformMappers.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89DAFF461D97215C4B63A0A1 /* PlatformMappers.generated.swift */; };
+		73DBBA374F2ED176BCF8E189 /* DefaultValues.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93070CB7E1723F904DBEDD26 /* DefaultValues.generated.swift */; };
 		7425815FF35195035A8991B0 /* LocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74C710A1E2E41AF0F4A9FFC5 /* LocationViewController.swift */; };
 		74671D1F8F6A31F1DD3F7912 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74BBBF2C57521E71982179E0 /* AppDelegate.swift */; };
 		7478297FCF44ED1D49525D4E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74FDC8922442294AF0776058 /* LaunchScreen.storyboard */; };
@@ -42,7 +54,19 @@
 		74C75886D08DD78EA65E6DD9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 74C9C443CC304CB387AB324D /* Assets.xcassets */; };
 		74D656BE6B4BD50115400411 /* DemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 744CF99B70DA1947AA98CA3B /* DemoTests.swift */; };
 		74E6599B023623BD96737582 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74F483E9C1890D693F808DDA /* Main.storyboard */; };
+		7C49888336FE57AAA89E7958 /* KalugaDate+Extensions.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA317627E5725424F6B7569C /* KalugaDate+Extensions.generated.swift */; };
+		7ECE3B4F9AD53DA93EF73B0E /* ContainerView.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 167E723C40578BBD9EAA6559 /* ContainerView.generated.swift */; };
+		847C2A647F23AF46CED079CF /* RoutingState.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896B16F89BA730B7FBF42625 /* RoutingState.generated.swift */; };
+		8679BDAA7F79F92DAC24AF23 /* ListObservable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31718DE342D28B4942D37524 /* ListObservable.generated.swift */; };
+		93EC5B31E0ADDED3225B15C9 /* Color+Color.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12F49DA13243DC3767266475 /* Color+Color.generated.swift */; };
 		978348A7235DF586005B140B /* PermissionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978348A6235DF586005B140B /* PermissionViewController.swift */; };
+		C0C827F580A4F1950E9B10EE /* Shape+Helpers.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A2BAEDD60E67CE8F9277AC6 /* Shape+Helpers.generated.swift */; };
+		C77C23B538A4DFB02C0E0773 /* LazyView.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095989173871C8CDA70C49E1 /* LazyView.generated.swift */; };
+		C9555693B015ADE12795997D /* NavigationBarColor.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C9189D92DAF37F9815ECFDC /* NavigationBarColor.generated.swift */; };
+		D174F54A364898AC7E0962FC /* KalugaBackgroundStyle+SwiftUI.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF72582307421E9939C863E /* KalugaBackgroundStyle+SwiftUI.generated.swift */; };
+		D17DC9D74F0BD77D12813366 /* Observable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6681B8FDABE90D9625CA407A /* Observable.generated.swift */; };
+		D976FB8DC34A35578A995B2E /* KalugaButton+SwiftUI.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5304E64813F87A2C71BD40C2 /* KalugaButton+SwiftUI.generated.swift */; };
+		F62F6B35C805651F41B90380 /* KalugaStyledString+SwiftUI.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 382B35FA85A28992FE37B803 /* KalugaStyledString+SwiftUI.generated.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -75,6 +99,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		095989173871C8CDA70C49E1 /* LazyView.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = LazyView.generated.swift; sourceTree = "<group>"; };
+		12F49DA13243DC3767266475 /* Color+Color.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "Color+Color.generated.swift"; sourceTree = "<group>"; };
+		167E723C40578BBD9EAA6559 /* ContainerView.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ContainerView.generated.swift; sourceTree = "<group>"; };
+		1DA3213EF5694917A0138255 /* PlatformValueMapper.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = PlatformValueMapper.generated.swift; sourceTree = "<group>"; };
 		2017B1C42400175C00F9072A /* PermissionListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionListViewController.swift; sourceTree = "<group>"; };
 		20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimePickerViewController.swift; sourceTree = "<group>"; };
 		205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardManagerViewController.swift; sourceTree = "<group>"; };
@@ -96,18 +124,26 @@
 		20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetSubPageViewController.swift; sourceTree = "<group>"; };
 		20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesListViewController.swift; sourceTree = "<group>"; };
 		20D8CD3826FF550100D14AC9 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = "<group>"; };
+		27D181CE83615D345BB56946 /* HasDefaultValue.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = HasDefaultValue.generated.swift; sourceTree = "<group>"; };
+		31718DE342D28B4942D37524 /* ListObservable.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ListObservable.generated.swift; sourceTree = "<group>"; };
+		382B35FA85A28992FE37B803 /* KalugaStyledString+SwiftUI.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "KalugaStyledString+SwiftUI.generated.swift"; sourceTree = "<group>"; };
+		3EC460D671184DBFD03C42FB /* ListSubject.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ListSubject.generated.swift; sourceTree = "<group>"; };
+		4A2BAEDD60E67CE8F9277AC6 /* Shape+Helpers.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "Shape+Helpers.generated.swift"; sourceTree = "<group>"; };
 		4B02E503236B221B003F0B36 /* LoadingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
 		4B54CB202369DA6600B69B2D /* AlertsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertsViewController.swift; sourceTree = "<group>"; };
 		4BC0CBDD269F1D25000512A9 /* BeaconsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeaconsViewController.swift; sourceTree = "<group>"; };
 		4BC0CBDE269F1D25000512A9 /* BeaconsViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeaconsViewCell.swift; sourceTree = "<group>"; };
+		5304E64813F87A2C71BD40C2 /* KalugaButton+SwiftUI.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "KalugaButton+SwiftUI.generated.swift"; sourceTree = "<group>"; };
 		641CC0DB25CACAAD001E1CD1 /* LinksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinksViewController.swift; sourceTree = "<group>"; };
 		648214DD263095A900CDAE05 /* Demo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Demo.entitlements; sourceTree = "<group>"; };
 		649979D225CC638C00348419 /* SystemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemViewController.swift; sourceTree = "<group>"; };
 		649979E625CCD37200348419 /* NetworkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkViewController.swift; sourceTree = "<group>"; };
+		6681B8FDABE90D9625CA407A /* Observable.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Observable.generated.swift; sourceTree = "<group>"; };
 		740C363F8973304E72F429BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
 		741DDADC0C8034E32EA9C3D6 /* DemoUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoUITests.swift; sourceTree = "<group>"; };
 		7428D8755D288FD7EA2E6537 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.info; path = Info.plist; sourceTree = "<group>"; };
 		742CCE9033CEC8C8004D624F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		744B1E9043B534F8B9BD501C /* UninitializedObservable.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = UninitializedObservable.generated.swift; sourceTree = "<group>"; };
 		744CF99B70DA1947AA98CA3B /* DemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoTests.swift; sourceTree = "<group>"; };
 		746834742E284396FD5452F4 /* DemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		746E133CAEC5C7B1D516B11F /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -117,7 +153,18 @@
 		74C07E8A2DB465B1CE47DC5E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		74C710A1E2E41AF0F4A9FFC5 /* LocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationViewController.swift; sourceTree = "<group>"; };
 		74C9C443CC304CB387AB324D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		7C9189D92DAF37F9815ECFDC /* NavigationBarColor.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = NavigationBarColor.generated.swift; sourceTree = "<group>"; };
+		7CF72582307421E9939C863E /* KalugaBackgroundStyle+SwiftUI.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "KalugaBackgroundStyle+SwiftUI.generated.swift"; sourceTree = "<group>"; };
+		8165D122BD8D8848D7242385 /* UninitializedSubject.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = UninitializedSubject.generated.swift; sourceTree = "<group>"; };
+		896B16F89BA730B7FBF42625 /* RoutingState.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = RoutingState.generated.swift; sourceTree = "<group>"; };
+		89DAFF461D97215C4B63A0A1 /* PlatformMappers.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = PlatformMappers.generated.swift; sourceTree = "<group>"; };
+		93070CB7E1723F904DBEDD26 /* DefaultValues.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = DefaultValues.generated.swift; sourceTree = "<group>"; };
 		978348A6235DF586005B140B /* PermissionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionViewController.swift; sourceTree = "<group>"; };
+		A1AD210B87A46DBD057A7D28 /* Navigation.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Navigation.generated.swift; sourceTree = "<group>"; };
+		A8678F48E60D40E6AB06177C /* LifecycleViewModel.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = LifecycleViewModel.generated.swift; sourceTree = "<group>"; };
+		CCF6BD3638095E5452785FF3 /* KalugaLabel+SwiftUI.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "KalugaLabel+SwiftUI.generated.swift"; sourceTree = "<group>"; };
+		D7A59766D89528BA5F4327BD /* Subject.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Subject.generated.swift; sourceTree = "<group>"; };
+		EA317627E5725424F6B7569C /* KalugaDate+Extensions.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "KalugaDate+Extensions.generated.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -139,6 +186,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2034C13A2937B494003A6D19 /* PartialSheet in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -292,6 +340,7 @@
 				746CAD9D15ECB24F4ED84E11 /* Demo */,
 				7492DE0914511F3DC96A30A8 /* DemoTests */,
 				74D6698E6E24A4F93E6B289A /* DemoUITests */,
+				E773590040EDC1551F0C4C30 /* Generated */,
 			);
 			sourceTree = "<group>";
 		};
@@ -362,6 +411,44 @@
 			path = Permissions;
 			sourceTree = "<group>";
 		};
+		B1EC995442879572D3F41147 /* KalugaSwiftUI */ = {
+			isa = PBXGroup;
+			children = (
+				12F49DA13243DC3767266475 /* Color+Color.generated.swift */,
+				167E723C40578BBD9EAA6559 /* ContainerView.generated.swift */,
+				93070CB7E1723F904DBEDD26 /* DefaultValues.generated.swift */,
+				27D181CE83615D345BB56946 /* HasDefaultValue.generated.swift */,
+				7CF72582307421E9939C863E /* KalugaBackgroundStyle+SwiftUI.generated.swift */,
+				5304E64813F87A2C71BD40C2 /* KalugaButton+SwiftUI.generated.swift */,
+				EA317627E5725424F6B7569C /* KalugaDate+Extensions.generated.swift */,
+				CCF6BD3638095E5452785FF3 /* KalugaLabel+SwiftUI.generated.swift */,
+				382B35FA85A28992FE37B803 /* KalugaStyledString+SwiftUI.generated.swift */,
+				095989173871C8CDA70C49E1 /* LazyView.generated.swift */,
+				A8678F48E60D40E6AB06177C /* LifecycleViewModel.generated.swift */,
+				31718DE342D28B4942D37524 /* ListObservable.generated.swift */,
+				3EC460D671184DBFD03C42FB /* ListSubject.generated.swift */,
+				A1AD210B87A46DBD057A7D28 /* Navigation.generated.swift */,
+				7C9189D92DAF37F9815ECFDC /* NavigationBarColor.generated.swift */,
+				6681B8FDABE90D9625CA407A /* Observable.generated.swift */,
+				89DAFF461D97215C4B63A0A1 /* PlatformMappers.generated.swift */,
+				1DA3213EF5694917A0138255 /* PlatformValueMapper.generated.swift */,
+				896B16F89BA730B7FBF42625 /* RoutingState.generated.swift */,
+				4A2BAEDD60E67CE8F9277AC6 /* Shape+Helpers.generated.swift */,
+				D7A59766D89528BA5F4327BD /* Subject.generated.swift */,
+				744B1E9043B534F8B9BD501C /* UninitializedObservable.generated.swift */,
+				8165D122BD8D8848D7242385 /* UninitializedSubject.generated.swift */,
+			);
+			path = KalugaSwiftUI;
+			sourceTree = "<group>";
+		};
+		E773590040EDC1551F0C4C30 /* Generated */ = {
+			isa = PBXGroup;
+			children = (
+				B1EC995442879572D3F41147 /* KalugaSwiftUI */,
+			);
+			path = Generated;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -398,6 +485,9 @@
 			dependencies = (
 			);
 			name = Demo;
+			packageProductDependencies = (
+				2034C1392937B494003A6D19 /* PartialSheet */,
+			);
 			productName = Demo;
 			productReference = 746E133CAEC5C7B1D516B11F /* Demo.app */;
 			productType = "com.apple.product-type.application";
@@ -444,6 +534,9 @@
 				Base,
 			);
 			mainGroup = 745520950D85E4696686141D;
+			packageReferences = (
+				2034C1382937B494003A6D19 /* XCRemoteSwiftPackageReference "PartialSheet" */,
+			);
 			productRefGroup = 747A549D9FF0D1B49E65E190 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -540,6 +633,29 @@
 				4B54CB212369DA6600B69B2D /* AlertsViewController.swift in Sources */,
 				2073D0F0270303B3002CB856 /* ButtonViewController.swift in Sources */,
 				20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */,
+				93EC5B31E0ADDED3225B15C9 /* Color+Color.generated.swift in Sources */,
+				7ECE3B4F9AD53DA93EF73B0E /* ContainerView.generated.swift in Sources */,
+				73DBBA374F2ED176BCF8E189 /* DefaultValues.generated.swift in Sources */,
+				42B12B5CFE87189A5F539B92 /* HasDefaultValue.generated.swift in Sources */,
+				D174F54A364898AC7E0962FC /* KalugaBackgroundStyle+SwiftUI.generated.swift in Sources */,
+				D976FB8DC34A35578A995B2E /* KalugaButton+SwiftUI.generated.swift in Sources */,
+				7C49888336FE57AAA89E7958 /* KalugaDate+Extensions.generated.swift in Sources */,
+				319A4712667C1DC1B422411A /* KalugaLabel+SwiftUI.generated.swift in Sources */,
+				F62F6B35C805651F41B90380 /* KalugaStyledString+SwiftUI.generated.swift in Sources */,
+				C77C23B538A4DFB02C0E0773 /* LazyView.generated.swift in Sources */,
+				1E3CD7CB5C78456A64FD6847 /* LifecycleViewModel.generated.swift in Sources */,
+				8679BDAA7F79F92DAC24AF23 /* ListObservable.generated.swift in Sources */,
+				62D65713EC7DD3C712D864BB /* ListSubject.generated.swift in Sources */,
+				008D2380957750839A7B501C /* Navigation.generated.swift in Sources */,
+				C9555693B015ADE12795997D /* NavigationBarColor.generated.swift in Sources */,
+				D17DC9D74F0BD77D12813366 /* Observable.generated.swift in Sources */,
+				6BBAC6F7C1C74608F52D7FF7 /* PlatformMappers.generated.swift in Sources */,
+				37B9F4481D30F2FC895AB554 /* PlatformValueMapper.generated.swift in Sources */,
+				847C2A647F23AF46CED079CF /* RoutingState.generated.swift in Sources */,
+				C0C827F580A4F1950E9B10EE /* Shape+Helpers.generated.swift in Sources */,
+				300D5D65F49D6711AC8FF5DA /* Subject.generated.swift in Sources */,
+				2EF7D8289105AC623E600829 /* UninitializedObservable.generated.swift in Sources */,
+				1529FF0B35BD7AB3B6E838A9 /* UninitializedSubject.generated.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -651,7 +767,8 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -662,7 +779,11 @@
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
 				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -684,7 +805,10 @@
 				);
 				INFOPLIST_FILE = Demo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
@@ -703,7 +827,11 @@
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoUITests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -779,7 +907,11 @@
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
 				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -793,7 +925,11 @@
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoUITests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.splendo.mpp.demo.DemoUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -816,7 +952,10 @@
 				);
 				INFOPLIST_FILE = Demo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
@@ -870,6 +1009,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		2034C1382937B494003A6D19 /* XCRemoteSwiftPackageReference "PartialSheet" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/AndreaMiotto/PartialSheet.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 3.0.0;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		2034C1392937B494003A6D19 /* PartialSheet */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 2034C1382937B494003A6D19 /* XCRemoteSwiftPackageReference "PartialSheet" */;
+			productName = PartialSheet;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 7477FD4305C126F92DB837CC /* Project object */;
 }
diff --git a/example/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/example/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 000000000..cbe8ba8d5
--- /dev/null
+++ b/example/ios/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "partialsheet",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/AndreaMiotto/PartialSheet.git",
+      "state" : {
+        "revision" : "318f18bfabd2b2ddf785babd2e53bd593c00a254",
+        "version" : "3.1.0"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
new file mode 160000
index 000000000..ea551475b
--- /dev/null
+++ b/example/ios/Kaluga-SwiftUI
@@ -0,0 +1 @@
+Subproject commit ea551475bdc7424e76b006ecb8d0b6aec290a5b7
diff --git a/example/ios/kaluga.sourcery.yml b/example/ios/kaluga.sourcery.yml
new file mode 100644
index 000000000..613a32152
--- /dev/null
+++ b/example/ios/kaluga.sourcery.yml
@@ -0,0 +1,19 @@
+project:
+  file: ./Demo.xcodeproj
+  target:
+    name: Demo
+templates:
+  - Kaluga-SwiftUI/stencils/
+output:
+  path: ./Generated/KalugaSwiftUI
+  link: 
+     project: ./Demo.xcodeproj
+     targets: [Demo]
+     group: Generated/KalugaSwiftUI
+args:
+  sharedFrameworkName: KalugaExampleShared
+  includeResources: true
+  includeAlerts: true
+  includeHud: true
+  includeDatePicker: true
+  includePartialSheet: true

From fb9619bc3aaba8e199b51f4ff306ec7a30f487e5 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 1 Dec 2022 10:00:07 +0100
Subject: [PATCH 047/227] Adding SwiftUI views

---
 example/ios/Demo.xcodeproj/project.pbxproj    | 12 +++
 ...wiftUIOrUIKitSelectionViewController.swift | 87 +++++++++++++++++++
 .../ui/SwiftUIOrUIKitSelectionViewModel.kt    |  4 +-
 3 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index a67a777c3..32a604374 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -11,6 +11,7 @@
 		1529FF0B35BD7AB3B6E838A9 /* UninitializedSubject.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8165D122BD8D8848D7242385 /* UninitializedSubject.generated.swift */; };
 		1E3CD7CB5C78456A64FD6847 /* LifecycleViewModel.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8678F48E60D40E6AB06177C /* LifecycleViewModel.generated.swift */; };
 		2017B1C52400175C00F9072A /* PermissionListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2017B1C42400175C00F9072A /* PermissionListViewController.swift */; };
+		201EA2192937C32000C562EC /* SwiftUIOrUIKitSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA2182937C32000C562EC /* SwiftUIOrUIKitSelectionViewController.swift */; };
 		2034C13A2937B494003A6D19 /* PartialSheet in Frameworks */ = {isa = PBXBuildFile; productRef = 2034C1392937B494003A6D19 /* PartialSheet */; };
 		20524A24257BEA1E0054B57E /* DateTimePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */; };
 		205747572397C9C400CDE25E /* KeyboardManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */; };
@@ -104,6 +105,7 @@
 		167E723C40578BBD9EAA6559 /* ContainerView.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ContainerView.generated.swift; sourceTree = "<group>"; };
 		1DA3213EF5694917A0138255 /* PlatformValueMapper.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = PlatformValueMapper.generated.swift; sourceTree = "<group>"; };
 		2017B1C42400175C00F9072A /* PermissionListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionListViewController.swift; sourceTree = "<group>"; };
+		201EA2182937C32000C562EC /* SwiftUIOrUIKitSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIOrUIKitSelectionViewController.swift; sourceTree = "<group>"; };
 		20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimePickerViewController.swift; sourceTree = "<group>"; };
 		205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardManagerViewController.swift; sourceTree = "<group>"; };
 		205AF6552488F017001BD99E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Demo/Base.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -193,6 +195,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		201EA2172937C2CC00C562EC /* UITypeSelection */ = {
+			isa = PBXGroup;
+			children = (
+				201EA2182937C32000C562EC /* SwiftUIOrUIKitSelectionViewController.swift */,
+			);
+			path = UITypeSelection;
+			sourceTree = "<group>";
+		};
 		20524A22257BEA020054B57E /* DateTimePicker */ = {
 			isa = PBXGroup;
 			children = (
@@ -347,6 +357,7 @@
 		746CAD9D15ECB24F4ED84E11 /* Demo */ = {
 			isa = PBXGroup;
 			children = (
+				201EA2172937C2CC00C562EC /* UITypeSelection */,
 				20D8CD3526FE8FBA00D14AC9 /* Resources */,
 				648214DD263095A900CDAE05 /* Demo.entitlements */,
 				641CC0D625CAC0A1001E1CD1 /* Links */,
@@ -645,6 +656,7 @@
 				C77C23B538A4DFB02C0E0773 /* LazyView.generated.swift in Sources */,
 				1E3CD7CB5C78456A64FD6847 /* LifecycleViewModel.generated.swift in Sources */,
 				8679BDAA7F79F92DAC24AF23 /* ListObservable.generated.swift in Sources */,
+				201EA2192937C32000C562EC /* SwiftUIOrUIKitSelectionViewController.swift in Sources */,
 				62D65713EC7DD3C712D864BB /* ListSubject.generated.swift in Sources */,
 				008D2380957750839A7B501C /* Navigation.generated.swift in Sources */,
 				C9555693B015ADE12795997D /* NavigationBarColor.generated.swift in Sources */,
diff --git a/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift b/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift
new file mode 100644
index 000000000..b5d9aad54
--- /dev/null
+++ b/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift
@@ -0,0 +1,87 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import SwiftUI
+import KalugaExampleShared
+
+class SwiftUIOrUIKitSelectionViewController : UITableViewController {
+
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "SwiftOrUIKit"
+    }
+
+    static func create() {
+
+    }
+
+    var viewModel: SwiftUIOrUIKitSelectionViewModel!
+    private var lifecycleManager: LifecycleManager!
+
+    private var uiTypes = [String]()
+    private var onSelected: ((Int) -> Void)? = nil
+
+    deinit {
+        lifecycleManager.unbind()
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
+            guard let viewModel = self?.viewModel else { return [] }
+            return [
+                viewModel.uiTypes.observeInitialized { next in
+                    let uiTypes = next ?? []
+                    self?.uiTypes = uiTypes.map { ($0 as! UIType).title }
+                    self?.onSelected = { (index: Int) in viewModel.onUITypePressed(uiType: uiTypes[index] as! UIType) }
+                    self?.tableView.reloadData()
+                }
+            ]
+        }
+    }
+
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return uiTypes.count
+    }
+
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: UITypesListCell.Const.identifier, for: indexPath) as! UITypesListCell
+        cell.label.text = uiTypes[indexPath.row]
+        return cell
+    }
+
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let _ = onSelected?(indexPath.row)
+        tableView.deselectRow(at: indexPath, animated: true)
+    }
+
+}
+
+class UITypesListCell : UITableViewCell {
+
+    struct Const {
+        static let identifier = "ResourcesListCell"
+    }
+
+    @IBOutlet weak var label: UILabel!
+
+}
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ui/SwiftUIOrUIKitSelectionViewModel.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ui/SwiftUIOrUIKitSelectionViewModel.kt
index cd247b87f..87cb78879 100644
--- a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ui/SwiftUIOrUIKitSelectionViewModel.kt
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/ui/SwiftUIOrUIKitSelectionViewModel.kt
@@ -45,9 +45,9 @@ class SwiftUIOrUIKitSelectionViewModel(
         )
     )
 
-    fun onUITypePressed(feature: UIType) {
+    fun onUITypePressed(uiType: UIType) {
         navigator.navigate(
-            when (feature) {
+            when (uiType) {
                 is UIType.SwiftUI -> SwiftUIOrUIKitNavigationAction.SwiftUI
                 is UIType.UIKit -> SwiftUIOrUIKitNavigationAction.UIKit
             }

From addfb9724c38f8328ed6f60c9ee9e76c80314a44 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 1 Dec 2022 10:06:23 +0100
Subject: [PATCH 048/227] Fixed crash if no local properties

---
 kaluga-library-components/src/main/kotlin/Library.kt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/kaluga-library-components/src/main/kotlin/Library.kt b/kaluga-library-components/src/main/kotlin/Library.kt
index 9aaac8215..62b6aba97 100644
--- a/kaluga-library-components/src/main/kotlin/Library.kt
+++ b/kaluga-library-components/src/main/kotlin/Library.kt
@@ -32,7 +32,13 @@ val Project.Library get() = libraries.getOrPut(this) { Library(this) }
 
 class Library(project: Project) {
 
-    private val props: Properties = File("${project.rootProject.buildDir.absolutePath}/../local.properties").loadProperties()
+    private val props: Properties = File("${project.rootProject.buildDir.absolutePath}/../local.properties").let { file ->
+        if (file.exists) {
+            file.loadProperties()
+        } else {
+            Properties()
+        }
+    }
     private val logger = project.logger
     private val baseVersion = "1.0.0"
     val group = "com.splendo.kaluga"

From 643cb4785bd176ff5590c4c01c4181fcb484219c Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 1 Dec 2022 10:09:10 +0100
Subject: [PATCH 049/227] Update
 test-utils-base/src/iosMain/kotlin/mainBackground.kt

Co-authored-by: Tijl <tijl@houtbecke.rs>
---
 test-utils-base/src/iosMain/kotlin/mainBackground.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-utils-base/src/iosMain/kotlin/mainBackground.kt b/test-utils-base/src/iosMain/kotlin/mainBackground.kt
index 36e2a7b82..e9dd5aa7b 100644
--- a/test-utils-base/src/iosMain/kotlin/mainBackground.kt
+++ b/test-utils-base/src/iosMain/kotlin/mainBackground.kt
@@ -27,7 +27,7 @@ import kotlin.system.exitProcess
 fun mainBackground(args: Array<String>) {
     debug("using background thread for iOS tests")
     val worker = Worker.start(name = "kaluga-test-background")
-    worker.execute(TransferMode.SAFE, { args }) {
+    worker.execute(TransferMode.SAFE, { args }) { // TransferMode has no effect with the new memory manager in use
         val result = testLauncherEntryPoint(it)
         exitProcess(result)
     }

From c06162d65e4be837baa39612e86bbf27675ecbcf Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 1 Dec 2022 11:20:56 +0100
Subject: [PATCH 050/227] Fixed problems compiling AndroidTest

---
 alerts/build.gradle.kts                                   | 1 +
 date-time-picker/build.gradle.kts                         | 4 ++++
 kaluga-library-components/src/main/kotlin/Dependencies.kt | 5 ++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/alerts/build.gradle.kts b/alerts/build.gradle.kts
index f469ee5a7..38b66a17c 100644
--- a/alerts/build.gradle.kts
+++ b/alerts/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
 dependencies {
     implementationDependency(Dependencies.AndroidX.Fragment)
     testImplementationDependency(Dependencies.AndroidX.FragmentKtx)
+    androidTestImplementationDependency(Dependencies.AndroidX.Activity.Ktx)
 }
 
 publishableComponent()
diff --git a/date-time-picker/build.gradle.kts b/date-time-picker/build.gradle.kts
index b00b0eb02..2f1bf40bd 100644
--- a/date-time-picker/build.gradle.kts
+++ b/date-time-picker/build.gradle.kts
@@ -8,6 +8,10 @@ plugins {
 
 publishableComponent()
 
+dependencies {
+    androidTestImplementationDependency(Dependencies.AndroidX.Activity.Ktx)
+}
+
 kotlin {
     sourceSets {
         getByName("commonMain") {
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index 1723996fc..871ed11e8 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -97,7 +97,10 @@ object Dependencies {
 
         object Activity {
             private const val group = "$groupBase.activity"
-            val Compose = Dependency(group, "activity-compose", "1.6.0")
+            private const val version = "1.6.0"
+            val Activity = Dependency(group, "activity", version)
+            val Ktx = Dependency(group, "activity-ktx", version)
+            val Compose = Dependency(group, "activity-compose", version)
         }
         val AppCompat = Dependency("$groupBase.appcompat", "appcompat", "1.5.1")
         val ArchCore = Dependency("$groupBase.arch.core", "core-testing", "2.1.0")

From 1272807de84091c641e654e8d67b19c91e1f781e Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 1 Dec 2022 12:21:19 +0100
Subject: [PATCH 051/227] Fixing Android connected check causing failures

---
 kaluga-library-components/src/main/kotlin/Component.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index 3e49adf2e..c898ba3e8 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -75,8 +75,12 @@ fun Project.commonComponent() {
             it.name.startsWith("${project.name}-") || it.name.endsWith("-${project.name}")
         }?.forEach {
             logger.info("[connect_check_expansion] :${project.name}:connectedDebugAndroidTest dependsOn:${name}:connectedDebugAndroidTest")
-             tasks.getByPath("connectedDebugAndroidTest")
-                 .dependsOn(":${name}:connectedDebugAndroidTest")
+            try {
+                tasks.getByPath("connectedDebugAndroidTest")
+                    .dependsOn(":${name}:connectedDebugAndroidTest")
+            } catch (e : org.gradle.api.UnknownTaskException) {
+                logger.info("connectedDebugAndroidTest not supported")
+            }
         }
     }
 }

From e5377b337b3971a3f3165750e51aafa4303d8836 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 1 Dec 2022 12:25:25 +0100
Subject: [PATCH 052/227] Added back forgotten afterEvaluate

---
 kaluga-library-components/src/main/kotlin/Component.kt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index c898ba3e8..209d965f2 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -74,12 +74,10 @@ fun Project.commonComponent() {
         parent?.subprojects?.filter {
             it.name.startsWith("${project.name}-") || it.name.endsWith("-${project.name}")
         }?.forEach {
-            logger.info("[connect_check_expansion] :${project.name}:connectedDebugAndroidTest dependsOn:${name}:connectedDebugAndroidTest")
-            try {
+            afterEvaluate {
+                logger.info("[connect_check_expansion] :${project.name}:connectedDebugAndroidTest dependsOn:${name}:connectedDebugAndroidTest")
                 tasks.getByPath("connectedDebugAndroidTest")
                     .dependsOn(":${name}:connectedDebugAndroidTest")
-            } catch (e : org.gradle.api.UnknownTaskException) {
-                logger.info("connectedDebugAndroidTest not supported")
             }
         }
     }

From ad20b42b480d2b83e360b2d2186d30889593daa8 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 1 Dec 2022 12:32:54 +0100
Subject: [PATCH 053/227] Proper scope

---
 kaluga-library-components/src/main/kotlin/Component.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index 209d965f2..7c5dac75b 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -74,7 +74,7 @@ fun Project.commonComponent() {
         parent?.subprojects?.filter {
             it.name.startsWith("${project.name}-") || it.name.endsWith("-${project.name}")
         }?.forEach {
-            afterEvaluate {
+            it.afterEvaluate {
                 logger.info("[connect_check_expansion] :${project.name}:connectedDebugAndroidTest dependsOn:${name}:connectedDebugAndroidTest")
                 tasks.getByPath("connectedDebugAndroidTest")
                     .dependsOn(":${name}:connectedDebugAndroidTest")

From d5fde6bc7dfc605a77d49d263e76dca016859a95 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 1 Dec 2022 12:42:47 +0100
Subject: [PATCH 054/227] More corrections on AndroidTest gradle

---
 kaluga-library-components/src/main/kotlin/Component.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index 7c5dac75b..8dce05f5c 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -73,11 +73,11 @@ fun Project.commonComponent() {
     if (Library.connectCheckExpansion) {
         parent?.subprojects?.filter {
             it.name.startsWith("${project.name}-") || it.name.endsWith("-${project.name}")
-        }?.forEach {
-            it.afterEvaluate {
-                logger.info("[connect_check_expansion] :${project.name}:connectedDebugAndroidTest dependsOn:${name}:connectedDebugAndroidTest")
+        }?.forEach { module ->
+            afterEvaluate {
+                logger.info("[connect_check_expansion] :${project.name}:connectedDebugAndroidTest dependsOn:${module.name}:connectedDebugAndroidTest")
                 tasks.getByPath("connectedDebugAndroidTest")
-                    .dependsOn(":${name}:connectedDebugAndroidTest")
+                    .dependsOn(":${module.name}:connectedDebugAndroidTest")
             }
         }
     }

From d07e23f2f7d90a6c99397975d3c8e45148b40c7c Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 1 Dec 2022 15:25:26 +0100
Subject: [PATCH 055/227] Added SwiftUI for Alerts/HUD/DateTime

---
 example/ios/Demo.xcodeproj/project.pbxproj    | 24 ++++-
 example/ios/Demo/Alerts/AlertsView.swift      | 56 +++++++++++
 .../Demo/Alerts/AlertsViewController.swift    |  2 +
 ...swift => ArchitectureViewController.swift} |  2 +
 .../ios/Demo/Base.lproj/Localizable.strings   |  4 +
 example/ios/Demo/Base.lproj/Main.storyboard   | 93 ++++++++++++++-----
 .../Demo/Beacons/BeaconsViewController.swift  |  2 +
 ...BluetoothDeviceDetailsViewController.swift | 10 +-
 .../Bluetooth/BluetoothViewController.swift   |  6 +-
 .../DateTimePicker/DateTimePickerView.swift   | 56 +++++++++++
 .../DateTimePickerViewController.swift        | 12 +++
 example/ios/Demo/ExampleViewController.swift  |  2 +
 .../FeaturesListViewController.swift          | 22 ++++-
 .../ios/Demo/Helpers/String+Localized.swift   | 23 +++++
 .../KeyboardManagerViewController.swift       |  2 +
 .../ios/Demo/Links/LinksViewController.swift  |  2 +
 .../Demo/LoadingIndicator/LoadingView.swift   | 50 ++++++++++
 .../LoadingViewController.swift               | 11 +++
 .../Location/LocationViewController.swift     |  2 +
 .../PermissionListViewController.swift        |  2 +
 .../PermissionViewController.swift            | 10 +-
 .../Network/NetworkViewController.swift       |  2 +
 .../Demo/System/SystemViewController.swift    |  2 +
 ...wiftUIOrUIKitSelectionViewController.swift | 20 +++-
 example/ios/Kaluga-SwiftUI                    |  2 +-
 example/ios/install.sh                        |  4 +
 26 files changed, 378 insertions(+), 45 deletions(-)
 create mode 100644 example/ios/Demo/Alerts/AlertsView.swift
 rename example/ios/Demo/Architecture/{ArchitectureInputViewController.swift => ArchitectureViewController.swift} (98%)
 create mode 100644 example/ios/Demo/DateTimePicker/DateTimePickerView.swift
 create mode 100644 example/ios/Demo/Helpers/String+Localized.swift
 create mode 100644 example/ios/Demo/LoadingIndicator/LoadingView.swift
 create mode 100755 example/ios/install.sh

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 32a604374..ac02cbad2 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -12,6 +12,10 @@
 		1E3CD7CB5C78456A64FD6847 /* LifecycleViewModel.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8678F48E60D40E6AB06177C /* LifecycleViewModel.generated.swift */; };
 		2017B1C52400175C00F9072A /* PermissionListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2017B1C42400175C00F9072A /* PermissionListViewController.swift */; };
 		201EA2192937C32000C562EC /* SwiftUIOrUIKitSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA2182937C32000C562EC /* SwiftUIOrUIKitSelectionViewController.swift */; };
+		201EA21B2938E23600C562EC /* AlertsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA21A2938E23600C562EC /* AlertsView.swift */; };
+		201EA21D2938E89300C562EC /* DateTimePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA21C2938E89300C562EC /* DateTimePickerView.swift */; };
+		201EA21F2938EB5200C562EC /* String+Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA21E2938EB5200C562EC /* String+Localized.swift */; };
+		201EA2212938ECE700C562EC /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA2202938ECE700C562EC /* LoadingView.swift */; };
 		2034C13A2937B494003A6D19 /* PartialSheet in Frameworks */ = {isa = PBXBuildFile; productRef = 2034C1392937B494003A6D19 /* PartialSheet */; };
 		20524A24257BEA1E0054B57E /* DateTimePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */; };
 		205747572397C9C400CDE25E /* KeyboardManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */; };
@@ -27,7 +31,7 @@
 		20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */; };
 		20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */; };
 		20C7D1D52469B25B00C9A63F /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D42469B25B00C9A63F /* InfoViewController.swift */; };
-		20C7D1D8246A93A600C9A63F /* ArchitectureInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */; };
+		20C7D1D8246A93A600C9A63F /* ArchitectureViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D7246A93A600C9A63F /* ArchitectureViewController.swift */; };
 		20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */; };
 		20CA2905293796C5007E4079 /* BottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20CA2904293796C5007E4079 /* BottomSheetViewController.swift */; };
 		20CA2907293796D7007E4079 /* BottomSheetSubPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */; };
@@ -106,6 +110,10 @@
 		1DA3213EF5694917A0138255 /* PlatformValueMapper.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = PlatformValueMapper.generated.swift; sourceTree = "<group>"; };
 		2017B1C42400175C00F9072A /* PermissionListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionListViewController.swift; sourceTree = "<group>"; };
 		201EA2182937C32000C562EC /* SwiftUIOrUIKitSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIOrUIKitSelectionViewController.swift; sourceTree = "<group>"; };
+		201EA21A2938E23600C562EC /* AlertsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertsView.swift; sourceTree = "<group>"; };
+		201EA21C2938E89300C562EC /* DateTimePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimePickerView.swift; sourceTree = "<group>"; };
+		201EA21E2938EB5200C562EC /* String+Localized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Localized.swift"; sourceTree = "<group>"; };
+		201EA2202938ECE700C562EC /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
 		20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimePickerViewController.swift; sourceTree = "<group>"; };
 		205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardManagerViewController.swift; sourceTree = "<group>"; };
 		205AF6552488F017001BD99E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Demo/Base.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -120,7 +128,7 @@
 		20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIControl+Closure.swift"; sourceTree = "<group>"; };
 		20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturesListViewController.swift; sourceTree = "<group>"; };
 		20C7D1D42469B25B00C9A63F /* InfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoViewController.swift; sourceTree = "<group>"; };
-		20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureInputViewController.swift; sourceTree = "<group>"; };
+		20C7D1D7246A93A600C9A63F /* ArchitectureViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureViewController.swift; sourceTree = "<group>"; };
 		20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureDetailsViewController.swift; sourceTree = "<group>"; };
 		20CA2904293796C5007E4079 /* BottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetViewController.swift; sourceTree = "<group>"; };
 		20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetSubPageViewController.swift; sourceTree = "<group>"; };
@@ -207,6 +215,7 @@
 			isa = PBXGroup;
 			children = (
 				20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */,
+				201EA21C2938E89300C562EC /* DateTimePickerView.swift */,
 			);
 			path = DateTimePicker;
 			sourceTree = "<group>";
@@ -242,6 +251,7 @@
 			isa = PBXGroup;
 			children = (
 				20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */,
+				201EA21E2938EB5200C562EC /* String+Localized.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -265,7 +275,7 @@
 		20C7D1D6246A938A00C9A63F /* Architecture */ = {
 			isa = PBXGroup;
 			children = (
-				20C7D1D7246A93A600C9A63F /* ArchitectureInputViewController.swift */,
+				20C7D1D7246A93A600C9A63F /* ArchitectureViewController.swift */,
 				20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */,
 				20CA2904293796C5007E4079 /* BottomSheetViewController.swift */,
 				20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */,
@@ -288,6 +298,7 @@
 			isa = PBXGroup;
 			children = (
 				4B02E503236B221B003F0B36 /* LoadingViewController.swift */,
+				201EA2202938ECE700C562EC /* LoadingView.swift */,
 			);
 			path = LoadingIndicator;
 			sourceTree = "<group>";
@@ -304,6 +315,7 @@
 			isa = PBXGroup;
 			children = (
 				4B54CB202369DA6600B69B2D /* AlertsViewController.swift */,
+				201EA21A2938E23600C562EC /* AlertsView.swift */,
 			);
 			path = Alerts;
 			sourceTree = "<group>";
@@ -629,15 +641,18 @@
 				649979E725CCD37200348419 /* NetworkViewController.swift in Sources */,
 				20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */,
 				4BC0CBE0269F1D25000512A9 /* BeaconsViewCell.swift in Sources */,
-				20C7D1D8246A93A600C9A63F /* ArchitectureInputViewController.swift in Sources */,
+				20C7D1D8246A93A600C9A63F /* ArchitectureViewController.swift in Sources */,
 				20CA2905293796C5007E4079 /* BottomSheetViewController.swift in Sources */,
 				20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */,
+				201EA2212938ECE700C562EC /* LoadingView.swift in Sources */,
 				20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */,
+				201EA21F2938EB5200C562EC /* String+Localized.swift in Sources */,
 				649979D325CC638C00348419 /* SystemViewController.swift in Sources */,
 				978348A7235DF586005B140B /* PermissionViewController.swift in Sources */,
 				20C7D1D52469B25B00C9A63F /* InfoViewController.swift in Sources */,
 				4B02E504236B221B003F0B36 /* LoadingViewController.swift in Sources */,
 				7425815FF35195035A8991B0 /* LocationViewController.swift in Sources */,
+				201EA21B2938E23600C562EC /* AlertsView.swift in Sources */,
 				209471E624C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift in Sources */,
 				209471E424C07EAD001426CD /* BluetoothViewController.swift in Sources */,
 				20CA2907293796D7007E4079 /* BottomSheetSubPageViewController.swift in Sources */,
@@ -645,6 +660,7 @@
 				2073D0F0270303B3002CB856 /* ButtonViewController.swift in Sources */,
 				20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */,
 				93EC5B31E0ADDED3225B15C9 /* Color+Color.generated.swift in Sources */,
+				201EA21D2938E89300C562EC /* DateTimePickerView.swift in Sources */,
 				7ECE3B4F9AD53DA93EF73B0E /* ContainerView.generated.swift in Sources */,
 				73DBBA374F2ED176BCF8E189 /* DefaultValues.generated.swift in Sources */,
 				42B12B5CFE87189A5F539B92 /* HasDefaultValue.generated.swift in Sources */,
diff --git a/example/ios/Demo/Alerts/AlertsView.swift b/example/ios/Demo/Alerts/AlertsView.swift
new file mode 100644
index 000000000..92633e8f3
--- /dev/null
+++ b/example/ios/Demo/Alerts/AlertsView.swift
@@ -0,0 +1,56 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct AlertsView: View {
+
+    let lifecycleViewModel: LifecycleViewModel<AlertViewModel>
+
+    init() {
+        let container = ContainerView(.alert)
+        let viewModel = AlertViewModel(builder: container.alertBuilder)
+        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: container)
+    }
+
+    var body: some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            VStack(spacing: 10.0) {
+                viewModel.showAlertButton.toButton(
+                    buttonFrame: .frame(maxWidth: .infinity)
+                )
+                viewModel.showAndDismissAfter3SecondsButton.toButton(
+                    buttonFrame: .frame(maxWidth: .infinity)
+                )
+                viewModel.showAlertWithInputButton.toButton(
+                    buttonFrame: .frame(maxWidth: .infinity)
+                )
+                viewModel.showAlertWithListButton.toButton(
+                    buttonFrame: .frame(maxWidth: .infinity)
+                )
+                Spacer()
+            }
+        }.padding(10.0)
+            .navigationTitle(Text("feature_alerts".localized()))
+    }
+}
+
+struct AlertsView_Previews: PreviewProvider {
+    static var previews: some View {
+        AlertsView()
+    }
+}
diff --git a/example/ios/Demo/Alerts/AlertsViewController.swift b/example/ios/Demo/Alerts/AlertsViewController.swift
index 11c301548..5f29e12a4 100644
--- a/example/ios/Demo/Alerts/AlertsViewController.swift
+++ b/example/ios/Demo/Alerts/AlertsViewController.swift
@@ -45,6 +45,8 @@ class AlertsViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_alerts".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
         ButtonStyleKt.bindButton(showAlertButton, button: viewModel.showAlertButton)
         ButtonStyleKt.bindButton(showAndDismissButton, button: viewModel.showAndDismissAfter3SecondsButton)
diff --git a/example/ios/Demo/Architecture/ArchitectureInputViewController.swift b/example/ios/Demo/Architecture/ArchitectureViewController.swift
similarity index 98%
rename from example/ios/Demo/Architecture/ArchitectureInputViewController.swift
rename to example/ios/Demo/Architecture/ArchitectureViewController.swift
index 04149aefc..becce91a7 100644
--- a/example/ios/Demo/Architecture/ArchitectureInputViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureViewController.swift
@@ -68,6 +68,8 @@ class ArchitectureViewController: UIViewController  {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_architecture".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
 
             guard let viewModel = self?.viewModel else {
diff --git a/example/ios/Demo/Base.lproj/Localizable.strings b/example/ios/Demo/Base.lproj/Localizable.strings
index 91aa9e3c2..a93e12dac 100644
--- a/example/ios/Demo/Base.lproj/Localizable.strings
+++ b/example/ios/Demo/Base.lproj/Localizable.strings
@@ -110,3 +110,7 @@ That query will be deserialized into a object and shown in an alert.";
 
 "feature_system" = "System";
 "network_feature" = "Network";
+
+"ios_ui_type_selector" = "Select UI Type";
+"ios_swift_ui" = "SwiftUI";
+"ios_ui_kit" = "UIKit";
diff --git a/example/ios/Demo/Base.lproj/Main.storyboard b/example/ios/Demo/Base.lproj/Main.storyboard
index a1d91ea68..895b9d0a7 100644
--- a/example/ios/Demo/Base.lproj/Main.storyboard
+++ b/example/ios/Demo/Base.lproj/Main.storyboard
@@ -350,14 +350,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="FeaturesListCell" id="C4Y-IC-Pu4" customClass="FeaturesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51.5"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="C4Y-IC-Pu4" id="XEB-aa-Byo">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xh8-DK-zfM">
-                                            <rect key="frame" x="40" y="15" width="334" height="21.5"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -387,13 +387,11 @@
                         <segue destination="BYZ-38-t0r" kind="show" identifier="showLocation" id="25d-lm-Tpv"/>
                         <segue destination="Hbw-co-mWZ" kind="show" identifier="showPermissions" id="gxu-od-TLe"/>
                         <segue destination="7Rf-m0-GFx" kind="show" identifier="showKeyboard" id="IO5-8e-Q9F"/>
-                        <segue destination="Y7p-ku-8gX" kind="show" identifier="showDateTimePicker" id="wT7-jZ-xqh"/>
                         <segue destination="VPE-Hp-Qc9" kind="show" identifier="showLinks" id="KlM-G9-P6y"/>
                         <segue destination="NRf-rC-nl1" kind="show" identifier="showSystem" id="IT2-HT-9Hz"/>
                         <segue destination="SGP-dn-hxw" kind="show" identifier="showBluetooth" id="Z5V-Lj-mdM"/>
                         <segue destination="2CB-DJ-Qmw" kind="show" identifier="showBeacons" id="jYU-Fd-PgO"/>
                         <segue destination="Tyz-Gd-0uw" kind="show" identifier="showResources" id="R7Z-R6-fGx"/>
-                        <segue destination="Bdl-Gs-l66" kind="show" identifier="showHUD" id="Cfy-9E-GEn"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="L6W-Hz-iOT" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -455,7 +453,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="IhH-mW-4kH" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2613" y="329"/>
+            <point key="canvasLocation" x="4078" y="337"/>
         </scene>
         <!--Bluetooth View Controller-->
         <scene sceneID="YuN-Fr-cmH">
@@ -996,14 +994,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SystemListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SystemListCell" id="a8b-dW-eKx" customClass="SystemListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="52"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="a8b-dW-eKx" id="pjk-M2-4TV">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pnV-0z-POK">
-                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1038,9 +1036,9 @@
         <!--Loading View Controller-->
         <scene sceneID="kYO-hI-MfB">
             <objects>
-                <viewController id="Bdl-Gs-l66" customClass="LoadingViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="LoadingView" id="Bdl-Gs-l66" customClass="LoadingViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="b9N-r2-D7a">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lsK-x5-RrK">
@@ -1085,14 +1083,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="InfoButtonCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="InfoButtonCell" id="3eh-xF-TU3" customClass="InfoButtonCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="43"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3eh-xF-TU3" id="cyO-Cc-dq8">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odz-vr-fX0">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1133,14 +1131,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PermissionsListCell" id="FrV-FL-GKa" customClass="PermissionsListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="52"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FrV-FL-GKa" id="wA3-QT-FyZ">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nXv-Uh-BJk">
-                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1217,9 +1215,9 @@
         <!--Date Time Picker View Controller-->
         <scene sceneID="RxC-NZ-XHu">
             <objects>
-                <viewController id="Y7p-ku-8gX" customClass="DateTimePickerViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="DateTimePicker" id="Y7p-ku-8gX" customClass="DateTimePickerViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="CUa-6I-u96">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zPh-dc-WSn">
@@ -1269,7 +1267,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Ljl-id-804" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2648" y="2496"/>
+            <point key="canvasLocation" x="1946" y="2486"/>
         </scene>
         <!--Resources List View Controller-->
         <scene sceneID="O9e-U5-TLS">
@@ -1281,14 +1279,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ResourcesListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ResourcesListCell" id="YH6-gF-Pq3" customClass="ResourcesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="37"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="38"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YH6-gF-Pq3" id="yfs-Dl-hfq">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="37"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="38"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="app-pb-mRq">
-                                            <rect key="frame" x="20" y="8" width="374" height="21"/>
+                                            <rect key="frame" x="20" y="8" width="374" height="22"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1713,6 +1711,55 @@
             </objects>
             <point key="canvasLocation" x="4461" y="3449"/>
         </scene>
+        <!--SwiftUI OrUI Kit Selection View Controller-->
+        <scene sceneID="SnS-MQ-kmf">
+            <objects>
+                <tableViewController storyboardIdentifier="SwiftOrUIKit" id="koH-cS-yL2" customClass="SwiftUIOrUIKitSelectionViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="obU-8O-aFL">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="UITypesListCell" id="ZCQ-8B-OTT" customClass="UITypesListCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ZCQ-8B-OTT" id="nFY-1A-spl">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GMC-Yg-Klf">
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstAttribute="trailingMargin" secondItem="GMC-Yg-Klf" secondAttribute="trailing" constant="20" id="CLW-07-2PF"/>
+                                        <constraint firstItem="GMC-Yg-Klf" firstAttribute="leading" secondItem="nFY-1A-spl" secondAttribute="leadingMargin" constant="20" id="U8A-to-qBt"/>
+                                        <constraint firstAttribute="bottomMargin" secondItem="GMC-Yg-Klf" secondAttribute="bottom" constant="4" id="mL4-FF-wJR"/>
+                                        <constraint firstItem="GMC-Yg-Klf" firstAttribute="top" secondItem="nFY-1A-spl" secondAttribute="topMargin" constant="4" id="ymA-pk-c6V"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="label" destination="GMC-Yg-Klf" id="4HX-vP-ZQi"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="koH-cS-yL2" id="FVB-5H-GhJ"/>
+                            <outlet property="delegate" destination="koH-cS-yL2" id="0s2-Hy-i9F"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="dpZ-hi-Omn"/>
+                    <connections>
+                        <outlet property="view" destination="obU-8O-aFL" id="Qvz-gO-uTl"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="G9Q-b2-1g7" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3264" y="337"/>
+        </scene>
     </scenes>
     <resources>
         <image name="error_icon" width="14" height="14"/>
diff --git a/example/ios/Demo/Beacons/BeaconsViewController.swift b/example/ios/Demo/Beacons/BeaconsViewController.swift
index 653f7c54a..2aec082c2 100644
--- a/example/ios/Demo/Beacons/BeaconsViewController.swift
+++ b/example/ios/Demo/Beacons/BeaconsViewController.swift
@@ -50,6 +50,8 @@ class BeaconsViewController: UICollectionViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_beacons".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
 
diff --git a/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift b/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
index cb593bf85..e8a3f972c 100644
--- a/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
+++ b/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
@@ -56,7 +56,9 @@ class BluetoothDeviceDetailsViewController : UIViewController {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
-        servicesHeader.text = NSLocalizedString("bluetooth_services_header", comment: "")
+        title = "feature_bluetooth".localized()
+
+        servicesHeader.text = "bluetooth_services_header".localized()
         deviceIdentifier.text = viewModel.identifierString
 
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
@@ -150,8 +152,8 @@ class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICo
     override func awakeFromNib() {
         super.awakeFromNib()
 
-        serviceHeader.text = NSLocalizedString("bluetooth_service", comment: "")
-        characteristicsHeader.text = NSLocalizedString("bluetooth_characteristics", comment: "")
+        serviceHeader.text = "bluetooth_service".localized()
+        characteristicsHeader.text = "bluetooth_characteristics".localized()
 
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
         flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
@@ -249,7 +251,7 @@ class BluetoothCharacteristicView : UICollectionViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
 
-        descriptorsHeader.text = NSLocalizedString("bluetooth_descriptors", comment: "")
+        descriptorsHeader.text = "bluetooth_descriptors".localized()
 
         let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
         flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
diff --git a/example/ios/Demo/Bluetooth/BluetoothViewController.swift b/example/ios/Demo/Bluetooth/BluetoothViewController.swift
index 82903a4b1..840de8dd6 100644
--- a/example/ios/Demo/Bluetooth/BluetoothViewController.swift
+++ b/example/ios/Demo/Bluetooth/BluetoothViewController.swift
@@ -47,6 +47,8 @@ class BluetoothViewController : UICollectionViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_bluetooth".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
 
@@ -68,9 +70,9 @@ class BluetoothViewController : UICollectionViewController {
 
     private func updateNavigationItem(isScanning: Bool) {
         if (isScanning) {
-            self.navigationItem.setRightBarButton(UIBarButtonItem(title: NSLocalizedString("bluetooth_stop_scanning", comment: ""), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
+            self.navigationItem.setRightBarButton(UIBarButtonItem(title: "bluetooth_stop_scanning".localized(), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
         } else {
-            self.navigationItem.setRightBarButton(UIBarButtonItem(title: NSLocalizedString("bluetooth_start_scanning", comment: ""), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
+            self.navigationItem.setRightBarButton(UIBarButtonItem(title: "bluetooth_start_scanning".localized(), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
         }
     }
 
diff --git a/example/ios/Demo/DateTimePicker/DateTimePickerView.swift b/example/ios/Demo/DateTimePicker/DateTimePickerView.swift
new file mode 100644
index 000000000..bf1a9c903
--- /dev/null
+++ b/example/ios/Demo/DateTimePicker/DateTimePickerView.swift
@@ -0,0 +1,56 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct DateTimePickerView: View {
+
+    @ObservedObject var dateLabel: StringObservable
+    let lifecycleViewModel: LifecycleViewModel<DateTimePickerViewModel>
+
+    init() {
+        let container = ContainerView(.datePicker)
+        let viewModel = DateTimePickerViewModel(dateTimePickerPresenterBuilder: container.datePickerBuilder)
+        dateLabel = StringObservable(viewModel.dateLabel)
+        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: container)
+    }
+
+    var body: some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            VStack {
+                HStack(spacing: 10.0) {
+                    viewModel.selectDateButton.toButton(
+                        buttonFrame: .frame(maxWidth: .infinity)
+                    )
+                    viewModel.selectTimeButton.toButton(
+                        buttonFrame: .frame(maxWidth: .infinity)
+                    )
+                }
+                Text(viewModel.currentTimeTitle)
+                Text(dateLabel.value)
+                Spacer()
+            }
+        }.padding(10.0)
+            .navigationTitle(Text("feature_date_time_picker".localized()))
+    }
+}
+
+struct DateTimePickerView_Previews: PreviewProvider {
+    static var previews: some View {
+        DateTimePickerView()
+    }
+}
diff --git a/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift b/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
index f189e466c..f997ad129 100644
--- a/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
+++ b/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
@@ -20,6 +20,16 @@ import KalugaExampleShared
 
 class DateTimePickerViewController : UIViewController {
 
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "DateTimePicker"
+    }
+
+    static func instantiate() -> DateTimePickerViewController {
+        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! DateTimePickerViewController
+    }
+
+
     @IBOutlet private var currentTimeLabel: UILabel!
     @IBOutlet private var timeLabel: UILabel!
     @IBOutlet private var dateButton: UIButton!
@@ -35,6 +45,8 @@ class DateTimePickerViewController : UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_date_time_picker".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else {
                 return []
diff --git a/example/ios/Demo/ExampleViewController.swift b/example/ios/Demo/ExampleViewController.swift
index d6ad2d207..1a02f892d 100644
--- a/example/ios/Demo/ExampleViewController.swift
+++ b/example/ios/Demo/ExampleViewController.swift
@@ -52,6 +52,8 @@ class ExampleViewController : UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "app_name".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel, let bottomView = self?.bottomView else { return [] }
 
diff --git a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
index ffc992232..81b97fd03 100644
--- a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -83,16 +83,30 @@ class FeaturesListCell : UITableViewCell {
 private extension FeatureListNavigationAction {
     var spec: NavigationSpec {
         get {
-            let storyboard = UIStoryboard(name: "Main", bundle: nil)
             switch self {
-            case is FeatureListNavigationAction.Alerts: return NavigationSpec.Push(animated: true) { AlertsViewController.instantiate() }
+            case is FeatureListNavigationAction.Alerts: return NavigationSpec.Push(animated: true) {
+                SwiftUIOrUIKitSelectionViewController.create(
+                    uiKitViewController: { AlertsViewController.instantiate() },
+                    swiftUIView: { AlertsView() }
+                )
+            }
             case is FeatureListNavigationAction.Architecture: return NavigationSpec.Segue(identifier: "showArchitecture")
             case is FeatureListNavigationAction.Beacons: return NavigationSpec.Segue(identifier: "showBeacons")
             case is FeatureListNavigationAction.Bluetooth: return NavigationSpec.Segue(identifier: "showBluetooth")
-            case is FeatureListNavigationAction.DateTimePicker: return NavigationSpec.Segue(identifier: "showDateTimePicker")
+            case is FeatureListNavigationAction.DateTimePicker: return NavigationSpec.Push(animated: true) {
+                SwiftUIOrUIKitSelectionViewController.create(
+                    uiKitViewController: { DateTimePickerViewController.instantiate() },
+                    swiftUIView: { DateTimePickerView() }
+                )
+            }
             case is FeatureListNavigationAction.Keyboard: return NavigationSpec.Segue(identifier: "showKeyboard")
             case is FeatureListNavigationAction.Links: return NavigationSpec.Segue(identifier: "showLinks")
-            case is FeatureListNavigationAction.LoadingIndicator: return NavigationSpec.Segue(identifier: "showHUD")
+            case is FeatureListNavigationAction.LoadingIndicator: return NavigationSpec.Push(animated: true) {
+                SwiftUIOrUIKitSelectionViewController.create(
+                    uiKitViewController: { LoadingViewController.instantiate() },
+                    swiftUIView: { LoadingView() }
+                )
+            }
             case is FeatureListNavigationAction.Location: return NavigationSpec.Segue(identifier: "showLocation")
             case is FeatureListNavigationAction.Permissions: return NavigationSpec.Segue(identifier: "showPermissions")
             case is FeatureListNavigationAction.PlatformSpecific: return NavigationSpec.Segue(identifier: "showPlatformSpecific")
diff --git a/example/ios/Demo/Helpers/String+Localized.swift b/example/ios/Demo/Helpers/String+Localized.swift
new file mode 100644
index 000000000..2d4129b22
--- /dev/null
+++ b/example/ios/Demo/Helpers/String+Localized.swift
@@ -0,0 +1,23 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import Foundation
+
+extension String {
+    func localized() -> String {
+        return NSLocalizedString(self, comment: "")
+    }
+}
diff --git a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
index 94d32eda7..f99efa190 100644
--- a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
+++ b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
@@ -37,6 +37,8 @@ class KeyboardManagerViewController : UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_keyboard".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
         ButtonStyleKt.bindButton(showButton, button: viewModel.showButton)
         ButtonStyleKt.bindButton(hideButton, button: viewModel.hideButton)
diff --git a/example/ios/Demo/Links/LinksViewController.swift b/example/ios/Demo/Links/LinksViewController.swift
index 34ab58446..ccd6e55bd 100644
--- a/example/ios/Demo/Links/LinksViewController.swift
+++ b/example/ios/Demo/Links/LinksViewController.swift
@@ -34,6 +34,8 @@ class LinksViewController : UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        title = "feature_links".localized()
         
         lifecycleManager = viewModel.addLifecycleManager(parent: self) {
             [
diff --git a/example/ios/Demo/LoadingIndicator/LoadingView.swift b/example/ios/Demo/LoadingIndicator/LoadingView.swift
new file mode 100644
index 000000000..35591de5d
--- /dev/null
+++ b/example/ios/Demo/LoadingIndicator/LoadingView.swift
@@ -0,0 +1,50 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct LoadingView: View {
+
+    let lifecycleViewModel: LifecycleViewModel<HudViewModel>
+
+    init() {
+        let container = ContainerView(.hud)
+        let viewModel = HudViewModel(builder: container.hudBuilder)
+        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: container)
+    }
+
+    var body: some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            VStack(spacing: 10.0) {
+                viewModel.showSystemButton.toButton(
+                    buttonFrame: .frame(maxWidth: .infinity)
+                )
+                viewModel.showCustomButton.toButton(
+                    buttonFrame: .frame(maxWidth: .infinity)
+                )
+                Spacer()
+            }
+        }.padding(10.0)
+            .navigationTitle(Text("feature_hud".localized()))
+    }
+}
+
+struct LoadingView_Previews: PreviewProvider {
+    static var previews: some View {
+        LoadingView()
+    }
+}
diff --git a/example/ios/Demo/LoadingIndicator/LoadingViewController.swift b/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
index 73dce2fe1..14f76d58e 100644
--- a/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
+++ b/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
@@ -20,6 +20,15 @@ import KalugaExampleShared
 
 class LoadingViewController: UIViewController {
 
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "LoadingView"
+    }
+
+    static func instantiate() -> LoadingViewController {
+        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! LoadingViewController
+    }
+
     @IBOutlet private var systemButton: UIButton!
     @IBOutlet private var customButton: UIButton!
 
@@ -33,6 +42,8 @@ class LoadingViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_hud".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
         ButtonStyleKt.bindButton(systemButton, button: viewModel.showSystemButton)
         ButtonStyleKt.bindButton(customButton, button: viewModel.showCustomButton)
diff --git a/example/ios/Demo/Location/LocationViewController.swift b/example/ios/Demo/Location/LocationViewController.swift
index 2b82f3b9c..6e682748a 100644
--- a/example/ios/Demo/Location/LocationViewController.swift
+++ b/example/ios/Demo/Location/LocationViewController.swift
@@ -40,6 +40,8 @@ class LocationViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_location".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else {
                 return []
diff --git a/example/ios/Demo/Permissions/PermissionListViewController.swift b/example/ios/Demo/Permissions/PermissionListViewController.swift
index 2fd828e7c..5c08a8ddc 100644
--- a/example/ios/Demo/Permissions/PermissionListViewController.swift
+++ b/example/ios/Demo/Permissions/PermissionListViewController.swift
@@ -42,6 +42,8 @@ class PermissionListViewController : UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_permissions".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             return [
diff --git a/example/ios/Demo/Permissions/PermissionViewController.swift b/example/ios/Demo/Permissions/PermissionViewController.swift
index 4bca12051..10ec6992f 100644
--- a/example/ios/Demo/Permissions/PermissionViewController.swift
+++ b/example/ios/Demo/Permissions/PermissionViewController.swift
@@ -34,7 +34,7 @@ class PermissionViewController: UIViewController {
     
     @IBOutlet weak var permissionStateLabel: UILabel!
     @IBOutlet weak var requestPermissionButton: UIButton!
-    
+
     var viewModel: PermissionViewModel!
     private var lifecycleManager: LifecycleManager!
 
@@ -45,7 +45,9 @@ class PermissionViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        requestPermissionButton.setTitle(NSLocalizedString("permission_request", comment: ""), for: .normal)
+        title = viewModel.title
+
+        requestPermissionButton.setTitle("permission_request".localized(), for: .normal)
 
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
 
@@ -64,8 +66,8 @@ class PermissionViewController: UIViewController {
                         return
                     }
 
-                    let alert = UIAlertController(title: NSLocalizedString("permission_request", comment: ""), message: message, preferredStyle: .alert)
-                    alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default, handler: nil))
+                    let alert = UIAlertController(title: "permission_request".localized(), message: message, preferredStyle: .alert)
+                    alert.addAction(UIAlertAction(title: "OK".localized(), style: .default, handler: nil))
                     self?.present(alert, animated: true, completion: nil)
 
                 },
diff --git a/example/ios/Demo/System/Network/NetworkViewController.swift b/example/ios/Demo/System/Network/NetworkViewController.swift
index ead546b08..c874dfc59 100644
--- a/example/ios/Demo/System/Network/NetworkViewController.swift
+++ b/example/ios/Demo/System/Network/NetworkViewController.swift
@@ -32,6 +32,8 @@ class NetworkViewController : UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        title = "network_feature".localized()
         
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
diff --git a/example/ios/Demo/System/SystemViewController.swift b/example/ios/Demo/System/SystemViewController.swift
index 0f8cf0bcb..9bb3c7565 100644
--- a/example/ios/Demo/System/SystemViewController.swift
+++ b/example/ios/Demo/System/SystemViewController.swift
@@ -40,6 +40,8 @@ class SystemViewController : UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_system".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else {
                 return []
diff --git a/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift b/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift
index b5d9aad54..de189bb35 100644
--- a/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift
+++ b/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift
@@ -25,8 +25,20 @@ class SwiftUIOrUIKitSelectionViewController : UITableViewController {
         static let storyboardId = "SwiftOrUIKit"
     }
 
-    static func create() {
-
+    static func create(uiKitViewController: @escaping () -> UIViewController, swiftUIView: @escaping () -> some View) -> SwiftUIOrUIKitSelectionViewController {
+        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! SwiftUIOrUIKitSelectionViewController
+
+        let navigator = ViewControllerNavigator<SwiftUIOrUIKitNavigationAction>(parentVC: vc) { action in
+            switch action {
+            case is SwiftUIOrUIKitNavigationAction.SwiftUI: return NavigationSpec.Push(animated: true) {
+                UIHostingController(rootView: swiftUIView())
+            }
+            case is SwiftUIOrUIKitNavigationAction.UIKit: return NavigationSpec.Push(animated: true, push: uiKitViewController)
+            default: fatalError("Unknown navigation action \(action)")
+            }
+        }
+        vc.viewModel = SwiftUIOrUIKitSelectionViewModel(navigator: navigator)
+        return vc
     }
 
     var viewModel: SwiftUIOrUIKitSelectionViewModel!
@@ -42,6 +54,8 @@ class SwiftUIOrUIKitSelectionViewController : UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "ios_ui_type_selector".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             return [
@@ -79,7 +93,7 @@ class SwiftUIOrUIKitSelectionViewController : UITableViewController {
 class UITypesListCell : UITableViewCell {
 
     struct Const {
-        static let identifier = "ResourcesListCell"
+        static let identifier = "UITypesListCell"
     }
 
     @IBOutlet weak var label: UILabel!
diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index ea551475b..7213cdb60 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit ea551475bdc7424e76b006ecb8d0b6aec290a5b7
+Subproject commit 7213cdb60957e12ab50ff5ddb0ed7cae76e6abbb
diff --git a/example/ios/install.sh b/example/ios/install.sh
new file mode 100755
index 000000000..66918f9b4
--- /dev/null
+++ b/example/ios/install.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+sourcery
+sourcery --config ./kaluga.sourcery.yml

From 1ba78070527204e53e2b99494b822380f6e7c063 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 5 Dec 2022 11:00:33 +0100
Subject: [PATCH 056/227] Rename some Kaluga resource classes to deal with
 conflicts

---
 .../iosMain/kotlin/navigation/Navigator.kt    |   6 +
 .../example/resources/xml/ColorsActivity.kt   |   2 +-
 example/ios/Demo.xcodeproj/project.pbxproj    |  16 ++
 example/ios/Demo/AppDelegate.swift            |   2 +-
 example/ios/Demo/Base.lproj/Main.storyboard   |   9 +-
 .../FeaturesListViewController.swift          |   7 +-
 example/ios/Demo/Resources/ButtonView.swift   |  52 +++++
 .../Demo/Resources/ButtonViewController.swift |   3 +
 example/ios/Demo/Resources/ColorView.swift    | 140 +++++++++++++
 .../Demo/Resources/ColorViewController.swift  |  33 ++--
 example/ios/Demo/Resources/LabelView.swift    |  48 +++++
 .../Demo/Resources/LabelViewController.swift  |   2 +
 .../Demo/Resources/ResourcesListView.swift    |  94 +++++++++
 .../ResourcesListViewController.swift         |  11 ++
 example/ios/Kaluga-SwiftUI                    |   2 +-
 .../example/shared/stylable/ButtonStyles.kt   | 184 +++++++++---------
 .../example/shared/stylable/TextStyles.kt     |   4 +-
 .../viewmodel/resources/ButtonViewModel.kt    |   4 +-
 .../viewmodel/resources/ColorViewModel.kt     |  20 +-
 .../viewmodel/resources/LabelViewModel.kt     |   6 +-
 .../androidLibMain/kotlin/BackgroundStyle.kt  |  38 ++--
 .../src/androidLibMain/kotlin/KalugaButton.kt |  12 +-
 .../androidLibMain/kotlin/TextAlignment.kt    |  14 +-
 .../src/androidLibMain/kotlin/Binding.kt      |  26 ++-
 resources/README.md                           |  26 +--
 .../kotlin/view/BackgroundStyle.kt            |  40 ++--
 .../src/androidLibMain/kotlin/view/Button.kt  |   4 +-
 .../kotlin/view/TextAlignment.kt              |  14 +-
 .../src/commonMain/kotlin/StyledString.kt     |   4 +-
 ...roundStyle.kt => KalugaBackgroundStyle.kt} |   2 +-
 .../{ButtonStyle.kt => KalugaButtonStyle.kt}  |  16 +-
 ...extAlignment.kt => KalugaTextAlignment.kt} |   2 +-
 .../commonMain/kotlin/stylable/TextStyle.kt   |   2 +-
 .../commonMain/kotlin/view/KalugaButton.kt    |   8 +-
 resources/src/iosMain/kotlin/StyledString.kt  |   4 +-
 .../iosMain/kotlin/uikit/BackgroundStyle.kt   |  32 +--
 .../src/iosMain/kotlin/uikit/ButtonStyle.kt   |   4 +-
 .../src/iosMain/kotlin/uikit/TextAlignment.kt |  26 +--
 38 files changed, 653 insertions(+), 266 deletions(-)
 create mode 100644 example/ios/Demo/Resources/ButtonView.swift
 create mode 100644 example/ios/Demo/Resources/ColorView.swift
 create mode 100644 example/ios/Demo/Resources/LabelView.swift
 create mode 100644 example/ios/Demo/Resources/ResourcesListView.swift
 rename resources/src/commonMain/kotlin/stylable/{BackgroundStyle.kt => KalugaBackgroundStyle.kt} (98%)
 rename resources/src/commonMain/kotlin/stylable/{ButtonStyle.kt => KalugaButtonStyle.kt} (81%)
 rename resources/src/commonMain/kotlin/stylable/{TextAlignment.kt => KalugaTextAlignment.kt} (95%)

diff --git a/architecture/src/iosMain/kotlin/navigation/Navigator.kt b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
index 2cebdf3f8..9ca23f122 100644
--- a/architecture/src/iosMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
@@ -63,6 +63,12 @@ actual interface Navigator<A : NavigationAction<*>> {
     actual fun navigate(action: A)
 }
 
+class DefaultNavigator<A : NavigationAction<*>>(val onAction: (A) -> Unit) : Navigator<A> {
+    override fun navigate(action: A) {
+        onAction(action)
+    }
+}
+
 /**
  * Implementation of [Navigator] used for navigating to and from [UIViewController]. Takes a mapper function to map all [NavigationAction] to a [NavigationSpec]
  * Whenever [navigate] is called, this class maps it to a [NavigationSpec] and performs navigation according to that
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
index b3b296c9c..50f230366 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
@@ -28,7 +28,7 @@ import com.splendo.kaluga.example.databinding.ActivityResourcesColorBinding
 import com.splendo.kaluga.example.databinding.ViewResourceListBackgroundBinding
 import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
 import com.splendo.kaluga.resources.DefaultColors
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.view.applyBackgroundStyle
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index ac02cbad2..e69c2c0e9 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -16,6 +16,10 @@
 		201EA21D2938E89300C562EC /* DateTimePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA21C2938E89300C562EC /* DateTimePickerView.swift */; };
 		201EA21F2938EB5200C562EC /* String+Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA21E2938EB5200C562EC /* String+Localized.swift */; };
 		201EA2212938ECE700C562EC /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA2202938ECE700C562EC /* LoadingView.swift */; };
+		201EA2232938F11700C562EC /* ResourcesListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA2222938F11700C562EC /* ResourcesListView.swift */; };
+		201EA22529390A7F00C562EC /* ButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA22429390A7F00C562EC /* ButtonView.swift */; };
+		201EA22729390CFE00C562EC /* LabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA22629390CFE00C562EC /* LabelView.swift */; };
+		201EA229293B8C6600C562EC /* ColorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201EA228293B8C6600C562EC /* ColorView.swift */; };
 		2034C13A2937B494003A6D19 /* PartialSheet in Frameworks */ = {isa = PBXBuildFile; productRef = 2034C1392937B494003A6D19 /* PartialSheet */; };
 		20524A24257BEA1E0054B57E /* DateTimePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */; };
 		205747572397C9C400CDE25E /* KeyboardManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */; };
@@ -114,6 +118,10 @@
 		201EA21C2938E89300C562EC /* DateTimePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimePickerView.swift; sourceTree = "<group>"; };
 		201EA21E2938EB5200C562EC /* String+Localized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Localized.swift"; sourceTree = "<group>"; };
 		201EA2202938ECE700C562EC /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
+		201EA2222938F11700C562EC /* ResourcesListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesListView.swift; sourceTree = "<group>"; };
+		201EA22429390A7F00C562EC /* ButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonView.swift; sourceTree = "<group>"; };
+		201EA22629390CFE00C562EC /* LabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelView.swift; sourceTree = "<group>"; };
+		201EA228293B8C6600C562EC /* ColorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorView.swift; sourceTree = "<group>"; };
 		20524A23257BEA1E0054B57E /* DateTimePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimePickerViewController.swift; sourceTree = "<group>"; };
 		205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardManagerViewController.swift; sourceTree = "<group>"; };
 		205AF6552488F017001BD99E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Demo/Base.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -290,6 +298,10 @@
 				20D8CD3826FF550100D14AC9 /* LabelViewController.swift */,
 				2073D0EF270303B3002CB856 /* ButtonViewController.swift */,
 				2073D0F127032B5B002CB856 /* ColorViewController.swift */,
+				201EA2222938F11700C562EC /* ResourcesListView.swift */,
+				201EA22429390A7F00C562EC /* ButtonView.swift */,
+				201EA22629390CFE00C562EC /* LabelView.swift */,
+				201EA228293B8C6600C562EC /* ColorView.swift */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -635,6 +647,7 @@
 				978348A7235DF586005B140B /* PermissionViewController.swift in Sources */,
 				641CC0DC25CACAAD001E1CD1 /* LinksViewController.swift in Sources */,
 				2073D0F227032B5B002CB856 /* ColorViewController.swift in Sources */,
+				201EA2232938F11700C562EC /* ResourcesListView.swift in Sources */,
 				20524A24257BEA1E0054B57E /* DateTimePickerViewController.swift in Sources */,
 				20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */,
 				4BC0CBDF269F1D25000512A9 /* BeaconsViewController.swift in Sources */,
@@ -652,8 +665,11 @@
 				20C7D1D52469B25B00C9A63F /* InfoViewController.swift in Sources */,
 				4B02E504236B221B003F0B36 /* LoadingViewController.swift in Sources */,
 				7425815FF35195035A8991B0 /* LocationViewController.swift in Sources */,
+				201EA22529390A7F00C562EC /* ButtonView.swift in Sources */,
 				201EA21B2938E23600C562EC /* AlertsView.swift in Sources */,
 				209471E624C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift in Sources */,
+				201EA22729390CFE00C562EC /* LabelView.swift in Sources */,
+				201EA229293B8C6600C562EC /* ColorView.swift in Sources */,
 				209471E424C07EAD001426CD /* BluetoothViewController.swift in Sources */,
 				20CA2907293796D7007E4079 /* BottomSheetSubPageViewController.swift in Sources */,
 				4B54CB212369DA6600B69B2D /* AlertsViewController.swift in Sources */,
diff --git a/example/ios/Demo/AppDelegate.swift b/example/ios/Demo/AppDelegate.swift
index cefdc285e..c4ea27188 100644
--- a/example/ios/Demo/AppDelegate.swift
+++ b/example/ios/Demo/AppDelegate.swift
@@ -45,7 +45,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let vc = storyboard.instantiateViewController(withIdentifier: "LinksViewController") as! LinksViewController
         self.window?.rootViewController = vc
         
-//        vc.handleIncomingLink(url: stringUrl)
+        vc.handleIncomingLink(url: stringUrl)
         return true
     }
 
diff --git a/example/ios/Demo/Base.lproj/Main.storyboard b/example/ios/Demo/Base.lproj/Main.storyboard
index 895b9d0a7..6dac96a4e 100644
--- a/example/ios/Demo/Base.lproj/Main.storyboard
+++ b/example/ios/Demo/Base.lproj/Main.storyboard
@@ -391,7 +391,6 @@
                         <segue destination="NRf-rC-nl1" kind="show" identifier="showSystem" id="IT2-HT-9Hz"/>
                         <segue destination="SGP-dn-hxw" kind="show" identifier="showBluetooth" id="Z5V-Lj-mdM"/>
                         <segue destination="2CB-DJ-Qmw" kind="show" identifier="showBeacons" id="jYU-Fd-PgO"/>
-                        <segue destination="Tyz-Gd-0uw" kind="show" identifier="showResources" id="R7Z-R6-fGx"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="L6W-Hz-iOT" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -1274,19 +1273,19 @@
             <objects>
                 <tableViewController storyboardIdentifier="ResourcesList" id="Tyz-Gd-0uw" customClass="ResourcesListViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="W41-OS-Wnx">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ResourcesListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ResourcesListCell" id="YH6-gF-Pq3" customClass="ResourcesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="38"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="37"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YH6-gF-Pq3" id="yfs-Dl-hfq">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="38"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="37"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="app-pb-mRq">
-                                            <rect key="frame" x="20" y="8" width="374" height="22"/>
+                                            <rect key="frame" x="20" y="8" width="374" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
diff --git a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
index 81b97fd03..f8323afb7 100644
--- a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -110,7 +110,12 @@ private extension FeatureListNavigationAction {
             case is FeatureListNavigationAction.Location: return NavigationSpec.Segue(identifier: "showLocation")
             case is FeatureListNavigationAction.Permissions: return NavigationSpec.Segue(identifier: "showPermissions")
             case is FeatureListNavigationAction.PlatformSpecific: return NavigationSpec.Segue(identifier: "showPlatformSpecific")
-            case is FeatureListNavigationAction.Resources: return NavigationSpec.Segue(identifier: "showResources")
+            case is FeatureListNavigationAction.Resources: return NavigationSpec.Push(animated: true) {
+                SwiftUIOrUIKitSelectionViewController.create(
+                    uiKitViewController: { ResourcesListViewController.instantiate() },
+                    swiftUIView: { ResourcesListView() }
+                )
+            }
             case is FeatureListNavigationAction.System: return NavigationSpec.Segue(identifier: "showSystem")
             default: fatalError("Unknown action")
             }
diff --git a/example/ios/Demo/Resources/ButtonView.swift b/example/ios/Demo/Resources/ButtonView.swift
new file mode 100644
index 000000000..81778379e
--- /dev/null
+++ b/example/ios/Demo/Resources/ButtonView.swift
@@ -0,0 +1,52 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct ButtonView: View, Equatable {
+    static func == (lhs: ButtonView, rhs: ButtonView) -> Bool {
+        return true
+    }
+
+    let lifecycleViewModel: LifecycleViewModel<ButtonViewModel>
+    @ObservedObject var buttons: ListObservable<KalugaButton>
+
+    init() {
+        let contentView = ContainerView(.alert)
+        let viewModel = ButtonViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider(), alertPresenterBuilder: contentView.alertBuilder)
+        buttons = ListObservable(viewModel.buttons)
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        lifecycleViewModel.lifecycleView { _ in
+            ScrollView {
+                VStack(spacing: 10.0) {
+                    ForEach(buttons.value, id: \.self) { button in
+                        button.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                    }
+                }
+            }.navigationTitle("feature_resources_button".localized())
+        }
+    }
+}
+
+struct ButtonView_Previews: PreviewProvider {
+    static var previews: some View {
+        ButtonView()
+    }
+}
diff --git a/example/ios/Demo/Resources/ButtonViewController.swift b/example/ios/Demo/Resources/ButtonViewController.swift
index f00e435ff..c5f12c461 100644
--- a/example/ios/Demo/Resources/ButtonViewController.swift
+++ b/example/ios/Demo/Resources/ButtonViewController.swift
@@ -30,6 +30,9 @@ class ButtonViewController : UITableViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        title = "feature_resources_button".localized()
+
         tableView.allowsSelection = false
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
diff --git a/example/ios/Demo/Resources/ColorView.swift b/example/ios/Demo/Resources/ColorView.swift
new file mode 100644
index 000000000..307f6a977
--- /dev/null
+++ b/example/ios/Demo/Resources/ColorView.swift
@@ -0,0 +1,140 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct ColorView: View, Equatable {
+    
+    static func == (lhs: ColorView, rhs: ColorView) -> Bool {
+        return true
+    }
+
+    let lifecycleViewModel: LifecycleViewModel<ColorViewModel>
+    private let disposeBag = DisposeBag()
+    @ObservedObject var backdropColorBackground: BackgroundStyleObservable
+    @ObservedObject var blendedColorBackground: BackgroundStyleObservable
+    @ObservedObject var sourceColorBackground: BackgroundStyleObservable
+
+    @State var backdropText: String = ""
+    @State var sourceText: String = ""
+
+    @ObservedObject var blendModeButton: ButtonObservable
+    @ObservedObject var lightenedBackdrops: ListObservable<KalugaBackgroundStyle>
+    @ObservedObject var darkenedBackdrops: ListObservable<KalugaBackgroundStyle>
+    @ObservedObject var lightenedBlended: ListObservable<KalugaBackgroundStyle>
+    @ObservedObject var darkenedBlended: ListObservable<KalugaBackgroundStyle>
+    @ObservedObject var lightenedSource: ListObservable<KalugaBackgroundStyle>
+    @ObservedObject var darkenedSource: ListObservable<KalugaBackgroundStyle>
+
+    init() {
+        let containerView = ContainerView(.alert)
+        let viewModel = ColorViewModel(alertPresenterBuilder: containerView.alertBuilder)
+        backdropColorBackground = BackgroundStyleObservable(viewModel.backdropColorBackground)
+        blendedColorBackground = BackgroundStyleObservable(viewModel.blendedColorBackground)
+        sourceColorBackground = BackgroundStyleObservable(viewModel.sourceColorBackground)
+        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: containerView)
+
+        blendModeButton = ButtonObservable(viewModel.blendModeButton)
+
+        lightenedBackdrops = ListObservable(viewModel.lightenBackdrops)
+        darkenedBackdrops = ListObservable(viewModel.darkenBackdrops)
+        lightenedBlended = ListObservable(viewModel.lightenBlended)
+        darkenedBlended = ListObservable(viewModel.darkenBlended)
+        lightenedSource = ListObservable(viewModel.lightenSource)
+        darkenedSource = ListObservable(viewModel.darkenSource)
+
+    }
+
+    var body: some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            ScrollView {
+                HStack(alignment: .top, spacing: 10.0) {
+                    VStack(alignment: .center, spacing: 5.0) {
+                        Spacer()
+                            .frame(width: 100, height: 100, alignment: .center)
+                            .background(backdropColorBackground.value)
+                        TextField("", text: $backdropText)
+                            .onSubmit {
+                                viewModel.submitBackdropText(backdropText: backdropText)
+                            }
+                            .textFieldStyle(.roundedBorder)
+                    }
+                    .frame(maxWidth: .infinity, alignment: .center)
+                    Spacer()
+                        .frame(width: 100, height: 100, alignment: .center)
+                        .background(blendedColorBackground.value)
+                    VStack(alignment: .center, spacing: 5.0) {
+                        Spacer()
+                            .frame(width: 100, height: 100, alignment: .center)
+                            .background(sourceColorBackground.value)
+                        TextField("", text: $sourceText).onSubmit {
+                            viewModel.submitSourceText(sourceText: sourceText)
+                        }
+                        .textFieldStyle(.roundedBorder)
+                    }
+                    .frame(maxWidth: .infinity, alignment: .center)
+                }
+                blendModeButton.value.toButton()
+                viewModel.flipButton.toButton()
+                lightenedBackdrops.asHorizontalScrollView()
+                darkenedBackdrops.asHorizontalScrollView()
+                lightenedBlended.asHorizontalScrollView()
+                darkenedBlended.asHorizontalScrollView()
+                lightenedSource.asHorizontalScrollView()
+                darkenedSource.asHorizontalScrollView()
+            }
+            .onAppear {
+                disposeBag.add(
+                    disposable: viewModel.backdropText.observe { next in
+                        if let backdrop = next as? String {
+                            backdropText = backdrop
+                        }
+                    }
+                )
+                disposeBag.add(
+                    disposable: viewModel.sourceText.observe { next in
+                        if let source = next as? String {
+                            sourceText = source
+                        }
+                    }
+                )
+            }.onDisappear {
+                disposeBag.dispose()
+            }
+        }
+    }
+}
+
+extension ListObservable<KalugaBackgroundStyle> {
+    func asHorizontalScrollView() -> some View {
+        ScrollView(.horizontal) {
+            HStack(spacing: 2.0) {
+                ForEach(value, id: \.self) { backgroundStyle in
+                    Spacer()
+                        .frame(width: 50.0, height: 50.0)
+                        .background(backgroundStyle)
+                }
+            }.padding(.horizontal, 10.0)
+        }
+    }
+}
+
+struct ColorView_Previews: PreviewProvider {
+    static var previews: some View {
+        ColorView()
+    }
+}
diff --git a/example/ios/Demo/Resources/ColorViewController.swift b/example/ios/Demo/Resources/ColorViewController.swift
index c8412766a..22d1513af 100644
--- a/example/ios/Demo/Resources/ColorViewController.swift
+++ b/example/ios/Demo/Resources/ColorViewController.swift
@@ -36,12 +36,12 @@ class ColorViewController : UIViewController {
     @IBOutlet var blendedLightenedColorsCollectionView: UICollectionView!
     @IBOutlet var blendedDarkenedColorsCollectionView: UICollectionView!
     
-    private var backdropLightenedColors: [BackgroundStyle] = []
-    private var backdropDarkenedColors: [BackgroundStyle] = []
-    private var sourceLightenedColors: [BackgroundStyle] = []
-    private var sourceDarkenedColors: [BackgroundStyle] = []
-    private var blendedLightenedColors: [BackgroundStyle] = []
-    private var blendedDarkenedColors: [BackgroundStyle] = []
+    private var backdropLightenedColors: [KalugaBackgroundStyle] = []
+    private var backdropDarkenedColors: [KalugaBackgroundStyle] = []
+    private var sourceLightenedColors: [KalugaBackgroundStyle] = []
+    private var sourceDarkenedColors: [KalugaBackgroundStyle] = []
+    private var blendedLightenedColors: [KalugaBackgroundStyle] = []
+    private var blendedDarkenedColors: [KalugaBackgroundStyle] = []
     
     private lazy var viewModel: ColorViewModel = ColorViewModel(alertPresenterBuilder: AlertPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
@@ -52,6 +52,9 @@ class ColorViewController : UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        title = "feature_resources_color".localized()
+
         backdropLightenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
         backdropDarkenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
         sourceLightenedColorsCollectionView.register(ColorCollectionCellView.self, forCellWithReuseIdentifier: ColorCollectionCellView.Const.identifier)
@@ -63,19 +66,19 @@ class ColorViewController : UIViewController {
             
             return [
                 viewModel.backdropColorBackground.observe { next in
-                    guard let backdropColorBackground = self?.backdropColorBackground, let backdropBackgroundStyle = next as? BackgroundStyle else {
+                    guard let backdropColorBackground = self?.backdropColorBackground, let backdropBackgroundStyle = next as? KalugaBackgroundStyle else {
                         return
                     }
                     BackgroundStyleKt.applyBackgroundStyle(backdropColorBackground, style: backdropBackgroundStyle)
                 },
                 viewModel.sourceColorBackground.observe { next in
-                    guard let sourceColorBackground = self?.sourceColorBackground, let sourceBackgroundStyle = next as? BackgroundStyle else {
+                    guard let sourceColorBackground = self?.sourceColorBackground, let sourceBackgroundStyle = next as? KalugaBackgroundStyle else {
                         return
                     }
                     BackgroundStyleKt.applyBackgroundStyle(sourceColorBackground, style: sourceBackgroundStyle)
                 },
                 viewModel.blendedColorBackground.observe { next in
-                    guard let blendedColorBackground = self?.blendedColorBackground, let blendedBackgroundStyle = next as? BackgroundStyle else {
+                    guard let blendedColorBackground = self?.blendedColorBackground, let blendedBackgroundStyle = next as? KalugaBackgroundStyle else {
                         return
                     }
                     BackgroundStyleKt.applyBackgroundStyle(blendedColorBackground, style: blendedBackgroundStyle)
@@ -93,27 +96,27 @@ class ColorViewController : UIViewController {
                     ButtonStyleKt.bindButton(blendModeButton, button: buttonStyle)
                 },
                 viewModel.lightenBackdrops.observe { next in
-                    self?.backdropLightenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.backdropLightenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
                     self?.backdropLightenedColorsCollectionView?.reloadData()
                 },
                 viewModel.darkenBackdrops.observe { next in
-                    self?.backdropDarkenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.backdropDarkenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
                     self?.backdropDarkenedColorsCollectionView?.reloadData()
                 },
                 viewModel.lightenSource.observe { next in
-                    self?.sourceLightenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.sourceLightenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
                     self?.sourceLightenedColorsCollectionView?.reloadData()
                 },
                 viewModel.darkenSource.observe { next in
-                    self?.sourceDarkenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.sourceDarkenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
                     self?.sourceDarkenedColorsCollectionView?.reloadData()
                 },
                 viewModel.lightenBlended.observe { next in
-                    self?.blendedLightenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.blendedLightenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
                     self?.blendedLightenedColorsCollectionView?.reloadData()
                 },
                 viewModel.darkenBlended.observe { next in
-                    self?.blendedDarkenedColors = next?.compactMap({ $0 as? BackgroundStyle }) ?? []
+                    self?.blendedDarkenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
                     self?.blendedDarkenedColorsCollectionView?.reloadData()
                 },
             ]
diff --git a/example/ios/Demo/Resources/LabelView.swift b/example/ios/Demo/Resources/LabelView.swift
new file mode 100644
index 000000000..3d12f3c9e
--- /dev/null
+++ b/example/ios/Demo/Resources/LabelView.swift
@@ -0,0 +1,48 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct LabelView: View {
+
+    let lifecycleViewModel: LifecycleViewModel<LabelViewModel>
+    @ObservedObject var labels: ListObservable<KalugaLabel>
+
+    init() {
+        let viewModel = LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider())
+        labels = ListObservable(viewModel.labels)
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        lifecycleViewModel.lifecycleView { _ in
+            ScrollView {
+                VStack(spacing: 10.0) {
+                    ForEach(labels.value, id: \.self) { label in
+                        label.toText().frame(maxWidth: .infinity)
+                    }
+                }
+            }.navigationTitle("feature_resources_button".localized())
+        }
+    }
+}
+
+struct LabelView_Previews: PreviewProvider {
+    static var previews: some View {
+        LabelView()
+    }
+}
diff --git a/example/ios/Demo/Resources/LabelViewController.swift b/example/ios/Demo/Resources/LabelViewController.swift
index dd8695a79..cb00c9a47 100644
--- a/example/ios/Demo/Resources/LabelViewController.swift
+++ b/example/ios/Demo/Resources/LabelViewController.swift
@@ -30,6 +30,8 @@ class LabelViewController : UITableViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        title = "feature_resources_label".localized()
         
         tableView.allowsSelection = false
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
diff --git a/example/ios/Demo/Resources/ResourcesListView.swift b/example/ios/Demo/Resources/ResourcesListView.swift
new file mode 100644
index 000000000..9e22e8c9f
--- /dev/null
+++ b/example/ios/Demo/Resources/ResourcesListView.swift
@@ -0,0 +1,94 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct ResourcesListView: View {
+
+    @ObservedObject var navigationState = ObjectRoutingState<Route>()
+    @ObservedObject var resources: ListObservable<Resource>
+    let lifecycleViewModel: LifecycleViewModel<ResourcesListViewModel>
+    let router: Router
+
+    init() {
+        router = Router()
+
+        let viewModel = ResourcesListViewModel(navigator: router.defaultNavigator)
+        resources = ListObservable(viewModel.resources)
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        router.nextRouter = navigationState
+        return generateBody().navigationTitle("feature_resources".localized())
+    }
+
+    func generateBody() -> some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            ScrollView {
+                VStack(spacing: 10.0) {
+                    ForEach(resources.value, id: \.self) { resource in
+                        Button(resource.title) {
+                            viewModel.onResourceSelected(resource: resource)
+                        }
+                    }
+                }
+            }
+            .navigation(state: navigationState, type: .push) {
+                switch navigationState.object {
+                case .buttons: ButtonView().equatable() // For lifecycle subviews it is recommended to use equatable
+                case .labels: LabelView()
+                case .colors: ColorView().equatable()
+                default: EmptyView()
+                }
+            }
+        }
+    }
+}
+
+extension ResourcesListView {
+    enum Route : Equatable {
+        case buttons
+        case labels
+        case colors
+    }
+
+    class Router {
+
+        var nextRouter: ObjectRoutingState<Route>? = nil
+        lazy var defaultNavigator: DefaultNavigator<ResourcesListNavigationAction> = DefaultNavigator { [weak self] action in
+            self?.nextRouter?.show(action.route)
+        }
+    }
+}
+
+extension ResourcesListNavigationAction {
+    var route: ResourcesListView.Route {
+        switch self {
+        case is ResourcesListNavigationAction.Button: return .buttons
+        case is ResourcesListNavigationAction.Color: return .colors
+        case is ResourcesListNavigationAction.Label: return .labels
+        default: fatalError("Unknown action \(self)")
+        }
+     }
+}
+
+struct ResourcesListView_Previews: PreviewProvider {
+    static var previews: some View {
+        ResourcesListView()
+    }
+}
diff --git a/example/ios/Demo/Resources/ResourcesListViewController.swift b/example/ios/Demo/Resources/ResourcesListViewController.swift
index 40d7799a8..c99b17e1d 100644
--- a/example/ios/Demo/Resources/ResourcesListViewController.swift
+++ b/example/ios/Demo/Resources/ResourcesListViewController.swift
@@ -19,6 +19,15 @@ import KalugaExampleShared
 
 class ResourcesListViewController : UITableViewController {
 
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "ResourcesList"
+    }
+
+    static func instantiate() -> ResourcesListViewController {
+        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! ResourcesListViewController
+    }
+
     private lazy var navigator: ViewControllerNavigator<ResourcesListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
         NavigationSpec.Segue(identifier: action.segueKey)
     }
@@ -36,6 +45,8 @@ class ResourcesListViewController : UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        title = "feature_resource".localized()
+
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
             return [
diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 7213cdb60..7db104fb2 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 7213cdb60957e12ab50ff5ddb0ed7cae76e6abbb
+Subproject commit 7db104fb2f4e78684be24c810bbfc0cf1a7d4322
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
index fc82372e8..26756332c 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/ButtonStyles.kt
@@ -19,28 +19,28 @@ package com.splendo.kaluga.example.shared.stylable
 
 import com.splendo.kaluga.resources.DefaultColors
 import com.splendo.kaluga.resources.defaultFont
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.ButtonStateStyle
-import com.splendo.kaluga.resources.stylable.ButtonStyle
+import com.splendo.kaluga.resources.stylable.KalugaButtonStyle
 import com.splendo.kaluga.resources.stylable.GradientStyle
 
 object ButtonStyles {
 
     val default by lazy {
-        ButtonStyle(
+        KalugaButtonStyle(
             TextStyles.defaultTitle,
             backgroundColor = DefaultColors.lightGray,
             pressedBackgroundColor = DefaultColors.gray,
             disabledBackgroundColor = DefaultColors.dimGray,
-            shape = BackgroundStyle.Shape.Rectangle(4.0f)
+            shape = KalugaBackgroundStyle.Shape.Rectangle(4.0f)
         )
     }
 
     val textButton by lazy {
-        ButtonStyle(TextStyles.redText)
+        KalugaButtonStyle(TextStyles.redText)
     }
     val redButton by lazy {
-        ButtonStyle(
+        KalugaButtonStyle(
             TextStyles.whiteText,
             backgroundColor = DefaultColors.red,
             pressedBackgroundColor = DefaultColors.maroon,
@@ -48,202 +48,202 @@ object ButtonStyles {
         )
     }
     val roundedButton by lazy {
-        ButtonStyle(
+        KalugaButtonStyle(
             defaultFont,
             12.0f,
-            defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, BackgroundStyle.Shape.Rectangle(10.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))),
-            pressedStyle = ButtonStateStyle(DefaultColors.azure, DefaultColors.lightSkyBlue, BackgroundStyle.Shape.Rectangle(5.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT))),
-            disabledStyle = ButtonStateStyle(DefaultColors.black, DefaultColors.lightGray, BackgroundStyle.Shape.Rectangle(10.0f))
+            defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, KalugaBackgroundStyle.Shape.Rectangle(10.0f, setOf(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))),
+            pressedStyle = ButtonStateStyle(DefaultColors.azure, DefaultColors.lightSkyBlue, KalugaBackgroundStyle.Shape.Rectangle(5.0f, setOf(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT))),
+            disabledStyle = ButtonStateStyle(DefaultColors.black, DefaultColors.lightGray, KalugaBackgroundStyle.Shape.Rectangle(10.0f))
         )
     }
     val ovalButton by lazy {
-        ButtonStyle(
+        KalugaButtonStyle(
             defaultFont,
             12.0f,
-            defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, BackgroundStyle.Shape.Oval),
-            pressedStyle = ButtonStateStyle(DefaultColors.azure, DefaultColors.lightSkyBlue, BackgroundStyle.Shape.Oval),
-            disabledStyle = ButtonStateStyle(DefaultColors.black, DefaultColors.lightGray, BackgroundStyle.Shape.Oval)
+            defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, KalugaBackgroundStyle.Shape.Oval),
+            pressedStyle = ButtonStateStyle(DefaultColors.azure, DefaultColors.lightSkyBlue, KalugaBackgroundStyle.Shape.Oval),
+            disabledStyle = ButtonStateStyle(DefaultColors.black, DefaultColors.lightGray, KalugaBackgroundStyle.Shape.Oval)
         )
     }
     val redButtonWithStroke by lazy {
-        ButtonStyle(
+        KalugaButtonStyle(
             defaultFont,
             12.0f,
             defaultStyle = ButtonStateStyle(
                 DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.red),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.red),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             ),
             pressedStyle = ButtonStateStyle(
                 DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.maroon),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.maroon),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             ),
             disabledStyle = ButtonStateStyle(
                 DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             )
         )
     }
     val roundedButtonWithStroke by lazy {
-        ButtonStyle(
+        KalugaButtonStyle(
             defaultFont,
             12.0f,
             defaultStyle = ButtonStateStyle(
                 DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.deepSkyBlue),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Rectangle(10.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.deepSkyBlue),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    KalugaBackgroundStyle.Shape.Rectangle(10.0f, setOf(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))
                 )
             ),
             pressedStyle = ButtonStateStyle(
                 DefaultColors.azure,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightSkyBlue),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.azure),
-                    BackgroundStyle.Shape.Rectangle(5.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT))
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.lightSkyBlue),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.azure),
+                    KalugaBackgroundStyle.Shape.Rectangle(5.0f, setOf(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT))
                 )
             ),
             disabledStyle = ButtonStateStyle(
                 DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Rectangle(10.0f)
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    KalugaBackgroundStyle.Shape.Rectangle(10.0f)
                 )
             )
         )
     }
     val ovalButtonWithStroke by lazy {
-        ButtonStyle(
+        KalugaButtonStyle(
             defaultFont,
             12.0f,
             defaultStyle = ButtonStateStyle(
                 DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.deepSkyBlue),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Oval
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.deepSkyBlue),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    KalugaBackgroundStyle.Shape.Oval
                 )
             ),
             pressedStyle = ButtonStateStyle(
                 DefaultColors.azure,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightSkyBlue),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.azure),
-                    BackgroundStyle.Shape.Oval
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.lightSkyBlue),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.azure),
+                    KalugaBackgroundStyle.Shape.Oval
                 )
             ),
             disabledStyle = ButtonStateStyle(
                 DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Oval
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.lightGray),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    KalugaBackgroundStyle.Shape.Oval
                 )
             )
         )
     }
 
     val linearGradientButton by lazy {
-        ButtonStyle(
+        KalugaButtonStyle(
             defaultFont,
             12.0f,
             defaultStyle = ButtonStateStyle(
                 DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             ),
             pressedStyle = ButtonStateStyle(
                 DefaultColors.azure,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             ),
             disabledStyle = ButtonStateStyle(
                 DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.lightGray, DefaultColors.gray), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Gradient(GradientStyle.Linear(listOf(DefaultColors.lightGray, DefaultColors.gray), GradientStyle.Linear.Orientation.LEFT_RIGHT)),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             )
         )
     }
 
     val radialGradientButton by lazy {
-        ButtonStyle(
+        KalugaButtonStyle(
             defaultFont,
             12.0f,
             defaultStyle = ButtonStateStyle(
                 DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), 50.0f, GradientStyle.CenterPoint(0.3f, 0.3f))),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), 50.0f, GradientStyle.CenterPoint(0.3f, 0.3f))),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             ),
             pressedStyle = ButtonStateStyle(
                 DefaultColors.azure,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), 25.0f, GradientStyle.CenterPoint(0.6f, 0.6f))),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), 25.0f, GradientStyle.CenterPoint(0.6f, 0.6f))),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             ),
             disabledStyle = ButtonStateStyle(
                 DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.lightGray, DefaultColors.gray), 50.0f)),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Gradient(GradientStyle.Radial(listOf(DefaultColors.lightGray, DefaultColors.gray), 50.0f)),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             )
         )
     }
 
     val angularGradientButton by lazy {
-        ButtonStyle(
+        KalugaButtonStyle(
             defaultFont,
             12.0f,
             defaultStyle = ButtonStateStyle(
                 DefaultColors.white,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), GradientStyle.CenterPoint(0.3f, 0.3f))),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.deepSkyBlue, DefaultColors.lightSkyBlue), GradientStyle.CenterPoint(0.3f, 0.3f))),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             ),
             pressedStyle = ButtonStateStyle(
                 DefaultColors.azure,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), GradientStyle.CenterPoint(0.6f, 0.6f))),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.midnightBlue, DefaultColors.deepSkyBlue), GradientStyle.CenterPoint(0.6f, 0.6f))),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.mistyRose),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             ),
             disabledStyle = ButtonStateStyle(
                 DefaultColors.black,
-                BackgroundStyle(
-                    BackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.lightGray, DefaultColors.gray))),
-                    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
-                    BackgroundStyle.Shape.Rectangle()
+                KalugaBackgroundStyle(
+                    KalugaBackgroundStyle.FillStyle.Gradient(GradientStyle.Angular(listOf(DefaultColors.lightGray, DefaultColors.gray))),
+                    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.black),
+                    KalugaBackgroundStyle.Shape.Rectangle()
                 )
             )
         )
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
index 34faa615a..78d25b5e3 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
@@ -22,7 +22,7 @@ import com.splendo.kaluga.resources.defaultBoldFont
 import com.splendo.kaluga.resources.defaultFont
 import com.splendo.kaluga.resources.defaultItalicFont
 import com.splendo.kaluga.resources.defaultMonospaceFont
-import com.splendo.kaluga.resources.stylable.TextAlignment
+import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
 import com.splendo.kaluga.resources.stylable.TextStyle
 
 object TextStyles {
@@ -49,6 +49,6 @@ object TextStyles {
         TextStyle(defaultFont, DefaultColors.red, 12.0f)
     }
     val oppositeText by lazy {
-        TextStyle(defaultFont, DefaultColors.dimGray, 12.0f, TextAlignment.END)
+        TextStyle(defaultFont, DefaultColors.dimGray, 12.0f, KalugaTextAlignment.END)
     }
 }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
index 82651eee9..f18e49093 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
@@ -24,7 +24,7 @@ import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.resources.StringStyleAttribute
 import com.splendo.kaluga.resources.StyledStringBuilder
-import com.splendo.kaluga.resources.stylable.ButtonStyle
+import com.splendo.kaluga.resources.stylable.KalugaButtonStyle
 import com.splendo.kaluga.resources.styled
 import com.splendo.kaluga.resources.view.KalugaButton
 import kotlinx.coroutines.launch
@@ -76,7 +76,7 @@ class ButtonViewModel(
     }
 
     private fun String.toButton(
-        style: ButtonStyle,
+        style: KalugaButtonStyle,
         isEnabled: Boolean = true
     ): List<KalugaButton.Plain> = listOf(
         KalugaButton.Plain(this, style, isEnabled) {
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
index bf184ac0f..0aa8460cd 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
@@ -21,7 +21,7 @@ import com.splendo.kaluga.alerts.Alert
 import com.splendo.kaluga.alerts.AlertPresenter
 import com.splendo.kaluga.alerts.buildActionSheet
 import com.splendo.kaluga.alerts.buildAlert
-import com.splendo.kaluga.architecture.observable.InitializedObservable
+import com.splendo.kaluga.architecture.observable.BaseInitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.example.shared.stylable.ButtonStyles
@@ -47,7 +47,7 @@ import com.splendo.kaluga.resources.overlay
 import com.splendo.kaluga.resources.saturate
 import com.splendo.kaluga.resources.screen
 import com.splendo.kaluga.resources.softLight
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.view.KalugaButton
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -121,15 +121,15 @@ class ColorViewModel(
     private val steps = (1..10).map { it.toDouble() / 10.0 }
     private fun Flow<KalugaColor>.lightenList() = map { color ->
         steps.map {
-            BackgroundStyle(
-                BackgroundStyle.FillStyle.Solid(color.lightenBy(it))
+            KalugaBackgroundStyle(
+                KalugaBackgroundStyle.FillStyle.Solid(color.lightenBy(it))
             )
         }
     }.toInitializedObservable(emptyList(), coroutineScope)
     private fun Flow<KalugaColor>.darkenList() = map { color ->
         steps.map {
-            BackgroundStyle(
-                BackgroundStyle.FillStyle.Solid(color.darkenBy(it))
+            KalugaBackgroundStyle(
+                KalugaBackgroundStyle.FillStyle.Solid(color.darkenBy(it))
             )
         }
     }.toInitializedObservable(emptyList(), coroutineScope)
@@ -184,9 +184,9 @@ class ColorViewModel(
         }
     }
 
-    private val Flow<KalugaColor>.backgroundStyleObservable: InitializedObservable<BackgroundStyle> get() = map {
-        BackgroundStyle(
-            BackgroundStyle.FillStyle.Solid(it)
+    private val Flow<KalugaColor>.backgroundStyleObservable: BaseInitializedObservable<KalugaBackgroundStyle> get() = map {
+        KalugaBackgroundStyle(
+            KalugaBackgroundStyle.FillStyle.Solid(it)
         )
-    }.toInitializedObservable(BackgroundStyle(BackgroundStyle.FillStyle.Solid(DefaultColors.clear)), coroutineScope)
+    }.toInitializedObservable(KalugaBackgroundStyle(KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.clear)), coroutineScope)
 }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
index 1e8fda99b..cae203dbe 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
@@ -25,7 +25,7 @@ import com.splendo.kaluga.resources.StringStyleAttribute
 import com.splendo.kaluga.resources.StyledStringBuilder
 import com.splendo.kaluga.resources.attributeSubstring
 import com.splendo.kaluga.resources.defaultBoldFont
-import com.splendo.kaluga.resources.stylable.TextAlignment
+import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
 import com.splendo.kaluga.resources.styled
 import com.splendo.kaluga.resources.view.KalugaLabel
 
@@ -101,7 +101,7 @@ class LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider)
                 loremIpsum.styled(
                     styledStringBuilderProvider,
                     TextStyles.defaultText,
-                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.Alignment(TextAlignment.END)) }
+                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.Alignment(KalugaTextAlignment.END)) }
                 ),
             ),
             KalugaLabel.Styled(
@@ -111,7 +111,7 @@ class LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider)
                     { attributeSubstring(this, StringStyleAttribute.ParagraphStyleAttribute.LineSpacing(2.0f, 4.0f, 1.0f)) },
                     { attributeSubstring(loremIpsumParagraph0, StringStyleAttribute.CharacterStyleAttribute.BackgroundColor(DefaultColors.deepSkyBlue)) },
                     { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.LeadingIndent(10.0f)) },
-                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.Alignment(TextAlignment.END)) },
+                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.Alignment(KalugaTextAlignment.END)) },
                     { attributeSubstring(loremIpsumParagraph2, StringStyleAttribute.CharacterStyleAttribute.Kerning(0.08f)) }
                 ),
             )
diff --git a/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt b/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
index c8b179b89..0662fcfae 100644
--- a/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
+++ b/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
@@ -31,32 +31,32 @@ import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.splendo.kaluga.resources.DefaultColors
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.GradientStyle
 
-fun Modifier.backgroundStyle(backgroundStyle: BackgroundStyle) = background(
+fun Modifier.backgroundStyle(backgroundStyle: KalugaBackgroundStyle) = background(
     backgroundStyle.fillStyle.brush,
     backgroundStyle.shape.shape
 ).border(backgroundStyle.strokeStyle.borderStroke, backgroundStyle.shape.shape)
 
-val BackgroundStyle.FillStyle.brush: Brush get() = when (this) {
-    is BackgroundStyle.FillStyle.Solid -> SolidColor(color.composable)
-    is BackgroundStyle.FillStyle.Gradient -> gradientStyle.brush
+val KalugaBackgroundStyle.FillStyle.brush: Brush get() = when (this) {
+    is KalugaBackgroundStyle.FillStyle.Solid -> SolidColor(color.composable)
+    is KalugaBackgroundStyle.FillStyle.Gradient -> gradientStyle.brush
 }
 
-val BackgroundStyle.Shape.shape: Shape get() = when (this) {
-    is BackgroundStyle.Shape.Rectangle -> RoundedCornerRadiusShape(
-        if (roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT)) CornerRadiusSize(cornerRadiusX.dp, cornerRadiusY.dp) else CornerRadiusSize(0.dp, 0.dp),
-        if (roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.TOP_RIGHT)) CornerRadiusSize(cornerRadiusX.dp, cornerRadiusY.dp) else CornerRadiusSize(0.dp, 0.dp),
-        if (roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT)) CornerRadiusSize(cornerRadiusX.dp, cornerRadiusY.dp) else CornerRadiusSize(0.dp, 0.dp),
-        if (roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT)) CornerRadiusSize(cornerRadiusX.dp, cornerRadiusY.dp) else CornerRadiusSize(0.dp, 0.dp)
+val KalugaBackgroundStyle.Shape.shape: Shape get() = when (this) {
+    is KalugaBackgroundStyle.Shape.Rectangle -> RoundedCornerRadiusShape(
+        if (roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT)) CornerRadiusSize(cornerRadiusX.dp, cornerRadiusY.dp) else CornerRadiusSize(0.dp, 0.dp),
+        if (roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_RIGHT)) CornerRadiusSize(cornerRadiusX.dp, cornerRadiusY.dp) else CornerRadiusSize(0.dp, 0.dp),
+        if (roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT)) CornerRadiusSize(cornerRadiusX.dp, cornerRadiusY.dp) else CornerRadiusSize(0.dp, 0.dp),
+        if (roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT)) CornerRadiusSize(cornerRadiusX.dp, cornerRadiusY.dp) else CornerRadiusSize(0.dp, 0.dp)
     )
-    is BackgroundStyle.Shape.Oval -> androidx.compose.foundation.shape.CircleShape
+    is KalugaBackgroundStyle.Shape.Oval -> androidx.compose.foundation.shape.CircleShape
 }
 
-val BackgroundStyle.StrokeStyle.borderStroke: BorderStroke get() = when (this) {
-    is BackgroundStyle.StrokeStyle.None -> BorderStroke(0.0f.dp, Color.Transparent)
-    is BackgroundStyle.StrokeStyle.Stroke -> BorderStroke(width.dp, color.composable)
+val KalugaBackgroundStyle.StrokeStyle.borderStroke: BorderStroke get() = when (this) {
+    is KalugaBackgroundStyle.StrokeStyle.None -> BorderStroke(0.0f.dp, Color.Transparent)
+    is KalugaBackgroundStyle.StrokeStyle.Stroke -> BorderStroke(width.dp, color.composable)
 }
 
 @Preview
@@ -64,8 +64,8 @@ val BackgroundStyle.StrokeStyle.borderStroke: BorderStroke get() = when (this) {
 fun PreviewBackgroundStyle() {
     Box(
         modifier = Modifier.backgroundStyle(
-            BackgroundStyle(
-                BackgroundStyle.FillStyle.Gradient(
+            KalugaBackgroundStyle(
+                KalugaBackgroundStyle.FillStyle.Gradient(
                     GradientStyle.Radial(
                         listOf(
                             GradientStyle.ColorPoint(DefaultColors.darkBlue, 0.2f),
@@ -76,8 +76,8 @@ fun PreviewBackgroundStyle() {
                         GradientStyle.CenterPoint(0.2f, 0.3f)
                     )
                 ),
-                BackgroundStyle.StrokeStyle.Stroke(1.0f, DefaultColors.black),
-                BackgroundStyle.Shape.Rectangle(4.0f, 2.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT, BackgroundStyle.Shape.Rectangle.Corner.TOP_RIGHT))
+                KalugaBackgroundStyle.StrokeStyle.Stroke(1.0f, DefaultColors.black),
+                KalugaBackgroundStyle.Shape.Rectangle(4.0f, 2.0f, setOf(KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT, KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_RIGHT))
             )
         )
     ) {
diff --git a/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt b/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
index 558345349..be108f574 100644
--- a/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
+++ b/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
@@ -40,9 +40,9 @@ import androidx.compose.ui.unit.dp
 import com.splendo.kaluga.resources.DefaultColors
 import com.splendo.kaluga.resources.StringStyleAttribute
 import com.splendo.kaluga.resources.StyledStringBuilder
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.ButtonStateStyle
-import com.splendo.kaluga.resources.stylable.ButtonStyle
+import com.splendo.kaluga.resources.stylable.KalugaButtonStyle
 import com.splendo.kaluga.resources.styled
 import com.splendo.kaluga.resources.view.KalugaButton
 import com.splendo.kaluga.resources.view.KalugaLabel
@@ -85,23 +85,23 @@ fun KalugaButton.Composable(
 @Composable
 @Preview
 fun PreviewKalugaButton() {
-    val buttonStyle = ButtonStyle(
+    val buttonStyle = KalugaButtonStyle(
         font = Typeface.DEFAULT_BOLD,
         textSize = 14.0f,
         defaultStyle = ButtonStateStyle(
             DefaultColors.white,
             DefaultColors.red,
-            shape = BackgroundStyle.Shape.Rectangle(5.0f)
+            shape = KalugaBackgroundStyle.Shape.Rectangle(5.0f)
         ),
         pressedStyle = ButtonStateStyle(
             DefaultColors.red,
             DefaultColors.white,
-            shape = BackgroundStyle.Shape.Rectangle(5.0f)
+            shape = KalugaBackgroundStyle.Shape.Rectangle(5.0f)
         ),
         disabledStyle = ButtonStateStyle(
             DefaultColors.black,
             DefaultColors.white,
-            shape = BackgroundStyle.Shape.Rectangle(5.0f)
+            shape = KalugaBackgroundStyle.Shape.Rectangle(5.0f)
         )
     )
     Column(modifier = Modifier.size(100.dp)) {
diff --git a/resources-compose/src/androidLibMain/kotlin/TextAlignment.kt b/resources-compose/src/androidLibMain/kotlin/TextAlignment.kt
index b1dcbddf5..65f1fb9fd 100644
--- a/resources-compose/src/androidLibMain/kotlin/TextAlignment.kt
+++ b/resources-compose/src/androidLibMain/kotlin/TextAlignment.kt
@@ -18,13 +18,13 @@
 package com.splendo.kaluga.resources.compose
 
 import androidx.compose.ui.text.style.TextAlign
-import com.splendo.kaluga.resources.stylable.TextAlignment
+import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
 
-val TextAlignment.composable: TextAlign
+val KalugaTextAlignment.composable: TextAlign
     get() = when (this) {
-        TextAlignment.CENTER -> TextAlign.Center
-        TextAlignment.LEFT -> TextAlign.Left
-        TextAlignment.START -> TextAlign.Start
-        TextAlignment.END -> TextAlign.End
-        TextAlignment.RIGHT -> TextAlign.Right
+        KalugaTextAlignment.CENTER -> TextAlign.Center
+        KalugaTextAlignment.LEFT -> TextAlign.Left
+        KalugaTextAlignment.START -> TextAlign.Start
+        KalugaTextAlignment.END -> TextAlign.End
+        KalugaTextAlignment.RIGHT -> TextAlign.Right
     }
diff --git a/resources-databinding/src/androidLibMain/kotlin/Binding.kt b/resources-databinding/src/androidLibMain/kotlin/Binding.kt
index 25e9163ad..ec1491fd7 100644
--- a/resources-databinding/src/androidLibMain/kotlin/Binding.kt
+++ b/resources-databinding/src/androidLibMain/kotlin/Binding.kt
@@ -27,7 +27,7 @@ import androidx.core.widget.TextViewCompat
 import androidx.databinding.BindingAdapter
 import com.google.android.material.textfield.TextInputLayout
 import com.splendo.kaluga.resources.Image
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.TextStyle
 import com.splendo.kaluga.resources.view.KalugaButton
 import com.splendo.kaluga.resources.view.KalugaLabel
@@ -43,8 +43,10 @@ object Binding {
 
     @BindingAdapter("backgroundStyle")
     @JvmStatic
-    fun bindBackground(view: View, backgroundStyle: BackgroundStyle) {
-        view.applyBackgroundStyle(backgroundStyle)
+    fun bindBackground(view: View, backgroundStyle: KalugaBackgroundStyle?) {
+        backgroundStyle?.let {
+            view.applyBackgroundStyle(it)
+        }
     }
 
     @BindingAdapter("image")
@@ -89,19 +91,25 @@ object Binding {
 
     @BindingAdapter("textStyle")
     @JvmStatic
-    fun bindTextInputLayoutTextStyle(textView: TextInputLayout, textStyle: TextStyle) {
-        textView.editText?.applyTextStyle(textStyle)
+    fun bindTextInputLayoutTextStyle(textView: TextInputLayout, textStyle: TextStyle?) {
+        textStyle?.let {
+            textView.editText?.applyTextStyle(it)
+        }
     }
 
     @BindingAdapter("prefixTextStyle")
     @JvmStatic
-    fun bindPrefixTextStyle(textView: TextInputLayout, textStyle: TextStyle) {
-        textView.prefixTextView.applyTextStyle(textStyle)
+    fun bindPrefixTextStyle(textView: TextInputLayout, textStyle: TextStyle?) {
+        textStyle?.let {
+            textView.prefixTextView.applyTextStyle(it)
+        }
     }
 
     @BindingAdapter("suffixTextStyle")
     @JvmStatic
-    fun bindSuffixTextStyle(textView: TextInputLayout, textStyle: TextStyle) {
-        textView.suffixTextView.applyTextStyle(textStyle)
+    fun bindSuffixTextStyle(textView: TextInputLayout, textStyle: TextStyle?) {
+        textStyle?.let {
+            textView.suffixTextView.applyTextStyle(it)
+        }
     }
 }
diff --git a/resources/README.md b/resources/README.md
index 7cb6eab05..3a8e39fce 100644
--- a/resources/README.md
+++ b/resources/README.md
@@ -77,9 +77,9 @@ To only apply a `TextStyle` use `TextView.applyTextStyle(textStyle)`
 You can easily bind a `KalugaLabel` to a `UILabel` or `UITextView` by using `UILabel.bindLabel(label)` or `UITextView.bindLabel(label)` respectively
 To only apply a `TextStyle` use `UILabel.applyTextStyle(textStyle)`, `UITextView.bindLabel(label)` or `UITextField.bindLabel(label)` 
 
-### BackgroundStyle
-Create a `BackgroundStyle` to apply a background to any view.
-A `BackgroundStyle` takes a `FillStyle`, `StrokeStyle` and `Shape` to describe the background.
+### KalugaBackgroundStyle
+Create a `KalugaBackgroundStyle` to apply a background to any view.
+A `KalugaBackgroundStyle` takes a `FillStyle`, `StrokeStyle` and `Shape` to describe the background.
 
 `FillStyle` can be either `Solid` or `Gradient`, where `Gradient` requires a `GradientStyle` to be created.
 `StrokeStyle` can be either `None`, removing all strokes, or `Stroke`, taking a width and `Color` to describe the stroke
@@ -88,36 +88,36 @@ A `BackgroundStyle` takes a `FillStyle`, `StrokeStyle` and `Shape` to describe t
 The `GradientStyle` can be `Linear`, `Radial`, or `Angular` and is created from either a list of `Color` or `ColorPoint`, where the `ColorPoint` specifies the position of the color on a scale of `0.0`- `1.0`
 
 ```kotlin
-BackgroundStyle(
-    BackgroundStyle.FillStyle.Solid(DefaultColors.deepSkyBlue),
-    BackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
-    BackgroundStyle.Shape.Rectangle(10.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))
+KalugaBackgroundStyle(
+    KalugaBackgroundStyle.FillStyle.Solid(DefaultColors.deepSkyBlue),
+    KalugaBackgroundStyle.StrokeStyle.Stroke(2.0f, DefaultColors.white),
+    KalugaBackgroundStyle.Shape.Rectangle(10.0f, setOf(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))
 )
 ```
 
 #### Android
 *For compose use the [Resources Compose library](../resources-compose)*
 
-Apply a `BackgroundStyle` to any `View` using `View.applyBackgroundStyle(backgroundStyle`
+Apply a `KalugaBackgroundStyle` to any `View` using `View.applyBackgroundStyle(backgroundStyle`
 
 #### iOS
 *For SwiftUI see [Kaluga SwiftUI](https://github.com/splendo/kaluga-swiftui)*
 
-Apply a `BackgroundStyle` to any `UIView` using `UIView.applyBackgroundStyle(backgroundStyle)` or to a `CALayer` using `CALayer.applyBackgroundStyle(backgroundStyle, bounds)`
+Apply a `KalugaBackgroundStyle` to any `UIView` using `UIView.applyBackgroundStyle(backgroundStyle)` or to a `CALayer` using `CALayer.applyBackgroundStyle(backgroundStyle, bounds)`
 
 ### KalugaButton and ButtonStyle
 Like `TextStyle` for a Label, a `ButtonStyle` can be created for a button.
 
 A `ButtonStyle` takes a font, textSize, text alignment and a `ButtonStateStyle` for its default, pressed, and disabled states.
-The `ButtonStateStyle` consists of a text color and a `BackgroundStyle` describing the background of the button.
+The `ButtonStateStyle` consists of a text color and a `KalugaBackgroundStyle` describing the background of the button.
 
 ```kotlin
 ButtonStyle(
     defaultFont,
     12.0f,
-    defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, BackgroundStyle.Shape.Rectangle(10.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))),
-    pressedStyle = ButtonStateStyle(DefaultColors.azure, DefaultColors.lightSkyBlue, BackgroundStyle.Shape.Rectangle(5.0f, setOf(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT))),
-    disabledStyle = ButtonStateStyle(DefaultColors.black, DefaultColors.lightGray, BackgroundStyle.Shape.Rectangle(10.0f))
+    defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, KalugaBackgroundStyle.Shape.Rectangle(10.0f, setOf(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))),
+    pressedStyle = ButtonStateStyle(DefaultColors.azure, DefaultColors.lightSkyBlue, KalugaBackgroundStyle.Shape.Rectangle(5.0f, setOf(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT))),
+    disabledStyle = ButtonStateStyle(DefaultColors.black, DefaultColors.lightGray, KalugaBackgroundStyle.Shape.Rectangle(10.0f))
 )
 ```
 
diff --git a/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt b/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt
index 7f6b5c477..1573e622c 100644
--- a/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt
+++ b/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt
@@ -24,10 +24,10 @@ import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.view.View
 import com.splendo.kaluga.resources.dpToPixel
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.GradientStyle
 
-fun BackgroundStyle.createDrawable(context: Context): Drawable {
+fun KalugaBackgroundStyle.createDrawable(context: Context): Drawable {
     return GradientDrawable().apply {
         applyShape(this@createDrawable.shape, context)
         applyFillStyle(fillStyle, context)
@@ -35,33 +35,33 @@ fun BackgroundStyle.createDrawable(context: Context): Drawable {
     }
 }
 
-private fun GradientDrawable.applyShape(shape: BackgroundStyle.Shape, context: Context) {
+private fun GradientDrawable.applyShape(shape: KalugaBackgroundStyle.Shape, context: Context) {
     this.shape = when (shape) {
-        is BackgroundStyle.Shape.Rectangle -> {
+        is KalugaBackgroundStyle.Shape.Rectangle -> {
             val radiusX = shape.cornerRadiusX.dpToPixel(context)
             val radiusY = shape.cornerRadiusY.dpToPixel(context)
             cornerRadii = floatArrayOf(
-                if (shape.roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT)) radiusX else 0.0f,
-                if (shape.roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT)) radiusY else 0.0f,
-                if (shape.roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.TOP_RIGHT)) radiusX else 0.0f,
-                if (shape.roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.TOP_RIGHT)) radiusY else 0.0f,
-                if (shape.roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT)) radiusX else 0.0f,
-                if (shape.roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT)) radiusY else 0.0f,
-                if (shape.roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT)) radiusX else 0.0f,
-                if (shape.roundedCorners.contains(BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT)) radiusY else 0.0f,
+                if (shape.roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT)) radiusX else 0.0f,
+                if (shape.roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT)) radiusY else 0.0f,
+                if (shape.roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_RIGHT)) radiusX else 0.0f,
+                if (shape.roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_RIGHT)) radiusY else 0.0f,
+                if (shape.roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT)) radiusX else 0.0f,
+                if (shape.roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT)) radiusY else 0.0f,
+                if (shape.roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT)) radiusX else 0.0f,
+                if (shape.roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT)) radiusY else 0.0f,
             )
             GradientDrawable.RECTANGLE
         }
-        is BackgroundStyle.Shape.Oval -> GradientDrawable.OVAL
+        is KalugaBackgroundStyle.Shape.Oval -> GradientDrawable.OVAL
     }
 }
 
-private fun GradientDrawable.applyFillStyle(fillStyle: BackgroundStyle.FillStyle, context: Context) {
+private fun GradientDrawable.applyFillStyle(fillStyle: KalugaBackgroundStyle.FillStyle, context: Context) {
     when (fillStyle) {
-        is BackgroundStyle.FillStyle.Solid -> {
+        is KalugaBackgroundStyle.FillStyle.Solid -> {
             color = ColorStateList(arrayOf(intArrayOf()), intArrayOf(fillStyle.color))
         }
-        is BackgroundStyle.FillStyle.Gradient -> {
+        is KalugaBackgroundStyle.FillStyle.Gradient -> {
             val colors = fillStyle.gradientStyle.colorPoints.map { it.color }.toIntArray()
             val offsets = fillStyle.gradientStyle.colorPoints.map { it.offset }.toFloatArray()
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@@ -104,15 +104,15 @@ private fun GradientDrawable.applyGradientStyle(gradientStyle: GradientStyle, co
     }
 }
 
-private fun GradientDrawable.applyStrokeStyle(strokeStyle: BackgroundStyle.StrokeStyle, context: Context) {
+private fun GradientDrawable.applyStrokeStyle(strokeStyle: KalugaBackgroundStyle.StrokeStyle, context: Context) {
     when (strokeStyle) {
-        is BackgroundStyle.StrokeStyle.Stroke -> {
+        is KalugaBackgroundStyle.StrokeStyle.Stroke -> {
             setStroke(strokeStyle.width.dpToPixel(context).toInt(), ColorStateList(arrayOf(intArrayOf()), intArrayOf(strokeStyle.color)))
         }
-        is BackgroundStyle.StrokeStyle.None -> {}
+        is KalugaBackgroundStyle.StrokeStyle.None -> {}
     }
 }
 
-fun View.applyBackgroundStyle(backgroundStyle: BackgroundStyle) {
+fun View.applyBackgroundStyle(backgroundStyle: KalugaBackgroundStyle) {
     background = backgroundStyle.createDrawable(context)
 }
diff --git a/resources/src/androidLibMain/kotlin/view/Button.kt b/resources/src/androidLibMain/kotlin/view/Button.kt
index dab11e1de..a7eb23881 100644
--- a/resources/src/androidLibMain/kotlin/view/Button.kt
+++ b/resources/src/androidLibMain/kotlin/view/Button.kt
@@ -23,7 +23,7 @@ import android.graphics.drawable.RippleDrawable
 import android.graphics.drawable.StateListDrawable
 import android.util.StateSet
 import com.splendo.kaluga.resources.KalugaColor
-import com.splendo.kaluga.resources.stylable.ButtonStyle
+import com.splendo.kaluga.resources.stylable.KalugaButtonStyle
 
 /**
  * Binds kaluga button
@@ -47,7 +47,7 @@ sealed class RippleStyle {
     data class CustomRipple(val color: KalugaColor) : RippleStyle()
 }
 
-fun android.widget.Button.applyButtonStyle(style: ButtonStyle, rippleStyle: RippleStyle = RippleStyle.ForegroundRipple) {
+fun android.widget.Button.applyButtonStyle(style: KalugaButtonStyle, rippleStyle: RippleStyle = RippleStyle.ForegroundRipple) {
     typeface = style.font
     isAllCaps = false
     textSize = style.textSize
diff --git a/resources/src/androidLibMain/kotlin/view/TextAlignment.kt b/resources/src/androidLibMain/kotlin/view/TextAlignment.kt
index 2f3a78222..36d366843 100644
--- a/resources/src/androidLibMain/kotlin/view/TextAlignment.kt
+++ b/resources/src/androidLibMain/kotlin/view/TextAlignment.kt
@@ -6,28 +6,28 @@ import android.text.Layout
 import android.text.TextUtils
 import android.view.Gravity
 import android.view.View
-import com.splendo.kaluga.resources.stylable.TextAlignment
+import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
 
-fun TextAlignment.alignment(context: Context): Layout.Alignment {
+fun KalugaTextAlignment.alignment(context: Context): Layout.Alignment {
     val locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
         context.resources.configuration.locales.get(0)
     } else {
         context.resources.configuration.locale
     }
     return when (this) {
-        TextAlignment.LEFT -> if (TextUtils.getLayoutDirectionFromLocale(locale) == View.LAYOUT_DIRECTION_RTL) {
+        KalugaTextAlignment.LEFT -> if (TextUtils.getLayoutDirectionFromLocale(locale) == View.LAYOUT_DIRECTION_RTL) {
             Layout.Alignment.ALIGN_OPPOSITE
         } else {
             Layout.Alignment.ALIGN_NORMAL
         }
-        TextAlignment.RIGHT -> if (TextUtils.getLayoutDirectionFromLocale(locale) == View.LAYOUT_DIRECTION_LTR) {
+        KalugaTextAlignment.RIGHT -> if (TextUtils.getLayoutDirectionFromLocale(locale) == View.LAYOUT_DIRECTION_LTR) {
             Layout.Alignment.ALIGN_OPPOSITE
         } else {
             Layout.Alignment.ALIGN_NORMAL
         }
-        TextAlignment.CENTER -> Layout.Alignment.ALIGN_CENTER
-        TextAlignment.END -> Layout.Alignment.ALIGN_OPPOSITE
-        TextAlignment.START -> Layout.Alignment.ALIGN_NORMAL
+        KalugaTextAlignment.CENTER -> Layout.Alignment.ALIGN_CENTER
+        KalugaTextAlignment.END -> Layout.Alignment.ALIGN_OPPOSITE
+        KalugaTextAlignment.START -> Layout.Alignment.ALIGN_NORMAL
     }
 }
 
diff --git a/resources/src/commonMain/kotlin/StyledString.kt b/resources/src/commonMain/kotlin/StyledString.kt
index d01ac0e8e..281474b33 100644
--- a/resources/src/commonMain/kotlin/StyledString.kt
+++ b/resources/src/commonMain/kotlin/StyledString.kt
@@ -18,7 +18,7 @@
 @file:JvmName("AndroidStyledString")
 package com.splendo.kaluga.resources
 
-import com.splendo.kaluga.resources.stylable.TextAlignment
+import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
 import com.splendo.kaluga.resources.stylable.TextStyle
 import kotlin.jvm.JvmName
 
@@ -120,7 +120,7 @@ sealed class StringStyleAttribute {
     sealed class ParagraphStyleAttribute : StringStyleAttribute() {
         data class LeadingIndent(val indent: Float, val firstLineIndent: Float = indent) : ParagraphStyleAttribute()
         data class LineSpacing(val spacing: Float, val paragraphSpacing: Float = 0.0f, val paragraphSpacingBefore: Float = 0.0f) : ParagraphStyleAttribute()
-        data class Alignment(val alignment: TextAlignment) : ParagraphStyleAttribute()
+        data class Alignment(val alignment: KalugaTextAlignment) : ParagraphStyleAttribute()
     }
 
     data class Link(val url: String) : StringStyleAttribute()
diff --git a/resources/src/commonMain/kotlin/stylable/BackgroundStyle.kt b/resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt
similarity index 98%
rename from resources/src/commonMain/kotlin/stylable/BackgroundStyle.kt
rename to resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt
index f8559c257..449a8c01c 100644
--- a/resources/src/commonMain/kotlin/stylable/BackgroundStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt
@@ -19,7 +19,7 @@ package com.splendo.kaluga.resources.stylable
 
 import com.splendo.kaluga.resources.KalugaColor
 
-data class BackgroundStyle(
+data class KalugaBackgroundStyle(
     val fillStyle: FillStyle,
     val strokeStyle: StrokeStyle = StrokeStyle.None,
     val shape: Shape = Shape.Rectangle()
diff --git a/resources/src/commonMain/kotlin/stylable/ButtonStyle.kt b/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt
similarity index 81%
rename from resources/src/commonMain/kotlin/stylable/ButtonStyle.kt
rename to resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt
index 581121f70..6e7de2e0c 100644
--- a/resources/src/commonMain/kotlin/stylable/ButtonStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt
@@ -21,21 +21,21 @@ import com.splendo.kaluga.resources.DefaultColors
 import com.splendo.kaluga.resources.Font
 import com.splendo.kaluga.resources.KalugaColor
 
-data class ButtonStyle(
+data class KalugaButtonStyle(
     val font: Font,
     val textSize: Float,
-    val textAlignment: TextAlignment = TextAlignment.CENTER,
+    val textAlignment: KalugaTextAlignment = KalugaTextAlignment.CENTER,
     val defaultStyle: ButtonStateStyle,
     val pressedStyle: ButtonStateStyle = defaultStyle,
     val disabledStyle: ButtonStateStyle = defaultStyle
 ) {
     constructor(
         textStyle: TextStyle,
-        textAlignment: TextAlignment = TextAlignment.CENTER,
+        textAlignment: KalugaTextAlignment = KalugaTextAlignment.CENTER,
         backgroundColor: KalugaColor = DefaultColors.clear,
         pressedBackgroundColor: KalugaColor = backgroundColor,
         disabledBackgroundColor: KalugaColor = backgroundColor,
-        shape: BackgroundStyle.Shape = BackgroundStyle.Shape.Rectangle()
+        shape: KalugaBackgroundStyle.Shape = KalugaBackgroundStyle.Shape.Rectangle()
     ) : this(
         textStyle.font,
         textStyle.size,
@@ -73,13 +73,13 @@ data class ButtonStyle(
 
 data class ButtonStateStyle(
     val textColor: KalugaColor,
-    val backgroundStyle: BackgroundStyle,
+    val backgroundStyle: KalugaBackgroundStyle,
 ) {
 
-    constructor(textColor: KalugaColor, backgroundColor: KalugaColor = DefaultColors.clear, shape: BackgroundStyle.Shape = BackgroundStyle.Shape.Rectangle()) : this(
+    constructor(textColor: KalugaColor, backgroundColor: KalugaColor = DefaultColors.clear, shape: KalugaBackgroundStyle.Shape = KalugaBackgroundStyle.Shape.Rectangle()) : this(
         textColor,
-        BackgroundStyle(
-            BackgroundStyle.FillStyle.Solid(backgroundColor),
+        KalugaBackgroundStyle(
+            KalugaBackgroundStyle.FillStyle.Solid(backgroundColor),
             shape = shape
         )
     )
diff --git a/resources/src/commonMain/kotlin/stylable/TextAlignment.kt b/resources/src/commonMain/kotlin/stylable/KalugaTextAlignment.kt
similarity index 95%
rename from resources/src/commonMain/kotlin/stylable/TextAlignment.kt
rename to resources/src/commonMain/kotlin/stylable/KalugaTextAlignment.kt
index 590aa5d92..bb5d4dfc6 100644
--- a/resources/src/commonMain/kotlin/stylable/TextAlignment.kt
+++ b/resources/src/commonMain/kotlin/stylable/KalugaTextAlignment.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.resources.stylable
 
-enum class TextAlignment {
+enum class KalugaTextAlignment {
     LEFT,
     RIGHT,
     END,
diff --git a/resources/src/commonMain/kotlin/stylable/TextStyle.kt b/resources/src/commonMain/kotlin/stylable/TextStyle.kt
index f0171b141..6c03e4444 100644
--- a/resources/src/commonMain/kotlin/stylable/TextStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/TextStyle.kt
@@ -24,5 +24,5 @@ data class TextStyle(
     val font: Font,
     val color: KalugaColor,
     val size: Float,
-    val alignment: TextAlignment = TextAlignment.START
+    val alignment: KalugaTextAlignment = KalugaTextAlignment.START
 )
diff --git a/resources/src/commonMain/kotlin/view/KalugaButton.kt b/resources/src/commonMain/kotlin/view/KalugaButton.kt
index 278978555..a5d5b1cd0 100644
--- a/resources/src/commonMain/kotlin/view/KalugaButton.kt
+++ b/resources/src/commonMain/kotlin/view/KalugaButton.kt
@@ -18,22 +18,22 @@
 package com.splendo.kaluga.resources.view
 
 import com.splendo.kaluga.resources.StyledString
-import com.splendo.kaluga.resources.stylable.ButtonStyle
+import com.splendo.kaluga.resources.stylable.KalugaButtonStyle
 
 sealed class KalugaButton {
-    abstract val style: ButtonStyle
+    abstract val style: KalugaButtonStyle
     abstract val isEnabled: Boolean
     abstract val action: () -> Unit
     data class Plain(
         val text: String,
-        override val style: ButtonStyle,
+        override val style: KalugaButtonStyle,
         override val isEnabled: Boolean = true,
         override val action: () -> Unit
     ) : KalugaButton()
 
     data class Styled(
         val text: StyledString,
-        override val style: ButtonStyle,
+        override val style: KalugaButtonStyle,
         override val isEnabled: Boolean = true,
         override val action: () -> Unit
     ) : KalugaButton()
diff --git a/resources/src/iosMain/kotlin/StyledString.kt b/resources/src/iosMain/kotlin/StyledString.kt
index 1a9637806..78068189f 100644
--- a/resources/src/iosMain/kotlin/StyledString.kt
+++ b/resources/src/iosMain/kotlin/StyledString.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.resources
 
-import com.splendo.kaluga.resources.stylable.TextAlignment
+import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
 import com.splendo.kaluga.resources.stylable.TextStyle
 import com.splendo.kaluga.resources.uikit.nsTextAlignment
 import kotlinx.cinterop.CValue
@@ -107,7 +107,7 @@ actual class StyledStringBuilder constructor(string: String, private val default
         )
     }
 
-    private fun StringStyleAttribute.ParagraphStyleAttribute.updateParagraphAttribute(range: IntRange, defaultAlignment: TextAlignment) {
+    private fun StringStyleAttribute.ParagraphStyleAttribute.updateParagraphAttribute(range: IntRange, defaultAlignment: KalugaTextAlignment) {
         // First search for all existing paragraph attributes within range
         val rangesWithParagraphStyle = mutableListOf<Pair<IntRange, NSParagraphStyle>>()
         attributedString.enumerateAttribute("NSParagraphStyle", (0 until attributedString.string.length).nsRange, 0) { match, matchedNSRange, _ ->
diff --git a/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt b/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
index fc961816a..04c928fd0 100644
--- a/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.resources.uikit
 
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.GradientStyle
 import kotlinx.cinterop.CValue
 import kotlinx.cinterop.useContents
@@ -42,9 +42,9 @@ import platform.UIKit.UIRectCornerTopLeft
 import platform.UIKit.UIRectCornerTopRight
 import platform.UIKit.UIView
 
-fun UIView.applyBackgroundStyle(style: BackgroundStyle) = layer.applyBackgroundStyle(style, bounds)
+fun UIView.applyBackgroundStyle(style: KalugaBackgroundStyle) = layer.applyBackgroundStyle(style, bounds)
 
-fun CALayer.applyBackgroundStyle(style: BackgroundStyle, bounds: CValue<CGRect>) = apply {
+fun CALayer.applyBackgroundStyle(style: KalugaBackgroundStyle, bounds: CValue<CGRect>) = apply {
     val maskPath = pathForShape(style.shape, bounds)
     mask = CAShapeLayer(this).apply {
         frame = bounds
@@ -54,16 +54,16 @@ fun CALayer.applyBackgroundStyle(style: BackgroundStyle, bounds: CValue<CGRect>)
     applyStroke(style.strokeStyle, maskPath, bounds)
 }
 
-private fun pathForShape(shape: BackgroundStyle.Shape, bounds: CValue<CGRect>): CGPathRef? =
+private fun pathForShape(shape: KalugaBackgroundStyle.Shape, bounds: CValue<CGRect>): CGPathRef? =
     when (shape) {
-        is BackgroundStyle.Shape.Rectangle -> UIBezierPath.bezierPathWithRoundedRect(
+        is KalugaBackgroundStyle.Shape.Rectangle -> UIBezierPath.bezierPathWithRoundedRect(
             bounds,
             shape.roundedCorners.fold(0U) { acc, corner ->
                 acc or when (corner) {
-                    BackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT -> UIRectCornerTopLeft
-                    BackgroundStyle.Shape.Rectangle.Corner.TOP_RIGHT -> UIRectCornerTopRight
-                    BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT -> UIRectCornerBottomLeft
-                    BackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT -> UIRectCornerBottomRight
+                    KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT -> UIRectCornerTopLeft
+                    KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_RIGHT -> UIRectCornerTopRight
+                    KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT -> UIRectCornerBottomLeft
+                    KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_RIGHT -> UIRectCornerBottomRight
                 }
             },
             CGSizeMake(
@@ -71,22 +71,22 @@ private fun pathForShape(shape: BackgroundStyle.Shape, bounds: CValue<CGRect>):
                 shape.cornerRadiusY.toDouble()
             )
         )
-        is BackgroundStyle.Shape.Oval -> UIBezierPath.bezierPathWithOvalInRect(bounds)
+        is KalugaBackgroundStyle.Shape.Oval -> UIBezierPath.bezierPathWithOvalInRect(bounds)
     }.CGPath
 
-private fun CALayer.applyFillStyle(fillStyle: BackgroundStyle.FillStyle, bounds: CValue<CGRect>) {
+private fun CALayer.applyFillStyle(fillStyle: KalugaBackgroundStyle.FillStyle, bounds: CValue<CGRect>) {
     addSublayer(
         CAGradientLayer(this).apply {
             frame = bounds
             when (fillStyle) {
-                is BackgroundStyle.FillStyle.Solid -> {
+                is KalugaBackgroundStyle.FillStyle.Solid -> {
                     type = kCAGradientLayerAxial
                     colors = listOfNotNull(
                         fillStyle.color.uiColor.CGColor,
                         fillStyle.color.uiColor.CGColor
                     ).mapToCGColor()
                 }
-                is BackgroundStyle.FillStyle.Gradient -> {
+                is KalugaBackgroundStyle.FillStyle.Gradient -> {
                     val sortedColorPoints =
                         fillStyle.gradientStyle.colorPoints.sortedBy { it.offset }
                     colors =
@@ -165,7 +165,7 @@ private fun CAGradientLayer.applyGradientStyle(
 }
 
 private fun CALayer.applyStroke(
-    strokeStyle: BackgroundStyle.StrokeStyle,
+    strokeStyle: KalugaBackgroundStyle.StrokeStyle,
     path: CGPathRef?,
     bounds: CValue<CGRect>
 ) {
@@ -174,11 +174,11 @@ private fun CALayer.applyStroke(
             frame = bounds
             this.path = path
             when (strokeStyle) {
-                is BackgroundStyle.StrokeStyle.Stroke -> {
+                is KalugaBackgroundStyle.StrokeStyle.Stroke -> {
                     lineWidth = strokeStyle.width.toDouble()
                     strokeColor = strokeStyle.color.uiColor.CGColor
                 }
-                is BackgroundStyle.StrokeStyle.None -> {
+                is KalugaBackgroundStyle.StrokeStyle.None -> {
                     lineWidth = 0.0
                     strokeColor = UIColor.clearColor.CGColor
                 }
diff --git a/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt b/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
index fee39d574..f3d237994 100644
--- a/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.resources.uikit
 
 import com.splendo.kaluga.resources.stylable.ButtonStateStyle
-import com.splendo.kaluga.resources.stylable.ButtonStyle
+import com.splendo.kaluga.resources.stylable.KalugaButtonStyle
 import com.splendo.kaluga.resources.view.KalugaButton
 import kotlinx.cinterop.ObjCAction
 import kotlinx.cinterop.useContents
@@ -65,7 +65,7 @@ fun UIButton.bindButton(button: KalugaButton) {
     addTarget(wrappedAction, sel_registerName("invoke"), UIControlEventTouchUpInside)
 }
 
-fun UIButton.applyStyle(buttonStyle: ButtonStyle) {
+fun UIButton.applyStyle(buttonStyle: KalugaButtonStyle) {
     setFont(buttonStyle.font.fontWithSize(buttonStyle.textSize.toDouble()))
     setContentHorizontalAlignment(buttonStyle.textAlignment.contentHorizontalAlignment)
     applyButtonStateStyle(buttonStyle.defaultStyle, UIControlStateNormal)
diff --git a/resources/src/iosMain/kotlin/uikit/TextAlignment.kt b/resources/src/iosMain/kotlin/uikit/TextAlignment.kt
index 1e943ff78..932a09fa9 100644
--- a/resources/src/iosMain/kotlin/uikit/TextAlignment.kt
+++ b/resources/src/iosMain/kotlin/uikit/TextAlignment.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.resources.uikit
 
-import com.splendo.kaluga.resources.stylable.TextAlignment
+import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
 import platform.UIKit.NSTextAlignment
 import platform.UIKit.NSTextAlignmentCenter
 import platform.UIKit.NSTextAlignmentLeft
@@ -32,22 +32,22 @@ import platform.UIKit.UIControlContentHorizontalAlignmentRight
 import platform.UIKit.UIControlContentHorizontalAlignmentTrailing
 import platform.UIKit.UIUserInterfaceLayoutDirection
 
-val TextAlignment.nsTextAlignment: NSTextAlignment get() = when (this) {
-    TextAlignment.LEFT -> NSTextAlignmentLeft
-    TextAlignment.RIGHT -> NSTextAlignmentRight
-    TextAlignment.CENTER -> NSTextAlignmentCenter
-    TextAlignment.END -> if (UIApplication.sharedApplication.userInterfaceLayoutDirection == UIUserInterfaceLayoutDirection.UIUserInterfaceLayoutDirectionLeftToRight) {
+val KalugaTextAlignment.nsTextAlignment: NSTextAlignment get() = when (this) {
+    KalugaTextAlignment.LEFT -> NSTextAlignmentLeft
+    KalugaTextAlignment.RIGHT -> NSTextAlignmentRight
+    KalugaTextAlignment.CENTER -> NSTextAlignmentCenter
+    KalugaTextAlignment.END -> if (UIApplication.sharedApplication.userInterfaceLayoutDirection == UIUserInterfaceLayoutDirection.UIUserInterfaceLayoutDirectionLeftToRight) {
         NSTextAlignmentRight
     } else {
         NSTextAlignmentLeft
     }
-    TextAlignment.START -> NSTextAlignmentNatural
+    KalugaTextAlignment.START -> NSTextAlignmentNatural
 }
 
-val TextAlignment.contentHorizontalAlignment: UIControlContentHorizontalAlignment get() = when (this) {
-    TextAlignment.LEFT -> UIControlContentHorizontalAlignmentLeft
-    TextAlignment.RIGHT -> UIControlContentHorizontalAlignmentRight
-    TextAlignment.CENTER -> UIControlContentHorizontalAlignmentCenter
-    TextAlignment.END -> UIControlContentHorizontalAlignmentTrailing
-    TextAlignment.START -> UIControlContentHorizontalAlignmentLeading
+val KalugaTextAlignment.contentHorizontalAlignment: UIControlContentHorizontalAlignment get() = when (this) {
+    KalugaTextAlignment.LEFT -> UIControlContentHorizontalAlignmentLeft
+    KalugaTextAlignment.RIGHT -> UIControlContentHorizontalAlignmentRight
+    KalugaTextAlignment.CENTER -> UIControlContentHorizontalAlignmentCenter
+    KalugaTextAlignment.END -> UIControlContentHorizontalAlignmentTrailing
+    KalugaTextAlignment.START -> UIControlContentHorizontalAlignmentLeading
 }

From acafee8aa048f4a4b3da18dc04b5be4b83c0afdb Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 5 Dec 2022 11:13:15 +0100
Subject: [PATCH 057/227] Fixed broken alerts in ButtonView

---
 example/ios/Demo/Alerts/AlertsView.swift                 | 6 +++---
 example/ios/Demo/DateTimePicker/DateTimePickerView.swift | 6 +++---
 example/ios/Demo/LoadingIndicator/LoadingView.swift      | 6 +++---
 example/ios/Demo/Resources/ButtonView.swift              | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/example/ios/Demo/Alerts/AlertsView.swift b/example/ios/Demo/Alerts/AlertsView.swift
index 92633e8f3..45955e536 100644
--- a/example/ios/Demo/Alerts/AlertsView.swift
+++ b/example/ios/Demo/Alerts/AlertsView.swift
@@ -22,9 +22,9 @@ struct AlertsView: View {
     let lifecycleViewModel: LifecycleViewModel<AlertViewModel>
 
     init() {
-        let container = ContainerView(.alert)
-        let viewModel = AlertViewModel(builder: container.alertBuilder)
-        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: container)
+        let containerView = ContainerView(.alert)
+        let viewModel = AlertViewModel(builder: containerView.alertBuilder)
+        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: containerView)
     }
 
     var body: some View {
diff --git a/example/ios/Demo/DateTimePicker/DateTimePickerView.swift b/example/ios/Demo/DateTimePicker/DateTimePickerView.swift
index bf1a9c903..f749b2f12 100644
--- a/example/ios/Demo/DateTimePicker/DateTimePickerView.swift
+++ b/example/ios/Demo/DateTimePicker/DateTimePickerView.swift
@@ -23,10 +23,10 @@ struct DateTimePickerView: View {
     let lifecycleViewModel: LifecycleViewModel<DateTimePickerViewModel>
 
     init() {
-        let container = ContainerView(.datePicker)
-        let viewModel = DateTimePickerViewModel(dateTimePickerPresenterBuilder: container.datePickerBuilder)
+        let containerView = ContainerView(.datePicker)
+        let viewModel = DateTimePickerViewModel(dateTimePickerPresenterBuilder: containerView.datePickerBuilder)
         dateLabel = StringObservable(viewModel.dateLabel)
-        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: container)
+        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: containerView)
     }
 
     var body: some View {
diff --git a/example/ios/Demo/LoadingIndicator/LoadingView.swift b/example/ios/Demo/LoadingIndicator/LoadingView.swift
index 35591de5d..69abe4dff 100644
--- a/example/ios/Demo/LoadingIndicator/LoadingView.swift
+++ b/example/ios/Demo/LoadingIndicator/LoadingView.swift
@@ -22,9 +22,9 @@ struct LoadingView: View {
     let lifecycleViewModel: LifecycleViewModel<HudViewModel>
 
     init() {
-        let container = ContainerView(.hud)
-        let viewModel = HudViewModel(builder: container.hudBuilder)
-        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: container)
+        let containerView = ContainerView(.hud)
+        let viewModel = HudViewModel(builder: containerView.hudBuilder)
+        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: containerView)
     }
 
     var body: some View {
diff --git a/example/ios/Demo/Resources/ButtonView.swift b/example/ios/Demo/Resources/ButtonView.swift
index 81778379e..e7b3dc7b8 100644
--- a/example/ios/Demo/Resources/ButtonView.swift
+++ b/example/ios/Demo/Resources/ButtonView.swift
@@ -26,10 +26,10 @@ struct ButtonView: View, Equatable {
     @ObservedObject var buttons: ListObservable<KalugaButton>
 
     init() {
-        let contentView = ContainerView(.alert)
-        let viewModel = ButtonViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider(), alertPresenterBuilder: contentView.alertBuilder)
+        let containerView = ContainerView(.alert)
+        let viewModel = ButtonViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider(), alertPresenterBuilder: containerView.alertBuilder)
         buttons = ListObservable(viewModel.buttons)
-        lifecycleViewModel = LifecycleViewModel(viewModel)
+        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: containerView)
     }
 
     var body: some View {

From 2276fa0db85e796bc728188f4bbbb59d0f29dcf3 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 6 Dec 2022 01:57:24 +0100
Subject: [PATCH 058/227] Adding architecture swiftUI example

---
 example/ios/Demo.xcodeproj/project.pbxproj    |   8 ++
 .../ArchitectureDetailsView.swift             |  98 ++++++++++++++++
 .../Demo/Architecture/ArchitectureView.swift  | 108 ++++++++++++++++++
 .../ArchitectureViewController.swift          |   9 ++
 example/ios/Demo/Base.lproj/Main.storyboard   |  41 ++++---
 .../FeaturesListViewController.swift          |   8 +-
 example/ios/Demo/Resources/ColorView.swift    |   1 +
 .../Demo/Resources/ResourcesListView.swift    |   3 +-
 .../ArchitectureDetailsViewModel.kt           |  21 ++--
 .../ArchitectureDetailsNavigator.kt           |  11 ++
 .../architecture/ArchitectureNavigator.kt     |  11 ++
 11 files changed, 284 insertions(+), 35 deletions(-)
 create mode 100644 example/ios/Demo/Architecture/ArchitectureDetailsView.swift
 create mode 100644 example/ios/Demo/Architecture/ArchitectureView.swift

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index e69c2c0e9..664378f89 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -41,6 +41,8 @@
 		20CA2907293796D7007E4079 /* BottomSheetSubPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */; };
 		20D8CD3726FE8FE200D14AC9 /* ResourcesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */; };
 		20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3826FF550100D14AC9 /* LabelViewController.swift */; };
+		20FFB48A293EB4F0005CF1C8 /* ArchitectureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FFB489293EB4F0005CF1C8 /* ArchitectureView.swift */; };
+		20FFB48C293EC3CB005CF1C8 /* ArchitectureDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FFB48B293EC3CB005CF1C8 /* ArchitectureDetailsView.swift */; };
 		2EF7D8289105AC623E600829 /* UninitializedObservable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 744B1E9043B534F8B9BD501C /* UninitializedObservable.generated.swift */; };
 		300D5D65F49D6711AC8FF5DA /* Subject.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7A59766D89528BA5F4327BD /* Subject.generated.swift */; };
 		319A4712667C1DC1B422411A /* KalugaLabel+SwiftUI.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCF6BD3638095E5452785FF3 /* KalugaLabel+SwiftUI.generated.swift */; };
@@ -142,6 +144,8 @@
 		20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetSubPageViewController.swift; sourceTree = "<group>"; };
 		20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesListViewController.swift; sourceTree = "<group>"; };
 		20D8CD3826FF550100D14AC9 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = "<group>"; };
+		20FFB489293EB4F0005CF1C8 /* ArchitectureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureView.swift; sourceTree = "<group>"; };
+		20FFB48B293EC3CB005CF1C8 /* ArchitectureDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureDetailsView.swift; sourceTree = "<group>"; };
 		27D181CE83615D345BB56946 /* HasDefaultValue.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = HasDefaultValue.generated.swift; sourceTree = "<group>"; };
 		31718DE342D28B4942D37524 /* ListObservable.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ListObservable.generated.swift; sourceTree = "<group>"; };
 		382B35FA85A28992FE37B803 /* KalugaStyledString+SwiftUI.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "KalugaStyledString+SwiftUI.generated.swift"; sourceTree = "<group>"; };
@@ -287,6 +291,8 @@
 				20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */,
 				20CA2904293796C5007E4079 /* BottomSheetViewController.swift */,
 				20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */,
+				20FFB489293EB4F0005CF1C8 /* ArchitectureView.swift */,
+				20FFB48B293EC3CB005CF1C8 /* ArchitectureDetailsView.swift */,
 			);
 			path = Architecture;
 			sourceTree = "<group>";
@@ -681,6 +687,7 @@
 				73DBBA374F2ED176BCF8E189 /* DefaultValues.generated.swift in Sources */,
 				42B12B5CFE87189A5F539B92 /* HasDefaultValue.generated.swift in Sources */,
 				D174F54A364898AC7E0962FC /* KalugaBackgroundStyle+SwiftUI.generated.swift in Sources */,
+				20FFB48C293EC3CB005CF1C8 /* ArchitectureDetailsView.swift in Sources */,
 				D976FB8DC34A35578A995B2E /* KalugaButton+SwiftUI.generated.swift in Sources */,
 				7C49888336FE57AAA89E7958 /* KalugaDate+Extensions.generated.swift in Sources */,
 				319A4712667C1DC1B422411A /* KalugaLabel+SwiftUI.generated.swift in Sources */,
@@ -698,6 +705,7 @@
 				847C2A647F23AF46CED079CF /* RoutingState.generated.swift in Sources */,
 				C0C827F580A4F1950E9B10EE /* Shape+Helpers.generated.swift in Sources */,
 				300D5D65F49D6711AC8FF5DA /* Subject.generated.swift in Sources */,
+				20FFB48A293EB4F0005CF1C8 /* ArchitectureView.swift in Sources */,
 				2EF7D8289105AC623E600829 /* UninitializedObservable.generated.swift in Sources */,
 				1529FF0B35BD7AB3B6E838A9 /* UninitializedSubject.generated.swift in Sources */,
 			);
diff --git a/example/ios/Demo/Architecture/ArchitectureDetailsView.swift b/example/ios/Demo/Architecture/ArchitectureDetailsView.swift
new file mode 100644
index 000000000..627c204a6
--- /dev/null
+++ b/example/ios/Demo/Architecture/ArchitectureDetailsView.swift
@@ -0,0 +1,98 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct ArchitectureDetailsView: View, Equatable {
+    static func == (lhs: ArchitectureDetailsView, rhs: ArchitectureDetailsView) -> Bool {
+        lhs.inputDetails == rhs.inputDetails
+    }
+
+
+    let inputDetails: InputDetails
+    private let lifecycleViewModel: LifecycleViewModel<ArchitectureDetailsViewModel>
+    let router: Router
+
+    @ObservedObject var name: StringObservable
+    @ObservedObject var number: StringObservable
+
+    @EnvironmentObject var previousRouter: RoutingState
+
+    init(inputDetails: InputDetails, onFinish: @escaping (InputDetails) -> Void) {
+        let router = Router(onFinish: onFinish)
+        self.router = router
+        self.inputDetails = inputDetails
+        let viewModel = ArchitectureDetailsViewModel(initialDetail: inputDetails, navigator: router.navigator)
+
+        name = StringObservable(viewModel.name)
+        number = StringObservable(viewModel.number)
+
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        router.previousRouter = previousRouter
+        return generateBody()
+    }
+
+    func generateBody() -> some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            ScrollView {
+                VStack(spacing: 10.0) {
+                    Text(name.value)
+                    Text(number.value)
+                    viewModel.inverseButton.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                    viewModel.finishButton.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                }
+            }
+            .padding(10.0)
+            .navigationBarItems(leading:
+                                    Button(action: { viewModel.onBackPressed() }) {
+                                            Image(systemName: "chevron.left")
+                                                .scaleEffect(0.83)
+                                                .font(Font.title.weight(.medium))
+                                        })
+            .navigationBarBackButtonHidden(true)
+        }
+    }
+}
+
+extension ArchitectureDetailsView {
+    class Router {
+        var previousRouter: RoutingState?
+        let onFinish: (InputDetails) -> Void
+        lazy var navigator = ArchitectureDetailsNavigatorKt.ArchitectureDetailsNavigator { [weak self] inputDetails in
+            self?.onFinish(inputDetails)
+            self?.previousRouter?.close()
+        } onClose: { [weak self] in
+            self?.previousRouter?.close()
+        }
+
+
+        init(onFinish: @escaping (InputDetails) -> Void) {
+            self.onFinish = onFinish
+        }
+    }
+}
+
+struct ArchitectureDetailsView_Previews: PreviewProvider {
+    static var previews: some View {
+        ArchitectureDetailsView(inputDetails: InputDetails(name: "Name", number: 42)) { _ in
+
+        }
+    }
+}
diff --git a/example/ios/Demo/Architecture/ArchitectureView.swift b/example/ios/Demo/Architecture/ArchitectureView.swift
new file mode 100644
index 000000000..47d0a155a
--- /dev/null
+++ b/example/ios/Demo/Architecture/ArchitectureView.swift
@@ -0,0 +1,108 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+import PartialSheet
+
+struct ArchitectureView: View {
+
+    private let lifecycleViewModel: LifecycleViewModel<ArchitectureViewModel>
+    private let router = Router()
+
+    @ObservedObject var nameInput: StringSubject
+    @ObservedObject var isNameValid: BoolObservable
+    @ObservedObject var numberInput: StringSubject
+    @ObservedObject var isNumberValid: BoolObservable
+
+    @ObservedObject var contentRoutingState = ObjectRoutingState<ContentRoute>()
+    @ObservedObject var bottomSheetRoutingState = RoutingState()
+
+    init() {
+        let viewModel = ArchitectureViewModel(navigator: router.defaultNavigator)
+        nameInput = StringSubject(viewModel.nameInput)
+        isNameValid = BoolObservable(viewModel.isNameValid)
+        numberInput = StringSubject(viewModel.numberInput)
+        isNumberValid = BoolObservable(viewModel.isNumberValid)
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        router.nextContentRoutingState = contentRoutingState
+        router.bottomSheetRoutingState = bottomSheetRoutingState
+        return generateBody()
+    }
+
+    func generateBody() -> some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            ScrollView {
+                VStack(spacing: 10.0) {
+                    TextField(viewModel.namePlaceholder, text: $nameInput.value)
+                        .textFieldStyle(.roundedBorder)
+                        .border(isNameValid.value ? Color.gray : Color.red)
+                    TextField(viewModel.numberPlaceholder, text: $numberInput.value)
+                        .textFieldStyle(.roundedBorder)
+                        .keyboardType(.numberPad)
+                        .border(isNumberValid.value ? Color.gray : Color.red)
+                    viewModel.showDetailsButton.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                    viewModel.showBottomSheetButton.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                }
+            }
+            .padding(10.0)
+            .navigation(state: contentRoutingState, type: .push) {
+                switch contentRoutingState.object {
+                case let .details(input): ArchitectureDetailsView(inputDetails: input) { result in
+                    viewModel.nameInput.post(newValue: result.name as NSString)
+                    viewModel.numberInput.post(newValue: NSString.init(format: "%d", result.number))
+                }.equatable()
+                        .environmentObject(contentRoutingState as RoutingState)
+                default: EmptyView()
+                }
+            }
+            .navigation(state: bottomSheetRoutingState, type: .partialSheet(style: PSIphoneStyle.defaultStyle())) {
+                Text("Im a bottom sheet")
+            }
+            .navigationTitle("feature_architecture".localized())
+        }
+    }
+}
+
+extension ArchitectureView {
+    enum ContentRoute : Equatable {
+        case details(input: InputDetails)
+    }
+
+    class Router {
+
+        var nextContentRoutingState: ObjectRoutingState<ContentRoute>? = nil
+        var bottomSheetRoutingState: RoutingState? = nil
+        lazy var defaultNavigator = ArchitectureNavigatorKt.ArchitectureNavigator(
+            onDetails: { [weak self] inputDetails in
+                self?.nextContentRoutingState?.show(ContentRoute.details(input: inputDetails))
+
+            },
+            onBottomSheet: { [weak self] in
+                self?.bottomSheetRoutingState?.show()
+            }
+        )
+    }
+}
+
+struct ArchitectureView_Previews: PreviewProvider {
+    static var previews: some View {
+        ArchitectureView()
+    }
+}
diff --git a/example/ios/Demo/Architecture/ArchitectureViewController.swift b/example/ios/Demo/Architecture/ArchitectureViewController.swift
index becce91a7..1b200bef4 100644
--- a/example/ios/Demo/Architecture/ArchitectureViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureViewController.swift
@@ -19,6 +19,15 @@ import UIKit
 import KalugaExampleShared
 
 class ArchitectureViewController: UIViewController  {
+
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "Architecture"
+    }
+
+    static func instantiate() -> ArchitectureViewController {
+        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! ArchitectureViewController
+    }
     
     @IBOutlet weak var nameLabel: UILabel!
     @IBOutlet weak var nameInput: UITextField!
diff --git a/example/ios/Demo/Base.lproj/Main.storyboard b/example/ios/Demo/Base.lproj/Main.storyboard
index 6dac96a4e..1b01b4a91 100644
--- a/example/ios/Demo/Base.lproj/Main.storyboard
+++ b/example/ios/Demo/Base.lproj/Main.storyboard
@@ -14,9 +14,9 @@
         <!--Architecture View Controller-->
         <scene sceneID="YDA-Hr-mSj">
             <objects>
-                <viewController id="irm-WF-A13" customClass="ArchitectureViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="Architecture" id="irm-WF-A13" customClass="ArchitectureViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="py6-Ar-fCs">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="r7U-VH-8wC">
@@ -350,14 +350,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="FeaturesListCell" id="C4Y-IC-Pu4" customClass="FeaturesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="52"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="C4Y-IC-Pu4" id="XEB-aa-Byo">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xh8-DK-zfM">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -383,7 +383,6 @@
                     <navigationItem key="navigationItem" id="q2T-p0-bqB"/>
                     <connections>
                         <outlet property="view" destination="KZQ-Mr-INa" id="yKY-xs-5Bk"/>
-                        <segue destination="irm-WF-A13" kind="show" identifier="showArchitecture" id="IOQ-4E-QhL"/>
                         <segue destination="BYZ-38-t0r" kind="show" identifier="showLocation" id="25d-lm-Tpv"/>
                         <segue destination="Hbw-co-mWZ" kind="show" identifier="showPermissions" id="gxu-od-TLe"/>
                         <segue destination="7Rf-m0-GFx" kind="show" identifier="showKeyboard" id="IO5-8e-Q9F"/>
@@ -993,14 +992,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SystemListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SystemListCell" id="a8b-dW-eKx" customClass="SystemListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="52"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="a8b-dW-eKx" id="pjk-M2-4TV">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pnV-0z-POK">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1082,14 +1081,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="InfoButtonCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="InfoButtonCell" id="3eh-xF-TU3" customClass="InfoButtonCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="44"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="43"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3eh-xF-TU3" id="cyO-Cc-dq8">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odz-vr-fX0">
-                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1130,14 +1129,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PermissionsListCell" id="FrV-FL-GKa" customClass="PermissionsListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="52"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FrV-FL-GKa" id="wA3-QT-FyZ">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nXv-Uh-BJk">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1278,14 +1277,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ResourcesListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ResourcesListCell" id="YH6-gF-Pq3" customClass="ResourcesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="37"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="38"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YH6-gF-Pq3" id="yfs-Dl-hfq">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="37"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="38"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="app-pb-mRq">
-                                            <rect key="frame" x="20" y="8" width="374" height="21"/>
+                                            <rect key="frame" x="20" y="8" width="374" height="22"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1720,14 +1719,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="UITypesListCell" id="ZCQ-8B-OTT" customClass="UITypesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ZCQ-8B-OTT" id="nFY-1A-spl">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GMC-Yg-Klf">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21.5"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
diff --git a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
index f8323afb7..b6153250a 100644
--- a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -17,6 +17,7 @@
 
 import UIKit
 import KalugaExampleShared
+import PartialSheet
 
 class FeaturesListViewController : UITableViewController {
 
@@ -90,7 +91,12 @@ private extension FeatureListNavigationAction {
                     swiftUIView: { AlertsView() }
                 )
             }
-            case is FeatureListNavigationAction.Architecture: return NavigationSpec.Segue(identifier: "showArchitecture")
+            case is FeatureListNavigationAction.Architecture: return NavigationSpec.Push(animated: true) {
+                SwiftUIOrUIKitSelectionViewController.create(
+                    uiKitViewController: { ArchitectureViewController.instantiate() },
+                    swiftUIView: { ArchitectureView().attachPartialSheetToRoot() }
+                )
+            }
             case is FeatureListNavigationAction.Beacons: return NavigationSpec.Segue(identifier: "showBeacons")
             case is FeatureListNavigationAction.Bluetooth: return NavigationSpec.Segue(identifier: "showBluetooth")
             case is FeatureListNavigationAction.DateTimePicker: return NavigationSpec.Push(animated: true) {
diff --git a/example/ios/Demo/Resources/ColorView.swift b/example/ios/Demo/Resources/ColorView.swift
index 307f6a977..cabd609f9 100644
--- a/example/ios/Demo/Resources/ColorView.swift
+++ b/example/ios/Demo/Resources/ColorView.swift
@@ -97,6 +97,7 @@ struct ColorView: View, Equatable {
                 lightenedSource.asHorizontalScrollView()
                 darkenedSource.asHorizontalScrollView()
             }
+            .navigationTitle("feature_resources_color".localized())
             .onAppear {
                 disposeBag.add(
                     disposable: viewModel.backdropText.observe { next in
diff --git a/example/ios/Demo/Resources/ResourcesListView.swift b/example/ios/Demo/Resources/ResourcesListView.swift
index 9e22e8c9f..1958b785b 100644
--- a/example/ios/Demo/Resources/ResourcesListView.swift
+++ b/example/ios/Demo/Resources/ResourcesListView.swift
@@ -22,10 +22,9 @@ struct ResourcesListView: View {
     @ObservedObject var navigationState = ObjectRoutingState<Route>()
     @ObservedObject var resources: ListObservable<Resource>
     let lifecycleViewModel: LifecycleViewModel<ResourcesListViewModel>
-    let router: Router
+    let router = Router()
 
     init() {
-        router = Router()
 
         let viewModel = ResourcesListViewModel(navigator: router.defaultNavigator)
         resources = ListObservable(viewModel.resources)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
index 9128b50c2..252eac6a8 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
@@ -20,12 +20,12 @@ package com.splendo.kaluga.example.shared.viewmodel.architecture
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
-import com.splendo.kaluga.architecture.observable.InitializedObservable
-import com.splendo.kaluga.architecture.observable.subjectOf
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
 import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.resources.localized
 import com.splendo.kaluga.resources.view.KalugaButton
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -41,21 +41,20 @@ sealed class ArchitectureDetailsNavigationAction<T>(value: T, type: NavigationBu
 
 class ArchitectureDetailsViewModel(initialDetail: InputDetails, navigator: Navigator<ArchitectureDetailsNavigationAction<*>>) : NavigatingViewModel<ArchitectureDetailsNavigationAction<*>>(navigator) {
 
-    private val _name = subjectOf(initialDetail.name)
-    val name: InitializedObservable<String> = _name
-    private val _number = subjectOf(initialDetail.number.toString())
-    val number: InitializedObservable<String> = _number
+    private val _name = MutableStateFlow(initialDetail.name)
+    val name = _name.toInitializedObservable(coroutineScope)
+    private val _number = MutableStateFlow(initialDetail.number.toString())
+    val number = _number.toInitializedObservable(coroutineScope)
+
 
-    private var nameResult: String by _name.valueDelegate
-    private var numberResult: String by _number.valueDelegate
 
     val inverseButton = KalugaButton.Plain("architecture_details_inverse".localized(), ButtonStyles.default) {
-        nameResult = nameResult.reversed()
-        numberResult = numberResult.reversed()
+        _name.value = _name.value.reversed()
+        _number.value = _number.value.reversed()
     }
 
     val finishButton = KalugaButton.Plain("architecture_finish".localized(), ButtonStyles.default) {
-        navigator.navigate(ArchitectureDetailsNavigationAction.FinishWithDetails(InputDetails(nameResult, numberResult.toIntOrNull() ?: 0)))
+        navigator.navigate(ArchitectureDetailsNavigationAction.FinishWithDetails(InputDetails(_name.value, _number.value.toIntOrNull() ?: 0)))
     }
 
     fun onBackPressed() {
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsNavigator.kt
index e61aae475..72bcbc3ec 100644
--- a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsNavigator.kt
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsNavigator.kt
@@ -17,10 +17,21 @@
 
 package com.splendo.kaluga.example.shared.viewmodel.architecture
 
+import com.splendo.kaluga.architecture.navigation.DefaultNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.navigation.ViewControllerNavigator
 import platform.UIKit.UIViewController
 
+fun ArchitectureDetailsNavigator(
+    onFinishWithDetails: (InputDetails) -> Unit,
+    onClose: () -> Unit
+) = DefaultNavigator<ArchitectureDetailsNavigationAction<*>> { action ->
+    when (action) {
+        is ArchitectureDetailsNavigationAction.FinishWithDetails -> onFinishWithDetails(action.value)
+        is ArchitectureDetailsNavigationAction.Close -> onClose()
+    }
+}
+
 fun ArchitectureDetailsViewControllerNavigator(
     parent: UIViewController,
     onFinishWithDetails: (InputDetails) -> NavigationSpec,
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureNavigator.kt
index 0c0e85735..e31333c02 100644
--- a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureNavigator.kt
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureNavigator.kt
@@ -17,10 +17,21 @@
 
 package com.splendo.kaluga.example.shared.viewmodel.architecture
 
+import com.splendo.kaluga.architecture.navigation.DefaultNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.navigation.ViewControllerNavigator
 import platform.UIKit.UIViewController
 
+fun ArchitectureNavigator(
+    onDetails: (InputDetails) -> Unit,
+    onBottomSheet: () -> Unit
+) = DefaultNavigator<ArchitectureNavigationAction<*>> { action ->
+    when (action) {
+        is ArchitectureNavigationAction.Details -> onDetails(action.value)
+        is ArchitectureNavigationAction.BottomSheet -> onBottomSheet()
+    }
+}
+
 fun ArchitectureViewControllerNavigator(
     parent: UIViewController,
     onDetails: (InputDetails) -> NavigationSpec,

From 79b4a34c58431484b88cdec9b7f917c1568bebce Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 6 Dec 2022 18:01:31 +0100
Subject: [PATCH 059/227] BottomSheet iOS example

---
 example/ios/Demo.xcodeproj/project.pbxproj    |  8 ++
 .../Demo/Architecture/ArchitectureView.swift  |  2 +-
 .../Architecture/BottomSheetSubPageView.swift | 84 +++++++++++++++++++
 .../Demo/Architecture/BottomSheetView.swift   | 83 ++++++++++++++++++
 4 files changed, 176 insertions(+), 1 deletion(-)
 create mode 100644 example/ios/Demo/Architecture/BottomSheetSubPageView.swift
 create mode 100644 example/ios/Demo/Architecture/BottomSheetView.swift

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 664378f89..e2e4f7c14 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -43,6 +43,8 @@
 		20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3826FF550100D14AC9 /* LabelViewController.swift */; };
 		20FFB48A293EB4F0005CF1C8 /* ArchitectureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FFB489293EB4F0005CF1C8 /* ArchitectureView.swift */; };
 		20FFB48C293EC3CB005CF1C8 /* ArchitectureDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FFB48B293EC3CB005CF1C8 /* ArchitectureDetailsView.swift */; };
+		20FFB48E293F818B005CF1C8 /* BottomSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FFB48D293F818B005CF1C8 /* BottomSheetView.swift */; };
+		20FFB490293FA7EB005CF1C8 /* BottomSheetSubPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FFB48F293FA7EB005CF1C8 /* BottomSheetSubPageView.swift */; };
 		2EF7D8289105AC623E600829 /* UninitializedObservable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 744B1E9043B534F8B9BD501C /* UninitializedObservable.generated.swift */; };
 		300D5D65F49D6711AC8FF5DA /* Subject.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7A59766D89528BA5F4327BD /* Subject.generated.swift */; };
 		319A4712667C1DC1B422411A /* KalugaLabel+SwiftUI.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCF6BD3638095E5452785FF3 /* KalugaLabel+SwiftUI.generated.swift */; };
@@ -146,6 +148,8 @@
 		20D8CD3826FF550100D14AC9 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = "<group>"; };
 		20FFB489293EB4F0005CF1C8 /* ArchitectureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureView.swift; sourceTree = "<group>"; };
 		20FFB48B293EC3CB005CF1C8 /* ArchitectureDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureDetailsView.swift; sourceTree = "<group>"; };
+		20FFB48D293F818B005CF1C8 /* BottomSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetView.swift; sourceTree = "<group>"; };
+		20FFB48F293FA7EB005CF1C8 /* BottomSheetSubPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetSubPageView.swift; sourceTree = "<group>"; };
 		27D181CE83615D345BB56946 /* HasDefaultValue.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = HasDefaultValue.generated.swift; sourceTree = "<group>"; };
 		31718DE342D28B4942D37524 /* ListObservable.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ListObservable.generated.swift; sourceTree = "<group>"; };
 		382B35FA85A28992FE37B803 /* KalugaStyledString+SwiftUI.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "KalugaStyledString+SwiftUI.generated.swift"; sourceTree = "<group>"; };
@@ -293,6 +297,8 @@
 				20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */,
 				20FFB489293EB4F0005CF1C8 /* ArchitectureView.swift */,
 				20FFB48B293EC3CB005CF1C8 /* ArchitectureDetailsView.swift */,
+				20FFB48D293F818B005CF1C8 /* BottomSheetView.swift */,
+				20FFB48F293FA7EB005CF1C8 /* BottomSheetSubPageView.swift */,
 			);
 			path = Architecture;
 			sourceTree = "<group>";
@@ -702,10 +708,12 @@
 				D17DC9D74F0BD77D12813366 /* Observable.generated.swift in Sources */,
 				6BBAC6F7C1C74608F52D7FF7 /* PlatformMappers.generated.swift in Sources */,
 				37B9F4481D30F2FC895AB554 /* PlatformValueMapper.generated.swift in Sources */,
+				20FFB48E293F818B005CF1C8 /* BottomSheetView.swift in Sources */,
 				847C2A647F23AF46CED079CF /* RoutingState.generated.swift in Sources */,
 				C0C827F580A4F1950E9B10EE /* Shape+Helpers.generated.swift in Sources */,
 				300D5D65F49D6711AC8FF5DA /* Subject.generated.swift in Sources */,
 				20FFB48A293EB4F0005CF1C8 /* ArchitectureView.swift in Sources */,
+				20FFB490293FA7EB005CF1C8 /* BottomSheetSubPageView.swift in Sources */,
 				2EF7D8289105AC623E600829 /* UninitializedObservable.generated.swift in Sources */,
 				1529FF0B35BD7AB3B6E838A9 /* UninitializedSubject.generated.swift in Sources */,
 			);
diff --git a/example/ios/Demo/Architecture/ArchitectureView.swift b/example/ios/Demo/Architecture/ArchitectureView.swift
index 47d0a155a..821b2e986 100644
--- a/example/ios/Demo/Architecture/ArchitectureView.swift
+++ b/example/ios/Demo/Architecture/ArchitectureView.swift
@@ -73,7 +73,7 @@ struct ArchitectureView: View {
                 }
             }
             .navigation(state: bottomSheetRoutingState, type: .partialSheet(style: PSIphoneStyle.defaultStyle())) {
-                Text("Im a bottom sheet")
+                BottomSheetView().equatable().environmentObject(bottomSheetRoutingState)
             }
             .navigationTitle("feature_architecture".localized())
         }
diff --git a/example/ios/Demo/Architecture/BottomSheetSubPageView.swift b/example/ios/Demo/Architecture/BottomSheetSubPageView.swift
new file mode 100644
index 000000000..510dc48ea
--- /dev/null
+++ b/example/ios/Demo/Architecture/BottomSheetSubPageView.swift
@@ -0,0 +1,84 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct BottomSheetSubPageView: View {
+
+    class RouteStack : ObservableObject {
+        let previousRoute: RoutingState
+        let parentRoute: RoutingState
+
+        init(previousRoute: RoutingState, parentRoute: RoutingState) {
+            self.previousRoute = previousRoute
+            self.parentRoute = parentRoute
+        }
+    }
+
+    let lifecycleViewModel: LifecycleViewModel<BottomSheetSubPageViewModel>
+    private let router = Router()
+
+    @EnvironmentObject var routeStack: RouteStack
+
+    init() {
+        let viewModel = BottomSheetSubPageViewModel(navigator: router.navigator)
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        router.routingStack = routeStack
+        return generateBody()
+    }
+
+    func generateBody() -> some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            VStack {
+                Text(viewModel.text)
+            }.padding(10.0)
+                .navigationBarBackButtonHidden(true)
+                .navigationBarItems(
+                    leading: Button(action: { viewModel.onBackPressed() }) {
+                        Image(systemName: "chevron.left")
+                            .scaleEffect(0.83)
+                            .font(Font.title.weight(.medium))
+                    }, trailing: Button("X") {
+                            viewModel.onClosePressed()
+                        }
+                    )
+        }
+    }
+}
+
+extension BottomSheetSubPageView {
+    class Router {
+
+        var routingStack: RouteStack?
+        lazy var navigator = DefaultNavigator<BottomSheetSubPageNavigation> { [weak self] action in
+            switch action {
+            case is BottomSheetSubPageNavigation.Back: self?.routingStack?.previousRoute.close()
+            case is BottomSheetSubPageNavigation.Close: self?.routingStack?.parentRoute.close()
+            default: ()
+            }
+        }
+    }
+}
+
+struct BottomSheetSubPageView_Previews: PreviewProvider {
+    static var previews: some View {
+        BottomSheetSubPageView()
+    }
+}
diff --git a/example/ios/Demo/Architecture/BottomSheetView.swift b/example/ios/Demo/Architecture/BottomSheetView.swift
new file mode 100644
index 000000000..6926d40cc
--- /dev/null
+++ b/example/ios/Demo/Architecture/BottomSheetView.swift
@@ -0,0 +1,83 @@
+//
+//  Copyright 2022 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct BottomSheetView: View, Equatable {
+    static func == (lhs: BottomSheetView, rhs: BottomSheetView) -> Bool {
+        true
+    }
+
+    let lifecycleViewModel: LifecycleViewModel<BottomSheetViewModel>
+    let router = Router()
+
+    @ObservedObject var nextRoute = RoutingState()
+    @EnvironmentObject var previousRoute: RoutingState
+
+    init() {
+        let viewModel = BottomSheetViewModel(navigator: router.navigator)
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        router.nextRoute = nextRoute
+        router.previousRoute = previousRoute
+        return generateBody()
+    }
+
+    func generateBody() -> some View {
+        NavigationView { // Bug in partial sheet requires moving the bottom sheet a bit before it becomes interactive
+            lifecycleViewModel.lifecycleView { viewModel in
+                VStack(spacing: 10.0) {
+                    Text(viewModel.text)
+                    viewModel.button.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                }.padding(10.0)
+                    .navigation(state: nextRoute, type: .push) {
+                        BottomSheetSubPageView().environmentObject(BottomSheetSubPageView.RouteStack(previousRoute: nextRoute, parentRoute: previousRoute))
+                    }
+                    .navigationViewStyle(.stack)
+                    .navigationBarItems(
+                        trailing: Button("X") {
+                            viewModel.onClosePressed()
+                        }
+                    )
+
+            }
+        }.frame(height: 150.0) // bug in partial sheet
+    }
+}
+
+extension BottomSheetView {
+    class Router {
+
+        var nextRoute: RoutingState?
+        var previousRoute: RoutingState?
+        lazy var navigator = DefaultNavigator<BottomSheetNavigation> { [weak self] action in
+            switch action {
+            case is BottomSheetNavigation.SubPage: self?.nextRoute?.show()
+            case is BottomSheetNavigation.Close: self?.previousRoute?.close()
+            default: ()
+            }
+        }
+    }
+}
+
+struct BottomSheetView_Previews: PreviewProvider {
+    static var previews: some View {
+        BottomSheetView()
+    }
+}

From 024d6cb9732f418c7354fa05b25a87ab898169d1 Mon Sep 17 00:00:00 2001
From: Tijl Houtbeckers <tijl@houtbecke.rs>
Date: Fri, 9 Dec 2022 13:47:51 +0100
Subject: [PATCH 060/227] remove deprecated properties #442

---
 base-permissions/api/jvm/base-permissions.api | 34 --------
 base/api/androidLib/base.api                  |  2 -
 base/api/jvm/base.api                         |  6 --
 .../commonMain/kotlin/state/KalugaState.kt    | 20 +----
 .../commonTest/kotlin/state/StateRepoTest.kt  | 12 ---
 bluetooth/api/jvm/bluetooth.api               | 84 -------------------
 location/api/jvm/location.api                 | 36 --------
 system/api/jvm/system.api                     |  2 -
 8 files changed, 2 insertions(+), 194 deletions(-)

diff --git a/base-permissions/api/jvm/base-permissions.api b/base-permissions/api/jvm/base-permissions.api
index 78f03389f..6619dc17b 100644
--- a/base-permissions/api/jvm/base-permissions.api
+++ b/base-permissions/api/jvm/base-permissions.api
@@ -87,8 +87,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Active$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Active;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -97,14 +95,10 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Allowed$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Allowed;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Allowed;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Allowed;)Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -113,8 +107,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Deinitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Deinitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -123,8 +115,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Denied$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -133,8 +123,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Denied$Locked$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Locked;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Locked;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Locked;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -144,8 +132,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -153,8 +139,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Inactive$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Inactive;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -162,8 +146,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Initialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Initialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -172,8 +154,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Initializing$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Initializing;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -181,8 +161,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionState$Uninitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/permissions/base/PermissionState$Uninitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/permissions/base/PermissionState$Uninitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Uninitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -207,11 +185,9 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Allow
 	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;
 	public fun deny (Z)Lkotlin/jvm/functions/Function1;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMonitoringInterval-UwyO8pc ()J
 	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -223,12 +199,10 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Deini
 	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
 	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getMonitoringInterval-UwyO8pc ()J
 	public final fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -244,12 +218,10 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denie
 	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
 	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMonitoringInterval-UwyO8pc ()J
 	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
 	public fun getUnlock ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -261,12 +233,10 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denie
 	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
 	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLock ()Lkotlin/jvm/functions/Function1;
 	public fun getMonitoringInterval-UwyO8pc ()J
 	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun request ()V
 	public fun toString ()Ljava/lang/String;
@@ -282,11 +252,9 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Initi
 	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
 	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMonitoringInterval-UwyO8pc ()J
 	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -294,8 +262,6 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Initi
 
 public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Uninitialized : com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive, com/splendo/kaluga/permissions/base/PermissionState$Uninitialized {
 	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun initialize-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index 07a9c0c0f..c298e95e8 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -1000,8 +1000,6 @@ public abstract class com/splendo/kaluga/state/HotStateRepo : com/splendo/kaluga
 }
 
 public abstract interface class com/splendo/kaluga/state/KalugaState {
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index 168de0bed..bc67b9c46 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -983,14 +983,10 @@ public abstract class com/splendo/kaluga/state/HotStateRepo : com/splendo/kaluga
 }
 
 public abstract interface class com/splendo/kaluga/state/KalugaState {
-	public abstract fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/state/KalugaState$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/state/KalugaState;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1000,8 +996,6 @@ public final class com/splendo/kaluga/state/KalugaStateKt {
 
 public abstract class com/splendo/kaluga/state/State : com/splendo/kaluga/state/KalugaState {
 	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
diff --git a/base/src/commonMain/kotlin/state/KalugaState.kt b/base/src/commonMain/kotlin/state/KalugaState.kt
index 72f79a1e7..bb8bfee98 100644
--- a/base/src/commonMain/kotlin/state/KalugaState.kt
+++ b/base/src/commonMain/kotlin/state/KalugaState.kt
@@ -60,18 +60,6 @@ interface KalugaState {
      */
     @Suppress("UNCHECKED_CAST") // cast should normally work since the receiver uses one type of state
     fun <S : KalugaState> remain(): suspend() -> S = remain as suspend () -> S
-
-    /**
-     * Called when this state is the first state of the state machine
-     */
-    @Deprecated("Use an initializer state rather than relying on this method, it might be called after the initial state is already changed")
-    suspend fun initialState() {}
-
-    /**
-     * Called when this state is the final state of the state machine
-     */
-    @Deprecated("This method is not always actually called (e.g. for a HotRepo) since there is not always a final state")
-    suspend fun finalState() {}
 }
 
 @Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaState"))
@@ -159,10 +147,6 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
             (initialValue ?: initialValue()).also { value ->
                 mutableFlow.emit(value)
                 stateMutex.release() // release the initial permit held
-                // The mutex is already released above to let the state initialize afterwards, to avoid changeState mutex deadlocks
-                // However releasing the above mutex might have already changed the state to a new state before initialState runs.
-                // State machines that need initialization should rely on having an initialization state rather than using this method.
-                value.initialState()
             }
         else
             state()
@@ -390,9 +374,9 @@ abstract class BaseColdStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
                 launch(coroutineContext) {
                     flow.onCollectionEvent { event ->
                         when (event) {
-                            NoMoreCollections -> noMoreCollections().also { it.finalState() }
+                            NoMoreCollections -> noMoreCollections()
                             FirstCollection -> firstCollection()
-                            LaterCollections -> laterCollections().also { it.initialState() }
+                            LaterCollections -> laterCollections()
                         }
                     }
                 }
diff --git a/base/src/commonTest/kotlin/state/StateRepoTest.kt b/base/src/commonTest/kotlin/state/StateRepoTest.kt
index 242e43c58..cebebd2e8 100644
--- a/base/src/commonTest/kotlin/state/StateRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/StateRepoTest.kt
@@ -41,17 +41,11 @@ sealed class TrafficLightState :
     HandleAfterOldStateIsRemoved<TrafficLightState>,
     HandleAfterNewStateIsSet<TrafficLightState> {
 
-    val initialStateDone = EmptyCompletableDeferred()
     val beforeCreatingNewStateDone = EmptyCompletableDeferred()
     val afterCreatingNewStateDone = CompletableDeferred<TrafficLightState>()
     val afterNewStateIsSetDone = CompletableDeferred<TrafficLightState>()
     val beforeOldStateIsRemovedDone = CompletableDeferred<TrafficLightState>()
     val afterOldStateIsRemovedDone = CompletableDeferred<TrafficLightState>()
-    val finalStateDone = EmptyCompletableDeferred()
-
-    override suspend fun initialState() {
-        initialStateDone.complete()
-    }
 
     override suspend fun beforeCreatingNewState() {
         beforeCreatingNewStateDone.complete()
@@ -73,12 +67,7 @@ sealed class TrafficLightState :
         afterOldStateIsRemovedDone.complete(oldState)
     }
 
-    override suspend fun finalState() {
-        finalStateDone.complete()
-    }
-
     class RedLight internal constructor() : TrafficLightState() {
-
         val becomeGreen = suspend { GreenLight() }
     }
 
@@ -112,7 +101,6 @@ class StateRepoTest : FlowTest<TrafficLightState, TrafficLight>() {
         test {
             assertIs<TrafficLightState.GreenLight>(it)
             greenStateDeferred.complete(it)
-            assertTrue(it.initialStateDone.isCompleted)
         }
         val greenState = greenStateDeferred.await()
         action {
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index 71d809511..38c58973a 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -299,8 +299,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -309,8 +307,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$DiscoveredServices$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$DiscoveredServices;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$DiscoveredServices;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$DiscoveredServices;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -319,8 +315,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -332,8 +326,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -342,8 +334,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Idle$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Idle;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Idle;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Idle;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -353,8 +343,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$NoServices$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$NoServices;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$NoServices;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$NoServices;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -365,14 +353,10 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting;)Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -382,8 +366,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnected$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnected;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnected;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnected;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -391,8 +373,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -407,8 +387,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 }
 
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting;)Lkotlin/jvm/functions/Function1;
 	public static fun retry (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings$ReconnectionSettings;)Lkotlin/jvm/functions/Function1;
 }
@@ -438,10 +416,8 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun didDiscoverServices (Ljava/util/List;)Lkotlin/jvm/functions/Function1;
 	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMtu ()Ljava/lang/Integer;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -459,14 +435,12 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction;Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction;
 	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 	public fun getActionCompleted ()Lkotlin/jvm/functions/Function1;
 	public fun getMtu ()Ljava/lang/Integer;
 	public fun getNextActions ()Ljava/util/List;
 	public fun getServices ()Ljava/util/List;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -479,12 +453,10 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle;
 	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getMtu ()Ljava/lang/Integer;
 	public fun getServices ()Ljava/util/List;
 	public fun handleAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -496,11 +468,9 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices;Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices;
 	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscoverServices ()Lkotlin/jvm/functions/Function1;
 	public fun getMtu ()Ljava/lang/Integer;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun startDiscovering ()V
 	public fun toString ()Ljava/lang/String;
@@ -513,12 +483,10 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getCancelConnection ()Lkotlin/jvm/functions/Function1;
 	public fun getDidConnect ()Lkotlin/jvm/functions/Function1;
 	public fun handleCancel ()V
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -528,10 +496,8 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getConnect ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun startConnecting ()V
 	public fun toString ()Ljava/lang/String;
@@ -544,9 +510,7 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -560,7 +524,6 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public final fun copy (ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getAttempt ()I
 	public fun getCancelConnection ()Lkotlin/jvm/functions/Function1;
 	public fun getDidConnect ()Lkotlin/jvm/functions/Function1;
@@ -568,7 +531,6 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun getServices ()Ljava/util/List;
 	public fun handleCancel ()V
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun retry (Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings$ReconnectionSettings;)Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -1011,14 +973,10 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Active$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Active;)Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1028,8 +986,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Deinitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Deinitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1046,8 +1002,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1057,8 +1011,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun refresh$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle;Ljava/util/Set;ILjava/lang/Object;)Lkotlin/jvm/functions/Function1;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle;)Lkotlin/jvm/functions/Function1;
 	public static synthetic fun startScanning$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle;Ljava/util/Set;ILjava/lang/Object;)Lkotlin/jvm/functions/Function1;
@@ -1070,8 +1022,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1079,8 +1029,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Inactive$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Inactive;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1088,8 +1036,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Initialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1098,8 +1044,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Initializing$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Initializing;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1107,8 +1051,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1117,8 +1059,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1127,8 +1067,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1136,8 +1074,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1145,8 +1081,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1155,8 +1089,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Permitted$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Permitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Permitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Permitted;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -1185,12 +1117,10 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinit
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getPreviouslyDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -1225,10 +1155,8 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Ena
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Idle : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun refresh (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun startScanning (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
@@ -1240,11 +1168,9 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enable
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun discoverDevice (Lcom/splendo/kaluga/bluetooth/UUID;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 	public fun getStopScanning ()Lkotlin/jvm/functions/Function1;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
@@ -1255,11 +1181,9 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initia
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialized (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -1275,33 +1199,25 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBlue
 	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth$MissingPermissions : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions {
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun permit (Z)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoHardware : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware {
 	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoHardware;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotInitialized : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized {
 	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotInitialized;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public final fun startInitializing (Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lkotlin/jvm/functions/Function1;
 }
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index e1da9fb39..ed7249cc2 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -257,14 +257,10 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Active
 }
 
 public final class com/splendo/kaluga/location/LocationState$Active$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Active;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Active;)Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/location/LocationState$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -273,8 +269,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Deinit
 }
 
 public final class com/splendo/kaluga/location/LocationState$Deinitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Deinitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Deinitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -282,8 +276,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Disabl
 }
 
 public final class com/splendo/kaluga/location/LocationState$Disabled$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Disabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Disabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Disabled;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -292,8 +284,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Disabl
 }
 
 public final class com/splendo/kaluga/location/LocationState$Disabled$NoGPS$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Disabled$NoGPS;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Disabled$NoGPS;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Disabled$NoGPS;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -302,8 +292,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Disabl
 }
 
 public final class com/splendo/kaluga/location/LocationState$Disabled$NotPermitted$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Disabled$NotPermitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Disabled$NotPermitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Disabled$NotPermitted;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -313,8 +301,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Enable
 }
 
 public final class com/splendo/kaluga/location/LocationState$Enabled$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Enabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Enabled;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Enabled;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -322,8 +308,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Inacti
 }
 
 public final class com/splendo/kaluga/location/LocationState$Inactive$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Inactive;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Inactive;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -331,8 +315,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Initia
 }
 
 public final class com/splendo/kaluga/location/LocationState$Initialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Initialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Initialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -341,8 +323,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Initia
 }
 
 public final class com/splendo/kaluga/location/LocationState$Initializing$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Initializing;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Initializing;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -350,8 +330,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$NotIni
 }
 
 public final class com/splendo/kaluga/location/LocationState$NotInitialized$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$NotInitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$NotInitialized;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$NotInitialized;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -360,8 +338,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Permit
 }
 
 public final class com/splendo/kaluga/location/LocationState$Permitted$DefaultImpls {
-	public static fun finalState (Lcom/splendo/kaluga/location/LocationState$Permitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun initialState (Lcom/splendo/kaluga/location/LocationState$Permitted;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Permitted;)Lkotlin/jvm/functions/Function1;
 }
 
@@ -384,11 +360,9 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Deinitialized :
 	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -402,19 +376,15 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NoGPS
 	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NotPermitted : com/splendo/kaluga/location/LocationStateImpl$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NotPermitted {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun permit (Z)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
@@ -429,12 +399,10 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Enabled : com/s
 	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDisable ()Lkotlin/jvm/functions/Function1;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 	public fun updateWithLocation (Lcom/splendo/kaluga/location/Location$KnownLocation;)Lkotlin/jvm/functions/Function1;
@@ -446,10 +414,8 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Initializing :
 	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -457,9 +423,7 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Initializing :
 
 public final class com/splendo/kaluga/location/LocationStateImpl$NotInitialized : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/location/LocationState$NotInitialized {
 	public static final field INSTANCE Lcom/splendo/kaluga/location/LocationStateImpl$NotInitialized;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public final fun startInitializing (Lcom/splendo/kaluga/location/LocationManager;)Lkotlin/jvm/functions/Function1;
 }
diff --git a/system/api/jvm/system.api b/system/api/jvm/system.api
index b73607cc9..c84f0df81 100644
--- a/system/api/jvm/system.api
+++ b/system/api/jvm/system.api
@@ -82,9 +82,7 @@ public abstract interface class com/splendo/kaluga/system/network/ReachableNetwo
 
 public abstract class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/state/KalugaState {
 	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/Network;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getNetworkType ()Lcom/splendo/kaluga/system/network/Network;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 

From e587292a8a91072bc21661c6651d2ba14a62d0ff Mon Sep 17 00:00:00 2001
From: Tijl Houtbeckers <tijl@houtbecke.rs>
Date: Fri, 9 Dec 2022 16:05:04 +0100
Subject: [PATCH 061/227] remove deprecated properties #442

---
 base/src/commonTest/kotlin/state/ColdStateRepoTest.kt | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt b/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
index aebb851d1..f87172b17 100644
--- a/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
@@ -26,7 +26,6 @@ import com.splendo.kaluga.test.base.mock.parameters.mock
 import com.splendo.kaluga.test.base.mock.verify
 import com.splendo.kaluga.test.base.yieldMultiple
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
@@ -36,13 +35,6 @@ import kotlin.test.assertEquals
 class ColdStateRepoTest : BaseTest() {
 
     sealed class CircuitState : KalugaState {
-        val initialStateCounter = MutableStateFlow(0)
-
-        override suspend fun initialState() {
-            super.initialState()
-
-            initialStateCounter.value++
-        }
 
         object Open : CircuitState()
         object Closed : CircuitState()
@@ -84,7 +76,6 @@ class ColdStateRepoTest : BaseTest() {
         val job = launch { collect() }
         yieldMultiple(2)
         useState {
-            assertEquals(times, it.initialStateCounter.value)
             initialValueMock.verify(times)
             assertEquals(CircuitState.Open, it)
         }

From 188119dc3100e29a32bf7d06e3073351e3458d3f Mon Sep 17 00:00:00 2001
From: Tijl Houtbeckers <tijl@houtbecke.rs>
Date: Fri, 9 Dec 2022 16:44:42 +0100
Subject: [PATCH 062/227] remove deprecated properties, refresh cached API
 dumps #442

---
 .../api/jvm/test-utils-bluetooth.api          |  16 --
 .../api/jvm/test-utils-location.api           |  12 --
 .../api/jvm/test-utils-permissions.api        | 145 ------------------
 3 files changed, 173 deletions(-)
 delete mode 100644 test-utils-permissions/api/jvm/test-utils-permissions.api

diff --git a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
index 69ec1c9fe..2e947c983 100644
--- a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
@@ -268,11 +268,9 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$D
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Deinitialized;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;ILjava/lang/Object;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getPreviouslyDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -304,9 +302,7 @@ public abstract class com/splendo/kaluga/test/bluetooth/scanner/MockScanningStat
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Idle : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun refresh (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun startScanning (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
@@ -315,10 +311,8 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$E
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Scanning : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;)V
 	public fun discoverDevice (Lcom/splendo/kaluga/bluetooth/UUID;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun getStopScanning ()Lkotlin/jvm/functions/Function1;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
@@ -334,10 +328,8 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$I
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Initializing;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Initializing;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;ILjava/lang/Object;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialized (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -350,25 +342,19 @@ public abstract class com/splendo/kaluga/test/bluetooth/scanner/MockScanningStat
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoBluetooth$Disabled : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled {
 	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoBluetooth$MissingPermissions : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions {
 	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun permit (Z)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoHardware : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware {
 	public static final field INSTANCE Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NoHardware;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
@@ -378,9 +364,7 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$N
 	public final fun copy (Z)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NotInitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NotInitialized;ZILjava/lang/Object;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$NotInitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun isHardwareSupported ()Z
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public final fun startInitializing ()Lkotlin/jvm/functions/Function0;
diff --git a/test-utils-location/api/jvm/test-utils-location.api b/test-utils-location/api/jvm/test-utils-location.api
index a109ee728..979a6b289 100644
--- a/test-utils-location/api/jvm/test-utils-location.api
+++ b/test-utils-location/api/jvm/test-utils-location.api
@@ -73,11 +73,9 @@ public final class com/splendo/kaluga/test/location/MockLocationState$Deinitiali
 	public final fun copy (Lcom/splendo/kaluga/location/Location;)Lcom/splendo/kaluga/test/location/MockLocationState$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/location/MockLocationState$Deinitialized;Lcom/splendo/kaluga/location/Location;ILjava/lang/Object;)Lcom/splendo/kaluga/test/location/MockLocationState$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 }
@@ -87,19 +85,15 @@ public abstract class com/splendo/kaluga/test/location/MockLocationState$Disable
 
 public final class com/splendo/kaluga/test/location/MockLocationState$Disabled$NoGPS : com/splendo/kaluga/test/location/MockLocationState$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NoGPS {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
 public final class com/splendo/kaluga/test/location/MockLocationState$Disabled$NotPermitted : com/splendo/kaluga/test/location/MockLocationState$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NotPermitted {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun permit (Z)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
@@ -110,12 +104,10 @@ public final class com/splendo/kaluga/test/location/MockLocationState$Enabled :
 	public final fun copy (Lcom/splendo/kaluga/location/Location;)Lcom/splendo/kaluga/test/location/MockLocationState$Enabled;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/location/MockLocationState$Enabled;Lcom/splendo/kaluga/location/Location;ILjava/lang/Object;)Lcom/splendo/kaluga/test/location/MockLocationState$Enabled;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDisable ()Lkotlin/jvm/functions/Function1;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
 	public fun updateWithLocation (Lcom/splendo/kaluga/location/Location$KnownLocation;)Lkotlin/jvm/functions/Function1;
@@ -130,10 +122,8 @@ public final class com/splendo/kaluga/test/location/MockLocationState$Initializi
 	public final fun copy (Lcom/splendo/kaluga/location/Location;)Lcom/splendo/kaluga/test/location/MockLocationState$Initializing;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/location/MockLocationState$Initializing;Lcom/splendo/kaluga/location/Location;ILjava/lang/Object;)Lcom/splendo/kaluga/test/location/MockLocationState$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun hashCode ()I
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun toString ()Ljava/lang/String;
@@ -141,9 +131,7 @@ public final class com/splendo/kaluga/test/location/MockLocationState$Initializi
 
 public final class com/splendo/kaluga/test/location/MockLocationState$NotInitialized : com/splendo/kaluga/test/location/MockLocationState$Inactive, com/splendo/kaluga/location/LocationState$NotInitialized {
 	public static final field INSTANCE Lcom/splendo/kaluga/test/location/MockLocationState$NotInitialized;
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public final fun startInitializing ()Lkotlin/jvm/functions/Function0;
 }
diff --git a/test-utils-permissions/api/jvm/test-utils-permissions.api b/test-utils-permissions/api/jvm/test-utils-permissions.api
deleted file mode 100644
index 1ca3d0343..000000000
--- a/test-utils-permissions/api/jvm/test-utils-permissions.api
+++ /dev/null
@@ -1,145 +0,0 @@
-public final class com/splendo/kaluga/test/permissions/DummyPermission : com/splendo/kaluga/permissions/base/Permission {
-	public static final field INSTANCE Lcom/splendo/kaluga/test/permissions/DummyPermission;
-	public fun getName ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/test/permissions/MockBasePermissionStateRepo : com/splendo/kaluga/permissions/base/BasePermissionStateRepo {
-	public fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/jvm/functions/Function0;ZLkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/jvm/functions/Function0;ZLkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun didDeinitialize (Lcom/splendo/kaluga/test/permissions/MockPermissionState;)V
-	public final fun didInitialize (Lcom/splendo/kaluga/test/permissions/MockPermissionState;)V
-	public final fun getCurrentMockState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState;
-	public final fun getDidDeinitializeMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getDidInitializeMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getPermission ()Lcom/splendo/kaluga/permissions/base/Permission;
-}
-
-public final class com/splendo/kaluga/test/permissions/MockBasePermissionsBuilder : com/splendo/kaluga/permissions/base/BasePermissionsBuilder {
-	public fun <init> ()V
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionManager : com/splendo/kaluga/permissions/base/BasePermissionManager {
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ZLkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ZLkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getMonitoringDidStartMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getMonitoringDidStopMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getMonitoringInterval-UwyO8pc ()J
-	public final fun getRequestPermissionDidStartMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun grantPermission ()V
-	public final fun revokePermission (Z)V
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionManager$Builder {
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun create (Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/permissions/MockPermissionManager;
-	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedManagers ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getInitialState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public final fun getMonitoringInterval-UwyO8pc ()J
-	public final fun getPermission ()Lcom/splendo/kaluga/permissions/base/Permission;
-}
-
-public abstract class com/splendo/kaluga/test/permissions/MockPermissionState {
-	public final fun deny (Z)Lkotlin/jvm/functions/Function1;
-	public abstract fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public final fun getAllow ()Lkotlin/jvm/functions/Function1;
-	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
-	public final fun getLock ()Lkotlin/jvm/functions/Function1;
-	public final fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public final fun getRequestMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getUnlock ()Lkotlin/jvm/functions/Function1;
-	public final fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
-	public final fun request ()V
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionState$ActiveState : java/lang/Enum {
-	public static final field ALLOWED Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public static final field LOCKED Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public static final field REQUESTABLE Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public static fun values ()[Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionState$Allowed : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Allowed {
-	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionState$Deinitialized : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Deinitialized {
-	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionState$Initializing : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Initializing {
-	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionState$Locked : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Denied$Locked {
-	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionState$Requestable : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable {
-	public fun <init> ()V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionState$Uninitialized : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Uninitialized {
-	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;)V
-	public fun finalState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
-	public fun initialState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionStateRepo : com/splendo/kaluga/permissions/base/PermissionStateRepo {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lcom/splendo/kaluga/test/permissions/MockPermissionManager$Builder;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lcom/splendo/kaluga/test/permissions/MockPermissionManager$Builder;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getBuilder ()Lcom/splendo/kaluga/test/permissions/MockPermissionManager$Builder;
-	public final fun getPermissionManager ()Lcom/splendo/kaluga/test/permissions/MockPermissionManager;
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionsBuilder : com/splendo/kaluga/permissions/base/PermissionsBuilder {
-	public fun <init> ()V
-	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;Z)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getBluetoothStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getBuildBluetoothStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildCalendarStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildCameraStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildContactsStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildLocationStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildMicrophoneStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildNotificationsStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getBuildStorageStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
-	public final fun getCalendarStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCameraStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getContactsStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getLocationStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getMicrophoneStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getNotificationsStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStorageStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun registerAllPermissionsBuilders ()V
-}
-
-public final class com/splendo/kaluga/test/permissions/MockPermissionsContextKt {
-	public static final fun getMockPermissionContext ()Lcom/splendo/kaluga/permissions/base/PermissionContext;
-}
-

From 4928bc000af6407289db58293ed942d3c1d10d88 Mon Sep 17 00:00:00 2001
From: Tijl Houtbeckers <tijl@houtbecke.rs>
Date: Mon, 12 Dec 2022 11:40:35 +0100
Subject: [PATCH 063/227] missing API dump file #442

---
 .../api/jvm/test-utils-permissions.api        | 133 ++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 test-utils-permissions/api/jvm/test-utils-permissions.api

diff --git a/test-utils-permissions/api/jvm/test-utils-permissions.api b/test-utils-permissions/api/jvm/test-utils-permissions.api
new file mode 100644
index 000000000..2a85d284b
--- /dev/null
+++ b/test-utils-permissions/api/jvm/test-utils-permissions.api
@@ -0,0 +1,133 @@
+public final class com/splendo/kaluga/test/permissions/DummyPermission : com/splendo/kaluga/permissions/base/Permission {
+	public static final field INSTANCE Lcom/splendo/kaluga/test/permissions/DummyPermission;
+	public fun getName ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/test/permissions/MockBasePermissionStateRepo : com/splendo/kaluga/permissions/base/BasePermissionStateRepo {
+	public fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/jvm/functions/Function0;ZLkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/jvm/functions/Function0;ZLkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun didDeinitialize (Lcom/splendo/kaluga/test/permissions/MockPermissionState;)V
+	public final fun didInitialize (Lcom/splendo/kaluga/test/permissions/MockPermissionState;)V
+	public final fun getCurrentMockState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState;
+	public final fun getDidDeinitializeMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getDidInitializeMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getPermission ()Lcom/splendo/kaluga/permissions/base/Permission;
+}
+
+public final class com/splendo/kaluga/test/permissions/MockBasePermissionsBuilder : com/splendo/kaluga/permissions/base/BasePermissionsBuilder {
+	public fun <init> ()V
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionManager : com/splendo/kaluga/permissions/base/BasePermissionManager {
+	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ZLkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ZLkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getMonitoringDidStartMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getMonitoringDidStopMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getMonitoringInterval-UwyO8pc ()J
+	public final fun getRequestPermissionDidStartMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun grantPermission ()V
+	public final fun revokePermission (Z)V
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionManager$Builder {
+	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun create (Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/permissions/MockPermissionManager;
+	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getCreatedManagers ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getInitialState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public final fun getMonitoringInterval-UwyO8pc ()J
+	public final fun getPermission ()Lcom/splendo/kaluga/permissions/base/Permission;
+}
+
+public abstract class com/splendo/kaluga/test/permissions/MockPermissionState {
+	public final fun deny (Z)Lkotlin/jvm/functions/Function1;
+	public abstract fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public final fun getAllow ()Lkotlin/jvm/functions/Function1;
+	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
+	public final fun getLock ()Lkotlin/jvm/functions/Function1;
+	public final fun getReinitialize ()Lkotlin/jvm/functions/Function1;
+	public final fun getRequestMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getUnlock ()Lkotlin/jvm/functions/Function1;
+	public final fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
+	public final fun request ()V
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionState$ActiveState : java/lang/Enum {
+	public static final field ALLOWED Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public static final field LOCKED Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public static final field REQUESTABLE Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public static fun values ()[Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionState$Allowed : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Allowed {
+	public fun <init> ()V
+	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionState$Deinitialized : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Deinitialized {
+	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;)V
+	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionState$Initializing : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Initializing {
+	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;)V
+	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionState$Locked : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Denied$Locked {
+	public fun <init> ()V
+	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionState$Requestable : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable {
+	public fun <init> ()V
+	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionState$Uninitialized : com/splendo/kaluga/test/permissions/MockPermissionState, com/splendo/kaluga/permissions/base/PermissionState$Uninitialized {
+	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;)V
+	public fun getActiveState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionStateRepo : com/splendo/kaluga/permissions/base/PermissionStateRepo {
+	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lcom/splendo/kaluga/test/permissions/MockPermissionManager$Builder;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lcom/splendo/kaluga/test/permissions/MockPermissionManager$Builder;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getBuilder ()Lcom/splendo/kaluga/test/permissions/MockPermissionManager$Builder;
+	public final fun getPermissionManager ()Lcom/splendo/kaluga/test/permissions/MockPermissionManager;
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionsBuilder : com/splendo/kaluga/permissions/base/PermissionsBuilder {
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;Z)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getBluetoothStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getBuildBluetoothStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuildCalendarStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuildCameraStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuildContactsStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuildLocationStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuildMicrophoneStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuildNotificationsStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getBuildStorageStateRepos ()Lco/touchlab/stately/collections/IsoMutableList;
+	public final fun getCalendarStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getCameraStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getContactsStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getLocationStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getMicrophoneStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getNotificationsStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStorageStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun registerAllPermissionsBuilders ()V
+}
+
+public final class com/splendo/kaluga/test/permissions/MockPermissionsContextKt {
+	public static final fun getMockPermissionContext ()Lcom/splendo/kaluga/permissions/base/PermissionContext;
+}
+

From db43c89a04773e15b74a79f983bbc487325d39c4 Mon Sep 17 00:00:00 2001
From: Tijl Houtbeckers <tijl@houtbecke.rs>
Date: Tue, 13 Dec 2022 13:44:01 +0100
Subject: [PATCH 064/227] remove needless return for VM binding #600

---
 .../kotlin/viewmodel/LifecycleViewModel.kt        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
index 84fa66e1d..f2a0327ef 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -41,10 +41,13 @@ fun <VM : BaseLifecycleViewModel> VM.bind(activity: AppCompatActivity) {
 /**
  * Binds a [Fragment] to the [LifecycleViewModel] to manage the viewmodel lifecycle
  * @param fragment The [Fragment] to bind to.
- * @return `true` if the ViewModel could be bound to the [Fragment].
  */
-fun <VM : BaseLifecycleViewModel> VM.bind(fragment: Fragment): Boolean {
-    val fragmentManager = fragment.parentFragmentManager
-    fragment.lifecycle.addObserver(KalugaViewModelLifecycleObserver(this, fragment.activity, fragment.viewLifecycleOwner, fragmentManager))
-    return true
-}
+fun <VM : BaseLifecycleViewModel> VM.bind(fragment: Fragment) =
+    fragment.lifecycle.addObserver(
+        KalugaViewModelLifecycleObserver(
+            viewModel = this,
+            activity = fragment.activity,
+            lifecycleOwner = fragment.viewLifecycleOwner,
+            fragmentManager = fragment.parentFragmentManager
+        )
+    )

From 9f4083868bc7e3f7b802680f9f112d478e2aa6f5 Mon Sep 17 00:00:00 2001
From: Tijl Houtbeckers <tijl@houtbecke.rs>
Date: Tue, 13 Dec 2022 14:22:28 +0100
Subject: [PATCH 065/227] apiDump #600

---
 architecture/api/androidLib/architecture.api                 | 2 +-
 test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api | 2 +-
 test-utils-bluetooth/api/jvm/test-utils-bluetooth.api        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index 10f875dac..7c5d4f7a1 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -1783,7 +1783,7 @@ public class com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel : andr
 
 public final class com/splendo/kaluga/architecture/viewmodel/LifecycleViewModelKt {
 	public static final fun bind (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/appcompat/app/AppCompatActivity;)V
-	public static final fun bind (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/fragment/app/Fragment;)Z
+	public static final fun bind (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/fragment/app/Fragment;)V
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/NavigatingViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
diff --git a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
index 48fb3a938..2cc4a1172 100644
--- a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
@@ -388,7 +388,7 @@ public abstract class com/splendo/kaluga/test/bluetooth/scanner/MockScanningStat
 	public final fun getDisable ()Lkotlin/jvm/functions/Function1;
 	protected abstract fun getPermittedHandler ()Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$PermittedHandler;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public final fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
+	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Idle : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
diff --git a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
index 2e1afc1c2..c02d7c685 100644
--- a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
@@ -297,7 +297,7 @@ public abstract class com/splendo/kaluga/test/bluetooth/scanner/MockScanningStat
 	public final fun getDisable ()Lkotlin/jvm/functions/Function1;
 	protected abstract fun getPermittedHandler ()Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$PermittedHandler;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public final fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
+	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Idle : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {

From 5a3cc804e82997a4c0b6159fdd154a9a8ccf2b94 Mon Sep 17 00:00:00 2001
From: Tijl Houtbeckers <tijl@houtbecke.rs>
Date: Wed, 14 Dec 2022 12:57:10 +0100
Subject: [PATCH 066/227] apiDump

---
 bluetooth/api/jvm/bluetooth.api | 8 --------
 location/api/jvm/location.api   | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index 7bf28e694..114dac622 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -28,14 +28,6 @@ public final class com/splendo/kaluga/bluetooth/Bluetooth : com/splendo/kaluga/b
 	public fun stopScanning ()V
 }
 
-public abstract interface class com/splendo/kaluga/bluetooth/Bluetooth$Builder {
-	public abstract fun create (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
-}
-
-public final class com/splendo/kaluga/bluetooth/Bluetooth$Builder$DefaultImpls {
-	public static synthetic fun create$default (Lcom/splendo/kaluga/bluetooth/Bluetooth$Builder;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/Bluetooth;
-}
-
 public abstract class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode {
 }
 
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index c3f1505b8..0afc56d86 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -458,14 +458,6 @@ public final class com/splendo/kaluga/location/LocationStateRepo : com/splendo/k
 	public fun <init> (Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
 }
 
-public abstract interface class com/splendo/kaluga/location/LocationStateRepo$Builder {
-	public abstract fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
-}
-
-public final class com/splendo/kaluga/location/LocationStateRepo$Builder$DefaultImpls {
-	public static synthetic fun create$default (Lcom/splendo/kaluga/location/LocationStateRepo$Builder;Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateRepo;
-}
-
 public final class com/splendo/kaluga/location/LocationStateRepoBuilder : com/splendo/kaluga/location/BaseLocationStateRepoBuilder {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/jvm/functions/Function2;)V

From 434717edbe06e0582eaf2691a470d55549ead79f Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 2 Jan 2023 14:49:20 +0100
Subject: [PATCH 067/227] Add SwiftUI keyboard manager

---
 example/ios/Demo.xcodeproj/project.pbxproj    |  8 +++
 example/ios/Demo/Base.lproj/Main.storyboard   | 41 ++++++------
 .../FeaturesListViewController.swift          |  7 +-
 .../KeyboardManager/KeyboardManagerView.swift | 65 +++++++++++++++++++
 .../KeyboardManagerViewController.swift       |  9 +++
 .../Demo/Resources/ColorViewController.swift  |  6 +-
 example/ios/Kaluga-SwiftUI                    |  2 +-
 example/ios/kaluga.sourcery.yml               |  1 +
 .../commonMain/kotlin/BaseKeyboardManager.kt  |  1 +
 keyboard/src/iosMain/kotlin/FocusHandler.kt   |  2 +
 .../src/iosMain/kotlin/KeyboardManager.kt     | 10 +++
 11 files changed, 126 insertions(+), 26 deletions(-)
 create mode 100644 example/ios/Demo/KeyboardManager/KeyboardManagerView.swift

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index e2e4f7c14..926046a02 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -31,6 +31,7 @@
 		209471E624C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */; };
 		209471E824C07F19001426CD /* BluetoothCharacteristicCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */; };
 		209471EA24C07F5F001426CD /* BluetoothDescriptorCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */; };
+		20BB9E652962ECA70096E836 /* KeyboardManagerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E642962ECA70096E836 /* KeyboardManagerView.swift */; };
 		20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */; };
 		20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */; };
 		20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */; };
@@ -72,6 +73,7 @@
 		847C2A647F23AF46CED079CF /* RoutingState.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896B16F89BA730B7FBF42625 /* RoutingState.generated.swift */; };
 		8679BDAA7F79F92DAC24AF23 /* ListObservable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31718DE342D28B4942D37524 /* ListObservable.generated.swift */; };
 		93EC5B31E0ADDED3225B15C9 /* Color+Color.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12F49DA13243DC3767266475 /* Color+Color.generated.swift */; };
+		9481F22DC3CFE170CE894584 /* KeyboardManager.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F34DFA21F534655B6FD3D03 /* KeyboardManager.generated.swift */; };
 		978348A7235DF586005B140B /* PermissionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978348A6235DF586005B140B /* PermissionViewController.swift */; };
 		C0C827F580A4F1950E9B10EE /* Shape+Helpers.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A2BAEDD60E67CE8F9277AC6 /* Shape+Helpers.generated.swift */; };
 		C77C23B538A4DFB02C0E0773 /* LazyView.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095989173871C8CDA70C49E1 /* LazyView.generated.swift */; };
@@ -136,6 +138,7 @@
 		209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothDeviceDetailsViewController.swift; sourceTree = "<group>"; };
 		209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BluetoothCharacteristicCell.xib; sourceTree = "<group>"; };
 		209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BluetoothDescriptorCell.xib; sourceTree = "<group>"; };
+		20BB9E642962ECA70096E836 /* KeyboardManagerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardManagerView.swift; sourceTree = "<group>"; };
 		20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleViewController.swift; sourceTree = "<group>"; };
 		20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIControl+Closure.swift"; sourceTree = "<group>"; };
 		20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturesListViewController.swift; sourceTree = "<group>"; };
@@ -151,6 +154,7 @@
 		20FFB48D293F818B005CF1C8 /* BottomSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetView.swift; sourceTree = "<group>"; };
 		20FFB48F293FA7EB005CF1C8 /* BottomSheetSubPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetSubPageView.swift; sourceTree = "<group>"; };
 		27D181CE83615D345BB56946 /* HasDefaultValue.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = HasDefaultValue.generated.swift; sourceTree = "<group>"; };
+		2F34DFA21F534655B6FD3D03 /* KeyboardManager.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; lastKnownFileType = sourcecode.swift; name = KeyboardManager.generated.swift; path = KeyboardManager.generated.swift; sourceTree = "<group>"; };
 		31718DE342D28B4942D37524 /* ListObservable.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ListObservable.generated.swift; sourceTree = "<group>"; };
 		382B35FA85A28992FE37B803 /* KalugaStyledString+SwiftUI.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "KalugaStyledString+SwiftUI.generated.swift"; sourceTree = "<group>"; };
 		3EC460D671184DBFD03C42FB /* ListSubject.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ListSubject.generated.swift; sourceTree = "<group>"; };
@@ -240,6 +244,7 @@
 			isa = PBXGroup;
 			children = (
 				205747562397C9C400CDE25E /* KeyboardManagerViewController.swift */,
+				20BB9E642962ECA70096E836 /* KeyboardManagerView.swift */,
 			);
 			path = KeyboardManager;
 			sourceTree = "<group>";
@@ -484,6 +489,7 @@
 				D7A59766D89528BA5F4327BD /* Subject.generated.swift */,
 				744B1E9043B534F8B9BD501C /* UninitializedObservable.generated.swift */,
 				8165D122BD8D8848D7242385 /* UninitializedSubject.generated.swift */,
+				2F34DFA21F534655B6FD3D03 /* KeyboardManager.generated.swift */,
 			);
 			path = KalugaSwiftUI;
 			sourceTree = "<group>";
@@ -668,6 +674,7 @@
 				4BC0CBE0269F1D25000512A9 /* BeaconsViewCell.swift in Sources */,
 				20C7D1D8246A93A600C9A63F /* ArchitectureViewController.swift in Sources */,
 				20CA2905293796C5007E4079 /* BottomSheetViewController.swift in Sources */,
+				20BB9E652962ECA70096E836 /* KeyboardManagerView.swift in Sources */,
 				20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */,
 				201EA2212938ECE700C562EC /* LoadingView.swift in Sources */,
 				20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */,
@@ -716,6 +723,7 @@
 				20FFB490293FA7EB005CF1C8 /* BottomSheetSubPageView.swift in Sources */,
 				2EF7D8289105AC623E600829 /* UninitializedObservable.generated.swift in Sources */,
 				1529FF0B35BD7AB3B6E838A9 /* UninitializedSubject.generated.swift in Sources */,
+				9481F22DC3CFE170CE894584 /* KeyboardManager.generated.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/example/ios/Demo/Base.lproj/Main.storyboard b/example/ios/Demo/Base.lproj/Main.storyboard
index 1b01b4a91..e32065e6e 100644
--- a/example/ios/Demo/Base.lproj/Main.storyboard
+++ b/example/ios/Demo/Base.lproj/Main.storyboard
@@ -350,14 +350,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="FeaturesListCell" id="C4Y-IC-Pu4" customClass="FeaturesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="52"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="C4Y-IC-Pu4" id="XEB-aa-Byo">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xh8-DK-zfM">
-                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -385,7 +385,6 @@
                         <outlet property="view" destination="KZQ-Mr-INa" id="yKY-xs-5Bk"/>
                         <segue destination="BYZ-38-t0r" kind="show" identifier="showLocation" id="25d-lm-Tpv"/>
                         <segue destination="Hbw-co-mWZ" kind="show" identifier="showPermissions" id="gxu-od-TLe"/>
-                        <segue destination="7Rf-m0-GFx" kind="show" identifier="showKeyboard" id="IO5-8e-Q9F"/>
                         <segue destination="VPE-Hp-Qc9" kind="show" identifier="showLinks" id="KlM-G9-P6y"/>
                         <segue destination="NRf-rC-nl1" kind="show" identifier="showSystem" id="IT2-HT-9Hz"/>
                         <segue destination="SGP-dn-hxw" kind="show" identifier="showBluetooth" id="Z5V-Lj-mdM"/>
@@ -905,9 +904,9 @@
         <!--Keyboard Manager View Controller-->
         <scene sceneID="i03-J0-4z5">
             <objects>
-                <viewController id="7Rf-m0-GFx" customClass="KeyboardManagerViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="KeyboardManagerViewController" id="7Rf-m0-GFx" customClass="KeyboardManagerViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ujg-Ft-aqv">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KiQ-CF-pig">
@@ -992,14 +991,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SystemListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SystemListCell" id="a8b-dW-eKx" customClass="SystemListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="52"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="a8b-dW-eKx" id="pjk-M2-4TV">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pnV-0z-POK">
-                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1081,14 +1080,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="InfoButtonCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="InfoButtonCell" id="3eh-xF-TU3" customClass="InfoButtonCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="43"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3eh-xF-TU3" id="cyO-Cc-dq8">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odz-vr-fX0">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1129,14 +1128,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PermissionsListCell" id="FrV-FL-GKa" customClass="PermissionsListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="52"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FrV-FL-GKa" id="wA3-QT-FyZ">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nXv-Uh-BJk">
-                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1277,14 +1276,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ResourcesListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ResourcesListCell" id="YH6-gF-Pq3" customClass="ResourcesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="38"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="37"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YH6-gF-Pq3" id="yfs-Dl-hfq">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="38"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="37"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="app-pb-mRq">
-                                            <rect key="frame" x="20" y="8" width="374" height="22"/>
+                                            <rect key="frame" x="20" y="8" width="374" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1719,14 +1718,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="UITypesListCell" id="ZCQ-8B-OTT" customClass="UITypesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51.5"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ZCQ-8B-OTT" id="nFY-1A-spl">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GMC-Yg-Klf">
-                                            <rect key="frame" x="40" y="15" width="334" height="21.5"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
diff --git a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
index b6153250a..6019276b5 100644
--- a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -105,7 +105,12 @@ private extension FeatureListNavigationAction {
                     swiftUIView: { DateTimePickerView() }
                 )
             }
-            case is FeatureListNavigationAction.Keyboard: return NavigationSpec.Segue(identifier: "showKeyboard")
+            case is FeatureListNavigationAction.Keyboard: return NavigationSpec.Push(animated: true) {
+                SwiftUIOrUIKitSelectionViewController.create(
+                    uiKitViewController: { KeyboardManagerViewController.instantiate() },
+                    swiftUIView: { KeyboardManagerView() }
+                )
+            }
             case is FeatureListNavigationAction.Links: return NavigationSpec.Segue(identifier: "showLinks")
             case is FeatureListNavigationAction.LoadingIndicator: return NavigationSpec.Push(animated: true) {
                 SwiftUIOrUIKitSelectionViewController.create(
diff --git a/example/ios/Demo/KeyboardManager/KeyboardManagerView.swift b/example/ios/Demo/KeyboardManager/KeyboardManagerView.swift
new file mode 100644
index 000000000..980e8b69a
--- /dev/null
+++ b/example/ios/Demo/KeyboardManager/KeyboardManagerView.swift
@@ -0,0 +1,65 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct KeyboardManagerView: View {
+
+    enum Field : String, Hashable {
+        case textField
+    }
+
+    let lifecycleViewModel: LifecycleViewModel<KeyboardViewModel<ValueFocusHandler<HashableClass<Field>>>>
+    @ObservedObject var keyboardManagerBuilder: SwiftUIKeyboardManagerBuilder<Field>
+    @State var text: String = ""
+    @FocusState private var focusedField: Field?
+
+    init() {
+        let keyboardManagerBuilder = SwiftUIKeyboardManagerBuilder<Field>()
+        self.keyboardManagerBuilder = keyboardManagerBuilder
+        let viewModel = KeyboardViewModel(keyboardManagerBuilder: keyboardManagerBuilder, editFieldFocusHandler: SwiftUIFocusHandler(value: Field.textField))
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            VStack(spacing: 10.0) {
+                TextField("", text: _text.projectedValue)
+                    .focused($focusedField, equals: Field.textField)
+                    .textFieldStyle(.roundedBorder)
+                viewModel.showButton.toButton(
+                    buttonFrame: .frame(maxWidth: .infinity)
+                )
+                viewModel.hideButton.toButton(
+                    buttonFrame: .frame(maxWidth: .infinity)
+                )
+                Spacer()
+            }.padding(10.0)
+                .navigationTitle(Text("feature_keyboard".localized())).bindKeyboardManager(keyboardManagerBuilder: keyboardManagerBuilder, focusState: _focusedField.projectedValue)
+        }
+    }
+}
+
+struct KeyboardManagerView_Previews: PreviewProvider {
+    static var previews: some View {
+        KeyboardManagerView()
+    }
+}
+
+
+
+
diff --git a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
index f99efa190..1c74f8ddd 100644
--- a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
+++ b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
@@ -19,6 +19,15 @@ import UIKit
 import KalugaExampleShared
 
 class KeyboardManagerViewController : UIViewController {
+
+    struct Const {
+        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+        static let storyboardId = "KeyboardManagerViewController"
+    }
+
+    static func instantiate() -> KeyboardManagerViewController {
+        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! KeyboardManagerViewController
+    }
     
     @IBOutlet private var editField: UITextField!
     @IBOutlet private var showButton: UIButton!
diff --git a/example/ios/Demo/Resources/ColorViewController.swift b/example/ios/Demo/Resources/ColorViewController.swift
index 22d1513af..eb88122fe 100644
--- a/example/ios/Demo/Resources/ColorViewController.swift
+++ b/example/ios/Demo/Resources/ColorViewController.swift
@@ -66,19 +66,19 @@ class ColorViewController : UIViewController {
             
             return [
                 viewModel.backdropColorBackground.observe { next in
-                    guard let backdropColorBackground = self?.backdropColorBackground, let backdropBackgroundStyle = next as? KalugaBackgroundStyle else {
+                    guard let backdropColorBackground = self?.backdropColorBackground, let backdropBackgroundStyle = next else {
                         return
                     }
                     BackgroundStyleKt.applyBackgroundStyle(backdropColorBackground, style: backdropBackgroundStyle)
                 },
                 viewModel.sourceColorBackground.observe { next in
-                    guard let sourceColorBackground = self?.sourceColorBackground, let sourceBackgroundStyle = next as? KalugaBackgroundStyle else {
+                    guard let sourceColorBackground = self?.sourceColorBackground, let sourceBackgroundStyle = next else {
                         return
                     }
                     BackgroundStyleKt.applyBackgroundStyle(sourceColorBackground, style: sourceBackgroundStyle)
                 },
                 viewModel.blendedColorBackground.observe { next in
-                    guard let blendedColorBackground = self?.blendedColorBackground, let blendedBackgroundStyle = next as? KalugaBackgroundStyle else {
+                    guard let blendedColorBackground = self?.blendedColorBackground, let blendedBackgroundStyle = next else {
                         return
                     }
                     BackgroundStyleKt.applyBackgroundStyle(blendedColorBackground, style: blendedBackgroundStyle)
diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 7db104fb2..5d1ad7235 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 7db104fb2f4e78684be24c810bbfc0cf1a7d4322
+Subproject commit 5d1ad72355fffc73fb34decbaecb3ecc35d018a5
diff --git a/example/ios/kaluga.sourcery.yml b/example/ios/kaluga.sourcery.yml
index 613a32152..3c8affada 100644
--- a/example/ios/kaluga.sourcery.yml
+++ b/example/ios/kaluga.sourcery.yml
@@ -16,4 +16,5 @@ args:
   includeAlerts: true
   includeHud: true
   includeDatePicker: true
+  includeKeyboard: true
   includePartialSheet: true
diff --git a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
index 54a699a26..811c4e522 100644
--- a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
+++ b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
@@ -1,3 +1,4 @@
+
 /*
 
 Copyright 2022 Splendo Consulting B.V. The Netherlands
diff --git a/keyboard/src/iosMain/kotlin/FocusHandler.kt b/keyboard/src/iosMain/kotlin/FocusHandler.kt
index 6b30daad3..577344da8 100644
--- a/keyboard/src/iosMain/kotlin/FocusHandler.kt
+++ b/keyboard/src/iosMain/kotlin/FocusHandler.kt
@@ -26,3 +26,5 @@ class UIKitFocusHandler(val view: UIView) : FocusHandler {
         }
     }
 }
+
+class ValueFocusHandler<Value>(val value: Value) : FocusHandler
diff --git a/keyboard/src/iosMain/kotlin/KeyboardManager.kt b/keyboard/src/iosMain/kotlin/KeyboardManager.kt
index 095bd639a..bf546629d 100644
--- a/keyboard/src/iosMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/iosMain/kotlin/KeyboardManager.kt
@@ -36,3 +36,13 @@ class UIKitKeyboardManager(private val application: UIApplication) : BaseKeyboar
         application.sendAction(sel_registerName("resignFirstResponder"), null, null, null)
     }
 }
+
+open class ValueKeyboardManager<Value>(private val onFocusOnValue: (Value?) -> Unit) : BaseKeyboardManager<ValueFocusHandler<Value>> {
+    override fun show(focusHandler: ValueFocusHandler<Value>) {
+        onFocusOnValue(focusHandler.value)
+    }
+
+    override fun hide() {
+        onFocusOnValue(null)
+    }
+}

From 4efb396a6befaa18056a23a363b1561f35e7ed88 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 3 Jan 2023 10:44:45 +0100
Subject: [PATCH 068/227] Lint Fixes

---
 example/ios/.swiftlint.yml                    | 141 +++++++++
 example/ios/Demo.xcodeproj/project.pbxproj    |  54 +++-
 example/ios/Demo/Alerts/AlertsView.swift      |   5 +-
 .../Demo/Alerts/AlertsViewController.swift    |  11 +-
 example/ios/Demo/AppDelegate.swift            |  24 +-
 .../ArchitectureDetailsView.swift             |  23 +-
 .../ArchitectureDetailsViewController.swift   |  30 +-
 .../Demo/Architecture/ArchitectureView.swift  |   7 +-
 .../ArchitectureViewController.swift          |  26 +-
 .../Architecture/BottomSheetSubPageView.swift |  20 +-
 .../BottomSheetSubPageViewController.swift    |  32 +--
 .../Demo/Architecture/BottomSheetView.swift   |   1 -
 .../BottomSheetViewController.swift           |  34 ++-
 example/ios/Demo/Base.lproj/Main.storyboard   |  15 +-
 .../ios/Demo/Beacons/BeaconsViewCell.swift    |   9 +-
 .../Demo/Beacons/BeaconsViewController.swift  |   6 +-
 .../BluetoothCharacteristicView.swift         | 128 +++++++++
 .../Bluetooth/BluetoothDescriptorView.swift   |  62 ++++
 ...BluetoothDeviceDetailsViewController.swift | 270 ++----------------
 .../Demo/Bluetooth/BluetoothServiceView.swift | 126 ++++++++
 .../Bluetooth/BluetoothViewController.swift   |  86 +++---
 .../DateTimePicker/DateTimePickerView.swift   |   5 +-
 .../DateTimePickerViewController.swift        |  14 +-
 example/ios/Demo/ExampleViewController.swift  |  19 +-
 .../FeaturesListViewController.swift          | 118 ++++----
 example/ios/Demo/Helpers/MainStoryboard.swift |  86 ++++++
 .../Demo/Helpers/UICollectionView+Typed.swift |  32 +++
 .../ios/Demo/Helpers/UIControl+Closure.swift  |   8 +-
 .../ios/Demo/Helpers/UITableView+Typed.swift  |  32 +++
 .../ios/Demo/Info/InfoViewController.swift    |  38 +--
 .../KeyboardManager/KeyboardManagerView.swift |  19 +-
 .../KeyboardManagerViewController.swift       |  20 +-
 .../ios/Demo/Links/LinksViewController.swift  |   8 +-
 .../Demo/LoadingIndicator/LoadingView.swift   |   5 +-
 .../LoadingViewController.swift               |  11 +-
 .../Location/LocationViewController.swift     |   6 +-
 .../PermissionListViewController.swift        |  20 +-
 .../PermissionViewController.swift            |  17 +-
 .../Demo/Resources/ButtonViewController.swift |  18 +-
 example/ios/Demo/Resources/ColorView.swift    |   4 +-
 .../Demo/Resources/ColorViewController.swift  |  67 ++---
 .../Demo/Resources/LabelViewController.swift  |  15 +-
 .../Demo/Resources/ResourcesListView.swift    |   4 +-
 .../ResourcesListViewController.swift         |  49 ++--
 .../Network/NetworkViewController.swift       |   5 +-
 .../Demo/System/SystemViewController.swift    |  22 +-
 ...wiftUIOrUIKitSelectionViewController.swift |  39 ++-
 ...omaticHeightCollectionViewFlowLayout.swift |  14 +-
 example/ios/DemoTests/DemoTests.swift         |   1 -
 example/ios/DemoUITests/DemoUITests.swift     |   4 +-
 example/ios/Kaluga-SwiftUI                    |   2 +-
 51 files changed, 1093 insertions(+), 719 deletions(-)
 create mode 100644 example/ios/.swiftlint.yml
 create mode 100644 example/ios/Demo/Bluetooth/BluetoothCharacteristicView.swift
 create mode 100644 example/ios/Demo/Bluetooth/BluetoothDescriptorView.swift
 create mode 100644 example/ios/Demo/Bluetooth/BluetoothServiceView.swift
 create mode 100644 example/ios/Demo/Helpers/MainStoryboard.swift
 create mode 100644 example/ios/Demo/Helpers/UICollectionView+Typed.swift
 create mode 100644 example/ios/Demo/Helpers/UITableView+Typed.swift

diff --git a/example/ios/.swiftlint.yml b/example/ios/.swiftlint.yml
new file mode 100644
index 000000000..c9c1a78d4
--- /dev/null
+++ b/example/ios/.swiftlint.yml
@@ -0,0 +1,141 @@
+disabled_rules: # rule identifiers to exclude from running
+  - conditional_returns_on_newline
+  - inclusive_language
+  - let_var_whitespace
+  - nesting
+  - pattern_matching_keywords
+  - superfluous_disable_command
+  - todo
+  - trailing_whitespace
+  - weak_delegate
+  - no_space_in_method_call
+  - compiler_protocol_init
+  - overridden_super_call
+opt_in_rules: # some rules are only opt-in
+  - anyobject_protocol
+  - array_init
+#  - attributes
+  - collection_alignment
+  - conditional_returns_on_newline
+  - contains_over_filter_count
+  - contains_over_filter_is_empty
+  - contains_over_first_not_nil
+  - contains_over_range_nil_comparison
+  - convenience_type
+  - closure_end_indentation
+  - closure_spacing
+  - empty_count
+  - empty_collection_literal
+  - empty_string
+#  - explicit_enum_raw_value
+  - fatal_error_message
+#  - file_name
+  - file_name_no_space
+#  - file_types_order
+  - first_where
+  - flatmap_over_map_reduce
+  - for_where
+#  - force_unwrapping
+  - identical_operands
+  - implicit_return
+  - joined_default_parameter
+  - last_where
+  - legacy_random
+  - literal_expression_end_indentation
+  - modifier_order
+  - multiline_arguments
+  - multiline_function_chains
+#  - multiline_literal_brackets
+  - multiline_parameters
+  - operator_usage_whitespace
+  - override_in_extension
+  - overridden_super_call
+  - prefer_self_type_over_type_of_self
+#  - prefixed_toplevel_constant
+  - prohibited_super_call
+  - redundant_discardable_let
+  - redundant_nil_coalescing
+  - redundant_objc_attribute
+  - redundant_optional_initialization
+  - redundant_set_access_control
+  - redundant_type_annotation
+  - redundant_void_return
+  - return_arrow_whitespace
+  - sorted_first_last
+  - static_operator
+  - toggle_bool
+  - trailing_closure
+#  - type_contents_order
+  - unneeded_parentheses_in_closure_argument
+#  - unowned_variable_capture
+  - vertical_parameter_alignment_on_call
+  - vertical_whitespace
+#  - vertical_whitespace_between_cases
+  - vertical_whitespace_closing_braces
+#  - vertical_whitespace_opening_braces
+  - yoda_condition
+  # Find all the available rules by running:
+  # swiftlint rules
+analyzer_rules:
+  - unused_declaration
+  - unused_import
+excluded: # paths to ignore during linting. Takes precedence over `included`.
+  - Pods
+  - Carthage
+
+cyclomatic_complexity:
+  ignores_case_statements: true
+# configurable rules can be customized from this configuration file
+# binary rules can set their severity level
+force_cast: warning # implicitly
+force_try:
+  severity: warning # explicitly
+# rules that have both warning and error levels, can set just the warning level
+# implicitly
+line_length: 160
+type_body_length:
+  - 300 # warning
+  - 400 # error
+function_body_length:
+ - 200 # warning
+ - 300 # error
+file_length:
+  warning: 300
+  error: 400
+implicit_return:
+  included:
+    - closure
+type_name:
+  min_length: 3 # only warning
+  max_length: # warning and error
+    warning: 60
+    error: 100
+  excluded:
+  - iPhone
+  - ID
+generic_type_name:
+  max_length: 30
+
+identifier_name:
+  min_length: # only min_length
+    error: 3 # only error
+  excluded:
+    - id
+    - to
+    - of
+    - go
+    - up
+    - on
+    - in
+    - qa
+    - en
+    - nl
+    - be
+    - ch
+    - de
+    - no
+    - fr
+    - gb
+    - uk
+    - wp
+#reporter: "xcode" # reporter type (xcode, json, csv, checkstyle, junit)
\ No newline at end of file
diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 926046a02..14f609917 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -32,6 +32,13 @@
 		209471E824C07F19001426CD /* BluetoothCharacteristicCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */; };
 		209471EA24C07F5F001426CD /* BluetoothDescriptorCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */; };
 		20BB9E652962ECA70096E836 /* KeyboardManagerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E642962ECA70096E836 /* KeyboardManagerView.swift */; };
+		20BB9E6C296323260096E836 /* BluetoothServiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E6B296323260096E836 /* BluetoothServiceView.swift */; };
+		20BB9E6E296323B80096E836 /* BluetoothCharacteristicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E6D296323B80096E836 /* BluetoothCharacteristicView.swift */; };
+		20BB9E70296323FD0096E836 /* BluetoothDescriptorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E6F296323FD0096E836 /* BluetoothDescriptorView.swift */; };
+		20BB9E722963281D0096E836 /* MainStoryboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E712963281D0096E836 /* MainStoryboard.swift */; };
+		20BB9E74296331290096E836 /* UICollectionView+Typed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E73296331290096E836 /* UICollectionView+Typed.swift */; };
+		20BB9E76296333BE0096E836 /* UITableView+Typed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E75296333BE0096E836 /* UITableView+Typed.swift */; };
+		20BB9E7729642FEB0096E836 /* PermissionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978348A6235DF586005B140B /* PermissionViewController.swift */; };
 		20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */; };
 		20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */; };
 		20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */; };
@@ -74,7 +81,6 @@
 		8679BDAA7F79F92DAC24AF23 /* ListObservable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31718DE342D28B4942D37524 /* ListObservable.generated.swift */; };
 		93EC5B31E0ADDED3225B15C9 /* Color+Color.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12F49DA13243DC3767266475 /* Color+Color.generated.swift */; };
 		9481F22DC3CFE170CE894584 /* KeyboardManager.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F34DFA21F534655B6FD3D03 /* KeyboardManager.generated.swift */; };
-		978348A7235DF586005B140B /* PermissionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978348A6235DF586005B140B /* PermissionViewController.swift */; };
 		C0C827F580A4F1950E9B10EE /* Shape+Helpers.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A2BAEDD60E67CE8F9277AC6 /* Shape+Helpers.generated.swift */; };
 		C77C23B538A4DFB02C0E0773 /* LazyView.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095989173871C8CDA70C49E1 /* LazyView.generated.swift */; };
 		C9555693B015ADE12795997D /* NavigationBarColor.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C9189D92DAF37F9815ECFDC /* NavigationBarColor.generated.swift */; };
@@ -139,6 +145,12 @@
 		209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BluetoothCharacteristicCell.xib; sourceTree = "<group>"; };
 		209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BluetoothDescriptorCell.xib; sourceTree = "<group>"; };
 		20BB9E642962ECA70096E836 /* KeyboardManagerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardManagerView.swift; sourceTree = "<group>"; };
+		20BB9E6B296323260096E836 /* BluetoothServiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothServiceView.swift; sourceTree = "<group>"; };
+		20BB9E6D296323B80096E836 /* BluetoothCharacteristicView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothCharacteristicView.swift; sourceTree = "<group>"; };
+		20BB9E6F296323FD0096E836 /* BluetoothDescriptorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothDescriptorView.swift; sourceTree = "<group>"; };
+		20BB9E712963281D0096E836 /* MainStoryboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainStoryboard.swift; sourceTree = "<group>"; };
+		20BB9E73296331290096E836 /* UICollectionView+Typed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Typed.swift"; sourceTree = "<group>"; };
+		20BB9E75296333BE0096E836 /* UITableView+Typed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableView+Typed.swift"; sourceTree = "<group>"; };
 		20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleViewController.swift; sourceTree = "<group>"; };
 		20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIControl+Closure.swift"; sourceTree = "<group>"; };
 		20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturesListViewController.swift; sourceTree = "<group>"; };
@@ -154,7 +166,7 @@
 		20FFB48D293F818B005CF1C8 /* BottomSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetView.swift; sourceTree = "<group>"; };
 		20FFB48F293FA7EB005CF1C8 /* BottomSheetSubPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetSubPageView.swift; sourceTree = "<group>"; };
 		27D181CE83615D345BB56946 /* HasDefaultValue.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = HasDefaultValue.generated.swift; sourceTree = "<group>"; };
-		2F34DFA21F534655B6FD3D03 /* KeyboardManager.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; lastKnownFileType = sourcecode.swift; name = KeyboardManager.generated.swift; path = KeyboardManager.generated.swift; sourceTree = "<group>"; };
+		2F34DFA21F534655B6FD3D03 /* KeyboardManager.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = KeyboardManager.generated.swift; sourceTree = "<group>"; };
 		31718DE342D28B4942D37524 /* ListObservable.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ListObservable.generated.swift; sourceTree = "<group>"; };
 		382B35FA85A28992FE37B803 /* KalugaStyledString+SwiftUI.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "KalugaStyledString+SwiftUI.generated.swift"; sourceTree = "<group>"; };
 		3EC460D671184DBFD03C42FB /* ListSubject.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ListSubject.generated.swift; sourceTree = "<group>"; };
@@ -264,6 +276,9 @@
 				209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */,
 				209471E724C07F19001426CD /* BluetoothCharacteristicCell.xib */,
 				209471E924C07F5F001426CD /* BluetoothDescriptorCell.xib */,
+				20BB9E6B296323260096E836 /* BluetoothServiceView.swift */,
+				20BB9E6D296323B80096E836 /* BluetoothCharacteristicView.swift */,
+				20BB9E6F296323FD0096E836 /* BluetoothDescriptorView.swift */,
 			);
 			path = Bluetooth;
 			sourceTree = "<group>";
@@ -273,6 +288,9 @@
 			children = (
 				20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */,
 				201EA21E2938EB5200C562EC /* String+Localized.swift */,
+				20BB9E712963281D0096E836 /* MainStoryboard.swift */,
+				20BB9E73296331290096E836 /* UICollectionView+Typed.swift */,
+				20BB9E75296333BE0096E836 /* UITableView+Typed.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -528,6 +546,7 @@
 			buildConfigurationList = 74C754F7F747073B076C3A91 /* Build configuration list for PBXNativeTarget "Demo" */;
 			buildPhases = (
 				95D0860F27D2540B00838E57 /* Compile Kotlin/Native */,
+				20BB9E6A29631B600096E836 /* SwiftLint */,
 				744156D82DB12C1F9CC3C68F /* Sources */,
 				74B635A880CB81844D31A213 /* Frameworks */,
 				746C535FD7586B544C684D34 /* Resources */,
@@ -632,8 +651,28 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		20BB9E6A29631B600096E836 /* SwiftLint */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = SwiftLint;
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nexport PATH=\"$PATH:/opt/homebrew/bin\"\nif which swiftlint > /dev/null; then\n  swiftlint\nelse\n  echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+		};
 		95D0860F27D2540B00838E57 /* Compile Kotlin/Native */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -657,12 +696,13 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				20BB9E7729642FEB0096E836 /* PermissionViewController.swift in Sources */,
 				205747572397C9C400CDE25E /* KeyboardManagerViewController.swift in Sources */,
 				74671D1F8F6A31F1DD3F7912 /* AppDelegate.swift in Sources */,
 				20D8CD3726FE8FE200D14AC9 /* ResourcesListViewController.swift in Sources */,
 				209471E124C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift in Sources */,
 				2017B1C52400175C00F9072A /* PermissionListViewController.swift in Sources */,
-				978348A7235DF586005B140B /* PermissionViewController.swift in Sources */,
+				20BB9E70296323FD0096E836 /* BluetoothDescriptorView.swift in Sources */,
 				641CC0DC25CACAAD001E1CD1 /* LinksViewController.swift in Sources */,
 				2073D0F227032B5B002CB856 /* ColorViewController.swift in Sources */,
 				201EA2232938F11700C562EC /* ResourcesListView.swift in Sources */,
@@ -672,15 +712,17 @@
 				649979E725CCD37200348419 /* NetworkViewController.swift in Sources */,
 				20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */,
 				4BC0CBE0269F1D25000512A9 /* BeaconsViewCell.swift in Sources */,
+				20BB9E6C296323260096E836 /* BluetoothServiceView.swift in Sources */,
 				20C7D1D8246A93A600C9A63F /* ArchitectureViewController.swift in Sources */,
 				20CA2905293796C5007E4079 /* BottomSheetViewController.swift in Sources */,
+				20BB9E76296333BE0096E836 /* UITableView+Typed.swift in Sources */,
 				20BB9E652962ECA70096E836 /* KeyboardManagerView.swift in Sources */,
 				20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */,
 				201EA2212938ECE700C562EC /* LoadingView.swift in Sources */,
 				20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */,
 				201EA21F2938EB5200C562EC /* String+Localized.swift in Sources */,
+				20BB9E6E296323B80096E836 /* BluetoothCharacteristicView.swift in Sources */,
 				649979D325CC638C00348419 /* SystemViewController.swift in Sources */,
-				978348A7235DF586005B140B /* PermissionViewController.swift in Sources */,
 				20C7D1D52469B25B00C9A63F /* InfoViewController.swift in Sources */,
 				4B02E504236B221B003F0B36 /* LoadingViewController.swift in Sources */,
 				7425815FF35195035A8991B0 /* LocationViewController.swift in Sources */,
@@ -712,6 +754,7 @@
 				62D65713EC7DD3C712D864BB /* ListSubject.generated.swift in Sources */,
 				008D2380957750839A7B501C /* Navigation.generated.swift in Sources */,
 				C9555693B015ADE12795997D /* NavigationBarColor.generated.swift in Sources */,
+				20BB9E74296331290096E836 /* UICollectionView+Typed.swift in Sources */,
 				D17DC9D74F0BD77D12813366 /* Observable.generated.swift in Sources */,
 				6BBAC6F7C1C74608F52D7FF7 /* PlatformMappers.generated.swift in Sources */,
 				37B9F4481D30F2FC895AB554 /* PlatformValueMapper.generated.swift in Sources */,
@@ -719,6 +762,7 @@
 				847C2A647F23AF46CED079CF /* RoutingState.generated.swift in Sources */,
 				C0C827F580A4F1950E9B10EE /* Shape+Helpers.generated.swift in Sources */,
 				300D5D65F49D6711AC8FF5DA /* Subject.generated.swift in Sources */,
+				20BB9E722963281D0096E836 /* MainStoryboard.swift in Sources */,
 				20FFB48A293EB4F0005CF1C8 /* ArchitectureView.swift in Sources */,
 				20FFB490293FA7EB005CF1C8 /* BottomSheetSubPageView.swift in Sources */,
 				2EF7D8289105AC623E600829 /* UninitializedObservable.generated.swift in Sources */,
diff --git a/example/ios/Demo/Alerts/AlertsView.swift b/example/ios/Demo/Alerts/AlertsView.swift
index 45955e536..7069625cb 100644
--- a/example/ios/Demo/Alerts/AlertsView.swift
+++ b/example/ios/Demo/Alerts/AlertsView.swift
@@ -44,8 +44,9 @@ struct AlertsView: View {
                 )
                 Spacer()
             }
-        }.padding(10.0)
-            .navigationTitle(Text("feature_alerts".localized()))
+        }
+        .padding(10.0)
+        .navigationTitle(Text("feature_alerts".localized()))
     }
 }
 
diff --git a/example/ios/Demo/Alerts/AlertsViewController.swift b/example/ios/Demo/Alerts/AlertsViewController.swift
index 5f29e12a4..e3aa07bcb 100644
--- a/example/ios/Demo/Alerts/AlertsViewController.swift
+++ b/example/ios/Demo/Alerts/AlertsViewController.swift
@@ -21,15 +21,6 @@ import KalugaExampleShared
 
 class AlertsViewController: UIViewController {
 
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "AlertsViewController"
-    }
-
-    static func instantiate() -> AlertsViewController {
-        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! AlertsViewController
-    }
-
     @IBOutlet var showAlertButton: UIButton!
     @IBOutlet var showAndDismissButton: UIButton!
     @IBOutlet var showAlertWithInputButton: UIButton!
@@ -47,7 +38,7 @@ class AlertsViewController: UIViewController {
 
         title = "feature_alerts".localized()
 
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [] }
         ButtonStyleKt.bindButton(showAlertButton, button: viewModel.showAlertButton)
         ButtonStyleKt.bindButton(showAndDismissButton, button: viewModel.showAndDismissAfter3SecondsButton)
         ButtonStyleKt.bindButton(showAlertWithInputButton, button: viewModel.showAlertWithInputButton)
diff --git a/example/ios/Demo/AppDelegate.swift b/example/ios/Demo/AppDelegate.swift
index c4ea27188..568630691 100644
--- a/example/ios/Demo/AppDelegate.swift
+++ b/example/ios/Demo/AppDelegate.swift
@@ -41,42 +41,38 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             return false
         }
 
-        let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        let vc = storyboard.instantiateViewController(withIdentifier: "LinksViewController") as! LinksViewController
-        self.window?.rootViewController = vc
+        let viewController = MainStoryboard.instantiateLinksViewController()
+        self.window?.rootViewController = viewController
         
-        vc.handleIncomingLink(url: stringUrl)
+        viewController.handleIncomingLink(url: stringUrl)
         return true
     }
 
     func applicationWillResignActive(_ application: UIApplication) {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+    // Sent when the application is about to move from active to inactive state.
+    // This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message)
+    // or when the user quits the application and it begins the transition to the background state.
     // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
 
     }
 
-
     func applicationDidEnterBackground(_ application: UIApplication) {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+    // Use this method to release shared resources, save user data, invalidate timers,
+    // and store enough application state information to restore your application to its current state in case it is terminated later.
     // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 
     }
 
-
     func applicationWillEnterForeground(_ application: UIApplication) {
     // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
     }
 
-
     func applicationDidBecomeActive(_ application: UIApplication) {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    // Restart any tasks that were paused (or not yet started) while the application was inactive.
+    // If the application was previously in the background, optionally refresh the user interface.
     }
 
-
     func applicationWillTerminate(_ application: UIApplication) {
     // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
-
-
-
 }
diff --git a/example/ios/Demo/Architecture/ArchitectureDetailsView.swift b/example/ios/Demo/Architecture/ArchitectureDetailsView.swift
index 627c204a6..57b4cda6d 100644
--- a/example/ios/Demo/Architecture/ArchitectureDetailsView.swift
+++ b/example/ios/Demo/Architecture/ArchitectureDetailsView.swift
@@ -22,7 +22,6 @@ struct ArchitectureDetailsView: View, Equatable {
         lhs.inputDetails == rhs.inputDetails
     }
 
-
     let inputDetails: InputDetails
     private let lifecycleViewModel: LifecycleViewModel<ArchitectureDetailsViewModel>
     let router: Router
@@ -60,12 +59,16 @@ struct ArchitectureDetailsView: View, Equatable {
                 }
             }
             .padding(10.0)
-            .navigationBarItems(leading:
-                                    Button(action: { viewModel.onBackPressed() }) {
-                                            Image(systemName: "chevron.left")
-                                                .scaleEffect(0.83)
-                                                .font(Font.title.weight(.medium))
-                                        })
+            .navigationBarItems(
+                leading: Button(
+                    action: { viewModel.onBackPressed() },
+                    label: {
+                        Image(systemName: "chevron.left")
+                            .scaleEffect(0.83)
+                            .font(Font.title.weight(.medium))
+                    }
+                )
+            )
             .navigationBarBackButtonHidden(true)
         }
     }
@@ -81,8 +84,6 @@ extension ArchitectureDetailsView {
         } onClose: { [weak self] in
             self?.previousRouter?.close()
         }
-
-
         init(onFinish: @escaping (InputDetails) -> Void) {
             self.onFinish = onFinish
         }
@@ -91,8 +92,6 @@ extension ArchitectureDetailsView {
 
 struct ArchitectureDetailsView_Previews: PreviewProvider {
     static var previews: some View {
-        ArchitectureDetailsView(inputDetails: InputDetails(name: "Name", number: 42)) { _ in
-
-        }
+        ArchitectureDetailsView(inputDetails: InputDetails(name: "Name", number: 42)) { _ in }
     }
 }
diff --git a/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift b/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
index f4ca69754..5ded27846 100644
--- a/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureDetailsViewController.swift
@@ -20,25 +20,24 @@ import KalugaExampleShared
 
 class ArchitectureDetailsViewController: UIViewController {
     
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "ArchitectureDetails"
-    }
-    
     static func create(inputDetails: InputDetails, onDismiss: @escaping (InputDetails) -> Void) -> ArchitectureDetailsViewController {
-        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! ArchitectureDetailsViewController
+        let viewController = MainStoryboard.instantiateArchitectureDetailsViewController()
         if #available(iOS 13.0, *) {
-            vc.isModalInPresentation = true
+            viewController.isModalInPresentation = true
         }
-        let navigator = ArchitectureDetailsNavigatorKt.ArchitectureDetailsViewControllerNavigator(parent: vc) { details in
-            NavigationSpec.Pop(to: nil, animated: true) {
-                onDismiss(details)
+        let navigator = ArchitectureDetailsNavigatorKt.ArchitectureDetailsViewControllerNavigator(
+            parent: viewController,
+            onFinishWithDetails: { details in
+                NavigationSpec.Pop(to: nil, animated: true) {
+                    onDismiss(details)
+                }
+            },
+            onClose: {
+                NavigationSpec.Pop(to: nil, animated: true)
             }
-        } onClose: {
-            NavigationSpec.Pop(to: nil, animated: true)
-        }
-        vc.viewModel = ArchitectureDetailsViewModel(initialDetail: inputDetails, navigator: navigator)
-        return vc
+        )
+        viewController.viewModel = ArchitectureDetailsViewModel(initialDetail: inputDetails, navigator: navigator)
+        return viewController
     }
 
     var viewModel: ArchitectureDetailsViewModel!
@@ -83,5 +82,4 @@ class ArchitectureDetailsViewController: UIViewController {
     @objc func didDismiss() {
         viewModel.onBackPressed()
     }
-    
 }
diff --git a/example/ios/Demo/Architecture/ArchitectureView.swift b/example/ios/Demo/Architecture/ArchitectureView.swift
index 821b2e986..9aba06554 100644
--- a/example/ios/Demo/Architecture/ArchitectureView.swift
+++ b/example/ios/Demo/Architecture/ArchitectureView.swift
@@ -81,18 +81,17 @@ struct ArchitectureView: View {
 }
 
 extension ArchitectureView {
-    enum ContentRoute : Equatable {
+    enum ContentRoute: Equatable {
         case details(input: InputDetails)
     }
 
     class Router {
 
-        var nextContentRoutingState: ObjectRoutingState<ContentRoute>? = nil
-        var bottomSheetRoutingState: RoutingState? = nil
+        var nextContentRoutingState: ObjectRoutingState<ContentRoute>?
+        var bottomSheetRoutingState: RoutingState?
         lazy var defaultNavigator = ArchitectureNavigatorKt.ArchitectureNavigator(
             onDetails: { [weak self] inputDetails in
                 self?.nextContentRoutingState?.show(ContentRoute.details(input: inputDetails))
-
             },
             onBottomSheet: { [weak self] in
                 self?.bottomSheetRoutingState?.show()
diff --git a/example/ios/Demo/Architecture/ArchitectureViewController.swift b/example/ios/Demo/Architecture/ArchitectureViewController.swift
index 1b200bef4..2a58ef52f 100644
--- a/example/ios/Demo/Architecture/ArchitectureViewController.swift
+++ b/example/ios/Demo/Architecture/ArchitectureViewController.swift
@@ -18,16 +18,7 @@
 import UIKit
 import KalugaExampleShared
 
-class ArchitectureViewController: UIViewController  {
-
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "Architecture"
-    }
-
-    static func instantiate() -> ArchitectureViewController {
-        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! ArchitectureViewController
-    }
+class ArchitectureViewController: UIViewController {
     
     @IBOutlet weak var nameLabel: UILabel!
     @IBOutlet weak var nameInput: UITextField!
@@ -57,8 +48,8 @@ class ArchitectureViewController: UIViewController  {
                 presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue),
                 transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)
             ) {
-                let vc = BottomSheetViewController.create()
-                let nav = UINavigationController(rootViewController: vc)
+                let viewController = BottomSheetViewController.create()
+                let nav = UINavigationController(rootViewController: viewController)
                 if let sheet = nav.sheetPresentationController {
                     sheet.detents = [.medium()]
                 }
@@ -110,10 +101,9 @@ class ArchitectureViewController: UIViewController  {
         viewModel.nameInput.post(newValue: NSString(string: inputDetails.name))
         viewModel.numberInput.post(newValue: NSString(string: "\(inputDetails.number)"))
     }
-
 }
 
-extension ArchitectureViewController : UITextFieldDelegate {
+extension ArchitectureViewController: UITextFieldDelegate {
 
     func textFieldDidEndEditing(_ textField: UITextField) {
         postInput(text: textField.text ?? "", fromTextField: textField)
@@ -126,10 +116,10 @@ extension ArchitectureViewController : UITextFieldDelegate {
     }
 
     private func postInput(text: String, fromTextField textField: UITextField) {
-        if (textField == nameInput) {
-            viewModel.nameInput.post(newValue: NSString(string: text))
-        } else if (textField == numberInput) {
-            viewModel.numberInput.post(newValue: NSString(string: text))
+        switch textField {
+        case nameInput: viewModel.nameInput.post(newValue: NSString(string: text))
+        case numberInput: viewModel.numberInput.post(newValue: NSString(string: text))
+        default: ()
         }
     }
 }
diff --git a/example/ios/Demo/Architecture/BottomSheetSubPageView.swift b/example/ios/Demo/Architecture/BottomSheetSubPageView.swift
index 510dc48ea..022f0100d 100644
--- a/example/ios/Demo/Architecture/BottomSheetSubPageView.swift
+++ b/example/ios/Demo/Architecture/BottomSheetSubPageView.swift
@@ -19,7 +19,7 @@ import KalugaExampleShared
 
 struct BottomSheetSubPageView: View {
 
-    class RouteStack : ObservableObject {
+    class RouteStack: ObservableObject {
         let previousRoute: RoutingState
         let parentRoute: RoutingState
 
@@ -51,14 +51,18 @@ struct BottomSheetSubPageView: View {
             }.padding(10.0)
                 .navigationBarBackButtonHidden(true)
                 .navigationBarItems(
-                    leading: Button(action: { viewModel.onBackPressed() }) {
-                        Image(systemName: "chevron.left")
-                            .scaleEffect(0.83)
-                            .font(Font.title.weight(.medium))
-                    }, trailing: Button("X") {
-                            viewModel.onClosePressed()
+                    leading: Button(
+                        action: { viewModel.onBackPressed() },
+                        label: {
+                            Image(systemName: "chevron.left")
+                                .scaleEffect(0.83)
+                                .font(Font.title.weight(.medium))
                         }
-                    )
+                    ),
+                    trailing: Button("X") {
+                            viewModel.onClosePressed()
+                    }
+                )
         }
     }
 }
diff --git a/example/ios/Demo/Architecture/BottomSheetSubPageViewController.swift b/example/ios/Demo/Architecture/BottomSheetSubPageViewController.swift
index 3d5cddee7..79d58c46a 100644
--- a/example/ios/Demo/Architecture/BottomSheetSubPageViewController.swift
+++ b/example/ios/Demo/Architecture/BottomSheetSubPageViewController.swift
@@ -20,22 +20,21 @@ import KalugaExampleShared
 
 class BottomSheetSubPageViewController: UIViewController, UISheetPresentationControllerDelegate {
 
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "BottomSheetSubPage"
-    }
-
     static func create() -> BottomSheetSubPageViewController {
-        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! BottomSheetSubPageViewController
-        let navigator = BottomSheetSubPageNavigatorKt.BottomSheetSubPageViewControllerNavigator(parent: vc, onClose: {
-            NavigationSpec.Dismiss(toDismiss: { viewController in
-                viewController.navigationController!
-            }, animated: true)
-        }, onBack: {
-            NavigationSpec.Pop(to: nil, animated: true)
-        })
-        vc.viewModel = BottomSheetSubPageViewModel(navigator: navigator)
-        return vc
+        let viewController = MainStoryboard.instantiateBottomSheetSubPageViewController()
+        let navigator = BottomSheetSubPageNavigatorKt.BottomSheetSubPageViewControllerNavigator(
+            parent: viewController,
+            onClose: {
+                NavigationSpec.Dismiss(toDismiss: { viewController in
+                    viewController.navigationController!
+                }, animated: true)
+            },
+            onBack: {
+                NavigationSpec.Pop(to: nil, animated: true)
+            }
+        )
+        viewController.viewModel = BottomSheetSubPageViewModel(navigator: navigator)
+        return viewController
     }
 
     var viewModel: BottomSheetSubPageViewModel!
@@ -57,7 +56,7 @@ class BottomSheetSubPageViewController: UIViewController, UISheetPresentationCon
         self.navigationItem.rightBarButtonItem = closeButton
 
         lifecycleManager = viewModel.addLifecycleManager(parent: self) {
-            return []
+            []
         }
 
         label.text = viewModel.text
@@ -70,5 +69,4 @@ class BottomSheetSubPageViewController: UIViewController, UISheetPresentationCon
     @objc func didClose() {
         viewModel.onClosePressed()
     }
-
 }
diff --git a/example/ios/Demo/Architecture/BottomSheetView.swift b/example/ios/Demo/Architecture/BottomSheetView.swift
index 6926d40cc..9a6c45271 100644
--- a/example/ios/Demo/Architecture/BottomSheetView.swift
+++ b/example/ios/Demo/Architecture/BottomSheetView.swift
@@ -55,7 +55,6 @@ struct BottomSheetView: View, Equatable {
                             viewModel.onClosePressed()
                         }
                     )
-
             }
         }.frame(height: 150.0) // bug in partial sheet
     }
diff --git a/example/ios/Demo/Architecture/BottomSheetViewController.swift b/example/ios/Demo/Architecture/BottomSheetViewController.swift
index c34aa3b71..6dba3f089 100644
--- a/example/ios/Demo/Architecture/BottomSheetViewController.swift
+++ b/example/ios/Demo/Architecture/BottomSheetViewController.swift
@@ -20,24 +20,23 @@ import KalugaExampleShared
 
 class BottomSheetViewController: UIViewController, UISheetPresentationControllerDelegate {
 
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "BottomSheet"
-    }
-
     static func create() -> BottomSheetViewController {
-        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! BottomSheetViewController
-        let navigator = BottomSheetNavigatorKt.BottomSheetViewControllerNavigator(parent: vc, onClose: {
-            NavigationSpec.Dismiss(toDismiss: { viewController in
-                viewController.navigationController!
-            }, animated: true)
-        }, onSubPage: {
-            NavigationSpec.Push(animated: true) {
-                BottomSheetSubPageViewController.create()
+        let viewController = MainStoryboard.instantiateBottomSheetViewController()
+        let navigator = BottomSheetNavigatorKt.BottomSheetViewControllerNavigator(
+            parent: viewController,
+            onClose: {
+                NavigationSpec.Dismiss(toDismiss: { viewController in
+                    viewController.navigationController!
+                }, animated: true)
+            },
+            onSubPage: {
+                NavigationSpec.Push(animated: true) {
+                    BottomSheetSubPageViewController.create()
+                }
             }
-        })
-        vc.viewModel = BottomSheetViewModel(navigator: navigator)
-        return vc
+        )
+        viewController.viewModel = BottomSheetViewModel(navigator: navigator)
+        return viewController
     }
 
     var viewModel: BottomSheetViewModel!
@@ -58,7 +57,7 @@ class BottomSheetViewController: UIViewController, UISheetPresentationController
         self.navigationItem.leftBarButtonItem = newBackButton
 
         lifecycleManager = viewModel.addLifecycleManager(parent: self) {
-            return []
+            []
         }
 
         label.text = viewModel.text
@@ -68,5 +67,4 @@ class BottomSheetViewController: UIViewController, UISheetPresentationController
     @objc func didDismiss() {
         viewModel.onClosePressed()
     }
-
 }
diff --git a/example/ios/Demo/Base.lproj/Main.storyboard b/example/ios/Demo/Base.lproj/Main.storyboard
index e32065e6e..5ee49e399 100644
--- a/example/ios/Demo/Base.lproj/Main.storyboard
+++ b/example/ios/Demo/Base.lproj/Main.storyboard
@@ -28,13 +28,13 @@
                                 </connections>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter Your Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BRD-1O-pzh">
-                                <rect key="frame" x="20" y="68" width="128.5" height="20.5"/>
+                                <rect key="frame" x="20" y="68" width="374" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter a Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e50-92-l7G">
-                                <rect key="frame" x="20" y="147.5" width="119.5" height="20.5"/>
+                                <rect key="frame" x="20" y="147.5" width="374" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -87,9 +87,11 @@
                             <constraint firstItem="MN6-Uw-a48" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="9AT-IS-szf"/>
                             <constraint firstItem="r7U-VH-8wC" firstAttribute="top" secondItem="BRD-1O-pzh" secondAttribute="bottom" constant="5" id="CQ8-uz-pia"/>
                             <constraint firstItem="9Vf-hG-a8X" firstAttribute="width" secondItem="9Vf-hG-a8X" secondAttribute="height" multiplier="1:1" id="DOC-kp-U4u"/>
+                            <constraint firstItem="cfj-uN-qHa" firstAttribute="trailing" secondItem="BRD-1O-pzh" secondAttribute="trailing" constant="20" id="Exo-1h-N3X"/>
                             <constraint firstItem="MN6-Uw-a48" firstAttribute="top" secondItem="w2o-g6-GSv" secondAttribute="bottom" constant="20" id="F7h-7c-fq2"/>
                             <constraint firstItem="cfj-uN-qHa" firstAttribute="trailing" secondItem="w2o-g6-GSv" secondAttribute="trailing" constant="20" id="KZD-4u-uFu"/>
                             <constraint firstItem="r7U-VH-8wC" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="RBw-GV-NWQ"/>
+                            <constraint firstItem="cfj-uN-qHa" firstAttribute="trailing" secondItem="e50-92-l7G" secondAttribute="trailing" constant="20" id="SMx-6a-Jm7"/>
                             <constraint firstItem="cfj-uN-qHa" firstAttribute="trailing" secondItem="MN6-Uw-a48" secondAttribute="trailing" constant="20" id="T0D-RX-rxR"/>
                             <constraint firstItem="e50-92-l7G" firstAttribute="leading" secondItem="cfj-uN-qHa" secondAttribute="leading" constant="20" id="VdD-wU-Vy9"/>
                             <constraint firstItem="w2o-g6-GSv" firstAttribute="trailing" secondItem="9Vf-hG-a8X" secondAttribute="trailing" constant="4" id="avb-uH-j8z"/>
@@ -124,13 +126,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jo1-3B-4UO">
-                                <rect key="frame" x="20" y="68" width="45" height="20.5"/>
+                                <rect key="frame" x="20" y="68" width="374" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P3V-58-1Kg">
-                                <rect key="frame" x="20" y="108.5" width="61.5" height="20.5"/>
+                                <rect key="frame" x="20" y="108.5" width="374" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -152,11 +154,13 @@
                         <viewLayoutGuide key="safeArea" id="FAp-h6-6JX"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
+                            <constraint firstItem="FAp-h6-6JX" firstAttribute="trailing" secondItem="Jo1-3B-4UO" secondAttribute="trailing" constant="20" id="3k3-uz-Sg9"/>
                             <constraint firstItem="Yci-wv-53q" firstAttribute="top" secondItem="P3V-58-1Kg" secondAttribute="bottom" constant="20" id="4Wj-XK-4lK"/>
                             <constraint firstItem="Yci-wv-53q" firstAttribute="leading" secondItem="PHY-me-ogV" secondAttribute="leading" constant="20" id="Hhy-2f-bEP"/>
                             <constraint firstItem="Jo1-3B-4UO" firstAttribute="top" secondItem="FAp-h6-6JX" secondAttribute="top" constant="20" id="h5e-Z5-ZJG"/>
                             <constraint firstItem="FAp-h6-6JX" firstAttribute="trailing" secondItem="Yci-wv-53q" secondAttribute="trailing" constant="20" id="j8D-he-zWs"/>
                             <constraint firstItem="P3V-58-1Kg" firstAttribute="top" secondItem="Jo1-3B-4UO" secondAttribute="bottom" constant="20" id="lVw-ru-QeN"/>
+                            <constraint firstItem="FAp-h6-6JX" firstAttribute="trailing" secondItem="P3V-58-1Kg" secondAttribute="trailing" constant="20" id="sCE-6P-OmE"/>
                             <constraint firstItem="P3V-58-1Kg" firstAttribute="leading" secondItem="FAp-h6-6JX" secondAttribute="leading" constant="20" id="swA-AQ-pJ8"/>
                             <constraint firstItem="Jo1-3B-4UO" firstAttribute="leading" secondItem="FAp-h6-6JX" secondAttribute="leading" constant="20" id="w4u-u2-Opd"/>
                         </constraints>
@@ -1232,7 +1236,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Current Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E9l-oh-DX8">
-                                <rect key="frame" x="20" y="166" width="100" height="21"/>
+                                <rect key="frame" x="20" y="166" width="374" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -1248,6 +1252,7 @@
                             <constraint firstItem="zPh-dc-WSn" firstAttribute="top" secondItem="cDV-k0-OPn" secondAttribute="top" constant="10" id="CPJ-2x-4Zs"/>
                             <constraint firstItem="E9l-oh-DX8" firstAttribute="top" secondItem="ipx-q1-8HF" secondAttribute="bottom" constant="30" id="JmW-Ic-3rz"/>
                             <constraint firstItem="3I5-FX-ntF" firstAttribute="leading" secondItem="cDV-k0-OPn" secondAttribute="leading" constant="20" id="Q8F-Ve-D70"/>
+                            <constraint firstItem="cDV-k0-OPn" firstAttribute="trailing" secondItem="E9l-oh-DX8" secondAttribute="trailing" constant="20" id="S12-hX-7ke"/>
                             <constraint firstItem="3I5-FX-ntF" firstAttribute="top" secondItem="E9l-oh-DX8" secondAttribute="bottom" constant="10" id="e3H-uo-eaR"/>
                             <constraint firstItem="cDV-k0-OPn" firstAttribute="trailing" secondItem="zPh-dc-WSn" secondAttribute="trailing" constant="20" id="odP-op-1ao"/>
                             <constraint firstItem="ipx-q1-8HF" firstAttribute="leading" secondItem="cDV-k0-OPn" secondAttribute="leading" constant="20" id="twC-pd-zFo"/>
diff --git a/example/ios/Demo/Beacons/BeaconsViewCell.swift b/example/ios/Demo/Beacons/BeaconsViewCell.swift
index 928f6e859..f24195259 100644
--- a/example/ios/Demo/Beacons/BeaconsViewCell.swift
+++ b/example/ios/Demo/Beacons/BeaconsViewCell.swift
@@ -35,15 +35,18 @@ class BeaconsViewCell: UICollectionViewCell {
     func startMonitoring() {
         viewModel?.namespace_.observe { [weak self] namespace in
             self?.namespaceLabel.text = namespace as String?
-        }.addTo(disposeBag: disposeBag)
+        }
+        .addTo(disposeBag: disposeBag)
 
         viewModel?.instance.observe { [weak self] instance in
             self?.instanceLabel.text = instance as String?
-        }.addTo(disposeBag: disposeBag)
+        }
+        .addTo(disposeBag: disposeBag)
 
         viewModel?.txPower.observe { [weak self] txPower in
             self?.txPowerLabel.text = txPower as String?
-        }.addTo(disposeBag: disposeBag)
+        }
+        .addTo(disposeBag: disposeBag)
     }
 
     func stopMonitoring() {
diff --git a/example/ios/Demo/Beacons/BeaconsViewController.swift b/example/ios/Demo/Beacons/BeaconsViewController.swift
index 2aec082c2..11c3aebd7 100644
--- a/example/ios/Demo/Beacons/BeaconsViewController.swift
+++ b/example/ios/Demo/Beacons/BeaconsViewController.swift
@@ -75,9 +75,9 @@ class BeaconsViewController: UICollectionViewController {
     }
 
     override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let beaconCell = collectionView.dequeueReusableCell(withReuseIdentifier: BeaconsViewCell.identifier, for: indexPath) as! BeaconsViewCell
-        beaconCell.configure(with: beacons[indexPath.row])
-        return beaconCell
+        return collectionView.dequeueTypedReusableCell(withReuseIdentifier: BeaconsViewCell.identifier, for: indexPath) { (beaconCell: BeaconsViewCell) in
+            beaconCell.configure(with: beacons[indexPath.row])
+        }
     }
 
     override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
diff --git a/example/ios/Demo/Bluetooth/BluetoothCharacteristicView.swift b/example/ios/Demo/Bluetooth/BluetoothCharacteristicView.swift
new file mode 100644
index 000000000..58efcf4ac
--- /dev/null
+++ b/example/ios/Demo/Bluetooth/BluetoothCharacteristicView.swift
@@ -0,0 +1,128 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import KalugaExampleShared
+
+class BluetoothCharacteristicView: UICollectionViewCell {
+
+    enum Companion {
+        static let identifier = "BluetoothCharacteristicView"
+    }
+
+    weak var parent: BluetoothServiceView?
+    var characteristic: BluetoothCharacteristicViewModel?
+    private let disposeBag = DisposeBag()
+
+    private var isInvalidating = false
+
+    @IBOutlet var characteristicIdentifier: UILabel!
+    @IBOutlet var characteristicValue: UILabel!
+    @IBOutlet var descriptorsHeader: UILabel!
+    @IBOutlet var descriptorsList: UICollectionView!
+
+    @IBOutlet var descriptorsListHeight: NSLayoutConstraint!
+
+    private var descriptors: [BluetoothDescriptorViewModel] = []
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+
+        descriptorsHeader.text = "bluetooth_descriptors".localized()
+
+        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
+        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
+        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
+        flowLayout.minimumLineSpacing = 4
+        descriptorsList.collectionViewLayout = flowLayout
+        descriptorsList.register(
+            UINib(nibName: "BluetoothDescriptorCell", bundle: nil),
+            forCellWithReuseIdentifier: BluetoothDescriptorView.Companion.identifier
+        )
+    }
+
+    func startMonitoring() {
+        disposeBag.dispose()
+        guard let characteristic = self.characteristic else {
+            return
+        }
+        characteristic.didResume()
+
+        characteristicIdentifier.text = characteristic.uuid
+        characteristic.descriptors.observe { [weak self] descriptors in
+            self?.descriptors = descriptors as? [BluetoothDescriptorViewModel] ?? []
+            self?.descriptorsList.reloadData()
+            self?.updateListSize(isInvalidating: false)
+        }
+        .addTo(disposeBag: disposeBag)
+
+        characteristic.value.observe { [weak self] value in
+            self?.characteristicValue.text = value as String?
+        }
+        .addTo(disposeBag: disposeBag)
+    }
+
+    func stopMonitoring() {
+        disposeBag.dispose()
+        characteristic?.didPause()
+    }
+
+    private func updateListSize(isInvalidating: Bool) {
+        self.isInvalidating = isInvalidating
+        descriptorsList.collectionViewLayout.invalidateLayout()
+        descriptorsList.layoutIfNeeded()
+        let height = descriptorsList.contentSize.height
+        descriptorsListHeight.constant = height
+        parent?.updateListSize(isInvalidating: true)
+        self.isInvalidating = false
+    }
+
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return descriptors.count
+    }
+
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        return collectionView.dequeueTypedReusableCell(
+            withReuseIdentifier: BluetoothDescriptorView.Companion.identifier,
+            for: indexPath
+        ) { (descriptorCell: BluetoothDescriptorView) in
+            descriptorCell.descriptor = descriptors[indexPath.row]
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if !isInvalidating {
+            (cell as? BluetoothDescriptorView)?.startMonitoring()
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if !isInvalidating {
+            (cell as? BluetoothDescriptorView)?.stopMonitoring()
+        }
+    }
+
+    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
+        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
+        layoutIfNeeded()
+        layoutAttributes.frame.size = systemLayoutSizeFitting(
+            UIView.layoutFittingCompressedSize,
+            withHorizontalFittingPriority: .required,
+            verticalFittingPriority: .fittingSizeLevel
+        )
+        return layoutAttributes
+    }
+}
diff --git a/example/ios/Demo/Bluetooth/BluetoothDescriptorView.swift b/example/ios/Demo/Bluetooth/BluetoothDescriptorView.swift
new file mode 100644
index 000000000..495e149bb
--- /dev/null
+++ b/example/ios/Demo/Bluetooth/BluetoothDescriptorView.swift
@@ -0,0 +1,62 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import KalugaExampleShared
+
+class BluetoothDescriptorView: UICollectionViewCell {
+
+    enum Companion {
+        static let identifier = "BluetoothDescriptorView"
+    }
+
+    var descriptor: BluetoothDescriptorViewModel?
+    private let disposeBag = DisposeBag()
+
+    @IBOutlet var descriptorIdentifier: UILabel!
+    @IBOutlet var descriptorValue: UILabel!
+
+    func startMonitoring() {
+        disposeBag.dispose()
+        guard let descriptor = self.descriptor else {
+            return
+        }
+        descriptor.didResume()
+
+        descriptorIdentifier.text = descriptor.uuid
+
+        descriptor.value.observe { [weak self] value in
+            self?.descriptorValue.text = value as String?
+        }
+        .addTo(disposeBag: disposeBag)
+    }
+
+    func stopMonitoring() {
+        disposeBag.dispose()
+        descriptor?.didResume()
+    }
+
+    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
+        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
+        layoutIfNeeded()
+        layoutAttributes.frame.size = systemLayoutSizeFitting(
+            UIView.layoutFittingCompressedSize,
+            withHorizontalFittingPriority: .required,
+            verticalFittingPriority: .fittingSizeLevel
+        )
+        return layoutAttributes
+    }
+}
diff --git a/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift b/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
index e8a3f972c..33b3b93f5 100644
--- a/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
+++ b/example/ios/Demo/Bluetooth/BluetoothDeviceDetailsViewController.swift
@@ -18,20 +18,15 @@
 import UIKit
 import KalugaExampleShared
 
-class BluetoothDeviceDetailsViewController : UIViewController {
-    
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "BluetoothDeviceDetails"
-    }
+class BluetoothDeviceDetailsViewController: UIViewController {
     
     static func create(identifier: UUID) -> BluetoothDeviceDetailsViewController {
-        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! BluetoothDeviceDetailsViewController
+        let viewController = MainStoryboard.instantiateBluetoothDeviceDetailsViewController()
         if #available(iOS 13.0, *) {
-            vc.isModalInPresentation = true
+            viewController.isModalInPresentation = true
         }
-        vc.viewModel = BluetoothDeviceDetailViewModel(identifier: identifier)
-        return vc
+        viewController.viewModel = BluetoothDeviceDetailViewModel(identifier: identifier)
+        return viewController
     }
 
     var viewModel: BluetoothDeviceDetailViewModel!
@@ -47,7 +42,7 @@ class BluetoothDeviceDetailsViewController : UIViewController {
     
     private var services: [BluetoothServiceViewModel] = []
 
-    private var isInvalidating: Bool = false
+    private var isInvalidating = false
 
     deinit {
         lifecycleManager.unbind()
@@ -102,264 +97,31 @@ class BluetoothDeviceDetailsViewController : UIViewController {
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let serviceCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothServiceView.Companion.identifier, for: indexPath) as! BluetoothServiceView
-        serviceCell.parent = self
-        serviceCell.service = services[indexPath.row]
-        return serviceCell
+        return collectionView.dequeueTypedReusableCell(
+            withReuseIdentifier: BluetoothServiceView.Companion.identifier,
+            for: indexPath
+        ) { (serviceCell: BluetoothServiceView) in
+            serviceCell.parent = self
+            serviceCell.service = services[indexPath.row]
+        }
     }
 
     func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
+        if !isInvalidating {
             (cell as? BluetoothServiceView)?.startMonitoring()
         }
     }
 
     func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
+        if !isInvalidating {
             (cell as? BluetoothServiceView)?.stopMonitoring()
         }
     }
 
-    fileprivate func updateListSize() {
+    func updateListSize() {
         isInvalidating = true
         servicesList.collectionViewLayout.invalidateLayout()
         servicesList.layoutIfNeeded()
         isInvalidating = false
     }
-    
-}
-
-class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
-    
-    fileprivate struct Companion {
-        static let identifier = "BluetoothServiceView"
-    }
-    
-    fileprivate weak var parent: BluetoothDeviceDetailsViewController?
-    fileprivate var service: BluetoothServiceViewModel?
-    private let disposeBag = DisposeBag()
-    
-    private var isInvalidating: Bool = false
-
-    @IBOutlet var serviceHeader: UILabel!
-    @IBOutlet var serviceIdentifier: UILabel!
-    @IBOutlet var characteristicsHeader: UILabel!
-    @IBOutlet var characteristicsList: UICollectionView!
-    @IBOutlet var characteristicsListHeight: NSLayoutConstraint!
-    
-    private var characteristics: [BluetoothCharacteristicViewModel] = []
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-
-        serviceHeader.text = "bluetooth_service".localized()
-        characteristicsHeader.text = "bluetooth_characteristics".localized()
-
-        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
-        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
-        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
-        flowLayout.minimumLineSpacing = 4
-        characteristicsList.collectionViewLayout = flowLayout
-        characteristicsList.dataSource = self
-        characteristicsList.delegate = self
-        characteristicsList.register(UINib(nibName: "BluetoothCharacteristicCell", bundle: nil), forCellWithReuseIdentifier: BluetoothCharacteristicView.Companion.identifier)
-    }
-
-    fileprivate func startMonitoring() {
-        disposeBag.dispose()
-        guard let service = self.service else {
-            return
-        }
-        service.didResume()
-
-        serviceIdentifier.text = service.uuid
-        service.characteristics.observe { [weak self] characteristics in
-            self?.characteristics = characteristics as? [BluetoothCharacteristicViewModel] ?? []
-            self?.characteristicsList.reloadData()
-            self?.updateListSize(isInvalidating: false)
-        }.addTo(disposeBag: disposeBag)
-    }
-
-    fileprivate func stopMonitoring() {
-        service?.didPause()
-        disposeBag.dispose()
-    }
-
-    fileprivate func updateListSize(isInvalidating: Bool) {
-        self.isInvalidating = isInvalidating
-        characteristicsList.collectionViewLayout.invalidateLayout()
-        characteristicsList.layoutIfNeeded()
-        let height = characteristicsList.contentSize.height
-        characteristicsListHeight.constant = height
-        parent?.updateListSize()
-        self.isInvalidating = false
-    }
-
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return characteristics.count
-    }
-
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let characteristicCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothCharacteristicView.Companion.identifier, for: indexPath) as! BluetoothCharacteristicView
-        characteristicCell.parent = self
-        characteristicCell.characteristic = characteristics[indexPath.row]
-        return characteristicCell
-    }
-
-    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
-            (cell as? BluetoothCharacteristicView)?.startMonitoring()
-        }
-    }
-
-    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
-            (cell as? BluetoothCharacteristicView)?.stopMonitoring()
-        }
-    }
-
-    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
-        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
-        layoutIfNeeded()
-        layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
-        return layoutAttributes
-    }
-    
-}
-
-class BluetoothCharacteristicView : UICollectionViewCell {
-    
-    fileprivate struct Companion {
-        static let identifier = "BluetoothCharacteristicView"
-    }
-    
-    fileprivate weak var parent: BluetoothServiceView?
-    fileprivate var characteristic: BluetoothCharacteristicViewModel?
-    private let disposeBag = DisposeBag()
-
-    private var isInvalidating: Bool = false
-    
-    @IBOutlet var characteristicIdentifier: UILabel!
-    @IBOutlet var characteristicValue: UILabel!
-    @IBOutlet var descriptorsHeader: UILabel!
-    @IBOutlet var descriptorsList: UICollectionView!
-    
-    @IBOutlet var descriptorsListHeight: NSLayoutConstraint!
-    
-    private var descriptors: [BluetoothDescriptorViewModel] = []
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-
-        descriptorsHeader.text = "bluetooth_descriptors".localized()
-
-        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
-        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
-        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
-        flowLayout.minimumLineSpacing = 4
-        descriptorsList.collectionViewLayout = flowLayout
-        descriptorsList.register(UINib(nibName: "BluetoothDescriptorCell", bundle: nil), forCellWithReuseIdentifier: BluetoothDescriptorView.Companion.identifier)
-    }
-
-    fileprivate func startMonitoring() {
-        disposeBag.dispose()
-        guard let characteristic = self.characteristic else {
-            return
-        }
-        characteristic.didResume()
-
-        characteristicIdentifier.text = characteristic.uuid
-        characteristic.descriptors.observe { [weak self] descriptors in
-            self?.descriptors = descriptors as? [BluetoothDescriptorViewModel] ?? []
-            self?.descriptorsList.reloadData()
-            self?.updateListSize(isInvalidating: false)
-        }.addTo(disposeBag: disposeBag)
-
-        characteristic.value.observe { [weak self] value in
-            self?.characteristicValue.text = value as String?
-        }.addTo(disposeBag: disposeBag)
-    }
-
-    fileprivate func stopMonitoring() {
-        disposeBag.dispose()
-        characteristic?.didPause()
-    }
-
-    private func updateListSize(isInvalidating: Bool) {
-        self.isInvalidating = isInvalidating
-        descriptorsList.collectionViewLayout.invalidateLayout()
-        descriptorsList.layoutIfNeeded()
-        let height = descriptorsList.contentSize.height
-        descriptorsListHeight.constant = height
-        parent?.updateListSize(isInvalidating: true)
-        self.isInvalidating = false
-    }
-
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return descriptors.count
-    }
-
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let descriptorCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothDescriptorView.Companion.identifier, for: indexPath) as! BluetoothDescriptorView
-        descriptorCell.descriptor = descriptors[indexPath.row]
-        return descriptorCell
-    }
-
-    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
-            (cell as? BluetoothDescriptorView)?.startMonitoring()
-        }
-    }
-
-    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if (!isInvalidating) {
-            (cell as? BluetoothDescriptorView)?.stopMonitoring()
-        }
-    }
-
-    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
-        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
-        layoutIfNeeded()
-        layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
-        return layoutAttributes
-    }
-}
-
-class BluetoothDescriptorView : UICollectionViewCell {
-    
-    fileprivate struct Companion {
-        static let identifier = "BluetoothDescriptorView"
-    }
-    
-    fileprivate var descriptor: BluetoothDescriptorViewModel?
-    private let disposeBag = DisposeBag()
-    
-    @IBOutlet var descriptorIdentifier: UILabel!
-    @IBOutlet var descriptorValue: UILabel!
-    
-    fileprivate func startMonitoring() {
-        disposeBag.dispose()
-        guard let descriptor = self.descriptor else {
-            return
-        }
-        descriptor.didResume()
-
-        descriptorIdentifier.text = descriptor.uuid
-
-        descriptor.value.observe { [weak self] value in
-            self?.descriptorValue.text = value as String?
-        }.addTo(disposeBag: disposeBag)
-    }
-
-    fileprivate func stopMonitoring() {
-        disposeBag.dispose()
-        descriptor?.didResume()
-    }
-
-    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
-        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
-        layoutIfNeeded()
-        layoutAttributes.frame.size = systemLayoutSizeFitting(UIView.layoutFittingCompressedSize, withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel)
-        return layoutAttributes
-    }
 }
diff --git a/example/ios/Demo/Bluetooth/BluetoothServiceView.swift b/example/ios/Demo/Bluetooth/BluetoothServiceView.swift
new file mode 100644
index 000000000..230bda401
--- /dev/null
+++ b/example/ios/Demo/Bluetooth/BluetoothServiceView.swift
@@ -0,0 +1,126 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import KalugaExampleShared
+
+class BluetoothServiceView: UICollectionViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
+
+    enum Companion {
+        static let identifier = "BluetoothServiceView"
+    }
+
+    weak var parent: BluetoothDeviceDetailsViewController?
+    var service: BluetoothServiceViewModel?
+    private let disposeBag = DisposeBag()
+
+    private var isInvalidating = false
+
+    @IBOutlet var serviceHeader: UILabel!
+    @IBOutlet var serviceIdentifier: UILabel!
+    @IBOutlet var characteristicsHeader: UILabel!
+    @IBOutlet var characteristicsList: UICollectionView!
+    @IBOutlet var characteristicsListHeight: NSLayoutConstraint!
+
+    private var characteristics: [BluetoothCharacteristicViewModel] = []
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+
+        serviceHeader.text = "bluetooth_service".localized()
+        characteristicsHeader.text = "bluetooth_characteristics".localized()
+
+        let flowLayout = FittingWidthAutomaticHeightCollectionViewFlowLayout()
+        flowLayout.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
+        flowLayout.sectionInset = UIEdgeInsets(top: 10, left: 8, bottom: 10, right: 8)
+        flowLayout.minimumLineSpacing = 4
+        characteristicsList.collectionViewLayout = flowLayout
+        characteristicsList.dataSource = self
+        characteristicsList.delegate = self
+        characteristicsList.register(
+            UINib(nibName: "BluetoothCharacteristicCell", bundle: nil),
+            forCellWithReuseIdentifier: BluetoothCharacteristicView.Companion.identifier
+        )
+    }
+
+    func startMonitoring() {
+        disposeBag.dispose()
+        guard let service = self.service else {
+            return
+        }
+        service.didResume()
+
+        serviceIdentifier.text = service.uuid
+        service.characteristics.observe { [weak self] characteristics in
+            self?.characteristics = characteristics as? [BluetoothCharacteristicViewModel] ?? []
+            self?.characteristicsList.reloadData()
+            self?.updateListSize(isInvalidating: false)
+        }
+        .addTo(disposeBag: disposeBag)
+    }
+
+    func stopMonitoring() {
+        service?.didPause()
+        disposeBag.dispose()
+    }
+
+    func updateListSize(isInvalidating: Bool) {
+        self.isInvalidating = isInvalidating
+        characteristicsList.collectionViewLayout.invalidateLayout()
+        characteristicsList.layoutIfNeeded()
+        let height = characteristicsList.contentSize.height
+        characteristicsListHeight.constant = height
+        parent?.updateListSize()
+        self.isInvalidating = false
+    }
+
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return characteristics.count
+    }
+
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        return collectionView.dequeueTypedReusableCell(
+            withReuseIdentifier: BluetoothCharacteristicView.Companion.identifier,
+            for: indexPath
+        ) { (characteristicCell: BluetoothCharacteristicView) in
+            characteristicCell.parent = self
+            characteristicCell.characteristic = characteristics[indexPath.row]
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if !isInvalidating {
+            (cell as? BluetoothCharacteristicView)?.startMonitoring()
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if !isInvalidating {
+            (cell as? BluetoothCharacteristicView)?.stopMonitoring()
+        }
+    }
+
+    override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes {
+        let layoutAttributes = super.preferredLayoutAttributesFitting(layoutAttributes)
+        layoutIfNeeded()
+        layoutAttributes.frame.size = systemLayoutSizeFitting(
+            UIView.layoutFittingCompressedSize,
+            withHorizontalFittingPriority: .required,
+            verticalFittingPriority: .fittingSizeLevel
+        )
+        return layoutAttributes
+    }
+}
diff --git a/example/ios/Demo/Bluetooth/BluetoothViewController.swift b/example/ios/Demo/Bluetooth/BluetoothViewController.swift
index 840de8dd6..10b032aa9 100644
--- a/example/ios/Demo/Bluetooth/BluetoothViewController.swift
+++ b/example/ios/Demo/Bluetooth/BluetoothViewController.swift
@@ -18,7 +18,7 @@
 import UIKit
 import KalugaExampleShared
 
-class BluetoothViewController : UICollectionViewController {
+class BluetoothViewController: UICollectionViewController {
 
     lazy var navigator: ViewControllerNavigator<DeviceDetails> = ViewControllerNavigator(parentVC: self) { action in
         NavigationSpec.Push(animated: true) {
@@ -69,10 +69,26 @@ class BluetoothViewController : UICollectionViewController {
     }
 
     private func updateNavigationItem(isScanning: Bool) {
-        if (isScanning) {
-            self.navigationItem.setRightBarButton(UIBarButtonItem(title: "bluetooth_stop_scanning".localized(), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
+        if isScanning {
+            self.navigationItem.setRightBarButton(
+                UIBarButtonItem(
+                    title: "bluetooth_stop_scanning".localized(),
+                    style: .plain,
+                    target: self,
+                    action: #selector(self.toggleScanning)
+                ),
+                animated: true
+            )
         } else {
-            self.navigationItem.setRightBarButton(UIBarButtonItem(title: "bluetooth_start_scanning".localized(), style: .plain, target: self, action: #selector(self.toggleScanning)), animated: true)
+            self.navigationItem.setRightBarButton(
+                UIBarButtonItem(
+                    title: "bluetooth_start_scanning".localized(),
+                    style: .plain,
+                    target: self,
+                    action: #selector(self.toggleScanning)
+                ),
+                animated: true
+            )
         }
     }
 
@@ -93,9 +109,12 @@ class BluetoothViewController : UICollectionViewController {
     }
 
     override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let bluetoothCell = collectionView.dequeueReusableCell(withReuseIdentifier: BluetoothCell.Companion.identifier, for: indexPath) as! BluetoothCell
-        bluetoothCell.device = devices[indexPath.row]
-        return bluetoothCell
+        return collectionView.dequeueTypedReusableCell(
+            withReuseIdentifier: BluetoothCell.Companion.identifier,
+            for: indexPath
+        ) { (bluetoothCell: BluetoothCell) in
+            bluetoothCell.device = devices[indexPath.row]
+        }
     }
 
     override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
@@ -124,7 +143,7 @@ class BluetoothViewController : UICollectionViewController {
 
 class BluetoothCell: UICollectionViewCell {
     
-    fileprivate struct Companion {
+    fileprivate enum Companion {
         static let identifier = "BluetoothCell"
     }
     
@@ -147,7 +166,7 @@ class BluetoothCell: UICollectionViewCell {
     @IBOutlet var moreButtonContainer: UIView!
     @IBOutlet var moreButton: UIButton!
     
-    fileprivate var device: BluetoothListDeviceViewModel? = nil
+    fileprivate var device: BluetoothListDeviceViewModel?
 
     @IBAction func onConnectPressed() {
         device?.onConnectPressed()
@@ -170,29 +189,25 @@ class BluetoothCell: UICollectionViewCell {
 
         deviceIdentifier.text = device.identifierString
 
-        device.name.observe { [weak self] name in
-            self?.deviceName.text = name as? String
-        }.addTo(disposeBag: disposeBag)
-
-        device.rssi.observe { [weak self] rssiValue in
-            self?.rssi.text = rssiValue as? String
-        }.addTo(disposeBag: disposeBag)
-
-        device.txPower.observe { [weak self] txPowerValue in
-            self?.txPower.text = txPowerValue as? String
-        }.addTo(disposeBag: disposeBag)
-
-        device.status.observe { [weak self] status in
-            self?.connectionStatus.text = status as? String
-        }.addTo(disposeBag: disposeBag)
-
-        device.isConnectButtonVisible.observe { [weak self] isVisible in
-            self?.buttonContainer.alpha = (isVisible as? Bool ?? false) ? 1.0 : 0.0
-        }.addTo(disposeBag: disposeBag)
-
-        device.connectButtonState.observe { [weak self] connectButtonState in
-            let state: BluetoothListDeviceViewModel.ConnectButtonState = connectButtonState as? BluetoothListDeviceViewModel.ConnectButtonState ?? BluetoothListDeviceViewModel.ConnectButtonState.disconnect
-            switch state {
+        let disposables = [
+            device.name.observe { [weak self] name in
+                self?.deviceName.text = name as? String
+            },
+            device.rssi.observe { [weak self] rssiValue in
+                self?.rssi.text = rssiValue as? String
+            },
+            device.txPower.observe { [weak self] txPowerValue in
+                self?.txPower.text = txPowerValue as? String
+            },
+            device.status.observe { [weak self] status in
+                self?.connectionStatus.text = status as? String
+            },
+            device.isConnectButtonVisible.observe { [weak self] isVisible in
+                self?.buttonContainer.alpha = (isVisible as? Bool ?? false) ? 1.0 : 0.0
+            },
+            device.connectButtonState.observe { [weak self] connectButtonState in
+                let state = connectButtonState as? BluetoothListDeviceViewModel.ConnectButtonState ?? BluetoothListDeviceViewModel.ConnectButtonState.disconnect
+                switch state {
                 case BluetoothListDeviceViewModel.ConnectButtonState.connect:
                     self?.connectButton.isHidden = false
                     self?.disconnectButton.isHidden = true
@@ -200,8 +215,13 @@ class BluetoothCell: UICollectionViewCell {
                     self?.connectButton.isHidden = true
                     self?.disconnectButton.isHidden = false
                 default: ()
+                }
             }
-        }.addTo(disposeBag: disposeBag)
+        ]
+
+        for disposable in disposables {
+            disposable.addTo(disposeBag: disposeBag)
+        }
 
         device.isFoldedOut.observe { [weak self] isFoldedOut in
             self?.foldOutMenu.isHidden = !((isFoldedOut as? Bool) ?? false)
diff --git a/example/ios/Demo/DateTimePicker/DateTimePickerView.swift b/example/ios/Demo/DateTimePicker/DateTimePickerView.swift
index f749b2f12..22fd3e374 100644
--- a/example/ios/Demo/DateTimePicker/DateTimePickerView.swift
+++ b/example/ios/Demo/DateTimePicker/DateTimePickerView.swift
@@ -44,8 +44,9 @@ struct DateTimePickerView: View {
                 Text(dateLabel.value)
                 Spacer()
             }
-        }.padding(10.0)
-            .navigationTitle(Text("feature_date_time_picker".localized()))
+        }
+        .padding(10.0)
+        .navigationTitle(Text("feature_date_time_picker".localized()))
     }
 }
 
diff --git a/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift b/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
index f997ad129..a6119470a 100644
--- a/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
+++ b/example/ios/Demo/DateTimePicker/DateTimePickerViewController.swift
@@ -18,17 +18,7 @@
 import UIKit
 import KalugaExampleShared
 
-class DateTimePickerViewController : UIViewController {
-
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "DateTimePicker"
-    }
-
-    static func instantiate() -> DateTimePickerViewController {
-        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! DateTimePickerViewController
-    }
-
+class DateTimePickerViewController: UIViewController {
 
     @IBOutlet private var currentTimeLabel: UILabel!
     @IBOutlet private var timeLabel: UILabel!
@@ -52,7 +42,7 @@ class DateTimePickerViewController : UIViewController {
                 return []
             }
             return [
-                viewModel.dateLabel.observe { (time) in
+                viewModel.dateLabel.observe { time in
                     self?.timeLabel.text = time as? String
                 }
             ]
diff --git a/example/ios/Demo/ExampleViewController.swift b/example/ios/Demo/ExampleViewController.swift
index 1a02f892d..c5f4cf386 100644
--- a/example/ios/Demo/ExampleViewController.swift
+++ b/example/ios/Demo/ExampleViewController.swift
@@ -18,19 +18,13 @@
 import UIKit
 import KalugaExampleShared
 
-class ExampleViewController : UIViewController {
-    
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let featuresList = "FeaturesList"
-        static let infoView = "InfoViewController"
-    }
+class ExampleViewController: UIViewController {
     
     @IBOutlet weak var containerView: UIView!
     @IBOutlet weak var bottomView: UIStackView!
     
-    lazy var featuresListController = Const.storyboard.instantiateViewController(withIdentifier: Const.featuresList) as! FeaturesListViewController
-    lazy var infoViewController = Const.storyboard.instantiateViewController(withIdentifier: Const.infoView) as! InfoViewController
+    lazy var featuresListController = MainStoryboard.instantiateFeaturesListViewController()
+    lazy var infoViewController = MainStoryboard.instantiateInfoViewController()
 
     private lazy var navigator: ViewControllerNavigator<ExampleTabNavigation> = ViewControllerNavigator(parentVC: self) { action in
         NavigationSpec.Nested(type: NavigationSpec.NestedTypeReplace(tag: 1), containerView: self.containerView) {
@@ -41,7 +35,7 @@ class ExampleViewController : UIViewController {
             }
         }
     }
-    lazy var viewModel: ExampleViewModel = ExampleViewModel(navigator: navigator)
+    lazy var viewModel = ExampleViewModel(navigator: navigator)
     var lifecycleManager: LifecycleManager!
     let selectedButtonDisposeBag = DisposeBag()
 
@@ -73,16 +67,15 @@ class ExampleViewController : UIViewController {
 
                         viewModel.tab.observeInitialized { selectedTab in
                             button.isSelected = selectedTab == tab
-                        }.addTo(disposeBag: disposeBag)
+                        }
+                        .addTo(disposeBag: disposeBag)
                         button.addAction {
                             viewModel.tab.post(newValue: tab)
                         }
                         bottomView.addArrangedSubview(button)
                     }
-
                 }
             ]
         }
     }
-    
 }
diff --git a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
index 6019276b5..d41a94bde 100644
--- a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -19,16 +19,16 @@ import UIKit
 import KalugaExampleShared
 import PartialSheet
 
-class FeaturesListViewController : UITableViewController {
+class FeaturesListViewController: UITableViewController {
 
     private lazy var navigator: ViewControllerNavigator<FeatureListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
         action.spec
     }
-    private lazy var viewModel: FeatureListViewModel = FeatureListViewModel(navigator: navigator)
+    private lazy var viewModel = FeatureListViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     private var features = [String]()
-    private var onSelected: ((Int) -> Void)? = nil
+    private var onSelected: ((Int) -> Void)?
 
     deinit {
         lifecycleManager.unbind()
@@ -41,9 +41,11 @@ class FeaturesListViewController : UITableViewController {
             guard let viewModel = self?.viewModel else { return [] }
             return [viewModel.feature.observeInitialized { next in
                 let features = next ?? []
-                self?.features = features.map { ($0 as! Feature).title }
+                self?.features = features.map { ($0 as? Feature)?.title ?? "" }
                 self?.onSelected = { (index: Int) in
-                    viewModel.onFeaturePressed(feature: features[index] as! Feature)
+                    if let feature = features[index] as? Feature {
+                        viewModel.onFeaturePressed(feature: feature)
+                    }
                 }
                 self?.tableView.reloadData()
             }]
@@ -59,77 +61,73 @@ class FeaturesListViewController : UITableViewController {
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: FeaturesListCell.Const.identifier, for: indexPath) as! FeaturesListCell
-        cell.label.text = features[indexPath.row]
-        return cell
+        return tableView.dequeueTypedReusableCell(withIdentifier: FeaturesListCell.Const.identifier, for: indexPath) { (cell: FeaturesListCell) in
+            cell.label.text = features[indexPath.row]
+        }
     }
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(indexPath.row)
+        _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
-    
 }
 
-class FeaturesListCell : UITableViewCell {
+class FeaturesListCell: UITableViewCell {
     
-    struct Const {
+    enum Const {
         static let identifier = "FeaturesListCell"
     }
     
     @IBOutlet weak var label: UILabel!
-    
 }
 
 private extension FeatureListNavigationAction {
     var spec: NavigationSpec {
-        get {
-            switch self {
-            case is FeatureListNavigationAction.Alerts: return NavigationSpec.Push(animated: true) {
-                SwiftUIOrUIKitSelectionViewController.create(
-                    uiKitViewController: { AlertsViewController.instantiate() },
-                    swiftUIView: { AlertsView() }
-                )
-            }
-            case is FeatureListNavigationAction.Architecture: return NavigationSpec.Push(animated: true) {
-                SwiftUIOrUIKitSelectionViewController.create(
-                    uiKitViewController: { ArchitectureViewController.instantiate() },
-                    swiftUIView: { ArchitectureView().attachPartialSheetToRoot() }
-                )
-            }
-            case is FeatureListNavigationAction.Beacons: return NavigationSpec.Segue(identifier: "showBeacons")
-            case is FeatureListNavigationAction.Bluetooth: return NavigationSpec.Segue(identifier: "showBluetooth")
-            case is FeatureListNavigationAction.DateTimePicker: return NavigationSpec.Push(animated: true) {
-                SwiftUIOrUIKitSelectionViewController.create(
-                    uiKitViewController: { DateTimePickerViewController.instantiate() },
-                    swiftUIView: { DateTimePickerView() }
-                )
-            }
-            case is FeatureListNavigationAction.Keyboard: return NavigationSpec.Push(animated: true) {
-                SwiftUIOrUIKitSelectionViewController.create(
-                    uiKitViewController: { KeyboardManagerViewController.instantiate() },
-                    swiftUIView: { KeyboardManagerView() }
-                )
-            }
-            case is FeatureListNavigationAction.Links: return NavigationSpec.Segue(identifier: "showLinks")
-            case is FeatureListNavigationAction.LoadingIndicator: return NavigationSpec.Push(animated: true) {
-                SwiftUIOrUIKitSelectionViewController.create(
-                    uiKitViewController: { LoadingViewController.instantiate() },
-                    swiftUIView: { LoadingView() }
-                )
-            }
-            case is FeatureListNavigationAction.Location: return NavigationSpec.Segue(identifier: "showLocation")
-            case is FeatureListNavigationAction.Permissions: return NavigationSpec.Segue(identifier: "showPermissions")
-            case is FeatureListNavigationAction.PlatformSpecific: return NavigationSpec.Segue(identifier: "showPlatformSpecific")
-            case is FeatureListNavigationAction.Resources: return NavigationSpec.Push(animated: true) {
-                SwiftUIOrUIKitSelectionViewController.create(
-                    uiKitViewController: { ResourcesListViewController.instantiate() },
-                    swiftUIView: { ResourcesListView() }
-                )
-            }
-            case is FeatureListNavigationAction.System: return NavigationSpec.Segue(identifier: "showSystem")
-            default: fatalError("Unknown action")
-            }
+        switch self {
+        case is FeatureListNavigationAction.Alerts: return NavigationSpec.Push(animated: true) {
+            SwiftUIOrUIKitSelectionViewController.create(
+                uiKitViewController: { MainStoryboard.instantiateAlertsViewController() },
+                swiftUIView: { AlertsView() }
+            )
+        }
+        case is FeatureListNavigationAction.Architecture: return NavigationSpec.Push(animated: true) {
+            SwiftUIOrUIKitSelectionViewController.create(
+                uiKitViewController: { MainStoryboard.instantiateArchitectureViewController() },
+                swiftUIView: { ArchitectureView().attachPartialSheetToRoot() }
+            )
+        }
+        case is FeatureListNavigationAction.Beacons: return NavigationSpec.Segue(identifier: "showBeacons")
+        case is FeatureListNavigationAction.Bluetooth: return NavigationSpec.Segue(identifier: "showBluetooth")
+        case is FeatureListNavigationAction.DateTimePicker: return NavigationSpec.Push(animated: true) {
+            SwiftUIOrUIKitSelectionViewController.create(
+                uiKitViewController: { MainStoryboard.instantiateDateTimePickerViewController() },
+                swiftUIView: { DateTimePickerView() }
+            )
+        }
+        case is FeatureListNavigationAction.Keyboard: return NavigationSpec.Push(animated: true) {
+            SwiftUIOrUIKitSelectionViewController.create(
+                uiKitViewController: { MainStoryboard.instantiateKeyboardManagerViewController() },
+                swiftUIView: { KeyboardManagerView() }
+            )
+        }
+        case is FeatureListNavigationAction.Links: return NavigationSpec.Segue(identifier: "showLinks")
+        case is FeatureListNavigationAction.LoadingIndicator: return NavigationSpec.Push(animated: true) {
+            SwiftUIOrUIKitSelectionViewController.create(
+                uiKitViewController: { MainStoryboard.instantiateLoadingViewController() },
+                swiftUIView: { LoadingView() }
+            )
+        }
+        case is FeatureListNavigationAction.Location: return NavigationSpec.Segue(identifier: "showLocation")
+        case is FeatureListNavigationAction.Permissions: return NavigationSpec.Segue(identifier: "showPermissions")
+        case is FeatureListNavigationAction.PlatformSpecific: return NavigationSpec.Segue(identifier: "showPlatformSpecific")
+        case is FeatureListNavigationAction.Resources: return NavigationSpec.Push(animated: true) {
+            SwiftUIOrUIKitSelectionViewController.create(
+                uiKitViewController: { MainStoryboard.instantiateResourcesListViewController() },
+                swiftUIView: { ResourcesListView() }
+            )
+        }
+        case is FeatureListNavigationAction.System: return NavigationSpec.Segue(identifier: "showSystem")
+        default: fatalError("Unknown action")
         }
     }
 }
diff --git a/example/ios/Demo/Helpers/MainStoryboard.swift b/example/ios/Demo/Helpers/MainStoryboard.swift
new file mode 100644
index 000000000..e2b4829ee
--- /dev/null
+++ b/example/ios/Demo/Helpers/MainStoryboard.swift
@@ -0,0 +1,86 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+
+enum MainStoryboard {
+    private static let storyboard = UIStoryboard(name: "Main", bundle: nil)
+
+    static func instantiateAlertsViewController() -> AlertsViewController {
+        return instantiate(identifier: "AlertsViewController")
+    }
+
+    static func instantiateArchitectureViewController() -> ArchitectureViewController {
+        return instantiate(identifier: "Architecture")
+    }
+
+    static func instantiateArchitectureDetailsViewController() -> ArchitectureDetailsViewController {
+        return instantiate(identifier: "ArchitectureDetails")
+    }
+
+    static func instantiateBluetoothDeviceDetailsViewController() -> BluetoothDeviceDetailsViewController {
+        return instantiate(identifier: "BluetoothDeviceDetails")
+    }
+
+    static func instantiateBottomSheetViewController() -> BottomSheetViewController {
+        return instantiate(identifier: "BottomSheet")
+    }
+
+    static func instantiateBottomSheetSubPageViewController() -> BottomSheetSubPageViewController {
+        instantiate(identifier: "BottomSheetSubPage")
+    }
+
+    static func instantiateDateTimePickerViewController() -> DateTimePickerViewController {
+        return instantiate(identifier: "DateTimePicker")
+    }
+
+    static func instantiateFeaturesListViewController() -> FeaturesListViewController {
+        return instantiate(identifier: "FeaturesList")
+    }
+
+    static func instantiateInfoViewController() -> InfoViewController {
+        return instantiate(identifier: "InfoViewController")
+    }
+
+    static func instantiateKeyboardManagerViewController() -> KeyboardManagerViewController {
+        return instantiate(identifier: "KeyboardManagerViewController")
+    }
+
+    static func instantiateLinksViewController() -> LinksViewController {
+        return instantiate(identifier: "LinksViewController")
+    }
+
+    static func instantiateLoadingViewController() -> LoadingViewController {
+        return instantiate(identifier: "LoadingView")
+    }
+
+    static func instantiatePermissionViewController() -> PermissionViewController {
+        return instantiate(identifier: "Permission")
+    }
+
+    static func instantiateResourcesListViewController() -> ResourcesListViewController {
+        return instantiate(identifier: "ResourcesList")
+    }
+
+    static func instantiateSwiftUIOrUIKitSelectionViewController() -> SwiftUIOrUIKitSelectionViewController {
+        return instantiate(identifier: "SwiftOrUIKit")
+    }
+
+    private static func instantiate<VC: UIViewController>(identifier: String) -> VC {
+        // swiftlint:disable:next force_cast
+        storyboard.instantiateViewController(withIdentifier: identifier) as! VC
+    }
+}
diff --git a/example/ios/Demo/Helpers/UICollectionView+Typed.swift b/example/ios/Demo/Helpers/UICollectionView+Typed.swift
new file mode 100644
index 000000000..218be9f7a
--- /dev/null
+++ b/example/ios/Demo/Helpers/UICollectionView+Typed.swift
@@ -0,0 +1,32 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+
+extension UICollectionView {
+
+    func dequeueTypedReusableCell<TypedCell: UICollectionViewCell>(
+        withReuseIdentifier identifier: String,
+        for indexPath: IndexPath,
+        asType: (TypedCell) -> Void
+    ) -> UICollectionViewCell {
+        let cell = dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath)
+        if let typedCell = cell as? TypedCell {
+            asType(typedCell)
+        }
+        return cell
+    }
+}
diff --git a/example/ios/Demo/Helpers/UIControl+Closure.swift b/example/ios/Demo/Helpers/UIControl+Closure.swift
index de3718ea9..ae2512e08 100644
--- a/example/ios/Demo/Helpers/UIControl+Closure.swift
+++ b/example/ios/Demo/Helpers/UIControl+Closure.swift
@@ -18,9 +18,9 @@
 import UIKit
 
 @objc class UIControlClosure: NSObject {
-    let closure: ()->()
+    let closure: () -> Void
 
-    init (_ closure: @escaping ()->()) {
+    init (_ closure: @escaping () -> Void) {
         self.closure = closure
     }
 
@@ -30,9 +30,9 @@ import UIKit
 }
 
 extension UIControl {
-    func addAction(for controlEvents: UIControl.Event = .touchUpInside, _ closure: @escaping ()->()) {
+    func addAction(for controlEvents: UIControl.Event = .touchUpInside, _ closure: @escaping () -> Void) {
         let sleeve = UIControlClosure(closure)
         addTarget(sleeve, action: #selector(UIControlClosure.invoke), for: controlEvents)
-        objc_setAssociatedObject(self, "[\(arc4random())]", sleeve, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
+        objc_setAssociatedObject(self, "[\(UInt32.random(in: UInt32.min..<UInt32.max))]", sleeve, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
     }
 }
diff --git a/example/ios/Demo/Helpers/UITableView+Typed.swift b/example/ios/Demo/Helpers/UITableView+Typed.swift
new file mode 100644
index 000000000..6c372c6ef
--- /dev/null
+++ b/example/ios/Demo/Helpers/UITableView+Typed.swift
@@ -0,0 +1,32 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+
+extension UITableView {
+
+    func dequeueTypedReusableCell<TypedCell: UITableViewCell>(
+        withIdentifier identifier: String,
+        for indexPath: IndexPath,
+        asType: (TypedCell) -> Void
+    ) -> UITableViewCell {
+        let cell = dequeueReusableCell(withIdentifier: identifier, for: indexPath)
+        if let typedCell = cell as? TypedCell {
+            asType(typedCell)
+        }
+        return cell
+    }
+}
diff --git a/example/ios/Demo/Info/InfoViewController.swift b/example/ios/Demo/Info/InfoViewController.swift
index a2f18dc06..be86798dc 100644
--- a/example/ios/Demo/Info/InfoViewController.swift
+++ b/example/ios/Demo/Info/InfoViewController.swift
@@ -19,7 +19,7 @@ import UIKit
 import MessageUI
 import KalugaExampleShared
 
-class InfoViewController : UITableViewController {
+class InfoViewController: UITableViewController {
 
     private lazy var navigator = InfoNavigatorKt.InfoNavigator(
         parent: self,
@@ -29,23 +29,31 @@ class InfoViewController : UITableViewController {
                 presentationStyle: Int64(UIModalPresentationStyle.automatic.rawValue),
                 transitionStyle: Int64(UIModalTransitionStyle.coverVertical.rawValue)
             ) {
-                    let alert = UIAlertController.init(title: dialogSpec.title, message: dialogSpec.message, preferredStyle: .alert)
-                    alert.addAction(UIAlertAction(title: "OK", style: .default))
-                    return alert
-                }
+                let alert = UIAlertController.init(title: dialogSpec.title, message: dialogSpec.message, preferredStyle: .alert)
+                alert.addAction(UIAlertAction(title: "OK", style: .default))
+                return alert
+            }
         },
         onLink: { link in NavigationSpec.Browser(url: URL(string: link)!, viewType: NavigationSpec.BrowserTypeNormal()) },
         onMailSpec: { mailSpec in
-            let settings = NavigationSpec.Email.EmailEmailSettings(type: NavigationSpec.EmailTypePlain(), to: mailSpec.to, cc: [], bcc: [], subject: mailSpec.subject, body: nil, attachments: [])
+            let settings = NavigationSpec.Email.EmailEmailSettings(
+                type: NavigationSpec.EmailTypePlain(),
+                to: mailSpec.to,
+                cc: [],
+                bcc: [],
+                subject: mailSpec.subject,
+                body: nil,
+                attachments: []
+            )
             return NavigationSpec.Email(emailSettings: settings, delegate: nil, animated: true)
         }
     )
-    private lazy var viewModel: InfoViewModel = InfoViewModel(
+    private lazy var viewModel = InfoViewModel(
         reviewManagerBuilder: ReviewManager.Builder(),
         navigator: navigator)
 
     private var buttons = [String]()
-    private var onSelected: ((Int) -> Void)? = nil
+    private var onSelected: ((Int) -> Void)?
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -81,24 +89,22 @@ class InfoViewController : UITableViewController {
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: InfoButtonCell.Const.identifier, for: indexPath) as! InfoButtonCell
-        cell.label.text = buttons[indexPath.row]
-        return cell
+        return tableView.dequeueTypedReusableCell(withIdentifier: InfoButtonCell.Const.identifier, for: indexPath) { (cell: InfoButtonCell) in
+            cell.label.text = buttons[indexPath.row]
+        }
     }
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(indexPath.row)
+        _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
-    
 }
 
-class InfoButtonCell : UITableViewCell {
+class InfoButtonCell: UITableViewCell {
     
-    struct Const {
+    enum Const {
         static let identifier = "InfoButtonCell"
     }
     
     @IBOutlet weak var label: UILabel!
-    
 }
diff --git a/example/ios/Demo/KeyboardManager/KeyboardManagerView.swift b/example/ios/Demo/KeyboardManager/KeyboardManagerView.swift
index 980e8b69a..0774cdc8c 100644
--- a/example/ios/Demo/KeyboardManager/KeyboardManagerView.swift
+++ b/example/ios/Demo/KeyboardManager/KeyboardManagerView.swift
@@ -19,7 +19,7 @@ import KalugaExampleShared
 
 struct KeyboardManagerView: View {
 
-    enum Field : String, Hashable {
+    enum Field: String, Hashable {
         case textField
     }
 
@@ -31,7 +31,7 @@ struct KeyboardManagerView: View {
     init() {
         let keyboardManagerBuilder = SwiftUIKeyboardManagerBuilder<Field>()
         self.keyboardManagerBuilder = keyboardManagerBuilder
-        let viewModel = KeyboardViewModel(keyboardManagerBuilder: keyboardManagerBuilder, editFieldFocusHandler: SwiftUIFocusHandler(value: Field.textField))
+        let viewModel = KeyboardViewModel(keyboardManagerBuilder: keyboardManagerBuilder, editFieldFocusHandler: swiftUIFocusHandler(value: Field.textField))
         lifecycleViewModel = LifecycleViewModel(viewModel)
     }
 
@@ -48,8 +48,15 @@ struct KeyboardManagerView: View {
                     buttonFrame: .frame(maxWidth: .infinity)
                 )
                 Spacer()
-            }.padding(10.0)
-                .navigationTitle(Text("feature_keyboard".localized())).bindKeyboardManager(keyboardManagerBuilder: keyboardManagerBuilder, focusState: _focusedField.projectedValue)
+            }
+            .padding(10.0)
+            .navigationTitle(
+                Text("feature_keyboard".localized())
+            )
+            .bindKeyboardManager(
+                keyboardManagerBuilder: keyboardManagerBuilder,
+                focusState: _focusedField.projectedValue
+            )
         }
     }
 }
@@ -59,7 +66,3 @@ struct KeyboardManagerView_Previews: PreviewProvider {
         KeyboardManagerView()
     }
 }
-
-
-
-
diff --git a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
index 1c74f8ddd..c9e4d4d2f 100644
--- a/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
+++ b/example/ios/Demo/KeyboardManager/KeyboardManagerViewController.swift
@@ -18,25 +18,19 @@
 import UIKit
 import KalugaExampleShared
 
-class KeyboardManagerViewController : UIViewController {
-
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "KeyboardManagerViewController"
-    }
-
-    static func instantiate() -> KeyboardManagerViewController {
-        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! KeyboardManagerViewController
-    }
+class KeyboardManagerViewController: UIViewController {
     
     @IBOutlet private var editField: UITextField!
     @IBOutlet private var showButton: UIButton!
     @IBOutlet private var hideButton: UIButton!
     
     private lazy var editFieldFocusHandler = {
-        return UIKitFocusHandler(view: self.editField)
+        UIKitFocusHandler(view: self.editField)
     }()
-    lazy var viewModel = KeyboardViewModel(keyboardManagerBuilder: UIKitKeyboardManager.Builder(application: UIApplication.shared), editFieldFocusHandler: editFieldFocusHandler)
+    lazy var viewModel = KeyboardViewModel(
+        keyboardManagerBuilder: UIKitKeyboardManager.Builder(application: UIApplication.shared),
+        editFieldFocusHandler: editFieldFocusHandler
+    )
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -48,7 +42,7 @@ class KeyboardManagerViewController : UIViewController {
 
         title = "feature_keyboard".localized()
 
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [] }
         ButtonStyleKt.bindButton(showButton, button: viewModel.showButton)
         ButtonStyleKt.bindButton(hideButton, button: viewModel.hideButton)
     }
diff --git a/example/ios/Demo/Links/LinksViewController.swift b/example/ios/Demo/Links/LinksViewController.swift
index ccd6e55bd..14099c0d0 100644
--- a/example/ios/Demo/Links/LinksViewController.swift
+++ b/example/ios/Demo/Links/LinksViewController.swift
@@ -19,13 +19,17 @@ import Foundation
 import UIKit
 import KalugaExampleShared
 
-class LinksViewController : UIViewController {
+class LinksViewController: UIViewController {
     
     @IBOutlet weak var browserButton: UIButton!
     @IBOutlet weak var instructionsText: UILabel!
 
     private lazy var navigator: ViewControllerNavigator<BrowserNavigationActions<AnyObject>> = BrowserNavigatorKt.BrowserNavigator(parent: self)
-    private lazy var viewModel: LinksViewModel = LinksViewModel(linkRepoBuilder: LinksLinksBuilder(), builder: AlertPresenter.Builder(viewController: self), navigator: navigator)
+    private lazy var viewModel = LinksViewModel(
+        linkRepoBuilder: LinksLinksBuilder(),
+        builder: AlertPresenter.Builder(viewController: self),
+        navigator: navigator
+    )
     private var lifecycleManager: LifecycleManager!
 
     deinit {
diff --git a/example/ios/Demo/LoadingIndicator/LoadingView.swift b/example/ios/Demo/LoadingIndicator/LoadingView.swift
index 69abe4dff..9fc31189b 100644
--- a/example/ios/Demo/LoadingIndicator/LoadingView.swift
+++ b/example/ios/Demo/LoadingIndicator/LoadingView.swift
@@ -38,8 +38,9 @@ struct LoadingView: View {
                 )
                 Spacer()
             }
-        }.padding(10.0)
-            .navigationTitle(Text("feature_hud".localized()))
+        }
+        .padding(10.0)
+        .navigationTitle(Text("feature_hud".localized()))
     }
 }
 
diff --git a/example/ios/Demo/LoadingIndicator/LoadingViewController.swift b/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
index 14f76d58e..067f44952 100644
--- a/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
+++ b/example/ios/Demo/LoadingIndicator/LoadingViewController.swift
@@ -20,15 +20,6 @@ import KalugaExampleShared
 
 class LoadingViewController: UIViewController {
 
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "LoadingView"
-    }
-
-    static func instantiate() -> LoadingViewController {
-        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! LoadingViewController
-    }
-
     @IBOutlet private var systemButton: UIButton!
     @IBOutlet private var customButton: UIButton!
 
@@ -44,7 +35,7 @@ class LoadingViewController: UIViewController {
 
         title = "feature_hud".localized()
 
-        lifecycleManager = viewModel.addLifecycleManager(parent: self) { return [] }
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [] }
         ButtonStyleKt.bindButton(systemButton, button: viewModel.showSystemButton)
         ButtonStyleKt.bindButton(customButton, button: viewModel.showCustomButton)
     }
diff --git a/example/ios/Demo/Location/LocationViewController.swift b/example/ios/Demo/Location/LocationViewController.swift
index 6e682748a..f38a10c2a 100644
--- a/example/ios/Demo/Location/LocationViewController.swift
+++ b/example/ios/Demo/Location/LocationViewController.swift
@@ -22,11 +22,11 @@ import KalugaExampleShared
 
 class LocationViewController: UIViewController {
 
-    struct Const {
+    enum Const {
         static let permission = LocationPermission(background: false, precise: true)
     }
     
-    //MARK: Properties
+    // MARK: Properties
     
     @IBOutlet weak var label: UILabel!
     
@@ -47,7 +47,7 @@ class LocationViewController: UIViewController {
                 return []
             }
             return [
-                viewModel.location.observe { (location) in
+                viewModel.location.observe { location in
                     self?.label.text = location as? String ?? ""
                 }
             ]
diff --git a/example/ios/Demo/Permissions/PermissionListViewController.swift b/example/ios/Demo/Permissions/PermissionListViewController.swift
index 5c08a8ddc..ec2866450 100644
--- a/example/ios/Demo/Permissions/PermissionListViewController.swift
+++ b/example/ios/Demo/Permissions/PermissionListViewController.swift
@@ -18,7 +18,7 @@
 import UIKit
 import KalugaExampleShared
 
-class PermissionListViewController : UITableViewController {
+class PermissionListViewController: UITableViewController {
 
     private lazy var navigator: ViewControllerNavigator<PermissionsListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
         NavigationSpec.Push(animated: true) {
@@ -29,11 +29,11 @@ class PermissionListViewController : UITableViewController {
             return PermissionViewController.create(permission: permission)
         }
     }
-    private lazy var viewModel: PermissionsListViewModel = PermissionsListViewModel(navigator: navigator)
+    private lazy var viewModel = PermissionsListViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     private var permissions = [PermissionView]()
-    private var onSelected: ((Int) -> Void)? = nil
+    private var onSelected: ((Int) -> Void)?
 
     deinit {
         lifecycleManager.unbind()
@@ -66,24 +66,22 @@ class PermissionListViewController : UITableViewController {
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: PermissionsListCell.Const.identifier, for: indexPath) as! PermissionsListCell
-        cell.label.text = permissions[indexPath.row].title
-        return cell
+        return tableView.dequeueTypedReusableCell(withIdentifier: PermissionsListCell.Const.identifier, for: indexPath) { (cell: PermissionsListCell) in
+            cell.label.text = permissions[indexPath.row].title
+        }
     }
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(indexPath.row)
+        _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
-    
 }
 
-class PermissionsListCell : UITableViewCell {
+class PermissionsListCell: UITableViewCell {
     
-    struct Const {
+    enum Const {
         static let identifier = "PermissionsListCell"
     }
     
     @IBOutlet weak var label: UILabel!
-    
 }
diff --git a/example/ios/Demo/Permissions/PermissionViewController.swift b/example/ios/Demo/Permissions/PermissionViewController.swift
index 10ec6992f..46b63ff36 100644
--- a/example/ios/Demo/Permissions/PermissionViewController.swift
+++ b/example/ios/Demo/Permissions/PermissionViewController.swift
@@ -21,15 +21,10 @@ import KalugaExampleShared
 
 class PermissionViewController: UIViewController {
     
-    private struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let permissionVc = "Permission"
-    }
-    
     static func create(permission: Permission) -> PermissionViewController {
-        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.permissionVc) as! PermissionViewController
-        vc.viewModel = PermissionViewModel(permission: permission)
-        return vc
+        let viewController = MainStoryboard.instantiatePermissionViewController()
+        viewController.viewModel = PermissionViewModel(permission: permission)
+        return viewController
     }
     
     @IBOutlet weak var permissionStateLabel: UILabel!
@@ -58,7 +53,6 @@ class PermissionViewController: UIViewController {
             return [
                 viewModel.permissionStateMessage.observe { message in
                     self?.permissionStateLabel.text = NSLocalizedString(message as? String ?? "", comment: "")
-
                 },
 
                 viewModel.requestMessage.observe { optionalMessage in
@@ -69,19 +63,16 @@ class PermissionViewController: UIViewController {
                     let alert = UIAlertController(title: "permission_request".localized(), message: message, preferredStyle: .alert)
                     alert.addAction(UIAlertAction(title: "OK".localized(), style: .default, handler: nil))
                     self?.present(alert, animated: true, completion: nil)
-
                 },
 
                 viewModel.showPermissionButton.observe { show in
                     self?.requestPermissionButton.isHidden = !(show as? Bool ?? false)
-                    }
+                }
             ]
         }
     }
 
-
     @IBAction func requestPermission(sender: Any?) {
         viewModel.requestPermission()
     }
-
 }
diff --git a/example/ios/Demo/Resources/ButtonViewController.swift b/example/ios/Demo/Resources/ButtonViewController.swift
index c5f12c461..cda3681f5 100644
--- a/example/ios/Demo/Resources/ButtonViewController.swift
+++ b/example/ios/Demo/Resources/ButtonViewController.swift
@@ -17,9 +17,12 @@
 import UIKit
 import KalugaExampleShared
 
-class ButtonViewController : UITableViewController {
+class ButtonViewController: UITableViewController {
     
-    private lazy var viewModel: ButtonViewModel = ButtonViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider(), alertPresenterBuilder: AlertPresenter.Builder(viewController: self))
+    private lazy var viewModel = ButtonViewModel(
+        styledStringBuilderProvider: StyledStringBuilder.Provider(),
+        alertPresenterBuilder: AlertPresenter.Builder(viewController: self)
+    )
     private var lifecycleManager: LifecycleManager!
 
     private var buttons = [KalugaButton]()
@@ -54,18 +57,17 @@ class ButtonViewController : UITableViewController {
     }
     
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: ButtonListCell.Const.identifier, for: indexPath) as! ButtonListCell
-        ButtonStyleKt.bindButton(cell.button, button: buttons[indexPath.row])
-        return cell
+        return tableView.dequeueTypedReusableCell(withIdentifier: ButtonListCell.Const.identifier, for: indexPath) { (cell: ButtonListCell) in
+            ButtonStyleKt.bindButton(cell.button, button: buttons[indexPath.row])
+        }
     }
 }
 
-class ButtonListCell : UITableViewCell {
+class ButtonListCell: UITableViewCell {
     
-    struct Const {
+    enum Const {
         static let identifier = "ButtonListCell"
     }
     
     @IBOutlet weak var button: UIButton!
-    
 }
diff --git a/example/ios/Demo/Resources/ColorView.swift b/example/ios/Demo/Resources/ColorView.swift
index cabd609f9..17df650b9 100644
--- a/example/ios/Demo/Resources/ColorView.swift
+++ b/example/ios/Demo/Resources/ColorView.swift
@@ -56,7 +56,6 @@ struct ColorView: View, Equatable {
         darkenedBlended = ListObservable(viewModel.darkenBlended)
         lightenedSource = ListObservable(viewModel.lightenSource)
         darkenedSource = ListObservable(viewModel.darkenSource)
-
     }
 
     var body: some View {
@@ -113,7 +112,8 @@ struct ColorView: View, Equatable {
                         }
                     }
                 )
-            }.onDisappear {
+            }
+            .onDisappear {
                 disposeBag.dispose()
             }
         }
diff --git a/example/ios/Demo/Resources/ColorViewController.swift b/example/ios/Demo/Resources/ColorViewController.swift
index eb88122fe..2bc7e16a7 100644
--- a/example/ios/Demo/Resources/ColorViewController.swift
+++ b/example/ios/Demo/Resources/ColorViewController.swift
@@ -17,7 +17,7 @@
 import UIKit
 import KalugaExampleShared
 
-class ColorViewController : UIViewController {
+class ColorViewController: UIViewController {
     
     @IBOutlet var backdropColorBackground: UIView!
     @IBOutlet var sourceColorBackground: UIView!
@@ -43,7 +43,7 @@ class ColorViewController : UIViewController {
     private var blendedLightenedColors: [KalugaBackgroundStyle] = []
     private var blendedDarkenedColors: [KalugaBackgroundStyle] = []
     
-    private lazy var viewModel: ColorViewModel = ColorViewModel(alertPresenterBuilder: AlertPresenter.Builder(viewController: self))
+    private lazy var viewModel = ColorViewModel(alertPresenterBuilder: AlertPresenter.Builder(viewController: self))
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -96,29 +96,29 @@ class ColorViewController : UIViewController {
                     ButtonStyleKt.bindButton(blendModeButton, button: buttonStyle)
                 },
                 viewModel.lightenBackdrops.observe { next in
-                    self?.backdropLightenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
+                    self?.backdropLightenedColors = next?.compactMap { $0 as? KalugaBackgroundStyle } ?? []
                     self?.backdropLightenedColorsCollectionView?.reloadData()
                 },
                 viewModel.darkenBackdrops.observe { next in
-                    self?.backdropDarkenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
+                    self?.backdropDarkenedColors = next?.compactMap { $0 as? KalugaBackgroundStyle } ?? []
                     self?.backdropDarkenedColorsCollectionView?.reloadData()
                 },
                 viewModel.lightenSource.observe { next in
-                    self?.sourceLightenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
+                    self?.sourceLightenedColors = next?.compactMap { $0 as? KalugaBackgroundStyle } ?? []
                     self?.sourceLightenedColorsCollectionView?.reloadData()
                 },
                 viewModel.darkenSource.observe { next in
-                    self?.sourceDarkenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
+                    self?.sourceDarkenedColors = next?.compactMap { $0 as? KalugaBackgroundStyle } ?? []
                     self?.sourceDarkenedColorsCollectionView?.reloadData()
                 },
                 viewModel.lightenBlended.observe { next in
-                    self?.blendedLightenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
+                    self?.blendedLightenedColors = next?.compactMap { $0 as? KalugaBackgroundStyle } ?? []
                     self?.blendedLightenedColorsCollectionView?.reloadData()
                 },
                 viewModel.darkenBlended.observe { next in
-                    self?.blendedDarkenedColors = next?.compactMap({ $0 as? KalugaBackgroundStyle }) ?? []
+                    self?.blendedDarkenedColors = next?.compactMap { $0 as? KalugaBackgroundStyle } ?? []
                     self?.blendedDarkenedColorsCollectionView?.reloadData()
-                },
+                }
             ]
         }
         
@@ -126,7 +126,7 @@ class ColorViewController : UIViewController {
     }
 }
 
-extension ColorViewController : UITextFieldDelegate {
+extension ColorViewController: UITextFieldDelegate {
     func textFieldDidEndEditing(_ textField: UITextField) {
         if textField == backdropInputField {
             viewModel.submitBackdropText(backdropText: textField.text ?? "")
@@ -137,7 +137,7 @@ extension ColorViewController : UITextFieldDelegate {
     }
 }
 
-extension ColorViewController : UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
+extension ColorViewController: UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
     
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         if collectionView == backdropLightenedColorsCollectionView {
@@ -166,32 +166,35 @@ extension ColorViewController : UICollectionViewDataSource, UICollectionViewDele
     }
     
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: ColorCollectionCellView.Const.identifier, for: indexPath) as! ColorCollectionCellView
-        if collectionView == backdropLightenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: backdropLightenedColors[indexPath.row])
-        }
-        if collectionView == backdropDarkenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: backdropDarkenedColors[indexPath.row])
-        }
-        if collectionView == sourceLightenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: sourceLightenedColors[indexPath.row])
-        }
-        if collectionView == sourceDarkenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: sourceDarkenedColors[indexPath.row])
-        }
-        if collectionView == blendedLightenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: blendedLightenedColors[indexPath.row])
-        }
-        if collectionView == blendedDarkenedColorsCollectionView {
-            BackgroundStyleKt.applyBackgroundStyle(cell, style: blendedDarkenedColors[indexPath.row])
+        return collectionView.dequeueTypedReusableCell(
+            withReuseIdentifier: ColorCollectionCellView.Const.identifier,
+            for: indexPath
+        ) { (cell: ColorCollectionCellView) in
+            if collectionView == backdropLightenedColorsCollectionView {
+                BackgroundStyleKt.applyBackgroundStyle(cell, style: backdropLightenedColors[indexPath.row])
+            }
+            if collectionView == backdropDarkenedColorsCollectionView {
+                BackgroundStyleKt.applyBackgroundStyle(cell, style: backdropDarkenedColors[indexPath.row])
+            }
+            if collectionView == sourceLightenedColorsCollectionView {
+                BackgroundStyleKt.applyBackgroundStyle(cell, style: sourceLightenedColors[indexPath.row])
+            }
+            if collectionView == sourceDarkenedColorsCollectionView {
+                BackgroundStyleKt.applyBackgroundStyle(cell, style: sourceDarkenedColors[indexPath.row])
+            }
+            if collectionView == blendedLightenedColorsCollectionView {
+                BackgroundStyleKt.applyBackgroundStyle(cell, style: blendedLightenedColors[indexPath.row])
+            }
+            if collectionView == blendedDarkenedColorsCollectionView {
+                BackgroundStyleKt.applyBackgroundStyle(cell, style: blendedDarkenedColors[indexPath.row])
+            }
         }
-        return cell
     }
 }
 
-class ColorCollectionCellView : UICollectionViewCell {
+class ColorCollectionCellView: UICollectionViewCell {
     
-    struct Const {
+    enum Const {
         static let identifier = "ColorCollectionCellView"
     }
     
diff --git a/example/ios/Demo/Resources/LabelViewController.swift b/example/ios/Demo/Resources/LabelViewController.swift
index cb00c9a47..a26f0dac9 100644
--- a/example/ios/Demo/Resources/LabelViewController.swift
+++ b/example/ios/Demo/Resources/LabelViewController.swift
@@ -17,9 +17,9 @@
 import UIKit
 import KalugaExampleShared
 
-class LabelViewController : UITableViewController {
+class LabelViewController: UITableViewController {
 
-    private var viewModel: LabelViewModel = LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider())
+    private var viewModel = LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider())
     private var lifecycleManager: LifecycleManager!
 
     private var labels = [KalugaLabel]()
@@ -54,18 +54,17 @@ class LabelViewController : UITableViewController {
     }
     
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: LabelListCell.Const.identifier, for: indexPath) as! LabelListCell
-        TextStyleKt.bindLabel(cell.label, label: labels[indexPath.row])
-        return cell
+        return tableView.dequeueTypedReusableCell(withIdentifier: LabelListCell.Const.identifier, for: indexPath) { (cell: LabelListCell) in
+            TextStyleKt.bindLabel(cell.label, label: labels[indexPath.row])
+        }
     }
 }
 
-class LabelListCell : UITableViewCell {
+class LabelListCell: UITableViewCell {
     
-    struct Const {
+    enum Const {
         static let identifier = "LabelListCell"
     }
     
     @IBOutlet weak var label: UILabel!
-    
 }
diff --git a/example/ios/Demo/Resources/ResourcesListView.swift b/example/ios/Demo/Resources/ResourcesListView.swift
index 1958b785b..239c416e7 100644
--- a/example/ios/Demo/Resources/ResourcesListView.swift
+++ b/example/ios/Demo/Resources/ResourcesListView.swift
@@ -60,7 +60,7 @@ struct ResourcesListView: View {
 }
 
 extension ResourcesListView {
-    enum Route : Equatable {
+    enum Route: Equatable {
         case buttons
         case labels
         case colors
@@ -68,7 +68,7 @@ extension ResourcesListView {
 
     class Router {
 
-        var nextRouter: ObjectRoutingState<Route>? = nil
+        var nextRouter: ObjectRoutingState<Route>?
         lazy var defaultNavigator: DefaultNavigator<ResourcesListNavigationAction> = DefaultNavigator { [weak self] action in
             self?.nextRouter?.show(action.route)
         }
diff --git a/example/ios/Demo/Resources/ResourcesListViewController.swift b/example/ios/Demo/Resources/ResourcesListViewController.swift
index c99b17e1d..dd17a9f0d 100644
--- a/example/ios/Demo/Resources/ResourcesListViewController.swift
+++ b/example/ios/Demo/Resources/ResourcesListViewController.swift
@@ -17,26 +17,17 @@
 import UIKit
 import KalugaExampleShared
 
-class ResourcesListViewController : UITableViewController {
-
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "ResourcesList"
-    }
-
-    static func instantiate() -> ResourcesListViewController {
-        Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! ResourcesListViewController
-    }
+class ResourcesListViewController: UITableViewController {
 
     private lazy var navigator: ViewControllerNavigator<ResourcesListNavigationAction> = ViewControllerNavigator(parentVC: self) { action in
         NavigationSpec.Segue(identifier: action.segueKey)
     }
     
-    private lazy var viewModel: ResourcesListViewModel = ResourcesListViewModel(navigator: navigator)
+    private lazy var viewModel = ResourcesListViewModel(navigator: navigator)
     private var lifecycleManager: LifecycleManager!
 
     private var resources = [String]()
-    private var onSelected: ((Int) -> Void)? = nil
+    private var onSelected: ((Int) -> Void)?
 
     deinit {
         lifecycleManager.unbind()
@@ -52,8 +43,12 @@ class ResourcesListViewController : UITableViewController {
             return [
                 viewModel.resources.observeInitialized { next in
                     let resources = next ?? []
-                    self?.resources = resources.map { ($0 as! Resource).title }
-                    self?.onSelected = { (index: Int) in viewModel.onResourceSelected(resource: resources[index] as! Resource) }
+                    self?.resources = resources.map { ($0 as? Resource)?.title ?? "" }
+                    self?.onSelected = { (index: Int) in
+                        if let resource = resources[index] as? Resource {
+                            viewModel.onResourceSelected(resource: resource)
+                        }
+                    }
                     self?.tableView.reloadData()
                 }
             ]
@@ -69,37 +64,33 @@ class ResourcesListViewController : UITableViewController {
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: ResourcesListCell.Const.identifier, for: indexPath) as! ResourcesListCell
-        cell.label.text = resources[indexPath.row]
-        return cell
+        return tableView.dequeueTypedReusableCell(withIdentifier: ResourcesListCell.Const.identifier, for: indexPath) { (cell: ResourcesListCell) in
+            cell.label.text = resources[indexPath.row]
+        }
     }
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(indexPath.row)
+        _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
-    
 }
 
-class ResourcesListCell : UITableViewCell {
+class ResourcesListCell: UITableViewCell {
     
-    struct Const {
+    enum Const {
         static let identifier = "ResourcesListCell"
     }
     
     @IBOutlet weak var label: UILabel!
-    
 }
 
 private extension ResourcesListNavigationAction {
     var segueKey: String {
-        get {
-            switch self {
-            case is ResourcesListNavigationAction.Button: return "showButton"
-            case is ResourcesListNavigationAction.Color: return "showColor"
-            case is ResourcesListNavigationAction.Label: return "showLabel"
-            default: return ""
-            }
+        switch self {
+        case is ResourcesListNavigationAction.Button: return "showButton"
+        case is ResourcesListNavigationAction.Color: return "showColor"
+        case is ResourcesListNavigationAction.Label: return "showLabel"
+        default: return ""
         }
     }
 }
diff --git a/example/ios/Demo/System/Network/NetworkViewController.swift b/example/ios/Demo/System/Network/NetworkViewController.swift
index c874dfc59..0ee8a9d03 100644
--- a/example/ios/Demo/System/Network/NetworkViewController.swift
+++ b/example/ios/Demo/System/Network/NetworkViewController.swift
@@ -19,12 +19,12 @@ import Foundation
 import UIKit
 import KalugaExampleShared
 
-class NetworkViewController : UIViewController {
+class NetworkViewController: UIViewController {
 
     @IBOutlet weak var networkStateText: UILabel!
     private var lifecycleManager: LifecycleManager!
     
-    private lazy var viewModel: NetworkViewModel = NetworkViewModel(networkStateRepoBuilder: NetworkStateRepoBuilder())
+    private lazy var viewModel = NetworkViewModel(networkStateRepoBuilder: NetworkStateRepoBuilder())
     
     deinit {
         lifecycleManager.unbind()
@@ -45,5 +45,4 @@ class NetworkViewController : UIViewController {
             ]
         }
     }
-    
 }
diff --git a/example/ios/Demo/System/SystemViewController.swift b/example/ios/Demo/System/SystemViewController.swift
index 9bb3c7565..39d349771 100644
--- a/example/ios/Demo/System/SystemViewController.swift
+++ b/example/ios/Demo/System/SystemViewController.swift
@@ -19,7 +19,7 @@ import Foundation
 import UIKit
 import KalugaExampleShared
 
-class SystemViewController : UITableViewController {
+class SystemViewController: UITableViewController {
 
     private lazy var navigator: ViewControllerNavigator<SystemNavigationActions> = ViewControllerNavigator(parentVC: self) { action in
         switch action {
@@ -27,10 +27,10 @@ class SystemViewController : UITableViewController {
         default: return NavigationSpec.Segue(identifier: "")
         }
     }
-    private lazy var viewModel: SystemViewModel = SystemViewModel(navigator: navigator)
+    private lazy var viewModel = SystemViewModel(navigator: navigator)
 
     private var systemFeatures = [String]()
-    private var onSystemFeatureTapped: ((Int) -> Void)? = nil
+    private var onSystemFeatureTapped: ((Int) -> Void)?
     private var lifecycleManager: LifecycleManager!
 
     deinit {
@@ -49,7 +49,7 @@ class SystemViewController : UITableViewController {
             return [
                 viewModel.systemFeatures.observeInitialized { next in
                     let systemFeatures = next?.compactMap { $0 as? SystemFeatures } ?? []
-                    self?.systemFeatures = systemFeatures.map{ $0.name }
+                    self?.systemFeatures = systemFeatures.map { $0.name }
                     self?.onSystemFeatureTapped = { (index: Int) in viewModel.onButtonTapped(systemFeatures: systemFeatures[index]) }
                     self?.tableView.reloadData()
                 }
@@ -66,24 +66,22 @@ class SystemViewController : UITableViewController {
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: SystemListCell.Const.identifier, for: indexPath) as! SystemListCell
-        cell.label.text = systemFeatures[indexPath.row]
-        return cell
+        return tableView.dequeueTypedReusableCell(withIdentifier: SystemListCell.Const.identifier, for: indexPath) { (cell: SystemListCell) in
+            cell.label.text = systemFeatures[indexPath.row]
+        }
     }
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSystemFeatureTapped?(indexPath.row)
+        _ = onSystemFeatureTapped?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
-    
 }
 
-class SystemListCell : UITableViewCell {
+class SystemListCell: UITableViewCell {
     
-    struct Const {
+    enum Const {
         static let identifier = "SystemListCell"
     }
     
     @IBOutlet weak var label: UILabel!
-    
 }
diff --git a/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift b/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift
index de189bb35..87b557def 100644
--- a/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift
+++ b/example/ios/Demo/UITypeSelection/SwiftUIOrUIKitSelectionViewController.swift
@@ -18,17 +18,12 @@ import UIKit
 import SwiftUI
 import KalugaExampleShared
 
-class SwiftUIOrUIKitSelectionViewController : UITableViewController {
-
-    struct Const {
-        static let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        static let storyboardId = "SwiftOrUIKit"
-    }
+class SwiftUIOrUIKitSelectionViewController: UITableViewController {
 
     static func create(uiKitViewController: @escaping () -> UIViewController, swiftUIView: @escaping () -> some View) -> SwiftUIOrUIKitSelectionViewController {
-        let vc = Const.storyboard.instantiateViewController(withIdentifier: Const.storyboardId) as! SwiftUIOrUIKitSelectionViewController
+        let viewController = MainStoryboard.instantiateSwiftUIOrUIKitSelectionViewController()
 
-        let navigator = ViewControllerNavigator<SwiftUIOrUIKitNavigationAction>(parentVC: vc) { action in
+        let navigator = ViewControllerNavigator<SwiftUIOrUIKitNavigationAction>(parentVC: viewController) { action in
             switch action {
             case is SwiftUIOrUIKitNavigationAction.SwiftUI: return NavigationSpec.Push(animated: true) {
                 UIHostingController(rootView: swiftUIView())
@@ -37,15 +32,15 @@ class SwiftUIOrUIKitSelectionViewController : UITableViewController {
             default: fatalError("Unknown navigation action \(action)")
             }
         }
-        vc.viewModel = SwiftUIOrUIKitSelectionViewModel(navigator: navigator)
-        return vc
+        viewController.viewModel = SwiftUIOrUIKitSelectionViewModel(navigator: navigator)
+        return viewController
     }
 
     var viewModel: SwiftUIOrUIKitSelectionViewModel!
     private var lifecycleManager: LifecycleManager!
 
     private var uiTypes = [String]()
-    private var onSelected: ((Int) -> Void)? = nil
+    private var onSelected: ((Int) -> Void)?
 
     deinit {
         lifecycleManager.unbind()
@@ -61,8 +56,12 @@ class SwiftUIOrUIKitSelectionViewController : UITableViewController {
             return [
                 viewModel.uiTypes.observeInitialized { next in
                     let uiTypes = next ?? []
-                    self?.uiTypes = uiTypes.map { ($0 as! UIType).title }
-                    self?.onSelected = { (index: Int) in viewModel.onUITypePressed(uiType: uiTypes[index] as! UIType) }
+                    self?.uiTypes = uiTypes.map { ($0 as? UIType)?.title ?? "" }
+                    self?.onSelected = { (index: Int) in
+                        if let uiType = uiTypes[index] as? UIType {
+                            viewModel.onUITypePressed(uiType: uiType)
+                        }
+                    }
                     self?.tableView.reloadData()
                 }
             ]
@@ -78,24 +77,22 @@ class SwiftUIOrUIKitSelectionViewController : UITableViewController {
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: UITypesListCell.Const.identifier, for: indexPath) as! UITypesListCell
-        cell.label.text = uiTypes[indexPath.row]
-        return cell
+        return tableView.dequeueTypedReusableCell(withIdentifier: UITypesListCell.Const.identifier, for: indexPath) { (cell: UITypesListCell) in
+            cell.label.text = uiTypes[indexPath.row]
+        }
     }
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let _ = onSelected?(indexPath.row)
+        _ = onSelected?(indexPath.row)
         tableView.deselectRow(at: indexPath, animated: true)
     }
-
 }
 
-class UITypesListCell : UITableViewCell {
+class UITypesListCell: UITableViewCell {
 
-    struct Const {
+    enum Const {
         static let identifier = "UITypesListCell"
     }
 
     @IBOutlet weak var label: UILabel!
-
 }
diff --git a/example/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift b/example/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
index 81fa29aa4..0c6b41e04 100644
--- a/example/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
+++ b/example/ios/Demo/View/FittingWidthAutomaticHeightCollectionViewFlowLayout.swift
@@ -20,20 +20,20 @@ import UIKit
 final class FittingWidthAutomaticHeightCollectionViewFlowLayout: UICollectionViewFlowLayout {
 
     override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
-        let layoutAttributesObjects = super.layoutAttributesForElements(in: rect)?.map{ $0.copy() } as? [UICollectionViewLayoutAttributes]
-        layoutAttributesObjects?.forEach({ layoutAttributes in
+        let layoutAttributesObjects = super.layoutAttributesForElements(in: rect)?.map { $0.copy() } as? [UICollectionViewLayoutAttributes]
+        layoutAttributesObjects?.forEach { layoutAttributes in
             if layoutAttributes.representedElementCategory == .cell {
                 if let newFrame = layoutAttributesForItem(at: layoutAttributes.indexPath)?.frame {
                     layoutAttributes.frame = newFrame
                 }
             }
-        })
+        }
         return layoutAttributesObjects
     }
 
     override func layoutAttributesForItem(at indexPath: IndexPath) -> UICollectionViewLayoutAttributes? {
         guard let collectionView = collectionView else {
-            fatalError()
+            fatalError("CollectionView should not be empty when being layed out")
         }
         guard let layoutAttributes = super.layoutAttributesForItem(at: indexPath)?.copy() as? UICollectionViewLayoutAttributes else {
             return nil
@@ -44,8 +44,10 @@ final class FittingWidthAutomaticHeightCollectionViewFlowLayout: UICollectionVie
         return layoutAttributes
     }
 
-    override func shouldInvalidateLayout(forPreferredLayoutAttributes preferredAttributes: UICollectionViewLayoutAttributes,
-             withOriginalAttributes originalAttributes: UICollectionViewLayoutAttributes) -> Bool {
+    override func shouldInvalidateLayout(
+        forPreferredLayoutAttributes preferredAttributes: UICollectionViewLayoutAttributes,
+        withOriginalAttributes originalAttributes: UICollectionViewLayoutAttributes
+    ) -> Bool {
         return true
     }
 }
diff --git a/example/ios/DemoTests/DemoTests.swift b/example/ios/DemoTests/DemoTests.swift
index dbe30118f..55851ad9d 100644
--- a/example/ios/DemoTests/DemoTests.swift
+++ b/example/ios/DemoTests/DemoTests.swift
@@ -42,5 +42,4 @@ class DemoTests: XCTestCase {
             // Put the code you want to measure the time of here.
         }
     }
-
 }
diff --git a/example/ios/DemoUITests/DemoUITests.swift b/example/ios/DemoUITests/DemoUITests.swift
index 85a5ce551..b354e7719 100644
--- a/example/ios/DemoUITests/DemoUITests.swift
+++ b/example/ios/DemoUITests/DemoUITests.swift
@@ -29,7 +29,8 @@ class DemoUITests: XCTestCase {
         // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method.
         XCUIApplication().launch()
 
-        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
+        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run.
+        // The setUp method is a good place to do this.
     }
 
     override func tearDown() {
@@ -40,5 +41,4 @@ class DemoUITests: XCTestCase {
         // Use recording to get started writing UI tests.
         // Use XCTAssert and related functions to verify your tests produce the correct results.
     }
-
 }
diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 5d1ad7235..9335df3ad 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 5d1ad72355fffc73fb34decbaecb3ecc35d018a5
+Subproject commit 9335df3ad4ce420e3fe74dfc9b7073f5ffce078f

From 9be1b0a6d3a8f3f697c008341681c83b5640abbc Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 3 Jan 2023 10:49:54 +0100
Subject: [PATCH 069/227] Upgrade Xcode version

---
 example/ios/Demo.xcodeproj/project.pbxproj                   | 5 +++++
 .../ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme  | 1 +
 .../Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme | 2 +-
 .../xcshareddata/xcschemes/DemoUITests.xcscheme              | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 14f609917..692b1676c 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -588,6 +588,7 @@
 		7477FD4305C126F92DB837CC /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastUpgradeCheck = 1420;
 				ORGANIZATIONNAME = "Splendo Consulting B.V.";
 				TargetAttributes = {
 					74555136E1B2BB715E50195E = {
@@ -834,6 +835,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -856,6 +858,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -956,6 +959,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -978,6 +982,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
index e9ab380d8..117f291f1 100644
--- a/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
+++ b/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+   LastUpgradeVersion = "1420"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme b/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme
index df330714c..d2d29bfb0 100644
--- a/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme
+++ b/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1420"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme b/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme
index f5b5d4dc4..17c902114 100644
--- a/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme
+++ b/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/DemoUITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1420"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

From 1c04f6ba4f333d558bab8205a4eaca30042a26c8 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 3 Jan 2023 11:47:01 +0100
Subject: [PATCH 070/227] Fix Android example not compiling

---
 .../splendo/kaluga/example/resources/compose/ColorsLayout.kt  | 4 ++--
 .../splendo/kaluga/example/resources/xml/ColorsActivity.kt    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
index efa799999..b7235ea58 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ColorsLayout.kt
@@ -48,7 +48,7 @@ import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
 import com.splendo.kaluga.resources.compose.Composable
 import com.splendo.kaluga.resources.compose.backgroundStyle
-import com.splendo.kaluga.resources.stylable.BackgroundStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import org.koin.androidx.compose.koinViewModel
 
 @Composable
@@ -141,7 +141,7 @@ fun ColorsLayout() {
 }
 
 @Composable
-fun ListOfColors(list: List<BackgroundStyle>) {
+fun ListOfColors(list: List<KalugaBackgroundStyle>) {
     Row(
         Modifier
             .fillMaxWidth()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
index 50f230366..1951fe8cb 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
@@ -75,7 +75,7 @@ class BackgroundAdapter : RecyclerView.Adapter<BackgroundAdapter.BackgroundViewH
     companion object {
         @BindingAdapter("backgroundStyles")
         @JvmStatic
-        fun bindBackgroundStyles(view: RecyclerView, backgroundStyles: List<BackgroundStyle>?) {
+        fun bindBackgroundStyles(view: RecyclerView, backgroundStyles: List<KalugaBackgroundStyle>?) {
             val adapter = (view.adapter as? BackgroundAdapter) ?: return
             adapter.backgrounds = backgroundStyles.orEmpty()
         }
@@ -85,7 +85,7 @@ class BackgroundAdapter : RecyclerView.Adapter<BackgroundAdapter.BackgroundViewH
         val view = binding.root
     }
 
-    var backgrounds: List<BackgroundStyle> = emptyList()
+    var backgrounds: List<KalugaBackgroundStyle> = emptyList()
         set(newValue) {
             field = newValue
             notifyDataSetChanged()

From 566f818aac2397f33022649a2994cb781d990222 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 3 Jan 2023 14:26:55 +0100
Subject: [PATCH 071/227] Added DateTime to the example

---
 .../kaluga/datetime/timer/RecurringTimer.kt   | 16 ++++--
 .../splendo/kaluga/datetime/timer/Timer.kt    |  2 +-
 example/android/src/main/AndroidManifest.xml  |  3 ++
 .../kaluga/example/datetime/TimerActivity.kt  | 38 ++++++++++++++
 .../featurelist/FeaturesListFragment.kt       |  2 +
 .../src/main/res/layout/activity_timer.xml    | 46 ++++++++++++++++
 .../android/src/main/res/values/strings.xml   |  1 +
 example/ios/Demo.xcodeproj/project.pbxproj    | 12 +++++
 .../ios/Demo/Base.lproj/Localizable.strings   |  1 +
 example/ios/Demo/DateTime/TimerView.swift     | 52 +++++++++++++++++++
 .../FeaturesListViewController.swift          |  4 ++
 example/shared/build.gradle.kts               |  1 +
 .../example/shared/di/DependencyInjection.kt  |  5 ++
 .../ArchitectureDetailsViewModel.kt           |  2 -
 .../viewmodel/datetime/TimerViewModel.kt      | 47 +++++++++++++++++
 .../featureList/FeatureListViewModel.kt       |  4 ++
 16 files changed, 228 insertions(+), 8 deletions(-)
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/datetime/TimerActivity.kt
 create mode 100644 example/android/src/main/res/layout/activity_timer.xml
 create mode 100644 example/ios/Demo/DateTime/TimerView.swift
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetime/TimerViewModel.kt

diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
index 9eda42346..fe8e2f99a 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
@@ -25,10 +25,10 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.time.Duration
@@ -52,7 +52,13 @@ class RecurringTimer(
     coroutineScope: CoroutineScope = MainScope()
 ) : ControllableTimer {
     private val stateRepo = TimerStateRepo(duration, interval, timeSource, delayFunction, coroutineScope)
-    override val state: StateFlow<Timer.State> = stateRepo.stateFlow
+    override val state: Flow<Timer.State> = stateRepo.stateFlow.map { state ->
+        when (state) {
+            is TimerStateRepo.State.NotRunning.Finished -> state
+            is TimerStateRepo.State.NotRunning.Paused -> state
+            is TimerStateRepo.State.Running -> state
+        }
+    }
 
     override suspend fun start() = stateRepo.start()
 
@@ -108,11 +114,11 @@ private class TimerStateRepo(
     }
 
     /** Timer state. */
-    sealed class State : KalugaState, Timer.State {
+    sealed class State : KalugaState {
         abstract val totalDuration: Duration
         /** Timer is not running. */
-        sealed class NotRunning(protected val elapsedSoFar: Duration) : State(), Timer.State.NotRunning {
-            override val elapsed = flowOf(elapsedSoFar)
+        sealed class NotRunning(protected val elapsedSoFar: Duration) : State() {
+            val elapsed = flowOf(elapsedSoFar)
             /** Timer is paused. */
             class Paused(
                 elapsedSoFar: Duration,
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
index 38ad6bb98..c16cfbf34 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
@@ -28,7 +28,7 @@ interface Timer {
     /** Timer duration. */
     val duration: Duration
     /** Current state of the timer. */
-    val state: StateFlow<State>
+    val state: Flow<State>
 
     sealed interface State {
         val elapsed: Flow<Duration>
diff --git a/example/android/src/main/AndroidManifest.xml b/example/android/src/main/AndroidManifest.xml
index 99fa7584b..7ffcecc90 100644
--- a/example/android/src/main/AndroidManifest.xml
+++ b/example/android/src/main/AndroidManifest.xml
@@ -71,6 +71,9 @@
         <activity android:name=".alerts.compose.ComposeAlertsActivity"
             android:label="@string/feature_alerts"
             android:screenOrientation="fullSensor"/>
+        <activity android:name=".datetime.TimerActivity"
+            android:label="@string/feature_date_time"
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".datetimepicker.DateTimePickerActivity"
             android:label="@string/feature_date_time_picker"
             android:screenOrientation="fullSensor"/>
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/datetime/TimerActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/datetime/TimerActivity.kt
new file mode 100644
index 000000000..69cfb4eb4
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/datetime/TimerActivity.kt
@@ -0,0 +1,38 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.datetime
+
+import android.os.Bundle
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityTimerBinding
+import com.splendo.kaluga.example.shared.viewmodel.datetime.TimerViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class TimerActivity : KalugaViewModelActivity<TimerViewModel>() {
+
+    override val viewModel: TimerViewModel by viewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityTimerBinding.inflate(layoutInflater, null, false)
+        setContentView(binding.root)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+    }
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
index c43782406..e70c2da42 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
@@ -32,6 +32,7 @@ import com.splendo.kaluga.example.beacons.BeaconsActivity
 import com.splendo.kaluga.example.bluetooth.BluetoothActivity
 import com.splendo.kaluga.example.databinding.FragmentFeaturesListBinding
 import com.splendo.kaluga.example.databinding.ViewListButtonBinding
+import com.splendo.kaluga.example.datetime.TimerActivity
 import com.splendo.kaluga.example.datetimepicker.DateTimePickerActivity
 import com.splendo.kaluga.example.keyboard.KeyboardActivity
 import com.splendo.kaluga.example.link.LinksActivity
@@ -55,6 +56,7 @@ class FeaturesListFragment : KalugaViewModelFragment<FeatureListViewModel>() {
                     FeatureListNavigationAction.Location -> NavigationSpec.Activity<LocationActivity>()
                     FeatureListNavigationAction.Permissions -> NavigationSpec.Activity<PermissionsListActivity>()
                     FeatureListNavigationAction.Alerts -> NavigationSpec.Activity<AlertsActivity>()
+                    FeatureListNavigationAction.DateTime -> NavigationSpec.Activity<TimerActivity>()
                     FeatureListNavigationAction.DateTimePicker -> NavigationSpec.Activity<DateTimePickerActivity>()
                     FeatureListNavigationAction.LoadingIndicator -> NavigationSpec.Activity<LoadingActivity>()
                     FeatureListNavigationAction.Architecture -> NavigationSpec.Activity<ArchitectureActivity>()
diff --git a/example/android/src/main/res/layout/activity_timer.xml b/example/android/src/main/res/layout/activity_timer.xml
new file mode 100644
index 000000000..ea6cc5ddd
--- /dev/null
+++ b/example/android/src/main/res/layout/activity_timer.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.datetime.TimerViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="20dp">
+
+        <TextView
+            android:id="@+id/elapsed"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:text="@{viewModel.elapsed.stateFlow}"
+            android:textSize="24sp"/>
+
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/elapsed"
+            android:layout_marginTop="10dp"
+            app:kalugaButton="@{viewModel.button.stateFlow}"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/values/strings.xml b/example/android/src/main/res/values/strings.xml
index 57804e927..4c38d697e 100644
--- a/example/android/src/main/res/values/strings.xml
+++ b/example/android/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
 
     <string name="feature_alerts">Alerts</string>
     <string name="feature_architecture">Architecture</string>
+    <string name="feature_date_time">Date Time</string>
     <string name="feature_date_time_picker">Date Time Picker</string>
     <string name="feature_bluetooth">Bluetooth</string>
     <string name="feature_hud">Loading Indicator</string>
diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 692b1676c..9a6e2e741 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -39,6 +39,7 @@
 		20BB9E74296331290096E836 /* UICollectionView+Typed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E73296331290096E836 /* UICollectionView+Typed.swift */; };
 		20BB9E76296333BE0096E836 /* UITableView+Typed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E75296333BE0096E836 /* UITableView+Typed.swift */; };
 		20BB9E7729642FEB0096E836 /* PermissionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978348A6235DF586005B140B /* PermissionViewController.swift */; };
+		20BB9E7A29645AA10096E836 /* TimerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E7929645AA10096E836 /* TimerView.swift */; };
 		20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */; };
 		20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */; };
 		20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */; };
@@ -151,6 +152,7 @@
 		20BB9E712963281D0096E836 /* MainStoryboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainStoryboard.swift; sourceTree = "<group>"; };
 		20BB9E73296331290096E836 /* UICollectionView+Typed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Typed.swift"; sourceTree = "<group>"; };
 		20BB9E75296333BE0096E836 /* UITableView+Typed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableView+Typed.swift"; sourceTree = "<group>"; };
+		20BB9E7929645AA10096E836 /* TimerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerView.swift; sourceTree = "<group>"; };
 		20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleViewController.swift; sourceTree = "<group>"; };
 		20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIControl+Closure.swift"; sourceTree = "<group>"; };
 		20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturesListViewController.swift; sourceTree = "<group>"; };
@@ -283,6 +285,14 @@
 			path = Bluetooth;
 			sourceTree = "<group>";
 		};
+		20BB9E7829645A8E0096E836 /* DateTime */ = {
+			isa = PBXGroup;
+			children = (
+				20BB9E7929645AA10096E836 /* TimerView.swift */,
+			);
+			path = DateTime;
+			sourceTree = "<group>";
+		};
 		20C7D1CD24699A5000C9A63F /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
@@ -416,6 +426,7 @@
 		746CAD9D15ECB24F4ED84E11 /* Demo */ = {
 			isa = PBXGroup;
 			children = (
+				20BB9E7829645A8E0096E836 /* DateTime */,
 				201EA2172937C2CC00C562EC /* UITypeSelection */,
 				20D8CD3526FE8FBA00D14AC9 /* Resources */,
 				648214DD263095A900CDAE05 /* Demo.entitlements */,
@@ -706,6 +717,7 @@
 				20BB9E70296323FD0096E836 /* BluetoothDescriptorView.swift in Sources */,
 				641CC0DC25CACAAD001E1CD1 /* LinksViewController.swift in Sources */,
 				2073D0F227032B5B002CB856 /* ColorViewController.swift in Sources */,
+				20BB9E7A29645AA10096E836 /* TimerView.swift in Sources */,
 				201EA2232938F11700C562EC /* ResourcesListView.swift in Sources */,
 				20524A24257BEA1E0054B57E /* DateTimePickerViewController.swift in Sources */,
 				20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */,
diff --git a/example/ios/Demo/Base.lproj/Localizable.strings b/example/ios/Demo/Base.lproj/Localizable.strings
index a93e12dac..8a89339c8 100644
--- a/example/ios/Demo/Base.lproj/Localizable.strings
+++ b/example/ios/Demo/Base.lproj/Localizable.strings
@@ -2,6 +2,7 @@
 
 "feature_alerts" = "Alerts";
 "feature_architecture" = "Architecture";
+"feature_date_time"= "Date Time";
 "feature_date_time_picker"= "Date Time Picker";
 "feature_bluetooth" = "Bluetooth";
 "feature_hud" = "Loading Indicator";
diff --git a/example/ios/Demo/DateTime/TimerView.swift b/example/ios/Demo/DateTime/TimerView.swift
new file mode 100644
index 000000000..3696b3977
--- /dev/null
+++ b/example/ios/Demo/DateTime/TimerView.swift
@@ -0,0 +1,52 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct TimerView: View {
+
+    private let lifecycleViewModel: LifecycleViewModel<TimerViewModel>
+    @ObservedObject var elapsed: StringObservable
+    @ObservedObject var button: ButtonObservable
+
+    init() {
+        let viewModel = TimerViewModel()
+
+        elapsed = StringObservable(viewModel.elapsed)
+        button = ButtonObservable(viewModel.button)
+
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        lifecycleViewModel.lifecycleView { _ in
+            VStack(alignment: .center, spacing: 10.0) {
+                Text(elapsed.value).font(.system(size: 32))
+                button.value.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                Spacer()
+            }
+            .padding(10.0)
+            .navigationTitle(Text("feature_date_time".localized()))
+        }
+    }
+}
+
+struct TimerView_Previews: PreviewProvider {
+    static var previews: some View {
+        TimerView()
+    }
+}
diff --git a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
index d41a94bde..895815817 100644
--- a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -16,6 +16,7 @@
  */
 
 import UIKit
+import SwiftUI
 import KalugaExampleShared
 import PartialSheet
 
@@ -98,6 +99,9 @@ private extension FeatureListNavigationAction {
         }
         case is FeatureListNavigationAction.Beacons: return NavigationSpec.Segue(identifier: "showBeacons")
         case is FeatureListNavigationAction.Bluetooth: return NavigationSpec.Segue(identifier: "showBluetooth")
+        case is FeatureListNavigationAction.DateTime: return NavigationSpec.Push(animated: true) {
+            UIHostingController(rootView: TimerView())
+        }
         case is FeatureListNavigationAction.DateTimePicker: return NavigationSpec.Push(animated: true) {
             SwiftUIOrUIKitSelectionViewController.create(
                 uiKitViewController: { MainStoryboard.instantiateDateTimePickerViewController() },
diff --git a/example/shared/build.gradle.kts b/example/shared/build.gradle.kts
index 65d3d59ca..b768b1362 100644
--- a/example/shared/build.gradle.kts
+++ b/example/shared/build.gradle.kts
@@ -13,6 +13,7 @@ val modules = listOf(
     "base" to false,
     "bluetooth" to false,
     "beacons" to false,
+    "date-time" to false,
     "date-time-picker" to true,
     "hud" to true,
     "keyboard" to true,
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index 4fc65982a..30535e0f8 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -41,6 +41,7 @@ import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListViewMo
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.DeviceDetails
 import com.splendo.kaluga.example.shared.viewmodel.compose.ComposeOrXMLNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.compose.ComposeOrXMLSelectionViewModel
+import com.splendo.kaluga.example.shared.viewmodel.datetime.TimerViewModel
 import com.splendo.kaluga.example.shared.viewmodel.datetimepicker.DateTimePickerViewModel
 import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewModel
@@ -126,6 +127,10 @@ internal val androidModule = module {
         AlertViewModel(AlertPresenter.Builder())
     }
 
+    viewModel {
+        TimerViewModel()
+    }
+
     viewModel {
         DateTimePickerViewModel(DateTimePickerPresenter.Builder())
     }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
index 252eac6a8..d99abd034 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/architecture/ArchitectureDetailsViewModel.kt
@@ -46,8 +46,6 @@ class ArchitectureDetailsViewModel(initialDetail: InputDetails, navigator: Navig
     private val _number = MutableStateFlow(initialDetail.number.toString())
     val number = _number.toInitializedObservable(coroutineScope)
 
-
-
     val inverseButton = KalugaButton.Plain("architecture_details_inverse".localized(), ButtonStyles.default) {
         _name.value = _name.value.reversed()
         _number.value = _number.value.reversed()
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetime/TimerViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetime/TimerViewModel.kt
new file mode 100644
index 000000000..d515feca9
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetime/TimerViewModel.kt
@@ -0,0 +1,47 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.datetime
+
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.datetime.timer.RecurringTimer
+import com.splendo.kaluga.datetime.timer.Timer
+import com.splendo.kaluga.datetime.timer.elapsed
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
+import com.splendo.kaluga.resources.view.KalugaButton
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import kotlin.time.Duration.Companion.minutes
+
+class TimerViewModel : BaseLifecycleViewModel() {
+
+    private val timer = MutableStateFlow(RecurringTimer(1.minutes, coroutineScope = coroutineScope))
+
+    val elapsed = timer.flatMapLatest { timer -> timer.elapsed().map { "${it.inWholeSeconds} s" } }.toInitializedObservable("0 s", coroutineScope)
+    val button = timer.flatMapLatest { timer ->
+        timer.state.map { state ->
+            when (state) {
+                is Timer.State.NotRunning.Paused -> KalugaButton.Plain("Start", ButtonStyles.default) { coroutineScope.launch { timer.start() } }
+                is Timer.State.NotRunning.Finished -> KalugaButton.Plain("Reset", ButtonStyles.default) { this.timer.value = RecurringTimer(1.minutes, coroutineScope = coroutineScope) }
+                is Timer.State.Running -> KalugaButton.Plain("Pause", ButtonStyles.default) { coroutineScope.launch { timer.pause() } }
+            }
+        }
+    }.toInitializedObservable<KalugaButton>(KalugaButton.Plain("", ButtonStyles.default) {}, coroutineScope)
+}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
index 08f4211b8..c32d5d382 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
@@ -27,6 +27,7 @@ sealed class FeatureListNavigationAction : NavigationAction<Nothing>(null) {
     object Location : FeatureListNavigationAction()
     object Permissions : FeatureListNavigationAction()
     object Alerts : FeatureListNavigationAction()
+    object DateTime : FeatureListNavigationAction()
     object DateTimePicker : FeatureListNavigationAction()
     object LoadingIndicator : FeatureListNavigationAction()
     object Architecture : FeatureListNavigationAction()
@@ -43,6 +44,7 @@ sealed class Feature(val title: String) {
     object Alerts : Feature("feature_alerts".localized())
     object Architecture : Feature("feature_architecture".localized())
     object Bluetooth : Feature("feature_bluetooth".localized())
+    object DateTime : Feature("feature_date_time".localized())
     object DateTimePicker : Feature("feature_date_time_picker".localized())
     object Keyboard : Feature("feature_keyboard".localized())
     object LoadingIndicator : Feature("feature_hud".localized())
@@ -62,6 +64,7 @@ class FeatureListViewModel(navigator: Navigator<FeatureListNavigationAction>) :
             Feature.Alerts,
             Feature.Architecture,
             Feature.Bluetooth,
+            Feature.DateTime,
             Feature.DateTimePicker,
             Feature.Keyboard,
             Feature.Links,
@@ -81,6 +84,7 @@ class FeatureListViewModel(navigator: Navigator<FeatureListNavigationAction>) :
                 is Feature.Alerts -> FeatureListNavigationAction.Alerts
                 is Feature.Architecture -> FeatureListNavigationAction.Architecture
                 is Feature.Bluetooth -> FeatureListNavigationAction.Bluetooth
+                is Feature.DateTime -> FeatureListNavigationAction.DateTime
                 is Feature.DateTimePicker -> FeatureListNavigationAction.DateTimePicker
                 is Feature.Keyboard -> FeatureListNavigationAction.Keyboard
                 is Feature.Links -> FeatureListNavigationAction.Links

From f401d5a323a5350474e6871963ab2977f10a6b70 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 4 Jan 2023 15:34:43 +0100
Subject: [PATCH 072/227] Adding scientific example

---
 example/android/src/main/AndroidManifest.xml  |   6 +
 .../featurelist/FeaturesListFragment.kt       |   2 +
 .../example/scientific/ScientificActivity.kt  |  53 +++++++
 .../scientific/ScientificConverterActivity.kt |  51 +++++++
 .../main/res/layout/activity_scientific.xml   | 135 +++++++++++++++++
 .../layout/activity_scientific_converter.xml  | 115 +++++++++++++++
 .../android/src/main/res/values/strings.xml   |   1 +
 .../ios/Demo/Base.lproj/Localizable.strings   |   1 +
 example/shared/build.gradle.kts               |   1 +
 .../example/shared/di/DependencyInjection.kt  |  12 ++
 .../model/scientific/QuantityDetails.kt       | 122 ++++++++++++++++
 .../converters/AccelerationConverters.kt      |  83 +++++++++++
 .../scientific/converters/ActionConverters.kt |  41 ++++++
 .../converters/AmountOfSubstanceConverters.kt |  89 ++++++++++++
 .../scientific/converters/AngleConverters.kt  |  42 ++++++
 .../AngularAccelerationConverters.kt          |  34 +++++
 .../converters/AngularVelocityConverters.kt   |  49 +++++++
 .../scientific/converters/AreaConverters.kt   |  81 +++++++++++
 .../converters/QuantityConverter.kt           |  62 ++++++++
 .../model/scientific/scientificUnitName.kt    |  64 ++++++++
 .../featureList/FeatureListViewModel.kt       |   4 +
 .../ScientificConverterViewModel.kt           | 122 ++++++++++++++++
 .../scientific/ScientificViewModel.kt         | 137 ++++++++++++++++++
 .../converter/acceleration/convertToTime.kt   |   2 +-
 24 files changed, 1308 insertions(+), 1 deletion(-)
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt
 create mode 100644 example/android/src/main/res/layout/activity_scientific.xml
 create mode 100644 example/android/src/main/res/layout/activity_scientific_converter.xml
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/scientificUnitName.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt

diff --git a/example/android/src/main/AndroidManifest.xml b/example/android/src/main/AndroidManifest.xml
index 7ffcecc90..07300891d 100644
--- a/example/android/src/main/AndroidManifest.xml
+++ b/example/android/src/main/AndroidManifest.xml
@@ -156,6 +156,12 @@
         <activity android:name=".resources.xml.ButtonActivity"
             android:label="@string/feature_resources_button"
             android:screenOrientation="fullSensor"/>
+        <activity android:name=".scientific.ScientificActivity"
+            android:label="@string/feature_scientific"
+            android:screenOrientation="fullSensor"/>
+        <activity android:name=".scientific.ScientificConverterActivity"
+            android:label="@string/feature_scientific"
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".system.SystemActivity"
             android:label="@string/feature_system"
             android:screenOrientation="fullSensor"/>
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
index e70c2da42..b2525fd0a 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
@@ -40,6 +40,7 @@ import com.splendo.kaluga.example.loading.LoadingActivity
 import com.splendo.kaluga.example.location.LocationActivity
 import com.splendo.kaluga.example.permissions.PermissionsListActivity
 import com.splendo.kaluga.example.resources.ResourcesActivity
+import com.splendo.kaluga.example.scientific.ScientificActivity
 import com.splendo.kaluga.example.shared.viewmodel.featureList.Feature
 import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.featureList.FeatureListViewModel
@@ -66,6 +67,7 @@ class FeaturesListFragment : KalugaViewModelFragment<FeatureListViewModel>() {
                     FeatureListNavigationAction.Bluetooth -> NavigationSpec.Activity<BluetoothActivity>()
                     FeatureListNavigationAction.Beacons -> NavigationSpec.Activity<BeaconsActivity>()
                     FeatureListNavigationAction.Resources -> NavigationSpec.Activity<ResourcesActivity>()
+                    FeatureListNavigationAction.Scientific -> NavigationSpec.Activity<ScientificActivity>()
                     FeatureListNavigationAction.PlatformSpecific -> throw java.lang.RuntimeException("Not supported")
                 }
             }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
new file mode 100644
index 000000000..20c8c92f8
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
@@ -0,0 +1,53 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.scientific
+
+import android.os.Bundle
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityScientificBinding
+import com.splendo.kaluga.example.resources.xml.ButtonAdapter
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificViewModel
+import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
+import com.splendo.kaluga.resources.dpToPixel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class ScientificActivity : KalugaViewModelActivity<ScientificViewModel>() {
+
+    override val viewModel: ScientificViewModel by viewModel {
+        parametersOf(
+            ActivityNavigator<ScientificConverterNavigationAction> {
+                NavigationSpec.Activity<ScientificConverterActivity>()
+            }
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityScientificBinding.inflate(layoutInflater, null, false)
+        setContentView(binding.root)
+        binding.viewModel = viewModel
+        binding.convertersList.adapter = ButtonAdapter()
+        binding.convertersList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
+        binding.lifecycleOwner = this
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt
new file mode 100644
index 000000000..53636a660
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt
@@ -0,0 +1,51 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.scientific
+
+import android.os.Bundle
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityScientificConverterBinding
+import com.splendo.kaluga.example.shared.viewmodel.scientific.CloseScientificConverterNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+class ScientificConverterActivity : KalugaViewModelActivity<ScientificConverterViewModel>() {
+
+    override val viewModel: ScientificConverterViewModel by viewModel {
+        parametersOf(
+            intent.extras!!.toTypedProperty(NavigationBundleSpecType.SerializedType(ScientificConverterViewModel.Arguments.serializer())),
+            ActivityNavigator<CloseScientificConverterNavigationAction> {
+                NavigationSpec.Close()
+            }
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityScientificConverterBinding.inflate(layoutInflater, null, false)
+        setContentView(binding.root)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+    }
+}
diff --git a/example/android/src/main/res/layout/activity_scientific.xml b/example/android/src/main/res/layout/activity_scientific.xml
new file mode 100644
index 000000000..67536ef55
--- /dev/null
+++ b/example/android/src/main/res/layout/activity_scientific.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificViewModel" />
+    </data>
+    <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="10dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/quantity_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:kalugaButton="@{viewModel.quantityDetailsButton.stateFlow}"
+                android:layout_marginBottom="10dp"/>
+
+            <TextView
+                android:id="@+id/conversion"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Convert:"
+                android:paddingVertical="10dp"
+                app:layout_constraintTop_toBottomOf="@+id/quantity_button"
+                app:layout_constraintStart_toStartOf="parent"/>
+
+            <Space
+                android:id="@+id/left_side"
+                android:layout_width="0dp"
+                android:layout_height="10dp"
+                app:layout_constraintHorizontal_weight="1"
+                app:layout_constraintTop_toBottomOf="@id/conversion"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/right_side"
+                android:layout_marginEnd="5dp"/>
+
+            <Space
+                android:id="@+id/right_side"
+                android:layout_width="0dp"
+                android:layout_height="10dp"
+                app:layout_constraintHorizontal_weight="1"
+                app:layout_constraintTop_toBottomOf="@id/conversion"
+                app:layout_constraintStart_toEndOf="@id/left_side"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginStart="5dp"/>
+
+            <EditText
+                android:id="@+id/left_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/left_side"
+                app:layout_constraintStart_toStartOf="@id/left_side"
+                app:layout_constraintEnd_toStartOf="@id/left_symbol"
+                android:text="@={viewModel.leftValue.stateFlow}"
+                app:layout_constraintHorizontal_weight="1"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/left_symbol"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:kalugaButton="@{viewModel.currentLeftUnitButton.stateFlow}"
+                app:layout_constraintBaseline_toBaselineOf="@id/left_value"
+                app:layout_constraintStart_toEndOf="@id/left_value"
+                app:layout_constraintEnd_toEndOf="@id/left_side"/>
+
+            <TextView
+                android:id="@+id/right_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@{viewModel.rightValue.stateFlow}"
+                app:layout_constraintBaseline_toBaselineOf="@id/left_value"
+                app:layout_constraintStart_toStartOf="@id/right_side"
+                app:layout_constraintEnd_toStartOf="@id/right_symbol"
+                app:layout_constraintHorizontal_weight="1"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/right_symbol"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:kalugaButton="@{viewModel.currentRightUnitButton.stateFlow}"
+                app:layout_constraintBaseline_toBaselineOf="@id/right_value"
+                app:layout_constraintStart_toEndOf="@id/right_value"
+                app:layout_constraintEnd_toEndOf="@id/right_side"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/calculate_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/left_value"
+                app:kalugaButton="@{viewModel.calculateButton}"
+                android:layout_marginTop="10dp"/>
+
+            <TextView
+                android:id="@+id/converter_separator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Converters:"
+                android:paddingVertical="10dp"
+                app:layout_constraintTop_toBottomOf="@+id/calculate_button"
+                app:layout_constraintStart_toStartOf="parent"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/converters_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/converter_separator"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                app:buttons="@{viewModel.converters.stateFlow}"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/activity_scientific_converter.xml b/example/android/src/main/res/layout/activity_scientific_converter.xml
new file mode 100644
index 000000000..b4779be74
--- /dev/null
+++ b/example/android/src/main/res/layout/activity_scientific_converter.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterViewModel" />
+    </data>
+    <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="10dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Space
+                android:id="@+id/left_side"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintHorizontal_weight="1"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/operator"/>
+
+            <TextView
+                android:id="@+id/operator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{viewModel.calculateOperatorSymbol}"
+                app:layout_constraintBaseline_toBaselineOf="@id/left_value"
+                app:layout_constraintStart_toEndOf="@id/left_side"
+                app:layout_constraintEnd_toStartOf="@id/right_side"
+                android:padding="10dp"/>
+
+            <Space
+                android:id="@+id/right_side"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintHorizontal_weight="1"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/operator"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+            <EditText
+                android:id="@+id/left_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/left_side"
+                app:layout_constraintStart_toStartOf="@id/left_side"
+                app:layout_constraintEnd_toStartOf="@id/left_symbol"
+                android:text="@={viewModel.leftValue.stateFlow}"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/left_symbol"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:kalugaButton="@{viewModel.currentLeftUnitButton.stateFlow}"
+                app:layout_constraintBaseline_toBaselineOf="@id/left_value"
+                app:layout_constraintStart_toEndOf="@id/left_value"
+                app:layout_constraintEnd_toEndOf="@id/left_side"/>
+
+            <EditText
+                android:id="@+id/right_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@={viewModel.rightValue.stateFlow}"
+                app:layout_constraintTop_toBottomOf="@id/right_side"
+                app:layout_constraintStart_toStartOf="@id/right_side"
+                app:layout_constraintEnd_toStartOf="@id/right_symbol"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/right_symbol"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:kalugaButton="@{viewModel.currentRightUnitButton.stateFlow}"
+                app:layout_constraintBaseline_toBaselineOf="@id/right_value"
+                app:layout_constraintStart_toEndOf="@id/right_value"
+                app:layout_constraintEnd_toEndOf="@id/right_side"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/calculate_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                app:layout_constraintTop_toBottomOf="@id/left_value"
+                app:kalugaButton="@{viewModel.calculateButton}"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/calculate_button"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginTop="10dp"
+                android:text="@{viewModel.resultValue.stateFlow}"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/values/strings.xml b/example/android/src/main/res/values/strings.xml
index 4c38d697e..7757242b8 100644
--- a/example/android/src/main/res/values/strings.xml
+++ b/example/android/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="feature_resources_color">Color</string>
     <string name="feature_resources_button">Button</string>
     <string name="feature_resources_label">Label</string>
+    <string name="feature_scientific">Scientific</string>
 
     <string name="show_alert">Show Alert</string>
     <string name="dismissible_alert">Dismissible Alert</string>
diff --git a/example/ios/Demo/Base.lproj/Localizable.strings b/example/ios/Demo/Base.lproj/Localizable.strings
index 8a89339c8..985695a6c 100644
--- a/example/ios/Demo/Base.lproj/Localizable.strings
+++ b/example/ios/Demo/Base.lproj/Localizable.strings
@@ -15,6 +15,7 @@
 "feature_resources_color" = "Color";
 "feature_resources_button" = "Button";
 "feature_resources_label" = "Label";
+"feature_scientific" = "Scientific";
 
 "show_alert" = "Show Alert";
 "dismissible_alert" = "Dismissible Alert";
diff --git a/example/shared/build.gradle.kts b/example/shared/build.gradle.kts
index b768b1362..b6615d002 100644
--- a/example/shared/build.gradle.kts
+++ b/example/shared/build.gradle.kts
@@ -22,6 +22,7 @@ val modules = listOf(
     "logging" to false,
     "resources" to true,
     "review" to true,
+    "scientific" to false,
     "system" to true,
     "permissions" to true
 )
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index 30535e0f8..b209ca098 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -59,6 +59,10 @@ import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
 import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
 import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
+import com.splendo.kaluga.example.shared.viewmodel.scientific.CloseScientificConverterNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificViewModel
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterViewModel
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationActions
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
 import com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel
@@ -184,6 +188,14 @@ internal val androidModule = module {
     viewModel {
         ButtonViewModel(StyledStringBuilder.Provider(), AlertPresenter.Builder())
     }
+
+    viewModel { (navigator: Navigator<ScientificConverterNavigationAction>) ->
+        ScientificViewModel(AlertPresenter.Builder(), navigator)
+    }
+
+    viewModel { (arguments: ScientificConverterViewModel.Arguments, navigator: Navigator<CloseScientificConverterNavigationAction>) ->
+        ScientificConverterViewModel(arguments, AlertPresenter.Builder(), navigator)
+    }
 }
 
 fun initKoin(customModules: List<Module> = emptyList()) = initKoin(
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
new file mode 100644
index 000000000..822e59bef
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
@@ -0,0 +1,122 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific
+
+import com.splendo.kaluga.base.utils.Decimal
+import com.splendo.kaluga.example.shared.model.scientific.converters.QuantityConverter
+import com.splendo.kaluga.example.shared.model.scientific.converters.converters
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.convert
+import com.splendo.kaluga.scientific.unit.AccelerationUnits
+import com.splendo.kaluga.scientific.unit.ActionUnits
+import com.splendo.kaluga.scientific.unit.AmountOfSubstanceUnits
+import com.splendo.kaluga.scientific.unit.AngleUnits
+import com.splendo.kaluga.scientific.unit.AngularAccelerationUnits
+import com.splendo.kaluga.scientific.unit.AngularVelocityUnits
+import com.splendo.kaluga.scientific.unit.ScientificUnit
+
+data class QuantityDetails<Quantity: PhysicalQuantity>(
+    val quantity: Quantity,
+    val units: Set<ScientificUnit<Quantity>>,
+    val converters: List<QuantityConverter<Quantity, *, *>>
+) {
+    fun convert(value: Decimal, unit: ScientificUnit<*>, to: ScientificUnit<*>): ScientificValue<Quantity, *>? = if (unit.quantity == quantity && to.quantity == quantity) {
+        DefaultScientificValue(value, unit as ScientificUnit<Quantity>).convert(to as ScientificUnit<Quantity>)
+    } else {
+        null
+    }
+}
+
+val allPhysicalQuantities = setOf(
+    PhysicalQuantity.Acceleration,
+    PhysicalQuantity.Action,
+    PhysicalQuantity.AmountOfSubstance,
+    PhysicalQuantity.Angle,
+    PhysicalQuantity.AngularAcceleration,
+    PhysicalQuantity.AngularVelocity,
+    PhysicalQuantity.Area,
+    PhysicalQuantity.AreaDensity,
+    PhysicalQuantity.CatalysticActivity,
+    PhysicalQuantity.Density,
+    PhysicalQuantity.Dimensionless,
+    PhysicalQuantity.DynamicViscosity,
+    PhysicalQuantity.ElectricCapacitance,
+    PhysicalQuantity.ElectricCharge,
+    PhysicalQuantity.ElectricConductance,
+    PhysicalQuantity.ElectricCurrent,
+    PhysicalQuantity.ElectricInductance,
+    PhysicalQuantity.ElectricInductance,
+    PhysicalQuantity.ElectricResistance,
+    PhysicalQuantity.Energy,
+    PhysicalQuantity.Force,
+    PhysicalQuantity.Frequency,
+    PhysicalQuantity.HeatCapacity,
+    PhysicalQuantity.Illuminance,
+    PhysicalQuantity.IonizingRadiationAbsorbedDose,
+    PhysicalQuantity.IonizingRadiationEquivalentDose,
+    PhysicalQuantity.LinearMassDensity,
+    PhysicalQuantity.Jolt,
+    PhysicalQuantity.Length,
+    PhysicalQuantity.Luminance,
+    PhysicalQuantity.LuminousEnergy,
+    PhysicalQuantity.LuminousExposure,
+    PhysicalQuantity.LuminousFlux,
+    PhysicalQuantity.LuminousIntensity,
+    PhysicalQuantity.MassFlowRate,
+    PhysicalQuantity.MagneticFlux,
+    PhysicalQuantity.MagneticInduction,
+    PhysicalQuantity.Molality,
+    PhysicalQuantity.Molarity,
+    PhysicalQuantity.MolarEnergy,
+    PhysicalQuantity.MolarMass,
+    PhysicalQuantity.MolarVolume,
+    PhysicalQuantity.Momentum,
+    PhysicalQuantity.Power,
+    PhysicalQuantity.Pressure,
+    PhysicalQuantity.Radioactivity,
+    PhysicalQuantity.SolidAngle,
+    PhysicalQuantity.SpecificEnergy,
+    PhysicalQuantity.SpecificHeatCapacity,
+    PhysicalQuantity.SpecificVolume,
+    PhysicalQuantity.Speed,
+    PhysicalQuantity.SurfaceTension,
+    PhysicalQuantity.Temperature,
+    PhysicalQuantity.ThermalResistance,
+    PhysicalQuantity.Time,
+    PhysicalQuantity.Voltage,
+    PhysicalQuantity.Volume,
+    PhysicalQuantity.VolumetricFlow,
+    PhysicalQuantity.VolumetricFlux,
+    PhysicalQuantity.Weight,
+    PhysicalQuantity.Yank
+)
+
+val PhysicalQuantity.details: QuantityDetails<*>? get() {
+    return when (this) {
+        is PhysicalQuantity.Dimensionless -> null
+        is PhysicalQuantity.Acceleration -> QuantityDetails(this, AccelerationUnits, converters)
+        is PhysicalQuantity.Action -> QuantityDetails(this, ActionUnits, converters)
+        is PhysicalQuantity.AmountOfSubstance -> QuantityDetails(this, AmountOfSubstanceUnits, converters)
+        is PhysicalQuantity.Angle -> QuantityDetails(this, AngleUnits, converters)
+        is PhysicalQuantity.AngularAcceleration -> QuantityDetails(this, AngularAccelerationUnits, converters)
+        is PhysicalQuantity.AngularVelocity -> QuantityDetails(this, AngularVelocityUnits, converters)
+        else -> null
+    }
+}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt
new file mode 100644
index 000000000..17b50ad41
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt
@@ -0,0 +1,83 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.acceleration.div
+import com.splendo.kaluga.scientific.converter.acceleration.times
+import com.splendo.kaluga.scientific.unit.Acceleration
+import com.splendo.kaluga.scientific.unit.Grain
+import com.splendo.kaluga.scientific.unit.Gram
+import com.splendo.kaluga.scientific.unit.ImperialAcceleration
+import com.splendo.kaluga.scientific.unit.ImperialTon
+import com.splendo.kaluga.scientific.unit.ImperialWeight
+import com.splendo.kaluga.scientific.unit.Jolt
+import com.splendo.kaluga.scientific.unit.JoltUnits
+import com.splendo.kaluga.scientific.unit.MetricAcceleration
+import com.splendo.kaluga.scientific.unit.MetricWeight
+import com.splendo.kaluga.scientific.unit.Ounce
+import com.splendo.kaluga.scientific.unit.Pound
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.TimeUnits
+import com.splendo.kaluga.scientific.unit.UKImperialWeight
+import com.splendo.kaluga.scientific.unit.USCustomaryWeight
+import com.splendo.kaluga.scientific.unit.UsTon
+import com.splendo.kaluga.scientific.unit.Weight
+import com.splendo.kaluga.scientific.unit.WeightUnits
+
+val PhysicalQuantity.Acceleration.converters get() = listOf<QuantityConverter<PhysicalQuantity.Acceleration, *, *>>(
+    QuantityConverter("Force from Weight", QuantityConverter.Type.Multiplication, WeightUnits) { (accelerationValue, accelerationUnit), (weightValue, weightUnit) ->
+        when {
+            accelerationUnit is MetricAcceleration && weightUnit is Gram -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            accelerationUnit is MetricAcceleration && weightUnit is MetricWeight -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            accelerationUnit is ImperialAcceleration && weightUnit is Pound -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            accelerationUnit is ImperialAcceleration && weightUnit is Ounce -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            accelerationUnit is ImperialAcceleration && weightUnit is Grain -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            accelerationUnit is ImperialAcceleration && weightUnit is UsTon -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            accelerationUnit is ImperialAcceleration && weightUnit is ImperialTon -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            accelerationUnit is ImperialAcceleration && weightUnit is ImperialWeight -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            accelerationUnit is ImperialAcceleration && weightUnit is UKImperialWeight -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            accelerationUnit is ImperialAcceleration && weightUnit is USCustomaryWeight -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            accelerationUnit is Acceleration && weightUnit is Weight -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
+            else -> throw RuntimeException("Unexpected units: $accelerationUnit, $weightUnit")
+        }
+    },
+    QuantityConverter("Jolt from Time", QuantityConverter.Type.Division, TimeUnits) { (accelerationValue, accelerationUnit), (timeValue, timeUnit) ->
+        when {
+            accelerationUnit is MetricAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) / DefaultScientificValue(timeValue, timeUnit)
+            accelerationUnit is ImperialAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) / DefaultScientificValue(timeValue, timeUnit)
+            accelerationUnit is Acceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) / DefaultScientificValue(timeValue, timeUnit)
+            else -> throw RuntimeException("Unexpected units: $accelerationUnit, $timeUnit")
+        }
+    },
+    QuantityConverter("Speed from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (accelerationValue, accelerationUnit), (timeValue, timeUnit) ->
+        when {
+            accelerationUnit is MetricAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(timeValue, timeUnit)
+            accelerationUnit is ImperialAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(timeValue, timeUnit)
+            accelerationUnit is Acceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(timeValue, timeUnit)
+            else -> throw RuntimeException("Unexpected units: $accelerationUnit, $timeUnit")
+        }
+    },
+    QuantityConverter("Time from Jolt", QuantityConverter.Type.Division, JoltUnits) { (accelerationValue, accelerationUnit), (joltValue, joltUnit) ->
+        when {
+            accelerationUnit is Acceleration && joltUnit is Jolt -> DefaultScientificValue(accelerationValue, accelerationUnit) / DefaultScientificValue(joltValue, joltUnit)
+            else -> throw RuntimeException("Unexpected units: $accelerationUnit, $joltUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
new file mode 100644
index 000000000..3b30e80a3
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
@@ -0,0 +1,41 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+  
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.action.div
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Action.converters get() = listOf<QuantityConverter<PhysicalQuantity.Action, *, *>>(
+    QuantityConverter("Energy from Time", QuantityConverter.Type.Division, TimeUnits) { (actionValue, actionUnit), (timeValue, timeUnit) ->
+        when {
+            actionUnit is MetricAndImperialAction && timeUnit is Time -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(timeValue, timeUnit)
+            actionUnit is MetricAction && timeUnit is Time -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(timeValue, timeUnit)
+            actionUnit is ImperialAction && timeUnit is Time -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(timeValue, timeUnit)
+            actionUnit is Action && timeUnit is Time -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(timeValue, timeUnit)
+            else -> throw RuntimeException("Unexpected units: $actionUnit, $timeUnit")
+        }
+    },
+    QuantityConverter("Time from Energy", QuantityConverter.Type.Division, EnergyUnits) { (actionValue, actionUnit), (energyValue, energyUnit) ->
+        when {
+            actionUnit is Action && energyUnit is Energy -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(energyValue, energyUnit)
+            else -> throw RuntimeException("Unexpected units: $actionUnit, $energyUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
new file mode 100644
index 000000000..ace642086
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
@@ -0,0 +1,89 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.amountOfSubstance.decaysWithHalfLife
+import com.splendo.kaluga.scientific.converter.amountOfSubstance.div
+import com.splendo.kaluga.scientific.converter.amountOfSubstance.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConverter<PhysicalQuantity.AmountOfSubstance, *, *>>(
+    QuantityConverter("Energy from Molar Energy", QuantityConverter.Type.Multiplication, MolarEnergyUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molarEnergyValue, molarEnergyUnit) ->
+        when {
+            amountOfSubstanceUnit is AmountOfSubstance && molarEnergyUnit is MetricAndImperialMolarEnergy -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) * DefaultScientificValue(molarEnergyValue, molarEnergyUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molarEnergyUnit is MetricMolarEnergy -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) * DefaultScientificValue(molarEnergyValue, molarEnergyUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molarEnergyUnit is ImperialMolarEnergy -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) * DefaultScientificValue(molarEnergyValue, molarEnergyUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molarEnergyUnit is MolarEnergy -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) * DefaultScientificValue(molarEnergyValue, molarEnergyUnit)
+            else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $molarEnergyUnit")
+        }
+    },
+    QuantityConverter("Molality from Weight", QuantityConverter.Type.Division, WeightUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (weightValue, weightUnit) ->
+        when {
+            amountOfSubstanceUnit is AmountOfSubstance && weightUnit is MetricWeight -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(weightValue, weightUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && weightUnit is ImperialWeight -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(weightValue, weightUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && weightUnit is UKImperialWeight -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(weightValue, weightUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && weightUnit is USCustomaryWeight -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(weightValue, weightUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && weightUnit is Weight -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(weightValue, weightUnit)
+            else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $weightUnit")
+        }
+    },
+    QuantityConverter("Molarity from Volume", QuantityConverter.Type.Division, VolumeUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (volumeValue, volumeUnit) ->
+        when {
+            amountOfSubstanceUnit is AmountOfSubstance && volumeUnit is MetricVolume -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(volumeValue, volumeUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && volumeUnit is ImperialVolume -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(volumeValue, volumeUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && volumeUnit is UKImperialVolume -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(volumeValue, volumeUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && volumeUnit is USCustomaryVolume -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(volumeValue, volumeUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && volumeUnit is Volume -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(volumeValue, volumeUnit)
+            else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $volumeUnit")
+        }
+    },
+    QuantityConverter("Radioactivity from Time", QuantityConverter.Type.Custom("with λ"), TimeUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (timeValue, timeUnit) ->
+        when {
+            amountOfSubstanceUnit is AmountOfSubstance && timeUnit is Time -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit).decaysWithHalfLife(DefaultScientificValue(timeValue, timeUnit))
+            else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $timeUnit")
+        }
+    },
+    QuantityConverter("Time from Catalystic Activity", QuantityConverter.Type.Division, CatalysticActivityUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (catalysticActivityValue, catalysticActivityUnit) ->
+        when {
+            amountOfSubstanceUnit is AmountOfSubstance && catalysticActivityUnit is CatalysticActivity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(catalysticActivityValue, catalysticActivityUnit)
+            else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $catalysticActivityUnit")
+        }
+    },
+    QuantityConverter("Volume from Molarity", QuantityConverter.Type.Division, MolarityUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molarityValue, molarityUnit) ->
+        when {
+            amountOfSubstanceUnit is AmountOfSubstance && molarityUnit is MetricMolarity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molarityValue, molarityUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molarityUnit is ImperialMolarity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molarityValue, molarityUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molarityUnit is UKImperialMolarity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molarityValue, molarityUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molarityUnit is USCustomaryMolarity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molarityValue, molarityUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molarityUnit is Molarity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molarityValue, molarityUnit)
+            else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $molarityUnit")
+        }
+    },
+    QuantityConverter("Weight from Molality", QuantityConverter.Type.Division, MolalityUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molalityValue, molalityUnit) ->
+        when {
+            amountOfSubstanceUnit is AmountOfSubstance && molalityUnit is MetricMolality -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molalityValue, molalityUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molalityUnit is ImperialMolality -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molalityValue, molalityUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molalityUnit is UKImperialMolality -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molalityValue, molalityUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molalityUnit is USCustomaryMolality -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molalityValue, molalityUnit)
+            amountOfSubstanceUnit is AmountOfSubstance && molalityUnit is Molality -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molalityValue, molalityUnit)
+            else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $molalityUnit")
+        }
+    }
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
new file mode 100644
index 000000000..7f9397cab
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
@@ -0,0 +1,42 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.angle.div
+import com.splendo.kaluga.scientific.unit.Angle
+import com.splendo.kaluga.scientific.unit.AngularVelocity
+import com.splendo.kaluga.scientific.unit.AngularVelocityUnits
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.TimeUnits
+
+val PhysicalQuantity.Angle.converters get() = listOf<QuantityConverter<PhysicalQuantity.Angle, *, *>>(
+    QuantityConverter("Angular Velocity from Time", QuantityConverter.Type.Division, TimeUnits) { (angleValue, angleUnit), (timeValue, timeUnit) ->
+        when {
+            angleUnit is Angle && timeUnit is Time -> DefaultScientificValue(angleValue, angleUnit) / DefaultScientificValue(timeValue, timeUnit)
+            else -> throw RuntimeException("Unexpected units: $angleUnit $timeUnit")
+        }
+    },
+    QuantityConverter("Time from Angular Velocity", QuantityConverter.Type.Division, AngularVelocityUnits) { (angleValue, angleUnit), (angularVelocityValue, angularVelocityUnit) ->
+        when {
+            angleUnit is Angle && angularVelocityUnit is AngularVelocity -> DefaultScientificValue(angleValue, angleUnit) / DefaultScientificValue(angularVelocityValue, angularVelocityUnit)
+            else -> throw RuntimeException("Unexpected units: $angleUnit $angularVelocityUnit")
+        }
+    }
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt
new file mode 100644
index 000000000..9f6842d93
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt
@@ -0,0 +1,34 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.angularAcceleration.times
+import com.splendo.kaluga.scientific.unit.AngularAcceleration
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.TimeUnits
+
+val PhysicalQuantity.AngularAcceleration.converters get() = listOf<QuantityConverter<PhysicalQuantity.AngularAcceleration, *, *>>(
+    QuantityConverter("Angular Velocity from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (angularAccelerationValue, angularAccelerationUnit), (timeValue, timeUnit) ->
+        when {
+            angularAccelerationUnit is AngularAcceleration && timeUnit is Time -> DefaultScientificValue(angularAccelerationValue, angularAccelerationUnit) * DefaultScientificValue(timeValue, timeUnit)
+            else -> throw RuntimeException("Unexpected units: $angularAccelerationUnit $timeUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
new file mode 100644
index 000000000..f8e1884f3
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
@@ -0,0 +1,49 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.angularVelocity.div
+import com.splendo.kaluga.scientific.converter.angularVelocity.times
+import com.splendo.kaluga.scientific.unit.AngularAcceleration
+import com.splendo.kaluga.scientific.unit.AngularAccelerationUnits
+import com.splendo.kaluga.scientific.unit.AngularVelocity
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.TimeUnits
+
+val PhysicalQuantity.AngularVelocity.converters get() = listOf<QuantityConverter<PhysicalQuantity.AngularVelocity, *, *>>(
+    QuantityConverter("Angle from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
+        when {
+            angularVelocityUnit is AngularVelocity && timeUnit is Time -> DefaultScientificValue(angularVelocityValue, angularVelocityUnit) * DefaultScientificValue(timeValue, timeUnit)
+            else -> throw RuntimeException("Unexpected units: $angularVelocityUnit $timeUnit")
+        }
+    },
+    QuantityConverter("Angular Acceleration from Time", QuantityConverter.Type.Division, TimeUnits) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
+        when {
+            angularVelocityUnit is AngularVelocity && timeUnit is Time -> DefaultScientificValue(angularVelocityValue, angularVelocityUnit) / DefaultScientificValue(timeValue, timeUnit)
+            else -> throw RuntimeException("Unexpected units: $angularVelocityUnit $timeUnit")
+        }
+    },
+    QuantityConverter("Time from Angular Acceleration", QuantityConverter.Type.Division, AngularAccelerationUnits) { (angularVelocityValue, angularVelocityUnit), (angularAccelerationValue, angularAccelerationUnit) ->
+        when {
+            angularVelocityUnit is AngularVelocity && angularAccelerationUnit is AngularAcceleration -> DefaultScientificValue(angularVelocityValue, angularVelocityUnit) / DefaultScientificValue(angularAccelerationValue, angularAccelerationUnit)
+            else -> throw RuntimeException("Unexpected units: $angularVelocityUnit $angularAccelerationUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
new file mode 100644
index 000000000..7b441fabf
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
@@ -0,0 +1,81 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.area.div
+import com.splendo.kaluga.scientific.converter.area.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQuantity.Area, *, *>>(
+    QuantityConverter("Energy from Surface Tension", QuantityConverter.Type.Multiplication, SurfaceTensionUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is SquareCentimeter && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricArea && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareInch && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareInch && rightUnit is UKImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareInch && rightUnit is USCustomarySurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is UKImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is USCustomarySurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is SurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Force from Pressure", QuantityConverter.Type.Multiplication, PressureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is SquareCentimeter && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is OunceSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is KipSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is KipSquareFoot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is USTonSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is USTonSquareFoot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialTonSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialTonSquareFoot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is Pressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Length", QuantityConverter.Type.Division, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is SquareMeter && rightUnit is Meter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareNanometer && rightUnit is Nanometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareMicrometer && rightUnit is Micrometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareMillimeter && rightUnit is Millimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareDecimeter && rightUnit is Decimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareDecameter && rightUnit is Decameter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareHectometer && rightUnit is Hectometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareKilometer && rightUnit is Kilometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareMegameter && rightUnit is Megameter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareGigameter && rightUnit is Gigameter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricArea && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareInch && rightUnit is Inch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareFoot && rightUnit is Foot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareYard && rightUnit is Yard -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareMile && rightUnit is Mile -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
new file mode 100644
index 000000000..a7b7299b0
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
@@ -0,0 +1,62 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.base.utils.Decimal
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.unit.ScientificUnit
+import kotlin.reflect.KClass
+
+data class QuantityConverter<Left: PhysicalQuantity, Right: PhysicalQuantity, Result: PhysicalQuantity>(
+    val leftQuantity: KClass<Left>,
+    val rightQuantity: KClass<Right>,
+    val resultQuantity: KClass<Result>,
+    val name: String,
+    val type: Type,
+    val rightUnits: Set<ScientificUnit<Right>>,
+    val converter: (left: Pair<Decimal, ScientificUnit<Left>>, right: Pair<Decimal, ScientificUnit<Right>>) -> ScientificValue<Result, *>
+) {
+    sealed class Type {
+
+        abstract val operatorSymbol: String
+
+        object Multiplication : Type() {
+            override val operatorSymbol: String = "*"
+        }
+        object Division : Type() {
+            override val operatorSymbol: String = "/"
+        }
+        data class Custom(override val operatorSymbol: String) : Type()
+    }
+
+    fun convert(left: Decimal, leftUnit: ScientificUnit<*>, right: Decimal, rightUnit: ScientificUnit<*>): ScientificValue<*, *>? {
+        return if (leftQuantity.isInstance(leftUnit.quantity) && rightQuantity.isInstance(rightUnit.quantity)) {
+            converter(left to leftUnit as ScientificUnit<Left>, right to rightUnit as ScientificUnit<Right>)
+        } else {
+            null
+        }
+    }
+}
+
+inline fun <reified Left : PhysicalQuantity, reified Right : PhysicalQuantity, reified Result : PhysicalQuantity> QuantityConverter(
+    name: String,
+    type: QuantityConverter.Type,
+    rightUnits: Set<ScientificUnit<Right>>,
+    noinline converter: (left: Pair<Decimal, ScientificUnit<Left>>, right: Pair<Decimal, ScientificUnit<Right>>) -> ScientificValue<Result, *>
+) = QuantityConverter(Left::class, Right::class, Result::class, name, type, rightUnits, converter)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/scientificUnitName.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/scientificUnitName.kt
new file mode 100644
index 000000000..fd64359c2
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/scientificUnitName.kt
@@ -0,0 +1,64 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific
+
+import com.splendo.kaluga.scientific.unit.*
+
+val ScientificUnit<*>.name: String get() = when (this) {
+    is Acceleration -> "${speed.name} per ${per.name}"
+    is Action -> "${energy.name}-${time.name}"
+    is AngularAcceleration -> "${angularVelocity.name} per ${per.name}"
+    is AngularVelocity -> "${angle.name} per ${per.name}"
+    is AreaDensity -> "${weight.name} per ${per.name}"
+    is Density -> "${weight.name} per ${per.name}"
+    is DynamicViscosity -> "${pressure.name}-${time.name}"
+    is ImperialMetricAndImperialEnergyWrapper -> "${metricAndImperialEnergy.name} (Imperial)"
+    is ImperialMetricAndImperialPowerWrapper -> "${metricAndImperialPower.name} (Imperial)"
+    is HeatCapacity -> "${energy.name} per ${per.name}"
+    is Jolt -> "${acceleration.name} per ${per.name}"
+    is LinearMassDensity -> "${weight.name} per ${per.name}"
+    is LuminousEnergy -> "${luminousFlux.name}-${time.name}"
+    is LuminousExposure -> "${illuminance.name}-${time.name}"
+    is MassFlowRate -> "${weight.name} per ${per.name}"
+    is Molality -> "${amountOfSubstance.name} per ${per.name}"
+    is MolarEnergy -> "${energy.name} per ${per.name}"
+    is Molarity -> "${amountOfSubstance.name} per ${per.name}"
+    is MolarMass -> "${weight.name} per ${per.name}"
+    is MolarVolume -> "${volume.name} per ${per.name}"
+    is Momentum -> "${mass.name}-${speed.name}"
+    is MetricMetricAndImperialEnergyWrapper -> "${metricAndImperialEnergy.name} (Metric)"
+    is MetricMetricAndImperialPowerWrapper -> "${metricAndImperialPower.name} (Metric)"
+    is SpecificEnergy -> "${energy.name} per ${per.name}"
+    is SpecificHeatCapacity -> "${heatCapacity.name} per ${perWeight.name}"
+    is SpecificVolume -> "${volume.name} per ${per.name}"
+    is Speed -> "${distance.name} per ${per.name}"
+    is SurfaceTension -> "${force.name} per ${per.name}"
+    is ThermalResistance -> "${temperature.name} per ${per.name}"
+    is USCustomaryImperialForceWrapper -> "${imperial.name} (US)"
+    is USCustomaryImperialPressureWrapper -> "${imperial.name} (US)"
+    is USCustomaryImperialVolumeWrapper -> "${imperial.name} (US)"
+    is USCustomaryImperialWeightWrapper -> "${imperial.name} (US)"
+    is UKImperialImperialForceWrapper -> "${imperial.name} (UK)"
+    is UKImperialPressureWrapper -> "${imperial.name} (UK)"
+    is UKImperialImperialVolumeWrapper -> "${imperial.name} (UK)"
+    is UKImperialImperialWeightWrapper -> "${imperial.name} (UK)"
+    is VolumetricFlow -> "${volume.name} per ${per.name}"
+    is VolumetricFlux -> "${volumetricFlow.name}-${per.name}"
+    is Yank -> "${force.name} per ${per.name}"
+    else -> this::class.simpleName ?: ""
+}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
index c32d5d382..cb7b5e2d6 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/featureList/FeatureListViewModel.kt
@@ -37,6 +37,7 @@ sealed class FeatureListNavigationAction : NavigationAction<Nothing>(null) {
     object System : FeatureListNavigationAction()
     object Beacons : FeatureListNavigationAction()
     object Resources : FeatureListNavigationAction()
+    object Scientific : FeatureListNavigationAction()
     object PlatformSpecific : FeatureListNavigationAction()
 }
 
@@ -54,6 +55,7 @@ sealed class Feature(val title: String) {
     object System : Feature("feature_system".localized())
     object Beacons : Feature("feature_beacons".localized())
     object Resource : Feature("feature_resources".localized())
+    object Scientific : Feature("feature_scientific".localized())
     object PlatformSpecific : Feature("feature_platform_specific".localized())
 }
 
@@ -74,6 +76,7 @@ class FeatureListViewModel(navigator: Navigator<FeatureListNavigationAction>) :
             Feature.System,
             Feature.Beacons,
             Feature.Resource,
+            Feature.Scientific,
             Feature.PlatformSpecific.takeIf { showPlatformSpecificFeatures }
         )
     )
@@ -94,6 +97,7 @@ class FeatureListViewModel(navigator: Navigator<FeatureListNavigationAction>) :
                 is Feature.System -> FeatureListNavigationAction.System
                 is Feature.Beacons -> FeatureListNavigationAction.Beacons
                 is Feature.Resource -> FeatureListNavigationAction.Resources
+                is Feature.Scientific -> FeatureListNavigationAction.Scientific
                 is Feature.PlatformSpecific -> FeatureListNavigationAction.PlatformSpecific
             }
         )
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
new file mode 100644
index 000000000..73bc42761
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
@@ -0,0 +1,122 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.scientific
+
+import com.splendo.kaluga.alerts.Alert
+import com.splendo.kaluga.alerts.BaseAlertPresenter
+import com.splendo.kaluga.alerts.buildActionSheet
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.observable.toInitializedSubject
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.base.text.NumberFormatStyle
+import com.splendo.kaluga.base.text.NumberFormatter
+import com.splendo.kaluga.base.utils.toDecimal
+import com.splendo.kaluga.example.shared.model.scientific.converters.QuantityConverter
+import com.splendo.kaluga.example.shared.model.scientific.details
+import com.splendo.kaluga.example.shared.model.scientific.name
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
+import com.splendo.kaluga.resources.view.KalugaButton
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.unit.ScientificUnit
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+object CloseScientificConverterNavigationAction : SingleValueNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType)
+
+class ScientificConverterViewModel internal constructor(
+    private val leftUnits: Set<ScientificUnit<*>>,
+    private val converter: QuantityConverter<*, *, *>?,
+    val alertPresenterBuilder: BaseAlertPresenter.Builder,
+    navigator: Navigator<CloseScientificConverterNavigationAction>
+) : NavigatingViewModel<CloseScientificConverterNavigationAction>(navigator) {
+
+    companion object {
+        val numberFormatterDecimal = NumberFormatter(style = NumberFormatStyle.Decimal(maxIntegerDigits = 10U, minIntegerDigits = 1U, minFractionDigits = 0U, maxFractionDigits = 10U))
+        val numberFormatterScientific = NumberFormatter(style = NumberFormatStyle.Scientific())
+    }
+
+    @kotlinx.serialization.Serializable
+    data class Arguments(val physicalQuantity: PhysicalQuantity, val converterIndex: Int)
+
+    private val rightUnits = converter?.rightUnits ?: emptySet()
+
+    private val currentLeftUnit = MutableStateFlow(leftUnits.firstOrNull())
+    val currentLeftUnitButton = currentLeftUnit.map { createLeftUnitButton(it) }.toInitializedObservable(createLeftUnitButton(null), coroutineScope)
+    private val currentRightUnit = MutableStateFlow(rightUnits.firstOrNull())
+    val currentRightUnitButton = currentRightUnit.map { createRightUnitButton(it) }.toInitializedObservable(createRightUnitButton(null), coroutineScope)
+    private val _leftValue = MutableStateFlow("0.0")
+    val leftValue = _leftValue.toInitializedSubject(coroutineScope)
+    private val _rightValue = MutableStateFlow("0.0")
+    val rightValue = _rightValue.toInitializedSubject(coroutineScope)
+    val calculateOperatorSymbol = converter?.type?.operatorSymbol.orEmpty()
+    private val _resultValue = MutableStateFlow("")
+    val resultValue = _resultValue.toInitializedObservable(coroutineScope)
+
+    val calculateButton = KalugaButton.Plain("Calculate", ButtonStyles.default) {
+        val left = numberFormatterScientific.parse(_leftValue.value)?.toDecimal()
+        val leftUnit = currentLeftUnit.value
+        val right = numberFormatterScientific.parse(_rightValue.value)?.toDecimal()
+        val rightUnit = currentRightUnit.value
+        _resultValue.value = if (left != null && leftUnit != null && right != null && rightUnit != null) {
+            converter?.convert(left, leftUnit, right, rightUnit)?.let { result ->
+                val formattedDecimal = numberFormatterDecimal.format(result.value)
+                val parsedDecimal = numberFormatterDecimal.parse(formattedDecimal)
+                val formatter = if (parsedDecimal?.toDouble() == result.value.toDouble()) {
+                    numberFormatterDecimal
+                } else {
+                    numberFormatterScientific
+                }
+                "${formatter.format(result.value)} ${result.unit.symbol}"
+            }.orEmpty()
+        } else {
+            ""
+        }
+    }
+
+    private fun createLeftUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) { selectLeftUnit() }
+
+    private fun selectLeftUnit() {
+        coroutineScope.launch {
+            alertPresenterBuilder.buildActionSheet(coroutineScope) {
+                setTitle("Select Unit")
+                addActions(leftUnits.map { Alert.Action(it.name) { currentLeftUnit.value = it } })
+            }.show()
+        }
+    }
+
+    private fun createRightUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) { selectRightUnit() }
+
+    private fun selectRightUnit() {
+        coroutineScope.launch {
+            alertPresenterBuilder.buildActionSheet(coroutineScope) {
+                setTitle("Select Unit")
+                addActions(rightUnits.map { Alert.Action(it.name) { currentRightUnit.value = it } })
+            }.show()
+        }
+    }
+}
+
+fun ScientificConverterViewModel(arguments: ScientificConverterViewModel.Arguments, alertPresenterBuilder: BaseAlertPresenter.Builder, navigator: Navigator<CloseScientificConverterNavigationAction>) = arguments.physicalQuantity.details?.let { details ->
+    details.converters.getOrNull(arguments.converterIndex)?.let { converter ->
+        ScientificConverterViewModel(details.units, converter, alertPresenterBuilder, navigator)
+    }
+} ?: ScientificConverterViewModel(emptySet(), null, alertPresenterBuilder, navigator)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
new file mode 100644
index 000000000..e17fab5ba
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
@@ -0,0 +1,137 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.scientific
+
+import com.splendo.kaluga.alerts.Alert
+import com.splendo.kaluga.alerts.BaseAlertPresenter
+import com.splendo.kaluga.alerts.buildActionSheet
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.observable.toInitializedSubject
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.base.text.NumberFormatStyle
+import com.splendo.kaluga.base.text.NumberFormatter
+import com.splendo.kaluga.base.utils.toDecimal
+import com.splendo.kaluga.example.shared.model.scientific.QuantityDetails
+import com.splendo.kaluga.example.shared.model.scientific.allPhysicalQuantities
+import com.splendo.kaluga.example.shared.model.scientific.details
+import com.splendo.kaluga.example.shared.model.scientific.name
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
+import com.splendo.kaluga.resources.view.KalugaButton
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.unit.ScientificUnit
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+data class ScientificConverterNavigationAction(val quantity: PhysicalQuantity, val index: Int) : SingleValueNavigationAction<ScientificConverterViewModel.Arguments>(
+    ScientificConverterViewModel.Arguments(quantity, index),
+    NavigationBundleSpecType.SerializedType(ScientificConverterViewModel.Arguments.serializer())
+)
+
+class ScientificViewModel(
+    val alertPresenterBuilder: BaseAlertPresenter.Builder,
+    navigator: Navigator<ScientificConverterNavigationAction>
+) : NavigatingViewModel<ScientificConverterNavigationAction>(navigator) {
+
+    companion object {
+        val numberFormatterDecimal = NumberFormatter(style = NumberFormatStyle.Decimal(maxIntegerDigits = 10U, minIntegerDigits = 1U, minFractionDigits = 0U, maxFractionDigits = 10U))
+        val numberFormatterScientific = NumberFormatter(style = NumberFormatStyle.Scientific())
+    }
+
+    private val quantityDetails = allPhysicalQuantities.mapNotNull { it.details }
+    private val currentQuantityDetails = MutableStateFlow(quantityDetails.firstOrNull())
+    val quantityDetailsButton = currentQuantityDetails.map { createQuantityButton(it) }.toInitializedObservable(createQuantityButton(null), coroutineScope)
+    private val units = currentQuantityDetails.map { it?.units ?: emptySet() }.stateIn(coroutineScope, SharingStarted.Eagerly, emptySet())
+    private val currentLeftUnit = MutableStateFlow<ScientificUnit<*>?>(null)
+    val currentLeftUnitButton = currentLeftUnit.map { createLeftUnitButton(it) }.toInitializedObservable(createLeftUnitButton(null), coroutineScope)
+    private val currentRightUnit = MutableStateFlow<ScientificUnit<*>?>(null)
+    val currentRightUnitButton = currentRightUnit.map { createRightUnitButton(it) }.toInitializedObservable(createRightUnitButton(null), coroutineScope)
+    private val _leftValue = MutableStateFlow("0.0")
+    val leftValue = _leftValue.toInitializedSubject(coroutineScope)
+    private val _rightValue = MutableStateFlow("0.0")
+    val rightValue = _rightValue.toInitializedObservable(coroutineScope)
+
+    val converters = currentQuantityDetails.map { details ->
+        details?.let {
+            details.converters.mapIndexed { index, converter ->
+                KalugaButton.Plain(converter.name, ButtonStyles.default) {
+                    navigator.navigate(ScientificConverterNavigationAction(details.quantity, index))
+                }
+            }
+        }.orEmpty()
+    }.toInitializedObservable(emptyList(), coroutineScope)
+
+    init {
+        coroutineScope.launch {
+            units.collect {
+                currentLeftUnit.value = it.firstOrNull()
+                currentRightUnit.value = it.firstOrNull()
+            }
+        }
+    }
+
+    val calculateButton = KalugaButton.Plain("Calculate", ButtonStyles.default) {
+        val details = currentQuantityDetails.value
+        val left = numberFormatterScientific.parse(_leftValue.value)?.toDecimal()
+        val leftUnit = currentLeftUnit.value
+        val rightUnit = currentRightUnit.value
+        _rightValue.value = if (details != null && left != null && leftUnit != null && rightUnit != null) {
+            details.convert(left, leftUnit, rightUnit)?.let { result ->
+                val formattedDecimal = numberFormatterDecimal.format(result.value)
+                val parsedDecimal = numberFormatterDecimal.parse(formattedDecimal)
+                val formatter = if (parsedDecimal?.toDouble() == result.value.toDouble()) {
+                    numberFormatterDecimal
+                } else {
+                    numberFormatterScientific
+                }
+                formatter.format(result.value)
+            }.orEmpty()
+        } else {
+            ""
+        }
+    }
+
+    private fun createQuantityButton(currentQuantityDetails: QuantityDetails<*>?) = KalugaButton.Plain(currentQuantityDetails?.let { it.quantity::class.simpleName }.orEmpty(), ButtonStyles.default) { selectQuantity() }
+
+    private fun selectQuantity() {
+        coroutineScope.launch {
+            alertPresenterBuilder.buildActionSheet(coroutineScope) {
+                setTitle("Select Quantity")
+                addActions(quantityDetails.map { Alert.Action(it.quantity::class.simpleName.orEmpty()) { currentQuantityDetails.value = it } })
+            }.show()
+        }
+    }
+
+    private fun createLeftUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) { selectUnit(currentLeftUnit) }
+
+    private fun createRightUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) { selectUnit(currentRightUnit) }
+
+    private fun selectUnit(saveTo: MutableStateFlow<ScientificUnit<*>?>) {
+        coroutineScope.launch {
+            alertPresenterBuilder.buildActionSheet(coroutineScope) {
+                setTitle("Select Unit")
+                addActions(units.value.map { Alert.Action(it.name) { saveTo.value = it } })
+            }.show()
+        }
+    }
+}
diff --git a/scientific/src/commonMain/kotlin/converter/acceleration/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/acceleration/convertToTime.kt
index d7c3a8d32..6391ccd83 100644
--- a/scientific/src/commonMain/kotlin/converter/acceleration/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/acceleration/convertToTime.kt
@@ -24,7 +24,7 @@ import com.splendo.kaluga.scientific.unit.Acceleration
 import com.splendo.kaluga.scientific.unit.Jolt
 import kotlin.jvm.JvmName
 
-@JvmName("speedDivAcceleration")
+@JvmName("joltDivAcceleration")
 infix operator fun <AccelerationUnit : Acceleration, JoltUnit : Jolt> ScientificValue<PhysicalQuantity.Acceleration, AccelerationUnit>.div(
     jolt: ScientificValue<PhysicalQuantity.Jolt, JoltUnit>
 ) = jolt.unit.per.time(this, jolt)

From 27c9f0137485e8f73f743c5bc8aad7fdef128214 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 9 Jan 2023 11:11:26 +0100
Subject: [PATCH 073/227] Adding more conversions to example

---
 .../model/scientific/QuantityDetails.kt       |   62 +-
 .../scientific/converters/AreaConverters.kt   |  123 ++
 .../converters/AreaDensityConverter.kt        |   85 ++
 .../CatalysticActivityConverters.kt           |   34 +
 .../converters/DensityConverters.kt           |  101 ++
 .../converters/DynamicViscosityConverters.kt  |   65 +
 .../converters/ElectricCapacitanceUnits.kt    |   54 +
 .../converters/ElectricChargeConverters.kt    |   82 ++
 .../ElectricConductanceConverters.kt          |   55 +
 .../converters/ElectricCurrentConverters.kt   |   83 ++
 .../ElectricInductanceConverters.kt           |   55 +
 .../ElectricResistanceConverters.kt           |   84 ++
 .../scientific/converters/EnergyConverters.kt | 1088 +++++++++++++++++
 .../scientific/converters/ForceConverters.kt  |  379 ++++++
 .../scientific/ScientificViewModel.kt         |    2 +-
 .../kotlin/converter/area/convertToForce.kt   |    3 +-
 .../converter/area/convertToVolumetricFlow.kt |    6 +-
 .../kotlin/converter/area/convertToWeight.kt  |    2 +-
 .../kotlin/converter/energy/convertToArea.kt  |    3 +-
 .../energy/convertToElectricCharge.kt         |    3 +-
 .../energy/convertToElectricCurrent.kt        |    3 +-
 .../kotlin/converter/energy/convertToForce.kt |    3 +-
 .../convertToIonizingRadiationAbsorbedDose.kt |    3 +-
 ...onvertToIonizingRadiationEquivalentDose.kt |    3 +-
 .../converter/energy/convertToLength.kt       |    8 +-
 .../converter/energy/convertToMagneticFlux.kt |    5 +-
 .../kotlin/converter/energy/convertToPower.kt |    8 +-
 .../converter/energy/convertToPressure.kt     |    3 +-
 .../energy/convertToSurfaceTension.kt         |    3 +-
 .../kotlin/converter/energy/convertToTime.kt  |    8 +-
 .../converter/energy/convertToVoltage.kt      |    3 +-
 .../converter/energy/convertToVolume.kt       |    8 +-
 .../converter/energy/convertToWeight.kt       |   12 +-
 .../converter/force/convertToAcceleration.kt  |    3 +-
 .../kotlin/converter/force/convertToArea.kt   |    8 +-
 .../kotlin/converter/force/convertToEnergy.kt |    2 +-
 .../kotlin/converter/force/convertToPower.kt  |    3 +-
 .../converter/force/convertToPressure.kt      |    5 +-
 .../illuminance/convertToLuminance.kt         |    3 +-
 .../converter/length/convertToEnergy.kt       |    2 +-
 .../converter/luminousFlux/convertToArea.kt   |    3 +-
 .../kotlin/converter/power/convertToSpeed.kt  |    3 +-
 .../converter/pressure/convertToEnergy.kt     |    3 +-
 .../converter/pressure/convertToForce.kt      |    3 +-
 .../kotlin/converter/speed/convertToPower.kt  |    3 +-
 .../converter/volume/convertToEnergy.kt       |    3 +-
 46 files changed, 2426 insertions(+), 57 deletions(-)
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt

diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
index 822e59bef..e8f87e7dc 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
@@ -24,13 +24,7 @@ import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.convert
-import com.splendo.kaluga.scientific.unit.AccelerationUnits
-import com.splendo.kaluga.scientific.unit.ActionUnits
-import com.splendo.kaluga.scientific.unit.AmountOfSubstanceUnits
-import com.splendo.kaluga.scientific.unit.AngleUnits
-import com.splendo.kaluga.scientific.unit.AngularAccelerationUnits
-import com.splendo.kaluga.scientific.unit.AngularVelocityUnits
-import com.splendo.kaluga.scientific.unit.ScientificUnit
+import com.splendo.kaluga.scientific.unit.*
 
 data class QuantityDetails<Quantity: PhysicalQuantity>(
     val quantity: Quantity,
@@ -117,6 +111,58 @@ val PhysicalQuantity.details: QuantityDetails<*>? get() {
         is PhysicalQuantity.Angle -> QuantityDetails(this, AngleUnits, converters)
         is PhysicalQuantity.AngularAcceleration -> QuantityDetails(this, AngularAccelerationUnits, converters)
         is PhysicalQuantity.AngularVelocity -> QuantityDetails(this, AngularVelocityUnits, converters)
-        else -> null
+        is PhysicalQuantity.Area -> QuantityDetails(this, AreaUnits, converters)
+        is PhysicalQuantity.AreaDensity -> QuantityDetails(this, AreaDensityUnits, converters)
+        is PhysicalQuantity.CatalysticActivity -> QuantityDetails(this, CatalysticActivityUnits, converters)
+        is PhysicalQuantity.Density -> QuantityDetails(this, DensityUnits, converters)
+        is PhysicalQuantity.DynamicViscosity -> QuantityDetails(this, DynamicViscosityUnits, converters)
+        is PhysicalQuantity.ElectricCapacitance -> QuantityDetails(this, ElectricCapacitanceUnits, converters)
+        is PhysicalQuantity.ElectricCharge -> QuantityDetails(this, ElectricChargeUnits, converters)
+        is PhysicalQuantity.ElectricConductance -> QuantityDetails(this, ElectricConductanceUnits, converters)
+        is PhysicalQuantity.ElectricCurrent -> QuantityDetails(this, ElectricCurrentUnits, converters)
+        is PhysicalQuantity.ElectricInductance -> QuantityDetails(this, ElectricInductanceUnits, converters)
+        is PhysicalQuantity.ElectricResistance -> QuantityDetails(this, ElectricResistanceUnits, converters)
+        is PhysicalQuantity.Energy -> QuantityDetails(this, EnergyUnits, converters)
+        is PhysicalQuantity.Force -> QuantityDetails(this, ForceUnits, converters)
+        is PhysicalQuantity.Frequency -> QuantityDetails(this, FrequencyUnits, emptyList())
+        is PhysicalQuantity.HeatCapacity -> QuantityDetails(this, HeatCapacityUnits, emptyList())
+        is PhysicalQuantity.Illuminance -> QuantityDetails(this, IlluminanceUnits, emptyList())
+        is PhysicalQuantity.IonizingRadiationAbsorbedDose -> QuantityDetails(this, IonizingRadiationAbsorbedDoseUnits, emptyList())
+        is PhysicalQuantity.IonizingRadiationEquivalentDose -> QuantityDetails(this, IonizingRadiationEquivalentDoseUnits, emptyList())
+        is PhysicalQuantity.Jolt -> QuantityDetails(this, JoltUnits, emptyList())
+        is PhysicalQuantity.Length -> QuantityDetails(this, LengthUnits, emptyList())
+        is PhysicalQuantity.LinearMassDensity -> QuantityDetails(this, LinearMassDensityUnits, emptyList())
+        is PhysicalQuantity.Luminance -> QuantityDetails(this, LuminanceUnits, emptyList())
+        is PhysicalQuantity.LuminousEnergy -> QuantityDetails(this, LuminousEnergyUnits, emptyList())
+        is PhysicalQuantity.LuminousExposure -> QuantityDetails(this, LuminousExposureUnits, emptyList())
+        is PhysicalQuantity.LuminousFlux -> QuantityDetails(this, LuminousFluxUnits, emptyList())
+        is PhysicalQuantity.LuminousIntensity -> QuantityDetails(this, LuminousIntensityUnits, emptyList())
+        is PhysicalQuantity.MagneticFlux -> QuantityDetails(this, MagneticFluxUnits, emptyList())
+        is PhysicalQuantity.MagneticInduction -> QuantityDetails(this, MagneticInductionUnits, emptyList())
+        is PhysicalQuantity.MassFlowRate -> QuantityDetails(this, MassFlowRateUnits, emptyList())
+        is PhysicalQuantity.Molality -> QuantityDetails(this, MolalityUnits, emptyList())
+        is PhysicalQuantity.MolarEnergy -> QuantityDetails(this, MolarEnergyUnits, emptyList())
+        is PhysicalQuantity.Molarity -> QuantityDetails(this, MolarityUnits, emptyList())
+        is PhysicalQuantity.MolarMass -> QuantityDetails(this, MolarMassUnits, emptyList())
+        is PhysicalQuantity.MolarVolume -> QuantityDetails(this, MolarVolumeUnits, emptyList())
+        is PhysicalQuantity.Momentum -> QuantityDetails(this, MomentumUnits, emptyList())
+        is PhysicalQuantity.Power -> QuantityDetails(this, PowerUnits, emptyList())
+        is PhysicalQuantity.Pressure -> QuantityDetails(this, PressureUnits, emptyList())
+        is PhysicalQuantity.Radioactivity -> QuantityDetails(this, RadioactivityUnits, emptyList())
+        is PhysicalQuantity.SolidAngle -> QuantityDetails(this, SolidAngleUnits, emptyList())
+        is PhysicalQuantity.SpecificEnergy -> QuantityDetails(this, SpecificEnergyUnits, emptyList())
+        is PhysicalQuantity.SpecificHeatCapacity -> QuantityDetails(this, SpecificHeatCapacityUnits, emptyList())
+        is PhysicalQuantity.SpecificVolume -> QuantityDetails(this, SpecificVolumeUnits, emptyList())
+        is PhysicalQuantity.Speed -> QuantityDetails(this, SpeedUnits, emptyList())
+        is PhysicalQuantity.SurfaceTension -> QuantityDetails(this, SurfaceTensionUnits, emptyList())
+        is PhysicalQuantity.Temperature -> QuantityDetails(this, TemperatureUnits, emptyList())
+        is PhysicalQuantity.ThermalResistance -> QuantityDetails(this, ThermalResistanceUnits, emptyList())
+        is PhysicalQuantity.Time -> QuantityDetails(this, TimeUnits, emptyList())
+        is PhysicalQuantity.Voltage -> QuantityDetails(this, VoltageUnits, emptyList())
+        is PhysicalQuantity.Volume -> QuantityDetails(this, VolumeUnits, emptyList())
+        is PhysicalQuantity.VolumetricFlow -> QuantityDetails(this, VolumetricFlowUnits, emptyList())
+        is PhysicalQuantity.VolumetricFlux -> QuantityDetails(this, VolumetricFluxUnits, emptyList())
+        is PhysicalQuantity.Weight -> QuantityDetails(this, WeightUnits, emptyList())
+        is PhysicalQuantity.Yank -> QuantityDetails(this, YankUnits, emptyList())
     }
 }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
index 7b441fabf..f382016df 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
@@ -41,6 +41,16 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
     QuantityConverter("Force from Pressure", QuantityConverter.Type.Multiplication, PressureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareCentimeter && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is OunceSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is KipSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is KipSquareFoot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -78,4 +88,117 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
+    QuantityConverter("Linear Mass Density from Density", QuantityConverter.Type.Multiplication, DensityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricArea && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Linear Mass Density from Specific Volume", QuantityConverter.Type.Division, SpecificVolumeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricArea && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Energy from Luminous Exposure", QuantityConverter.Type.Multiplication, LuminousExposureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricArea && rightUnit is MetricLuminousExposure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialLuminousExposure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is LuminousExposure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Flux from Illuminance", QuantityConverter.Type.Multiplication, IlluminanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Area && rightUnit is Illuminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Intensity from Luminance", QuantityConverter.Type.Multiplication, LuminanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Area && rightUnit is Luminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Magnetic Flux from Magnetic Induction", QuantityConverter.Type.Multiplication, MagneticInductionUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is SquareCentimeter && rightUnit is Gauss -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is MagneticInduction -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Momentum from Dynamic Viscosity", QuantityConverter.Type.Multiplication, DynamicViscosityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricArea && rightUnit is MetricDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is UKImperialDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is USCustomaryDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is DynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Volume from Linear Mass Density", QuantityConverter.Type.Division, LinearMassDensityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricArea && rightUnit is MetricLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is UKImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is USCustomaryLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is LinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Volume from Length", QuantityConverter.Type.Multiplication, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is SquareMeter && rightUnit is Meter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareNanometer && rightUnit is Nanometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareMicrometer && rightUnit is Micrometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareMillimeter && rightUnit is Millimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareDecimeter && rightUnit is Decimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareDecameter && rightUnit is Decameter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareHectometer && rightUnit is Hectometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareKilometer && rightUnit is Kilometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareMegameter && rightUnit is Megameter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareGigameter && rightUnit is Gigameter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricArea && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareInch && rightUnit is Inch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareFoot && rightUnit is Foot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareYard && rightUnit is Yard -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareMile && rightUnit is Mile -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Acre && rightUnit is Inch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Acre && rightUnit is Foot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Volumetric Flow from Volumetric Flux", QuantityConverter.Type.Multiplication, VolumetricFluxUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricArea && rightUnit is MetricVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is UKImperialVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is USCustomaryVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is VolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Area Density", QuantityConverter.Type.Multiplication, AreaDensityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricArea && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is UKImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialArea && rightUnit is USCustomaryAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Area && rightUnit is AreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    }
 )
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
new file mode 100644
index 000000000..1a0a0df94
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
@@ -0,0 +1,85 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.areaDensity.div
+import com.splendo.kaluga.scientific.converter.areaDensity.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<PhysicalQuantity.AreaDensity, *, *>>(
+    QuantityConverter("Density from Length", QuantityConverter.Type.Division, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAreaDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is AreaDensity && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Specific Volume", QuantityConverter.Type.Multiplication, SpecificVolumeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAreaDensity && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialAreaDensity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialAreaDensity && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialAreaDensity && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialAreaDensity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialAreaDensity && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryAreaDensity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryAreaDensity && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is AreaDensity && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Density", QuantityConverter.Type.Division, DensityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAreaDensity && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialAreaDensity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialAreaDensity && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialAreaDensity && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialAreaDensity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialAreaDensity && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryAreaDensity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryAreaDensity && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is AreaDensity && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Linear Mass Density from Length", QuantityConverter.Type.Division, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAreaDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is AreaDensity && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Area", QuantityConverter.Type.Division, AreaUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAreaDensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialAreaDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialAreaDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryAreaDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is AreaDensity && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
+        }
+    },
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
new file mode 100644
index 000000000..00823d527
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
@@ -0,0 +1,34 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+  
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.catalysticActivity.times
+import com.splendo.kaluga.scientific.unit.CatalysticActivity
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.TimeUnits
+
+val PhysicalQuantity.CatalysticActivity.converters get() = listOf<QuantityConverter<PhysicalQuantity.CatalysticActivity, *, *>>(
+    QuantityConverter("Amount of Substance from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is CatalysticActivity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
new file mode 100644
index 000000000..066984810
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
@@ -0,0 +1,101 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+  
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.density.div
+import com.splendo.kaluga.scientific.converter.density.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<PhysicalQuantity.Density, *, *>>(
+    QuantityConverter("Area Density from Length", QuantityConverter.Type.Multiplication, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Density && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Linear Mass Density from Area", QuantityConverter.Type.Multiplication, AreaUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Density && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molarity from Molality", QuantityConverter.Type.Multiplication, MolalityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDensity && rightUnit is MetricMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDensity && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDensity && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDensity && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Density && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molarity from Molar Mass", QuantityConverter.Type.Division, MolarMassUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDensity && rightUnit is MetricMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDensity && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDensity && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDensity && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Density && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Mass from Molarity", QuantityConverter.Type.Division, MolarityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDensity && rightUnit is MetricMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDensity && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDensity && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDensity && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Density && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molarity from Molar Volume", QuantityConverter.Type.Multiplication, MolarVolumeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDensity && rightUnit is MetricMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDensity && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDensity && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDensity && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Density && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Volume", QuantityConverter.Type.Multiplication, VolumeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDensity && rightUnit is MetricVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDensity && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDensity && rightUnit is UKImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDensity && rightUnit is USCustomaryVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDensity && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDensity && rightUnit is UKImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDensity && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDensity && rightUnit is USCustomaryVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Density && rightUnit is Volume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
new file mode 100644
index 000000000..6fcb4c21c
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
@@ -0,0 +1,65 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.dynamicViscosity.div
+import com.splendo.kaluga.scientific.converter.dynamicViscosity.times
+import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.AreaUnits
+import com.splendo.kaluga.scientific.unit.DynamicViscosity
+import com.splendo.kaluga.scientific.unit.ImperialArea
+import com.splendo.kaluga.scientific.unit.ImperialDynamicViscosity
+import com.splendo.kaluga.scientific.unit.MetricArea
+import com.splendo.kaluga.scientific.unit.MetricDynamicViscosity
+import com.splendo.kaluga.scientific.unit.Pressure
+import com.splendo.kaluga.scientific.unit.PressureUnits
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.TimeUnits
+import com.splendo.kaluga.scientific.unit.UKImperialDynamicViscosity
+import com.splendo.kaluga.scientific.unit.USCustomaryDynamicViscosity
+
+val PhysicalQuantity.DynamicViscosity.converters get() = listOf<QuantityConverter<PhysicalQuantity.DynamicViscosity, *, *>>(
+    QuantityConverter("Momentum from Area", QuantityConverter.Type.Multiplication, AreaUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDynamicViscosity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDynamicViscosity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDynamicViscosity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDynamicViscosity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DynamicViscosity && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Pressure from Time", QuantityConverter.Type.Division, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDynamicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDynamicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDynamicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDynamicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DynamicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Pressure", QuantityConverter.Type.Division, PressureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is DynamicViscosity && rightUnit is Pressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
new file mode 100644
index 000000000..e059ba5c0
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
@@ -0,0 +1,54 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.electricCapacitance.times
+import com.splendo.kaluga.scientific.unit.Abfarad
+import com.splendo.kaluga.scientific.unit.Abvolt
+import com.splendo.kaluga.scientific.unit.ElectricCapacitance
+import com.splendo.kaluga.scientific.unit.ElectricResistance
+import com.splendo.kaluga.scientific.unit.ElectricResistanceUnits
+import com.splendo.kaluga.scientific.unit.Frequency
+import com.splendo.kaluga.scientific.unit.FrequencyUnits
+import com.splendo.kaluga.scientific.unit.Voltage
+import com.splendo.kaluga.scientific.unit.VoltageUnits
+
+val PhysicalQuantity.ElectricCapacitance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCapacitance, *, *>>(
+    QuantityConverter("Electric Charge from voltage", QuantityConverter.Type.Multiplication, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abfarad && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCapacitance && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Conductance from Frequency", QuantityConverter.Type.Multiplication, FrequencyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abfarad && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCapacitance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Electric Resistance", QuantityConverter.Type.Multiplication, ElectricResistanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is ElectricCapacitance && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
new file mode 100644
index 000000000..e7898c3b8
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
@@ -0,0 +1,82 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.electricCharge.div
+import com.splendo.kaluga.scientific.converter.electricCharge.times
+import com.splendo.kaluga.scientific.unit.Abcoulomb
+import com.splendo.kaluga.scientific.unit.Abfarad
+import com.splendo.kaluga.scientific.unit.Abohm
+import com.splendo.kaluga.scientific.unit.Abvolt
+import com.splendo.kaluga.scientific.unit.ElectricCapacitance
+import com.splendo.kaluga.scientific.unit.ElectricCapacitanceUnits
+import com.splendo.kaluga.scientific.unit.ElectricCharge
+import com.splendo.kaluga.scientific.unit.ElectricCurrent
+import com.splendo.kaluga.scientific.unit.ElectricCurrentUnits
+import com.splendo.kaluga.scientific.unit.ElectricResistance
+import com.splendo.kaluga.scientific.unit.ElectricResistanceUnits
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.TimeUnits
+import com.splendo.kaluga.scientific.unit.Voltage
+import com.splendo.kaluga.scientific.unit.VoltageUnits
+
+val PhysicalQuantity.ElectricCharge.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCharge, *, *>>(
+    QuantityConverter("Electric Charge from Voltage", QuantityConverter.Type.Division, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abcoulomb && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCharge && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Current from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abcoulomb && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCharge && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Voltage", QuantityConverter.Type.Multiplication, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abcoulomb && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCharge && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Magnetic Flux from Electric Resistance", QuantityConverter.Type.Multiplication, ElectricResistanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abcoulomb && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCharge && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Electric Current", QuantityConverter.Type.Division, ElectricCurrentUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is ElectricCharge && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Voltage from Electric Capacitance", QuantityConverter.Type.Division, ElectricCapacitanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abcoulomb && rightUnit is Abfarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCharge && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
new file mode 100644
index 000000000..a4ad80351
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
@@ -0,0 +1,55 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.electricConductance.div
+import com.splendo.kaluga.scientific.converter.electricConductance.times
+import com.splendo.kaluga.scientific.unit.Absiemens
+import com.splendo.kaluga.scientific.unit.Abvolt
+import com.splendo.kaluga.scientific.unit.ElectricCapacitance
+import com.splendo.kaluga.scientific.unit.ElectricCapacitanceUnits
+import com.splendo.kaluga.scientific.unit.ElectricConductance
+import com.splendo.kaluga.scientific.unit.Frequency
+import com.splendo.kaluga.scientific.unit.FrequencyUnits
+import com.splendo.kaluga.scientific.unit.Voltage
+import com.splendo.kaluga.scientific.unit.VoltageUnits
+
+val PhysicalQuantity.ElectricConductance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricConductance, *, *>>(
+    QuantityConverter("Electric Capacitance from Frequency", QuantityConverter.Type.Division, FrequencyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Absiemens && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricConductance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Current from Voltage", QuantityConverter.Type.Division, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Absiemens && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricConductance && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Frequency from Electric Capacitance", QuantityConverter.Type.Division, ElectricCapacitanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is ElectricConductance && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
new file mode 100644
index 000000000..c7dc0c4a7
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
@@ -0,0 +1,83 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.electricCurrent.div
+import com.splendo.kaluga.scientific.converter.electricCurrent.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCurrent, *, *>>(
+    QuantityConverter("Electric Charge from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abampere && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Biot && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCurrent && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Charge from Time", QuantityConverter.Type.Division, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abampere && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Biot && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCurrent && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Magnetic Flux", QuantityConverter.Type.Multiplication, MagneticFluxUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abampere && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Biot && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCurrent && rightUnit is MagneticFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Magnetic Flux from Electric Inductance", QuantityConverter.Type.Multiplication, ElectricInductanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abampere && rightUnit is Abhenry -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Biot && rightUnit is Abhenry -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCurrent && rightUnit is ElectricInductance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Power from Voltage", QuantityConverter.Type.Multiplication, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abampere && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Biot && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCurrent && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Voltage from Electric Conductance", QuantityConverter.Type.Division, ElectricConductanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abampere && rightUnit is Absiemens -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Biot && rightUnit is Absiemens -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCurrent && rightUnit is ElectricConductance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Voltage from Electric Resistance", QuantityConverter.Type.Multiplication, ElectricResistanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abampere && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Biot && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricCurrent && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt
new file mode 100644
index 000000000..69c7e628a
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt
@@ -0,0 +1,55 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.electricInductance.div
+import com.splendo.kaluga.scientific.converter.electricInductance.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.ElectricInductance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricInductance, *, *>>(
+    QuantityConverter("Electric Resistance from Frequency", QuantityConverter.Type.Multiplication, FrequencyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abhenry && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricInductance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Resistance from Time", QuantityConverter.Type.Division, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abhenry && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricInductance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Magnetic Flux from Electric Current", QuantityConverter.Type.Multiplication, ElectricCurrentUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abhenry && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Abhenry && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricInductance && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Electric Resistance", QuantityConverter.Type.Division, ElectricResistanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is ElectricInductance && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
new file mode 100644
index 000000000..5a7d1ee0d
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
@@ -0,0 +1,84 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.electricResistance.div
+import com.splendo.kaluga.scientific.converter.electricResistance.times
+import com.splendo.kaluga.scientific.unit.Abampere
+import com.splendo.kaluga.scientific.unit.Abcoulomb
+import com.splendo.kaluga.scientific.unit.Abohm
+import com.splendo.kaluga.scientific.unit.Biot
+import com.splendo.kaluga.scientific.unit.ElectricCapacitance
+import com.splendo.kaluga.scientific.unit.ElectricCapacitanceUnits
+import com.splendo.kaluga.scientific.unit.ElectricCharge
+import com.splendo.kaluga.scientific.unit.ElectricChargeUnits
+import com.splendo.kaluga.scientific.unit.ElectricCurrent
+import com.splendo.kaluga.scientific.unit.ElectricCurrentUnits
+import com.splendo.kaluga.scientific.unit.ElectricInductance
+import com.splendo.kaluga.scientific.unit.ElectricInductanceUnits
+import com.splendo.kaluga.scientific.unit.ElectricResistance
+import com.splendo.kaluga.scientific.unit.Frequency
+import com.splendo.kaluga.scientific.unit.FrequencyUnits
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.TimeUnits
+
+val PhysicalQuantity.ElectricResistance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricResistance, *, *>>(
+    QuantityConverter("Electric Inductance from Frequency", QuantityConverter.Type.Division, FrequencyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abohm && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricResistance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Inductance from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abohm && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricResistance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Frequency from Electric Inductance", QuantityConverter.Type.Division, ElectricInductanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is ElectricResistance && rightUnit is ElectricInductance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Magnetic Flux from Electric Charge", QuantityConverter.Type.Multiplication, ElectricChargeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abohm && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricResistance && rightUnit is ElectricCharge -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Electric Capacitance", QuantityConverter.Type.Multiplication, ElectricCapacitanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is ElectricResistance && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Voltage from Electric Current", QuantityConverter.Type.Multiplication, ElectricCurrentUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abohm && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Abohm && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ElectricResistance && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
new file mode 100644
index 000000000..252f13450
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
@@ -0,0 +1,1088 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.energy.absorbedBy
+import com.splendo.kaluga.scientific.converter.energy.div
+import com.splendo.kaluga.scientific.converter.energy.equivalentDoseBy
+import com.splendo.kaluga.scientific.converter.energy.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<PhysicalQuantity.Energy, *, *>>(
+    QuantityConverter("Action from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndImperialEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Amount of Substance from Molar Energy", QuantityConverter.Type.Division, MolarEnergyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Energy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Area from Surface Tension", QuantityConverter.Type.Division, SurfaceTensionUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForce && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForce && rightUnit is UKImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForce && rightUnit is USCustomarySurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchOunceForce && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchOunceForce && rightUnit is UKImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchOunceForce && rightUnit is USCustomarySurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is UKImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is USCustomarySurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricEnergy && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is UKImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is USCustomarySurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is SurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Charge from Voltage", QuantityConverter.Type.Division, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Current from Magnetic Flux", QuantityConverter.Type.Division, MagneticFluxUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is MagneticFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Force from Length", QuantityConverter.Type.Division, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundal && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchOunceForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Heat Capacity from Temperature", QuantityConverter.Type.Division, TemperatureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndImperialEnergy && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is USCustomaryTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricEnergy && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is USCustomaryTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Temperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Ionizing Radiation Absorbed Dose from Weight", QuantityConverter.Type.Custom("absorbed by"), WeightUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Ionizing Radiation Equivalent Dose from Weight", QuantityConverter.Type.Custom("absorbed by"), WeightUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Force", QuantityConverter.Type.Division, ForceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Nanoerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Microerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Millierg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Centierg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Decierg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Decaerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Hectoerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Kiloerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Megaerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Gigaerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is FootPoundal && rightUnit is Poundal -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundForce && rightUnit is PoundForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForce && rightUnit is PoundForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchOunceForce && rightUnit is OunceForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is UKImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is USCustomaryForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is UKImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is USCustomaryForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Force -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Magnetic Flux from Electric Current", QuantityConverter.Type.Division, ElectricCurrentUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Energy from Amount of Substance", QuantityConverter.Type.Division, AmountOfSubstanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndImperialEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Power from Time", QuantityConverter.Type.Division, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is WattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Joule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanojoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microjoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millijoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centijoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decijoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decajoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectojoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilojoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megajoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigajoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Erg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is FootPoundal && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundal && rightUnit is Minute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundForce && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundForce && rightUnit is Minute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForce && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForce && rightUnit is Minute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchOunceForce && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchOunceForce && rightUnit is Minute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnit && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnit && rightUnit is Minute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnit && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Pressure from Volume", QuantityConverter.Type.Division, VolumeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundal && rightUnit is CubicFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundForce && rightUnit is CubicFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is UKImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is USCustomaryVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is UKImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is USCustomaryVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Volume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Energy from Weight", QuantityConverter.Type.Division, WeightUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndImperialEnergy && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricEnergy && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Surface Tension from Area", QuantityConverter.Type.Division, AreaUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundal && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForce && rightUnit is SquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchOunceForce && rightUnit is SquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Temperature from Heat Capacity", QuantityConverter.Type.Division, HeatCapacityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndImperialEnergy && rightUnit is MetricAndUKImperialHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is MetricHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is UKImperialHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is USCustomaryHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricEnergy && rightUnit is MetricHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is MetricAndUKImperialHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is UKImperialHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is USCustomaryHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is HeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Power", QuantityConverter.Type.Division, PowerUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is WattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is NanowattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is NanowattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is MicrowattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MicrowattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is MilliwattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilliwattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is CentiwattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CentiwattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is DeciwattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DeciwattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is DecawattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DecawattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is HectowattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HectowattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is KilowattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilowattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is MegawattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MegawattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is GigawattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GigawattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is HorsepowerHour && rightUnit is Horsepower -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundForce && rightUnit is FootPoundForcePerMinute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForce && rightUnit is InchPoundForcePerMinute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnit && rightUnit is BritishThermalUnitPerHour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnit && rightUnit is BritishThermalUnitPerMinute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Power -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Voltage from Electric Charge", QuantityConverter.Type.Division, ElectricChargeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is ElectricCharge -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Volume from Pressure", QuantityConverter.Type.Division, PressureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Nanoerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Microerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Millierg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Centierg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Decierg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Decaerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Hectoerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Kiloerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Megaerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Gigaerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is FootPoundal && rightUnit is PoundSquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForce && rightUnit is PoundSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchOunceForce && rightUnit is PoundSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is UKImperialPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is USCustomaryPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is UKImperialPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is USCustomaryPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is Pressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Ionizing Radiation Absorbed Dose", QuantityConverter.Type.Division, IonizingRadiationAbsorbedDoseUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Nanoerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Microerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Millierg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Centierg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Decierg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Decaerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Hectoerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Kiloerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Megaerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Gigaerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Energy && rightUnit is IonizingRadiationAbsorbedDose -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Ionizing Radiation Equivalent Dose", QuantityConverter.Type.Division, IonizingRadiationEquivalentDoseUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Erg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Erg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Nanoerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanoerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Microerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Millierg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millierg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Centierg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centierg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Decierg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decierg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Decaerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decaerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Hectoerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectoerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Kiloerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kiloerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Megaerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megaerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Gigaerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigaerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Energy && rightUnit is IonizingRadiationEquivalentDose -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+        QuantityConverter("Weight from Specific Energy", QuantityConverter.Type.Division, SpecificEnergyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndImperialEnergy && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is UKImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialEnergy && rightUnit is USCustomarySpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricEnergy && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is UKImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialEnergy && rightUnit is USCustomarySpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Energy && rightUnit is SpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
new file mode 100644
index 000000000..ab7b834bc
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
@@ -0,0 +1,379 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.force.div
+import com.splendo.kaluga.scientific.converter.force.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQuantity.Force, *, *>>(
+    QuantityConverter("Acceleration from Weight", QuantityConverter.Type.Division, WeightUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Dyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Force && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Area from Pressure", QuantityConverter.Type.Division, PressureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Dyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Dyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Dyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Dyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Dyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Dyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Dyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Dyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Dyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Dyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Dyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Nanodyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Microdyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Millidyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Centidyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Decidyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Decadyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Hectodyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Kilodyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Megadyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is Gigadyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+
+            leftUnit is PoundForce && rightUnit is PoundSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is PoundForce && rightUnit is PoundSquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is PoundForce && rightUnit is KiloPoundSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is OunceForce && rightUnit is OunceSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kip && rightUnit is KipSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kip && rightUnit is KipSquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UsTonForce && rightUnit is USTonSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UsTonForce && rightUnit is USTonSquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialTonForce && rightUnit is ImperialTonSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialTonForce && rightUnit is ImperialTonSquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is UKImperialPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is USCustomaryPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is UKImperialPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is USCustomaryPressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Force && rightUnit is Pressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Length", QuantityConverter.Type.Multiplication, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Dyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricForce && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Poundal && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Force && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Surface Tension", QuantityConverter.Type.Division, SurfaceTensionUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricForce && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is UKImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is USCustomarySurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is UKImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is USCustomarySurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Force && rightUnit is SurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Momentum from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Dyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is TonneForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GramForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilligramForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Poundal && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is OunceForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GrainForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UsTonForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialTonForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Force && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Power from Speed", QuantityConverter.Type.Multiplication, SpeedUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Dyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Force && rightUnit is Speed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Pressure from Area", QuantityConverter.Type.Division, AreaUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Dyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Poundal && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Poundal && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is PoundForce && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is PoundForce && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is OunceForce && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GrainForce && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kip && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kip && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UsTonForce && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UsTonForce && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialTonForce && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialTonForce && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Force && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Surface Tension from Length", QuantityConverter.Type.Division, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricForce && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Force && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Yank", QuantityConverter.Type.Division, YankUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Force && rightUnit is Yank -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Acceleration", QuantityConverter.Type.Division, AccelerationUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Dyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanodyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microdyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millidyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centidyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decidyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decadyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectodyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilodyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megadyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigadyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KilogramForce && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GramForce && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MilligramForce && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is TonneForce && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricForce && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is OunceForce && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is OunceForce && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is GrainForce && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UsTonForce && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialTonForce && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Force && rightUnit is Acceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Yank from Time", QuantityConverter.Type.Division, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Force && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
index e17fab5ba..c6e89f707 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
@@ -117,7 +117,7 @@ class ScientificViewModel(
         coroutineScope.launch {
             alertPresenterBuilder.buildActionSheet(coroutineScope) {
                 setTitle("Select Quantity")
-                addActions(quantityDetails.map { Alert.Action(it.quantity::class.simpleName.orEmpty()) { currentQuantityDetails.value = it } })
+                addActions(quantityDetails.map { Alert.Action(it.quantity::class.simpleName.orEmpty().split("(?=\\p{Upper})".toRegex()).joinToString(" ")) { currentQuantityDetails.value = it } })
             }.show()
         }
     }
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt
index ca6908ee7..dde680fdd 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt
@@ -30,6 +30,7 @@ import com.splendo.kaluga.scientific.unit.KipSquareFoot
 import com.splendo.kaluga.scientific.unit.KipSquareInch
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
+import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
 import com.splendo.kaluga.scientific.unit.Pressure
 import com.splendo.kaluga.scientific.unit.SquareCentimeter
@@ -46,7 +47,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Area, SquareCentimeter>.time
 @JvmName("squareCentimeterTimesBaryeMultiple")
 infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Area, SquareCentimeter>.times(
     pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>
-) where BaryeUnit : Pressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
     pressure * this
 
 @JvmName("imperialAreaTimesOunceSquareInch")
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToVolumetricFlow.kt b/scientific/src/commonMain/kotlin/converter/area/convertToVolumetricFlow.kt
index 6e3da13fd..c272d8fe1 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToVolumetricFlow.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToVolumetricFlow.kt
@@ -35,17 +35,17 @@ infix operator fun <AreaUnit : MetricArea> ScientificValue<PhysicalQuantity.Area
     volumetricFlux: ScientificValue<PhysicalQuantity.VolumetricFlux, MetricVolumetricFlux>
 ) = volumetricFlux * this
 
-@JvmName("imperialAreaTimesImperialArea")
+@JvmName("imperialAreaTimesImperialVolumetricFlux")
 infix operator fun <AreaUnit : ImperialArea> ScientificValue<PhysicalQuantity.Area, AreaUnit>.times(
     volumetricFlux: ScientificValue<PhysicalQuantity.VolumetricFlux, ImperialVolumetricFlux>
 ) = volumetricFlux * this
 
-@JvmName("imperialAreaTimesUKImperialArea")
+@JvmName("imperialAreaTimesUKImperialVolumetricFlux")
 infix operator fun <AreaUnit : ImperialArea> ScientificValue<PhysicalQuantity.Area, AreaUnit>.times(
     volumetricFlux: ScientificValue<PhysicalQuantity.VolumetricFlux, UKImperialVolumetricFlux>
 ) = volumetricFlux * this
 
-@JvmName("imperialAreaTimesUSCustomaryArea")
+@JvmName("imperialAreaTimesUSCustomaryVolumetricFlux")
 infix operator fun <AreaUnit : ImperialArea> ScientificValue<PhysicalQuantity.Area, AreaUnit>.times(
     volumetricFlux: ScientificValue<PhysicalQuantity.VolumetricFlux, USCustomaryVolumetricFlux>
 ) = volumetricFlux * this
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/area/convertToWeight.kt
index 519a8deda..24215f931 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToWeight.kt
@@ -30,7 +30,7 @@ import com.splendo.kaluga.scientific.unit.UKImperialAreaDensity
 import com.splendo.kaluga.scientific.unit.USCustomaryAreaDensity
 import kotlin.jvm.JvmName
 
-@JvmName("metricAreaTimesMetricAreaDenisty")
+@JvmName("metricAreaTimesMetricAreaDensity")
 infix operator fun <AreaUnit : MetricArea> ScientificValue<PhysicalQuantity.Area, AreaUnit>.times(
     areaDensity: ScientificValue<PhysicalQuantity.AreaDensity, MetricAreaDensity>
 ) = areaDensity * this
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt
index 08cc6f1e9..585a19944 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt
@@ -28,6 +28,7 @@ import com.splendo.kaluga.scientific.unit.InchOunceForce
 import com.splendo.kaluga.scientific.unit.InchPoundForce
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MetricSurfaceTension
 import com.splendo.kaluga.scientific.unit.SquareCentimeter
@@ -44,7 +45,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(surfaceTens
     SquareCentimeter.area(this, surfaceTension)
 
 @JvmName("ergMultipleDivMetricSurfaceTension")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(surfaceTension: ScientificValue<PhysicalQuantity.SurfaceTension, MetricSurfaceTension>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(surfaceTension: ScientificValue<PhysicalQuantity.SurfaceTension, MetricSurfaceTension>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     SquareCentimeter.area(this, surfaceTension)
 
 @JvmName("metricAndImperialEnergyDivMetricSurfaceTension")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt
index e522a81aa..9d702d12b 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt
@@ -26,6 +26,7 @@ import com.splendo.kaluga.scientific.unit.Coulomb
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Voltage
 import kotlin.jvm.JvmName
@@ -35,7 +36,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(voltage: Sc
     Abcoulomb.charge(this, voltage)
 
 @JvmName("ergMultipleDivAbvolt")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(voltage: ScientificValue<PhysicalQuantity.Voltage, Abvolt>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(voltage: ScientificValue<PhysicalQuantity.Voltage, Abvolt>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Abcoulomb.charge(this, voltage)
 
 @JvmName("energyDivVoltage")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt
index bb41cf0ea..b81a733ea 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt
@@ -27,6 +27,7 @@ import com.splendo.kaluga.scientific.unit.Erg
 import com.splendo.kaluga.scientific.unit.MagneticFlux
 import com.splendo.kaluga.scientific.unit.Maxwell
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import kotlin.jvm.JvmName
 
@@ -35,7 +36,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(flux: Scien
     Abampere.current(this, flux)
 
 @JvmName("ergMultipleDivMaxwell")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(flux: ScientificValue<PhysicalQuantity.MagneticFlux, Maxwell>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(flux: ScientificValue<PhysicalQuantity.MagneticFlux, Maxwell>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Abampere.current(this, flux)
 
 @JvmName("energyDivFlux")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt
index 2f78dff70..e8c7badd6 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt
@@ -32,6 +32,7 @@ import com.splendo.kaluga.scientific.unit.InchOunceForce
 import com.splendo.kaluga.scientific.unit.Length
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricLength
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Newton
@@ -45,7 +46,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(distance: S
     Dyne.force(this, distance)
 
 @JvmName("ergMultipleDivCentimeter")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(distance: ScientificValue<PhysicalQuantity.Length, Centimeter>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(distance: ScientificValue<PhysicalQuantity.Length, Centimeter>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Dyne.force(this, distance)
 
 @JvmName("metricAndImperialEnergyDivMetricLength")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt
index 9429501d7..4b0943c49 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt
@@ -25,6 +25,7 @@ import com.splendo.kaluga.scientific.unit.Erg
 import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.Gray
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Rad
 import com.splendo.kaluga.scientific.unit.Weight
@@ -35,7 +36,7 @@ infix fun ScientificValue<PhysicalQuantity.Energy, Erg>.absorbedBy(gram: Scienti
     Rad.absorbedDose(this, gram)
 
 @JvmName("ergMultipleAbsorbedByGram")
-infix fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.absorbedBy(gram: ScientificValue<PhysicalQuantity.Weight, Gram>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.absorbedBy(gram: ScientificValue<PhysicalQuantity.Weight, Gram>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Rad.absorbedDose(this, gram)
 
 @JvmName("energyAbsorbedByWeight")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt
index 5a33dca98..681aa8f66 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt
@@ -24,6 +24,7 @@ import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
 import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.RoentgenEquivalentMan
 import com.splendo.kaluga.scientific.unit.Sievert
@@ -35,7 +36,7 @@ infix fun ScientificValue<PhysicalQuantity.Energy, Erg>.equivalentDoseBy(gram: S
     RoentgenEquivalentMan.equivalentDose(this, gram)
 
 @JvmName("ergMultipleEquivalentDoseByGram")
-infix fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.equivalentDoseBy(gram: ScientificValue<PhysicalQuantity.Weight, Gram>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.equivalentDoseBy(gram: ScientificValue<PhysicalQuantity.Weight, Gram>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     RoentgenEquivalentMan.equivalentDose(this, gram)
 
 @JvmName("energyEquivalentDoseByWeight")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt
index 900853716..79bcd9240 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt
@@ -36,6 +36,8 @@ import com.splendo.kaluga.scientific.unit.InchPoundForce
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Meter
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
+import com.splendo.kaluga.scientific.unit.MetricEnergy
+import com.splendo.kaluga.scientific.unit.MetricForce
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.PoundForce
@@ -49,15 +51,15 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(force: Scie
     Centimeter.distance(this, force)
 
 @JvmName("ergMultipleDivDyne")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(force: ScientificValue<PhysicalQuantity.Force, Dyne>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(force: ScientificValue<PhysicalQuantity.Force, Dyne>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Centimeter.distance(this, force)
 
 @JvmName("ergDivDyneMultiple")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Energy, Erg>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Energy, Erg>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
     Centimeter.distance(this, force)
 
 @JvmName("ergMultipleDivDyneMultiple")
-infix operator fun <ErgUnit, DyneUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>, DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <ErgUnit, DyneUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>, DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
     Centimeter.distance(this, force)
 
 @JvmName("footPoundalDivPoundal")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt
index 3b030f1a1..3aac390ca 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt
@@ -27,6 +27,7 @@ import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
 import com.splendo.kaluga.scientific.unit.Maxwell
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Weber
 import kotlin.jvm.JvmName
@@ -36,7 +37,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(current: Sc
     Maxwell.flux(this, current)
 
 @JvmName("ergMultipleDivAbampere")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(current: ScientificValue<PhysicalQuantity.ElectricCurrent, Abampere>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(current: ScientificValue<PhysicalQuantity.ElectricCurrent, Abampere>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Maxwell.flux(this, current)
 
 @JvmName("ergDivBiot")
@@ -44,7 +45,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(current: Sc
     Maxwell.flux(this, current)
 
 @JvmName("ergMultipleDivBiot")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(current: ScientificValue<PhysicalQuantity.ElectricCurrent, Biot>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(current: ScientificValue<PhysicalQuantity.ElectricCurrent, Biot>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Maxwell.flux(this, current)
 
 @JvmName("energyDivCurrent")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt
index 2529c918d..17d512051 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt
@@ -62,6 +62,7 @@ import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Megajoule
 import com.splendo.kaluga.scientific.unit.Megawatt
 import com.splendo.kaluga.scientific.unit.MegawattHour
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Microjoule
 import com.splendo.kaluga.scientific.unit.Microwatt
@@ -174,7 +175,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(time: Scien
     ErgPerSecond.power(this, time)
 
 @JvmName("ergMultipleDivSecond")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(time: ScientificValue<PhysicalQuantity.Time, Second>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(time: ScientificValue<PhysicalQuantity.Time, Second>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     ErgPerSecond.power(this, time)
 
 @JvmName("footPoundalDivSecond")
@@ -225,6 +226,11 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, BritishThermalUnit>.
 infix operator fun ScientificValue<PhysicalQuantity.Energy, BritishThermalUnit>.div(time: ScientificValue<PhysicalQuantity.Time, Second>) =
     BritishThermalUnitPerSecond.power(this, time)
 
+@JvmName("metricEnergyDivTime")
+infix operator fun <EnergyUnit : MetricEnergy, TimeUnit : Time> ScientificValue<PhysicalQuantity.Energy, EnergyUnit>.div(
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = Watt.metric.power(this, time)
+
 @JvmName("imperialEnergyDivTime")
 infix operator fun <EnergyUnit : ImperialEnergy, TimeUnit : Time> ScientificValue<PhysicalQuantity.Energy, EnergyUnit>.div(
     time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt
index 85dd535dc..02a904139 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt
@@ -31,6 +31,7 @@ import com.splendo.kaluga.scientific.unit.ImperialEnergy
 import com.splendo.kaluga.scientific.unit.ImperialVolume
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Pascal
 import com.splendo.kaluga.scientific.unit.PoundSquareFoot
@@ -47,7 +48,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(volume: Sci
     Barye.pressure(this, volume)
 
 @JvmName("ergMultipleDivCubicCentimeter")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(volume: ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(volume: ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Barye.pressure(this, volume)
 
 @JvmName("footPoundalDivCubicFoot")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt
index c9a30bc2d..a377e8132 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt
@@ -36,6 +36,7 @@ import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Meter
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
 import com.splendo.kaluga.scientific.unit.MetricArea
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Newton
 import com.splendo.kaluga.scientific.unit.OunceForce
@@ -52,7 +53,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(area: Scien
     (Dyne per Centimeter).surfaceTension(this, area)
 
 @JvmName("ergMultipleDivSquareCentimeter")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     (Dyne per Centimeter).surfaceTension(this, area)
 
 @JvmName("metricAndImperialEnergyDivMetricArea")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt
index 00e113b30..56eff540a 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt
@@ -32,6 +32,8 @@ import com.splendo.kaluga.scientific.unit.Hour
 import com.splendo.kaluga.scientific.unit.InchPoundForce
 import com.splendo.kaluga.scientific.unit.InchPoundForcePerMinute
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
+import com.splendo.kaluga.scientific.unit.MetricAndImperialPower
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Minute
 import com.splendo.kaluga.scientific.unit.Power
@@ -45,17 +47,17 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, WattHour>.div(power:
     Hour.time(this, power)
 
 @JvmName("wattHourMultipleDivWatt")
-infix operator fun <WattHourUnit> ScientificValue<PhysicalQuantity.Energy, WattHourUnit>.div(power: ScientificValue<PhysicalQuantity.Power, Watt>) where WattHourUnit : Energy, WattHourUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> =
+infix operator fun <WattHourUnit> ScientificValue<PhysicalQuantity.Energy, WattHourUnit>.div(power: ScientificValue<PhysicalQuantity.Power, Watt>) where WattHourUnit : MetricAndImperialEnergy, WattHourUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> =
     Hour.time(this, power)
 
 @JvmName("wattHourDivWattMultiple")
-infix operator fun <WattUnit> ScientificValue<PhysicalQuantity.Energy, WattHour>.div(power: ScientificValue<PhysicalQuantity.Power, WattUnit>) where WattUnit : Power, WattUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> =
+infix operator fun <WattUnit> ScientificValue<PhysicalQuantity.Energy, WattHour>.div(power: ScientificValue<PhysicalQuantity.Power, WattUnit>) where WattUnit : MetricAndImperialPower, WattUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> =
     Hour.time(this, power)
 
 @JvmName("wattHourMultipleDivWattMultiple")
 infix operator fun <WattHourUnit, WattUnit> ScientificValue<PhysicalQuantity.Energy, WattHourUnit>.div(
     power: ScientificValue<PhysicalQuantity.Power, WattUnit>
-) where WattHourUnit : Energy, WattHourUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour>, WattUnit : Power, WattUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> =
+) where WattHourUnit : MetricAndImperialEnergy, WattHourUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour>, WattUnit : MetricAndImperialPower, WattUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> =
     Hour.time(this, power)
 
 @JvmName("horsepowerHourDivHorsepower")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt
index b97512eb9..2ba881ec7 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt
@@ -26,6 +26,7 @@ import com.splendo.kaluga.scientific.unit.ElectricCharge
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Volt
 import kotlin.jvm.JvmName
@@ -35,7 +36,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(charge: Sci
     Abvolt.voltage(this, charge)
 
 @JvmName("ergMultipleDivAbcoulomb")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(charge: ScientificValue<PhysicalQuantity.ElectricCharge, Abcoulomb>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(charge: ScientificValue<PhysicalQuantity.ElectricCharge, Abcoulomb>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Abvolt.voltage(this, charge)
 
 @JvmName("energyDivCharge")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt
index 2d366ee50..5ac89c5e3 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt
@@ -34,7 +34,9 @@ import com.splendo.kaluga.scientific.unit.InchOunceForce
 import com.splendo.kaluga.scientific.unit.InchPoundForce
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
+import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
+import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.PoundSquareFoot
 import com.splendo.kaluga.scientific.unit.PoundSquareInch
 import com.splendo.kaluga.scientific.unit.Pressure
@@ -49,17 +51,17 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(pressure: S
     CubicCentimeter.volume(this, pressure)
 
 @JvmName("ergMultipleDivBarye")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(pressure: ScientificValue<PhysicalQuantity.Pressure, Barye>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(pressure: ScientificValue<PhysicalQuantity.Pressure, Barye>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     CubicCentimeter.volume(this, pressure)
 
 @JvmName("ergDivBaryeMultiple")
-infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Energy, Erg>.div(pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>) where BaryeUnit : Pressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Energy, Erg>.div(pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
     CubicCentimeter.volume(this, pressure)
 
 @JvmName("ergMultipleDivBaryeMultiple")
 infix operator fun <ErgUnit, BaryeUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(
     pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>
-) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>, BaryeUnit : Pressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>, BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
     CubicCentimeter.volume(this, pressure)
 
 @JvmName("footPoundalDivPoundSquareFoot")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt
index 3f7800a87..7f7688241 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt
@@ -45,19 +45,19 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(absorbedDos
     Gram.weight(this, absorbedDose)
 
 @JvmName("ergMultipleDivRad")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Gram.weight(this, absorbedDose)
 
-@JvmName("ergMultipleDivRadMultiple")
+@JvmName("ergDivRadMultiple")
 infix operator fun <AbsorbedDoseUnit> ScientificValue<PhysicalQuantity.Energy, Erg>.div(
     absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, AbsorbedDoseUnit>
 ) where AbsorbedDoseUnit : IonizingRadiationAbsorbedDose, AbsorbedDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> =
     Gram.weight(this, absorbedDose)
 
-@JvmName("ergMultipleDivAbsorbedDose")
+@JvmName("ergMultipleDivRadMultiple")
 infix operator fun <ErgUnit, AbsorbedDoseUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(
     absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, AbsorbedDoseUnit>
-) where ErgUnit : Energy,
+) where ErgUnit : MetricEnergy,
     ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>,
     AbsorbedDoseUnit : IonizingRadiationAbsorbedDose,
     AbsorbedDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> =
@@ -73,7 +73,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(equivalentD
     Gram.weight(this, equivalentDose)
 
 @JvmName("ergMultipleDivRem")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(equivalentDose: ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan>) where ErgUnit : Energy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(equivalentDose: ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
     Gram.weight(this, equivalentDose)
 
 @JvmName("ergDivRemMultiple")
@@ -86,7 +86,7 @@ infix operator fun <EquivalentDoseUnit> ScientificValue<PhysicalQuantity.Energy,
 @JvmName("ergMultipleDivRemMultiple")
 infix operator fun <ErgUnit, EquivalentDoseUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(
     equivalentDose: ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, EquivalentDoseUnit>
-) where ErgUnit : Energy,
+) where ErgUnit : MetricEnergy,
     ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>,
     EquivalentDoseUnit : IonizingRadiationEquivalentDose,
     EquivalentDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> =
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt b/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt
index d6a350be1..16893cdd7 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt
@@ -29,6 +29,7 @@ import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.ImperialWeight
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Meter
+import com.splendo.kaluga.scientific.unit.MetricForce
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Second
 import com.splendo.kaluga.scientific.unit.UKImperialForce
@@ -44,7 +45,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.div(mass: Scien
     (Centimeter per Second per Second).acceleration(this, mass)
 
 @JvmName("dyneMultipleDivGram")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(mass: ScientificValue<PhysicalQuantity.Weight, Gram>) where DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(mass: ScientificValue<PhysicalQuantity.Weight, Gram>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
     (Centimeter per Second per Second).acceleration(this, mass)
 
 @JvmName("imperialForceDivImperialWeight")
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt
index 33f9b2ba3..b9de8a2b5 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt
@@ -33,7 +33,9 @@ import com.splendo.kaluga.scientific.unit.Kip
 import com.splendo.kaluga.scientific.unit.KipSquareFoot
 import com.splendo.kaluga.scientific.unit.KipSquareInch
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricForce
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
+import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
 import com.splendo.kaluga.scientific.unit.PoundForce
@@ -60,19 +62,19 @@ infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.div(pressure: S
 @JvmName("dyneDivBaryeMultiple")
 infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Force, Dyne>.div(
     pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>
-) where BaryeUnit : Pressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
     SquareCentimeter.area(this, pressure)
 
 @JvmName("dyneMultipleDivBarye")
 infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(
     pressure: ScientificValue<PhysicalQuantity.Pressure, Barye>
-) where DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
     SquareCentimeter.area(this, pressure)
 
 @JvmName("dyneMultipleDivBaryeMultiple")
 infix operator fun <DyneUnit, BaryeUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(
     pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>
-) where DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne>, BaryeUnit : Pressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne>, BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
     SquareCentimeter.area(this, pressure)
 
 @JvmName("poundForcePoundSquareInch")
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt
index e483ef8d1..34f7cbb8a 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt
@@ -49,7 +49,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.times(distance:
     Erg.energy(this, distance)
 
 @JvmName("dyneMultipleTimesCentimeter")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.times(distance: ScientificValue<PhysicalQuantity.Length, Centimeter>) where DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.times(distance: ScientificValue<PhysicalQuantity.Length, Centimeter>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
     Erg.energy(this, distance)
 
 @JvmName("metricForceTimesMetricLength")
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt
index b36c108d7..aaf2a2aa6 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt
@@ -27,6 +27,7 @@ import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.ImperialSpeed
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricForce
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MetricSpeed
 import com.splendo.kaluga.scientific.unit.Speed
@@ -40,7 +41,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.times(speed: Sc
     ErgPerSecond.power(this, speed)
 
 @JvmName("dyneMultipleTimesMetricSpeed")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.times(speed: ScientificValue<PhysicalQuantity.Speed, MetricSpeed>) where DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.times(speed: ScientificValue<PhysicalQuantity.Speed, MetricSpeed>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
     ErgPerSecond.power(this, speed)
 
 @JvmName("imperialForceTimesImperialSpeed")
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt b/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt
index e24d36636..4094968bc 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt
@@ -34,6 +34,7 @@ import com.splendo.kaluga.scientific.unit.Kip
 import com.splendo.kaluga.scientific.unit.KipSquareFoot
 import com.splendo.kaluga.scientific.unit.KipSquareInch
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricForce
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
@@ -57,10 +58,10 @@ import kotlin.jvm.JvmName
 infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.div(area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>) =
     Barye.pressure(this, area)
 
-@JvmName("dyneMultipleDivSquareCentime")
+@JvmName("dyneMultipleDivSquareCentimeter")
 infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(
     area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>
-) where DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
     Barye.pressure(this, area)
 
 @JvmName("poundalDivSquareFoot")
diff --git a/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt b/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt
index b14e85ef6..a730c7620 100644
--- a/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt
@@ -24,6 +24,7 @@ import com.splendo.kaluga.scientific.unit.FootLambert
 import com.splendo.kaluga.scientific.unit.Illuminance
 import com.splendo.kaluga.scientific.unit.ImperialIlluminance
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricIlluminance
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Nit
 import com.splendo.kaluga.scientific.unit.Phot
@@ -39,7 +40,7 @@ infix operator fun <SolidAngleUnit : SolidAngle> ScientificValue<PhysicalQuantit
 @JvmName("photMultipleDivSolidAngle")
 infix operator fun <PhotUnit, SolidAngleUnit : SolidAngle> ScientificValue<PhysicalQuantity.Illuminance, PhotUnit>.div(
     solidAngle: ScientificValue<PhysicalQuantity.SolidAngle, SolidAngleUnit>
-) where PhotUnit : Illuminance, PhotUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> =
+) where PhotUnit : MetricIlluminance, PhotUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> =
     Stilb.luminance(this, solidAngle)
 
 @JvmName("imperialIlluminanceDivSolidAngle")
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt
index b4d779458..24341b5be 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt
@@ -43,7 +43,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Length, Centimeter>.times(fo
     force * this
 
 @JvmName("centimeterTimesDyneMultiple")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Length, Centimeter>.times(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Length, Centimeter>.times(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
     force * this
 
 @JvmName("metricLengthTimesMetricForce")
diff --git a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt
index 285dd37d4..cf82ed878 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt
@@ -24,6 +24,7 @@ import com.splendo.kaluga.scientific.unit.Illuminance
 import com.splendo.kaluga.scientific.unit.ImperialIlluminance
 import com.splendo.kaluga.scientific.unit.LuminousFlux
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricIlluminance
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Phot
 import com.splendo.kaluga.scientific.unit.SquareCentimeter
@@ -39,7 +40,7 @@ infix operator fun <FluxUnit : LuminousFlux> ScientificValue<PhysicalQuantity.Lu
 @JvmName("fluxDivPhotMultiple")
 infix operator fun <FluxUnit : LuminousFlux, PhotUnit> ScientificValue<PhysicalQuantity.LuminousFlux, FluxUnit>.div(
     phot: ScientificValue<PhysicalQuantity.Illuminance, PhotUnit>
-) where PhotUnit : Illuminance, PhotUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> =
+) where PhotUnit : MetricIlluminance, PhotUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> =
     SquareCentimeter.area(this, phot)
 
 @JvmName("fluxDivImperialIlluminance")
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt b/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt
index 5b068dc13..991034ccd 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt
@@ -39,6 +39,7 @@ import com.splendo.kaluga.scientific.unit.InchPoundForcePerSecond
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Meter
 import com.splendo.kaluga.scientific.unit.MetricAndImperialPower
+import com.splendo.kaluga.scientific.unit.MetricForce
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MetricPower
 import com.splendo.kaluga.scientific.unit.Minute
@@ -55,7 +56,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Power, ErgPerSecond>.div(for
     (Centimeter per Second).speed(this, force)
 
 @JvmName("ergPerSecondDivDyneMultiple")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Power, ErgPerSecond>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Power, ErgPerSecond>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
     (Centimeter per Second).speed(this, force)
 
 @JvmName("metricPowerDivMetricForce")
diff --git a/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt
index 6b319cb72..af42389b8 100644
--- a/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt
@@ -36,6 +36,7 @@ import com.splendo.kaluga.scientific.unit.KiloPoundSquareInch
 import com.splendo.kaluga.scientific.unit.KipSquareInch
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
+import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
 import com.splendo.kaluga.scientific.unit.PoundSquareFoot
 import com.splendo.kaluga.scientific.unit.PoundSquareInch
@@ -53,7 +54,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Pressure, Barye>.times(volum
     Erg.energy(this, volume)
 
 @JvmName("baryeMultipleTimesCubicCentimeter")
-infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>.times(volume: ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>) where BaryeUnit : Pressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>.times(volume: ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
     Erg.energy(this, volume)
 
 @JvmName("poundSquareFootTimesCubicFoot")
diff --git a/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt
index f39a3d79b..61b9a4af0 100644
--- a/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt
@@ -33,6 +33,7 @@ import com.splendo.kaluga.scientific.unit.KipSquareFoot
 import com.splendo.kaluga.scientific.unit.KipSquareInch
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
+import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.Newton
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
@@ -53,7 +54,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Pressure, Barye>.times(area:
     Dyne.force(this, area)
 
 @JvmName("baryeMultipleTimesSquareCentimeter")
-infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>.times(area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>) where BaryeUnit : Pressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>.times(area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
     Dyne.force(this, area)
 
 @JvmName("ounceSquareInchTimesImperialArea")
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt
index 48f93ba6d..5e5f1d63d 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt
@@ -25,6 +25,7 @@ import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.ImperialSpeed
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
+import com.splendo.kaluga.scientific.unit.MetricForce
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MetricSpeed
 import com.splendo.kaluga.scientific.unit.Speed
@@ -37,7 +38,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Speed, MetricSpeed>.times(fo
     force * this
 
 @JvmName("metricSpeedTimesDyneMultiple")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Speed, MetricSpeed>.times(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : Force, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Speed, MetricSpeed>.times(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
     force * this
 
 @JvmName("imperialSpeedTimesImperialForce")
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt
index ebd243f7a..7e2949f2e 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt
@@ -31,6 +31,7 @@ import com.splendo.kaluga.scientific.unit.KiloPoundSquareInch
 import com.splendo.kaluga.scientific.unit.KipSquareInch
 import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
+import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
 import com.splendo.kaluga.scientific.unit.PoundSquareFoot
 import com.splendo.kaluga.scientific.unit.PoundSquareInch
@@ -50,7 +51,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>.tim
 @JvmName("cubicCentimeterTimesBaryeMultiple")
 infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>.times(
     pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>
-) where BaryeUnit : Pressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
     pressure * this
 
 @JvmName("cubicFootTimesPoundSquareFoot")

From 49ba41211ad2c1bb64a307a175f8981e308dc3c6 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 11 Jan 2023 16:26:33 +0100
Subject: [PATCH 074/227] Example UI

Also made MetricMultiple easier to infer typing
---
 .../kotlin/navigation/NavigationSpec.kt       |  16 +-
 .../kotlin/navigation/Navigator.kt            |  46 +-
 example/android/build.gradle.kts              |   1 +
 .../xml/BottomSheetRootDialogFragment.kt      |   2 +-
 .../example/resources/xml/ButtonsActivity.kt  |  47 +-
 .../example/scientific/ScientificActivity.kt  |  51 +-
 .../scientific/ScientificConverterActivity.kt |  37 +-
 .../ScientificUnitSelectionDialogFragment.kt  |  91 ++
 .../kaluga/example/view/ButtonAdapter.kt      |  65 ++
 .../main/res/layout/activity_scientific.xml   |   2 +-
 .../dialog_scientific_unit_selection.xml      |  69 ++
 example/ios/Demo.xcodeproj/project.pbxproj    |  20 +
 .../FeaturesListViewController.swift          |   3 +
 .../Scientific/ScientificConverterView.swift  | 130 +++
 .../ScientificUnitSelectionView.swift         |  87 ++
 .../ios/Demo/Scientific/ScientificView.swift  | 150 +++
 .../example/shared/di/DependencyInjection.kt  |  15 +-
 .../model/scientific/QuantityDetails.kt       | 128 +--
 .../converters/AccelerationConverters.kt      |  11 +-
 .../scientific/converters/ActionConverters.kt |  11 +-
 .../converters/AmountOfSubstanceConverters.kt |  14 +-
 .../scientific/converters/AngleConverters.kt  |   6 +-
 .../AngularAccelerationConverters.kt          |   3 +-
 .../converters/AngularVelocityConverters.kt   |   6 +-
 .../scientific/converters/AreaConverters.kt   |  39 +-
 .../converters/AreaDensityConverter.kt        |  10 +-
 .../CatalysticActivityConverters.kt           |   3 +-
 .../converters/DensityConverters.kt           |  14 +-
 .../converters/DynamicViscosityConverters.kt  |   9 +-
 .../converters/ElectricCapacitanceUnits.kt    |   9 +-
 .../converters/ElectricChargeConverters.kt    |  17 +-
 .../ElectricConductanceConverters.kt          |   9 +-
 .../converters/ElectricCurrentConverters.kt   |  29 +-
 .../ElectricInductanceConverters.kt           |  17 +-
 .../ElectricResistanceConverters.kt           |  18 +-
 .../scientific/converters/EnergyConverters.kt | 873 ++----------------
 .../scientific/converters/ForceConverters.kt  | 222 +----
 .../converters/FrequencyConverters.kt         |  44 +
 .../converters/HeatCapacityConverters.kt      |  78 ++
 .../converters/QuantityConverter.kt           |   9 +-
 .../ScientificConverterViewModel.kt           |  70 +-
 .../ScientificUnitSelectionViewModel.kt       |  67 ++
 .../scientific/ScientificViewModel.kt         |  67 +-
 .../ScientificConverterNavigator.kt           |  33 +
 .../scientific/ScientificNavigator.kt         |  33 +
 .../ScientificUnitSelectionNavigator.kt       |  30 +
 .../kotlin/converter/area/convertToForce.kt   |   8 +-
 .../kotlin/converter/energy/convertToArea.kt  |   6 +-
 .../energy/convertToElectricCharge.kt         |   6 +-
 .../energy/convertToElectricCurrent.kt        |   6 +-
 .../kotlin/converter/energy/convertToForce.kt |   6 +-
 .../convertToIonizingRadiationAbsorbedDose.kt |   6 +-
 ...onvertToIonizingRadiationEquivalentDose.kt |   6 +-
 .../converter/energy/convertToLength.kt       |  12 +-
 .../converter/energy/convertToMagneticFlux.kt |   8 +-
 .../kotlin/converter/energy/convertToPower.kt |   5 +-
 .../converter/energy/convertToPressure.kt     |   6 +-
 .../energy/convertToSurfaceTension.kt         |   6 +-
 .../kotlin/converter/energy/convertToTime.kt  |  14 +-
 .../converter/energy/convertToVoltage.kt      |   6 +-
 .../converter/energy/convertToVolume.kt       |  15 +-
 .../converter/energy/convertToWeight.kt       |  43 +-
 .../converter/force/convertToAcceleration.kt  |   6 +-
 .../kotlin/converter/force/convertToArea.kt   |  21 +-
 .../kotlin/converter/force/convertToEnergy.kt |   6 +-
 .../converter/force/convertToMomentum.kt      |   8 +-
 .../kotlin/converter/force/convertToPower.kt  |   7 +-
 .../converter/force/convertToPressure.kt      |   9 +-
 .../kotlin/converter/force/convertToWeight.kt |   6 +-
 .../illuminance/convertToLuminance.kt         |   9 +-
 .../convertToEnergy.kt                        |   8 +-
 .../convertToSpecificEnergy.kt                |   5 +-
 .../convertToEnergy.kt                        |   8 +-
 .../convertToSpecificEnergy.kt                |   5 +-
 .../converter/length/convertToEnergy.kt       |   5 +-
 .../converter/luminousFlux/convertToArea.kt   |   9 +-
 .../kotlin/converter/power/convertToSpeed.kt  |   6 +-
 .../converter/pressure/convertToEnergy.kt     |   6 +-
 .../converter/pressure/convertToForce.kt      |   6 +-
 .../kotlin/converter/speed/convertToPower.kt  |   6 +-
 .../converter/time/convertToMomentum.kt       |   8 +-
 .../converter/volume/convertToEnergy.kt       |   9 +-
 .../converter/weight/convertToEnergy.kt       |  14 +-
 .../kotlin/unit/AmountOfSubstanceUnit.kt      |  23 +-
 .../src/commonMain/kotlin/unit/AngleUnit.kt   |  26 +-
 .../kotlin/unit/CatalysticActivityUnit.kt     |  23 +-
 .../kotlin/unit/ElectricCapacitanceUnit.kt    |  25 +-
 .../kotlin/unit/ElectricChargeUnit.kt         |  25 +-
 .../kotlin/unit/ElectricConductanceUnit.kt    |  25 +-
 .../kotlin/unit/ElectricCurrentUnit.kt        |  27 +-
 .../kotlin/unit/ElectricInductanceUnit.kt     |  25 +-
 .../kotlin/unit/ElectricResistanceUnit.kt     |  25 +-
 .../src/commonMain/kotlin/unit/EnergyUnit.kt  | 113 ++-
 .../src/commonMain/kotlin/unit/ForceUnit.kt   |  46 +-
 .../commonMain/kotlin/unit/FrequencyUnit.kt   |  23 +-
 .../commonMain/kotlin/unit/IlluminanceUnit.kt |  46 +-
 .../unit/IonizingRadiationAbsorbedDoseUnit.kt |  46 +-
 .../IonizingRadiationEquivalentDoseUnit.kt    |  46 +-
 .../src/commonMain/kotlin/unit/LengthUnit.kt  |  23 +-
 .../commonMain/kotlin/unit/LuminanceUnit.kt   |  23 +-
 .../kotlin/unit/LuminousFluxUnit.kt           |  23 +-
 .../kotlin/unit/LuminousIntensityUnit.kt      |  23 +-
 .../kotlin/unit/MagneticFluxUnit.kt           |  23 +-
 .../kotlin/unit/MagneticInductionUnit.kt      |  23 +-
 .../kotlin/unit/MeasurementSystem.kt          |   2 +-
 .../src/commonMain/kotlin/unit/PowerUnit.kt   |  24 +-
 .../commonMain/kotlin/unit/PressureUnit.kt    |  93 +-
 .../kotlin/unit/RadioactivityUnit.kt          |  46 +-
 .../commonMain/kotlin/unit/SolidAngleUnit.kt  |  13 +-
 .../src/commonMain/kotlin/unit/TimeUnit.kt    |  13 +-
 .../src/commonMain/kotlin/unit/VoltageUnit.kt |  22 +-
 .../src/commonMain/kotlin/unit/VolumeUnit.kt  |  23 +-
 .../src/commonMain/kotlin/unit/WeightUnit.kt  |  48 +-
 113 files changed, 2041 insertions(+), 1962 deletions(-)
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/view/ButtonAdapter.kt
 create mode 100644 example/android/src/main/res/layout/dialog_scientific_unit_selection.xml
 create mode 100644 example/ios/Demo/Scientific/ScientificConverterView.swift
 create mode 100644 example/ios/Demo/Scientific/ScientificUnitSelectionView.swift
 create mode 100644 example/ios/Demo/Scientific/ScientificView.swift
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionViewModel.kt
 create mode 100644 example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterNavigator.kt
 create mode 100644 example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificNavigator.kt
 create mode 100644 example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionNavigator.kt

diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
index 67bf7dbbf..a01aa34c9 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
@@ -174,32 +174,38 @@ sealed class NavigationSpec {
      * Removes a [Fragment] with a given tag
      * @param tag The tag of the [Fragment] to remove
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle removing the [Fragment]
+     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      */
     data class RemoveFragment(
         val tag: String,
-        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager },
+        val fragmentRequestKey: String? = null
     ) : NavigationSpec()
 
     /**
      * Pops a [Fragment] from the backstack
      * @param immediate If `true` the transaction should execute without waiting for pending transactions
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle popping the [Fragment]
+     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      */
     data class PopFragment(
         val immediate: Boolean = false,
-        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager },
+        val fragmentRequestKey: String? = null
     ) : NavigationSpec()
 
     /**
      * Pops a [Fragment] from the backstack
      * @param immediate If `true` the transaction should execute without waiting for pending transactions
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle popping the [Fragment]
+     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      */
     data class PopFragmentTo(
         val name: String,
         val inclusive: Boolean,
         val immediate: Boolean = false,
-        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager },
+        val fragmentRequestKey: String? = null
     ) : NavigationSpec()
 
     /**
@@ -218,10 +224,12 @@ sealed class NavigationSpec {
      * Dismisses a [DialogFragment] with a given Tag
      * @param tag The tag of the [DialogFragment] to remove
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle removing the [DialogFragment]
+     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      */
     data class DismissDialog(
         val tag: String,
-        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager },
+        val fragmentRequestKey: String? = null
     ) : NavigationSpec()
 
     /**
diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index b81aec084..4e9579164 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -48,12 +48,12 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         when (spec) {
             is NavigationSpec.Activity<*> -> navigateToActivity(spec, bundle)
             is NavigationSpec.Close -> closeActivity(spec, bundle)
-            is NavigationSpec.Fragment -> navigateToFragment(spec)
-            is NavigationSpec.RemoveFragment -> removeFragment(spec)
-            is NavigationSpec.PopFragment -> popFragment(spec)
-            is NavigationSpec.PopFragmentTo -> popFragmentTo(spec)
-            is NavigationSpec.Dialog -> navigateToDialog(spec)
-            is NavigationSpec.DismissDialog -> dismissDialog(spec)
+            is NavigationSpec.Fragment -> navigateToFragment(spec, bundle)
+            is NavigationSpec.RemoveFragment -> removeFragment(spec, bundle)
+            is NavigationSpec.PopFragment -> popFragment(spec, bundle)
+            is NavigationSpec.PopFragmentTo -> popFragmentTo(spec, bundle)
+            is NavigationSpec.Dialog -> navigateToDialog(spec, bundle)
+            is NavigationSpec.DismissDialog -> dismissDialog(spec, bundle)
             is NavigationSpec.Camera -> navigateToCamera(spec)
             is NavigationSpec.Email -> navigateToEmail(spec)
             is NavigationSpec.FileSelector -> navigateToFileSelector(spec)
@@ -101,7 +101,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         activity.finish()
     }
 
-    private fun navigateToFragment(fragmentSpec: NavigationSpec.Fragment) {
+    private fun navigateToFragment(fragmentSpec: NavigationSpec.Fragment, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = fragmentSpec.getFragmentManager(manager!!)
         val transaction = fragmentManager.beginTransaction().let {
@@ -123,6 +123,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         }
 
         val fragment = fragmentSpec.createFragment()
+        fragment.arguments = bundle?.toBundle()
         when (fragmentSpec.type) {
             is NavigationSpec.Fragment.Type.Add -> transaction.add(
                 fragmentSpec.containerId,
@@ -139,9 +140,13 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         transaction.commit()
     }
 
-    private fun removeFragment(removeFragmentSpec: NavigationSpec.RemoveFragment) {
+    private fun removeFragment(removeFragmentSpec: NavigationSpec.RemoveFragment, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = removeFragmentSpec.getFragmentManager(manager!!)
+        removeFragmentSpec.fragmentRequestKey?.let {
+            if (bundle != null)
+                fragmentManager.setFragmentResult(it, bundle.toBundle())
+        }
         val fragment = fragmentManager.findFragmentByTag(removeFragmentSpec.tag) ?: return
 
         val transaction = fragmentManager.beginTransaction()
@@ -149,9 +154,13 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         transaction.commit()
     }
 
-    private fun popFragment(popFragmentSpec: NavigationSpec.PopFragment) {
+    private fun popFragment(popFragmentSpec: NavigationSpec.PopFragment, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = popFragmentSpec.getFragmentManager(manager!!)
+        popFragmentSpec.fragmentRequestKey?.let {
+            if (bundle != null)
+                fragmentManager.setFragmentResult(it, bundle.toBundle())
+        }
         if (popFragmentSpec.immediate) {
             fragmentManager.popBackStackImmediate()
         } else {
@@ -159,9 +168,13 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         }
     }
 
-    private fun popFragmentTo(popToFragmentSpec: NavigationSpec.PopFragmentTo) {
+    private fun popFragmentTo(popToFragmentSpec: NavigationSpec.PopFragmentTo, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = popToFragmentSpec.getFragmentManager(manager!!)
+        popToFragmentSpec.fragmentRequestKey?.let {
+            if (bundle != null)
+                fragmentManager.setFragmentResult(it, bundle.toBundle())
+        }
         val flags = if (popToFragmentSpec.inclusive) FragmentManager.POP_BACK_STACK_INCLUSIVE else 0
         if (popToFragmentSpec.immediate) {
             fragmentManager.popBackStackImmediate(popToFragmentSpec.name, flags)
@@ -170,15 +183,22 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         }
     }
 
-    private fun navigateToDialog(dialogSpec: NavigationSpec.Dialog) {
+    private fun navigateToDialog(dialogSpec: NavigationSpec.Dialog, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = dialogSpec.getFragmentManager(manager!!)
-        dialogSpec.createDialog().show(fragmentManager, dialogSpec.tag)
+        dialogSpec.createDialog().apply {
+            arguments = bundle?.toBundle()
+            show(fragmentManager, dialogSpec.tag)
+        }
     }
 
-    private fun dismissDialog(spec: NavigationSpec.DismissDialog) {
+    private fun dismissDialog(spec: NavigationSpec.DismissDialog, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = spec.getFragmentManager(manager!!)
+        spec.fragmentRequestKey?.let {
+            if (bundle != null)
+                fragmentManager.setFragmentResult(it, bundle.toBundle())
+        }
         val dialog = fragmentManager.findFragmentByTag(spec.tag) as? DialogFragment ?: return
         dialog.dismiss()
     }
diff --git a/example/android/build.gradle.kts b/example/android/build.gradle.kts
index e3a82bbea..d5923bfd9 100644
--- a/example/android/build.gradle.kts
+++ b/example/android/build.gradle.kts
@@ -88,6 +88,7 @@ dependencies {
     implementationDependency(Dependencies.AndroidX.Activity.Compose)
     implementationDependency(Dependencies.AndroidX.Navigation.Compose)
 
+    implementationDependency(Dependencies.AndroidX.Fragment)
     implementationDependency(Dependencies.AndroidX.FragmentKtx)
     implementationDependency(Dependencies.AndroidX.ConstraintLayout)
     implementationDependency(Dependencies.AndroidX.Lifecycle.Service)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
index 070510dde..8ee5f7aec 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
@@ -47,7 +47,7 @@ class BottomSheetRootDialogFragment : KalugaViewModelBottomSheetDialogFragment<B
 
     private val subPageNavigator = ActivityNavigator<BottomSheetSubPageNavigation> { action ->
         when (action) {
-            is BottomSheetSubPageNavigation.Back -> NavigationSpec.PopFragment(true) { childFragmentManager!! }
+            is BottomSheetSubPageNavigation.Back -> NavigationSpec.PopFragment(true, { childFragmentManager!! })
             is BottomSheetSubPageNavigation.Close -> NavigationSpec.DismissDialog(TAG)
         }
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonsActivity.kt
index e914534b1..6bbd0a1e4 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonsActivity.kt
@@ -18,18 +18,12 @@
 package com.splendo.kaluga.example.resources.xml
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.databinding.BindingAdapter
-import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityButtonBinding
-import com.splendo.kaluga.example.databinding.ViewListButtonBinding
 import com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel
+import com.splendo.kaluga.example.view.ButtonAdapter
 import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
 import com.splendo.kaluga.resources.dpToPixel
-import com.splendo.kaluga.resources.view.KalugaButton
-import com.splendo.kaluga.resources.view.bindButton
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class ButtonActivity : KalugaViewModelActivity<ButtonViewModel>() {
@@ -46,42 +40,3 @@ class ButtonActivity : KalugaViewModelActivity<ButtonViewModel>() {
         binding.buttonsList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
     }
 }
-
-class ButtonAdapter : RecyclerView.Adapter<ButtonAdapter.ButtonViewHolder>() {
-
-    companion object {
-        @BindingAdapter("buttons")
-        @JvmStatic
-        fun bindButtons(view: RecyclerView, buttons: List<KalugaButton>?) {
-            val adapter = (view.adapter as? ButtonAdapter) ?: return
-            adapter.buttons = buttons.orEmpty()
-        }
-    }
-
-    class ButtonViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
-        val button = binding.button
-    }
-
-    var buttons: List<KalugaButton> = emptyList()
-        set(newValue) {
-            field = newValue
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ButtonViewHolder {
-        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ButtonViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = buttons.size
-
-    override fun onBindViewHolder(holder: ButtonViewHolder, position: Int) {
-        buttons.getOrNull(position)?.let { button ->
-            holder.button.bindButton(button)
-        } ?: run {
-            holder.button.text = null
-            holder.button.background = null
-            holder.button.setOnClickListener(null)
-        }
-    }
-}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
index 20c8c92f8..5c44b2f1d 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
@@ -18,13 +18,19 @@
 package com.splendo.kaluga.example.scientific
 
 import android.os.Bundle
+import androidx.databinding.BindingAdapter
+import androidx.fragment.app.FragmentResultListener
+import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityScientificBinding
-import com.splendo.kaluga.example.resources.xml.ButtonAdapter
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificViewModel
+import com.splendo.kaluga.example.view.ButtonAdapter
 import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
 import com.splendo.kaluga.resources.dpToPixel
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -32,10 +38,40 @@ import org.koin.core.parameter.parametersOf
 
 class ScientificActivity : KalugaViewModelActivity<ScientificViewModel>() {
 
+    companion object {
+        const val leftUnitRequestKey: String = "LeftUnit"
+        const val rightUnitRequestKey: String = "RightUnit"
+
+        @BindingAdapter("scientificConverterButtons")
+        @JvmStatic
+        fun bindButtons(view: RecyclerView, buttons: List<ScientificViewModel.Button>?) {
+            val adapter = (view.adapter as? ButtonAdapter) ?: return
+            adapter.buttons = buttons?.map { it.button }.orEmpty()
+        }
+    }
+
+    class LeftUnitDialogSelectionFragment : ScientificUnitSelectionDialogFragment() {
+        override val requestKey: String = leftUnitRequestKey
+    }
+
+    class RightUnitSelectionDialogFragment : ScientificUnitSelectionDialogFragment() {
+        override val requestKey: String = rightUnitRequestKey
+    }
+
     override val viewModel: ScientificViewModel by viewModel {
         parametersOf(
-            ActivityNavigator<ScientificConverterNavigationAction> {
-                NavigationSpec.Activity<ScientificConverterActivity>()
+            ActivityNavigator<ScientificNavigationAction<*>> { action ->
+                when (action) {
+                    is ScientificNavigationAction.SelectUnit -> {
+                        NavigationSpec.Dialog(ScientificUnitSelectionDialogFragment.TAG) {
+                            when (action) {
+                                is ScientificNavigationAction.SelectUnit.Left -> LeftUnitDialogSelectionFragment()
+                                is ScientificNavigationAction.SelectUnit.Right -> RightUnitSelectionDialogFragment()
+                            }
+                        }
+                    }
+                    is ScientificNavigationAction.Converter -> NavigationSpec.Activity<ScientificConverterActivity>()
+                }
             }
         )
     }
@@ -43,6 +79,13 @@ class ScientificActivity : KalugaViewModelActivity<ScientificViewModel>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        supportFragmentManager.setFragmentResultListener(leftUnitRequestKey, this) { _, result ->
+            viewModel.didSelectLeftUnit(result.toTypedProperty(NavigationBundleSpecType.IntegerType))
+        }
+        supportFragmentManager.setFragmentResultListener(rightUnitRequestKey, this) { _, result ->
+            viewModel.didSelectRightUnit(result.toTypedProperty(NavigationBundleSpecType.IntegerType))
+        }
+
         val binding = ActivityScientificBinding.inflate(layoutInflater, null, false)
         setContentView(binding.root)
         binding.viewModel = viewModel
@@ -50,4 +93,4 @@ class ScientificActivity : KalugaViewModelActivity<ScientificViewModel>() {
         binding.convertersList.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(this).toInt()))
         binding.lifecycleOwner = this
     }
-}
\ No newline at end of file
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt
index 53636a660..fcaa9bfda 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt
@@ -24,18 +24,38 @@ import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityScientificConverterBinding
-import com.splendo.kaluga.example.shared.viewmodel.scientific.CloseScientificConverterNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 class ScientificConverterActivity : KalugaViewModelActivity<ScientificConverterViewModel>() {
 
+    companion object {
+        const val leftUnitRequestKey: String = "ConverterLeftUnit"
+        const val rightUnitRequestKey: String = "ConverterRightUnit"
+    }
+    class LeftUnitDialogSelectionFragment : ScientificUnitSelectionDialogFragment() {
+        override val requestKey: String = leftUnitRequestKey
+    }
+
+    class RightUnitSelectionDialogFragment : ScientificUnitSelectionDialogFragment() {
+        override val requestKey: String = rightUnitRequestKey
+    }
+
     override val viewModel: ScientificConverterViewModel by viewModel {
         parametersOf(
             intent.extras!!.toTypedProperty(NavigationBundleSpecType.SerializedType(ScientificConverterViewModel.Arguments.serializer())),
-            ActivityNavigator<CloseScientificConverterNavigationAction> {
-                NavigationSpec.Close()
+            ActivityNavigator<ScientificConverterNavigationAction<*>> { action ->
+                when (action) {
+                    is ScientificConverterNavigationAction.Close -> NavigationSpec.Close()
+                    is ScientificConverterNavigationAction.SelectUnit -> NavigationSpec.Dialog(ScientificUnitSelectionDialogFragment.TAG) {
+                        when (action) {
+                            is ScientificConverterNavigationAction.SelectUnit.Left -> LeftUnitDialogSelectionFragment()
+                            is ScientificConverterNavigationAction.SelectUnit.Right -> RightUnitSelectionDialogFragment()
+                        }
+                    }
+                }
             }
         )
     }
@@ -43,9 +63,20 @@ class ScientificConverterActivity : KalugaViewModelActivity<ScientificConverterV
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        supportFragmentManager.setFragmentResultListener(leftUnitRequestKey, this) { _, result ->
+            viewModel.didSelectLeftUnit(result.toTypedProperty(NavigationBundleSpecType.IntegerType))
+        }
+        supportFragmentManager.setFragmentResultListener(rightUnitRequestKey, this) { _, result ->
+            viewModel.didSelectRightUnit(result.toTypedProperty(NavigationBundleSpecType.IntegerType))
+        }
+
         val binding = ActivityScientificConverterBinding.inflate(layoutInflater, null, false)
         setContentView(binding.root)
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
     }
+
+    override fun onBackPressed() {
+        viewModel.onClosePressed()
+    }
 }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt
new file mode 100644
index 000000000..580864049
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt
@@ -0,0 +1,91 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.scientific
+
+import android.app.ActionBar.LayoutParams
+import android.app.Dialog
+import android.content.DialogInterface
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import com.splendo.kaluga.architecture.navigation.ActivityNavigator
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelDialogFragment
+import com.splendo.kaluga.example.architecture.xml.BottomSheetRootDialogFragment
+import com.splendo.kaluga.example.databinding.DialogScientificUnitSelectionBinding
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificUnitSelectionAction
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificUnitSelectionViewModel
+import com.splendo.kaluga.example.view.ButtonAdapter
+import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
+import com.splendo.kaluga.resources.dpToPixel
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.unit.ScientificUnit
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+
+abstract class ScientificUnitSelectionDialogFragment : KalugaViewModelDialogFragment<ScientificUnitSelectionViewModel>() {
+
+    companion object {
+        val TAG = ScientificUnitSelectionDialogFragment::class.simpleName.orEmpty()
+    }
+
+    abstract val requestKey: String
+
+    override val viewModel: ScientificUnitSelectionViewModel by viewModel {
+        parametersOf(
+            requireArguments().toTypedProperty(NavigationBundleSpecType.SerializedType(PhysicalQuantity.serializer())),
+            ActivityNavigator<ScientificUnitSelectionAction<*>> {action ->
+                when (action) {
+                    is ScientificUnitSelectionAction.Cancelled -> NavigationSpec.DismissDialog(TAG)
+                    is ScientificUnitSelectionAction.DidSelect -> {
+                        NavigationSpec.DismissDialog(TAG, fragmentRequestKey = requestKey)
+                    }
+                }
+            }
+        )
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val binding = DialogScientificUnitSelectionBinding.inflate(inflater, container, false)
+        binding.viewModel = viewModel
+        binding.currentUnits.adapter = ButtonAdapter()
+        binding.lifecycleOwner = this
+        binding.currentUnits.addItemDecoration(VerticalSpaceItemDecoration(10.0f.dpToPixel(requireContext()).toInt()))
+        return binding.root
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        dialog?.window?.setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        viewModel.onCancel()
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/view/ButtonAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/view/ButtonAdapter.kt
new file mode 100644
index 000000000..e192d4d29
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/view/ButtonAdapter.kt
@@ -0,0 +1,65 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.view
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.example.databinding.ViewListButtonBinding
+import com.splendo.kaluga.resources.view.KalugaButton
+import com.splendo.kaluga.resources.view.bindButton
+
+class ButtonAdapter : RecyclerView.Adapter<ButtonAdapter.ButtonViewHolder>() {
+
+    companion object {
+        @BindingAdapter("buttons")
+        @JvmStatic
+        fun bindButtons(view: RecyclerView, buttons: List<KalugaButton>?) {
+            val adapter = (view.adapter as? ButtonAdapter) ?: return
+            adapter.buttons = buttons.orEmpty()
+        }
+    }
+
+    class ButtonViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
+        val button = binding.button
+    }
+
+    var buttons: List<KalugaButton> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ButtonViewHolder {
+        val binding = ViewListButtonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ButtonViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = buttons.size
+
+    override fun onBindViewHolder(holder: ButtonViewHolder, position: Int) {
+        buttons.getOrNull(position)?.let { button ->
+            holder.button.bindButton(button)
+        } ?: run {
+            holder.button.text = null
+            holder.button.background = null
+            holder.button.setOnClickListener(null)
+        }
+    }
+}
diff --git a/example/android/src/main/res/layout/activity_scientific.xml b/example/android/src/main/res/layout/activity_scientific.xml
index 67536ef55..edd701102 100644
--- a/example/android/src/main/res/layout/activity_scientific.xml
+++ b/example/android/src/main/res/layout/activity_scientific.xml
@@ -128,7 +128,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/converter_separator"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                app:buttons="@{viewModel.converters.stateFlow}"/>
+                app:scientificConverterButtons="@{viewModel.converters.stateFlow}"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/example/android/src/main/res/layout/dialog_scientific_unit_selection.xml b/example/android/src/main/res/layout/dialog_scientific_unit_selection.xml
new file mode 100644
index 000000000..e3ac03368
--- /dev/null
+++ b/example/android/src/main/res/layout/dialog_scientific_unit_selection.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificUnitSelectionViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:title="Select unit"/>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/toolbar"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="10dp">
+
+                <EditText
+                    android:id="@+id/filter"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@={viewModel.filter.stateFlow}"
+                    app:layout_constraintTop_toTopOf="parent"/>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/current_units"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toBottomOf="@id/filter"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:layout_marginTop="10dp"
+                    app:buttons="@{viewModel.currentUnits.stateFlow}"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 9a6e2e741..27961d913 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
 		20BB9E76296333BE0096E836 /* UITableView+Typed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E75296333BE0096E836 /* UITableView+Typed.swift */; };
 		20BB9E7729642FEB0096E836 /* PermissionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978348A6235DF586005B140B /* PermissionViewController.swift */; };
 		20BB9E7A29645AA10096E836 /* TimerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20BB9E7929645AA10096E836 /* TimerView.swift */; };
+		20C03634296F03FF004B86DD /* ScientificUnitSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C03633296F03FF004B86DD /* ScientificUnitSelectionView.swift */; };
 		20C7D1CC246968AA00C9A63F /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */; };
 		20C7D1CF24699A6C00C9A63F /* UIControl+Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */; };
 		20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */; };
@@ -48,6 +49,8 @@
 		20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */; };
 		20CA2905293796C5007E4079 /* BottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20CA2904293796C5007E4079 /* BottomSheetViewController.swift */; };
 		20CA2907293796D7007E4079 /* BottomSheetSubPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */; };
+		20D4E17C296D562D00A046D6 /* ScientificView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D4E17B296D562D00A046D6 /* ScientificView.swift */; };
+		20D4E17E296D565000A046D6 /* ScientificConverterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D4E17D296D565000A046D6 /* ScientificConverterView.swift */; };
 		20D8CD3726FE8FE200D14AC9 /* ResourcesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */; };
 		20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D8CD3826FF550100D14AC9 /* LabelViewController.swift */; };
 		20FFB48A293EB4F0005CF1C8 /* ArchitectureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FFB489293EB4F0005CF1C8 /* ArchitectureView.swift */; };
@@ -153,6 +156,7 @@
 		20BB9E73296331290096E836 /* UICollectionView+Typed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Typed.swift"; sourceTree = "<group>"; };
 		20BB9E75296333BE0096E836 /* UITableView+Typed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableView+Typed.swift"; sourceTree = "<group>"; };
 		20BB9E7929645AA10096E836 /* TimerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerView.swift; sourceTree = "<group>"; };
+		20C03633296F03FF004B86DD /* ScientificUnitSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScientificUnitSelectionView.swift; sourceTree = "<group>"; };
 		20C7D1CB246968AA00C9A63F /* ExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleViewController.swift; sourceTree = "<group>"; };
 		20C7D1CE24699A6C00C9A63F /* UIControl+Closure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIControl+Closure.swift"; sourceTree = "<group>"; };
 		20C7D1D12469A3D600C9A63F /* FeaturesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturesListViewController.swift; sourceTree = "<group>"; };
@@ -161,6 +165,8 @@
 		20C7D1D9246A944A00C9A63F /* ArchitectureDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureDetailsViewController.swift; sourceTree = "<group>"; };
 		20CA2904293796C5007E4079 /* BottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetViewController.swift; sourceTree = "<group>"; };
 		20CA2906293796D7007E4079 /* BottomSheetSubPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetSubPageViewController.swift; sourceTree = "<group>"; };
+		20D4E17B296D562D00A046D6 /* ScientificView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScientificView.swift; sourceTree = "<group>"; };
+		20D4E17D296D565000A046D6 /* ScientificConverterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScientificConverterView.swift; sourceTree = "<group>"; };
 		20D8CD3626FE8FE200D14AC9 /* ResourcesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesListViewController.swift; sourceTree = "<group>"; };
 		20D8CD3826FF550100D14AC9 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = "<group>"; };
 		20FFB489293EB4F0005CF1C8 /* ArchitectureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitectureView.swift; sourceTree = "<group>"; };
@@ -336,6 +342,16 @@
 			path = Architecture;
 			sourceTree = "<group>";
 		};
+		20D4E17A296D561500A046D6 /* Scientific */ = {
+			isa = PBXGroup;
+			children = (
+				20D4E17B296D562D00A046D6 /* ScientificView.swift */,
+				20D4E17D296D565000A046D6 /* ScientificConverterView.swift */,
+				20C03633296F03FF004B86DD /* ScientificUnitSelectionView.swift */,
+			);
+			path = Scientific;
+			sourceTree = "<group>";
+		};
 		20D8CD3526FE8FBA00D14AC9 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
@@ -426,6 +442,7 @@
 		746CAD9D15ECB24F4ED84E11 /* Demo */ = {
 			isa = PBXGroup;
 			children = (
+				20D4E17A296D561500A046D6 /* Scientific */,
 				20BB9E7829645A8E0096E836 /* DateTime */,
 				201EA2172937C2CC00C562EC /* UITypeSelection */,
 				20D8CD3526FE8FBA00D14AC9 /* Resources */,
@@ -713,6 +730,7 @@
 				74671D1F8F6A31F1DD3F7912 /* AppDelegate.swift in Sources */,
 				20D8CD3726FE8FE200D14AC9 /* ResourcesListViewController.swift in Sources */,
 				209471E124C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift in Sources */,
+				20D4E17E296D565000A046D6 /* ScientificConverterView.swift in Sources */,
 				2017B1C52400175C00F9072A /* PermissionListViewController.swift in Sources */,
 				20BB9E70296323FD0096E836 /* BluetoothDescriptorView.swift in Sources */,
 				641CC0DC25CACAAD001E1CD1 /* LinksViewController.swift in Sources */,
@@ -724,6 +742,7 @@
 				4BC0CBDF269F1D25000512A9 /* BeaconsViewController.swift in Sources */,
 				649979E725CCD37200348419 /* NetworkViewController.swift in Sources */,
 				20D8CD3926FF550100D14AC9 /* LabelViewController.swift in Sources */,
+				20C03634296F03FF004B86DD /* ScientificUnitSelectionView.swift in Sources */,
 				4BC0CBE0269F1D25000512A9 /* BeaconsViewCell.swift in Sources */,
 				20BB9E6C296323260096E836 /* BluetoothServiceView.swift in Sources */,
 				20C7D1D8246A93A600C9A63F /* ArchitectureViewController.swift in Sources */,
@@ -779,6 +798,7 @@
 				20FFB48A293EB4F0005CF1C8 /* ArchitectureView.swift in Sources */,
 				20FFB490293FA7EB005CF1C8 /* BottomSheetSubPageView.swift in Sources */,
 				2EF7D8289105AC623E600829 /* UninitializedObservable.generated.swift in Sources */,
+				20D4E17C296D562D00A046D6 /* ScientificView.swift in Sources */,
 				1529FF0B35BD7AB3B6E838A9 /* UninitializedSubject.generated.swift in Sources */,
 				9481F22DC3CFE170CE894584 /* KeyboardManager.generated.swift in Sources */,
 			);
diff --git a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
index 895815817..5743c48e0 100644
--- a/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
+++ b/example/ios/Demo/FeaturesList/FeaturesListViewController.swift
@@ -130,6 +130,9 @@ private extension FeatureListNavigationAction {
                 swiftUIView: { ResourcesListView() }
             )
         }
+        case is FeatureListNavigationAction.Scientific: return NavigationSpec.Push(animated: true) {
+            UIHostingController(rootView: ScientificView())
+        }
         case is FeatureListNavigationAction.System: return NavigationSpec.Segue(identifier: "showSystem")
         default: fatalError("Unknown action")
         }
diff --git a/example/ios/Demo/Scientific/ScientificConverterView.swift b/example/ios/Demo/Scientific/ScientificConverterView.swift
new file mode 100644
index 000000000..61efedbac
--- /dev/null
+++ b/example/ios/Demo/Scientific/ScientificConverterView.swift
@@ -0,0 +1,130 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct ScientificConverterView: View, Equatable {
+    
+    static func == (lhs: ScientificConverterView, rhs: ScientificConverterView) -> Bool {
+        lhs.arguments == rhs.arguments
+    }
+
+    let arguments: ScientificConverterViewModel.Arguments
+    private let lifecycleViewModel: LifecycleViewModel<ScientificConverterViewModel>
+    private let router = Router()
+    @ObservedObject private var leftValue: StringSubject
+    @ObservedObject private var currentLeftUnitButton: ButtonObservable
+    @ObservedObject private var rightValue: StringSubject
+    @ObservedObject private var currentRightUnitButton: ButtonObservable
+    @ObservedObject private var resultValue: StringObservable
+    @ObservedObject private var nextRoute = ObjectRoutingState<Route>()
+    @EnvironmentObject var previousRoute: RoutingState
+
+    init(arguments: ScientificConverterViewModel.Arguments) {
+        self.arguments = arguments
+
+        let viewModel = ScientificConverterViewModelKt.ScientificConverterViewModel(
+            arguments: arguments,
+            navigator: router.navigator
+        )
+
+        leftValue = StringSubject(viewModel.leftValue)
+        currentLeftUnitButton = ButtonObservable(viewModel.currentLeftUnitButton)
+        rightValue = StringSubject(viewModel.rightValue)
+        currentRightUnitButton = ButtonObservable(viewModel.currentRightUnitButton)
+        resultValue = StringObservable(viewModel.resultValue)
+
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        router.previousRoutingState = previousRoute
+        router.nextRoutingState = nextRoute
+        return generateBody().navigationTitle("feature_scientific".localized())
+    }
+
+    func generateBody() -> some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            ScrollView {
+                VStack(spacing: 10) {
+                    HStack(alignment: .center, spacing: 10.0) {
+                        HStack {
+                            TextField("", text: $leftValue.value)
+                                .textFieldStyle(.roundedBorder)
+                                .frame(maxWidth: .infinity)
+                            currentLeftUnitButton.value.toButton()
+                        }.frame(maxWidth: .infinity)
+                        Text(viewModel.calculateOperatorSymbol)
+                        HStack {
+                            TextField("", text: $rightValue.value)
+                                .textFieldStyle(.roundedBorder)
+                                .frame(maxWidth: .infinity)
+                            currentRightUnitButton.value.toButton()
+                        }.frame(maxWidth: .infinity)
+                    }
+                    viewModel.calculateButton.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                    HStack {
+                        Text(resultValue.value)
+                    }
+                }
+            }
+            .padding(10.0)
+            .navigation(state: nextRoute, type: .sheet) {
+                if let routeObject = nextRoute.object {
+                    switch routeObject {
+                    case let .leftUnit(quantity):
+                        ScientificUnitSelectionView(quantity: quantity) { index in
+                            viewModel.didSelectLeftUnit(unitIndex: index)
+                        }
+                        .equatable()
+                        .environmentObject(nextRoute as RoutingState)
+                    case let .rightUnit(quantity):
+                        ScientificUnitSelectionView(quantity: quantity) { index in
+                            viewModel.didSelectRightUnit(unitIndex: index)
+                        }
+                        .equatable()
+                        .environmentObject(nextRoute as RoutingState)
+                    }
+                }
+            }
+        }
+    }
+}
+
+extension ScientificConverterView {
+
+    enum Route: Equatable {
+        case leftUnit(quantity: ScientificPhysicalQuantity)
+        case rightUnit(quantity: ScientificPhysicalQuantity)
+    }
+
+    class Router {
+        var previousRoutingState: RoutingState?
+        var nextRoutingState: ObjectRoutingState<Route>?
+        lazy var navigator = ScientificConverterNavigatorKt.ScientificConverterNavigator(
+            onSelectLeftUnit: { [weak self] quantity in
+                self?.nextRoutingState?.show(.leftUnit(quantity: quantity))
+            },
+            onSelectRightUnit: { [weak self] quantity in
+                self?.nextRoutingState?.show(.rightUnit(quantity: quantity))
+            },
+            onClose: { [weak self] in
+                self?.previousRoutingState?.close()
+            }
+        )
+    }
+}
diff --git a/example/ios/Demo/Scientific/ScientificUnitSelectionView.swift b/example/ios/Demo/Scientific/ScientificUnitSelectionView.swift
new file mode 100644
index 000000000..6404bcdcc
--- /dev/null
+++ b/example/ios/Demo/Scientific/ScientificUnitSelectionView.swift
@@ -0,0 +1,87 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct ScientificUnitSelectionView: View, Equatable {
+
+    static func == (lhs: ScientificUnitSelectionView, rhs: ScientificUnitSelectionView) -> Bool {
+        lhs.quantity == rhs.quantity
+    }
+
+    private let lifecycleViewModel: LifecycleViewModel<ScientificUnitSelectionViewModel>
+
+    let quantity: ScientificPhysicalQuantity
+    let router: Router
+    @ObservedObject var filter: StringSubject
+    @ObservedObject var currentUnits: ListObservable<KalugaButton.Plain>
+    @EnvironmentObject var previousRoute: RoutingState
+
+    init(quantity: ScientificPhysicalQuantity, onUnitIndex: @escaping (Int32) -> Void) {
+        self.quantity = quantity
+        router = Router(onUnitIndex: onUnitIndex)
+        let viewModel = ScientificUnitSelectionViewModel(quantity: quantity, navigator: router.navigator)
+
+        filter = StringSubject(viewModel.filter)
+        currentUnits = ListObservable(viewModel.currentUnits)
+
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        router.previousRoute = previousRoute
+        return generateBody()
+    }
+
+    func generateBody() -> some View {
+        lifecycleViewModel.lifecycleView { _ in
+            VStack {
+                HStack {
+                    Text("Select Unit").padding(10.0)
+                }
+                ScrollView {
+                    VStack {
+                        TextField("", text: $filter.value)
+                            .textFieldStyle(.roundedBorder)
+                            .frame(maxWidth: .infinity)
+                        ForEach(currentUnits.value, id: \.self) { button in
+                            button.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                        }
+                    }
+                }.padding(10.0)
+            }
+        }
+    }
+}
+
+extension ScientificUnitSelectionView {
+    class Router {
+
+        private let onUnitIndex: ((Int32) -> Void)?
+        var previousRoute: RoutingState?
+        lazy var navigator = ScientificUnitSelectionNavigatorKt.ScientificUnitSelectionNavigator { [weak self] index in
+            self?.onUnitIndex?(index.int32Value)
+            self?.previousRoute?.close()
+        } onCancelled: { [weak self] in
+            self?.previousRoute?.close()
+        }
+
+        init(onUnitIndex: @escaping (Int32) -> Void) {
+            self.onUnitIndex = onUnitIndex
+        }
+    }
+}
diff --git a/example/ios/Demo/Scientific/ScientificView.swift b/example/ios/Demo/Scientific/ScientificView.swift
new file mode 100644
index 000000000..ef41e5f67
--- /dev/null
+++ b/example/ios/Demo/Scientific/ScientificView.swift
@@ -0,0 +1,150 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct ScientificView: View {
+
+    private let lifecycleViewModel: LifecycleViewModel<ScientificViewModel>
+    private let router = Router()
+
+    @ObservedObject private var quantityDetailsButton: ButtonObservable
+    @ObservedObject private var leftValue: StringSubject
+    @ObservedObject private var currentLeftUnitButton: ButtonObservable
+    @ObservedObject private var rightValue: StringObservable
+    @ObservedObject private var currentRightUnitButton: ButtonObservable
+    @ObservedObject private var converters: ListObservable<ScientificViewModel.Button>
+    @ObservedObject private var route = ObjectRoutingState<Route>()
+    @ObservedObject private var converterRoute = IdentifiableObjectRoutingState<ConverterRoute>()
+
+    init() {
+        let containerView = ContainerView(.alert)
+        let viewModel = ScientificViewModel(alertPresenterBuilder: containerView.alertBuilder, navigator: router.navigator)
+
+        quantityDetailsButton = ButtonObservable(viewModel.quantityDetailsButton)
+        leftValue = StringSubject(viewModel.leftValue)
+        currentLeftUnitButton = ButtonObservable(viewModel.currentLeftUnitButton)
+        rightValue = StringObservable(viewModel.rightValue)
+        currentRightUnitButton = ButtonObservable(viewModel.currentRightUnitButton)
+        converters = ListObservable(viewModel.converters)
+
+        lifecycleViewModel = LifecycleViewModel(viewModel, containerView: containerView)
+    }
+
+    var body: some View {
+        router.routingState = route
+        router.converterRoutingState = converterRoute
+        return generateBody().navigationTitle("feature_scientific".localized())
+    }
+
+    func generateBody() -> some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            ScrollView {
+                VStack(spacing: 10) {
+                    quantityDetailsButton.value.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                    Text("Convert:")
+                    HStack(alignment: .center, spacing: 10.0) {
+                        HStack {
+                            TextField("", text: $leftValue.value)
+                                .textFieldStyle(.roundedBorder)
+                                .frame(maxWidth: .infinity)
+                            currentLeftUnitButton.value.toButton()
+                        }.frame(maxWidth: .infinity)
+                        HStack {
+                            Text(rightValue.value)
+                                .frame(maxWidth: .infinity)
+                            currentRightUnitButton.value.toButton()
+                        }.frame(maxWidth: .infinity)
+                    }
+                    viewModel.calculateButton.toButton(buttonFrame: .frame(maxWidth: .infinity))
+                    Text("Converters:")
+                    ForEach(converters.value) { converter in
+                        converter.button.toButton(buttonFrame: .frame(maxWidth: .infinity)).navigation(
+                            state: converterRoute,
+                            id: converter.id,
+                            type: .push,
+                            didSelect: converter.button.action
+                        ) {
+                            if let route = converterRoute.object {
+                                switch route {
+                                case let .converter(arguments): ScientificConverterView(arguments: arguments)
+                                        .equatable()
+                                        .environmentObject(converterRoute as RoutingState)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            .padding(.horizontal, 10.0)
+            .navigation(state: route, type: .sheet) {
+                if let routeObject = route.object {
+                    switch routeObject {
+                    case let .leftUnit(quantity):
+                        ScientificUnitSelectionView(quantity: quantity) { index in
+                            viewModel.didSelectLeftUnit(unitIndex: index)
+                        }
+                        .equatable()
+                        .environmentObject(route as RoutingState)
+                    case let .rightUnit(quantity):
+                        ScientificUnitSelectionView(quantity: quantity) { index in
+                            viewModel.didSelectRightUnit(unitIndex: index)
+                        }
+                        .equatable()
+                        .environmentObject(route as RoutingState)
+                    }
+                }
+            }
+        }
+    }
+}
+
+extension ScientificView {
+
+    enum Route: Equatable {
+        case leftUnit(quantity: ScientificPhysicalQuantity)
+        case rightUnit(quantity: ScientificPhysicalQuantity)
+    }
+
+    enum ConverterRoute: Identifiable, Equatable {
+        var id: String {
+            switch self {
+            case let .converter(arguments): return arguments.id
+            }
+        }
+
+        case converter(arguments: ScientificConverterViewModel.Arguments)
+    }
+
+    class Router {
+        var routingState: ObjectRoutingState<Route>?
+        var converterRoutingState: IdentifiableObjectRoutingState<ConverterRoute>?
+        lazy var navigator = ScientificNavigatorKt.ScientificNavigator(
+            onSelectLeftUnit: { [weak self] quantity in
+                self?.routingState?.show(.leftUnit(quantity: quantity))
+            },
+            onSelectRightUnit: { [weak self] quantity in
+                self?.routingState?.show(.rightUnit(quantity: quantity))
+            },
+            onConverter: { [weak self] arguments in
+                self?.converterRoutingState?.show(.converter(arguments: arguments))
+            }
+        )
+    }
+}
+
+extension ScientificViewModel.Button: Identifiable {}
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index b209ca098..6c37b1321 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -59,10 +59,12 @@ import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
 import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
 import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
-import com.splendo.kaluga.example.shared.viewmodel.scientific.CloseScientificConverterNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificViewModel
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterViewModel
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificNavigationAction
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificUnitSelectionAction
+import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificUnitSelectionViewModel
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationActions
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
 import com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel
@@ -73,6 +75,7 @@ import com.splendo.kaluga.permissions.base.Permission
 import com.splendo.kaluga.permissions.location.LocationPermission
 import com.splendo.kaluga.resources.StyledStringBuilder
 import com.splendo.kaluga.review.ReviewManager
+import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.system.network.state.NetworkStateRepoBuilder
 import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
@@ -189,12 +192,16 @@ internal val androidModule = module {
         ButtonViewModel(StyledStringBuilder.Provider(), AlertPresenter.Builder())
     }
 
-    viewModel { (navigator: Navigator<ScientificConverterNavigationAction>) ->
+    viewModel { (navigator: Navigator<ScientificNavigationAction<*>>) ->
         ScientificViewModel(AlertPresenter.Builder(), navigator)
     }
 
-    viewModel { (arguments: ScientificConverterViewModel.Arguments, navigator: Navigator<CloseScientificConverterNavigationAction>) ->
-        ScientificConverterViewModel(arguments, AlertPresenter.Builder(), navigator)
+    viewModel { (quantity: PhysicalQuantity, navigator: Navigator<ScientificUnitSelectionAction<*>>) ->
+        ScientificUnitSelectionViewModel(quantity, navigator)
+    }
+
+    viewModel { (arguments: ScientificConverterViewModel.Arguments, navigator: Navigator<ScientificConverterNavigationAction<*>>) ->
+        ScientificConverterViewModel(arguments, navigator)
     }
 }
 
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
index e8f87e7dc..0196e6136 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
@@ -38,7 +38,7 @@ data class QuantityDetails<Quantity: PhysicalQuantity>(
     }
 }
 
-val allPhysicalQuantities = setOf(
+val allPhysicalQuantities: Set<PhysicalQuantity> = setOf(
     PhysicalQuantity.Acceleration,
     PhysicalQuantity.Action,
     PhysicalQuantity.AmountOfSubstance,
@@ -102,67 +102,67 @@ val allPhysicalQuantities = setOf(
     PhysicalQuantity.Yank
 )
 
-val PhysicalQuantity.details: QuantityDetails<*>? get() {
-    return when (this) {
-        is PhysicalQuantity.Dimensionless -> null
-        is PhysicalQuantity.Acceleration -> QuantityDetails(this, AccelerationUnits, converters)
-        is PhysicalQuantity.Action -> QuantityDetails(this, ActionUnits, converters)
-        is PhysicalQuantity.AmountOfSubstance -> QuantityDetails(this, AmountOfSubstanceUnits, converters)
-        is PhysicalQuantity.Angle -> QuantityDetails(this, AngleUnits, converters)
-        is PhysicalQuantity.AngularAcceleration -> QuantityDetails(this, AngularAccelerationUnits, converters)
-        is PhysicalQuantity.AngularVelocity -> QuantityDetails(this, AngularVelocityUnits, converters)
-        is PhysicalQuantity.Area -> QuantityDetails(this, AreaUnits, converters)
-        is PhysicalQuantity.AreaDensity -> QuantityDetails(this, AreaDensityUnits, converters)
-        is PhysicalQuantity.CatalysticActivity -> QuantityDetails(this, CatalysticActivityUnits, converters)
-        is PhysicalQuantity.Density -> QuantityDetails(this, DensityUnits, converters)
-        is PhysicalQuantity.DynamicViscosity -> QuantityDetails(this, DynamicViscosityUnits, converters)
-        is PhysicalQuantity.ElectricCapacitance -> QuantityDetails(this, ElectricCapacitanceUnits, converters)
-        is PhysicalQuantity.ElectricCharge -> QuantityDetails(this, ElectricChargeUnits, converters)
-        is PhysicalQuantity.ElectricConductance -> QuantityDetails(this, ElectricConductanceUnits, converters)
-        is PhysicalQuantity.ElectricCurrent -> QuantityDetails(this, ElectricCurrentUnits, converters)
-        is PhysicalQuantity.ElectricInductance -> QuantityDetails(this, ElectricInductanceUnits, converters)
-        is PhysicalQuantity.ElectricResistance -> QuantityDetails(this, ElectricResistanceUnits, converters)
-        is PhysicalQuantity.Energy -> QuantityDetails(this, EnergyUnits, converters)
-        is PhysicalQuantity.Force -> QuantityDetails(this, ForceUnits, converters)
-        is PhysicalQuantity.Frequency -> QuantityDetails(this, FrequencyUnits, emptyList())
-        is PhysicalQuantity.HeatCapacity -> QuantityDetails(this, HeatCapacityUnits, emptyList())
-        is PhysicalQuantity.Illuminance -> QuantityDetails(this, IlluminanceUnits, emptyList())
-        is PhysicalQuantity.IonizingRadiationAbsorbedDose -> QuantityDetails(this, IonizingRadiationAbsorbedDoseUnits, emptyList())
-        is PhysicalQuantity.IonizingRadiationEquivalentDose -> QuantityDetails(this, IonizingRadiationEquivalentDoseUnits, emptyList())
-        is PhysicalQuantity.Jolt -> QuantityDetails(this, JoltUnits, emptyList())
-        is PhysicalQuantity.Length -> QuantityDetails(this, LengthUnits, emptyList())
-        is PhysicalQuantity.LinearMassDensity -> QuantityDetails(this, LinearMassDensityUnits, emptyList())
-        is PhysicalQuantity.Luminance -> QuantityDetails(this, LuminanceUnits, emptyList())
-        is PhysicalQuantity.LuminousEnergy -> QuantityDetails(this, LuminousEnergyUnits, emptyList())
-        is PhysicalQuantity.LuminousExposure -> QuantityDetails(this, LuminousExposureUnits, emptyList())
-        is PhysicalQuantity.LuminousFlux -> QuantityDetails(this, LuminousFluxUnits, emptyList())
-        is PhysicalQuantity.LuminousIntensity -> QuantityDetails(this, LuminousIntensityUnits, emptyList())
-        is PhysicalQuantity.MagneticFlux -> QuantityDetails(this, MagneticFluxUnits, emptyList())
-        is PhysicalQuantity.MagneticInduction -> QuantityDetails(this, MagneticInductionUnits, emptyList())
-        is PhysicalQuantity.MassFlowRate -> QuantityDetails(this, MassFlowRateUnits, emptyList())
-        is PhysicalQuantity.Molality -> QuantityDetails(this, MolalityUnits, emptyList())
-        is PhysicalQuantity.MolarEnergy -> QuantityDetails(this, MolarEnergyUnits, emptyList())
-        is PhysicalQuantity.Molarity -> QuantityDetails(this, MolarityUnits, emptyList())
-        is PhysicalQuantity.MolarMass -> QuantityDetails(this, MolarMassUnits, emptyList())
-        is PhysicalQuantity.MolarVolume -> QuantityDetails(this, MolarVolumeUnits, emptyList())
-        is PhysicalQuantity.Momentum -> QuantityDetails(this, MomentumUnits, emptyList())
-        is PhysicalQuantity.Power -> QuantityDetails(this, PowerUnits, emptyList())
-        is PhysicalQuantity.Pressure -> QuantityDetails(this, PressureUnits, emptyList())
-        is PhysicalQuantity.Radioactivity -> QuantityDetails(this, RadioactivityUnits, emptyList())
-        is PhysicalQuantity.SolidAngle -> QuantityDetails(this, SolidAngleUnits, emptyList())
-        is PhysicalQuantity.SpecificEnergy -> QuantityDetails(this, SpecificEnergyUnits, emptyList())
-        is PhysicalQuantity.SpecificHeatCapacity -> QuantityDetails(this, SpecificHeatCapacityUnits, emptyList())
-        is PhysicalQuantity.SpecificVolume -> QuantityDetails(this, SpecificVolumeUnits, emptyList())
-        is PhysicalQuantity.Speed -> QuantityDetails(this, SpeedUnits, emptyList())
-        is PhysicalQuantity.SurfaceTension -> QuantityDetails(this, SurfaceTensionUnits, emptyList())
-        is PhysicalQuantity.Temperature -> QuantityDetails(this, TemperatureUnits, emptyList())
-        is PhysicalQuantity.ThermalResistance -> QuantityDetails(this, ThermalResistanceUnits, emptyList())
-        is PhysicalQuantity.Time -> QuantityDetails(this, TimeUnits, emptyList())
-        is PhysicalQuantity.Voltage -> QuantityDetails(this, VoltageUnits, emptyList())
-        is PhysicalQuantity.Volume -> QuantityDetails(this, VolumeUnits, emptyList())
-        is PhysicalQuantity.VolumetricFlow -> QuantityDetails(this, VolumetricFlowUnits, emptyList())
-        is PhysicalQuantity.VolumetricFlux -> QuantityDetails(this, VolumetricFluxUnits, emptyList())
-        is PhysicalQuantity.Weight -> QuantityDetails(this, WeightUnits, emptyList())
-        is PhysicalQuantity.Yank -> QuantityDetails(this, YankUnits, emptyList())
-    }
+internal val PhysicalQuantity.quantityDetails: QuantityDetails<*>? get() = when (this) {
+    is PhysicalQuantity.Dimensionless -> null
+    is PhysicalQuantity.Acceleration -> QuantityDetails(this, AccelerationUnits, converters)
+    is PhysicalQuantity.Action -> QuantityDetails(this, ActionUnits, converters)
+    is PhysicalQuantity.AmountOfSubstance -> QuantityDetails(this, AmountOfSubstanceUnits, converters)
+    is PhysicalQuantity.Angle -> QuantityDetails(this, AngleUnits, converters)
+    is PhysicalQuantity.AngularAcceleration -> QuantityDetails(this, AngularAccelerationUnits, converters)
+    is PhysicalQuantity.AngularVelocity -> QuantityDetails(this, AngularVelocityUnits, converters)
+    is PhysicalQuantity.Area -> QuantityDetails(this, AreaUnits, converters)
+    is PhysicalQuantity.AreaDensity -> QuantityDetails(this, AreaDensityUnits, converters)
+    is PhysicalQuantity.CatalysticActivity -> QuantityDetails(this, CatalysticActivityUnits, converters)
+    is PhysicalQuantity.Density -> QuantityDetails(this, DensityUnits, converters)
+    is PhysicalQuantity.DynamicViscosity -> QuantityDetails(this, DynamicViscosityUnits, converters)
+    is PhysicalQuantity.ElectricCapacitance -> QuantityDetails(this, ElectricCapacitanceUnits, converters)
+    is PhysicalQuantity.ElectricCharge -> QuantityDetails(this, ElectricChargeUnits, converters)
+    is PhysicalQuantity.ElectricConductance -> QuantityDetails(this, ElectricConductanceUnits, converters)
+    is PhysicalQuantity.ElectricCurrent -> QuantityDetails(this, ElectricCurrentUnits, converters)
+    is PhysicalQuantity.ElectricInductance -> QuantityDetails(this, ElectricInductanceUnits, converters)
+    is PhysicalQuantity.ElectricResistance -> QuantityDetails(this, ElectricResistanceUnits, converters)
+    is PhysicalQuantity.Energy -> QuantityDetails(this, EnergyUnits, converters)
+    is PhysicalQuantity.Force -> QuantityDetails(this, ForceUnits, converters)
+    is PhysicalQuantity.Frequency -> QuantityDetails(this, FrequencyUnits, converters)
+    is PhysicalQuantity.HeatCapacity -> QuantityDetails(this, HeatCapacityUnits, converters)
+    is PhysicalQuantity.Illuminance -> QuantityDetails(this, IlluminanceUnits, emptyList())
+    is PhysicalQuantity.IonizingRadiationAbsorbedDose -> QuantityDetails(this, IonizingRadiationAbsorbedDoseUnits, emptyList())
+    is PhysicalQuantity.IonizingRadiationEquivalentDose -> QuantityDetails(this, IonizingRadiationEquivalentDoseUnits, emptyList())
+    is PhysicalQuantity.Jolt -> QuantityDetails(this, JoltUnits, emptyList())
+    is PhysicalQuantity.Length -> QuantityDetails(this, LengthUnits, emptyList())
+    is PhysicalQuantity.LinearMassDensity -> QuantityDetails(this, LinearMassDensityUnits, emptyList())
+    is PhysicalQuantity.Luminance -> QuantityDetails(this, LuminanceUnits, emptyList())
+    is PhysicalQuantity.LuminousEnergy -> QuantityDetails(this, LuminousEnergyUnits, emptyList())
+    is PhysicalQuantity.LuminousExposure -> QuantityDetails(this, LuminousExposureUnits, emptyList())
+    is PhysicalQuantity.LuminousFlux -> QuantityDetails(this, LuminousFluxUnits, emptyList())
+    is PhysicalQuantity.LuminousIntensity -> QuantityDetails(this, LuminousIntensityUnits, emptyList())
+    is PhysicalQuantity.MagneticFlux -> QuantityDetails(this, MagneticFluxUnits, emptyList())
+    is PhysicalQuantity.MagneticInduction -> QuantityDetails(this, MagneticInductionUnits, emptyList())
+    is PhysicalQuantity.MassFlowRate -> QuantityDetails(this, MassFlowRateUnits, emptyList())
+    is PhysicalQuantity.Molality -> QuantityDetails(this, MolalityUnits, emptyList())
+    is PhysicalQuantity.MolarEnergy -> QuantityDetails(this, MolarEnergyUnits, emptyList())
+    is PhysicalQuantity.Molarity -> QuantityDetails(this, MolarityUnits, emptyList())
+    is PhysicalQuantity.MolarMass -> QuantityDetails(this, MolarMassUnits, emptyList())
+    is PhysicalQuantity.MolarVolume -> QuantityDetails(this, MolarVolumeUnits, emptyList())
+    is PhysicalQuantity.Momentum -> QuantityDetails(this, MomentumUnits, emptyList())
+    is PhysicalQuantity.Power -> QuantityDetails(this, PowerUnits, emptyList())
+    is PhysicalQuantity.Pressure -> QuantityDetails(this, PressureUnits, emptyList())
+    is PhysicalQuantity.Radioactivity -> QuantityDetails(this, RadioactivityUnits, emptyList())
+    is PhysicalQuantity.SolidAngle -> QuantityDetails(this, SolidAngleUnits, emptyList())
+    is PhysicalQuantity.SpecificEnergy -> QuantityDetails(this, SpecificEnergyUnits, emptyList())
+    is PhysicalQuantity.SpecificHeatCapacity -> QuantityDetails(this, SpecificHeatCapacityUnits, emptyList())
+    is PhysicalQuantity.SpecificVolume -> QuantityDetails(this, SpecificVolumeUnits, emptyList())
+    is PhysicalQuantity.Speed -> QuantityDetails(this, SpeedUnits, emptyList())
+    is PhysicalQuantity.SurfaceTension -> QuantityDetails(this, SurfaceTensionUnits, emptyList())
+    is PhysicalQuantity.Temperature -> QuantityDetails(this, TemperatureUnits, emptyList())
+    is PhysicalQuantity.ThermalResistance -> QuantityDetails(this, ThermalResistanceUnits, emptyList())
+    is PhysicalQuantity.Time -> QuantityDetails(this, TimeUnits, emptyList())
+    is PhysicalQuantity.Voltage -> QuantityDetails(this, VoltageUnits, emptyList())
+    is PhysicalQuantity.Volume -> QuantityDetails(this, VolumeUnits, emptyList())
+    is PhysicalQuantity.VolumetricFlow -> QuantityDetails(this, VolumetricFlowUnits, emptyList())
+    is PhysicalQuantity.VolumetricFlux -> QuantityDetails(this, VolumetricFluxUnits, emptyList())
+    is PhysicalQuantity.Weight -> QuantityDetails(this, WeightUnits, emptyList())
+    is PhysicalQuantity.Yank -> QuantityDetails(this, YankUnits, emptyList())
 }
+
+val PhysicalQuantity.name: String get() = this::class.simpleName.orEmpty().split("(?=\\p{Upper})".toRegex()).joinToString(" ")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt
index 17b50ad41..4b798ff1c 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt
@@ -28,21 +28,18 @@ import com.splendo.kaluga.scientific.unit.ImperialAcceleration
 import com.splendo.kaluga.scientific.unit.ImperialTon
 import com.splendo.kaluga.scientific.unit.ImperialWeight
 import com.splendo.kaluga.scientific.unit.Jolt
-import com.splendo.kaluga.scientific.unit.JoltUnits
 import com.splendo.kaluga.scientific.unit.MetricAcceleration
 import com.splendo.kaluga.scientific.unit.MetricWeight
 import com.splendo.kaluga.scientific.unit.Ounce
 import com.splendo.kaluga.scientific.unit.Pound
 import com.splendo.kaluga.scientific.unit.Time
-import com.splendo.kaluga.scientific.unit.TimeUnits
 import com.splendo.kaluga.scientific.unit.UKImperialWeight
 import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.UsTon
 import com.splendo.kaluga.scientific.unit.Weight
-import com.splendo.kaluga.scientific.unit.WeightUnits
 
 val PhysicalQuantity.Acceleration.converters get() = listOf<QuantityConverter<PhysicalQuantity.Acceleration, *, *>>(
-    QuantityConverter("Force from Weight", QuantityConverter.Type.Multiplication, WeightUnits) { (accelerationValue, accelerationUnit), (weightValue, weightUnit) ->
+    QuantityConverter("Force from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (accelerationValue, accelerationUnit), (weightValue, weightUnit) ->
         when {
             accelerationUnit is MetricAcceleration && weightUnit is Gram -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
             accelerationUnit is MetricAcceleration && weightUnit is MetricWeight -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
@@ -58,7 +55,7 @@ val PhysicalQuantity.Acceleration.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $accelerationUnit, $weightUnit")
         }
     },
-    QuantityConverter("Jolt from Time", QuantityConverter.Type.Division, TimeUnits) { (accelerationValue, accelerationUnit), (timeValue, timeUnit) ->
+    QuantityConverter("Jolt from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (accelerationValue, accelerationUnit), (timeValue, timeUnit) ->
         when {
             accelerationUnit is MetricAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) / DefaultScientificValue(timeValue, timeUnit)
             accelerationUnit is ImperialAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) / DefaultScientificValue(timeValue, timeUnit)
@@ -66,7 +63,7 @@ val PhysicalQuantity.Acceleration.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $accelerationUnit, $timeUnit")
         }
     },
-    QuantityConverter("Speed from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (accelerationValue, accelerationUnit), (timeValue, timeUnit) ->
+    QuantityConverter("Speed from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (accelerationValue, accelerationUnit), (timeValue, timeUnit) ->
         when {
             accelerationUnit is MetricAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(timeValue, timeUnit)
             accelerationUnit is ImperialAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(timeValue, timeUnit)
@@ -74,7 +71,7 @@ val PhysicalQuantity.Acceleration.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $accelerationUnit, $timeUnit")
         }
     },
-    QuantityConverter("Time from Jolt", QuantityConverter.Type.Division, JoltUnits) { (accelerationValue, accelerationUnit), (joltValue, joltUnit) ->
+    QuantityConverter("Time from Jolt", QuantityConverter.Type.Division, PhysicalQuantity.Jolt) { (accelerationValue, accelerationUnit), (joltValue, joltUnit) ->
         when {
             accelerationUnit is Acceleration && joltUnit is Jolt -> DefaultScientificValue(accelerationValue, accelerationUnit) / DefaultScientificValue(joltValue, joltUnit)
             else -> throw RuntimeException("Unexpected units: $accelerationUnit, $joltUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
index 3b30e80a3..3fb44c33e 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
@@ -20,10 +20,15 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.action.div
-import com.splendo.kaluga.scientific.unit.*
+import com.splendo.kaluga.scientific.unit.Action
+import com.splendo.kaluga.scientific.unit.Energy
+import com.splendo.kaluga.scientific.unit.ImperialAction
+import com.splendo.kaluga.scientific.unit.MetricAction
+import com.splendo.kaluga.scientific.unit.MetricAndImperialAction
+import com.splendo.kaluga.scientific.unit.Time
 
 val PhysicalQuantity.Action.converters get() = listOf<QuantityConverter<PhysicalQuantity.Action, *, *>>(
-    QuantityConverter("Energy from Time", QuantityConverter.Type.Division, TimeUnits) { (actionValue, actionUnit), (timeValue, timeUnit) ->
+    QuantityConverter("Energy from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (actionValue, actionUnit), (timeValue, timeUnit) ->
         when {
             actionUnit is MetricAndImperialAction && timeUnit is Time -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(timeValue, timeUnit)
             actionUnit is MetricAction && timeUnit is Time -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(timeValue, timeUnit)
@@ -32,7 +37,7 @@ val PhysicalQuantity.Action.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $actionUnit, $timeUnit")
         }
     },
-    QuantityConverter("Time from Energy", QuantityConverter.Type.Division, EnergyUnits) { (actionValue, actionUnit), (energyValue, energyUnit) ->
+    QuantityConverter("Time from Energy", QuantityConverter.Type.Division, PhysicalQuantity.Energy) { (actionValue, actionUnit), (energyValue, energyUnit) ->
         when {
             actionUnit is Action && energyUnit is Energy -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(energyValue, energyUnit)
             else -> throw RuntimeException("Unexpected units: $actionUnit, $energyUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
index ace642086..a5b599baa 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
@@ -25,7 +25,7 @@ import com.splendo.kaluga.scientific.converter.amountOfSubstance.times
 import com.splendo.kaluga.scientific.unit.*
 
 val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConverter<PhysicalQuantity.AmountOfSubstance, *, *>>(
-    QuantityConverter("Energy from Molar Energy", QuantityConverter.Type.Multiplication, MolarEnergyUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molarEnergyValue, molarEnergyUnit) ->
+    QuantityConverter("Energy from Molar Energy", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarEnergy) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molarEnergyValue, molarEnergyUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && molarEnergyUnit is MetricAndImperialMolarEnergy -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) * DefaultScientificValue(molarEnergyValue, molarEnergyUnit)
             amountOfSubstanceUnit is AmountOfSubstance && molarEnergyUnit is MetricMolarEnergy -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) * DefaultScientificValue(molarEnergyValue, molarEnergyUnit)
@@ -34,7 +34,7 @@ val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $molarEnergyUnit")
         }
     },
-    QuantityConverter("Molality from Weight", QuantityConverter.Type.Division, WeightUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (weightValue, weightUnit) ->
+    QuantityConverter("Molality from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (amountOfSubstanceValue, amountOfSubstanceUnit), (weightValue, weightUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && weightUnit is MetricWeight -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(weightValue, weightUnit)
             amountOfSubstanceUnit is AmountOfSubstance && weightUnit is ImperialWeight -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(weightValue, weightUnit)
@@ -44,7 +44,7 @@ val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $weightUnit")
         }
     },
-    QuantityConverter("Molarity from Volume", QuantityConverter.Type.Division, VolumeUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (volumeValue, volumeUnit) ->
+    QuantityConverter("Molarity from Volume", QuantityConverter.Type.Division, PhysicalQuantity.Volume) { (amountOfSubstanceValue, amountOfSubstanceUnit), (volumeValue, volumeUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && volumeUnit is MetricVolume -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(volumeValue, volumeUnit)
             amountOfSubstanceUnit is AmountOfSubstance && volumeUnit is ImperialVolume -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(volumeValue, volumeUnit)
@@ -54,19 +54,19 @@ val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $volumeUnit")
         }
     },
-    QuantityConverter("Radioactivity from Time", QuantityConverter.Type.Custom("with λ"), TimeUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (timeValue, timeUnit) ->
+    QuantityConverter("Radioactivity from Time", QuantityConverter.Type.Custom("with λ"), PhysicalQuantity.Time) { (amountOfSubstanceValue, amountOfSubstanceUnit), (timeValue, timeUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && timeUnit is Time -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit).decaysWithHalfLife(DefaultScientificValue(timeValue, timeUnit))
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $timeUnit")
         }
     },
-    QuantityConverter("Time from Catalystic Activity", QuantityConverter.Type.Division, CatalysticActivityUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (catalysticActivityValue, catalysticActivityUnit) ->
+    QuantityConverter("Time from Catalystic Activity", QuantityConverter.Type.Division, PhysicalQuantity.CatalysticActivity) { (amountOfSubstanceValue, amountOfSubstanceUnit), (catalysticActivityValue, catalysticActivityUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && catalysticActivityUnit is CatalysticActivity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(catalysticActivityValue, catalysticActivityUnit)
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $catalysticActivityUnit")
         }
     },
-    QuantityConverter("Volume from Molarity", QuantityConverter.Type.Division, MolarityUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molarityValue, molarityUnit) ->
+    QuantityConverter("Volume from Molarity", QuantityConverter.Type.Division, PhysicalQuantity.Molarity) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molarityValue, molarityUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && molarityUnit is MetricMolarity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molarityValue, molarityUnit)
             amountOfSubstanceUnit is AmountOfSubstance && molarityUnit is ImperialMolarity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molarityValue, molarityUnit)
@@ -76,7 +76,7 @@ val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $molarityUnit")
         }
     },
-    QuantityConverter("Weight from Molality", QuantityConverter.Type.Division, MolalityUnits) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molalityValue, molalityUnit) ->
+    QuantityConverter("Weight from Molality", QuantityConverter.Type.Division, PhysicalQuantity.Molality) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molalityValue, molalityUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && molalityUnit is MetricMolality -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molalityValue, molalityUnit)
             amountOfSubstanceUnit is AmountOfSubstance && molalityUnit is ImperialMolality -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molalityValue, molalityUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
index 7f9397cab..5d48ee383 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
@@ -22,18 +22,16 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.angle.div
 import com.splendo.kaluga.scientific.unit.Angle
 import com.splendo.kaluga.scientific.unit.AngularVelocity
-import com.splendo.kaluga.scientific.unit.AngularVelocityUnits
 import com.splendo.kaluga.scientific.unit.Time
-import com.splendo.kaluga.scientific.unit.TimeUnits
 
 val PhysicalQuantity.Angle.converters get() = listOf<QuantityConverter<PhysicalQuantity.Angle, *, *>>(
-    QuantityConverter("Angular Velocity from Time", QuantityConverter.Type.Division, TimeUnits) { (angleValue, angleUnit), (timeValue, timeUnit) ->
+    QuantityConverter("Angular Velocity from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (angleValue, angleUnit), (timeValue, timeUnit) ->
         when {
             angleUnit is Angle && timeUnit is Time -> DefaultScientificValue(angleValue, angleUnit) / DefaultScientificValue(timeValue, timeUnit)
             else -> throw RuntimeException("Unexpected units: $angleUnit $timeUnit")
         }
     },
-    QuantityConverter("Time from Angular Velocity", QuantityConverter.Type.Division, AngularVelocityUnits) { (angleValue, angleUnit), (angularVelocityValue, angularVelocityUnit) ->
+    QuantityConverter("Time from Angular Velocity", QuantityConverter.Type.Division, PhysicalQuantity.AngularVelocity) { (angleValue, angleUnit), (angularVelocityValue, angularVelocityUnit) ->
         when {
             angleUnit is Angle && angularVelocityUnit is AngularVelocity -> DefaultScientificValue(angleValue, angleUnit) / DefaultScientificValue(angularVelocityValue, angularVelocityUnit)
             else -> throw RuntimeException("Unexpected units: $angleUnit $angularVelocityUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt
index 9f6842d93..f65dc4a56 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt
@@ -22,10 +22,9 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.angularAcceleration.times
 import com.splendo.kaluga.scientific.unit.AngularAcceleration
 import com.splendo.kaluga.scientific.unit.Time
-import com.splendo.kaluga.scientific.unit.TimeUnits
 
 val PhysicalQuantity.AngularAcceleration.converters get() = listOf<QuantityConverter<PhysicalQuantity.AngularAcceleration, *, *>>(
-    QuantityConverter("Angular Velocity from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (angularAccelerationValue, angularAccelerationUnit), (timeValue, timeUnit) ->
+    QuantityConverter("Angular Velocity from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (angularAccelerationValue, angularAccelerationUnit), (timeValue, timeUnit) ->
         when {
             angularAccelerationUnit is AngularAcceleration && timeUnit is Time -> DefaultScientificValue(angularAccelerationValue, angularAccelerationUnit) * DefaultScientificValue(timeValue, timeUnit)
             else -> throw RuntimeException("Unexpected units: $angularAccelerationUnit $timeUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
index f8e1884f3..f90594a35 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
@@ -28,19 +28,19 @@ import com.splendo.kaluga.scientific.unit.Time
 import com.splendo.kaluga.scientific.unit.TimeUnits
 
 val PhysicalQuantity.AngularVelocity.converters get() = listOf<QuantityConverter<PhysicalQuantity.AngularVelocity, *, *>>(
-    QuantityConverter("Angle from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
+    QuantityConverter("Angle from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
         when {
             angularVelocityUnit is AngularVelocity && timeUnit is Time -> DefaultScientificValue(angularVelocityValue, angularVelocityUnit) * DefaultScientificValue(timeValue, timeUnit)
             else -> throw RuntimeException("Unexpected units: $angularVelocityUnit $timeUnit")
         }
     },
-    QuantityConverter("Angular Acceleration from Time", QuantityConverter.Type.Division, TimeUnits) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
+    QuantityConverter("Angular Acceleration from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
         when {
             angularVelocityUnit is AngularVelocity && timeUnit is Time -> DefaultScientificValue(angularVelocityValue, angularVelocityUnit) / DefaultScientificValue(timeValue, timeUnit)
             else -> throw RuntimeException("Unexpected units: $angularVelocityUnit $timeUnit")
         }
     },
-    QuantityConverter("Time from Angular Acceleration", QuantityConverter.Type.Division, AngularAccelerationUnits) { (angularVelocityValue, angularVelocityUnit), (angularAccelerationValue, angularAccelerationUnit) ->
+    QuantityConverter("Time from Angular Acceleration", QuantityConverter.Type.Division, PhysicalQuantity.AngularAcceleration) { (angularVelocityValue, angularVelocityUnit), (angularAccelerationValue, angularAccelerationUnit) ->
         when {
             angularVelocityUnit is AngularVelocity && angularAccelerationUnit is AngularAcceleration -> DefaultScientificValue(angularVelocityValue, angularVelocityUnit) / DefaultScientificValue(angularAccelerationValue, angularAccelerationUnit)
             else -> throw RuntimeException("Unexpected units: $angularVelocityUnit $angularAccelerationUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
index f382016df..6ec1b70c2 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
@@ -24,7 +24,7 @@ import com.splendo.kaluga.scientific.converter.area.times
 import com.splendo.kaluga.scientific.unit.*
 
 val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQuantity.Area, *, *>>(
-    QuantityConverter("Energy from Surface Tension", QuantityConverter.Type.Multiplication, SurfaceTensionUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Energy from Surface Tension", QuantityConverter.Type.Multiplication, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareCentimeter && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricArea && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -38,19 +38,10 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Force from Pressure", QuantityConverter.Type.Multiplication, PressureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Force from Pressure", QuantityConverter.Type.Multiplication, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareCentimeter && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is SquareCentimeter && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is SquareCentimeter && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is SquareCentimeter && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is SquareCentimeter && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is SquareCentimeter && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is SquareCentimeter && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is SquareCentimeter && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is SquareCentimeter && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is SquareCentimeter && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is SquareCentimeter && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SquareCentimeter && rightUnit is BaryeMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is OunceSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is KipSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is KipSquareFoot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -65,7 +56,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Length from Length", QuantityConverter.Type.Division, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Length from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareMeter && rightUnit is Meter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is SquareNanometer && rightUnit is Nanometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -88,7 +79,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Linear Mass Density from Density", QuantityConverter.Type.Multiplication, DensityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Linear Mass Density from Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -99,7 +90,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Linear Mass Density from Specific Volume", QuantityConverter.Type.Division, SpecificVolumeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Linear Mass Density from Specific Volume", QuantityConverter.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -109,7 +100,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Luminous Energy from Luminous Exposure", QuantityConverter.Type.Multiplication, LuminousExposureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Luminous Energy from Luminous Exposure", QuantityConverter.Type.Multiplication, PhysicalQuantity.LuminousExposure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricLuminousExposure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialLuminousExposure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -117,26 +108,26 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Luminous Flux from Illuminance", QuantityConverter.Type.Multiplication, IlluminanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Luminous Flux from Illuminance", QuantityConverter.Type.Multiplication, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Area && rightUnit is Illuminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Luminous Intensity from Luminance", QuantityConverter.Type.Multiplication, LuminanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Luminous Intensity from Luminance", QuantityConverter.Type.Multiplication, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Area && rightUnit is Luminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Magnetic Induction", QuantityConverter.Type.Multiplication, MagneticInductionUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Magnetic Flux from Magnetic Induction", QuantityConverter.Type.Multiplication, PhysicalQuantity.MagneticInduction) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareCentimeter && rightUnit is Gauss -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Area && rightUnit is MagneticInduction -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Momentum from Dynamic Viscosity", QuantityConverter.Type.Multiplication, DynamicViscosityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Momentum from Dynamic Viscosity", QuantityConverter.Type.Multiplication, PhysicalQuantity.DynamicViscosity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -146,7 +137,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Specific Volume from Linear Mass Density", QuantityConverter.Type.Division, LinearMassDensityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Specific Volume from Linear Mass Density", QuantityConverter.Type.Division, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -156,7 +147,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Volume from Length", QuantityConverter.Type.Multiplication, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Volume from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareMeter && rightUnit is Meter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is SquareNanometer && rightUnit is Nanometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -181,7 +172,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Volumetric Flow from Volumetric Flux", QuantityConverter.Type.Multiplication, VolumetricFluxUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Volumetric Flow from Volumetric Flux", QuantityConverter.Type.Multiplication, PhysicalQuantity.VolumetricFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -191,7 +182,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Weight from Area Density", QuantityConverter.Type.Multiplication, AreaDensityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Weight from Area Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
index 1a0a0df94..80010a053 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
@@ -24,7 +24,7 @@ import com.splendo.kaluga.scientific.converter.areaDensity.times
 import com.splendo.kaluga.scientific.unit.*
 
 val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<PhysicalQuantity.AreaDensity, *, *>>(
-    QuantityConverter("Density from Length", QuantityConverter.Type.Division, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Density from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -34,7 +34,7 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Length from Specific Volume", QuantityConverter.Type.Multiplication, SpecificVolumeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Length from Specific Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -48,7 +48,7 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Length from Density", QuantityConverter.Type.Division, DensityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Length from Density", QuantityConverter.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -62,7 +62,7 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Linear Mass Density from Length", QuantityConverter.Type.Division, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Linear Mass Density from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -72,7 +72,7 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Weight from Area", QuantityConverter.Type.Division, AreaUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Weight from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
index 00823d527..b27031ba2 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
@@ -22,10 +22,9 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.catalysticActivity.times
 import com.splendo.kaluga.scientific.unit.CatalysticActivity
 import com.splendo.kaluga.scientific.unit.Time
-import com.splendo.kaluga.scientific.unit.TimeUnits
 
 val PhysicalQuantity.CatalysticActivity.converters get() = listOf<QuantityConverter<PhysicalQuantity.CatalysticActivity, *, *>>(
-    QuantityConverter("Amount of Substance from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Amount of Substance from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is CatalysticActivity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
index 066984810..53b08ebf1 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
@@ -24,7 +24,7 @@ import com.splendo.kaluga.scientific.converter.density.times
 import com.splendo.kaluga.scientific.unit.*
 
 val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<PhysicalQuantity.Density, *, *>>(
-    QuantityConverter("Area Density from Length", QuantityConverter.Type.Multiplication, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Area Density from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -34,7 +34,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Linear Mass Density from Area", QuantityConverter.Type.Multiplication, AreaUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Linear Mass Density from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -44,7 +44,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molarity from Molality", QuantityConverter.Type.Multiplication, MolalityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Molarity from Molality", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -54,7 +54,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molarity from Molar Mass", QuantityConverter.Type.Division, MolarMassUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Molarity from Molar Mass", QuantityConverter.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -64,7 +64,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Mass from Molarity", QuantityConverter.Type.Division, MolarityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Molar Mass from Molarity", QuantityConverter.Type.Division, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -74,7 +74,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molarity from Molar Volume", QuantityConverter.Type.Multiplication, MolarVolumeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Molarity from Molar Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -84,7 +84,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Volume", QuantityConverter.Type.Multiplication, VolumeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Weight from Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
index 6fcb4c21c..c2fec31ae 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
@@ -22,21 +22,18 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.dynamicViscosity.div
 import com.splendo.kaluga.scientific.converter.dynamicViscosity.times
 import com.splendo.kaluga.scientific.unit.Area
-import com.splendo.kaluga.scientific.unit.AreaUnits
 import com.splendo.kaluga.scientific.unit.DynamicViscosity
 import com.splendo.kaluga.scientific.unit.ImperialArea
 import com.splendo.kaluga.scientific.unit.ImperialDynamicViscosity
 import com.splendo.kaluga.scientific.unit.MetricArea
 import com.splendo.kaluga.scientific.unit.MetricDynamicViscosity
 import com.splendo.kaluga.scientific.unit.Pressure
-import com.splendo.kaluga.scientific.unit.PressureUnits
 import com.splendo.kaluga.scientific.unit.Time
-import com.splendo.kaluga.scientific.unit.TimeUnits
 import com.splendo.kaluga.scientific.unit.UKImperialDynamicViscosity
 import com.splendo.kaluga.scientific.unit.USCustomaryDynamicViscosity
 
 val PhysicalQuantity.DynamicViscosity.converters get() = listOf<QuantityConverter<PhysicalQuantity.DynamicViscosity, *, *>>(
-    QuantityConverter("Momentum from Area", QuantityConverter.Type.Multiplication, AreaUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Momentum from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDynamicViscosity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDynamicViscosity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -46,7 +43,7 @@ val PhysicalQuantity.DynamicViscosity.converters get() = listOf<QuantityConverte
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Pressure from Time", QuantityConverter.Type.Division, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Pressure from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDynamicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDynamicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -56,7 +53,7 @@ val PhysicalQuantity.DynamicViscosity.converters get() = listOf<QuantityConverte
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Pressure", QuantityConverter.Type.Division, PressureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Time from Pressure", QuantityConverter.Type.Division, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is DynamicViscosity && rightUnit is Pressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
index e059ba5c0..47260c176 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
@@ -24,28 +24,25 @@ import com.splendo.kaluga.scientific.unit.Abfarad
 import com.splendo.kaluga.scientific.unit.Abvolt
 import com.splendo.kaluga.scientific.unit.ElectricCapacitance
 import com.splendo.kaluga.scientific.unit.ElectricResistance
-import com.splendo.kaluga.scientific.unit.ElectricResistanceUnits
 import com.splendo.kaluga.scientific.unit.Frequency
-import com.splendo.kaluga.scientific.unit.FrequencyUnits
 import com.splendo.kaluga.scientific.unit.Voltage
-import com.splendo.kaluga.scientific.unit.VoltageUnits
 
 val PhysicalQuantity.ElectricCapacitance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCapacitance, *, *>>(
-    QuantityConverter("Electric Charge from voltage", QuantityConverter.Type.Multiplication, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Charge from voltage", QuantityConverter.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abfarad && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCapacitance && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Conductance from Frequency", QuantityConverter.Type.Multiplication, FrequencyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Conductance from Frequency", QuantityConverter.Type.Multiplication, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abfarad && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCapacitance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Electric Resistance", QuantityConverter.Type.Multiplication, ElectricResistanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Time from Electric Resistance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricCapacitance && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
index e7898c3b8..d781c94a3 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
@@ -26,53 +26,48 @@ import com.splendo.kaluga.scientific.unit.Abfarad
 import com.splendo.kaluga.scientific.unit.Abohm
 import com.splendo.kaluga.scientific.unit.Abvolt
 import com.splendo.kaluga.scientific.unit.ElectricCapacitance
-import com.splendo.kaluga.scientific.unit.ElectricCapacitanceUnits
 import com.splendo.kaluga.scientific.unit.ElectricCharge
 import com.splendo.kaluga.scientific.unit.ElectricCurrent
-import com.splendo.kaluga.scientific.unit.ElectricCurrentUnits
 import com.splendo.kaluga.scientific.unit.ElectricResistance
-import com.splendo.kaluga.scientific.unit.ElectricResistanceUnits
 import com.splendo.kaluga.scientific.unit.Time
-import com.splendo.kaluga.scientific.unit.TimeUnits
 import com.splendo.kaluga.scientific.unit.Voltage
-import com.splendo.kaluga.scientific.unit.VoltageUnits
 
 val PhysicalQuantity.ElectricCharge.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCharge, *, *>>(
-    QuantityConverter("Electric Charge from Voltage", QuantityConverter.Type.Division, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Charge from Voltage", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Current from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Current from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Voltage", QuantityConverter.Type.Multiplication, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Energy from Voltage", QuantityConverter.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Electric Resistance", QuantityConverter.Type.Multiplication, ElectricResistanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Magnetic Flux from Electric Resistance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Electric Current", QuantityConverter.Type.Division, ElectricCurrentUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Time from Electric Current", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricCharge && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Capacitance", QuantityConverter.Type.Division, ElectricCapacitanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Voltage from Electric Capacitance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Abfarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
index a4ad80351..780b6bb28 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
@@ -24,29 +24,26 @@ import com.splendo.kaluga.scientific.converter.electricConductance.times
 import com.splendo.kaluga.scientific.unit.Absiemens
 import com.splendo.kaluga.scientific.unit.Abvolt
 import com.splendo.kaluga.scientific.unit.ElectricCapacitance
-import com.splendo.kaluga.scientific.unit.ElectricCapacitanceUnits
 import com.splendo.kaluga.scientific.unit.ElectricConductance
 import com.splendo.kaluga.scientific.unit.Frequency
-import com.splendo.kaluga.scientific.unit.FrequencyUnits
 import com.splendo.kaluga.scientific.unit.Voltage
-import com.splendo.kaluga.scientific.unit.VoltageUnits
 
 val PhysicalQuantity.ElectricConductance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricConductance, *, *>>(
-    QuantityConverter("Electric Capacitance from Frequency", QuantityConverter.Type.Division, FrequencyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Capacitance from Frequency", QuantityConverter.Type.Division, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Absiemens && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricConductance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Current from Voltage", QuantityConverter.Type.Division, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Current from Voltage", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Absiemens && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricConductance && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Frequency from Electric Capacitance", QuantityConverter.Type.Division, ElectricCapacitanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Frequency from Electric Capacitance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricConductance && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
index c7dc0c4a7..f14bcb683 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
@@ -21,10 +21,23 @@ import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.electricCurrent.div
 import com.splendo.kaluga.scientific.converter.electricCurrent.times
-import com.splendo.kaluga.scientific.unit.*
+import com.splendo.kaluga.scientific.unit.Abampere
+import com.splendo.kaluga.scientific.unit.Abhenry
+import com.splendo.kaluga.scientific.unit.Abohm
+import com.splendo.kaluga.scientific.unit.Absiemens
+import com.splendo.kaluga.scientific.unit.Abvolt
+import com.splendo.kaluga.scientific.unit.Biot
+import com.splendo.kaluga.scientific.unit.ElectricConductance
+import com.splendo.kaluga.scientific.unit.ElectricCurrent
+import com.splendo.kaluga.scientific.unit.ElectricInductance
+import com.splendo.kaluga.scientific.unit.ElectricResistance
+import com.splendo.kaluga.scientific.unit.MagneticFlux
+import com.splendo.kaluga.scientific.unit.Maxwell
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.Voltage
 
 val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCurrent, *, *>>(
-    QuantityConverter("Electric Charge from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Charge from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -32,7 +45,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Charge from Time", QuantityConverter.Type.Division, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Charge from Time", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -40,7 +53,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Magnetic Flux", QuantityConverter.Type.Multiplication, MagneticFluxUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Energy from Magnetic Flux", QuantityConverter.Type.Multiplication, PhysicalQuantity.MagneticFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -48,7 +61,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Electric Inductance", QuantityConverter.Type.Multiplication, ElectricInductanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Magnetic Flux from Electric Inductance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Abhenry -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Abhenry -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -56,7 +69,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Power from Voltage", QuantityConverter.Type.Multiplication, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Power from Voltage", QuantityConverter.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -64,7 +77,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Conductance", QuantityConverter.Type.Division, ElectricConductanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Voltage from Electric Conductance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricConductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Absiemens -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Absiemens -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -72,7 +85,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Resistance", QuantityConverter.Type.Multiplication, ElectricResistanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Voltage from Electric Resistance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt
index 69c7e628a..464b489d0 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt
@@ -21,24 +21,31 @@ import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.electricInductance.div
 import com.splendo.kaluga.scientific.converter.electricInductance.times
-import com.splendo.kaluga.scientific.unit.*
+import com.splendo.kaluga.scientific.unit.Abampere
+import com.splendo.kaluga.scientific.unit.Abhenry
+import com.splendo.kaluga.scientific.unit.Biot
+import com.splendo.kaluga.scientific.unit.ElectricCurrent
+import com.splendo.kaluga.scientific.unit.ElectricInductance
+import com.splendo.kaluga.scientific.unit.ElectricResistance
+import com.splendo.kaluga.scientific.unit.Frequency
+import com.splendo.kaluga.scientific.unit.Time
 
 val PhysicalQuantity.ElectricInductance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricInductance, *, *>>(
-    QuantityConverter("Electric Resistance from Frequency", QuantityConverter.Type.Multiplication, FrequencyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Resistance from Frequency", QuantityConverter.Type.Multiplication, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abhenry && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricInductance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Resistance from Time", QuantityConverter.Type.Division, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Resistance from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abhenry && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricInductance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Electric Current", QuantityConverter.Type.Multiplication, ElectricCurrentUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Magnetic Flux from Electric Current", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abhenry && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Abhenry && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -46,7 +53,7 @@ val PhysicalQuantity.ElectricInductance.converters get() = listOf<QuantityConver
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Electric Resistance", QuantityConverter.Type.Division, ElectricResistanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Time from Electric Resistance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricInductance && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
index 5a7d1ee0d..941653718 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
@@ -26,54 +26,48 @@ import com.splendo.kaluga.scientific.unit.Abcoulomb
 import com.splendo.kaluga.scientific.unit.Abohm
 import com.splendo.kaluga.scientific.unit.Biot
 import com.splendo.kaluga.scientific.unit.ElectricCapacitance
-import com.splendo.kaluga.scientific.unit.ElectricCapacitanceUnits
 import com.splendo.kaluga.scientific.unit.ElectricCharge
-import com.splendo.kaluga.scientific.unit.ElectricChargeUnits
 import com.splendo.kaluga.scientific.unit.ElectricCurrent
-import com.splendo.kaluga.scientific.unit.ElectricCurrentUnits
 import com.splendo.kaluga.scientific.unit.ElectricInductance
-import com.splendo.kaluga.scientific.unit.ElectricInductanceUnits
 import com.splendo.kaluga.scientific.unit.ElectricResistance
 import com.splendo.kaluga.scientific.unit.Frequency
-import com.splendo.kaluga.scientific.unit.FrequencyUnits
 import com.splendo.kaluga.scientific.unit.Time
-import com.splendo.kaluga.scientific.unit.TimeUnits
 
 val PhysicalQuantity.ElectricResistance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricResistance, *, *>>(
-    QuantityConverter("Electric Inductance from Frequency", QuantityConverter.Type.Division, FrequencyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Inductance from Frequency", QuantityConverter.Type.Division, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abohm && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricResistance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Inductance from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Inductance from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abohm && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricResistance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Frequency from Electric Inductance", QuantityConverter.Type.Division, ElectricInductanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Frequency from Electric Inductance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricResistance && rightUnit is ElectricInductance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Electric Charge", QuantityConverter.Type.Multiplication, ElectricChargeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Magnetic Flux from Electric Charge", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abohm && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricResistance && rightUnit is ElectricCharge -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Electric Capacitance", QuantityConverter.Type.Multiplication, ElectricCapacitanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Time from Electric Capacitance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricResistance && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Current", QuantityConverter.Type.Multiplication, ElectricCurrentUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Voltage from Electric Current", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abohm && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Abohm && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
index 252f13450..68aa23d3b 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
@@ -26,7 +26,7 @@ import com.splendo.kaluga.scientific.converter.energy.times
 import com.splendo.kaluga.scientific.unit.*
 
 val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<PhysicalQuantity.Energy, *, *>>(
-    QuantityConverter("Action from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Action from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -35,25 +35,16 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Amount of Substance from Molar Energy", QuantityConverter.Type.Division, MolarEnergyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Amount of Substance from Molar Energy", QuantityConverter.Type.Division, PhysicalQuantity.MolarEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Energy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area from Surface Tension", QuantityConverter.Type.Division, SurfaceTensionUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Area from Surface Tension", QuantityConverter.Type.Division, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is InchPoundForce && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is InchPoundForce && rightUnit is UKImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -72,53 +63,26 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Charge from Voltage", QuantityConverter.Type.Division, VoltageUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Charge from Voltage", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Energy && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Current from Magnetic Flux", QuantityConverter.Type.Division, MagneticFluxUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Electric Current from Magnetic Flux", QuantityConverter.Type.Division, PhysicalQuantity.MagneticFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Energy && rightUnit is MagneticFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Force from Length", QuantityConverter.Type.Division, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Force from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundal && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is InchOunceForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -128,7 +92,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Heat Capacity from Temperature", QuantityConverter.Type.Division, TemperatureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Heat Capacity from Temperature", QuantityConverter.Type.Division, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is USCustomaryTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -139,174 +103,28 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Ionizing Radiation Absorbed Dose from Weight", QuantityConverter.Type.Custom("absorbed by"), WeightUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Ionizing Radiation Absorbed Dose from Weight", QuantityConverter.Type.Custom("absorbed by"), PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Energy && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Ionizing Radiation Equivalent Dose from Weight", QuantityConverter.Type.Custom("absorbed by"), WeightUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Ionizing Radiation Equivalent Dose from Weight", QuantityConverter.Type.Custom("absorbed by"), PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Energy && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Length from Force", QuantityConverter.Type.Division, ForceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Length from Force", QuantityConverter.Type.Division, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Nanoerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Microerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Millierg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Centierg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Decierg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Decaerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Hectoerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Kiloerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Megaerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Gigaerg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Nanodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Microdyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Millidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Centidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Decidyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Decadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Hectodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Kilodyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Megadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Gigadyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
+            leftUnit is Erg && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundal && rightUnit is Poundal -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundForce && rightUnit is PoundForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is InchPoundForce && rightUnit is PoundForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -321,35 +139,17 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Electric Current", QuantityConverter.Type.Division, ElectricCurrentUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Magnetic Flux from Electric Current", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Erg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Energy && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Energy from Amount of Substance", QuantityConverter.Type.Division, AmountOfSubstanceUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Molar Energy from Amount of Substance", QuantityConverter.Type.Division, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -358,44 +158,14 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Power from Time", QuantityConverter.Type.Division, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Power from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is WattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
+            leftUnit is WattHourMultiple && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Joule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanojoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microjoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millijoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centijoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decijoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decajoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectojoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilojoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megajoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigajoule && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
+            leftUnit is JouleMultiple && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Erg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
+            leftUnit is ErgMultiple && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundal && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundal && rightUnit is Minute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundForce && rightUnit is Second -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -413,19 +183,10 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Pressure from Volume", QuantityConverter.Type.Division, VolumeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Pressure from Volume", QuantityConverter.Type.Division, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundal && rightUnit is CubicFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundForce && rightUnit is CubicFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -438,7 +199,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Energy from Weight", QuantityConverter.Type.Division, WeightUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Specific Energy from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -452,19 +213,10 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Surface Tension from Area", QuantityConverter.Type.Division, AreaUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Surface Tension from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundal && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is InchPoundForce && rightUnit is SquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is InchOunceForce && rightUnit is SquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -474,7 +226,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Temperature from Heat Capacity", QuantityConverter.Type.Division, HeatCapacityUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Temperature from Heat Capacity", QuantityConverter.Type.Division, PhysicalQuantity.HeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricAndUKImperialHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -488,140 +240,12 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Power", QuantityConverter.Type.Division, PowerUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Time from Power", QuantityConverter.Type.Division, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is WattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is WattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is WattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is WattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is WattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is WattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is WattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is WattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is WattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is WattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is WattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is NanowattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is NanowattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is MicrowattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MicrowattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is MilliwattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MilliwattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is CentiwattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is CentiwattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is DeciwattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DeciwattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is DecawattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is DecawattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is HectowattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is HectowattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is KilowattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is KilowattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is MegawattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is MegawattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is GigawattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is GigawattHour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
+            leftUnit is WattHour && rightUnit is WattMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHourMultiple && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is WattHourMultiple && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is HorsepowerHour && rightUnit is Horsepower -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundForce && rightUnit is FootPoundForcePerMinute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is InchPoundForce && rightUnit is InchPoundForcePerMinute -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -631,157 +255,20 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Charge", QuantityConverter.Type.Division, ElectricChargeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Voltage from Electric Charge", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Energy && rightUnit is ElectricCharge -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volume from Pressure", QuantityConverter.Type.Division, PressureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Volume from Pressure", QuantityConverter.Type.Division, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Nanoerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Microerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Millierg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Centierg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Decierg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Decaerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Hectoerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Kiloerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Megaerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Gigaerg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
+            leftUnit is Erg && rightUnit is BaryeMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is BaryeMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is FootPoundal && rightUnit is PoundSquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is InchPoundForce && rightUnit is PoundSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is InchOunceForce && rightUnit is PoundSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -795,283 +282,27 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Ionizing Radiation Absorbed Dose", QuantityConverter.Type.Division, IonizingRadiationAbsorbedDoseUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Weight from Ionizing Radiation Absorbed Dose", QuantityConverter.Type.Division, PhysicalQuantity.IonizingRadiationAbsorbedDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Nanoerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Microerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Millierg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Centierg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Decierg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Decaerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Hectoerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Kiloerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Megaerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Gigaerg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Nanorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Microrad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Millirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Centirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Decirad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Decarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Hectorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Kilorad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Megarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is Gigarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
+            leftUnit is Erg && rightUnit is RadMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is RadMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Energy && rightUnit is IonizingRadiationAbsorbedDose -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Ionizing Radiation Equivalent Dose", QuantityConverter.Type.Division, IonizingRadiationEquivalentDoseUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Weight from Ionizing Radiation Equivalent Dose", QuantityConverter.Type.Division, PhysicalQuantity.IonizingRadiationEquivalentDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Erg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Nanoerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanoerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Microerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Millierg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millierg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Centierg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centierg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Decierg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decierg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Decaerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decaerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Hectoerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectoerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Kiloerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kiloerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Megaerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megaerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Gigaerg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is NanoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is MicroroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is MilliroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is CentiroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is DeciroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is DecaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is HectoroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is KiloroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is MegaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigaerg && rightUnit is GigaroentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
+            leftUnit is Erg && rightUnit is RoentgenEquivalentManMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgMultiple && rightUnit is RoentgenEquivalentManMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Energy && rightUnit is IonizingRadiationEquivalentDose -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-        QuantityConverter("Weight from Specific Energy", QuantityConverter.Type.Division, SpecificEnergyUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        QuantityConverter("Weight from Specific Energy", QuantityConverter.Type.Division, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
index ab7b834bc..252343117 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
@@ -24,19 +24,10 @@ import com.splendo.kaluga.scientific.converter.force.times
 import com.splendo.kaluga.scientific.unit.*
 
 val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQuantity.Force, *, *>>(
-    QuantityConverter("Acceleration from Weight", QuantityConverter.Type.Division, WeightUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Acceleration from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DyneMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -48,140 +39,12 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area from Pressure", QuantityConverter.Type.Division, PressureUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Area from Pressure", QuantityConverter.Type.Division, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Dyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Dyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Dyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Dyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Dyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Dyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Dyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Dyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Dyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Dyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Nanodyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Microdyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Millidyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Centidyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Decidyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Decadyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Hectodyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Kilodyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Megadyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
-            leftUnit is Gigadyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Nanobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Microbarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Millibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Centibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Decibarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Decabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Hectobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Kilobarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Megabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Gigabarye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-
+            leftUnit is Dyne && rightUnit is BaryeMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DyneMultiple && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DyneMultiple && rightUnit is BaryeMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is PoundForce && rightUnit is PoundSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is PoundForce && rightUnit is PoundSquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is PoundForce && rightUnit is KiloPoundSquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -203,19 +66,10 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Length", QuantityConverter.Type.Multiplication, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Energy from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DyneMultiple && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricForce && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Poundal && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -225,7 +79,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Length from Surface Tension", QuantityConverter.Type.Division, SurfaceTensionUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Length from Surface Tension", QuantityConverter.Type.Division, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricForce && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -239,19 +93,10 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Momentum from Time", QuantityConverter.Type.Multiplication, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Momentum from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DyneMultiple && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is TonneForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is GramForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MilligramForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -268,19 +113,10 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Power from Speed", QuantityConverter.Type.Multiplication, SpeedUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Power from Speed", QuantityConverter.Type.Multiplication, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DyneMultiple && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is UKImperialForce && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is USCustomaryForce && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -288,19 +124,10 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Pressure from Area", QuantityConverter.Type.Division, AreaUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Pressure from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DyneMultiple && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Poundal && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Poundal && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is PoundForce && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -320,7 +147,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Surface Tension from Length", QuantityConverter.Type.Division, LengthUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Surface Tension from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricForce && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -330,25 +157,16 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Yank", QuantityConverter.Type.Division, YankUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Time from Yank", QuantityConverter.Type.Division, PhysicalQuantity.Yank) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Force && rightUnit is Yank -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Acceleration", QuantityConverter.Type.Division, AccelerationUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Weight from Acceleration", QuantityConverter.Type.Division, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Nanodyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Microdyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Millidyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Centidyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decidyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Decadyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Hectodyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Kilodyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Megadyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
-            leftUnit is Gigadyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DyneMultiple && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is KilogramForce && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is GramForce && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MilligramForce && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -366,7 +184,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Yank from Time", QuantityConverter.Type.Division, TimeUnits) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Yank from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt
new file mode 100644
index 000000000..b19c3fd9d
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt
@@ -0,0 +1,44 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.frequency.times
+import com.splendo.kaluga.scientific.unit.Abfarad
+import com.splendo.kaluga.scientific.unit.Abhenry
+import com.splendo.kaluga.scientific.unit.ElectricCapacitance
+import com.splendo.kaluga.scientific.unit.ElectricInductance
+import com.splendo.kaluga.scientific.unit.Frequency
+
+val PhysicalQuantity.Frequency.converters get() = listOf<QuantityConverter<PhysicalQuantity.Frequency, *, *>>(
+    QuantityConverter("Electric Conductance from Electric Capacitance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Frequency && rightUnit is Abfarad -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Frequency && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Resistance from Electric Inductance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Frequency && rightUnit is Abhenry -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Frequency && rightUnit is ElectricInductance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt
new file mode 100644
index 000000000..69dbdec8a
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt
@@ -0,0 +1,78 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.heatCapacity.div
+import com.splendo.kaluga.scientific.converter.heatCapacity.times
+import com.splendo.kaluga.scientific.unit.HeatCapacity
+import com.splendo.kaluga.scientific.unit.ImperialWeight
+import com.splendo.kaluga.scientific.unit.MetricAndUKImperialHeatCapacity
+import com.splendo.kaluga.scientific.unit.MetricAndUKImperialTemperature
+import com.splendo.kaluga.scientific.unit.MetricHeatCapacity
+import com.splendo.kaluga.scientific.unit.MetricSpecificHeatCapacity
+import com.splendo.kaluga.scientific.unit.MetricWeight
+import com.splendo.kaluga.scientific.unit.SpecificHeatCapacity
+import com.splendo.kaluga.scientific.unit.Temperature
+import com.splendo.kaluga.scientific.unit.UKImperialHeatCapacity
+import com.splendo.kaluga.scientific.unit.UKImperialSpecificHeatCapacity
+import com.splendo.kaluga.scientific.unit.UKImperialWeight
+import com.splendo.kaluga.scientific.unit.USCustomaryHeatCapacity
+import com.splendo.kaluga.scientific.unit.USCustomarySpecificHeatCapacity
+import com.splendo.kaluga.scientific.unit.USCustomaryTemperature
+import com.splendo.kaluga.scientific.unit.USCustomaryWeight
+import com.splendo.kaluga.scientific.unit.Weight
+
+val PhysicalQuantity.HeatCapacity.converters get() = listOf<QuantityConverter<PhysicalQuantity.HeatCapacity, *, *>>(
+    QuantityConverter("Energy from Temperature", QuantityConverter.Type.Multiplication, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricHeatCapacity && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialHeatCapacity && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryHeatCapacity && rightUnit is USCustomaryTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HeatCapacity && rightUnit is Temperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Heat Capacity from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricHeatCapacity && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialHeatCapacity && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialHeatCapacity && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryHeatCapacity && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryHeatCapacity && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HeatCapacity && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Specific Heat Capacity", QuantityConverter.Type.Division, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is MetricSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricHeatCapacity && rightUnit is MetricSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialHeatCapacity && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryHeatCapacity && rightUnit is USCustomarySpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is HeatCapacity && rightUnit is SpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+)
\ No newline at end of file
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
index a7b7299b0..fd05629f7 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
@@ -25,11 +25,10 @@ import kotlin.reflect.KClass
 
 data class QuantityConverter<Left: PhysicalQuantity, Right: PhysicalQuantity, Result: PhysicalQuantity>(
     val leftQuantity: KClass<Left>,
-    val rightQuantity: KClass<Right>,
+    val rightQuantity: Right,
     val resultQuantity: KClass<Result>,
     val name: String,
     val type: Type,
-    val rightUnits: Set<ScientificUnit<Right>>,
     val converter: (left: Pair<Decimal, ScientificUnit<Left>>, right: Pair<Decimal, ScientificUnit<Right>>) -> ScientificValue<Result, *>
 ) {
     sealed class Type {
@@ -46,7 +45,7 @@ data class QuantityConverter<Left: PhysicalQuantity, Right: PhysicalQuantity, Re
     }
 
     fun convert(left: Decimal, leftUnit: ScientificUnit<*>, right: Decimal, rightUnit: ScientificUnit<*>): ScientificValue<*, *>? {
-        return if (leftQuantity.isInstance(leftUnit.quantity) && rightQuantity.isInstance(rightUnit.quantity)) {
+        return if (leftQuantity.isInstance(leftUnit.quantity) && rightQuantity::class.isInstance(rightUnit.quantity)) {
             converter(left to leftUnit as ScientificUnit<Left>, right to rightUnit as ScientificUnit<Right>)
         } else {
             null
@@ -57,6 +56,6 @@ data class QuantityConverter<Left: PhysicalQuantity, Right: PhysicalQuantity, Re
 inline fun <reified Left : PhysicalQuantity, reified Right : PhysicalQuantity, reified Result : PhysicalQuantity> QuantityConverter(
     name: String,
     type: QuantityConverter.Type,
-    rightUnits: Set<ScientificUnit<Right>>,
+    right: Right,
     noinline converter: (left: Pair<Decimal, ScientificUnit<Left>>, right: Pair<Decimal, ScientificUnit<Right>>) -> ScientificValue<Result, *>
-) = QuantityConverter(Left::class, Right::class, Result::class, name, type, rightUnits, converter)
+) = QuantityConverter(Left::class, right, Result::class, name, type, converter)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
index 73bc42761..f31a0c593 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
@@ -17,12 +17,10 @@
 
 package com.splendo.kaluga.example.shared.viewmodel.scientific
 
-import com.splendo.kaluga.alerts.Alert
-import com.splendo.kaluga.alerts.BaseAlertPresenter
-import com.splendo.kaluga.alerts.buildActionSheet
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.BaseInitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedSubject
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
@@ -30,24 +28,28 @@ import com.splendo.kaluga.base.text.NumberFormatStyle
 import com.splendo.kaluga.base.text.NumberFormatter
 import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.example.shared.model.scientific.converters.QuantityConverter
-import com.splendo.kaluga.example.shared.model.scientific.details
 import com.splendo.kaluga.example.shared.model.scientific.name
+import com.splendo.kaluga.example.shared.model.scientific.quantityDetails
 import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.resources.view.KalugaButton
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.unit.ScientificUnit
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
 
-object CloseScientificConverterNavigationAction : SingleValueNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType)
+sealed class ScientificConverterNavigationAction<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
+    object Close : ScientificConverterNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType)
+    sealed class SelectUnit(quantity: PhysicalQuantity) : ScientificConverterNavigationAction<PhysicalQuantity>(quantity, NavigationBundleSpecType.SerializedType(PhysicalQuantity.serializer())) {
+        data class Left(val quantity: PhysicalQuantity): SelectUnit(quantity)
+        data class Right(val quantity: PhysicalQuantity): SelectUnit(quantity)
+    }
+}
 
 class ScientificConverterViewModel internal constructor(
     private val leftUnits: Set<ScientificUnit<*>>,
     private val converter: QuantityConverter<*, *, *>?,
-    val alertPresenterBuilder: BaseAlertPresenter.Builder,
-    navigator: Navigator<CloseScientificConverterNavigationAction>
-) : NavigatingViewModel<CloseScientificConverterNavigationAction>(navigator) {
+    navigator: Navigator<ScientificConverterNavigationAction<*>>
+) : NavigatingViewModel<ScientificConverterNavigationAction<*>>(navigator) {
 
     companion object {
         val numberFormatterDecimal = NumberFormatter(style = NumberFormatStyle.Decimal(maxIntegerDigits = 10U, minIntegerDigits = 1U, minFractionDigits = 0U, maxFractionDigits = 10U))
@@ -55,14 +57,14 @@ class ScientificConverterViewModel internal constructor(
     }
 
     @kotlinx.serialization.Serializable
-    data class Arguments(val physicalQuantity: PhysicalQuantity, val converterIndex: Int)
-
-    private val rightUnits = converter?.rightUnits ?: emptySet()
+    data class Arguments(val physicalQuantity: PhysicalQuantity, val converterIndex: Int) {
+        val id: String get() = "${physicalQuantity.name}_$converterIndex"
+    }
 
     private val currentLeftUnit = MutableStateFlow(leftUnits.firstOrNull())
-    val currentLeftUnitButton = currentLeftUnit.map { createLeftUnitButton(it) }.toInitializedObservable(createLeftUnitButton(null), coroutineScope)
-    private val currentRightUnit = MutableStateFlow(rightUnits.firstOrNull())
-    val currentRightUnitButton = currentRightUnit.map { createRightUnitButton(it) }.toInitializedObservable(createRightUnitButton(null), coroutineScope)
+    val currentLeftUnitButton: BaseInitializedObservable<KalugaButton> = currentLeftUnit.map { createLeftUnitButton(it) }.toInitializedObservable(createLeftUnitButton(null), coroutineScope)
+    private val currentRightUnit = MutableStateFlow(converter?.rightQuantity?.quantityDetails?.units?.firstOrNull())
+    val currentRightUnitButton: BaseInitializedObservable<KalugaButton> = currentRightUnit.map { createRightUnitButton(it) }.toInitializedObservable(createRightUnitButton(null), coroutineScope)
     private val _leftValue = MutableStateFlow("0.0")
     val leftValue = _leftValue.toInitializedSubject(coroutineScope)
     private val _rightValue = MutableStateFlow("0.0")
@@ -92,31 +94,33 @@ class ScientificConverterViewModel internal constructor(
         }
     }
 
-    private fun createLeftUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) { selectLeftUnit() }
+    fun didSelectLeftUnit(unitIndex: Int) {
+        currentLeftUnit.value = leftUnits.toList().getOrNull(unitIndex)
+    }
+
+    fun didSelectRightUnit(unitIndex: Int) {
+        currentRightUnit.value = converter?.rightQuantity?.quantityDetails?.units?.toList()?.getOrNull(unitIndex)
+    }
 
-    private fun selectLeftUnit() {
-        coroutineScope.launch {
-            alertPresenterBuilder.buildActionSheet(coroutineScope) {
-                setTitle("Select Unit")
-                addActions(leftUnits.map { Alert.Action(it.name) { currentLeftUnit.value = it } })
-            }.show()
-        }
+    fun onClosePressed() {
+        navigator.navigate(ScientificConverterNavigationAction.Close)
     }
 
-    private fun createRightUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) { selectRightUnit() }
+    private fun createLeftUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) {
+        currentLeftUnit.value?.let {
+            navigator.navigate(ScientificConverterNavigationAction.SelectUnit.Left(it.quantity))
+        }
+    }
 
-    private fun selectRightUnit() {
-        coroutineScope.launch {
-            alertPresenterBuilder.buildActionSheet(coroutineScope) {
-                setTitle("Select Unit")
-                addActions(rightUnits.map { Alert.Action(it.name) { currentRightUnit.value = it } })
-            }.show()
+    private fun createRightUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) {
+        currentRightUnit.value?.let {
+            navigator.navigate(ScientificConverterNavigationAction.SelectUnit.Right(it.quantity))
         }
     }
 }
 
-fun ScientificConverterViewModel(arguments: ScientificConverterViewModel.Arguments, alertPresenterBuilder: BaseAlertPresenter.Builder, navigator: Navigator<CloseScientificConverterNavigationAction>) = arguments.physicalQuantity.details?.let { details ->
+fun ScientificConverterViewModel(arguments: ScientificConverterViewModel.Arguments, navigator: Navigator<ScientificConverterNavigationAction<*>>) = arguments.physicalQuantity.quantityDetails?.let { details ->
     details.converters.getOrNull(arguments.converterIndex)?.let { converter ->
-        ScientificConverterViewModel(details.units, converter, alertPresenterBuilder, navigator)
+        ScientificConverterViewModel(details.units, converter, navigator)
     }
-} ?: ScientificConverterViewModel(emptySet(), null, alertPresenterBuilder, navigator)
+} ?: ScientificConverterViewModel(emptySet(), null, navigator)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionViewModel.kt
new file mode 100644
index 000000000..1fbc3b727
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionViewModel.kt
@@ -0,0 +1,67 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.scientific
+
+import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.Navigator
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.observable.toInitializedSubject
+import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
+import com.splendo.kaluga.example.shared.model.scientific.name
+import com.splendo.kaluga.example.shared.model.scientific.quantityDetails
+import com.splendo.kaluga.example.shared.stylable.ButtonStyles
+import com.splendo.kaluga.resources.view.KalugaButton
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.unit.ScientificUnit
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+sealed class ScientificUnitSelectionAction<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
+    object Cancelled : ScientificUnitSelectionAction<Unit>(Unit, NavigationBundleSpecType.UnitType)
+    data class DidSelect(val index:Int) : ScientificUnitSelectionAction<Int>(index, NavigationBundleSpecType.IntegerType)
+}
+
+class ScientificUnitSelectionViewModel(
+    private val quantity: PhysicalQuantity,
+    navigator: Navigator<ScientificUnitSelectionAction<*>>
+) : NavigatingViewModel<ScientificUnitSelectionAction<*>>(navigator) {
+
+    private val allUnits = MutableStateFlow<List<String>>(emptyList())
+    private val _filter = MutableStateFlow("")
+    val filter = _filter.toInitializedSubject(coroutineScope)
+
+    init {
+        coroutineScope.launch(Dispatchers.Default) {
+            allUnits.value = quantity.quantityDetails?.units?.map { it.name }.orEmpty()
+        }
+    }
+
+    val currentUnits = combine(allUnits, _filter) { units, filterToApply ->
+        units.withIndex()
+            .filter { it.value.lowercase().contains(filterToApply.lowercase()) }
+            .map { KalugaButton.Plain(it.value, ButtonStyles.default) { navigator.navigate(ScientificUnitSelectionAction.DidSelect(it.index)) } }
+    }.toInitializedObservable(emptyList(), coroutineScope)
+
+    fun onCancel() {
+        navigator.navigate(ScientificUnitSelectionAction.Cancelled)
+    }
+}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
index c6e89f707..59c446a02 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
@@ -23,6 +23,7 @@ import com.splendo.kaluga.alerts.buildActionSheet
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
+import com.splendo.kaluga.architecture.observable.BaseInitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedObservable
 import com.splendo.kaluga.architecture.observable.toInitializedSubject
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
@@ -31,7 +32,7 @@ import com.splendo.kaluga.base.text.NumberFormatter
 import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.example.shared.model.scientific.QuantityDetails
 import com.splendo.kaluga.example.shared.model.scientific.allPhysicalQuantities
-import com.splendo.kaluga.example.shared.model.scientific.details
+import com.splendo.kaluga.example.shared.model.scientific.quantityDetails
 import com.splendo.kaluga.example.shared.model.scientific.name
 import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.resources.view.KalugaButton
@@ -43,29 +44,44 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
-data class ScientificConverterNavigationAction(val quantity: PhysicalQuantity, val index: Int) : SingleValueNavigationAction<ScientificConverterViewModel.Arguments>(
-    ScientificConverterViewModel.Arguments(quantity, index),
-    NavigationBundleSpecType.SerializedType(ScientificConverterViewModel.Arguments.serializer())
-)
+sealed class ScientificNavigationAction<T>(value: T, spec: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, spec) {
+    sealed class SelectUnit(quantity: PhysicalQuantity) : ScientificNavigationAction<PhysicalQuantity>(quantity, NavigationBundleSpecType.SerializedType(PhysicalQuantity.serializer())) {
+        data class Left(val quantity: PhysicalQuantity): SelectUnit(quantity)
+        data class Right(val quantity: PhysicalQuantity): SelectUnit(quantity)
+    }
+    data class Converter(val quantity: PhysicalQuantity, val index: Int) : ScientificNavigationAction<ScientificConverterViewModel.Arguments>(
+        ScientificConverterViewModel.Arguments(quantity, index),
+        NavigationBundleSpecType.SerializedType(ScientificConverterViewModel.Arguments.serializer())
+    )
+}
+
+
 
 class ScientificViewModel(
     val alertPresenterBuilder: BaseAlertPresenter.Builder,
-    navigator: Navigator<ScientificConverterNavigationAction>
-) : NavigatingViewModel<ScientificConverterNavigationAction>(navigator) {
+    navigator: Navigator<ScientificNavigationAction<*>>
+) : NavigatingViewModel<ScientificNavigationAction<*>>(navigator) {
+
+    data class Button(val name: String, val quantity: PhysicalQuantity, val index: Int, val navigator: Navigator<in ScientificNavigationAction.Converter>) {
+        val id: String get() = "${quantity.name}_$index"
+        val button: KalugaButton.Plain get() = KalugaButton.Plain(name, ButtonStyles.default) {
+            navigator.navigate(ScientificNavigationAction.Converter(quantity, index))
+        }
+    }
 
     companion object {
         val numberFormatterDecimal = NumberFormatter(style = NumberFormatStyle.Decimal(maxIntegerDigits = 10U, minIntegerDigits = 1U, minFractionDigits = 0U, maxFractionDigits = 10U))
         val numberFormatterScientific = NumberFormatter(style = NumberFormatStyle.Scientific())
     }
 
-    private val quantityDetails = allPhysicalQuantities.mapNotNull { it.details }
+    private val quantityDetails = allPhysicalQuantities.mapNotNull { it.quantityDetails }
     private val currentQuantityDetails = MutableStateFlow(quantityDetails.firstOrNull())
-    val quantityDetailsButton = currentQuantityDetails.map { createQuantityButton(it) }.toInitializedObservable(createQuantityButton(null), coroutineScope)
+    val quantityDetailsButton: BaseInitializedObservable<KalugaButton> = currentQuantityDetails.map { createQuantityButton(it) }.toInitializedObservable(createQuantityButton(null), coroutineScope)
     private val units = currentQuantityDetails.map { it?.units ?: emptySet() }.stateIn(coroutineScope, SharingStarted.Eagerly, emptySet())
     private val currentLeftUnit = MutableStateFlow<ScientificUnit<*>?>(null)
-    val currentLeftUnitButton = currentLeftUnit.map { createLeftUnitButton(it) }.toInitializedObservable(createLeftUnitButton(null), coroutineScope)
+    val currentLeftUnitButton: BaseInitializedObservable<KalugaButton> = currentLeftUnit.map { createLeftUnitButton(it) }.toInitializedObservable(createLeftUnitButton(null), coroutineScope)
     private val currentRightUnit = MutableStateFlow<ScientificUnit<*>?>(null)
-    val currentRightUnitButton = currentRightUnit.map { createRightUnitButton(it) }.toInitializedObservable(createRightUnitButton(null), coroutineScope)
+    val currentRightUnitButton: BaseInitializedObservable<KalugaButton> = currentRightUnit.map { createRightUnitButton(it) }.toInitializedObservable(createRightUnitButton(null), coroutineScope)
     private val _leftValue = MutableStateFlow("0.0")
     val leftValue = _leftValue.toInitializedSubject(coroutineScope)
     private val _rightValue = MutableStateFlow("0.0")
@@ -74,9 +90,7 @@ class ScientificViewModel(
     val converters = currentQuantityDetails.map { details ->
         details?.let {
             details.converters.mapIndexed { index, converter ->
-                KalugaButton.Plain(converter.name, ButtonStyles.default) {
-                    navigator.navigate(ScientificConverterNavigationAction(details.quantity, index))
-                }
+                Button(converter.name, details.quantity, index, navigator)
             }
         }.orEmpty()
     }.toInitializedObservable(emptyList(), coroutineScope)
@@ -117,21 +131,28 @@ class ScientificViewModel(
         coroutineScope.launch {
             alertPresenterBuilder.buildActionSheet(coroutineScope) {
                 setTitle("Select Quantity")
-                addActions(quantityDetails.map { Alert.Action(it.quantity::class.simpleName.orEmpty().split("(?=\\p{Upper})".toRegex()).joinToString(" ")) { currentQuantityDetails.value = it } })
+                addActions(quantityDetails.map { Alert.Action(it.quantity.name) { currentQuantityDetails.value = it } })
             }.show()
         }
     }
 
-    private fun createLeftUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) { selectUnit(currentLeftUnit) }
+    fun didSelectLeftUnit(unitIndex: Int) {
+        currentLeftUnit.value = currentQuantityDetails.value?.units?.withIndex()?.toList()?.getOrNull(unitIndex)?.value
+    }
 
-    private fun createRightUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) { selectUnit(currentRightUnit) }
+    fun didSelectRightUnit(unitIndex: Int) {
+        currentRightUnit.value = currentQuantityDetails.value?.units?.withIndex()?.toList()?.getOrNull(unitIndex)?.value
+    }
 
-    private fun selectUnit(saveTo: MutableStateFlow<ScientificUnit<*>?>) {
-        coroutineScope.launch {
-            alertPresenterBuilder.buildActionSheet(coroutineScope) {
-                setTitle("Select Unit")
-                addActions(units.value.map { Alert.Action(it.name) { saveTo.value = it } })
-            }.show()
+    private fun createLeftUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) {
+        currentQuantityDetails.value?.let {
+            navigator.navigate(ScientificNavigationAction.SelectUnit.Left(it.quantity))
+        }
+    }
+
+    private fun createRightUnitButton(currentUnit: ScientificUnit<*>?) = KalugaButton.Plain(currentUnit?.symbol.orEmpty(), ButtonStyles.default) {
+        currentQuantityDetails.value?.let {
+            navigator.navigate(ScientificNavigationAction.SelectUnit.Right(it.quantity))
         }
     }
 }
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterNavigator.kt
new file mode 100644
index 000000000..e3ae24b5c
--- /dev/null
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterNavigator.kt
@@ -0,0 +1,33 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.scientific
+
+import com.splendo.kaluga.architecture.navigation.DefaultNavigator
+import com.splendo.kaluga.scientific.PhysicalQuantity
+
+fun ScientificConverterNavigator(
+    onSelectLeftUnit: (PhysicalQuantity) -> Unit,
+    onSelectRightUnit: (PhysicalQuantity) -> Unit,
+    onClose: () -> Unit
+) = DefaultNavigator<ScientificConverterNavigationAction<*>> { action ->
+    when (action) {
+        is ScientificConverterNavigationAction.SelectUnit.Left-> onSelectLeftUnit(action.value)
+        is ScientificConverterNavigationAction.SelectUnit.Right-> onSelectRightUnit(action.value)
+        is ScientificConverterNavigationAction.Close -> onClose()
+    }
+}
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificNavigator.kt
new file mode 100644
index 000000000..bec704ec7
--- /dev/null
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificNavigator.kt
@@ -0,0 +1,33 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.scientific
+
+import com.splendo.kaluga.architecture.navigation.DefaultNavigator
+import com.splendo.kaluga.scientific.PhysicalQuantity
+
+fun ScientificNavigator(
+    onSelectLeftUnit: (PhysicalQuantity) -> Unit,
+    onSelectRightUnit: (PhysicalQuantity) -> Unit,
+    onConverter: (ScientificConverterViewModel.Arguments) -> Unit
+) = DefaultNavigator<ScientificNavigationAction<*>> { action ->
+    when (action) {
+        is ScientificNavigationAction.SelectUnit.Left-> onSelectLeftUnit(action.value)
+        is ScientificNavigationAction.SelectUnit.Right-> onSelectRightUnit(action.value)
+        is ScientificNavigationAction.Converter -> onConverter(action.value)
+    }
+}
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionNavigator.kt
new file mode 100644
index 000000000..b87822dd1
--- /dev/null
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionNavigator.kt
@@ -0,0 +1,30 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.scientific
+
+import com.splendo.kaluga.architecture.navigation.DefaultNavigator
+
+fun ScientificUnitSelectionNavigator(
+    onDidSelect: (Int) -> Unit,
+    onCancelled: () -> Unit
+) = DefaultNavigator<ScientificUnitSelectionAction<*>> { action ->
+    when (action) {
+        is ScientificUnitSelectionAction.DidSelect -> onDidSelect(action.value)
+        is ScientificUnitSelectionAction.Cancelled -> onCancelled()
+    }
+}
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt
index dde680fdd..1e3af20c1 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToForce.kt
@@ -22,15 +22,13 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.pressure.times
 import com.splendo.kaluga.scientific.unit.Area
 import com.splendo.kaluga.scientific.unit.Barye
+import com.splendo.kaluga.scientific.unit.BaryeMultiple
 import com.splendo.kaluga.scientific.unit.ImperialArea
 import com.splendo.kaluga.scientific.unit.ImperialPressure
 import com.splendo.kaluga.scientific.unit.ImperialTonSquareFoot
 import com.splendo.kaluga.scientific.unit.ImperialTonSquareInch
 import com.splendo.kaluga.scientific.unit.KipSquareFoot
 import com.splendo.kaluga.scientific.unit.KipSquareInch
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
-import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
 import com.splendo.kaluga.scientific.unit.Pressure
 import com.splendo.kaluga.scientific.unit.SquareCentimeter
@@ -45,9 +43,9 @@ infix operator fun ScientificValue<PhysicalQuantity.Area, SquareCentimeter>.time
     pressure * this
 
 @JvmName("squareCentimeterTimesBaryeMultiple")
-infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Area, SquareCentimeter>.times(
+infix operator fun <BaryeUnit : BaryeMultiple> ScientificValue<PhysicalQuantity.Area, SquareCentimeter>.times(
     pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>
-) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+) =
     pressure * this
 
 @JvmName("imperialAreaTimesOunceSquareInch")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt
index 585a19944..17bd383da 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToArea.kt
@@ -22,14 +22,12 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.area.area
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.ImperialEnergy
 import com.splendo.kaluga.scientific.unit.ImperialSurfaceTension
 import com.splendo.kaluga.scientific.unit.InchOunceForce
 import com.splendo.kaluga.scientific.unit.InchPoundForce
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MetricSurfaceTension
 import com.splendo.kaluga.scientific.unit.SquareCentimeter
 import com.splendo.kaluga.scientific.unit.SquareFoot
@@ -45,7 +43,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(surfaceTens
     SquareCentimeter.area(this, surfaceTension)
 
 @JvmName("ergMultipleDivMetricSurfaceTension")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(surfaceTension: ScientificValue<PhysicalQuantity.SurfaceTension, MetricSurfaceTension>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(surfaceTension: ScientificValue<PhysicalQuantity.SurfaceTension, MetricSurfaceTension>) =
     SquareCentimeter.area(this, surfaceTension)
 
 @JvmName("metricAndImperialEnergyDivMetricSurfaceTension")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt
index 9d702d12b..df61dcfdd 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCharge.kt
@@ -25,9 +25,7 @@ import com.splendo.kaluga.scientific.unit.Abvolt
 import com.splendo.kaluga.scientific.unit.Coulomb
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.Voltage
 import kotlin.jvm.JvmName
 
@@ -36,7 +34,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(voltage: Sc
     Abcoulomb.charge(this, voltage)
 
 @JvmName("ergMultipleDivAbvolt")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(voltage: ScientificValue<PhysicalQuantity.Voltage, Abvolt>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(voltage: ScientificValue<PhysicalQuantity.Voltage, Abvolt>) =
     Abcoulomb.charge(this, voltage)
 
 @JvmName("energyDivVoltage")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt
index b81a733ea..8e0a95693 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToElectricCurrent.kt
@@ -24,11 +24,9 @@ import com.splendo.kaluga.scientific.unit.Abampere
 import com.splendo.kaluga.scientific.unit.Ampere
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.MagneticFlux
 import com.splendo.kaluga.scientific.unit.Maxwell
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import kotlin.jvm.JvmName
 
 @JvmName("ergDivMaxwell")
@@ -36,7 +34,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(flux: Scien
     Abampere.current(this, flux)
 
 @JvmName("ergMultipleDivMaxwell")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(flux: ScientificValue<PhysicalQuantity.MagneticFlux, Maxwell>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(flux: ScientificValue<PhysicalQuantity.MagneticFlux, Maxwell>) =
     Abampere.current(this, flux)
 
 @JvmName("energyDivFlux")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt
index e8c7badd6..c3c08a1bb 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToForce.kt
@@ -24,17 +24,15 @@ import com.splendo.kaluga.scientific.unit.Centimeter
 import com.splendo.kaluga.scientific.unit.Dyne
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.FootPoundal
 import com.splendo.kaluga.scientific.unit.ImperialEnergy
 import com.splendo.kaluga.scientific.unit.ImperialLength
 import com.splendo.kaluga.scientific.unit.Inch
 import com.splendo.kaluga.scientific.unit.InchOunceForce
 import com.splendo.kaluga.scientific.unit.Length
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
-import com.splendo.kaluga.scientific.unit.MetricEnergy
 import com.splendo.kaluga.scientific.unit.MetricLength
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Newton
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.PoundForce
@@ -46,7 +44,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(distance: S
     Dyne.force(this, distance)
 
 @JvmName("ergMultipleDivCentimeter")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(distance: ScientificValue<PhysicalQuantity.Length, Centimeter>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(distance: ScientificValue<PhysicalQuantity.Length, Centimeter>) =
     Dyne.force(this, distance)
 
 @JvmName("metricAndImperialEnergyDivMetricLength")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt
index 4b0943c49..69a9fad55 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationAbsorbedDose.kt
@@ -22,11 +22,9 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.ionizingRadiationAbsorbedDose.absorbedDose
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.Gray
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Rad
 import com.splendo.kaluga.scientific.unit.Weight
 import kotlin.jvm.JvmName
@@ -36,7 +34,7 @@ infix fun ScientificValue<PhysicalQuantity.Energy, Erg>.absorbedBy(gram: Scienti
     Rad.absorbedDose(this, gram)
 
 @JvmName("ergMultipleAbsorbedByGram")
-infix fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.absorbedBy(gram: ScientificValue<PhysicalQuantity.Weight, Gram>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.absorbedBy(gram: ScientificValue<PhysicalQuantity.Weight, Gram>) =
     Rad.absorbedDose(this, gram)
 
 @JvmName("energyAbsorbedByWeight")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt
index 681aa8f66..e367efbc9 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToIonizingRadiationEquivalentDose.kt
@@ -22,10 +22,8 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.ionizingRadiationEquivalentDose.equivalentDose
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.Gram
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.RoentgenEquivalentMan
 import com.splendo.kaluga.scientific.unit.Sievert
 import com.splendo.kaluga.scientific.unit.Weight
@@ -36,7 +34,7 @@ infix fun ScientificValue<PhysicalQuantity.Energy, Erg>.equivalentDoseBy(gram: S
     RoentgenEquivalentMan.equivalentDose(this, gram)
 
 @JvmName("ergMultipleEquivalentDoseByGram")
-infix fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.equivalentDoseBy(gram: ScientificValue<PhysicalQuantity.Weight, Gram>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.equivalentDoseBy(gram: ScientificValue<PhysicalQuantity.Weight, Gram>) =
     RoentgenEquivalentMan.equivalentDose(this, gram)
 
 @JvmName("energyEquivalentDoseByWeight")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt
index 79bcd9240..4d9715c87 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToLength.kt
@@ -22,8 +22,10 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.length.distance
 import com.splendo.kaluga.scientific.unit.Centimeter
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.Foot
 import com.splendo.kaluga.scientific.unit.FootPoundForce
 import com.splendo.kaluga.scientific.unit.FootPoundal
@@ -33,12 +35,8 @@ import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.Inch
 import com.splendo.kaluga.scientific.unit.InchOunceForce
 import com.splendo.kaluga.scientific.unit.InchPoundForce
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Meter
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricForce
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.PoundForce
 import com.splendo.kaluga.scientific.unit.Poundal
@@ -51,15 +49,15 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(force: Scie
     Centimeter.distance(this, force)
 
 @JvmName("ergMultipleDivDyne")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(force: ScientificValue<PhysicalQuantity.Force, Dyne>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(force: ScientificValue<PhysicalQuantity.Force, Dyne>) =
     Centimeter.distance(this, force)
 
 @JvmName("ergDivDyneMultiple")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Energy, Erg>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Energy, Erg>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) =
     Centimeter.distance(this, force)
 
 @JvmName("ergMultipleDivDyneMultiple")
-infix operator fun <ErgUnit, DyneUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>, DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <ErgUnit : ErgMultiple, DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) =
     Centimeter.distance(this, force)
 
 @JvmName("footPoundalDivPoundal")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt
index 3aac390ca..f79db8879 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToMagneticFlux.kt
@@ -25,10 +25,8 @@ import com.splendo.kaluga.scientific.unit.Biot
 import com.splendo.kaluga.scientific.unit.ElectricCurrent
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.Maxwell
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Weber
 import kotlin.jvm.JvmName
 
@@ -37,7 +35,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(current: Sc
     Maxwell.flux(this, current)
 
 @JvmName("ergMultipleDivAbampere")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(current: ScientificValue<PhysicalQuantity.ElectricCurrent, Abampere>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(current: ScientificValue<PhysicalQuantity.ElectricCurrent, Abampere>) =
     Maxwell.flux(this, current)
 
 @JvmName("ergDivBiot")
@@ -45,7 +43,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(current: Sc
     Maxwell.flux(this, current)
 
 @JvmName("ergMultipleDivBiot")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(current: ScientificValue<PhysicalQuantity.ElectricCurrent, Biot>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(current: ScientificValue<PhysicalQuantity.ElectricCurrent, Biot>) =
     Maxwell.flux(this, current)
 
 @JvmName("energyDivCurrent")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt
index 17d512051..0311fb223 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToPower.kt
@@ -35,6 +35,7 @@ import com.splendo.kaluga.scientific.unit.Deciwatt
 import com.splendo.kaluga.scientific.unit.DeciwattHour
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.ErgPerSecond
 import com.splendo.kaluga.scientific.unit.FootPoundForce
 import com.splendo.kaluga.scientific.unit.FootPoundForcePerMinute
@@ -58,12 +59,10 @@ import com.splendo.kaluga.scientific.unit.Joule
 import com.splendo.kaluga.scientific.unit.Kilojoule
 import com.splendo.kaluga.scientific.unit.Kilowatt
 import com.splendo.kaluga.scientific.unit.KilowattHour
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Megajoule
 import com.splendo.kaluga.scientific.unit.Megawatt
 import com.splendo.kaluga.scientific.unit.MegawattHour
 import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Microjoule
 import com.splendo.kaluga.scientific.unit.Microwatt
 import com.splendo.kaluga.scientific.unit.MicrowattHour
@@ -175,7 +174,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(time: Scien
     ErgPerSecond.power(this, time)
 
 @JvmName("ergMultipleDivSecond")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(time: ScientificValue<PhysicalQuantity.Time, Second>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(time: ScientificValue<PhysicalQuantity.Time, Second>) =
     ErgPerSecond.power(this, time)
 
 @JvmName("footPoundalDivSecond")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt
index 02a904139..fb7c8891f 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToPressure.kt
@@ -25,14 +25,12 @@ import com.splendo.kaluga.scientific.unit.CubicCentimeter
 import com.splendo.kaluga.scientific.unit.CubicFoot
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.FootPoundForce
 import com.splendo.kaluga.scientific.unit.FootPoundal
 import com.splendo.kaluga.scientific.unit.ImperialEnergy
 import com.splendo.kaluga.scientific.unit.ImperialVolume
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Pascal
 import com.splendo.kaluga.scientific.unit.PoundSquareFoot
 import com.splendo.kaluga.scientific.unit.PoundSquareInch
@@ -48,7 +46,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(volume: Sci
     Barye.pressure(this, volume)
 
 @JvmName("ergMultipleDivCubicCentimeter")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(volume: ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(volume: ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>) =
     Barye.pressure(this, volume)
 
 @JvmName("footPoundalDivCubicFoot")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt
index a377e8132..7089942c4 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToSurfaceTension.kt
@@ -25,6 +25,7 @@ import com.splendo.kaluga.scientific.unit.Centimeter
 import com.splendo.kaluga.scientific.unit.Dyne
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.Foot
 import com.splendo.kaluga.scientific.unit.FootPoundal
 import com.splendo.kaluga.scientific.unit.ImperialArea
@@ -32,12 +33,9 @@ import com.splendo.kaluga.scientific.unit.ImperialEnergy
 import com.splendo.kaluga.scientific.unit.Inch
 import com.splendo.kaluga.scientific.unit.InchOunceForce
 import com.splendo.kaluga.scientific.unit.InchPoundForce
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Meter
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
 import com.splendo.kaluga.scientific.unit.MetricArea
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Newton
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.PoundForce
@@ -53,7 +51,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(area: Scien
     (Dyne per Centimeter).surfaceTension(this, area)
 
 @JvmName("ergMultipleDivSquareCentimeter")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>) =
     (Dyne per Centimeter).surfaceTension(this, area)
 
 @JvmName("metricAndImperialEnergyDivMetricArea")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt
index 56eff540a..547bf83f1 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToTime.kt
@@ -31,15 +31,13 @@ import com.splendo.kaluga.scientific.unit.HorsepowerHour
 import com.splendo.kaluga.scientific.unit.Hour
 import com.splendo.kaluga.scientific.unit.InchPoundForce
 import com.splendo.kaluga.scientific.unit.InchPoundForcePerMinute
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
-import com.splendo.kaluga.scientific.unit.MetricAndImperialPower
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Minute
 import com.splendo.kaluga.scientific.unit.Power
 import com.splendo.kaluga.scientific.unit.Second
 import com.splendo.kaluga.scientific.unit.Watt
 import com.splendo.kaluga.scientific.unit.WattHour
+import com.splendo.kaluga.scientific.unit.WattHourMultiple
+import com.splendo.kaluga.scientific.unit.WattMultiple
 import kotlin.jvm.JvmName
 
 @JvmName("wattHourDivWatt")
@@ -47,17 +45,17 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, WattHour>.div(power:
     Hour.time(this, power)
 
 @JvmName("wattHourMultipleDivWatt")
-infix operator fun <WattHourUnit> ScientificValue<PhysicalQuantity.Energy, WattHourUnit>.div(power: ScientificValue<PhysicalQuantity.Power, Watt>) where WattHourUnit : MetricAndImperialEnergy, WattHourUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> =
+infix operator fun <WattHourUnit : WattHourMultiple> ScientificValue<PhysicalQuantity.Energy, WattHourUnit>.div(power: ScientificValue<PhysicalQuantity.Power, Watt>) =
     Hour.time(this, power)
 
 @JvmName("wattHourDivWattMultiple")
-infix operator fun <WattUnit> ScientificValue<PhysicalQuantity.Energy, WattHour>.div(power: ScientificValue<PhysicalQuantity.Power, WattUnit>) where WattUnit : MetricAndImperialPower, WattUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> =
+infix operator fun <WattUnit : WattMultiple> ScientificValue<PhysicalQuantity.Energy, WattHour>.div(power: ScientificValue<PhysicalQuantity.Power, WattUnit>) =
     Hour.time(this, power)
 
 @JvmName("wattHourMultipleDivWattMultiple")
-infix operator fun <WattHourUnit, WattUnit> ScientificValue<PhysicalQuantity.Energy, WattHourUnit>.div(
+infix operator fun <WattHourUnit : WattHourMultiple, WattUnit : WattMultiple> ScientificValue<PhysicalQuantity.Energy, WattHourUnit>.div(
     power: ScientificValue<PhysicalQuantity.Power, WattUnit>
-) where WattHourUnit : MetricAndImperialEnergy, WattHourUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour>, WattUnit : MetricAndImperialPower, WattUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> =
+) =
     Hour.time(this, power)
 
 @JvmName("horsepowerHourDivHorsepower")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt
index 2ba881ec7..6e57c8f62 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToVoltage.kt
@@ -25,9 +25,7 @@ import com.splendo.kaluga.scientific.unit.Abvolt
 import com.splendo.kaluga.scientific.unit.ElectricCharge
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.Volt
 import kotlin.jvm.JvmName
 
@@ -36,7 +34,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(charge: Sci
     Abvolt.voltage(this, charge)
 
 @JvmName("ergMultipleDivAbcoulomb")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(charge: ScientificValue<PhysicalQuantity.ElectricCharge, Abcoulomb>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(charge: ScientificValue<PhysicalQuantity.ElectricCharge, Abcoulomb>) =
     Abvolt.voltage(this, charge)
 
 @JvmName("energyDivCharge")
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt
index 5ac89c5e3..46ba90acc 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToVolume.kt
@@ -21,22 +21,20 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.volume.volume
 import com.splendo.kaluga.scientific.unit.Barye
+import com.splendo.kaluga.scientific.unit.BaryeMultiple
 import com.splendo.kaluga.scientific.unit.CubicCentimeter
 import com.splendo.kaluga.scientific.unit.CubicFoot
 import com.splendo.kaluga.scientific.unit.CubicInch
 import com.splendo.kaluga.scientific.unit.CubicMeter
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.FootPoundal
 import com.splendo.kaluga.scientific.unit.ImperialEnergy
 import com.splendo.kaluga.scientific.unit.ImperialPressure
 import com.splendo.kaluga.scientific.unit.InchOunceForce
 import com.splendo.kaluga.scientific.unit.InchPoundForce
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
-import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
-import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.PoundSquareFoot
 import com.splendo.kaluga.scientific.unit.PoundSquareInch
 import com.splendo.kaluga.scientific.unit.Pressure
@@ -51,18 +49,17 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(pressure: S
     CubicCentimeter.volume(this, pressure)
 
 @JvmName("ergMultipleDivBarye")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(pressure: ScientificValue<PhysicalQuantity.Pressure, Barye>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(pressure: ScientificValue<PhysicalQuantity.Pressure, Barye>) =
     CubicCentimeter.volume(this, pressure)
 
 @JvmName("ergDivBaryeMultiple")
-infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Energy, Erg>.div(pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+infix operator fun <BaryeUnit : BaryeMultiple> ScientificValue<PhysicalQuantity.Energy, Erg>.div(pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>) =
     CubicCentimeter.volume(this, pressure)
 
 @JvmName("ergMultipleDivBaryeMultiple")
-infix operator fun <ErgUnit, BaryeUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(
+infix operator fun <ErgUnit : ErgMultiple, BaryeUnit : BaryeMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(
     pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>
-) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>, BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
-    CubicCentimeter.volume(this, pressure)
+) = CubicCentimeter.volume(this, pressure)
 
 @JvmName("footPoundalDivPoundSquareFoot")
 infix operator fun ScientificValue<PhysicalQuantity.Energy, FootPoundal>.div(pressure: ScientificValue<PhysicalQuantity.Pressure, PoundSquareFoot>) =
diff --git a/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt
index 7f7688241..c37935768 100644
--- a/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/energy/convertToWeight.kt
@@ -22,19 +22,20 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.weight.weight
 import com.splendo.kaluga.scientific.unit.Energy
 import com.splendo.kaluga.scientific.unit.Erg
+import com.splendo.kaluga.scientific.unit.ErgMultiple
 import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.ImperialEnergy
 import com.splendo.kaluga.scientific.unit.ImperialSpecificEnergy
 import com.splendo.kaluga.scientific.unit.IonizingRadiationAbsorbedDose
 import com.splendo.kaluga.scientific.unit.IonizingRadiationEquivalentDose
 import com.splendo.kaluga.scientific.unit.Kilogram
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricAndImperialEnergy
 import com.splendo.kaluga.scientific.unit.MetricEnergy
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MetricSpecificEnergy
 import com.splendo.kaluga.scientific.unit.Rad
+import com.splendo.kaluga.scientific.unit.RadMultiple
 import com.splendo.kaluga.scientific.unit.RoentgenEquivalentMan
+import com.splendo.kaluga.scientific.unit.RoentgenEquivalentManMultiple
 import com.splendo.kaluga.scientific.unit.SpecificEnergy
 import com.splendo.kaluga.scientific.unit.UKImperialSpecificEnergy
 import com.splendo.kaluga.scientific.unit.USCustomarySpecificEnergy
@@ -45,23 +46,19 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(absorbedDos
     Gram.weight(this, absorbedDose)
 
 @JvmName("ergMultipleDivRad")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad>) =
     Gram.weight(this, absorbedDose)
 
 @JvmName("ergDivRadMultiple")
-infix operator fun <AbsorbedDoseUnit> ScientificValue<PhysicalQuantity.Energy, Erg>.div(
-    absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, AbsorbedDoseUnit>
-) where AbsorbedDoseUnit : IonizingRadiationAbsorbedDose, AbsorbedDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> =
+infix operator fun <RadUnit : RadMultiple> ScientificValue<PhysicalQuantity.Energy, Erg>.div(
+    absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, RadUnit>
+) =
     Gram.weight(this, absorbedDose)
 
 @JvmName("ergMultipleDivRadMultiple")
-infix operator fun <ErgUnit, AbsorbedDoseUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(
-    absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, AbsorbedDoseUnit>
-) where ErgUnit : MetricEnergy,
-    ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>,
-    AbsorbedDoseUnit : IonizingRadiationAbsorbedDose,
-    AbsorbedDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> =
-    Gram.weight(this, absorbedDose)
+infix operator fun <ErgUnit : ErgMultiple, RadUnit : RadMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(
+    absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, RadUnit>
+) = Gram.weight(this, absorbedDose)
 
 @JvmName("energyDivAbsorbedDose")
 infix operator fun <EnergyUnit : Energy, AbsorbedDoseUnit : IonizingRadiationAbsorbedDose> ScientificValue<PhysicalQuantity.Energy, EnergyUnit>.div(
@@ -73,24 +70,18 @@ infix operator fun ScientificValue<PhysicalQuantity.Energy, Erg>.div(equivalentD
     Gram.weight(this, equivalentDose)
 
 @JvmName("ergMultipleDivRem")
-infix operator fun <ErgUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(equivalentDose: ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan>) where ErgUnit : MetricEnergy, ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> =
+infix operator fun <ErgUnit : ErgMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(equivalentDose: ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan>) =
     Gram.weight(this, equivalentDose)
 
 @JvmName("ergDivRemMultiple")
-infix operator fun <EquivalentDoseUnit> ScientificValue<PhysicalQuantity.Energy, Erg>.div(
-    equivalentDose: ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, EquivalentDoseUnit>
-) where EquivalentDoseUnit : IonizingRadiationEquivalentDose,
-    EquivalentDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> =
-    Gram.weight(this, equivalentDose)
+infix operator fun <RemUnit : RoentgenEquivalentManMultiple> ScientificValue<PhysicalQuantity.Energy, Erg>.div(
+    equivalentDose: ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, RemUnit>
+) = Gram.weight(this, equivalentDose)
 
 @JvmName("ergMultipleDivRemMultiple")
-infix operator fun <ErgUnit, EquivalentDoseUnit> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(
-    equivalentDose: ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, EquivalentDoseUnit>
-) where ErgUnit : MetricEnergy,
-    ErgUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>,
-    EquivalentDoseUnit : IonizingRadiationEquivalentDose,
-    EquivalentDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> =
-    Gram.weight(this, equivalentDose)
+infix operator fun <ErgUnit : ErgMultiple, RemUnit : RoentgenEquivalentManMultiple> ScientificValue<PhysicalQuantity.Energy, ErgUnit>.div(
+    equivalentDose: ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, RemUnit>
+) = Gram.weight(this, equivalentDose)
 
 @JvmName("energyDivEquivalentDose")
 infix operator fun <EnergyUnit : Energy, EquivalentDoseUnit : IonizingRadiationEquivalentDose> ScientificValue<PhysicalQuantity.Energy, EnergyUnit>.div(
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt b/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt
index 16893cdd7..2b52bae41 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToAcceleration.kt
@@ -22,15 +22,13 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.acceleration.acceleration
 import com.splendo.kaluga.scientific.unit.Centimeter
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.Foot
 import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.ImperialWeight
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Meter
-import com.splendo.kaluga.scientific.unit.MetricForce
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Second
 import com.splendo.kaluga.scientific.unit.UKImperialForce
 import com.splendo.kaluga.scientific.unit.UKImperialWeight
@@ -45,7 +43,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.div(mass: Scien
     (Centimeter per Second per Second).acceleration(this, mass)
 
 @JvmName("dyneMultipleDivGram")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(mass: ScientificValue<PhysicalQuantity.Weight, Gram>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(mass: ScientificValue<PhysicalQuantity.Weight, Gram>) =
     (Centimeter per Second per Second).acceleration(this, mass)
 
 @JvmName("imperialForceDivImperialWeight")
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt
index b9de8a2b5..910d71ac8 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToArea.kt
@@ -21,7 +21,9 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.area.area
 import com.splendo.kaluga.scientific.unit.Barye
+import com.splendo.kaluga.scientific.unit.BaryeMultiple
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.ImperialPressure
@@ -32,10 +34,6 @@ import com.splendo.kaluga.scientific.unit.KiloPoundSquareInch
 import com.splendo.kaluga.scientific.unit.Kip
 import com.splendo.kaluga.scientific.unit.KipSquareFoot
 import com.splendo.kaluga.scientific.unit.KipSquareInch
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricForce
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
-import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
 import com.splendo.kaluga.scientific.unit.PoundForce
@@ -60,22 +58,19 @@ infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.div(pressure: S
     SquareCentimeter.area(this, pressure)
 
 @JvmName("dyneDivBaryeMultiple")
-infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Force, Dyne>.div(
+infix operator fun <BaryeUnit : BaryeMultiple> ScientificValue<PhysicalQuantity.Force, Dyne>.div(
     pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>
-) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
-    SquareCentimeter.area(this, pressure)
+) = SquareCentimeter.area(this, pressure)
 
 @JvmName("dyneMultipleDivBarye")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(
+infix operator fun <DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(
     pressure: ScientificValue<PhysicalQuantity.Pressure, Barye>
-) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
-    SquareCentimeter.area(this, pressure)
+) = SquareCentimeter.area(this, pressure)
 
 @JvmName("dyneMultipleDivBaryeMultiple")
-infix operator fun <DyneUnit, BaryeUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(
+infix operator fun <DyneUnit : DyneMultiple, BaryeUnit : BaryeMultiple> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(
     pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>
-) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne>, BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
-    SquareCentimeter.area(this, pressure)
+) = SquareCentimeter.area(this, pressure)
 
 @JvmName("poundForcePoundSquareInch")
 infix operator fun ScientificValue<PhysicalQuantity.Force, PoundForce>.div(
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt
index 34f7cbb8a..5047dd54a 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToEnergy.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.energy.energy
 import com.splendo.kaluga.scientific.unit.Centimeter
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.Erg
 import com.splendo.kaluga.scientific.unit.FootPoundForce
 import com.splendo.kaluga.scientific.unit.FootPoundal
@@ -33,10 +34,8 @@ import com.splendo.kaluga.scientific.unit.InchOunceForce
 import com.splendo.kaluga.scientific.unit.InchPoundForce
 import com.splendo.kaluga.scientific.unit.Joule
 import com.splendo.kaluga.scientific.unit.Length
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricForce
 import com.splendo.kaluga.scientific.unit.MetricLength
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.PoundForce
 import com.splendo.kaluga.scientific.unit.Poundal
@@ -49,8 +48,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.times(distance:
     Erg.energy(this, distance)
 
 @JvmName("dyneMultipleTimesCentimeter")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.times(distance: ScientificValue<PhysicalQuantity.Length, Centimeter>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
-    Erg.energy(this, distance)
+infix operator fun <DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Force, DyneUnit>.times(distance: ScientificValue<PhysicalQuantity.Length, Centimeter>) = Erg.energy(this, distance)
 
 @JvmName("metricForceTimesMetricLength")
 infix operator fun <ForceUnit : MetricForce, LengthUnit : MetricLength> ScientificValue<PhysicalQuantity.Force, ForceUnit>.times(
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToMomentum.kt b/scientific/src/commonMain/kotlin/converter/force/convertToMomentum.kt
index 394f6f2d3..b279b57cc 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToMomentum.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToMomentum.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.momentum.momentum
 import com.splendo.kaluga.scientific.unit.Centimeter
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.Foot
 import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.Grain
@@ -32,10 +33,8 @@ import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.ImperialTon
 import com.splendo.kaluga.scientific.unit.ImperialTonForce
 import com.splendo.kaluga.scientific.unit.Kilogram
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Meter
 import com.splendo.kaluga.scientific.unit.MetricForce
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Milligram
 import com.splendo.kaluga.scientific.unit.MilligramForce
 import com.splendo.kaluga.scientific.unit.Ounce
@@ -59,10 +58,9 @@ infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.Force, Dyn
     (Gram x (Centimeter per Second)).momentum(this, time)
 
 @JvmName("dyneMultipleTimesTime")
-infix operator fun <DyneUnit, TimeUnit : Time> ScientificValue<PhysicalQuantity.Force, DyneUnit>.times(
+infix operator fun <DyneUnit : DyneMultiple, TimeUnit : Time> ScientificValue<PhysicalQuantity.Force, DyneUnit>.times(
     time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
-) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
-    (Gram x (Centimeter per Second)).momentum(this, time)
+) = (Gram x (Centimeter per Second)).momentum(this, time)
 
 @JvmName("tonneForceTimesTime")
 infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.Force, TonneForce>.times(time: ScientificValue<PhysicalQuantity.Time, TimeUnit>) =
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt
index aaf2a2aa6..78d4679f3 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToPower.kt
@@ -21,14 +21,12 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.power.power
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.ErgPerSecond
 import com.splendo.kaluga.scientific.unit.FootPoundForcePerSecond
 import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.ImperialSpeed
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricForce
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MetricSpeed
 import com.splendo.kaluga.scientific.unit.Speed
 import com.splendo.kaluga.scientific.unit.UKImperialForce
@@ -41,8 +39,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.times(speed: Sc
     ErgPerSecond.power(this, speed)
 
 @JvmName("dyneMultipleTimesMetricSpeed")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.times(speed: ScientificValue<PhysicalQuantity.Speed, MetricSpeed>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
-    ErgPerSecond.power(this, speed)
+infix operator fun <DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Force, DyneUnit>.times(speed: ScientificValue<PhysicalQuantity.Speed, MetricSpeed>) = ErgPerSecond.power(this, speed)
 
 @JvmName("imperialForceTimesImperialSpeed")
 infix operator fun <ForceUnit : ImperialForce> ScientificValue<PhysicalQuantity.Force, ForceUnit>.times(
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt b/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt
index 4094968bc..2429d1e79 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToPressure.kt
@@ -23,6 +23,7 @@ import com.splendo.kaluga.scientific.converter.pressure.pressure
 import com.splendo.kaluga.scientific.unit.Area
 import com.splendo.kaluga.scientific.unit.Barye
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.GrainForce
 import com.splendo.kaluga.scientific.unit.ImperialArea
@@ -33,9 +34,6 @@ import com.splendo.kaluga.scientific.unit.ImperialTonSquareInch
 import com.splendo.kaluga.scientific.unit.Kip
 import com.splendo.kaluga.scientific.unit.KipSquareFoot
 import com.splendo.kaluga.scientific.unit.KipSquareInch
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricForce
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
 import com.splendo.kaluga.scientific.unit.Pascal
@@ -59,10 +57,9 @@ infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.div(area: Scien
     Barye.pressure(this, area)
 
 @JvmName("dyneMultipleDivSquareCentimeter")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(
+infix operator fun <DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(
     area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>
-) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
-    Barye.pressure(this, area)
+) = Barye.pressure(this, area)
 
 @JvmName("poundalDivSquareFoot")
 infix operator fun ScientificValue<PhysicalQuantity.Force, Poundal>.div(area: ScientificValue<PhysicalQuantity.Area, SquareFoot>) =
diff --git a/scientific/src/commonMain/kotlin/converter/force/convertToWeight.kt b/scientific/src/commonMain/kotlin/converter/force/convertToWeight.kt
index c484c9cf8..19f27b65c 100644
--- a/scientific/src/commonMain/kotlin/converter/force/convertToWeight.kt
+++ b/scientific/src/commonMain/kotlin/converter/force/convertToWeight.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.weight.mass
 import com.splendo.kaluga.scientific.unit.Acceleration
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.Grain
 import com.splendo.kaluga.scientific.unit.GrainForce
@@ -33,10 +34,8 @@ import com.splendo.kaluga.scientific.unit.ImperialTon
 import com.splendo.kaluga.scientific.unit.ImperialTonForce
 import com.splendo.kaluga.scientific.unit.Kilogram
 import com.splendo.kaluga.scientific.unit.KilogramForce
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricAcceleration
 import com.splendo.kaluga.scientific.unit.MetricForce
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Milligram
 import com.splendo.kaluga.scientific.unit.MilligramForce
 import com.splendo.kaluga.scientific.unit.Ounce
@@ -57,8 +56,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Force, Dyne>.div(acceleratio
     Gram.mass(this, acceleration)
 
 @JvmName("dyneMultipleDivAcceleration")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(acceleration: ScientificValue<PhysicalQuantity.Acceleration, MetricAcceleration>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
-    Gram.mass(this, acceleration)
+infix operator fun <DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Force, DyneUnit>.div(acceleration: ScientificValue<PhysicalQuantity.Acceleration, MetricAcceleration>) = Gram.mass(this, acceleration)
 
 @JvmName("kilogramForceDivAcceleration")
 infix operator fun ScientificValue<PhysicalQuantity.Force, KilogramForce>.div(acceleration: ScientificValue<PhysicalQuantity.Acceleration, MetricAcceleration>) =
diff --git a/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt b/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt
index a730c7620..720baa032 100644
--- a/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/illuminance/convertToLuminance.kt
@@ -23,11 +23,9 @@ import com.splendo.kaluga.scientific.converter.luminance.luminance
 import com.splendo.kaluga.scientific.unit.FootLambert
 import com.splendo.kaluga.scientific.unit.Illuminance
 import com.splendo.kaluga.scientific.unit.ImperialIlluminance
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricIlluminance
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Nit
 import com.splendo.kaluga.scientific.unit.Phot
+import com.splendo.kaluga.scientific.unit.PhotMultiple
 import com.splendo.kaluga.scientific.unit.SolidAngle
 import com.splendo.kaluga.scientific.unit.Stilb
 import kotlin.jvm.JvmName
@@ -38,10 +36,9 @@ infix operator fun <SolidAngleUnit : SolidAngle> ScientificValue<PhysicalQuantit
 ) = Stilb.luminance(this, solidAngle)
 
 @JvmName("photMultipleDivSolidAngle")
-infix operator fun <PhotUnit, SolidAngleUnit : SolidAngle> ScientificValue<PhysicalQuantity.Illuminance, PhotUnit>.div(
+infix operator fun <PhotUnit : PhotMultiple, SolidAngleUnit : SolidAngle> ScientificValue<PhysicalQuantity.Illuminance, PhotUnit>.div(
     solidAngle: ScientificValue<PhysicalQuantity.SolidAngle, SolidAngleUnit>
-) where PhotUnit : MetricIlluminance, PhotUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> =
-    Stilb.luminance(this, solidAngle)
+) = Stilb.luminance(this, solidAngle)
 
 @JvmName("imperialIlluminanceDivSolidAngle")
 infix operator fun <IlluminanceUnit : ImperialIlluminance, SolidAngleUnit : SolidAngle> ScientificValue<PhysicalQuantity.Illuminance, IlluminanceUnit>.div(
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToEnergy.kt
index 0f0823f98..3d4154be9 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToEnergy.kt
@@ -26,9 +26,8 @@ import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.ImperialWeight
 import com.splendo.kaluga.scientific.unit.IonizingRadiationAbsorbedDose
 import com.splendo.kaluga.scientific.unit.Joule
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Rad
+import com.splendo.kaluga.scientific.unit.RadMultiple
 import com.splendo.kaluga.scientific.unit.UKImperialWeight
 import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.Weight
@@ -40,10 +39,9 @@ infix operator fun ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDos
 ) = Erg.energy(this, weight)
 
 @JvmName("radMultipleTimesGram")
-infix operator fun <AbsorbedDoseUnit> ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, AbsorbedDoseUnit>.times(
+infix operator fun <RadUnit : RadMultiple> ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, RadUnit>.times(
     weight: ScientificValue<PhysicalQuantity.Weight, Gram>
-) where AbsorbedDoseUnit : IonizingRadiationAbsorbedDose, AbsorbedDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> =
-    Erg.energy(this, weight)
+) = Erg.energy(this, weight)
 
 @JvmName("absorbedDoseTimesImperialWeight")
 infix operator fun <AbsorbedDoseUnit : IonizingRadiationAbsorbedDose, WeightUnit : ImperialWeight> ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, AbsorbedDoseUnit>.times(
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToSpecificEnergy.kt
index d3e7db99d..cbe2daaa7 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationAbsorbedDose/convertToSpecificEnergy.kt
@@ -25,9 +25,8 @@ import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.IonizingRadiationAbsorbedDose
 import com.splendo.kaluga.scientific.unit.Joule
 import com.splendo.kaluga.scientific.unit.Kilogram
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Rad
+import com.splendo.kaluga.scientific.unit.RadMultiple
 import com.splendo.kaluga.scientific.unit.per
 import kotlin.jvm.JvmName
 
@@ -36,7 +35,7 @@ fun ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad>.asSpeci
     (Erg per Gram).specificEnergy(this)
 
 @JvmName("specificEnergyFromRadMultiple")
-fun <RadUnit> ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, RadUnit>.asSpecificEnergy() where RadUnit : IonizingRadiationAbsorbedDose, RadUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> =
+fun <RadUnit : RadMultiple> ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, RadUnit>.asSpecificEnergy() =
     (Erg per Gram).specificEnergy(this)
 
 @JvmName("specificEnergyFromAbsorbedDose")
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToEnergy.kt
index 8456f42dc..c3d71cd72 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToEnergy.kt
@@ -26,9 +26,8 @@ import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.ImperialWeight
 import com.splendo.kaluga.scientific.unit.IonizingRadiationEquivalentDose
 import com.splendo.kaluga.scientific.unit.Joule
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.RoentgenEquivalentMan
+import com.splendo.kaluga.scientific.unit.RoentgenEquivalentManMultiple
 import com.splendo.kaluga.scientific.unit.UKImperialWeight
 import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.Weight
@@ -40,10 +39,9 @@ infix operator fun ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentD
 ) = Erg.energy(this, weight)
 
 @JvmName("roentgenEquivalentManMultipleTimesGram")
-infix operator fun <EquivalentDoseUnit> ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, EquivalentDoseUnit>.times(
+infix operator fun <EquivalentDoseUnit : RoentgenEquivalentManMultiple> ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, EquivalentDoseUnit>.times(
     weight: ScientificValue<PhysicalQuantity.Weight, Gram>
-) where EquivalentDoseUnit : IonizingRadiationEquivalentDose, EquivalentDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> =
-    Erg.energy(this, weight)
+) = Erg.energy(this, weight)
 
 @JvmName("equivalentDoseTimesImperialWeight")
 infix operator fun <EquivalentDoseUnit : IonizingRadiationEquivalentDose, WeightUnit : ImperialWeight> ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, EquivalentDoseUnit>.times(
diff --git a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToSpecificEnergy.kt
index 31ee008dc..ef178ee44 100644
--- a/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToSpecificEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/ionizingRadiationEquivalentDose/convertToSpecificEnergy.kt
@@ -25,9 +25,8 @@ import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.IonizingRadiationEquivalentDose
 import com.splendo.kaluga.scientific.unit.Joule
 import com.splendo.kaluga.scientific.unit.Kilogram
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.RoentgenEquivalentMan
+import com.splendo.kaluga.scientific.unit.RoentgenEquivalentManMultiple
 import com.splendo.kaluga.scientific.unit.per
 import kotlin.jvm.JvmName
 
@@ -36,7 +35,7 @@ fun ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEq
     (Erg per Gram).specificEnergy(this)
 
 @JvmName("specificEnergyFromRoentgenEquivalentManMultiple")
-fun <RoentgenEquivalentManUnit> ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentManUnit>.asSpecificEnergy() where RoentgenEquivalentManUnit : IonizingRadiationEquivalentDose, RoentgenEquivalentManUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> =
+fun <RoentgenEquivalentManUnit : RoentgenEquivalentManMultiple> ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentManUnit>.asSpecificEnergy() =
     (Erg per Gram).specificEnergy(this)
 
 @JvmName("specificEnergyFromEquivalentDose")
diff --git a/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt
index 24341b5be..158267969 100644
--- a/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/length/convertToEnergy.kt
@@ -22,15 +22,14 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.force.times
 import com.splendo.kaluga.scientific.unit.Centimeter
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.ImperialLength
 import com.splendo.kaluga.scientific.unit.Inch
 import com.splendo.kaluga.scientific.unit.Length
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricForce
 import com.splendo.kaluga.scientific.unit.MetricLength
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.PoundForce
 import com.splendo.kaluga.scientific.unit.Poundal
@@ -43,7 +42,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Length, Centimeter>.times(fo
     force * this
 
 @JvmName("centimeterTimesDyneMultiple")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Length, Centimeter>.times(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Length, Centimeter>.times(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) =
     force * this
 
 @JvmName("metricLengthTimesMetricForce")
diff --git a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt
index cf82ed878..de06bcfb6 100644
--- a/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt
+++ b/scientific/src/commonMain/kotlin/converter/luminousFlux/convertToArea.kt
@@ -23,10 +23,8 @@ import com.splendo.kaluga.scientific.converter.area.area
 import com.splendo.kaluga.scientific.unit.Illuminance
 import com.splendo.kaluga.scientific.unit.ImperialIlluminance
 import com.splendo.kaluga.scientific.unit.LuminousFlux
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricIlluminance
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.Phot
+import com.splendo.kaluga.scientific.unit.PhotMultiple
 import com.splendo.kaluga.scientific.unit.SquareCentimeter
 import com.splendo.kaluga.scientific.unit.SquareFoot
 import com.splendo.kaluga.scientific.unit.SquareMeter
@@ -38,10 +36,9 @@ infix operator fun <FluxUnit : LuminousFlux> ScientificValue<PhysicalQuantity.Lu
 ) = SquareCentimeter.area(this, phot)
 
 @JvmName("fluxDivPhotMultiple")
-infix operator fun <FluxUnit : LuminousFlux, PhotUnit> ScientificValue<PhysicalQuantity.LuminousFlux, FluxUnit>.div(
+infix operator fun <FluxUnit : LuminousFlux, PhotUnit : PhotMultiple> ScientificValue<PhysicalQuantity.LuminousFlux, FluxUnit>.div(
     phot: ScientificValue<PhysicalQuantity.Illuminance, PhotUnit>
-) where PhotUnit : MetricIlluminance, PhotUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> =
-    SquareCentimeter.area(this, phot)
+) = SquareCentimeter.area(this, phot)
 
 @JvmName("fluxDivImperialIlluminance")
 infix operator fun <FluxUnit : LuminousFlux, IlluminanceUnit : ImperialIlluminance> ScientificValue<PhysicalQuantity.LuminousFlux, FluxUnit>.div(
diff --git a/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt b/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt
index 991034ccd..59cbcafe6 100644
--- a/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt
+++ b/scientific/src/commonMain/kotlin/converter/power/convertToSpeed.kt
@@ -25,6 +25,7 @@ import com.splendo.kaluga.scientific.unit.BritishThermalUnitPerMinute
 import com.splendo.kaluga.scientific.unit.BritishThermalUnitPerSecond
 import com.splendo.kaluga.scientific.unit.Centimeter
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.ErgPerSecond
 import com.splendo.kaluga.scientific.unit.Foot
 import com.splendo.kaluga.scientific.unit.FootPoundForcePerMinute
@@ -36,11 +37,8 @@ import com.splendo.kaluga.scientific.unit.ImperialPower
 import com.splendo.kaluga.scientific.unit.Inch
 import com.splendo.kaluga.scientific.unit.InchPoundForcePerMinute
 import com.splendo.kaluga.scientific.unit.InchPoundForcePerSecond
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.Meter
 import com.splendo.kaluga.scientific.unit.MetricAndImperialPower
-import com.splendo.kaluga.scientific.unit.MetricForce
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MetricPower
 import com.splendo.kaluga.scientific.unit.Minute
 import com.splendo.kaluga.scientific.unit.PoundForce
@@ -56,7 +54,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Power, ErgPerSecond>.div(for
     (Centimeter per Second).speed(this, force)
 
 @JvmName("ergPerSecondDivDyneMultiple")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Power, ErgPerSecond>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Power, ErgPerSecond>.div(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) =
     (Centimeter per Second).speed(this, force)
 
 @JvmName("metricPowerDivMetricForce")
diff --git a/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt
index af42389b8..c585f7c36 100644
--- a/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/pressure/convertToEnergy.kt
@@ -21,6 +21,7 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.energy.energy
 import com.splendo.kaluga.scientific.unit.Barye
+import com.splendo.kaluga.scientific.unit.BaryeMultiple
 import com.splendo.kaluga.scientific.unit.CubicCentimeter
 import com.splendo.kaluga.scientific.unit.CubicFoot
 import com.splendo.kaluga.scientific.unit.CubicInch
@@ -34,9 +35,6 @@ import com.splendo.kaluga.scientific.unit.InchPoundForce
 import com.splendo.kaluga.scientific.unit.Joule
 import com.splendo.kaluga.scientific.unit.KiloPoundSquareInch
 import com.splendo.kaluga.scientific.unit.KipSquareInch
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
-import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
 import com.splendo.kaluga.scientific.unit.PoundSquareFoot
 import com.splendo.kaluga.scientific.unit.PoundSquareInch
@@ -54,7 +52,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Pressure, Barye>.times(volum
     Erg.energy(this, volume)
 
 @JvmName("baryeMultipleTimesCubicCentimeter")
-infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>.times(volume: ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+infix operator fun <BaryeUnit : BaryeMultiple> ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>.times(volume: ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>) =
     Erg.energy(this, volume)
 
 @JvmName("poundSquareFootTimesCubicFoot")
diff --git a/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt
index 61b9a4af0..fba2c6758 100644
--- a/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/pressure/convertToForce.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.force.force
 import com.splendo.kaluga.scientific.unit.Area
 import com.splendo.kaluga.scientific.unit.Barye
+import com.splendo.kaluga.scientific.unit.BaryeMultiple
 import com.splendo.kaluga.scientific.unit.Dyne
 import com.splendo.kaluga.scientific.unit.ImperialArea
 import com.splendo.kaluga.scientific.unit.ImperialPressure
@@ -31,9 +32,6 @@ import com.splendo.kaluga.scientific.unit.ImperialTonSquareInch
 import com.splendo.kaluga.scientific.unit.Kip
 import com.splendo.kaluga.scientific.unit.KipSquareFoot
 import com.splendo.kaluga.scientific.unit.KipSquareInch
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
-import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.Newton
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
@@ -54,7 +52,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Pressure, Barye>.times(area:
     Dyne.force(this, area)
 
 @JvmName("baryeMultipleTimesSquareCentimeter")
-infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>.times(area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
+infix operator fun <BaryeUnit : BaryeMultiple> ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>.times(area: ScientificValue<PhysicalQuantity.Area, SquareCentimeter>) =
     Dyne.force(this, area)
 
 @JvmName("ounceSquareInchTimesImperialArea")
diff --git a/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt b/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt
index 5e5f1d63d..7c9e32125 100644
--- a/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt
+++ b/scientific/src/commonMain/kotlin/converter/speed/convertToPower.kt
@@ -21,12 +21,10 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.force.times
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.ImperialSpeed
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricForce
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MetricSpeed
 import com.splendo.kaluga.scientific.unit.Speed
 import com.splendo.kaluga.scientific.unit.UKImperialForce
@@ -38,7 +36,7 @@ infix operator fun ScientificValue<PhysicalQuantity.Speed, MetricSpeed>.times(fo
     force * this
 
 @JvmName("metricSpeedTimesDyneMultiple")
-infix operator fun <DyneUnit> ScientificValue<PhysicalQuantity.Speed, MetricSpeed>.times(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
+infix operator fun <DyneUnit : DyneMultiple> ScientificValue<PhysicalQuantity.Speed, MetricSpeed>.times(force: ScientificValue<PhysicalQuantity.Force, DyneUnit>) =
     force * this
 
 @JvmName("imperialSpeedTimesImperialForce")
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToMomentum.kt b/scientific/src/commonMain/kotlin/converter/time/convertToMomentum.kt
index 7ca7e338b..d1edf8030 100644
--- a/scientific/src/commonMain/kotlin/converter/time/convertToMomentum.kt
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToMomentum.kt
@@ -21,14 +21,13 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.force.times
 import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
 import com.splendo.kaluga.scientific.unit.Force
 import com.splendo.kaluga.scientific.unit.GrainForce
 import com.splendo.kaluga.scientific.unit.GramForce
 import com.splendo.kaluga.scientific.unit.ImperialForce
 import com.splendo.kaluga.scientific.unit.ImperialTonForce
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
 import com.splendo.kaluga.scientific.unit.MetricForce
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MilligramForce
 import com.splendo.kaluga.scientific.unit.OunceForce
 import com.splendo.kaluga.scientific.unit.Poundal
@@ -44,10 +43,9 @@ infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.Time, Time
     dyne * this
 
 @JvmName("timeTimesDyneMultiple")
-infix operator fun <DyneUnit, TimeUnit : Time> ScientificValue<PhysicalQuantity.Time, TimeUnit>.times(
+infix operator fun <DyneUnit : DyneMultiple, TimeUnit : Time> ScientificValue<PhysicalQuantity.Time, TimeUnit>.times(
     dyne: ScientificValue<PhysicalQuantity.Force, DyneUnit>
-) where DyneUnit : MetricForce, DyneUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> =
-    dyne * this
+) = dyne * this
 
 @JvmName("timeTimesTonneForce")
 infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.Time, TimeUnit>.times(tonne: ScientificValue<PhysicalQuantity.Force, TonneForce>) =
diff --git a/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt
index 7e2949f2e..3f71f6df6 100644
--- a/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/volume/convertToEnergy.kt
@@ -21,6 +21,7 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.pressure.times
 import com.splendo.kaluga.scientific.unit.Barye
+import com.splendo.kaluga.scientific.unit.BaryeMultiple
 import com.splendo.kaluga.scientific.unit.CubicCentimeter
 import com.splendo.kaluga.scientific.unit.CubicFoot
 import com.splendo.kaluga.scientific.unit.CubicInch
@@ -29,9 +30,6 @@ import com.splendo.kaluga.scientific.unit.ImperialTonSquareInch
 import com.splendo.kaluga.scientific.unit.ImperialVolume
 import com.splendo.kaluga.scientific.unit.KiloPoundSquareInch
 import com.splendo.kaluga.scientific.unit.KipSquareInch
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
-import com.splendo.kaluga.scientific.unit.MetricPressure
 import com.splendo.kaluga.scientific.unit.OunceSquareInch
 import com.splendo.kaluga.scientific.unit.PoundSquareFoot
 import com.splendo.kaluga.scientific.unit.PoundSquareInch
@@ -49,10 +47,9 @@ infix operator fun ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>.tim
     pressure * this
 
 @JvmName("cubicCentimeterTimesBaryeMultiple")
-infix operator fun <BaryeUnit> ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>.times(
+infix operator fun <BaryeUnit : BaryeMultiple> ScientificValue<PhysicalQuantity.Volume, CubicCentimeter>.times(
     pressure: ScientificValue<PhysicalQuantity.Pressure, BaryeUnit>
-) where BaryeUnit : MetricPressure, BaryeUnit : MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> =
-    pressure * this
+) = pressure * this
 
 @JvmName("cubicFootTimesPoundSquareFoot")
 infix operator fun ScientificValue<PhysicalQuantity.Volume, CubicFoot>.times(pressure: ScientificValue<PhysicalQuantity.Pressure, PoundSquareFoot>) =
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToEnergy.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToEnergy.kt
index 010877dfb..38e03eaec 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToEnergy.kt
@@ -27,12 +27,12 @@ import com.splendo.kaluga.scientific.unit.ImperialSpecificEnergy
 import com.splendo.kaluga.scientific.unit.ImperialWeight
 import com.splendo.kaluga.scientific.unit.IonizingRadiationAbsorbedDose
 import com.splendo.kaluga.scientific.unit.IonizingRadiationEquivalentDose
-import com.splendo.kaluga.scientific.unit.MeasurementSystem
-import com.splendo.kaluga.scientific.unit.MetricMultipleUnit
 import com.splendo.kaluga.scientific.unit.MetricSpecificEnergy
 import com.splendo.kaluga.scientific.unit.MetricWeight
 import com.splendo.kaluga.scientific.unit.Rad
+import com.splendo.kaluga.scientific.unit.RadMultiple
 import com.splendo.kaluga.scientific.unit.RoentgenEquivalentMan
+import com.splendo.kaluga.scientific.unit.RoentgenEquivalentManMultiple
 import com.splendo.kaluga.scientific.unit.SpecificEnergy
 import com.splendo.kaluga.scientific.unit.UKImperialSpecificEnergy
 import com.splendo.kaluga.scientific.unit.UKImperialWeight
@@ -47,10 +47,9 @@ infix operator fun ScientificValue<PhysicalQuantity.Weight, Gram>.times(
 ) = absorbedDose * this
 
 @JvmName("gramTimesRadMultiple")
-infix operator fun <AbsorbedDoseUnit> ScientificValue<PhysicalQuantity.Weight, Gram>.times(
+infix operator fun <AbsorbedDoseUnit : RadMultiple> ScientificValue<PhysicalQuantity.Weight, Gram>.times(
     absorbedDose: ScientificValue<PhysicalQuantity.IonizingRadiationAbsorbedDose, AbsorbedDoseUnit>
-) where AbsorbedDoseUnit : IonizingRadiationAbsorbedDose, AbsorbedDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> =
-    absorbedDose * this
+) = absorbedDose * this
 
 @JvmName("imperialWeightTimesAbsorbedDose")
 infix operator fun <AbsorbedDoseUnit : IonizingRadiationAbsorbedDose, WeightUnit : ImperialWeight> ScientificValue<PhysicalQuantity.Weight, WeightUnit>.times(
@@ -78,10 +77,9 @@ infix operator fun ScientificValue<PhysicalQuantity.Weight, Gram>.times(
 ) = equivalentDose * this
 
 @JvmName("gramTimesRoentgenEquivalentManMultiple")
-infix operator fun <EquivalentDoseUnit> ScientificValue<PhysicalQuantity.Weight, Gram>.times(
+infix operator fun <EquivalentDoseUnit : RoentgenEquivalentManMultiple> ScientificValue<PhysicalQuantity.Weight, Gram>.times(
     equivalentDose: ScientificValue<PhysicalQuantity.IonizingRadiationEquivalentDose, EquivalentDoseUnit>
-) where EquivalentDoseUnit : IonizingRadiationEquivalentDose, EquivalentDoseUnit : MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> =
-    equivalentDose * this
+) = equivalentDose * this
 
 @JvmName("imperialWeightTimesEquivalentDose")
 infix operator fun <EquivalentDoseUnit : IonizingRadiationEquivalentDose, WeightUnit : ImperialWeight> ScientificValue<PhysicalQuantity.Weight, WeightUnit>.times(
diff --git a/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt b/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
index 7aefb5222..b6dee9dae 100644
--- a/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
@@ -49,24 +49,27 @@ object Mole : AmountOfSubstance(), MetricBaseUnit<MeasurementSystem.MetricAndImp
 }
 
 @Serializable
-object Nanomole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Nano(Mole)
+sealed class MoleMultiple : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole>
+
+@Serializable
+object Nanomole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Nano(Mole)
 @Serializable
-object Micromole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Micro(Mole)
+object Micromole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Micro(Mole)
 @Serializable
-object Millimole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Milli(Mole)
+object Millimole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Milli(Mole)
 @Serializable
-object Centimole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Centi(Mole)
+object Centimole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Centi(Mole)
 @Serializable
-object Decimole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Deci(Mole)
+object Decimole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Deci(Mole)
 @Serializable
-object Decamole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Deca(Mole)
+object Decamole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Deca(Mole)
 @Serializable
-object Hectomole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Hecto(Mole)
+object Hectomole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Hecto(Mole)
 @Serializable
-object Kilomole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Kilo(Mole)
+object Kilomole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Kilo(Mole)
 @Serializable
-object Megamole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Mega(Mole)
+object Megamole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Mega(Mole)
 @Serializable
-object Gigamole : AmountOfSubstance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Giga(Mole)
+object Gigamole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Giga(Mole)
 
 val AvogadroConstant = 6.02214076e23.toDecimal()
diff --git a/scientific/src/commonMain/kotlin/unit/AngleUnit.kt b/scientific/src/commonMain/kotlin/unit/AngleUnit.kt
index f29bbf30f..2af82bb96 100644
--- a/scientific/src/commonMain/kotlin/unit/AngleUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AngleUnit.kt
@@ -57,15 +57,18 @@ object Radian : Angle(), MetricBaseUnit<MeasurementSystem.MetricAndImperial, Phy
 }
 
 @Serializable
-object Nanoradian : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian> by Nano(Radian)
+sealed class RadianMultiple : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian>
+
+@Serializable
+object Nanoradian : RadianMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian> by Nano(Radian)
 @Serializable
-object Microradian : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian> by Micro(Radian)
+object Microradian : RadianMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian> by Micro(Radian)
 @Serializable
-object Milliradian : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian> by Milli(Radian)
+object Milliradian : RadianMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian> by Milli(Radian)
 @Serializable
-object Centiradian : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian> by Centi(Radian)
+object Centiradian : RadianMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian> by Centi(Radian)
 @Serializable
-object Deciradian : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian> by Deci(Radian)
+object Deciradian : RadianMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Radian> by Deci(Radian)
 
 @Serializable
 object Turn : Angle(), MetricBaseUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle> {
@@ -78,15 +81,18 @@ object Turn : Angle(), MetricBaseUnit<MeasurementSystem.MetricAndImperial, Physi
 }
 
 @Serializable
-object Nanoturn : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn> by Nano(Turn)
+sealed class TurnMultiple : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn>
+
+@Serializable
+object Nanoturn : TurnMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn> by Nano(Turn)
 @Serializable
-object Microturn : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn> by Micro(Turn)
+object Microturn : TurnMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn> by Micro(Turn)
 @Serializable
-object Milliturn : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn> by Milli(Turn)
+object Milliturn : TurnMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn> by Milli(Turn)
 @Serializable
-object Centiturn : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn> by Centi(Turn)
+object Centiturn : TurnMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn> by Centi(Turn)
 @Serializable
-object Deciturn : Angle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn> by Deci(Turn)
+object Deciturn : TurnMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Angle, Turn> by Deci(Turn)
 
 @Serializable
 object Degree : Angle() {
diff --git a/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt b/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt
index 983e51c05..95d8498a5 100644
--- a/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt
@@ -48,22 +48,25 @@ object Katal : CatalysticActivity(), MetricBaseUnit<MeasurementSystem.MetricAndI
 }
 
 @Serializable
-object Nanokatal : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Nano(Katal)
+sealed class KatalMultiple : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal>
+
+@Serializable
+object Nanokatal : KatalMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Nano(Katal)
 @Serializable
-object Microkatal : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Micro(Katal)
+object Microkatal : KatalMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Micro(Katal)
 @Serializable
-object Millikatal : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Milli(Katal)
+object Millikatal : KatalMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Milli(Katal)
 @Serializable
-object Centikatal : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Centi(Katal)
+object Centikatal : KatalMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Centi(Katal)
 @Serializable
-object Decikatal : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Deci(Katal)
+object Decikatal : KatalMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Deci(Katal)
 @Serializable
-object Decakatal : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Deca(Katal)
+object Decakatal : KatalMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Deca(Katal)
 @Serializable
-object Hectokatal : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Hecto(Katal)
+object Hectokatal : KatalMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Hecto(Katal)
 @Serializable
-object Kilokatal : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Kilo(Katal)
+object Kilokatal : KatalMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Kilo(Katal)
 @Serializable
-object Megakatal : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Mega(Katal)
+object Megakatal : KatalMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Mega(Katal)
 @Serializable
-object Gigakatal : CatalysticActivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Giga(Katal)
+object Gigakatal : KatalMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.CatalysticActivity, Katal> by Giga(Katal)
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt
index b7b87119a..96e35e883 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt
@@ -48,26 +48,29 @@ object Farad : ElectricCapacitance(), MetricBaseUnit<MeasurementSystem.MetricAnd
 }
 
 @Serializable
-object Nanofarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Nano(Farad)
+sealed class FaradMultiple : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad>
+
+@Serializable
+object Nanofarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Nano(Farad)
 @Serializable
-object Microfarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Micro(Farad)
+object Microfarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Micro(Farad)
 @Serializable
-object Millifarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Milli(Farad)
+object Millifarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Milli(Farad)
 @Serializable
-object Centifarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Centi(Farad)
+object Centifarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Centi(Farad)
 @Serializable
-object Decifarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Deci(Farad)
+object Decifarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Deci(Farad)
 @Serializable
-object Decafarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Deca(Farad)
+object Decafarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Deca(Farad)
 @Serializable
-object Hectofarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Hecto(Farad)
+object Hectofarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Hecto(Farad)
 @Serializable
-object Kilofarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Kilo(Farad)
+object Kilofarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Kilo(Farad)
 @Serializable
-object Megafarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Mega(Farad)
+object Megafarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Mega(Farad)
 @Serializable
-object Gigafarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Giga(Farad)
+object Gigafarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Giga(Farad)
 @Serializable
-object Abfarad : ElectricCapacitance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Giga(Farad) {
+object Abfarad : FaradMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCapacitance, Farad> by Giga(Farad) {
     override val symbol: String = "abF"
 }
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
index ba623c227..d86d441c7 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
@@ -50,28 +50,31 @@ object Coulomb : ElectricCharge(), MetricBaseUnit<MeasurementSystem.MetricAndImp
 }
 
 @Serializable
-object Nanocoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Nano(Coulomb)
+sealed class CoulombMultiple : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb>
+
+@Serializable
+object Nanocoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Nano(Coulomb)
 @Serializable
-object Microcoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Micro(Coulomb)
+object Microcoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Micro(Coulomb)
 @Serializable
-object Millicoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Milli(Coulomb)
+object Millicoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Milli(Coulomb)
 @Serializable
-object Centicoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Centi(Coulomb)
+object Centicoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Centi(Coulomb)
 @Serializable
-object Decicoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Deci(Coulomb)
+object Decicoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Deci(Coulomb)
 @Serializable
-object Decacoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Deca(Coulomb)
+object Decacoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Deca(Coulomb)
 @Serializable
-object Abcoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Deca(Coulomb) {
+object Abcoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Deca(Coulomb) {
     override val symbol: String = "abC"
 }
 @Serializable
-object Hectocoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Hecto(Coulomb)
+object Hectocoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Hecto(Coulomb)
 @Serializable
-object Kilocoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Kilo(Coulomb)
+object Kilocoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Kilo(Coulomb)
 @Serializable
-object Megacoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Mega(Coulomb)
+object Megacoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Mega(Coulomb)
 @Serializable
-object Gigacoulomb : ElectricCharge(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Giga(Coulomb)
+object Gigacoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Giga(Coulomb)
 
 val elementaryCharge = 1.602176634e-19(Coulomb)
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt
index 3b30061d3..6089159ef 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt
@@ -49,26 +49,29 @@ object Siemens : ElectricConductance(), MetricBaseUnit<MeasurementSystem.MetricA
 }
 
 @Serializable
-object Nanosiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Nano(Siemens)
+sealed class SiemensMultiple : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens>
+
+@Serializable
+object Nanosiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Nano(Siemens)
 @Serializable
-object Microsiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Micro(Siemens)
+object Microsiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Micro(Siemens)
 @Serializable
-object Millisiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Milli(Siemens)
+object Millisiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Milli(Siemens)
 @Serializable
-object Centisiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Centi(Siemens)
+object Centisiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Centi(Siemens)
 @Serializable
-object Decisiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Deci(Siemens)
+object Decisiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Deci(Siemens)
 @Serializable
-object Decasiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Deca(Siemens)
+object Decasiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Deca(Siemens)
 @Serializable
-object Hectosiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Hecto(Siemens)
+object Hectosiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Hecto(Siemens)
 @Serializable
-object Kilosiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Kilo(Siemens)
+object Kilosiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Kilo(Siemens)
 @Serializable
-object Megasiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Mega(Siemens)
+object Megasiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Mega(Siemens)
 @Serializable
-object Gigasiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Giga(Siemens)
+object Gigasiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Giga(Siemens)
 @Serializable
-object Absiemens : ElectricConductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Giga(Siemens) {
+object Absiemens : SiemensMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricConductance, Siemens> by Giga(Siemens) {
     override val symbol: String = "abS"
 }
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt
index 36de8e1e8..8270173ce 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt
@@ -50,30 +50,33 @@ object Ampere : ElectricCurrent(), MetricBaseUnit<MeasurementSystem.MetricAndImp
 }
 
 @Serializable
-object Nanoampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Nano(Ampere)
+sealed class AmpereMultiple : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere>
+
+@Serializable
+object Nanoampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Nano(Ampere)
 @Serializable
-object Microampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Micro(Ampere)
+object Microampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Micro(Ampere)
 @Serializable
-object Milliampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Milli(Ampere)
+object Milliampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Milli(Ampere)
 @Serializable
-object Centiampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Centi(Ampere)
+object Centiampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Centi(Ampere)
 @Serializable
-object Deciampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Deci(Ampere)
+object Deciampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Deci(Ampere)
 @Serializable
-object Decaampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Deca(Ampere)
+object Decaampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Deca(Ampere)
 @Serializable
-object Abampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Deca(Ampere) {
+object Abampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Deca(Ampere) {
     override val symbol: String = "abA"
 }
 @Serializable
-object Biot : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Deca(Ampere) {
+object Biot : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Deca(Ampere) {
     override val symbol: String = "B"
 }
 @Serializable
-object Hectoampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Hecto(Ampere)
+object Hectoampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Hecto(Ampere)
 @Serializable
-object Kiloampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Kilo(Ampere)
+object Kiloampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Kilo(Ampere)
 @Serializable
-object Megaampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Mega(Ampere)
+object Megaampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Mega(Ampere)
 @Serializable
-object Gigaampere : ElectricCurrent(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Giga(Ampere)
+object Gigaampere : AmpereMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCurrent, Ampere> by Giga(Ampere)
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt
index 0e8d3be7a..177134b37 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt
@@ -49,26 +49,29 @@ object Henry : ElectricInductance(), MetricBaseUnit<MeasurementSystem.MetricAndI
 }
 
 @Serializable
-object Nanohenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Nano(Henry)
+sealed class HenryMultiple : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry>
+
+@Serializable
+object Nanohenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Nano(Henry)
 @Serializable
-object Abhenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Nano(Henry) {
+object Abhenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Nano(Henry) {
     override val symbol: String = "abH"
 }
 @Serializable
-object Microhenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Micro(Henry)
+object Microhenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Micro(Henry)
 @Serializable
-object Millihenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Milli(Henry)
+object Millihenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Milli(Henry)
 @Serializable
-object Centihenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Centi(Henry)
+object Centihenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Centi(Henry)
 @Serializable
-object Decihenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Deci(Henry)
+object Decihenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Deci(Henry)
 @Serializable
-object Decahenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Deca(Henry)
+object Decahenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Deca(Henry)
 @Serializable
-object Hectohenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Hecto(Henry)
+object Hectohenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Hecto(Henry)
 @Serializable
-object Kilohenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Kilo(Henry)
+object Kilohenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Kilo(Henry)
 @Serializable
-object Megahenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Mega(Henry)
+object Megahenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Mega(Henry)
 @Serializable
-object Gigahenry : ElectricInductance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Giga(Henry)
+object Gigahenry : HenryMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricInductance, Henry> by Giga(Henry)
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt
index 7af5e5993..d7752f882 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt
@@ -49,26 +49,29 @@ object Ohm : ElectricResistance(), MetricBaseUnit<MeasurementSystem.MetricAndImp
 }
 
 @Serializable
-object Nanoohm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Nano(Ohm)
+sealed class OhmMultiple : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm>
+
+@Serializable
+object Nanoohm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Nano(Ohm)
 @Serializable
-object Abohm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Nano(Ohm) {
+object Abohm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Nano(Ohm) {
     override val symbol = "abΩ"
 }
 @Serializable
-object Microohm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Micro(Ohm)
+object Microohm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Micro(Ohm)
 @Serializable
-object Milliohm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Milli(Ohm)
+object Milliohm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Milli(Ohm)
 @Serializable
-object Centiohm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Centi(Ohm)
+object Centiohm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Centi(Ohm)
 @Serializable
-object Deciohm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Deci(Ohm)
+object Deciohm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Deci(Ohm)
 @Serializable
-object Decaohm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Deca(Ohm)
+object Decaohm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Deca(Ohm)
 @Serializable
-object HectoOhm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Hecto(Ohm)
+object HectoOhm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Hecto(Ohm)
 @Serializable
-object Kiloohm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Kilo(Ohm)
+object Kiloohm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Kilo(Ohm)
 @Serializable
-object Megaohm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Mega(Ohm)
+object Megaohm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Mega(Ohm)
 @Serializable
-object Gigaohm : ElectricResistance(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Giga(Ohm)
+object Gigaohm : OhmMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricResistance, Ohm> by Giga(Ohm)
diff --git a/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt
index dfe9d57b7..1072cafb8 100644
--- a/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt
@@ -112,26 +112,30 @@ object Joule : MetricEnergy(), MetricBaseUnit<MeasurementSystem.Metric, Physical
     override fun fromSIUnit(value: Decimal): Decimal = value
     override fun toSIUnit(value: Decimal): Decimal = value
 }
+
+@Serializable
+sealed class JouleMultiple : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule>
+
 @Serializable
-object Nanojoule : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Nano(Joule)
+object Nanojoule : JouleMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Nano(Joule)
 @Serializable
-object Microjoule : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Micro(Joule)
+object Microjoule : JouleMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Micro(Joule)
 @Serializable
-object Millijoule : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Milli(Joule)
+object Millijoule : JouleMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Milli(Joule)
 @Serializable
-object Centijoule : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Centi(Joule)
+object Centijoule : JouleMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Centi(Joule)
 @Serializable
-object Decijoule : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Deci(Joule)
+object Decijoule : JouleMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Deci(Joule)
 @Serializable
-object Decajoule : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Deca(Joule)
+object Decajoule : JouleMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Deca(Joule)
 @Serializable
-object Hectojoule : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Hecto(Joule)
+object Hectojoule : JouleMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Hecto(Joule)
 @Serializable
-object Kilojoule : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Kilo(Joule)
+object Kilojoule : JouleMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Kilo(Joule)
 @Serializable
-object Megajoule : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Mega(Joule)
+object Megajoule : JouleMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Mega(Joule)
 @Serializable
-object Gigajoule : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Giga(Joule)
+object Gigajoule : JouleMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Joule> by Giga(Joule)
 
 @Serializable
 object Erg : MetricEnergy(), MetricBaseUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy> {
@@ -144,25 +148,28 @@ object Erg : MetricEnergy(), MetricBaseUnit<MeasurementSystem.Metric, PhysicalQu
 }
 
 @Serializable
-object Nanoerg : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Nano(Erg)
+sealed class ErgMultiple : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg>
+
+@Serializable
+object Nanoerg : ErgMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Nano(Erg)
 @Serializable
-object Microerg : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Micro(Erg)
+object Microerg : ErgMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Micro(Erg)
 @Serializable
-object Millierg : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Milli(Erg)
+object Millierg : ErgMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Milli(Erg)
 @Serializable
-object Centierg : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Centi(Erg)
+object Centierg : ErgMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Centi(Erg)
 @Serializable
-object Decierg : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Deci(Erg)
+object Decierg : ErgMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Deci(Erg)
 @Serializable
-object Decaerg : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Deca(Erg)
+object Decaerg : ErgMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Deca(Erg)
 @Serializable
-object Hectoerg : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Hecto(Erg)
+object Hectoerg : ErgMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Hecto(Erg)
 @Serializable
-object Kiloerg : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Kilo(Erg)
+object Kiloerg : ErgMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Kilo(Erg)
 @Serializable
-object Megaerg : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Mega(Erg)
+object Megaerg : ErgMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Mega(Erg)
 @Serializable
-object Gigaerg : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Giga(Erg)
+object Gigaerg : ErgMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Erg> by Giga(Erg)
 
 @Serializable
 object WattHour : MetricAndImperialEnergy(), MetricBaseUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy> {
@@ -172,26 +179,30 @@ object WattHour : MetricAndImperialEnergy(), MetricBaseUnit<MeasurementSystem.Me
     override fun fromSIUnit(value: Decimal): Decimal = Hour.fromSIUnit(value)
     override fun toSIUnit(value: Decimal): Decimal = Hour.toSIUnit(value)
 }
+
+@Serializable
+sealed class WattHourMultiple : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour>
+
 @Serializable
-object NanowattHour : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Nano(WattHour)
+object NanowattHour : WattHourMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Nano(WattHour)
 @Serializable
-object MicrowattHour : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Micro(WattHour)
+object MicrowattHour : WattHourMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Micro(WattHour)
 @Serializable
-object MilliwattHour : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Milli(WattHour)
+object MilliwattHour : WattHourMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Milli(WattHour)
 @Serializable
-object CentiwattHour : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Centi(WattHour)
+object CentiwattHour : WattHourMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Centi(WattHour)
 @Serializable
-object DeciwattHour : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Deci(WattHour)
+object DeciwattHour : WattHourMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Deci(WattHour)
 @Serializable
-object DecawattHour : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Deca(WattHour)
+object DecawattHour : WattHourMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Deca(WattHour)
 @Serializable
-object HectowattHour : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Hecto(WattHour)
+object HectowattHour : WattHourMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Hecto(WattHour)
 @Serializable
-object KilowattHour : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Kilo(WattHour)
+object KilowattHour : WattHourMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Kilo(WattHour)
 @Serializable
-object MegawattHour : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Mega(WattHour)
+object MegawattHour : WattHourMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Mega(WattHour)
 @Serializable
-object GigawattHour : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Giga(WattHour)
+object GigawattHour : WattHourMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, WattHour> by Giga(WattHour)
 
 @Serializable
 object Electronvolt : MetricEnergy(), MetricBaseUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy> {
@@ -203,25 +214,28 @@ object Electronvolt : MetricEnergy(), MetricBaseUnit<MeasurementSystem.Metric, P
 }
 
 @Serializable
-object Nanoelectronvolt : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Nano(Electronvolt)
+sealed class ElectronvoltMultiple : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt>
+
+@Serializable
+object Nanoelectronvolt : ElectronvoltMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Nano(Electronvolt)
 @Serializable
-object Microelectronvolt : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Micro(Electronvolt)
+object Microelectronvolt : ElectronvoltMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Micro(Electronvolt)
 @Serializable
-object Millielectronvolt : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Milli(Electronvolt)
+object Millielectronvolt : ElectronvoltMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Milli(Electronvolt)
 @Serializable
-object Centielectronvolt : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Centi(Electronvolt)
+object Centielectronvolt : ElectronvoltMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Centi(Electronvolt)
 @Serializable
-object Decielectronvolt : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Deci(Electronvolt)
+object Decielectronvolt : ElectronvoltMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Deci(Electronvolt)
 @Serializable
-object Decaelectronvolt : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Deca(Electronvolt)
+object Decaelectronvolt : ElectronvoltMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Deca(Electronvolt)
 @Serializable
-object Hectoelectronvolt : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Hecto(Electronvolt)
+object Hectoelectronvolt : ElectronvoltMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Hecto(Electronvolt)
 @Serializable
-object Kiloelectronvolt : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Kilo(Electronvolt)
+object Kiloelectronvolt : ElectronvoltMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Kilo(Electronvolt)
 @Serializable
-object Megaelectronvolt : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Mega(Electronvolt)
+object Megaelectronvolt : ElectronvoltMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Mega(Electronvolt)
 @Serializable
-object Gigaelectronvolt : MetricEnergy(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Giga(Electronvolt)
+object Gigaelectronvolt : ElectronvoltMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Energy, Electronvolt> by Giga(Electronvolt)
 
 interface CalorieUnit : MetricBaseUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy>
 @Serializable
@@ -238,20 +252,27 @@ object Calorie : MetricAndImperialEnergy(), CalorieUnit by CalorieBase(4.184.toD
     @Serializable
     object IT : MetricAndImperialEnergy(), CalorieUnit by CalorieBase(4.1868.toDecimal(), "-IT")
 }
+
+@Serializable
+sealed class CalorieMultiple : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie> {
+    @Serializable
+    sealed class IT : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie.IT>
+}
+
 @Serializable
-object Millicalorie : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie> by Milli(Calorie) {
+object Millicalorie : CalorieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie> by Milli(Calorie) {
     @Serializable
-    object IT : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie.IT> by Milli(Calorie.IT)
+    object IT : CalorieMultiple.IT(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie.IT> by Milli(Calorie.IT)
 }
 @Serializable
-object Kilocalorie : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie> by Kilo(Calorie) {
+object Kilocalorie : CalorieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie> by Kilo(Calorie) {
     @Serializable
-    object IT : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie.IT> by Kilo(Calorie.IT)
+    object IT : CalorieMultiple.IT(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie.IT> by Kilo(Calorie.IT)
 }
 @Serializable
-object Megacalorie : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie> by Mega(Calorie) {
+object Megacalorie : CalorieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie> by Mega(Calorie) {
     @Serializable
-    object IT : MetricAndImperialEnergy(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie.IT> by Mega(Calorie.IT)
+    object IT : CalorieMultiple.IT(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Energy, Calorie.IT> by Mega(Calorie.IT)
 }
 
 @Serializable
diff --git a/scientific/src/commonMain/kotlin/unit/ForceUnit.kt b/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
index e10202c84..4e1a78d86 100644
--- a/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
@@ -107,25 +107,28 @@ object Newton : MetricForce(), MetricBaseUnit<MeasurementSystem.Metric, Physical
 }
 
 @Serializable
-object Nanonewton : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Nano(Newton)
+sealed class NewtonMultiple : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton>
+
+@Serializable
+object Nanonewton : NewtonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Nano(Newton)
 @Serializable
-object Micronewton : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Micro(Newton)
+object Micronewton : NewtonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Micro(Newton)
 @Serializable
-object Millinewton : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Milli(Newton)
+object Millinewton : NewtonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Milli(Newton)
 @Serializable
-object Centinewton : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Centi(Newton)
+object Centinewton : NewtonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Centi(Newton)
 @Serializable
-object Decinewton : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Deci(Newton)
+object Decinewton : NewtonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Deci(Newton)
 @Serializable
-object Decanewton : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Deca(Newton)
+object Decanewton : NewtonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Deca(Newton)
 @Serializable
-object Hectonewton : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Hecto(Newton)
+object Hectonewton : NewtonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Hecto(Newton)
 @Serializable
-object Kilonewton : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Kilo(Newton)
+object Kilonewton : NewtonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Kilo(Newton)
 @Serializable
-object Meganewton : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Mega(Newton)
+object Meganewton : NewtonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Mega(Newton)
 @Serializable
-object Giganewton : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Giga(Newton)
+object Giganewton : NewtonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Newton> by Giga(Newton)
 
 @Serializable
 object Dyne : MetricForce(), MetricBaseUnit<MeasurementSystem.Metric, PhysicalQuantity.Force> {
@@ -137,25 +140,28 @@ object Dyne : MetricForce(), MetricBaseUnit<MeasurementSystem.Metric, PhysicalQu
 }
 
 @Serializable
-object Nanodyne : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Nano(Dyne)
+sealed class DyneMultiple : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne>
+
+@Serializable
+object Nanodyne : DyneMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Nano(Dyne)
 @Serializable
-object Microdyne : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Micro(Dyne)
+object Microdyne : DyneMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Micro(Dyne)
 @Serializable
-object Millidyne : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Milli(Dyne)
+object Millidyne : DyneMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Milli(Dyne)
 @Serializable
-object Centidyne : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Centi(Dyne)
+object Centidyne : DyneMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Centi(Dyne)
 @Serializable
-object Decidyne : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Deci(Dyne)
+object Decidyne : DyneMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Deci(Dyne)
 @Serializable
-object Decadyne : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Deca(Dyne)
+object Decadyne : DyneMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Deca(Dyne)
 @Serializable
-object Hectodyne : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Hecto(Dyne)
+object Hectodyne : DyneMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Hecto(Dyne)
 @Serializable
-object Kilodyne : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Kilo(Dyne)
+object Kilodyne : DyneMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Kilo(Dyne)
 @Serializable
-object Megadyne : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Mega(Dyne)
+object Megadyne : DyneMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Mega(Dyne)
 @Serializable
-object Gigadyne : MetricForce(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Giga(Dyne)
+object Gigadyne : DyneMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Force, Dyne> by Giga(Dyne)
 
 @Serializable
 object KilogramForce : MetricForce() {
diff --git a/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt b/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt
index 7fc9d6b21..28a208fa9 100644
--- a/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt
@@ -51,25 +51,28 @@ object Hertz : Frequency(), MetricBaseUnit<MeasurementSystem.MetricAndImperial,
 }
 
 @Serializable
-object Nanohertz : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Nano(Hertz)
+sealed class HertzMultiple : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz>
+
+@Serializable
+object Nanohertz : HertzMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Nano(Hertz)
 @Serializable
-object Microhertz : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Micro(Hertz)
+object Microhertz : HertzMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Micro(Hertz)
 @Serializable
-object Millihertz : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Milli(Hertz)
+object Millihertz : HertzMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Milli(Hertz)
 @Serializable
-object Centihertz : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Centi(Hertz)
+object Centihertz : HertzMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Centi(Hertz)
 @Serializable
-object Decihertz : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Deci(Hertz)
+object Decihertz : HertzMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Deci(Hertz)
 @Serializable
-object Decahertz : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Deca(Hertz)
+object Decahertz : HertzMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Deca(Hertz)
 @Serializable
-object Hectohertz : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Hecto(Hertz)
+object Hectohertz : HertzMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Hecto(Hertz)
 @Serializable
-object Kilohertz : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Kilo(Hertz)
+object Kilohertz : HertzMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Kilo(Hertz)
 @Serializable
-object Megahertz : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Mega(Hertz)
+object Megahertz : HertzMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Mega(Hertz)
 @Serializable
-object Gigahertz : Frequency(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Giga(Hertz)
+object Gigahertz : HertzMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Frequency, Hertz> by Giga(Hertz)
 @Serializable
 object BeatsPerMinute : Frequency() {
     override val symbol: String = "bpm"
diff --git a/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt b/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt
index 0a3ccf3c7..4f24db883 100644
--- a/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt
@@ -70,25 +70,28 @@ object Lux : MetricIlluminance(), MetricBaseUnit<MeasurementSystem.Metric, Physi
 }
 
 @Serializable
-object Nanolux : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Nano(Lux)
+sealed class LuxMultiple : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux>
+
+@Serializable
+object Nanolux : LuxMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Nano(Lux)
 @Serializable
-object Microlux : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Micro(Lux)
+object Microlux : LuxMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Micro(Lux)
 @Serializable
-object Millilux : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Milli(Lux)
+object Millilux : LuxMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Milli(Lux)
 @Serializable
-object Centilux : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Centi(Lux)
+object Centilux : LuxMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Centi(Lux)
 @Serializable
-object Decilux : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Deci(Lux)
+object Decilux : LuxMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Deci(Lux)
 @Serializable
-object Decalux : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Deca(Lux)
+object Decalux : LuxMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Deca(Lux)
 @Serializable
-object Hectolux : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Hecto(Lux)
+object Hectolux : LuxMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Hecto(Lux)
 @Serializable
-object Kilolux : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Kilo(Lux)
+object Kilolux : LuxMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Kilo(Lux)
 @Serializable
-object Megalux : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Mega(Lux)
+object Megalux : LuxMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Mega(Lux)
 @Serializable
-object Gigalux : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Giga(Lux)
+object Gigalux : LuxMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Lux> by Giga(Lux)
 
 @Serializable
 object Phot : MetricIlluminance(), MetricBaseUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance> {
@@ -100,25 +103,28 @@ object Phot : MetricIlluminance(), MetricBaseUnit<MeasurementSystem.Metric, Phys
 }
 
 @Serializable
-object Nanophot : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Nano(Phot)
+sealed class PhotMultiple : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot>
+
+@Serializable
+object Nanophot : PhotMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Nano(Phot)
 @Serializable
-object Microphot : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Micro(Phot)
+object Microphot : PhotMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Micro(Phot)
 @Serializable
-object Milliphot : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Milli(Phot)
+object Milliphot : PhotMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Milli(Phot)
 @Serializable
-object Centiphot : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Centi(Phot)
+object Centiphot : PhotMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Centi(Phot)
 @Serializable
-object Deciphot : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Deci(Phot)
+object Deciphot : PhotMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Deci(Phot)
 @Serializable
-object Decaphot : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Deca(Phot)
+object Decaphot : PhotMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Deca(Phot)
 @Serializable
-object Hectophot : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Hecto(Phot)
+object Hectophot : PhotMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Hecto(Phot)
 @Serializable
-object Kilophot : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Kilo(Phot)
+object Kilophot : PhotMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Kilo(Phot)
 @Serializable
-object Megaphot : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Mega(Phot)
+object Megaphot : PhotMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Mega(Phot)
 @Serializable
-object Gigaphot : MetricIlluminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Giga(Phot)
+object Gigaphot : PhotMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Illuminance, Phot> by Giga(Phot)
 
 @Serializable
 object FootCandle : ImperialIlluminance() {
diff --git a/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt b/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt
index 36ea0c641..b19f58deb 100644
--- a/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt
@@ -62,25 +62,28 @@ object Gray : IonizingRadiationAbsorbedDose(), MetricBaseUnit<MeasurementSystem.
 }
 
 @Serializable
-object Nanogray : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Nano(Gray)
+sealed class GrayMultiple : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray>
+
+@Serializable
+object Nanogray : GrayMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Nano(Gray)
 @Serializable
-object Microgray : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Micro(Gray)
+object Microgray : GrayMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Micro(Gray)
 @Serializable
-object Milligray : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Milli(Gray)
+object Milligray : GrayMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Milli(Gray)
 @Serializable
-object Centigray : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Centi(Gray)
+object Centigray : GrayMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Centi(Gray)
 @Serializable
-object Decigray : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Deci(Gray)
+object Decigray : GrayMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Deci(Gray)
 @Serializable
-object Decagray : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Deca(Gray)
+object Decagray : GrayMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Deca(Gray)
 @Serializable
-object Hectogray : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Hecto(Gray)
+object Hectogray : GrayMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Hecto(Gray)
 @Serializable
-object Kilogray : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Kilo(Gray)
+object Kilogray : GrayMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Kilo(Gray)
 @Serializable
-object Megagray : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Mega(Gray)
+object Megagray : GrayMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Mega(Gray)
 @Serializable
-object Gigagray : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Giga(Gray)
+object Gigagray : GrayMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Gray> by Giga(Gray)
 
 @Serializable
 object Rad : IonizingRadiationAbsorbedDose(), MetricBaseUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose> {
@@ -93,22 +96,25 @@ object Rad : IonizingRadiationAbsorbedDose(), MetricBaseUnit<MeasurementSystem.M
 }
 
 @Serializable
-object Nanorad : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Nano(Rad)
+sealed class RadMultiple : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad>
+
+@Serializable
+object Nanorad : RadMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Nano(Rad)
 @Serializable
-object Microrad : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Micro(Rad)
+object Microrad : RadMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Micro(Rad)
 @Serializable
-object Millirad : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Milli(Rad)
+object Millirad : RadMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Milli(Rad)
 @Serializable
-object Centirad : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Centi(Rad)
+object Centirad : RadMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Centi(Rad)
 @Serializable
-object Decirad : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Deci(Rad)
+object Decirad : RadMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Deci(Rad)
 @Serializable
-object Decarad : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Deca(Rad)
+object Decarad : RadMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Deca(Rad)
 @Serializable
-object Hectorad : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Hecto(Rad)
+object Hectorad : RadMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Hecto(Rad)
 @Serializable
-object Kilorad : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Kilo(Rad)
+object Kilorad : RadMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Kilo(Rad)
 @Serializable
-object Megarad : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Mega(Rad)
+object Megarad : RadMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Mega(Rad)
 @Serializable
-object Gigarad : IonizingRadiationAbsorbedDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Giga(Rad)
+object Gigarad : RadMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationAbsorbedDose, Rad> by Giga(Rad)
diff --git a/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt b/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt
index f2271a7c2..2cbf484d6 100644
--- a/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt
@@ -62,25 +62,28 @@ object Sievert : IonizingRadiationEquivalentDose(), MetricBaseUnit<MeasurementSy
 }
 
 @Serializable
-object Nanosievert : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Nano(Sievert)
+sealed class SievertMultiple : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert>
+
+@Serializable
+object Nanosievert : SievertMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Nano(Sievert)
 @Serializable
-object Microsievert : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Micro(Sievert)
+object Microsievert : SievertMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Micro(Sievert)
 @Serializable
-object Millisievert : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Milli(Sievert)
+object Millisievert : SievertMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Milli(Sievert)
 @Serializable
-object Centisievert : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Centi(Sievert)
+object Centisievert : SievertMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Centi(Sievert)
 @Serializable
-object Decisievert : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Deci(Sievert)
+object Decisievert : SievertMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Deci(Sievert)
 @Serializable
-object Decasievert : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Deca(Sievert)
+object Decasievert : SievertMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Deca(Sievert)
 @Serializable
-object Hectosievert : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Hecto(Sievert)
+object Hectosievert : SievertMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Hecto(Sievert)
 @Serializable
-object Kilosievert : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Kilo(Sievert)
+object Kilosievert : SievertMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Kilo(Sievert)
 @Serializable
-object Megasievert : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Mega(Sievert)
+object Megasievert : SievertMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Mega(Sievert)
 @Serializable
-object Gigasievert : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Giga(Sievert)
+object Gigasievert : SievertMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, Sievert> by Giga(Sievert)
 
 @Serializable
 object RoentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricBaseUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose> {
@@ -93,22 +96,25 @@ object RoentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricBaseUnit
 }
 
 @Serializable
-object NanoroentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Nano(RoentgenEquivalentMan)
+sealed class RoentgenEquivalentManMultiple : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan>
+
+@Serializable
+object NanoroentgenEquivalentMan : RoentgenEquivalentManMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Nano(RoentgenEquivalentMan)
 @Serializable
-object MicroroentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Micro(RoentgenEquivalentMan)
+object MicroroentgenEquivalentMan : RoentgenEquivalentManMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Micro(RoentgenEquivalentMan)
 @Serializable
-object MilliroentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Milli(RoentgenEquivalentMan)
+object MilliroentgenEquivalentMan : RoentgenEquivalentManMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Milli(RoentgenEquivalentMan)
 @Serializable
-object CentiroentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Centi(RoentgenEquivalentMan)
+object CentiroentgenEquivalentMan : RoentgenEquivalentManMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Centi(RoentgenEquivalentMan)
 @Serializable
-object DeciroentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Deci(RoentgenEquivalentMan)
+object DeciroentgenEquivalentMan : RoentgenEquivalentManMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Deci(RoentgenEquivalentMan)
 @Serializable
-object DecaroentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Deca(RoentgenEquivalentMan)
+object DecaroentgenEquivalentMan : RoentgenEquivalentManMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Deca(RoentgenEquivalentMan)
 @Serializable
-object HectoroentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Hecto(RoentgenEquivalentMan)
+object HectoroentgenEquivalentMan : RoentgenEquivalentManMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Hecto(RoentgenEquivalentMan)
 @Serializable
-object KiloroentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Kilo(RoentgenEquivalentMan)
+object KiloroentgenEquivalentMan : RoentgenEquivalentManMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Kilo(RoentgenEquivalentMan)
 @Serializable
-object MegaroentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Mega(RoentgenEquivalentMan)
+object MegaroentgenEquivalentMan : RoentgenEquivalentManMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Mega(RoentgenEquivalentMan)
 @Serializable
-object GigaroentgenEquivalentMan : IonizingRadiationEquivalentDose(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Giga(RoentgenEquivalentMan)
+object GigaroentgenEquivalentMan : RoentgenEquivalentManMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.IonizingRadiationEquivalentDose, RoentgenEquivalentMan> by Giga(RoentgenEquivalentMan)
diff --git a/scientific/src/commonMain/kotlin/unit/LengthUnit.kt b/scientific/src/commonMain/kotlin/unit/LengthUnit.kt
index 82c764c24..7a3ffa7f8 100644
--- a/scientific/src/commonMain/kotlin/unit/LengthUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LengthUnit.kt
@@ -71,34 +71,37 @@ object Meter : MetricLength(), MetricBaseUnit<MeasurementSystem.Metric, Physical
 }
 
 @Serializable
-object Nanometer : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Nano(Meter)
+sealed class MeterMultiple : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter>
 
 @Serializable
-object Micrometer : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Micro(Meter)
+object Nanometer : MeterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Nano(Meter)
 
 @Serializable
-object Millimeter : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Milli(Meter)
+object Micrometer : MeterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Micro(Meter)
 
 @Serializable
-object Centimeter : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Centi(Meter)
+object Millimeter : MeterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Milli(Meter)
 
 @Serializable
-object Decimeter : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Deci(Meter)
+object Centimeter : MeterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Centi(Meter)
 
 @Serializable
-object Decameter : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Deca(Meter)
+object Decimeter : MeterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Deci(Meter)
 
 @Serializable
-object Hectometer : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Hecto(Meter)
+object Decameter : MeterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Deca(Meter)
 
 @Serializable
-object Kilometer : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Kilo(Meter)
+object Hectometer : MeterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Hecto(Meter)
 
 @Serializable
-object Megameter : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Mega(Meter)
+object Kilometer : MeterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Kilo(Meter)
 
 @Serializable
-object Gigameter : MetricLength(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Giga(Meter)
+object Megameter : MeterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Mega(Meter)
+
+@Serializable
+object Gigameter : MeterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Length, Meter> by Giga(Meter)
 
 @Serializable
 object NauticalMile : MetricLength() {
diff --git a/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt
index 3e1b49d9e..ab55bea2b 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt
@@ -68,25 +68,28 @@ object Nit : MetricLuminance(), MetricBaseUnit<MeasurementSystem.Metric, Physica
 }
 
 @Serializable
-object Nanonit : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Nano(Nit)
+sealed class NitMultiple : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit>
+
+@Serializable
+object Nanonit : NitMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Nano(Nit)
 @Serializable
-object Micronit : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Micro(Nit)
+object Micronit : NitMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Micro(Nit)
 @Serializable
-object Millinit : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Milli(Nit)
+object Millinit : NitMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Milli(Nit)
 @Serializable
-object Centinit : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Centi(Nit)
+object Centinit : NitMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Centi(Nit)
 @Serializable
-object Decinit : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Deci(Nit)
+object Decinit : NitMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Deci(Nit)
 @Serializable
-object Decanit : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Deca(Nit)
+object Decanit : NitMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Deca(Nit)
 @Serializable
-object Hectonit : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Hecto(Nit)
+object Hectonit : NitMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Hecto(Nit)
 @Serializable
-object Kilonit : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Kilo(Nit)
+object Kilonit : NitMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Kilo(Nit)
 @Serializable
-object Meganit : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Mega(Nit)
+object Meganit : NitMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Mega(Nit)
 @Serializable
-object Giganit : MetricLuminance(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Giga(Nit)
+object Giganit : NitMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Luminance, Nit> by Giga(Nit)
 
 @Serializable
 object Stilb : MetricLuminance() {
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt
index 27689937f..13d8bd864 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt
@@ -48,22 +48,25 @@ object Lumen : LuminousFlux(), MetricBaseUnit<MeasurementSystem.MetricAndImperia
 }
 
 @Serializable
-object Nanolumen : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Nano(Lumen)
+sealed class LumenMultiple : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen>
+
+@Serializable
+object Nanolumen : LumenMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Nano(Lumen)
 @Serializable
-object Microlumen : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Micro(Lumen)
+object Microlumen : LumenMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Micro(Lumen)
 @Serializable
-object Millilumen : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Milli(Lumen)
+object Millilumen : LumenMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Milli(Lumen)
 @Serializable
-object Centilumen : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Centi(Lumen)
+object Centilumen : LumenMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Centi(Lumen)
 @Serializable
-object Decilumen : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Deci(Lumen)
+object Decilumen : LumenMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Deci(Lumen)
 @Serializable
-object Decalumen : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Deca(Lumen)
+object Decalumen : LumenMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Deca(Lumen)
 @Serializable
-object Hectolumen : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Hecto(Lumen)
+object Hectolumen : LumenMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Hecto(Lumen)
 @Serializable
-object Kilolumen : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Kilo(Lumen)
+object Kilolumen : LumenMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Kilo(Lumen)
 @Serializable
-object Megalumen : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Mega(Lumen)
+object Megalumen : LumenMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Mega(Lumen)
 @Serializable
-object Gigalumen : LuminousFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Giga(Lumen)
+object Gigalumen : LumenMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousFlux, Lumen> by Giga(Lumen)
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt
index 20f305b3d..7540405c3 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt
@@ -48,22 +48,25 @@ object Candela : LuminousIntensity(), MetricBaseUnit<MeasurementSystem.MetricAnd
 }
 
 @Serializable
-object Nanocandela : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Nano(Candela)
+sealed class CandelaMultiple : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela>
+
+@Serializable
+object Nanocandela : CandelaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Nano(Candela)
 @Serializable
-object Microcandela : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Micro(Candela)
+object Microcandela : CandelaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Micro(Candela)
 @Serializable
-object Millicandela : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Milli(Candela)
+object Millicandela : CandelaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Milli(Candela)
 @Serializable
-object Centicandela : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Centi(Candela)
+object Centicandela : CandelaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Centi(Candela)
 @Serializable
-object Decicandela : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Deci(Candela)
+object Decicandela : CandelaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Deci(Candela)
 @Serializable
-object Decacandela : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Deca(Candela)
+object Decacandela : CandelaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Deca(Candela)
 @Serializable
-object Hectocandela : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Hecto(Candela)
+object Hectocandela : CandelaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Hecto(Candela)
 @Serializable
-object Kilocandela : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Kilo(Candela)
+object Kilocandela : CandelaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Kilo(Candela)
 @Serializable
-object Megacandela : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Mega(Candela)
+object Megacandela : CandelaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Mega(Candela)
 @Serializable
-object Gigacandela : LuminousIntensity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Giga(Candela)
+object Gigacandela : CandelaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.LuminousIntensity, Candela> by Giga(Candela)
diff --git a/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt b/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt
index df876ab3c..ae1e58bc1 100644
--- a/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt
@@ -49,25 +49,28 @@ object Weber : MagneticFlux(), MetricBaseUnit<MeasurementSystem.MetricAndImperia
 }
 
 @Serializable
-object Nanoweber : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Nano(Weber)
+sealed class WeberMultiple : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber>
+
+@Serializable
+object Nanoweber : WeberMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Nano(Weber)
 @Serializable
-object Microweber : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Micro(Weber)
+object Microweber : WeberMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Micro(Weber)
 @Serializable
-object Milliweber : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Milli(Weber)
+object Milliweber : WeberMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Milli(Weber)
 @Serializable
-object Centiweber : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Centi(Weber)
+object Centiweber : WeberMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Centi(Weber)
 @Serializable
-object Deciweber : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Deci(Weber)
+object Deciweber : WeberMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Deci(Weber)
 @Serializable
-object Decaweber : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Deca(Weber)
+object Decaweber : WeberMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Deca(Weber)
 @Serializable
-object Hectoweber : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Hecto(Weber)
+object Hectoweber : WeberMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Hecto(Weber)
 @Serializable
-object Kiloweber : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Kilo(Weber)
+object Kiloweber : WeberMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Kilo(Weber)
 @Serializable
-object Megaweber : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Mega(Weber)
+object Megaweber : WeberMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Mega(Weber)
 @Serializable
-object Gigaweber : MagneticFlux(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Giga(Weber)
+object Gigaweber : WeberMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticFlux, Weber> by Giga(Weber)
 @Serializable
 object Maxwell : MagneticFlux() {
     override val symbol = "Mx"
diff --git a/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt b/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt
index 4679990f0..47b0ede7c 100644
--- a/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt
@@ -52,25 +52,28 @@ object Tesla : MagneticInduction(), MetricBaseUnit<MeasurementSystem.MetricAndIm
 }
 
 @Serializable
-object Nanotesla : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Nano(Tesla)
+sealed class TeslaMultiple : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla>
+
+@Serializable
+object Nanotesla : TeslaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Nano(Tesla)
 @Serializable
-object Microtesla : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Micro(Tesla)
+object Microtesla : TeslaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Micro(Tesla)
 @Serializable
-object Millitesla : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Milli(Tesla)
+object Millitesla : TeslaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Milli(Tesla)
 @Serializable
-object Centitesla : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Centi(Tesla)
+object Centitesla : TeslaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Centi(Tesla)
 @Serializable
-object Decitesla : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Deci(Tesla)
+object Decitesla : TeslaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Deci(Tesla)
 @Serializable
-object Decatesla : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Deca(Tesla)
+object Decatesla : TeslaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Deca(Tesla)
 @Serializable
-object Hectotesla : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Hecto(Tesla)
+object Hectotesla : TeslaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Hecto(Tesla)
 @Serializable
-object Kilotesla : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Kilo(Tesla)
+object Kilotesla : TeslaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Kilo(Tesla)
 @Serializable
-object Megatesla : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Mega(Tesla)
+object Megatesla : TeslaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Mega(Tesla)
 @Serializable
-object Gigatesla : MagneticInduction(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Giga(Tesla)
+object Gigatesla : TeslaMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.MagneticInduction, Tesla> by Giga(Tesla)
 @Serializable
 object Gauss : MagneticInduction() {
     private const val GAUSS_IN_TESLA = 10000.0
diff --git a/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt b/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt
index a8de6f5f0..44dce8d19 100644
--- a/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt
+++ b/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt
@@ -54,7 +54,7 @@ interface MetricBaseUnit<System, Quantity : PhysicalQuantity> : SystemScientific
     override val quantity: Quantity
 }
 
-interface MetricMultipleUnit<System, Quantity : PhysicalQuantity, Unit : MetricBaseUnit<System, Quantity>> : SystemScientificUnit<System, Quantity> where System : MeasurementSystem, System : MeasurementUsage.UsedInMetric
+sealed interface MetricMultipleUnit<System, Quantity : PhysicalQuantity, Unit : MetricBaseUnit<System, Quantity>> : SystemScientificUnit<System, Quantity> where System : MeasurementSystem, System : MeasurementUsage.UsedInMetric
 
 class Giga<System, Quantity : PhysicalQuantity, Unit : MetricBaseUnit<System, Quantity>>(private val unit: Unit) : MetricMultipleUnit<System, Quantity, Unit> where System : MeasurementSystem, System : MeasurementUsage.UsedInMetric {
     override val symbol: String = "G${unit.symbol}"
diff --git a/scientific/src/commonMain/kotlin/unit/PowerUnit.kt b/scientific/src/commonMain/kotlin/unit/PowerUnit.kt
index 0da75067e..93e80c2fe 100644
--- a/scientific/src/commonMain/kotlin/unit/PowerUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/PowerUnit.kt
@@ -77,26 +77,30 @@ object Watt : MetricAndImperialPower(), MetricBaseUnit<MeasurementSystem.MetricA
     override fun fromSIUnit(value: Decimal): Decimal = value
     override fun toSIUnit(value: Decimal): Decimal = value
 }
+
+@Serializable
+sealed class WattMultiple : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt>
+
 @Serializable
-object Nanowatt : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Nano(Watt)
+object Nanowatt : WattMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Nano(Watt)
 @Serializable
-object Microwatt : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Micro(Watt)
+object Microwatt : WattMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Micro(Watt)
 @Serializable
-object Milliwatt : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Milli(Watt)
+object Milliwatt : WattMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Milli(Watt)
 @Serializable
-object Centiwatt : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Centi(Watt)
+object Centiwatt : WattMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Centi(Watt)
 @Serializable
-object Deciwatt : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Deci(Watt)
+object Deciwatt : WattMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Deci(Watt)
 @Serializable
-object Decawatt : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Deca(Watt)
+object Decawatt : WattMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Deca(Watt)
 @Serializable
-object Hectowatt : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Hecto(Watt)
+object Hectowatt : WattMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Hecto(Watt)
 @Serializable
-object Kilowatt : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Kilo(Watt)
+object Kilowatt : WattMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Kilo(Watt)
 @Serializable
-object Megawatt : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Mega(Watt)
+object Megawatt : WattMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Mega(Watt)
 @Serializable
-object Gigawatt : MetricAndImperialPower(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Giga(Watt)
+object Gigawatt : WattMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Power, Watt> by Giga(Watt)
 
 @Serializable
 object ErgPerSecond : MetricPower(), MetricBaseUnit<MeasurementSystem.Metric, PhysicalQuantity.Power> {
diff --git a/scientific/src/commonMain/kotlin/unit/PressureUnit.kt b/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
index adfef1a65..2cc12a071 100644
--- a/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
@@ -136,26 +136,30 @@ object Pascal : MetricPressure(), MetricBaseUnit<MeasurementSystem.Metric, Physi
     override fun fromSIUnit(value: Decimal): Decimal = value
     override fun toSIUnit(value: Decimal): Decimal = value
 }
+
+@Serializable
+sealed class PascalMultiple : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal>
+
 @Serializable
-object Nanopascal : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Nano(Pascal)
+object Nanopascal : PascalMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Nano(Pascal)
 @Serializable
-object Micropascal : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Micro(Pascal)
+object Micropascal : PascalMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Micro(Pascal)
 @Serializable
-object Millipascal : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Milli(Pascal)
+object Millipascal : PascalMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Milli(Pascal)
 @Serializable
-object Centipascal : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Centi(Pascal)
+object Centipascal : PascalMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Centi(Pascal)
 @Serializable
-object Decipascal : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Deci(Pascal)
+object Decipascal : PascalMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Deci(Pascal)
 @Serializable
-object Decapascal : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Deca(Pascal)
+object Decapascal : PascalMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Deca(Pascal)
 @Serializable
-object Hectopascal : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Hecto(Pascal)
+object Hectopascal : PascalMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Hecto(Pascal)
 @Serializable
-object Kilopascal : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Kilo(Pascal)
+object Kilopascal : PascalMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Kilo(Pascal)
 @Serializable
-object Megapascal : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Mega(Pascal)
+object Megapascal : PascalMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Mega(Pascal)
 @Serializable
-object Gigapascal : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Giga(Pascal)
+object Gigapascal : PascalMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Pascal> by Giga(Pascal)
 @Serializable
 object Bar : MetricPressure(), MetricBaseUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure> {
     private const val BAR_PER_PASCAL = 0.00001
@@ -167,25 +171,28 @@ object Bar : MetricPressure(), MetricBaseUnit<MeasurementSystem.Metric, Physical
 }
 
 @Serializable
-object Nanobar : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Nano(Bar)
+sealed class BarMultiple : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar>
+
+@Serializable
+object Nanobar : BarMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Nano(Bar)
 @Serializable
-object Microbar : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Micro(Bar)
+object Microbar : BarMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Micro(Bar)
 @Serializable
-object Millibar : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Milli(Bar)
+object Millibar : BarMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Milli(Bar)
 @Serializable
-object Centibar : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Centi(Bar)
+object Centibar : BarMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Centi(Bar)
 @Serializable
-object Decibar : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Deci(Bar)
+object Decibar : BarMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Deci(Bar)
 @Serializable
-object Decabar : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Deca(Bar)
+object Decabar : BarMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Deca(Bar)
 @Serializable
-object Hectobar : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Hecto(Bar)
+object Hectobar : BarMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Hecto(Bar)
 @Serializable
-object Kilobar : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Kilo(Bar)
+object Kilobar : BarMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Kilo(Bar)
 @Serializable
-object Megabar : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Mega(Bar)
+object Megabar : BarMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Mega(Bar)
 @Serializable
-object Gigabar : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Giga(Bar)
+object Gigabar : BarMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Bar> by Giga(Bar)
 
 @Serializable
 object Barye : MetricPressure(), MetricBaseUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure> {
@@ -198,25 +205,28 @@ object Barye : MetricPressure(), MetricBaseUnit<MeasurementSystem.Metric, Physic
 }
 
 @Serializable
-object Nanobarye : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Nano(Barye)
+sealed class BaryeMultiple : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye>
+
+@Serializable
+object Nanobarye : BaryeMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Nano(Barye)
 @Serializable
-object Microbarye : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Micro(Barye)
+object Microbarye : BaryeMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Micro(Barye)
 @Serializable
-object Millibarye : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Milli(Barye)
+object Millibarye : BaryeMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Milli(Barye)
 @Serializable
-object Centibarye : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Centi(Barye)
+object Centibarye : BaryeMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Centi(Barye)
 @Serializable
-object Decibarye : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Deci(Barye)
+object Decibarye : BaryeMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Deci(Barye)
 @Serializable
-object Decabarye : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Deca(Barye)
+object Decabarye : BaryeMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Deca(Barye)
 @Serializable
-object Hectobarye : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Hecto(Barye)
+object Hectobarye : BaryeMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Hecto(Barye)
 @Serializable
-object Kilobarye : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Kilo(Barye)
+object Kilobarye : BaryeMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Kilo(Barye)
 @Serializable
-object Megabarye : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Mega(Barye)
+object Megabarye : BaryeMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Mega(Barye)
 @Serializable
-object Gigabarye : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Giga(Barye)
+object Gigabarye : BaryeMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Barye> by Giga(Barye)
 
 @Serializable
 object Atmosphere : MetricPressure() {
@@ -238,25 +248,28 @@ object Torr : MetricPressure(), MetricBaseUnit<MeasurementSystem.Metric, Physica
 }
 
 @Serializable
-object Nanotorr : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Nano(Torr)
+sealed class TorrMultiple : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr>
+
+@Serializable
+object Nanotorr : TorrMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Nano(Torr)
 @Serializable
-object Microtorr : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Micro(Torr)
+object Microtorr : TorrMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Micro(Torr)
 @Serializable
-object Millitorr : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Milli(Torr)
+object Millitorr : TorrMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Milli(Torr)
 @Serializable
-object Centitorr : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Centi(Torr)
+object Centitorr : TorrMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Centi(Torr)
 @Serializable
-object Decitorr : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Deci(Torr)
+object Decitorr : TorrMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Deci(Torr)
 @Serializable
-object Decatorr : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Deca(Torr)
+object Decatorr : TorrMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Deca(Torr)
 @Serializable
-object Hectotorr : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Hecto(Torr)
+object Hectotorr : TorrMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Hecto(Torr)
 @Serializable
-object Kilotorr : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Kilo(Torr)
+object Kilotorr : TorrMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Kilo(Torr)
 @Serializable
-object Megatorr : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Mega(Torr)
+object Megatorr : TorrMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Mega(Torr)
 @Serializable
-object Gigatorr : MetricPressure(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Giga(Torr)
+object Gigatorr : TorrMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Pressure, Torr> by Giga(Torr)
 
 @Serializable
 object MillimeterOfMercury : MetricPressure() {
diff --git a/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt b/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt
index 697dae359..5b1ab6b4e 100644
--- a/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt
@@ -63,25 +63,28 @@ object Becquerel : Radioactivity(), MetricBaseUnit<MeasurementSystem.MetricAndIm
 }
 
 @Serializable
-object Nanobecquerel : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Nano(Becquerel)
+sealed class BecquerelMultiple : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel>
+
+@Serializable
+object Nanobecquerel : BecquerelMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Nano(Becquerel)
 @Serializable
-object Microbecquerel : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Micro(Becquerel)
+object Microbecquerel : BecquerelMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Micro(Becquerel)
 @Serializable
-object Millibecquerel : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Milli(Becquerel)
+object Millibecquerel : BecquerelMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Milli(Becquerel)
 @Serializable
-object Centibecquerel : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Centi(Becquerel)
+object Centibecquerel : BecquerelMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Centi(Becquerel)
 @Serializable
-object Decibecquerel : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Deci(Becquerel)
+object Decibecquerel : BecquerelMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Deci(Becquerel)
 @Serializable
-object Decabecquerel : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Deca(Becquerel)
+object Decabecquerel : BecquerelMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Deca(Becquerel)
 @Serializable
-object Hectobecquerel : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Hecto(Becquerel)
+object Hectobecquerel : BecquerelMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Hecto(Becquerel)
 @Serializable
-object Kilobecquerel : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Kilo(Becquerel)
+object Kilobecquerel : BecquerelMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Kilo(Becquerel)
 @Serializable
-object Megabecquerel : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Mega(Becquerel)
+object Megabecquerel : BecquerelMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Mega(Becquerel)
 @Serializable
-object Gigabecquerel : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Giga(Becquerel)
+object Gigabecquerel : BecquerelMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Becquerel> by Giga(Becquerel)
 
 @Serializable
 object Rutherford : Radioactivity() {
@@ -104,22 +107,25 @@ object Curie : Radioactivity(), MetricBaseUnit<MeasurementSystem.MetricAndImperi
 }
 
 @Serializable
-object Nanocurie : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Nano(Curie)
+sealed class CurieMultiple : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie>
+
+@Serializable
+object Nanocurie : CurieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Nano(Curie)
 @Serializable
-object Microcurie : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Micro(Curie)
+object Microcurie : CurieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Micro(Curie)
 @Serializable
-object Millicurie : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Milli(Curie)
+object Millicurie : CurieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Milli(Curie)
 @Serializable
-object Centicurie : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Centi(Curie)
+object Centicurie : CurieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Centi(Curie)
 @Serializable
-object Decicurie : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Deci(Curie)
+object Decicurie : CurieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Deci(Curie)
 @Serializable
-object Decacurie : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Deca(Curie)
+object Decacurie : CurieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Deca(Curie)
 @Serializable
-object Hectocurie : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Hecto(Curie)
+object Hectocurie : CurieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Hecto(Curie)
 @Serializable
-object Kilocurie : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Kilo(Curie)
+object Kilocurie : CurieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Kilo(Curie)
 @Serializable
-object Megacurie : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Mega(Curie)
+object Megacurie : CurieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Mega(Curie)
 @Serializable
-object Gigacurie : Radioactivity(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Giga(Curie)
+object Gigacurie : CurieMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Radioactivity, Curie> by Giga(Curie)
diff --git a/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt b/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt
index 80f15ba36..63c1f6353 100644
--- a/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt
@@ -49,15 +49,18 @@ object Steradian : SolidAngle(), MetricBaseUnit<MeasurementSystem.MetricAndImper
 }
 
 @Serializable
-object Nanosteradian : SolidAngle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian> by Nano(Steradian)
+sealed class SteradianMultiple : SolidAngle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian>
+
+@Serializable
+object Nanosteradian : SteradianMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian> by Nano(Steradian)
 @Serializable
-object Microsteradian : SolidAngle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian> by Micro(Steradian)
+object Microsteradian : SteradianMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian> by Micro(Steradian)
 @Serializable
-object Millisteradian : SolidAngle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian> by Milli(Steradian)
+object Millisteradian : SteradianMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian> by Milli(Steradian)
 @Serializable
-object Centisteradian : SolidAngle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian> by Centi(Steradian)
+object Centisteradian : SteradianMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian> by Centi(Steradian)
 @Serializable
-object Decisteradian : SolidAngle(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian> by Deci(Steradian)
+object Decisteradian : SteradianMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle, Steradian> by Deci(Steradian)
 
 @Serializable
 object Spat : SolidAngle(), MetricBaseUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.SolidAngle> {
diff --git a/scientific/src/commonMain/kotlin/unit/TimeUnit.kt b/scientific/src/commonMain/kotlin/unit/TimeUnit.kt
index e4b568bc1..a65d00567 100644
--- a/scientific/src/commonMain/kotlin/unit/TimeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/TimeUnit.kt
@@ -48,19 +48,22 @@ object Second : Time(), MetricBaseUnit<MeasurementSystem.MetricAndImperial, Phys
 }
 
 @Serializable
-object Decisecond : Time(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second> by Deci(Second)
+sealed class SecondMultiple : Time(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second>
 
 @Serializable
-object Centisecond : Time(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second> by Centi(Second)
+object Decisecond : SecondMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second> by Deci(Second)
 
 @Serializable
-object Millisecond : Time(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second> by Milli(Second)
+object Centisecond : SecondMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second> by Centi(Second)
 
 @Serializable
-object Microsecond : Time(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second> by Micro(Second)
+object Millisecond : SecondMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second> by Milli(Second)
 
 @Serializable
-object Nanosecond : Time(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second> by Nano(Second)
+object Microsecond : SecondMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second> by Micro(Second)
+
+@Serializable
+object Nanosecond : SecondMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Time, Second> by Nano(Second)
 
 @Serializable
 object Minute : Time() {
diff --git a/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt b/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt
index 5b0b4e4b1..2f54fe7e9 100644
--- a/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt
@@ -62,21 +62,25 @@ object Abvolt : Voltage() {
     override fun fromSIUnit(value: Decimal): Decimal = value * ABVOLT_IN_VOLT.toDecimal()
     override fun toSIUnit(value: Decimal): Decimal = value / ABVOLT_IN_VOLT.toDecimal()
 }
+
+@Serializable
+sealed class VoltMultiple : Voltage(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt>
+
 @Serializable
-object Microvolt : Voltage(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Micro(Volt)
+object Microvolt : VoltMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Micro(Volt)
 @Serializable
-object Millivolt : Voltage(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Milli(Volt)
+object Millivolt : VoltMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Milli(Volt)
 @Serializable
-object Centivolt : Voltage(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Centi(Volt)
+object Centivolt : VoltMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Centi(Volt)
 @Serializable
-object Decivolt : Voltage(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Deci(Volt)
+object Decivolt : VoltMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Deci(Volt)
 @Serializable
-object Decavolt : Voltage(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Deca(Volt)
+object Decavolt : VoltMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Deca(Volt)
 @Serializable
-object Hectovolt : Voltage(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Hecto(Volt)
+object Hectovolt : VoltMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Hecto(Volt)
 @Serializable
-object Kilovolt : Voltage(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Kilo(Volt)
+object Kilovolt : VoltMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Kilo(Volt)
 @Serializable
-object Megavolt : Voltage(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Mega(Volt)
+object Megavolt : VoltMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Mega(Volt)
 @Serializable
-object Gigavolt : Voltage(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Giga(Volt)
+object Gigavolt : VoltMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Voltage, Volt> by Giga(Volt)
diff --git a/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
index a1380d6b2..cae648c9f 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
@@ -160,34 +160,37 @@ object Liter : MetricVolume(), MetricBaseUnit<MeasurementSystem.Metric, Physical
 }
 
 @Serializable
-object Deciliter : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Deci(Liter)
+sealed class LiterMultiple : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter>
 
 @Serializable
-object Centiliter : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Centi(Liter)
+object Deciliter : LiterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Deci(Liter)
 
 @Serializable
-object Milliliter : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Milli(Liter)
+object Centiliter : LiterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Centi(Liter)
 
 @Serializable
-object Microliter : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Micro(Liter)
+object Milliliter : LiterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Milli(Liter)
 
 @Serializable
-object Nanoliter : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Nano(Liter)
+object Microliter : LiterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Micro(Liter)
 
 @Serializable
-object Decaliter : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Deca(Liter)
+object Nanoliter : LiterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Nano(Liter)
 
 @Serializable
-object Hectoliter : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Hecto(Liter)
+object Decaliter : LiterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Deca(Liter)
 
 @Serializable
-object Kiloliter : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Kilo(Liter)
+object Hectoliter : LiterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Hecto(Liter)
 
 @Serializable
-object Megaliter : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Mega(Liter)
+object Kiloliter : LiterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Kilo(Liter)
 
 @Serializable
-object Gigaliter : MetricVolume(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Giga(Liter)
+object Megaliter : LiterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Mega(Liter)
+
+@Serializable
+object Gigaliter : LiterMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Volume, Liter> by Giga(Liter)
 
 // Imperial
 @Serializable
diff --git a/scientific/src/commonMain/kotlin/unit/WeightUnit.kt b/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
index 1330c5a9b..7f6be531f 100644
--- a/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
@@ -103,28 +103,31 @@ object Gram : MetricWeight(), MetricBaseUnit<MeasurementSystem.Metric, PhysicalQ
 }
 
 @Serializable
-object Nanogram : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Nano(Gram)
+sealed class GramMultiple : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram>
+
+@Serializable
+object Nanogram : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Nano(Gram)
 @Serializable
-object Microgram : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Micro(Gram)
+object Microgram : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Micro(Gram)
 @Serializable
-object Milligram : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Milli(Gram)
+object Milligram : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Milli(Gram)
 @Serializable
-object Centigram : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Centi(Gram)
+object Centigram : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Centi(Gram)
 @Serializable
-object Decigram : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Deci(Gram)
+object Decigram : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Deci(Gram)
 @Serializable
-object Decagram : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Deca(Gram)
+object Decagram : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Deca(Gram)
 @Serializable
-object Hectogram : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Hecto(Gram)
+object Hectogram : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Hecto(Gram)
 @Serializable
-object Kilogram : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Kilo(Gram)
+object Kilogram : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Kilo(Gram)
 @Serializable
-object Megagram : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Mega(Gram)
+object Megagram : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Mega(Gram)
 @Serializable
-object Gigagram : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Giga(Gram)
+object Gigagram : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Giga(Gram)
 
 @Serializable
-object Tonne : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Mega(Gram) {
+object Tonne : GramMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Gram> by Mega(Gram) {
     override val symbol: String = "t"
 }
 
@@ -138,25 +141,28 @@ object Dalton : MetricWeight(), MetricBaseUnit<MeasurementSystem.Metric, Physica
 }
 
 @Serializable
-object Nanodalton : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Nano(Dalton)
+sealed class DaltonMultiple : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton>
+
+@Serializable
+object Nanodalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Nano(Dalton)
 @Serializable
-object Microdalton : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Micro(Dalton)
+object Microdalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Micro(Dalton)
 @Serializable
-object Millidalton : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Milli(Dalton)
+object Millidalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Milli(Dalton)
 @Serializable
-object Centidalton : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Centi(Dalton)
+object Centidalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Centi(Dalton)
 @Serializable
-object Decidalton : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Deci(Dalton)
+object Decidalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Deci(Dalton)
 @Serializable
-object Decadalton : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Deca(Dalton)
+object Decadalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Deca(Dalton)
 @Serializable
-object HectoDalton : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Hecto(Dalton)
+object HectoDalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Hecto(Dalton)
 @Serializable
-object Kilodalton : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Kilo(Dalton)
+object Kilodalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Kilo(Dalton)
 @Serializable
-object Megadalton : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Mega(Dalton)
+object Megadalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Mega(Dalton)
 @Serializable
-object Gigadalton : MetricWeight(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Giga(Dalton)
+object Gigadalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metric, PhysicalQuantity.Weight, Dalton> by Giga(Dalton)
 
 // Imperial Weight
 @Serializable

From 7b90b5556a7993f6936d2d9f9a8ee52c5d3d5fc8 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 13 Jan 2023 14:55:17 +0100
Subject: [PATCH 075/227] Remaining converters

---
 .../{ButtonsActivity.kt => ButtonActivity.kt} |   0
 .../example/scientific/ScientificActivity.kt  |   2 -
 .../ScientificUnitSelectionDialogFragment.kt  |  10 +-
 .../model/scientific/QuantityDetails.kt       |  78 +++---
 .../scientific/converters/ActionConverters.kt |   8 +-
 .../converters/AmountOfSubstanceConverters.kt |   2 +-
 .../scientific/converters/AngleConverters.kt  |   2 +-
 .../converters/AngularVelocityConverters.kt   |   2 -
 .../scientific/converters/AreaConverters.kt   |   2 +-
 .../converters/AreaDensityConverter.kt        |   2 +-
 .../CatalysticActivityConverters.kt           |   8 +-
 .../converters/DensityConverters.kt           |  10 +-
 .../converters/DynamicViscosityConverters.kt  |   2 +-
 .../converters/ElectricCapacitanceUnits.kt    |   2 +-
 .../converters/ElectricChargeConverters.kt    |   2 +-
 .../ElectricConductanceConverters.kt          |   2 +-
 .../scientific/converters/EnergyConverters.kt |   4 +-
 .../scientific/converters/ForceConverters.kt  |   2 +-
 .../converters/HeatCapacityConverters.kt      |   2 +-
 .../converters/IlluminanceConverters.kt       |  64 +++++
 .../IonizingRadiationAbsobedDoseConverters.kt |  44 ++++
 ...nizingRadiationEquivalentDoseConverters.kt |  44 ++++
 .../scientific/converters/JoltConverters.kt   |  52 ++++
 .../scientific/converters/LengthConverters.kt | 165 ++++++++++++
 .../converters/LinearMassDensityConverters.kt |  99 ++++++++
 .../converters/LuminanceConverters.kt         |  48 ++++
 .../converters/LuminousEnergyConverters.kt    |  62 +++++
 .../converters/LuminousExposureConverters.kt  |  60 +++++
 .../converters/LuminousFluxConverters.kt      |  74 ++++++
 .../converters/LuminousIntensityConverters.kt |  62 +++++
 .../converters/MagneticFluxConverters.kt      | 107 ++++++++
 .../converters/MagneticInductionConverters.kt |  36 +++
 .../converters/MassFlowRateConverters.kt      |  41 +++
 .../converters/MolalityConverters.kt          |  95 +++++++
 .../converters/MolarEnergyConverters.kt       |  74 ++++++
 .../converters/MolarMassConverters.kt         |  95 +++++++
 .../converters/MolarVolumeConverters.kt       |  85 +++++++
 .../converters/MolarityConverters.kt          |  81 ++++++
 .../converters/MomentumConverters.kt          |  84 +++++++
 .../scientific/converters/PowerConverters.kt  | 113 +++++++++
 .../converters/PressureConverters.kt          |  76 ++++++
 .../converters/QuantityConverter.kt           |   2 +-
 .../converters/RadioactivityConverters.kt     |  22 ++
 .../converters/SolidAngleConverters.kt        |  42 ++++
 .../converters/SpecificEnergyConverters.kt    |  93 +++++++
 .../SpecificHeatCapacityConverters.kt         |  57 +++++
 .../converters/SpecificVolumeConverters.kt    | 109 ++++++++
 .../scientific/converters/SpeedConverters.kt  |  85 +++++++
 .../converters/SurfaceTensionConverters.kt    |  50 ++++
 .../converters/TemperatureConverters.kt       |  66 +++++
 .../converters/TheralResistanceConverters.kt  |  47 ++++
 .../scientific/converters/TimeConverters.kt   | 214 ++++++++++++++++
 .../converters/VoltageConverters.kt           |  91 +++++++
 .../scientific/converters/VolumeConverters.kt | 177 +++++++++++++
 .../converters/VolumetricFlowConverters.kt    |  61 +++++
 .../converters/VolumetricFluxConverters.kt    |  43 ++++
 .../scientific/converters/WeightConverters.kt | 238 ++++++++++++++++++
 .../scientific/converters/YankConverters.kt   |  74 ++++++
 .../ScientificConverterViewModel.kt           |   4 +-
 .../ScientificUnitSelectionViewModel.kt       |   4 +-
 .../scientific/ScientificViewModel.kt         |   6 +-
 .../ScientificConverterNavigator.kt           |   4 +-
 .../scientific/ScientificNavigator.kt         |   4 +-
 .../molality/convertToSpecificVolume.kt       |   2 +-
 ...ToMolarEnergy.kt => convertToMolarMass.kt} |  20 --
 .../solidAngle/convertToIlluminance.kt        |   2 +-
 .../kotlin/converter/weight/convertToForce.kt |  12 +-
 .../kotlin/converter/weight/convertToTime.kt  |  38 ---
 68 files changed, 3214 insertions(+), 156 deletions(-)
 rename example/android/src/main/java/com/splendo/kaluga/example/resources/xml/{ButtonsActivity.kt => ButtonActivity.kt} (100%)
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IlluminanceConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/JoltConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LengthConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LinearMassDensityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminanceConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousEnergyConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousExposureConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousFluxConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousIntensityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticFluxConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticInductionConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MassFlowRateConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarEnergyConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MomentumConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PowerConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PressureConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/RadioactivityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SolidAngleConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificHeatCapacityConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpeedConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SurfaceTensionConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TemperatureConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TheralResistanceConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VoltageConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumeConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFlowConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFluxConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/WeightConverters.kt
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/YankConverters.kt
 rename scientific/src/commonMain/kotlin/converter/molarEnergy/{convertToMolarEnergy.kt => convertToMolarMass.kt} (69%)

diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonActivity.kt
similarity index 100%
rename from example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonsActivity.kt
rename to example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ButtonActivity.kt
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
index 5c44b2f1d..d649d778f 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
@@ -19,7 +19,6 @@ package com.splendo.kaluga.example.scientific
 
 import android.os.Bundle
 import androidx.databinding.BindingAdapter
-import androidx.fragment.app.FragmentResultListener
 import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
@@ -27,7 +26,6 @@ import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityScientificBinding
-import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificViewModel
 import com.splendo.kaluga.example.view.ButtonAdapter
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt
index 580864049..83e57a5df 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt
@@ -18,21 +18,16 @@
 package com.splendo.kaluga.example.scientific
 
 import android.app.ActionBar.LayoutParams
-import android.app.Dialog
 import android.content.DialogInterface
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.Window
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelDialogFragment
-import com.splendo.kaluga.example.architecture.xml.BottomSheetRootDialogFragment
 import com.splendo.kaluga.example.databinding.DialogScientificUnitSelectionBinding
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificUnitSelectionAction
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificUnitSelectionViewModel
@@ -40,7 +35,6 @@ import com.splendo.kaluga.example.view.ButtonAdapter
 import com.splendo.kaluga.example.view.VerticalSpaceItemDecoration
 import com.splendo.kaluga.resources.dpToPixel
 import com.splendo.kaluga.scientific.PhysicalQuantity
-import com.splendo.kaluga.scientific.unit.ScientificUnit
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
@@ -55,7 +49,7 @@ abstract class ScientificUnitSelectionDialogFragment : KalugaViewModelDialogFrag
     override val viewModel: ScientificUnitSelectionViewModel by viewModel {
         parametersOf(
             requireArguments().toTypedProperty(NavigationBundleSpecType.SerializedType(PhysicalQuantity.serializer())),
-            ActivityNavigator<ScientificUnitSelectionAction<*>> {action ->
+            ActivityNavigator<ScientificUnitSelectionAction<*>> { action ->
                 when (action) {
                     is ScientificUnitSelectionAction.Cancelled -> NavigationSpec.DismissDialog(TAG)
                     is ScientificUnitSelectionAction.DidSelect -> {
@@ -88,4 +82,4 @@ abstract class ScientificUnitSelectionDialogFragment : KalugaViewModelDialogFrag
     override fun onCancel(dialog: DialogInterface) {
         viewModel.onCancel()
     }
-}
\ No newline at end of file
+}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
index 0196e6136..6445d9f82 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
@@ -26,7 +26,7 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.convert
 import com.splendo.kaluga.scientific.unit.*
 
-data class QuantityDetails<Quantity: PhysicalQuantity>(
+data class QuantityDetails<Quantity : PhysicalQuantity>(
     val quantity: Quantity,
     val units: Set<ScientificUnit<Quantity>>,
     val converters: List<QuantityConverter<Quantity, *, *>>
@@ -125,44 +125,44 @@ internal val PhysicalQuantity.quantityDetails: QuantityDetails<*>? get() = when
     is PhysicalQuantity.Force -> QuantityDetails(this, ForceUnits, converters)
     is PhysicalQuantity.Frequency -> QuantityDetails(this, FrequencyUnits, converters)
     is PhysicalQuantity.HeatCapacity -> QuantityDetails(this, HeatCapacityUnits, converters)
-    is PhysicalQuantity.Illuminance -> QuantityDetails(this, IlluminanceUnits, emptyList())
-    is PhysicalQuantity.IonizingRadiationAbsorbedDose -> QuantityDetails(this, IonizingRadiationAbsorbedDoseUnits, emptyList())
-    is PhysicalQuantity.IonizingRadiationEquivalentDose -> QuantityDetails(this, IonizingRadiationEquivalentDoseUnits, emptyList())
-    is PhysicalQuantity.Jolt -> QuantityDetails(this, JoltUnits, emptyList())
-    is PhysicalQuantity.Length -> QuantityDetails(this, LengthUnits, emptyList())
-    is PhysicalQuantity.LinearMassDensity -> QuantityDetails(this, LinearMassDensityUnits, emptyList())
-    is PhysicalQuantity.Luminance -> QuantityDetails(this, LuminanceUnits, emptyList())
-    is PhysicalQuantity.LuminousEnergy -> QuantityDetails(this, LuminousEnergyUnits, emptyList())
-    is PhysicalQuantity.LuminousExposure -> QuantityDetails(this, LuminousExposureUnits, emptyList())
-    is PhysicalQuantity.LuminousFlux -> QuantityDetails(this, LuminousFluxUnits, emptyList())
-    is PhysicalQuantity.LuminousIntensity -> QuantityDetails(this, LuminousIntensityUnits, emptyList())
-    is PhysicalQuantity.MagneticFlux -> QuantityDetails(this, MagneticFluxUnits, emptyList())
-    is PhysicalQuantity.MagneticInduction -> QuantityDetails(this, MagneticInductionUnits, emptyList())
-    is PhysicalQuantity.MassFlowRate -> QuantityDetails(this, MassFlowRateUnits, emptyList())
-    is PhysicalQuantity.Molality -> QuantityDetails(this, MolalityUnits, emptyList())
-    is PhysicalQuantity.MolarEnergy -> QuantityDetails(this, MolarEnergyUnits, emptyList())
-    is PhysicalQuantity.Molarity -> QuantityDetails(this, MolarityUnits, emptyList())
-    is PhysicalQuantity.MolarMass -> QuantityDetails(this, MolarMassUnits, emptyList())
-    is PhysicalQuantity.MolarVolume -> QuantityDetails(this, MolarVolumeUnits, emptyList())
-    is PhysicalQuantity.Momentum -> QuantityDetails(this, MomentumUnits, emptyList())
-    is PhysicalQuantity.Power -> QuantityDetails(this, PowerUnits, emptyList())
-    is PhysicalQuantity.Pressure -> QuantityDetails(this, PressureUnits, emptyList())
-    is PhysicalQuantity.Radioactivity -> QuantityDetails(this, RadioactivityUnits, emptyList())
-    is PhysicalQuantity.SolidAngle -> QuantityDetails(this, SolidAngleUnits, emptyList())
-    is PhysicalQuantity.SpecificEnergy -> QuantityDetails(this, SpecificEnergyUnits, emptyList())
-    is PhysicalQuantity.SpecificHeatCapacity -> QuantityDetails(this, SpecificHeatCapacityUnits, emptyList())
-    is PhysicalQuantity.SpecificVolume -> QuantityDetails(this, SpecificVolumeUnits, emptyList())
-    is PhysicalQuantity.Speed -> QuantityDetails(this, SpeedUnits, emptyList())
-    is PhysicalQuantity.SurfaceTension -> QuantityDetails(this, SurfaceTensionUnits, emptyList())
-    is PhysicalQuantity.Temperature -> QuantityDetails(this, TemperatureUnits, emptyList())
-    is PhysicalQuantity.ThermalResistance -> QuantityDetails(this, ThermalResistanceUnits, emptyList())
-    is PhysicalQuantity.Time -> QuantityDetails(this, TimeUnits, emptyList())
-    is PhysicalQuantity.Voltage -> QuantityDetails(this, VoltageUnits, emptyList())
-    is PhysicalQuantity.Volume -> QuantityDetails(this, VolumeUnits, emptyList())
-    is PhysicalQuantity.VolumetricFlow -> QuantityDetails(this, VolumetricFlowUnits, emptyList())
-    is PhysicalQuantity.VolumetricFlux -> QuantityDetails(this, VolumetricFluxUnits, emptyList())
-    is PhysicalQuantity.Weight -> QuantityDetails(this, WeightUnits, emptyList())
-    is PhysicalQuantity.Yank -> QuantityDetails(this, YankUnits, emptyList())
+    is PhysicalQuantity.Illuminance -> QuantityDetails(this, IlluminanceUnits, converters)
+    is PhysicalQuantity.IonizingRadiationAbsorbedDose -> QuantityDetails(this, IonizingRadiationAbsorbedDoseUnits, converters)
+    is PhysicalQuantity.IonizingRadiationEquivalentDose -> QuantityDetails(this, IonizingRadiationEquivalentDoseUnits, converters)
+    is PhysicalQuantity.Jolt -> QuantityDetails(this, JoltUnits, converters)
+    is PhysicalQuantity.Length -> QuantityDetails(this, LengthUnits, converters)
+    is PhysicalQuantity.LinearMassDensity -> QuantityDetails(this, LinearMassDensityUnits, converters)
+    is PhysicalQuantity.Luminance -> QuantityDetails(this, LuminanceUnits, converters)
+    is PhysicalQuantity.LuminousEnergy -> QuantityDetails(this, LuminousEnergyUnits, converters)
+    is PhysicalQuantity.LuminousExposure -> QuantityDetails(this, LuminousExposureUnits, converters)
+    is PhysicalQuantity.LuminousFlux -> QuantityDetails(this, LuminousFluxUnits, converters)
+    is PhysicalQuantity.LuminousIntensity -> QuantityDetails(this, LuminousIntensityUnits, converters)
+    is PhysicalQuantity.MagneticFlux -> QuantityDetails(this, MagneticFluxUnits, converters)
+    is PhysicalQuantity.MagneticInduction -> QuantityDetails(this, MagneticInductionUnits, converters)
+    is PhysicalQuantity.MassFlowRate -> QuantityDetails(this, MassFlowRateUnits, converters)
+    is PhysicalQuantity.Molality -> QuantityDetails(this, MolalityUnits, converters)
+    is PhysicalQuantity.MolarEnergy -> QuantityDetails(this, MolarEnergyUnits, converters)
+    is PhysicalQuantity.Molarity -> QuantityDetails(this, MolarityUnits, converters)
+    is PhysicalQuantity.MolarMass -> QuantityDetails(this, MolarMassUnits, converters)
+    is PhysicalQuantity.MolarVolume -> QuantityDetails(this, MolarVolumeUnits, converters)
+    is PhysicalQuantity.Momentum -> QuantityDetails(this, MomentumUnits, converters)
+    is PhysicalQuantity.Power -> QuantityDetails(this, PowerUnits, converters)
+    is PhysicalQuantity.Pressure -> QuantityDetails(this, PressureUnits, converters)
+    is PhysicalQuantity.Radioactivity -> QuantityDetails(this, RadioactivityUnits, converters)
+    is PhysicalQuantity.SolidAngle -> QuantityDetails(this, SolidAngleUnits, converters)
+    is PhysicalQuantity.SpecificEnergy -> QuantityDetails(this, SpecificEnergyUnits, converters)
+    is PhysicalQuantity.SpecificHeatCapacity -> QuantityDetails(this, SpecificHeatCapacityUnits, converters)
+    is PhysicalQuantity.SpecificVolume -> QuantityDetails(this, SpecificVolumeUnits, converters)
+    is PhysicalQuantity.Speed -> QuantityDetails(this, SpeedUnits, converters)
+    is PhysicalQuantity.SurfaceTension -> QuantityDetails(this, SurfaceTensionUnits, converters)
+    is PhysicalQuantity.Temperature -> QuantityDetails(this, TemperatureUnits, converters)
+    is PhysicalQuantity.ThermalResistance -> QuantityDetails(this, ThermalResistanceUnits, converters)
+    is PhysicalQuantity.Time -> QuantityDetails(this, TimeUnits, converters)
+    is PhysicalQuantity.Voltage -> QuantityDetails(this, VoltageUnits, converters)
+    is PhysicalQuantity.Volume -> QuantityDetails(this, VolumeUnits, converters)
+    is PhysicalQuantity.VolumetricFlow -> QuantityDetails(this, VolumetricFlowUnits, converters)
+    is PhysicalQuantity.VolumetricFlux -> QuantityDetails(this, VolumetricFluxUnits, converters)
+    is PhysicalQuantity.Weight -> QuantityDetails(this, WeightUnits, converters)
+    is PhysicalQuantity.Yank -> QuantityDetails(this, YankUnits, converters)
 }
 
 val PhysicalQuantity.name: String get() = this::class.simpleName.orEmpty().split("(?=\\p{Upper})".toRegex()).joinToString(" ")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
index 3fb44c33e..38e15e217 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
@@ -1,18 +1,18 @@
 /*
  Copyright 2023 Splendo Consulting B.V. The Netherlands
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.example.shared.model.scientific.converters
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
index a5b599baa..74dab8be4 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
@@ -86,4 +86,4 @@ val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $molalityUnit")
         }
     }
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
index 5d48ee383..5a2e87e99 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
@@ -37,4 +37,4 @@ val PhysicalQuantity.Angle.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $angleUnit $angularVelocityUnit")
         }
     }
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
index f90594a35..1c624e6a2 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
@@ -22,10 +22,8 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.angularVelocity.div
 import com.splendo.kaluga.scientific.converter.angularVelocity.times
 import com.splendo.kaluga.scientific.unit.AngularAcceleration
-import com.splendo.kaluga.scientific.unit.AngularAccelerationUnits
 import com.splendo.kaluga.scientific.unit.AngularVelocity
 import com.splendo.kaluga.scientific.unit.Time
-import com.splendo.kaluga.scientific.unit.TimeUnits
 
 val PhysicalQuantity.AngularVelocity.converters get() = listOf<QuantityConverter<PhysicalQuantity.AngularVelocity, *, *>>(
     QuantityConverter("Angle from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
index 6ec1b70c2..488aad0b9 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
@@ -192,4 +192,4 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     }
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
index 80010a053..c9068ddd0 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
@@ -82,4 +82,4 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
index b27031ba2..4049f16f7 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
@@ -1,18 +1,18 @@
 /*
  Copyright 2023 Splendo Consulting B.V. The Netherlands
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.example.shared.model.scientific.converters
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
index 53b08ebf1..785c445fd 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
@@ -1,18 +1,18 @@
 /*
  Copyright 2023 Splendo Consulting B.V. The Netherlands
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
       http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  
+
  */
 
 package com.splendo.kaluga.example.shared.model.scientific.converters
@@ -98,4 +98,4 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
index c2fec31ae..30a2609a6 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
@@ -59,4 +59,4 @@ val PhysicalQuantity.DynamicViscosity.converters get() = listOf<QuantityConverte
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     }
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
index 47260c176..fd593886e 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
@@ -48,4 +48,4 @@ val PhysicalQuantity.ElectricCapacitance.converters get() = listOf<QuantityConve
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     }
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
index d781c94a3..38666122e 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
@@ -74,4 +74,4 @@ val PhysicalQuantity.ElectricCharge.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     }
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
index 780b6bb28..f2d8d1726 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
@@ -49,4 +49,4 @@ val PhysicalQuantity.ElectricConductance.converters get() = listOf<QuantityConve
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     }
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
index 68aa23d3b..126fff503 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
@@ -302,7 +302,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-        QuantityConverter("Weight from Specific Energy", QuantityConverter.Type.Division, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverter("Weight from Specific Energy", QuantityConverter.Type.Division, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -316,4 +316,4 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     }
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
index 252343117..040142410 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
@@ -194,4 +194,4 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt
index 69dbdec8a..57ec5feab 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt
@@ -75,4 +75,4 @@ val PhysicalQuantity.HeatCapacity.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-)
\ No newline at end of file
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IlluminanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IlluminanceConverters.kt
new file mode 100644
index 000000000..0ab7b9cb9
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IlluminanceConverters.kt
@@ -0,0 +1,64 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.illuminance.div
+import com.splendo.kaluga.scientific.converter.illuminance.times
+import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.Illuminance
+import com.splendo.kaluga.scientific.unit.ImperialIlluminance
+import com.splendo.kaluga.scientific.unit.Luminance
+import com.splendo.kaluga.scientific.unit.MetricIlluminance
+import com.splendo.kaluga.scientific.unit.Phot
+import com.splendo.kaluga.scientific.unit.PhotMultiple
+import com.splendo.kaluga.scientific.unit.SolidAngle
+import com.splendo.kaluga.scientific.unit.Time
+
+val PhysicalQuantity.Illuminance.converters get() = listOf<QuantityConverter<PhysicalQuantity.Illuminance, *, *>>(
+    QuantityConverter("Luminance from Solid Angle", QuantityConverter.Type.Division, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Phot && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is PhotMultiple && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialIlluminance && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Illuminance && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Exposure from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricIlluminance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialIlluminance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Illuminance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Flux from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Illuminance && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Solid Angle from Luminance", QuantityConverter.Type.Division, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Illuminance && rightUnit is Luminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt
new file mode 100644
index 000000000..c9dcbffed
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt
@@ -0,0 +1,44 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.ionizingRadiationAbsorbedDose.times
+import com.splendo.kaluga.scientific.unit.Gram
+import com.splendo.kaluga.scientific.unit.ImperialWeight
+import com.splendo.kaluga.scientific.unit.IonizingRadiationAbsorbedDose
+import com.splendo.kaluga.scientific.unit.Rad
+import com.splendo.kaluga.scientific.unit.RadMultiple
+import com.splendo.kaluga.scientific.unit.UKImperialWeight
+import com.splendo.kaluga.scientific.unit.USCustomaryWeight
+import com.splendo.kaluga.scientific.unit.Weight
+
+val PhysicalQuantity.IonizingRadiationAbsorbedDose.converters get() = listOf<QuantityConverter<PhysicalQuantity.IonizingRadiationAbsorbedDose, *, *>>(
+    QuantityConverter("Energy from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Rad && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is RadMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is IonizingRadiationAbsorbedDose && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is IonizingRadiationAbsorbedDose && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is IonizingRadiationAbsorbedDose && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is IonizingRadiationAbsorbedDose && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt
new file mode 100644
index 000000000..293b26379
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt
@@ -0,0 +1,44 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.ionizingRadiationEquivalentDose.times
+import com.splendo.kaluga.scientific.unit.Gram
+import com.splendo.kaluga.scientific.unit.ImperialWeight
+import com.splendo.kaluga.scientific.unit.IonizingRadiationEquivalentDose
+import com.splendo.kaluga.scientific.unit.RoentgenEquivalentMan
+import com.splendo.kaluga.scientific.unit.RoentgenEquivalentManMultiple
+import com.splendo.kaluga.scientific.unit.UKImperialWeight
+import com.splendo.kaluga.scientific.unit.USCustomaryWeight
+import com.splendo.kaluga.scientific.unit.Weight
+
+val PhysicalQuantity.IonizingRadiationEquivalentDose.converters get() = listOf<QuantityConverter<PhysicalQuantity.IonizingRadiationEquivalentDose, *, *>>(
+    QuantityConverter("Energy from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is RoentgenEquivalentMan && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is RoentgenEquivalentManMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is IonizingRadiationEquivalentDose && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is IonizingRadiationEquivalentDose && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is IonizingRadiationEquivalentDose && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is IonizingRadiationEquivalentDose && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/JoltConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/JoltConverters.kt
new file mode 100644
index 000000000..de40d0be5
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/JoltConverters.kt
@@ -0,0 +1,52 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.jolt.times
+import com.splendo.kaluga.scientific.unit.ImperialJolt
+import com.splendo.kaluga.scientific.unit.ImperialWeight
+import com.splendo.kaluga.scientific.unit.Jolt
+import com.splendo.kaluga.scientific.unit.MetricJolt
+import com.splendo.kaluga.scientific.unit.MetricWeight
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.UKImperialWeight
+import com.splendo.kaluga.scientific.unit.USCustomaryWeight
+import com.splendo.kaluga.scientific.unit.Weight
+
+val PhysicalQuantity.Jolt.converters get() = listOf<QuantityConverter<PhysicalQuantity.Jolt, *, *>>(
+    QuantityConverter("Acceleration from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricJolt && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialJolt && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Jolt && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Yank from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricJolt && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialJolt && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialJolt && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialJolt && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Jolt && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LengthConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LengthConverters.kt
new file mode 100644
index 000000000..d9bb487c5
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LengthConverters.kt
@@ -0,0 +1,165 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.length.div
+import com.splendo.kaluga.scientific.converter.length.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<PhysicalQuantity.Length, *, *>>(
+    QuantityConverter("Area from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Meter && rightUnit is Meter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanometer && rightUnit is Nanometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Micrometer && rightUnit is Micrometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millimeter && rightUnit is Millimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centimeter && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decimeter && rightUnit is Decimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decameter && rightUnit is Decameter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectometer && rightUnit is Hectometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilometer && rightUnit is Kilometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megameter && rightUnit is Megameter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigameter && rightUnit is Gigameter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricLength && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Inch && rightUnit is Inch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Foot && rightUnit is Foot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Yard && rightUnit is Yard -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Mile && rightUnit is Mile -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Length && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Area Density from Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLength && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Length && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Area Density from Specific Volume", QuantityConverter.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLength && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Length && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Force", QuantityConverter.Type.Multiplication, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Centimeter && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centimeter && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricLength && rightUnit is MetricForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is Poundal -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Inch && rightUnit is PoundForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Inch && rightUnit is OunceForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is PoundForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is UKImperialForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is USCustomaryForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Length && rightUnit is Force -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Force from Surface Tension", QuantityConverter.Type.Multiplication, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLength && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is UKImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is USCustomarySurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Length && rightUnit is SurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Linear Mass Density from Area Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLength && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is UKImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is USCustomaryAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Length && rightUnit is AreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Volume from Area Density", QuantityConverter.Type.Division, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLength && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is UKImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is USCustomaryAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Length && rightUnit is AreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Speed from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLength && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Length && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Speed", QuantityConverter.Type.Division, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Length && rightUnit is Speed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Volume from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Meter && rightUnit is SquareMeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanometer && rightUnit is SquareNanometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Micrometer && rightUnit is SquareMicrometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Millimeter && rightUnit is SquareMillimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centimeter && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decimeter && rightUnit is SquareDecimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decameter && rightUnit is SquareDecameter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectometer && rightUnit is SquareHectometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilometer && rightUnit is SquareKilometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megameter && rightUnit is SquareMegameter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigameter && rightUnit is SquareGigameter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricLength && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Inch && rightUnit is SquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Foot && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Yard && rightUnit is SquareYard -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Mile && rightUnit is SquareMile -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Inch && rightUnit is Acre -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Foot && rightUnit is Acre -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Length && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Linear Mass Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLength && rightUnit is MetricLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is UKImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLength && rightUnit is USCustomaryLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Length && rightUnit is LinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LinearMassDensityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LinearMassDensityConverters.kt
new file mode 100644
index 000000000..39ffe761f
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LinearMassDensityConverters.kt
@@ -0,0 +1,99 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.linearMassDensity.div
+import com.splendo.kaluga.scientific.converter.linearMassDensity.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.LinearMassDensity.converters get() = listOf<QuantityConverter<PhysicalQuantity.LinearMassDensity, *, *>>(
+    QuantityConverter("Area from Density", QuantityConverter.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLinearMassDensity && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialLinearMassDensity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialLinearMassDensity && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryLinearMassDensity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryLinearMassDensity && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LinearMassDensity && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Area from Specific Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLinearMassDensity && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialLinearMassDensity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialLinearMassDensity && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryLinearMassDensity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryLinearMassDensity && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LinearMassDensity && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Area Density from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLinearMassDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialLinearMassDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryLinearMassDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LinearMassDensity && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Density from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLinearMassDensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialLinearMassDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryLinearMassDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LinearMassDensity && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Area Density", QuantityConverter.Type.Division, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLinearMassDensity && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is UKImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is USCustomaryAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialLinearMassDensity && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialLinearMassDensity && rightUnit is UKImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryLinearMassDensity && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryLinearMassDensity && rightUnit is USCustomaryAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LinearMassDensity && rightUnit is AreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLinearMassDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLinearMassDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialLinearMassDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryLinearMassDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LinearMassDensity && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminanceConverters.kt
new file mode 100644
index 000000000..2d3834841
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminanceConverters.kt
@@ -0,0 +1,48 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.luminance.times
+import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.ImperialLuminance
+import com.splendo.kaluga.scientific.unit.Lambert
+import com.splendo.kaluga.scientific.unit.Luminance
+import com.splendo.kaluga.scientific.unit.MetricLuminance
+import com.splendo.kaluga.scientific.unit.SolidAngle
+import com.splendo.kaluga.scientific.unit.Stilb
+
+val PhysicalQuantity.Luminance.converters get() = listOf<QuantityConverter<PhysicalQuantity.Luminance, *, *>>(
+    QuantityConverter("Illuminance from Solid Angle", QuantityConverter.Type.Multiplication, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Stilb && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Lambert && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricLuminance && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLuminance && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Luminance && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Intensity from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Luminance && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousEnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousEnergyConverters.kt
new file mode 100644
index 000000000..1064da49b
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousEnergyConverters.kt
@@ -0,0 +1,62 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.luminousEnergy.div
+import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.ImperialArea
+import com.splendo.kaluga.scientific.unit.ImperialLuminousExposure
+import com.splendo.kaluga.scientific.unit.LuminousEnergy
+import com.splendo.kaluga.scientific.unit.LuminousExposure
+import com.splendo.kaluga.scientific.unit.LuminousFlux
+import com.splendo.kaluga.scientific.unit.MetricArea
+import com.splendo.kaluga.scientific.unit.MetricLuminousExposure
+import com.splendo.kaluga.scientific.unit.Time
+
+val PhysicalQuantity.LuminousEnergy.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousEnergy, *, *>>(
+    QuantityConverter("Energy from Luminous Exposure", QuantityConverter.Type.Division, PhysicalQuantity.LuminousExposure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousEnergy && rightUnit is MetricLuminousExposure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousEnergy && rightUnit is ImperialLuminousExposure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousEnergy && rightUnit is LuminousExposure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Exposure from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousEnergy && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousEnergy && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousEnergy && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Flux from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Luminous Flux", QuantityConverter.Type.Division, PhysicalQuantity.LuminousFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousEnergy && rightUnit is LuminousFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousExposureConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousExposureConverters.kt
new file mode 100644
index 000000000..16cb93104
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousExposureConverters.kt
@@ -0,0 +1,60 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.luminousExposure.div
+import com.splendo.kaluga.scientific.converter.luminousExposure.times
+import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.Illuminance
+import com.splendo.kaluga.scientific.unit.ImperialArea
+import com.splendo.kaluga.scientific.unit.ImperialIlluminance
+import com.splendo.kaluga.scientific.unit.ImperialLuminousExposure
+import com.splendo.kaluga.scientific.unit.LuminousExposure
+import com.splendo.kaluga.scientific.unit.MetricArea
+import com.splendo.kaluga.scientific.unit.MetricIlluminance
+import com.splendo.kaluga.scientific.unit.MetricLuminousExposure
+import com.splendo.kaluga.scientific.unit.Time
+
+val PhysicalQuantity.LuminousExposure.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousExposure, *, *>>(
+    QuantityConverter("Illuminance from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLuminousExposure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLuminousExposure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousExposure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Energy from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLuminousExposure && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLuminousExposure && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousExposure && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Illuminance", QuantityConverter.Type.Division, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricLuminousExposure && rightUnit is MetricIlluminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialLuminousExposure && rightUnit is ImperialIlluminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousExposure && rightUnit is Illuminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousFluxConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousFluxConverters.kt
new file mode 100644
index 000000000..ef5f48cf3
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousFluxConverters.kt
@@ -0,0 +1,74 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.luminousFlux.div
+import com.splendo.kaluga.scientific.converter.luminousFlux.times
+import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.Illuminance
+import com.splendo.kaluga.scientific.unit.ImperialArea
+import com.splendo.kaluga.scientific.unit.ImperialIlluminance
+import com.splendo.kaluga.scientific.unit.LuminousFlux
+import com.splendo.kaluga.scientific.unit.LuminousIntensity
+import com.splendo.kaluga.scientific.unit.MetricArea
+import com.splendo.kaluga.scientific.unit.Phot
+import com.splendo.kaluga.scientific.unit.PhotMultiple
+import com.splendo.kaluga.scientific.unit.SolidAngle
+import com.splendo.kaluga.scientific.unit.SquareCentimeter
+import com.splendo.kaluga.scientific.unit.Time
+
+val PhysicalQuantity.LuminousFlux.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousFlux, *, *>>(
+    QuantityConverter("Area from Illuminance", QuantityConverter.Type.Division, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousFlux && rightUnit is Phot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousFlux && rightUnit is PhotMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousFlux && rightUnit is ImperialIlluminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousFlux && rightUnit is Illuminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Illuminance from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousFlux && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousFlux && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousFlux && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousFlux && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Energy from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousFlux && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Intensity from Solid Angle", QuantityConverter.Type.Division, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousFlux && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Solid Angle from Luminous Intensity", QuantityConverter.Type.Division, PhysicalQuantity.LuminousIntensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousFlux && rightUnit is LuminousIntensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousIntensityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousIntensityConverters.kt
new file mode 100644
index 000000000..dca0435c9
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousIntensityConverters.kt
@@ -0,0 +1,62 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.luminousIntensity.div
+import com.splendo.kaluga.scientific.converter.luminousIntensity.times
+import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.ImperialArea
+import com.splendo.kaluga.scientific.unit.ImperialLuminance
+import com.splendo.kaluga.scientific.unit.Lambert
+import com.splendo.kaluga.scientific.unit.Luminance
+import com.splendo.kaluga.scientific.unit.LuminousIntensity
+import com.splendo.kaluga.scientific.unit.MetricArea
+import com.splendo.kaluga.scientific.unit.MetricLuminance
+import com.splendo.kaluga.scientific.unit.SolidAngle
+import com.splendo.kaluga.scientific.unit.SquareCentimeter
+import com.splendo.kaluga.scientific.unit.Stilb
+
+val PhysicalQuantity.LuminousIntensity.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousIntensity, *, *>>(
+    QuantityConverter("Area from Luminance", QuantityConverter.Type.Division, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousIntensity && rightUnit is Stilb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousIntensity && rightUnit is Lambert -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousIntensity && rightUnit is MetricLuminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousIntensity && rightUnit is ImperialLuminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousIntensity && rightUnit is Luminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminance from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousIntensity && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousIntensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousIntensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is LuminousIntensity && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Flux from Solid Angle", QuantityConverter.Type.Multiplication, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is LuminousIntensity && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticFluxConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticFluxConverters.kt
new file mode 100644
index 000000000..4c009ad76
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticFluxConverters.kt
@@ -0,0 +1,107 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.magneticFlux.div
+import com.splendo.kaluga.scientific.converter.magneticFlux.times
+import com.splendo.kaluga.scientific.unit.Abampere
+import com.splendo.kaluga.scientific.unit.Abcoulomb
+import com.splendo.kaluga.scientific.unit.Abhenry
+import com.splendo.kaluga.scientific.unit.Abohm
+import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.Biot
+import com.splendo.kaluga.scientific.unit.ElectricCharge
+import com.splendo.kaluga.scientific.unit.ElectricCurrent
+import com.splendo.kaluga.scientific.unit.ElectricInductance
+import com.splendo.kaluga.scientific.unit.ElectricResistance
+import com.splendo.kaluga.scientific.unit.Gauss
+import com.splendo.kaluga.scientific.unit.MagneticFlux
+import com.splendo.kaluga.scientific.unit.MagneticInduction
+import com.splendo.kaluga.scientific.unit.Maxwell
+import com.splendo.kaluga.scientific.unit.SquareCentimeter
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.Voltage
+
+val PhysicalQuantity.MagneticFlux.converters get() = listOf<QuantityConverter<PhysicalQuantity.MagneticFlux, *, *>>(
+    QuantityConverter("Area from Magnetic Induction", QuantityConverter.Type.Division, PhysicalQuantity.MagneticInduction) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Maxwell && rightUnit is Gauss -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MagneticFlux && rightUnit is MagneticInduction -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Charge from Electric Resistance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Maxwell && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MagneticFlux && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Current from Electric Inductance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Maxwell && rightUnit is Abhenry -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MagneticFlux && rightUnit is ElectricInductance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Inductance from Electric Current", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Maxwell && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Maxwell && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MagneticFlux && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Resistance from Electric Charge", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Maxwell && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MagneticFlux && rightUnit is ElectricCharge -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Electric Current", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Maxwell && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Maxwell && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MagneticFlux && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Magnetic Induction from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Maxwell && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MagneticFlux && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Voltage", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MagneticFlux && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Voltage from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Maxwell && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MagneticFlux && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticInductionConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticInductionConverters.kt
new file mode 100644
index 000000000..888aec28c
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticInductionConverters.kt
@@ -0,0 +1,36 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.magneticInduction.times
+import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.Gauss
+import com.splendo.kaluga.scientific.unit.MagneticInduction
+import com.splendo.kaluga.scientific.unit.SquareCentimeter
+
+val PhysicalQuantity.MagneticInduction.converters get() = listOf<QuantityConverter<PhysicalQuantity.MagneticInduction, *, *>>(
+    QuantityConverter("Magnetic Flux from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Gauss && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MagneticInduction && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MassFlowRateConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MassFlowRateConverters.kt
new file mode 100644
index 000000000..9f217eeed
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MassFlowRateConverters.kt
@@ -0,0 +1,41 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.massFlowRate.times
+import com.splendo.kaluga.scientific.unit.ImperialMassFlowRate
+import com.splendo.kaluga.scientific.unit.MassFlowRate
+import com.splendo.kaluga.scientific.unit.MetricMassFlowRate
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.UKImperialMassFlowRate
+import com.splendo.kaluga.scientific.unit.USCustomaryMassFlowRate
+
+val PhysicalQuantity.MassFlowRate.converters get() = listOf<QuantityConverter<PhysicalQuantity.MassFlowRate, *, *>>(
+    QuantityConverter("Weight from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMassFlowRate && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMassFlowRate && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMassFlowRate && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMassFlowRate && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MassFlowRate && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt
new file mode 100644
index 000000000..733841004
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt
@@ -0,0 +1,95 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.molality.div
+import com.splendo.kaluga.scientific.converter.molality.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Molality.converters get() = listOf<QuantityConverter<PhysicalQuantity.Molality, *, *>>(
+    QuantityConverter("Amount of Substance from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Molality && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molarity from Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Molality && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molarity from Specific Volume", QuantityConverter.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Molality && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Energy from Molar Energy", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolality && rightUnit is MetricAndImperialMolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolality && rightUnit is MetricAndImperialMolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolality && rightUnit is MetricAndImperialMolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolality && rightUnit is MetricAndImperialMolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricMolality && rightUnit is MetricMolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolality && rightUnit is ImperialMolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolality && rightUnit is ImperialMolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolality && rightUnit is ImperialMolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Volume from Molar Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolality && rightUnit is MetricMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolality && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolality && rightUnit is UKImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolality && rightUnit is USCustomaryMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolality && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolality && rightUnit is UKImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolality && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolality && rightUnit is USCustomaryMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Volume from Molarity", QuantityConverter.Type.Division, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolality && rightUnit is MetricMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolality && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolality && rightUnit is UKImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolality && rightUnit is USCustomaryMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolality && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolality && rightUnit is UKImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolality && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolality && rightUnit is USCustomaryMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molality && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarEnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarEnergyConverters.kt
new file mode 100644
index 000000000..abe2a5869
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarEnergyConverters.kt
@@ -0,0 +1,74 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.molarEnergy.div
+import com.splendo.kaluga.scientific.converter.molarEnergy.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.MolarEnergy.converters get() = listOf<QuantityConverter<PhysicalQuantity.MolarEnergy, *, *>>(
+    QuantityConverter("Energy from Amount of Substance", QuantityConverter.Type.Multiplication, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndImperialMolarEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricMolarEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Mass from Specific Energy", QuantityConverter.Type.Division, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MolarEnergy && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarEnergy && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarEnergy && rightUnit is UKImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarEnergy && rightUnit is USCustomarySpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarEnergy && rightUnit is SpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Energy from Molar Mass", QuantityConverter.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndImperialMolarEnergy && rightUnit is MetricMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialMolarEnergy && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialMolarEnergy && rightUnit is UKImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialMolarEnergy && rightUnit is USCustomaryMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricMolarEnergy && rightUnit is MetricMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarEnergy && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarEnergy && rightUnit is UKImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarEnergy && rightUnit is USCustomaryMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarEnergy && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Energy from Molality", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndImperialMolarEnergy && rightUnit is MetricMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialMolarEnergy && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialMolarEnergy && rightUnit is UKImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialMolarEnergy && rightUnit is USCustomaryMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricMolarEnergy && rightUnit is MetricMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarEnergy && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarEnergy && rightUnit is UKImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarEnergy && rightUnit is USCustomaryMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarEnergy && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt
new file mode 100644
index 000000000..0f61bf385
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt
@@ -0,0 +1,95 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.molarMass.div
+import com.splendo.kaluga.scientific.converter.molarMass.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.MolarMass.converters get() = listOf<QuantityConverter<PhysicalQuantity.MolarMass, *, *>>(
+    QuantityConverter("Density from Molarity", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolarMass && rightUnit is MetricMolarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarMass && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarMass && rightUnit is UKImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarMass && rightUnit is USCustomaryMolarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarMass && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarMass && rightUnit is UKImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarMass && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarMass && rightUnit is USCustomaryMolarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Density from Molar Volume", QuantityConverter.Type.Division, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolarMass && rightUnit is MetricMolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarMass && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarMass && rightUnit is UKImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarMass && rightUnit is USCustomaryMolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarMass && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarMass && rightUnit is UKImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarMass && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarMass && rightUnit is USCustomaryMolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Energy from Specific Energy", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MolarMass && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is UKImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is USCustomarySpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is SpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Volume from Density", QuantityConverter.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MolarMass && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Volume from Specific Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MolarMass && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Amount of Substance", QuantityConverter.Type.Multiplication, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolarMass && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarMass && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarMass && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarMass && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarMass && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt
new file mode 100644
index 000000000..064dcee5b
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt
@@ -0,0 +1,85 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.molarVolume.div
+import com.splendo.kaluga.scientific.converter.molarVolume.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.MolarVolume.converters get() = listOf<QuantityConverter<PhysicalQuantity.MolarVolume, *, *>>(
+    QuantityConverter("Molar Mass from Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MolarVolume && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Mass from Specific Volume", QuantityConverter.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MolarVolume && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Volume from Molality", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolarVolume && rightUnit is MetricMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarVolume && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarVolume && rightUnit is UKImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarVolume && rightUnit is USCustomaryMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarVolume && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarVolume && rightUnit is UKImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarVolume && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarVolume && rightUnit is USCustomaryMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Volume from Molar Mass", QuantityConverter.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolarVolume && rightUnit is MetricMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarVolume && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarVolume && rightUnit is UKImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarVolume && rightUnit is USCustomaryMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarVolume && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarVolume && rightUnit is UKImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarVolume && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarVolume && rightUnit is USCustomaryMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Volume from Amount of Substance", QuantityConverter.Type.Multiplication, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolarVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MolarVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt
new file mode 100644
index 000000000..36afc1666
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt
@@ -0,0 +1,81 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.molarity.div
+import com.splendo.kaluga.scientific.converter.molarity.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Molarity.converters get() = listOf<QuantityConverter<PhysicalQuantity.Molarity, *, *>>(
+    QuantityConverter("Amount of Substance from Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Molarity && rightUnit is Volume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Density from Molality", QuantityConverter.Type.Division, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolarity && rightUnit is MetricMolality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarity && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarity && rightUnit is UKImperialMolality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarity && rightUnit is USCustomaryMolality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarity && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarity && rightUnit is UKImperialMolality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarity && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarity && rightUnit is USCustomaryMolality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molarity && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Density from Molar Mass", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMolarity && rightUnit is MetricMolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarity && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarity && rightUnit is UKImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMolarity && rightUnit is USCustomaryMolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarity && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMolarity && rightUnit is UKImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarity && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMolarity && rightUnit is USCustomaryMolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molarity && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molality from Density", QuantityConverter.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Molarity && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molarity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molarity && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molarity && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molarity && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molality from Specific Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Molarity && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molarity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molarity && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molarity && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Molarity && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MomentumConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MomentumConverters.kt
new file mode 100644
index 000000000..ac5124cdf
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MomentumConverters.kt
@@ -0,0 +1,84 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.momentum.div
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Momentum.converters get() = listOf<QuantityConverter<PhysicalQuantity.Momentum, *, *>>(
+    QuantityConverter("Area from Dynamic Viscosity", QuantityConverter.Type.Division, PhysicalQuantity.DynamicViscosity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMomentum && rightUnit is MetricDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMomentum && rightUnit is ImperialDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMomentum && rightUnit is UKImperialDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMomentum && rightUnit is USCustomaryDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMomentum && rightUnit is ImperialDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMomentum && rightUnit is UKImperialDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMomentum && rightUnit is ImperialDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMomentum && rightUnit is USCustomaryDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Momentum && rightUnit is DynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Dynamic Viscosity from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMomentum && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMomentum && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMomentum && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMomentum && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Momentum && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Force from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMomentum && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMomentum && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMomentum && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMomentum && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Momentum && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Speed from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMomentum && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMomentum && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMomentum && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMomentum && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMomentum && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMomentum && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMomentum && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMomentum && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Momentum && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Speed", QuantityConverter.Type.Division, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricMomentum && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialMomentum && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialMomentum && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryMomentum && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Momentum && rightUnit is Speed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PowerConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PowerConverters.kt
new file mode 100644
index 000000000..40512ccfc
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PowerConverters.kt
@@ -0,0 +1,113 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.power.div
+import com.splendo.kaluga.scientific.converter.power.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Power.converters get() = listOf<QuantityConverter<PhysicalQuantity.Power, *, *>>(
+    QuantityConverter("Electric Current from Voltage", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is ErgPerSecond && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Power && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Watt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Nanowatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Microwatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Milliwatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Centiwatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Deciwatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Decawatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hectowatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Kilowatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Megawatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gigawatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgPerSecond && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricPower && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForcePerSecond && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForcePerMinute && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Horsepower && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnitPerSecond && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnitPerMinute && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnitPerHour && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPower && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Power && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Force from Speed", QuantityConverter.Type.Division, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is ErgPerSecond && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricPower && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPower && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialPower && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Power && rightUnit is Speed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Speed from Force", QuantityConverter.Type.Division, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is ErgPerSecond && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgPerSecond && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricPower && rightUnit is MetricForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundForcePerSecond && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is FootPoundForcePerMinute && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForcePerSecond && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is InchPoundForcePerMinute && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnitPerSecond && rightUnit is PoundForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnitPerMinute && rightUnit is PoundForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BritishThermalUnitPerHour && rightUnit is PoundForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPower && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPower && rightUnit is UKImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPower && rightUnit is USCustomaryForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialPower && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialPower && rightUnit is UKImperialForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialPower && rightUnit is USCustomaryForce -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Power && rightUnit is Force -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Temperature from Thermal Resistance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ThermalResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Power && rightUnit is MetricAndUKImperialThermalResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialPower && rightUnit is MetricThermalResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricPower && rightUnit is MetricThermalResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialPower && rightUnit is UKImperialThermalResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPower && rightUnit is UKImperialThermalResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndImperialPower && rightUnit is USCustomaryThermalResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPower && rightUnit is USCustomaryThermalResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Power && rightUnit is ThermalResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Voltage from Electric Current", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is ErgPerSecond && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ErgPerSecond && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Power && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PressureConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PressureConverters.kt
new file mode 100644
index 000000000..a51870720
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PressureConverters.kt
@@ -0,0 +1,76 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.pressure.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Pressure.converters get() = listOf<QuantityConverter<PhysicalQuantity.Pressure, *, *>>(
+    QuantityConverter("Dynamic Viscosity from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricPressure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPressure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialPressure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryPressure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Pressure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Barye && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BaryeMultiple && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is PoundSquareFoot && rightUnit is CubicFoot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is PoundSquareInch && rightUnit is CubicInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is OunceSquareInch && rightUnit is CubicInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KiloPoundSquareInch && rightUnit is CubicInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KipSquareInch && rightUnit is CubicInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USTonSquareInch && rightUnit is CubicInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialTonSquareInch && rightUnit is CubicInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPressure && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPressure && rightUnit is UKImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPressure && rightUnit is USCustomaryVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialPressure && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialPressure && rightUnit is UKImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryPressure && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryPressure && rightUnit is USCustomaryVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Pressure && rightUnit is Volume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Force from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Barye && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is BaryeMultiple && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is OunceSquareInch && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KipSquareInch && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KipSquareFoot && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USTonSquareInch && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USTonSquareFoot && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialTonSquareInch && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialTonSquareFoot && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialPressure && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialPressure && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryPressure && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Pressure && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
index fd05629f7..df8f595eb 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
@@ -23,7 +23,7 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.unit.ScientificUnit
 import kotlin.reflect.KClass
 
-data class QuantityConverter<Left: PhysicalQuantity, Right: PhysicalQuantity, Result: PhysicalQuantity>(
+data class QuantityConverter<Left : PhysicalQuantity, Right : PhysicalQuantity, Result : PhysicalQuantity>(
     val leftQuantity: KClass<Left>,
     val rightQuantity: Right,
     val resultQuantity: KClass<Result>,
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/RadioactivityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/RadioactivityConverters.kt
new file mode 100644
index 000000000..d7743530c
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/RadioactivityConverters.kt
@@ -0,0 +1,22 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.PhysicalQuantity
+
+val PhysicalQuantity.Radioactivity.converters get() = listOf<QuantityConverter<PhysicalQuantity.Radioactivity, *, *>>()
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SolidAngleConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SolidAngleConverters.kt
new file mode 100644
index 000000000..30627572a
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SolidAngleConverters.kt
@@ -0,0 +1,42 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.solidAngle.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.SolidAngle.converters get() = listOf<QuantityConverter<PhysicalQuantity.SolidAngle, *, *>>(
+    QuantityConverter("Illuminance from Luminance", QuantityConverter.Type.Multiplication, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is SolidAngle && rightUnit is Luminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SolidAngle && rightUnit is Lambert -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SolidAngle && rightUnit is MetricLuminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SolidAngle && rightUnit is ImperialLuminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SolidAngle && rightUnit is Luminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Flux from Luminous Intensity", QuantityConverter.Type.Multiplication, PhysicalQuantity.LuminousIntensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is SolidAngle && rightUnit is LuminousIntensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt
new file mode 100644
index 000000000..296084ef5
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt
@@ -0,0 +1,93 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.specificEnergy.div
+import com.splendo.kaluga.scientific.converter.specificEnergy.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.SpecificEnergy.converters get() = listOf<QuantityConverter<PhysicalQuantity.SpecificEnergy, *, *>>(
+    QuantityConverter("Energy from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificEnergy && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificEnergy && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificEnergy && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificEnergy && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificEnergy && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificEnergy && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molality from Molar Energy", QuantityConverter.Type.Division, PhysicalQuantity.MolarEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificEnergy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificEnergy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificEnergy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificEnergy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Energy from Molar Mass", QuantityConverter.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificEnergy && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificEnergy && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificEnergy && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificEnergy && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Energy from Molality", QuantityConverter.Type.Division, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificEnergy && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificEnergy && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificEnergy && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificEnergy && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Heat Capacity from Temperature", QuantityConverter.Type.Division, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificEnergy && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is USCustomaryTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificEnergy && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificEnergy && rightUnit is USCustomaryTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificEnergy && rightUnit is Temperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Temperature from Specific Heat Capacity", QuantityConverter.Type.Division, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificEnergy && rightUnit is MetricSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is USCustomarySpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificEnergy && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificEnergy && rightUnit is USCustomarySpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificEnergy && rightUnit is SpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificHeatCapacityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificHeatCapacityConverters.kt
new file mode 100644
index 000000000..b56872d67
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificHeatCapacityConverters.kt
@@ -0,0 +1,57 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.specificHeatCapacity.times
+import com.splendo.kaluga.scientific.unit.ImperialWeight
+import com.splendo.kaluga.scientific.unit.MetricAndUKImperialTemperature
+import com.splendo.kaluga.scientific.unit.MetricSpecificHeatCapacity
+import com.splendo.kaluga.scientific.unit.MetricWeight
+import com.splendo.kaluga.scientific.unit.SpecificHeatCapacity
+import com.splendo.kaluga.scientific.unit.Temperature
+import com.splendo.kaluga.scientific.unit.UKImperialSpecificHeatCapacity
+import com.splendo.kaluga.scientific.unit.UKImperialWeight
+import com.splendo.kaluga.scientific.unit.USCustomarySpecificHeatCapacity
+import com.splendo.kaluga.scientific.unit.USCustomaryTemperature
+import com.splendo.kaluga.scientific.unit.USCustomaryWeight
+import com.splendo.kaluga.scientific.unit.Weight
+
+val PhysicalQuantity.SpecificHeatCapacity.converters get() = listOf<QuantityConverter<PhysicalQuantity.SpecificHeatCapacity, *, *>>(
+    QuantityConverter("Heat Capacity from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificHeatCapacity && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificHeatCapacity && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificHeatCapacity && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificHeatCapacity && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificHeatCapacity && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificHeatCapacity && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Energy from Temperature", QuantityConverter.Type.Multiplication, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificHeatCapacity && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificHeatCapacity && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificHeatCapacity && rightUnit is USCustomaryTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificHeatCapacity && rightUnit is Temperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt
new file mode 100644
index 000000000..c07709d40
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt
@@ -0,0 +1,109 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.specificVolume.div
+import com.splendo.kaluga.scientific.converter.specificVolume.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.SpecificVolume.converters get() = listOf<QuantityConverter<PhysicalQuantity.SpecificVolume, *, *>>(
+    QuantityConverter("Area from Linear Mass Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificVolume && rightUnit is MetricLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is UKImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is USCustomaryLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificVolume && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificVolume && rightUnit is UKImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificVolume && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificVolume && rightUnit is USCustomaryLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificVolume && rightUnit is LinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Area Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificVolume && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is UKImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is USCustomaryAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificVolume && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificVolume && rightUnit is UKImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificVolume && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificVolume && rightUnit is USCustomaryAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificVolume && rightUnit is AreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molality from Molar Volume", QuantityConverter.Type.Division, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificVolume && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificVolume && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificVolume && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificVolume && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molality from Molarity", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificVolume && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificVolume && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificVolume && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificVolume && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Volume from Molar Mass", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificVolume && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificVolume && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificVolume && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificVolume && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Volume from Molality", QuantityConverter.Type.Division, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificVolume && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificVolume && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificVolume && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificVolume && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Volume from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificVolume && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificVolume && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificVolume && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificVolume && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificVolume && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificVolume && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificVolume && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpeedConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpeedConverters.kt
new file mode 100644
index 000000000..e637e5fd2
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpeedConverters.kt
@@ -0,0 +1,85 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.speed.div
+import com.splendo.kaluga.scientific.converter.speed.times
+import com.splendo.kaluga.scientific.unit.Acceleration
+import com.splendo.kaluga.scientific.unit.Dyne
+import com.splendo.kaluga.scientific.unit.DyneMultiple
+import com.splendo.kaluga.scientific.unit.Force
+import com.splendo.kaluga.scientific.unit.ImperialForce
+import com.splendo.kaluga.scientific.unit.ImperialSpeed
+import com.splendo.kaluga.scientific.unit.ImperialWeight
+import com.splendo.kaluga.scientific.unit.MetricSpeed
+import com.splendo.kaluga.scientific.unit.MetricWeight
+import com.splendo.kaluga.scientific.unit.Speed
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.UKImperialForce
+import com.splendo.kaluga.scientific.unit.UKImperialWeight
+import com.splendo.kaluga.scientific.unit.USCustomaryForce
+import com.splendo.kaluga.scientific.unit.USCustomaryWeight
+import com.splendo.kaluga.scientific.unit.Weight
+
+val PhysicalQuantity.Speed.converters get() = listOf<QuantityConverter<PhysicalQuantity.Speed, *, *>>(
+    QuantityConverter("Acceleration from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpeed && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpeed && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Speed && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpeed && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpeed && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Speed && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Momentum from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpeed && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpeed && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpeed && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpeed && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Speed && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Power from Force", QuantityConverter.Type.Multiplication, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpeed && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricSpeed && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpeed && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpeed && rightUnit is UKImperialForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpeed && rightUnit is USCustomaryForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Speed && rightUnit is Force -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Acceleration", QuantityConverter.Type.Division, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Speed && rightUnit is Acceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SurfaceTensionConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SurfaceTensionConverters.kt
new file mode 100644
index 000000000..0258a2672
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SurfaceTensionConverters.kt
@@ -0,0 +1,50 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.surfaceTension.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.SurfaceTension.converters get() = listOf<QuantityConverter<PhysicalQuantity.SurfaceTension, *, *>>(
+    QuantityConverter("Energy from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSurfaceTension && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricSurfaceTension && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSurfaceTension && rightUnit is SquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSurfaceTension && rightUnit is SquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySurfaceTension && rightUnit is SquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSurfaceTension && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSurfaceTension && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySurfaceTension && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SurfaceTension && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Force from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSurfaceTension && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSurfaceTension && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSurfaceTension && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySurfaceTension && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SurfaceTension && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TemperatureConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TemperatureConverters.kt
new file mode 100644
index 000000000..caed67ce3
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TemperatureConverters.kt
@@ -0,0 +1,66 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.temperature.div
+import com.splendo.kaluga.scientific.converter.temperature.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Temperature.converters get() = listOf<QuantityConverter<PhysicalQuantity.Temperature, *, *>>(
+    QuantityConverter("Energy from Heat Capacity", QuantityConverter.Type.Multiplication, PhysicalQuantity.HeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricAndUKImperialHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is UKImperialHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryTemperature && rightUnit is USCustomaryHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Temperature && rightUnit is HeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Power from Thermal Resistance", QuantityConverter.Type.Division, PhysicalQuantity.ThermalResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricAndUKImperialThermalResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricThermalResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is UKImperialThermalResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryTemperature && rightUnit is USCustomaryThermalResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Temperature && rightUnit is ThermalResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Energy from Specific Heat Capacity", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryTemperature && rightUnit is USCustomarySpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Temperature && rightUnit is SpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Thermal Resistance from Power", QuantityConverter.Type.Division, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricAndImperialPower -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricPower -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricAndUKImperialTemperature && rightUnit is ImperialPower -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryTemperature && rightUnit is ImperialPower -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Temperature && rightUnit is Power -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TheralResistanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TheralResistanceConverters.kt
new file mode 100644
index 000000000..f73241f92
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TheralResistanceConverters.kt
@@ -0,0 +1,47 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.thermalResistance.times
+import com.splendo.kaluga.scientific.unit.ImperialPower
+import com.splendo.kaluga.scientific.unit.MetricAndImperialPower
+import com.splendo.kaluga.scientific.unit.MetricAndUKImperialThermalResistance
+import com.splendo.kaluga.scientific.unit.MetricPower
+import com.splendo.kaluga.scientific.unit.MetricThermalResistance
+import com.splendo.kaluga.scientific.unit.Power
+import com.splendo.kaluga.scientific.unit.ThermalResistance
+import com.splendo.kaluga.scientific.unit.UKImperialThermalResistance
+import com.splendo.kaluga.scientific.unit.USCustomaryThermalResistance
+
+val PhysicalQuantity.ThermalResistance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ThermalResistance, *, *>>(
+    QuantityConverter("Temperature from Power", QuantityConverter.Type.Multiplication, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricAndUKImperialThermalResistance && rightUnit is Power -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricThermalResistance && rightUnit is MetricAndImperialPower -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricThermalResistance && rightUnit is MetricPower -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialThermalResistance && rightUnit is MetricAndImperialPower -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialThermalResistance && rightUnit is ImperialPower -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryThermalResistance && rightUnit is MetricAndImperialPower -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryThermalResistance && rightUnit is ImperialPower -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ThermalResistance && rightUnit is Power -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt
new file mode 100644
index 000000000..81fc57a94
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt
@@ -0,0 +1,214 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.time.div
+import com.splendo.kaluga.scientific.converter.time.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQuantity.Time, *, *>>(
+    QuantityConverter("Acceleration from Jolt", QuantityConverter.Type.Multiplication, PhysicalQuantity.Jolt) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is MetricJolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialJolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Jolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Action from Energy", QuantityConverter.Type.Multiplication, PhysicalQuantity.Energy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is MetricAndImperialEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is MetricEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Energy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Amount of Substance from Catalystic Activity", QuantityConverter.Type.Multiplication, PhysicalQuantity.CatalysticActivity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is CatalysticActivity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Angle from Angular Velocity", QuantityConverter.Type.Multiplication, PhysicalQuantity.AngularVelocity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is AngularVelocity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Angular Velocity from Angular Acceleration", QuantityConverter.Type.Multiplication, PhysicalQuantity.AngularAcceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is AngularAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Dynamic Viscosity from Pressure", QuantityConverter.Type.Multiplication, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is MetricPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is UKImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is USCustomaryPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Pressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Capacitance from Electric Resistance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Charge from Electric Current", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Inductance from Electric Resistance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Resistance from Electric Capacitance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is Abfarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Power", QuantityConverter.Type.Multiplication, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Hour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Microwatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Milliwatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Centiwatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Deciwatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Decawatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Hectowatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Kilowatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Megawatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Gigawatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ErgPerSecond -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is MetricPower -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is InchPoundForcePerSecond -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is InchPoundForcePerMinute -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Hour && rightUnit is Horsepower -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is BritishThermalUnitPerSecond -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is BritishThermalUnitPerMinute -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is BritishThermalUnitPerHour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialPower -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Power -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Force from Yank", QuantityConverter.Type.Multiplication, PhysicalQuantity.Yank) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is MetricYank -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialYank -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is UKImperialYank -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is USCustomaryYank -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Yank -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Speed", QuantityConverter.Type.Multiplication, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Speed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Energy from Luminous Flux", QuantityConverter.Type.Multiplication, PhysicalQuantity.LuminousFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is LuminousFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Luminous Exposure from Illuminance", QuantityConverter.Type.Multiplication, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is MetricIlluminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialIlluminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Illuminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Magnetic Flux from Voltage", QuantityConverter.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Momentum from Force", QuantityConverter.Type.Multiplication, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is TonneForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is GramForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is MilligramForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is MetricForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Poundal -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is OunceForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is GrainForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is UsTonForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialTonForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is UKImperialForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is USCustomaryForce -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Force -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Speed from Acceleration", QuantityConverter.Type.Multiplication, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is Acceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Volume from Volumetric Flow", QuantityConverter.Type.Multiplication, PhysicalQuantity.VolumetricFlow) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is MetricVolumetricFlow -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialVolumetricFlow -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is UKImperialVolumetricFlow -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is USCustomaryVolumetricFlow -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is VolumetricFlow -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Mass Flow Rate", QuantityConverter.Type.Multiplication, PhysicalQuantity.MassFlowRate) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is MetricMassFlowRate -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialMassFlowRate -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is UKImperialMassFlowRate -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is USCustomaryMassFlowRate -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is MassFlowRate -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VoltageConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VoltageConverters.kt
new file mode 100644
index 000000000..86ef75e45
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VoltageConverters.kt
@@ -0,0 +1,91 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.voltage.div
+import com.splendo.kaluga.scientific.converter.voltage.times
+import com.splendo.kaluga.scientific.unit.Abampere
+import com.splendo.kaluga.scientific.unit.Abcoulomb
+import com.splendo.kaluga.scientific.unit.Abfarad
+import com.splendo.kaluga.scientific.unit.Abohm
+import com.splendo.kaluga.scientific.unit.Absiemens
+import com.splendo.kaluga.scientific.unit.Abvolt
+import com.splendo.kaluga.scientific.unit.Biot
+import com.splendo.kaluga.scientific.unit.ElectricCapacitance
+import com.splendo.kaluga.scientific.unit.ElectricCharge
+import com.splendo.kaluga.scientific.unit.ElectricConductance
+import com.splendo.kaluga.scientific.unit.ElectricCurrent
+import com.splendo.kaluga.scientific.unit.ElectricResistance
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.Voltage
+
+val PhysicalQuantity.Voltage.converters get() = listOf<QuantityConverter<PhysicalQuantity.Voltage, *, *>>(
+    QuantityConverter("Electric Charge from Electric Capacitance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abvolt && rightUnit is Abfarad -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Voltage && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Current from Electric Conductance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricConductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abvolt && rightUnit is Absiemens -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Voltage && rightUnit is ElectricConductance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Current from Electric Resistance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abvolt && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Voltage && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Electric Resistance from Electric Current", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abvolt && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Abvolt && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Voltage && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Electric Charge", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abvolt && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Voltage && rightUnit is ElectricCharge -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Magnetic Flux from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abvolt && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Voltage && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Power from Electric Current", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Abvolt && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Abvolt && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Voltage && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumeConverters.kt
new file mode 100644
index 000000000..b524a48a0
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumeConverters.kt
@@ -0,0 +1,177 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.volume.div
+import com.splendo.kaluga.scientific.converter.volume.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Volume.converters get() = listOf<QuantityConverter<PhysicalQuantity.Volume, *, *>>(
+    QuantityConverter("Amount of Substance from Molarity", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Volume && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Amount of Substance from Molar Volume", QuantityConverter.Type.Division, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Volume && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Area from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is CubicMeter && rightUnit is Meter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicNanometer && rightUnit is Nanometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicMicrometer && rightUnit is Micrometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicMillimeter && rightUnit is Millimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicCentimeter && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicDecimeter && rightUnit is Decimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicDecameter && rightUnit is Decameter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicHectometer && rightUnit is Hectometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicKilometer && rightUnit is Kilometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicMegameter && rightUnit is Megameter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicGigameter && rightUnit is Gigameter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricVolume && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicInch && rightUnit is Inch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicFoot && rightUnit is Foot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicYard && rightUnit is Yard -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicMile && rightUnit is Mile -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is AcreInch && rightUnit is Inch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is AcreFoot && rightUnit is Foot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Volume && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Pressure", QuantityConverter.Type.Multiplication, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is CubicCentimeter && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicCentimeter && rightUnit is BaryeMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicFoot && rightUnit is PoundSquareFoot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicInch && rightUnit is PoundSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicInch && rightUnit is OunceSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicInch && rightUnit is KiloPoundSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicInch && rightUnit is KipSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicInch && rightUnit is USTonSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicInch && rightUnit is ImperialTonSquareInch -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is UKImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is USCustomaryPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is UKImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is USCustomaryPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Volume && rightUnit is Pressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is CubicMeter && rightUnit is SquareMeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicNanometer && rightUnit is SquareNanometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicMicrometer && rightUnit is SquareMicrometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicMillimeter && rightUnit is SquareMillimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicCentimeter && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicDecimeter && rightUnit is SquareDecimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicDecameter && rightUnit is SquareDecameter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicHectometer && rightUnit is SquareHectometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicKilometer && rightUnit is SquareKilometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicMegameter && rightUnit is SquareMegameter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicGigameter && rightUnit is SquareGigameter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricVolume && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicInch && rightUnit is SquareInch -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicFoot && rightUnit is SquareFoot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicYard && rightUnit is SquareYard -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is CubicMile && rightUnit is SquareMile -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is AcreInch && rightUnit is Acre -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is AcreFoot && rightUnit is Acre -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Volume && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Volume from Amount of Substance", QuantityConverter.Type.Division, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Volume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Specific Volume from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricVolume && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Volume && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Volumetric Flow from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricVolume && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Volume && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricVolume && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Volume && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Specific Volume", QuantityConverter.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricVolume && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolume && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolume && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolume && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Volume && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFlowConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFlowConverters.kt
new file mode 100644
index 000000000..6ef078f06
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFlowConverters.kt
@@ -0,0 +1,61 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.volumetricFlow.div
+import com.splendo.kaluga.scientific.converter.volumetricFlow.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.VolumetricFlow.converters get() = listOf<QuantityConverter<PhysicalQuantity.VolumetricFlow, *, *>>(
+    QuantityConverter("Area from Volumetric Flux", QuantityConverter.Type.Division, PhysicalQuantity.VolumetricFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricVolumetricFlow && rightUnit is MetricVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolumetricFlow && rightUnit is ImperialVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolumetricFlow && rightUnit is UKImperialVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolumetricFlow && rightUnit is USCustomaryVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolumetricFlow && rightUnit is ImperialVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolumetricFlow && rightUnit is UKImperialVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolumetricFlow && rightUnit is ImperialVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolumetricFlow && rightUnit is USCustomaryVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is VolumetricFlow && rightUnit is VolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Volume from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricVolumetricFlow && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolumetricFlow && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolumetricFlow && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolumetricFlow && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is VolumetricFlow && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Volumetric Flux from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricVolumetricFlow && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolumetricFlow && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolumetricFlow && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolumetricFlow && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is VolumetricFlow && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFluxConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFluxConverters.kt
new file mode 100644
index 000000000..a1a451476
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFluxConverters.kt
@@ -0,0 +1,43 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.volumetricFlux.times
+import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.ImperialArea
+import com.splendo.kaluga.scientific.unit.ImperialVolumetricFlux
+import com.splendo.kaluga.scientific.unit.MetricArea
+import com.splendo.kaluga.scientific.unit.MetricVolumetricFlux
+import com.splendo.kaluga.scientific.unit.UKImperialVolumetricFlux
+import com.splendo.kaluga.scientific.unit.USCustomaryVolumetricFlux
+import com.splendo.kaluga.scientific.unit.VolumetricFlux
+
+val PhysicalQuantity.VolumetricFlux.converters get() = listOf<QuantityConverter<PhysicalQuantity.VolumetricFlux, *, *>>(
+    QuantityConverter("Volumetric Flow from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricVolumetricFlux && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialVolumetricFlux && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialVolumetricFlux && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryVolumetricFlux && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is VolumetricFlux && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/WeightConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/WeightConverters.kt
new file mode 100644
index 000000000..eed3e3b48
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/WeightConverters.kt
@@ -0,0 +1,238 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.weight.div
+import com.splendo.kaluga.scientific.converter.weight.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<PhysicalQuantity.Weight, *, *>>(
+    QuantityConverter("Amount of Substance from Molality", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Weight && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Amount of Substance from Molar Mass", QuantityConverter.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Weight && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Area from Area Density", QuantityConverter.Type.Division, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is UKImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is USCustomaryAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is UKImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is USCustomaryAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is AreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Area Density from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Density from Volume", QuantityConverter.Type.Division, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is UKImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is USCustomaryVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is UKImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is USCustomaryVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is Volume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Ionizing Radiation Absorbed Dose", QuantityConverter.Type.Multiplication, PhysicalQuantity.IonizingRadiationAbsorbedDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Gram && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gram && rightUnit is RadMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is IonizingRadiationAbsorbedDose -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is IonizingRadiationAbsorbedDose -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is IonizingRadiationAbsorbedDose -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is IonizingRadiationAbsorbedDose -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Ionizing Radiation Equivalent Dose", QuantityConverter.Type.Multiplication, PhysicalQuantity.IonizingRadiationEquivalentDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Gram && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Gram && rightUnit is RoentgenEquivalentManMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is IonizingRadiationEquivalentDose -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is IonizingRadiationEquivalentDose -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is IonizingRadiationEquivalentDose -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is IonizingRadiationEquivalentDose -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Energy from Specific Energy", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is UKImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is USCustomarySpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is UKImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is USCustomarySpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is SpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Force from Acceleration", QuantityConverter.Type.Multiplication, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Gram && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is MetricWeight && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Pound && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Ounce && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Grain && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UsTon && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialTon && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is Acceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Heat Capacity from Specific Heat Capacity", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is USCustomarySpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is USCustomarySpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is SpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Length from Linear Mass Density", QuantityConverter.Type.Division, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is UKImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is USCustomaryLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is UKImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is USCustomaryLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is LinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Linear Mass Density from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is Length -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Mass Flow Rate from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Molar Mass from Amount of Substance", QuantityConverter.Type.Division, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Momentum from Speed", QuantityConverter.Type.Multiplication, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is Speed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Time from Mass Flow Rate", QuantityConverter.Type.Division, PhysicalQuantity.MassFlowRate) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Weight && rightUnit is MassFlowRate -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Volume from Density", QuantityConverter.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Volume from Specific Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is UKImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is USCustomarySpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Yank from Jolt", QuantityConverter.Type.Multiplication, PhysicalQuantity.Jolt) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricWeight && rightUnit is MetricJolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialWeight && rightUnit is ImperialJolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialWeight && rightUnit is ImperialJolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryWeight && rightUnit is ImperialJolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Weight && rightUnit is Jolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/YankConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/YankConverters.kt
new file mode 100644
index 000000000..d7e48bdd1
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/YankConverters.kt
@@ -0,0 +1,74 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.yank.div
+import com.splendo.kaluga.scientific.converter.yank.times
+import com.splendo.kaluga.scientific.unit.ImperialJolt
+import com.splendo.kaluga.scientific.unit.ImperialWeight
+import com.splendo.kaluga.scientific.unit.ImperialYank
+import com.splendo.kaluga.scientific.unit.Jolt
+import com.splendo.kaluga.scientific.unit.MetricJolt
+import com.splendo.kaluga.scientific.unit.MetricWeight
+import com.splendo.kaluga.scientific.unit.MetricYank
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.UKImperialWeight
+import com.splendo.kaluga.scientific.unit.UKImperialYank
+import com.splendo.kaluga.scientific.unit.USCustomaryWeight
+import com.splendo.kaluga.scientific.unit.USCustomaryYank
+import com.splendo.kaluga.scientific.unit.Weight
+import com.splendo.kaluga.scientific.unit.Yank
+
+val PhysicalQuantity.Yank.converters get() = listOf<QuantityConverter<PhysicalQuantity.Yank, *, *>>(
+    QuantityConverter("Force from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricYank && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialYank && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialYank && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryYank && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Yank && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Jolt from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricYank && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialYank && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialYank && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialYank && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialYank && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialYank && rightUnit is UKImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryYank && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryYank && rightUnit is USCustomaryWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Yank && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverter("Weight from Jolt", QuantityConverter.Type.Division, PhysicalQuantity.Jolt) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricYank && rightUnit is MetricJolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialYank && rightUnit is ImperialJolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialYank && rightUnit is ImperialJolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryYank && rightUnit is ImperialJolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Yank && rightUnit is Jolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
index f31a0c593..6af2b2c4c 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
@@ -40,8 +40,8 @@ import kotlinx.coroutines.flow.map
 sealed class ScientificConverterNavigationAction<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
     object Close : ScientificConverterNavigationAction<Unit>(Unit, NavigationBundleSpecType.UnitType)
     sealed class SelectUnit(quantity: PhysicalQuantity) : ScientificConverterNavigationAction<PhysicalQuantity>(quantity, NavigationBundleSpecType.SerializedType(PhysicalQuantity.serializer())) {
-        data class Left(val quantity: PhysicalQuantity): SelectUnit(quantity)
-        data class Right(val quantity: PhysicalQuantity): SelectUnit(quantity)
+        data class Left(val quantity: PhysicalQuantity) : SelectUnit(quantity)
+        data class Right(val quantity: PhysicalQuantity) : SelectUnit(quantity)
     }
 }
 
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionViewModel.kt
index 1fbc3b727..4b581e4de 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificUnitSelectionViewModel.kt
@@ -28,16 +28,14 @@ import com.splendo.kaluga.example.shared.model.scientific.quantityDetails
 import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.resources.view.KalugaButton
 import com.splendo.kaluga.scientific.PhysicalQuantity
-import com.splendo.kaluga.scientific.unit.ScientificUnit
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
 sealed class ScientificUnitSelectionAction<T>(value: T, type: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, type) {
     object Cancelled : ScientificUnitSelectionAction<Unit>(Unit, NavigationBundleSpecType.UnitType)
-    data class DidSelect(val index:Int) : ScientificUnitSelectionAction<Int>(index, NavigationBundleSpecType.IntegerType)
+    data class DidSelect(val index: Int) : ScientificUnitSelectionAction<Int>(index, NavigationBundleSpecType.IntegerType)
 }
 
 class ScientificUnitSelectionViewModel(
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
index 59c446a02..501fe5483 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
@@ -46,8 +46,8 @@ import kotlinx.coroutines.launch
 
 sealed class ScientificNavigationAction<T>(value: T, spec: NavigationBundleSpecType<T>) : SingleValueNavigationAction<T>(value, spec) {
     sealed class SelectUnit(quantity: PhysicalQuantity) : ScientificNavigationAction<PhysicalQuantity>(quantity, NavigationBundleSpecType.SerializedType(PhysicalQuantity.serializer())) {
-        data class Left(val quantity: PhysicalQuantity): SelectUnit(quantity)
-        data class Right(val quantity: PhysicalQuantity): SelectUnit(quantity)
+        data class Left(val quantity: PhysicalQuantity) : SelectUnit(quantity)
+        data class Right(val quantity: PhysicalQuantity) : SelectUnit(quantity)
     }
     data class Converter(val quantity: PhysicalQuantity, val index: Int) : ScientificNavigationAction<ScientificConverterViewModel.Arguments>(
         ScientificConverterViewModel.Arguments(quantity, index),
@@ -55,8 +55,6 @@ sealed class ScientificNavigationAction<T>(value: T, spec: NavigationBundleSpecT
     )
 }
 
-
-
 class ScientificViewModel(
     val alertPresenterBuilder: BaseAlertPresenter.Builder,
     navigator: Navigator<ScientificNavigationAction<*>>
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterNavigator.kt
index e3ae24b5c..08739282d 100644
--- a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterNavigator.kt
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterNavigator.kt
@@ -26,8 +26,8 @@ fun ScientificConverterNavigator(
     onClose: () -> Unit
 ) = DefaultNavigator<ScientificConverterNavigationAction<*>> { action ->
     when (action) {
-        is ScientificConverterNavigationAction.SelectUnit.Left-> onSelectLeftUnit(action.value)
-        is ScientificConverterNavigationAction.SelectUnit.Right-> onSelectRightUnit(action.value)
+        is ScientificConverterNavigationAction.SelectUnit.Left -> onSelectLeftUnit(action.value)
+        is ScientificConverterNavigationAction.SelectUnit.Right -> onSelectRightUnit(action.value)
         is ScientificConverterNavigationAction.Close -> onClose()
     }
 }
diff --git a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificNavigator.kt b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificNavigator.kt
index bec704ec7..e150c924a 100644
--- a/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificNavigator.kt
+++ b/example/shared/src/iosMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificNavigator.kt
@@ -26,8 +26,8 @@ fun ScientificNavigator(
     onConverter: (ScientificConverterViewModel.Arguments) -> Unit
 ) = DefaultNavigator<ScientificNavigationAction<*>> { action ->
     when (action) {
-        is ScientificNavigationAction.SelectUnit.Left-> onSelectLeftUnit(action.value)
-        is ScientificNavigationAction.SelectUnit.Right-> onSelectRightUnit(action.value)
+        is ScientificNavigationAction.SelectUnit.Left -> onSelectLeftUnit(action.value)
+        is ScientificNavigationAction.SelectUnit.Right -> onSelectRightUnit(action.value)
         is ScientificNavigationAction.Converter -> onConverter(action.value)
     }
 }
diff --git a/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificVolume.kt b/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificVolume.kt
index 05779ea2d..0f0921a62 100644
--- a/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificVolume.kt
+++ b/scientific/src/commonMain/kotlin/converter/molality/convertToSpecificVolume.kt
@@ -78,7 +78,7 @@ infix operator fun <MolalityUnit : Molality, MolarVolumeUnit : MolarVolume> Scie
     molarVolume: ScientificValue<PhysicalQuantity.MolarVolume, MolarVolumeUnit>
 ) = molarVolume * this
 
-@JvmName("metricMolalityDivMetricMolality")
+@JvmName("metricMolalityDivMetricMolarity")
 infix operator fun ScientificValue<PhysicalQuantity.Molality, MetricMolality>.div(molarity: ScientificValue<PhysicalQuantity.Molarity, MetricMolarity>) =
     (molarity.unit.per per unit.per).specificVolume(this, molarity)
 
diff --git a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarEnergy.kt b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarMass.kt
similarity index 69%
rename from scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarEnergy.kt
rename to scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarMass.kt
index 7c3e3c7ff..f162b13dc 100644
--- a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarEnergy.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarMass.kt
@@ -31,26 +31,6 @@ import com.splendo.kaluga.scientific.unit.USCustomarySpecificEnergy
 import com.splendo.kaluga.scientific.unit.per
 import kotlin.jvm.JvmName
 
-@JvmName("metricAndImperialMolarEnergyDivMetricSpecificEnergy")
-infix operator fun ScientificValue<PhysicalQuantity.MolarEnergy, MetricAndImperialMolarEnergy>.div(
-    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, MetricSpecificEnergy>
-) = (specificEnergy.unit.per per unit.per).molarMass(this, specificEnergy)
-
-@JvmName("metricAndImperialMolarEnergyDivImperialSpecificEnergy")
-infix operator fun ScientificValue<PhysicalQuantity.MolarEnergy, MetricAndImperialMolarEnergy>.div(
-    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, ImperialSpecificEnergy>
-) = (specificEnergy.unit.per per unit.per).molarMass(this, specificEnergy)
-
-@JvmName("metricAndImperialMolarEnergyDivUKImperialSpecificEnergy")
-infix operator fun ScientificValue<PhysicalQuantity.MolarEnergy, MetricAndImperialMolarEnergy>.div(
-    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, UKImperialSpecificEnergy>
-) = (specificEnergy.unit.per per unit.per).molarMass(this, specificEnergy)
-
-@JvmName("metricAndImperialMolarEnergyDivUSCustomarySpecificEnergy")
-infix operator fun ScientificValue<PhysicalQuantity.MolarEnergy, MetricAndImperialMolarEnergy>.div(
-    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, USCustomarySpecificEnergy>
-) = (specificEnergy.unit.per per unit.per).molarMass(this, specificEnergy)
-
 @JvmName("molarEnergyDivMetricSpecificEnergy")
 infix operator fun <MolarEnergyUnit : MolarEnergy> ScientificValue<PhysicalQuantity.MolarEnergy, MolarEnergyUnit>.div(
     specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, MetricSpecificEnergy>
diff --git a/scientific/src/commonMain/kotlin/converter/solidAngle/convertToIlluminance.kt b/scientific/src/commonMain/kotlin/converter/solidAngle/convertToIlluminance.kt
index 3dae0db1f..f2b58a78c 100644
--- a/scientific/src/commonMain/kotlin/converter/solidAngle/convertToIlluminance.kt
+++ b/scientific/src/commonMain/kotlin/converter/solidAngle/convertToIlluminance.kt
@@ -33,7 +33,7 @@ infix operator fun <SolidAngleUnit : SolidAngle> ScientificValue<PhysicalQuantit
     luminance: ScientificValue<PhysicalQuantity.Luminance, Stilb>
 ) = luminance * this
 
-@JvmName("solidAngleTimesLambertTimes")
+@JvmName("solidAngleTimesLambert")
 infix operator fun <SolidAngleUnit : SolidAngle> ScientificValue<PhysicalQuantity.SolidAngle, SolidAngleUnit>.times(
     luminance: ScientificValue<PhysicalQuantity.Luminance, Lambert>
 ) = luminance * this
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToForce.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToForce.kt
index a03f88092..48e8b8a2f 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToForce.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToForce.kt
@@ -45,7 +45,7 @@ import com.splendo.kaluga.scientific.unit.ukImperial
 import com.splendo.kaluga.scientific.unit.usCustomary
 import kotlin.jvm.JvmName
 
-@JvmName("gramTimesAcceleration")
+@JvmName("gramTimesMetricAcceleration")
 infix operator fun ScientificValue<PhysicalQuantity.Weight, Gram>.times(acceleration: ScientificValue<PhysicalQuantity.Acceleration, MetricAcceleration>) =
     Dyne.force(this, acceleration)
 
@@ -54,23 +54,23 @@ infix operator fun <WeightUnit : MetricWeight> ScientificValue<PhysicalQuantity.
     acceleration: ScientificValue<PhysicalQuantity.Acceleration, MetricAcceleration>
 ) = Newton.force(this, acceleration)
 
-@JvmName("poundTimesAcceleration")
+@JvmName("poundTimesImperialAcceleration")
 infix operator fun ScientificValue<PhysicalQuantity.Weight, Pound>.times(acceleration: ScientificValue<PhysicalQuantity.Acceleration, ImperialAcceleration>) =
     PoundForce.force(this, acceleration)
 
-@JvmName("ounceTimesAcceleration")
+@JvmName("ounceTimesImperialAcceleration")
 infix operator fun ScientificValue<PhysicalQuantity.Weight, Ounce>.times(acceleration: ScientificValue<PhysicalQuantity.Acceleration, ImperialAcceleration>) =
     OunceForce.force(this, acceleration)
 
-@JvmName("grainTimesAcceleration")
+@JvmName("grainTimesImperialAcceleration")
 infix operator fun ScientificValue<PhysicalQuantity.Weight, Grain>.times(acceleration: ScientificValue<PhysicalQuantity.Acceleration, ImperialAcceleration>) =
     GrainForce.force(this, acceleration)
 
-@JvmName("usTonTimesAcceleration")
+@JvmName("usTonTimesImperialAcceleration")
 infix operator fun ScientificValue<PhysicalQuantity.Weight, UsTon>.times(acceleration: ScientificValue<PhysicalQuantity.Acceleration, ImperialAcceleration>) =
     UsTonForce.force(this, acceleration)
 
-@JvmName("imperialTonTimesAcceleration")
+@JvmName("imperialTonTimesImperialAcceleration")
 infix operator fun ScientificValue<PhysicalQuantity.Weight, ImperialTon>.times(acceleration: ScientificValue<PhysicalQuantity.Acceleration, ImperialAcceleration>) =
     ImperialTonForce.force(this, acceleration)
 
diff --git a/scientific/src/commonMain/kotlin/converter/weight/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/weight/convertToTime.kt
index f3944c276..9f425ce97 100644
--- a/scientific/src/commonMain/kotlin/converter/weight/convertToTime.kt
+++ b/scientific/src/commonMain/kotlin/converter/weight/convertToTime.kt
@@ -20,48 +20,10 @@ package com.splendo.kaluga.scientific.converter.weight
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.time.time
-import com.splendo.kaluga.scientific.unit.ImperialMassFlowRate
-import com.splendo.kaluga.scientific.unit.ImperialWeight
 import com.splendo.kaluga.scientific.unit.MassFlowRate
-import com.splendo.kaluga.scientific.unit.MetricMassFlowRate
-import com.splendo.kaluga.scientific.unit.MetricWeight
-import com.splendo.kaluga.scientific.unit.UKImperialMassFlowRate
-import com.splendo.kaluga.scientific.unit.UKImperialWeight
-import com.splendo.kaluga.scientific.unit.USCustomaryMassFlowRate
-import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.Weight
 import kotlin.jvm.JvmName
 
-@JvmName("metricWeightDivMetricMassFlowRate")
-infix operator fun <WeightUnit : MetricWeight> ScientificValue<PhysicalQuantity.Weight, WeightUnit>.div(
-    massFlowRate: ScientificValue<PhysicalQuantity.MassFlowRate, MetricMassFlowRate>
-) = massFlowRate.unit.per.time(this, massFlowRate)
-
-@JvmName("imperialWeightDivImperialMassFlowRate")
-infix operator fun <WeightUnit : ImperialWeight> ScientificValue<PhysicalQuantity.Weight, WeightUnit>.div(
-    massFlowRate: ScientificValue<PhysicalQuantity.MassFlowRate, ImperialMassFlowRate>
-) = massFlowRate.unit.per.time(this, massFlowRate)
-
-@JvmName("ukImperialWeightDivImperialMassFlowRate")
-infix operator fun <WeightUnit : UKImperialWeight> ScientificValue<PhysicalQuantity.Weight, WeightUnit>.div(
-    massFlowRate: ScientificValue<PhysicalQuantity.MassFlowRate, ImperialMassFlowRate>
-) = massFlowRate.unit.per.time(this, massFlowRate)
-
-@JvmName("ukImperialWeightDivUKImperialMassFlowRate")
-infix operator fun <WeightUnit : UKImperialWeight> ScientificValue<PhysicalQuantity.Weight, WeightUnit>.div(
-    massFlowRate: ScientificValue<PhysicalQuantity.MassFlowRate, UKImperialMassFlowRate>
-) = massFlowRate.unit.per.time(this, massFlowRate)
-
-@JvmName("usCustomaryWeightDivImperialMassFlowRate")
-infix operator fun <WeightUnit : USCustomaryWeight> ScientificValue<PhysicalQuantity.Weight, WeightUnit>.div(
-    massFlowRate: ScientificValue<PhysicalQuantity.MassFlowRate, ImperialMassFlowRate>
-) = massFlowRate.unit.per.time(this, massFlowRate)
-
-@JvmName("usCustomaryWeightDivUSCustomaryMassFlowRate")
-infix operator fun <WeightUnit : USCustomaryWeight> ScientificValue<PhysicalQuantity.Weight, WeightUnit>.div(
-    massFlowRate: ScientificValue<PhysicalQuantity.MassFlowRate, USCustomaryMassFlowRate>
-) = massFlowRate.unit.per.time(this, massFlowRate)
-
 @JvmName("weightDivMassFlowRate")
 infix operator fun <WeightUnit : Weight, MassFlowRateUnit : MassFlowRate> ScientificValue<PhysicalQuantity.Weight, WeightUnit>.div(
     massFlowRate: ScientificValue<PhysicalQuantity.MassFlowRate, MassFlowRateUnit>

From 4a467a8929e1065d198a0d04f725a44d08ff7366 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Sun, 15 Jan 2023 00:09:56 +0100
Subject: [PATCH 076/227] Added missing converters

---
 .../model/scientific/scientificUnitName.kt    |  1 +
 ...omDynamicViscosityAndKinematicViscosity.kt | 50 ++++++++++++
 .../density/convertToDynamicViscosity.kt      | 56 +++++++++++++
 ...convertFromKinematicViscosityAndDensity.kt | 50 ++++++++++++
 .../dynamicViscosity/convertToDensity.kt      | 49 +++++++++++
 .../convertToKinematicViscosity.kt            | 81 +++++++++++++++++++
 .../convertFromDynamicViscosityAndDensity.kt  | 50 ++++++++++++
 .../convertFromSpecificEnergyAndTime.kt       | 50 ++++++++++++
 .../convertToDynamicViscosity.kt              | 61 ++++++++++++++
 .../convertToSpecificEnergy.kt                | 47 +++++++++++
 .../kinematicViscosity/convertToTime.kt       | 30 +++++++
 .../molarEnergy/convertToMolarMass.kt         |  1 -
 .../convertFromKinematicViscosityAndTime.kt   | 50 ++++++++++++
 .../convertToKinematicViscosity.kt            | 49 +++++++++++
 ...FromKinematicViscosityAndSpecificEnergy.kt | 50 ++++++++++++
 .../time/convertToKinematicViscosity.kt       | 49 +++++++++++
 .../kotlin/unit/HeatCapacityUnit.kt           |  2 +-
 .../commonMain/kotlin/unit/MolarEnergyUnit.kt |  2 +-
 .../kotlin/unit/SpecificEnergyUnit.kt         |  2 +-
 .../kotlin/unit/SpecificHeatCapacityUnit.kt   |  2 +-
 .../kotlin/unit/ThermalResistanceUnit.kt      |  2 +-
 .../commonTest/kotlin/unit/DensityUnitTest.kt | 10 +++
 .../kotlin/unit/DynamicViscosityTest.kt       | 20 +++++
 .../kotlin/unit/KinematicViscosityTest.kt     | 39 ++++++++-
 .../kotlin/unit/SpecificEnergyUnitTest.kt     |  7 ++
 .../commonTest/kotlin/unit/TimeUnitTest.kt    |  6 ++
 26 files changed, 806 insertions(+), 10 deletions(-)
 create mode 100644 scientific/src/commonMain/kotlin/converter/density/convertFromDynamicViscosityAndKinematicViscosity.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/density/convertToDynamicViscosity.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromKinematicViscosityAndDensity.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToDensity.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToKinematicViscosity.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertFromDynamicViscosityAndDensity.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertFromSpecificEnergyAndTime.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToDynamicViscosity.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToSpecificEnergy.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToTime.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromKinematicViscosityAndTime.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/specificEnergy/convertToKinematicViscosity.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/time/convertFromKinematicViscosityAndSpecificEnergy.kt
 create mode 100644 scientific/src/commonMain/kotlin/converter/time/convertToKinematicViscosity.kt

diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/scientificUnitName.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/scientificUnitName.kt
index fd64359c2..620262a4b 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/scientificUnitName.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/scientificUnitName.kt
@@ -31,6 +31,7 @@ val ScientificUnit<*>.name: String get() = when (this) {
     is ImperialMetricAndImperialPowerWrapper -> "${metricAndImperialPower.name} (Imperial)"
     is HeatCapacity -> "${energy.name} per ${per.name}"
     is Jolt -> "${acceleration.name} per ${per.name}"
+    is KinematicViscosity -> "${area.name} per ${time.name}"
     is LinearMassDensity -> "${weight.name} per ${per.name}"
     is LuminousEnergy -> "${luminousFlux.name}-${time.name}"
     is LuminousExposure -> "${illuminance.name}-${time.name}"
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertFromDynamicViscosityAndKinematicViscosity.kt b/scientific/src/commonMain/kotlin/converter/density/convertFromDynamicViscosityAndKinematicViscosity.kt
new file mode 100644
index 000000000..cdc640b6f
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/density/convertFromDynamicViscosityAndKinematicViscosity.kt
@@ -0,0 +1,50 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.density
+
+import com.splendo.kaluga.base.utils.Decimal
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.byDividing
+import com.splendo.kaluga.scientific.unit.Density
+import com.splendo.kaluga.scientific.unit.DynamicViscosity
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
+import kotlin.jvm.JvmName
+
+@JvmName("densityFromDynamicViscosityAndKinematicViscosityDefault")
+fun <
+    DensityUnit : Density,
+    DynamicViscosityUnit : DynamicViscosity,
+    KinematicViscosityUnit : KinematicViscosity
+    > DensityUnit.density(
+    dynamicViscosity: ScientificValue<PhysicalQuantity.DynamicViscosity, DynamicViscosityUnit>,
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>
+) = density(dynamicViscosity, kinematicViscosity, ::DefaultScientificValue)
+
+@JvmName("densityFromDynamicViscosityAndKinematicViscosity")
+fun <
+    DensityUnit : Density,
+    DynamicViscosityUnit : DynamicViscosity,
+    KinematicViscosityUnit : KinematicViscosity,
+    Value : ScientificValue<PhysicalQuantity.Density, DensityUnit>
+    > DensityUnit.density(
+    dynamicViscosity: ScientificValue<PhysicalQuantity.DynamicViscosity, DynamicViscosityUnit>,
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>,
+    factory: (Decimal, DensityUnit) -> Value
+) = byDividing(dynamicViscosity, kinematicViscosity, factory)
diff --git a/scientific/src/commonMain/kotlin/converter/density/convertToDynamicViscosity.kt b/scientific/src/commonMain/kotlin/converter/density/convertToDynamicViscosity.kt
new file mode 100644
index 000000000..96c7366ed
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/density/convertToDynamicViscosity.kt
@@ -0,0 +1,56 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.density
+
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.converter.kinematicViscosity.times
+import com.splendo.kaluga.scientific.unit.Density
+import com.splendo.kaluga.scientific.unit.ImperialDensity
+import com.splendo.kaluga.scientific.unit.ImperialKinematicViscosity
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
+import com.splendo.kaluga.scientific.unit.MetricDensity
+import com.splendo.kaluga.scientific.unit.MetricKinematicViscosity
+import com.splendo.kaluga.scientific.unit.UKImperialDensity
+import com.splendo.kaluga.scientific.unit.USCustomaryDensity
+import kotlin.jvm.JvmName
+
+@JvmName("metricDensityTimesMetricKinematicViscosity")
+infix operator fun ScientificValue<PhysicalQuantity.Density, MetricDensity>.times(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, MetricKinematicViscosity>
+) = kinematicViscosity * this
+
+@JvmName("imperialDensityTimesImperialKinematicViscosity")
+infix operator fun ScientificValue<PhysicalQuantity.Density, ImperialDensity>.times(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, ImperialKinematicViscosity>
+) = kinematicViscosity * this
+
+@JvmName("ukImperialDensityTimesImperialKinematicViscosity")
+infix operator fun ScientificValue<PhysicalQuantity.Density, UKImperialDensity>.times(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, ImperialKinematicViscosity>
+) = kinematicViscosity * this
+
+@JvmName("usCustomaryDensityTimesImperialKinematicViscosity")
+infix operator fun ScientificValue<PhysicalQuantity.Density, USCustomaryDensity>.times(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, ImperialKinematicViscosity>
+) = kinematicViscosity * this
+
+@JvmName("densityTimesKinematicViscosity")
+infix operator fun <DensityUnit : Density, KinematicViscosityUnit : KinematicViscosity> ScientificValue<PhysicalQuantity.Density, DensityUnit>.times(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>
+) = kinematicViscosity * this
diff --git a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromKinematicViscosityAndDensity.kt b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromKinematicViscosityAndDensity.kt
new file mode 100644
index 000000000..7f729a65d
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertFromKinematicViscosityAndDensity.kt
@@ -0,0 +1,50 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.dynamicViscosity
+
+import com.splendo.kaluga.base.utils.Decimal
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.byMultiplying
+import com.splendo.kaluga.scientific.unit.Density
+import com.splendo.kaluga.scientific.unit.DynamicViscosity
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
+import kotlin.jvm.JvmName
+
+@JvmName("dynamicViscosityFromKinematicViscosityAndDensityDefault")
+fun <
+    DynamicViscosityUnit : DynamicViscosity,
+    DensityUnit : Density,
+    KinematicViscosityUnit : KinematicViscosity
+    > DynamicViscosityUnit.dynamicViscosity(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>,
+    density: ScientificValue<PhysicalQuantity.Density, DensityUnit>
+) = dynamicViscosity(kinematicViscosity, density, ::DefaultScientificValue)
+
+@JvmName("dynamicViscosityFromKinematicViscosityAndDensity")
+fun <
+    DynamicViscosityUnit : DynamicViscosity,
+    DensityUnit : Density,
+    KinematicViscosityUnit : KinematicViscosity,
+    Value : ScientificValue<PhysicalQuantity.DynamicViscosity, DynamicViscosityUnit>
+    > DynamicViscosityUnit.dynamicViscosity(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>,
+    density: ScientificValue<PhysicalQuantity.Density, DensityUnit>,
+    factory: (Decimal, DynamicViscosityUnit) -> Value
+) = byMultiplying(kinematicViscosity, density, factory)
diff --git a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToDensity.kt b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToDensity.kt
new file mode 100644
index 000000000..54d2c6ee9
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToDensity.kt
@@ -0,0 +1,49 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.dynamicViscosity
+
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.converter.density.density
+import com.splendo.kaluga.scientific.unit.*
+import kotlin.jvm.JvmName
+
+@JvmName("metricDynamicViscosityDivMetricKinematicViscosity")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, MetricDynamicViscosity>.div(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, MetricKinematicViscosity>
+) = (Kilogram per CubicMeter).density(this, kinematicViscosity)
+
+@JvmName("imperialDynamicViscosityDivImperialKinematicViscosity")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, ImperialDynamicViscosity>.div(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, ImperialKinematicViscosity>
+) = (Pound per CubicFoot).density(this, kinematicViscosity)
+
+@JvmName("ukImperialDynamicViscosityDivImperialKinematicViscosity")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, UKImperialDynamicViscosity>.div(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, ImperialKinematicViscosity>
+) = (Pound.ukImperial per CubicFoot).density(this, kinematicViscosity)
+
+@JvmName("usCustomaryDynamicViscosityDivImperialKinematicViscosity")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, USCustomaryDynamicViscosity>.div(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, ImperialKinematicViscosity>
+) = (Pound.usCustomary per CubicFoot).density(this, kinematicViscosity)
+
+@JvmName("dynamicViscosityDivKinematicViscosity")
+infix operator fun <DynamicViscosityUnit : DynamicViscosity, DensityUnit : KinematicViscosity> ScientificValue<PhysicalQuantity.DynamicViscosity, DynamicViscosityUnit>.div(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, DensityUnit>
+) = (Kilogram per CubicMeter).density(this, kinematicViscosity)
diff --git a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToKinematicViscosity.kt b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToKinematicViscosity.kt
new file mode 100644
index 000000000..d5b6d02f9
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToKinematicViscosity.kt
@@ -0,0 +1,81 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.dynamicViscosity
+
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.converter.kinematicViscosity.kinematicViscosity
+import com.splendo.kaluga.scientific.unit.Density
+import com.splendo.kaluga.scientific.unit.DynamicViscosity
+import com.splendo.kaluga.scientific.unit.ImperialDensity
+import com.splendo.kaluga.scientific.unit.ImperialDynamicViscosity
+import com.splendo.kaluga.scientific.unit.MetricDensity
+import com.splendo.kaluga.scientific.unit.MetricDynamicViscosity
+import com.splendo.kaluga.scientific.unit.SquareFoot
+import com.splendo.kaluga.scientific.unit.SquareMeter
+import com.splendo.kaluga.scientific.unit.UKImperialDensity
+import com.splendo.kaluga.scientific.unit.UKImperialDynamicViscosity
+import com.splendo.kaluga.scientific.unit.USCustomaryDensity
+import com.splendo.kaluga.scientific.unit.USCustomaryDynamicViscosity
+import com.splendo.kaluga.scientific.unit.per
+import kotlin.jvm.JvmName
+
+@JvmName("metricDynamicViscosityDivMetricDensitu")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, MetricDynamicViscosity>.div(
+    density: ScientificValue<PhysicalQuantity.Density, MetricDensity>
+) = (SquareMeter per unit.time).kinematicViscosity(this, density)
+
+@JvmName("imperialDynamicViscosityDivImperialDensitu")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, ImperialDynamicViscosity>.div(
+    density: ScientificValue<PhysicalQuantity.Density, ImperialDensity>
+) = (SquareFoot per unit.time).kinematicViscosity(this, density)
+
+@JvmName("imperialDynamicViscosityDivUKImperialDensitu")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, ImperialDynamicViscosity>.div(
+    density: ScientificValue<PhysicalQuantity.Density, UKImperialDensity>
+) = (SquareFoot per unit.time).kinematicViscosity(this, density)
+
+@JvmName("imperialDynamicViscosityDivUSCustomaryDensitu")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, ImperialDynamicViscosity>.div(
+    density: ScientificValue<PhysicalQuantity.Density, USCustomaryDensity>
+) = (SquareFoot per unit.time).kinematicViscosity(this, density)
+
+@JvmName("ukImperialDynamicViscosityDivImperialDensitu")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, UKImperialDynamicViscosity>.div(
+    density: ScientificValue<PhysicalQuantity.Density, ImperialDensity>
+) = (SquareFoot per unit.time).kinematicViscosity(this, density)
+
+@JvmName("ukImperialDynamicViscosityDivUKImperialDensitu")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, UKImperialDynamicViscosity>.div(
+    density: ScientificValue<PhysicalQuantity.Density, UKImperialDensity>
+) = (SquareFoot per unit.time).kinematicViscosity(this, density)
+
+@JvmName("usCustomaryDynamicViscosityDivImperialDensitu")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, USCustomaryDynamicViscosity>.div(
+    density: ScientificValue<PhysicalQuantity.Density, ImperialDensity>
+) = (SquareFoot per unit.time).kinematicViscosity(this, density)
+
+@JvmName("usCustomaryDynamicViscosityDivUSCustomaryDensitu")
+infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, USCustomaryDynamicViscosity>.div(
+    density: ScientificValue<PhysicalQuantity.Density, USCustomaryDensity>
+) = (SquareFoot per unit.time).kinematicViscosity(this, density)
+
+@JvmName("dynamicViscosityDivDensitu")
+infix operator fun <DynamicViscosityUnit : DynamicViscosity, DensityUnit : Density> ScientificValue<PhysicalQuantity.DynamicViscosity, DynamicViscosityUnit>.div(
+    density: ScientificValue<PhysicalQuantity.Density, DensityUnit>
+) = (SquareMeter per unit.time).kinematicViscosity(this, density)
diff --git a/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertFromDynamicViscosityAndDensity.kt b/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertFromDynamicViscosityAndDensity.kt
new file mode 100644
index 000000000..19cd00bf5
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertFromDynamicViscosityAndDensity.kt
@@ -0,0 +1,50 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.kinematicViscosity
+
+import com.splendo.kaluga.base.utils.Decimal
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.byDividing
+import com.splendo.kaluga.scientific.unit.Density
+import com.splendo.kaluga.scientific.unit.DynamicViscosity
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
+import kotlin.jvm.JvmName
+
+@JvmName("kinematicViscosityFromDynamicViscosityAndDensityDefault")
+fun <
+    KinematicViscosityUnit : KinematicViscosity,
+    DensityUnit : Density,
+    DynamicViscosityUnit : DynamicViscosity
+    > KinematicViscosityUnit.kinematicViscosity(
+    dynamicViscosity: ScientificValue<PhysicalQuantity.DynamicViscosity, DynamicViscosityUnit>,
+    density: ScientificValue<PhysicalQuantity.Density, DensityUnit>
+) = kinematicViscosity(dynamicViscosity, density, ::DefaultScientificValue)
+
+@JvmName("kinematicViscosityFromDynamicViscosityAndDensity")
+fun <
+    KinematicViscosityUnit : KinematicViscosity,
+    DensityUnit : Density,
+    DynamicViscosityUnit : DynamicViscosity,
+    Value : ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>
+    > KinematicViscosityUnit.kinematicViscosity(
+    dynamicViscosity: ScientificValue<PhysicalQuantity.DynamicViscosity, DynamicViscosityUnit>,
+    density: ScientificValue<PhysicalQuantity.Density, DensityUnit>,
+    factory: (Decimal, KinematicViscosityUnit) -> Value
+) = byDividing(dynamicViscosity, density, factory)
diff --git a/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertFromSpecificEnergyAndTime.kt b/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertFromSpecificEnergyAndTime.kt
new file mode 100644
index 000000000..a18058700
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertFromSpecificEnergyAndTime.kt
@@ -0,0 +1,50 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.kinematicViscosity
+
+import com.splendo.kaluga.base.utils.Decimal
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.byMultiplying
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
+import com.splendo.kaluga.scientific.unit.SpecificEnergy
+import com.splendo.kaluga.scientific.unit.Time
+import kotlin.jvm.JvmName
+
+@JvmName("kinematicViscosityFromSpecificEnergyAndTimeDefault")
+fun <
+    KinematicViscosityUnit : KinematicViscosity,
+    TimeUnit : Time,
+    SpecificEnergyUnit : SpecificEnergy
+    > KinematicViscosityUnit.kinematicViscosity(
+    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, SpecificEnergyUnit>,
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = kinematicViscosity(specificEnergy, time, ::DefaultScientificValue)
+
+@JvmName("kinematicViscosityFromSpecificEnergyAndTime")
+fun <
+    KinematicViscosityUnit : KinematicViscosity,
+    TimeUnit : Time,
+    SpecificEnergyUnit : SpecificEnergy,
+    Value : ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>
+    > KinematicViscosityUnit.kinematicViscosity(
+    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, SpecificEnergyUnit>,
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>,
+    factory: (Decimal, KinematicViscosityUnit) -> Value
+) = byMultiplying(specificEnergy, time, factory)
diff --git a/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToDynamicViscosity.kt b/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToDynamicViscosity.kt
new file mode 100644
index 000000000..f43b484a1
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToDynamicViscosity.kt
@@ -0,0 +1,61 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.kinematicViscosity
+
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.converter.dynamicViscosity.dynamicViscosity
+import com.splendo.kaluga.scientific.unit.Density
+import com.splendo.kaluga.scientific.unit.ImperialDensity
+import com.splendo.kaluga.scientific.unit.ImperialKinematicViscosity
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
+import com.splendo.kaluga.scientific.unit.MetricDensity
+import com.splendo.kaluga.scientific.unit.MetricKinematicViscosity
+import com.splendo.kaluga.scientific.unit.Pascal
+import com.splendo.kaluga.scientific.unit.PoundSquareInch
+import com.splendo.kaluga.scientific.unit.UKImperialDensity
+import com.splendo.kaluga.scientific.unit.USCustomaryDensity
+import com.splendo.kaluga.scientific.unit.ukImperial
+import com.splendo.kaluga.scientific.unit.usCustomary
+import com.splendo.kaluga.scientific.unit.x
+import kotlin.jvm.JvmName
+
+@JvmName("metricKinematicViscosityTimesMetricDensity")
+infix operator fun ScientificValue<PhysicalQuantity.KinematicViscosity, MetricKinematicViscosity>.times(
+    density: ScientificValue<PhysicalQuantity.Density, MetricDensity>
+) = (Pascal x unit.time).dynamicViscosity(this, density)
+
+@JvmName("imperialKinematicViscosityTimesImperialDensity")
+infix operator fun ScientificValue<PhysicalQuantity.KinematicViscosity, ImperialKinematicViscosity>.times(
+    density: ScientificValue<PhysicalQuantity.Density, ImperialDensity>
+) = (PoundSquareInch x unit.time).dynamicViscosity(this, density)
+
+@JvmName("imperialKinematicViscosityTimesUKImperialDensity")
+infix operator fun ScientificValue<PhysicalQuantity.KinematicViscosity, ImperialKinematicViscosity>.times(
+    density: ScientificValue<PhysicalQuantity.Density, UKImperialDensity>
+) = (PoundSquareInch.ukImperial x unit.time).dynamicViscosity(this, density)
+
+@JvmName("imperialKinematicViscosityTimesUSCustomaryDensity")
+infix operator fun ScientificValue<PhysicalQuantity.KinematicViscosity, ImperialKinematicViscosity>.times(
+    density: ScientificValue<PhysicalQuantity.Density, USCustomaryDensity>
+) = (PoundSquareInch.usCustomary x unit.time).dynamicViscosity(this, density)
+
+@JvmName("kinematicViscosityTimesDensity")
+infix operator fun <KinematicViscosityUnit : KinematicViscosity, DensityUnit : Density> ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>.times(
+    density: ScientificValue<PhysicalQuantity.Density, DensityUnit>
+) = (Pascal x unit.time).dynamicViscosity(this, density)
diff --git a/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToSpecificEnergy.kt
new file mode 100644
index 000000000..a01776ac7
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToSpecificEnergy.kt
@@ -0,0 +1,47 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.kinematicViscosity
+
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.converter.specificEnergy.specificEnergy
+import com.splendo.kaluga.scientific.unit.FootPoundForce
+import com.splendo.kaluga.scientific.unit.ImperialKinematicViscosity
+import com.splendo.kaluga.scientific.unit.Joule
+import com.splendo.kaluga.scientific.unit.Kilogram
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
+import com.splendo.kaluga.scientific.unit.MetricKinematicViscosity
+import com.splendo.kaluga.scientific.unit.Pound
+import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.per
+import kotlin.jvm.JvmName
+
+@JvmName("metricKinematicViscosityDivTime")
+infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.KinematicViscosity, MetricKinematicViscosity>.div(
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = (Joule per Kilogram).specificEnergy(this, time)
+
+@JvmName("imperialKinematicViscosityDivTime")
+infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.KinematicViscosity, ImperialKinematicViscosity>.div(
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = (FootPoundForce per Pound).specificEnergy(this, time)
+
+@JvmName("kinematicViscosityDivTime")
+infix operator fun <KinematicViscosityUnit : KinematicViscosity, TimeUnit : Time> ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>.div(
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = (Joule per Kilogram).specificEnergy(this, time)
diff --git a/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToTime.kt b/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToTime.kt
new file mode 100644
index 000000000..4712c23e3
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/kinematicViscosity/convertToTime.kt
@@ -0,0 +1,30 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.kinematicViscosity
+
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.converter.time.time
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
+import com.splendo.kaluga.scientific.unit.SpecificEnergy
+import kotlin.jvm.JvmName
+
+@JvmName("kinematicViscosityDivSpecificEnergy")
+infix operator fun <KinematicViscosityUnit : KinematicViscosity, SpecificEnergyUnit : SpecificEnergy> ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>.div(
+    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, SpecificEnergyUnit>
+) = unit.time.time(this, specificEnergy)
diff --git a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarMass.kt b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarMass.kt
index f162b13dc..790042adc 100644
--- a/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarMass.kt
+++ b/scientific/src/commonMain/kotlin/converter/molarEnergy/convertToMolarMass.kt
@@ -22,7 +22,6 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.molarMass.molarMass
 import com.splendo.kaluga.scientific.unit.ImperialSpecificEnergy
 import com.splendo.kaluga.scientific.unit.Kilogram
-import com.splendo.kaluga.scientific.unit.MetricAndImperialMolarEnergy
 import com.splendo.kaluga.scientific.unit.MetricSpecificEnergy
 import com.splendo.kaluga.scientific.unit.MolarEnergy
 import com.splendo.kaluga.scientific.unit.SpecificEnergy
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromKinematicViscosityAndTime.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromKinematicViscosityAndTime.kt
new file mode 100644
index 000000000..7da7f9e9a
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertFromKinematicViscosityAndTime.kt
@@ -0,0 +1,50 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.specificEnergy
+
+import com.splendo.kaluga.base.utils.Decimal
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.byDividing
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
+import com.splendo.kaluga.scientific.unit.SpecificEnergy
+import com.splendo.kaluga.scientific.unit.Time
+import kotlin.jvm.JvmName
+
+@JvmName("specificEnergyFromKinematicViscosityAndTimeDefault")
+fun <
+    SpecificEnergyUnit : SpecificEnergy,
+    TimeUnit : Time,
+    KinematicViscosityUnit : KinematicViscosity
+    > SpecificEnergyUnit.specificEnergy(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>,
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = specificEnergy(kinematicViscosity, time, ::DefaultScientificValue)
+
+@JvmName("specificEnergyFromKinematicViscosityAndTime")
+fun <
+    SpecificEnergyUnit : SpecificEnergy,
+    TimeUnit : Time,
+    KinematicViscosityUnit : KinematicViscosity,
+    Value : ScientificValue<PhysicalQuantity.SpecificEnergy, SpecificEnergyUnit>
+    > SpecificEnergyUnit.specificEnergy(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>,
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>,
+    factory: (Decimal, SpecificEnergyUnit) -> Value
+) = byDividing(kinematicViscosity, time, factory)
diff --git a/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToKinematicViscosity.kt b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToKinematicViscosity.kt
new file mode 100644
index 000000000..8902b5895
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/specificEnergy/convertToKinematicViscosity.kt
@@ -0,0 +1,49 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.specificEnergy
+
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.converter.kinematicViscosity.kinematicViscosity
+import com.splendo.kaluga.scientific.unit.*
+import kotlin.jvm.JvmName
+
+@JvmName("metricSpecificEnergyTimesTime")
+infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.SpecificEnergy, MetricSpecificEnergy>.times(
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = (SquareMeter per time.unit).kinematicViscosity(this, time)
+
+@JvmName("imperialSpecificEnergyTimesTime")
+infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.SpecificEnergy, ImperialSpecificEnergy>.times(
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = (SquareFoot per time.unit).kinematicViscosity(this, time)
+
+@JvmName("ukImperialSpecificEnergyTimesTime")
+infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.SpecificEnergy, UKImperialSpecificEnergy>.times(
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = (SquareFoot per time.unit).kinematicViscosity(this, time)
+
+@JvmName("usCustomarySpecificEnergyTimesTime")
+infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.SpecificEnergy, USCustomarySpecificEnergy>.times(
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = (SquareFoot per time.unit).kinematicViscosity(this, time)
+
+@JvmName("specificEnergyTimesTime")
+infix operator fun <SpecificEnergyUnit : SpecificEnergy, TimeUnit : Time> ScientificValue<PhysicalQuantity.SpecificEnergy, SpecificEnergyUnit>.times(
+    time: ScientificValue<PhysicalQuantity.Time, TimeUnit>
+) = (SquareMeter per time.unit).kinematicViscosity(this, time)
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertFromKinematicViscosityAndSpecificEnergy.kt b/scientific/src/commonMain/kotlin/converter/time/convertFromKinematicViscosityAndSpecificEnergy.kt
new file mode 100644
index 000000000..9e3cf28ff
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/time/convertFromKinematicViscosityAndSpecificEnergy.kt
@@ -0,0 +1,50 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.time
+
+import com.splendo.kaluga.base.utils.Decimal
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.byDividing
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
+import com.splendo.kaluga.scientific.unit.SpecificEnergy
+import com.splendo.kaluga.scientific.unit.Time
+import kotlin.jvm.JvmName
+
+@JvmName("timeFromKinematicViscosityAndSpecificEnergyDefault")
+fun <
+    SpecificEnergyUnit : SpecificEnergy,
+    TimeUnit : Time,
+    KinematicViscosityUnit : KinematicViscosity
+    > TimeUnit.time(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>,
+    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, SpecificEnergyUnit>
+) = time(kinematicViscosity, specificEnergy, ::DefaultScientificValue)
+
+@JvmName("timeFromKinematicViscosityAndSpecificEnergy")
+fun <
+    SpecificEnergyUnit : SpecificEnergy,
+    TimeUnit : Time,
+    KinematicViscosityUnit : KinematicViscosity,
+    Value : ScientificValue<PhysicalQuantity.Time, TimeUnit>
+    > TimeUnit.time(
+    kinematicViscosity: ScientificValue<PhysicalQuantity.KinematicViscosity, KinematicViscosityUnit>,
+    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, SpecificEnergyUnit>,
+    factory: (Decimal, TimeUnit) -> Value
+) = byDividing(kinematicViscosity, specificEnergy, factory)
diff --git a/scientific/src/commonMain/kotlin/converter/time/convertToKinematicViscosity.kt b/scientific/src/commonMain/kotlin/converter/time/convertToKinematicViscosity.kt
new file mode 100644
index 000000000..efdd2e553
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/time/convertToKinematicViscosity.kt
@@ -0,0 +1,49 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter.time
+
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
+import com.splendo.kaluga.scientific.converter.specificEnergy.times
+import com.splendo.kaluga.scientific.unit.*
+import kotlin.jvm.JvmName
+
+@JvmName("timeTimesMetricSpecificEnergy")
+infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.Time, TimeUnit>.times(
+    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, MetricSpecificEnergy>
+) = specificEnergy * this
+
+@JvmName("timeTimesImperialSpecificEnergy")
+infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.Time, TimeUnit>.times(
+    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, ImperialSpecificEnergy>
+) = specificEnergy * this
+
+@JvmName("timeTimesUkImperialSpecificEnergy")
+infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.Time, TimeUnit>.times(
+    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, UKImperialSpecificEnergy>
+) = specificEnergy * this
+
+@JvmName("timeTimesUsCustomarySpecificEnergy")
+infix operator fun <TimeUnit : Time> ScientificValue<PhysicalQuantity.Time, TimeUnit>.times(
+    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, USCustomarySpecificEnergy>
+) = specificEnergy * this
+
+@JvmName("timeTimesSpecificEnergy")
+infix operator fun <SpecificEnergyUnit : SpecificEnergy, TimeUnit : Time> ScientificValue<PhysicalQuantity.Time, TimeUnit>.times(
+    specificEnergy: ScientificValue<PhysicalQuantity.SpecificEnergy, SpecificEnergyUnit>
+) = specificEnergy * this
diff --git a/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt b/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
index 2ecbb30d9..59cf15a6a 100644
--- a/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
@@ -47,7 +47,7 @@ sealed class HeatCapacity : AbstractScientificUnit<PhysicalQuantity.HeatCapacity
     abstract val energy: Energy
     abstract val per: Temperature
     override val quantity = PhysicalQuantity.HeatCapacity
-    override val symbol: String by lazy { "${energy.symbol}/${per.symbol}" }
+    override val symbol: String by lazy { "${energy.symbol} / ${per.symbol}" }
     override fun fromSIUnit(value: Decimal): Decimal = per.deltaToSIUnitDelta(energy.fromSIUnit(value))
     override fun toSIUnit(value: Decimal): Decimal = energy.toSIUnit(per.deltaFromSIUnitDelta(value))
 }
diff --git a/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
index 60ff48578..2db222d53 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
@@ -42,7 +42,7 @@ sealed class MolarEnergy : AbstractScientificUnit<PhysicalQuantity.MolarEnergy>(
     abstract val energy: Energy
     abstract val per: AmountOfSubstance
     override val quantity = PhysicalQuantity.MolarEnergy
-    override val symbol: String by lazy { "${energy.symbol}/${per.symbol}" }
+    override val symbol: String by lazy { "${energy.symbol} / ${per.symbol}" }
     override fun fromSIUnit(value: Decimal): Decimal = per.toSIUnit(energy.fromSIUnit(value))
     override fun toSIUnit(value: Decimal): Decimal = energy.toSIUnit(per.fromSIUnit(value))
 }
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
index ee2ca21c2..0d17f47fd 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
@@ -47,7 +47,7 @@ sealed class SpecificEnergy : AbstractScientificUnit<PhysicalQuantity.SpecificEn
     abstract val energy: Energy
     abstract val per: Weight
     override val quantity = PhysicalQuantity.SpecificEnergy
-    override val symbol: String by lazy { "${energy.symbol}/${per.symbol}" }
+    override val symbol: String by lazy { "${energy.symbol} / ${per.symbol}" }
     override fun fromSIUnit(value: Decimal): Decimal = per.toSIUnit(energy.fromSIUnit(value))
     override fun toSIUnit(value: Decimal): Decimal = energy.toSIUnit(per.fromSIUnit(value))
 }
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
index f768231eb..4aa747da4 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
@@ -42,7 +42,7 @@ sealed class SpecificHeatCapacity : AbstractScientificUnit<PhysicalQuantity.Spec
     abstract val heatCapacity: HeatCapacity
     abstract val perWeight: Weight
     override val quantity = PhysicalQuantity.SpecificHeatCapacity
-    override val symbol: String by lazy { "${heatCapacity.energy.symbol}/(${heatCapacity.per.symbol}⋅${perWeight.symbol})" }
+    override val symbol: String by lazy { "${heatCapacity.energy.symbol} / (${heatCapacity.per.symbol}⋅${perWeight.symbol})" }
     override fun fromSIUnit(value: Decimal): Decimal = perWeight.toSIUnit(heatCapacity.fromSIUnit(value))
     override fun toSIUnit(value: Decimal): Decimal = heatCapacity.toSIUnit(perWeight.fromSIUnit(value))
 }
diff --git a/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
index bac262e0b..2022a4edc 100644
--- a/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
@@ -47,7 +47,7 @@ sealed class ThermalResistance : AbstractScientificUnit<PhysicalQuantity.Thermal
     abstract val temperature: Temperature
     abstract val per: Power
     override val quantity = PhysicalQuantity.ThermalResistance
-    override val symbol: String by lazy { "${temperature.symbol}/${per.symbol}" }
+    override val symbol: String by lazy { "${temperature.symbol} / ${per.symbol}" }
     override fun fromSIUnit(value: Decimal): Decimal = per.toSIUnit(temperature.deltaFromSIUnitDelta(value))
     override fun toSIUnit(value: Decimal): Decimal = temperature.deltaToSIUnitDelta(per.fromSIUnit(value))
 }
diff --git a/scientific/src/commonTest/kotlin/unit/DensityUnitTest.kt b/scientific/src/commonTest/kotlin/unit/DensityUnitTest.kt
index 514a667c0..a4fb97b72 100644
--- a/scientific/src/commonTest/kotlin/unit/DensityUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/DensityUnitTest.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.scientific.unit
 
 import com.splendo.kaluga.scientific.convert
 import com.splendo.kaluga.scientific.converter.areaDensity.div
+import com.splendo.kaluga.scientific.converter.dynamicViscosity.div
 import com.splendo.kaluga.scientific.converter.linearMassDensity.div
 import com.splendo.kaluga.scientific.converter.molarMass.div
 import com.splendo.kaluga.scientific.converter.molarMass.times
@@ -55,6 +56,15 @@ class DensityUnitTest {
         )
     }
 
+    @Test
+    fun densityFromDynamicViscosityAndKinematicViscosityTest() {
+        assertEquals(1(Kilogram per CubicMeter), 2(Pascal x Second) / 2(SquareMeter per Second))
+        assertEquals(ImperialStandardGravityAcceleration.value(Pound per CubicFoot), 2(PoundSquareFoot x Second) / 2(SquareFoot per Second))
+        assertEquals(ImperialStandardGravityAcceleration.value(Pound.ukImperial per CubicFoot), 2(PoundSquareFoot.ukImperial x Second) / 2(SquareFoot per Second))
+        assertEquals(ImperialStandardGravityAcceleration.value(Pound.usCustomary per CubicFoot), 2(PoundSquareFoot.usCustomary x Second) / 2(SquareFoot per Second))
+        assertEquals(1(Kilogram per CubicMeter), 2(Pascal x Second) / 2(SquareMeter per Second).convert(SquareFoot per Second))
+    }
+
     @Test
     fun densityFromLinearMassDensityAndAreaTest() {
         assertEquals(1(Kilogram per CubicMeter), 2(Kilogram per Meter) / 2(SquareMeter))
diff --git a/scientific/src/commonTest/kotlin/unit/DynamicViscosityTest.kt b/scientific/src/commonTest/kotlin/unit/DynamicViscosityTest.kt
index 0b3c21523..517775fd1 100644
--- a/scientific/src/commonTest/kotlin/unit/DynamicViscosityTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/DynamicViscosityTest.kt
@@ -19,6 +19,8 @@ package com.splendo.kaluga.scientific.unit
 
 import com.splendo.kaluga.scientific.assertEqualScientificValue
 import com.splendo.kaluga.scientific.convert
+import com.splendo.kaluga.scientific.converter.density.times
+import com.splendo.kaluga.scientific.converter.kinematicViscosity.times
 import com.splendo.kaluga.scientific.converter.momentum.div
 import com.splendo.kaluga.scientific.converter.pressure.times
 import com.splendo.kaluga.scientific.converter.time.times
@@ -39,6 +41,24 @@ class DynamicViscosityTest {
         )
     }
 
+    @Test
+    fun dynamicViscosityFromKinematicViscosityAndDensity() {
+        assertEquals(4(Pascal x Second), 2(SquareMeter per Second) * 2(Kilogram per CubicMeter))
+        assertEquals(4(Pascal x Second), 2(Kilogram per CubicMeter) * 2(SquareMeter per Second))
+
+        assertEqualScientificValue(4(PoundSquareInch x Second), 2(SquareInch per Second) * (24 * ImperialStandardGravityAcceleration.value)(Pound per CubicInch), 5)
+        assertEqualScientificValue(4(PoundSquareInch x Second), (24 * ImperialStandardGravityAcceleration.value)(Pound per CubicInch) * 2(SquareInch per Second), 5)
+
+        assertEqualScientificValue(4(PoundSquareInch.ukImperial x Second), 2(SquareInch per Second) * (24 * ImperialStandardGravityAcceleration.value)(Pound.ukImperial per CubicInch), 5)
+        assertEqualScientificValue(4(PoundSquareInch.ukImperial x Second), (24 * ImperialStandardGravityAcceleration.value)(Pound.ukImperial per CubicInch) * 2(SquareInch per Second), 5)
+
+        assertEqualScientificValue(4(PoundSquareInch.usCustomary x Second), 2(SquareInch per Second) * (24 * ImperialStandardGravityAcceleration.value)(Pound.usCustomary per CubicInch), 5)
+        assertEqualScientificValue(4(PoundSquareInch.usCustomary x Second), (24 * ImperialStandardGravityAcceleration.value)(Pound.usCustomary per CubicInch) * 2(SquareInch per Second), 5)
+
+        assertEquals(4(Pascal x Second), 2(SquareMeter per Second) * 2(Kilogram per CubicMeter).convert(Pound per CubicFoot))
+        assertEquals(4(Pascal x Second), 2(Kilogram per CubicMeter).convert(Pound per CubicFoot) * 2(SquareMeter per Second))
+    }
+
     @Test
     fun dynamicViscosityFromMomentumAndAreaTest() {
         assertEquals(1(Pascal x Second), 2(Kilogram x (Meter per Second)) / 2(SquareMeter))
diff --git a/scientific/src/commonTest/kotlin/unit/KinematicViscosityTest.kt b/scientific/src/commonTest/kotlin/unit/KinematicViscosityTest.kt
index 03b0ca159..acb199f2b 100644
--- a/scientific/src/commonTest/kotlin/unit/KinematicViscosityTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/KinematicViscosityTest.kt
@@ -18,8 +18,12 @@
 package com.splendo.kaluga.scientific.unit
 
 import com.splendo.kaluga.scientific.assertEqualScientificValue
+import com.splendo.kaluga.scientific.convert
 import com.splendo.kaluga.scientific.converter.area.div
+import com.splendo.kaluga.scientific.converter.dynamicViscosity.div
 import com.splendo.kaluga.scientific.converter.length.times
+import com.splendo.kaluga.scientific.converter.specificEnergy.times
+import com.splendo.kaluga.scientific.converter.time.times
 import com.splendo.kaluga.scientific.invoke
 import kotlin.test.Test
 
@@ -53,14 +57,41 @@ class KinematicViscosityTest {
     }
 
     @Test
-    fun kinematicViscosityFromMetricAreaByTimeTest() {
+    fun kinematicViscosityFromAreaByTimeTest() {
         assertEqualScientificValue(1(SquareMeter per Second), (2(SquareMeter)) / 2(Second))
         assertEqualScientificValue(1(SquareMeter per Second), (2(Meter) * 1(Meter)) / 2(Second))
-    }
 
-    @Test
-    fun kinematicViscosityFromImperialAreaByTimeTest() {
         assertEqualScientificValue(1(SquareFoot per Second), (2(SquareFoot)) / 2(Second))
         assertEqualScientificValue(1(SquareFoot per Second), (2(Foot) * 1(Foot)) / 2(Second))
+
+        assertEqualScientificValue(1(SquareMeter per Second), (2(SquareMeter).convert(SquareFoot)) / 2(Second))
+        assertEqualScientificValue(1(SquareMeter per Second), (2(Meter) * 1(Meter).convert(Foot)) / 2(Second))
+    }
+
+    @Test
+    fun kinematicViscosityFromDynamicViscosityAndDensity() {
+        assertEqualScientificValue(1(SquareMeter per Second), (2(Pascal x Second)) / 2(Kilogram per CubicMeter))
+        assertEqualScientificValue(ImperialStandardGravityAcceleration.value(SquareFoot per Second), (2(PoundSquareFoot x Second)) / 2(Pound per CubicFoot))
+        assertEqualScientificValue(ImperialStandardGravityAcceleration.value(SquareFoot per Second), (2(PoundSquareFoot x Second)) / 2(Pound.ukImperial per CubicFoot))
+        assertEqualScientificValue(ImperialStandardGravityAcceleration.value(SquareFoot per Second), (2(PoundSquareFoot x Second)) / 2(Pound.usCustomary per CubicFoot))
+        assertEqualScientificValue(ImperialStandardGravityAcceleration.value(SquareFoot per Second), (2(PoundSquareFoot.ukImperial x Second)) / 2(Pound per CubicFoot))
+        assertEqualScientificValue(ImperialStandardGravityAcceleration.value(SquareFoot per Second), (2(PoundSquareFoot.ukImperial x Second)) / 2(Pound.ukImperial per CubicFoot))
+        assertEqualScientificValue(ImperialStandardGravityAcceleration.value(SquareFoot per Second), (2(PoundSquareFoot.usCustomary x Second)) / 2(Pound per CubicFoot))
+        assertEqualScientificValue(ImperialStandardGravityAcceleration.value(SquareFoot per Second), (2(PoundSquareFoot.usCustomary x Second)) / 2(Pound.usCustomary per CubicFoot))
+        assertEqualScientificValue(1(SquareMeter per Second), (2(Pascal x Second)) / 2(Kilogram per CubicMeter).convert(Pound per CubicFoot))
+    }
+
+    @Test
+    fun kinematicViscosityFromSpecificEnergyAndTime() {
+        assertEqualScientificValue(4(SquareMeter per Second), (2(Joule per Kilogram)) * 2(Second))
+        assertEqualScientificValue(4(SquareMeter per Second), (2(Second) * 2(Joule per Kilogram)))
+        assertEqualScientificValue((4 * ImperialStandardGravityAcceleration.value)(SquareFoot per Second), (2(FootPoundForce per Pound)) * 2(Second))
+        assertEqualScientificValue((4 * ImperialStandardGravityAcceleration.value)(SquareFoot per Second), (2(Second) * 2(FootPoundForce per Pound)))
+        assertEqualScientificValue((4 * ImperialStandardGravityAcceleration.value)(SquareFoot per Second), (2(FootPoundForce per Pound.ukImperial)) * 2(Second))
+        assertEqualScientificValue((4 * ImperialStandardGravityAcceleration.value)(SquareFoot per Second), (2(Second) * 2(FootPoundForce per Pound.ukImperial)))
+        assertEqualScientificValue((4 * ImperialStandardGravityAcceleration.value)(SquareFoot per Second), (2(FootPoundForce per Pound.usCustomary)) * 2(Second))
+        assertEqualScientificValue((4 * ImperialStandardGravityAcceleration.value)(SquareFoot per Second), (2(Second) * 2(FootPoundForce per Pound.usCustomary)))
+        assertEqualScientificValue(4(SquareMeter per Second), (2(Joule per Kilogram)).convert(FootPoundForce per Pound) * 2(Second))
+        assertEqualScientificValue(4(SquareMeter per Second), (2(Second) * 2(Joule per Kilogram).convert(FootPoundForce per Pound)))
     }
 }
diff --git a/scientific/src/commonTest/kotlin/unit/SpecificEnergyUnitTest.kt b/scientific/src/commonTest/kotlin/unit/SpecificEnergyUnitTest.kt
index e8f98612e..8c09e203a 100644
--- a/scientific/src/commonTest/kotlin/unit/SpecificEnergyUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/SpecificEnergyUnitTest.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.scientific.convert
 import com.splendo.kaluga.scientific.converter.energy.div
 import com.splendo.kaluga.scientific.converter.ionizingRadiationAbsorbedDose.asSpecificEnergy
 import com.splendo.kaluga.scientific.converter.ionizingRadiationEquivalentDose.asSpecificEnergy
+import com.splendo.kaluga.scientific.converter.kinematicViscosity.div
 import com.splendo.kaluga.scientific.converter.molality.times
 import com.splendo.kaluga.scientific.converter.molarEnergy.div
 import com.splendo.kaluga.scientific.converter.molarEnergy.times
@@ -80,6 +81,12 @@ class SpecificEnergyUnitTest {
         assertEquals(2(Joule per Kilogram), 2(Sievert).asSpecificEnergy())
     }
 
+    @Test
+    fun specificEnergyFromKinematicViscosityAndTimeTest() {
+        assertEqualScientificValue(1(Joule per Kilogram), 2(SquareMeter per Second) / 2(Second))
+        assertEqualScientificValue(1(FootPoundForce per Pound), (2 * ImperialStandardGravityAcceleration.value)(SquareFoot per Second) / 2(Second), 5)
+    }
+
     @Test
     fun specificEnergyFromMolarEnergyAndMolalityTest() {
         assertEquals(4(Joule per Kilogram), 2(Joule per Decimole) * 2(Decimole per Kilogram))
diff --git a/scientific/src/commonTest/kotlin/unit/TimeUnitTest.kt b/scientific/src/commonTest/kotlin/unit/TimeUnitTest.kt
index c574cbffd..4cbcbd9e4 100644
--- a/scientific/src/commonTest/kotlin/unit/TimeUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/TimeUnitTest.kt
@@ -35,6 +35,7 @@ import com.splendo.kaluga.scientific.converter.electricResistance.times
 import com.splendo.kaluga.scientific.converter.energy.div
 import com.splendo.kaluga.scientific.converter.force.div
 import com.splendo.kaluga.scientific.converter.frequency.time
+import com.splendo.kaluga.scientific.converter.kinematicViscosity.div
 import com.splendo.kaluga.scientific.converter.length.div
 import com.splendo.kaluga.scientific.converter.luminousEnergy.div
 import com.splendo.kaluga.scientific.converter.luminousExposure.div
@@ -129,6 +130,11 @@ class TimeUnitTest {
         assertEqualScientificValue(2(Second), 5(Decihertz).time())
     }
 
+    @Test
+    fun timeFromKinematicViscosityAndSpecificEnergyTest() {
+        assertEqualScientificValue(1(Minute), 7200(SquareMeter per Minute) / 2(Joule per Kilogram))
+    }
+
     @Test
     fun timeFromLengthAndSpeedTest() {
         assertEqualScientificValue(1(Hour), 2(Kilometer) / 2(Kilometer per Hour))

From 559b3e482f956d7f47fe78ca849ea331b7f59ad8 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Sun, 15 Jan 2023 00:57:18 +0100
Subject: [PATCH 077/227] Added support for single unit converters

---
 .../layout/activity_scientific_converter.xml  | 14 ++-
 .../model/scientific/QuantityDetails.kt       |  2 +-
 .../converters/AccelerationConverters.kt      | 10 +--
 .../scientific/converters/ActionConverters.kt |  6 +-
 .../converters/AmountOfSubstanceConverters.kt | 16 ++--
 .../scientific/converters/AngleConverters.kt  |  6 +-
 .../AngularAccelerationConverters.kt          |  4 +-
 .../converters/AngularVelocityConverters.kt   |  8 +-
 .../scientific/converters/AreaConverters.kt   | 30 +++----
 .../converters/AreaDensityConverter.kt        | 12 +--
 .../CatalysticActivityConverters.kt           |  4 +-
 .../converters/DensityConverters.kt           | 16 ++--
 .../converters/DynamicViscosityConverters.kt  |  8 +-
 .../converters/ElectricCapacitanceUnits.kt    |  8 +-
 .../converters/ElectricChargeConverters.kt    | 14 +--
 .../ElectricConductanceConverters.kt          |  8 +-
 .../converters/ElectricCurrentConverters.kt   | 16 ++--
 .../ElectricInductanceConverters.kt           | 10 +--
 .../ElectricResistanceConverters.kt           | 14 +--
 .../scientific/converters/EnergyConverters.kt | 48 +++++-----
 .../scientific/converters/ForceConverters.kt  | 24 ++---
 .../converters/FrequencyConverters.kt         |  6 +-
 .../converters/HeatCapacityConverters.kt      |  8 +-
 .../converters/IlluminanceConverters.kt       | 10 +--
 .../IonizingRadiationAbsobedDoseConverters.kt |  4 +-
 ...nizingRadiationEquivalentDoseConverters.kt |  4 +-
 .../scientific/converters/JoltConverters.kt   |  6 +-
 .../scientific/converters/LengthConverters.kt | 24 ++---
 .../converters/LinearMassDensityConverters.kt | 14 +--
 .../converters/LuminanceConverters.kt         |  6 +-
 .../converters/LuminousEnergyConverters.kt    | 10 +--
 .../converters/LuminousExposureConverters.kt  |  8 +-
 .../converters/LuminousFluxConverters.kt      | 12 +--
 .../converters/LuminousIntensityConverters.kt |  8 +-
 .../converters/MagneticFluxConverters.kt      | 20 ++---
 .../converters/MagneticInductionConverters.kt |  4 +-
 .../converters/MassFlowRateConverters.kt      |  4 +-
 .../converters/MolalityConverters.kt          | 14 +--
 .../converters/MolarEnergyConverters.kt       | 10 +--
 .../converters/MolarMassConverters.kt         | 14 +--
 .../converters/MolarVolumeConverters.kt       | 12 +--
 .../converters/MolarityConverters.kt          | 12 +--
 .../converters/MomentumConverters.kt          | 12 +--
 .../scientific/converters/PowerConverters.kt  | 14 +--
 .../converters/PressureConverters.kt          |  8 +-
 .../converters/QuantityConverter.kt           | 87 +++++++++++++------
 .../converters/RadioactivityConverters.kt     |  2 +-
 .../converters/SolidAngleConverters.kt        |  6 +-
 .../converters/SpecificEnergyConverters.kt    | 14 +--
 .../SpecificHeatCapacityConverters.kt         |  6 +-
 .../converters/SpecificVolumeConverters.kt    | 16 ++--
 .../scientific/converters/SpeedConverters.kt  | 12 +--
 .../converters/SurfaceTensionConverters.kt    |  6 +-
 .../converters/TemperatureConverters.kt       | 10 +--
 .../converters/TheralResistanceConverters.kt  |  4 +-
 .../scientific/converters/TimeConverters.kt   | 42 ++++-----
 .../converters/VoltageConverters.kt           | 16 ++--
 .../scientific/converters/VolumeConverters.kt | 22 ++---
 .../converters/VolumetricFlowConverters.kt    |  8 +-
 .../converters/VolumetricFluxConverters.kt    |  4 +-
 .../scientific/converters/WeightConverters.kt | 40 ++++-----
 .../scientific/converters/YankConverters.kt   |  8 +-
 .../ScientificConverterViewModel.kt           | 37 +++++---
 63 files changed, 459 insertions(+), 403 deletions(-)

diff --git a/example/android/src/main/res/layout/activity_scientific_converter.xml b/example/android/src/main/res/layout/activity_scientific_converter.xml
index b4779be74..bd9f4c440 100644
--- a/example/android/src/main/res/layout/activity_scientific_converter.xml
+++ b/example/android/src/main/res/layout/activity_scientific_converter.xml
@@ -19,6 +19,8 @@
         <variable
             name="viewModel"
             type="com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificConverterViewModel" />
+
+        <import type="android.view.View"/>
     </data>
     <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
@@ -46,7 +48,8 @@
                 app:layout_constraintBaseline_toBaselineOf="@id/left_value"
                 app:layout_constraintStart_toEndOf="@id/left_side"
                 app:layout_constraintEnd_toStartOf="@id/right_side"
-                android:padding="10dp"/>
+                android:padding="10dp"
+                android:visibility="@{viewModel.isRightUnitSelectable ? View.VISIBLE : View.GONE}"/>
 
             <Space
                 android:id="@+id/right_side"
@@ -55,7 +58,8 @@
                 app:layout_constraintHorizontal_weight="1"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toEndOf="@id/operator"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                app:layout_constraintEnd_toEndOf="parent"
+                android:visibility="@{viewModel.isRightUnitSelectable ? View.VISIBLE : View.GONE}"/>
 
             <EditText
                 android:id="@+id/left_value"
@@ -82,7 +86,8 @@
                 android:text="@={viewModel.rightValue.stateFlow}"
                 app:layout_constraintTop_toBottomOf="@id/right_side"
                 app:layout_constraintStart_toStartOf="@id/right_side"
-                app:layout_constraintEnd_toStartOf="@id/right_symbol"/>
+                app:layout_constraintEnd_toStartOf="@id/right_symbol"
+                android:visibility="@{viewModel.isRightUnitSelectable ? View.VISIBLE : View.GONE}"/>
 
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/right_symbol"
@@ -91,7 +96,8 @@
                 app:kalugaButton="@{viewModel.currentRightUnitButton.stateFlow}"
                 app:layout_constraintBaseline_toBaselineOf="@id/right_value"
                 app:layout_constraintStart_toEndOf="@id/right_value"
-                app:layout_constraintEnd_toEndOf="@id/right_side"/>
+                app:layout_constraintEnd_toEndOf="@id/right_side"
+                android:visibility="@{viewModel.isRightUnitSelectable ? View.VISIBLE : View.GONE}"/>
 
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/calculate_button"
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
index 6445d9f82..11c076a39 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
@@ -29,7 +29,7 @@ import com.splendo.kaluga.scientific.unit.*
 data class QuantityDetails<Quantity : PhysicalQuantity>(
     val quantity: Quantity,
     val units: Set<ScientificUnit<Quantity>>,
-    val converters: List<QuantityConverter<Quantity, *, *>>
+    val converters: List<QuantityConverter<Quantity, *>>
 ) {
     fun convert(value: Decimal, unit: ScientificUnit<*>, to: ScientificUnit<*>): ScientificValue<Quantity, *>? = if (unit.quantity == quantity && to.quantity == quantity) {
         DefaultScientificValue(value, unit as ScientificUnit<Quantity>).convert(to as ScientificUnit<Quantity>)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt
index 4b798ff1c..f24039996 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AccelerationConverters.kt
@@ -38,8 +38,8 @@ import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.UsTon
 import com.splendo.kaluga.scientific.unit.Weight
 
-val PhysicalQuantity.Acceleration.converters get() = listOf<QuantityConverter<PhysicalQuantity.Acceleration, *, *>>(
-    QuantityConverter("Force from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (accelerationValue, accelerationUnit), (weightValue, weightUnit) ->
+val PhysicalQuantity.Acceleration.converters get() = listOf<QuantityConverter<PhysicalQuantity.Acceleration, *>>(
+    QuantityConverterWithOperator("Force from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Weight) { (accelerationValue, accelerationUnit), (weightValue, weightUnit) ->
         when {
             accelerationUnit is MetricAcceleration && weightUnit is Gram -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
             accelerationUnit is MetricAcceleration && weightUnit is MetricWeight -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(weightValue, weightUnit)
@@ -55,7 +55,7 @@ val PhysicalQuantity.Acceleration.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $accelerationUnit, $weightUnit")
         }
     },
-    QuantityConverter("Jolt from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (accelerationValue, accelerationUnit), (timeValue, timeUnit) ->
+    QuantityConverterWithOperator("Jolt from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (accelerationValue, accelerationUnit), (timeValue, timeUnit) ->
         when {
             accelerationUnit is MetricAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) / DefaultScientificValue(timeValue, timeUnit)
             accelerationUnit is ImperialAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) / DefaultScientificValue(timeValue, timeUnit)
@@ -63,7 +63,7 @@ val PhysicalQuantity.Acceleration.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $accelerationUnit, $timeUnit")
         }
     },
-    QuantityConverter("Speed from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (accelerationValue, accelerationUnit), (timeValue, timeUnit) ->
+    QuantityConverterWithOperator("Speed from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (accelerationValue, accelerationUnit), (timeValue, timeUnit) ->
         when {
             accelerationUnit is MetricAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(timeValue, timeUnit)
             accelerationUnit is ImperialAcceleration && timeUnit is Time -> DefaultScientificValue(accelerationValue, accelerationUnit) * DefaultScientificValue(timeValue, timeUnit)
@@ -71,7 +71,7 @@ val PhysicalQuantity.Acceleration.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $accelerationUnit, $timeUnit")
         }
     },
-    QuantityConverter("Time from Jolt", QuantityConverter.Type.Division, PhysicalQuantity.Jolt) { (accelerationValue, accelerationUnit), (joltValue, joltUnit) ->
+    QuantityConverterWithOperator("Time from Jolt", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Jolt) { (accelerationValue, accelerationUnit), (joltValue, joltUnit) ->
         when {
             accelerationUnit is Acceleration && joltUnit is Jolt -> DefaultScientificValue(accelerationValue, accelerationUnit) / DefaultScientificValue(joltValue, joltUnit)
             else -> throw RuntimeException("Unexpected units: $accelerationUnit, $joltUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
index 38e15e217..0ff989802 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ActionConverters.kt
@@ -27,8 +27,8 @@ import com.splendo.kaluga.scientific.unit.MetricAction
 import com.splendo.kaluga.scientific.unit.MetricAndImperialAction
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.Action.converters get() = listOf<QuantityConverter<PhysicalQuantity.Action, *, *>>(
-    QuantityConverter("Energy from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (actionValue, actionUnit), (timeValue, timeUnit) ->
+val PhysicalQuantity.Action.converters get() = listOf<QuantityConverter<PhysicalQuantity.Action, *>>(
+    QuantityConverterWithOperator("Energy from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (actionValue, actionUnit), (timeValue, timeUnit) ->
         when {
             actionUnit is MetricAndImperialAction && timeUnit is Time -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(timeValue, timeUnit)
             actionUnit is MetricAction && timeUnit is Time -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(timeValue, timeUnit)
@@ -37,7 +37,7 @@ val PhysicalQuantity.Action.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $actionUnit, $timeUnit")
         }
     },
-    QuantityConverter("Time from Energy", QuantityConverter.Type.Division, PhysicalQuantity.Energy) { (actionValue, actionUnit), (energyValue, energyUnit) ->
+    QuantityConverterWithOperator("Time from Energy", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Energy) { (actionValue, actionUnit), (energyValue, energyUnit) ->
         when {
             actionUnit is Action && energyUnit is Energy -> DefaultScientificValue(actionValue, actionUnit) / DefaultScientificValue(energyValue, energyUnit)
             else -> throw RuntimeException("Unexpected units: $actionUnit, $energyUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
index 74dab8be4..e9bab036f 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AmountOfSubstanceConverters.kt
@@ -24,8 +24,8 @@ import com.splendo.kaluga.scientific.converter.amountOfSubstance.div
 import com.splendo.kaluga.scientific.converter.amountOfSubstance.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConverter<PhysicalQuantity.AmountOfSubstance, *, *>>(
-    QuantityConverter("Energy from Molar Energy", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarEnergy) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molarEnergyValue, molarEnergyUnit) ->
+val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConverter<PhysicalQuantity.AmountOfSubstance, *>>(
+    QuantityConverterWithOperator("Energy from Molar Energy", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.MolarEnergy) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molarEnergyValue, molarEnergyUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && molarEnergyUnit is MetricAndImperialMolarEnergy -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) * DefaultScientificValue(molarEnergyValue, molarEnergyUnit)
             amountOfSubstanceUnit is AmountOfSubstance && molarEnergyUnit is MetricMolarEnergy -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) * DefaultScientificValue(molarEnergyValue, molarEnergyUnit)
@@ -34,7 +34,7 @@ val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $molarEnergyUnit")
         }
     },
-    QuantityConverter("Molality from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (amountOfSubstanceValue, amountOfSubstanceUnit), (weightValue, weightUnit) ->
+    QuantityConverterWithOperator("Molality from Weight", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Weight) { (amountOfSubstanceValue, amountOfSubstanceUnit), (weightValue, weightUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && weightUnit is MetricWeight -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(weightValue, weightUnit)
             amountOfSubstanceUnit is AmountOfSubstance && weightUnit is ImperialWeight -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(weightValue, weightUnit)
@@ -44,7 +44,7 @@ val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $weightUnit")
         }
     },
-    QuantityConverter("Molarity from Volume", QuantityConverter.Type.Division, PhysicalQuantity.Volume) { (amountOfSubstanceValue, amountOfSubstanceUnit), (volumeValue, volumeUnit) ->
+    QuantityConverterWithOperator("Molarity from Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Volume) { (amountOfSubstanceValue, amountOfSubstanceUnit), (volumeValue, volumeUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && volumeUnit is MetricVolume -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(volumeValue, volumeUnit)
             amountOfSubstanceUnit is AmountOfSubstance && volumeUnit is ImperialVolume -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(volumeValue, volumeUnit)
@@ -54,19 +54,19 @@ val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $volumeUnit")
         }
     },
-    QuantityConverter("Radioactivity from Time", QuantityConverter.Type.Custom("with λ"), PhysicalQuantity.Time) { (amountOfSubstanceValue, amountOfSubstanceUnit), (timeValue, timeUnit) ->
+    QuantityConverterWithOperator("Radioactivity from Time", QuantityConverter.WithOperator.Type.Custom("with λ"), PhysicalQuantity.Time) { (amountOfSubstanceValue, amountOfSubstanceUnit), (timeValue, timeUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && timeUnit is Time -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit).decaysWithHalfLife(DefaultScientificValue(timeValue, timeUnit))
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $timeUnit")
         }
     },
-    QuantityConverter("Time from Catalystic Activity", QuantityConverter.Type.Division, PhysicalQuantity.CatalysticActivity) { (amountOfSubstanceValue, amountOfSubstanceUnit), (catalysticActivityValue, catalysticActivityUnit) ->
+    QuantityConverterWithOperator("Time from Catalystic Activity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.CatalysticActivity) { (amountOfSubstanceValue, amountOfSubstanceUnit), (catalysticActivityValue, catalysticActivityUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && catalysticActivityUnit is CatalysticActivity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(catalysticActivityValue, catalysticActivityUnit)
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $catalysticActivityUnit")
         }
     },
-    QuantityConverter("Volume from Molarity", QuantityConverter.Type.Division, PhysicalQuantity.Molarity) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molarityValue, molarityUnit) ->
+    QuantityConverterWithOperator("Volume from Molarity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Molarity) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molarityValue, molarityUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && molarityUnit is MetricMolarity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molarityValue, molarityUnit)
             amountOfSubstanceUnit is AmountOfSubstance && molarityUnit is ImperialMolarity -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molarityValue, molarityUnit)
@@ -76,7 +76,7 @@ val PhysicalQuantity.AmountOfSubstance.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $amountOfSubstanceUnit, $molarityUnit")
         }
     },
-    QuantityConverter("Weight from Molality", QuantityConverter.Type.Division, PhysicalQuantity.Molality) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molalityValue, molalityUnit) ->
+    QuantityConverterWithOperator("Weight from Molality", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Molality) { (amountOfSubstanceValue, amountOfSubstanceUnit), (molalityValue, molalityUnit) ->
         when {
             amountOfSubstanceUnit is AmountOfSubstance && molalityUnit is MetricMolality -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molalityValue, molalityUnit)
             amountOfSubstanceUnit is AmountOfSubstance && molalityUnit is ImperialMolality -> DefaultScientificValue(amountOfSubstanceValue, amountOfSubstanceUnit) / DefaultScientificValue(molalityValue, molalityUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
index 5a2e87e99..ac8bc4374 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngleConverters.kt
@@ -24,14 +24,14 @@ import com.splendo.kaluga.scientific.unit.Angle
 import com.splendo.kaluga.scientific.unit.AngularVelocity
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.Angle.converters get() = listOf<QuantityConverter<PhysicalQuantity.Angle, *, *>>(
-    QuantityConverter("Angular Velocity from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (angleValue, angleUnit), (timeValue, timeUnit) ->
+val PhysicalQuantity.Angle.converters get() = listOf<QuantityConverter<PhysicalQuantity.Angle, *>>(
+    QuantityConverterWithOperator("Angular Velocity from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (angleValue, angleUnit), (timeValue, timeUnit) ->
         when {
             angleUnit is Angle && timeUnit is Time -> DefaultScientificValue(angleValue, angleUnit) / DefaultScientificValue(timeValue, timeUnit)
             else -> throw RuntimeException("Unexpected units: $angleUnit $timeUnit")
         }
     },
-    QuantityConverter("Time from Angular Velocity", QuantityConverter.Type.Division, PhysicalQuantity.AngularVelocity) { (angleValue, angleUnit), (angularVelocityValue, angularVelocityUnit) ->
+    QuantityConverterWithOperator("Time from Angular Velocity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.AngularVelocity) { (angleValue, angleUnit), (angularVelocityValue, angularVelocityUnit) ->
         when {
             angleUnit is Angle && angularVelocityUnit is AngularVelocity -> DefaultScientificValue(angleValue, angleUnit) / DefaultScientificValue(angularVelocityValue, angularVelocityUnit)
             else -> throw RuntimeException("Unexpected units: $angleUnit $angularVelocityUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt
index f65dc4a56..a1437a343 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularAccelerationConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.angularAcceleration.times
 import com.splendo.kaluga.scientific.unit.AngularAcceleration
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.AngularAcceleration.converters get() = listOf<QuantityConverter<PhysicalQuantity.AngularAcceleration, *, *>>(
-    QuantityConverter("Angular Velocity from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (angularAccelerationValue, angularAccelerationUnit), (timeValue, timeUnit) ->
+val PhysicalQuantity.AngularAcceleration.converters get() = listOf<QuantityConverter<PhysicalQuantity.AngularAcceleration, *>>(
+    QuantityConverterWithOperator("Angular Velocity from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (angularAccelerationValue, angularAccelerationUnit), (timeValue, timeUnit) ->
         when {
             angularAccelerationUnit is AngularAcceleration && timeUnit is Time -> DefaultScientificValue(angularAccelerationValue, angularAccelerationUnit) * DefaultScientificValue(timeValue, timeUnit)
             else -> throw RuntimeException("Unexpected units: $angularAccelerationUnit $timeUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
index 1c624e6a2..358dc5fa9 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AngularVelocityConverters.kt
@@ -25,20 +25,20 @@ import com.splendo.kaluga.scientific.unit.AngularAcceleration
 import com.splendo.kaluga.scientific.unit.AngularVelocity
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.AngularVelocity.converters get() = listOf<QuantityConverter<PhysicalQuantity.AngularVelocity, *, *>>(
-    QuantityConverter("Angle from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
+val PhysicalQuantity.AngularVelocity.converters get() = listOf<QuantityConverter<PhysicalQuantity.AngularVelocity, *>>(
+    QuantityConverterWithOperator("Angle from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
         when {
             angularVelocityUnit is AngularVelocity && timeUnit is Time -> DefaultScientificValue(angularVelocityValue, angularVelocityUnit) * DefaultScientificValue(timeValue, timeUnit)
             else -> throw RuntimeException("Unexpected units: $angularVelocityUnit $timeUnit")
         }
     },
-    QuantityConverter("Angular Acceleration from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
+    QuantityConverterWithOperator("Angular Acceleration from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (angularVelocityValue, angularVelocityUnit), (timeValue, timeUnit) ->
         when {
             angularVelocityUnit is AngularVelocity && timeUnit is Time -> DefaultScientificValue(angularVelocityValue, angularVelocityUnit) / DefaultScientificValue(timeValue, timeUnit)
             else -> throw RuntimeException("Unexpected units: $angularVelocityUnit $timeUnit")
         }
     },
-    QuantityConverter("Time from Angular Acceleration", QuantityConverter.Type.Division, PhysicalQuantity.AngularAcceleration) { (angularVelocityValue, angularVelocityUnit), (angularAccelerationValue, angularAccelerationUnit) ->
+    QuantityConverterWithOperator("Time from Angular Acceleration", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.AngularAcceleration) { (angularVelocityValue, angularVelocityUnit), (angularAccelerationValue, angularAccelerationUnit) ->
         when {
             angularVelocityUnit is AngularVelocity && angularAccelerationUnit is AngularAcceleration -> DefaultScientificValue(angularVelocityValue, angularVelocityUnit) / DefaultScientificValue(angularAccelerationValue, angularAccelerationUnit)
             else -> throw RuntimeException("Unexpected units: $angularVelocityUnit $angularAccelerationUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
index 488aad0b9..541f2423b 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.area.div
 import com.splendo.kaluga.scientific.converter.area.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQuantity.Area, *, *>>(
-    QuantityConverter("Energy from Surface Tension", QuantityConverter.Type.Multiplication, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQuantity.Area, *>>(
+    QuantityConverterWithOperator("Energy from Surface Tension", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareCentimeter && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricArea && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -38,7 +38,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Force from Pressure", QuantityConverter.Type.Multiplication, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Force from Pressure", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareCentimeter && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is SquareCentimeter && rightUnit is BaryeMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -56,7 +56,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Length from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Length", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareMeter && rightUnit is Meter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is SquareNanometer && rightUnit is Nanometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -79,7 +79,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Linear Mass Density from Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Linear Mass Density from Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -90,7 +90,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Linear Mass Density from Specific Volume", QuantityConverter.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Linear Mass Density from Specific Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -100,7 +100,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Luminous Energy from Luminous Exposure", QuantityConverter.Type.Multiplication, PhysicalQuantity.LuminousExposure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Energy from Luminous Exposure", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.LuminousExposure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricLuminousExposure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialLuminousExposure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -108,26 +108,26 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Luminous Flux from Illuminance", QuantityConverter.Type.Multiplication, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Flux from Illuminance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Area && rightUnit is Illuminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Luminous Intensity from Luminance", QuantityConverter.Type.Multiplication, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Intensity from Luminance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Area && rightUnit is Luminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Magnetic Induction", QuantityConverter.Type.Multiplication, PhysicalQuantity.MagneticInduction) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Magnetic Flux from Magnetic Induction", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.MagneticInduction) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareCentimeter && rightUnit is Gauss -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Area && rightUnit is MagneticInduction -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Momentum from Dynamic Viscosity", QuantityConverter.Type.Multiplication, PhysicalQuantity.DynamicViscosity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Momentum from Dynamic Viscosity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.DynamicViscosity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -137,7 +137,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Specific Volume from Linear Mass Density", QuantityConverter.Type.Division, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Volume from Linear Mass Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -147,7 +147,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Volume from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volume from Length", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SquareMeter && rightUnit is Meter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is SquareNanometer && rightUnit is Nanometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -172,7 +172,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Volumetric Flow from Volumetric Flux", QuantityConverter.Type.Multiplication, PhysicalQuantity.VolumetricFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volumetric Flow from Volumetric Flux", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.VolumetricFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -182,7 +182,7 @@ val PhysicalQuantity.Area.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Weight from Area Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Area Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricArea && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialArea && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
index c9068ddd0..a6bcc9843 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.areaDensity.div
 import com.splendo.kaluga.scientific.converter.areaDensity.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<PhysicalQuantity.AreaDensity, *, *>>(
-    QuantityConverter("Density from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<PhysicalQuantity.AreaDensity, *>>(
+    QuantityConverterWithOperator("Density from Length", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -34,7 +34,7 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Length from Specific Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Specific Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -48,7 +48,7 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Length from Density", QuantityConverter.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -62,7 +62,7 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Linear Mass Density from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Linear Mass Density from Length", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -72,7 +72,7 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverter("Weight from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
index 4049f16f7..9e6e5d284 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/CatalysticActivityConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.catalysticActivity.times
 import com.splendo.kaluga.scientific.unit.CatalysticActivity
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.CatalysticActivity.converters get() = listOf<QuantityConverter<PhysicalQuantity.CatalysticActivity, *, *>>(
-    QuantityConverter("Amount of Substance from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.CatalysticActivity.converters get() = listOf<QuantityConverter<PhysicalQuantity.CatalysticActivity, *>>(
+    QuantityConverterWithOperator("Amount of Substance from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is CatalysticActivity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
index 785c445fd..1c75e1815 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.density.div
 import com.splendo.kaluga.scientific.converter.density.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<PhysicalQuantity.Density, *, *>>(
-    QuantityConverter("Area Density from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<PhysicalQuantity.Density, *>>(
+    QuantityConverterWithOperator("Area Density from Length", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -34,7 +34,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Linear Mass Density from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Linear Mass Density from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -44,7 +44,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molarity from Molality", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molarity from Molality", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -54,7 +54,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molarity from Molar Mass", QuantityConverter.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molarity from Molar Mass", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -64,7 +64,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Mass from Molarity", QuantityConverter.Type.Division, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Mass from Molarity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -74,7 +74,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molarity from Molar Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molarity from Molar Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -84,7 +84,7 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDensity && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
index 30a2609a6..872b4428c 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
@@ -32,8 +32,8 @@ import com.splendo.kaluga.scientific.unit.Time
 import com.splendo.kaluga.scientific.unit.UKImperialDynamicViscosity
 import com.splendo.kaluga.scientific.unit.USCustomaryDynamicViscosity
 
-val PhysicalQuantity.DynamicViscosity.converters get() = listOf<QuantityConverter<PhysicalQuantity.DynamicViscosity, *, *>>(
-    QuantityConverter("Momentum from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.DynamicViscosity.converters get() = listOf<QuantityConverter<PhysicalQuantity.DynamicViscosity, *>>(
+    QuantityConverterWithOperator("Momentum from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDynamicViscosity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDynamicViscosity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -43,7 +43,7 @@ val PhysicalQuantity.DynamicViscosity.converters get() = listOf<QuantityConverte
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Pressure from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Pressure from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDynamicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialDynamicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -53,7 +53,7 @@ val PhysicalQuantity.DynamicViscosity.converters get() = listOf<QuantityConverte
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Pressure", QuantityConverter.Type.Division, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Pressure", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is DynamicViscosity && rightUnit is Pressure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
index fd593886e..4e4d81a72 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
@@ -27,22 +27,22 @@ import com.splendo.kaluga.scientific.unit.ElectricResistance
 import com.splendo.kaluga.scientific.unit.Frequency
 import com.splendo.kaluga.scientific.unit.Voltage
 
-val PhysicalQuantity.ElectricCapacitance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCapacitance, *, *>>(
-    QuantityConverter("Electric Charge from voltage", QuantityConverter.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.ElectricCapacitance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCapacitance, *>>(
+    QuantityConverterWithOperator("Electric Charge from voltage", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abfarad && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCapacitance && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Conductance from Frequency", QuantityConverter.Type.Multiplication, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Conductance from Frequency", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abfarad && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCapacitance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Electric Resistance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Electric Resistance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricCapacitance && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
index 38666122e..03e7df81f 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
@@ -32,42 +32,42 @@ import com.splendo.kaluga.scientific.unit.ElectricResistance
 import com.splendo.kaluga.scientific.unit.Time
 import com.splendo.kaluga.scientific.unit.Voltage
 
-val PhysicalQuantity.ElectricCharge.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCharge, *, *>>(
-    QuantityConverter("Electric Charge from Voltage", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.ElectricCharge.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCharge, *>>(
+    QuantityConverterWithOperator("Electric Charge from Voltage", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Current from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Current from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Voltage", QuantityConverter.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Voltage", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Electric Resistance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Magnetic Flux from Electric Resistance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Electric Current", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Electric Current", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricCharge && rightUnit is ElectricCurrent -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Capacitance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Voltage from Electric Capacitance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Abfarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
index f2d8d1726..37d8b636a 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
@@ -28,22 +28,22 @@ import com.splendo.kaluga.scientific.unit.ElectricConductance
 import com.splendo.kaluga.scientific.unit.Frequency
 import com.splendo.kaluga.scientific.unit.Voltage
 
-val PhysicalQuantity.ElectricConductance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricConductance, *, *>>(
-    QuantityConverter("Electric Capacitance from Frequency", QuantityConverter.Type.Division, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.ElectricConductance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricConductance, *>>(
+    QuantityConverterWithOperator("Electric Capacitance from Frequency", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Absiemens && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricConductance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Current from Voltage", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Current from Voltage", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Absiemens && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricConductance && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Frequency from Electric Capacitance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Frequency from Electric Capacitance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricConductance && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
index f14bcb683..25d37c1d2 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
@@ -36,8 +36,8 @@ import com.splendo.kaluga.scientific.unit.Maxwell
 import com.splendo.kaluga.scientific.unit.Time
 import com.splendo.kaluga.scientific.unit.Voltage
 
-val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCurrent, *, *>>(
-    QuantityConverter("Electric Charge from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCurrent, *>>(
+    QuantityConverterWithOperator("Electric Charge from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -45,7 +45,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Charge from Time", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Charge from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -53,7 +53,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Magnetic Flux", QuantityConverter.Type.Multiplication, PhysicalQuantity.MagneticFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Magnetic Flux", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.MagneticFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -61,7 +61,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Electric Inductance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Magnetic Flux from Electric Inductance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Abhenry -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Abhenry -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -69,7 +69,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Power from Voltage", QuantityConverter.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Power from Voltage", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -77,7 +77,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Conductance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricConductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Voltage from Electric Conductance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricConductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Absiemens -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Absiemens -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -85,7 +85,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Resistance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Voltage from Electric Resistance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt
index 464b489d0..29aa62757 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricInductanceConverters.kt
@@ -30,22 +30,22 @@ import com.splendo.kaluga.scientific.unit.ElectricResistance
 import com.splendo.kaluga.scientific.unit.Frequency
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.ElectricInductance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricInductance, *, *>>(
-    QuantityConverter("Electric Resistance from Frequency", QuantityConverter.Type.Multiplication, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.ElectricInductance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricInductance, *>>(
+    QuantityConverterWithOperator("Electric Resistance from Frequency", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abhenry && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricInductance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Resistance from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Resistance from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abhenry && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricInductance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Electric Current", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Magnetic Flux from Electric Current", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abhenry && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Abhenry && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -53,7 +53,7 @@ val PhysicalQuantity.ElectricInductance.converters get() = listOf<QuantityConver
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Electric Resistance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Electric Resistance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricInductance && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
index 941653718..f10013d27 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
@@ -33,41 +33,41 @@ import com.splendo.kaluga.scientific.unit.ElectricResistance
 import com.splendo.kaluga.scientific.unit.Frequency
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.ElectricResistance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricResistance, *, *>>(
-    QuantityConverter("Electric Inductance from Frequency", QuantityConverter.Type.Division, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.ElectricResistance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricResistance, *>>(
+    QuantityConverterWithOperator("Electric Inductance from Frequency", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abohm && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricResistance && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Inductance from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Inductance from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abohm && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricResistance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Frequency from Electric Inductance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Frequency from Electric Inductance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricResistance && rightUnit is ElectricInductance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Electric Charge", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Magnetic Flux from Electric Charge", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abohm && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricResistance && rightUnit is ElectricCharge -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Electric Capacitance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Electric Capacitance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricResistance && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Current", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Voltage from Electric Current", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abohm && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Abohm && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
index 126fff503..9c8a60b93 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
@@ -25,8 +25,8 @@ import com.splendo.kaluga.scientific.converter.energy.equivalentDoseBy
 import com.splendo.kaluga.scientific.converter.energy.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<PhysicalQuantity.Energy, *, *>>(
-    QuantityConverter("Action from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<PhysicalQuantity.Energy, *>>(
+    QuantityConverterWithOperator("Action from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -35,13 +35,13 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Amount of Substance from Molar Energy", QuantityConverter.Type.Division, PhysicalQuantity.MolarEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Amount of Substance from Molar Energy", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Energy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area from Surface Tension", QuantityConverter.Type.Division, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Area from Surface Tension", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -63,7 +63,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Charge from Voltage", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Charge from Voltage", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -71,7 +71,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Current from Magnetic Flux", QuantityConverter.Type.Division, PhysicalQuantity.MagneticFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Current from Magnetic Flux", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MagneticFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is Maxwell -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -79,7 +79,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Force from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Force from Length", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -92,7 +92,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Heat Capacity from Temperature", QuantityConverter.Type.Division, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Heat Capacity from Temperature", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is USCustomaryTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -103,7 +103,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Ionizing Radiation Absorbed Dose from Weight", QuantityConverter.Type.Custom("absorbed by"), PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Ionizing Radiation Absorbed Dose from Weight", QuantityConverter.WithOperator.Type.Custom("absorbed by"), PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) absorbedBy DefaultScientificValue(rightValue, rightUnit)
@@ -111,7 +111,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Ionizing Radiation Equivalent Dose from Weight", QuantityConverter.Type.Custom("absorbed by"), PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Ionizing Radiation Equivalent Dose from Weight", QuantityConverter.WithOperator.Type.Custom("absorbed by"), PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
@@ -119,7 +119,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Length from Force", QuantityConverter.Type.Division, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Force", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Erg && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -139,7 +139,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Electric Current", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Magnetic Flux from Electric Current", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -149,7 +149,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Energy from Amount of Substance", QuantityConverter.Type.Division, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Energy from Amount of Substance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -158,7 +158,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Power from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Power from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is WattHour && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is WattHourMultiple && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -183,7 +183,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Pressure from Volume", QuantityConverter.Type.Division, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Pressure from Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -199,7 +199,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Energy from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Energy from Weight", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -213,7 +213,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Surface Tension from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Surface Tension from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -226,7 +226,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Temperature from Heat Capacity", QuantityConverter.Type.Division, PhysicalQuantity.HeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Temperature from Heat Capacity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.HeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricAndUKImperialHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -240,7 +240,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Power", QuantityConverter.Type.Division, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Power", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is WattHour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is WattHour && rightUnit is WattMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -255,7 +255,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Charge", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Voltage from Electric Charge", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -263,7 +263,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volume from Pressure", QuantityConverter.Type.Division, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volume from Pressure", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Erg && rightUnit is BaryeMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -282,7 +282,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Ionizing Radiation Absorbed Dose", QuantityConverter.Type.Division, PhysicalQuantity.IonizingRadiationAbsorbedDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Ionizing Radiation Absorbed Dose", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.IonizingRadiationAbsorbedDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Erg && rightUnit is RadMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -292,7 +292,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Ionizing Radiation Equivalent Dose", QuantityConverter.Type.Division, PhysicalQuantity.IonizingRadiationEquivalentDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Ionizing Radiation Equivalent Dose", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.IonizingRadiationEquivalentDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Erg && rightUnit is RoentgenEquivalentManMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -302,7 +302,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Specific Energy", QuantityConverter.Type.Division, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Specific Energy", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialEnergy && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialEnergy && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
index 040142410..6e0ff1b3b 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ForceConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.force.div
 import com.splendo.kaluga.scientific.converter.force.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQuantity.Force, *, *>>(
-    QuantityConverter("Acceleration from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQuantity.Force, *>>(
+    QuantityConverterWithOperator("Acceleration from Weight", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is DyneMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -39,7 +39,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area from Pressure", QuantityConverter.Type.Division, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Area from Pressure", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Dyne && rightUnit is BaryeMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -66,7 +66,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Length", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is DyneMultiple && rightUnit is Centimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -79,7 +79,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Length from Surface Tension", QuantityConverter.Type.Division, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Surface Tension", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricForce && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -93,7 +93,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Momentum from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Momentum from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is DyneMultiple && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -113,7 +113,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Power from Speed", QuantityConverter.Type.Multiplication, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Power from Speed", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is DyneMultiple && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -124,7 +124,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Pressure from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Pressure from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is DyneMultiple && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -147,7 +147,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Surface Tension from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Surface Tension from Length", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricForce && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -157,13 +157,13 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Yank", QuantityConverter.Type.Division, PhysicalQuantity.Yank) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Yank", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Yank) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Force && rightUnit is Yank -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Acceleration", QuantityConverter.Type.Division, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Acceleration", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Dyne && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is DyneMultiple && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -184,7 +184,7 @@ val PhysicalQuantity.Force.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Yank from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Yank from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialForce && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt
index b19c3fd9d..d6d39dde0 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt
@@ -26,15 +26,15 @@ import com.splendo.kaluga.scientific.unit.ElectricCapacitance
 import com.splendo.kaluga.scientific.unit.ElectricInductance
 import com.splendo.kaluga.scientific.unit.Frequency
 
-val PhysicalQuantity.Frequency.converters get() = listOf<QuantityConverter<PhysicalQuantity.Frequency, *, *>>(
-    QuantityConverter("Electric Conductance from Electric Capacitance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Frequency.converters get() = listOf<QuantityConverter<PhysicalQuantity.Frequency, *>>(
+    QuantityConverterWithOperator("Electric Conductance from Electric Capacitance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Frequency && rightUnit is Abfarad -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Frequency && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Resistance from Electric Inductance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Resistance from Electric Inductance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Frequency && rightUnit is Abhenry -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Frequency && rightUnit is ElectricInductance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt
index 57ec5feab..c4e9e5169 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/HeatCapacityConverters.kt
@@ -39,8 +39,8 @@ import com.splendo.kaluga.scientific.unit.USCustomaryTemperature
 import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.Weight
 
-val PhysicalQuantity.HeatCapacity.converters get() = listOf<QuantityConverter<PhysicalQuantity.HeatCapacity, *, *>>(
-    QuantityConverter("Energy from Temperature", QuantityConverter.Type.Multiplication, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.HeatCapacity.converters get() = listOf<QuantityConverter<PhysicalQuantity.HeatCapacity, *>>(
+    QuantityConverterWithOperator("Energy from Temperature", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricHeatCapacity && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -50,7 +50,7 @@ val PhysicalQuantity.HeatCapacity.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Heat Capacity from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Heat Capacity from Weight", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -64,7 +64,7 @@ val PhysicalQuantity.HeatCapacity.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Specific Heat Capacity", QuantityConverter.Type.Division, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Specific Heat Capacity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is MetricSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndUKImperialHeatCapacity && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IlluminanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IlluminanceConverters.kt
index 0ab7b9cb9..d5df9e4aa 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IlluminanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IlluminanceConverters.kt
@@ -31,8 +31,8 @@ import com.splendo.kaluga.scientific.unit.PhotMultiple
 import com.splendo.kaluga.scientific.unit.SolidAngle
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.Illuminance.converters get() = listOf<QuantityConverter<PhysicalQuantity.Illuminance, *, *>>(
-    QuantityConverter("Luminance from Solid Angle", QuantityConverter.Type.Division, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Illuminance.converters get() = listOf<QuantityConverter<PhysicalQuantity.Illuminance, *>>(
+    QuantityConverterWithOperator("Luminance from Solid Angle", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Phot && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is PhotMultiple && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -41,7 +41,7 @@ val PhysicalQuantity.Illuminance.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Exposure from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Exposure from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricIlluminance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialIlluminance && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -49,13 +49,13 @@ val PhysicalQuantity.Illuminance.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Flux from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Flux from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Illuminance && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Solid Angle from Luminance", QuantityConverter.Type.Division, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Solid Angle from Luminance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Illuminance && rightUnit is Luminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt
index c9dcbffed..91f71019e 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt
@@ -29,8 +29,8 @@ import com.splendo.kaluga.scientific.unit.UKImperialWeight
 import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.Weight
 
-val PhysicalQuantity.IonizingRadiationAbsorbedDose.converters get() = listOf<QuantityConverter<PhysicalQuantity.IonizingRadiationAbsorbedDose, *, *>>(
-    QuantityConverter("Energy from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.IonizingRadiationAbsorbedDose.converters get() = listOf<QuantityConverter<PhysicalQuantity.IonizingRadiationAbsorbedDose, *>>(
+    QuantityConverterWithOperator("Energy from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Rad && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is RadMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt
index 293b26379..fc0ad27ed 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt
@@ -29,8 +29,8 @@ import com.splendo.kaluga.scientific.unit.UKImperialWeight
 import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.Weight
 
-val PhysicalQuantity.IonizingRadiationEquivalentDose.converters get() = listOf<QuantityConverter<PhysicalQuantity.IonizingRadiationEquivalentDose, *, *>>(
-    QuantityConverter("Energy from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.IonizingRadiationEquivalentDose.converters get() = listOf<QuantityConverter<PhysicalQuantity.IonizingRadiationEquivalentDose, *>>(
+    QuantityConverterWithOperator("Energy from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is RoentgenEquivalentMan && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is RoentgenEquivalentManMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/JoltConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/JoltConverters.kt
index de40d0be5..416da4788 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/JoltConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/JoltConverters.kt
@@ -30,8 +30,8 @@ import com.splendo.kaluga.scientific.unit.UKImperialWeight
 import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.Weight
 
-val PhysicalQuantity.Jolt.converters get() = listOf<QuantityConverter<PhysicalQuantity.Jolt, *, *>>(
-    QuantityConverter("Acceleration from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Jolt.converters get() = listOf<QuantityConverter<PhysicalQuantity.Jolt, *>>(
+    QuantityConverterWithOperator("Acceleration from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricJolt && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialJolt && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -39,7 +39,7 @@ val PhysicalQuantity.Jolt.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Yank from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Yank from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricJolt && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialJolt && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LengthConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LengthConverters.kt
index d9bb487c5..60a484cc2 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LengthConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LengthConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.length.div
 import com.splendo.kaluga.scientific.converter.length.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<PhysicalQuantity.Length, *, *>>(
-    QuantityConverter("Area from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<PhysicalQuantity.Length, *>>(
+    QuantityConverterWithOperator("Area from Length", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Meter && rightUnit is Meter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Nanometer && rightUnit is Nanometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -47,7 +47,7 @@ val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area Density from Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Area Density from Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLength && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLength && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -57,7 +57,7 @@ val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area Density from Specific Volume", QuantityConverter.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Area Density from Specific Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLength && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLength && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -67,7 +67,7 @@ val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Force", QuantityConverter.Type.Multiplication, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Force", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Centimeter && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Centimeter && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -83,7 +83,7 @@ val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Force from Surface Tension", QuantityConverter.Type.Multiplication, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Force from Surface Tension", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SurfaceTension) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLength && rightUnit is MetricSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLength && rightUnit is ImperialSurfaceTension -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -93,7 +93,7 @@ val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Linear Mass Density from Area Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Linear Mass Density from Area Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLength && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLength && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -103,7 +103,7 @@ val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Volume from Area Density", QuantityConverter.Type.Division, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Volume from Area Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLength && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLength && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -113,7 +113,7 @@ val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Speed from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Speed from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLength && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLength && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -121,13 +121,13 @@ val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Speed", QuantityConverter.Type.Division, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Speed", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Length && rightUnit is Speed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volume from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volume from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Meter && rightUnit is SquareMeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Nanometer && rightUnit is SquareNanometer -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -152,7 +152,7 @@ val PhysicalQuantity.Length.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Linear Mass Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Linear Mass Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLength && rightUnit is MetricLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLength && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LinearMassDensityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LinearMassDensityConverters.kt
index 39ffe761f..abcd47a9f 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LinearMassDensityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LinearMassDensityConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.linearMassDensity.div
 import com.splendo.kaluga.scientific.converter.linearMassDensity.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.LinearMassDensity.converters get() = listOf<QuantityConverter<PhysicalQuantity.LinearMassDensity, *, *>>(
-    QuantityConverter("Area from Density", QuantityConverter.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.LinearMassDensity.converters get() = listOf<QuantityConverter<PhysicalQuantity.LinearMassDensity, *>>(
+    QuantityConverterWithOperator("Area from Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLinearMassDensity && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLinearMassDensity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -38,7 +38,7 @@ val PhysicalQuantity.LinearMassDensity.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area from Specific Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Area from Specific Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLinearMassDensity && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLinearMassDensity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -52,7 +52,7 @@ val PhysicalQuantity.LinearMassDensity.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area Density from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Area Density from Length", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLinearMassDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLinearMassDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -62,7 +62,7 @@ val PhysicalQuantity.LinearMassDensity.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Density from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Density from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLinearMassDensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLinearMassDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -72,7 +72,7 @@ val PhysicalQuantity.LinearMassDensity.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Length from Area Density", QuantityConverter.Type.Division, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Area Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLinearMassDensity && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLinearMassDensity && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -86,7 +86,7 @@ val PhysicalQuantity.LinearMassDensity.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Length", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLinearMassDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLinearMassDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminanceConverters.kt
index 2d3834841..ff3e91bf0 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminanceConverters.kt
@@ -28,8 +28,8 @@ import com.splendo.kaluga.scientific.unit.MetricLuminance
 import com.splendo.kaluga.scientific.unit.SolidAngle
 import com.splendo.kaluga.scientific.unit.Stilb
 
-val PhysicalQuantity.Luminance.converters get() = listOf<QuantityConverter<PhysicalQuantity.Luminance, *, *>>(
-    QuantityConverter("Illuminance from Solid Angle", QuantityConverter.Type.Multiplication, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Luminance.converters get() = listOf<QuantityConverter<PhysicalQuantity.Luminance, *>>(
+    QuantityConverterWithOperator("Illuminance from Solid Angle", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Stilb && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Lambert && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -39,7 +39,7 @@ val PhysicalQuantity.Luminance.converters get() = listOf<QuantityConverter<Physi
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Intensity from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Intensity from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Luminance && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousEnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousEnergyConverters.kt
index 1064da49b..b12a51d29 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousEnergyConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousEnergyConverters.kt
@@ -30,8 +30,8 @@ import com.splendo.kaluga.scientific.unit.MetricArea
 import com.splendo.kaluga.scientific.unit.MetricLuminousExposure
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.LuminousEnergy.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousEnergy, *, *>>(
-    QuantityConverter("Energy from Luminous Exposure", QuantityConverter.Type.Division, PhysicalQuantity.LuminousExposure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.LuminousEnergy.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousEnergy, *>>(
+    QuantityConverterWithOperator("Energy from Luminous Exposure", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.LuminousExposure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousEnergy && rightUnit is MetricLuminousExposure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is LuminousEnergy && rightUnit is ImperialLuminousExposure -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -39,7 +39,7 @@ val PhysicalQuantity.LuminousEnergy.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Exposure from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Exposure from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousEnergy && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is LuminousEnergy && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -47,13 +47,13 @@ val PhysicalQuantity.LuminousEnergy.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Flux from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Flux from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Luminous Flux", QuantityConverter.Type.Division, PhysicalQuantity.LuminousFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Luminous Flux", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.LuminousFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousEnergy && rightUnit is LuminousFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousExposureConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousExposureConverters.kt
index 16cb93104..823d271d3 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousExposureConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousExposureConverters.kt
@@ -32,8 +32,8 @@ import com.splendo.kaluga.scientific.unit.MetricIlluminance
 import com.splendo.kaluga.scientific.unit.MetricLuminousExposure
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.LuminousExposure.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousExposure, *, *>>(
-    QuantityConverter("Illuminance from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.LuminousExposure.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousExposure, *>>(
+    QuantityConverterWithOperator("Illuminance from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLuminousExposure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLuminousExposure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -41,7 +41,7 @@ val PhysicalQuantity.LuminousExposure.converters get() = listOf<QuantityConverte
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Energy from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Energy from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLuminousExposure && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLuminousExposure && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -49,7 +49,7 @@ val PhysicalQuantity.LuminousExposure.converters get() = listOf<QuantityConverte
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Illuminance", QuantityConverter.Type.Division, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Illuminance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricLuminousExposure && rightUnit is MetricIlluminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialLuminousExposure && rightUnit is ImperialIlluminance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousFluxConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousFluxConverters.kt
index ef5f48cf3..60431667c 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousFluxConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousFluxConverters.kt
@@ -34,8 +34,8 @@ import com.splendo.kaluga.scientific.unit.SolidAngle
 import com.splendo.kaluga.scientific.unit.SquareCentimeter
 import com.splendo.kaluga.scientific.unit.Time
 
-val PhysicalQuantity.LuminousFlux.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousFlux, *, *>>(
-    QuantityConverter("Area from Illuminance", QuantityConverter.Type.Division, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.LuminousFlux.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousFlux, *>>(
+    QuantityConverterWithOperator("Area from Illuminance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousFlux && rightUnit is Phot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is LuminousFlux && rightUnit is PhotMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -44,7 +44,7 @@ val PhysicalQuantity.LuminousFlux.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Illuminance from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Illuminance from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousFlux && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is LuminousFlux && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -53,19 +53,19 @@ val PhysicalQuantity.LuminousFlux.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Energy from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Energy from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousFlux && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Intensity from Solid Angle", QuantityConverter.Type.Division, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Intensity from Solid Angle", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousFlux && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Solid Angle from Luminous Intensity", QuantityConverter.Type.Division, PhysicalQuantity.LuminousIntensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Solid Angle from Luminous Intensity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.LuminousIntensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousFlux && rightUnit is LuminousIntensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousIntensityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousIntensityConverters.kt
index dca0435c9..0541acb3d 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousIntensityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/LuminousIntensityConverters.kt
@@ -33,8 +33,8 @@ import com.splendo.kaluga.scientific.unit.SolidAngle
 import com.splendo.kaluga.scientific.unit.SquareCentimeter
 import com.splendo.kaluga.scientific.unit.Stilb
 
-val PhysicalQuantity.LuminousIntensity.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousIntensity, *, *>>(
-    QuantityConverter("Area from Luminance", QuantityConverter.Type.Division, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.LuminousIntensity.converters get() = listOf<QuantityConverter<PhysicalQuantity.LuminousIntensity, *>>(
+    QuantityConverterWithOperator("Area from Luminance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousIntensity && rightUnit is Stilb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is LuminousIntensity && rightUnit is Lambert -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -44,7 +44,7 @@ val PhysicalQuantity.LuminousIntensity.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminance from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminance from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousIntensity && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is LuminousIntensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -53,7 +53,7 @@ val PhysicalQuantity.LuminousIntensity.converters get() = listOf<QuantityConvert
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Flux from Solid Angle", QuantityConverter.Type.Multiplication, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Flux from Solid Angle", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SolidAngle) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is LuminousIntensity && rightUnit is SolidAngle -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticFluxConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticFluxConverters.kt
index 4c009ad76..8d83f8205 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticFluxConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticFluxConverters.kt
@@ -39,29 +39,29 @@ import com.splendo.kaluga.scientific.unit.SquareCentimeter
 import com.splendo.kaluga.scientific.unit.Time
 import com.splendo.kaluga.scientific.unit.Voltage
 
-val PhysicalQuantity.MagneticFlux.converters get() = listOf<QuantityConverter<PhysicalQuantity.MagneticFlux, *, *>>(
-    QuantityConverter("Area from Magnetic Induction", QuantityConverter.Type.Division, PhysicalQuantity.MagneticInduction) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.MagneticFlux.converters get() = listOf<QuantityConverter<PhysicalQuantity.MagneticFlux, *>>(
+    QuantityConverterWithOperator("Area from Magnetic Induction", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MagneticInduction) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Maxwell && rightUnit is Gauss -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MagneticFlux && rightUnit is MagneticInduction -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Charge from Electric Resistance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Charge from Electric Resistance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Maxwell && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MagneticFlux && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Current from Electric Inductance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Current from Electric Inductance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricInductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Maxwell && rightUnit is Abhenry -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MagneticFlux && rightUnit is ElectricInductance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Inductance from Electric Current", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Inductance from Electric Current", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Maxwell && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Maxwell && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -69,14 +69,14 @@ val PhysicalQuantity.MagneticFlux.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Resistance from Electric Charge", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Resistance from Electric Charge", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Maxwell && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MagneticFlux && rightUnit is ElectricCharge -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Electric Current", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Electric Current", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Maxwell && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Maxwell && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -84,20 +84,20 @@ val PhysicalQuantity.MagneticFlux.converters get() = listOf<QuantityConverter<Ph
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Induction from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Magnetic Induction from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Maxwell && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MagneticFlux && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Voltage", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Voltage", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MagneticFlux && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Voltage from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Maxwell && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MagneticFlux && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticInductionConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticInductionConverters.kt
index 888aec28c..48ef89306 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticInductionConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MagneticInductionConverters.kt
@@ -25,8 +25,8 @@ import com.splendo.kaluga.scientific.unit.Gauss
 import com.splendo.kaluga.scientific.unit.MagneticInduction
 import com.splendo.kaluga.scientific.unit.SquareCentimeter
 
-val PhysicalQuantity.MagneticInduction.converters get() = listOf<QuantityConverter<PhysicalQuantity.MagneticInduction, *, *>>(
-    QuantityConverter("Magnetic Flux from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.MagneticInduction.converters get() = listOf<QuantityConverter<PhysicalQuantity.MagneticInduction, *>>(
+    QuantityConverterWithOperator("Magnetic Flux from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Gauss && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MagneticInduction && rightUnit is Area -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MassFlowRateConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MassFlowRateConverters.kt
index 9f217eeed..53873f955 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MassFlowRateConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MassFlowRateConverters.kt
@@ -27,8 +27,8 @@ import com.splendo.kaluga.scientific.unit.Time
 import com.splendo.kaluga.scientific.unit.UKImperialMassFlowRate
 import com.splendo.kaluga.scientific.unit.USCustomaryMassFlowRate
 
-val PhysicalQuantity.MassFlowRate.converters get() = listOf<QuantityConverter<PhysicalQuantity.MassFlowRate, *, *>>(
-    QuantityConverter("Weight from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.MassFlowRate.converters get() = listOf<QuantityConverter<PhysicalQuantity.MassFlowRate, *>>(
+    QuantityConverterWithOperator("Weight from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMassFlowRate && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMassFlowRate && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt
index 733841004..c37de1a13 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt
@@ -23,14 +23,14 @@ import com.splendo.kaluga.scientific.converter.molality.div
 import com.splendo.kaluga.scientific.converter.molality.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Molality.converters get() = listOf<QuantityConverter<PhysicalQuantity.Molality, *, *>>(
-    QuantityConverter("Amount of Substance from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Molality.converters get() = listOf<QuantityConverter<PhysicalQuantity.Molality, *>>(
+    QuantityConverterWithOperator("Amount of Substance from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Molality && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molarity from Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molarity from Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Molality && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Molality && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -40,7 +40,7 @@ val PhysicalQuantity.Molality.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molarity from Specific Volume", QuantityConverter.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molarity from Specific Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Molality && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Molality && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -50,7 +50,7 @@ val PhysicalQuantity.Molality.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Energy from Molar Energy", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Energy from Molar Energy", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.MolarEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolality && rightUnit is MetricAndImperialMolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolality && rightUnit is MetricAndImperialMolarEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -64,7 +64,7 @@ val PhysicalQuantity.Molality.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Volume from Molar Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Volume from Molar Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolality && rightUnit is MetricMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolality && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -78,7 +78,7 @@ val PhysicalQuantity.Molality.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Volume from Molarity", QuantityConverter.Type.Division, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Volume from Molarity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolality && rightUnit is MetricMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolality && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarEnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarEnergyConverters.kt
index abe2a5869..0df131888 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarEnergyConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarEnergyConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.molarEnergy.div
 import com.splendo.kaluga.scientific.converter.molarEnergy.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.MolarEnergy.converters get() = listOf<QuantityConverter<PhysicalQuantity.MolarEnergy, *, *>>(
-    QuantityConverter("Energy from Amount of Substance", QuantityConverter.Type.Multiplication, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.MolarEnergy.converters get() = listOf<QuantityConverter<PhysicalQuantity.MolarEnergy, *>>(
+    QuantityConverterWithOperator("Energy from Amount of Substance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialMolarEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricMolarEnergy && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -33,7 +33,7 @@ val PhysicalQuantity.MolarEnergy.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Mass from Specific Energy", QuantityConverter.Type.Division, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Mass from Specific Energy", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MolarEnergy && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MolarEnergy && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -43,7 +43,7 @@ val PhysicalQuantity.MolarEnergy.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Energy from Molar Mass", QuantityConverter.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Energy from Molar Mass", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialMolarEnergy && rightUnit is MetricMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialMolarEnergy && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -57,7 +57,7 @@ val PhysicalQuantity.MolarEnergy.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Energy from Molality", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Energy from Molality", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndImperialMolarEnergy && rightUnit is MetricMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialMolarEnergy && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt
index 0f61bf385..36da9e6f8 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.molarMass.div
 import com.splendo.kaluga.scientific.converter.molarMass.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.MolarMass.converters get() = listOf<QuantityConverter<PhysicalQuantity.MolarMass, *, *>>(
-    QuantityConverter("Density from Molarity", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.MolarMass.converters get() = listOf<QuantityConverter<PhysicalQuantity.MolarMass, *>>(
+    QuantityConverterWithOperator("Density from Molarity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolarMass && rightUnit is MetricMolarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolarMass && rightUnit is ImperialMolarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -38,7 +38,7 @@ val PhysicalQuantity.MolarMass.converters get() = listOf<QuantityConverter<Physi
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Density from Molar Volume", QuantityConverter.Type.Division, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Density from Molar Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolarMass && rightUnit is MetricMolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolarMass && rightUnit is ImperialMolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -52,7 +52,7 @@ val PhysicalQuantity.MolarMass.converters get() = listOf<QuantityConverter<Physi
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Energy from Specific Energy", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Energy from Specific Energy", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MolarMass && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MolarMass && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -62,7 +62,7 @@ val PhysicalQuantity.MolarMass.converters get() = listOf<QuantityConverter<Physi
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Volume from Density", QuantityConverter.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Volume from Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MolarMass && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MolarMass && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -72,7 +72,7 @@ val PhysicalQuantity.MolarMass.converters get() = listOf<QuantityConverter<Physi
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Volume from Specific Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Volume from Specific Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MolarMass && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MolarMass && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -82,7 +82,7 @@ val PhysicalQuantity.MolarMass.converters get() = listOf<QuantityConverter<Physi
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Amount of Substance", QuantityConverter.Type.Multiplication, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Amount of Substance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolarMass && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolarMass && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt
index 064dcee5b..e658b041a 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.molarVolume.div
 import com.splendo.kaluga.scientific.converter.molarVolume.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.MolarVolume.converters get() = listOf<QuantityConverter<PhysicalQuantity.MolarVolume, *, *>>(
-    QuantityConverter("Molar Mass from Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.MolarVolume.converters get() = listOf<QuantityConverter<PhysicalQuantity.MolarVolume, *>>(
+    QuantityConverterWithOperator("Molar Mass from Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MolarVolume && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MolarVolume && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -34,7 +34,7 @@ val PhysicalQuantity.MolarVolume.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Mass from Specific Volume", QuantityConverter.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Mass from Specific Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MolarVolume && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MolarVolume && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -44,7 +44,7 @@ val PhysicalQuantity.MolarVolume.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Volume from Molality", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Volume from Molality", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolarVolume && rightUnit is MetricMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolarVolume && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -58,7 +58,7 @@ val PhysicalQuantity.MolarVolume.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Volume from Molar Mass", QuantityConverter.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Volume from Molar Mass", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolarVolume && rightUnit is MetricMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolarVolume && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -72,7 +72,7 @@ val PhysicalQuantity.MolarVolume.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volume from Amount of Substance", QuantityConverter.Type.Multiplication, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volume from Amount of Substance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolarVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolarVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt
index 36afc1666..1d6b62a98 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt
@@ -23,14 +23,14 @@ import com.splendo.kaluga.scientific.converter.molarity.div
 import com.splendo.kaluga.scientific.converter.molarity.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Molarity.converters get() = listOf<QuantityConverter<PhysicalQuantity.Molarity, *, *>>(
-    QuantityConverter("Amount of Substance from Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Molarity.converters get() = listOf<QuantityConverter<PhysicalQuantity.Molarity, *>>(
+    QuantityConverterWithOperator("Amount of Substance from Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Molarity && rightUnit is Volume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Density from Molality", QuantityConverter.Type.Division, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Density from Molality", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolarity && rightUnit is MetricMolality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolarity && rightUnit is ImperialMolality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -44,7 +44,7 @@ val PhysicalQuantity.Molarity.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Density from Molar Mass", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Density from Molar Mass", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMolarity && rightUnit is MetricMolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMolarity && rightUnit is ImperialMolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -58,7 +58,7 @@ val PhysicalQuantity.Molarity.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molality from Density", QuantityConverter.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molality from Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Molarity && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Molarity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -68,7 +68,7 @@ val PhysicalQuantity.Molarity.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molality from Specific Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molality from Specific Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Molarity && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Molarity && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MomentumConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MomentumConverters.kt
index ac5124cdf..30e97ffcd 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MomentumConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MomentumConverters.kt
@@ -22,8 +22,8 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.momentum.div
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Momentum.converters get() = listOf<QuantityConverter<PhysicalQuantity.Momentum, *, *>>(
-    QuantityConverter("Area from Dynamic Viscosity", QuantityConverter.Type.Division, PhysicalQuantity.DynamicViscosity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Momentum.converters get() = listOf<QuantityConverter<PhysicalQuantity.Momentum, *>>(
+    QuantityConverterWithOperator("Area from Dynamic Viscosity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.DynamicViscosity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMomentum && rightUnit is MetricDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMomentum && rightUnit is ImperialDynamicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -37,7 +37,7 @@ val PhysicalQuantity.Momentum.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Dynamic Viscosity from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Dynamic Viscosity from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMomentum && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMomentum && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -47,7 +47,7 @@ val PhysicalQuantity.Momentum.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Force from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Force from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMomentum && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMomentum && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -57,7 +57,7 @@ val PhysicalQuantity.Momentum.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Speed from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Speed from Weight", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMomentum && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMomentum && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -71,7 +71,7 @@ val PhysicalQuantity.Momentum.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Speed", QuantityConverter.Type.Division, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Speed", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricMomentum && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialMomentum && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PowerConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PowerConverters.kt
index 40512ccfc..fc8d22e8d 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PowerConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PowerConverters.kt
@@ -23,15 +23,15 @@ import com.splendo.kaluga.scientific.converter.power.div
 import com.splendo.kaluga.scientific.converter.power.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Power.converters get() = listOf<QuantityConverter<PhysicalQuantity.Power, *, *>>(
-    QuantityConverter("Electric Current from Voltage", QuantityConverter.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Power.converters get() = listOf<QuantityConverter<PhysicalQuantity.Power, *>>(
+    QuantityConverterWithOperator("Electric Current from Voltage", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ErgPerSecond && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Power && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Watt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Nanowatt && rightUnit is Hour -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -57,7 +57,7 @@ val PhysicalQuantity.Power.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Force from Speed", QuantityConverter.Type.Division, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Force from Speed", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ErgPerSecond && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricPower && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -67,7 +67,7 @@ val PhysicalQuantity.Power.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Speed from Force", QuantityConverter.Type.Division, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Speed from Force", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ErgPerSecond && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgPerSecond && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -89,7 +89,7 @@ val PhysicalQuantity.Power.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Temperature from Thermal Resistance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ThermalResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Temperature from Thermal Resistance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ThermalResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Power && rightUnit is MetricAndUKImperialThermalResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndImperialPower && rightUnit is MetricThermalResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -102,7 +102,7 @@ val PhysicalQuantity.Power.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Voltage from Electric Current", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Voltage from Electric Current", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ErgPerSecond && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgPerSecond && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PressureConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PressureConverters.kt
index a51870720..bf4f518e7 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PressureConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/PressureConverters.kt
@@ -22,8 +22,8 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.pressure.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Pressure.converters get() = listOf<QuantityConverter<PhysicalQuantity.Pressure, *, *>>(
-    QuantityConverter("Dynamic Viscosity from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Pressure.converters get() = listOf<QuantityConverter<PhysicalQuantity.Pressure, *>>(
+    QuantityConverterWithOperator("Dynamic Viscosity from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricPressure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialPressure && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -33,7 +33,7 @@ val PhysicalQuantity.Pressure.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Barye && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is BaryeMultiple && rightUnit is CubicCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -55,7 +55,7 @@ val PhysicalQuantity.Pressure.converters get() = listOf<QuantityConverter<Physic
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Force from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Force from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Barye && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is BaryeMultiple && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
index df8f595eb..5216dd2fc 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
@@ -23,39 +23,74 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.unit.ScientificUnit
 import kotlin.reflect.KClass
 
-data class QuantityConverter<Left : PhysicalQuantity, Right : PhysicalQuantity, Result : PhysicalQuantity>(
-    val leftQuantity: KClass<Left>,
-    val rightQuantity: Right,
-    val resultQuantity: KClass<Result>,
-    val name: String,
-    val type: Type,
-    val converter: (left: Pair<Decimal, ScientificUnit<Left>>, right: Pair<Decimal, ScientificUnit<Right>>) -> ScientificValue<Result, *>
-) {
-    sealed class Type {
-
-        abstract val operatorSymbol: String
-
-        object Multiplication : Type() {
-            override val operatorSymbol: String = "*"
-        }
-        object Division : Type() {
-            override val operatorSymbol: String = "/"
+sealed class QuantityConverter<From : PhysicalQuantity, Result : PhysicalQuantity> {
+    abstract val name: String
+
+    data class Single<From : PhysicalQuantity, Result : PhysicalQuantity>(
+        val fromQuantity: KClass<From>,
+        val resultQuantity: KClass<Result>,
+        override val name: String,
+        val converter: (Pair<Decimal, ScientificUnit<From>>) -> ScientificValue<Result, *>
+    ) : QuantityConverter<From, Result>() {
+        fun convert(
+            value: Decimal,
+            unit: ScientificUnit<*>
+        ): ScientificValue<*, *>? {
+            return if (fromQuantity.isInstance(unit.quantity)) {
+                converter(value to unit as ScientificUnit<From>)
+            } else {
+                null
+            }
         }
-        data class Custom(override val operatorSymbol: String) : Type()
     }
 
-    fun convert(left: Decimal, leftUnit: ScientificUnit<*>, right: Decimal, rightUnit: ScientificUnit<*>): ScientificValue<*, *>? {
-        return if (leftQuantity.isInstance(leftUnit.quantity) && rightQuantity::class.isInstance(rightUnit.quantity)) {
-            converter(left to leftUnit as ScientificUnit<Left>, right to rightUnit as ScientificUnit<Right>)
-        } else {
-            null
+    data class WithOperator<Left : PhysicalQuantity, Right : PhysicalQuantity, Result : PhysicalQuantity>(
+        val leftQuantity: KClass<Left>,
+        val rightQuantity: Right,
+        val resultQuantity: KClass<Result>,
+        override val name: String,
+        val type: Type,
+        val converter: (left: Pair<Decimal, ScientificUnit<Left>>, right: Pair<Decimal, ScientificUnit<Right>>) -> ScientificValue<Result, *>
+    ) : QuantityConverter<Left, Result>() {
+        sealed class Type {
+
+            abstract val operatorSymbol: String
+
+            object Multiplication : Type() {
+                override val operatorSymbol: String = "*"
+            }
+
+            object Division : Type() {
+                override val operatorSymbol: String = "/"
+            }
+
+            data class Custom(override val operatorSymbol: String) : Type()
+        }
+
+        fun convert(
+            left: Decimal,
+            leftUnit: ScientificUnit<*>,
+            right: Decimal,
+            rightUnit: ScientificUnit<*>
+        ): ScientificValue<*, *>? {
+            return if (leftQuantity.isInstance(leftUnit.quantity) && rightQuantity::class.isInstance(
+                    rightUnit.quantity
+                )
+            ) {
+                converter(
+                    left to leftUnit as ScientificUnit<Left>,
+                    right to rightUnit as ScientificUnit<Right>
+                )
+            } else {
+                null
+            }
         }
     }
 }
 
-inline fun <reified Left : PhysicalQuantity, reified Right : PhysicalQuantity, reified Result : PhysicalQuantity> QuantityConverter(
+inline fun <reified Left : PhysicalQuantity, reified Right : PhysicalQuantity, reified Result : PhysicalQuantity> QuantityConverterWithOperator(
     name: String,
-    type: QuantityConverter.Type,
+    type: QuantityConverter.WithOperator.Type,
     right: Right,
     noinline converter: (left: Pair<Decimal, ScientificUnit<Left>>, right: Pair<Decimal, ScientificUnit<Right>>) -> ScientificValue<Result, *>
-) = QuantityConverter(Left::class, right, Result::class, name, type, converter)
+) = QuantityConverter.WithOperator(Left::class, right, Result::class, name, type, converter)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/RadioactivityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/RadioactivityConverters.kt
index d7743530c..a5d021d9c 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/RadioactivityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/RadioactivityConverters.kt
@@ -19,4 +19,4 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 
 import com.splendo.kaluga.scientific.PhysicalQuantity
 
-val PhysicalQuantity.Radioactivity.converters get() = listOf<QuantityConverter<PhysicalQuantity.Radioactivity, *, *>>()
+val PhysicalQuantity.Radioactivity.converters get() = listOf<QuantityConverter<PhysicalQuantity.Radioactivity, *>>()
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SolidAngleConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SolidAngleConverters.kt
index 30627572a..2ad6582ab 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SolidAngleConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SolidAngleConverters.kt
@@ -22,8 +22,8 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.solidAngle.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.SolidAngle.converters get() = listOf<QuantityConverter<PhysicalQuantity.SolidAngle, *, *>>(
-    QuantityConverter("Illuminance from Luminance", QuantityConverter.Type.Multiplication, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.SolidAngle.converters get() = listOf<QuantityConverter<PhysicalQuantity.SolidAngle, *>>(
+    QuantityConverterWithOperator("Illuminance from Luminance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Luminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SolidAngle && rightUnit is Luminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is SolidAngle && rightUnit is Lambert -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -33,7 +33,7 @@ val PhysicalQuantity.SolidAngle.converters get() = listOf<QuantityConverter<Phys
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Flux from Luminous Intensity", QuantityConverter.Type.Multiplication, PhysicalQuantity.LuminousIntensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Flux from Luminous Intensity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.LuminousIntensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is SolidAngle && rightUnit is LuminousIntensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt
index 296084ef5..65d43f56c 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.specificEnergy.div
 import com.splendo.kaluga.scientific.converter.specificEnergy.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.SpecificEnergy.converters get() = listOf<QuantityConverter<PhysicalQuantity.SpecificEnergy, *, *>>(
-    QuantityConverter("Energy from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.SpecificEnergy.converters get() = listOf<QuantityConverter<PhysicalQuantity.SpecificEnergy, *>>(
+    QuantityConverterWithOperator("Energy from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificEnergy && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificEnergy && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -38,7 +38,7 @@ val PhysicalQuantity.SpecificEnergy.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molality from Molar Energy", QuantityConverter.Type.Division, PhysicalQuantity.MolarEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molality from Molar Energy", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificEnergy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificEnergy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -48,7 +48,7 @@ val PhysicalQuantity.SpecificEnergy.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Energy from Molar Mass", QuantityConverter.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Energy from Molar Mass", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificEnergy && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificEnergy && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -58,7 +58,7 @@ val PhysicalQuantity.SpecificEnergy.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Energy from Molality", QuantityConverter.Type.Division, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Energy from Molality", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificEnergy && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificEnergy && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -68,7 +68,7 @@ val PhysicalQuantity.SpecificEnergy.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Heat Capacity from Temperature", QuantityConverter.Type.Division, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Heat Capacity from Temperature", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificEnergy && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificEnergy && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -79,7 +79,7 @@ val PhysicalQuantity.SpecificEnergy.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Temperature from Specific Heat Capacity", QuantityConverter.Type.Division, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Temperature from Specific Heat Capacity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificEnergy && rightUnit is MetricSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificEnergy && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificHeatCapacityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificHeatCapacityConverters.kt
index b56872d67..2dc53c94d 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificHeatCapacityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificHeatCapacityConverters.kt
@@ -33,8 +33,8 @@ import com.splendo.kaluga.scientific.unit.USCustomaryTemperature
 import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.Weight
 
-val PhysicalQuantity.SpecificHeatCapacity.converters get() = listOf<QuantityConverter<PhysicalQuantity.SpecificHeatCapacity, *, *>>(
-    QuantityConverter("Heat Capacity from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.SpecificHeatCapacity.converters get() = listOf<QuantityConverter<PhysicalQuantity.SpecificHeatCapacity, *>>(
+    QuantityConverterWithOperator("Heat Capacity from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificHeatCapacity && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is UKImperialSpecificHeatCapacity && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -45,7 +45,7 @@ val PhysicalQuantity.SpecificHeatCapacity.converters get() = listOf<QuantityConv
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Energy from Temperature", QuantityConverter.Type.Multiplication, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Energy from Temperature", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Temperature) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificHeatCapacity && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is UKImperialSpecificHeatCapacity && rightUnit is MetricAndUKImperialTemperature -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt
index c07709d40..1cf47359a 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.specificVolume.div
 import com.splendo.kaluga.scientific.converter.specificVolume.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.SpecificVolume.converters get() = listOf<QuantityConverter<PhysicalQuantity.SpecificVolume, *, *>>(
-    QuantityConverter("Area from Linear Mass Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.SpecificVolume.converters get() = listOf<QuantityConverter<PhysicalQuantity.SpecificVolume, *>>(
+    QuantityConverterWithOperator("Area from Linear Mass Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificVolume && rightUnit is MetricLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificVolume && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -38,7 +38,7 @@ val PhysicalQuantity.SpecificVolume.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Length from Area Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Area Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificVolume && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificVolume && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -52,7 +52,7 @@ val PhysicalQuantity.SpecificVolume.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molality from Molar Volume", QuantityConverter.Type.Division, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molality from Molar Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificVolume && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificVolume && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -62,7 +62,7 @@ val PhysicalQuantity.SpecificVolume.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molality from Molarity", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molality from Molarity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificVolume && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificVolume && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -72,7 +72,7 @@ val PhysicalQuantity.SpecificVolume.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Volume from Molar Mass", QuantityConverter.Type.Multiplication, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Volume from Molar Mass", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificVolume && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificVolume && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -82,7 +82,7 @@ val PhysicalQuantity.SpecificVolume.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Volume from Molality", QuantityConverter.Type.Division, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Volume from Molality", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificVolume && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificVolume && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -92,7 +92,7 @@ val PhysicalQuantity.SpecificVolume.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volume from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volume from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificVolume && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificVolume && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpeedConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpeedConverters.kt
index e637e5fd2..fe47ba732 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpeedConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpeedConverters.kt
@@ -38,8 +38,8 @@ import com.splendo.kaluga.scientific.unit.USCustomaryForce
 import com.splendo.kaluga.scientific.unit.USCustomaryWeight
 import com.splendo.kaluga.scientific.unit.Weight
 
-val PhysicalQuantity.Speed.converters get() = listOf<QuantityConverter<PhysicalQuantity.Speed, *, *>>(
-    QuantityConverter("Acceleration from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Speed.converters get() = listOf<QuantityConverter<PhysicalQuantity.Speed, *>>(
+    QuantityConverterWithOperator("Acceleration from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpeed && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpeed && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -47,7 +47,7 @@ val PhysicalQuantity.Speed.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Length from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpeed && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpeed && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -55,7 +55,7 @@ val PhysicalQuantity.Speed.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Momentum from Weight", QuantityConverter.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Momentum from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpeed && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpeed && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -65,7 +65,7 @@ val PhysicalQuantity.Speed.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Power from Force", QuantityConverter.Type.Multiplication, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Power from Force", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpeed && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricSpeed && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -76,7 +76,7 @@ val PhysicalQuantity.Speed.converters get() = listOf<QuantityConverter<PhysicalQ
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Acceleration", QuantityConverter.Type.Division, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Acceleration", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Speed && rightUnit is Acceleration -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SurfaceTensionConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SurfaceTensionConverters.kt
index 0258a2672..7db98dc5d 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SurfaceTensionConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SurfaceTensionConverters.kt
@@ -22,8 +22,8 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.surfaceTension.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.SurfaceTension.converters get() = listOf<QuantityConverter<PhysicalQuantity.SurfaceTension, *, *>>(
-    QuantityConverter("Energy from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.SurfaceTension.converters get() = listOf<QuantityConverter<PhysicalQuantity.SurfaceTension, *>>(
+    QuantityConverterWithOperator("Energy from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSurfaceTension && rightUnit is SquareCentimeter -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricSurfaceTension && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -37,7 +37,7 @@ val PhysicalQuantity.SurfaceTension.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Force from Length", QuantityConverter.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Force from Length", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSurfaceTension && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSurfaceTension && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TemperatureConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TemperatureConverters.kt
index caed67ce3..4f93f01ad 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TemperatureConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TemperatureConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.temperature.div
 import com.splendo.kaluga.scientific.converter.temperature.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Temperature.converters get() = listOf<QuantityConverter<PhysicalQuantity.Temperature, *, *>>(
-    QuantityConverter("Energy from Heat Capacity", QuantityConverter.Type.Multiplication, PhysicalQuantity.HeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Temperature.converters get() = listOf<QuantityConverter<PhysicalQuantity.Temperature, *>>(
+    QuantityConverterWithOperator("Energy from Heat Capacity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.HeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricAndUKImperialHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -34,7 +34,7 @@ val PhysicalQuantity.Temperature.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Power from Thermal Resistance", QuantityConverter.Type.Division, PhysicalQuantity.ThermalResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Power from Thermal Resistance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ThermalResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricAndUKImperialThermalResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricThermalResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -44,7 +44,7 @@ val PhysicalQuantity.Temperature.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Energy from Specific Heat Capacity", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Energy from Specific Heat Capacity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndUKImperialTemperature && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -53,7 +53,7 @@ val PhysicalQuantity.Temperature.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Thermal Resistance from Power", QuantityConverter.Type.Division, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Thermal Resistance from Power", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricAndImperialPower -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricAndUKImperialTemperature && rightUnit is MetricPower -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TheralResistanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TheralResistanceConverters.kt
index f73241f92..d5604dd51 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TheralResistanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TheralResistanceConverters.kt
@@ -30,8 +30,8 @@ import com.splendo.kaluga.scientific.unit.ThermalResistance
 import com.splendo.kaluga.scientific.unit.UKImperialThermalResistance
 import com.splendo.kaluga.scientific.unit.USCustomaryThermalResistance
 
-val PhysicalQuantity.ThermalResistance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ThermalResistance, *, *>>(
-    QuantityConverter("Temperature from Power", QuantityConverter.Type.Multiplication, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.ThermalResistance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ThermalResistance, *>>(
+    QuantityConverterWithOperator("Temperature from Power", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAndUKImperialThermalResistance && rightUnit is Power -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricThermalResistance && rightUnit is MetricAndImperialPower -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt
index 81fc57a94..15294925d 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.time.div
 import com.splendo.kaluga.scientific.converter.time.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQuantity.Time, *, *>>(
-    QuantityConverter("Acceleration from Jolt", QuantityConverter.Type.Multiplication, PhysicalQuantity.Jolt) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQuantity.Time, *>>(
+    QuantityConverterWithOperator("Acceleration from Jolt", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Jolt) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is MetricJolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ImperialJolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -32,7 +32,7 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Action from Energy", QuantityConverter.Type.Multiplication, PhysicalQuantity.Energy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Action from Energy", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Energy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is MetricAndImperialEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is MetricEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -41,25 +41,25 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Amount of Substance from Catalystic Activity", QuantityConverter.Type.Multiplication, PhysicalQuantity.CatalysticActivity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Amount of Substance from Catalystic Activity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.CatalysticActivity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is CatalysticActivity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Angle from Angular Velocity", QuantityConverter.Type.Multiplication, PhysicalQuantity.AngularVelocity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Angle from Angular Velocity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.AngularVelocity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is AngularVelocity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Angular Velocity from Angular Acceleration", QuantityConverter.Type.Multiplication, PhysicalQuantity.AngularAcceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Angular Velocity from Angular Acceleration", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.AngularAcceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is AngularAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Dynamic Viscosity from Pressure", QuantityConverter.Type.Multiplication, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Dynamic Viscosity from Pressure", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is MetricPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ImperialPressure -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -69,14 +69,14 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Capacitance from Electric Resistance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Capacitance from Electric Resistance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Charge from Electric Current", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Charge from Electric Current", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -84,21 +84,21 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Inductance from Electric Resistance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Inductance from Electric Resistance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Resistance from Electric Capacitance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Resistance from Electric Capacitance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is Abfarad -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Power", QuantityConverter.Type.Multiplication, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Power", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Power) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Hour && rightUnit is Watt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Hour && rightUnit is Nanowatt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -124,7 +124,7 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Force from Yank", QuantityConverter.Type.Multiplication, PhysicalQuantity.Yank) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Force from Yank", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Yank) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is MetricYank -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ImperialYank -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -134,7 +134,7 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Length from Speed", QuantityConverter.Type.Multiplication, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Speed", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -142,13 +142,13 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Energy from Luminous Flux", QuantityConverter.Type.Multiplication, PhysicalQuantity.LuminousFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Energy from Luminous Flux", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.LuminousFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is LuminousFlux -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Luminous Exposure from Illuminance", QuantityConverter.Type.Multiplication, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Luminous Exposure from Illuminance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Illuminance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is MetricIlluminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ImperialIlluminance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -156,14 +156,14 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Voltage", QuantityConverter.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Magnetic Flux from Voltage", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Momentum from Force", QuantityConverter.Type.Multiplication, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Momentum from Force", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Force) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is Dyne -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is DyneMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -183,7 +183,7 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Speed from Acceleration", QuantityConverter.Type.Multiplication, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Speed from Acceleration", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ImperialAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -191,7 +191,7 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volume from Volumetric Flow", QuantityConverter.Type.Multiplication, PhysicalQuantity.VolumetricFlow) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volume from Volumetric Flow", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.VolumetricFlow) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is MetricVolumetricFlow -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ImperialVolumetricFlow -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -201,7 +201,7 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Mass Flow Rate", QuantityConverter.Type.Multiplication, PhysicalQuantity.MassFlowRate) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Mass Flow Rate", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.MassFlowRate) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is MetricMassFlowRate -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Time && rightUnit is ImperialMassFlowRate -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VoltageConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VoltageConverters.kt
index 86ef75e45..e004dc6c9 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VoltageConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VoltageConverters.kt
@@ -36,29 +36,29 @@ import com.splendo.kaluga.scientific.unit.ElectricResistance
 import com.splendo.kaluga.scientific.unit.Time
 import com.splendo.kaluga.scientific.unit.Voltage
 
-val PhysicalQuantity.Voltage.converters get() = listOf<QuantityConverter<PhysicalQuantity.Voltage, *, *>>(
-    QuantityConverter("Electric Charge from Electric Capacitance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Voltage.converters get() = listOf<QuantityConverter<PhysicalQuantity.Voltage, *>>(
+    QuantityConverterWithOperator("Electric Charge from Electric Capacitance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abvolt && rightUnit is Abfarad -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Voltage && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Current from Electric Conductance", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricConductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Current from Electric Conductance", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricConductance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abvolt && rightUnit is Absiemens -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Voltage && rightUnit is ElectricConductance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Current from Electric Resistance", QuantityConverter.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Current from Electric Resistance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricResistance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abvolt && rightUnit is Abohm -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Voltage && rightUnit is ElectricResistance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Electric Resistance from Electric Current", QuantityConverter.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Resistance from Electric Current", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abvolt && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Abvolt && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -66,21 +66,21 @@ val PhysicalQuantity.Voltage.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Electric Charge", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Electric Charge", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricCharge) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abvolt && rightUnit is Abcoulomb -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Voltage && rightUnit is ElectricCharge -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Magnetic Flux from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Magnetic Flux from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abvolt && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Voltage && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Power from Electric Current", QuantityConverter.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Power from Electric Current", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.ElectricCurrent) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abvolt && rightUnit is Abampere -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Abvolt && rightUnit is Biot -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumeConverters.kt
index b524a48a0..3e1fda037 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumeConverters.kt
@@ -23,20 +23,20 @@ import com.splendo.kaluga.scientific.converter.volume.div
 import com.splendo.kaluga.scientific.converter.volume.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Volume.converters get() = listOf<QuantityConverter<PhysicalQuantity.Volume, *, *>>(
-    QuantityConverter("Amount of Substance from Molarity", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Volume.converters get() = listOf<QuantityConverter<PhysicalQuantity.Volume, *>>(
+    QuantityConverterWithOperator("Amount of Substance from Molarity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Molarity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Volume && rightUnit is Molarity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Amount of Substance from Molar Volume", QuantityConverter.Type.Division, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Amount of Substance from Molar Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Volume && rightUnit is MolarVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Area from Length", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is CubicMeter && rightUnit is Meter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is CubicNanometer && rightUnit is Nanometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -63,7 +63,7 @@ val PhysicalQuantity.Volume.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Pressure", QuantityConverter.Type.Multiplication, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Pressure", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Pressure) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is CubicCentimeter && rightUnit is Barye -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is CubicCentimeter && rightUnit is BaryeMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -85,7 +85,7 @@ val PhysicalQuantity.Volume.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Length from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is CubicMeter && rightUnit is SquareMeter -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is CubicNanometer && rightUnit is SquareNanometer -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -112,7 +112,7 @@ val PhysicalQuantity.Volume.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Volume from Amount of Substance", QuantityConverter.Type.Division, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Volume from Amount of Substance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialVolume && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -122,7 +122,7 @@ val PhysicalQuantity.Volume.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Specific Volume from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Specific Volume from Weight", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricVolume && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialVolume && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -136,7 +136,7 @@ val PhysicalQuantity.Volume.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volumetric Flow from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volumetric Flow from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricVolume && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialVolume && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -146,7 +146,7 @@ val PhysicalQuantity.Volume.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Density", QuantityConverter.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricVolume && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialVolume && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -160,7 +160,7 @@ val PhysicalQuantity.Volume.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Specific Volume", QuantityConverter.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Specific Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricVolume && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialVolume && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFlowConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFlowConverters.kt
index 6ef078f06..c7a46dd9e 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFlowConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFlowConverters.kt
@@ -23,8 +23,8 @@ import com.splendo.kaluga.scientific.converter.volumetricFlow.div
 import com.splendo.kaluga.scientific.converter.volumetricFlow.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.VolumetricFlow.converters get() = listOf<QuantityConverter<PhysicalQuantity.VolumetricFlow, *, *>>(
-    QuantityConverter("Area from Volumetric Flux", QuantityConverter.Type.Division, PhysicalQuantity.VolumetricFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.VolumetricFlow.converters get() = listOf<QuantityConverter<PhysicalQuantity.VolumetricFlow, *>>(
+    QuantityConverterWithOperator("Area from Volumetric Flux", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.VolumetricFlux) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricVolumetricFlow && rightUnit is MetricVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialVolumetricFlow && rightUnit is ImperialVolumetricFlux -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -38,7 +38,7 @@ val PhysicalQuantity.VolumetricFlow.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volume from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volume from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricVolumetricFlow && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialVolumetricFlow && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -48,7 +48,7 @@ val PhysicalQuantity.VolumetricFlow.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volumetric Flux from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volumetric Flux from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricVolumetricFlow && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialVolumetricFlow && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFluxConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFluxConverters.kt
index a1a451476..9b7fc4e50 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFluxConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/VolumetricFluxConverters.kt
@@ -29,8 +29,8 @@ import com.splendo.kaluga.scientific.unit.UKImperialVolumetricFlux
 import com.splendo.kaluga.scientific.unit.USCustomaryVolumetricFlux
 import com.splendo.kaluga.scientific.unit.VolumetricFlux
 
-val PhysicalQuantity.VolumetricFlux.converters get() = listOf<QuantityConverter<PhysicalQuantity.VolumetricFlux, *, *>>(
-    QuantityConverter("Volumetric Flow from Area", QuantityConverter.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.VolumetricFlux.converters get() = listOf<QuantityConverter<PhysicalQuantity.VolumetricFlux, *>>(
+    QuantityConverterWithOperator("Volumetric Flow from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricVolumetricFlux && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialVolumetricFlux && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/WeightConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/WeightConverters.kt
index eed3e3b48..d6915e960 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/WeightConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/WeightConverters.kt
@@ -23,20 +23,20 @@ import com.splendo.kaluga.scientific.converter.weight.div
 import com.splendo.kaluga.scientific.converter.weight.times
 import com.splendo.kaluga.scientific.unit.*
 
-val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<PhysicalQuantity.Weight, *, *>>(
-    QuantityConverter("Amount of Substance from Molality", QuantityConverter.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<PhysicalQuantity.Weight, *>>(
+    QuantityConverterWithOperator("Amount of Substance from Molality", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Molality) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Weight && rightUnit is Molality -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Amount of Substance from Molar Mass", QuantityConverter.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Amount of Substance from Molar Mass", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Weight && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area from Area Density", QuantityConverter.Type.Division, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Area from Area Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is ImperialAreaDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -50,7 +50,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Area Density from Area", QuantityConverter.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Area Density from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -60,7 +60,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Density from Volume", QuantityConverter.Type.Division, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Density from Volume", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is ImperialVolume -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -74,7 +74,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Ionizing Radiation Absorbed Dose", QuantityConverter.Type.Multiplication, PhysicalQuantity.IonizingRadiationAbsorbedDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Ionizing Radiation Absorbed Dose", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.IonizingRadiationAbsorbedDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Gram && rightUnit is Rad -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Gram && rightUnit is RadMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -85,7 +85,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Ionizing Radiation Equivalent Dose", QuantityConverter.Type.Multiplication, PhysicalQuantity.IonizingRadiationEquivalentDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Ionizing Radiation Equivalent Dose", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.IonizingRadiationEquivalentDose) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Gram && rightUnit is RoentgenEquivalentMan -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Gram && rightUnit is RoentgenEquivalentManMultiple -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -96,7 +96,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Energy from Specific Energy", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Energy from Specific Energy", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -110,7 +110,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Force from Acceleration", QuantityConverter.Type.Multiplication, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Force from Acceleration", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Acceleration) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Gram && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is MetricWeight && rightUnit is MetricAcceleration -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -126,7 +126,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Heat Capacity from Specific Heat Capacity", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Heat Capacity from Specific Heat Capacity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificHeatCapacity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is UKImperialSpecificHeatCapacity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -137,7 +137,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Length from Linear Mass Density", QuantityConverter.Type.Division, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Length from Linear Mass Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.LinearMassDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is ImperialLinearMassDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -151,7 +151,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Linear Mass Density from Length", QuantityConverter.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Linear Mass Density from Length", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -161,7 +161,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Mass Flow Rate from Time", QuantityConverter.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Mass Flow Rate from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -171,7 +171,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Molar Mass from Amount of Substance", QuantityConverter.Type.Division, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Mass from Amount of Substance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.AmountOfSubstance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is AmountOfSubstance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -181,7 +181,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Momentum from Speed", QuantityConverter.Type.Multiplication, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Momentum from Speed", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is ImperialSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -191,13 +191,13 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Time from Mass Flow Rate", QuantityConverter.Type.Division, PhysicalQuantity.MassFlowRate) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Time from Mass Flow Rate", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MassFlowRate) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Weight && rightUnit is MassFlowRate -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volume from Density", QuantityConverter.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volume from Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -211,7 +211,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Volume from Specific Volume", QuantityConverter.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Volume from Specific Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificVolume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is ImperialSpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -225,7 +225,7 @@ val PhysicalQuantity.Weight.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Yank from Jolt", QuantityConverter.Type.Multiplication, PhysicalQuantity.Jolt) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Yank from Jolt", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Jolt) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricWeight && rightUnit is MetricJolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialWeight && rightUnit is ImperialJolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/YankConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/YankConverters.kt
index d7e48bdd1..a82394698 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/YankConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/YankConverters.kt
@@ -36,8 +36,8 @@ import com.splendo.kaluga.scientific.unit.USCustomaryYank
 import com.splendo.kaluga.scientific.unit.Weight
 import com.splendo.kaluga.scientific.unit.Yank
 
-val PhysicalQuantity.Yank.converters get() = listOf<QuantityConverter<PhysicalQuantity.Yank, *, *>>(
-    QuantityConverter("Force from Time", QuantityConverter.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+val PhysicalQuantity.Yank.converters get() = listOf<QuantityConverter<PhysicalQuantity.Yank, *>>(
+    QuantityConverterWithOperator("Force from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricYank && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialYank && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -47,7 +47,7 @@ val PhysicalQuantity.Yank.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Jolt from Weight", QuantityConverter.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Jolt from Weight", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricYank && rightUnit is MetricWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialYank && rightUnit is ImperialWeight -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -61,7 +61,7 @@ val PhysicalQuantity.Yank.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverter("Weight from Jolt", QuantityConverter.Type.Division, PhysicalQuantity.Jolt) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Jolt", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Jolt) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricYank && rightUnit is MetricJolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialYank && rightUnit is ImperialJolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
index 6af2b2c4c..76d2c9a4d 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
@@ -47,7 +47,7 @@ sealed class ScientificConverterNavigationAction<T>(value: T, type: NavigationBu
 
 class ScientificConverterViewModel internal constructor(
     private val leftUnits: Set<ScientificUnit<*>>,
-    private val converter: QuantityConverter<*, *, *>?,
+    private val converter: QuantityConverter<*, *>?,
     navigator: Navigator<ScientificConverterNavigationAction<*>>
 ) : NavigatingViewModel<ScientificConverterNavigationAction<*>>(navigator) {
 
@@ -63,13 +63,14 @@ class ScientificConverterViewModel internal constructor(
 
     private val currentLeftUnit = MutableStateFlow(leftUnits.firstOrNull())
     val currentLeftUnitButton: BaseInitializedObservable<KalugaButton> = currentLeftUnit.map { createLeftUnitButton(it) }.toInitializedObservable(createLeftUnitButton(null), coroutineScope)
-    private val currentRightUnit = MutableStateFlow(converter?.rightQuantity?.quantityDetails?.units?.firstOrNull())
+    val isRightUnitSelectable = converter is QuantityConverter.WithOperator<*, *, *>
+    private val currentRightUnit = MutableStateFlow((converter as? QuantityConverter.WithOperator<*, *, *>)?.rightQuantity?.quantityDetails?.units?.firstOrNull())
     val currentRightUnitButton: BaseInitializedObservable<KalugaButton> = currentRightUnit.map { createRightUnitButton(it) }.toInitializedObservable(createRightUnitButton(null), coroutineScope)
     private val _leftValue = MutableStateFlow("0.0")
     val leftValue = _leftValue.toInitializedSubject(coroutineScope)
     private val _rightValue = MutableStateFlow("0.0")
     val rightValue = _rightValue.toInitializedSubject(coroutineScope)
-    val calculateOperatorSymbol = converter?.type?.operatorSymbol.orEmpty()
+    val calculateOperatorSymbol = (converter as? QuantityConverter.WithOperator<*, *, *>)?.type?.operatorSymbol.orEmpty()
     private val _resultValue = MutableStateFlow("")
     val resultValue = _resultValue.toInitializedObservable(coroutineScope)
 
@@ -78,9 +79,26 @@ class ScientificConverterViewModel internal constructor(
         val leftUnit = currentLeftUnit.value
         val right = numberFormatterScientific.parse(_rightValue.value)?.toDecimal()
         val rightUnit = currentRightUnit.value
-        _resultValue.value = if (left != null && leftUnit != null && right != null && rightUnit != null) {
-            converter?.convert(left, leftUnit, right, rightUnit)?.let { result ->
-                val formattedDecimal = numberFormatterDecimal.format(result.value)
+        _resultValue.value = when (converter) {
+            is QuantityConverter.Single<*, *> -> {
+                if (left != null && leftUnit != null) {
+                    converter.convert(left, leftUnit)
+                } else {
+                    null
+                }
+            }
+            is QuantityConverter.WithOperator<*, *, *> -> {
+                if (left != null && leftUnit != null && right != null && rightUnit != null) {
+                    converter.convert(left, leftUnit, right, rightUnit)
+                } else {
+                    null
+                }
+            }
+            null -> {
+                null
+            }
+        }?.let { result ->
+            val formattedDecimal = numberFormatterDecimal.format(result.value)
                 val parsedDecimal = numberFormatterDecimal.parse(formattedDecimal)
                 val formatter = if (parsedDecimal?.toDouble() == result.value.toDouble()) {
                     numberFormatterDecimal
@@ -88,10 +106,7 @@ class ScientificConverterViewModel internal constructor(
                     numberFormatterScientific
                 }
                 "${formatter.format(result.value)} ${result.unit.symbol}"
-            }.orEmpty()
-        } else {
-            ""
-        }
+        }.orEmpty()
     }
 
     fun didSelectLeftUnit(unitIndex: Int) {
@@ -99,7 +114,7 @@ class ScientificConverterViewModel internal constructor(
     }
 
     fun didSelectRightUnit(unitIndex: Int) {
-        currentRightUnit.value = converter?.rightQuantity?.quantityDetails?.units?.toList()?.getOrNull(unitIndex)
+        currentRightUnit.value = (converter as? QuantityConverter.WithOperator<*, *, *>)?.rightQuantity?.quantityDetails?.units?.toList()?.getOrNull(unitIndex)
     }
 
     fun onClosePressed() {

From 655293fcdb260c850ec83f69636dbfcc593f2068 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Sun, 15 Jan 2023 23:51:32 +0100
Subject: [PATCH 078/227] Adding remaining converters

---
 .../Scientific/ScientificConverterView.swift  | 16 ++---
 .../model/scientific/QuantityDetails.kt       |  1 +
 .../converters/AreaDensityConverter.kt        |  4 +-
 .../converters/DensityConverters.kt           | 21 +++++++
 .../converters/DynamicViscosityConverters.kt  | 32 ++++++++++
 .../converters/ElectricCapacitanceUnits.kt    |  2 +-
 .../converters/ElectricChargeConverters.kt    |  2 +-
 .../ElectricConductanceConverters.kt          | 10 +++-
 .../converters/ElectricCurrentConverters.kt   |  2 +-
 .../ElectricResistanceConverters.kt           |  8 +++
 .../scientific/converters/EnergyConverters.kt |  2 +-
 .../converters/FrequencyConverters.kt         |  9 +++
 .../IonizingRadiationAbsobedDoseConverters.kt |  9 +++
 ...nizingRadiationEquivalentDoseConverters.kt |  9 +++
 .../KinematicViscosityConverters.kt           | 59 +++++++++++++++++++
 .../converters/MolalityConverters.kt          | 13 +++-
 .../converters/MolarMassConverters.kt         | 11 ++++
 .../converters/MolarVolumeConverters.kt       | 11 ++++
 .../converters/MolarityConverters.kt          | 11 ++++
 .../converters/QuantityConverter.kt           |  9 ++-
 .../converters/SpecificEnergyConverters.kt    | 26 +++++++-
 .../converters/SpecificVolumeConverters.kt    | 11 ++++
 .../scientific/converters/TimeConverters.kt   | 18 ++++++
 .../ScientificConverterViewModel.kt           | 32 ++++++----
 .../scientific/ScientificViewModel.kt         | 10 ++--
 .../convertToKinematicViscosity.kt            | 18 +++---
 26 files changed, 312 insertions(+), 44 deletions(-)
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/KinematicViscosityConverters.kt

diff --git a/example/ios/Demo/Scientific/ScientificConverterView.swift b/example/ios/Demo/Scientific/ScientificConverterView.swift
index 61efedbac..e2e2fe20f 100644
--- a/example/ios/Demo/Scientific/ScientificConverterView.swift
+++ b/example/ios/Demo/Scientific/ScientificConverterView.swift
@@ -68,13 +68,15 @@ struct ScientificConverterView: View, Equatable {
                                 .frame(maxWidth: .infinity)
                             currentLeftUnitButton.value.toButton()
                         }.frame(maxWidth: .infinity)
-                        Text(viewModel.calculateOperatorSymbol)
-                        HStack {
-                            TextField("", text: $rightValue.value)
-                                .textFieldStyle(.roundedBorder)
-                                .frame(maxWidth: .infinity)
-                            currentRightUnitButton.value.toButton()
-                        }.frame(maxWidth: .infinity)
+                        if viewModel.isRightUnitSelectable {
+                            Text(viewModel.calculateOperatorSymbol)
+                            HStack {
+                                TextField("", text: $rightValue.value)
+                                    .textFieldStyle(.roundedBorder)
+                                    .frame(maxWidth: .infinity)
+                                currentRightUnitButton.value.toButton()
+                            }.frame(maxWidth: .infinity)
+                        }
                     }
                     viewModel.calculateButton.toButton(buttonFrame: .frame(maxWidth: .infinity))
                     HStack {
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
index 11c076a39..fe7b15fd1 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
@@ -129,6 +129,7 @@ internal val PhysicalQuantity.quantityDetails: QuantityDetails<*>? get() = when
     is PhysicalQuantity.IonizingRadiationAbsorbedDose -> QuantityDetails(this, IonizingRadiationAbsorbedDoseUnits, converters)
     is PhysicalQuantity.IonizingRadiationEquivalentDose -> QuantityDetails(this, IonizingRadiationEquivalentDoseUnits, converters)
     is PhysicalQuantity.Jolt -> QuantityDetails(this, JoltUnits, converters)
+    is PhysicalQuantity.KinematicViscosity -> QuantityDetails(this, KinematicViscosityUnits, converters)
     is PhysicalQuantity.Length -> QuantityDetails(this, LengthUnits, converters)
     is PhysicalQuantity.LinearMassDensity -> QuantityDetails(this, LinearMassDensityUnits, converters)
     is PhysicalQuantity.Luminance -> QuantityDetails(this, LuminanceUnits, converters)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
index a6bcc9843..7e5d44126 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/AreaDensityConverter.kt
@@ -62,7 +62,7 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverterWithOperator("Linear Mass Density from Length", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Linear Mass Density from Length", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Length) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialLength -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -72,7 +72,7 @@ val PhysicalQuantity.AreaDensity.converters get() = listOf<QuantityConverter<Phy
             else -> throw RuntimeException("Unexpected units: $leftUnit $rightUnit")
         }
     },
-    QuantityConverterWithOperator("Weight from Area", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Weight from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricAreaDensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialAreaDensity && rightUnit is ImperialArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
index 1c75e1815..3d1b07385 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DensityConverters.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.density.div
+import com.splendo.kaluga.scientific.converter.density.specificVolume
 import com.splendo.kaluga.scientific.converter.density.times
 import com.splendo.kaluga.scientific.unit.*
 
@@ -34,6 +35,16 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
+    QuantityConverterWithOperator("Dynamic Viscosity from Kinematic Viscosity", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.KinematicViscosity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDensity && rightUnit is MetricKinematicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDensity && rightUnit is ImperialKinematicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDensity && rightUnit is ImperialKinematicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDensity && rightUnit is ImperialKinematicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Density && rightUnit is KinematicViscosity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
     QuantityConverterWithOperator("Linear Mass Density from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
@@ -84,6 +95,16 @@ val PhysicalQuantity.Density.converters get() = listOf<QuantityConverter<Physica
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
+    SingleQuantityConverter("Specific Volume") { value, unit ->
+        when (unit) {
+            is MetricDensity -> DefaultScientificValue(value, unit).specificVolume()
+            is ImperialDensity -> DefaultScientificValue(value, unit).specificVolume()
+            is UKImperialDensity -> DefaultScientificValue(value, unit).specificVolume()
+            is USCustomaryDensity -> DefaultScientificValue(value, unit).specificVolume()
+            is Density -> DefaultScientificValue(value, unit).specificVolume()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
+    },
     QuantityConverterWithOperator("Weight from Volume", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Volume) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDensity && rightUnit is MetricVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
index 872b4428c..dfdf9496b 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/DynamicViscosityConverters.kt
@@ -22,17 +22,49 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.dynamicViscosity.div
 import com.splendo.kaluga.scientific.converter.dynamicViscosity.times
 import com.splendo.kaluga.scientific.unit.Area
+import com.splendo.kaluga.scientific.unit.Density
 import com.splendo.kaluga.scientific.unit.DynamicViscosity
 import com.splendo.kaluga.scientific.unit.ImperialArea
+import com.splendo.kaluga.scientific.unit.ImperialDensity
 import com.splendo.kaluga.scientific.unit.ImperialDynamicViscosity
+import com.splendo.kaluga.scientific.unit.ImperialKinematicViscosity
+import com.splendo.kaluga.scientific.unit.KinematicViscosity
 import com.splendo.kaluga.scientific.unit.MetricArea
+import com.splendo.kaluga.scientific.unit.MetricDensity
 import com.splendo.kaluga.scientific.unit.MetricDynamicViscosity
+import com.splendo.kaluga.scientific.unit.MetricKinematicViscosity
 import com.splendo.kaluga.scientific.unit.Pressure
 import com.splendo.kaluga.scientific.unit.Time
+import com.splendo.kaluga.scientific.unit.UKImperialDensity
 import com.splendo.kaluga.scientific.unit.UKImperialDynamicViscosity
+import com.splendo.kaluga.scientific.unit.USCustomaryDensity
 import com.splendo.kaluga.scientific.unit.USCustomaryDynamicViscosity
 
 val PhysicalQuantity.DynamicViscosity.converters get() = listOf<QuantityConverter<PhysicalQuantity.DynamicViscosity, *>>(
+    QuantityConverterWithOperator("Density from Kinematic Viscosity", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.KinematicViscosity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDynamicViscosity && rightUnit is MetricKinematicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDynamicViscosity && rightUnit is ImperialKinematicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDynamicViscosity && rightUnit is ImperialKinematicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDynamicViscosity && rightUnit is ImperialKinematicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DynamicViscosity && rightUnit is KinematicViscosity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverterWithOperator("Kinematic Viscosity from Density", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricDynamicViscosity && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDynamicViscosity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDynamicViscosity && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialDynamicViscosity && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDynamicViscosity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialDynamicViscosity && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDynamicViscosity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomaryDynamicViscosity && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is DynamicViscosity && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
     QuantityConverterWithOperator("Momentum from Area", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Area) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricDynamicViscosity && rightUnit is MetricArea -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
index 4e4d81a72..4c9977852 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCapacitanceUnits.kt
@@ -28,7 +28,7 @@ import com.splendo.kaluga.scientific.unit.Frequency
 import com.splendo.kaluga.scientific.unit.Voltage
 
 val PhysicalQuantity.ElectricCapacitance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricCapacitance, *>>(
-    QuantityConverterWithOperator("Electric Charge from voltage", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Charge from Voltage", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abfarad && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCapacitance && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
index 03e7df81f..7bf74e2d8 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricChargeConverters.kt
@@ -40,7 +40,7 @@ val PhysicalQuantity.ElectricCharge.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverterWithOperator("Electric Current from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Current from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abcoulomb && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricCharge && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
index 37d8b636a..1fb3dd4dd 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricConductanceConverters.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.electricConductance.div
+import com.splendo.kaluga.scientific.converter.electricConductance.resistance
 import com.splendo.kaluga.scientific.converter.electricConductance.times
 import com.splendo.kaluga.scientific.unit.Absiemens
 import com.splendo.kaluga.scientific.unit.Abvolt
@@ -36,13 +37,20 @@ val PhysicalQuantity.ElectricConductance.converters get() = listOf<QuantityConve
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverterWithOperator("Electric Current from Voltage", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Current from Voltage", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Absiemens && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ElectricConductance && rightUnit is Voltage -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
+    SingleQuantityConverter("Electric Resistance") { value, unit ->
+        when (unit) {
+            is Absiemens -> DefaultScientificValue(value, unit).resistance()
+            is ElectricConductance -> DefaultScientificValue(value, unit).resistance()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
+    },
     QuantityConverterWithOperator("Frequency from Electric Capacitance", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.ElectricCapacitance) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is ElectricConductance && rightUnit is ElectricCapacitance -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
index 25d37c1d2..1bc79369a 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricCurrentConverters.kt
@@ -45,7 +45,7 @@ val PhysicalQuantity.ElectricCurrent.converters get() = listOf<QuantityConverter
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverterWithOperator("Electric Charge from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Electric Conductance from Voltage", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Voltage) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abampere && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
             leftUnit is Biot && rightUnit is Abvolt -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
index f10013d27..2210598a1 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/ElectricResistanceConverters.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.electricResistance.conductance
 import com.splendo.kaluga.scientific.converter.electricResistance.div
 import com.splendo.kaluga.scientific.converter.electricResistance.times
 import com.splendo.kaluga.scientific.unit.Abampere
@@ -34,6 +35,13 @@ import com.splendo.kaluga.scientific.unit.Frequency
 import com.splendo.kaluga.scientific.unit.Time
 
 val PhysicalQuantity.ElectricResistance.converters get() = listOf<QuantityConverter<PhysicalQuantity.ElectricResistance, *>>(
+    SingleQuantityConverter("Electric Conductance") { value, unit ->
+        when (unit) {
+            is Abohm -> DefaultScientificValue(value, unit).conductance()
+            is ElectricResistance -> DefaultScientificValue(value, unit).conductance()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
+    },
     QuantityConverterWithOperator("Electric Inductance from Frequency", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Frequency) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Abohm && rightUnit is Frequency -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
index 9c8a60b93..43a3183cd 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/EnergyConverters.kt
@@ -111,7 +111,7 @@ val PhysicalQuantity.Energy.converters get() = listOf<QuantityConverter<Physical
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverterWithOperator("Ionizing Radiation Equivalent Dose from Weight", QuantityConverter.WithOperator.Type.Custom("absorbed by"), PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Ionizing Radiation Equivalent Dose from Weight", QuantityConverter.WithOperator.Type.Custom("equivalent dose by"), PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Erg && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ErgMultiple && rightUnit is Gram -> DefaultScientificValue(leftValue, leftUnit) equivalentDoseBy DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt
index d6d39dde0..194402330 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/FrequencyConverters.kt
@@ -19,9 +19,11 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.frequency.time
 import com.splendo.kaluga.scientific.converter.frequency.times
 import com.splendo.kaluga.scientific.unit.Abfarad
 import com.splendo.kaluga.scientific.unit.Abhenry
+import com.splendo.kaluga.scientific.unit.BeatsPerMinute
 import com.splendo.kaluga.scientific.unit.ElectricCapacitance
 import com.splendo.kaluga.scientific.unit.ElectricInductance
 import com.splendo.kaluga.scientific.unit.Frequency
@@ -40,5 +42,12 @@ val PhysicalQuantity.Frequency.converters get() = listOf<QuantityConverter<Physi
             leftUnit is Frequency && rightUnit is ElectricInductance -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
+    },
+    SingleQuantityConverter("Time") { value, unit ->
+        when (unit) {
+            is BeatsPerMinute -> DefaultScientificValue(value, unit).time()
+            is Frequency -> DefaultScientificValue(value, unit).time()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
     }
 )
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt
index 91f71019e..a009f61ef 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationAbsobedDoseConverters.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.ionizingRadiationAbsorbedDose.asSpecificEnergy
 import com.splendo.kaluga.scientific.converter.ionizingRadiationAbsorbedDose.times
 import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.ImperialWeight
@@ -40,5 +41,13 @@ val PhysicalQuantity.IonizingRadiationAbsorbedDose.converters get() = listOf<Qua
             leftUnit is IonizingRadiationAbsorbedDose && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
+    },
+    SingleQuantityConverter("Specific Energy") { value, unit ->
+        when (unit) {
+            is Rad -> DefaultScientificValue(value, unit).asSpecificEnergy()
+            is RadMultiple -> DefaultScientificValue(value, unit).asSpecificEnergy()
+            is IonizingRadiationAbsorbedDose -> DefaultScientificValue(value, unit).asSpecificEnergy()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
     }
 )
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt
index fc0ad27ed..7759899db 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/IonizingRadiationEquivalentDoseConverters.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.ionizingRadiationEquivalentDose.asSpecificEnergy
 import com.splendo.kaluga.scientific.converter.ionizingRadiationEquivalentDose.times
 import com.splendo.kaluga.scientific.unit.Gram
 import com.splendo.kaluga.scientific.unit.ImperialWeight
@@ -40,5 +41,13 @@ val PhysicalQuantity.IonizingRadiationEquivalentDose.converters get() = listOf<Q
             leftUnit is IonizingRadiationEquivalentDose && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
+    },
+    SingleQuantityConverter("Specific Energy") { value, unit ->
+        when (unit) {
+            is RoentgenEquivalentMan -> DefaultScientificValue(value, unit).asSpecificEnergy()
+            is RoentgenEquivalentManMultiple -> DefaultScientificValue(value, unit).asSpecificEnergy()
+            is IonizingRadiationEquivalentDose -> DefaultScientificValue(value, unit).asSpecificEnergy()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
     }
 )
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/KinematicViscosityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/KinematicViscosityConverters.kt
new file mode 100644
index 000000000..f7a62e4d7
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/KinematicViscosityConverters.kt
@@ -0,0 +1,59 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.model.scientific.converters
+
+import com.splendo.kaluga.scientific.DefaultScientificValue
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.kinematicViscosity.div
+import com.splendo.kaluga.scientific.converter.kinematicViscosity.times
+import com.splendo.kaluga.scientific.unit.*
+
+val PhysicalQuantity.KinematicViscosity.converters get() = listOf<QuantityConverter<PhysicalQuantity.KinematicViscosity, *>>(
+    QuantityConverterWithOperator("Area from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricKinematicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialKinematicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KinematicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverterWithOperator("Dynamic Viscosity from Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricKinematicViscosity && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialKinematicViscosity && rightUnit is ImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialKinematicViscosity && rightUnit is UKImperialDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialKinematicViscosity && rightUnit is USCustomaryDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KinematicViscosity && rightUnit is Density -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverterWithOperator("Specific Energy from Time", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricKinematicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialKinematicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is KinematicViscosity && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
+    QuantityConverterWithOperator("Time from Specific Energy", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is KinematicViscosity && rightUnit is SpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    }
+)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt
index c37de1a13..45763269e 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolalityConverters.kt
@@ -20,16 +20,27 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.molality.div
+import com.splendo.kaluga.scientific.converter.molality.molarMass
 import com.splendo.kaluga.scientific.converter.molality.times
 import com.splendo.kaluga.scientific.unit.*
 
 val PhysicalQuantity.Molality.converters get() = listOf<QuantityConverter<PhysicalQuantity.Molality, *>>(
-    QuantityConverterWithOperator("Amount of Substance from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Amount of Substance from Weight", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Weight) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Molality && rightUnit is Weight -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
+    SingleQuantityConverter("Molar Mass") { value, unit ->
+        when (unit) {
+            is MetricMolality -> DefaultScientificValue(value, unit).molarMass()
+            is ImperialMolality -> DefaultScientificValue(value, unit).molarMass()
+            is UKImperialMolality -> DefaultScientificValue(value, unit).molarMass()
+            is USCustomaryMolality -> DefaultScientificValue(value, unit).molarMass()
+            is Molality -> DefaultScientificValue(value, unit).molarMass()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
+    },
     QuantityConverterWithOperator("Molarity from Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Molality && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt
index 36da9e6f8..b8cdee8f1 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarMassConverters.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.molarMass.div
+import com.splendo.kaluga.scientific.converter.molarMass.molality
 import com.splendo.kaluga.scientific.converter.molarMass.times
 import com.splendo.kaluga.scientific.unit.*
 
@@ -52,6 +53,16 @@ val PhysicalQuantity.MolarMass.converters get() = listOf<QuantityConverter<Physi
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
+    SingleQuantityConverter("Molality") { value, unit ->
+        when (unit) {
+            is MetricMolarMass -> DefaultScientificValue(value, unit).molality()
+            is ImperialMolarMass -> DefaultScientificValue(value, unit).molality()
+            is UKImperialMolarMass -> DefaultScientificValue(value, unit).molality()
+            is USCustomaryMolarMass -> DefaultScientificValue(value, unit).molality()
+            is MolarMass -> DefaultScientificValue(value, unit).molality()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
+    },
     QuantityConverterWithOperator("Molar Energy from Specific Energy", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MolarMass && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt
index e658b041a..7944030c4 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarVolumeConverters.kt
@@ -20,10 +20,21 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.molarVolume.div
+import com.splendo.kaluga.scientific.converter.molarVolume.molarity
 import com.splendo.kaluga.scientific.converter.molarVolume.times
 import com.splendo.kaluga.scientific.unit.*
 
 val PhysicalQuantity.MolarVolume.converters get() = listOf<QuantityConverter<PhysicalQuantity.MolarVolume, *>>(
+    SingleQuantityConverter("Molarity") { value, unit ->
+        when (unit) {
+            is MetricMolarVolume -> DefaultScientificValue(value, unit).molarity()
+            is ImperialMolarVolume -> DefaultScientificValue(value, unit).molarity()
+            is UKImperialMolarVolume -> DefaultScientificValue(value, unit).molarity()
+            is USCustomaryMolarVolume -> DefaultScientificValue(value, unit).molarity()
+            is MolarVolume -> DefaultScientificValue(value, unit).molarity()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
+    },
     QuantityConverterWithOperator("Molar Mass from Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Density) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MolarVolume && rightUnit is MetricDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt
index 1d6b62a98..5e6b6cc33 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/MolarityConverters.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.molarity.div
+import com.splendo.kaluga.scientific.converter.molarity.molarVolume
 import com.splendo.kaluga.scientific.converter.molarity.times
 import com.splendo.kaluga.scientific.unit.*
 
@@ -77,5 +78,15 @@ val PhysicalQuantity.Molarity.converters get() = listOf<QuantityConverter<Physic
             leftUnit is Molarity && rightUnit is SpecificVolume -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
+    },
+    SingleQuantityConverter("Molar Volume") { value, unit ->
+        when (unit) {
+            is MetricMolarity -> DefaultScientificValue(value, unit).molarVolume()
+            is ImperialMolarity -> DefaultScientificValue(value, unit).molarVolume()
+            is UKImperialMolarity -> DefaultScientificValue(value, unit).molarVolume()
+            is USCustomaryMolarity -> DefaultScientificValue(value, unit).molarVolume()
+            is Molarity -> DefaultScientificValue(value, unit).molarVolume()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
     }
 )
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
index 5216dd2fc..c438be4b3 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
@@ -30,14 +30,14 @@ sealed class QuantityConverter<From : PhysicalQuantity, Result : PhysicalQuantit
         val fromQuantity: KClass<From>,
         val resultQuantity: KClass<Result>,
         override val name: String,
-        val converter: (Pair<Decimal, ScientificUnit<From>>) -> ScientificValue<Result, *>
+        val converter: (Decimal, ScientificUnit<From>) -> ScientificValue<Result, *>
     ) : QuantityConverter<From, Result>() {
         fun convert(
             value: Decimal,
             unit: ScientificUnit<*>
         ): ScientificValue<*, *>? {
             return if (fromQuantity.isInstance(unit.quantity)) {
-                converter(value to unit as ScientificUnit<From>)
+                converter(value, unit as ScientificUnit<From>)
             } else {
                 null
             }
@@ -88,6 +88,11 @@ sealed class QuantityConverter<From : PhysicalQuantity, Result : PhysicalQuantit
     }
 }
 
+inline fun <reified From : PhysicalQuantity, reified Result : PhysicalQuantity> SingleQuantityConverter(
+    name: String,
+    noinline converter: (value: Decimal, unit: ScientificUnit<From>) -> ScientificValue<Result, *>
+) = QuantityConverter.Single(From::class, Result::class, name, converter)
+
 inline fun <reified Left : PhysicalQuantity, reified Right : PhysicalQuantity, reified Result : PhysicalQuantity> QuantityConverterWithOperator(
     name: String,
     type: QuantityConverter.WithOperator.Type,
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt
index 65d43f56c..75f81b61b 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificEnergyConverters.kt
@@ -19,6 +19,8 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.specificEnergy.asAbsorbedDose
+import com.splendo.kaluga.scientific.converter.specificEnergy.asEquivalentDose
 import com.splendo.kaluga.scientific.converter.specificEnergy.div
 import com.splendo.kaluga.scientific.converter.specificEnergy.times
 import com.splendo.kaluga.scientific.unit.*
@@ -38,6 +40,28 @@ val PhysicalQuantity.SpecificEnergy.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
+    SingleQuantityConverter("Ionizing Radiation Absorbed Dose") { value, unit ->
+        when (unit) {
+            is SpecificEnergy -> DefaultScientificValue(value, unit).asAbsorbedDose()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
+    },
+    SingleQuantityConverter("Ionizing Radiation Equivalent Dose") { value, unit ->
+        when (unit) {
+            is SpecificEnergy -> DefaultScientificValue(value, unit).asEquivalentDose()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
+    },
+    QuantityConverterWithOperator("Kinematic Viscosity from Time", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Time) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is MetricSpecificEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is ImperialSpecificEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is UKImperialSpecificEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is USCustomarySpecificEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is SpecificEnergy && rightUnit is Time -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
     QuantityConverterWithOperator("Molality from Molar Energy", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificEnergy && rightUnit is MolarEnergy -> DefaultScientificValue(leftValue, leftUnit) / DefaultScientificValue(rightValue, rightUnit)
@@ -48,7 +72,7 @@ val PhysicalQuantity.SpecificEnergy.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
-    QuantityConverterWithOperator("Molar Energy from Molar Mass", QuantityConverter.WithOperator.Type.Division, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+    QuantityConverterWithOperator("Molar Energy from Molar Mass", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.MolarMass) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificEnergy && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
             leftUnit is ImperialSpecificEnergy && rightUnit is MolarMass -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt
index 1cf47359a..9bcc2a12f 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/SpecificVolumeConverters.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.specificVolume.density
 import com.splendo.kaluga.scientific.converter.specificVolume.div
 import com.splendo.kaluga.scientific.converter.specificVolume.times
 import com.splendo.kaluga.scientific.unit.*
@@ -38,6 +39,16 @@ val PhysicalQuantity.SpecificVolume.converters get() = listOf<QuantityConverter<
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
+    SingleQuantityConverter("Density") { value, unit ->
+        when (unit) {
+            is MetricSpecificVolume -> DefaultScientificValue(value, unit).density()
+            is ImperialSpecificVolume -> DefaultScientificValue(value, unit).density()
+            is UKImperialSpecificVolume -> DefaultScientificValue(value, unit).density()
+            is USCustomarySpecificVolume -> DefaultScientificValue(value, unit).density()
+            is SpecificVolume -> DefaultScientificValue(value, unit).density()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
+    },
     QuantityConverterWithOperator("Length from Area Density", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.AreaDensity) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is MetricSpecificVolume && rightUnit is MetricAreaDensity -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt
index 15294925d..e32155543 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/TimeConverters.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.example.shared.model.scientific.converters
 import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.converter.time.div
+import com.splendo.kaluga.scientific.converter.time.frequency
 import com.splendo.kaluga.scientific.converter.time.times
 import com.splendo.kaluga.scientific.unit.*
 
@@ -134,6 +135,23 @@ val PhysicalQuantity.Time.converters get() = listOf<QuantityConverter<PhysicalQu
             else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
         }
     },
+    SingleQuantityConverter("Frequency") { value, unit ->
+        when (unit) {
+            is Minute -> DefaultScientificValue(value, unit).frequency()
+            is Time -> DefaultScientificValue(value, unit).frequency()
+            else -> throw RuntimeException("Unexpected unit: $unit")
+        }
+    },
+    QuantityConverterWithOperator("Kinematic Viscosity from Specific Energy", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.SpecificEnergy) { (leftValue, leftUnit), (rightValue, rightUnit) ->
+        when {
+            leftUnit is Time && rightUnit is MetricSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is ImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is UKImperialSpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is USCustomarySpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            leftUnit is Time && rightUnit is SpecificEnergy -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
+            else -> throw RuntimeException("Unexpected units: $leftUnit, $rightUnit")
+        }
+    },
     QuantityConverterWithOperator("Length from Speed", QuantityConverter.WithOperator.Type.Multiplication, PhysicalQuantity.Speed) { (leftValue, leftUnit), (rightValue, rightUnit) ->
         when {
             leftUnit is Time && rightUnit is MetricSpeed -> DefaultScientificValue(leftValue, leftUnit) * DefaultScientificValue(rightValue, rightUnit)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
index 76d2c9a4d..47a417359 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
@@ -66,9 +66,9 @@ class ScientificConverterViewModel internal constructor(
     val isRightUnitSelectable = converter is QuantityConverter.WithOperator<*, *, *>
     private val currentRightUnit = MutableStateFlow((converter as? QuantityConverter.WithOperator<*, *, *>)?.rightQuantity?.quantityDetails?.units?.firstOrNull())
     val currentRightUnitButton: BaseInitializedObservable<KalugaButton> = currentRightUnit.map { createRightUnitButton(it) }.toInitializedObservable(createRightUnitButton(null), coroutineScope)
-    private val _leftValue = MutableStateFlow("0.0")
+    private val _leftValue = MutableStateFlow(numberFormatterDecimal.format(0.0))
     val leftValue = _leftValue.toInitializedSubject(coroutineScope)
-    private val _rightValue = MutableStateFlow("0.0")
+    private val _rightValue = MutableStateFlow(numberFormatterDecimal.format(0.0))
     val rightValue = _rightValue.toInitializedSubject(coroutineScope)
     val calculateOperatorSymbol = (converter as? QuantityConverter.WithOperator<*, *, *>)?.type?.operatorSymbol.orEmpty()
     private val _resultValue = MutableStateFlow("")
@@ -82,14 +82,22 @@ class ScientificConverterViewModel internal constructor(
         _resultValue.value = when (converter) {
             is QuantityConverter.Single<*, *> -> {
                 if (left != null && leftUnit != null) {
-                    converter.convert(left, leftUnit)
+                    try {
+                        converter.convert(left, leftUnit)
+                    } catch (e: Exception) {
+                        null
+                    }
                 } else {
                     null
                 }
             }
             is QuantityConverter.WithOperator<*, *, *> -> {
                 if (left != null && leftUnit != null && right != null && rightUnit != null) {
-                    converter.convert(left, leftUnit, right, rightUnit)
+                    try {
+                        converter.convert(left, leftUnit, right, rightUnit)
+                    } catch (e: Exception) {
+                        null
+                    }
                 } else {
                     null
                 }
@@ -99,14 +107,14 @@ class ScientificConverterViewModel internal constructor(
             }
         }?.let { result ->
             val formattedDecimal = numberFormatterDecimal.format(result.value)
-                val parsedDecimal = numberFormatterDecimal.parse(formattedDecimal)
-                val formatter = if (parsedDecimal?.toDouble() == result.value.toDouble()) {
-                    numberFormatterDecimal
-                } else {
-                    numberFormatterScientific
-                }
-                "${formatter.format(result.value)} ${result.unit.symbol}"
-        }.orEmpty()
+            val parsedDecimal = numberFormatterDecimal.parse(formattedDecimal)
+            val formatter = if (parsedDecimal?.toDouble() == result.value.toDouble()) {
+                numberFormatterDecimal
+            } else {
+                numberFormatterScientific
+            }
+            "${formatter.format(result.value)} ${result.unit.symbol}"
+        } ?: "Invalid Result"
     }
 
     fun didSelectLeftUnit(unitIndex: Int) {
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
index 501fe5483..c608fcd3b 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
@@ -80,9 +80,9 @@ class ScientificViewModel(
     val currentLeftUnitButton: BaseInitializedObservable<KalugaButton> = currentLeftUnit.map { createLeftUnitButton(it) }.toInitializedObservable(createLeftUnitButton(null), coroutineScope)
     private val currentRightUnit = MutableStateFlow<ScientificUnit<*>?>(null)
     val currentRightUnitButton: BaseInitializedObservable<KalugaButton> = currentRightUnit.map { createRightUnitButton(it) }.toInitializedObservable(createRightUnitButton(null), coroutineScope)
-    private val _leftValue = MutableStateFlow("0.0")
+    private val _leftValue = MutableStateFlow(numberFormatterDecimal.format(0.0))
     val leftValue = _leftValue.toInitializedSubject(coroutineScope)
-    private val _rightValue = MutableStateFlow("0.0")
+    private val _rightValue = MutableStateFlow(numberFormatterDecimal.format(0.0))
     val rightValue = _rightValue.toInitializedObservable(coroutineScope)
 
     val converters = currentQuantityDetails.map { details ->
@@ -117,10 +117,10 @@ class ScientificViewModel(
                     numberFormatterScientific
                 }
                 formatter.format(result.value)
-            }.orEmpty()
+            }
         } else {
-            ""
-        }
+            null
+        } ?: "Invalid Result"
     }
 
     private fun createQuantityButton(currentQuantityDetails: QuantityDetails<*>?) = KalugaButton.Plain(currentQuantityDetails?.let { it.quantity::class.simpleName }.orEmpty(), ButtonStyles.default) { selectQuantity() }
diff --git a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToKinematicViscosity.kt b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToKinematicViscosity.kt
index d5b6d02f9..0b83221d5 100644
--- a/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToKinematicViscosity.kt
+++ b/scientific/src/commonMain/kotlin/converter/dynamicViscosity/convertToKinematicViscosity.kt
@@ -35,47 +35,47 @@ import com.splendo.kaluga.scientific.unit.USCustomaryDynamicViscosity
 import com.splendo.kaluga.scientific.unit.per
 import kotlin.jvm.JvmName
 
-@JvmName("metricDynamicViscosityDivMetricDensitu")
+@JvmName("metricDynamicViscosityDivMetricDensity")
 infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, MetricDynamicViscosity>.div(
     density: ScientificValue<PhysicalQuantity.Density, MetricDensity>
 ) = (SquareMeter per unit.time).kinematicViscosity(this, density)
 
-@JvmName("imperialDynamicViscosityDivImperialDensitu")
+@JvmName("imperialDynamicViscosityDivImperialDensity")
 infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, ImperialDynamicViscosity>.div(
     density: ScientificValue<PhysicalQuantity.Density, ImperialDensity>
 ) = (SquareFoot per unit.time).kinematicViscosity(this, density)
 
-@JvmName("imperialDynamicViscosityDivUKImperialDensitu")
+@JvmName("imperialDynamicViscosityDivUKImperialDensity")
 infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, ImperialDynamicViscosity>.div(
     density: ScientificValue<PhysicalQuantity.Density, UKImperialDensity>
 ) = (SquareFoot per unit.time).kinematicViscosity(this, density)
 
-@JvmName("imperialDynamicViscosityDivUSCustomaryDensitu")
+@JvmName("imperialDynamicViscosityDivUSCustomaryDensity")
 infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, ImperialDynamicViscosity>.div(
     density: ScientificValue<PhysicalQuantity.Density, USCustomaryDensity>
 ) = (SquareFoot per unit.time).kinematicViscosity(this, density)
 
-@JvmName("ukImperialDynamicViscosityDivImperialDensitu")
+@JvmName("ukImperialDynamicViscosityDivImperialDensity")
 infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, UKImperialDynamicViscosity>.div(
     density: ScientificValue<PhysicalQuantity.Density, ImperialDensity>
 ) = (SquareFoot per unit.time).kinematicViscosity(this, density)
 
-@JvmName("ukImperialDynamicViscosityDivUKImperialDensitu")
+@JvmName("ukImperialDynamicViscosityDivUKImperialDensity")
 infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, UKImperialDynamicViscosity>.div(
     density: ScientificValue<PhysicalQuantity.Density, UKImperialDensity>
 ) = (SquareFoot per unit.time).kinematicViscosity(this, density)
 
-@JvmName("usCustomaryDynamicViscosityDivImperialDensitu")
+@JvmName("usCustomaryDynamicViscosityDivImperialDensity")
 infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, USCustomaryDynamicViscosity>.div(
     density: ScientificValue<PhysicalQuantity.Density, ImperialDensity>
 ) = (SquareFoot per unit.time).kinematicViscosity(this, density)
 
-@JvmName("usCustomaryDynamicViscosityDivUSCustomaryDensitu")
+@JvmName("usCustomaryDynamicViscosityDivUSCustomaryDensity")
 infix operator fun ScientificValue<PhysicalQuantity.DynamicViscosity, USCustomaryDynamicViscosity>.div(
     density: ScientificValue<PhysicalQuantity.Density, USCustomaryDensity>
 ) = (SquareFoot per unit.time).kinematicViscosity(this, density)
 
-@JvmName("dynamicViscosityDivDensitu")
+@JvmName("dynamicViscosityDivDensity")
 infix operator fun <DynamicViscosityUnit : DynamicViscosity, DensityUnit : Density> ScientificValue<PhysicalQuantity.DynamicViscosity, DynamicViscosityUnit>.div(
     density: ScientificValue<PhysicalQuantity.Density, DensityUnit>
 ) = (SquareMeter per unit.time).kinematicViscosity(this, density)

From a63a9be020770a4a8ae216d7d40a47e0d2fcd33f Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 11:30:53 +0100
Subject: [PATCH 079/227] Added exception handling for divide by 0 in
 Scientific

---
 .../ScientificConverterViewModel.kt           |  5 ++--
 .../src/commonMain/kotlin/ScientificValue.kt  | 26 ++++++++++++++++---
 .../converter/ScientificConverterException.kt | 20 ++++++++++++++
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 scientific/src/commonMain/kotlin/converter/ScientificConverterException.kt

diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
index 47a417359..9fe209912 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
@@ -33,6 +33,7 @@ import com.splendo.kaluga.example.shared.model.scientific.quantityDetails
 import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.resources.view.KalugaButton
 import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.converter.ScientificConverterException
 import com.splendo.kaluga.scientific.unit.ScientificUnit
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
@@ -84,7 +85,7 @@ class ScientificConverterViewModel internal constructor(
                 if (left != null && leftUnit != null) {
                     try {
                         converter.convert(left, leftUnit)
-                    } catch (e: Exception) {
+                    } catch (e: ScientificConverterException) {
                         null
                     }
                 } else {
@@ -95,7 +96,7 @@ class ScientificConverterViewModel internal constructor(
                 if (left != null && leftUnit != null && right != null && rightUnit != null) {
                     try {
                         converter.convert(left, leftUnit, right, rightUnit)
-                    } catch (e: Exception) {
+                    } catch (e: ScientificConverterException) {
                         null
                     }
                 } else {
diff --git a/scientific/src/commonMain/kotlin/ScientificValue.kt b/scientific/src/commonMain/kotlin/ScientificValue.kt
index 24b2d771f..f9ca50fb4 100644
--- a/scientific/src/commonMain/kotlin/ScientificValue.kt
+++ b/scientific/src/commonMain/kotlin/ScientificValue.kt
@@ -25,6 +25,7 @@ import com.splendo.kaluga.base.utils.plus
 import com.splendo.kaluga.base.utils.times
 import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.base.utils.toDouble
+import com.splendo.kaluga.scientific.converter.ScientificConverterException
 import com.splendo.kaluga.scientific.unit.ScientificUnit
 import com.splendo.kaluga.scientific.unit.convert
 import kotlinx.serialization.Serializable
@@ -297,7 +298,11 @@ fun <
     > Decimal.div(
     factor: ScientificValue<Quantity, Unit>,
     factory: (Decimal, Unit) -> Value
-) = factory(this / factor.decimalValue, factor.unit)
+) = if (factor.value != 0.0) {
+    factory(this / factor.decimalValue, factor.unit)
+} else {
+    throw ScientificConverterException("Dividing by 0.0")
+}
 
 fun <
     Quantity : PhysicalQuantity,
@@ -306,7 +311,11 @@ fun <
     > ScientificValue<Quantity, Unit>.div(
     factor: Decimal,
     factory: (Decimal, Unit) -> Value
-) = factory(decimalValue / factor, unit)
+) = if (factor.toDouble() == 0.0) {
+    factory(decimalValue / factor, unit)
+} else {
+    throw ScientificConverterException("Dividing by 0.0")
+}
 
 infix operator fun <
     Quantity : PhysicalQuantity,
@@ -366,7 +375,11 @@ internal fun <
     nominator: ScientificValue<NominatorQuantity, NominatorUnit>,
     divider: ScientificValue<DividerQuantity, DividerUnit>,
     factory: (Decimal, Unit) -> Value
-) = fromSIUnit(nominator.unit.toSIUnit(nominator.decimalValue) / divider.unit.toSIUnit(divider.decimalValue))(this, factory)
+) = if (divider.value != 0.0) {
+    fromSIUnit(nominator.unit.toSIUnit(nominator.decimalValue) / divider.unit.toSIUnit(divider.decimalValue))(this, factory)
+} else {
+    throw ScientificConverterException("Dividing by 0.0")
+}
 
 internal fun <
     TargetQuantity : PhysicalQuantity,
@@ -391,4 +404,9 @@ internal fun <
     > Unit.byInverting(
     inverse: ScientificValue<InverseQuantity, InverseUnit>,
     factory: (Decimal, Unit) -> Value
-) = fromSIUnit(1.0.toDecimal() / inverse.unit.toSIUnit(inverse.decimalValue))(this, factory)
+) = if (inverse.value != 0.0) {
+    fromSIUnit(1.0.toDecimal() / inverse.unit.toSIUnit(inverse.decimalValue))(this, factory)
+} else {
+    throw ScientificConverterException("Inverting by 0.0")
+}
+
diff --git a/scientific/src/commonMain/kotlin/converter/ScientificConverterException.kt b/scientific/src/commonMain/kotlin/converter/ScientificConverterException.kt
new file mode 100644
index 000000000..1ccd564f5
--- /dev/null
+++ b/scientific/src/commonMain/kotlin/converter/ScientificConverterException.kt
@@ -0,0 +1,20 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.scientific.converter
+
+class ScientificConverterException(message: String? = null) : ArithmeticException(message)

From 76af816c95d026ddf05f58eec2b32b49db0a4bcb Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 11:44:53 +0100
Subject: [PATCH 080/227] Added divide by zero protection in Decimal

---
 .../androidLibMain/kotlin/utils/Decimal.kt    | 21 ++++----
 base/src/commonMain/kotlin/utils/Decimal.kt   |  2 +
 base/src/iosMain/kotlin/utils/DataUtils.kt    |  1 -
 base/src/iosMain/kotlin/utils/Decimal.kt      | 50 ++++++++++---------
 base/src/jsMain/kotlin/utils/Decimal.kt       |  9 ++--
 base/src/jvmMain/kotlin/utils/Decimal.kt      | 22 ++++----
 .../splendo/kaluga/datetime/timer/Timer.kt    |  1 -
 .../androidLibMain/kotlin/BackgroundStyle.kt  |  2 +-
 .../src/androidLibMain/kotlin/KalugaButton.kt |  2 +-
 .../src/commonMain/kotlin/ScientificValue.kt  |  1 -
 10 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/base/src/androidLibMain/kotlin/utils/Decimal.kt b/base/src/androidLibMain/kotlin/utils/Decimal.kt
index 5e934c4f3..733fbf73c 100644
--- a/base/src/androidLibMain/kotlin/utils/Decimal.kt
+++ b/base/src/androidLibMain/kotlin/utils/Decimal.kt
@@ -50,22 +50,25 @@ actual fun Decimal.minus(
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.android)
 
-actual operator fun Decimal.div(value: Decimal) = this.divide(value, MathContext.DECIMAL128)
+actual operator fun Decimal.div(value: Decimal) = if (value != Decimal.ZERO) this.divide(value, MathContext.DECIMAL128) else throw DecimalException("Divide by zero")
 
-actual fun Decimal.div(value: Decimal, scale: Int) =
+actual fun Decimal.div(value: Decimal, scale: Int) = if (value != Decimal.ZERO)
     this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
+else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
-) = this.divide(
-    value,
-    MathContext(
-        MathContext.DECIMAL128.precision,
-        roundingMode.android
-    )
-).setScale(scale, roundingMode.android)
+) = if (value != Decimal.ZERO)
+    this.divide(
+        value,
+        MathContext(
+            MathContext.DECIMAL128.precision,
+            roundingMode.android
+        )
+    ).setScale(scale, roundingMode.android)
+else throw DecimalException("Divide by zero")
 
 actual operator fun Decimal.times(value: Decimal) =
     this.multiply(value, MathContext.DECIMAL128)
diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index c3cec452c..73bf7bac7 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -19,6 +19,8 @@
 
 package com.splendo.kaluga.base.utils
 
+class DecimalException(val message: String?) : ArithmeticException(message)
+
 expect class Decimal : Comparable<Decimal>
 
 expect operator fun Decimal.plus(value: Decimal): Decimal
diff --git a/base/src/iosMain/kotlin/utils/DataUtils.kt b/base/src/iosMain/kotlin/utils/DataUtils.kt
index 6e6a846e4..e1099c83e 100644
--- a/base/src/iosMain/kotlin/utils/DataUtils.kt
+++ b/base/src/iosMain/kotlin/utils/DataUtils.kt
@@ -25,7 +25,6 @@ import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.reinterpret
 import platform.Foundation.NSData
 import platform.Foundation.create
-import platform.darwin.NSUInteger
 
 /**
  * Converts a [NSData] to its corresponding [ByteArray]
diff --git a/base/src/iosMain/kotlin/utils/Decimal.kt b/base/src/iosMain/kotlin/utils/Decimal.kt
index 05894c9b9..4a20a6088 100644
--- a/base/src/iosMain/kotlin/utils/Decimal.kt
+++ b/base/src/iosMain/kotlin/utils/Decimal.kt
@@ -90,35 +90,39 @@ actual fun Decimal.minus(value: Decimal, scale: Int, roundingMode: RoundingMode)
     )
 )
 
-actual operator fun Decimal.div(value: Decimal) = copy(nsDecimal = nsDecimal.decimalNumberByDividingBy(value.nsDecimal))
+actual operator fun Decimal.div(value: Decimal) = if (value.nsDecimal != NSDecimalNumber.zero) copy(nsDecimal = nsDecimal.decimalNumberByDividingBy(value.nsDecimal)) else throw DecimalException("Divide by zero")
 
-actual fun Decimal.div(value: Decimal, scale: Int) = copy(
-    nsDecimal = nsDecimal.decimalNumberByDividingBy(
-        decimalNumber = value.nsDecimal,
-        withBehavior = NSDecimalNumberHandler(
-            NSRoundingMode.NSRoundBankers,
-            scale.toShort(),
-            raiseOnExactness = true,
-            raiseOnOverflow = true,
-            raiseOnUnderflow = true,
-            raiseOnDivideByZero = true
+actual fun Decimal.div(value: Decimal, scale: Int) = if (value.nsDecimal != NSDecimalNumber.zero)
+    copy(
+        nsDecimal = nsDecimal.decimalNumberByDividingBy(
+            decimalNumber = value.nsDecimal,
+            withBehavior = NSDecimalNumberHandler(
+                NSRoundingMode.NSRoundBankers,
+                scale.toShort(),
+                raiseOnExactness = true,
+                raiseOnOverflow = true,
+                raiseOnUnderflow = true,
+                raiseOnDivideByZero = true
+            )
         )
     )
-)
+else throw DecimalException("Divide by zero")
 
-actual fun Decimal.div(value: Decimal, scale: Int, roundingMode: RoundingMode) = copy(
-    nsDecimal = nsDecimal.decimalNumberByDividingBy(
-        decimalNumber = value.nsDecimal,
-        withBehavior = NSDecimalNumberHandler(
-            roundingMode = roundingMode.nsRoundingMode,
-            scale = scale.toShort(),
-            raiseOnExactness = false,
-            raiseOnOverflow = false,
-            raiseOnUnderflow = false,
-            raiseOnDivideByZero = true
+actual fun Decimal.div(value: Decimal, scale: Int, roundingMode: RoundingMode) = if (value.nsDecimal != NSDecimalNumber.zero)
+    copy(
+        nsDecimal = nsDecimal.decimalNumberByDividingBy(
+            decimalNumber = value.nsDecimal,
+            withBehavior = NSDecimalNumberHandler(
+                roundingMode = roundingMode.nsRoundingMode,
+                scale = scale.toShort(),
+                raiseOnExactness = false,
+                raiseOnOverflow = false,
+                raiseOnUnderflow = false,
+                raiseOnDivideByZero = true
+            )
         )
     )
-)
+else throw DecimalException("Divide by zero")
 
 actual operator fun Decimal.times(value: Decimal) = copy(nsDecimal = nsDecimal.decimalNumberByMultiplyingBy(value.nsDecimal))
 
diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index 92b573a87..14dd93c30 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -99,18 +99,21 @@ actual fun Decimal.minus(
 
 actual operator fun Decimal.div(
     value: Decimal
-): Decimal = Decimal(BigDecimal.divide(bd, value.bd, Rounding()))
+): Decimal = if (value.toDouble() != 0.0) Decimal(BigDecimal.divide(bd, value.bd, Rounding())) else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(
     value: Decimal,
     scale: Int
-): Decimal = Decimal(BigDecimal.divide(bd, value.bd, Rounding(scale)))
+): Decimal = if (value.toDouble() != 0.0) Decimal(BigDecimal.divide(bd, value.bd, Rounding(scale))) else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = round(BigDecimal.divide(bd, value.bd, Rounding(scale + 1, ROUNDING_MODE, DIV_DECIMAL_128_SIGNIFICANT_DIGITS)), roundingMode, scale)
+): Decimal = if (value.toDouble() != 0.0)
+    round(BigDecimal.divide(bd, value.bd, Rounding(scale + 1, ROUNDING_MODE, DIV_DECIMAL_128_SIGNIFICANT_DIGITS)), roundingMode, scale)
+else
+    throw DecimalException("Divide by zero")
 
 actual operator fun Decimal.times(
     value: Decimal
diff --git a/base/src/jvmMain/kotlin/utils/Decimal.kt b/base/src/jvmMain/kotlin/utils/Decimal.kt
index 13bb2f28f..de1ae6c85 100644
--- a/base/src/jvmMain/kotlin/utils/Decimal.kt
+++ b/base/src/jvmMain/kotlin/utils/Decimal.kt
@@ -51,22 +51,26 @@ actual fun Decimal.minus(
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.java)
 
-actual operator fun Decimal.div(value: Decimal) = this.divide(value, MathContext.DECIMAL128)
+actual operator fun Decimal.div(value: Decimal) = if (value != Decimal.ZERO) this.divide(value, MathContext.DECIMAL128)
+else throw DecimalException("Divide by zero")
 
-actual fun Decimal.div(value: Decimal, scale: Int) =
+actual fun Decimal.div(value: Decimal, scale: Int) = if (value != Decimal.ZERO)
     this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
+else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
-) = this.divide(
-    value,
-    MathContext(
-        MathContext.DECIMAL128.precision,
-        roundingMode.java
-    )
-).setScale(scale, roundingMode.java)
+) = if (value != Decimal.ZERO)
+    this.divide(
+        value,
+        MathContext(
+            MathContext.DECIMAL128.precision,
+            roundingMode.java
+        )
+    ).setScale(scale, roundingMode.java)
+else throw DecimalException("Divide by zero")
 
 actual operator fun Decimal.times(value: Decimal) =
     this.multiply(value, MathContext.DECIMAL128)
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
index c16cfbf34..486d2eba4 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
@@ -18,7 +18,6 @@ package com.splendo.kaluga.datetime.timer
 
 import com.splendo.kaluga.base.utils.firstInstance
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.transformWhile
 import kotlin.time.Duration
diff --git a/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt b/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
index 0662fcfae..40b83e77e 100644
--- a/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
+++ b/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
@@ -31,8 +31,8 @@ import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.splendo.kaluga.resources.DefaultColors
-import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.GradientStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 
 fun Modifier.backgroundStyle(backgroundStyle: KalugaBackgroundStyle) = background(
     backgroundStyle.fillStyle.brush,
diff --git a/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt b/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
index be108f574..0ba7a1792 100644
--- a/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
+++ b/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
@@ -40,8 +40,8 @@ import androidx.compose.ui.unit.dp
 import com.splendo.kaluga.resources.DefaultColors
 import com.splendo.kaluga.resources.StringStyleAttribute
 import com.splendo.kaluga.resources.StyledStringBuilder
-import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.ButtonStateStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.KalugaButtonStyle
 import com.splendo.kaluga.resources.styled
 import com.splendo.kaluga.resources.view.KalugaButton
diff --git a/scientific/src/commonMain/kotlin/ScientificValue.kt b/scientific/src/commonMain/kotlin/ScientificValue.kt
index f9ca50fb4..30caa6666 100644
--- a/scientific/src/commonMain/kotlin/ScientificValue.kt
+++ b/scientific/src/commonMain/kotlin/ScientificValue.kt
@@ -409,4 +409,3 @@ internal fun <
 } else {
     throw ScientificConverterException("Inverting by 0.0")
 }
-

From f12b362cbb51f2328e6dfd856744401789b4fbef Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 11:52:23 +0100
Subject: [PATCH 081/227] Lint fixes

---
 base/src/iosMain/kotlin/utils/DataUtils.kt    |  1 -
 .../system/network/NetworkManager.kt          | 19 ++++++++-----------
 test-utils-system/build.gradle.kts            |  2 +-
 .../kotlin/network/MockNetworkManager.kt      |  1 -
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/base/src/iosMain/kotlin/utils/DataUtils.kt b/base/src/iosMain/kotlin/utils/DataUtils.kt
index 6e6a846e4..e1099c83e 100644
--- a/base/src/iosMain/kotlin/utils/DataUtils.kt
+++ b/base/src/iosMain/kotlin/utils/DataUtils.kt
@@ -25,7 +25,6 @@ import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.reinterpret
 import platform.Foundation.NSData
 import platform.Foundation.create
-import platform.darwin.NSUInteger
 
 /**
  * Converts a [NSData] to its corresponding [ByteArray]
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
index 0cb610db7..c34a5f09b 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
+++ b/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
@@ -25,7 +25,6 @@ import kotlinx.cinterop.alloc
 import kotlinx.cinterop.asStableRef
 import kotlinx.cinterop.nativeHeap
 import kotlinx.cinterop.ptr
-import kotlinx.cinterop.reinterpret
 import kotlinx.cinterop.staticCFunction
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
@@ -59,14 +58,9 @@ import platform.SystemConfiguration.SCNetworkReachabilitySetDispatchQueue
 import platform.SystemConfiguration.kSCNetworkReachabilityFlagsIsWWAN
 import platform.SystemConfiguration.kSCNetworkReachabilityFlagsReachable
 import platform.darwin.DISPATCH_QUEUE_PRIORITY_DEFAULT
-import platform.darwin.DISPATCH_QUEUE_SERIAL
-import platform.darwin.DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL
 import platform.darwin.dispatch_get_main_queue
-import platform.darwin.dispatch_qos_class_t
 import platform.darwin.dispatch_queue_attr_make_with_qos_class
-import platform.darwin.dispatch_queue_attr_tVar
 import platform.darwin.dispatch_queue_create
-import platform.darwin.dispatch_queue_serial_t
 import platform.posix.QOS_CLASS_UTILITY
 
 actual class DefaultNetworkManager internal constructor(
@@ -100,11 +94,14 @@ actual class DefaultNetworkManager internal constructor(
             }
         }
         private val nwPathMonitor: nw_path_monitor_t = nw_path_monitor_create().apply {
-            val queue = dispatch_queue_create("com.splendo.kaluga.system.network", dispatch_queue_attr_make_with_qos_class(
-                null,
-                QOS_CLASS_UTILITY,
-                DISPATCH_QUEUE_PRIORITY_DEFAULT
-            ))
+            val queue = dispatch_queue_create(
+                "com.splendo.kaluga.system.network",
+                dispatch_queue_attr_make_with_qos_class(
+                    null,
+                    QOS_CLASS_UTILITY,
+                    DISPATCH_QUEUE_PRIORITY_DEFAULT
+                )
+            )
             nw_path_monitor_set_queue(
                 this,
                 queue
diff --git a/test-utils-system/build.gradle.kts b/test-utils-system/build.gradle.kts
index 5a488a166..3ed49f0a7 100644
--- a/test-utils-system/build.gradle.kts
+++ b/test-utils-system/build.gradle.kts
@@ -20,4 +20,4 @@ kotlin {
             dependencies {}
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
index 321404f15..33ee86793 100644
--- a/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
@@ -78,4 +78,3 @@ class MockBaseNetworkManager(initialNetworkConnectionType: NetworkConnectionType
     val stopMonitoringMock = ::stopMonitoring.mock()
     override suspend fun stopMonitoring(): Unit = stopMonitoringMock.call()
 }
-

From 604f0d0a359afbbd09872cee46807d174b9beb61 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 11:59:42 +0100
Subject: [PATCH 082/227] Make Decimal class throw self declared exception on
 divide by 0

---
 .../androidLibMain/kotlin/utils/Decimal.kt    | 21 ++++----
 base/src/commonMain/kotlin/utils/Decimal.kt   |  2 +
 base/src/iosMain/kotlin/utils/Decimal.kt      | 50 ++++++++++---------
 base/src/jsMain/kotlin/utils/Decimal.kt       |  9 ++--
 base/src/jvmMain/kotlin/utils/Decimal.kt      | 22 ++++----
 5 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/base/src/androidLibMain/kotlin/utils/Decimal.kt b/base/src/androidLibMain/kotlin/utils/Decimal.kt
index 5e934c4f3..733fbf73c 100644
--- a/base/src/androidLibMain/kotlin/utils/Decimal.kt
+++ b/base/src/androidLibMain/kotlin/utils/Decimal.kt
@@ -50,22 +50,25 @@ actual fun Decimal.minus(
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.android)
 
-actual operator fun Decimal.div(value: Decimal) = this.divide(value, MathContext.DECIMAL128)
+actual operator fun Decimal.div(value: Decimal) = if (value != Decimal.ZERO) this.divide(value, MathContext.DECIMAL128) else throw DecimalException("Divide by zero")
 
-actual fun Decimal.div(value: Decimal, scale: Int) =
+actual fun Decimal.div(value: Decimal, scale: Int) = if (value != Decimal.ZERO)
     this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
+else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
-) = this.divide(
-    value,
-    MathContext(
-        MathContext.DECIMAL128.precision,
-        roundingMode.android
-    )
-).setScale(scale, roundingMode.android)
+) = if (value != Decimal.ZERO)
+    this.divide(
+        value,
+        MathContext(
+            MathContext.DECIMAL128.precision,
+            roundingMode.android
+        )
+    ).setScale(scale, roundingMode.android)
+else throw DecimalException("Divide by zero")
 
 actual operator fun Decimal.times(value: Decimal) =
     this.multiply(value, MathContext.DECIMAL128)
diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index c3cec452c..73bf7bac7 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -19,6 +19,8 @@
 
 package com.splendo.kaluga.base.utils
 
+class DecimalException(val message: String?) : ArithmeticException(message)
+
 expect class Decimal : Comparable<Decimal>
 
 expect operator fun Decimal.plus(value: Decimal): Decimal
diff --git a/base/src/iosMain/kotlin/utils/Decimal.kt b/base/src/iosMain/kotlin/utils/Decimal.kt
index 05894c9b9..4a20a6088 100644
--- a/base/src/iosMain/kotlin/utils/Decimal.kt
+++ b/base/src/iosMain/kotlin/utils/Decimal.kt
@@ -90,35 +90,39 @@ actual fun Decimal.minus(value: Decimal, scale: Int, roundingMode: RoundingMode)
     )
 )
 
-actual operator fun Decimal.div(value: Decimal) = copy(nsDecimal = nsDecimal.decimalNumberByDividingBy(value.nsDecimal))
+actual operator fun Decimal.div(value: Decimal) = if (value.nsDecimal != NSDecimalNumber.zero) copy(nsDecimal = nsDecimal.decimalNumberByDividingBy(value.nsDecimal)) else throw DecimalException("Divide by zero")
 
-actual fun Decimal.div(value: Decimal, scale: Int) = copy(
-    nsDecimal = nsDecimal.decimalNumberByDividingBy(
-        decimalNumber = value.nsDecimal,
-        withBehavior = NSDecimalNumberHandler(
-            NSRoundingMode.NSRoundBankers,
-            scale.toShort(),
-            raiseOnExactness = true,
-            raiseOnOverflow = true,
-            raiseOnUnderflow = true,
-            raiseOnDivideByZero = true
+actual fun Decimal.div(value: Decimal, scale: Int) = if (value.nsDecimal != NSDecimalNumber.zero)
+    copy(
+        nsDecimal = nsDecimal.decimalNumberByDividingBy(
+            decimalNumber = value.nsDecimal,
+            withBehavior = NSDecimalNumberHandler(
+                NSRoundingMode.NSRoundBankers,
+                scale.toShort(),
+                raiseOnExactness = true,
+                raiseOnOverflow = true,
+                raiseOnUnderflow = true,
+                raiseOnDivideByZero = true
+            )
         )
     )
-)
+else throw DecimalException("Divide by zero")
 
-actual fun Decimal.div(value: Decimal, scale: Int, roundingMode: RoundingMode) = copy(
-    nsDecimal = nsDecimal.decimalNumberByDividingBy(
-        decimalNumber = value.nsDecimal,
-        withBehavior = NSDecimalNumberHandler(
-            roundingMode = roundingMode.nsRoundingMode,
-            scale = scale.toShort(),
-            raiseOnExactness = false,
-            raiseOnOverflow = false,
-            raiseOnUnderflow = false,
-            raiseOnDivideByZero = true
+actual fun Decimal.div(value: Decimal, scale: Int, roundingMode: RoundingMode) = if (value.nsDecimal != NSDecimalNumber.zero)
+    copy(
+        nsDecimal = nsDecimal.decimalNumberByDividingBy(
+            decimalNumber = value.nsDecimal,
+            withBehavior = NSDecimalNumberHandler(
+                roundingMode = roundingMode.nsRoundingMode,
+                scale = scale.toShort(),
+                raiseOnExactness = false,
+                raiseOnOverflow = false,
+                raiseOnUnderflow = false,
+                raiseOnDivideByZero = true
+            )
         )
     )
-)
+else throw DecimalException("Divide by zero")
 
 actual operator fun Decimal.times(value: Decimal) = copy(nsDecimal = nsDecimal.decimalNumberByMultiplyingBy(value.nsDecimal))
 
diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index 92b573a87..14dd93c30 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -99,18 +99,21 @@ actual fun Decimal.minus(
 
 actual operator fun Decimal.div(
     value: Decimal
-): Decimal = Decimal(BigDecimal.divide(bd, value.bd, Rounding()))
+): Decimal = if (value.toDouble() != 0.0) Decimal(BigDecimal.divide(bd, value.bd, Rounding())) else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(
     value: Decimal,
     scale: Int
-): Decimal = Decimal(BigDecimal.divide(bd, value.bd, Rounding(scale)))
+): Decimal = if (value.toDouble() != 0.0) Decimal(BigDecimal.divide(bd, value.bd, Rounding(scale))) else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = round(BigDecimal.divide(bd, value.bd, Rounding(scale + 1, ROUNDING_MODE, DIV_DECIMAL_128_SIGNIFICANT_DIGITS)), roundingMode, scale)
+): Decimal = if (value.toDouble() != 0.0)
+    round(BigDecimal.divide(bd, value.bd, Rounding(scale + 1, ROUNDING_MODE, DIV_DECIMAL_128_SIGNIFICANT_DIGITS)), roundingMode, scale)
+else
+    throw DecimalException("Divide by zero")
 
 actual operator fun Decimal.times(
     value: Decimal
diff --git a/base/src/jvmMain/kotlin/utils/Decimal.kt b/base/src/jvmMain/kotlin/utils/Decimal.kt
index 13bb2f28f..de1ae6c85 100644
--- a/base/src/jvmMain/kotlin/utils/Decimal.kt
+++ b/base/src/jvmMain/kotlin/utils/Decimal.kt
@@ -51,22 +51,26 @@ actual fun Decimal.minus(
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.java)
 
-actual operator fun Decimal.div(value: Decimal) = this.divide(value, MathContext.DECIMAL128)
+actual operator fun Decimal.div(value: Decimal) = if (value != Decimal.ZERO) this.divide(value, MathContext.DECIMAL128)
+else throw DecimalException("Divide by zero")
 
-actual fun Decimal.div(value: Decimal, scale: Int) =
+actual fun Decimal.div(value: Decimal, scale: Int) = if (value != Decimal.ZERO)
     this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
+else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
-) = this.divide(
-    value,
-    MathContext(
-        MathContext.DECIMAL128.precision,
-        roundingMode.java
-    )
-).setScale(scale, roundingMode.java)
+) = if (value != Decimal.ZERO)
+    this.divide(
+        value,
+        MathContext(
+            MathContext.DECIMAL128.precision,
+            roundingMode.java
+        )
+    ).setScale(scale, roundingMode.java)
+else throw DecimalException("Divide by zero")
 
 actual operator fun Decimal.times(value: Decimal) =
     this.multiply(value, MathContext.DECIMAL128)

From 089f06fe99e09f3323dbcc9248d209a313d94474 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 12:14:18 +0100
Subject: [PATCH 083/227] Improve passing bundles for Fragment navigation

---
 .../kotlin/navigation/NavigationSpec.kt       |  8 +++
 .../kotlin/navigation/Navigator.kt            | 61 +++++++++++++------
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
index 67bf7dbbf..8c30798af 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
@@ -173,32 +173,38 @@ sealed class NavigationSpec {
     /**
      * Removes a [Fragment] with a given tag
      * @param tag The tag of the [Fragment] to remove
+     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle removing the [Fragment]
      */
     data class RemoveFragment(
         val tag: String,
+        val fragmentRequestKey: String? = null,
         val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
     ) : NavigationSpec()
 
     /**
      * Pops a [Fragment] from the backstack
      * @param immediate If `true` the transaction should execute without waiting for pending transactions
+     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle popping the [Fragment]
      */
     data class PopFragment(
         val immediate: Boolean = false,
+        val fragmentRequestKey: String? = null,
         val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
     ) : NavigationSpec()
 
     /**
      * Pops a [Fragment] from the backstack
      * @param immediate If `true` the transaction should execute without waiting for pending transactions
+     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle popping the [Fragment]
      */
     data class PopFragmentTo(
         val name: String,
         val inclusive: Boolean,
         val immediate: Boolean = false,
+        val fragmentRequestKey: String? = null,
         val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
     ) : NavigationSpec()
 
@@ -217,10 +223,12 @@ sealed class NavigationSpec {
     /**
      * Dismisses a [DialogFragment] with a given Tag
      * @param tag The tag of the [DialogFragment] to remove
+     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle removing the [DialogFragment]
      */
     data class DismissDialog(
         val tag: String,
+        val fragmentRequestKey: String? = null,
         val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
     ) : NavigationSpec()
 
diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index b81aec084..92dc8bbd5 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -48,12 +48,12 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         when (spec) {
             is NavigationSpec.Activity<*> -> navigateToActivity(spec, bundle)
             is NavigationSpec.Close -> closeActivity(spec, bundle)
-            is NavigationSpec.Fragment -> navigateToFragment(spec)
-            is NavigationSpec.RemoveFragment -> removeFragment(spec)
-            is NavigationSpec.PopFragment -> popFragment(spec)
-            is NavigationSpec.PopFragmentTo -> popFragmentTo(spec)
-            is NavigationSpec.Dialog -> navigateToDialog(spec)
-            is NavigationSpec.DismissDialog -> dismissDialog(spec)
+            is NavigationSpec.Fragment -> navigateToFragment(spec, bundle)
+            is NavigationSpec.RemoveFragment -> removeFragment(spec, bundle)
+            is NavigationSpec.PopFragment -> popFragment(spec, bundle)
+            is NavigationSpec.PopFragmentTo -> popFragmentTo(spec, bundle)
+            is NavigationSpec.Dialog -> navigateToDialog(spec, bundle)
+            is NavigationSpec.DismissDialog -> dismissDialog(spec, bundle)
             is NavigationSpec.Camera -> navigateToCamera(spec)
             is NavigationSpec.Email -> navigateToEmail(spec)
             is NavigationSpec.FileSelector -> navigateToFileSelector(spec)
@@ -101,7 +101,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         activity.finish()
     }
 
-    private fun navigateToFragment(fragmentSpec: NavigationSpec.Fragment) {
+    private fun navigateToFragment(fragmentSpec: NavigationSpec.Fragment, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = fragmentSpec.getFragmentManager(manager!!)
         val transaction = fragmentManager.beginTransaction().let {
@@ -122,7 +122,9 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
             )
         }
 
-        val fragment = fragmentSpec.createFragment()
+        val fragment = fragmentSpec.createFragment().apply {
+            arguments = bundle?.toBundle()
+        }
         when (fragmentSpec.type) {
             is NavigationSpec.Fragment.Type.Add -> transaction.add(
                 fragmentSpec.containerId,
@@ -139,9 +141,14 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         transaction.commit()
     }
 
-    private fun removeFragment(removeFragmentSpec: NavigationSpec.RemoveFragment) {
+    private fun removeFragment(removeFragmentSpec: NavigationSpec.RemoveFragment, bundle: NavigationBundle<*>?) {
         assert(manager != null)
-        val fragmentManager = removeFragmentSpec.getFragmentManager(manager!!)
+        val fragmentManager = removeFragmentSpec.getFragmentManager(manager!!).apply {
+            removeFragmentSpec.fragmentRequestKey?.let {
+                if (bundle != null)
+                    setFragmentResult(it, bundle.toBundle())
+            }
+        }
         val fragment = fragmentManager.findFragmentByTag(removeFragmentSpec.tag) ?: return
 
         val transaction = fragmentManager.beginTransaction()
@@ -149,9 +156,14 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         transaction.commit()
     }
 
-    private fun popFragment(popFragmentSpec: NavigationSpec.PopFragment) {
+    private fun popFragment(popFragmentSpec: NavigationSpec.PopFragment, bundle: NavigationBundle<*>?) {
         assert(manager != null)
-        val fragmentManager = popFragmentSpec.getFragmentManager(manager!!)
+        val fragmentManager = popFragmentSpec.getFragmentManager(manager!!).apply {
+            popFragmentSpec.fragmentRequestKey?.let {
+                if (bundle != null)
+                    setFragmentResult(it, bundle.toBundle())
+            }
+        }
         if (popFragmentSpec.immediate) {
             fragmentManager.popBackStackImmediate()
         } else {
@@ -159,9 +171,14 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         }
     }
 
-    private fun popFragmentTo(popToFragmentSpec: NavigationSpec.PopFragmentTo) {
+    private fun popFragmentTo(popToFragmentSpec: NavigationSpec.PopFragmentTo, bundle: NavigationBundle<*>?) {
         assert(manager != null)
-        val fragmentManager = popToFragmentSpec.getFragmentManager(manager!!)
+        val fragmentManager = popToFragmentSpec.getFragmentManager(manager!!).apply {
+            popToFragmentSpec.fragmentRequestKey?.let {
+                if (bundle != null)
+                    setFragmentResult(it, bundle.toBundle())
+            }
+        }
         val flags = if (popToFragmentSpec.inclusive) FragmentManager.POP_BACK_STACK_INCLUSIVE else 0
         if (popToFragmentSpec.immediate) {
             fragmentManager.popBackStackImmediate(popToFragmentSpec.name, flags)
@@ -170,15 +187,23 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         }
     }
 
-    private fun navigateToDialog(dialogSpec: NavigationSpec.Dialog) {
+    private fun navigateToDialog(dialogSpec: NavigationSpec.Dialog, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = dialogSpec.getFragmentManager(manager!!)
-        dialogSpec.createDialog().show(fragmentManager, dialogSpec.tag)
+        dialogSpec.createDialog().apply {
+            arguments = bundle?.toBundle()
+            show(fragmentManager, dialogSpec.tag)
+        }
     }
 
-    private fun dismissDialog(spec: NavigationSpec.DismissDialog) {
+    private fun dismissDialog(spec: NavigationSpec.DismissDialog, bundle: NavigationBundle<*>?) {
         assert(manager != null)
-        val fragmentManager = spec.getFragmentManager(manager!!)
+        val fragmentManager = spec.getFragmentManager(manager!!).apply {
+            spec.fragmentRequestKey?.let {
+                if (bundle != null)
+                    setFragmentResult(it, bundle.toBundle())
+            }
+        }
         val dialog = fragmentManager.findFragmentByTag(spec.tag) as? DialogFragment ?: return
         dialog.dismiss()
     }

From 4ce74e86a2f2cc7b70053d8bf96bcfa83054ad2a Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 12:18:55 +0100
Subject: [PATCH 084/227] Minor fix

---
 base/src/commonMain/kotlin/utils/Decimal.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index 73bf7bac7..2578eb5d4 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -19,7 +19,7 @@
 
 package com.splendo.kaluga.base.utils
 
-class DecimalException(val message: String?) : ArithmeticException(message)
+class DecimalException(message: String?) : ArithmeticException(message)
 
 expect class Decimal : Comparable<Decimal>
 

From 6b5997665ee942da4f775f00d267c0497cc42032 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 13:06:19 +0100
Subject: [PATCH 085/227] Lint fixes

---
 .../splendo/kaluga/architecture/compose/navigation/Route.kt  | 4 +---
 .../kaluga/architecture/compose/navigation/RouteNavigator.kt | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
index 2aca3c577..30222f5eb 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
@@ -24,8 +24,6 @@ import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationBundleValue
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationSpec
-import com.splendo.kaluga.architecture.navigation.toBundle
 import com.splendo.kaluga.base.text.KalugaDateFormatter
 import com.splendo.kaluga.base.text.iso8601Pattern
 import kotlinx.serialization.builtins.BooleanArraySerializer
@@ -181,7 +179,7 @@ sealed class Route {
         companion object {
             const val KEY = "com.splendo.kaluga.architecture.compose.navigation.Route.Result.KEY"
         }
-        object Empty: Result()
+        object Empty : Result()
         data class Data<SpecRow : NavigationBundleSpecRow<*>, Bundle : NavigationBundle<SpecRow>>(val bundle: Bundle) : Result()
     }
 
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
index 4a0951bfe..2b70afe53 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteNavigator.kt
@@ -87,11 +87,10 @@ class NavHostRouteController(
         }
     }
 
-    override fun back(result: Route.Result): Boolean = if (navHostController.backQueue.isNotEmpty()){
+    override fun back(result: Route.Result): Boolean = if (navHostController.backQueue.isNotEmpty()) {
         navHostController.previousBackStackEntry?.setResult(result)
         navHostController.popBackStack()
-    }
-    else { parentRouteController?.back(result) ?: false }
+    } else { parentRouteController?.back(result) ?: false }
 
     override fun close() {
         navHostController.popBackStack(ROOT_VIEW, true)

From 014f9af92b2eb09980d7981d088942d70f4e3d46 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 13:12:58 +0100
Subject: [PATCH 086/227] Fixed Ktlint

---
 resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt | 2 +-
 resources-compose/src/androidLibMain/kotlin/KalugaButton.kt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt b/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
index 0662fcfae..40b83e77e 100644
--- a/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
+++ b/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
@@ -31,8 +31,8 @@ import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.splendo.kaluga.resources.DefaultColors
-import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.GradientStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 
 fun Modifier.backgroundStyle(backgroundStyle: KalugaBackgroundStyle) = background(
     backgroundStyle.fillStyle.brush,
diff --git a/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt b/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
index be108f574..0ba7a1792 100644
--- a/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
+++ b/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
@@ -40,8 +40,8 @@ import androidx.compose.ui.unit.dp
 import com.splendo.kaluga.resources.DefaultColors
 import com.splendo.kaluga.resources.StringStyleAttribute
 import com.splendo.kaluga.resources.StyledStringBuilder
-import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.ButtonStateStyle
+import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.KalugaButtonStyle
 import com.splendo.kaluga.resources.styled
 import com.splendo.kaluga.resources.view.KalugaButton

From 6546a721e8c54613c7ddb9500d6197451bc58e2c Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 13:15:13 +0100
Subject: [PATCH 087/227] Lint fix

---
 .../commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
index c16cfbf34..486d2eba4 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
@@ -18,7 +18,6 @@ package com.splendo.kaluga.datetime.timer
 
 import com.splendo.kaluga.base.utils.firstInstance
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.transformWhile
 import kotlin.time.Duration

From e533a7624a4ebe408e585f131cecb0ecaba49ca2 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 13:42:25 +0100
Subject: [PATCH 088/227] Api update

---
 bluetooth/api/androidLib/bluetooth.api        |  2 +-
 bluetooth/api/jvm/bluetooth.api               | 14 +++++++++----
 .../api/androidLib/test-utils-bluetooth.api   |  5 ++---
 .../api/jvm/test-utils-bluetooth.api          | 21 ++++++++++++-------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/bluetooth/api/androidLib/bluetooth.api b/bluetooth/api/androidLib/bluetooth.api
index 76f36b6c0..fba688d70 100644
--- a/bluetooth/api/androidLib/bluetooth.api
+++ b/bluetooth/api/androidLib/bluetooth.api
@@ -901,7 +901,7 @@ public final class com/splendo/kaluga/bluetooth/scanner/DefaultScanner : com/spl
 	public fun generateEnableSensorsActions ()Ljava/util/List;
 	public fun isHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun isSupported ()Z
-	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
+	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index ef02eddeb..920ffc3e0 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -1143,7 +1143,8 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinit
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getPreviouslyDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
+	public fun getPreviouslyDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
+	public fun getPreviouslyPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 	public fun hashCode ()I
@@ -1181,8 +1182,10 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Ena
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Idle : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
+	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
+	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
+	public fun pairedDevices (Ljava/util/Set;Ljava/util/Set;Ljava/util/List;)Lkotlin/jvm/functions/Function1;
 	public fun refresh (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -1195,9 +1198,11 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enable
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun discoverDevice (Lcom/splendo/kaluga/bluetooth/UUID;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
+	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
+	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 	public fun getStopScanning ()Lkotlin/jvm/functions/Function1;
+	public fun pairedDevices (Ljava/util/Set;Ljava/util/Set;Ljava/util/List;)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
@@ -1210,7 +1215,8 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initia
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
+	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
+	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 	public fun hashCode ()I
 	public fun initialized (ZZ)Lkotlin/jvm/functions/Function1;
diff --git a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
index c47a570a3..2cc7d38de 100644
--- a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
@@ -290,14 +290,14 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner : c
 	public final fun getDidStartScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getDidStopScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getGenerateEnableSensorsActionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getPairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getRetrievePairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun isEnabled ()Lkotlinx/coroutines/flow/MutableStateFlow;
 	public fun isSupported ()Z
-	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
+	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -389,7 +389,6 @@ public abstract class com/splendo/kaluga/test/bluetooth/scanner/MockScanningStat
 	public final fun getDisable ()Lkotlin/jvm/functions/Function1;
 	protected abstract fun getPermittedHandler ()Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$PermittedHandler;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Idle : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
diff --git a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
index 350b978e3..8fcbe2f64 100644
--- a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
@@ -200,14 +200,14 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner : c
 	public final fun getDidStartScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getDidStopScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getGenerateEnableSensorsActionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getPairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getRetrievePairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringHardwareEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun isEnabled ()Lkotlinx/coroutines/flow/MutableStateFlow;
 	public fun isSupported ()Z
-	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
+	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoringHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -270,7 +270,8 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$D
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Deinitialized;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;ILjava/lang/Object;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getPreviouslyDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
+	public fun getPreviouslyDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
+	public fun getPreviouslyPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
 	public fun remain ()Lkotlin/jvm/functions/Function1;
@@ -300,12 +301,13 @@ public abstract class com/splendo/kaluga/test/bluetooth/scanner/MockScanningStat
 	public final fun getDisable ()Lkotlin/jvm/functions/Function1;
 	protected abstract fun getPermittedHandler ()Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$PermittedHandler;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun pairedDevices (Ljava/util/Set;)Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Idle : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;)V
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
+	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;)V
+	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
+	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
+	public fun pairedDevices (Ljava/util/Set;Ljava/util/Set;Ljava/util/List;)Lkotlin/jvm/functions/Function1;
 	public fun refresh (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -315,8 +317,10 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$E
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled$Scanning : com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;)V
 	public fun discoverDevice (Lcom/splendo/kaluga/bluetooth/UUID;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
+	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
+	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public fun getStopScanning ()Lkotlin/jvm/functions/Function1;
+	public fun pairedDevices (Ljava/util/Set;Ljava/util/Set;Ljava/util/List;)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
@@ -334,7 +338,8 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanningState$I
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Initializing;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Initializing;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;ILjava/lang/Object;)Lcom/splendo/kaluga/test/bluetooth/scanner/MockScanningState$Initializing;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Discovered;
+	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
+	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public fun hashCode ()I
 	public fun initialized (ZZ)Lkotlin/jvm/functions/Function1;
 	public fun remain ()Lkotlin/jvm/functions/Function1;

From 6fa92b2261317482be112b72607a3c8aafe88f82 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 13:43:11 +0100
Subject: [PATCH 089/227] Api update

---
 base/api/androidLib/base.api | 4 ++++
 base/api/jvm/base.api        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index 8161f9d4c..2fc268af3 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -624,6 +624,10 @@ public final class com/splendo/kaluga/base/utils/DecimalAndroid {
 	public static final fun toString (Ljava/math/BigDecimal;)Ljava/lang/String;
 }
 
+public final class com/splendo/kaluga/base/utils/DecimalException : java/lang/ArithmeticException {
+	public fun <init> (Ljava/lang/String;)V
+}
+
 public final class com/splendo/kaluga/base/utils/DecimalKt {
 	public static final fun toDecimalList (Ljava/util/Collection;)Ljava/util/List;
 	public static final fun toDecimalList ([B)Ljava/util/List;
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index 4692642e8..cd975aa82 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -571,6 +571,10 @@ public final class com/splendo/kaluga/base/utils/ContainsAnyKt {
 	public static final fun containsAny (Ljava/lang/Iterable;Ljava/lang/Iterable;)Z
 }
 
+public final class com/splendo/kaluga/base/utils/DecimalException : java/lang/ArithmeticException {
+	public fun <init> (Ljava/lang/String;)V
+}
+
 public final class com/splendo/kaluga/base/utils/DecimalJVM {
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;

From dded0aa460ca116959a60ad6f3a0ff46a0e095b5 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 14:03:24 +0100
Subject: [PATCH 090/227] ApiDump

---
 bluetooth/api/androidLib/bluetooth.api     | 34 ++++++++++++++++++++--
 bluetooth/api/jvm/bluetooth.api            | 32 +++++++++++++++++++-
 permissions/api/androidLib/permissions.api |  2 ++
 permissions/api/jvm/permissions.api        |  2 ++
 4 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/bluetooth/api/androidLib/bluetooth.api b/bluetooth/api/androidLib/bluetooth.api
index fba688d70..ab9b0cd0d 100644
--- a/bluetooth/api/androidLib/bluetooth.api
+++ b/bluetooth/api/androidLib/bluetooth.api
@@ -798,6 +798,12 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/DeviceInfo {
 	public abstract fun getUpdatedAt ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
+public final class com/splendo/kaluga/bluetooth/device/DeviceInfoAndroid {
+	public static final fun getStringValue (Ljava/lang/String;)Ljava/lang/String;
+	public static final fun identifierFromString (Ljava/lang/String;)Ljava/lang/String;
+	public static final fun randomIdentifier ()Ljava/lang/String;
+}
+
 public final class com/splendo/kaluga/bluetooth/device/DeviceInfoImpl : com/splendo/kaluga/bluetooth/device/DeviceInfo {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;)V
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;)V
@@ -819,8 +825,7 @@ public final class com/splendo/kaluga/bluetooth/device/DeviceInfoImpl : com/sple
 }
 
 public final class com/splendo/kaluga/bluetooth/device/DeviceInfoKt {
-	public static final fun getStringValue (Ljava/lang/String;)Ljava/lang/String;
-	public static final fun randomIdentifier ()Ljava/lang/String;
+	public static final fun getSerializable (Ljava/lang/String;)Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/device/DeviceState {
@@ -836,6 +841,15 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/DeviceWrappe
 	public abstract fun removeBond ()V
 }
 
+public class com/splendo/kaluga/bluetooth/device/IdentifierSerializer : kotlinx/serialization/KSerializer {
+	public fun <init> ()V
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;
+	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;)V
+	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
+}
+
 public abstract interface class com/splendo/kaluga/bluetooth/device/NotConnectableDeviceState : com/splendo/kaluga/bluetooth/device/DeviceState {
 }
 
@@ -843,6 +857,22 @@ public final class com/splendo/kaluga/bluetooth/device/NotConnectableDeviceState
 	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/device/NotConnectableDeviceStateImpl;
 }
 
+public final class com/splendo/kaluga/bluetooth/device/SerializableIdentifier {
+	public static final field Companion Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier$Companion;
+	public fun <init> (Ljava/lang/String;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun copy (Ljava/lang/String;)Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;Ljava/lang/String;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getIdentifier ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/bluetooth/device/SerializableIdentifier$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanner : com/splendo/kaluga/bluetooth/scanner/Scanner, kotlinx/coroutines/CoroutineScope {
 	public static final field Companion Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Companion;
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;)V
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index 920ffc3e0..b33831ca4 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -800,11 +800,16 @@ public final class com/splendo/kaluga/bluetooth/device/DeviceInfoImpl : com/sple
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/bluetooth/device/DeviceInfoKt {
+public final class com/splendo/kaluga/bluetooth/device/DeviceInfoJVM {
 	public static final fun getStringValue (Lcom/splendo/kaluga/bluetooth/UUID;)Ljava/lang/String;
+	public static final fun identifierFromString (Ljava/lang/String;)Lcom/splendo/kaluga/bluetooth/UUID;
 	public static final fun randomIdentifier ()Lcom/splendo/kaluga/bluetooth/UUID;
 }
 
+public final class com/splendo/kaluga/bluetooth/device/DeviceInfoKt {
+	public static final fun getSerializable (Lcom/splendo/kaluga/bluetooth/UUID;)Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;
+}
+
 public abstract interface class com/splendo/kaluga/bluetooth/device/DeviceState {
 }
 
@@ -813,6 +818,15 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/DeviceWrappe
 	public abstract fun getName ()Ljava/lang/String;
 }
 
+public class com/splendo/kaluga/bluetooth/device/IdentifierSerializer : kotlinx/serialization/KSerializer {
+	public fun <init> ()V
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;
+	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;)V
+	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
+}
+
 public abstract interface class com/splendo/kaluga/bluetooth/device/NotConnectableDeviceState : com/splendo/kaluga/bluetooth/device/DeviceState {
 }
 
@@ -820,6 +834,22 @@ public final class com/splendo/kaluga/bluetooth/device/NotConnectableDeviceState
 	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/device/NotConnectableDeviceStateImpl;
 }
 
+public final class com/splendo/kaluga/bluetooth/device/SerializableIdentifier {
+	public static final field Companion Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier$Companion;
+	public fun <init> (Lcom/splendo/kaluga/bluetooth/UUID;)V
+	public final fun component1 ()Lcom/splendo/kaluga/bluetooth/UUID;
+	public final fun copy (Lcom/splendo/kaluga/bluetooth/UUID;)Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;Lcom/splendo/kaluga/bluetooth/UUID;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getIdentifier ()Lcom/splendo/kaluga/bluetooth/UUID;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/bluetooth/device/SerializableIdentifier$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanner : com/splendo/kaluga/bluetooth/scanner/Scanner, kotlinx/coroutines/CoroutineScope {
 	public static final field Companion Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Companion;
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;)V
diff --git a/permissions/api/androidLib/permissions.api b/permissions/api/androidLib/permissions.api
index 0aa4131f6..3ecb4fd24 100644
--- a/permissions/api/androidLib/permissions.api
+++ b/permissions/api/androidLib/permissions.api
@@ -1,5 +1,7 @@
 public final class com/splendo/kaluga/permissions/RegisterAllPermissionsKt {
 	public static final fun registerAllPermissions-8Mi8wO0 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)V
 	public static synthetic fun registerAllPermissions-8Mi8wO0$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)V
+	public static final fun registerAllPermissionsNotRegistered-dWUq8MI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerAllPermissionsNotRegistered-dWUq8MI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
diff --git a/permissions/api/jvm/permissions.api b/permissions/api/jvm/permissions.api
index 0aa4131f6..3ecb4fd24 100644
--- a/permissions/api/jvm/permissions.api
+++ b/permissions/api/jvm/permissions.api
@@ -1,5 +1,7 @@
 public final class com/splendo/kaluga/permissions/RegisterAllPermissionsKt {
 	public static final fun registerAllPermissions-8Mi8wO0 (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;)V
 	public static synthetic fun registerAllPermissions-8Mi8wO0$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;ILjava/lang/Object;)V
+	public static final fun registerAllPermissionsNotRegistered-dWUq8MI (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun registerAllPermissionsNotRegistered-dWUq8MI$default (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;JLcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 

From 62656042e27c8716acf7edcd2fb6ff88954c7aee Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 14:06:56 +0100
Subject: [PATCH 091/227] Added test

---
 base/src/commonTest/kotlin/utils/DecimalTest.kt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/base/src/commonTest/kotlin/utils/DecimalTest.kt b/base/src/commonTest/kotlin/utils/DecimalTest.kt
index 946202699..51fbe5465 100644
--- a/base/src/commonTest/kotlin/utils/DecimalTest.kt
+++ b/base/src/commonTest/kotlin/utils/DecimalTest.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.base.utils
 
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -43,6 +44,8 @@ class DecimalTest {
         assertEquals(1.toDecimal().div(3.toDecimal(), 3).toDouble(), 0.333)
         assertEquals(1.toDecimal().div(3.toDecimal(), 3, RoundingMode.RoundDown).toDouble(), 0.333)
         assertEquals(1.toDecimal().div(3.toDecimal(), 3, RoundingMode.RoundUp).toDouble(), 0.334)
+
+        assertFailsWith(DecimalException::class) { 1.0.toDecimal() / 0.0.toDecimal() }
     }
 
     @Test

From 18efa2cdfc9fd9a8aa4615303141000cc6366ebd Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 14:09:52 +0100
Subject: [PATCH 092/227] Added some additional tests

---
 base/src/commonTest/kotlin/utils/DecimalTest.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/base/src/commonTest/kotlin/utils/DecimalTest.kt b/base/src/commonTest/kotlin/utils/DecimalTest.kt
index 51fbe5465..47330ce9d 100644
--- a/base/src/commonTest/kotlin/utils/DecimalTest.kt
+++ b/base/src/commonTest/kotlin/utils/DecimalTest.kt
@@ -46,6 +46,8 @@ class DecimalTest {
         assertEquals(1.toDecimal().div(3.toDecimal(), 3, RoundingMode.RoundUp).toDouble(), 0.334)
 
         assertFailsWith(DecimalException::class) { 1.0.toDecimal() / 0.0.toDecimal() }
+        assertFailsWith(DecimalException::class) { 1.0.toDecimal().div(0.0.toDecimal(), 3) }
+        assertFailsWith(DecimalException::class) { 1.0.toDecimal().div(0.0.toDecimal(), 3, RoundingMode.RoundDown) }
     }
 
     @Test

From 983507010f6a8200ca766f852d690673a484a3d8 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 15:14:07 +0100
Subject: [PATCH 093/227] Small improvements

---
 .../commonTest/kotlin/utils/DecimalTest.kt    | 36 +++++++++----------
 base/src/jsMain/kotlin/utils/Decimal.kt       |  6 ++--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/base/src/commonTest/kotlin/utils/DecimalTest.kt b/base/src/commonTest/kotlin/utils/DecimalTest.kt
index 47330ce9d..8b5317288 100644
--- a/base/src/commonTest/kotlin/utils/DecimalTest.kt
+++ b/base/src/commonTest/kotlin/utils/DecimalTest.kt
@@ -26,24 +26,24 @@ import kotlin.test.assertTrue
 class DecimalTest {
     @Test
     fun testCalculation() {
-        assertEquals(0.1.toDecimal().plus(0.2.toDecimal()).toDouble(), 0.3)
-        assertEquals(1.99.toDecimal().round(1).toDouble(), 2.0)
-        assertEquals(1.91.toDecimal().round(1).toDouble(), 1.9)
-
-        assertEquals(1.5.toDecimal().round(0).toDouble(), 2.0)
-        assertEquals(1.5.toDecimal().round(0, RoundingMode.RoundDown).toDouble(), 1.0)
-        assertEquals(1.5.toDecimal().round(0, RoundingMode.RoundUp).toDouble(), 2.0)
-
-        assertEquals((0.5.toDecimal() + 0.5.toDecimal()).toDouble(), 1.0)
-        assertEquals((0.56.toDecimal() + 0.5.toDecimal()).round(1).toDouble(), 1.1)
-        assertEquals((1.5.toDecimal() - 0.5.toDecimal()).toDouble(), 1.0)
-        assertEquals((1.56.toDecimal() - 0.5.toDecimal()).round(1).toDouble(), 1.1)
-        assertEquals((5.toDecimal() / 10.toDecimal()).toDouble(), 0.5)
-        assertEquals((0.5.toDecimal() * 2.toDecimal()).toDouble(), 1.0)
-        assertEquals(((1.toDecimal() / 3.toDecimal()).times(2.toDecimal(), 3, RoundingMode.RoundHalfEven)).toDouble(), 0.667)
-        assertEquals(1.toDecimal().div(3.toDecimal(), 3).toDouble(), 0.333)
-        assertEquals(1.toDecimal().div(3.toDecimal(), 3, RoundingMode.RoundDown).toDouble(), 0.333)
-        assertEquals(1.toDecimal().div(3.toDecimal(), 3, RoundingMode.RoundUp).toDouble(), 0.334)
+        assertEquals(0.3, 0.1.toDecimal().plus(0.2.toDecimal()).toDouble())
+        assertEquals(2.0, 1.99.toDecimal().round(1).toDouble())
+        assertEquals(1.9, 1.91.toDecimal().round(1).toDouble())
+
+        assertEquals(2.0, 1.5.toDecimal().round(0).toDouble())
+        assertEquals(1.0, 1.5.toDecimal().round(0, RoundingMode.RoundDown).toDouble())
+        assertEquals(2.0, 1.5.toDecimal().round(0, RoundingMode.RoundUp).toDouble())
+
+        assertEquals(1.0, (0.5.toDecimal() + 0.5.toDecimal()).toDouble())
+        assertEquals(1.1, (0.56.toDecimal() + 0.5.toDecimal()).round(1).toDouble())
+        assertEquals(1.0, (1.5.toDecimal() - 0.5.toDecimal()).toDouble())
+        assertEquals(1.1, (1.56.toDecimal() - 0.5.toDecimal()).round(1).toDouble())
+        assertEquals(0.5, (5.toDecimal() / 10.toDecimal()).toDouble())
+        assertEquals(1.0, (0.5.toDecimal() * 2.toDecimal()).toDouble())
+        assertEquals(0.667, ((1.toDecimal() / 3.toDecimal()).times(2.toDecimal(), 3, RoundingMode.RoundHalfEven)).toDouble())
+        assertEquals(0.333, 1.toDecimal().div(3.toDecimal(), 3).toDouble())
+        assertEquals(0.333, 1.toDecimal().div(3.toDecimal(), 3, RoundingMode.RoundDown).toDouble())
+        assertEquals(0.334, 1.toDecimal().div(3.toDecimal(), 3, RoundingMode.RoundUp).toDouble())
 
         assertFailsWith(DecimalException::class) { 1.0.toDecimal() / 0.0.toDecimal() }
         assertFailsWith(DecimalException::class) { 1.0.toDecimal().div(0.0.toDecimal(), 3) }
diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index 14dd93c30..0b48af645 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -99,18 +99,18 @@ actual fun Decimal.minus(
 
 actual operator fun Decimal.div(
     value: Decimal
-): Decimal = if (value.toDouble() != 0.0) Decimal(BigDecimal.divide(bd, value.bd, Rounding())) else throw DecimalException("Divide by zero")
+): Decimal = if (!BigDecimal.equal(value.bd, ZERO)) Decimal(BigDecimal.divide(bd, value.bd, Rounding())) else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(
     value: Decimal,
     scale: Int
-): Decimal = if (value.toDouble() != 0.0) Decimal(BigDecimal.divide(bd, value.bd, Rounding(scale))) else throw DecimalException("Divide by zero")
+): Decimal = if (!BigDecimal.equal(value.bd, ZERO)) Decimal(BigDecimal.divide(bd, value.bd, Rounding(scale))) else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = if (value.toDouble() != 0.0)
+): Decimal = if (!BigDecimal.equal(value.bd, ZERO))
     round(BigDecimal.divide(bd, value.bd, Rounding(scale + 1, ROUNDING_MODE, DIV_DECIMAL_128_SIGNIFICANT_DIGITS)), roundingMode, scale)
 else
     throw DecimalException("Divide by zero")

From b7ee3ff40e5ac1355f0f469f35305dac221979c9 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 16 Jan 2023 16:17:08 +0100
Subject: [PATCH 094/227] Restored Readme

---
 example/README.md         | 83 +++++++++++++++++++++++++++++++++++++++
 example/gradle.properties |  3 +-
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 example/README.md

diff --git a/example/README.md b/example/README.md
new file mode 100644
index 000000000..cc91cd97b
--- /dev/null
+++ b/example/README.md
@@ -0,0 +1,83 @@
+# Example project
+An Example project to demonstrate functionality and best practices for using Kaluga.
+
+## Overview
+This example project has the following parts:
+- An Android app in [android](/android)
+- A shared code module in [shared](/shared). This exposes an Android library, and a Kotlin/Native sourceset that depends on a common source set. These are then included in the build of the Android and iOS example apps respectively.
+- An iOS app in [ios](/ios)
+
+## Running
+To access the shared code, simply open this folder in Android Studio. From there you can build the Android module and shared code.
+At times the latest Beta or Canary release is needed (see [DEVELOP](/DEVELOP.md))
+
+The iOS example can be built using XCode using the [Demo XCode Project](/ios/Demo.xcodeproj).
+The iOS projects uses [Kaluga SwiftUI](https://github.com/splendo/kaluga-swiftui) for bridging the project to SwiftUI. This requires installing by running `sh install.sh` from the `ios` folder.
+
+## Configuration
+The example app can load the main components either through your (local) maven repository, or as gradle modules.
+
+The advantage of using a gradle module is that you can edit the source of components and run them in the example right away, without needing to publish them to maven first.
+
+By default Kaluga dependency is included as a composite build. You also can put the property `kaluga.exampleEmbeddingMethod=composite` in the `local.properties` file in the root of the project (this file is already generated by your IDE normally) to specify it explicitly. To enable maven use `kaluga.exampleEmbeddingMethod=maven`.
+
+You can also set the `kaluga.exampleMavenRepo` property to specify which maven repo to look in. By default this is `mavenLocal()` (this can also be used by explicitly setting the value `local`). For example to set this to the sonatype snapshot repository use:
+
+```properties
+kaluga.exampleMavenRepo=https://oss.sonatype.org/content/repositories/snapshots/
+```
+
+In conjunction, you can set the `kaluga.libraryVersion` property. This will override the version of Kaluga to look for. For example:
+
+```properties
+kaluga.libraryVersion=0.2.2-SNAPSHOT
+```
+
+Please note that this also overrides the version when building Kaluga itself.
+
+### Links
+In order to make kaluga-links example work correctly, you must sign the app with a signing certificate belonging to our team or using the `debug.keystore` file we provide.
+
+#### Why?
+The goal of the example is to show the usages of `links` module, but on top of that we are also showing the flow where user are redirected to the app without being asked "Open with..." dialog.
+To do so the backend must contain in `https://whatever.domain/.well-known` two file named respectively `assetlinks.json` and `apple-app-site-association`.
+
+## Android
+`assetlinks.json` should have the following format
+
+```
+[
+  {
+    "relation": ["delegate_permission/common.handle_all_urls"],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "app.package",
+      "sha256_cert_fingerprints": [
+          <sha256_fingerprint_1>,
+          ...
+          <sha256_fingerprint_n>,
+      ]
+    }
+  }
+]
+```
+[More info about Android App Links](https://developer.android.com/training/app-links).
+
+## iOS
+While `apple-app-site-association` will be
+
+```
+{
+    "applinks": {
+        "apps": [], // This array MUST be empty (for more info check Universal link's doc below). -->
+        "details": [
+            {
+                "appID": "appId",
+                "paths": ["path_1", "path_2"] // Use wildcard "*" if you accept every path.
+            }
+        ]
+    }
+}
+```
+`appId` = `teamId`.`bundleId`
+[More info about iOS Universal Links](https://developer.apple.com/ios/universal-links/).
diff --git a/example/gradle.properties b/example/gradle.properties
index 938da4248..cf54f41c2 100644
--- a/example/gradle.properties
+++ b/example/gradle.properties
@@ -1,4 +1,5 @@
-#Gradle
+## ## keep in sync with gradle.properties in root ## ##
+# Gradle
 org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4096M"
 
 #Kotlin

From 388845470a98047b088f1c12646599ae7a18d3ab Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 11:27:04 +0100
Subject: [PATCH 095/227] Added some convenience methods for typed property

---
 .../kotlin/navigation/ActivityParseExtra.kt   | 369 ++++++++++++++++++
 .../navigation/BundleToTypedProperty.kt       | 358 +++++++++++++++++
 .../navigation/FragmentParseArguments.kt      | 369 ++++++++++++++++++
 .../kotlin/navigation/NavigationBundle.kt     |  10 -
 .../ArchitectureDetailsActivity.kt            |   6 +-
 .../architecture/ArchitectureInputActivity.kt |   5 +-
 .../bluetooth/BluetoothMoreActivity.kt        |   5 +-
 .../permissions/PermissionsDemoActivity.kt    |   7 +-
 8 files changed, 1105 insertions(+), 24 deletions(-)
 create mode 100644 architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
 create mode 100644 architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
 create mode 100644 architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt

diff --git a/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt b/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
new file mode 100644
index 000000000..0f0c236a5
--- /dev/null
+++ b/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
@@ -0,0 +1,369 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.navigation
+
+import android.app.Activity
+import android.os.Bundle
+import com.splendo.kaluga.base.utils.KalugaDate
+import kotlinx.serialization.KSerializer
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [T] using a convert method.
+ * @param convert The method for converting [Bundle] into [T]
+ * @return The [T] value extracted from the [Bundle]
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ */
+fun <T> Activity.parseExtra(convert: Bundle.() -> T): T = intent.extras!!.convert()
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [T] using a convert method.
+ * @param convert The method for converting [Bundle] into [T]
+ * @return The [T] value extracted from the [Bundle] or `null` if [android.content.Intent.getExtras] is `null`
+ */
+fun <T> Activity.parseExtraOrNull(convert: Bundle.() -> T?): T? = intent.extras?.convert()
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Boolean].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType]
+ * @return The [Boolean] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanType].
+ */
+fun Activity.parseBoolean(): Boolean = parseExtra { asBoolean() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Boolean] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Boolean] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseBooleanOrNull(): Boolean? = parseExtra { asBooleanOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [BooleanArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanArrayType]
+ * @return The [BooleanArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanArrayType].
+ */
+fun Activity.parseBooleanArray(): BooleanArray = parseExtra { asBooleanArray() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [BooleanArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [BooleanArray] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseBooleanArrayOrNull(): BooleanArray? = parseExtra { asBooleanArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Byte].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteType]
+ * @return The [Byte] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteType].
+ */
+fun Activity.parseByte(): Byte = parseExtra { asByte() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Byte] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Byte] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseByteOrNull(): Byte? = parseExtra { asByteOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [ByteArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteArrayType]
+ * @return The [ByteArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType].
+ */
+fun Activity.parseByteArray(): ByteArray = parseExtra { asByteArray() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [ByteArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [ByteArray] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseByteArrayOrNull(): ByteArray? = parseExtra { asByteArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Char].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharType]
+ * @return The [Char] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharType].
+ */
+fun Activity.parseChar(): Char = parseExtra { asChar() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Char] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Char] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseCharOrNull(): Char? = parseExtra { asCharOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [CharArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharArrayType]
+ * @return The [CharArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharArrayType].
+ */
+fun Activity.parseCharArray(): CharArray = parseExtra { asCharArray() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [CharArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [CharArray] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseCharArrayOrNull(): CharArray? = parseExtra { asCharArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [CharSequence] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharSequenceType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [CharSequence] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseCharSequenceOrNull(): CharSequence? = parseExtra { asCharSequenceOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [KalugaDate].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateType]
+ * @return The [KalugaDate] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateType].
+ */
+fun Activity.parseDate(): KalugaDate = parseExtra { asDate() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [KalugaDate] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [KalugaDate] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseDateOrNull(): KalugaDate? = parseExtra { asDateOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [List] of [KalugaDate].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateArrayType]
+ * @return The [List] of [KalugaDate] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateArrayType].
+ */
+fun Activity.parseDateArray(): List<KalugaDate> = parseExtra { asDateArray() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [List] of [KalugaDate] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [List] of [KalugaDate] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseDateArrayOrNull(): List<KalugaDate>? = parseExtra { asDateArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Double].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleType]
+ * @return The [Double] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleType].
+ */
+fun Activity.parseDouble(): Double = parseExtra { asDouble() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Double] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Double] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseDoubleOrNull(): Double? = parseExtra { asDoubleOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [DoubleArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleArrayType]
+ * @return The [DoubleArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleArrayType].
+ */
+fun Activity.parseDoubleArray(): DoubleArray = parseExtra { asDoubleArray() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [DoubleArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [DoubleArray] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseDoubleArrayOrNull(): DoubleArray? = parseExtra { asDoubleArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Float].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatType]
+ * @return The [Float] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatType].
+ */
+fun Activity.parseFloat(): Float = parseExtra { asFloat() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Float] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Float] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseFloatOrNull(): Float? = parseExtra { asFloatOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [FloatArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatArrayType]
+ * @return The [FloatArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatArrayType].
+ */
+fun Activity.parseFloatArray(): FloatArray = parseExtra { asFloatArray() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [FloatArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [FloatArray] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseFloatArrayOrNull(): FloatArray? = parseExtra { asFloatArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Int].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerType]
+ * @return The [Int] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerType].
+ */
+fun Activity.parseInt(): Int = parseExtra { asInt() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Int] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Int] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseIntOrNull(): Int? = parseExtra { asIntOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [IntArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerArrayType]
+ * @return The [IntArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerArrayType].
+ */
+fun Activity.parseIntArray(): IntArray = parseExtra { asIntArray() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [IntArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [IntArray] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseIntArrayOrNull(): IntArray? = parseExtra { asIntArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Long].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongType]
+ * @return The [Long] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongType].
+ */
+fun Activity.parseLong(): Long = parseExtra { asLong() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Long] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Long] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseLongOrNull(): Long? = parseExtra { asLongOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [LongArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongArrayType]
+ * @return The [LongArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongArrayType].
+ */
+fun Activity.parseLongArray(): LongArray = parseExtra { asLongArray() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [LongArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [LongArray] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseLongArrayOrNull(): LongArray? = parseExtra { asLongArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Short].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortType]
+ * @return The [Short] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortType].
+ */
+fun Activity.parseShort(): Short = parseExtra { asShort() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [Short] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Short] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseShortOrNull(): Short? = parseExtra { asShortOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [ShortArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortArrayType]
+ * @return The [ShortArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortArrayType].
+ */
+fun Activity.parseShortArray(): ShortArray = parseExtra { asShortArray() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [ShortArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [ShortArray] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseShortArrayOrNull(): ShortArray? = parseExtra { asShortArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [String].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringType]
+ * @return The [String] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringType].
+ */
+fun Activity.parseString(): String = parseExtra { asString() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [String] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [String] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseStringOrNull(): String? = parseExtra { asStringOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [List] of [String].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringArrayType]
+ * @return The [List] of [String] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringArrayType].
+ */
+fun Activity.parseStringList(): List<String> = parseExtra { asStringList() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [List] of [String] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [List] of [String] stored in the bundle or null if no such value was found.
+ */
+fun Activity.parseStringListOrNull(): List<String>? = parseExtra { asStringListOrNull() }
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [T].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer]
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle.
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with [serializer].
+ */
+fun <T> Activity.parseTypeOf(serializer: KSerializer<T>): T = parseExtra {
+    toTypedProperty(
+        NavigationBundleSpecType.SerializedType(serializer)
+    )
+}
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle or null if no such value was found.
+ */
+fun <T> Activity.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseExtraOrNull {
+    toTypedPropertyOrNull(
+        NavigationBundleSpecType.SerializedType(serializer)
+    )
+}
diff --git a/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt b/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
new file mode 100644
index 000000000..675d9ddf0
--- /dev/null
+++ b/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
@@ -0,0 +1,358 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.navigation
+
+import android.os.Bundle
+import com.splendo.kaluga.base.utils.KalugaDate
+import kotlinx.serialization.KSerializer
+
+/**
+ * Converts a [Bundle] to a [R] property associated with a [NavigationBundleSpecType]
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType]
+ * @return The [R] value stored in the bundle
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec]
+ */
+fun <R> Bundle.toTypedProperty(type: NavigationBundleSpecType<R>): R {
+    return toNavigationBundle(SingleValueNavigationSpec(type)).get(type)
+}
+
+/**
+ * Converts a [Bundle] to a [R] property associated with a [NavigationBundleSpecType]
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType] either directly or wrapped in [NavigationBundleSpecType.OptionalType]
+ * @return The [R] value stored in the bundle.
+ */
+fun <R> Bundle.toTypedPropertyOrNull(type: NavigationBundleSpecType<R>): R? = try {
+    toTypedProperty(type)
+} catch (e: BundleConversionError) {
+    try {
+        toTypedProperty(NavigationBundleSpecType.OptionalType(type))
+    } catch (e: BundleConversionError) {
+        null
+    }
+}
+
+/**
+ * Converts a [Bundle] to a [Boolean].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType]
+ * @return The [Boolean] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanType].
+ */
+fun Bundle.asBoolean(): Boolean = toTypedProperty(NavigationBundleSpecType.BooleanType)
+
+/**
+ * Converts a [Bundle] to a [Boolean] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Boolean] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asBooleanOrNull(): Boolean? = toTypedPropertyOrNull(NavigationBundleSpecType.BooleanType)
+
+/**
+ * Converts a [Bundle] to a [BooleanArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanArrayType]
+ * @return The [BooleanArray] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanArrayType].
+ */
+fun Bundle.asBooleanArray(): BooleanArray = toTypedProperty(NavigationBundleSpecType.BooleanArrayType)
+
+/**
+ * Converts a [Bundle] to a [BooleanArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [BooleanArray] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asBooleanArrayOrNull(): BooleanArray? = toTypedPropertyOrNull(NavigationBundleSpecType.BooleanArrayType)
+
+/**
+ * Converts a [Bundle] to a [Byte].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteArrayType]
+ * @return The [Byte] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType].
+ */
+fun Bundle.asByte(): Byte = toTypedProperty(NavigationBundleSpecType.ByteType)
+
+/**
+ * Converts a [Bundle] to a [Byte] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Byte] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asByteOrNull(): Byte? = toTypedPropertyOrNull(NavigationBundleSpecType.ByteType)
+
+/**
+ * Converts a [Bundle] to a [ByteArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteArrayType]
+ * @return The [ByteArray] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType].
+ */
+fun Bundle.asByteArray(): ByteArray = toTypedProperty(NavigationBundleSpecType.ByteArrayType)
+
+/**
+ * Converts a [Bundle] to a [ByteArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [ByteArray] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asByteArrayOrNull(): ByteArray? = toTypedPropertyOrNull(NavigationBundleSpecType.ByteArrayType)
+
+/**
+ * Converts a [Bundle] to a [Char].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharType]
+ * @return The [Char] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharType].
+ */
+fun Bundle.asChar(): Char = toTypedProperty(NavigationBundleSpecType.CharType)
+
+/**
+ * Converts a [Bundle] to a [Char] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Char] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asCharOrNull(): Char? = toTypedPropertyOrNull(NavigationBundleSpecType.CharType)
+
+/**
+ * Converts a [Bundle] to a [CharArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharArrayType]
+ * @return The [CharArray] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharArrayType].
+ */
+fun Bundle.asCharArray(): CharArray = toTypedProperty(NavigationBundleSpecType.CharArrayType)
+
+/**
+ * Converts a [Bundle] to a [CharArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [CharArray] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asCharArrayOrNull(): CharArray? = toTypedPropertyOrNull(NavigationBundleSpecType.CharArrayType)
+
+/**
+ * Converts a [Bundle] to a [CharSequence].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharSequenceType]
+ * @return The [CharSequence] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharSequenceType].
+ */
+fun Bundle.asCharSequence(): CharSequence = toTypedProperty(NavigationBundleSpecType.CharSequenceType)
+
+/**
+ * Converts a [Bundle] to a [CharSequence] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharSequenceType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [CharSequence] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asCharSequenceOrNull(): CharSequence? = toTypedPropertyOrNull(NavigationBundleSpecType.CharSequenceType)
+
+/**
+ * Converts a [Bundle] to a [KalugaDate].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateType]
+ * @return The [KalugaDate] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateType].
+ */
+fun Bundle.asDate(): KalugaDate = toTypedProperty(NavigationBundleSpecType.DateType)
+
+/**
+ * Converts a [Bundle] to a [KalugaDate] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [KalugaDate] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asDateOrNull(): KalugaDate? = toTypedPropertyOrNull(NavigationBundleSpecType.DateType)
+
+/**
+ * Converts a [Bundle] to a [List] of [KalugaDate].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateArrayType]
+ * @return The [List] of [KalugaDate] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateArrayType].
+ */
+fun Bundle.asDateArray(): List<KalugaDate> = toTypedProperty(NavigationBundleSpecType.DateArrayType)
+
+/**
+ * Converts a [Bundle] to a [List] of [KalugaDate] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [List] of [KalugaDate] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asDateArrayOrNull(): List<KalugaDate>? = toTypedPropertyOrNull(NavigationBundleSpecType.DateArrayType)
+
+/**
+ * Converts a [Bundle] to a [Double].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleType]
+ * @return The [Double] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleType].
+ */
+fun Bundle.asDouble(): Double = toTypedProperty(NavigationBundleSpecType.DoubleType)
+
+/**
+ * Converts a [Bundle] to a [Double] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Double] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asDoubleOrNull(): Double? = toTypedPropertyOrNull(NavigationBundleSpecType.DoubleType)
+
+/**
+ * Converts a [Bundle] to a [DoubleArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleArrayType]
+ * @return The [DoubleArray] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleArrayType].
+ */
+fun Bundle.asDoubleArray(): DoubleArray = toTypedProperty(NavigationBundleSpecType.DoubleArrayType)
+
+/**
+ * Converts a [Bundle] to a [DoubleArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [DoubleArray] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asDoubleArrayOrNull(): DoubleArray? = toTypedPropertyOrNull(NavigationBundleSpecType.DoubleArrayType)
+
+/**
+ * Converts a [Bundle] to a [Float].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatType]
+ * @return The [Float] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatType].
+ */
+fun Bundle.asFloat(): Float = toTypedProperty(NavigationBundleSpecType.FloatType)
+
+/**
+ * Converts a [Bundle] to a [Float] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Float] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asFloatOrNull(): Float? = toTypedPropertyOrNull(NavigationBundleSpecType.FloatType)
+
+/**
+ * Converts a [Bundle] to a [FloatArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatArrayType]
+ * @return The [FloatArray] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatArrayType].
+ */
+fun Bundle.asFloatArray(): FloatArray = toTypedProperty(NavigationBundleSpecType.FloatArrayType)
+
+/**
+ * Converts a [Bundle] to a [FloatArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [FloatArray] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asFloatArrayOrNull(): FloatArray? = toTypedPropertyOrNull(NavigationBundleSpecType.FloatArrayType)
+
+/**
+ * Converts a [Bundle] to an [Int].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerType]
+ * @return The [Int] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerType].
+ */
+fun Bundle.asInt(): Int = toTypedProperty(NavigationBundleSpecType.IntegerType)
+
+/**
+ * Converts a [Bundle] to an [Int] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Int] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asIntOrNull(): Int? = toTypedPropertyOrNull(NavigationBundleSpecType.IntegerType)
+
+/**
+ * Converts a [Bundle] to an [IntArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerArrayType]
+ * @return The [IntArray] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerArrayType].
+ */
+fun Bundle.asIntArray(): IntArray = toTypedProperty(NavigationBundleSpecType.IntegerArrayType)
+
+/**
+ * Converts a [Bundle] to an [IntArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [IntArray] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asIntArrayOrNull(): IntArray? = toTypedPropertyOrNull(NavigationBundleSpecType.IntegerArrayType)
+
+/**
+ * Converts a [Bundle] to a [Long].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongType]
+ * @return The [Long] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongType].
+ */
+fun Bundle.asLong(): Long = toTypedProperty(NavigationBundleSpecType.LongType)
+
+/**
+ * Converts a [Bundle] to a [Long] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Long] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asLongOrNull(): Long? = toTypedPropertyOrNull(NavigationBundleSpecType.LongType)
+
+/**
+ * Converts a [Bundle] to a [LongArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongArrayType]
+ * @return The [LongArray] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongArrayType].
+ */
+fun Bundle.asLongArray(): LongArray = toTypedProperty(NavigationBundleSpecType.LongArrayType)
+
+/**
+ * Converts a [Bundle] to a [LongArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [LongArray] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asLongArrayOrNull(): LongArray? = toTypedPropertyOrNull(NavigationBundleSpecType.LongArrayType)
+
+/**
+ * Converts a [Bundle] to a [Short].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortType]
+ * @return The [Short] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortType].
+ */
+fun Bundle.asShort(): Short = toTypedProperty(NavigationBundleSpecType.ShortType)
+
+/**
+ * Converts a [Bundle] to a [Short] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Short] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asShortOrNull(): Short? = toTypedPropertyOrNull(NavigationBundleSpecType.ShortType)
+
+/**
+ * Converts a [Bundle] to a [ShortArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortArrayType]
+ * @return The [ShortArray] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortArrayType].
+ */
+fun Bundle.asShortArray(): ShortArray = toTypedProperty(NavigationBundleSpecType.ShortArrayType)
+
+/**
+ * Converts a [Bundle] to a [ShortArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [ShortArray] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asShortArrayOrNull(): ShortArray? = toTypedPropertyOrNull(NavigationBundleSpecType.ShortArrayType)
+
+/**
+ * Converts a [Bundle] to a [String].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringType]
+ * @return The [String] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringType].
+ */
+fun Bundle.asString(): String = toTypedProperty(NavigationBundleSpecType.StringType)
+
+/**
+ * Converts a [Bundle] to a [String] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [String] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asStringOrNull(): String? = toTypedPropertyOrNull(NavigationBundleSpecType.StringType)
+
+/**
+ * Converts a [Bundle] to a [List] of [String].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringArrayType]
+ * @return The [List] of [String] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringArrayType].
+ */
+fun Bundle.asStringList(): List<String> = toTypedProperty(NavigationBundleSpecType.StringArrayType)
+
+/**
+ * Converts a [Bundle] to a [List] of [String] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [List] of [String] stored in the bundle or null if no such value was found.
+ */
+fun Bundle.asStringListOrNull(): List<String>? = toTypedPropertyOrNull(NavigationBundleSpecType.StringArrayType)
+
+/**
+ * Converts a [Bundle] to [T].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer]
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle.
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with [serializer].
+ */
+fun <T> Bundle.asTypeOf(serializer: KSerializer<T>): T = toTypedProperty(NavigationBundleSpecType.SerializedType(serializer))
+
+/**
+ * Converts a [Bundle] to [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle or null if no such value was found.
+ */
+fun <T> Bundle.asTypeOfOrNull(serializer: KSerializer<T>): T? = toTypedPropertyOrNull(
+    NavigationBundleSpecType.SerializedType(serializer))
\ No newline at end of file
diff --git a/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt b/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt
new file mode 100644
index 000000000..7525680db
--- /dev/null
+++ b/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt
@@ -0,0 +1,369 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.navigation
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import com.splendo.kaluga.base.utils.KalugaDate
+import kotlinx.serialization.KSerializer
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [T] using a convert method.
+ * @param convert The method for converting [Bundle] into [T]
+ * @return The [T] value extracted from the [Bundle]
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ */
+fun <T> Fragment.parseExtra(convert: Bundle.() -> T): T = arguments!!.convert()
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [T] using a convert method.
+ * @param convert The method for converting [Bundle] into [T]
+ * @return The [T] value extracted from the [Bundle] or `null` if [android.content.Intent.getExtras] is `null`
+ */
+fun <T> Fragment.parseExtraOrNull(convert: Bundle.() -> T?): T? = arguments?.convert()
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Boolean].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType]
+ * @return The [Boolean] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanType].
+ */
+fun Fragment.parseBoolean(): Boolean = parseExtra { asBoolean() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Boolean] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Boolean] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseBooleanOrNull(): Boolean? = parseExtra { asBooleanOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [BooleanArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanArrayType]
+ * @return The [BooleanArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanArrayType].
+ */
+fun Fragment.parseBooleanArray(): BooleanArray = parseExtra { asBooleanArray() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [BooleanArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [BooleanArray] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseBooleanArrayOrNull(): BooleanArray? = parseExtra { asBooleanArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Byte].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteType]
+ * @return The [Byte] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteType].
+ */
+fun Fragment.parseByte(): Byte = parseExtra { asByte() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Byte] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Byte] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseByteOrNull(): Byte? = parseExtra { asByteOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [ByteArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteArrayType]
+ * @return The [ByteArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType].
+ */
+fun Fragment.parseByteArray(): ByteArray = parseExtra { asByteArray() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [ByteArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [ByteArray] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseByteArrayOrNull(): ByteArray? = parseExtra { asByteArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Char].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharType]
+ * @return The [Char] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharType].
+ */
+fun Fragment.parseChar(): Char = parseExtra { asChar() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Char] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Char] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseCharOrNull(): Char? = parseExtra { asCharOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [CharArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharArrayType]
+ * @return The [CharArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharArrayType].
+ */
+fun Fragment.parseCharArray(): CharArray = parseExtra { asCharArray() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [CharArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [CharArray] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseCharArrayOrNull(): CharArray? = parseExtra { asCharArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [CharSequence] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharSequenceType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [CharSequence] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseCharSequenceOrNull(): CharSequence? = parseExtra { asCharSequenceOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [KalugaDate].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateType]
+ * @return The [KalugaDate] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateType].
+ */
+fun Fragment.parseDate(): KalugaDate = parseExtra { asDate() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [KalugaDate] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [KalugaDate] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseDateOrNull(): KalugaDate? = parseExtra { asDateOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [List] of [KalugaDate].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateArrayType]
+ * @return The [List] of [KalugaDate] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateArrayType].
+ */
+fun Fragment.parseDateArray(): List<KalugaDate> = parseExtra { asDateArray() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [List] of [KalugaDate] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [List] of [KalugaDate] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseDateArrayOrNull(): List<KalugaDate>? = parseExtra { asDateArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Double].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleType]
+ * @return The [Double] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleType].
+ */
+fun Fragment.parseDouble(): Double = parseExtra { asDouble() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Double] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Double] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseDoubleOrNull(): Double? = parseExtra { asDoubleOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [DoubleArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleArrayType]
+ * @return The [DoubleArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleArrayType].
+ */
+fun Fragment.parseDoubleArray(): DoubleArray = parseExtra { asDoubleArray() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [DoubleArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [DoubleArray] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseDoubleArrayOrNull(): DoubleArray? = parseExtra { asDoubleArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Float].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatType]
+ * @return The [Float] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatType].
+ */
+fun Fragment.parseFloat(): Float = parseExtra { asFloat() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Float] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Float] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseFloatOrNull(): Float? = parseExtra { asFloatOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [FloatArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatArrayType]
+ * @return The [FloatArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatArrayType].
+ */
+fun Fragment.parseFloatArray(): FloatArray = parseExtra { asFloatArray() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [FloatArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [FloatArray] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseFloatArrayOrNull(): FloatArray? = parseExtra { asFloatArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Int].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerType]
+ * @return The [Int] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerType].
+ */
+fun Fragment.parseInt(): Int = parseExtra { asInt() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Int] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Int] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseIntOrNull(): Int? = parseExtra { asIntOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [IntArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerArrayType]
+ * @return The [IntArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerArrayType].
+ */
+fun Fragment.parseIntArray(): IntArray = parseExtra { asIntArray() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [IntArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [IntArray] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseIntArrayOrNull(): IntArray? = parseExtra { asIntArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Long].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongType]
+ * @return The [Long] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongType].
+ */
+fun Fragment.parseLong(): Long = parseExtra { asLong() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Long] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Long] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseLongOrNull(): Long? = parseExtra { asLongOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [LongArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongArrayType]
+ * @return The [LongArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongArrayType].
+ */
+fun Fragment.parseLongArray(): LongArray = parseExtra { asLongArray() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [LongArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [LongArray] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseLongArrayOrNull(): LongArray? = parseExtra { asLongArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Short].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortType]
+ * @return The [Short] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortType].
+ */
+fun Fragment.parseShort(): Short = parseExtra { asShort() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [Short] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Short] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseShortOrNull(): Short? = parseExtra { asShortOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [ShortArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortArrayType]
+ * @return The [ShortArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortArrayType].
+ */
+fun Fragment.parseShortArray(): ShortArray = parseExtra { asShortArray() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [ShortArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [ShortArray] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseShortArrayOrNull(): ShortArray? = parseExtra { asShortArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [String].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringType]
+ * @return The [String] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringType].
+ */
+fun Fragment.parseString(): String = parseExtra { asString() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [String] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [String] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseStringOrNull(): String? = parseExtra { asStringOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [List] of [String].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringArrayType]
+ * @return The [List] of [String] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringArrayType].
+ */
+fun Fragment.parseStringList(): List<String> = parseExtra { asStringList() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [List] of [String] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [List] of [String] stored in the bundle or null if no such value was found.
+ */
+fun Fragment.parseStringListOrNull(): List<String>? = parseExtra { asStringListOrNull() }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [T].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer]
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle.
+ * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with [serializer].
+ */
+fun <T> Fragment.parseTypeOf(serializer: KSerializer<T>): T = parseExtra {
+    toTypedProperty(
+        NavigationBundleSpecType.SerializedType(serializer)
+    )
+}
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle or null if no such value was found.
+ */
+fun <T> Fragment.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseExtraOrNull {
+    toTypedPropertyOrNull(
+        NavigationBundleSpecType.SerializedType(serializer)
+    )
+}
diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
index 6193a39df..290ab017b 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
@@ -81,16 +81,6 @@ fun <R : NavigationBundleSpecRow<*>> Bundle.toNavigationBundle(spec: NavigationB
     )
 }
 
-/**
- * Converts a [Bundle] to a property associated with a [NavigationBundleSpecType]
- * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType]
- * @return The type stored in the bundle
- * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec]
- */
-fun <R> Bundle.toTypedProperty(type: NavigationBundleSpecType<R>): R {
-    return toNavigationBundle(SingleValueNavigationSpec(type)).get(type)
-}
-
 /**
  * Error indicating a [Bundle] could not be converted to a [NavigationBundle]
  */
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
index 241d9bb64..723547c2d 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureDetailsActivity.kt
@@ -20,9 +20,8 @@ package com.splendo.kaluga.example.architecture
 
 import android.os.Bundle
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.navigation.parseTypeOfOrNull
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureDetailsBinding
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureDetailsViewModel
@@ -38,8 +37,7 @@ class ArchitectureDetailsActivity : KalugaViewModelActivity<ArchitectureDetailsV
     }
 
     override val viewModel: ArchitectureDetailsViewModel by viewModel {
-        val type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
-        intent.extras?.toTypedProperty(type)?.let { details ->
+        parseTypeOfOrNull(InputDetails.serializer())?.let { details ->
             parametersOf(
                 details,
                 ActivityNavigator<CloseDetailsNavigation> {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
index 6b9e74d07..794502abe 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/ArchitectureInputActivity.kt
@@ -23,9 +23,8 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContract
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.navigation.parseTypeOfOrNull
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureInputBinding
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureInputViewModel
@@ -43,7 +42,7 @@ class ArchitectureInputActivity : KalugaViewModelActivity<ArchitectureInputViewM
         override fun parseResult(
             resultCode: Int,
             intent: Intent?
-        ): InputDetails? = intent?.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(InputDetails.serializer()))
+        ): InputDetails? = parseTypeOfOrNull(InputDetails.serializer())
     }
 
     override val viewModel: ArchitectureInputViewModel by viewModel {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
index 49ce564ef..e6b99c767 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothMoreActivity.kt
@@ -18,8 +18,7 @@
 package com.splendo.kaluga.example.bluetooth
 
 import android.os.Bundle
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.navigation.parseTypeOf
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.bluetooth.device.SerializableIdentifier
 import com.splendo.kaluga.example.databinding.ActivityBluetoothMoreBinding
@@ -31,7 +30,7 @@ class BluetoothMoreActivity : KalugaViewModelActivity<BluetoothDeviceDetailViewM
 
     override val viewModel: BluetoothDeviceDetailViewModel by viewModel {
         parametersOf(
-            intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(SerializableIdentifier.serializer()))!!.identifier
+            parseTypeOf(SerializableIdentifier.serializer()).identifier
         )
     }
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
index 0738ec653..411fd59f1 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsDemoActivity.kt
@@ -22,8 +22,7 @@ import android.view.View
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.widget.AppCompatButton
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.navigation.parseTypeOfOrNull
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionView
@@ -34,7 +33,7 @@ import org.koin.core.parameter.parametersOf
 class PermissionsDemoActivity : KalugaViewModelActivity<PermissionViewModel>(R.layout.activity_permissions_demo) {
 
     override val viewModel: PermissionViewModel by viewModel {
-        intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))?.let { permissionView ->
+        parseTypeOfOrNull(PermissionView.serializer())?.let { permissionView ->
             parametersOf(permissionView.permission)
         } ?: parametersOf()
     }
@@ -42,7 +41,7 @@ class PermissionsDemoActivity : KalugaViewModelActivity<PermissionViewModel>(R.l
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        supportActionBar?.title = intent.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(PermissionView.serializer()))?.title
+        supportActionBar?.title = parseTypeOfOrNull(PermissionView.serializer())?.title
 
         viewModel.permissionStateMessage.observe {
             findViewById<TextView>(R.id.permissions_message).text = it

From f6fb219a23bc647d4cdbc6db5cbc800e85a784dc Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 11:46:06 +0100
Subject: [PATCH 096/227] API Dump

---
 architecture/api/androidLib/architecture.api | 146 ++++++++++++++++++-
 1 file changed, 145 insertions(+), 1 deletion(-)

diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index 7c5d4f7a1..ec01bf7a6 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -58,10 +58,155 @@ public final class com/splendo/kaluga/architecture/navigation/ActivityNavigator
 	public fun unsubscribe ()V
 }
 
+public final class com/splendo/kaluga/architecture/navigation/ActivityParseExtraKt {
+	public static final fun parseBoolean (Landroid/app/Activity;)Z
+	public static final fun parseBooleanArray (Landroid/app/Activity;)[Z
+	public static final fun parseBooleanArrayOrNull (Landroid/app/Activity;)[Z
+	public static final fun parseBooleanOrNull (Landroid/app/Activity;)Ljava/lang/Boolean;
+	public static final fun parseByte (Landroid/app/Activity;)B
+	public static final fun parseByteArray (Landroid/app/Activity;)[B
+	public static final fun parseByteArrayOrNull (Landroid/app/Activity;)[B
+	public static final fun parseByteOrNull (Landroid/app/Activity;)Ljava/lang/Byte;
+	public static final fun parseChar (Landroid/app/Activity;)C
+	public static final fun parseCharArray (Landroid/app/Activity;)[C
+	public static final fun parseCharArrayOrNull (Landroid/app/Activity;)[C
+	public static final fun parseCharOrNull (Landroid/app/Activity;)Ljava/lang/Character;
+	public static final fun parseCharSequenceOrNull (Landroid/app/Activity;)Ljava/lang/CharSequence;
+	public static final fun parseDate (Landroid/app/Activity;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun parseDateArray (Landroid/app/Activity;)Ljava/util/List;
+	public static final fun parseDateArrayOrNull (Landroid/app/Activity;)Ljava/util/List;
+	public static final fun parseDateOrNull (Landroid/app/Activity;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun parseDouble (Landroid/app/Activity;)D
+	public static final fun parseDoubleArray (Landroid/app/Activity;)[D
+	public static final fun parseDoubleArrayOrNull (Landroid/app/Activity;)[D
+	public static final fun parseDoubleOrNull (Landroid/app/Activity;)Ljava/lang/Double;
+	public static final fun parseExtra (Landroid/app/Activity;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public static final fun parseExtraOrNull (Landroid/app/Activity;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public static final fun parseFloat (Landroid/app/Activity;)F
+	public static final fun parseFloatArray (Landroid/app/Activity;)[F
+	public static final fun parseFloatArrayOrNull (Landroid/app/Activity;)[F
+	public static final fun parseFloatOrNull (Landroid/app/Activity;)Ljava/lang/Float;
+	public static final fun parseInt (Landroid/app/Activity;)I
+	public static final fun parseIntArray (Landroid/app/Activity;)[I
+	public static final fun parseIntArrayOrNull (Landroid/app/Activity;)[I
+	public static final fun parseIntOrNull (Landroid/app/Activity;)Ljava/lang/Integer;
+	public static final fun parseLong (Landroid/app/Activity;)J
+	public static final fun parseLongArray (Landroid/app/Activity;)[J
+	public static final fun parseLongArrayOrNull (Landroid/app/Activity;)[J
+	public static final fun parseLongOrNull (Landroid/app/Activity;)Ljava/lang/Long;
+	public static final fun parseShort (Landroid/app/Activity;)S
+	public static final fun parseShortArray (Landroid/app/Activity;)[S
+	public static final fun parseShortArrayOrNull (Landroid/app/Activity;)[S
+	public static final fun parseShortOrNull (Landroid/app/Activity;)Ljava/lang/Short;
+	public static final fun parseString (Landroid/app/Activity;)Ljava/lang/String;
+	public static final fun parseStringList (Landroid/app/Activity;)Ljava/util/List;
+	public static final fun parseStringListOrNull (Landroid/app/Activity;)Ljava/util/List;
+	public static final fun parseStringOrNull (Landroid/app/Activity;)Ljava/lang/String;
+	public static final fun parseTypeOf (Landroid/app/Activity;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
+	public static final fun parseTypeOfOrNull (Landroid/app/Activity;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
+}
+
 public final class com/splendo/kaluga/architecture/navigation/BundleConversionError : java/lang/Exception {
 	public fun <init> ()V
 }
 
+public final class com/splendo/kaluga/architecture/navigation/BundleToTypedPropertyKt {
+	public static final fun asBoolean (Landroid/os/Bundle;)Z
+	public static final fun asBooleanArray (Landroid/os/Bundle;)[Z
+	public static final fun asBooleanArrayOrNull (Landroid/os/Bundle;)[Z
+	public static final fun asBooleanOrNull (Landroid/os/Bundle;)Ljava/lang/Boolean;
+	public static final fun asByte (Landroid/os/Bundle;)B
+	public static final fun asByteArray (Landroid/os/Bundle;)[B
+	public static final fun asByteArrayOrNull (Landroid/os/Bundle;)[B
+	public static final fun asByteOrNull (Landroid/os/Bundle;)Ljava/lang/Byte;
+	public static final fun asChar (Landroid/os/Bundle;)C
+	public static final fun asCharArray (Landroid/os/Bundle;)[C
+	public static final fun asCharArrayOrNull (Landroid/os/Bundle;)[C
+	public static final fun asCharOrNull (Landroid/os/Bundle;)Ljava/lang/Character;
+	public static final fun asCharSequence (Landroid/os/Bundle;)Ljava/lang/CharSequence;
+	public static final fun asCharSequenceOrNull (Landroid/os/Bundle;)Ljava/lang/CharSequence;
+	public static final fun asDate (Landroid/os/Bundle;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun asDateArray (Landroid/os/Bundle;)Ljava/util/List;
+	public static final fun asDateArrayOrNull (Landroid/os/Bundle;)Ljava/util/List;
+	public static final fun asDateOrNull (Landroid/os/Bundle;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun asDouble (Landroid/os/Bundle;)D
+	public static final fun asDoubleArray (Landroid/os/Bundle;)[D
+	public static final fun asDoubleArrayOrNull (Landroid/os/Bundle;)[D
+	public static final fun asDoubleOrNull (Landroid/os/Bundle;)Ljava/lang/Double;
+	public static final fun asFloat (Landroid/os/Bundle;)F
+	public static final fun asFloatArray (Landroid/os/Bundle;)[F
+	public static final fun asFloatArrayOrNull (Landroid/os/Bundle;)[F
+	public static final fun asFloatOrNull (Landroid/os/Bundle;)Ljava/lang/Float;
+	public static final fun asInt (Landroid/os/Bundle;)I
+	public static final fun asIntArray (Landroid/os/Bundle;)[I
+	public static final fun asIntArrayOrNull (Landroid/os/Bundle;)[I
+	public static final fun asIntOrNull (Landroid/os/Bundle;)Ljava/lang/Integer;
+	public static final fun asLong (Landroid/os/Bundle;)J
+	public static final fun asLongArray (Landroid/os/Bundle;)[J
+	public static final fun asLongArrayOrNull (Landroid/os/Bundle;)[J
+	public static final fun asLongOrNull (Landroid/os/Bundle;)Ljava/lang/Long;
+	public static final fun asShort (Landroid/os/Bundle;)S
+	public static final fun asShortArray (Landroid/os/Bundle;)[S
+	public static final fun asShortArrayOrNull (Landroid/os/Bundle;)[S
+	public static final fun asShortOrNull (Landroid/os/Bundle;)Ljava/lang/Short;
+	public static final fun asString (Landroid/os/Bundle;)Ljava/lang/String;
+	public static final fun asStringList (Landroid/os/Bundle;)Ljava/util/List;
+	public static final fun asStringListOrNull (Landroid/os/Bundle;)Ljava/util/List;
+	public static final fun asStringOrNull (Landroid/os/Bundle;)Ljava/lang/String;
+	public static final fun asTypeOf (Landroid/os/Bundle;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
+	public static final fun asTypeOfOrNull (Landroid/os/Bundle;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
+	public static final fun toTypedProperty (Landroid/os/Bundle;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)Ljava/lang/Object;
+	public static final fun toTypedPropertyOrNull (Landroid/os/Bundle;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)Ljava/lang/Object;
+}
+
+public final class com/splendo/kaluga/architecture/navigation/FragmentParseArgumentsKt {
+	public static final fun parseBoolean (Landroidx/fragment/app/Fragment;)Z
+	public static final fun parseBooleanArray (Landroidx/fragment/app/Fragment;)[Z
+	public static final fun parseBooleanArrayOrNull (Landroidx/fragment/app/Fragment;)[Z
+	public static final fun parseBooleanOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/Boolean;
+	public static final fun parseByte (Landroidx/fragment/app/Fragment;)B
+	public static final fun parseByteArray (Landroidx/fragment/app/Fragment;)[B
+	public static final fun parseByteArrayOrNull (Landroidx/fragment/app/Fragment;)[B
+	public static final fun parseByteOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/Byte;
+	public static final fun parseChar (Landroidx/fragment/app/Fragment;)C
+	public static final fun parseCharArray (Landroidx/fragment/app/Fragment;)[C
+	public static final fun parseCharArrayOrNull (Landroidx/fragment/app/Fragment;)[C
+	public static final fun parseCharOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/Character;
+	public static final fun parseCharSequenceOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/CharSequence;
+	public static final fun parseDate (Landroidx/fragment/app/Fragment;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun parseDateArray (Landroidx/fragment/app/Fragment;)Ljava/util/List;
+	public static final fun parseDateArrayOrNull (Landroidx/fragment/app/Fragment;)Ljava/util/List;
+	public static final fun parseDateOrNull (Landroidx/fragment/app/Fragment;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun parseDouble (Landroidx/fragment/app/Fragment;)D
+	public static final fun parseDoubleArray (Landroidx/fragment/app/Fragment;)[D
+	public static final fun parseDoubleArrayOrNull (Landroidx/fragment/app/Fragment;)[D
+	public static final fun parseDoubleOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/Double;
+	public static final fun parseExtra (Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public static final fun parseExtraOrNull (Landroidx/fragment/app/Fragment;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public static final fun parseFloat (Landroidx/fragment/app/Fragment;)F
+	public static final fun parseFloatArray (Landroidx/fragment/app/Fragment;)[F
+	public static final fun parseFloatArrayOrNull (Landroidx/fragment/app/Fragment;)[F
+	public static final fun parseFloatOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/Float;
+	public static final fun parseInt (Landroidx/fragment/app/Fragment;)I
+	public static final fun parseIntArray (Landroidx/fragment/app/Fragment;)[I
+	public static final fun parseIntArrayOrNull (Landroidx/fragment/app/Fragment;)[I
+	public static final fun parseIntOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/Integer;
+	public static final fun parseLong (Landroidx/fragment/app/Fragment;)J
+	public static final fun parseLongArray (Landroidx/fragment/app/Fragment;)[J
+	public static final fun parseLongArrayOrNull (Landroidx/fragment/app/Fragment;)[J
+	public static final fun parseLongOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/Long;
+	public static final fun parseShort (Landroidx/fragment/app/Fragment;)S
+	public static final fun parseShortArray (Landroidx/fragment/app/Fragment;)[S
+	public static final fun parseShortArrayOrNull (Landroidx/fragment/app/Fragment;)[S
+	public static final fun parseShortOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/Short;
+	public static final fun parseString (Landroidx/fragment/app/Fragment;)Ljava/lang/String;
+	public static final fun parseStringList (Landroidx/fragment/app/Fragment;)Ljava/util/List;
+	public static final fun parseStringListOrNull (Landroidx/fragment/app/Fragment;)Ljava/util/List;
+	public static final fun parseStringOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/String;
+	public static final fun parseTypeOf (Landroidx/fragment/app/Fragment;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
+	public static final fun parseTypeOfOrNull (Landroidx/fragment/app/Fragment;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
+}
+
 public abstract class com/splendo/kaluga/architecture/navigation/IntentFlag {
 	public abstract fun getValue ()I
 }
@@ -254,7 +399,6 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleGe
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleKt {
 	public static final fun toBundle (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)Landroid/os/Bundle;
 	public static final fun toNavigationBundle (Landroid/os/Bundle;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;
-	public static final fun toTypedProperty (Landroid/os/Bundle;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)Ljava/lang/Object;
 }
 
 public class com/splendo/kaluga/architecture/navigation/NavigationBundleSpec {

From 270a0a067933acaa28b7a3177df229dd66ede95b Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 12:22:39 +0100
Subject: [PATCH 097/227] Improved documentation

---
 README.md                                     | 99 ++++++++++---------
 .../api/architecture-compose.api              | 86 ++++++++++++++--
 architecture/api/androidLib/architecture.api  | 91 +++++++++++++----
 resources-databinding/README.md               | 23 +++++
 .../api/resources-databinding.api             | 39 ++++++++
 .../src/androidLibMain/kotlin/Binding.kt      | 27 +++++
 6 files changed, 290 insertions(+), 75 deletions(-)
 create mode 100644 resources-databinding/README.md
 create mode 100644 resources-databinding/api/resources-databinding.api

diff --git a/README.md b/README.md
index 74a16058f..0963eaa24 100644
--- a/README.md
+++ b/README.md
@@ -100,62 +100,65 @@ To use kaluga with SwiftUI and/or Combine we have a [repo with Sourcery template
 
 ### Available Modules
 
-Module | Usage | Artifact Name
---- | --- | --- 
-[alerts](alerts/) | Used for Showing Alert Dialogs | com.splendo.kaluga:alerts
-[architecture](architecture/) | MVVM architecture | com.splendo.kaluga:architecture
-[architecture-compose](architecture-compose/) | Compose extensions for architecture | com.splendo.kaluga:architecture-compose
-[base](base/) | Core components of Kaluga. Contains threading, flowables and localization features | com.splendo.kaluga.base
-[date-time](date-time/) | Contains multiplatform classes to work with date and time | com.splendo.kaluga.date-time
-[date-timepicker](date-time-picker/) | Used for showing a Date or Time Picker | com.splendo.kaluga.date-time-picker
-[hud](hud/) | Used for showing a Loading indicator HUD | com.splendo.kaluga.hud
-[keyboard](keyboard/) | Used for showing and hiding the keyboard | com.splendo.kaluga.keyboard
-[links](links/) | Used for decoding url into an object | com.splendo.kaluga.links
-[location](location/) | Provides the User' geolocation | com.splendo.kaluga.location
-[logging](logging/) | Shared console logging | com.splendo.kaluga.logging
-[base-permissions](base-permissions/) | Managing permissions, used in conjunction with modules below | com.splendo.kaluga:base-permissions
-[bluetooth-permissions](bluetooth-permissions/) | Managing bluetooth permissions | com.splendo.kaluga:bluetooth-permissions
-[calendar-permissions](calendar-permissions/) | Managing calendar permissions | com.splendo.kaluga:calendar-permissions
-[camera-permissions](camera-permissions/) | Managing camera permissions | com.splendo.kaluga:camera-permissions
-[contacts-permissions](contacts-permissions/) | Managing contacts permissions | com.splendo.kaluga:contacts-permissions
-[location-permissions](location-permissions/) | Managing location permissions | com.splendo.kaluga:location-permissions
-[microphone-permissions](microphone-permissions/) | Managing microphone permissions | com.splendo.kaluga:microphone-permissions
-[notifications-permissions](notifications-permissions/) | Managing notifications permissions | com.splendo.kaluga:notifications-permissions
-[storage-permissions](storage-permissions/) | Managing storage permissions | com.splendo.kaluga:storage-permissions
-[resources](resources/) | Provides shared Strings, Images, Colors and Fonts | com.splendo.kaluga.resources
-[review](review/) | Used for requesting the user to review the app | com.splendo.kaluga.review
-[scientific](scientific/) | Scientific units and conversions | com.splendo.kaluga.scientific
-[system](system/) | System APIs such as network, audio, battery | com.splendo.kaluga.system
-[test-utils](test-utils/) | Enables easier testing of Kaluga components | com.splendo.kaluga.test-utils
-[test-utils-base](test-utils-base/) | Enables easier testing of Kaluga components | com.splendo.kaluga.test-utils-base
-[test-utils-alerts](test-utils-alerts/) | Enables easier testing of Alerts module | com.splendo.kaluga.test-utils-alerts
-[test-utils-architecture](test-utils-architecture/) | Enables easier testing of Architecture module | com.splendo.kaluga.test-utils-architecture
-[test-utils-bluetooth](test-utils-bluetooth/) | Enables easier testing of Bluetooth module | com.splendo.kaluga.test-utils-bluetooth
-[test-utils-hud](test-utils-hud/) | Enables easier testing of HUD module | com.splendo.kaluga.test-utils-hud
-[test-utils-keyboard](test-utils-keyboard/) | Enables easier testing of Keyboard module | com.splendo.kaluga.test-utils-keyboard
-[test-utils-koin](test-utils-koin/) | Enables easier testing with Koin | com.splendo.kaluga.test-utils-koin
-[test-utils-location](test-utils-location/) | Enables easier testing of Location module | com.splendo.kaluga.test-utils-location
-[test-utils-permissions](test-utils-permissions/) | Enables easier testing of Permissions modules | com.splendo.kaluga.test-utils-permissions
-[test-utils-resources](test-utils-resources/) | Enables easier testing of Resources module | com.splendo.kaluga.test-utils-resources
-[test-utils-system](test-utils-system/) | Enables easier testing of System module | com.splendo.kaluga.test-utils-system
+| Module                                                  | Usage                                                                              | Artifact Name                                |
+|---------------------------------------------------------|------------------------------------------------------------------------------------|----------------------------------------------|
+| [alerts](alerts/)                                       | Used for Showing Alert Dialogs                                                     | com.splendo.kaluga:alerts                    |
+| [architecture](architecture/)                           | MVVM architecture                                                                  | com.splendo.kaluga:architecture              |
+| [architecture-compose](architecture-compose/)           | Compose extensions for architecture                                                | com.splendo.kaluga:architecture-compose      |
+| [base](base/)                                           | Core components of Kaluga. Contains threading, flowables and localization features | com.splendo.kaluga:base                      |
+| [date-time](date-time/)                                 | Contains multiplatform classes to work with date and time                          | com.splendo.kaluga:date-time                 |
+| [date-timepicker](date-time-picker/)                    | Used for showing a Date or Time Picker                                             | com.splendo.kaluga:date-time-picker          |
+| [hud](hud/)                                             | Used for showing a Loading indicator HUD                                           | com.splendo.kaluga:hud                       |
+| [keyboard](keyboard/)                                   | Used for showing and hiding the keyboard                                           | com.splendo.kaluga:keyboard                  |
+| [keyboard-compose](keyboard-compose/)                   | Compose extensions for keyboard                                                    | com.splendo.kaluga:keyboard-compose          |
+| [links](links/)                                         | Used for decoding url into an object                                               | com.splendo.kaluga:links                     |
+| [location](location/)                                   | Provides the User' geolocation                                                     | com.splendo.kaluga:location                  |
+| [logging](logging/)                                     | Shared console logging                                                             | com.splendo.kaluga:logging                   |
+| [base-permissions](base-permissions/)                   | Managing permissions, used in conjunction with modules below                       | com.splendo.kaluga:base-permissions          |
+| [bluetooth-permissions](bluetooth-permissions/)         | Managing bluetooth permissions                                                     | com.splendo.kaluga:bluetooth-permissions     |
+| [calendar-permissions](calendar-permissions/)           | Managing calendar permissions                                                      | com.splendo.kaluga:calendar-permissions      |
+| [camera-permissions](camera-permissions/)               | Managing camera permissions                                                        | com.splendo.kaluga:camera-permissions        |
+| [contacts-permissions](contacts-permissions/)           | Managing contacts permissions                                                      | com.splendo.kaluga:contacts-permissions      |
+| [location-permissions](location-permissions/)           | Managing location permissions                                                      | com.splendo.kaluga:location-permissions      |
+| [microphone-permissions](microphone-permissions/)       | Managing microphone permissions                                                    | com.splendo.kaluga:microphone-permissions    |
+| [notifications-permissions](notifications-permissions/) | Managing notifications permissions                                                 | com.splendo.kaluga:notifications-permissions |
+| [storage-permissions](storage-permissions/)             | Managing storage permissions                                                       | com.splendo.kaluga:storage-permissions       |
+| [resources](resources/)                                 | Provides shared Strings, Images, Colors and Fonts                                  | com.splendo.kaluga:resources                 |
+| [resources-compose](resources-compose/)                 | Compose extensions for resources                                                   | com.splendo.kaluga:resources-compose         |
+| [resources-databinding](resources-databinding/)         | Databinding extensions for resources                                               | com.splendo.kaluga:resources-databinding     |
+| [review](review/)                                       | Used for requesting the user to review the app                                     | com.splendo.kaluga:review                    |
+| [scientific](scientific/)                               | Scientific units and conversions                                                   | com.splendo.kaluga:scientific                |
+| [system](system/)                                       | System APIs such as network, audio, battery                                        | com.splendo.kaluga:system                    |
+| [test-utils](test-utils/)                               | Enables easier testing of Kaluga components                                        | com.splendo.kaluga:test-utils                |
+| [test-utils-base](test-utils-base/)                     | Enables easier testing of Kaluga components                                        | com.splendo.kaluga:test-utils-base           |
+| [test-utils-alerts](test-utils-alerts/)                 | Enables easier testing of Alerts module                                            | com.splendo.kaluga:test-utils-alerts         |
+| [test-utils-architecture](test-utils-architecture/)     | Enables easier testing of Architecture module                                      | com.splendo.kaluga:test-utils-architecture   |
+| [test-utils-bluetooth](test-utils-bluetooth/)           | Enables easier testing of Bluetooth module                                         | com.splendo.kaluga:test-utils-bluetooth      |
+| [test-utils-hud](test-utils-hud/)                       | Enables easier testing of HUD module                                               | com.splendo.kaluga:test-utils-hud            |
+| [test-utils-keyboard](test-utils-keyboard/)             | Enables easier testing of Keyboard module                                          | com.splendo.kaluga:test-utils-keyboard       |
+| [test-utils-koin](test-utils-koin/)                     | Enables easier testing with Koin                                                   | com.splendo:kaluga.test-utils-koin           |
+| [test-utils-location](test-utils-location/)             | Enables easier testing of Location module                                          | com.splendo.kaluga:test-utils-location       |
+| [test-utils-permissions](test-utils-permissions/)       | Enables easier testing of Permissions modules                                      | com.splendo.kaluga:test-utils-permissions    |
+| [test-utils-resources](test-utils-resources/)           | Enables easier testing of Resources module                                         | com.splendo.kaluga:test-utils-resources      |
+| [test-utils-system](test-utils-system/)                 | Enables easier testing of System module                                            | com.splendo.kaluga:test-utils-system         |
 
 ### Friends of kaluga
 
 Of course not every possible functionality is provided by kaluga. However, this is often because other good multiplatform libraries that work nicely with kaluga already exist. These use similar patterns such as coroutines and `Flow`, and include the following:
 
-Project | Usage
---- | ---
-[kotlin-firebase-sdk](https://github.com/GitLiveApp/firebase-kotlin-sdk) | wraps most of the Firebase SDK APIs
-[multiplatform-settings](https://github.com/russhwolf/multiplatform-settings) | store key/value data 
-[SQLDelight](https://github.com/cashapp/sqldelight) | access SQLite (and other SQL database) 
+| Project                                                                       | Usage                                  |
+|-------------------------------------------------------------------------------|----------------------------------------|
+| [kotlin-firebase-sdk](https://github.com/GitLiveApp/firebase-kotlin-sdk)      | wraps most of the Firebase SDK APIs    |
+| [multiplatform-settings](https://github.com/russhwolf/multiplatform-settings) | store key/value data                   |
+| [SQLDelight](https://github.com/cashapp/sqldelight)                           | access SQLite (and other SQL database) |
 
 Kaluga also uses some multiplatform libraries itself, so our thanks to:
 
-Project | Usage
---- | ---
-[Napier](https://github.com/AAkira/Napier) | powers the logging module
-[stately](https://github.com/touchlab/Stately) | concurrency
-[Koin](https://insert-koin.io/) | dependency injection
+| Project                                        | Usage                     |
+|------------------------------------------------|---------------------------|
+| [Napier](https://github.com/AAkira/Napier)     | powers the logging module |
+| [stately](https://github.com/touchlab/Stately) | concurrency               |
+| [Koin](https://insert-koin.io/)                | dependency injection      |
 
 ## Developing Kaluga
 
diff --git a/architecture-compose/api/architecture-compose.api b/architecture-compose/api/architecture-compose.api
index 1ca05cfeb..9bc306fd5 100644
--- a/architecture-compose/api/architecture-compose.api
+++ b/architecture-compose/api/architecture-compose.api
@@ -40,7 +40,7 @@ public final class com/splendo/kaluga/architecture/compose/navigation/BottomShee
 public final class com/splendo/kaluga/architecture/compose/navigation/BottomSheetSheetContentRouteController : com/splendo/kaluga/architecture/compose/navigation/RouteController {
 	public static final field $stable I
 	public fun <init> (Landroidx/navigation/NavHostController;Landroidx/compose/material/ModalBottomSheetState;Lkotlinx/coroutines/CoroutineScope;)V
-	public fun back ()Z
+	public fun back (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)Z
 	public fun close ()V
 	public fun navigate (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)V
 }
@@ -90,7 +90,7 @@ public final class com/splendo/kaluga/architecture/compose/navigation/NavHostRou
 	public static final field $stable I
 	public fun <init> (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;)V
 	public synthetic fun <init> (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun back ()Z
+	public fun back (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)Z
 	public fun close ()V
 	public fun navigate (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)V
 }
@@ -102,11 +102,21 @@ public final class com/splendo/kaluga/architecture/compose/navigation/Navigation
 
 public abstract class com/splendo/kaluga/architecture/compose/navigation/Route {
 	public static final field $stable I
+	public static final field Companion Lcom/splendo/kaluga/architecture/compose/navigation/Route$Companion;
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/Route$Back : com/splendo/kaluga/architecture/compose/navigation/Route {
 	public static final field $stable I
-	public static final field INSTANCE Lcom/splendo/kaluga/architecture/compose/navigation/Route$Back;
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;
+	public final fun copy (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$Back;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Back;Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$Back;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getResult ()Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/Route$Close : com/splendo/kaluga/architecture/compose/navigation/Route {
@@ -114,6 +124,11 @@ public final class com/splendo/kaluga/architecture/compose/navigation/Route$Clos
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/compose/navigation/Route$Close;
 }
 
+public final class com/splendo/kaluga/architecture/compose/navigation/Route$Companion {
+	public final fun getBack ()Lcom/splendo/kaluga/architecture/compose/navigation/Route$Back;
+	public final fun getPopToRoot ()Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopToRoot;
+}
+
 public final class com/splendo/kaluga/architecture/compose/navigation/Route$FromRoute : com/splendo/kaluga/architecture/compose/navigation/Route$Navigate {
 	public static final field $stable I
 	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;Ljava/lang/String;)V
@@ -126,6 +141,21 @@ public final class com/splendo/kaluga/architecture/compose/navigation/Route$From
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/splendo/kaluga/architecture/compose/navigation/Route$Launcher : com/splendo/kaluga/architecture/compose/navigation/Route {
+	public static final field $stable I
+	public fun <init> (Landroidx/activity/result/ActivityResultLauncher;Ljava/lang/Object;)V
+	public final fun component1 ()Landroidx/activity/result/ActivityResultLauncher;
+	public final fun component2 ()Ljava/lang/Object;
+	public final fun copy (Landroidx/activity/result/ActivityResultLauncher;Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$Launcher;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Launcher;Landroidx/activity/result/ActivityResultLauncher;Ljava/lang/Object;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$Launcher;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getActivityResultLauncher ()Landroidx/activity/result/ActivityResultLauncher;
+	public final fun getInput ()Ljava/lang/Object;
+	public fun hashCode ()I
+	public final fun launch ()V
+	public fun toString ()Ljava/lang/String;
+}
+
 public abstract class com/splendo/kaluga/architecture/compose/navigation/Route$Navigate : com/splendo/kaluga/architecture/compose/navigation/Route {
 	public static final field $stable I
 	public final fun getRoute ()Ljava/lang/String;
@@ -144,10 +174,13 @@ public final class com/splendo/kaluga/architecture/compose/navigation/Route$Next
 
 public final class com/splendo/kaluga/architecture/compose/navigation/Route$PopTo : com/splendo/kaluga/architecture/compose/navigation/Route$Navigate {
 	public static final field $stable I
-	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
-	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopTo;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopTo;Lcom/splendo/kaluga/architecture/navigation/NavigationAction;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopTo;
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component2 ()Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;
+	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopTo;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopTo;Lcom/splendo/kaluga/architecture/navigation/NavigationAction;Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopTo;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getResult ()Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
@@ -164,7 +197,16 @@ public final class com/splendo/kaluga/architecture/compose/navigation/Route$PopT
 
 public final class com/splendo/kaluga/architecture/compose/navigation/Route$PopToRoot : com/splendo/kaluga/architecture/compose/navigation/Route {
 	public static final field $stable I
-	public static final field INSTANCE Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopToRoot;
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;
+	public final fun copy (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopToRoot;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopToRoot;Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopToRoot;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getResult ()Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/Route$Replace : com/splendo/kaluga/architecture/compose/navigation/Route$Navigate {
@@ -177,8 +219,34 @@ public final class com/splendo/kaluga/architecture/compose/navigation/Route$Repl
 	public fun toString ()Ljava/lang/String;
 }
 
+public abstract class com/splendo/kaluga/architecture/compose/navigation/Route$Result {
+	public static final field $stable I
+	public static final field Companion Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result$Companion;
+	public static final field KEY Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/Route$Result$Companion {
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/Route$Result$Data : com/splendo/kaluga/architecture/compose/navigation/Route$Result {
+	public static final field $stable I
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)V
+	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;
+	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result$Data;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result$Data;Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result$Data;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getBundle ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/Route$Result$Empty : com/splendo/kaluga/architecture/compose/navigation/Route$Result {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result$Empty;
+}
+
 public abstract interface class com/splendo/kaluga/architecture/compose/navigation/RouteController {
-	public abstract fun back ()Z
+	public abstract fun back (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)Z
 	public abstract fun close ()V
 	public abstract fun navigate (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)V
 }
@@ -203,6 +271,8 @@ public class com/splendo/kaluga/architecture/compose/navigation/RouteNavigator :
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/RouteNavigatorKt {
+	public static final fun HandleResult (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleResult (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
 	public static final fun SetupNavHost (Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
 	public static final fun SetupNavHost (Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
 	public static final fun SetupNavHost (Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index 7c5d4f7a1..663bc1404 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -20,14 +20,17 @@ public abstract interface class com/splendo/kaluga/architecture/lifecycle/Lifecy
 }
 
 public final class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager {
-	public fun <init> (Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;)V
+	public fun <init> (Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;)V
+	public synthetic fun <init> (Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Landroid/app/Activity;
 	public final fun component2 ()Landroidx/lifecycle/LifecycleOwner;
 	public final fun component3 ()Landroidx/fragment/app/FragmentManager;
-	public final fun copy (Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
+	public final fun component4 ()Landroidx/fragment/app/FragmentManager;
+	public final fun copy (Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getActivity ()Landroid/app/Activity;
+	public final fun getChildFragmentManager ()Landroidx/fragment/app/FragmentManager;
 	public final fun getFragmentManager ()Landroidx/fragment/app/FragmentManager;
 	public final fun getLifecycleOwner ()Landroidx/lifecycle/LifecycleOwner;
 	public fun hashCode ()I
@@ -36,6 +39,7 @@ public final class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribab
 
 public final class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableKt {
 	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;)V
+	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;)V
 	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;Landroidx/appcompat/app/AppCompatActivity;)V
 }
 
@@ -851,25 +855,30 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Cus
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Dialog : com/splendo/kaluga/architecture/navigation/NavigationSpec {
-	public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lkotlin/jvm/functions/Function0;
-	public final fun copy (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Dialog;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Dialog;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Dialog;
+	public final fun component2 ()Lkotlin/jvm/functions/Function1;
+	public final fun component3 ()Lkotlin/jvm/functions/Function0;
+	public final fun copy (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Dialog;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Dialog;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Dialog;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getCreateDialog ()Lkotlin/jvm/functions/Function0;
+	public final fun getGetFragmentManager ()Lkotlin/jvm/functions/Function1;
 	public final fun getTag ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog : com/splendo/kaluga/architecture/navigation/NavigationSpec {
-	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;Ljava/lang/String;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;
+	public final fun component2 ()Lkotlin/jvm/functions/Function1;
+	public final fun copy (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getGetFragmentManager ()Lkotlin/jvm/functions/Function1;
 	public final fun getTag ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -952,21 +961,23 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Fil
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment : com/splendo/kaluga/architecture/navigation/NavigationSpec {
-	public fun <init> (ILcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$Type;Ljava/lang/String;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$BackStackSettings;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$AnimationSettings;Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (ILcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$Type;Ljava/lang/String;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$BackStackSettings;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$AnimationSettings;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (ILcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$Type;Ljava/lang/String;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$BackStackSettings;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$AnimationSettings;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$Type;Ljava/lang/String;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$BackStackSettings;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$AnimationSettings;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()I
 	public final fun component2 ()Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$Type;
 	public final fun component3 ()Ljava/lang/String;
 	public final fun component4 ()Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$BackStackSettings;
 	public final fun component5 ()Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$AnimationSettings;
-	public final fun component6 ()Lkotlin/jvm/functions/Function0;
-	public final fun copy (ILcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$Type;Ljava/lang/String;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$BackStackSettings;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$AnimationSettings;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment;ILcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$Type;Ljava/lang/String;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$BackStackSettings;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$AnimationSettings;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment;
+	public final fun component6 ()Lkotlin/jvm/functions/Function1;
+	public final fun component7 ()Lkotlin/jvm/functions/Function0;
+	public final fun copy (ILcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$Type;Ljava/lang/String;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$BackStackSettings;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$AnimationSettings;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment;ILcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$Type;Ljava/lang/String;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$BackStackSettings;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$AnimationSettings;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAnimationSettings ()Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$AnimationSettings;
 	public final fun getBackStackSettings ()Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$BackStackSettings;
 	public final fun getContainerId ()I
 	public final fun getCreateFragment ()Lkotlin/jvm/functions/Function0;
+	public final fun getGetFragmentManager ()Lkotlin/jvm/functions/Function1;
 	public final fun getTag ()Ljava/lang/String;
 	public final fun getType ()Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Fragment$Type;
 	public fun hashCode ()I
@@ -1047,12 +1058,48 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Pho
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Phone$Type$Dial;
 }
 
+public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment : com/splendo/kaluga/architecture/navigation/NavigationSpec {
+	public fun <init> ()V
+	public fun <init> (ZLkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (ZLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Z
+	public final fun component2 ()Lkotlin/jvm/functions/Function1;
+	public final fun copy (ZLkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getGetFragmentManager ()Lkotlin/jvm/functions/Function1;
+	public final fun getImmediate ()Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo : com/splendo/kaluga/architecture/navigation/NavigationSpec {
+	public fun <init> (Ljava/lang/String;ZZLkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Ljava/lang/String;ZZLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Z
+	public final fun component3 ()Z
+	public final fun component4 ()Lkotlin/jvm/functions/Function1;
+	public final fun copy (Ljava/lang/String;ZZLkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo;Ljava/lang/String;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getGetFragmentManager ()Lkotlin/jvm/functions/Function1;
+	public final fun getImmediate ()Z
+	public final fun getInclusive ()Z
+	public final fun getName ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment : com/splendo/kaluga/architecture/navigation/NavigationSpec {
-	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;Ljava/lang/String;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;
+	public final fun component2 ()Lkotlin/jvm/functions/Function1;
+	public final fun copy (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getGetFragmentManager ()Lkotlin/jvm/functions/Function1;
 	public final fun getTag ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -1755,6 +1802,12 @@ public abstract class com/splendo/kaluga/architecture/viewmodel/KalugaViewModelA
 	protected fun onCreate (Landroid/os/Bundle;)V
 }
 
+public abstract class com/splendo/kaluga/architecture/viewmodel/KalugaViewModelBottomSheetDialogFragment : com/google/android/material/bottomsheet/BottomSheetDialogFragment {
+	public fun <init> ()V
+	public abstract fun getViewModel ()Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;
+	public fun onViewCreated (Landroid/view/View;Landroid/os/Bundle;)V
+}
+
 public abstract class com/splendo/kaluga/architecture/viewmodel/KalugaViewModelDialogFragment : androidx/fragment/app/DialogFragment {
 	public fun <init> ()V
 	public abstract fun getViewModel ()Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;
diff --git a/resources-databinding/README.md b/resources-databinding/README.md
new file mode 100644
index 000000000..bf0bbc56e
--- /dev/null
+++ b/resources-databinding/README.md
@@ -0,0 +1,23 @@
+# Resources-compose
+[Android Data Binding](https://developer.android.com/topic/libraries/data-binding) extensions for [Resources](../resources)
+
+This module requires the Android project using it declaring the [Kapt plugin](https://kotlinlang.org/docs/kapt.html).
+
+## KalugaLabel ad TextStyle
+Use `app:kalugaLabel` to bind a `KalugaLabel` to a `TextView`.
+
+`TextStyle` can be applied using `app:textStyle` as well. To support autosize text, use
+
+```
+app:autoTextStyle=textStyle
+app:autoTextMinScalingFactor=scalingFactor
+```
+
+## BackgroundStyle
+Use `app:backgroundStyle` to bind a `BackgroundStyle` to a `View`
+
+## KalugaButton
+Use `app:kalugaButton` to bind a `KalugaButton` to a `Button`
+
+## Image
+Use `app:image` to bind an `Image` to an `ImageView` 
diff --git a/resources-databinding/api/resources-databinding.api b/resources-databinding/api/resources-databinding.api
new file mode 100644
index 000000000..42cd3470c
--- /dev/null
+++ b/resources-databinding/api/resources-databinding.api
@@ -0,0 +1,39 @@
+public abstract interface class androidx/databinding/DataBindingComponent {
+}
+
+public class androidx/databinding/library/baseAdapters/BR {
+	public static field _all I
+	public fun <init> ()V
+}
+
+public class com/splendo/kaluga/resources/databinding/BR {
+	public static field _all I
+	public fun <init> ()V
+}
+
+public final class com/splendo/kaluga/resources/databinding/Binding {
+	public static final field INSTANCE Lcom/splendo/kaluga/resources/databinding/Binding;
+	public static final fun bindAutoTextStyle (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/stylable/TextStyle;F)V
+	public static final fun bindBackground (Landroid/view/View;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;)V
+	public static final fun bindImage (Landroid/widget/ImageView;Lcom/splendo/kaluga/resources/Image;)V
+	public static final fun bindKalugaButton (Landroid/widget/Button;Lcom/splendo/kaluga/resources/view/KalugaButton;)V
+	public static final fun bindKalugaLabel (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/view/KalugaLabel;)V
+	public static final fun bindPrefixTextStyle (Lcom/google/android/material/textfield/TextInputLayout;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
+	public static final fun bindSuffixTextStyle (Lcom/google/android/material/textfield/TextInputLayout;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
+	public static final fun bindTextInputLayoutTextStyle (Lcom/google/android/material/textfield/TextInputLayout;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
+	public static final fun bindTextStyle (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
+}
+
+public class com/splendo/kaluga/resources/databinding/DataBinderMapperImpl : androidx/databinding/DataBinderMapper {
+	public fun <init> ()V
+	public fun collectDependencies ()Ljava/util/List;
+	public fun convertBrIdToString (I)Ljava/lang/String;
+	public fun getDataBinder (Landroidx/databinding/DataBindingComponent;Landroid/view/View;I)Landroidx/databinding/ViewDataBinding;
+	public fun getDataBinder (Landroidx/databinding/DataBindingComponent;[Landroid/view/View;I)Landroidx/databinding/ViewDataBinding;
+	public fun getLayoutId (Ljava/lang/String;)I
+}
+
+public class com/splendo/kaluga/resources/databinding/DataBindingTriggerClass {
+	public fun <init> ()V
+}
+
diff --git a/resources-databinding/src/androidLibMain/kotlin/Binding.kt b/resources-databinding/src/androidLibMain/kotlin/Binding.kt
index 25e9163ad..24f2615e0 100644
--- a/resources-databinding/src/androidLibMain/kotlin/Binding.kt
+++ b/resources-databinding/src/androidLibMain/kotlin/Binding.kt
@@ -41,18 +41,27 @@ import kotlin.math.max
 
 object Binding {
 
+    /**
+     * Binds a [BackgroundStyle] to a [View].
+     */
     @BindingAdapter("backgroundStyle")
     @JvmStatic
     fun bindBackground(view: View, backgroundStyle: BackgroundStyle) {
         view.applyBackgroundStyle(backgroundStyle)
     }
 
+    /**
+     * Binds an [Image] to an [ImageView].
+     */
     @BindingAdapter("image")
     @JvmStatic
     fun bindImage(view: ImageView, image: Image?) {
         view.setImageDrawable(image?.drawable)
     }
 
+    /**
+     * Binds a [KalugaButton] to a [Button].
+     */
     @BindingAdapter("kalugaButton")
     @JvmStatic
     fun bindKalugaButton(button: Button, kalugaButton: KalugaButton?) {
@@ -61,6 +70,9 @@ object Binding {
         }
     }
 
+    /**
+     * Binds a [KalugaLabel] to a [TextView]
+     */
     @BindingAdapter("kalugaLabel")
     @JvmStatic
     fun bindKalugaLabel(view: TextView, kalugaLabel: KalugaLabel?) {
@@ -69,6 +81,9 @@ object Binding {
         }
     }
 
+    /**
+     * Binds a [TextStyle] to a [TextView].
+     */
     @BindingAdapter("textStyle")
     @JvmStatic
     fun bindTextStyle(textView: TextView, textStyle: TextStyle?) {
@@ -77,6 +92,9 @@ object Binding {
         }
     }
 
+    /**
+     * Binds a [TextStyle] to a  [TextView] using [TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration]
+     */
     @BindingAdapter("autoTextStyle", "autoTextMinScalingFactor")
     @JvmStatic
     fun bindAutoTextStyle(textView: TextView, autoTextStyle: TextStyle?, autoTextMinScalingFactor: Float) {
@@ -87,18 +105,27 @@ object Binding {
         }
     }
 
+    /**
+     * Binds a [TextStyle] to the [TextInputLayout.getEditText] of a [TextInputLayout]
+     */
     @BindingAdapter("textStyle")
     @JvmStatic
     fun bindTextInputLayoutTextStyle(textView: TextInputLayout, textStyle: TextStyle) {
         textView.editText?.applyTextStyle(textStyle)
     }
 
+    /**
+     * Binds a [TextStyle] to the [TextInputLayout.getPrefixTextView] of a [TextInputLayout]
+     */
     @BindingAdapter("prefixTextStyle")
     @JvmStatic
     fun bindPrefixTextStyle(textView: TextInputLayout, textStyle: TextStyle) {
         textView.prefixTextView.applyTextStyle(textStyle)
     }
 
+    /**
+     * Binds a [TextStyle] to the [TextInputLayout.getSuffixTextView] of a [TextInputLayout]
+     */
     @BindingAdapter("suffixTextStyle")
     @JvmStatic
     fun bindSuffixTextStyle(textView: TextInputLayout, textStyle: TextStyle) {

From 42ceb7be04e9a6b949123888c6df707ed5c87e9d Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 12:27:56 +0100
Subject: [PATCH 098/227] Fixed missing copyright

---
 .../kaluga/example/alerts/AlertsActivity.kt     | 17 +++++++++++++++++
 .../example/alerts/xml/XMLAlertsActivity.kt     | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
index c588684e4..93f6aa5b0 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/AlertsActivity.kt
@@ -1,3 +1,20 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
 package com.splendo.kaluga.example.alerts
 
 import com.splendo.kaluga.example.alerts.compose.ComposeAlertsActivity
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt
index b5d877ed5..f13775600 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/xml/XMLAlertsActivity.kt
@@ -1,3 +1,20 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
 package com.splendo.kaluga.example.alerts.xml
 
 import android.annotation.SuppressLint

From 6949f46af204da854b2c1bdc6da4758aa5561b44 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 12:39:16 +0100
Subject: [PATCH 099/227] API dump

---
 .../api/architecture-compose.api              | 360 +++++++++++++++---
 architecture/api/androidLib/architecture.api  |  18 +
 keyboard-compose/api/keyboard-compose.api     |  24 +-
 keyboard/api/androidLib/keyboard.api          |  44 +--
 .../api/androidLib/test-utils-keyboard.api    |  15 +-
 .../api/jvm/test-utils-keyboard.api           |  12 +-
 6 files changed, 360 insertions(+), 113 deletions(-)

diff --git a/architecture-compose/api/architecture-compose.api b/architecture-compose/api/architecture-compose.api
index 9bc306fd5..0d71a9151 100644
--- a/architecture-compose/api/architecture-compose.api
+++ b/architecture-compose/api/architecture-compose.api
@@ -1,9 +1,73 @@
+public final class com/splendo/kaluga/architecture/compose/ContextExtensionsKt {
+	public static final fun getActivity (Landroid/content/Context;)Landroidx/appcompat/app/AppCompatActivity;
+}
+
 public final class com/splendo/kaluga/architecture/compose/ObservablesKt {
 	public static final fun mutableState (Lcom/splendo/kaluga/architecture/observable/WithMutableState;Landroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/MutableState;
 	public static final fun state (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State;
 }
 
-public abstract class com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute {
+public abstract interface class com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+	public abstract fun getModifier ()Lkotlin/jvm/functions/Function4;
+}
+
+public abstract class com/splendo/kaluga/architecture/compose/navigation/BottomSheetComposableNavSpec {
+	public static final field $stable I
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/BottomSheetContentNavHostComposableNavigator : com/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostComposableNavigator {
+	public static final field $stable I
+	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lkotlin/jvm/functions/Function3;)V
+	public synthetic fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/BottomSheetContentRouteController : com/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController {
+	public static final field $stable I
+	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;)V
+	public synthetic fun <init> (Lkotlinx/coroutines/flow/StateFlow;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun provide (Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState;)Landroidx/navigation/NavHostController;
+	public synthetic fun provide (Ljava/lang/Object;)Landroidx/navigation/NavHostController;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/BottomSheetLaunchedNavigation : com/splendo/kaluga/architecture/compose/navigation/BottomSheetComposableNavSpec {
+	public static final field $stable I
+	public fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation;)V
+	public final fun component1 ()Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation;
+	public final fun copy (Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation;)Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetLaunchedNavigation;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetLaunchedNavigation;Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetLaunchedNavigation;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getLaunchedNavigation ()Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator : com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable, com/splendo/kaluga/architecture/navigation/Navigator {
+	public static final field $stable I
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	protected final fun SetupNavigationAction (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/compose/runtime/Composer;I)V
+	protected abstract fun getContentModifier ()Lkotlin/jvm/functions/Function4;
+	public final fun getModifier ()Lkotlin/jvm/functions/Function4;
+	public abstract fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;
+	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState {
+	public static final field $stable I
+	public fun <init> (Landroidx/navigation/NavHostController;Landroidx/navigation/NavHostController;Landroidx/compose/material/ModalBottomSheetState;)V
+	public final fun component1 ()Landroidx/navigation/NavHostController;
+	public final fun component2 ()Landroidx/navigation/NavHostController;
+	public final fun component3 ()Landroidx/compose/material/ModalBottomSheetState;
+	public final fun copy (Landroidx/navigation/NavHostController;Landroidx/navigation/NavHostController;Landroidx/compose/material/ModalBottomSheetState;)Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState;Landroidx/navigation/NavHostController;Landroidx/navigation/NavHostController;Landroidx/compose/material/ModalBottomSheetState;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getContentNavHostController ()Landroidx/navigation/NavHostController;
+	public final fun getSheetContentNavHostController ()Landroidx/navigation/NavHostController;
+	public final fun getSheetState ()Landroidx/compose/material/ModalBottomSheetState;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute : com/splendo/kaluga/architecture/compose/navigation/BottomSheetComposableNavSpec {
 	public static final field $stable I
 }
 
@@ -37,48 +101,157 @@ public final class com/splendo/kaluga/architecture/compose/navigation/BottomShee
 	public final fun navigate (Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute;)V
 }
 
+public final class com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteKt {
+	public static final fun getBottomSheetComposable (Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation;)Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetLaunchedNavigation;
+	public static final fun getBottomSheetContent (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute$Content;
+	public static final fun getBottomSheetSheetContent (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute$SheetContent;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/BottomSheetSheetContentNavHostComposableNavigator : com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator {
+	public static final field $stable I
+	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Lkotlin/jvm/functions/Function3;)V
+	public synthetic fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getContentModifier ()Lkotlin/jvm/functions/Function4;
+	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetSheetContentRouteController;
+	public synthetic fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
+}
+
 public final class com/splendo/kaluga/architecture/compose/navigation/BottomSheetSheetContentRouteController : com/splendo/kaluga/architecture/compose/navigation/RouteController {
 	public static final field $stable I
-	public fun <init> (Landroidx/navigation/NavHostController;Landroidx/compose/material/ModalBottomSheetState;Lkotlinx/coroutines/CoroutineScope;)V
+	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;Lkotlinx/coroutines/flow/StateFlow;)V
+	public fun AddResultHandlers (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Ljava/util/List;Landroidx/compose/runtime/Composer;I)V
 	public fun back (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)Z
 	public fun close ()V
 	public fun navigate (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)V
 }
 
-public final class com/splendo/kaluga/architecture/compose/navigation/CombinedNavigator : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable, com/splendo/kaluga/architecture/navigation/Navigator {
+public final class com/splendo/kaluga/architecture/compose/navigation/BottomSheetSheetContentRouteController$NavHostRouteController : com/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController {
+	public fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetSheetContentRouteController;)V
+	public fun provide (Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState;)Landroidx/navigation/NavHostController;
+	public synthetic fun provide (Ljava/lang/Object;)Landroidx/navigation/NavHostController;
+}
+
+public abstract class com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec {
+	public static final field $stable I
+	public static final field Companion Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Companion;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$CloseActivity : com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation {
+	public static final field $stable I
+	public fun <init> ()V
+	public fun <init> (Lkotlin/Pair;)V
+	public synthetic fun <init> (Lkotlin/Pair;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lkotlin/Pair;
+	public final fun copy (Lkotlin/Pair;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$CloseActivity;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$CloseActivity;Lkotlin/Pair;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$CloseActivity;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getResult ()Lkotlin/Pair;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Companion {
+	public final fun Browser (Ljava/net/URL;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Browser$Type;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$IntentLauncher;
+	public static synthetic fun Browser$default (Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Companion;Ljava/net/URL;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Browser$Type;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$IntentLauncher;
+	public final fun Messenger (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$TextMessenger$TextMessengerSettings;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$IntentLauncher;
+	public final fun Phone (Ljava/lang/String;Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Phone$Type;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$IntentLauncher;
+	public final fun SendEmail (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Email$EmailSettings;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$IntentLauncher;
+	public final fun Settings (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$IntentLauncher;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Dialog : com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation {
+	public static final field $stable I
+	public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Lkotlin/jvm/functions/Function0;
+	public final fun copy (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Dialog;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Dialog;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Dialog;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getCreateDialog ()Lkotlin/jvm/functions/Function0;
+	public final fun getTag ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$IntentLauncher : com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation {
+	public static final field $stable I
+	public fun <init> (Lkotlin/jvm/functions/Function3;)V
+	public final fun component1 ()Lkotlin/jvm/functions/Function3;
+	public final fun copy (Lkotlin/jvm/functions/Function3;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$IntentLauncher;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$IntentLauncher;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$IntentLauncher;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getCreateIntent ()Lkotlin/jvm/functions/Function3;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation : com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec {
+	public static final field $stable I
+	public final fun Launch (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)V
+	protected abstract fun createLauncher (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)Lkotlin/jvm/functions/Function0;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Launcher : com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$LaunchedNavigation {
 	public static final field $stable I
-	public fun <init> (Lkotlin/jvm/functions/Function2;)V
-	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
+	public fun <init> (Lkotlin/reflect/KClass;Landroidx/activity/result/contract/ActivityResultContract;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)V
+	public final fun component1 ()Lkotlin/reflect/KClass;
+	public final fun component2 ()Landroidx/activity/result/contract/ActivityResultContract;
+	public final fun component3 ()Lkotlin/jvm/functions/Function2;
+	public final fun component4 ()Lkotlin/jvm/functions/Function2;
+	public final fun copy (Lkotlin/reflect/KClass;Landroidx/activity/result/contract/ActivityResultContract;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Launcher;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Launcher;Lkotlin/reflect/KClass;Landroidx/activity/result/contract/ActivityResultContract;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$Launcher;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getActivityResultContract ()Landroidx/activity/result/contract/ActivityResultContract;
+	public final fun getGetInput ()Lkotlin/jvm/functions/Function2;
+	public final fun getOnResult ()Lkotlin/jvm/functions/Function2;
+	public final fun getViewModelClass ()Lkotlin/reflect/KClass;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpecKt {
+	public static final fun CloseActivity (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;Ljava/lang/Integer;)Lcom/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec$CloseActivity;
+}
+
+public abstract class com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator : com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable, com/splendo/kaluga/architecture/navigation/Navigator {
+	public static final field $stable I
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	protected final fun SetupNavigationAction (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/compose/runtime/Composer;I)V
+	public abstract fun getContentModifier ()Lkotlin/jvm/functions/Function4;
+	public final fun getModifier ()Lkotlin/jvm/functions/Function4;
+	public abstract fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
 	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
-	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
-	public final fun toActivityNavigator (Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/ActivityNavigator;
-	public fun unsubscribe ()V
 }
 
-public final class com/splendo/kaluga/architecture/compose/navigation/CombinedNavigatorKt {
-	public static final fun rememberCombinedNavigator (Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)Lcom/splendo/kaluga/architecture/navigation/Navigator;
+public final class com/splendo/kaluga/architecture/compose/navigation/ComposableSingletons$ComposableNavigatorKt {
+	public static final field INSTANCE Lcom/splendo/kaluga/architecture/compose/navigation/ComposableSingletons$ComposableNavigatorKt;
+	public static field lambda-1 Lkotlin/jvm/functions/Function4;
+	public fun <init> ()V
+	public final fun getLambda-1$architecture_compose_release ()Lkotlin/jvm/functions/Function4;
 }
 
-public final class com/splendo/kaluga/architecture/compose/navigation/ComposableSingletons$RouteNavigatorKt {
-	public static final field INSTANCE Lcom/splendo/kaluga/architecture/compose/navigation/ComposableSingletons$RouteNavigatorKt;
-	public static field lambda-1 Lkotlin/jvm/functions/Function3;
+public final class com/splendo/kaluga/architecture/compose/navigation/ComposableSingletons$SetupNavHostKt {
+	public static final field INSTANCE Lcom/splendo/kaluga/architecture/compose/navigation/ComposableSingletons$SetupNavHostKt;
+	public static field lambda-1 Lkotlin/jvm/functions/Function2;
+	public static field lambda-2 Lkotlin/jvm/functions/Function2;
 	public fun <init> ()V
-	public final fun getLambda-1$architecture_compose_release ()Lkotlin/jvm/functions/Function3;
+	public final fun getLambda-1$architecture_compose_release ()Lkotlin/jvm/functions/Function2;
+	public final fun getLambda-2$architecture_compose_release ()Lkotlin/jvm/functions/Function2;
 }
 
-public final class com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator : com/splendo/kaluga/architecture/navigation/Navigator {
+public final class com/splendo/kaluga/architecture/compose/navigation/LaunchedComposableNavigator : com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator {
 	public static final field $stable I
-	public fun <init> (Landroidx/navigation/NavHostController;Landroidx/navigation/NavHostController;Landroidx/compose/material/ModalBottomSheetState;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;)V
-	public fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;Lkotlin/jvm/functions/Function1;)V
-	public fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetSheetContentRouteController;Lkotlin/jvm/functions/Function1;)V
-	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
+	public fun <init> (Lkotlin/jvm/functions/Function3;)V
+	public fun getContentModifier ()Lkotlin/jvm/functions/Function4;
+	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
 }
 
-public final class com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigatorKt {
-	public static final fun NavigatingModalBottomSheetLayout (Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;I)V
-	public static final fun NavigatingModalBottomSheetLayout (Lcom/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;I)V
-	public static final fun getBottomSheetContent (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute$Content;
-	public static final fun getBottomSheetSheetContent (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute$SheetContent;
+public final class com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator : com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator {
+	public static final field $stable I
+	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Ljava/util/List;Lkotlin/jvm/functions/Function3;)V
+	public synthetic fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Ljava/util/List;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilderKt {
@@ -86,13 +259,18 @@ public final class com/splendo/kaluga/architecture/compose/navigation/NavGraphBu
 	public static final fun composable (Landroidx/navigation/NavGraphBuilder;Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;Lkotlin/jvm/functions/Function3;)V
 }
 
-public final class com/splendo/kaluga/architecture/compose/navigation/NavHostRouteController : com/splendo/kaluga/architecture/compose/navigation/RouteController {
+public final class com/splendo/kaluga/architecture/compose/navigation/NavHostComposableNavigator : com/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostComposableNavigator {
 	public static final field $stable I
-	public fun <init> (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;)V
-	public synthetic fun <init> (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun back (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)Z
-	public fun close ()V
-	public fun navigate (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)V
+	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lkotlin/jvm/functions/Function3;)V
+	public synthetic fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/NavHostRouteController : com/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController {
+	public static final field $stable I
+	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;)V
+	public synthetic fun <init> (Lkotlinx/coroutines/flow/StateFlow;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun provide (Landroidx/navigation/NavHostController;)Landroidx/navigation/NavHostController;
+	public synthetic fun provide (Ljava/lang/Object;)Landroidx/navigation/NavHostController;
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/NavigationExtensionsKt {
@@ -100,7 +278,42 @@ public final class com/splendo/kaluga/architecture/compose/navigation/Navigation
 	public static final fun bind (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;Landroidx/compose/runtime/Composer;I)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;
 }
 
-public abstract class com/splendo/kaluga/architecture/compose/navigation/Route {
+public abstract class com/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostComposableNavigator : com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator {
+	public static final field $stable I
+	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController;Ljava/util/List;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController;Ljava/util/List;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getContentModifier ()Lkotlin/jvm/functions/Function4;
+	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController;
+	public synthetic fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
+}
+
+public abstract class com/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController : com/splendo/kaluga/architecture/compose/navigation/RouteController {
+	public static final field $stable I
+	public synthetic fun <init> (Lkotlinx/coroutines/flow/StateFlow;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lkotlinx/coroutines/flow/StateFlow;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun AddResultHandlers (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Ljava/util/List;Landroidx/compose/runtime/Composer;I)V
+	public fun back (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)Z
+	public fun close ()V
+	public fun navigate (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)V
+	public abstract fun provide (Ljava/lang/Object;)Landroidx/navigation/NavHostController;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/RootModalBottomSheetNavigator : com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator {
+	public static final field $stable I
+	public fun <init> (Lkotlin/jvm/functions/Function3;Landroidx/compose/material/ModalBottomSheetValue;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Landroidx/compose/material/ModalBottomSheetValue;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/RootNavHostComposableNavigator : com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator {
+	public static final field $stable I
+	public fun <init> (Lkotlin/jvm/functions/Function3;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Ljava/util/List;Lkotlin/jvm/functions/Function2;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getContentModifier ()Lkotlin/jvm/functions/Function4;
+	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
+}
+
+public abstract class com/splendo/kaluga/architecture/compose/navigation/Route : com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec {
 	public static final field $stable I
 	public static final field Companion Lcom/splendo/kaluga/architecture/compose/navigation/Route$Companion;
 }
@@ -141,21 +354,6 @@ public final class com/splendo/kaluga/architecture/compose/navigation/Route$From
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/compose/navigation/Route$Launcher : com/splendo/kaluga/architecture/compose/navigation/Route {
-	public static final field $stable I
-	public fun <init> (Landroidx/activity/result/ActivityResultLauncher;Ljava/lang/Object;)V
-	public final fun component1 ()Landroidx/activity/result/ActivityResultLauncher;
-	public final fun component2 ()Ljava/lang/Object;
-	public final fun copy (Landroidx/activity/result/ActivityResultLauncher;Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$Launcher;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Launcher;Landroidx/activity/result/ActivityResultLauncher;Ljava/lang/Object;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$Launcher;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getActivityResultLauncher ()Landroidx/activity/result/ActivityResultLauncher;
-	public final fun getInput ()Ljava/lang/Object;
-	public fun hashCode ()I
-	public final fun launch ()V
-	public fun toString ()Ljava/lang/String;
-}
-
 public abstract class com/splendo/kaluga/architecture/compose/navigation/Route$Navigate : com/splendo/kaluga/architecture/compose/navigation/Route {
 	public static final field $stable I
 	public final fun getRoute ()Ljava/lang/String;
@@ -246,6 +444,7 @@ public final class com/splendo/kaluga/architecture/compose/navigation/Route$Resu
 }
 
 public abstract interface class com/splendo/kaluga/architecture/compose/navigation/RouteController {
+	public abstract fun AddResultHandlers (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Ljava/util/List;Landroidx/compose/runtime/Composer;I)V
 	public abstract fun back (Lcom/splendo/kaluga/architecture/compose/navigation/Route$Result;)Z
 	public abstract fun close ()V
 	public abstract fun navigate (Lcom/splendo/kaluga/architecture/compose/navigation/Route;)V
@@ -254,6 +453,7 @@ public abstract interface class com/splendo/kaluga/architecture/compose/navigati
 public final class com/splendo/kaluga/architecture/compose/navigation/RouteKt {
 	public static final fun from (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;Ljava/lang/String;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$FromRoute;
 	public static final fun getArgumentKey (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecRow;)Ljava/lang/String;
+	public static final fun getBack (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$Back;
 	public static final fun getFromRoot (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$FromRoute;
 	public static final fun getNext (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$NextRoute;
 	public static final fun getPopTo (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)Lcom/splendo/kaluga/architecture/compose/navigation/Route$PopTo;
@@ -263,28 +463,67 @@ public final class com/splendo/kaluga/architecture/compose/navigation/RouteKt {
 	public static final fun route (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;)Ljava/lang/String;
 }
 
-public class com/splendo/kaluga/architecture/compose/navigation/RouteNavigator : com/splendo/kaluga/architecture/navigation/Navigator {
+public final class com/splendo/kaluga/architecture/compose/navigation/SetupNavHostKt {
+	public static final fun SetupNavHost (Landroidx/navigation/NavHostController;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;I)V
+	public static final fun SetupNavHost (Lkotlinx/coroutines/flow/StateFlow;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
+	public static final fun SetupNavHost (Lkotlinx/coroutines/flow/StateFlow;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/result/HandleResultKt {
+	public static final fun HandleResult (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleResult (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+}
+
+public abstract class com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler {
 	public static final field $stable I
-	public fun <init> (Landroidx/navigation/NavHostController;Lkotlin/jvm/functions/Function1;)V
-	public fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lkotlin/jvm/functions/Function1;)V
-	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
+	public abstract fun getOnResult ()Lkotlin/jvm/functions/Function2;
+	public abstract fun getRetain ()Z
+	public abstract fun getViewModelClass ()Lkotlin/reflect/KClass;
 }
 
-public final class com/splendo/kaluga/architecture/compose/navigation/RouteNavigatorKt {
-	public static final fun HandleResult (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
-	public static final fun HandleResult (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
-	public static final fun SetupNavHost (Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public static final fun SetupNavHost (Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public static final fun SetupNavHost (Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public static final fun SetupNavHost (Lcom/splendo/kaluga/architecture/compose/navigation/RouteNavigator;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public static final fun SetupNavHost (Lcom/splendo/kaluga/architecture/compose/navigation/RouteNavigator;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
-	public static final fun SetupNavHost (Lcom/splendo/kaluga/architecture/compose/navigation/RouteNavigator;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
+public final class com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Bundle : com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler {
+	public static final field $stable I
+	public fun <init> (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function2;)V
+	public synthetic fun <init> (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lkotlin/reflect/KClass;
+	public final fun component2 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;
+	public final fun component3 ()Z
+	public final fun component4 ()Lkotlin/jvm/functions/Function2;
+	public final fun copy (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Bundle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Bundle;Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Bundle;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getOnResult ()Lkotlin/jvm/functions/Function2;
+	public fun getRetain ()Z
+	public final fun getSpec ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;
+	public fun getViewModelClass ()Lkotlin/reflect/KClass;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Type : com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler {
+	public static final field $stable I
+	public fun <init> (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function2;)V
+	public final fun component1 ()Lkotlin/reflect/KClass;
+	public final fun component2 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;
+	public final fun component3 ()Z
+	public final fun component4 ()Lkotlin/jvm/functions/Function2;
+	public final fun copy (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Type;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Type;Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Type;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getOnResult ()Lkotlin/jvm/functions/Function2;
+	public fun getRetain ()Z
+	public final fun getSpec ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;
+	public fun getViewModelClass ()Lkotlin/reflect/KClass;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity : com/splendo/kaluga/architecture/viewmodel/KalugaViewModelActivity {
+public abstract class com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity : androidx/appcompat/app/AppCompatActivity {
 	public static final field $stable I
 	public fun <init> ()V
 	protected abstract fun Layout (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/compose/runtime/Composer;I)V
+	protected fun RootView (Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
+	protected abstract fun createViewModel (Landroidx/compose/runtime/Composer;I)Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;
 	protected fun onCreate (Landroid/os/Bundle;)V
 }
 
@@ -293,6 +532,7 @@ public final class com/splendo/kaluga/architecture/compose/viewModel/KalugaViewM
 }
 
 public final class com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposableKt {
+	public static final fun FragmentViewModelComposable (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/fragment/app/FragmentManager;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
 	public static final fun ViewModelComposable (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
 	public static final fun store (Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;
 	public static final fun storeAndRemember (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;
diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index 663bc1404..88eb381a6 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -913,6 +913,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Ema
 	public final fun getBcc ()Ljava/util/List;
 	public final fun getBody ()Ljava/lang/String;
 	public final fun getCc ()Ljava/util/List;
+	public final fun getIntent ()Landroid/content/Intent;
 	public final fun getSubject ()Ljava/lang/String;
 	public final fun getTo ()Ljava/util/List;
 	public final fun getType ()Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Email$Type;
@@ -1117,66 +1118,82 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Set
 }
 
 public abstract class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
+	public abstract fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$AirplaneMode : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$AirplaneMode;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Apn : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Apn;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$AppDetails : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$AppDetails;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Bluetooth : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Bluetooth;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Date : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Date;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Display : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Display;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$General : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$General;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$InputMethod : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$InputMethod;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$InternalStorage : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$InternalStorage;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Locale : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Locale;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$LocationSource : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$LocationSource;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$MemoryCard : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$MemoryCard;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Security : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Security;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Wifi : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Wifi;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Wireless : com/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Settings$Type$Wireless;
+	public fun intent (Landroid/app/Activity;)Landroid/content/Intent;
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$TextMessenger : com/splendo/kaluga/architecture/navigation/NavigationSpec {
@@ -1203,6 +1220,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Tex
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAttachments ()Ljava/util/List;
 	public final fun getBody ()Ljava/lang/String;
+	public final fun getIntent ()Landroid/content/Intent;
 	public final fun getRecipients ()Ljava/util/List;
 	public final fun getSubject ()Ljava/lang/String;
 	public final fun getType ()Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$TextMessenger$Type;
diff --git a/keyboard-compose/api/keyboard-compose.api b/keyboard-compose/api/keyboard-compose.api
index 1a894c34f..51135891c 100644
--- a/keyboard-compose/api/keyboard-compose.api
+++ b/keyboard-compose/api/keyboard-compose.api
@@ -1,12 +1,24 @@
-public final class com/splendo/kaluga/keyboard/compose/ComposeClearFocusHandler : com/splendo/kaluga/keyboard/ClearFocusHandler {
+public final class com/splendo/kaluga/keyboard/compose/ComposeFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
 	public static final field $stable I
-	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;)V
-	public fun clearFocus (Landroid/app/Activity;)V
+	public fun <init> (Landroidx/compose/ui/focus/FocusRequester;)V
+	public final fun getFocusRequester ()Landroidx/compose/ui/focus/FocusRequester;
 }
 
-public final class com/splendo/kaluga/keyboard/compose/ComposeFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
+public final class com/splendo/kaluga/keyboard/compose/ComposeKeyboardManager : com/splendo/kaluga/keyboard/BaseKeyboardManager {
 	public static final field $stable I
-	public fun <init> (Landroidx/compose/ui/focus/FocusRequester;)V
-	public fun requestFocus (Landroid/app/Activity;)V
+	public fun <init> ()V
+	public fun <init> (Landroidx/compose/ui/focus/FocusManager;)V
+	public synthetic fun <init> (Landroidx/compose/ui/focus/FocusManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun hide ()V
+	public synthetic fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
+	public fun show (Lcom/splendo/kaluga/keyboard/compose/ComposeFocusHandler;)V
+}
+
+public final class com/splendo/kaluga/keyboard/compose/ComposeKeyboardManager$Builder : com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable, com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder {
+	public static final field $stable I
+	public fun <init> ()V
+	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
+	public synthetic fun getModifier ()Lkotlin/jvm/functions/Function2;
+	public fun getModifier ()Lkotlin/jvm/functions/Function4;
 }
 
diff --git a/keyboard/api/androidLib/keyboard.api b/keyboard/api/androidLib/keyboard.api
index 71e1c0ef0..eca524d3c 100644
--- a/keyboard/api/androidLib/keyboard.api
+++ b/keyboard/api/androidLib/keyboard.api
@@ -7,45 +7,35 @@ public abstract interface class com/splendo/kaluga/keyboard/BaseKeyboardManager$
 	public abstract fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
 }
 
-public abstract interface class com/splendo/kaluga/keyboard/ClearFocusHandler {
-	public abstract fun clearFocus (Landroid/app/Activity;)V
+public abstract interface class com/splendo/kaluga/keyboard/FocusHandler {
 }
 
-public abstract interface class com/splendo/kaluga/keyboard/FocusHandler {
-	public abstract fun requestFocus (Landroid/app/Activity;)V
+public final class com/splendo/kaluga/keyboard/KeyboardManagerKt {
+	public static final fun keyboardManagerBuilder (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/keyboard/ViewKeyboardManager$Builder;
 }
 
-public final class com/splendo/kaluga/keyboard/KeyboardManager : com/splendo/kaluga/keyboard/BaseKeyboardManager, kotlinx/coroutines/CoroutineScope {
-	public fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;Lcom/splendo/kaluga/keyboard/ClearFocusHandler;Lkotlinx/coroutines/CoroutineScope;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;Lcom/splendo/kaluga/keyboard/ClearFocusHandler;Lkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+public final class com/splendo/kaluga/keyboard/ViewFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
+	public fun <init> (I)V
+	public final fun requestFocus (Landroid/app/Activity;)V
+}
+
+public final class com/splendo/kaluga/keyboard/ViewKeyboardManager : com/splendo/kaluga/keyboard/BaseKeyboardManager, kotlinx/coroutines/CoroutineScope {
+	public fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;Lkotlinx/coroutines/CoroutineScope;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;Lkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	public fun hide ()V
-	public fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
+	public synthetic fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
+	public fun show (Lcom/splendo/kaluga/keyboard/ViewFocusHandler;)V
 }
 
-public final class com/splendo/kaluga/keyboard/KeyboardManager$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable, com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder {
+public final class com/splendo/kaluga/keyboard/ViewKeyboardManager$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable, com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder {
 	public fun <init> ()V
-	public fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;Lcom/splendo/kaluga/keyboard/ClearFocusHandler;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;Lcom/splendo/kaluga/keyboard/ClearFocusHandler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
-	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/KeyboardManager;
+	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/ViewKeyboardManager;
 	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
 	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
 	public fun unsubscribe ()V
 }
 
-public final class com/splendo/kaluga/keyboard/KeyboardManagerKt {
-	public static final fun keyboardManagerBuilder (Landroidx/appcompat/app/AppCompatActivity;Lcom/splendo/kaluga/keyboard/ClearFocusHandler;)Lcom/splendo/kaluga/keyboard/KeyboardManager$Builder;
-	public static synthetic fun keyboardManagerBuilder$default (Landroidx/appcompat/app/AppCompatActivity;Lcom/splendo/kaluga/keyboard/ClearFocusHandler;ILjava/lang/Object;)Lcom/splendo/kaluga/keyboard/KeyboardManager$Builder;
-}
-
-public final class com/splendo/kaluga/keyboard/ViewClearFocusHandler : com/splendo/kaluga/keyboard/ClearFocusHandler {
-	public fun <init> ()V
-	public fun clearFocus (Landroid/app/Activity;)V
-}
-
-public final class com/splendo/kaluga/keyboard/ViewFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
-	public fun <init> (I)V
-	public fun requestFocus (Landroid/app/Activity;)V
-}
-
diff --git a/test-utils-keyboard/api/androidLib/test-utils-keyboard.api b/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
index 6372a48e3..12811d002 100644
--- a/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
+++ b/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
@@ -1,10 +1,3 @@
-public class com/splendo/kaluga/test/keyboard/BaseMockFocusHandler {
-	public fun <init> ()V
-	protected final fun giveFocus ()V
-	public final fun isFocused ()Z
-	protected final fun removeFocus ()V
-}
-
 public final class com/splendo/kaluga/test/keyboard/BuildConfig {
 	public static final field BUILD_TYPE Ljava/lang/String;
 	public static final field DEBUG Z
@@ -12,11 +5,11 @@ public final class com/splendo/kaluga/test/keyboard/BuildConfig {
 	public fun <init> ()V
 }
 
-public final class com/splendo/kaluga/test/keyboard/MockFocusHandler : com/splendo/kaluga/test/keyboard/BaseMockFocusHandler, com/splendo/kaluga/keyboard/FocusHandler {
+public final class com/splendo/kaluga/test/keyboard/MockFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
 	public fun <init> ()V
-	public fun requestFocus (Landroid/app/Activity;)V
-	public final fun simulateGiveFocus ()V
-	public final fun simulateRemoveFocus ()V
+	public final fun giveFocus ()V
+	public final fun isFocused ()Z
+	public final fun removeFocus ()V
 }
 
 public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager : com/splendo/kaluga/keyboard/BaseKeyboardManager {
diff --git a/test-utils-keyboard/api/jvm/test-utils-keyboard.api b/test-utils-keyboard/api/jvm/test-utils-keyboard.api
index b14aa4de8..2d3af61d9 100644
--- a/test-utils-keyboard/api/jvm/test-utils-keyboard.api
+++ b/test-utils-keyboard/api/jvm/test-utils-keyboard.api
@@ -1,14 +1,8 @@
-public class com/splendo/kaluga/test/keyboard/BaseMockFocusHandler {
+public final class com/splendo/kaluga/test/keyboard/MockFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
 	public fun <init> ()V
-	protected final fun giveFocus ()V
+	public final fun giveFocus ()V
 	public final fun isFocused ()Z
-	protected final fun removeFocus ()V
-}
-
-public final class com/splendo/kaluga/test/keyboard/MockFocusHandler : com/splendo/kaluga/test/keyboard/BaseMockFocusHandler, com/splendo/kaluga/keyboard/FocusHandler {
-	public fun <init> ()V
-	public final fun simulateGiveFocus ()V
-	public final fun simulateRemoveFocus ()V
+	public final fun removeFocus ()V
 }
 
 public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager : com/splendo/kaluga/keyboard/BaseKeyboardManager {

From b75ba56ef0c8501ca7cba07cbd164987cbaffdff Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 12:59:24 +0100
Subject: [PATCH 100/227] Api Dump

---
 resources-compose/README.md                   |   4 +-
 resources-compose/api/resources-compose.api   |  10 +-
 resources-databinding/README.md               |   4 +-
 .../api/resources-databinding.api             |   2 +-
 .../src/androidLibMain/kotlin/Binding.kt      |   2 +-
 resources/api/androidLib/resources.api        | 330 +++++++++---------
 resources/api/jvm/resources.api               | 320 ++++++++---------
 7 files changed, 336 insertions(+), 336 deletions(-)

diff --git a/resources-compose/README.md b/resources-compose/README.md
index aa661a8d7..e0c25c8a0 100644
--- a/resources-compose/README.md
+++ b/resources-compose/README.md
@@ -7,8 +7,8 @@ Convert a Kaluga `Color` to a composable color using `Color.composable()`
 ## KalugaLabel
 To use a `KalugaLabel` in compose, simply call `KalugaLabel.Composable(Modifier)` in your UI code.
 
-## BackgroundStyle
-To use `BackgroundStyle` in compose, apply the `backgroundStyle` to the `Modifier` managing your view.
+## KalugaBackgroundStyle
+To use `KalugaBackgroundStyle` in compose, apply the `backgroundStyle` to the `Modifier` managing your view.
 
 ## KalugaButton
 To use a `KalugaButton` in compose, simply call `KalugaButton.Composable(Modifier, ButtonElevation, PaddingValues)` in your UI code.
diff --git a/resources-compose/api/resources-compose.api b/resources-compose/api/resources-compose.api
index 2690e5164..780788e13 100644
--- a/resources-compose/api/resources-compose.api
+++ b/resources-compose/api/resources-compose.api
@@ -1,9 +1,9 @@
 public final class com/splendo/kaluga/resources/compose/BackgroundStyleKt {
 	public static final fun PreviewBackgroundStyle (Landroidx/compose/runtime/Composer;I)V
-	public static final fun backgroundStyle (Landroidx/compose/ui/Modifier;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;)Landroidx/compose/ui/Modifier;
-	public static final fun getBorderStroke (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;)Landroidx/compose/foundation/BorderStroke;
-	public static final fun getBrush (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;)Landroidx/compose/ui/graphics/Brush;
-	public static final fun getShape (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;)Landroidx/compose/ui/graphics/Shape;
+	public static final fun backgroundStyle (Landroidx/compose/ui/Modifier;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;)Landroidx/compose/ui/Modifier;
+	public static final fun getBorderStroke (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;)Landroidx/compose/foundation/BorderStroke;
+	public static final fun getBrush (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;)Landroidx/compose/ui/graphics/Brush;
+	public static final fun getShape (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)Landroidx/compose/ui/graphics/Shape;
 }
 
 public final class com/splendo/kaluga/resources/compose/ColorKt {
@@ -62,6 +62,6 @@ public final class com/splendo/kaluga/resources/compose/RoundedCornerRadiusShape
 }
 
 public final class com/splendo/kaluga/resources/compose/TextAlignmentKt {
-	public static final fun getComposable (Lcom/splendo/kaluga/resources/stylable/TextAlignment;)I
+	public static final fun getComposable (Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)I
 }
 
diff --git a/resources-databinding/README.md b/resources-databinding/README.md
index bf0bbc56e..88edfda23 100644
--- a/resources-databinding/README.md
+++ b/resources-databinding/README.md
@@ -13,8 +13,8 @@ app:autoTextStyle=textStyle
 app:autoTextMinScalingFactor=scalingFactor
 ```
 
-## BackgroundStyle
-Use `app:backgroundStyle` to bind a `BackgroundStyle` to a `View`
+## KalugaBackgroundStyle
+Use `app:backgroundStyle` to bind a `KalugaBackgroundStyle` to a `View`
 
 ## KalugaButton
 Use `app:kalugaButton` to bind a `KalugaButton` to a `Button`
diff --git a/resources-databinding/api/resources-databinding.api b/resources-databinding/api/resources-databinding.api
index 42cd3470c..69e319f6e 100644
--- a/resources-databinding/api/resources-databinding.api
+++ b/resources-databinding/api/resources-databinding.api
@@ -14,7 +14,7 @@ public class com/splendo/kaluga/resources/databinding/BR {
 public final class com/splendo/kaluga/resources/databinding/Binding {
 	public static final field INSTANCE Lcom/splendo/kaluga/resources/databinding/Binding;
 	public static final fun bindAutoTextStyle (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/stylable/TextStyle;F)V
-	public static final fun bindBackground (Landroid/view/View;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;)V
+	public static final fun bindBackground (Landroid/view/View;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;)V
 	public static final fun bindImage (Landroid/widget/ImageView;Lcom/splendo/kaluga/resources/Image;)V
 	public static final fun bindKalugaButton (Landroid/widget/Button;Lcom/splendo/kaluga/resources/view/KalugaButton;)V
 	public static final fun bindKalugaLabel (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/view/KalugaLabel;)V
diff --git a/resources-databinding/src/androidLibMain/kotlin/Binding.kt b/resources-databinding/src/androidLibMain/kotlin/Binding.kt
index 60e00f24f..1d672ef0b 100644
--- a/resources-databinding/src/androidLibMain/kotlin/Binding.kt
+++ b/resources-databinding/src/androidLibMain/kotlin/Binding.kt
@@ -42,7 +42,7 @@ import kotlin.math.max
 object Binding {
 
     /**
-     * Binds a [BackgroundStyle] to a [View].
+     * Binds a [KalugaBackgroundStyle] to a [View].
      */
     @BindingAdapter("backgroundStyle")
     @JvmStatic
diff --git a/resources/api/androidLib/resources.api b/resources/api/androidLib/resources.api
index 12ad2dd24..2dbaa93ca 100644
--- a/resources/api/androidLib/resources.api
+++ b/resources/api/androidLib/resources.api
@@ -601,12 +601,12 @@ public abstract class com/splendo/kaluga/resources/StringStyleAttribute$Paragrap
 }
 
 public final class com/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment : com/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute {
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/TextAlignment;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public final fun copy (Lcom/splendo/kaluga/resources/stylable/TextAlignment;)Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;Lcom/splendo/kaluga/resources/stylable/TextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public final fun copy (Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlignment ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
+	public final fun getAlignment ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
@@ -666,142 +666,21 @@ public final class com/splendo/kaluga/resources/StyledStringKt {
 	public static final fun getRawString (Lcom/splendo/kaluga/resources/StyledString;)Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle {
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;
-	public final fun component3 ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;
-	public final fun copy (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFillStyle ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;
-	public final fun getShape ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;
-	public final fun getStrokeStyle ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle {
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Gradient : com/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle {
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/GradientStyle;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/GradientStyle;
-	public final fun copy (Lcom/splendo/kaluga/resources/stylable/GradientStyle;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Gradient;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Gradient;Lcom/splendo/kaluga/resources/stylable/GradientStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Gradient;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getGradientStyle ()Lcom/splendo/kaluga/resources/stylable/GradientStyle;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Solid : com/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle {
-	public fun <init> (I)V
-	public final fun component1 ()I
-	public final fun copy (I)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Solid;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Solid;IILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Solid;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getColor ()I
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape {
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Oval : com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape {
-	public static final field INSTANCE Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Oval;
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle : com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape {
-	public fun <init> (FFLjava/util/Set;)V
-	public synthetic fun <init> (FFLjava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (FLjava/util/Set;)V
-	public synthetic fun <init> (FLjava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()F
-	public final fun component2 ()F
-	public final fun component3 ()Ljava/util/Set;
-	public final fun copy (FFLjava/util/Set;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle;FFLjava/util/Set;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCornerRadiusX ()F
-	public final fun getCornerRadiusY ()F
-	public final fun getRoundedCorners ()Ljava/util/Set;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner : java/lang/Enum {
-	public static final field BOTTOM_LEFT Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-	public static final field BOTTOM_RIGHT Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-	public static final field TOP_LEFT Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-	public static final field TOP_RIGHT Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-	public static fun values ()[Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-}
-
-public abstract class com/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle {
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$None : com/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle {
-	public static final field INSTANCE Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$None;
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$Stroke : com/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle {
-	public fun <init> (FI)V
-	public final fun component1 ()F
-	public final fun component2 ()I
-	public final fun copy (FI)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$Stroke;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$Stroke;FIILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$Stroke;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getColor ()I
-	public final fun getWidth ()F
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class com/splendo/kaluga/resources/stylable/ButtonStateStyle {
-	public fun <init> (IILcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;)V
-	public synthetic fun <init> (IILcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (ILcom/splendo/kaluga/resources/stylable/BackgroundStyle;)V
+	public fun <init> (IILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
+	public synthetic fun <init> (IILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (ILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;)V
 	public final fun component1 ()I
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;
-	public final fun copy (ILcom/splendo/kaluga/resources/stylable/BackgroundStyle;)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILcom/splendo/kaluga/resources/stylable/BackgroundStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;
+	public final fun copy (ILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getBackgroundStyle ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;
+	public final fun getBackgroundStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;
 	public final fun getTextColor ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/resources/stylable/ButtonStyle {
-	public fun <init> (Landroid/graphics/Typeface;FLcom/splendo/kaluga/resources/stylable/TextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)V
-	public synthetic fun <init> (Landroid/graphics/Typeface;FLcom/splendo/kaluga/resources/stylable/TextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/TextAlignment;IIILcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/TextAlignment;IIILcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Landroid/graphics/Typeface;
-	public final fun component2 ()F
-	public final fun component3 ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun component5 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun component6 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun copy (Landroid/graphics/Typeface;FLcom/splendo/kaluga/resources/stylable/TextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/ButtonStyle;Landroid/graphics/Typeface;FLcom/splendo/kaluga/resources/stylable/TextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDefaultStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getDisabledStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getFont ()Landroid/graphics/Typeface;
-	public final fun getPressedStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getStateStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getStateTextStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public final fun getTextAlignment ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public final fun getTextSize ()F
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public abstract class com/splendo/kaluga/resources/stylable/GradientStyle {
 	public synthetic fun <init> (Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getColorPoints ()Ljava/util/List;
@@ -892,27 +771,148 @@ public final class com/splendo/kaluga/resources/stylable/GradientStyleKt {
 	public static final fun getColorPoints (Ljava/util/List;)Ljava/util/List;
 }
 
-public final class com/splendo/kaluga/resources/stylable/TextAlignment : java/lang/Enum {
-	public static final field CENTER Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static final field END Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static final field LEFT Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static final field RIGHT Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static final field START Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static fun values ()[Lcom/splendo/kaluga/resources/stylable/TextAlignment;
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle {
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;
+	public final fun component3 ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;
+	public final fun copy (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFillStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;
+	public final fun getShape ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;
+	public final fun getStrokeStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle {
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Gradient : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle {
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/GradientStyle;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/GradientStyle;
+	public final fun copy (Lcom/splendo/kaluga/resources/stylable/GradientStyle;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Gradient;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Gradient;Lcom/splendo/kaluga/resources/stylable/GradientStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Gradient;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getGradientStyle ()Lcom/splendo/kaluga/resources/stylable/GradientStyle;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Solid : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle {
+	public fun <init> (I)V
+	public final fun component1 ()I
+	public final fun copy (I)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Solid;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Solid;IILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Solid;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getColor ()I
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape {
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Oval : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape {
+	public static final field INSTANCE Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Oval;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape {
+	public fun <init> (FFLjava/util/Set;)V
+	public synthetic fun <init> (FFLjava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (FLjava/util/Set;)V
+	public synthetic fun <init> (FLjava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()F
+	public final fun component2 ()F
+	public final fun component3 ()Ljava/util/Set;
+	public final fun copy (FFLjava/util/Set;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle;FFLjava/util/Set;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getCornerRadiusX ()F
+	public final fun getCornerRadiusY ()F
+	public final fun getRoundedCorners ()Ljava/util/Set;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner : java/lang/Enum {
+	public static final field BOTTOM_LEFT Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+	public static final field BOTTOM_RIGHT Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+	public static final field TOP_LEFT Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+	public static final field TOP_RIGHT Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+	public static fun values ()[Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+}
+
+public abstract class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle {
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$None : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle {
+	public static final field INSTANCE Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$None;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$Stroke : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle {
+	public fun <init> (FI)V
+	public final fun component1 ()F
+	public final fun component2 ()I
+	public final fun copy (FI)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$Stroke;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$Stroke;FIILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$Stroke;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getColor ()I
+	public final fun getWidth ()F
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaButtonStyle {
+	public fun <init> (Landroid/graphics/Typeface;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)V
+	public synthetic fun <init> (Landroid/graphics/Typeface;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Landroid/graphics/Typeface;
+	public final fun component2 ()F
+	public final fun component3 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun component5 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun component6 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun copy (Landroid/graphics/Typeface;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;Landroid/graphics/Typeface;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getDefaultStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun getDisabledStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun getFont ()Landroid/graphics/Typeface;
+	public final fun getPressedStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun getStateStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun getStateTextStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun getTextAlignment ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public final fun getTextSize ()F
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaTextAlignment : java/lang/Enum {
+	public static final field CENTER Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static final field END Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static final field LEFT Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static final field RIGHT Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static final field START Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static fun values ()[Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 }
 
 public final class com/splendo/kaluga/resources/stylable/TextStyle {
-	public fun <init> (Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/TextAlignment;)V
-	public synthetic fun <init> (Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/TextAlignment;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)V
+	public synthetic fun <init> (Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Landroid/graphics/Typeface;
 	public final fun component2 ()I
 	public final fun component3 ()F
-	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public final fun copy (Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/TextAlignment;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/TextStyle;Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/TextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public final fun copy (Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/TextStyle;Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlignment ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
+	public final fun getAlignment ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 	public final fun getColor ()I
 	public final fun getFont ()Landroid/graphics/Typeface;
 	public final fun getSize ()F
@@ -921,34 +921,34 @@ public final class com/splendo/kaluga/resources/stylable/TextStyle {
 }
 
 public final class com/splendo/kaluga/resources/view/AndroidButton {
-	public static final fun applyButtonStyle (Landroid/widget/Button;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;Lcom/splendo/kaluga/resources/view/RippleStyle;)V
-	public static synthetic fun applyButtonStyle$default (Landroid/widget/Button;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;Lcom/splendo/kaluga/resources/view/RippleStyle;ILjava/lang/Object;)V
+	public static final fun applyButtonStyle (Landroid/widget/Button;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;Lcom/splendo/kaluga/resources/view/RippleStyle;)V
+	public static synthetic fun applyButtonStyle$default (Landroid/widget/Button;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;Lcom/splendo/kaluga/resources/view/RippleStyle;ILjava/lang/Object;)V
 	public static final fun bindButton (Landroid/widget/Button;Lcom/splendo/kaluga/resources/view/KalugaButton;)V
 }
 
 public final class com/splendo/kaluga/resources/view/BackgroundStyleKt {
-	public static final fun applyBackgroundStyle (Landroid/view/View;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;)V
-	public static final fun createDrawable (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;Landroid/content/Context;)Landroid/graphics/drawable/Drawable;
+	public static final fun applyBackgroundStyle (Landroid/view/View;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;)V
+	public static final fun createDrawable (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;Landroid/content/Context;)Landroid/graphics/drawable/Drawable;
 }
 
 public abstract class com/splendo/kaluga/resources/view/KalugaButton {
 	public abstract fun getAction ()Lkotlin/jvm/functions/Function0;
-	public abstract fun getStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
+	public abstract fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public abstract fun isEnabled ()Z
 }
 
 public final class com/splendo/kaluga/resources/view/KalugaButton$Plain : com/splendo/kaluga/resources/view/KalugaButton {
-	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public final fun component3 ()Z
 	public final fun component4 ()Lkotlin/jvm/functions/Function0;
-	public final fun copy (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;
+	public final fun copy (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getAction ()Lkotlin/jvm/functions/Function0;
-	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
+	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public final fun getText ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun isEnabled ()Z
@@ -956,17 +956,17 @@ public final class com/splendo/kaluga/resources/view/KalugaButton$Plain : com/sp
 }
 
 public final class com/splendo/kaluga/resources/view/KalugaButton$Styled : com/splendo/kaluga/resources/view/KalugaButton {
-	public fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Lcom/splendo/kaluga/resources/StyledString;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public final fun component3 ()Z
 	public final fun component4 ()Lkotlin/jvm/functions/Function0;
-	public final fun copy (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;
+	public final fun copy (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getAction ()Lkotlin/jvm/functions/Function0;
-	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
+	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public final fun getText ()Lcom/splendo/kaluga/resources/StyledString;
 	public fun hashCode ()I
 	public fun isEnabled ()Z
@@ -1027,7 +1027,7 @@ public final class com/splendo/kaluga/resources/view/RippleStyle$None : com/sple
 }
 
 public final class com/splendo/kaluga/resources/view/TextAlignmentKt {
-	public static final fun alignment (Lcom/splendo/kaluga/resources/stylable/TextAlignment;Landroid/content/Context;)Landroid/text/Layout$Alignment;
+	public static final fun alignment (Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Landroid/content/Context;)Landroid/text/Layout$Alignment;
 	public static final fun getGravity (Landroid/text/Layout$Alignment;)I
 	public static final fun getViewAlignment (Landroid/text/Layout$Alignment;)I
 }
diff --git a/resources/api/jvm/resources.api b/resources/api/jvm/resources.api
index 7594b9f3a..286d80d15 100644
--- a/resources/api/jvm/resources.api
+++ b/resources/api/jvm/resources.api
@@ -593,12 +593,12 @@ public abstract class com/splendo/kaluga/resources/StringStyleAttribute$Paragrap
 }
 
 public final class com/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment : com/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute {
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/TextAlignment;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public final fun copy (Lcom/splendo/kaluga/resources/stylable/TextAlignment;)Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;Lcom/splendo/kaluga/resources/stylable/TextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public final fun copy (Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StringStyleAttribute$ParagraphStyleAttribute$Alignment;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlignment ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
+	public final fun getAlignment ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
@@ -668,142 +668,21 @@ public final class com/splendo/kaluga/resources/StyledStringKt {
 	public static final fun getRawString (Lcom/splendo/kaluga/resources/StyledString;)Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle {
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;
-	public final fun component3 ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;
-	public final fun copy (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFillStyle ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle;
-	public final fun getShape ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;
-	public final fun getStrokeStyle ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle {
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Gradient : com/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle {
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/GradientStyle;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/GradientStyle;
-	public final fun copy (Lcom/splendo/kaluga/resources/stylable/GradientStyle;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Gradient;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Gradient;Lcom/splendo/kaluga/resources/stylable/GradientStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Gradient;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getGradientStyle ()Lcom/splendo/kaluga/resources/stylable/GradientStyle;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Solid : com/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle {
-	public fun <init> (I)V
-	public final fun component1 ()I
-	public final fun copy (I)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Solid;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Solid;IILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$FillStyle$Solid;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getColor ()I
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape {
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Oval : com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape {
-	public static final field INSTANCE Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Oval;
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle : com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape {
-	public fun <init> (FFLjava/util/Set;)V
-	public synthetic fun <init> (FFLjava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (FLjava/util/Set;)V
-	public synthetic fun <init> (FLjava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()F
-	public final fun component2 ()F
-	public final fun component3 ()Ljava/util/Set;
-	public final fun copy (FFLjava/util/Set;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle;FFLjava/util/Set;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getCornerRadiusX ()F
-	public final fun getCornerRadiusY ()F
-	public final fun getRoundedCorners ()Ljava/util/Set;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner : java/lang/Enum {
-	public static final field BOTTOM_LEFT Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-	public static final field BOTTOM_RIGHT Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-	public static final field TOP_LEFT Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-	public static final field TOP_RIGHT Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-	public static fun values ()[Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape$Rectangle$Corner;
-}
-
-public abstract class com/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle {
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$None : com/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle {
-	public static final field INSTANCE Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$None;
-}
-
-public final class com/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$Stroke : com/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle {
-	public fun <init> (FI)V
-	public final fun component1 ()F
-	public final fun component2 ()I
-	public final fun copy (FI)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$Stroke;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$Stroke;FIILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/BackgroundStyle$StrokeStyle$Stroke;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getColor ()I
-	public final fun getWidth ()F
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class com/splendo/kaluga/resources/stylable/ButtonStateStyle {
-	public fun <init> (IILcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;)V
-	public synthetic fun <init> (IILcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (ILcom/splendo/kaluga/resources/stylable/BackgroundStyle;)V
+	public fun <init> (IILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
+	public synthetic fun <init> (IILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (ILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;)V
 	public final fun component1 ()I
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;
-	public final fun copy (ILcom/splendo/kaluga/resources/stylable/BackgroundStyle;)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILcom/splendo/kaluga/resources/stylable/BackgroundStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;
+	public final fun copy (ILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getBackgroundStyle ()Lcom/splendo/kaluga/resources/stylable/BackgroundStyle;
+	public final fun getBackgroundStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;
 	public final fun getTextColor ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/resources/stylable/ButtonStyle {
-	public fun <init> (Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/TextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/TextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/TextAlignment;IIILcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/TextAlignment;IIILcom/splendo/kaluga/resources/stylable/BackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/Font;
-	public final fun component2 ()F
-	public final fun component3 ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun component5 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun component6 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun copy (Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/TextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/ButtonStyle;Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/TextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDefaultStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getDisabledStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getFont ()Lcom/splendo/kaluga/resources/Font;
-	public final fun getPressedStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getStateStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getStateTextStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public final fun getTextAlignment ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public final fun getTextSize ()F
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public abstract class com/splendo/kaluga/resources/stylable/GradientStyle {
 	public synthetic fun <init> (Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getColorPoints ()Ljava/util/List;
@@ -894,27 +773,148 @@ public final class com/splendo/kaluga/resources/stylable/GradientStyleKt {
 	public static final fun getColorPoints (Ljava/util/List;)Ljava/util/List;
 }
 
-public final class com/splendo/kaluga/resources/stylable/TextAlignment : java/lang/Enum {
-	public static final field CENTER Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static final field END Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static final field LEFT Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static final field RIGHT Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static final field START Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public static fun values ()[Lcom/splendo/kaluga/resources/stylable/TextAlignment;
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle {
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;
+	public final fun component3 ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;
+	public final fun copy (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFillStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle;
+	public final fun getShape ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;
+	public final fun getStrokeStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle {
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Gradient : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle {
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/GradientStyle;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/GradientStyle;
+	public final fun copy (Lcom/splendo/kaluga/resources/stylable/GradientStyle;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Gradient;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Gradient;Lcom/splendo/kaluga/resources/stylable/GradientStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Gradient;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getGradientStyle ()Lcom/splendo/kaluga/resources/stylable/GradientStyle;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Solid : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle {
+	public fun <init> (I)V
+	public final fun component1 ()I
+	public final fun copy (I)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Solid;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Solid;IILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$FillStyle$Solid;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getColor ()I
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape {
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Oval : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape {
+	public static final field INSTANCE Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Oval;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape {
+	public fun <init> (FFLjava/util/Set;)V
+	public synthetic fun <init> (FFLjava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (FLjava/util/Set;)V
+	public synthetic fun <init> (FLjava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()F
+	public final fun component2 ()F
+	public final fun component3 ()Ljava/util/Set;
+	public final fun copy (FFLjava/util/Set;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle;FFLjava/util/Set;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getCornerRadiusX ()F
+	public final fun getCornerRadiusY ()F
+	public final fun getRoundedCorners ()Ljava/util/Set;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner : java/lang/Enum {
+	public static final field BOTTOM_LEFT Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+	public static final field BOTTOM_RIGHT Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+	public static final field TOP_LEFT Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+	public static final field TOP_RIGHT Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+	public static fun values ()[Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape$Rectangle$Corner;
+}
+
+public abstract class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle {
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$None : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle {
+	public static final field INSTANCE Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$None;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$Stroke : com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle {
+	public fun <init> (FI)V
+	public final fun component1 ()F
+	public final fun component2 ()I
+	public final fun copy (FI)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$Stroke;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$Stroke;FIILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$StrokeStyle$Stroke;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getColor ()I
+	public final fun getWidth ()F
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaButtonStyle {
+	public fun <init> (Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/Font;
+	public final fun component2 ()F
+	public final fun component3 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun component5 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun component6 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun copy (Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getDefaultStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun getDisabledStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun getFont ()Lcom/splendo/kaluga/resources/Font;
+	public final fun getPressedStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun getStateStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
+	public final fun getStateTextStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun getTextAlignment ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public final fun getTextSize ()F
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/resources/stylable/KalugaTextAlignment : java/lang/Enum {
+	public static final field CENTER Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static final field END Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static final field LEFT Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static final field RIGHT Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static final field START Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public static fun values ()[Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 }
 
 public final class com/splendo/kaluga/resources/stylable/TextStyle {
-	public fun <init> (Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/TextAlignment;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/TextAlignment;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Lcom/splendo/kaluga/resources/Font;
 	public final fun component2 ()I
 	public final fun component3 ()F
-	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
-	public final fun copy (Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/TextAlignment;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/TextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
+	public final fun copy (Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlignment ()Lcom/splendo/kaluga/resources/stylable/TextAlignment;
+	public final fun getAlignment ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 	public final fun getColor ()I
 	public final fun getFont ()Lcom/splendo/kaluga/resources/Font;
 	public final fun getSize ()F
@@ -924,22 +924,22 @@ public final class com/splendo/kaluga/resources/stylable/TextStyle {
 
 public abstract class com/splendo/kaluga/resources/view/KalugaButton {
 	public abstract fun getAction ()Lkotlin/jvm/functions/Function0;
-	public abstract fun getStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
+	public abstract fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public abstract fun isEnabled ()Z
 }
 
 public final class com/splendo/kaluga/resources/view/KalugaButton$Plain : com/splendo/kaluga/resources/view/KalugaButton {
-	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public final fun component3 ()Z
 	public final fun component4 ()Lkotlin/jvm/functions/Function0;
-	public final fun copy (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;
+	public final fun copy (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaButton$Plain;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getAction ()Lkotlin/jvm/functions/Function0;
-	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
+	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public final fun getText ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun isEnabled ()Z
@@ -947,17 +947,17 @@ public final class com/splendo/kaluga/resources/view/KalugaButton$Plain : com/sp
 }
 
 public final class com/splendo/kaluga/resources/view/KalugaButton$Styled : com/splendo/kaluga/resources/view/KalugaButton {
-	public fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Lcom/splendo/kaluga/resources/StyledString;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public final fun component3 ()Z
 	public final fun component4 ()Lkotlin/jvm/functions/Function0;
-	public final fun copy (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/ButtonStyle;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;
+	public final fun copy (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;)Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaButton$Styled;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getAction ()Lkotlin/jvm/functions/Function0;
-	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStyle;
+	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public final fun getText ()Lcom/splendo/kaluga/resources/StyledString;
 	public fun hashCode ()I
 	public fun isEnabled ()Z

From 95f77c540769af272b701b574ad0daa8b33da924 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 15:19:47 +0100
Subject: [PATCH 101/227] API dump

---
 .../architecture/compose/viewModel/ViewModelComposable.kt     | 2 +-
 date-time/api/androidLib/date-time.api                        | 4 ++--
 date-time/api/jvm/date-time.api                               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index 3b2d84f20..33903ecf1 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -63,7 +63,7 @@ private fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
     viewModel: ViewModel,
     content: @Composable (ViewModel.() -> Unit)? = null
 ) {
-    // Link the ViewModel to existing LifecycleSubsctibable
+    // Link the ViewModel to existing LifecycleSubscribable
     viewModel.linkLifecycle(activity, fragmentManager)
 
     // Get a List of all ComposableLifecycleSubscribable of the viewModel.
diff --git a/date-time/api/androidLib/date-time.api b/date-time/api/androidLib/date-time.api
index b16bbe662..f6c5742ea 100644
--- a/date-time/api/androidLib/date-time.api
+++ b/date-time/api/androidLib/date-time.api
@@ -7,14 +7,14 @@ public final class com/splendo/kaluga/datetime/timer/RecurringTimer : com/splend
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getDuration-UwyO8pc ()J
-	public fun getState ()Lkotlinx/coroutines/flow/StateFlow;
+	public fun getState ()Lkotlinx/coroutines/flow/Flow;
 	public fun pause (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class com/splendo/kaluga/datetime/timer/Timer {
 	public abstract fun getDuration-UwyO8pc ()J
-	public abstract fun getState ()Lkotlinx/coroutines/flow/StateFlow;
+	public abstract fun getState ()Lkotlinx/coroutines/flow/Flow;
 }
 
 public abstract interface class com/splendo/kaluga/datetime/timer/Timer$State {
diff --git a/date-time/api/jvm/date-time.api b/date-time/api/jvm/date-time.api
index b16bbe662..f6c5742ea 100644
--- a/date-time/api/jvm/date-time.api
+++ b/date-time/api/jvm/date-time.api
@@ -7,14 +7,14 @@ public final class com/splendo/kaluga/datetime/timer/RecurringTimer : com/splend
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getDuration-UwyO8pc ()J
-	public fun getState ()Lkotlinx/coroutines/flow/StateFlow;
+	public fun getState ()Lkotlinx/coroutines/flow/Flow;
 	public fun pause (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class com/splendo/kaluga/datetime/timer/Timer {
 	public abstract fun getDuration-UwyO8pc ()J
-	public abstract fun getState ()Lkotlinx/coroutines/flow/StateFlow;
+	public abstract fun getState ()Lkotlinx/coroutines/flow/Flow;
 }
 
 public abstract interface class com/splendo/kaluga/datetime/timer/Timer$State {

From a23e70d96d99fb75eb36cb2ece264ab23e26c542 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 15:22:56 +0100
Subject: [PATCH 102/227] API dump

---
 architecture/api/androidLib/architecture.api | 48 ++++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index 88eb381a6..d9ec117cd 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -871,13 +871,15 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Dia
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog : com/splendo/kaluga/architecture/navigation/NavigationSpec {
-	public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lkotlin/jvm/functions/Function1;
-	public final fun copy (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Lkotlin/jvm/functions/Function1;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$DismissDialog;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFragmentRequestKey ()Ljava/lang/String;
 	public final fun getGetFragmentManager ()Lkotlin/jvm/functions/Function1;
 	public final fun getTag ()Ljava/lang/String;
 	public fun hashCode ()I
@@ -1061,13 +1063,15 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Pho
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment : com/splendo/kaluga/architecture/navigation/NavigationSpec {
 	public fun <init> ()V
-	public fun <init> (ZLkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (ZLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (ZLjava/lang/String;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (ZLjava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Z
-	public final fun component2 ()Lkotlin/jvm/functions/Function1;
-	public final fun copy (ZLkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Lkotlin/jvm/functions/Function1;
+	public final fun copy (ZLjava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment;ZLjava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragment;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFragmentRequestKey ()Ljava/lang/String;
 	public final fun getGetFragmentManager ()Lkotlin/jvm/functions/Function1;
 	public final fun getImmediate ()Z
 	public fun hashCode ()I
@@ -1075,15 +1079,17 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Pop
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo : com/splendo/kaluga/architecture/navigation/NavigationSpec {
-	public fun <init> (Ljava/lang/String;ZZLkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Ljava/lang/String;ZZLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;ZZLjava/lang/String;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Ljava/lang/String;ZZLjava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Z
 	public final fun component3 ()Z
-	public final fun component4 ()Lkotlin/jvm/functions/Function1;
-	public final fun copy (Ljava/lang/String;ZZLkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo;Ljava/lang/String;ZZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo;
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()Lkotlin/jvm/functions/Function1;
+	public final fun copy (Ljava/lang/String;ZZLjava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo;Ljava/lang/String;ZZLjava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$PopFragmentTo;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFragmentRequestKey ()Ljava/lang/String;
 	public final fun getGetFragmentManager ()Lkotlin/jvm/functions/Function1;
 	public final fun getImmediate ()Z
 	public final fun getInclusive ()Z
@@ -1093,13 +1099,15 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Pop
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment : com/splendo/kaluga/architecture/navigation/NavigationSpec {
-	public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lkotlin/jvm/functions/Function1;
-	public final fun copy (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Lkotlin/jvm/functions/Function1;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$RemoveFragment;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFragmentRequestKey ()Ljava/lang/String;
 	public final fun getGetFragmentManager ()Lkotlin/jvm/functions/Function1;
 	public final fun getTag ()Ljava/lang/String;
 	public fun hashCode ()I

From 7dfb26290a8f01dec4bcd9a1c546fe7e535d86b3 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 15:43:45 +0100
Subject: [PATCH 103/227] Pr remarks

---
 date-time/api/androidLib/date-time.api        |  2 ++
 date-time/api/jvm/date-time.api               |  2 ++
 .../kaluga/datetime/timer/RecurringTimer.kt   | 20 +++++++++++--------
 .../splendo/kaluga/datetime/timer/Timer.kt    |  2 ++
 .../datetime/timer/RecurringTimerTest.kt      | 17 ++++++++--------
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/date-time/api/androidLib/date-time.api b/date-time/api/androidLib/date-time.api
index f6c5742ea..54793266c 100644
--- a/date-time/api/androidLib/date-time.api
+++ b/date-time/api/androidLib/date-time.api
@@ -6,6 +6,7 @@ public abstract interface class com/splendo/kaluga/datetime/timer/ControllableTi
 public final class com/splendo/kaluga/datetime/timer/RecurringTimer : com/splendo/kaluga/datetime/timer/ControllableTimer {
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getDefaultState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
 	public fun getDuration-UwyO8pc ()J
 	public fun getState ()Lkotlinx/coroutines/flow/Flow;
 	public fun pause (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -13,6 +14,7 @@ public final class com/splendo/kaluga/datetime/timer/RecurringTimer : com/splend
 }
 
 public abstract interface class com/splendo/kaluga/datetime/timer/Timer {
+	public abstract fun getDefaultState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
 	public abstract fun getDuration-UwyO8pc ()J
 	public abstract fun getState ()Lkotlinx/coroutines/flow/Flow;
 }
diff --git a/date-time/api/jvm/date-time.api b/date-time/api/jvm/date-time.api
index f6c5742ea..54793266c 100644
--- a/date-time/api/jvm/date-time.api
+++ b/date-time/api/jvm/date-time.api
@@ -6,6 +6,7 @@ public abstract interface class com/splendo/kaluga/datetime/timer/ControllableTi
 public final class com/splendo/kaluga/datetime/timer/RecurringTimer : com/splendo/kaluga/datetime/timer/ControllableTimer {
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getDefaultState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
 	public fun getDuration-UwyO8pc ()J
 	public fun getState ()Lkotlinx/coroutines/flow/Flow;
 	public fun pause (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -13,6 +14,7 @@ public final class com/splendo/kaluga/datetime/timer/RecurringTimer : com/splend
 }
 
 public abstract interface class com/splendo/kaluga/datetime/timer/Timer {
+	public abstract fun getDefaultState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
 	public abstract fun getDuration-UwyO8pc ()J
 	public abstract fun getState ()Lkotlinx/coroutines/flow/Flow;
 }
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
index fe8e2f99a..5acf9cbf0 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
@@ -52,13 +52,8 @@ class RecurringTimer(
     coroutineScope: CoroutineScope = MainScope()
 ) : ControllableTimer {
     private val stateRepo = TimerStateRepo(duration, interval, timeSource, delayFunction, coroutineScope)
-    override val state: Flow<Timer.State> = stateRepo.stateFlow.map { state ->
-        when (state) {
-            is TimerStateRepo.State.NotRunning.Finished -> state
-            is TimerStateRepo.State.NotRunning.Paused -> state
-            is TimerStateRepo.State.Running -> state
-        }
-    }
+    override val state: Flow<Timer.State> = stateRepo.stateFlow.map { it.timerState }
+    override val defaultState: Timer.State = stateRepo.stateFlow.value.timerState
 
     override suspend fun start() = stateRepo.start()
 
@@ -116,6 +111,8 @@ private class TimerStateRepo(
     /** Timer state. */
     sealed class State : KalugaState {
         abstract val totalDuration: Duration
+        abstract val timerState: Timer.State
+
         /** Timer is not running. */
         sealed class NotRunning(protected val elapsedSoFar: Duration) : State() {
             val elapsed = flowOf(elapsedSoFar)
@@ -124,6 +121,9 @@ private class TimerStateRepo(
                 elapsedSoFar: Duration,
                 override val totalDuration: Duration
             ) : NotRunning(elapsedSoFar), Timer.State.NotRunning.Paused {
+
+                override val timerState: Timer.State get() = this
+
                 fun start(
                     interval: Duration,
                     timeSource: TimeSource,
@@ -144,7 +144,9 @@ private class TimerStateRepo(
             /** Timer is finished. */
             class Finished(
                 override val totalDuration: Duration
-            ) : NotRunning(totalDuration), Timer.State.NotRunning.Finished
+            ) : NotRunning(totalDuration), Timer.State.NotRunning.Finished {
+                override val timerState: Timer.State get() = this
+            }
         }
 
         /** Timer is running. */
@@ -165,6 +167,8 @@ private class TimerStateRepo(
                 delayFunction = delayFunction
             )
 
+            override val timerState: Timer.State get() = this
+
             private val supervisor = SupervisorJob()
 
             internal suspend fun pause(): NotRunning.Paused {
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
index 486d2eba4..c5866f370 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
@@ -28,6 +28,8 @@ interface Timer {
     val duration: Duration
     /** Current state of the timer. */
     val state: Flow<State>
+    /** The Default [State] of the timer. */
+    val defaultState: State
 
     sealed interface State {
         val elapsed: Flow<Duration>
diff --git a/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt b/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt
index 72b5f7913..8a1cba3ad 100644
--- a/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt
+++ b/date-time/src/commonTest/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimerTest.kt
@@ -20,6 +20,7 @@ import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.test.base.captureFor
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -39,21 +40,21 @@ class RecurringTimerTest {
             interval = 10.milliseconds,
             coroutineScope = this
         )
-        assertIs<Timer.State.NotRunning.Paused>(timer.state.value, "timer was not paused after creation")
+        assertIs<Timer.State.NotRunning.Paused>(timer.state.first(), "timer was not paused after creation")
         timer.start()
-        assertIs<Timer.State.Running>(timer.state.value, "timer is not running after start")
+        assertIs<Timer.State.Running>(timer.state.first(), "timer is not running after start")
         timer.pause()
-        assertIs<Timer.State.NotRunning.Paused>(timer.state.value, "timer was not paused after pause")
+        assertIs<Timer.State.NotRunning.Paused>(timer.state.first(), "timer was not paused after pause")
         delay(500)
-        assertIs<Timer.State.NotRunning.Paused>(timer.state.value, "timer pause is not working")
+        assertIs<Timer.State.NotRunning.Paused>(timer.state.first(), "timer pause is not working")
         timer.start()
-        assertIs<Timer.State.Running>(timer.state.value, "timer is not running after start")
+        assertIs<Timer.State.Running>(timer.state.first(), "timer is not running after start")
         delay(500)
-        assertIs<Timer.State.NotRunning.Finished>(timer.state.value, "timer was not finished after time elapsed")
+        assertIs<Timer.State.NotRunning.Finished>(timer.state.first(), "timer was not finished after time elapsed")
         timer.start()
-        assertIs<Timer.State.NotRunning.Finished>(timer.state.value, "was able to start timer after finish")
+        assertIs<Timer.State.NotRunning.Finished>(timer.state.first(), "was able to start timer after finish")
         timer.pause()
-        assertIs<Timer.State.NotRunning.Finished>(timer.state.value, "was able to pause timer after finish")
+        assertIs<Timer.State.NotRunning.Finished>(timer.state.first(), "was able to pause timer after finish")
     }
 
     @Test

From e8155e802937441f0a4279ff38464ab6a28e85ef Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 15:46:23 +0100
Subject: [PATCH 104/227] Fix merge conflict

---
 .../src/androidLibMain/kotlin/navigation/NavigationSpec.kt    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
index bd29fcf90..8c30798af 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
@@ -175,7 +175,6 @@ sealed class NavigationSpec {
      * @param tag The tag of the [Fragment] to remove
      * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle removing the [Fragment]
-     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      */
     data class RemoveFragment(
         val tag: String,
@@ -188,7 +187,6 @@ sealed class NavigationSpec {
      * @param immediate If `true` the transaction should execute without waiting for pending transactions
      * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle popping the [Fragment]
-     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      */
     data class PopFragment(
         val immediate: Boolean = false,
@@ -201,7 +199,6 @@ sealed class NavigationSpec {
      * @param immediate If `true` the transaction should execute without waiting for pending transactions
      * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle popping the [Fragment]
-     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      */
     data class PopFragmentTo(
         val name: String,
@@ -228,7 +225,6 @@ sealed class NavigationSpec {
      * @param tag The tag of the [DialogFragment] to remove
      * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      * @param getFragmentManager Optional getter for the [FragmentManager] to handle removing the [DialogFragment]
-     * @param fragmentRequestKey Optional key to provide to [FragmentManager.setFragmentResult]
      */
     data class DismissDialog(
         val tag: String,

From 4a8c95678f958dcc1a0013bfcfd8e56e45cd8ebf Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 16:00:46 +0100
Subject: [PATCH 105/227] API Dump

---
 scientific/api/androidLib/scientific.api | 1407 +++++++++++++++-------
 scientific/api/jvm/scientific.api        | 1407 +++++++++++++++-------
 2 files changed, 1936 insertions(+), 878 deletions(-)

diff --git a/scientific/api/androidLib/scientific.api b/scientific/api/androidLib/scientific.api
index 6051a0a5f..9ab4f1b42 100644
--- a/scientific/api/androidLib/scientific.api
+++ b/scientific/api/androidLib/scientific.api
@@ -519,6 +519,12 @@ public abstract interface class com/splendo/kaluga/scientific/ShortScientificArr
 	public fun iterator ()Ljava/util/Iterator;
 }
 
+public final class com/splendo/kaluga/scientific/converter/ScientificConverterException : java/lang/ArithmeticException {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
 public final class com/splendo/kaluga/scientific/converter/acceleration/ConvertFromForceAndMassKt {
 	public static final fun accelerationFromForceAndMass (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun accelerationFromForceAndMassDefault (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -561,7 +567,7 @@ public final class com/splendo/kaluga/scientific/converter/acceleration/ConvertT
 }
 
 public final class com/splendo/kaluga/scientific/converter/acceleration/ConvertToTimeKt {
-	public static final fun speedDivAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun joltDivAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/action/ConvertFromEnergyAndTimeKt {
@@ -917,9 +923,9 @@ public final class com/splendo/kaluga/scientific/converter/area/ConvertToVolumeK
 
 public final class com/splendo/kaluga/scientific/converter/area/ConvertToVolumetricFlowKt {
 	public static final fun areaTimesVolumetricFlux (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun imperialAreaTimesImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun imperialAreaTimesUKImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun imperialAreaTimesUSCustomaryArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialAreaTimesImperialVolumetricFlux (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialAreaTimesUKImperialVolumetricFlux (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialAreaTimesUSCustomaryVolumetricFlux (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun metricAreaTimesMetricVolumetricFlux (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
@@ -928,7 +934,7 @@ public final class com/splendo/kaluga/scientific/converter/area/ConvertToWeightK
 	public static final fun imperialAreaDensityTimesUKImperialAreaDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialAreaTimesImperialAreaDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialAreaTimesImperialUSCustomaryAreaDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricAreaTimesMetricAreaDenisty (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricAreaTimesMetricAreaDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/areaDensity/ConvertFromDensityAndLengthKt {
@@ -1036,6 +1042,11 @@ public final class com/splendo/kaluga/scientific/converter/density/ConvertFromAr
 	public static final fun densityFromAreaDensityAndLengthDefault (Lcom/splendo/kaluga/scientific/unit/Density;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/density/ConvertFromDynamicViscosityAndKinematicViscosityKt {
+	public static final fun densityFromDynamicViscosityAndKinematicViscosity (Lcom/splendo/kaluga/scientific/unit/Density;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun densityFromDynamicViscosityAndKinematicViscosityDefault (Lcom/splendo/kaluga/scientific/unit/Density;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/density/ConvertFromLinearMassDensityAndAreaKt {
 	public static final fun densityFromLinearMassDensityAndArea (Lcom/splendo/kaluga/scientific/unit/Density;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun densityFromLinearMassDensityAndAreaDefault (Lcom/splendo/kaluga/scientific/unit/Density;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1074,6 +1085,14 @@ public final class com/splendo/kaluga/scientific/converter/density/ConvertToArea
 	public static final fun usCustomaryDensityTimesImperialLength (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/density/ConvertToDynamicViscosityKt {
+	public static final fun densityTimesKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialDensityTimesImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricDensityTimesMetricKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ukImperialDensityTimesImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usCustomaryDensityTimesImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/density/ConvertToLinearMassDensityKt {
 	public static final fun densityTimesArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialDensityTimesImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1147,6 +1166,11 @@ public final class com/splendo/kaluga/scientific/converter/dimensionless/Convert
 	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertFromKinematicViscosityAndDensityKt {
+	public static final fun dynamicViscosityFromKinematicViscosityAndDensity (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun dynamicViscosityFromKinematicViscosityAndDensityDefault (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertFromMomentumAndAreaKt {
 	public static final fun dynamicViscosityFromMomentumAndArea (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun dynamicViscosityFromMomentumAndAreaDefault (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1157,6 +1181,26 @@ public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/Conv
 	public static final fun dynamicViscosityFromPressureAndTimeDefault (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertToDensityKt {
+	public static final fun dynamicViscosityDivKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialDynamicViscosityDivImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricDynamicViscosityDivMetricKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ukImperialDynamicViscosityDivImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usCustomaryDynamicViscosityDivImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
+public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertToKinematicViscosityKt {
+	public static final fun dynamicViscosityDivDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialDynamicViscosityDivImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialDynamicViscosityDivUKImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialDynamicViscosityDivUSCustomaryDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricDynamicViscosityDivMetricDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ukImperialDynamicViscosityDivImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ukImperialDynamicViscosityDivUKImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usCustomaryDynamicViscosityDivImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usCustomaryDynamicViscosityDivUSCustomaryDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertToMomentumKt {
 	public static final fun dynamicViscosityTimesArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialDynamicViscosityTimesImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1650,6 +1694,7 @@ public final class com/splendo/kaluga/scientific/converter/energy/ConvertToPower
 	public static final fun kilowattHourDivHour (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun megajouleDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun megawattHourDivHour (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricEnergyDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun microjouleDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun microwattHourDivHour (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun millijouleDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1750,9 +1795,9 @@ public final class com/splendo/kaluga/scientific/converter/energy/ConvertToWeigh
 	public static final fun energyDivEquivalentDose (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun energyDivSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergDivRad (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ergDivRadMultiple (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergDivRem (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergDivRemMultiple (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun ergMultipleDivAbsorbedDose (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergMultipleDivRad (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergMultipleDivRadMultiple (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergMultipleDivRem (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1895,7 +1940,7 @@ public final class com/splendo/kaluga/scientific/converter/force/ConvertToPowerK
 
 public final class com/splendo/kaluga/scientific/converter/force/ConvertToPressureKt {
 	public static final fun dyneDivSquareCentimeter (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun dyneMultipleDivSquareCentime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun dyneMultipleDivSquareCentimeter (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun forceDivArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun grainForceDivImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialForceDivImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -2142,12 +2187,40 @@ public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/Co
 	public static final fun kinematicViscosityFromAreaAndTimeDefault (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertFromDynamicViscosityAndDensityKt {
+	public static final fun kinematicViscosityFromDynamicViscosityAndDensity (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun kinematicViscosityFromDynamicViscosityAndDensityDefault (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
+public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertFromSpecificEnergyAndTimeKt {
+	public static final fun kinematicViscosityFromSpecificEnergyAndTime (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun kinematicViscosityFromSpecificEnergyAndTimeDefault (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertToAreaKt {
 	public static final fun imperialKinematicViscosityTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun kinematicViscosityTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun metricKinematicViscosityTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertToDynamicViscosityKt {
+	public static final fun imperialKinematicViscosityTimesImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialKinematicViscosityTimesUKImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialKinematicViscosityTimesUSCustomaryDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun kinematicViscosityTimesDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricKinematicViscosityTimesMetricDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
+public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertToSpecificEnergyKt {
+	public static final fun imperialKinematicViscosityDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun kinematicViscosityDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricKinematicViscosityDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
+public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertToTimeKt {
+	public static final fun kinematicViscosityDivSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/length/ConvertFromAreaAndLengthKt {
 	public static final fun widthFromAreaAndLength (Lcom/splendo/kaluga/scientific/unit/Length;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun widthFromAreaAndLengthDefault (Lcom/splendo/kaluga/scientific/unit/Length;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -2703,7 +2776,7 @@ public final class com/splendo/kaluga/scientific/converter/molality/ConvertToSpe
 	public static final fun imperialMolalityTimesImperialMolarVolume (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialMolalityTimesUKImperialMolarVolume (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialMolalityTimesUSCustomaryMolarVolume (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricMolalityDivMetricMolality (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricMolalityDivMetricMolarity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun metricMolalityTimesMetricMolarVolume (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun molalityDivMolarity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun molalityTimesMolarVolume (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -2739,11 +2812,7 @@ public final class com/splendo/kaluga/scientific/converter/molarEnergy/ConvertTo
 	public static final fun molarEnergyTimesAmountOfSubstance (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
-public final class com/splendo/kaluga/scientific/converter/molarEnergy/ConvertToMolarEnergyKt {
-	public static final fun metricAndImperialMolarEnergyDivImperialSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricAndImperialMolarEnergyDivMetricSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricAndImperialMolarEnergyDivUKImperialSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricAndImperialMolarEnergyDivUSCustomarySpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+public final class com/splendo/kaluga/scientific/converter/molarEnergy/ConvertToMolarMassKt {
 	public static final fun molarEnergyDivImperialSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun molarEnergyDivMetricSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun molarEnergyDivSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -3250,7 +3319,7 @@ public final class com/splendo/kaluga/scientific/converter/solidAngle/ConvertFro
 
 public final class com/splendo/kaluga/scientific/converter/solidAngle/ConvertToIlluminanceKt {
 	public static final fun solidAngleTimesImperialLuminance (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun solidAngleTimesLambertTimes (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun solidAngleTimesLambert (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun solidAngleTimesLuminance (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun solidAngleTimesMetricLuminance (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun solidAngleTimesStilb (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -3275,6 +3344,11 @@ public final class com/splendo/kaluga/scientific/converter/specificEnergy/Conver
 	public static final fun specificEnergyFromEquivalentDoseDefault (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/specificEnergy/ConvertFromKinematicViscosityAndTimeKt {
+	public static final fun specificEnergyFromKinematicViscosityAndTime (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun specificEnergyFromKinematicViscosityAndTimeDefault (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/specificEnergy/ConvertFromMolarEnergyAndMolalityKt {
 	public static final fun specificEnergyFromMolarEnergyAndMolality (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun specificEnergyFromMolarEnergyAndMolalityDefault (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -3310,6 +3384,14 @@ public final class com/splendo/kaluga/scientific/converter/specificEnergy/Conver
 	public static final fun asEquivalentDose (Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/specificEnergy/ConvertToKinematicViscosityKt {
+	public static final fun imperialSpecificEnergyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricSpecificEnergyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun specificEnergyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ukImperialSpecificEnergyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usCustomarySpecificEnergyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/specificEnergy/ConvertToMolalityKt {
 	public static final fun imperialSpecificEnergyDivMolarEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun metricSpecificEnergyDivMolarEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -3698,6 +3780,11 @@ public final class com/splendo/kaluga/scientific/converter/time/ConvertFromKinem
 	public static final fun timeFromKinematicViscosityAndAreaDefault (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/time/ConvertFromKinematicViscosityAndSpecificEnergyKt {
+	public static final fun timeFromKinematicViscosityAndSpecificEnergy (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun timeFromKinematicViscosityAndSpecificEnergyDefault (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/time/ConvertFromLengthAndSpeedKt {
 	public static final fun timeFromDistanceAndSpeed (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeFromDistanceAndSpeedDefault (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -3837,6 +3924,14 @@ public final class com/splendo/kaluga/scientific/converter/time/ConvertToFrequen
 	public static final fun minuteFrequency (Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/time/ConvertToKinematicViscosityKt {
+	public static final fun timeTimesImperialSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun timeTimesMetricSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun timeTimesSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun timeTimesUkImperialSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun timeTimesUsCustomarySpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/time/ConvertToLengthKt {
 	public static final fun timeTimesImperialSpeed (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeTimesMetricSpeed (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
@@ -4306,16 +4401,16 @@ public final class com/splendo/kaluga/scientific/converter/weight/ConvertToEnerg
 }
 
 public final class com/splendo/kaluga/scientific/converter/weight/ConvertToForceKt {
-	public static final fun grainTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun gramTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun imperialTonTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun grainTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun gramTimesMetricAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialTonTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialWeightTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun metricWeightTimesMetricAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun ounceTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun poundTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ounceTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun poundTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ukImperialWeightTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun usCustomaryWeightTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun usTonTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usTonTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun weightTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
@@ -4373,12 +4468,6 @@ public final class com/splendo/kaluga/scientific/converter/weight/ConvertToMomen
 }
 
 public final class com/splendo/kaluga/scientific/converter/weight/ConvertToTimeKt {
-	public static final fun imperialWeightDivImperialMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricWeightDivMetricMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun ukImperialWeightDivImperialMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun ukImperialWeightDivUKImperialMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun usCustomaryWeightDivImperialMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun usCustomaryWeightDivUSCustomaryMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun weightDivMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
@@ -4478,7 +4567,7 @@ public final class com/splendo/kaluga/scientific/formatter/ScientificValueFormat
 	public static synthetic fun toString$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/formatter/ScientificValueFormatter;ILjava/lang/Object;)Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Abampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Abampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -4490,7 +4579,7 @@ public final class com/splendo/kaluga/scientific/unit/Abampere : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Abcoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Abcoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abcoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -4502,7 +4591,7 @@ public final class com/splendo/kaluga/scientific/unit/Abcoulomb : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Abfarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Abfarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abfarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -4514,7 +4603,7 @@ public final class com/splendo/kaluga/scientific/unit/Abfarad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Abhenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Abhenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abhenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -4526,7 +4615,7 @@ public final class com/splendo/kaluga/scientific/unit/Abhenry : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Abohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Abohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -4538,7 +4627,7 @@ public final class com/splendo/kaluga/scientific/unit/Abohm : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Absiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Absiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Absiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -4682,6 +4771,16 @@ public final class com/splendo/kaluga/scientific/unit/Ampere : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/AmpereMultiple : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/AmpereMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/AmpereMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/AmpereMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Angle : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Angle$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -4889,6 +4988,16 @@ public final class com/splendo/kaluga/scientific/unit/Bar : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/BarMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/BarMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/BarMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/BarMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Barye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Barye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -4901,6 +5010,16 @@ public final class com/splendo/kaluga/scientific/unit/Barye : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/BaryeMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/BaryeMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/BaryeMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/BaryeMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/BeatsPerMinute : com/splendo/kaluga/scientific/unit/Frequency {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BeatsPerMinute;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -4925,7 +5044,17 @@ public final class com/splendo/kaluga/scientific/unit/Becquerel : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Biot : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public abstract class com/splendo/kaluga/scientific/unit/BecquerelMultiple : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/BecquerelMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/BecquerelMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/BecquerelMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public final class com/splendo/kaluga/scientific/unit/Biot : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Biot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -5033,6 +5162,26 @@ public final class com/splendo/kaluga/scientific/unit/Calorie$IT : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/CalorieMultiple : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CalorieMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/CalorieMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/CalorieMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public abstract class com/splendo/kaluga/scientific/unit/CalorieMultiple$IT : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CalorieMultiple$IT$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/CalorieMultiple$IT;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/CalorieMultiple$IT$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract interface class com/splendo/kaluga/scientific/unit/CalorieUnit : com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 }
 
@@ -5048,6 +5197,16 @@ public final class com/splendo/kaluga/scientific/unit/Candela : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/CandelaMultiple : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CandelaMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/CandelaMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/CandelaMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/CatalysticActivity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CatalysticActivity$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -5080,7 +5239,7 @@ public final class com/splendo/kaluga/scientific/unit/Centi : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -5092,7 +5251,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiampere : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centibar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5104,7 +5263,7 @@ public final class com/splendo/kaluga/scientific/unit/Centibar : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centibarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5116,7 +5275,7 @@ public final class com/splendo/kaluga/scientific/unit/Centibarye : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centibecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -5128,7 +5287,7 @@ public final class com/splendo/kaluga/scientific/unit/Centibecquerel : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centicandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -5140,7 +5299,7 @@ public final class com/splendo/kaluga/scientific/unit/Centicandela : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centicoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -5152,7 +5311,7 @@ public final class com/splendo/kaluga/scientific/unit/Centicoulomb : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centicurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -5164,7 +5323,7 @@ public final class com/splendo/kaluga/scientific/unit/Centicurie : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centidalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centidalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -5176,7 +5335,7 @@ public final class com/splendo/kaluga/scientific/unit/Centidalton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centidyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centidyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -5188,7 +5347,7 @@ public final class com/splendo/kaluga/scientific/unit/Centidyne : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centielectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centielectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -5200,7 +5359,7 @@ public final class com/splendo/kaluga/scientific/unit/Centielectronvolt : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centierg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centierg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -5212,7 +5371,7 @@ public final class com/splendo/kaluga/scientific/unit/Centierg : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centifarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centifarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -5224,7 +5383,7 @@ public final class com/splendo/kaluga/scientific/unit/Centifarad : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centigram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centigram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centigram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -5236,7 +5395,7 @@ public final class com/splendo/kaluga/scientific/unit/Centigram : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centigray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centigray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centigray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -5248,7 +5407,7 @@ public final class com/splendo/kaluga/scientific/unit/Centigray : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centihenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centihenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -5260,7 +5419,7 @@ public final class com/splendo/kaluga/scientific/unit/Centihenry : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centihertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centihertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -5272,7 +5431,7 @@ public final class com/splendo/kaluga/scientific/unit/Centihertz : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centijoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centijoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -5284,7 +5443,7 @@ public final class com/splendo/kaluga/scientific/unit/Centijoule : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centikatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centikatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -5296,7 +5455,7 @@ public final class com/splendo/kaluga/scientific/unit/Centikatal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -5308,7 +5467,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiliter : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centilumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centilumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -5320,7 +5479,7 @@ public final class com/splendo/kaluga/scientific/unit/Centilumen : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centilux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centilux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -5332,7 +5491,7 @@ public final class com/splendo/kaluga/scientific/unit/Centilux : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centimeter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centimeter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -5356,7 +5515,7 @@ public final class com/splendo/kaluga/scientific/unit/CentimeterOfWater : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centimole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centimole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -5368,7 +5527,7 @@ public final class com/splendo/kaluga/scientific/unit/Centimole : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centinewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centinewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -5380,7 +5539,7 @@ public final class com/splendo/kaluga/scientific/unit/Centinewton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centinit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centinit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -5392,7 +5551,7 @@ public final class com/splendo/kaluga/scientific/unit/Centinit : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -5404,7 +5563,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiohm : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centipascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centipascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5416,7 +5575,7 @@ public final class com/splendo/kaluga/scientific/unit/Centipascal : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -5428,7 +5587,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiphot : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centirad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centirad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -5440,7 +5599,7 @@ public final class com/splendo/kaluga/scientific/unit/Centirad : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiradian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -5452,7 +5611,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiradian : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -5464,7 +5623,7 @@ public final class com/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centisecond : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
@@ -5476,7 +5635,7 @@ public final class com/splendo/kaluga/scientific/unit/Centisecond : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centisiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -5488,7 +5647,7 @@ public final class com/splendo/kaluga/scientific/unit/Centisiemens : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centisievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -5500,7 +5659,7 @@ public final class com/splendo/kaluga/scientific/unit/Centisievert : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centisteradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisteradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
@@ -5512,7 +5671,7 @@ public final class com/splendo/kaluga/scientific/unit/Centisteradian : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centitesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centitesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -5524,7 +5683,7 @@ public final class com/splendo/kaluga/scientific/unit/Centitesla : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centitorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centitorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5536,7 +5695,7 @@ public final class com/splendo/kaluga/scientific/unit/Centitorr : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiturn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiturn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -5548,7 +5707,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiturn : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centivolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centivolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -5560,7 +5719,7 @@ public final class com/splendo/kaluga/scientific/unit/Centivolt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiwatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiwatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -5572,7 +5731,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiwatt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/CentiwattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/CentiwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CentiwattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -5584,7 +5743,7 @@ public final class com/splendo/kaluga/scientific/unit/CentiwattHour : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -5608,6 +5767,16 @@ public final class com/splendo/kaluga/scientific/unit/Coulomb : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/CoulombMultiple : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CoulombMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/CoulombMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/CoulombMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Cubic : com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/SystemScientificUnit;)V
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -5810,6 +5979,16 @@ public final class com/splendo/kaluga/scientific/unit/Curie : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/CurieMultiple : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CurieMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/CurieMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/CurieMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Dalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Dalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -5822,6 +6001,16 @@ public final class com/splendo/kaluga/scientific/unit/Dalton : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/DaltonMultiple : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/DaltonMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/DaltonMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/DaltonMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Deca : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -5831,7 +6020,7 @@ public final class com/splendo/kaluga/scientific/unit/Deca : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -5843,7 +6032,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decabar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5855,7 +6044,7 @@ public final class com/splendo/kaluga/scientific/unit/Decabar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decabarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5867,7 +6056,7 @@ public final class com/splendo/kaluga/scientific/unit/Decabarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decabecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -5879,7 +6068,7 @@ public final class com/splendo/kaluga/scientific/unit/Decabecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decacandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -5891,7 +6080,7 @@ public final class com/splendo/kaluga/scientific/unit/Decacandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decacoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -5903,7 +6092,7 @@ public final class com/splendo/kaluga/scientific/unit/Decacoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decacurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -5915,7 +6104,7 @@ public final class com/splendo/kaluga/scientific/unit/Decacurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decadalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decadalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -5927,7 +6116,7 @@ public final class com/splendo/kaluga/scientific/unit/Decadalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decadyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decadyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -5939,7 +6128,7 @@ public final class com/splendo/kaluga/scientific/unit/Decadyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -5951,7 +6140,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaelectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -5963,7 +6152,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaerg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decafarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decafarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -5975,7 +6164,7 @@ public final class com/splendo/kaluga/scientific/unit/Decafarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decagram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decagram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -5987,7 +6176,7 @@ public final class com/splendo/kaluga/scientific/unit/Decagram : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decagray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decagray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -5999,7 +6188,7 @@ public final class com/splendo/kaluga/scientific/unit/Decagray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decahenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decahenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -6011,7 +6200,7 @@ public final class com/splendo/kaluga/scientific/unit/Decahenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decahertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decahertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -6023,7 +6212,7 @@ public final class com/splendo/kaluga/scientific/unit/Decahertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decajoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decajoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6035,7 +6224,7 @@ public final class com/splendo/kaluga/scientific/unit/Decajoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decakatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decakatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -6047,7 +6236,7 @@ public final class com/splendo/kaluga/scientific/unit/Decakatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -6059,7 +6248,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decalumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decalumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -6071,7 +6260,7 @@ public final class com/splendo/kaluga/scientific/unit/Decalumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decalux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decalux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -6083,7 +6272,7 @@ public final class com/splendo/kaluga/scientific/unit/Decalux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decameter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decameter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -6095,7 +6284,7 @@ public final class com/splendo/kaluga/scientific/unit/Decameter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decamole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decamole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -6107,7 +6296,7 @@ public final class com/splendo/kaluga/scientific/unit/Decamole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decanewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decanewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decanewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -6119,7 +6308,7 @@ public final class com/splendo/kaluga/scientific/unit/Decanewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decanit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decanit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decanit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -6131,7 +6320,7 @@ public final class com/splendo/kaluga/scientific/unit/Decanit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -6143,7 +6332,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decapascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decapascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6155,7 +6344,7 @@ public final class com/splendo/kaluga/scientific/unit/Decapascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -6167,7 +6356,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaphot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decarad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -6179,7 +6368,7 @@ public final class com/splendo/kaluga/scientific/unit/Decarad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -6191,7 +6380,7 @@ public final class com/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decasiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decasiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -6203,7 +6392,7 @@ public final class com/splendo/kaluga/scientific/unit/Decasiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decasievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decasievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -6215,7 +6404,7 @@ public final class com/splendo/kaluga/scientific/unit/Decasievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decatesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decatesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -6227,7 +6416,7 @@ public final class com/splendo/kaluga/scientific/unit/Decatesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decatorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decatorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6239,7 +6428,7 @@ public final class com/splendo/kaluga/scientific/unit/Decatorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decavolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decavolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -6251,7 +6440,7 @@ public final class com/splendo/kaluga/scientific/unit/Decavolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decawatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decawatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -6263,7 +6452,7 @@ public final class com/splendo/kaluga/scientific/unit/Decawatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/DecawattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/DecawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DecawattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6275,7 +6464,7 @@ public final class com/splendo/kaluga/scientific/unit/DecawattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -6296,7 +6485,7 @@ public final class com/splendo/kaluga/scientific/unit/Deci : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -6308,7 +6497,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decibar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6320,7 +6509,7 @@ public final class com/splendo/kaluga/scientific/unit/Decibar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decibarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6332,7 +6521,7 @@ public final class com/splendo/kaluga/scientific/unit/Decibarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decibecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -6344,7 +6533,7 @@ public final class com/splendo/kaluga/scientific/unit/Decibecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decicandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -6356,7 +6545,7 @@ public final class com/splendo/kaluga/scientific/unit/Decicandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decicoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -6368,7 +6557,7 @@ public final class com/splendo/kaluga/scientific/unit/Decicoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decicurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -6380,7 +6569,7 @@ public final class com/splendo/kaluga/scientific/unit/Decicurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decidalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decidalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -6392,7 +6581,7 @@ public final class com/splendo/kaluga/scientific/unit/Decidalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decidyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decidyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -6404,7 +6593,7 @@ public final class com/splendo/kaluga/scientific/unit/Decidyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decielectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decielectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6416,7 +6605,7 @@ public final class com/splendo/kaluga/scientific/unit/Decielectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decierg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decierg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6428,7 +6617,7 @@ public final class com/splendo/kaluga/scientific/unit/Decierg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decifarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decifarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -6440,7 +6629,7 @@ public final class com/splendo/kaluga/scientific/unit/Decifarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decigram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decigram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decigram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -6452,7 +6641,7 @@ public final class com/splendo/kaluga/scientific/unit/Decigram : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decigray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decigray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decigray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -6464,7 +6653,7 @@ public final class com/splendo/kaluga/scientific/unit/Decigray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decihenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decihenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -6476,7 +6665,7 @@ public final class com/splendo/kaluga/scientific/unit/Decihenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decihertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decihertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -6488,7 +6677,7 @@ public final class com/splendo/kaluga/scientific/unit/Decihertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decijoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decijoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6500,7 +6689,7 @@ public final class com/splendo/kaluga/scientific/unit/Decijoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decikatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decikatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -6512,7 +6701,7 @@ public final class com/splendo/kaluga/scientific/unit/Decikatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -6524,7 +6713,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decilumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decilumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -6536,7 +6725,7 @@ public final class com/splendo/kaluga/scientific/unit/Decilumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decilux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decilux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -6548,7 +6737,7 @@ public final class com/splendo/kaluga/scientific/unit/Decilux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decimeter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decimeter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -6560,7 +6749,7 @@ public final class com/splendo/kaluga/scientific/unit/Decimeter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decimole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decimole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -6572,7 +6761,7 @@ public final class com/splendo/kaluga/scientific/unit/Decimole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decinewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decinewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -6584,7 +6773,7 @@ public final class com/splendo/kaluga/scientific/unit/Decinewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decinit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decinit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -6596,7 +6785,7 @@ public final class com/splendo/kaluga/scientific/unit/Decinit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -6608,7 +6797,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decipascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decipascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6620,7 +6809,7 @@ public final class com/splendo/kaluga/scientific/unit/Decipascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -6632,7 +6821,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciphot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decirad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decirad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -6644,7 +6833,7 @@ public final class com/splendo/kaluga/scientific/unit/Decirad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciradian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -6656,7 +6845,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciradian : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -6668,7 +6857,7 @@ public final class com/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decisecond : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
@@ -6680,7 +6869,7 @@ public final class com/splendo/kaluga/scientific/unit/Decisecond : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decisiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -6692,7 +6881,7 @@ public final class com/splendo/kaluga/scientific/unit/Decisiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decisievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -6704,7 +6893,7 @@ public final class com/splendo/kaluga/scientific/unit/Decisievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decisteradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisteradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
@@ -6716,7 +6905,7 @@ public final class com/splendo/kaluga/scientific/unit/Decisteradian : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decitesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decitesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -6728,7 +6917,7 @@ public final class com/splendo/kaluga/scientific/unit/Decitesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decitorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decitorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6740,7 +6929,7 @@ public final class com/splendo/kaluga/scientific/unit/Decitorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciturn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciturn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -6752,7 +6941,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciturn : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decivolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decivolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -6764,7 +6953,7 @@ public final class com/splendo/kaluga/scientific/unit/Decivolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciwatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciwatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -6776,7 +6965,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciwatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/DeciwattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/DeciwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DeciwattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6788,7 +6977,7 @@ public final class com/splendo/kaluga/scientific/unit/DeciwattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -6948,6 +7137,16 @@ public final class com/splendo/kaluga/scientific/unit/Dyne : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/DyneMultiple : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/DyneMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/DyneMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/DyneMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/ElectricCapacitance : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ElectricCapacitance$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -7045,6 +7244,16 @@ public final class com/splendo/kaluga/scientific/unit/Electronvolt : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/ElectronvoltMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ElectronvoltMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ElectronvoltMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/ElectronvoltMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Energy : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Energy$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -7077,6 +7286,16 @@ public final class com/splendo/kaluga/scientific/unit/Erg : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/ErgMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ErgMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ErgMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/ErgMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/ErgPerSecond : com/splendo/kaluga/scientific/unit/MetricPower, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ErgPerSecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -7110,6 +7329,16 @@ public final class com/splendo/kaluga/scientific/unit/Farad : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/FaradMultiple : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/FaradMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/FaradMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/FaradMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Foot : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Foot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -7252,7 +7481,7 @@ public final class com/splendo/kaluga/scientific/unit/Giga : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -7264,7 +7493,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigabar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7276,7 +7505,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigabar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigabarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7288,7 +7517,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigabarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigabecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -7300,7 +7529,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigabecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigacandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -7312,7 +7541,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigacandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigacoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -7324,7 +7553,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigacoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigacurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -7336,7 +7565,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigacurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigadalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigadalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -7348,7 +7577,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigadalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigadyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigadyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -7360,7 +7589,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigadyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -7372,7 +7601,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaelectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -7384,7 +7613,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaerg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigafarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigafarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -7396,7 +7625,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigafarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigagram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigagram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -7408,7 +7637,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigagram : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigagray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigagray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -7420,7 +7649,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigagray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigahenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigahenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -7432,7 +7661,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigahenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigahertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigahertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -7444,7 +7673,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigahertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigajoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigajoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -7456,7 +7685,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigajoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigakatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigakatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -7468,7 +7697,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigakatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -7480,7 +7709,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigalumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigalumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -7492,7 +7721,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigalumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigalux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigalux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -7504,7 +7733,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigalux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigameter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigameter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -7516,7 +7745,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigameter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigamole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigamole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -7528,7 +7757,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigamole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Giganewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Giganewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Giganewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -7540,7 +7769,7 @@ public final class com/splendo/kaluga/scientific/unit/Giganewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Giganit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Giganit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Giganit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -7552,7 +7781,7 @@ public final class com/splendo/kaluga/scientific/unit/Giganit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -7564,7 +7793,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigapascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigapascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7576,7 +7805,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigapascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -7588,7 +7817,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaphot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigarad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -7600,7 +7829,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigarad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -7612,7 +7841,7 @@ public final class com/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigasiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigasiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -7624,7 +7853,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigasiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigasievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigasievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -7636,7 +7865,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigasievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigatesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigatesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -7648,7 +7877,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigatesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigatorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigatorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7660,7 +7889,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigatorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigavolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigavolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -7672,7 +7901,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigavolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigawatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigawatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -7684,7 +7913,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigawatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/GigawattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/GigawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GigawattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -7696,7 +7925,7 @@ public final class com/splendo/kaluga/scientific/unit/GigawattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -7759,6 +7988,16 @@ public final class com/splendo/kaluga/scientific/unit/GramForce : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/GramMultiple : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/GramMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/GramMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/GramMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Gray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -7771,6 +8010,16 @@ public final class com/splendo/kaluga/scientific/unit/Gray : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/GrayMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/GrayMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/GrayMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/GrayMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/HeatCapacity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/HeatCapacity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$HeatCapacity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -7822,7 +8071,7 @@ public final class com/splendo/kaluga/scientific/unit/Hecto : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/HectoDalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/HectoDalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoDalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -7834,7 +8083,7 @@ public final class com/splendo/kaluga/scientific/unit/HectoDalton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/HectoOhm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/HectoOhm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoOhm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -7846,7 +8095,7 @@ public final class com/splendo/kaluga/scientific/unit/HectoOhm : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectoampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectoampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -7858,7 +8107,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectoampere : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectobar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7870,7 +8119,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectobar : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectobarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7882,7 +8131,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectobarye : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectobecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -7894,7 +8143,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectobecquerel : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectocandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -7906,7 +8155,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectocandela : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectocoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -7918,7 +8167,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectocoulomb : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectocurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -7930,7 +8179,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectocurie : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectodyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectodyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -7942,7 +8191,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectodyne : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectoelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectoelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -7954,7 +8203,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectoelectronvolt : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectoerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectoerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -7966,7 +8215,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectoerg : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectofarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectofarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -7978,7 +8227,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectofarad : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectogram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectogram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -7990,7 +8239,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectogram : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectogray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectogray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -8002,7 +8251,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectogray : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectohenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectohenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -8014,7 +8263,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectohenry : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectohertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectohertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -8026,7 +8275,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectohertz : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectojoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectojoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -8038,7 +8287,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectojoule : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectokatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectokatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -8050,7 +8299,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectokatal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectoliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectoliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -8062,7 +8311,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectoliter : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectolumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectolumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -8074,7 +8323,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectolumen : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectolux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectolux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -8086,7 +8335,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectolux : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectometer : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectometer;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -8098,7 +8347,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectometer : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectomole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectomole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -8110,7 +8359,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectomole : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectonewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectonewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -8122,7 +8371,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectonewton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectonit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectonit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -8134,7 +8383,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectonit : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectopascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectopascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -8146,7 +8395,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectopascal : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectophot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectophot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -8158,7 +8407,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectophot : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectorad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectorad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -8170,7 +8419,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectorad : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -8182,7 +8431,7 @@ public final class com/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectosiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectosiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -8194,7 +8443,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectosiemens : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectosievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectosievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -8206,7 +8455,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectosievert : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectotesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectotesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -8218,7 +8467,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectotesla : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectotorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectotorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -8230,7 +8479,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectotorr : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectovolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectovolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectovolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -8242,7 +8491,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectovolt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectowatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectowatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -8254,7 +8503,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectowatt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/HectowattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/HectowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectowattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -8266,7 +8515,7 @@ public final class com/splendo/kaluga/scientific/unit/HectowattHour : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectoweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectoweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -8290,6 +8539,16 @@ public final class com/splendo/kaluga/scientific/unit/Henry : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/HenryMultiple : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/HenryMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/HenryMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/HenryMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Hertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -8301,6 +8560,16 @@ public final class com/splendo/kaluga/scientific/unit/Hertz : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/HertzMultiple : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/HertzMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/HertzMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/HertzMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Horsepower : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Horsepower;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -9603,6 +9872,16 @@ public final class com/splendo/kaluga/scientific/unit/Joule : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/JouleMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/JouleMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/JouleMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/JouleMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Katal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Katal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -9615,6 +9894,16 @@ public final class com/splendo/kaluga/scientific/unit/Katal : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/KatalMultiple : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/KatalMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/KatalMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/KatalMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Kelvin : com/splendo/kaluga/scientific/unit/MetricAndUKImperialTemperature {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kelvin;
 	public fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -9641,7 +9930,7 @@ public final class com/splendo/kaluga/scientific/unit/KiloPoundSquareInch : com/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -9653,7 +9942,7 @@ public final class com/splendo/kaluga/scientific/unit/Kiloampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilobar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -9665,7 +9954,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilobar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilobarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -9677,7 +9966,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilobarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilobecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -9689,7 +9978,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilobecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilocalorie : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilocalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocalorie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -9701,7 +9990,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilocalorie : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilocalorie$IT : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilocalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocalorie$IT;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -9713,7 +10002,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilocalorie$IT : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilocandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -9725,7 +10014,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilocandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilocoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -9737,7 +10026,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilocoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilocurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -9749,7 +10038,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilocurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilodalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilodalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilodalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -9761,7 +10050,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilodalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilodyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilodyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -9773,7 +10062,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilodyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -9785,7 +10074,7 @@ public final class com/splendo/kaluga/scientific/unit/Kiloelectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -9797,7 +10086,7 @@ public final class com/splendo/kaluga/scientific/unit/Kiloerg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilofarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilofarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -9809,7 +10098,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilofarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilogram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilogram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -9833,7 +10122,7 @@ public final class com/splendo/kaluga/scientific/unit/KilogramForce : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilogray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilogray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -9845,7 +10134,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilogray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilohenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilohenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -9857,7 +10146,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilohenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilohertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilohertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -9869,7 +10158,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilohertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilojoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilojoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -9881,7 +10170,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilojoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilokatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilokatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -9893,7 +10182,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilokatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -9905,7 +10194,7 @@ public final class com/splendo/kaluga/scientific/unit/Kiloliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilolumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilolumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -9917,7 +10206,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilolumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilolux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilolux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -9929,7 +10218,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilolux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilometer : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilometer;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -9941,7 +10230,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilometer : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilomole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilomole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -9953,7 +10242,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilomole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilonewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilonewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -9965,7 +10254,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilonewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilonit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilonit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -9977,7 +10266,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilonit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -9989,7 +10278,7 @@ public final class com/splendo/kaluga/scientific/unit/Kiloohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilopascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilopascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10001,7 +10290,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilopascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilophot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilophot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -10013,7 +10302,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilophot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilorad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilorad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -10025,7 +10314,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilorad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -10037,7 +10326,7 @@ public final class com/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilosiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilosiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -10049,7 +10338,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilosiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilosievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilosievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -10061,7 +10350,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilosievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilotesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilotesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -10073,7 +10362,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilotesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilotorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilotorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10085,7 +10374,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilotorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilovolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilovolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilovolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -10097,7 +10386,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilovolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilowatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilowatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -10109,7 +10398,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilowatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/KilowattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/KilowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KilowattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10121,7 +10410,7 @@ public final class com/splendo/kaluga/scientific/unit/KilowattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -10252,6 +10541,16 @@ public final class com/splendo/kaluga/scientific/unit/Liter : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/LiterMultiple : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/LiterMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LiterMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/LiterMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Lumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Lumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -10264,6 +10563,16 @@ public final class com/splendo/kaluga/scientific/unit/Lumen : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/LumenMultiple : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/LumenMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LumenMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/LumenMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Luminance : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Luminance$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -10390,6 +10699,16 @@ public final class com/splendo/kaluga/scientific/unit/Lux : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/LuxMultiple : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/LuxMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LuxMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/LuxMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/MagneticFlux : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MagneticFlux$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -10529,7 +10848,7 @@ public final class com/splendo/kaluga/scientific/unit/Mega : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -10541,7 +10860,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megabar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10553,7 +10872,7 @@ public final class com/splendo/kaluga/scientific/unit/Megabar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megabarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10565,7 +10884,7 @@ public final class com/splendo/kaluga/scientific/unit/Megabarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megabecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -10577,7 +10896,7 @@ public final class com/splendo/kaluga/scientific/unit/Megabecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megacalorie : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megacalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacalorie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10589,7 +10908,7 @@ public final class com/splendo/kaluga/scientific/unit/Megacalorie : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megacalorie$IT : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megacalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacalorie$IT;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10601,7 +10920,7 @@ public final class com/splendo/kaluga/scientific/unit/Megacalorie$IT : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megacandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -10613,7 +10932,7 @@ public final class com/splendo/kaluga/scientific/unit/Megacandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megacoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -10625,7 +10944,7 @@ public final class com/splendo/kaluga/scientific/unit/Megacoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megacurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -10637,7 +10956,7 @@ public final class com/splendo/kaluga/scientific/unit/Megacurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megadalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megadalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -10649,7 +10968,7 @@ public final class com/splendo/kaluga/scientific/unit/Megadalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megadyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megadyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -10661,7 +10980,7 @@ public final class com/splendo/kaluga/scientific/unit/Megadyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10673,7 +10992,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaelectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10685,7 +11004,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaerg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megafarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megafarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -10697,7 +11016,7 @@ public final class com/splendo/kaluga/scientific/unit/Megafarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megagram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megagram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -10709,7 +11028,7 @@ public final class com/splendo/kaluga/scientific/unit/Megagram : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megagray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megagray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -10721,7 +11040,7 @@ public final class com/splendo/kaluga/scientific/unit/Megagray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megahenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megahenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -10733,7 +11052,7 @@ public final class com/splendo/kaluga/scientific/unit/Megahenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megahertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megahertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -10745,7 +11064,7 @@ public final class com/splendo/kaluga/scientific/unit/Megahertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megajoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megajoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10757,7 +11076,7 @@ public final class com/splendo/kaluga/scientific/unit/Megajoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megakatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megakatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -10769,7 +11088,7 @@ public final class com/splendo/kaluga/scientific/unit/Megakatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -10781,7 +11100,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megalumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megalumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -10793,7 +11112,7 @@ public final class com/splendo/kaluga/scientific/unit/Megalumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megalux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megalux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -10805,7 +11124,7 @@ public final class com/splendo/kaluga/scientific/unit/Megalux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megameter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megameter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -10817,7 +11136,7 @@ public final class com/splendo/kaluga/scientific/unit/Megameter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megamole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megamole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -10829,7 +11148,7 @@ public final class com/splendo/kaluga/scientific/unit/Megamole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Meganewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Meganewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Meganewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -10841,7 +11160,7 @@ public final class com/splendo/kaluga/scientific/unit/Meganewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Meganit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Meganit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Meganit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -10853,7 +11172,7 @@ public final class com/splendo/kaluga/scientific/unit/Meganit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -10865,7 +11184,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megapascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megapascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10877,7 +11196,7 @@ public final class com/splendo/kaluga/scientific/unit/Megapascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -10889,7 +11208,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaphot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megarad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -10901,7 +11220,7 @@ public final class com/splendo/kaluga/scientific/unit/Megarad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -10913,7 +11232,7 @@ public final class com/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megasiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megasiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -10925,7 +11244,7 @@ public final class com/splendo/kaluga/scientific/unit/Megasiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megasievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megasievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -10937,7 +11256,7 @@ public final class com/splendo/kaluga/scientific/unit/Megasievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megatesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megatesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -10949,7 +11268,7 @@ public final class com/splendo/kaluga/scientific/unit/Megatesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megatorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megatorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10961,7 +11280,7 @@ public final class com/splendo/kaluga/scientific/unit/Megatorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megavolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megavolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -10973,7 +11292,7 @@ public final class com/splendo/kaluga/scientific/unit/Megavolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megawatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megawatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -10985,7 +11304,7 @@ public final class com/splendo/kaluga/scientific/unit/Megawatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MegawattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MegawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MegawattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10997,7 +11316,7 @@ public final class com/splendo/kaluga/scientific/unit/MegawattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -11021,6 +11340,16 @@ public final class com/splendo/kaluga/scientific/unit/Meter : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/MeterMultiple : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MeterMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MeterMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/MeterMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/MetricAcceleration : com/splendo/kaluga/scientific/unit/Acceleration, com/splendo/kaluga/scientific/unit/MetricScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MetricAcceleration$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Acceleration;Lcom/splendo/kaluga/scientific/unit/MetricSpeed;Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -12345,7 +12674,7 @@ public final class com/splendo/kaluga/scientific/unit/Micro : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -12357,7 +12686,7 @@ public final class com/splendo/kaluga/scientific/unit/Microampere : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microbar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microbar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12369,7 +12698,7 @@ public final class com/splendo/kaluga/scientific/unit/Microbar : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microbarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microbarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12381,7 +12710,7 @@ public final class com/splendo/kaluga/scientific/unit/Microbarye : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microbecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microbecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -12393,7 +12722,7 @@ public final class com/splendo/kaluga/scientific/unit/Microbecquerel : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microcandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microcandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -12405,7 +12734,7 @@ public final class com/splendo/kaluga/scientific/unit/Microcandela : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microcoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microcoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -12417,7 +12746,7 @@ public final class com/splendo/kaluga/scientific/unit/Microcoulomb : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microcurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microcurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -12429,7 +12758,7 @@ public final class com/splendo/kaluga/scientific/unit/Microcurie : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microdalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microdalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microdalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -12441,7 +12770,7 @@ public final class com/splendo/kaluga/scientific/unit/Microdalton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microdyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microdyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microdyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -12453,7 +12782,7 @@ public final class com/splendo/kaluga/scientific/unit/Microdyne : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12465,7 +12794,7 @@ public final class com/splendo/kaluga/scientific/unit/Microelectronvolt : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12477,7 +12806,7 @@ public final class com/splendo/kaluga/scientific/unit/Microerg : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microfarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microfarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microfarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -12489,7 +12818,7 @@ public final class com/splendo/kaluga/scientific/unit/Microfarad : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microgram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microgram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microgram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -12501,7 +12830,7 @@ public final class com/splendo/kaluga/scientific/unit/Microgram : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microgray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microgray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microgray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -12513,7 +12842,7 @@ public final class com/splendo/kaluga/scientific/unit/Microgray : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microhenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microhenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microhenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -12525,7 +12854,7 @@ public final class com/splendo/kaluga/scientific/unit/Microhenry : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microhertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microhertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microhertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -12537,7 +12866,7 @@ public final class com/splendo/kaluga/scientific/unit/Microhertz : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microjoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microjoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microjoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12549,7 +12878,7 @@ public final class com/splendo/kaluga/scientific/unit/Microjoule : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microkatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microkatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microkatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -12561,7 +12890,7 @@ public final class com/splendo/kaluga/scientific/unit/Microkatal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -12573,7 +12902,7 @@ public final class com/splendo/kaluga/scientific/unit/Microliter : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microlumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microlumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microlumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -12585,7 +12914,7 @@ public final class com/splendo/kaluga/scientific/unit/Microlumen : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microlux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microlux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microlux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -12597,7 +12926,7 @@ public final class com/splendo/kaluga/scientific/unit/Microlux : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Micrometer : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Micrometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micrometer;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -12609,7 +12938,7 @@ public final class com/splendo/kaluga/scientific/unit/Micrometer : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Micromole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Micromole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micromole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -12621,7 +12950,7 @@ public final class com/splendo/kaluga/scientific/unit/Micromole : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Micronewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Micronewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micronewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -12633,7 +12962,7 @@ public final class com/splendo/kaluga/scientific/unit/Micronewton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Micronit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Micronit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micronit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -12645,7 +12974,7 @@ public final class com/splendo/kaluga/scientific/unit/Micronit : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -12657,7 +12986,7 @@ public final class com/splendo/kaluga/scientific/unit/Microohm : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Micropascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Micropascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micropascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12669,7 +12998,7 @@ public final class com/splendo/kaluga/scientific/unit/Micropascal : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -12681,7 +13010,7 @@ public final class com/splendo/kaluga/scientific/unit/Microphot : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microrad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microrad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microrad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -12693,7 +13022,7 @@ public final class com/splendo/kaluga/scientific/unit/Microrad : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microradian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -12705,7 +13034,7 @@ public final class com/splendo/kaluga/scientific/unit/Microradian : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -12717,7 +13046,7 @@ public final class com/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microsecond : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microsecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
@@ -12729,7 +13058,7 @@ public final class com/splendo/kaluga/scientific/unit/Microsecond : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microsiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microsiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -12741,7 +13070,7 @@ public final class com/splendo/kaluga/scientific/unit/Microsiemens : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microsievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microsievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -12753,7 +13082,7 @@ public final class com/splendo/kaluga/scientific/unit/Microsievert : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microsteradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microsteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsteradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
@@ -12765,7 +13094,7 @@ public final class com/splendo/kaluga/scientific/unit/Microsteradian : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microtesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microtesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microtesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -12777,7 +13106,7 @@ public final class com/splendo/kaluga/scientific/unit/Microtesla : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microtorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microtorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microtorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12789,7 +13118,7 @@ public final class com/splendo/kaluga/scientific/unit/Microtorr : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microturn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microturn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -12801,7 +13130,7 @@ public final class com/splendo/kaluga/scientific/unit/Microturn : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microvolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microvolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -12813,7 +13142,7 @@ public final class com/splendo/kaluga/scientific/unit/Microvolt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microwatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microwatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -12825,7 +13154,7 @@ public final class com/splendo/kaluga/scientific/unit/Microwatt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MicrowattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MicrowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MicrowattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12837,7 +13166,7 @@ public final class com/splendo/kaluga/scientific/unit/MicrowattHour : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -12865,7 +13194,7 @@ public final class com/splendo/kaluga/scientific/unit/Milli : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -12877,7 +13206,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliampere : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millibar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12889,7 +13218,7 @@ public final class com/splendo/kaluga/scientific/unit/Millibar : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millibarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12901,7 +13230,7 @@ public final class com/splendo/kaluga/scientific/unit/Millibarye : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millibecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -12913,7 +13242,7 @@ public final class com/splendo/kaluga/scientific/unit/Millibecquerel : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millicalorie : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millicalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicalorie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12925,7 +13254,7 @@ public final class com/splendo/kaluga/scientific/unit/Millicalorie : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millicalorie$IT : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millicalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicalorie$IT;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12937,7 +13266,7 @@ public final class com/splendo/kaluga/scientific/unit/Millicalorie$IT : com/sple
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millicandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -12949,7 +13278,7 @@ public final class com/splendo/kaluga/scientific/unit/Millicandela : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millicoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -12961,7 +13290,7 @@ public final class com/splendo/kaluga/scientific/unit/Millicoulomb : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millicurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -12973,7 +13302,7 @@ public final class com/splendo/kaluga/scientific/unit/Millicurie : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millidalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millidalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -12985,7 +13314,7 @@ public final class com/splendo/kaluga/scientific/unit/Millidalton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millidyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millidyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -12997,7 +13326,7 @@ public final class com/splendo/kaluga/scientific/unit/Millidyne : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millielectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millielectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13009,7 +13338,7 @@ public final class com/splendo/kaluga/scientific/unit/Millielectronvolt : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millierg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millierg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13021,7 +13350,7 @@ public final class com/splendo/kaluga/scientific/unit/Millierg : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millifarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millifarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -13033,7 +13362,7 @@ public final class com/splendo/kaluga/scientific/unit/Millifarad : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milligram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milligram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milligram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -13057,7 +13386,7 @@ public final class com/splendo/kaluga/scientific/unit/MilligramForce : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milligray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milligray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milligray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -13069,7 +13398,7 @@ public final class com/splendo/kaluga/scientific/unit/Milligray : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millihenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millihenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -13081,7 +13410,7 @@ public final class com/splendo/kaluga/scientific/unit/Millihenry : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millihertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millihertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -13093,7 +13422,7 @@ public final class com/splendo/kaluga/scientific/unit/Millihertz : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millijoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millijoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13105,7 +13434,7 @@ public final class com/splendo/kaluga/scientific/unit/Millijoule : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millikatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millikatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -13117,7 +13446,7 @@ public final class com/splendo/kaluga/scientific/unit/Millikatal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -13129,7 +13458,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliliter : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millilumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millilumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -13141,7 +13470,7 @@ public final class com/splendo/kaluga/scientific/unit/Millilumen : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millilux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millilux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -13153,7 +13482,7 @@ public final class com/splendo/kaluga/scientific/unit/Millilux : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millimeter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millimeter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -13189,7 +13518,7 @@ public final class com/splendo/kaluga/scientific/unit/MillimeterOfWater : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millimole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millimole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -13201,7 +13530,7 @@ public final class com/splendo/kaluga/scientific/unit/Millimole : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millinewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millinewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -13213,7 +13542,7 @@ public final class com/splendo/kaluga/scientific/unit/Millinewton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millinit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millinit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -13225,7 +13554,7 @@ public final class com/splendo/kaluga/scientific/unit/Millinit : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -13237,7 +13566,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliohm : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millipascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millipascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -13249,7 +13578,7 @@ public final class com/splendo/kaluga/scientific/unit/Millipascal : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -13261,7 +13590,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliphot : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millirad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millirad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -13273,7 +13602,7 @@ public final class com/splendo/kaluga/scientific/unit/Millirad : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliradian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -13285,7 +13614,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliradian : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -13297,7 +13626,7 @@ public final class com/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millisecond : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
@@ -13309,7 +13638,7 @@ public final class com/splendo/kaluga/scientific/unit/Millisecond : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millisiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -13321,7 +13650,7 @@ public final class com/splendo/kaluga/scientific/unit/Millisiemens : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millisievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -13333,7 +13662,7 @@ public final class com/splendo/kaluga/scientific/unit/Millisievert : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millisteradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisteradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
@@ -13345,7 +13674,7 @@ public final class com/splendo/kaluga/scientific/unit/Millisteradian : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millitesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millitesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -13357,7 +13686,7 @@ public final class com/splendo/kaluga/scientific/unit/Millitesla : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millitorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millitorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -13369,7 +13698,7 @@ public final class com/splendo/kaluga/scientific/unit/Millitorr : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliturn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliturn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -13381,7 +13710,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliturn : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millivolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millivolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -13393,7 +13722,7 @@ public final class com/splendo/kaluga/scientific/unit/Millivolt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliwatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliwatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -13405,7 +13734,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliwatt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MilliwattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MilliwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MilliwattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13417,7 +13746,7 @@ public final class com/splendo/kaluga/scientific/unit/MilliwattHour : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -13596,6 +13925,16 @@ public final class com/splendo/kaluga/scientific/unit/Mole : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/MoleMultiple : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MoleMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MoleMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/MoleMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Momentum : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Momentum$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Momentum;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -13634,7 +13973,7 @@ public final class com/splendo/kaluga/scientific/unit/Nano : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -13646,7 +13985,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanobar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -13658,7 +13997,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanobar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanobarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -13670,7 +14009,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanobarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanobecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -13682,7 +14021,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanobecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanocandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -13694,7 +14033,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanocandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanocoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -13706,7 +14045,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanocoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanocurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -13718,7 +14057,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanocurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanodalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanodalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanodalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -13730,7 +14069,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanodalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanodyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanodyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -13742,7 +14081,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanodyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13754,7 +14093,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoelectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13766,7 +14105,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoerg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanofarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanofarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -13778,7 +14117,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanofarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanogram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanogram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -13790,7 +14129,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanogram : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanogray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanogray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -13802,7 +14141,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanogray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanohenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanohenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -13814,7 +14153,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanohenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanohertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanohertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -13826,7 +14165,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanohertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanojoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanojoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13838,7 +14177,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanojoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanokatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanokatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -13850,7 +14189,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanokatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -13862,7 +14201,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanolumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanolumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -13874,7 +14213,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanolumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanolux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanolux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -13886,7 +14225,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanolux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanometer : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanometer;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -13898,7 +14237,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanometer : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanomole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanomole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -13910,7 +14249,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanomole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanonewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanonewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -13922,7 +14261,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanonewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanonit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanonit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -13934,7 +14273,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanonit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -13946,7 +14285,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanopascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanopascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -13958,7 +14297,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanopascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanophot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanophot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -13970,7 +14309,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanophot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanorad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanorad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -13982,7 +14321,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanorad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoradian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -13994,7 +14333,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoradian : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -14006,7 +14345,7 @@ public final class com/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanosecond : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanosecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
@@ -14018,7 +14357,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanosecond : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanosiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -14030,7 +14369,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanosiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanosievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -14042,7 +14381,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanosievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanosteradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanosteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosteradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
@@ -14054,7 +14393,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanosteradian : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanotesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanotesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -14066,7 +14405,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanotesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanotorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanotorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -14078,7 +14417,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanotorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoturn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoturn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -14102,7 +14441,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanovolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanowatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanowatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -14114,7 +14453,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanowatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/NanowattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/NanowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/NanowattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -14126,7 +14465,7 @@ public final class com/splendo/kaluga/scientific/unit/NanowattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -14162,6 +14501,16 @@ public final class com/splendo/kaluga/scientific/unit/Newton : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/NewtonMultiple : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/NewtonMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/NewtonMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/NewtonMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Nit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14174,6 +14523,16 @@ public final class com/splendo/kaluga/scientific/unit/Nit : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/NitMultiple : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/NitMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/NitMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/NitMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Ohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Ohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14186,6 +14545,16 @@ public final class com/splendo/kaluga/scientific/unit/Ohm : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/OhmMultiple : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/OhmMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/OhmMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/OhmMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/One : com/splendo/kaluga/scientific/unit/Dimensionless {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/One;
 	public static final field UNIT_VALUE D
@@ -14234,6 +14603,16 @@ public final class com/splendo/kaluga/scientific/unit/Pascal : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/PascalMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/PascalMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/PascalMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/PascalMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Percent : com/splendo/kaluga/scientific/unit/Dimensionless {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Percent;
 	public static final field PARTS_PER_HUNDRED D
@@ -14272,6 +14651,16 @@ public final class com/splendo/kaluga/scientific/unit/Phot : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/PhotMultiple : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/PhotMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/PhotMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/PhotMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Pound : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Pound;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14363,6 +14752,16 @@ public final class com/splendo/kaluga/scientific/unit/Rad : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/RadMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/RadMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/RadMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/RadMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Radian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Radian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14375,6 +14774,16 @@ public final class com/splendo/kaluga/scientific/unit/Radian : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/RadianMultiple : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/RadianMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/RadianMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/RadianMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Radioactivity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Radioactivity$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -14411,6 +14820,16 @@ public final class com/splendo/kaluga/scientific/unit/RoentgenEquivalentMan : co
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Rutherford : com/splendo/kaluga/scientific/unit/Radioactivity {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Rutherford;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14453,6 +14872,16 @@ public final class com/splendo/kaluga/scientific/unit/Second : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/SecondMultiple : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SecondMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SecondMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/SecondMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Siemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Siemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14465,6 +14894,16 @@ public final class com/splendo/kaluga/scientific/unit/Siemens : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/SiemensMultiple : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SiemensMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SiemensMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/SiemensMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Sievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Sievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14477,6 +14916,16 @@ public final class com/splendo/kaluga/scientific/unit/Sievert : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/SievertMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SievertMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SievertMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/SievertMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Skot : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Skot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14866,6 +15315,16 @@ public final class com/splendo/kaluga/scientific/unit/Steradian : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/SteradianMultiple : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SteradianMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SteradianMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/SteradianMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Stilb : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Stilb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14954,6 +15413,16 @@ public final class com/splendo/kaluga/scientific/unit/Tesla : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/TeslaMultiple : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/TeslaMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/TeslaMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/TeslaMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/ThermalResistance : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ThermalResistance$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$ThermalResistance;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -14998,7 +15467,7 @@ public final class com/splendo/kaluga/scientific/unit/TimeUnitKt {
 	public static final fun getTimeUnits ()Ljava/util/Set;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Tonne : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Tonne : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Tonne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -15034,6 +15503,16 @@ public final class com/splendo/kaluga/scientific/unit/Torr : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/TorrMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/TorrMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/TorrMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/TorrMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Turn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Turn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -15046,6 +15525,16 @@ public final class com/splendo/kaluga/scientific/unit/Turn : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/TurnMultiple : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/TurnMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/TurnMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/TurnMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/UKImperialAreaDensity : com/splendo/kaluga/scientific/unit/AreaDensity, com/splendo/kaluga/scientific/unit/UKImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/UKImperialAreaDensity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$AreaDensity;Lcom/splendo/kaluga/scientific/unit/UKImperialWeight;Lcom/splendo/kaluga/scientific/unit/ImperialArea;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -16895,6 +17384,16 @@ public final class com/splendo/kaluga/scientific/unit/Volt : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/VoltMultiple : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/VoltMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/VoltMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/VoltMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Voltage : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Voltage$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -17011,6 +17510,26 @@ public final class com/splendo/kaluga/scientific/unit/WattHour : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/WattHourMultiple : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/WattHourMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/WattHourMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/WattHourMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public abstract class com/splendo/kaluga/scientific/unit/WattMultiple : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/WattMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/WattMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/WattMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Weber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Weber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -17023,6 +17542,16 @@ public final class com/splendo/kaluga/scientific/unit/Weber : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/WeberMultiple : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/WeberMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/WeberMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/WeberMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Weight : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Weight$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
diff --git a/scientific/api/jvm/scientific.api b/scientific/api/jvm/scientific.api
index 0b90e5260..11777253b 100644
--- a/scientific/api/jvm/scientific.api
+++ b/scientific/api/jvm/scientific.api
@@ -571,6 +571,12 @@ public final class com/splendo/kaluga/scientific/ShortScientificArray$DefaultImp
 	public static fun iterator (Lcom/splendo/kaluga/scientific/ShortScientificArray;)Ljava/util/Iterator;
 }
 
+public final class com/splendo/kaluga/scientific/converter/ScientificConverterException : java/lang/ArithmeticException {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
 public final class com/splendo/kaluga/scientific/converter/acceleration/ConvertFromForceAndMassKt {
 	public static final fun accelerationFromForceAndMass (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun accelerationFromForceAndMassDefault (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -613,7 +619,7 @@ public final class com/splendo/kaluga/scientific/converter/acceleration/ConvertT
 }
 
 public final class com/splendo/kaluga/scientific/converter/acceleration/ConvertToTimeKt {
-	public static final fun speedDivAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun joltDivAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/action/ConvertFromEnergyAndTimeKt {
@@ -969,9 +975,9 @@ public final class com/splendo/kaluga/scientific/converter/area/ConvertToVolumeK
 
 public final class com/splendo/kaluga/scientific/converter/area/ConvertToVolumetricFlowKt {
 	public static final fun areaTimesVolumetricFlux (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun imperialAreaTimesImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun imperialAreaTimesUKImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun imperialAreaTimesUSCustomaryArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialAreaTimesImperialVolumetricFlux (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialAreaTimesUKImperialVolumetricFlux (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialAreaTimesUSCustomaryVolumetricFlux (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun metricAreaTimesMetricVolumetricFlux (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
@@ -980,7 +986,7 @@ public final class com/splendo/kaluga/scientific/converter/area/ConvertToWeightK
 	public static final fun imperialAreaDensityTimesUKImperialAreaDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialAreaTimesImperialAreaDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialAreaTimesImperialUSCustomaryAreaDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricAreaTimesMetricAreaDenisty (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricAreaTimesMetricAreaDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/areaDensity/ConvertFromDensityAndLengthKt {
@@ -1088,6 +1094,11 @@ public final class com/splendo/kaluga/scientific/converter/density/ConvertFromAr
 	public static final fun densityFromAreaDensityAndLengthDefault (Lcom/splendo/kaluga/scientific/unit/Density;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/density/ConvertFromDynamicViscosityAndKinematicViscosityKt {
+	public static final fun densityFromDynamicViscosityAndKinematicViscosity (Lcom/splendo/kaluga/scientific/unit/Density;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun densityFromDynamicViscosityAndKinematicViscosityDefault (Lcom/splendo/kaluga/scientific/unit/Density;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/density/ConvertFromLinearMassDensityAndAreaKt {
 	public static final fun densityFromLinearMassDensityAndArea (Lcom/splendo/kaluga/scientific/unit/Density;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun densityFromLinearMassDensityAndAreaDefault (Lcom/splendo/kaluga/scientific/unit/Density;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1126,6 +1137,14 @@ public final class com/splendo/kaluga/scientific/converter/density/ConvertToArea
 	public static final fun usCustomaryDensityTimesImperialLength (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/density/ConvertToDynamicViscosityKt {
+	public static final fun densityTimesKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialDensityTimesImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricDensityTimesMetricKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ukImperialDensityTimesImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usCustomaryDensityTimesImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/density/ConvertToLinearMassDensityKt {
 	public static final fun densityTimesArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialDensityTimesImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1199,6 +1218,11 @@ public final class com/splendo/kaluga/scientific/converter/dimensionless/Convert
 	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertFromKinematicViscosityAndDensityKt {
+	public static final fun dynamicViscosityFromKinematicViscosityAndDensity (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun dynamicViscosityFromKinematicViscosityAndDensityDefault (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertFromMomentumAndAreaKt {
 	public static final fun dynamicViscosityFromMomentumAndArea (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun dynamicViscosityFromMomentumAndAreaDefault (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1209,6 +1233,26 @@ public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/Conv
 	public static final fun dynamicViscosityFromPressureAndTimeDefault (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertToDensityKt {
+	public static final fun dynamicViscosityDivKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialDynamicViscosityDivImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricDynamicViscosityDivMetricKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ukImperialDynamicViscosityDivImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usCustomaryDynamicViscosityDivImperialKinematicViscosity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
+public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertToKinematicViscosityKt {
+	public static final fun dynamicViscosityDivDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialDynamicViscosityDivImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialDynamicViscosityDivUKImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialDynamicViscosityDivUSCustomaryDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricDynamicViscosityDivMetricDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ukImperialDynamicViscosityDivImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ukImperialDynamicViscosityDivUKImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usCustomaryDynamicViscosityDivImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usCustomaryDynamicViscosityDivUSCustomaryDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertToMomentumKt {
 	public static final fun dynamicViscosityTimesArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialDynamicViscosityTimesImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1702,6 +1746,7 @@ public final class com/splendo/kaluga/scientific/converter/energy/ConvertToPower
 	public static final fun kilowattHourDivHour (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun megajouleDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun megawattHourDivHour (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricEnergyDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun microjouleDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun microwattHourDivHour (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun millijouleDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1802,9 +1847,9 @@ public final class com/splendo/kaluga/scientific/converter/energy/ConvertToWeigh
 	public static final fun energyDivEquivalentDose (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun energyDivSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergDivRad (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ergDivRadMultiple (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergDivRem (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergDivRemMultiple (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun ergMultipleDivAbsorbedDose (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergMultipleDivRad (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergMultipleDivRadMultiple (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ergMultipleDivRem (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1947,7 +1992,7 @@ public final class com/splendo/kaluga/scientific/converter/force/ConvertToPowerK
 
 public final class com/splendo/kaluga/scientific/converter/force/ConvertToPressureKt {
 	public static final fun dyneDivSquareCentimeter (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun dyneMultipleDivSquareCentime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun dyneMultipleDivSquareCentimeter (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun forceDivArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun grainForceDivImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialForceDivImperialArea (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -2194,12 +2239,40 @@ public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/Co
 	public static final fun kinematicViscosityFromAreaAndTimeDefault (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertFromDynamicViscosityAndDensityKt {
+	public static final fun kinematicViscosityFromDynamicViscosityAndDensity (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun kinematicViscosityFromDynamicViscosityAndDensityDefault (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
+public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertFromSpecificEnergyAndTimeKt {
+	public static final fun kinematicViscosityFromSpecificEnergyAndTime (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun kinematicViscosityFromSpecificEnergyAndTimeDefault (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertToAreaKt {
 	public static final fun imperialKinematicViscosityTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun kinematicViscosityTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun metricKinematicViscosityTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertToDynamicViscosityKt {
+	public static final fun imperialKinematicViscosityTimesImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialKinematicViscosityTimesUKImperialDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialKinematicViscosityTimesUSCustomaryDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun kinematicViscosityTimesDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricKinematicViscosityTimesMetricDensity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
+public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertToSpecificEnergyKt {
+	public static final fun imperialKinematicViscosityDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun kinematicViscosityDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricKinematicViscosityDivTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
+public final class com/splendo/kaluga/scientific/converter/kinematicViscosity/ConvertToTimeKt {
+	public static final fun kinematicViscosityDivSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/length/ConvertFromAreaAndLengthKt {
 	public static final fun widthFromAreaAndLength (Lcom/splendo/kaluga/scientific/unit/Length;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun widthFromAreaAndLengthDefault (Lcom/splendo/kaluga/scientific/unit/Length;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -2755,7 +2828,7 @@ public final class com/splendo/kaluga/scientific/converter/molality/ConvertToSpe
 	public static final fun imperialMolalityTimesImperialMolarVolume (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialMolalityTimesUKImperialMolarVolume (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialMolalityTimesUSCustomaryMolarVolume (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricMolalityDivMetricMolality (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricMolalityDivMetricMolarity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun metricMolalityTimesMetricMolarVolume (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun molalityDivMolarity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun molalityTimesMolarVolume (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -2791,11 +2864,7 @@ public final class com/splendo/kaluga/scientific/converter/molarEnergy/ConvertTo
 	public static final fun molarEnergyTimesAmountOfSubstance (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
-public final class com/splendo/kaluga/scientific/converter/molarEnergy/ConvertToMolarEnergyKt {
-	public static final fun metricAndImperialMolarEnergyDivImperialSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricAndImperialMolarEnergyDivMetricSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricAndImperialMolarEnergyDivUKImperialSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricAndImperialMolarEnergyDivUSCustomarySpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+public final class com/splendo/kaluga/scientific/converter/molarEnergy/ConvertToMolarMassKt {
 	public static final fun molarEnergyDivImperialSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun molarEnergyDivMetricSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun molarEnergyDivSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -3302,7 +3371,7 @@ public final class com/splendo/kaluga/scientific/converter/solidAngle/ConvertFro
 
 public final class com/splendo/kaluga/scientific/converter/solidAngle/ConvertToIlluminanceKt {
 	public static final fun solidAngleTimesImperialLuminance (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun solidAngleTimesLambertTimes (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun solidAngleTimesLambert (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun solidAngleTimesLuminance (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun solidAngleTimesMetricLuminance (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun solidAngleTimesStilb (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -3327,6 +3396,11 @@ public final class com/splendo/kaluga/scientific/converter/specificEnergy/Conver
 	public static final fun specificEnergyFromEquivalentDoseDefault (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/specificEnergy/ConvertFromKinematicViscosityAndTimeKt {
+	public static final fun specificEnergyFromKinematicViscosityAndTime (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun specificEnergyFromKinematicViscosityAndTimeDefault (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/specificEnergy/ConvertFromMolarEnergyAndMolalityKt {
 	public static final fun specificEnergyFromMolarEnergyAndMolality (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun specificEnergyFromMolarEnergyAndMolalityDefault (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -3362,6 +3436,14 @@ public final class com/splendo/kaluga/scientific/converter/specificEnergy/Conver
 	public static final fun asEquivalentDose (Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/specificEnergy/ConvertToKinematicViscosityKt {
+	public static final fun imperialSpecificEnergyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun metricSpecificEnergyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun specificEnergyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ukImperialSpecificEnergyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usCustomarySpecificEnergyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/specificEnergy/ConvertToMolalityKt {
 	public static final fun imperialSpecificEnergyDivMolarEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun metricSpecificEnergyDivMolarEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -3750,6 +3832,11 @@ public final class com/splendo/kaluga/scientific/converter/time/ConvertFromKinem
 	public static final fun timeFromKinematicViscosityAndAreaDefault (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/time/ConvertFromKinematicViscosityAndSpecificEnergyKt {
+	public static final fun timeFromKinematicViscosityAndSpecificEnergy (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun timeFromKinematicViscosityAndSpecificEnergyDefault (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/time/ConvertFromLengthAndSpeedKt {
 	public static final fun timeFromDistanceAndSpeed (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeFromDistanceAndSpeedDefault (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -3889,6 +3976,14 @@ public final class com/splendo/kaluga/scientific/converter/time/ConvertToFrequen
 	public static final fun minuteFrequency (Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
+public final class com/splendo/kaluga/scientific/converter/time/ConvertToKinematicViscosityKt {
+	public static final fun timeTimesImperialSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun timeTimesMetricSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun timeTimesSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun timeTimesUkImperialSpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun timeTimesUsCustomarySpecificEnergy (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+}
+
 public final class com/splendo/kaluga/scientific/converter/time/ConvertToLengthKt {
 	public static final fun timeTimesImperialSpeed (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeTimesMetricSpeed (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
@@ -4358,16 +4453,16 @@ public final class com/splendo/kaluga/scientific/converter/weight/ConvertToEnerg
 }
 
 public final class com/splendo/kaluga/scientific/converter/weight/ConvertToForceKt {
-	public static final fun grainTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun gramTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun imperialTonTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun grainTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun gramTimesMetricAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun imperialTonTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun imperialWeightTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun metricWeightTimesMetricAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun ounceTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun poundTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun ounceTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun poundTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun ukImperialWeightTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun usCustomaryWeightTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun usTonTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun usTonTimesImperialAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun weightTimesAcceleration (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
@@ -4425,12 +4520,6 @@ public final class com/splendo/kaluga/scientific/converter/weight/ConvertToMomen
 }
 
 public final class com/splendo/kaluga/scientific/converter/weight/ConvertToTimeKt {
-	public static final fun imperialWeightDivImperialMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun metricWeightDivMetricMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun ukImperialWeightDivImperialMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun ukImperialWeightDivUKImperialMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun usCustomaryWeightDivImperialMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun usCustomaryWeightDivUSCustomaryMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun weightDivMassFlowRate (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
@@ -4530,7 +4619,7 @@ public final class com/splendo/kaluga/scientific/formatter/ScientificValueFormat
 	public static synthetic fun toString$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/formatter/ScientificValueFormatter;ILjava/lang/Object;)Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Abampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Abampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -4542,7 +4631,7 @@ public final class com/splendo/kaluga/scientific/unit/Abampere : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Abcoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Abcoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abcoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -4554,7 +4643,7 @@ public final class com/splendo/kaluga/scientific/unit/Abcoulomb : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Abfarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Abfarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abfarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -4566,7 +4655,7 @@ public final class com/splendo/kaluga/scientific/unit/Abfarad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Abhenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Abhenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abhenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -4578,7 +4667,7 @@ public final class com/splendo/kaluga/scientific/unit/Abhenry : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Abohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Abohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -4590,7 +4679,7 @@ public final class com/splendo/kaluga/scientific/unit/Abohm : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Absiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Absiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Absiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -4734,6 +4823,16 @@ public final class com/splendo/kaluga/scientific/unit/Ampere : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/AmpereMultiple : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/AmpereMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/AmpereMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/AmpereMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Angle : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Angle$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -4941,6 +5040,16 @@ public final class com/splendo/kaluga/scientific/unit/Bar : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/BarMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/BarMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/BarMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/BarMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Barye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Barye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -4953,6 +5062,16 @@ public final class com/splendo/kaluga/scientific/unit/Barye : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/BaryeMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/BaryeMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/BaryeMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/BaryeMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/BeatsPerMinute : com/splendo/kaluga/scientific/unit/Frequency {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BeatsPerMinute;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -4977,7 +5096,17 @@ public final class com/splendo/kaluga/scientific/unit/Becquerel : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Biot : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public abstract class com/splendo/kaluga/scientific/unit/BecquerelMultiple : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/BecquerelMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/BecquerelMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/BecquerelMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public final class com/splendo/kaluga/scientific/unit/Biot : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Biot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -5085,6 +5214,26 @@ public final class com/splendo/kaluga/scientific/unit/Calorie$IT : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/CalorieMultiple : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CalorieMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/CalorieMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/CalorieMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public abstract class com/splendo/kaluga/scientific/unit/CalorieMultiple$IT : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CalorieMultiple$IT$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/CalorieMultiple$IT;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/CalorieMultiple$IT$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract interface class com/splendo/kaluga/scientific/unit/CalorieUnit : com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 }
 
@@ -5100,6 +5249,16 @@ public final class com/splendo/kaluga/scientific/unit/Candela : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/CandelaMultiple : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CandelaMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/CandelaMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/CandelaMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/CatalysticActivity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CatalysticActivity$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -5132,7 +5291,7 @@ public final class com/splendo/kaluga/scientific/unit/Centi : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -5144,7 +5303,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiampere : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centibar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5156,7 +5315,7 @@ public final class com/splendo/kaluga/scientific/unit/Centibar : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centibarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5168,7 +5327,7 @@ public final class com/splendo/kaluga/scientific/unit/Centibarye : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centibecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -5180,7 +5339,7 @@ public final class com/splendo/kaluga/scientific/unit/Centibecquerel : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centicandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -5192,7 +5351,7 @@ public final class com/splendo/kaluga/scientific/unit/Centicandela : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centicoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -5204,7 +5363,7 @@ public final class com/splendo/kaluga/scientific/unit/Centicoulomb : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centicurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -5216,7 +5375,7 @@ public final class com/splendo/kaluga/scientific/unit/Centicurie : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centidalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centidalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -5228,7 +5387,7 @@ public final class com/splendo/kaluga/scientific/unit/Centidalton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centidyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centidyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -5240,7 +5399,7 @@ public final class com/splendo/kaluga/scientific/unit/Centidyne : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centielectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centielectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -5252,7 +5411,7 @@ public final class com/splendo/kaluga/scientific/unit/Centielectronvolt : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centierg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centierg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -5264,7 +5423,7 @@ public final class com/splendo/kaluga/scientific/unit/Centierg : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centifarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centifarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -5276,7 +5435,7 @@ public final class com/splendo/kaluga/scientific/unit/Centifarad : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centigram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centigram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centigram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -5288,7 +5447,7 @@ public final class com/splendo/kaluga/scientific/unit/Centigram : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centigray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centigray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centigray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -5300,7 +5459,7 @@ public final class com/splendo/kaluga/scientific/unit/Centigray : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centihenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centihenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -5312,7 +5471,7 @@ public final class com/splendo/kaluga/scientific/unit/Centihenry : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centihertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centihertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -5324,7 +5483,7 @@ public final class com/splendo/kaluga/scientific/unit/Centihertz : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centijoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centijoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -5336,7 +5495,7 @@ public final class com/splendo/kaluga/scientific/unit/Centijoule : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centikatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centikatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -5348,7 +5507,7 @@ public final class com/splendo/kaluga/scientific/unit/Centikatal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -5360,7 +5519,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiliter : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centilumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centilumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -5372,7 +5531,7 @@ public final class com/splendo/kaluga/scientific/unit/Centilumen : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centilux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centilux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -5384,7 +5543,7 @@ public final class com/splendo/kaluga/scientific/unit/Centilux : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centimeter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centimeter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -5408,7 +5567,7 @@ public final class com/splendo/kaluga/scientific/unit/CentimeterOfWater : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centimole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centimole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -5420,7 +5579,7 @@ public final class com/splendo/kaluga/scientific/unit/Centimole : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centinewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centinewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -5432,7 +5591,7 @@ public final class com/splendo/kaluga/scientific/unit/Centinewton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centinit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centinit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -5444,7 +5603,7 @@ public final class com/splendo/kaluga/scientific/unit/Centinit : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -5456,7 +5615,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiohm : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centipascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centipascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5468,7 +5627,7 @@ public final class com/splendo/kaluga/scientific/unit/Centipascal : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -5480,7 +5639,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiphot : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centirad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centirad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -5492,7 +5651,7 @@ public final class com/splendo/kaluga/scientific/unit/Centirad : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiradian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -5504,7 +5663,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiradian : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -5516,7 +5675,7 @@ public final class com/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centisecond : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
@@ -5528,7 +5687,7 @@ public final class com/splendo/kaluga/scientific/unit/Centisecond : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centisiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -5540,7 +5699,7 @@ public final class com/splendo/kaluga/scientific/unit/Centisiemens : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centisievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -5552,7 +5711,7 @@ public final class com/splendo/kaluga/scientific/unit/Centisievert : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centisteradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisteradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
@@ -5564,7 +5723,7 @@ public final class com/splendo/kaluga/scientific/unit/Centisteradian : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centitesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centitesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -5576,7 +5735,7 @@ public final class com/splendo/kaluga/scientific/unit/Centitesla : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centitorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centitorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5588,7 +5747,7 @@ public final class com/splendo/kaluga/scientific/unit/Centitorr : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiturn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiturn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -5600,7 +5759,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiturn : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centivolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centivolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -5612,7 +5771,7 @@ public final class com/splendo/kaluga/scientific/unit/Centivolt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiwatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiwatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -5624,7 +5783,7 @@ public final class com/splendo/kaluga/scientific/unit/Centiwatt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/CentiwattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/CentiwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CentiwattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -5636,7 +5795,7 @@ public final class com/splendo/kaluga/scientific/unit/CentiwattHour : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Centiweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Centiweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -5660,6 +5819,16 @@ public final class com/splendo/kaluga/scientific/unit/Coulomb : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/CoulombMultiple : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CoulombMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/CoulombMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/CoulombMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Cubic : com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/SystemScientificUnit;)V
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -5862,6 +6031,16 @@ public final class com/splendo/kaluga/scientific/unit/Curie : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/CurieMultiple : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/CurieMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/CurieMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/CurieMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Dalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Dalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -5874,6 +6053,16 @@ public final class com/splendo/kaluga/scientific/unit/Dalton : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/DaltonMultiple : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/DaltonMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/DaltonMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/DaltonMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Deca : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -5883,7 +6072,7 @@ public final class com/splendo/kaluga/scientific/unit/Deca : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -5895,7 +6084,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decabar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5907,7 +6096,7 @@ public final class com/splendo/kaluga/scientific/unit/Decabar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decabarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -5919,7 +6108,7 @@ public final class com/splendo/kaluga/scientific/unit/Decabarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decabecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -5931,7 +6120,7 @@ public final class com/splendo/kaluga/scientific/unit/Decabecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decacandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -5943,7 +6132,7 @@ public final class com/splendo/kaluga/scientific/unit/Decacandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decacoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -5955,7 +6144,7 @@ public final class com/splendo/kaluga/scientific/unit/Decacoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decacurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -5967,7 +6156,7 @@ public final class com/splendo/kaluga/scientific/unit/Decacurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decadalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decadalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -5979,7 +6168,7 @@ public final class com/splendo/kaluga/scientific/unit/Decadalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decadyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decadyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -5991,7 +6180,7 @@ public final class com/splendo/kaluga/scientific/unit/Decadyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6003,7 +6192,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaelectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6015,7 +6204,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaerg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decafarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decafarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -6027,7 +6216,7 @@ public final class com/splendo/kaluga/scientific/unit/Decafarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decagram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decagram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -6039,7 +6228,7 @@ public final class com/splendo/kaluga/scientific/unit/Decagram : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decagray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decagray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -6051,7 +6240,7 @@ public final class com/splendo/kaluga/scientific/unit/Decagray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decahenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decahenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -6063,7 +6252,7 @@ public final class com/splendo/kaluga/scientific/unit/Decahenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decahertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decahertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -6075,7 +6264,7 @@ public final class com/splendo/kaluga/scientific/unit/Decahertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decajoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decajoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6087,7 +6276,7 @@ public final class com/splendo/kaluga/scientific/unit/Decajoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decakatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decakatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -6099,7 +6288,7 @@ public final class com/splendo/kaluga/scientific/unit/Decakatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -6111,7 +6300,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decalumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decalumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -6123,7 +6312,7 @@ public final class com/splendo/kaluga/scientific/unit/Decalumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decalux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decalux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -6135,7 +6324,7 @@ public final class com/splendo/kaluga/scientific/unit/Decalux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decameter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decameter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -6147,7 +6336,7 @@ public final class com/splendo/kaluga/scientific/unit/Decameter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decamole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decamole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -6159,7 +6348,7 @@ public final class com/splendo/kaluga/scientific/unit/Decamole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decanewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decanewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decanewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -6171,7 +6360,7 @@ public final class com/splendo/kaluga/scientific/unit/Decanewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decanit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decanit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decanit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -6183,7 +6372,7 @@ public final class com/splendo/kaluga/scientific/unit/Decanit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -6195,7 +6384,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decapascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decapascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6207,7 +6396,7 @@ public final class com/splendo/kaluga/scientific/unit/Decapascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -6219,7 +6408,7 @@ public final class com/splendo/kaluga/scientific/unit/Decaphot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decarad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -6231,7 +6420,7 @@ public final class com/splendo/kaluga/scientific/unit/Decarad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -6243,7 +6432,7 @@ public final class com/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decasiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decasiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -6255,7 +6444,7 @@ public final class com/splendo/kaluga/scientific/unit/Decasiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decasievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decasievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -6267,7 +6456,7 @@ public final class com/splendo/kaluga/scientific/unit/Decasievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decatesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decatesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -6279,7 +6468,7 @@ public final class com/splendo/kaluga/scientific/unit/Decatesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decatorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decatorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6291,7 +6480,7 @@ public final class com/splendo/kaluga/scientific/unit/Decatorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decavolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decavolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -6303,7 +6492,7 @@ public final class com/splendo/kaluga/scientific/unit/Decavolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decawatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decawatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -6315,7 +6504,7 @@ public final class com/splendo/kaluga/scientific/unit/Decawatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/DecawattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/DecawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DecawattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6327,7 +6516,7 @@ public final class com/splendo/kaluga/scientific/unit/DecawattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decaweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -6348,7 +6537,7 @@ public final class com/splendo/kaluga/scientific/unit/Deci : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -6360,7 +6549,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decibar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6372,7 +6561,7 @@ public final class com/splendo/kaluga/scientific/unit/Decibar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decibarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6384,7 +6573,7 @@ public final class com/splendo/kaluga/scientific/unit/Decibarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decibecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -6396,7 +6585,7 @@ public final class com/splendo/kaluga/scientific/unit/Decibecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decicandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -6408,7 +6597,7 @@ public final class com/splendo/kaluga/scientific/unit/Decicandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decicoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -6420,7 +6609,7 @@ public final class com/splendo/kaluga/scientific/unit/Decicoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decicurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -6432,7 +6621,7 @@ public final class com/splendo/kaluga/scientific/unit/Decicurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decidalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decidalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -6444,7 +6633,7 @@ public final class com/splendo/kaluga/scientific/unit/Decidalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decidyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decidyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -6456,7 +6645,7 @@ public final class com/splendo/kaluga/scientific/unit/Decidyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decielectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decielectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6468,7 +6657,7 @@ public final class com/splendo/kaluga/scientific/unit/Decielectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decierg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decierg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6480,7 +6669,7 @@ public final class com/splendo/kaluga/scientific/unit/Decierg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decifarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decifarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -6492,7 +6681,7 @@ public final class com/splendo/kaluga/scientific/unit/Decifarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decigram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decigram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decigram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -6504,7 +6693,7 @@ public final class com/splendo/kaluga/scientific/unit/Decigram : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decigray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decigray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decigray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -6516,7 +6705,7 @@ public final class com/splendo/kaluga/scientific/unit/Decigray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decihenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decihenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -6528,7 +6717,7 @@ public final class com/splendo/kaluga/scientific/unit/Decihenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decihertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decihertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -6540,7 +6729,7 @@ public final class com/splendo/kaluga/scientific/unit/Decihertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decijoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decijoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6552,7 +6741,7 @@ public final class com/splendo/kaluga/scientific/unit/Decijoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decikatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decikatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -6564,7 +6753,7 @@ public final class com/splendo/kaluga/scientific/unit/Decikatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -6576,7 +6765,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decilumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decilumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -6588,7 +6777,7 @@ public final class com/splendo/kaluga/scientific/unit/Decilumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decilux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decilux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -6600,7 +6789,7 @@ public final class com/splendo/kaluga/scientific/unit/Decilux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decimeter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decimeter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -6612,7 +6801,7 @@ public final class com/splendo/kaluga/scientific/unit/Decimeter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decimole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decimole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -6624,7 +6813,7 @@ public final class com/splendo/kaluga/scientific/unit/Decimole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decinewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decinewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -6636,7 +6825,7 @@ public final class com/splendo/kaluga/scientific/unit/Decinewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decinit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decinit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -6648,7 +6837,7 @@ public final class com/splendo/kaluga/scientific/unit/Decinit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -6660,7 +6849,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decipascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decipascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6672,7 +6861,7 @@ public final class com/splendo/kaluga/scientific/unit/Decipascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -6684,7 +6873,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciphot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decirad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decirad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -6696,7 +6885,7 @@ public final class com/splendo/kaluga/scientific/unit/Decirad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciradian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -6708,7 +6897,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciradian : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -6720,7 +6909,7 @@ public final class com/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decisecond : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
@@ -6732,7 +6921,7 @@ public final class com/splendo/kaluga/scientific/unit/Decisecond : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decisiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -6744,7 +6933,7 @@ public final class com/splendo/kaluga/scientific/unit/Decisiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decisievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -6756,7 +6945,7 @@ public final class com/splendo/kaluga/scientific/unit/Decisievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decisteradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisteradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
@@ -6768,7 +6957,7 @@ public final class com/splendo/kaluga/scientific/unit/Decisteradian : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decitesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decitesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -6780,7 +6969,7 @@ public final class com/splendo/kaluga/scientific/unit/Decitesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decitorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decitorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -6792,7 +6981,7 @@ public final class com/splendo/kaluga/scientific/unit/Decitorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciturn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciturn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -6804,7 +6993,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciturn : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Decivolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Decivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decivolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -6816,7 +7005,7 @@ public final class com/splendo/kaluga/scientific/unit/Decivolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciwatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciwatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -6828,7 +7017,7 @@ public final class com/splendo/kaluga/scientific/unit/Deciwatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/DeciwattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/DeciwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DeciwattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -6840,7 +7029,7 @@ public final class com/splendo/kaluga/scientific/unit/DeciwattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Deciweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Deciweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -7010,6 +7199,16 @@ public final class com/splendo/kaluga/scientific/unit/Dyne : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/DyneMultiple : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/DyneMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/DyneMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/DyneMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/ElectricCapacitance : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ElectricCapacitance$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -7107,6 +7306,16 @@ public final class com/splendo/kaluga/scientific/unit/Electronvolt : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/ElectronvoltMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ElectronvoltMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ElectronvoltMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/ElectronvoltMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Energy : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Energy$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -7139,6 +7348,16 @@ public final class com/splendo/kaluga/scientific/unit/Erg : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/ErgMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ErgMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ErgMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/ErgMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/ErgPerSecond : com/splendo/kaluga/scientific/unit/MetricPower, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ErgPerSecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -7172,6 +7391,16 @@ public final class com/splendo/kaluga/scientific/unit/Farad : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/FaradMultiple : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/FaradMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/FaradMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/FaradMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Foot : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Foot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -7314,7 +7543,7 @@ public final class com/splendo/kaluga/scientific/unit/Giga : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -7326,7 +7555,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigabar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7338,7 +7567,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigabar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigabarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7350,7 +7579,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigabarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigabecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -7362,7 +7591,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigabecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigacandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -7374,7 +7603,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigacandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigacoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -7386,7 +7615,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigacoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigacurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -7398,7 +7627,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigacurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigadalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigadalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -7410,7 +7639,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigadalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigadyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigadyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -7422,7 +7651,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigadyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -7434,7 +7663,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaelectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -7446,7 +7675,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaerg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigafarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigafarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -7458,7 +7687,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigafarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigagram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigagram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -7470,7 +7699,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigagram : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigagray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigagray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -7482,7 +7711,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigagray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigahenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigahenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -7494,7 +7723,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigahenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigahertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigahertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -7506,7 +7735,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigahertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigajoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigajoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -7518,7 +7747,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigajoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigakatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigakatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -7530,7 +7759,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigakatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -7542,7 +7771,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigalumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigalumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -7554,7 +7783,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigalumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigalux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigalux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -7566,7 +7795,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigalux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigameter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigameter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -7578,7 +7807,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigameter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigamole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigamole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -7590,7 +7819,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigamole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Giganewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Giganewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Giganewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -7602,7 +7831,7 @@ public final class com/splendo/kaluga/scientific/unit/Giganewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Giganit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Giganit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Giganit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -7614,7 +7843,7 @@ public final class com/splendo/kaluga/scientific/unit/Giganit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -7626,7 +7855,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigapascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigapascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7638,7 +7867,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigapascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -7650,7 +7879,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigaphot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigarad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -7662,7 +7891,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigarad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -7674,7 +7903,7 @@ public final class com/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigasiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigasiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -7686,7 +7915,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigasiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigasievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigasievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -7698,7 +7927,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigasievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigatesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigatesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -7710,7 +7939,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigatesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigatorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigatorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7722,7 +7951,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigatorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigavolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigavolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -7734,7 +7963,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigavolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigawatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigawatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -7746,7 +7975,7 @@ public final class com/splendo/kaluga/scientific/unit/Gigawatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/GigawattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/GigawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GigawattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -7758,7 +7987,7 @@ public final class com/splendo/kaluga/scientific/unit/GigawattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Gigaweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Gigaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -7821,6 +8050,16 @@ public final class com/splendo/kaluga/scientific/unit/GramForce : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/GramMultiple : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/GramMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/GramMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/GramMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Gray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -7833,6 +8072,16 @@ public final class com/splendo/kaluga/scientific/unit/Gray : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/GrayMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/GrayMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/GrayMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/GrayMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/HeatCapacity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/HeatCapacity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$HeatCapacity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -7884,7 +8133,7 @@ public final class com/splendo/kaluga/scientific/unit/Hecto : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/HectoDalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/HectoDalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoDalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -7896,7 +8145,7 @@ public final class com/splendo/kaluga/scientific/unit/HectoDalton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/HectoOhm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/HectoOhm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoOhm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -7908,7 +8157,7 @@ public final class com/splendo/kaluga/scientific/unit/HectoOhm : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectoampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectoampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -7920,7 +8169,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectoampere : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectobar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7932,7 +8181,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectobar : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectobarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -7944,7 +8193,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectobarye : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectobecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -7956,7 +8205,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectobecquerel : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectocandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -7968,7 +8217,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectocandela : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectocoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -7980,7 +8229,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectocoulomb : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectocurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -7992,7 +8241,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectocurie : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectodyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectodyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -8004,7 +8253,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectodyne : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectoelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectoelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -8016,7 +8265,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectoelectronvolt : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectoerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectoerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -8028,7 +8277,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectoerg : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectofarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectofarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -8040,7 +8289,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectofarad : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectogram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectogram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -8052,7 +8301,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectogram : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectogray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectogray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -8064,7 +8313,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectogray : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectohenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectohenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -8076,7 +8325,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectohenry : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectohertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectohertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -8088,7 +8337,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectohertz : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectojoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectojoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -8100,7 +8349,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectojoule : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectokatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectokatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -8112,7 +8361,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectokatal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectoliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectoliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -8124,7 +8373,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectoliter : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectolumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectolumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -8136,7 +8385,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectolumen : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectolux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectolux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -8148,7 +8397,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectolux : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectometer : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectometer;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -8160,7 +8409,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectometer : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectomole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectomole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -8172,7 +8421,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectomole : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectonewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectonewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -8184,7 +8433,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectonewton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectonit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectonit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -8196,7 +8445,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectonit : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectopascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectopascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -8208,7 +8457,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectopascal : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectophot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectophot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -8220,7 +8469,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectophot : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectorad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectorad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -8232,7 +8481,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectorad : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -8244,7 +8493,7 @@ public final class com/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectosiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectosiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -8256,7 +8505,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectosiemens : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectosievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectosievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -8268,7 +8517,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectosievert : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectotesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectotesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -8280,7 +8529,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectotesla : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectotorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectotorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -8292,7 +8541,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectotorr : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectovolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectovolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectovolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -8304,7 +8553,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectovolt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectowatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectowatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -8316,7 +8565,7 @@ public final class com/splendo/kaluga/scientific/unit/Hectowatt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/HectowattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/HectowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectowattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -8328,7 +8577,7 @@ public final class com/splendo/kaluga/scientific/unit/HectowattHour : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Hectoweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Hectoweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -8352,6 +8601,16 @@ public final class com/splendo/kaluga/scientific/unit/Henry : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/HenryMultiple : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/HenryMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/HenryMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/HenryMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Hertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -8363,6 +8622,16 @@ public final class com/splendo/kaluga/scientific/unit/Hertz : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/HertzMultiple : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/HertzMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/HertzMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/HertzMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Horsepower : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Horsepower;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -9665,6 +9934,16 @@ public final class com/splendo/kaluga/scientific/unit/Joule : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/JouleMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/JouleMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/JouleMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/JouleMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Katal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Katal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -9677,6 +9956,16 @@ public final class com/splendo/kaluga/scientific/unit/Katal : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/KatalMultiple : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/KatalMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/KatalMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/KatalMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Kelvin : com/splendo/kaluga/scientific/unit/MetricAndUKImperialTemperature {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kelvin;
 	public fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -9703,7 +9992,7 @@ public final class com/splendo/kaluga/scientific/unit/KiloPoundSquareInch : com/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -9715,7 +10004,7 @@ public final class com/splendo/kaluga/scientific/unit/Kiloampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilobar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -9727,7 +10016,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilobar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilobarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -9739,7 +10028,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilobarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilobecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -9751,7 +10040,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilobecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilocalorie : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilocalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocalorie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -9763,7 +10052,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilocalorie : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilocalorie$IT : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilocalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocalorie$IT;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -9775,7 +10064,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilocalorie$IT : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilocandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -9787,7 +10076,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilocandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilocoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -9799,7 +10088,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilocoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilocurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -9811,7 +10100,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilocurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilodalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilodalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilodalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -9823,7 +10112,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilodalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilodyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilodyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -9835,7 +10124,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilodyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -9847,7 +10136,7 @@ public final class com/splendo/kaluga/scientific/unit/Kiloelectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -9859,7 +10148,7 @@ public final class com/splendo/kaluga/scientific/unit/Kiloerg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilofarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilofarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -9871,7 +10160,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilofarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilogram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilogram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -9895,7 +10184,7 @@ public final class com/splendo/kaluga/scientific/unit/KilogramForce : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilogray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilogray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -9907,7 +10196,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilogray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilohenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilohenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -9919,7 +10208,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilohenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilohertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilohertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -9931,7 +10220,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilohertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilojoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilojoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -9943,7 +10232,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilojoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilokatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilokatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -9955,7 +10244,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilokatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -9967,7 +10256,7 @@ public final class com/splendo/kaluga/scientific/unit/Kiloliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilolumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilolumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -9979,7 +10268,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilolumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilolux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilolux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -9991,7 +10280,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilolux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilometer : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilometer;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -10003,7 +10292,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilometer : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilomole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilomole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -10015,7 +10304,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilomole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilonewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilonewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -10027,7 +10316,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilonewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilonit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilonit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -10039,7 +10328,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilonit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -10051,7 +10340,7 @@ public final class com/splendo/kaluga/scientific/unit/Kiloohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilopascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilopascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10063,7 +10352,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilopascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilophot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilophot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -10075,7 +10364,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilophot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilorad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilorad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -10087,7 +10376,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilorad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -10099,7 +10388,7 @@ public final class com/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilosiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilosiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -10111,7 +10400,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilosiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilosievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilosievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -10123,7 +10412,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilosievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilotesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilotesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -10135,7 +10424,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilotesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilotorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilotorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10147,7 +10436,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilotorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilovolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilovolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilovolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -10159,7 +10448,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilovolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kilowatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kilowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilowatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -10171,7 +10460,7 @@ public final class com/splendo/kaluga/scientific/unit/Kilowatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/KilowattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/KilowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KilowattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10183,7 +10472,7 @@ public final class com/splendo/kaluga/scientific/unit/KilowattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Kiloweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Kiloweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -10314,6 +10603,16 @@ public final class com/splendo/kaluga/scientific/unit/Liter : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/LiterMultiple : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/LiterMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LiterMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/LiterMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Lumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Lumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -10326,6 +10625,16 @@ public final class com/splendo/kaluga/scientific/unit/Lumen : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/LumenMultiple : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/LumenMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LumenMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/LumenMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Luminance : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Luminance$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -10452,6 +10761,16 @@ public final class com/splendo/kaluga/scientific/unit/Lux : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/LuxMultiple : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/LuxMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LuxMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/LuxMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/MagneticFlux : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MagneticFlux$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -10591,7 +10910,7 @@ public final class com/splendo/kaluga/scientific/unit/Mega : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -10603,7 +10922,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megabar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10615,7 +10934,7 @@ public final class com/splendo/kaluga/scientific/unit/Megabar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megabarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10627,7 +10946,7 @@ public final class com/splendo/kaluga/scientific/unit/Megabarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megabecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -10639,7 +10958,7 @@ public final class com/splendo/kaluga/scientific/unit/Megabecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megacalorie : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megacalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacalorie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10651,7 +10970,7 @@ public final class com/splendo/kaluga/scientific/unit/Megacalorie : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megacalorie$IT : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megacalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacalorie$IT;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10663,7 +10982,7 @@ public final class com/splendo/kaluga/scientific/unit/Megacalorie$IT : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megacandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -10675,7 +10994,7 @@ public final class com/splendo/kaluga/scientific/unit/Megacandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megacoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -10687,7 +11006,7 @@ public final class com/splendo/kaluga/scientific/unit/Megacoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megacurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -10699,7 +11018,7 @@ public final class com/splendo/kaluga/scientific/unit/Megacurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megadalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megadalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -10711,7 +11030,7 @@ public final class com/splendo/kaluga/scientific/unit/Megadalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megadyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megadyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -10723,7 +11042,7 @@ public final class com/splendo/kaluga/scientific/unit/Megadyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10735,7 +11054,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaelectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10747,7 +11066,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaerg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megafarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megafarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -10759,7 +11078,7 @@ public final class com/splendo/kaluga/scientific/unit/Megafarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megagram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megagram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -10771,7 +11090,7 @@ public final class com/splendo/kaluga/scientific/unit/Megagram : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megagray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megagray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -10783,7 +11102,7 @@ public final class com/splendo/kaluga/scientific/unit/Megagray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megahenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megahenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -10795,7 +11114,7 @@ public final class com/splendo/kaluga/scientific/unit/Megahenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megahertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megahertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -10807,7 +11126,7 @@ public final class com/splendo/kaluga/scientific/unit/Megahertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megajoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megajoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -10819,7 +11138,7 @@ public final class com/splendo/kaluga/scientific/unit/Megajoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megakatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megakatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -10831,7 +11150,7 @@ public final class com/splendo/kaluga/scientific/unit/Megakatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -10843,7 +11162,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megalumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megalumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -10855,7 +11174,7 @@ public final class com/splendo/kaluga/scientific/unit/Megalumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megalux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megalux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -10867,7 +11186,7 @@ public final class com/splendo/kaluga/scientific/unit/Megalux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megameter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megameter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -10879,7 +11198,7 @@ public final class com/splendo/kaluga/scientific/unit/Megameter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megamole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megamole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -10891,7 +11210,7 @@ public final class com/splendo/kaluga/scientific/unit/Megamole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Meganewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Meganewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Meganewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -10903,7 +11222,7 @@ public final class com/splendo/kaluga/scientific/unit/Meganewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Meganit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Meganit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Meganit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -10915,7 +11234,7 @@ public final class com/splendo/kaluga/scientific/unit/Meganit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -10927,7 +11246,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megapascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megapascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -10939,7 +11258,7 @@ public final class com/splendo/kaluga/scientific/unit/Megapascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -10951,7 +11270,7 @@ public final class com/splendo/kaluga/scientific/unit/Megaphot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megarad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -10963,7 +11282,7 @@ public final class com/splendo/kaluga/scientific/unit/Megarad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -10975,7 +11294,7 @@ public final class com/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megasiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megasiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -10987,7 +11306,7 @@ public final class com/splendo/kaluga/scientific/unit/Megasiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megasievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megasievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -10999,7 +11318,7 @@ public final class com/splendo/kaluga/scientific/unit/Megasievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megatesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megatesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -11011,7 +11330,7 @@ public final class com/splendo/kaluga/scientific/unit/Megatesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megatorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megatorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -11023,7 +11342,7 @@ public final class com/splendo/kaluga/scientific/unit/Megatorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megavolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megavolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -11035,7 +11354,7 @@ public final class com/splendo/kaluga/scientific/unit/Megavolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megawatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megawatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -11047,7 +11366,7 @@ public final class com/splendo/kaluga/scientific/unit/Megawatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MegawattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MegawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MegawattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -11059,7 +11378,7 @@ public final class com/splendo/kaluga/scientific/unit/MegawattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Megaweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Megaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -11083,6 +11402,16 @@ public final class com/splendo/kaluga/scientific/unit/Meter : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/MeterMultiple : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MeterMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MeterMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/MeterMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/MetricAcceleration : com/splendo/kaluga/scientific/unit/Acceleration, com/splendo/kaluga/scientific/unit/MetricScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MetricAcceleration$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Acceleration;Lcom/splendo/kaluga/scientific/unit/MetricSpeed;Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -12407,7 +12736,7 @@ public final class com/splendo/kaluga/scientific/unit/Micro : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -12419,7 +12748,7 @@ public final class com/splendo/kaluga/scientific/unit/Microampere : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microbar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microbar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12431,7 +12760,7 @@ public final class com/splendo/kaluga/scientific/unit/Microbar : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microbarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microbarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12443,7 +12772,7 @@ public final class com/splendo/kaluga/scientific/unit/Microbarye : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microbecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microbecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -12455,7 +12784,7 @@ public final class com/splendo/kaluga/scientific/unit/Microbecquerel : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microcandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microcandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -12467,7 +12796,7 @@ public final class com/splendo/kaluga/scientific/unit/Microcandela : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microcoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microcoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -12479,7 +12808,7 @@ public final class com/splendo/kaluga/scientific/unit/Microcoulomb : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microcurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microcurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -12491,7 +12820,7 @@ public final class com/splendo/kaluga/scientific/unit/Microcurie : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microdalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microdalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microdalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -12503,7 +12832,7 @@ public final class com/splendo/kaluga/scientific/unit/Microdalton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microdyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microdyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microdyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -12515,7 +12844,7 @@ public final class com/splendo/kaluga/scientific/unit/Microdyne : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12527,7 +12856,7 @@ public final class com/splendo/kaluga/scientific/unit/Microelectronvolt : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12539,7 +12868,7 @@ public final class com/splendo/kaluga/scientific/unit/Microerg : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microfarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microfarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microfarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -12551,7 +12880,7 @@ public final class com/splendo/kaluga/scientific/unit/Microfarad : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microgram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microgram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microgram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -12563,7 +12892,7 @@ public final class com/splendo/kaluga/scientific/unit/Microgram : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microgray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microgray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microgray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -12575,7 +12904,7 @@ public final class com/splendo/kaluga/scientific/unit/Microgray : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microhenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microhenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microhenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -12587,7 +12916,7 @@ public final class com/splendo/kaluga/scientific/unit/Microhenry : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microhertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microhertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microhertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -12599,7 +12928,7 @@ public final class com/splendo/kaluga/scientific/unit/Microhertz : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microjoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microjoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microjoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12611,7 +12940,7 @@ public final class com/splendo/kaluga/scientific/unit/Microjoule : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microkatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microkatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microkatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -12623,7 +12952,7 @@ public final class com/splendo/kaluga/scientific/unit/Microkatal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -12635,7 +12964,7 @@ public final class com/splendo/kaluga/scientific/unit/Microliter : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microlumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microlumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microlumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -12647,7 +12976,7 @@ public final class com/splendo/kaluga/scientific/unit/Microlumen : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microlux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microlux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microlux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -12659,7 +12988,7 @@ public final class com/splendo/kaluga/scientific/unit/Microlux : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Micrometer : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Micrometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micrometer;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -12671,7 +13000,7 @@ public final class com/splendo/kaluga/scientific/unit/Micrometer : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Micromole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Micromole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micromole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -12683,7 +13012,7 @@ public final class com/splendo/kaluga/scientific/unit/Micromole : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Micronewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Micronewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micronewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -12695,7 +13024,7 @@ public final class com/splendo/kaluga/scientific/unit/Micronewton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Micronit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Micronit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micronit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -12707,7 +13036,7 @@ public final class com/splendo/kaluga/scientific/unit/Micronit : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -12719,7 +13048,7 @@ public final class com/splendo/kaluga/scientific/unit/Microohm : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Micropascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Micropascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micropascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12731,7 +13060,7 @@ public final class com/splendo/kaluga/scientific/unit/Micropascal : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -12743,7 +13072,7 @@ public final class com/splendo/kaluga/scientific/unit/Microphot : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microrad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microrad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microrad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -12755,7 +13084,7 @@ public final class com/splendo/kaluga/scientific/unit/Microrad : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microradian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -12767,7 +13096,7 @@ public final class com/splendo/kaluga/scientific/unit/Microradian : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -12779,7 +13108,7 @@ public final class com/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microsecond : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microsecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
@@ -12791,7 +13120,7 @@ public final class com/splendo/kaluga/scientific/unit/Microsecond : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microsiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microsiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -12803,7 +13132,7 @@ public final class com/splendo/kaluga/scientific/unit/Microsiemens : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microsievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microsievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -12815,7 +13144,7 @@ public final class com/splendo/kaluga/scientific/unit/Microsievert : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microsteradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microsteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsteradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
@@ -12827,7 +13156,7 @@ public final class com/splendo/kaluga/scientific/unit/Microsteradian : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microtesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microtesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microtesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -12839,7 +13168,7 @@ public final class com/splendo/kaluga/scientific/unit/Microtesla : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microtorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microtorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microtorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12851,7 +13180,7 @@ public final class com/splendo/kaluga/scientific/unit/Microtorr : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microturn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microturn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -12863,7 +13192,7 @@ public final class com/splendo/kaluga/scientific/unit/Microturn : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microvolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microvolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -12875,7 +13204,7 @@ public final class com/splendo/kaluga/scientific/unit/Microvolt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microwatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microwatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -12887,7 +13216,7 @@ public final class com/splendo/kaluga/scientific/unit/Microwatt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MicrowattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MicrowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MicrowattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12899,7 +13228,7 @@ public final class com/splendo/kaluga/scientific/unit/MicrowattHour : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Microweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Microweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -12927,7 +13256,7 @@ public final class com/splendo/kaluga/scientific/unit/Milli : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -12939,7 +13268,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliampere : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millibar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12951,7 +13280,7 @@ public final class com/splendo/kaluga/scientific/unit/Millibar : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millibarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -12963,7 +13292,7 @@ public final class com/splendo/kaluga/scientific/unit/Millibarye : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millibecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -12975,7 +13304,7 @@ public final class com/splendo/kaluga/scientific/unit/Millibecquerel : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millicalorie : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millicalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicalorie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12987,7 +13316,7 @@ public final class com/splendo/kaluga/scientific/unit/Millicalorie : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millicalorie$IT : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millicalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicalorie$IT;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -12999,7 +13328,7 @@ public final class com/splendo/kaluga/scientific/unit/Millicalorie$IT : com/sple
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millicandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -13011,7 +13340,7 @@ public final class com/splendo/kaluga/scientific/unit/Millicandela : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millicoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -13023,7 +13352,7 @@ public final class com/splendo/kaluga/scientific/unit/Millicoulomb : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millicurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -13035,7 +13364,7 @@ public final class com/splendo/kaluga/scientific/unit/Millicurie : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millidalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millidalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -13047,7 +13376,7 @@ public final class com/splendo/kaluga/scientific/unit/Millidalton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millidyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millidyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -13059,7 +13388,7 @@ public final class com/splendo/kaluga/scientific/unit/Millidyne : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millielectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millielectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13071,7 +13400,7 @@ public final class com/splendo/kaluga/scientific/unit/Millielectronvolt : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millierg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millierg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13083,7 +13412,7 @@ public final class com/splendo/kaluga/scientific/unit/Millierg : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millifarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millifarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -13095,7 +13424,7 @@ public final class com/splendo/kaluga/scientific/unit/Millifarad : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milligram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milligram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milligram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -13119,7 +13448,7 @@ public final class com/splendo/kaluga/scientific/unit/MilligramForce : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milligray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milligray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milligray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -13131,7 +13460,7 @@ public final class com/splendo/kaluga/scientific/unit/Milligray : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millihenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millihenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -13143,7 +13472,7 @@ public final class com/splendo/kaluga/scientific/unit/Millihenry : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millihertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millihertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -13155,7 +13484,7 @@ public final class com/splendo/kaluga/scientific/unit/Millihertz : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millijoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millijoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13167,7 +13496,7 @@ public final class com/splendo/kaluga/scientific/unit/Millijoule : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millikatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millikatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -13179,7 +13508,7 @@ public final class com/splendo/kaluga/scientific/unit/Millikatal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -13191,7 +13520,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliliter : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millilumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millilumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -13203,7 +13532,7 @@ public final class com/splendo/kaluga/scientific/unit/Millilumen : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millilux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millilux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -13215,7 +13544,7 @@ public final class com/splendo/kaluga/scientific/unit/Millilux : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millimeter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millimeter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -13251,7 +13580,7 @@ public final class com/splendo/kaluga/scientific/unit/MillimeterOfWater : com/sp
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millimole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millimole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -13263,7 +13592,7 @@ public final class com/splendo/kaluga/scientific/unit/Millimole : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millinewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millinewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -13275,7 +13604,7 @@ public final class com/splendo/kaluga/scientific/unit/Millinewton : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millinit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millinit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -13287,7 +13616,7 @@ public final class com/splendo/kaluga/scientific/unit/Millinit : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -13299,7 +13628,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliohm : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millipascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millipascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -13311,7 +13640,7 @@ public final class com/splendo/kaluga/scientific/unit/Millipascal : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliphot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliphot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -13323,7 +13652,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliphot : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millirad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millirad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -13335,7 +13664,7 @@ public final class com/splendo/kaluga/scientific/unit/Millirad : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliradian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -13347,7 +13676,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliradian : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -13359,7 +13688,7 @@ public final class com/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millisecond : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
@@ -13371,7 +13700,7 @@ public final class com/splendo/kaluga/scientific/unit/Millisecond : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millisiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -13383,7 +13712,7 @@ public final class com/splendo/kaluga/scientific/unit/Millisiemens : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millisievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -13395,7 +13724,7 @@ public final class com/splendo/kaluga/scientific/unit/Millisievert : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millisteradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisteradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
@@ -13407,7 +13736,7 @@ public final class com/splendo/kaluga/scientific/unit/Millisteradian : com/splen
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millitesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millitesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -13419,7 +13748,7 @@ public final class com/splendo/kaluga/scientific/unit/Millitesla : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millitorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millitorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -13431,7 +13760,7 @@ public final class com/splendo/kaluga/scientific/unit/Millitorr : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliturn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliturn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -13443,7 +13772,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliturn : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Millivolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Millivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millivolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
@@ -13455,7 +13784,7 @@ public final class com/splendo/kaluga/scientific/unit/Millivolt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliwatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliwatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -13467,7 +13796,7 @@ public final class com/splendo/kaluga/scientific/unit/Milliwatt : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/MilliwattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/MilliwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MilliwattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13479,7 +13808,7 @@ public final class com/splendo/kaluga/scientific/unit/MilliwattHour : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Milliweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Milliweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -13658,6 +13987,16 @@ public final class com/splendo/kaluga/scientific/unit/Mole : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/MoleMultiple : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MoleMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MoleMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/MoleMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Momentum : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Momentum$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Momentum;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -13696,7 +14035,7 @@ public final class com/splendo/kaluga/scientific/unit/Nano : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoampere;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
@@ -13708,7 +14047,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoampere : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanobar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobar;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -13720,7 +14059,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanobar : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanobarye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobarye;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -13732,7 +14071,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanobarye : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanobecquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobecquerel;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -13744,7 +14083,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanobecquerel : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanocandela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocandela;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
@@ -13756,7 +14095,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanocandela : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanocoulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocoulomb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
@@ -13768,7 +14107,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanocoulomb : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanocurie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocurie;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
@@ -13780,7 +14119,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanocurie : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanodalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanodalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanodalton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -13792,7 +14131,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanodalton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanodyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanodyne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -13804,7 +14143,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanodyne : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoelectronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoelectronvolt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13816,7 +14155,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoelectronvolt : com/spl
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoerg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoerg;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13828,7 +14167,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoerg : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanofarad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanofarad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
@@ -13840,7 +14179,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanofarad : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanogram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanogram;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -13852,7 +14191,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanogram : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanogray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanogray;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -13864,7 +14203,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanogray : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanohenry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanohenry;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
@@ -13876,7 +14215,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanohenry : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanohertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanohertz;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
@@ -13888,7 +14227,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanohertz : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanojoule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanojoule;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -13900,7 +14239,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanojoule : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanokatal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanokatal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
@@ -13912,7 +14251,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanokatal : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoliter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoliter;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
@@ -13924,7 +14263,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoliter : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanolumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanolumen;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
@@ -13936,7 +14275,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanolumen : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanolux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanolux;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -13948,7 +14287,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanolux : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanometer : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanometer;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
@@ -13960,7 +14299,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanometer : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanomole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanomole;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
@@ -13972,7 +14311,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanomole : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanonewton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanonewton;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
@@ -13984,7 +14323,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanonewton : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanonit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanonit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
@@ -13996,7 +14335,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanonit : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
@@ -14008,7 +14347,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoohm : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanopascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanopascal;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -14020,7 +14359,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanopascal : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanophot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanophot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
@@ -14032,7 +14371,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanophot : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanorad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanorad;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
@@ -14044,7 +14383,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanorad : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoradian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -14056,7 +14395,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanoradian : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -14068,7 +14407,7 @@ public final class com/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanosecond : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanosecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosecond;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
@@ -14080,7 +14419,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanosecond : com/splendo/k
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanosiemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosiemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
@@ -14092,7 +14431,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanosiemens : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanosievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
@@ -14104,7 +14443,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanosievert : com/splendo/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanosteradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanosteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosteradian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
@@ -14116,7 +14455,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanosteradian : com/splend
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanotesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanotesla;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
@@ -14128,7 +14467,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanotesla : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanotorr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanotorr;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
@@ -14140,7 +14479,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanotorr : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoturn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoturn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
@@ -14164,7 +14503,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanovolt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanowatt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanowatt;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
@@ -14176,7 +14515,7 @@ public final class com/splendo/kaluga/scientific/unit/Nanowatt : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/NanowattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/NanowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/NanowattHour;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
@@ -14188,7 +14527,7 @@ public final class com/splendo/kaluga/scientific/unit/NanowattHour : com/splendo
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Nanoweber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Nanoweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoweber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
@@ -14224,6 +14563,16 @@ public final class com/splendo/kaluga/scientific/unit/Newton : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/NewtonMultiple : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/NewtonMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/NewtonMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/NewtonMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Nit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nit;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14236,6 +14585,16 @@ public final class com/splendo/kaluga/scientific/unit/Nit : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/NitMultiple : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/NitMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/NitMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/NitMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Ohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Ohm;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14248,6 +14607,16 @@ public final class com/splendo/kaluga/scientific/unit/Ohm : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/OhmMultiple : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/OhmMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/OhmMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/OhmMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/One : com/splendo/kaluga/scientific/unit/Dimensionless {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/One;
 	public static final field UNIT_VALUE D
@@ -14296,6 +14665,16 @@ public final class com/splendo/kaluga/scientific/unit/Pascal : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/PascalMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/PascalMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/PascalMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/PascalMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Percent : com/splendo/kaluga/scientific/unit/Dimensionless {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Percent;
 	public static final field PARTS_PER_HUNDRED D
@@ -14334,6 +14713,16 @@ public final class com/splendo/kaluga/scientific/unit/Phot : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/PhotMultiple : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/PhotMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/PhotMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/PhotMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Pound : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Pound;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14425,6 +14814,16 @@ public final class com/splendo/kaluga/scientific/unit/Rad : com/splendo/kaluga/s
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/RadMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/RadMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/RadMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/RadMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Radian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Radian;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14437,6 +14836,16 @@ public final class com/splendo/kaluga/scientific/unit/Radian : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/RadianMultiple : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/RadianMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/RadianMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/RadianMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Radioactivity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Radioactivity$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -14473,6 +14882,16 @@ public final class com/splendo/kaluga/scientific/unit/RoentgenEquivalentMan : co
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Rutherford : com/splendo/kaluga/scientific/unit/Radioactivity {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Rutherford;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14515,6 +14934,16 @@ public final class com/splendo/kaluga/scientific/unit/Second : com/splendo/kalug
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/SecondMultiple : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SecondMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SecondMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/SecondMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Siemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Siemens;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14527,6 +14956,16 @@ public final class com/splendo/kaluga/scientific/unit/Siemens : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/SiemensMultiple : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SiemensMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SiemensMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/SiemensMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Sievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Sievert;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14539,6 +14978,16 @@ public final class com/splendo/kaluga/scientific/unit/Sievert : com/splendo/kalu
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/SievertMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SievertMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SievertMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/SievertMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Skot : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Skot;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -14928,6 +15377,16 @@ public final class com/splendo/kaluga/scientific/unit/Steradian : com/splendo/ka
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/SteradianMultiple : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SteradianMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SteradianMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/SteradianMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Stilb : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Stilb;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -15016,6 +15475,16 @@ public final class com/splendo/kaluga/scientific/unit/Tesla : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/TeslaMultiple : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/TeslaMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/TeslaMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/TeslaMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/ThermalResistance : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ThermalResistance$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$ThermalResistance;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -15060,7 +15529,7 @@ public final class com/splendo/kaluga/scientific/unit/TimeUnitKt {
 	public static final fun getTimeUnits ()Ljava/util/Set;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Tonne : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+public final class com/splendo/kaluga/scientific/unit/Tonne : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Tonne;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
@@ -15096,6 +15565,16 @@ public final class com/splendo/kaluga/scientific/unit/Torr : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/TorrMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/TorrMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/TorrMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/TorrMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Turn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Turn;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -15108,6 +15587,16 @@ public final class com/splendo/kaluga/scientific/unit/Turn : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/TurnMultiple : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/TurnMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/TurnMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/TurnMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/UKImperialAreaDensity : com/splendo/kaluga/scientific/unit/AreaDensity, com/splendo/kaluga/scientific/unit/UKImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/UKImperialAreaDensity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$AreaDensity;Lcom/splendo/kaluga/scientific/unit/UKImperialWeight;Lcom/splendo/kaluga/scientific/unit/ImperialArea;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -16957,6 +17446,16 @@ public final class com/splendo/kaluga/scientific/unit/Volt : com/splendo/kaluga/
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/VoltMultiple : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/VoltMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/VoltMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/VoltMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Voltage : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Voltage$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -17073,6 +17572,26 @@ public final class com/splendo/kaluga/scientific/unit/WattHour : com/splendo/kal
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/WattHourMultiple : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/WattHourMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/WattHourMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/WattHourMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public abstract class com/splendo/kaluga/scientific/unit/WattMultiple : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/WattMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/WattMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/WattMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public final class com/splendo/kaluga/scientific/unit/Weber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Weber;
 	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
@@ -17085,6 +17604,16 @@ public final class com/splendo/kaluga/scientific/unit/Weber : com/splendo/kaluga
 	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 }
 
+public abstract class com/splendo/kaluga/scientific/unit/WeberMultiple : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
+	public static final field Companion Lcom/splendo/kaluga/scientific/unit/WeberMultiple$Companion;
+	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/WeberMultiple;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class com/splendo/kaluga/scientific/unit/WeberMultiple$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
 public abstract class com/splendo/kaluga/scientific/unit/Weight : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Weight$Companion;
 	public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V

From 3d17c00363878aa22821dd79bd80d6ba33de1e18 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 16:36:45 +0100
Subject: [PATCH 106/227] Add toString on KalugaDate and TimeZone

---
 base/api/androidLib/base.api                  | 39 ++++++++----
 base/api/jvm/base.api                         | 39 ++++++++----
 .../androidLibMain/kotlin/utils/KalugaDate.kt |  2 +-
 .../androidLibMain/kotlin/utils/TimeZone.kt   | 16 ++---
 .../src/commonMain/kotlin/utils/KalugaDate.kt | 49 ++++++++-------
 base/src/commonMain/kotlin/utils/TimeZone.kt  | 61 ++++++++++---------
 base/src/iosMain/kotlin/utils/KalugaDate.kt   |  2 +-
 base/src/iosMain/kotlin/utils/TimeZone.kt     | 16 ++---
 base/src/jsMain/kotlin/utils/KalugaDate.kt    |  2 +-
 base/src/jsMain/kotlin/utils/TimeZone.kt      | 16 ++---
 base/src/jvmMain/kotlin/utils/KalugaDate.kt   |  2 +-
 base/src/jvmMain/kotlin/utils/TimeZone.kt     | 16 ++---
 12 files changed, 151 insertions(+), 109 deletions(-)

diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index 2fc268af3..563d8e361 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -576,6 +576,21 @@ public final class com/splendo/kaluga/base/utils/ApplyIfKt {
 	public static final fun applyIf (Ljava/lang/Object;ZLkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
+public abstract class com/splendo/kaluga/base/utils/BaseTimeZone {
+	public fun <init> ()V
+	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
+	public abstract fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
+	public abstract fun getDaylightSavingsOffsetInMilliseconds ()J
+	public abstract fun getIdentifier ()Ljava/lang/String;
+	public abstract fun getOffsetFromGMTInMilliseconds ()J
+	public abstract fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public static synthetic fun offsetFromGMTAtDateInMilliseconds$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
+	public fun toString ()Ljava/lang/String;
+	public abstract fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static synthetic fun usesDaylightSavingsTime$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Z
+}
+
 public final class com/splendo/kaluga/base/utils/ByteUtils {
 	public static final field BYTE_STRING_LENGTH I
 	public static final field HEX_RADIX I
@@ -703,7 +718,8 @@ public final class com/splendo/kaluga/base/utils/IntKt {
 	public static final fun length (I)I
 }
 
-public abstract interface class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Comparable {
+public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Comparable {
+	public fun <init> ()V
 	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public abstract fun equals (Ljava/lang/Object;)Z
 	public abstract fun getDate ()Ljava/util/Date;
@@ -739,6 +755,7 @@ public abstract interface class com/splendo/kaluga/base/utils/KalugaDate : java/
 	public abstract fun setWeekOfMonth (I)V
 	public abstract fun setWeekOfYear (I)V
 	public abstract fun setYear (I)V
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
@@ -812,19 +829,17 @@ public final class com/splendo/kaluga/base/utils/RoundingMode$RoundUp : com/sple
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/RoundingMode$RoundUp;
 }
 
-public final class com/splendo/kaluga/base/utils/TimeZone {
+public final class com/splendo/kaluga/base/utils/TimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
 	public static final field Companion Lcom/splendo/kaluga/base/utils/TimeZone$Companion;
-	public final fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
+	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
+	public fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDaylightSavingsOffsetInMilliseconds ()J
-	public final fun getIdentifier ()Ljava/lang/String;
-	public final fun getOffsetFromGMTInMilliseconds ()J
-	public final fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public static synthetic fun offsetFromGMTAtDateInMilliseconds$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
-	public final fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-	public static synthetic fun usesDaylightSavingsTime$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Z
+	public fun getDaylightSavingsOffsetInMilliseconds ()J
+	public fun getIdentifier ()Ljava/lang/String;
+	public fun getOffsetFromGMTInMilliseconds ()J
+	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 }
 
 public final class com/splendo/kaluga/base/utils/TimeZone$Companion {
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index cd975aa82..acb444f44 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -554,6 +554,21 @@ public final class com/splendo/kaluga/base/utils/ApplyIfKt {
 	public static final fun applyIf (Ljava/lang/Object;ZLkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
+public abstract class com/splendo/kaluga/base/utils/BaseTimeZone {
+	public fun <init> ()V
+	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
+	public abstract fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
+	public abstract fun getDaylightSavingsOffsetInMilliseconds ()J
+	public abstract fun getIdentifier ()Ljava/lang/String;
+	public abstract fun getOffsetFromGMTInMilliseconds ()J
+	public abstract fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public static synthetic fun offsetFromGMTAtDateInMilliseconds$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
+	public fun toString ()Ljava/lang/String;
+	public abstract fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static synthetic fun usesDaylightSavingsTime$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Z
+}
+
 public final class com/splendo/kaluga/base/utils/ByteUtils {
 	public static final field BYTE_STRING_LENGTH I
 	public static final field HEX_RADIX I
@@ -681,7 +696,8 @@ public final class com/splendo/kaluga/base/utils/IntKt {
 	public static final fun length (I)I
 }
 
-public abstract interface class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Comparable {
+public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Comparable {
+	public fun <init> ()V
 	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public abstract fun equals (Ljava/lang/Object;)Z
 	public abstract fun getDate ()Ljava/util/Date;
@@ -717,6 +733,7 @@ public abstract interface class com/splendo/kaluga/base/utils/KalugaDate : java/
 	public abstract fun setWeekOfMonth (I)V
 	public abstract fun setWeekOfYear (I)V
 	public abstract fun setYear (I)V
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
@@ -790,19 +807,17 @@ public final class com/splendo/kaluga/base/utils/RoundingMode$RoundUp : com/sple
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/RoundingMode$RoundUp;
 }
 
-public final class com/splendo/kaluga/base/utils/TimeZone {
+public final class com/splendo/kaluga/base/utils/TimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
 	public static final field Companion Lcom/splendo/kaluga/base/utils/TimeZone$Companion;
-	public final fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
+	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
+	public fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getDaylightSavingsOffsetInMilliseconds ()J
-	public final fun getIdentifier ()Ljava/lang/String;
-	public final fun getOffsetFromGMTInMilliseconds ()J
-	public final fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public static synthetic fun offsetFromGMTAtDateInMilliseconds$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
-	public final fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-	public static synthetic fun usesDaylightSavingsTime$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Z
+	public fun getDaylightSavingsOffsetInMilliseconds ()J
+	public fun getIdentifier ()Ljava/lang/String;
+	public fun getOffsetFromGMTInMilliseconds ()J
+	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 }
 
 public final class com/splendo/kaluga/base/utils/TimeZone$Companion {
diff --git a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
index 5ea93a1fe..531bf4566 100644
--- a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
@@ -22,7 +22,7 @@ import java.util.Date
 
 actual typealias KalugaDateHolder = Date
 
-actual class DefaultKalugaDate internal constructor(internal val calendar: Calendar) : KalugaDate {
+actual class DefaultKalugaDate internal constructor(internal val calendar: Calendar) : KalugaDate() {
 
     actual companion object {
         actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
diff --git a/base/src/androidLibMain/kotlin/utils/TimeZone.kt b/base/src/androidLibMain/kotlin/utils/TimeZone.kt
index 14d33a68f..add30ff1f 100644
--- a/base/src/androidLibMain/kotlin/utils/TimeZone.kt
+++ b/base/src/androidLibMain/kotlin/utils/TimeZone.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.utils
 
-actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) {
+actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) : BaseTimeZone() {
 
     actual companion object {
         actual fun get(identifier: String): TimeZone? {
@@ -31,19 +31,19 @@ actual class TimeZone internal constructor(internal val timeZone: java.util.Time
         actual val availableIdentifiers get() = java.util.TimeZone.getAvailableIDs().asList()
     }
 
-    actual val identifier: String = timeZone.id
-    actual fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
+    override val identifier: String = timeZone.id
+    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
         val styleJava = when (style) {
             TimeZoneNameStyle.Short -> java.util.TimeZone.SHORT
             TimeZoneNameStyle.Long -> java.util.TimeZone.LONG
         }
         return timeZone.getDisplayName(withDaylightSavings, styleJava, locale.locale)
     }
-    actual val offsetFromGMTInMilliseconds = timeZone.rawOffset.toLong()
-    actual val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
-    actual fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
-    actual fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
-    actual fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
+    override val offsetFromGMTInMilliseconds = timeZone.rawOffset.toLong()
+    override val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
+    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
+    override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
+    override fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
     override fun equals(other: Any?): Boolean {
         return (other as? TimeZone)?.let { timeZone == other.timeZone } ?: false
     }
diff --git a/base/src/commonMain/kotlin/utils/KalugaDate.kt b/base/src/commonMain/kotlin/utils/KalugaDate.kt
index 5b4a7fe35..0bfd2999d 100644
--- a/base/src/commonMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaDate.kt
@@ -18,6 +18,8 @@
 
 package com.splendo.kaluga.base.utils
 
+import com.splendo.kaluga.base.text.KalugaDateFormatter
+import com.splendo.kaluga.base.text.iso8601Pattern
 import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
 import kotlin.jvm.JvmName
 
@@ -30,102 +32,107 @@ expect class KalugaDateHolder
  * Class describing a point in time
  * Dates are localized according to a [Locale] and relative to a given [TimeZone]
  */
-interface KalugaDate : Comparable<KalugaDate> {
+abstract class KalugaDate : Comparable<KalugaDate> {
     /**
      * The [TimeZone] in which the Date is set
      */
-    var timeZone: TimeZone
+    abstract var timeZone: TimeZone
 
     /**
      * The number of the era, e.g., AD or BC in the Julian calendar
      */
-    var era: Int
+    abstract var era: Int
 
     /**
      * The year
      */
-    var year: Int
+    abstract var year: Int
 
     /**
      * The month of the year. Starts at 1
      */
-    var month: Int
+    abstract var month: Int
 
     /**
      * The number of days in the current month
      */
-    val daysInMonth: Int
+    abstract val daysInMonth: Int
 
     /**
      * The week number within the current year.
      */
-    var weekOfYear: Int
+    abstract var weekOfYear: Int
 
     /**
      * The week number within the current month
      */
-    var weekOfMonth: Int
+    abstract var weekOfMonth: Int
 
     /**
      * The day of the current month
      */
-    var day: Int
+    abstract var day: Int
 
     /**
      * The day of the current year
      */
-    var dayOfYear: Int
+    abstract var dayOfYear: Int
 
     /**
      * The day of the week. Starts at 1
      */
-    var weekDay: Int
+    abstract var weekDay: Int
 
     /**
      * The first day of the week. E.g. Sunday in the US, Monday in France. Starts at 1.
      */
-    var firstWeekDay: Int
+    abstract var firstWeekDay: Int
 
     /**
      * The hour of the current day
      */
-    var hour: Int
+    abstract var hour: Int
 
     /**
      * The minute of the current hour
      */
-    var minute: Int
+    abstract var minute: Int
 
     /**
      * The second of the current minute
      */
-    var second: Int
+    abstract var second: Int
 
     /**
      * The millisecond of the current second
      */
-    var millisecond: Int
+    abstract var millisecond: Int
 
     /**
      * The number of milliseconds passed since epoch time (January 1st 1970 00:00:00:00 GMT)
      */
-    var millisecondSinceEpoch: Long
+    abstract var millisecondSinceEpoch: Long
 
     /**
      * Creates a copy of a [KalugaDate]
      * @return A copy of this [KalugaDate]
      */
-    fun copy(): KalugaDate
+    abstract fun copy(): KalugaDate
 
     /**
      * Returns whether this Date is in the same [timeZone] and has the same time based on [millisecondSinceEpoch]
      * @return `true` if the two dates are equal
      */
-    override fun equals(other: Any?): Boolean
+    abstract override fun equals(other: Any?): Boolean
 
-    override fun hashCode(): Int
+    abstract override fun hashCode(): Int
 
-    val date: KalugaDateHolder
+    override fun toString(): String {
+        val formatter = KalugaDateFormatter.iso8601Pattern(timeZone)
+        return formatter.format(this)
+    }
+
+    abstract val date: KalugaDateHolder
 }
 
 expect class DefaultKalugaDate : KalugaDate {
diff --git a/base/src/commonMain/kotlin/utils/TimeZone.kt b/base/src/commonMain/kotlin/utils/TimeZone.kt
index 53882c355..dfec4ac08 100644
--- a/base/src/commonMain/kotlin/utils/TimeZone.kt
+++ b/base/src/commonMain/kotlin/utils/TimeZone.kt
@@ -31,31 +31,12 @@ enum class TimeZoneNameStyle {
 
 val TimeZone.Companion.utc: TimeZone by lazy { TimeZone.get("UTC")!! }
 
-expect class TimeZone {
-    companion object {
-        /**
-         * Gets a [TimeZone] based on a given Identifier
-         * @param identifier The identifier to create a [TimeZone] for
-         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
-         */
-        fun get(identifier: String): TimeZone?
-
-        /**
-         * Gets the current [TimeZone] configured by the user
-         * @return The current [TimeZone] of the user
-         */
-        fun current(): TimeZone
-
-        /**
-         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
-         */
-        val availableIdentifiers: List<String>
-    }
+abstract class BaseTimeZone {
 
     /**
      * The identifier of the [TimeZone]
      */
-    val identifier: String
+    abstract val identifier: String
 
     /**
      * Gets the display name for this [TimeZone] formatted for a given [Locale]
@@ -63,34 +44,58 @@ expect class TimeZone {
      * @param withDaylightSavings If `true` the name for the DaylightSavings version of the [TimeZone] will be used. Defaults to [TimeZone.usesDaylightSavingsTime]
      * @param locale The [Locale] used for naming the [TimeZone]. Defaults to [Locale.defaultLocale]
      */
-    fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean = usesDaylightSavingsTime(), locale: Locale = defaultLocale): String
+    abstract fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean = usesDaylightSavingsTime(), locale: Locale = defaultLocale): String
 
     /**
      * The number of milliseconds this timezone differs from GMT when daylight savings time is not active
      */
-    val offsetFromGMTInMilliseconds: Long
+    abstract val offsetFromGMTInMilliseconds: Long
 
     /**
      * The number of milliseconds this timezone differs from itself during Daylight Savings
      */
-    val daylightSavingsOffsetInMilliseconds: Long
+    abstract val daylightSavingsOffsetInMilliseconds: Long
 
     /**
      * The number of milliseconds this [TimeZone] differs from GMT at a given [KalugaDate]
-     * @param date The [KalugaDate] for which to check the offset. Defaults to [KalugaDate.now]
+     * @param date The [KalugaDate] for which to check the offset. Defaults to [DefaultKalugaDate.now]
      * @return The number of milliseconds this [TimeZone] differs from GMT at [date]
      */
-    fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate = now()): Long
+    abstract fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate = now()): Long
 
     /**
      * Returns `true` if this [TimeZone] is observing daylight savings at a given [KalugaDate]
      * @param date The [KalugaDate] for which to check whether daylight savings is observed. Defaults to [KalugaDate.now]
      * @return `true` if this [TimeZone] if observing daylight savings at [date]
      */
-    fun usesDaylightSavingsTime(date: KalugaDate = now()): Boolean
+    abstract fun usesDaylightSavingsTime(date: KalugaDate = now()): Boolean
 
     /**
      * Creates a copy of this [TimeZone]
      */
-    fun copy(): TimeZone
+    abstract fun copy(): BaseTimeZone
+
+    override fun toString(): String = displayName(TimeZoneNameStyle.Long)
+}
+
+expect class TimeZone : BaseTimeZone {
+    companion object {
+        /**
+         * Gets a [TimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [TimeZone] for
+         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         */
+        fun get(identifier: String): TimeZone?
+
+        /**
+         * Gets the current [TimeZone] configured by the user
+         * @return The current [TimeZone] of the user
+         */
+        fun current(): TimeZone
+
+        /**
+         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         */
+        val availableIdentifiers: List<String>
+    }
 }
diff --git a/base/src/iosMain/kotlin/utils/KalugaDate.kt b/base/src/iosMain/kotlin/utils/KalugaDate.kt
index 8b5933348..ff8645cf3 100644
--- a/base/src/iosMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaDate.kt
@@ -43,7 +43,7 @@ import kotlin.math.round
 
 actual typealias KalugaDateHolder = NSDate
 
-actual class DefaultKalugaDate internal constructor(private val calendar: NSCalendar, initialDate: NSDate) : KalugaDate {
+actual class DefaultKalugaDate internal constructor(private val calendar: NSCalendar, initialDate: NSDate) : KalugaDate() {
     actual companion object {
 
         const val nanoSecondPerMilliSecond = 1000 * 1000
diff --git a/base/src/iosMain/kotlin/utils/TimeZone.kt b/base/src/iosMain/kotlin/utils/TimeZone.kt
index c54d3366d..709aa0f75 100644
--- a/base/src/iosMain/kotlin/utils/TimeZone.kt
+++ b/base/src/iosMain/kotlin/utils/TimeZone.kt
@@ -30,7 +30,7 @@ import platform.Foundation.secondsFromGMT
 import platform.Foundation.timeZoneWithAbbreviation
 import platform.Foundation.timeZoneWithName
 
-actual class TimeZone internal constructor(val timeZone: NSTimeZone) {
+actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZone() {
 
     actual companion object {
         actual fun get(identifier: String): TimeZone? {
@@ -46,15 +46,15 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) {
         actual val availableIdentifiers: List<String> = NSTimeZone.knownTimeZoneNames.typedList()
     }
 
-    actual val identifier: String = timeZone.name
-    actual fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
+    override val identifier: String = timeZone.name
+    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
         val nameStyle = when (style) {
             TimeZoneNameStyle.Short -> if (withDaylightSavings) NSTimeZoneNameStyle.NSTimeZoneNameStyleShortDaylightSaving else NSTimeZoneNameStyle.NSTimeZoneNameStyleShortStandard
             TimeZoneNameStyle.Long -> if (withDaylightSavings) NSTimeZoneNameStyle.NSTimeZoneNameStyleDaylightSaving else NSTimeZoneNameStyle.NSTimeZoneNameStyleStandard
         }
         return timeZone.localizedName(nameStyle, locale.nsLocale) ?: ""
     }
-    actual val offsetFromGMTInMilliseconds: Long get() {
+    override val offsetFromGMTInMilliseconds: Long get() {
         val rawOffset = if (timeZone.isDaylightSavingTime())
             timeZone.secondsFromGMT.toDouble() - timeZone.daylightSavingTimeOffset
         else
@@ -63,7 +63,7 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) {
         return rawOffset.toLong() * 1000L
     }
 
-    actual val daylightSavingsOffsetInMilliseconds: Long get() {
+    override val daylightSavingsOffsetInMilliseconds: Long get() {
         val rawOffset = if (timeZone.isDaylightSavingTime()) {
             timeZone.daylightSavingTimeOffset.toLong()
         } else {
@@ -73,9 +73,9 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) {
         }
         return rawOffset * 1000L
     }
-    actual fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = (timeZone.secondsFromGMTForDate(date.date) * 1000L)
-    actual fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.isDaylightSavingTimeForDate(date.date)
-    actual fun copy(): TimeZone = TimeZone(timeZone.copy() as NSTimeZone)
+    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = (timeZone.secondsFromGMTForDate(date.date) * 1000L)
+    override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.isDaylightSavingTimeForDate(date.date)
+    override fun copy(): TimeZone = TimeZone(timeZone.copy() as NSTimeZone)
     override fun equals(other: Any?): Boolean {
         return (other as? TimeZone)?.let { timeZone == other.timeZone } ?: false
     }
diff --git a/base/src/jsMain/kotlin/utils/KalugaDate.kt b/base/src/jsMain/kotlin/utils/KalugaDate.kt
index 2f5cee373..55b647bf1 100644
--- a/base/src/jsMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaDate.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.utils
 actual typealias KalugaDateHolder = kotlin.js.Date
 
 // TODO Implement with proper date solution for Java Script
-actual class DefaultKalugaDate internal constructor(override val date: KalugaDateHolder) : KalugaDate {
+actual class DefaultKalugaDate internal constructor(override val date: KalugaDateHolder) : KalugaDate() {
 
     actual companion object {
         actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(kotlin.js.Date.now() + offsetInMilliseconds))
diff --git a/base/src/jsMain/kotlin/utils/TimeZone.kt b/base/src/jsMain/kotlin/utils/TimeZone.kt
index 8ce3b4087..64b449fbc 100644
--- a/base/src/jsMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jsMain/kotlin/utils/TimeZone.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.base.utils
 
 // TODO Implement with proper timezone solution for Java Script
-actual class TimeZone internal constructor() {
+actual class TimeZone internal constructor() : BaseTimeZone() {
 
     actual companion object {
         actual fun get(identifier: String): TimeZone? = TimeZone()
@@ -26,11 +26,11 @@ actual class TimeZone internal constructor() {
         actual val availableIdentifiers: List<String> = emptyList()
     }
 
-    actual val identifier: String = ""
-    actual fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String = ""
-    actual val offsetFromGMTInMilliseconds = 0L
-    actual val daylightSavingsOffsetInMilliseconds: Long = 0L
-    actual fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = 0L
-    actual fun usesDaylightSavingsTime(date: KalugaDate): Boolean = false
-    actual fun copy(): TimeZone = TimeZone()
+    override val identifier: String = ""
+    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String = ""
+    override val offsetFromGMTInMilliseconds = 0L
+    override val daylightSavingsOffsetInMilliseconds: Long = 0L
+    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = 0L
+    override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = false
+    override fun copy(): TimeZone = TimeZone()
 }
diff --git a/base/src/jvmMain/kotlin/utils/KalugaDate.kt b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
index 92b080d69..0f9d9a29c 100644
--- a/base/src/jvmMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
@@ -22,7 +22,7 @@ import java.util.Date
 
 actual typealias KalugaDateHolder = Date
 
-actual class DefaultKalugaDate internal constructor(internal val calendar: Calendar) : KalugaDate {
+actual class DefaultKalugaDate internal constructor(internal val calendar: Calendar) : KalugaDate() {
 
     actual companion object {
         actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
diff --git a/base/src/jvmMain/kotlin/utils/TimeZone.kt b/base/src/jvmMain/kotlin/utils/TimeZone.kt
index 14d33a68f..add30ff1f 100644
--- a/base/src/jvmMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jvmMain/kotlin/utils/TimeZone.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.utils
 
-actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) {
+actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) : BaseTimeZone() {
 
     actual companion object {
         actual fun get(identifier: String): TimeZone? {
@@ -31,19 +31,19 @@ actual class TimeZone internal constructor(internal val timeZone: java.util.Time
         actual val availableIdentifiers get() = java.util.TimeZone.getAvailableIDs().asList()
     }
 
-    actual val identifier: String = timeZone.id
-    actual fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
+    override val identifier: String = timeZone.id
+    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
         val styleJava = when (style) {
             TimeZoneNameStyle.Short -> java.util.TimeZone.SHORT
             TimeZoneNameStyle.Long -> java.util.TimeZone.LONG
         }
         return timeZone.getDisplayName(withDaylightSavings, styleJava, locale.locale)
     }
-    actual val offsetFromGMTInMilliseconds = timeZone.rawOffset.toLong()
-    actual val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
-    actual fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
-    actual fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
-    actual fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
+    override val offsetFromGMTInMilliseconds = timeZone.rawOffset.toLong()
+    override val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
+    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
+    override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
+    override fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
     override fun equals(other: Any?): Boolean {
         return (other as? TimeZone)?.let { timeZone == other.timeZone } ?: false
     }

From b62cdd7e0a00b0e5f595989e5cb28a20483ad05f Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 20 Jan 2023 15:04:38 +0100
Subject: [PATCH 107/227] Upgrade to Kotlin 1.8

---
 .../commonMain/kotlin/text/FormatSpecifier.kt |  2 +-
 base/src/jsMain/kotlin/KalugaThread.kt        |  2 +-
 .../src/jsMain/kotlin/text/NumberFormatter.kt | 26 +++---
 base/src/jsMain/kotlin/utils/KalugaDate.kt    | 30 +++----
 example/gradle.properties                     |  6 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 gradle.properties                             |  8 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../src/main/kotlin/AndroidCommon.kt          |  2 +-
 .../src/main/kotlin/Component.kt              | 16 ++--
 .../src/main/kotlin/Dependencies.kt           | 88 ++++++++++++-------
 .../src/main/kotlin/Library.kt                |  4 +-
 .../kotlin/location/GoogleLocationProvider.kt | 17 ++--
 test-utils-base/build.gradle.kts              | 11 ++-
 .../androidLibMain/kotlin/test/BaseTest.kt    |  3 +-
 15 files changed, 128 insertions(+), 91 deletions(-)

diff --git a/base/src/commonMain/kotlin/text/FormatSpecifier.kt b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
index 5cc433f19..a166b492d 100644
--- a/base/src/commonMain/kotlin/text/FormatSpecifier.kt
+++ b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
@@ -36,7 +36,7 @@ internal sealed class ParsingCharacter(val char: Char) {
 internal class FormatSpecifier(private val out: StringBuilder, matchResult: MatchResult) : FormatString {
 
     companion object {
-        val formatSpecifier = "%(\\d+\\$)?([-#+ 0,(\\<]*)?(\\d+)?(\\.\\d+)?([tT])?([a-zA-Z@%])".toRegex()
+        val formatSpecifier = "%(\\d+\\$)?([-#+ 0,(<]*)?(\\d+)?(\\.\\d+)?([tT])?([a-zA-Z@%])".toRegex()
     }
     override var index: Int = -1
         private set
diff --git a/base/src/jsMain/kotlin/KalugaThread.kt b/base/src/jsMain/kotlin/KalugaThread.kt
index 6122c3964..bcd4b60d2 100644
--- a/base/src/jsMain/kotlin/KalugaThread.kt
+++ b/base/src/jsMain/kotlin/KalugaThread.kt
@@ -26,7 +26,7 @@ actual class KalugaThread {
     }
 
     actual var name: String = "Main Thread"
-        set(value) = Unit
+        set(_) = Unit
     actual val isMainThread: Boolean = true
 
     override fun equals(other: Any?): Boolean {
diff --git a/base/src/jsMain/kotlin/text/NumberFormatter.kt b/base/src/jsMain/kotlin/text/NumberFormatter.kt
index 3192bd49a..9b811e5b0 100644
--- a/base/src/jsMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/jsMain/kotlin/text/NumberFormatter.kt
@@ -21,27 +21,27 @@ import com.splendo.kaluga.base.utils.Locale
 
 // TODO Implement with proper number formatter solution for Java Script
 actual class NumberFormatter actual constructor(actual val locale: Locale, style: NumberFormatStyle) {
-    actual var percentSymbol: Char = Char.MIN_VALUE
-    actual var perMillSymbol: Char = Char.MIN_VALUE
-    actual var minusSign: Char = Char.MIN_VALUE
-    actual var exponentSymbol: String = ""
-    actual var zeroSymbol: Char = Char.MIN_VALUE
-    actual var notANumberSymbol: String = ""
-    actual var infinitySymbol: String = ""
+    actual var percentSymbol: Char = '%'
+    actual var perMillSymbol: Char = '\u2030'
+    actual var minusSign: Char = '-'
+    actual var exponentSymbol: String = "E"
+    actual var zeroSymbol: Char = '0'
+    actual var notANumberSymbol: String = "NaN"
+    actual var infinitySymbol: String = "\u221E"
     actual var currencySymbol: String = ""
     actual var currencyCode: String = ""
     actual var positivePrefix: String = ""
     actual var positiveSuffix: String = ""
-    actual var negativePrefix: String = ""
+    actual var negativePrefix: String = "-"
     actual var negativeSuffix: String = ""
-    actual var groupingSeparator: Char = Char.MIN_VALUE
+    actual var groupingSeparator: Char = ','
     actual var usesGroupingSeparator: Boolean = false
-    actual var decimalSeparator: Char = Char.MIN_VALUE
+    actual var decimalSeparator: Char = '.'
     actual var alwaysShowsDecimalSeparator: Boolean = false
-    actual var currencyDecimalSeparator: Char = Char.MIN_VALUE
+    actual var currencyDecimalSeparator: Char = '.'
     actual var groupingSize: Int = 0
     actual var multiplier: Int = 1
 
-    actual fun format(number: Number): String = ""
-    actual fun parse(string: String): Number? = null
+    actual fun format(number: Number): String = "$number"
+    actual fun parse(string: String): Number? = string.toFloatOrNull()
 }
diff --git a/base/src/jsMain/kotlin/utils/KalugaDate.kt b/base/src/jsMain/kotlin/utils/KalugaDate.kt
index 55b647bf1..dff22be5f 100644
--- a/base/src/jsMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaDate.kt
@@ -29,52 +29,52 @@ actual class DefaultKalugaDate internal constructor(override val date: KalugaDat
 
     override var timeZone: TimeZone
         get() = TimeZone()
-        set(value) { }
+        set(_) { }
 
     override var era: Int
         get() = 0
-        set(value) { }
+        set(_) { }
     override var year: Int
         get() = date.getFullYear()
-        set(value) { }
+        set(_) { }
     override var month: Int
         get() = date.getMonth()
-        set(value) { }
+        set(_) { }
     override val daysInMonth: Int = 0
     override var weekOfYear: Int
         get() = 0
-        set(value) { }
+        set(_) { }
     override var weekOfMonth: Int
         get() = 0
-        set(value) { }
+        set(_) { }
     override var day: Int
         get() = 0
-        set(value) { }
+        set(_) { }
     override var dayOfYear: Int
         get() = date.getDay()
-        set(value) { }
+        set(_) { }
     override var weekDay: Int
         get() = date.getDate() + 1
-        set(value) { }
+        set(_) { }
     override var firstWeekDay: Int
         get() = 1
-        set(value) { }
+        set(_) { }
 
     override var hour: Int
         get() = date.getHours()
-        set(value) { }
+        set(_) { }
     override var minute: Int
         get() = date.getMinutes()
-        set(value) { }
+        set(_) { }
     override var second: Int
         get() = date.getSeconds()
-        set(value) { }
+        set(_) { }
     override var millisecond: Int
         get() = date.getMilliseconds()
-        set(value) { }
+        set(_) { }
     override var millisecondSinceEpoch: Long
         get() = date.getTime().toLong()
-        set(value) { }
+        set(_) { }
 
     override fun copy(): KalugaDate = DefaultKalugaDate(kotlin.js.Date(date.getMilliseconds()))
 
diff --git a/example/gradle.properties b/example/gradle.properties
index cf54f41c2..b483df3d0 100644
--- a/example/gradle.properties
+++ b/example/gradle.properties
@@ -15,7 +15,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableCInteropCommonization=true
 
-kaluga.androidGradlePluginVersion=7.3.0
-kaluga.kotlinVersion=1.7.20
-kaluga.googleServicesGradlePluginVersion=4.3.10
+kaluga.androidGradlePluginVersion=7.4.0
+kaluga.kotlinVersion=1.8.0
+kaluga.googleServicesGradlePluginVersion=4.3.14
 kaluga.ktLintGradlePluginVersion=11.0.0
\ No newline at end of file
diff --git a/example/gradle/wrapper/gradle-wrapper.properties b/example/gradle/wrapper/gradle-wrapper.properties
index 5c9a6bc88..64166114e 100644
--- a/example/gradle/wrapper/gradle-wrapper.properties
+++ b/example/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Nov 04 13:12:48 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle.properties b/gradle.properties
index 805ca4e2e..846c7d777 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,11 +4,11 @@ kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 android.useAndroidX=true
 
-kaluga.androidGradlePluginVersion=7.3.0
-kaluga.kotlinVersion=1.7.20
-kaluga.googleServicesGradlePluginVersion=4.3.10
+kaluga.androidGradlePluginVersion=7.4.0
+kaluga.kotlinVersion=1.8.0
+kaluga.googleServicesGradlePluginVersion=4.3.14
 kaluga.ktLintGradlePluginVersion=11.0.0
-kaluga.atomicFuGradlePluginVersion=0.18.5
+kaluga.atomicFuGradlePluginVersion=0.19.0
 org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx4096M"
 
 #MPP
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1855ed1e9..7f0baca3f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Oct 10 09:58:47 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
index 1834113ae..b8f7b56e0 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
@@ -33,6 +33,7 @@ fun org.gradle.api.Project.commonAndroidComponent(type: ComponentType = Componen
         testImplementationDependency(Dependencies.Kotlin.Test)
         testImplementationDependency(Dependencies.Kotlin.JUnit)
 
+        androidTestImplementationDependency(Dependencies.Mockito.Core)
         androidTestImplementationDependency(Dependencies.Mockito.Android)
         androidTestImplementationDependency(Dependencies.ByteBuddy.Android)
         androidTestImplementationDependency(Dependencies.ByteBuddy.Agent)
@@ -55,7 +56,6 @@ fun LibraryExtension.androidCommon(project: org.gradle.api.Project, componentTyp
 
     defaultConfig {
         minSdk = LibraryImpl.Android.minSdk
-        targetSdk = LibraryImpl.Android.targetSdk
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index f7f75a29e..744963b7a 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
 import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
+import java.util.Locale
 
 sealed class ComponentType {
     object Default : ComponentType()
@@ -40,7 +41,7 @@ fun Project.commonComponent(iosExport: (Framework.() -> Unit)? = null) {
 
     commonAndroidComponent()
     androidLibrary {
-        commonMultiplatformComponentAndroid(this@commonComponent)
+        commonMultiplatformComponentAndroid()
     }
 
     task("printConfigurations") {
@@ -52,15 +53,15 @@ fun Project.commonComponent(iosExport: (Framework.() -> Unit)? = null) {
     afterEvaluate {
         Library.IOS.targets.forEach {
             val targetName = it.sourceSetName
-            if (tasks.names.contains("linkDebugTest${targetName.capitalize() }")) {
+            if (tasks.names.contains("linkDebugTest${targetName.capitalize(Locale.ENGLISH) }")) {
                 // creating copy task for the target
-                val copyTask = tasks.create("copy${targetName.capitalize() }TestResources", Copy::class.java) {
+                val copyTask = tasks.create("copy${targetName.capitalize(Locale.ENGLISH) }TestResources", Copy::class.java) {
                     from("src/iosTest/resources/.")
                     into("$buildDir/bin/$targetName/debugTest")
                 }
 
                 // apply copy task to the target
-                tasks.named("linkDebugTest${targetName.capitalize()}") {
+                tasks.named("linkDebugTest${targetName.capitalize(Locale.ENGLISH)}") {
                     dependsOn(copyTask)
                 }
             }
@@ -116,9 +117,7 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Pr
 
     jvm()
     js(KotlinJsCompilerType.IR) {
-        // Disable JS browser tests for now
-        // See https://github.com/splendo/kaluga/issues/97
-        // browser()
+        browser()
         nodejs()
         compilations.configureEach {
             kotlinOptions {
@@ -127,6 +126,7 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Pr
                 moduleKind = "umd"
             }
         }
+        binaries.executable()
     }
 
     val commonMain = sourceSets.getByName("commonMain").apply {
@@ -206,7 +206,7 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Pr
     }
 }
 
-fun LibraryExtension.commonMultiplatformComponentAndroid(project: Project) {
+fun LibraryExtension.commonMultiplatformComponentAndroid() {
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index 64da0176d..6fba56218 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -15,30 +15,53 @@
 
  */
 
+import org.gradle.api.artifacts.ModuleDependency
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
 
-data class Dependency(private val group: String, private val name: String, private val version: String? = null) {
+data class Dependency(val group: String, val name: String, val version: String? = null) {
     val notation = "$group:$name${version?.let { ":$it" } ?: ""}"
 }
 
-fun KotlinDependencyHandler.apiDependency(dependency: Dependency) = api(dependency.notation)
-fun KotlinDependencyHandler.implementationDependency(dependency: Dependency) = implementation(dependency.notation)
+typealias ModuleDependencyHandler = ModuleDependency.() -> Unit
+
+fun KotlinDependencyHandler.apiDependency(dependency: Dependency, handler: ModuleDependencyHandler? = null) = api(dependency.notation) {
+    handler?.invoke(this)
+}
+fun KotlinDependencyHandler.implementationDependency(dependency: Dependency, handler: ModuleDependencyHandler? = null) = implementation(dependency.notation) {
+    handler?.invoke(this)
+}
 
 fun DependencyHandler.apiDependency(dependency: Dependency) {
     add("api", dependency.notation)
 }
-fun DependencyHandler.implementationDependency(dependency: Dependency) {
-    add("implementation", dependency.notation)
+fun DependencyHandler.implementationDependency(dependency: Dependency, handler: ModuleDependencyHandler? = null) {
+    add("implementation", dependency.notation).apply {
+        (this as? ModuleDependency)?.let {
+            handler?.invoke(it)
+        }
+    }
 }
-fun DependencyHandler.debugImplementationDependency(dependency: Dependency) {
-    add("debugImplementation", dependency.notation)
+fun DependencyHandler.debugImplementationDependency(dependency: Dependency, handler: ModuleDependencyHandler? = null) {
+    add("debugImplementation", dependency.notation).apply {
+        (this as? ModuleDependency)?.let {
+            handler?.invoke(it)
+        }
+    }
 }
-fun DependencyHandler.testImplementationDependency(dependency: Dependency) {
-    add("testImplementation", dependency.notation)
+fun DependencyHandler.testImplementationDependency(dependency: Dependency, handler: ModuleDependencyHandler? = null) {
+    add("testImplementation", dependency.notation).apply {
+        (this as? ModuleDependency)?.let {
+            handler?.invoke(it)
+        }
+    }
 }
-fun DependencyHandler.androidTestImplementationDependency(dependency: Dependency) {
-    add("androidTestImplementation", dependency.notation)
+fun DependencyHandler.androidTestImplementationDependency(dependency: Dependency, handler: ModuleDependencyHandler? = null) {
+    add("androidTestImplementation", dependency.notation).apply {
+        (this as? ModuleDependency)?.let {
+            handler?.invoke(it)
+        }
+    }
 }
 
 object Dependencies {
@@ -65,20 +88,20 @@ object Dependencies {
         }
 
         object Serialization {
-            private const val version =  "1.4.0"
+            private const val version =  "1.4.1"
             val Core = Dependency(group, "kotlinx-serialization-core", version)
             val Json = Dependency(group, "kotlinx-serialization-json", version)
         }
 
-        val AtomicFu = Dependency(group, "atomicfu", "0.18.5")
+        val AtomicFu = Dependency(group, "atomicfu", "0.19.0")
     }
 
     object Android {
         internal const val groupBase = "com.google.android"
         private const val materialBase = "$groupBase.material"
 
-        val Material = Dependency(materialBase, "material", "1.6.1")
-        val MaterialComposeThemeAdapter = Dependency(materialBase, "compose-theme-adapter", "1.1.17")
+        val Material = Dependency(materialBase, "material", "1.7.0")
+        val MaterialComposeThemeAdapter = Dependency(materialBase, "compose-theme-adapter", "1.2.1")
 
         object Play {
             private const val group = "$groupBase.play"
@@ -87,7 +110,7 @@ object Dependencies {
         }
         object PlayServices {
             private const val group = "$groupBase.gms"
-            private const val version = "20.0.0"
+            private const val version = "21.0.1"
             val Location = Dependency(group, "play-services-location", version)
         }
     }
@@ -96,27 +119,28 @@ object Dependencies {
 
         private const val groupBase = "androidx"
         private const val fragmentGroup = "$groupBase.fragment"
-        private const val fragmentVersion = "1.5.3"
+        private const val fragmentVersion = "1.5.5"
 
         object Activity {
             private const val group = "$groupBase.activity"
-            private const val version = "1.6.0"
+            private const val version = "1.6.1"
             val Activity = Dependency(group, "activity", version)
             val Ktx = Dependency(group, "activity-ktx", version)
             val Compose = Dependency(group, "activity-compose", version)
         }
-        val AppCompat = Dependency("$groupBase.appcompat", "appcompat", "1.5.1")
+        val AppCompat = Dependency("$groupBase.appcompat", "appcompat", "1.6.0")
         val ArchCore = Dependency("$groupBase.arch.core", "core-testing", "2.1.0")
         val Browser = Dependency("$groupBase.browser", "browser", "1.4.0")
         object Compose {
-            private const val version = "1.2.1"
+            private const val version = "1.3.1"
+            private const val uiVersion = "1.3.3"
             private const val composeGroupBase = "$groupBase.compose"
 
             val Foundation = Dependency("$composeGroupBase.foundation", "foundation", version)
             val Material = Dependency("$composeGroupBase.material", "material", version)
-            val UI = Dependency("$composeGroupBase.ui", "ui", version)
-            val UITooling = Dependency("$composeGroupBase.ui", "ui-tooling", version)
-            val UIToolingPreview = Dependency("$composeGroupBase.ui", "ui-tooling-preview", version)
+            val UI = Dependency("$composeGroupBase.ui", "ui", uiVersion)
+            val UITooling = Dependency("$composeGroupBase.ui", "ui-tooling", uiVersion)
+            val UIToolingPreview = Dependency("$composeGroupBase.ui", "ui-tooling-preview", uiVersion)
         }
         val ConstraintLayout = Dependency("$groupBase.constraintlayout", "constraintlayout", "2.1.4")
         val Core = Dependency("$groupBase.core", "core", "1.9.0")
@@ -141,9 +165,9 @@ object Dependencies {
         object Test {
             private const val group = "$groupBase.test"
             private const val versionPostfix = ""
-            private const val version = "1.4.0$versionPostfix"
-            private const val espressoVersion = "3.4.0$versionPostfix"
-            private const val junitVersion = "1.1.3$versionPostfix"
+            private const val version = "1.5.0$versionPostfix"
+            private const val espressoVersion = "3.5.1$versionPostfix"
+            private const val junitVersion = "1.1.5$versionPostfix"
             private const val uiAutomatorVersion = "2.2.0"
 
             val Core = Dependency(group, "core", version)
@@ -160,9 +184,11 @@ object Dependencies {
 
     object Koin {
         private const val group = "io.insert-koin"
-        private const val version = "3.2.2"
-        val Android = Dependency(group, "koin-android", version)
-        val AndroidXCompose = Dependency(group, "koin-androidx-compose", version)
+        private const val version = "3.3.2"
+        private const val androidVersion = "3.3.2"
+        private const val composeVersion = "3.4.1"
+        val Android = Dependency(group, "koin-android", androidVersion)
+        val AndroidXCompose = Dependency(group, "koin-androidx-compose", composeVersion)
         val Core = Dependency(group, "koin-core", version)
     }
 
@@ -172,7 +198,7 @@ object Dependencies {
 
     object Mockito {
         private const val group = "org.mockito"
-        private const val version = "4.8.1"
+        private const val version = "5.0.0"
 
         val Android = Dependency(group, "mockito-android", version)
         val Core = Dependency(group, "mockito-core", version)
@@ -180,7 +206,7 @@ object Dependencies {
 
     object ByteBuddy {
         private const val group = "net.bytebuddy"
-        private const val version = "1.12.16"
+        private const val version = "1.12.22"
 
         val Android = Dependency(group, "byte-buddy-android", version)
         val Agent = Dependency(group, "byte-buddy-agent", version)
diff --git a/kaluga-library-components/src/main/kotlin/Library.kt b/kaluga-library-components/src/main/kotlin/Library.kt
index 1eceea4ff..3f0f5ac83 100644
--- a/kaluga-library-components/src/main/kotlin/Library.kt
+++ b/kaluga-library-components/src/main/kotlin/Library.kt
@@ -57,8 +57,8 @@ class LibraryImpl(project: Project) {
         const val minSdk = 21
         const val compileSdk = 33
         const val targetSdk = 33
-        const val buildTools = "33.0.0"
-        const val composeCompiler = "1.3.2"
+        const val buildTools = "33.0.1"
+        const val composeCompiler = "1.4.0"
     }
 
     class IOSLibrary(props: Properties, logger: Logger) {
diff --git a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
index af5c92b00..3b1fcf491 100644
--- a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
@@ -23,10 +23,10 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.Looper
-import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationCallback
 import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.LocationResult
+import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.Priority
 import com.splendo.kaluga.permissions.location.LocationPermission
 import kotlinx.coroutines.flow.Flow
@@ -40,10 +40,17 @@ class GoogleLocationProvider(private val context: Context) : LocationProvider {
         permission: LocationPermission,
         protected val context: Context
     ) {
-        protected val fusedLocationProviderClient = FusedLocationProviderClient(context)
-        protected val locationRequest = LocationRequest.create().setInterval(1).setMaxWaitTime(1000).setFastestInterval(1).setPriority(
-            if (permission.precise) Priority.PRIORITY_HIGH_ACCURACY else Priority.PRIORITY_BALANCED_POWER_ACCURACY
-        )
+        protected val fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context)
+        protected val locationRequest = LocationRequest.Builder(1)
+            .setMaxUpdateDelayMillis(1000)
+            .setMinUpdateIntervalMillis(1)
+            .setPriority(
+                if (permission.precise)
+                    Priority.PRIORITY_HIGH_ACCURACY
+                else
+                    Priority.PRIORITY_BALANCED_POWER_ACCURACY
+            )
+            .build()
         protected val locationsState: MutableStateFlow<List<Location.KnownLocation>> = MutableStateFlow(emptyList())
         val locations: Flow<List<Location.KnownLocation>> = locationsState
 
diff --git a/test-utils-base/build.gradle.kts b/test-utils-base/build.gradle.kts
index 3e8f9e4d4..3a8cf5b78 100644
--- a/test-utils-base/build.gradle.kts
+++ b/test-utils-base/build.gradle.kts
@@ -9,10 +9,6 @@ plugins {
 
 publishableComponent()
 
-dependencies {
-    apiDependency(Dependencies.AndroidX.ArchCore)
-}
-
 kotlin {
     sourceSets {
         commonMain {
@@ -48,6 +44,13 @@ kotlin {
 
 android {
     dependencies {
+        apiDependency(Dependencies.AndroidX.ArchCore)
+
+        implementationDependency(Dependencies.Mockito.Core)
+        implementationDependency(Dependencies.Mockito.Android)
+        implementationDependency(Dependencies.ByteBuddy.Agent)
+        implementationDependency(Dependencies.ByteBuddy.Android)
+
         apiDependency(Dependencies.KotlinX.Coroutines.Test)
         apiDependency(Dependencies.KotlinX.Coroutines.Debug)
     }
diff --git a/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt b/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt
index ebdea57af..a3cf308dc 100644
--- a/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt
+++ b/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt
@@ -76,7 +76,8 @@ actual open class BaseTest {
     actual open fun beforeTest() {
 
         if (isUnitTest) {
-            DebugProbes.install() // coroutine debugging
+            // Disabled as it gives issues as of Kotlin 1.8
+            // DebugProbes.install() // coroutine debugging
 
             Dispatchers.setMain(mainDispatcher)
 

From bc9be383b9c3bdb01ac761cadc623d147e26c3ec Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 20 Jan 2023 16:53:36 +0100
Subject: [PATCH 108/227] Use Android SourceSetLayout V2

---
 .../AndroidManifest.xml                       |  0
 .../kotlin/AlertsViewModel.kt                 |  0
 .../kotlin/AndroidAlertPresenterTest.kt       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../architecture/compose/ContextExtensions.kt |  0
 .../ComposableLifecycleSubscribable.kt        |  0
 .../navigation/BottomSheetNavigator.kt        |  0
 .../navigation/BottomSheetNavigatorState.kt   |  0
 .../compose/navigation/BottomSheetRoute.kt    |  0
 .../navigation/BottomSheetRouteController.kt  |  0
 .../compose/navigation/ComposableNavSpec.kt   |  0
 .../compose/navigation/ComposableNavigator.kt |  0
 .../compose/navigation/NavGraphBuilder.kt     |  0
 .../navigation/NavigationExtensions.kt        |  0
 .../architecture/compose/navigation/Route.kt  |  0
 .../compose/navigation/RouteController.kt     |  0
 .../compose/navigation/SetupNavHost.kt        |  0
 .../compose/navigation/result/HandleResult.kt |  0
 .../navigation/result/NavHostResultHandler.kt |  0
 .../compose/navigation/result/setResult.kt    |  0
 .../architecture/compose/observables.kt       |  0
 .../KalugaViewModelComposeActivity.kt         |  0
 .../compose/viewModel/ViewModelComposable.kt  |  2 ++
 .../kaluga/architecture/compose/RouteTests.kt |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 ...GetOrPutAndRemoveOnDestroyFromCacheTest.kt |  0
 .../kotlin/lifecycle/LifecycleManagerTest.kt  |  0
 .../navigation/AndroidNavigationBundleTest.kt |  0
 .../observation/ObservationLiveDataTest.kt    |  0
 .../LifecycleManagerObserverTests.kt          |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/AndroidPermissionsManagerTest.kt   |  0
 .../kotlin/text/DateFormatterTest.kt          |  0
 .../kotlin/text/DateFormatterTest.kt          |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/PairingUtilsTests.kt               |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidDateTimePickerPresenterTest.kt     |  0
 .../kotlin/DateTimePickerViewModel.kt         |  0
 .../kotlin/TestActivity.kt                    |  0
 example/android/build.gradle.kts              |  2 +-
 .../example/alerts/compose/AlertsLayout.kt    |  2 +-
 .../compose/ArchitectureLayout.kt             |  2 +-
 .../compose/DateTimePickerLayout.kt           |  2 +-
 .../keyboard/compose/KeyboardLayout.kt        | 15 ++++++------
 .../example/loading/compose/LoadingLayout.kt  |  2 +-
 .../resources/compose/ResourcesLayout.kt      |  2 +-
 example/gradle.properties                     |  1 +
 gradle.properties                             |  1 +
 .../AndroidManifest.xml                       |  0
 .../kotlin/AndroidHUDTests.kt                 |  0
 .../kotlin/HudViewModel.kt                    |  0
 .../kotlin/TestActivity.kt                    |  0
 .../src/main/kotlin/AndroidCommon.kt          | 24 -------------------
 .../src/main/kotlin/Dependencies.kt           |  8 ++++++-
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/ComposeFocusHandler.kt             |  0
 .../kotlin/ComposeKeyboardManager.kt          |  0
 .../AndroidManifest.xml                       |  0
 .../ActivityKeyboardManagerBuilderTest.kt     |  0
 .../kotlin/TestActivity.kt                    |  0
 .../kaluga/links/AndroidLinksHandlerTest.kt   |  0
 .../kaluga/links/manager/LinksManagerTest.kt  |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/BackgroundStyle.kt                 |  0
 .../{androidLibMain => main}/kotlin/Color.kt  |  0
 .../kotlin/GradientStyle.kt                   |  0
 .../kotlin/KalugaButton.kt                    |  0
 .../kotlin/KalugaLabel.kt                     |  0
 .../kotlin/RoundedCornerRadiusShape.kt        |  0
 .../kotlin/TextAlignment.kt                   |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/Binding.kt                         |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/AndroidStringsTest.kt              |  0
 .../kotlin/TestActivity.kt                    |  0
 .../res/values/strings.xml                    |  0
 .../kotlin/view/TextAlignment.kt              |  1 +
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestBaseInstrumentationTest.kt     |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../kotlin/TestMockBluetoothGattWrapper.kt    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 .../AndroidManifest.xml                       |  0
 .../kotlin/TestActivity.kt                    |  0
 129 files changed, 26 insertions(+), 38 deletions(-)
 rename alerts/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename alerts/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/AlertsViewModel.kt (100%)
 rename alerts/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/AndroidAlertPresenterTest.kt (100%)
 rename alerts/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename architecture-compose/src/{androidLibAndroidTest => androidTest}/AndroidManifest.xml (100%)
 rename architecture-compose/src/{androidLibAndroidTest => androidTest}/kotlin/TestActivity.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/AndroidManifest.xml (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/SetupNavHost.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/setResult.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/observables.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt (100%)
 rename architecture-compose/src/{androidLibMain => main}/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt (99%)
 rename architecture-compose/src/{androidLibUnitTest => test}/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt (100%)
 rename architecture/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename architecture/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename architecture/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt (100%)
 rename architecture/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/lifecycle/LifecycleManagerTest.kt (100%)
 rename architecture/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/navigation/AndroidNavigationBundleTest.kt (100%)
 rename architecture/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/observation/ObservationLiveDataTest.kt (100%)
 rename architecture/src/{androidLibTest => androidLibUnitTest}/kotlin/lifecycle/LifecycleManagerObserverTests.kt (100%)
 rename base-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename base-permissions/src/{androidLibTest => androidLibUnitTest}/kotlin/AndroidPermissionsManagerTest.kt (100%)
 rename base/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/text/DateFormatterTest.kt (100%)
 rename base/src/{androidLibTest => androidLibUnitTest}/kotlin/text/DateFormatterTest.kt (100%)
 rename beacons/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename bluetooth-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename bluetooth/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename bluetooth/src/{androidLibTest => androidLibUnitTest}/AndroidManifest.xml (100%)
 rename bluetooth/src/{androidLibTest => androidLibUnitTest}/kotlin/PairingUtilsTests.kt (100%)
 rename calendar-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename camera-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename contacts-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename date-time-picker/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename date-time-picker/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/AndroidDateTimePickerPresenterTest.kt (100%)
 rename date-time-picker/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/DateTimePickerViewModel.kt (100%)
 rename date-time-picker/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename hud/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename hud/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/AndroidHUDTests.kt (100%)
 rename hud/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/HudViewModel.kt (100%)
 rename hud/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename keyboard-compose/src/{androidLibAndroidTest => androidTest}/AndroidManifest.xml (100%)
 rename keyboard-compose/src/{androidLibAndroidTest => androidTest}/kotlin/TestActivity.kt (100%)
 rename keyboard-compose/src/{androidLibMain => main}/AndroidManifest.xml (100%)
 rename keyboard-compose/src/{androidLibMain => main}/kotlin/ComposeFocusHandler.kt (100%)
 rename keyboard-compose/src/{androidLibMain => main}/kotlin/ComposeKeyboardManager.kt (100%)
 rename keyboard/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename keyboard/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/ActivityKeyboardManagerBuilderTest.kt (100%)
 rename keyboard/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename links/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt (100%)
 rename links/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt (100%)
 rename location-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename location/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename microphone-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename notifications-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename resources-compose/src/{androidLibAndroidTest => androidTest}/AndroidManifest.xml (100%)
 rename resources-compose/src/{androidLibAndroidTest => androidTest}/kotlin/TestActivity.kt (100%)
 rename resources-compose/src/{androidLibMain => main}/AndroidManifest.xml (100%)
 rename resources-compose/src/{androidLibMain => main}/kotlin/BackgroundStyle.kt (100%)
 rename resources-compose/src/{androidLibMain => main}/kotlin/Color.kt (100%)
 rename resources-compose/src/{androidLibMain => main}/kotlin/GradientStyle.kt (100%)
 rename resources-compose/src/{androidLibMain => main}/kotlin/KalugaButton.kt (100%)
 rename resources-compose/src/{androidLibMain => main}/kotlin/KalugaLabel.kt (100%)
 rename resources-compose/src/{androidLibMain => main}/kotlin/RoundedCornerRadiusShape.kt (100%)
 rename resources-compose/src/{androidLibMain => main}/kotlin/TextAlignment.kt (100%)
 rename resources-databinding/src/{androidLibAndroidTest => androidTest}/AndroidManifest.xml (100%)
 rename resources-databinding/src/{androidLibAndroidTest => androidTest}/kotlin/TestActivity.kt (100%)
 rename resources-databinding/src/{androidLibMain => main}/AndroidManifest.xml (100%)
 rename resources-databinding/src/{androidLibMain => main}/kotlin/Binding.kt (100%)
 rename resources/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename resources/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/AndroidStringsTest.kt (100%)
 rename resources/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename resources/src/{androidLibAndroidTest => androidLibInstrumentedTest}/res/values/strings.xml (100%)
 rename review/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename review/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename scientific/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename scientific/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename storage-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename system/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-alerts/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-alerts/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename test-utils-architecture/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-architecture/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename test-utils-base/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-base/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestBaseInstrumentationTest.kt (100%)
 rename test-utils-bluetooth/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-bluetooth/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename test-utils-bluetooth/src/{androidLibTest => androidLibUnitTest}/kotlin/TestMockBluetoothGattWrapper.kt (100%)
 rename test-utils-hud/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-hud/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename test-utils-keyboard/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-keyboard/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename test-utils-koin/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-koin/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename test-utils-location/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-location/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename test-utils-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-permissions/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename test-utils-resources/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-resources/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename test-utils-system/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils-system/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)
 rename test-utils/src/{androidLibAndroidTest => androidLibInstrumentedTest}/AndroidManifest.xml (100%)
 rename test-utils/src/{androidLibAndroidTest => androidLibInstrumentedTest}/kotlin/TestActivity.kt (100%)

diff --git a/alerts/src/androidLibAndroidTest/AndroidManifest.xml b/alerts/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from alerts/src/androidLibAndroidTest/AndroidManifest.xml
rename to alerts/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/alerts/src/androidLibAndroidTest/kotlin/AlertsViewModel.kt b/alerts/src/androidLibInstrumentedTest/kotlin/AlertsViewModel.kt
similarity index 100%
rename from alerts/src/androidLibAndroidTest/kotlin/AlertsViewModel.kt
rename to alerts/src/androidLibInstrumentedTest/kotlin/AlertsViewModel.kt
diff --git a/alerts/src/androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt b/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
similarity index 100%
rename from alerts/src/androidLibAndroidTest/kotlin/AndroidAlertPresenterTest.kt
rename to alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
diff --git a/alerts/src/androidLibAndroidTest/kotlin/TestActivity.kt b/alerts/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from alerts/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to alerts/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/architecture-compose/src/androidLibAndroidTest/AndroidManifest.xml b/architecture-compose/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from architecture-compose/src/androidLibAndroidTest/AndroidManifest.xml
rename to architecture-compose/src/androidTest/AndroidManifest.xml
diff --git a/architecture-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt b/architecture-compose/src/androidTest/kotlin/TestActivity.kt
similarity index 100%
rename from architecture-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to architecture-compose/src/androidTest/kotlin/TestActivity.kt
diff --git a/architecture-compose/src/androidLibMain/AndroidManifest.xml b/architecture-compose/src/main/AndroidManifest.xml
similarity index 100%
rename from architecture-compose/src/androidLibMain/AndroidManifest.xml
rename to architecture-compose/src/main/AndroidManifest.xml
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/SetupNavHost.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/SetupNavHost.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/SetupNavHost.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/SetupNavHost.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/setResult.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/setResult.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/setResult.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/setResult.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/observables.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/observables.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/observables.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/observables.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
similarity index 100%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
diff --git a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
similarity index 99%
rename from architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
rename to architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index 33903ecf1..976249644 100644
--- a/architecture-compose/src/androidLibMain/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -110,6 +110,7 @@ fun <VM : BaseLifecycleViewModel> store(provider: @Composable () -> VM): VM =
     "Does not work for configuration changes (e.g. rotation).",
     replaceWith = ReplaceWith("viewModel()", "androidx.lifecycle.viewmodel.compose.viewModel")
 )
+@Suppress("Deprecation")
 fun <VM : BaseLifecycleViewModel> storeAndRemember(provider: @DisallowComposableCalls () -> VM): VM = store {
     remember(provider)
 }
@@ -124,6 +125,7 @@ fun <VM : BaseLifecycleViewModel> storeAndRemember(provider: @DisallowComposable
     "Does not work for configuration changes (e.g. rotation).",
     replaceWith = ReplaceWith("viewModel()", "androidx.lifecycle.viewmodel.compose.viewModel")
 )
+@Suppress("Deprecation")
 fun <VM : BaseLifecycleViewModel> storeAndRemember(key: Any?, provider: @DisallowComposableCalls () -> VM): VM = store {
     remember(key, provider)
 }
diff --git a/architecture-compose/src/androidLibUnitTest/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt b/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
similarity index 100%
rename from architecture-compose/src/androidLibUnitTest/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
rename to architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
diff --git a/architecture/src/androidLibAndroidTest/AndroidManifest.xml b/architecture/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from architecture/src/androidLibAndroidTest/AndroidManifest.xml
rename to architecture/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/architecture/src/androidLibAndroidTest/kotlin/TestActivity.kt b/architecture/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from architecture/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to architecture/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/architecture/src/androidLibAndroidTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt b/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt
similarity index 100%
rename from architecture/src/androidLibAndroidTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt
rename to architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt
diff --git a/architecture/src/androidLibAndroidTest/kotlin/lifecycle/LifecycleManagerTest.kt b/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
similarity index 100%
rename from architecture/src/androidLibAndroidTest/kotlin/lifecycle/LifecycleManagerTest.kt
rename to architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
diff --git a/architecture/src/androidLibAndroidTest/kotlin/navigation/AndroidNavigationBundleTest.kt b/architecture/src/androidLibInstrumentedTest/kotlin/navigation/AndroidNavigationBundleTest.kt
similarity index 100%
rename from architecture/src/androidLibAndroidTest/kotlin/navigation/AndroidNavigationBundleTest.kt
rename to architecture/src/androidLibInstrumentedTest/kotlin/navigation/AndroidNavigationBundleTest.kt
diff --git a/architecture/src/androidLibAndroidTest/kotlin/observation/ObservationLiveDataTest.kt b/architecture/src/androidLibInstrumentedTest/kotlin/observation/ObservationLiveDataTest.kt
similarity index 100%
rename from architecture/src/androidLibAndroidTest/kotlin/observation/ObservationLiveDataTest.kt
rename to architecture/src/androidLibInstrumentedTest/kotlin/observation/ObservationLiveDataTest.kt
diff --git a/architecture/src/androidLibTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt b/architecture/src/androidLibUnitTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt
similarity index 100%
rename from architecture/src/androidLibTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt
rename to architecture/src/androidLibUnitTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt
diff --git a/base-permissions/src/androidLibAndroidTest/AndroidManifest.xml b/base-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from base-permissions/src/androidLibAndroidTest/AndroidManifest.xml
rename to base-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/base-permissions/src/androidLibTest/kotlin/AndroidPermissionsManagerTest.kt b/base-permissions/src/androidLibUnitTest/kotlin/AndroidPermissionsManagerTest.kt
similarity index 100%
rename from base-permissions/src/androidLibTest/kotlin/AndroidPermissionsManagerTest.kt
rename to base-permissions/src/androidLibUnitTest/kotlin/AndroidPermissionsManagerTest.kt
diff --git a/base/src/androidLibAndroidTest/kotlin/text/DateFormatterTest.kt b/base/src/androidLibInstrumentedTest/kotlin/text/DateFormatterTest.kt
similarity index 100%
rename from base/src/androidLibAndroidTest/kotlin/text/DateFormatterTest.kt
rename to base/src/androidLibInstrumentedTest/kotlin/text/DateFormatterTest.kt
diff --git a/base/src/androidLibTest/kotlin/text/DateFormatterTest.kt b/base/src/androidLibUnitTest/kotlin/text/DateFormatterTest.kt
similarity index 100%
rename from base/src/androidLibTest/kotlin/text/DateFormatterTest.kt
rename to base/src/androidLibUnitTest/kotlin/text/DateFormatterTest.kt
diff --git a/beacons/src/androidLibAndroidTest/kotlin/TestActivity.kt b/beacons/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from beacons/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to beacons/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/bluetooth-permissions/src/androidLibAndroidTest/AndroidManifest.xml b/bluetooth-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from bluetooth-permissions/src/androidLibAndroidTest/AndroidManifest.xml
rename to bluetooth-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/bluetooth/src/androidLibAndroidTest/AndroidManifest.xml b/bluetooth/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from bluetooth/src/androidLibAndroidTest/AndroidManifest.xml
rename to bluetooth/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/bluetooth/src/androidLibTest/AndroidManifest.xml b/bluetooth/src/androidLibUnitTest/AndroidManifest.xml
similarity index 100%
rename from bluetooth/src/androidLibTest/AndroidManifest.xml
rename to bluetooth/src/androidLibUnitTest/AndroidManifest.xml
diff --git a/bluetooth/src/androidLibTest/kotlin/PairingUtilsTests.kt b/bluetooth/src/androidLibUnitTest/kotlin/PairingUtilsTests.kt
similarity index 100%
rename from bluetooth/src/androidLibTest/kotlin/PairingUtilsTests.kt
rename to bluetooth/src/androidLibUnitTest/kotlin/PairingUtilsTests.kt
diff --git a/calendar-permissions/src/androidLibAndroidTest/AndroidManifest.xml b/calendar-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from calendar-permissions/src/androidLibAndroidTest/AndroidManifest.xml
rename to calendar-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/camera-permissions/src/androidLibAndroidTest/AndroidManifest.xml b/camera-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from camera-permissions/src/androidLibAndroidTest/AndroidManifest.xml
rename to camera-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/contacts-permissions/src/androidLibAndroidTest/AndroidManifest.xml b/contacts-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from contacts-permissions/src/androidLibAndroidTest/AndroidManifest.xml
rename to contacts-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/date-time-picker/src/androidLibAndroidTest/AndroidManifest.xml b/date-time-picker/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from date-time-picker/src/androidLibAndroidTest/AndroidManifest.xml
rename to date-time-picker/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/date-time-picker/src/androidLibAndroidTest/kotlin/AndroidDateTimePickerPresenterTest.kt b/date-time-picker/src/androidLibInstrumentedTest/kotlin/AndroidDateTimePickerPresenterTest.kt
similarity index 100%
rename from date-time-picker/src/androidLibAndroidTest/kotlin/AndroidDateTimePickerPresenterTest.kt
rename to date-time-picker/src/androidLibInstrumentedTest/kotlin/AndroidDateTimePickerPresenterTest.kt
diff --git a/date-time-picker/src/androidLibAndroidTest/kotlin/DateTimePickerViewModel.kt b/date-time-picker/src/androidLibInstrumentedTest/kotlin/DateTimePickerViewModel.kt
similarity index 100%
rename from date-time-picker/src/androidLibAndroidTest/kotlin/DateTimePickerViewModel.kt
rename to date-time-picker/src/androidLibInstrumentedTest/kotlin/DateTimePickerViewModel.kt
diff --git a/date-time-picker/src/androidLibAndroidTest/kotlin/TestActivity.kt b/date-time-picker/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from date-time-picker/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to date-time-picker/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/example/android/build.gradle.kts b/example/android/build.gradle.kts
index d5923bfd9..10a6d6f64 100644
--- a/example/android/build.gradle.kts
+++ b/example/android/build.gradle.kts
@@ -95,7 +95,7 @@ dependencies {
 
     implementationDependency(Dependencies.Android.PlayServices.Location)
     implementationDependency(Dependencies.Android.Material)
-    implementationDependency(Dependencies.Android.MaterialComposeThemeAdapter)
+    implementationDependency(Dependencies.Accompanist.MaterialThemeAdapter)
 
     implementationDependency(Dependencies.KotlinX.Serialization.Core)
     implementationDependency(Dependencies.KotlinX.Serialization.Json)
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
index 2b66b51f4..addbf5c0d 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/alerts/compose/AlertsLayout.kt
@@ -30,7 +30,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
-import com.google.android.material.composethemeadapter.MdcTheme
+import com.google.accompanist.themeadapter.material.MdcTheme
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.alert.AlertViewModel
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
index d106a51bf..50d11507a 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
@@ -44,7 +44,7 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.navigation.compose.composable
-import com.google.android.material.composethemeadapter.MdcTheme
+import com.google.accompanist.themeadapter.material.MdcTheme
 import com.splendo.kaluga.architecture.compose.mutableState
 import com.splendo.kaluga.architecture.compose.navigation.RootModalBottomSheetNavigator
 import com.splendo.kaluga.architecture.compose.navigation.composable
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
index c46df491b..3a184ff7c 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/datetimepicker/compose/DateTimePickerLayout.kt
@@ -32,7 +32,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import com.google.android.material.composethemeadapter.MdcTheme
+import com.google.accompanist.themeadapter.material.MdcTheme
 import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
index 1a75ca067..945f62b81 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/keyboard/compose/KeyboardLayout.kt
@@ -41,7 +41,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.ImeAction
-import com.google.android.material.composethemeadapter.MdcTheme
+import com.google.accompanist.themeadapter.material.MdcTheme
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.keyboard.KeyboardViewModel
@@ -71,12 +71,13 @@ class ComposeKeyboardActivity : AppCompatActivity() {
 fun KeyboardLayout() {
     MdcTheme {
         val focusHandler = LocalFocusManager.current
-        val viewModel = koinViewModel<KeyboardViewModel<ComposeFocusHandler>>(named(composeKeyboardViewModel)) {
-            parametersOf(
-                ComposeKeyboardManager.Builder(),
-                ComposeFocusHandler(FocusRequester.Default)
-            )
-        }
+        val viewModel =
+            koinViewModel<KeyboardViewModel<ComposeFocusHandler>>(named(composeKeyboardViewModel)) {
+                parametersOf(
+                    ComposeKeyboardManager.Builder(),
+                    ComposeFocusHandler(FocusRequester.Default)
+                )
+            }
 
         ViewModelComposable(viewModel) {
             Column(
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
index c65ecefc8..a835f4e63 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/loading/compose/LoadingLayout.kt
@@ -30,7 +30,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
-import com.google.android.material.composethemeadapter.MdcTheme
+import com.google.accompanist.themeadapter.material.MdcTheme
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.hud.HudViewModel
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
index 5da2a0cf0..d179c51e6 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
@@ -34,7 +34,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.composable
-import com.google.android.material.composethemeadapter.MdcTheme
+import com.google.accompanist.themeadapter.material.MdcTheme
 import com.splendo.kaluga.architecture.compose.navigation.RootNavHostComposableNavigator
 import com.splendo.kaluga.architecture.compose.navigation.next
 import com.splendo.kaluga.architecture.compose.navigation.route
diff --git a/example/gradle.properties b/example/gradle.properties
index b483df3d0..84c837739 100644
--- a/example/gradle.properties
+++ b/example/gradle.properties
@@ -14,6 +14,7 @@ android.nonTransitiveRClass=true
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
 
 kaluga.androidGradlePluginVersion=7.4.0
 kaluga.kotlinVersion=1.8.0
diff --git a/gradle.properties b/gradle.properties
index 846c7d777..a639dbb41 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx4096M"
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
 
 ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ##
 #
diff --git a/hud/src/androidLibAndroidTest/AndroidManifest.xml b/hud/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from hud/src/androidLibAndroidTest/AndroidManifest.xml
rename to hud/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt b/hud/src/androidLibInstrumentedTest/kotlin/AndroidHUDTests.kt
similarity index 100%
rename from hud/src/androidLibAndroidTest/kotlin/AndroidHUDTests.kt
rename to hud/src/androidLibInstrumentedTest/kotlin/AndroidHUDTests.kt
diff --git a/hud/src/androidLibAndroidTest/kotlin/HudViewModel.kt b/hud/src/androidLibInstrumentedTest/kotlin/HudViewModel.kt
similarity index 100%
rename from hud/src/androidLibAndroidTest/kotlin/HudViewModel.kt
rename to hud/src/androidLibInstrumentedTest/kotlin/HudViewModel.kt
diff --git a/hud/src/androidLibAndroidTest/kotlin/TestActivity.kt b/hud/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from hud/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to hud/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
index b8f7b56e0..24c633011 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
@@ -66,30 +66,6 @@ fun LibraryExtension.androidCommon(project: org.gradle.api.Project, componentTyp
         }
     }
 
-    project.logger.lifecycle("Android sourcesets for this project module are configured as a library")
-    sourceSets {
-        getByName("main") {
-            manifest.srcFile("src/androidLibMain/AndroidManifest.xml")
-            res.srcDir("src/androidLibMain/res")
-            when (componentType) {
-                is ComponentType.Compose,
-                is ComponentType.DataBinding -> {
-                    java.srcDir("src/androidLibMain/kotlin")
-                }
-                is ComponentType.Default -> {}
-            }
-        }
-        getByName("androidTest") {
-            manifest.srcFile("src/androidLibAndroidTest/AndroidManifest.xml")
-            java.srcDir("src/androidLibAndroidTest/kotlin")
-            res.srcDir("src/androidLibAndroidTest/res")
-        }
-
-        getByName("test") {
-            java.srcDir("src/androidLibUnitTest/kotlin")
-        }
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index 6fba56218..4c0d29e1a 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -96,12 +96,18 @@ object Dependencies {
         val AtomicFu = Dependency(group, "atomicfu", "0.19.0")
     }
 
+    object Accompanist {
+        private const val groupBase = "com.google.accompanist"
+        private const val version = "0.28.0"
+
+        val MaterialThemeAdapter = Dependency(groupBase, "accompanist-themeadapter-material", version)
+    }
+
     object Android {
         internal const val groupBase = "com.google.android"
         private const val materialBase = "$groupBase.material"
 
         val Material = Dependency(materialBase, "material", "1.7.0")
-        val MaterialComposeThemeAdapter = Dependency(materialBase, "compose-theme-adapter", "1.2.1")
 
         object Play {
             private const val group = "$groupBase.play"
diff --git a/keyboard-compose/src/androidLibAndroidTest/AndroidManifest.xml b/keyboard-compose/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from keyboard-compose/src/androidLibAndroidTest/AndroidManifest.xml
rename to keyboard-compose/src/androidTest/AndroidManifest.xml
diff --git a/keyboard-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt b/keyboard-compose/src/androidTest/kotlin/TestActivity.kt
similarity index 100%
rename from keyboard-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to keyboard-compose/src/androidTest/kotlin/TestActivity.kt
diff --git a/keyboard-compose/src/androidLibMain/AndroidManifest.xml b/keyboard-compose/src/main/AndroidManifest.xml
similarity index 100%
rename from keyboard-compose/src/androidLibMain/AndroidManifest.xml
rename to keyboard-compose/src/main/AndroidManifest.xml
diff --git a/keyboard-compose/src/androidLibMain/kotlin/ComposeFocusHandler.kt b/keyboard-compose/src/main/kotlin/ComposeFocusHandler.kt
similarity index 100%
rename from keyboard-compose/src/androidLibMain/kotlin/ComposeFocusHandler.kt
rename to keyboard-compose/src/main/kotlin/ComposeFocusHandler.kt
diff --git a/keyboard-compose/src/androidLibMain/kotlin/ComposeKeyboardManager.kt b/keyboard-compose/src/main/kotlin/ComposeKeyboardManager.kt
similarity index 100%
rename from keyboard-compose/src/androidLibMain/kotlin/ComposeKeyboardManager.kt
rename to keyboard-compose/src/main/kotlin/ComposeKeyboardManager.kt
diff --git a/keyboard/src/androidLibAndroidTest/AndroidManifest.xml b/keyboard/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from keyboard/src/androidLibAndroidTest/AndroidManifest.xml
rename to keyboard/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/keyboard/src/androidLibAndroidTest/kotlin/ActivityKeyboardManagerBuilderTest.kt b/keyboard/src/androidLibInstrumentedTest/kotlin/ActivityKeyboardManagerBuilderTest.kt
similarity index 100%
rename from keyboard/src/androidLibAndroidTest/kotlin/ActivityKeyboardManagerBuilderTest.kt
rename to keyboard/src/androidLibInstrumentedTest/kotlin/ActivityKeyboardManagerBuilderTest.kt
diff --git a/keyboard/src/androidLibAndroidTest/kotlin/TestActivity.kt b/keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from keyboard/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt b/links/src/androidLibInstrumentedTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt
similarity index 100%
rename from links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt
rename to links/src/androidLibInstrumentedTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt
diff --git a/links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt b/links/src/androidLibInstrumentedTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
similarity index 100%
rename from links/src/androidLibAndroidTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
rename to links/src/androidLibInstrumentedTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
diff --git a/location-permissions/src/androidLibAndroidTest/AndroidManifest.xml b/location-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from location-permissions/src/androidLibAndroidTest/AndroidManifest.xml
rename to location-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/location/src/androidLibAndroidTest/AndroidManifest.xml b/location/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from location/src/androidLibAndroidTest/AndroidManifest.xml
rename to location/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/microphone-permissions/src/androidLibAndroidTest/AndroidManifest.xml b/microphone-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from microphone-permissions/src/androidLibAndroidTest/AndroidManifest.xml
rename to microphone-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/notifications-permissions/src/androidLibAndroidTest/AndroidManifest.xml b/notifications-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from notifications-permissions/src/androidLibAndroidTest/AndroidManifest.xml
rename to notifications-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/resources-compose/src/androidLibAndroidTest/AndroidManifest.xml b/resources-compose/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from resources-compose/src/androidLibAndroidTest/AndroidManifest.xml
rename to resources-compose/src/androidTest/AndroidManifest.xml
diff --git a/resources-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt b/resources-compose/src/androidTest/kotlin/TestActivity.kt
similarity index 100%
rename from resources-compose/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to resources-compose/src/androidTest/kotlin/TestActivity.kt
diff --git a/resources-compose/src/androidLibMain/AndroidManifest.xml b/resources-compose/src/main/AndroidManifest.xml
similarity index 100%
rename from resources-compose/src/androidLibMain/AndroidManifest.xml
rename to resources-compose/src/main/AndroidManifest.xml
diff --git a/resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt b/resources-compose/src/main/kotlin/BackgroundStyle.kt
similarity index 100%
rename from resources-compose/src/androidLibMain/kotlin/BackgroundStyle.kt
rename to resources-compose/src/main/kotlin/BackgroundStyle.kt
diff --git a/resources-compose/src/androidLibMain/kotlin/Color.kt b/resources-compose/src/main/kotlin/Color.kt
similarity index 100%
rename from resources-compose/src/androidLibMain/kotlin/Color.kt
rename to resources-compose/src/main/kotlin/Color.kt
diff --git a/resources-compose/src/androidLibMain/kotlin/GradientStyle.kt b/resources-compose/src/main/kotlin/GradientStyle.kt
similarity index 100%
rename from resources-compose/src/androidLibMain/kotlin/GradientStyle.kt
rename to resources-compose/src/main/kotlin/GradientStyle.kt
diff --git a/resources-compose/src/androidLibMain/kotlin/KalugaButton.kt b/resources-compose/src/main/kotlin/KalugaButton.kt
similarity index 100%
rename from resources-compose/src/androidLibMain/kotlin/KalugaButton.kt
rename to resources-compose/src/main/kotlin/KalugaButton.kt
diff --git a/resources-compose/src/androidLibMain/kotlin/KalugaLabel.kt b/resources-compose/src/main/kotlin/KalugaLabel.kt
similarity index 100%
rename from resources-compose/src/androidLibMain/kotlin/KalugaLabel.kt
rename to resources-compose/src/main/kotlin/KalugaLabel.kt
diff --git a/resources-compose/src/androidLibMain/kotlin/RoundedCornerRadiusShape.kt b/resources-compose/src/main/kotlin/RoundedCornerRadiusShape.kt
similarity index 100%
rename from resources-compose/src/androidLibMain/kotlin/RoundedCornerRadiusShape.kt
rename to resources-compose/src/main/kotlin/RoundedCornerRadiusShape.kt
diff --git a/resources-compose/src/androidLibMain/kotlin/TextAlignment.kt b/resources-compose/src/main/kotlin/TextAlignment.kt
similarity index 100%
rename from resources-compose/src/androidLibMain/kotlin/TextAlignment.kt
rename to resources-compose/src/main/kotlin/TextAlignment.kt
diff --git a/resources-databinding/src/androidLibAndroidTest/AndroidManifest.xml b/resources-databinding/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from resources-databinding/src/androidLibAndroidTest/AndroidManifest.xml
rename to resources-databinding/src/androidTest/AndroidManifest.xml
diff --git a/resources-databinding/src/androidLibAndroidTest/kotlin/TestActivity.kt b/resources-databinding/src/androidTest/kotlin/TestActivity.kt
similarity index 100%
rename from resources-databinding/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to resources-databinding/src/androidTest/kotlin/TestActivity.kt
diff --git a/resources-databinding/src/androidLibMain/AndroidManifest.xml b/resources-databinding/src/main/AndroidManifest.xml
similarity index 100%
rename from resources-databinding/src/androidLibMain/AndroidManifest.xml
rename to resources-databinding/src/main/AndroidManifest.xml
diff --git a/resources-databinding/src/androidLibMain/kotlin/Binding.kt b/resources-databinding/src/main/kotlin/Binding.kt
similarity index 100%
rename from resources-databinding/src/androidLibMain/kotlin/Binding.kt
rename to resources-databinding/src/main/kotlin/Binding.kt
diff --git a/resources/src/androidLibAndroidTest/AndroidManifest.xml b/resources/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from resources/src/androidLibAndroidTest/AndroidManifest.xml
rename to resources/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/resources/src/androidLibAndroidTest/kotlin/AndroidStringsTest.kt b/resources/src/androidLibInstrumentedTest/kotlin/AndroidStringsTest.kt
similarity index 100%
rename from resources/src/androidLibAndroidTest/kotlin/AndroidStringsTest.kt
rename to resources/src/androidLibInstrumentedTest/kotlin/AndroidStringsTest.kt
diff --git a/resources/src/androidLibAndroidTest/kotlin/TestActivity.kt b/resources/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from resources/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to resources/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/resources/src/androidLibAndroidTest/res/values/strings.xml b/resources/src/androidLibInstrumentedTest/res/values/strings.xml
similarity index 100%
rename from resources/src/androidLibAndroidTest/res/values/strings.xml
rename to resources/src/androidLibInstrumentedTest/res/values/strings.xml
diff --git a/resources/src/androidLibMain/kotlin/view/TextAlignment.kt b/resources/src/androidLibMain/kotlin/view/TextAlignment.kt
index 36d366843..dfa8a3de8 100644
--- a/resources/src/androidLibMain/kotlin/view/TextAlignment.kt
+++ b/resources/src/androidLibMain/kotlin/view/TextAlignment.kt
@@ -12,6 +12,7 @@ fun KalugaTextAlignment.alignment(context: Context): Layout.Alignment {
     val locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
         context.resources.configuration.locales.get(0)
     } else {
+        @Suppress("DEPRECATION")
         context.resources.configuration.locale
     }
     return when (this) {
diff --git a/review/src/androidLibAndroidTest/AndroidManifest.xml b/review/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from review/src/androidLibAndroidTest/AndroidManifest.xml
rename to review/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/review/src/androidLibAndroidTest/kotlin/TestActivity.kt b/review/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from review/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to review/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/scientific/src/androidLibAndroidTest/AndroidManifest.xml b/scientific/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from scientific/src/androidLibAndroidTest/AndroidManifest.xml
rename to scientific/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/scientific/src/androidLibAndroidTest/kotlin/TestActivity.kt b/scientific/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from scientific/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to scientific/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/storage-permissions/src/androidLibAndroidTest/AndroidManifest.xml b/storage-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from storage-permissions/src/androidLibAndroidTest/AndroidManifest.xml
rename to storage-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/system/src/androidLibAndroidTest/AndroidManifest.xml b/system/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from system/src/androidLibAndroidTest/AndroidManifest.xml
rename to system/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-alerts/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-alerts/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-alerts/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-alerts/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-alerts/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils-alerts/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils-alerts/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils-alerts/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/test-utils-architecture/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-architecture/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-architecture/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-architecture/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-architecture/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils-architecture/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils-architecture/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils-architecture/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/test-utils-base/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-base/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-base/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-base/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-base/src/androidLibAndroidTest/kotlin/TestBaseInstrumentationTest.kt b/test-utils-base/src/androidLibInstrumentedTest/kotlin/TestBaseInstrumentationTest.kt
similarity index 100%
rename from test-utils-base/src/androidLibAndroidTest/kotlin/TestBaseInstrumentationTest.kt
rename to test-utils-base/src/androidLibInstrumentedTest/kotlin/TestBaseInstrumentationTest.kt
diff --git a/test-utils-bluetooth/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-bluetooth/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-bluetooth/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-bluetooth/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-bluetooth/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils-bluetooth/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils-bluetooth/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils-bluetooth/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/test-utils-bluetooth/src/androidLibTest/kotlin/TestMockBluetoothGattWrapper.kt b/test-utils-bluetooth/src/androidLibUnitTest/kotlin/TestMockBluetoothGattWrapper.kt
similarity index 100%
rename from test-utils-bluetooth/src/androidLibTest/kotlin/TestMockBluetoothGattWrapper.kt
rename to test-utils-bluetooth/src/androidLibUnitTest/kotlin/TestMockBluetoothGattWrapper.kt
diff --git a/test-utils-hud/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-hud/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-hud/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-hud/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-hud/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils-hud/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils-hud/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils-hud/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/test-utils-keyboard/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-keyboard/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-keyboard/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-keyboard/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-keyboard/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils-keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils-keyboard/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils-keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/test-utils-koin/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-koin/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-koin/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-koin/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-koin/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils-koin/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils-koin/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils-koin/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/test-utils-location/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-location/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-location/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-location/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-location/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils-location/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils-location/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils-location/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/test-utils-permissions/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-permissions/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-permissions/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-permissions/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils-permissions/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils-permissions/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils-permissions/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/test-utils-resources/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-resources/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-resources/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-resources/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-resources/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils-resources/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils-resources/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils-resources/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/test-utils-system/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils-system/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils-system/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils-system/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils-system/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils-system/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils-system/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils-system/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
diff --git a/test-utils/src/androidLibAndroidTest/AndroidManifest.xml b/test-utils/src/androidLibInstrumentedTest/AndroidManifest.xml
similarity index 100%
rename from test-utils/src/androidLibAndroidTest/AndroidManifest.xml
rename to test-utils/src/androidLibInstrumentedTest/AndroidManifest.xml
diff --git a/test-utils/src/androidLibAndroidTest/kotlin/TestActivity.kt b/test-utils/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
similarity index 100%
rename from test-utils/src/androidLibAndroidTest/kotlin/TestActivity.kt
rename to test-utils/src/androidLibInstrumentedTest/kotlin/TestActivity.kt

From 9f320c74487385e844c9494cdf31d83d045c31f0 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 23 Jan 2023 09:48:18 +0100
Subject: [PATCH 109/227] Fix Divide by zero failure

---
 scientific/src/commonMain/kotlin/ScientificValue.kt    | 10 +++++-----
 .../src/commonTest/kotlin/ScientificValueTest.kt       |  7 +++++++
 .../commonTest/kotlin/unit/KinematicViscosityTest.kt   |  8 ++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/scientific/src/commonMain/kotlin/ScientificValue.kt b/scientific/src/commonMain/kotlin/ScientificValue.kt
index 30caa6666..396d8550c 100644
--- a/scientific/src/commonMain/kotlin/ScientificValue.kt
+++ b/scientific/src/commonMain/kotlin/ScientificValue.kt
@@ -301,7 +301,7 @@ fun <
 ) = if (factor.value != 0.0) {
     factory(this / factor.decimalValue, factor.unit)
 } else {
-    throw ScientificConverterException("Dividing by 0.0")
+    throw ScientificConverterException("Dividing by zero")
 }
 
 fun <
@@ -311,10 +311,10 @@ fun <
     > ScientificValue<Quantity, Unit>.div(
     factor: Decimal,
     factory: (Decimal, Unit) -> Value
-) = if (factor.toDouble() == 0.0) {
+) = if (factor.toDouble() != 0.0) {
     factory(decimalValue / factor, unit)
 } else {
-    throw ScientificConverterException("Dividing by 0.0")
+    throw ScientificConverterException("Dividing by zero")
 }
 
 infix operator fun <
@@ -378,7 +378,7 @@ internal fun <
 ) = if (divider.value != 0.0) {
     fromSIUnit(nominator.unit.toSIUnit(nominator.decimalValue) / divider.unit.toSIUnit(divider.decimalValue))(this, factory)
 } else {
-    throw ScientificConverterException("Dividing by 0.0")
+    throw ScientificConverterException("Dividing by zero")
 }
 
 internal fun <
@@ -407,5 +407,5 @@ internal fun <
 ) = if (inverse.value != 0.0) {
     fromSIUnit(1.0.toDecimal() / inverse.unit.toSIUnit(inverse.decimalValue))(this, factory)
 } else {
-    throw ScientificConverterException("Inverting by 0.0")
+    throw ScientificConverterException("Inverting by zero")
 }
diff --git a/scientific/src/commonTest/kotlin/ScientificValueTest.kt b/scientific/src/commonTest/kotlin/ScientificValueTest.kt
index 41a5b051f..0ba7ad59b 100644
--- a/scientific/src/commonTest/kotlin/ScientificValueTest.kt
+++ b/scientific/src/commonTest/kotlin/ScientificValueTest.kt
@@ -18,9 +18,11 @@
 package com.splendo.kaluga.scientific
 
 import com.splendo.kaluga.base.utils.toDouble
+import com.splendo.kaluga.scientific.converter.ScientificConverterException
 import com.splendo.kaluga.scientific.converter.decimal.div
 import com.splendo.kaluga.scientific.converter.frequency.times
 import com.splendo.kaluga.scientific.converter.length.times
+import com.splendo.kaluga.scientific.converter.time.frequency
 import com.splendo.kaluga.scientific.unit.Decimeter
 import com.splendo.kaluga.scientific.unit.Hectogram
 import com.splendo.kaluga.scientific.unit.Hertz
@@ -30,6 +32,7 @@ import com.splendo.kaluga.scientific.unit.Second
 import com.splendo.kaluga.scientific.unit.SquareMeter
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 
 class ScientificValueTest {
 
@@ -52,5 +55,9 @@ class ScientificValueTest {
         assertEquals(0.5(Hertz), 1.0 / 2(Second))
         assertEquals(3(Kilogram), 9(Kilogram) / 30(Hectogram))
         assertEquals(3(Kilogram), 9(Kilogram) / 3)
+
+        assertFailsWith<ScientificConverterException> { 1(Kilogram) / 0(Kilogram) }
+        assertFailsWith<ScientificConverterException> { 1(Kilogram) / 0 }
+        assertFailsWith<ScientificConverterException> { 0(Second).frequency() }
     }
 }
diff --git a/scientific/src/commonTest/kotlin/unit/KinematicViscosityTest.kt b/scientific/src/commonTest/kotlin/unit/KinematicViscosityTest.kt
index acb199f2b..bbf724ddb 100644
--- a/scientific/src/commonTest/kotlin/unit/KinematicViscosityTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/KinematicViscosityTest.kt
@@ -64,8 +64,8 @@ class KinematicViscosityTest {
         assertEqualScientificValue(1(SquareFoot per Second), (2(SquareFoot)) / 2(Second))
         assertEqualScientificValue(1(SquareFoot per Second), (2(Foot) * 1(Foot)) / 2(Second))
 
-        assertEqualScientificValue(1(SquareMeter per Second), (2(SquareMeter).convert(SquareFoot)) / 2(Second))
-        assertEqualScientificValue(1(SquareMeter per Second), (2(Meter) * 1(Meter).convert(Foot)) / 2(Second))
+        assertEqualScientificValue(1(SquareMeter per Second), 2(SquareMeter as Area) / 2(Second))
+        assertEqualScientificValue(1(SquareMeter per Second), 2(Meter) * 1(Meter as Length) / 2(Second))
     }
 
     @Test
@@ -91,7 +91,7 @@ class KinematicViscosityTest {
         assertEqualScientificValue((4 * ImperialStandardGravityAcceleration.value)(SquareFoot per Second), (2(Second) * 2(FootPoundForce per Pound.ukImperial)))
         assertEqualScientificValue((4 * ImperialStandardGravityAcceleration.value)(SquareFoot per Second), (2(FootPoundForce per Pound.usCustomary)) * 2(Second))
         assertEqualScientificValue((4 * ImperialStandardGravityAcceleration.value)(SquareFoot per Second), (2(Second) * 2(FootPoundForce per Pound.usCustomary)))
-        assertEqualScientificValue(4(SquareMeter per Second), (2(Joule per Kilogram)).convert(FootPoundForce per Pound) * 2(Second))
-        assertEqualScientificValue(4(SquareMeter per Second), (2(Second) * 2(Joule per Kilogram).convert(FootPoundForce per Pound)))
+        assertEqualScientificValue(4(SquareMeter per Second), (2((Joule per Kilogram) as SpecificEnergy)) * 2(Second))
+        assertEqualScientificValue(4(SquareMeter per Second), (2(Second) * 2((Joule per Kilogram) as SpecificEnergy)))
     }
 }

From 4c7e43d74359c19fc5191bfd63be2507b97598e3 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 18 Jan 2023 16:36:45 +0100
Subject: [PATCH 110/227] Revert "Add toString on KalugaDate and TimeZone"

This reverts commit 3d17c00363878aa22821dd79bd80d6ba33de1e18.
---
 base/api/androidLib/base.api                  | 39 ++++--------
 base/api/jvm/base.api                         | 39 ++++--------
 .../androidLibMain/kotlin/utils/KalugaDate.kt |  2 +-
 .../androidLibMain/kotlin/utils/TimeZone.kt   | 16 ++---
 .../src/commonMain/kotlin/utils/KalugaDate.kt | 49 +++++++--------
 base/src/commonMain/kotlin/utils/TimeZone.kt  | 61 +++++++++----------
 base/src/iosMain/kotlin/utils/KalugaDate.kt   |  2 +-
 base/src/iosMain/kotlin/utils/TimeZone.kt     | 16 ++---
 base/src/jsMain/kotlin/utils/KalugaDate.kt    |  2 +-
 base/src/jsMain/kotlin/utils/TimeZone.kt      | 16 ++---
 base/src/jvmMain/kotlin/utils/KalugaDate.kt   |  2 +-
 base/src/jvmMain/kotlin/utils/TimeZone.kt     | 16 ++---
 12 files changed, 109 insertions(+), 151 deletions(-)

diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index 563d8e361..2fc268af3 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -576,21 +576,6 @@ public final class com/splendo/kaluga/base/utils/ApplyIfKt {
 	public static final fun applyIf (Ljava/lang/Object;ZLkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
-public abstract class com/splendo/kaluga/base/utils/BaseTimeZone {
-	public fun <init> ()V
-	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public abstract fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
-	public abstract fun getDaylightSavingsOffsetInMilliseconds ()J
-	public abstract fun getIdentifier ()Ljava/lang/String;
-	public abstract fun getOffsetFromGMTInMilliseconds ()J
-	public abstract fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public static synthetic fun offsetFromGMTAtDateInMilliseconds$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
-	public fun toString ()Ljava/lang/String;
-	public abstract fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-	public static synthetic fun usesDaylightSavingsTime$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Z
-}
-
 public final class com/splendo/kaluga/base/utils/ByteUtils {
 	public static final field BYTE_STRING_LENGTH I
 	public static final field HEX_RADIX I
@@ -718,8 +703,7 @@ public final class com/splendo/kaluga/base/utils/IntKt {
 	public static final fun length (I)I
 }
 
-public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Comparable {
-	public fun <init> ()V
+public abstract interface class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Comparable {
 	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public abstract fun equals (Ljava/lang/Object;)Z
 	public abstract fun getDate ()Ljava/util/Date;
@@ -755,7 +739,6 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public abstract fun setWeekOfMonth (I)V
 	public abstract fun setWeekOfYear (I)V
 	public abstract fun setYear (I)V
-	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
@@ -829,17 +812,19 @@ public final class com/splendo/kaluga/base/utils/RoundingMode$RoundUp : com/sple
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/RoundingMode$RoundUp;
 }
 
-public final class com/splendo/kaluga/base/utils/TimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
+public final class com/splendo/kaluga/base/utils/TimeZone {
 	public static final field Companion Lcom/splendo/kaluga/base/utils/TimeZone$Companion;
-	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public final fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public final fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getDaylightSavingsOffsetInMilliseconds ()J
-	public fun getIdentifier ()Ljava/lang/String;
-	public fun getOffsetFromGMTInMilliseconds ()J
-	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public final fun getDaylightSavingsOffsetInMilliseconds ()J
+	public final fun getIdentifier ()Ljava/lang/String;
+	public final fun getOffsetFromGMTInMilliseconds ()J
+	public final fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public static synthetic fun offsetFromGMTAtDateInMilliseconds$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
+	public final fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static synthetic fun usesDaylightSavingsTime$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Z
 }
 
 public final class com/splendo/kaluga/base/utils/TimeZone$Companion {
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index acb444f44..cd975aa82 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -554,21 +554,6 @@ public final class com/splendo/kaluga/base/utils/ApplyIfKt {
 	public static final fun applyIf (Ljava/lang/Object;ZLkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
-public abstract class com/splendo/kaluga/base/utils/BaseTimeZone {
-	public fun <init> ()V
-	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public abstract fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
-	public abstract fun getDaylightSavingsOffsetInMilliseconds ()J
-	public abstract fun getIdentifier ()Ljava/lang/String;
-	public abstract fun getOffsetFromGMTInMilliseconds ()J
-	public abstract fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public static synthetic fun offsetFromGMTAtDateInMilliseconds$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
-	public fun toString ()Ljava/lang/String;
-	public abstract fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-	public static synthetic fun usesDaylightSavingsTime$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Z
-}
-
 public final class com/splendo/kaluga/base/utils/ByteUtils {
 	public static final field BYTE_STRING_LENGTH I
 	public static final field HEX_RADIX I
@@ -696,8 +681,7 @@ public final class com/splendo/kaluga/base/utils/IntKt {
 	public static final fun length (I)I
 }
 
-public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Comparable {
-	public fun <init> ()V
+public abstract interface class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Comparable {
 	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public abstract fun equals (Ljava/lang/Object;)Z
 	public abstract fun getDate ()Ljava/util/Date;
@@ -733,7 +717,6 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public abstract fun setWeekOfMonth (I)V
 	public abstract fun setWeekOfYear (I)V
 	public abstract fun setYear (I)V
-	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
@@ -807,17 +790,19 @@ public final class com/splendo/kaluga/base/utils/RoundingMode$RoundUp : com/sple
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/RoundingMode$RoundUp;
 }
 
-public final class com/splendo/kaluga/base/utils/TimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
+public final class com/splendo/kaluga/base/utils/TimeZone {
 	public static final field Companion Lcom/splendo/kaluga/base/utils/TimeZone$Companion;
-	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public final fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public final fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getDaylightSavingsOffsetInMilliseconds ()J
-	public fun getIdentifier ()Ljava/lang/String;
-	public fun getOffsetFromGMTInMilliseconds ()J
-	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public final fun getDaylightSavingsOffsetInMilliseconds ()J
+	public final fun getIdentifier ()Ljava/lang/String;
+	public final fun getOffsetFromGMTInMilliseconds ()J
+	public final fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public static synthetic fun offsetFromGMTAtDateInMilliseconds$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
+	public final fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static synthetic fun usesDaylightSavingsTime$default (Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Z
 }
 
 public final class com/splendo/kaluga/base/utils/TimeZone$Companion {
diff --git a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
index 531bf4566..5ea93a1fe 100644
--- a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
@@ -22,7 +22,7 @@ import java.util.Date
 
 actual typealias KalugaDateHolder = Date
 
-actual class DefaultKalugaDate internal constructor(internal val calendar: Calendar) : KalugaDate() {
+actual class DefaultKalugaDate internal constructor(internal val calendar: Calendar) : KalugaDate {
 
     actual companion object {
         actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
diff --git a/base/src/androidLibMain/kotlin/utils/TimeZone.kt b/base/src/androidLibMain/kotlin/utils/TimeZone.kt
index add30ff1f..14d33a68f 100644
--- a/base/src/androidLibMain/kotlin/utils/TimeZone.kt
+++ b/base/src/androidLibMain/kotlin/utils/TimeZone.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.utils
 
-actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) : BaseTimeZone() {
+actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) {
 
     actual companion object {
         actual fun get(identifier: String): TimeZone? {
@@ -31,19 +31,19 @@ actual class TimeZone internal constructor(internal val timeZone: java.util.Time
         actual val availableIdentifiers get() = java.util.TimeZone.getAvailableIDs().asList()
     }
 
-    override val identifier: String = timeZone.id
-    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
+    actual val identifier: String = timeZone.id
+    actual fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
         val styleJava = when (style) {
             TimeZoneNameStyle.Short -> java.util.TimeZone.SHORT
             TimeZoneNameStyle.Long -> java.util.TimeZone.LONG
         }
         return timeZone.getDisplayName(withDaylightSavings, styleJava, locale.locale)
     }
-    override val offsetFromGMTInMilliseconds = timeZone.rawOffset.toLong()
-    override val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
-    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
-    override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
-    override fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
+    actual val offsetFromGMTInMilliseconds = timeZone.rawOffset.toLong()
+    actual val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
+    actual fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
+    actual fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
+    actual fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
     override fun equals(other: Any?): Boolean {
         return (other as? TimeZone)?.let { timeZone == other.timeZone } ?: false
     }
diff --git a/base/src/commonMain/kotlin/utils/KalugaDate.kt b/base/src/commonMain/kotlin/utils/KalugaDate.kt
index 0bfd2999d..5b4a7fe35 100644
--- a/base/src/commonMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaDate.kt
@@ -18,8 +18,6 @@
 
 package com.splendo.kaluga.base.utils
 
-import com.splendo.kaluga.base.text.KalugaDateFormatter
-import com.splendo.kaluga.base.text.iso8601Pattern
 import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
 import kotlin.jvm.JvmName
 
@@ -32,107 +30,102 @@ expect class KalugaDateHolder
  * Class describing a point in time
  * Dates are localized according to a [Locale] and relative to a given [TimeZone]
  */
-abstract class KalugaDate : Comparable<KalugaDate> {
+interface KalugaDate : Comparable<KalugaDate> {
     /**
      * The [TimeZone] in which the Date is set
      */
-    abstract var timeZone: TimeZone
+    var timeZone: TimeZone
 
     /**
      * The number of the era, e.g., AD or BC in the Julian calendar
      */
-    abstract var era: Int
+    var era: Int
 
     /**
      * The year
      */
-    abstract var year: Int
+    var year: Int
 
     /**
      * The month of the year. Starts at 1
      */
-    abstract var month: Int
+    var month: Int
 
     /**
      * The number of days in the current month
      */
-    abstract val daysInMonth: Int
+    val daysInMonth: Int
 
     /**
      * The week number within the current year.
      */
-    abstract var weekOfYear: Int
+    var weekOfYear: Int
 
     /**
      * The week number within the current month
      */
-    abstract var weekOfMonth: Int
+    var weekOfMonth: Int
 
     /**
      * The day of the current month
      */
-    abstract var day: Int
+    var day: Int
 
     /**
      * The day of the current year
      */
-    abstract var dayOfYear: Int
+    var dayOfYear: Int
 
     /**
      * The day of the week. Starts at 1
      */
-    abstract var weekDay: Int
+    var weekDay: Int
 
     /**
      * The first day of the week. E.g. Sunday in the US, Monday in France. Starts at 1.
      */
-    abstract var firstWeekDay: Int
+    var firstWeekDay: Int
 
     /**
      * The hour of the current day
      */
-    abstract var hour: Int
+    var hour: Int
 
     /**
      * The minute of the current hour
      */
-    abstract var minute: Int
+    var minute: Int
 
     /**
      * The second of the current minute
      */
-    abstract var second: Int
+    var second: Int
 
     /**
      * The millisecond of the current second
      */
-    abstract var millisecond: Int
+    var millisecond: Int
 
     /**
      * The number of milliseconds passed since epoch time (January 1st 1970 00:00:00:00 GMT)
      */
-    abstract var millisecondSinceEpoch: Long
+    var millisecondSinceEpoch: Long
 
     /**
      * Creates a copy of a [KalugaDate]
      * @return A copy of this [KalugaDate]
      */
-    abstract fun copy(): KalugaDate
+    fun copy(): KalugaDate
 
     /**
      * Returns whether this Date is in the same [timeZone] and has the same time based on [millisecondSinceEpoch]
      * @return `true` if the two dates are equal
      */
-    abstract override fun equals(other: Any?): Boolean
+    override fun equals(other: Any?): Boolean
 
-    abstract override fun hashCode(): Int
+    override fun hashCode(): Int
 
-    override fun toString(): String {
-        val formatter = KalugaDateFormatter.iso8601Pattern(timeZone)
-        return formatter.format(this)
-    }
-
-    abstract val date: KalugaDateHolder
+    val date: KalugaDateHolder
 }
 
 expect class DefaultKalugaDate : KalugaDate {
diff --git a/base/src/commonMain/kotlin/utils/TimeZone.kt b/base/src/commonMain/kotlin/utils/TimeZone.kt
index dfec4ac08..53882c355 100644
--- a/base/src/commonMain/kotlin/utils/TimeZone.kt
+++ b/base/src/commonMain/kotlin/utils/TimeZone.kt
@@ -31,12 +31,31 @@ enum class TimeZoneNameStyle {
 
 val TimeZone.Companion.utc: TimeZone by lazy { TimeZone.get("UTC")!! }
 
-abstract class BaseTimeZone {
+expect class TimeZone {
+    companion object {
+        /**
+         * Gets a [TimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [TimeZone] for
+         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         */
+        fun get(identifier: String): TimeZone?
+
+        /**
+         * Gets the current [TimeZone] configured by the user
+         * @return The current [TimeZone] of the user
+         */
+        fun current(): TimeZone
+
+        /**
+         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         */
+        val availableIdentifiers: List<String>
+    }
 
     /**
      * The identifier of the [TimeZone]
      */
-    abstract val identifier: String
+    val identifier: String
 
     /**
      * Gets the display name for this [TimeZone] formatted for a given [Locale]
@@ -44,58 +63,34 @@ abstract class BaseTimeZone {
      * @param withDaylightSavings If `true` the name for the DaylightSavings version of the [TimeZone] will be used. Defaults to [TimeZone.usesDaylightSavingsTime]
      * @param locale The [Locale] used for naming the [TimeZone]. Defaults to [Locale.defaultLocale]
      */
-    abstract fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean = usesDaylightSavingsTime(), locale: Locale = defaultLocale): String
+    fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean = usesDaylightSavingsTime(), locale: Locale = defaultLocale): String
 
     /**
      * The number of milliseconds this timezone differs from GMT when daylight savings time is not active
      */
-    abstract val offsetFromGMTInMilliseconds: Long
+    val offsetFromGMTInMilliseconds: Long
 
     /**
      * The number of milliseconds this timezone differs from itself during Daylight Savings
      */
-    abstract val daylightSavingsOffsetInMilliseconds: Long
+    val daylightSavingsOffsetInMilliseconds: Long
 
     /**
      * The number of milliseconds this [TimeZone] differs from GMT at a given [KalugaDate]
-     * @param date The [KalugaDate] for which to check the offset. Defaults to [DefaultKalugaDate.now]
+     * @param date The [KalugaDate] for which to check the offset. Defaults to [KalugaDate.now]
      * @return The number of milliseconds this [TimeZone] differs from GMT at [date]
      */
-    abstract fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate = now()): Long
+    fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate = now()): Long
 
     /**
      * Returns `true` if this [TimeZone] is observing daylight savings at a given [KalugaDate]
      * @param date The [KalugaDate] for which to check whether daylight savings is observed. Defaults to [KalugaDate.now]
      * @return `true` if this [TimeZone] if observing daylight savings at [date]
      */
-    abstract fun usesDaylightSavingsTime(date: KalugaDate = now()): Boolean
+    fun usesDaylightSavingsTime(date: KalugaDate = now()): Boolean
 
     /**
      * Creates a copy of this [TimeZone]
      */
-    abstract fun copy(): BaseTimeZone
-
-    override fun toString(): String = displayName(TimeZoneNameStyle.Long)
-}
-
-expect class TimeZone : BaseTimeZone {
-    companion object {
-        /**
-         * Gets a [TimeZone] based on a given Identifier
-         * @param identifier The identifier to create a [TimeZone] for
-         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
-         */
-        fun get(identifier: String): TimeZone?
-
-        /**
-         * Gets the current [TimeZone] configured by the user
-         * @return The current [TimeZone] of the user
-         */
-        fun current(): TimeZone
-
-        /**
-         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
-         */
-        val availableIdentifiers: List<String>
-    }
+    fun copy(): TimeZone
 }
diff --git a/base/src/iosMain/kotlin/utils/KalugaDate.kt b/base/src/iosMain/kotlin/utils/KalugaDate.kt
index ff8645cf3..8b5933348 100644
--- a/base/src/iosMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaDate.kt
@@ -43,7 +43,7 @@ import kotlin.math.round
 
 actual typealias KalugaDateHolder = NSDate
 
-actual class DefaultKalugaDate internal constructor(private val calendar: NSCalendar, initialDate: NSDate) : KalugaDate() {
+actual class DefaultKalugaDate internal constructor(private val calendar: NSCalendar, initialDate: NSDate) : KalugaDate {
     actual companion object {
 
         const val nanoSecondPerMilliSecond = 1000 * 1000
diff --git a/base/src/iosMain/kotlin/utils/TimeZone.kt b/base/src/iosMain/kotlin/utils/TimeZone.kt
index 709aa0f75..c54d3366d 100644
--- a/base/src/iosMain/kotlin/utils/TimeZone.kt
+++ b/base/src/iosMain/kotlin/utils/TimeZone.kt
@@ -30,7 +30,7 @@ import platform.Foundation.secondsFromGMT
 import platform.Foundation.timeZoneWithAbbreviation
 import platform.Foundation.timeZoneWithName
 
-actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZone() {
+actual class TimeZone internal constructor(val timeZone: NSTimeZone) {
 
     actual companion object {
         actual fun get(identifier: String): TimeZone? {
@@ -46,15 +46,15 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZ
         actual val availableIdentifiers: List<String> = NSTimeZone.knownTimeZoneNames.typedList()
     }
 
-    override val identifier: String = timeZone.name
-    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
+    actual val identifier: String = timeZone.name
+    actual fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
         val nameStyle = when (style) {
             TimeZoneNameStyle.Short -> if (withDaylightSavings) NSTimeZoneNameStyle.NSTimeZoneNameStyleShortDaylightSaving else NSTimeZoneNameStyle.NSTimeZoneNameStyleShortStandard
             TimeZoneNameStyle.Long -> if (withDaylightSavings) NSTimeZoneNameStyle.NSTimeZoneNameStyleDaylightSaving else NSTimeZoneNameStyle.NSTimeZoneNameStyleStandard
         }
         return timeZone.localizedName(nameStyle, locale.nsLocale) ?: ""
     }
-    override val offsetFromGMTInMilliseconds: Long get() {
+    actual val offsetFromGMTInMilliseconds: Long get() {
         val rawOffset = if (timeZone.isDaylightSavingTime())
             timeZone.secondsFromGMT.toDouble() - timeZone.daylightSavingTimeOffset
         else
@@ -63,7 +63,7 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZ
         return rawOffset.toLong() * 1000L
     }
 
-    override val daylightSavingsOffsetInMilliseconds: Long get() {
+    actual val daylightSavingsOffsetInMilliseconds: Long get() {
         val rawOffset = if (timeZone.isDaylightSavingTime()) {
             timeZone.daylightSavingTimeOffset.toLong()
         } else {
@@ -73,9 +73,9 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZ
         }
         return rawOffset * 1000L
     }
-    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = (timeZone.secondsFromGMTForDate(date.date) * 1000L)
-    override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.isDaylightSavingTimeForDate(date.date)
-    override fun copy(): TimeZone = TimeZone(timeZone.copy() as NSTimeZone)
+    actual fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = (timeZone.secondsFromGMTForDate(date.date) * 1000L)
+    actual fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.isDaylightSavingTimeForDate(date.date)
+    actual fun copy(): TimeZone = TimeZone(timeZone.copy() as NSTimeZone)
     override fun equals(other: Any?): Boolean {
         return (other as? TimeZone)?.let { timeZone == other.timeZone } ?: false
     }
diff --git a/base/src/jsMain/kotlin/utils/KalugaDate.kt b/base/src/jsMain/kotlin/utils/KalugaDate.kt
index dff22be5f..f98760eb6 100644
--- a/base/src/jsMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaDate.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.utils
 actual typealias KalugaDateHolder = kotlin.js.Date
 
 // TODO Implement with proper date solution for Java Script
-actual class DefaultKalugaDate internal constructor(override val date: KalugaDateHolder) : KalugaDate() {
+actual class DefaultKalugaDate internal constructor(override val date: KalugaDateHolder) : KalugaDate {
 
     actual companion object {
         actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(kotlin.js.Date.now() + offsetInMilliseconds))
diff --git a/base/src/jsMain/kotlin/utils/TimeZone.kt b/base/src/jsMain/kotlin/utils/TimeZone.kt
index 64b449fbc..8ce3b4087 100644
--- a/base/src/jsMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jsMain/kotlin/utils/TimeZone.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.base.utils
 
 // TODO Implement with proper timezone solution for Java Script
-actual class TimeZone internal constructor() : BaseTimeZone() {
+actual class TimeZone internal constructor() {
 
     actual companion object {
         actual fun get(identifier: String): TimeZone? = TimeZone()
@@ -26,11 +26,11 @@ actual class TimeZone internal constructor() : BaseTimeZone() {
         actual val availableIdentifiers: List<String> = emptyList()
     }
 
-    override val identifier: String = ""
-    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String = ""
-    override val offsetFromGMTInMilliseconds = 0L
-    override val daylightSavingsOffsetInMilliseconds: Long = 0L
-    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = 0L
-    override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = false
-    override fun copy(): TimeZone = TimeZone()
+    actual val identifier: String = ""
+    actual fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String = ""
+    actual val offsetFromGMTInMilliseconds = 0L
+    actual val daylightSavingsOffsetInMilliseconds: Long = 0L
+    actual fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = 0L
+    actual fun usesDaylightSavingsTime(date: KalugaDate): Boolean = false
+    actual fun copy(): TimeZone = TimeZone()
 }
diff --git a/base/src/jvmMain/kotlin/utils/KalugaDate.kt b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
index 0f9d9a29c..92b080d69 100644
--- a/base/src/jvmMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
@@ -22,7 +22,7 @@ import java.util.Date
 
 actual typealias KalugaDateHolder = Date
 
-actual class DefaultKalugaDate internal constructor(internal val calendar: Calendar) : KalugaDate() {
+actual class DefaultKalugaDate internal constructor(internal val calendar: Calendar) : KalugaDate {
 
     actual companion object {
         actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
diff --git a/base/src/jvmMain/kotlin/utils/TimeZone.kt b/base/src/jvmMain/kotlin/utils/TimeZone.kt
index add30ff1f..14d33a68f 100644
--- a/base/src/jvmMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jvmMain/kotlin/utils/TimeZone.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.utils
 
-actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) : BaseTimeZone() {
+actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) {
 
     actual companion object {
         actual fun get(identifier: String): TimeZone? {
@@ -31,19 +31,19 @@ actual class TimeZone internal constructor(internal val timeZone: java.util.Time
         actual val availableIdentifiers get() = java.util.TimeZone.getAvailableIDs().asList()
     }
 
-    override val identifier: String = timeZone.id
-    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
+    actual val identifier: String = timeZone.id
+    actual fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
         val styleJava = when (style) {
             TimeZoneNameStyle.Short -> java.util.TimeZone.SHORT
             TimeZoneNameStyle.Long -> java.util.TimeZone.LONG
         }
         return timeZone.getDisplayName(withDaylightSavings, styleJava, locale.locale)
     }
-    override val offsetFromGMTInMilliseconds = timeZone.rawOffset.toLong()
-    override val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
-    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
-    override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
-    override fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
+    actual val offsetFromGMTInMilliseconds = timeZone.rawOffset.toLong()
+    actual val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
+    actual fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
+    actual fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
+    actual fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
     override fun equals(other: Any?): Boolean {
         return (other as? TimeZone)?.let { timeZone == other.timeZone } ?: false
     }

From ebbb322a0a555598fe79e9f3454c62eed41067d5 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 23 Jan 2023 10:03:12 +0100
Subject: [PATCH 111/227] API Dump

---
 resources-compose/api/resources-compose.api |   2 +
 resources/api/androidLib/resources.api      |   1 -
 resources/api/jvm/resources.api             |   1 -
 scientific/api/androidLib/scientific.api    | 109 --------------------
 scientific/api/jvm/scientific.api           | 109 --------------------
 5 files changed, 2 insertions(+), 220 deletions(-)

diff --git a/resources-compose/api/resources-compose.api b/resources-compose/api/resources-compose.api
index 780788e13..d38514bbe 100644
--- a/resources-compose/api/resources-compose.api
+++ b/resources-compose/api/resources-compose.api
@@ -30,6 +30,7 @@ public final class com/splendo/kaluga/resources/compose/KalugaLabelKt {
 }
 
 public final class com/splendo/kaluga/resources/compose/RelativeRadialGradient : androidx/compose/ui/graphics/ShaderBrush {
+	public static final field $stable I
 	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;FI[Lkotlin/Pair;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;FI[Lkotlin/Pair;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (Ljava/util/List;Ljava/util/List;Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;FIILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -40,6 +41,7 @@ public final class com/splendo/kaluga/resources/compose/RelativeRadialGradient :
 }
 
 public final class com/splendo/kaluga/resources/compose/RelativeSweepGradient : androidx/compose/ui/graphics/ShaderBrush {
+	public static final field $stable I
 	public fun <init> (Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;[Lkotlin/Pair;)V
 	public fun createShader-uvyYCjk (J)Landroid/graphics/Shader;
 	public fun equals (Ljava/lang/Object;)Z
diff --git a/resources/api/androidLib/resources.api b/resources/api/androidLib/resources.api
index 2dbaa93ca..a4b5abf3d 100644
--- a/resources/api/androidLib/resources.api
+++ b/resources/api/androidLib/resources.api
@@ -381,7 +381,6 @@ public final class com/splendo/kaluga/resources/HSLColor {
 
 public final class com/splendo/kaluga/resources/HSLColor$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/resources/HSLColor$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/resources/HSLColor;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
diff --git a/resources/api/jvm/resources.api b/resources/api/jvm/resources.api
index 286d80d15..3871063ce 100644
--- a/resources/api/jvm/resources.api
+++ b/resources/api/jvm/resources.api
@@ -363,7 +363,6 @@ public final class com/splendo/kaluga/resources/HSLColor {
 
 public final class com/splendo/kaluga/resources/HSLColor$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/resources/HSLColor$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/resources/HSLColor;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
diff --git a/scientific/api/androidLib/scientific.api b/scientific/api/androidLib/scientific.api
index 9ab4f1b42..0eaf18f83 100644
--- a/scientific/api/androidLib/scientific.api
+++ b/scientific/api/androidLib/scientific.api
@@ -24,7 +24,6 @@ public final class com/splendo/kaluga/scientific/DefaultScientificArray : com/sp
 }
 
 public final class com/splendo/kaluga/scientific/DefaultScientificArray$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun <init> (Lkotlinx/serialization/KSerializer;Lkotlinx/serialization/KSerializer;)V
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/DefaultScientificArray;
@@ -58,7 +57,6 @@ public final class com/splendo/kaluga/scientific/DefaultScientificValue : com/sp
 }
 
 public final class com/splendo/kaluga/scientific/DefaultScientificValue$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun <init> (Lkotlinx/serialization/KSerializer;Lkotlinx/serialization/KSerializer;)V
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -4820,7 +4818,6 @@ public final class com/splendo/kaluga/scientific/unit/AngularAcceleration : com/
 
 public final class com/splendo/kaluga/scientific/unit/AngularAcceleration$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/AngularAcceleration$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/AngularAcceleration;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -4864,7 +4861,6 @@ public final class com/splendo/kaluga/scientific/unit/AngularVelocity : com/sple
 
 public final class com/splendo/kaluga/scientific/unit/AngularVelocity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/AngularVelocity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/AngularVelocity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -7008,7 +7004,6 @@ public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScient
 }
 
 public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun <init> (Lkotlinx/serialization/KSerializer;)V
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
@@ -8643,7 +8638,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialAcceleration : com
 
 public final class com/splendo/kaluga/scientific/unit/ImperialAcceleration$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialAcceleration$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialAcceleration;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8678,7 +8672,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialAction : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/ImperialAction$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialAction$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialAction;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8726,7 +8719,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialAreaDensity : com/
 
 public final class com/splendo/kaluga/scientific/unit/ImperialAreaDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialAreaDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialAreaDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8764,7 +8756,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialDensity : com/sple
 
 public final class com/splendo/kaluga/scientific/unit/ImperialDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8801,7 +8792,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialDynamicViscosity :
 
 public final class com/splendo/kaluga/scientific/unit/ImperialDynamicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialDynamicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialDynamicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8894,7 +8884,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialJolt : com/splendo
 
 public final class com/splendo/kaluga/scientific/unit/ImperialJolt$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialJolt$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialJolt;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8929,7 +8918,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialKinematicViscosity
 
 public final class com/splendo/kaluga/scientific/unit/ImperialKinematicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialKinematicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialKinematicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8983,7 +8971,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialLinearMassDensity
 
 public final class com/splendo/kaluga/scientific/unit/ImperialLinearMassDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialLinearMassDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialLinearMassDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9028,7 +9015,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialLuminousExposure :
 
 public final class com/splendo/kaluga/scientific/unit/ImperialLuminousExposure$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialLuminousExposure$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialLuminousExposure;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9065,7 +9051,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMassFlowRate : com
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMassFlowRate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMassFlowRate$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMassFlowRate;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9102,7 +9087,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialE
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9139,7 +9123,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialP
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9176,7 +9159,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMolality : com/spl
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMolality$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMolality$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMolality;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9211,7 +9193,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMolarEnergy : com/
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMolarEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMolarEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMolarEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9248,7 +9229,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMolarMass : com/sp
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMolarMass$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMolarMass$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMolarMass;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9285,7 +9265,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMolarVolume : com/
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMolarVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMolarVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMolarVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9322,7 +9301,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMolarity : com/spl
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMolarity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMolarity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMolarity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9360,7 +9338,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMomentum : com/spl
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMomentum$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMomentum$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMomentum;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9441,7 +9418,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSpecificEnergy : c
 
 public final class com/splendo/kaluga/scientific/unit/ImperialSpecificEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialSpecificEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialSpecificEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9479,7 +9455,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSpecificVolume : c
 
 public final class com/splendo/kaluga/scientific/unit/ImperialSpecificVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialSpecificVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialSpecificVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9514,7 +9489,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSpeed : com/splend
 
 public final class com/splendo/kaluga/scientific/unit/ImperialSpeed$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialSpeed$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialSpeed;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9552,7 +9526,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSurfaceTension : c
 
 public final class com/splendo/kaluga/scientific/unit/ImperialSurfaceTension$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialSurfaceTension$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialSurfaceTension;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9630,7 +9603,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialVolumetricFlow : c
 
 public final class com/splendo/kaluga/scientific/unit/ImperialVolumetricFlow$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialVolumetricFlow$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialVolumetricFlow;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9668,7 +9640,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialVolumetricFlux : c
 
 public final class com/splendo/kaluga/scientific/unit/ImperialVolumetricFlux$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialVolumetricFlux$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialVolumetricFlux;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9721,7 +9692,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialYank : com/splendo
 
 public final class com/splendo/kaluga/scientific/unit/ImperialYank$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialYank$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialYank;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -10614,7 +10584,6 @@ public final class com/splendo/kaluga/scientific/unit/LuminousEnergy : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/LuminousEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/LuminousEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/LuminousEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11371,7 +11340,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAcceleration : com/s
 
 public final class com/splendo/kaluga/scientific/unit/MetricAcceleration$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAcceleration$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAcceleration;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11406,7 +11374,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAction : com/splendo
 
 public final class com/splendo/kaluga/scientific/unit/MetricAction$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAction$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAction;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11443,7 +11410,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAndImperialAction :
 
 public final class com/splendo/kaluga/scientific/unit/MetricAndImperialAction$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAndImperialAction$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAndImperialAction;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11490,7 +11456,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAndImperialMolarEner
 
 public final class com/splendo/kaluga/scientific/unit/MetricAndImperialMolarEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAndImperialMolarEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAndImperialMolarEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11541,7 +11506,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAndUKImperialHeatCap
 
 public final class com/splendo/kaluga/scientific/unit/MetricAndUKImperialHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAndUKImperialHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAndUKImperialHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11596,7 +11560,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAndUKImperialThermal
 
 public final class com/splendo/kaluga/scientific/unit/MetricAndUKImperialThermalResistance$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAndUKImperialThermalResistance$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAndUKImperialThermalResistance;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11642,7 +11605,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAreaDensity : com/sp
 
 public final class com/splendo/kaluga/scientific/unit/MetricAreaDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAreaDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAreaDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11690,7 +11652,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricDensity : com/splend
 
 public final class com/splendo/kaluga/scientific/unit/MetricDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11725,7 +11686,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricDynamicViscosity : c
 
 public final class com/splendo/kaluga/scientific/unit/MetricDynamicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricDynamicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricDynamicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11781,7 +11741,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricHeatCapacity : com/s
 
 public final class com/splendo/kaluga/scientific/unit/MetricHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11838,7 +11797,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricJolt : com/splendo/k
 
 public final class com/splendo/kaluga/scientific/unit/MetricJolt$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricJolt$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricJolt;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11873,7 +11831,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricKinematicViscosity :
 
 public final class com/splendo/kaluga/scientific/unit/MetricKinematicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricKinematicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricKinematicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11919,7 +11876,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricLinearMassDensity :
 
 public final class com/splendo/kaluga/scientific/unit/MetricLinearMassDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricLinearMassDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricLinearMassDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11964,7 +11920,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricLuminousExposure : c
 
 public final class com/splendo/kaluga/scientific/unit/MetricLuminousExposure$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricLuminousExposure$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricLuminousExposure;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11999,7 +11954,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMassFlowRate : com/s
 
 public final class com/splendo/kaluga/scientific/unit/MetricMassFlowRate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMassFlowRate$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMassFlowRate;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12036,7 +11990,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialEne
 
 public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12073,7 +12026,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialPow
 
 public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12108,7 +12060,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMolality : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/MetricMolality$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMolality$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMolality;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12143,7 +12094,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMolarEnergy : com/sp
 
 public final class com/splendo/kaluga/scientific/unit/MetricMolarEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMolarEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMolarEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12178,7 +12128,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMolarMass : com/sple
 
 public final class com/splendo/kaluga/scientific/unit/MetricMolarMass$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMolarMass$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMolarMass;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12213,7 +12162,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMolarVolume : com/sp
 
 public final class com/splendo/kaluga/scientific/unit/MetricMolarVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMolarVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMolarVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12248,7 +12196,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMolarity : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/MetricMolarity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMolarity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMolarity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12284,7 +12231,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMomentum : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/MetricMomentum$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMomentum$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMomentum;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12346,7 +12292,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricSpecificEnergy : com
 
 public final class com/splendo/kaluga/scientific/unit/MetricSpecificEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricSpecificEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricSpecificEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12382,7 +12327,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricSpecificHeatCapacity
 
 public final class com/splendo/kaluga/scientific/unit/MetricSpecificHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricSpecificHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricSpecificHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12418,7 +12362,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricSpecificVolume : com
 
 public final class com/splendo/kaluga/scientific/unit/MetricSpecificVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricSpecificVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricSpecificVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12453,7 +12396,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricSpeed : com/splendo/
 
 public final class com/splendo/kaluga/scientific/unit/MetricSpeed$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricSpeed$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricSpeed;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12489,7 +12431,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricSurfaceTension : com
 
 public final class com/splendo/kaluga/scientific/unit/MetricSurfaceTension$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricSurfaceTension$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricSurfaceTension;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12525,7 +12466,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricThermalResistance :
 
 public final class com/splendo/kaluga/scientific/unit/MetricThermalResistance$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricThermalResistance$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricThermalResistance;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12570,7 +12510,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricVolumetricFlow : com
 
 public final class com/splendo/kaluga/scientific/unit/MetricVolumetricFlow$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricVolumetricFlow$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricVolumetricFlow;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12606,7 +12545,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricVolumetricFlux : com
 
 public final class com/splendo/kaluga/scientific/unit/MetricVolumetricFlux$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricVolumetricFlux$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricVolumetricFlux;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12651,7 +12589,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricYank : com/splendo/k
 
 public final class com/splendo/kaluga/scientific/unit/MetricYank$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricYank$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricYank;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15557,7 +15494,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialAreaDensity : co
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialAreaDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialAreaDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialAreaDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15593,7 +15529,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialDensity : com/sp
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15628,7 +15563,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialDynamicViscosity
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialDynamicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialDynamicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialDynamicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15678,7 +15612,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialHeatCapacity : c
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15711,7 +15644,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialForceWra
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15744,7 +15676,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWr
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15776,7 +15707,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialWeightWr
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15812,7 +15742,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialLinearMassDensit
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialLinearMassDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialLinearMassDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialLinearMassDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15847,7 +15776,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMassFlowRate : c
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMassFlowRate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMassFlowRate$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMassFlowRate;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15882,7 +15810,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMolality : com/s
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMolality$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMolality$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMolality;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15917,7 +15844,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMolarMass : com/
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMolarMass$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMolarMass$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMolarMass;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15952,7 +15878,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMolarVolume : co
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMolarVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMolarVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMolarVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15987,7 +15912,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMolarity : com/s
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMolarity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMolarity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMolarity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16023,7 +15947,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMomentum : com/s
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMomentum$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMomentum$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMomentum;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16070,7 +15993,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialPressureWrapper
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialPressureWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16109,7 +16031,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificEnergy :
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16145,7 +16066,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificHeatCapa
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16181,7 +16101,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificVolume :
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16217,7 +16136,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialSurfaceTension :
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialSurfaceTension$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialSurfaceTension$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialSurfaceTension;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16253,7 +16171,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialThermalResistanc
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialThermalResistance$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialThermalResistance$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialThermalResistance;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16302,7 +16219,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialVolumetricFlow :
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialVolumetricFlow$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialVolumetricFlow$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialVolumetricFlow;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16338,7 +16254,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialVolumetricFlux :
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialVolumetricFlux$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialVolumetricFlux$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialVolumetricFlux;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16389,7 +16304,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialYank : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialYank$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialYank$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialYank;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16425,7 +16339,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryAreaDensity : c
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryAreaDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryAreaDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryAreaDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16461,7 +16374,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryDensity : com/s
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16496,7 +16408,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryDynamicViscosit
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryDynamicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryDynamicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryDynamicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16546,7 +16457,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryHeatCapacity :
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16579,7 +16489,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialForceWr
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16612,7 +16521,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialPressur
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16645,7 +16553,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeW
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16677,7 +16584,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialWeightW
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16713,7 +16619,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryLinearMassDensi
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryLinearMassDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryLinearMassDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryLinearMassDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16748,7 +16653,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMassFlowRate :
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMassFlowRate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMassFlowRate$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMassFlowRate;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16783,7 +16687,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMolality : com/
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMolality$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMolality$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMolality;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16818,7 +16721,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarMass : com
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarMass$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarMass$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarMass;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16853,7 +16755,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarVolume : c
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16888,7 +16789,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarity : com/
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16924,7 +16824,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMomentum : com/
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMomentum$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMomentum$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMomentum;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16977,7 +16876,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificEnergy
 
 public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17013,7 +16911,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificHeatCap
 
 public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17049,7 +16946,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificVolume
 
 public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17085,7 +16981,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomarySurfaceTension
 
 public final class com/splendo/kaluga/scientific/unit/USCustomarySurfaceTension$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomarySurfaceTension$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomarySurfaceTension;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17135,7 +17030,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryThermalResistan
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryThermalResistance$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryThermalResistance$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryThermalResistance;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17184,7 +17078,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlow
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlow$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlow$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlow;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17220,7 +17113,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlux
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlux$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlux$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlux;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17271,7 +17163,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryYank : com/sple
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryYank$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryYank$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryYank;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
diff --git a/scientific/api/jvm/scientific.api b/scientific/api/jvm/scientific.api
index 11777253b..0acd1b732 100644
--- a/scientific/api/jvm/scientific.api
+++ b/scientific/api/jvm/scientific.api
@@ -35,7 +35,6 @@ public final class com/splendo/kaluga/scientific/DefaultScientificArray : com/sp
 }
 
 public final class com/splendo/kaluga/scientific/DefaultScientificArray$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun <init> (Lkotlinx/serialization/KSerializer;Lkotlinx/serialization/KSerializer;)V
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/DefaultScientificArray;
@@ -72,7 +71,6 @@ public final class com/splendo/kaluga/scientific/DefaultScientificValue : com/sp
 }
 
 public final class com/splendo/kaluga/scientific/DefaultScientificValue$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun <init> (Lkotlinx/serialization/KSerializer;Lkotlinx/serialization/KSerializer;)V
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -4872,7 +4870,6 @@ public final class com/splendo/kaluga/scientific/unit/AngularAcceleration : com/
 
 public final class com/splendo/kaluga/scientific/unit/AngularAcceleration$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/AngularAcceleration$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/AngularAcceleration;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -4916,7 +4913,6 @@ public final class com/splendo/kaluga/scientific/unit/AngularVelocity : com/sple
 
 public final class com/splendo/kaluga/scientific/unit/AngularVelocity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/AngularVelocity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/AngularVelocity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -7064,7 +7060,6 @@ public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScient
 }
 
 public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun <init> (Lkotlinx/serialization/KSerializer;)V
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
@@ -8705,7 +8700,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialAcceleration : com
 
 public final class com/splendo/kaluga/scientific/unit/ImperialAcceleration$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialAcceleration$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialAcceleration;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8740,7 +8734,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialAction : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/ImperialAction$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialAction$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialAction;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8788,7 +8781,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialAreaDensity : com/
 
 public final class com/splendo/kaluga/scientific/unit/ImperialAreaDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialAreaDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialAreaDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8826,7 +8818,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialDensity : com/sple
 
 public final class com/splendo/kaluga/scientific/unit/ImperialDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8863,7 +8854,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialDynamicViscosity :
 
 public final class com/splendo/kaluga/scientific/unit/ImperialDynamicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialDynamicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialDynamicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8956,7 +8946,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialJolt : com/splendo
 
 public final class com/splendo/kaluga/scientific/unit/ImperialJolt$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialJolt$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialJolt;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -8991,7 +8980,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialKinematicViscosity
 
 public final class com/splendo/kaluga/scientific/unit/ImperialKinematicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialKinematicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialKinematicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9045,7 +9033,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialLinearMassDensity
 
 public final class com/splendo/kaluga/scientific/unit/ImperialLinearMassDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialLinearMassDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialLinearMassDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9090,7 +9077,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialLuminousExposure :
 
 public final class com/splendo/kaluga/scientific/unit/ImperialLuminousExposure$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialLuminousExposure$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialLuminousExposure;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9127,7 +9113,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMassFlowRate : com
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMassFlowRate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMassFlowRate$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMassFlowRate;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9164,7 +9149,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialE
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9201,7 +9185,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialP
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9238,7 +9221,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMolality : com/spl
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMolality$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMolality$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMolality;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9273,7 +9255,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMolarEnergy : com/
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMolarEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMolarEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMolarEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9310,7 +9291,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMolarMass : com/sp
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMolarMass$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMolarMass$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMolarMass;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9347,7 +9327,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMolarVolume : com/
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMolarVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMolarVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMolarVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9384,7 +9363,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMolarity : com/spl
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMolarity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMolarity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMolarity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9422,7 +9400,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMomentum : com/spl
 
 public final class com/splendo/kaluga/scientific/unit/ImperialMomentum$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialMomentum$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialMomentum;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9503,7 +9480,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSpecificEnergy : c
 
 public final class com/splendo/kaluga/scientific/unit/ImperialSpecificEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialSpecificEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialSpecificEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9541,7 +9517,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSpecificVolume : c
 
 public final class com/splendo/kaluga/scientific/unit/ImperialSpecificVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialSpecificVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialSpecificVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9576,7 +9551,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSpeed : com/splend
 
 public final class com/splendo/kaluga/scientific/unit/ImperialSpeed$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialSpeed$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialSpeed;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9614,7 +9588,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSurfaceTension : c
 
 public final class com/splendo/kaluga/scientific/unit/ImperialSurfaceTension$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialSurfaceTension$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialSurfaceTension;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9692,7 +9665,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialVolumetricFlow : c
 
 public final class com/splendo/kaluga/scientific/unit/ImperialVolumetricFlow$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialVolumetricFlow$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialVolumetricFlow;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9730,7 +9702,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialVolumetricFlux : c
 
 public final class com/splendo/kaluga/scientific/unit/ImperialVolumetricFlux$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialVolumetricFlux$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialVolumetricFlux;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -9783,7 +9754,6 @@ public final class com/splendo/kaluga/scientific/unit/ImperialYank : com/splendo
 
 public final class com/splendo/kaluga/scientific/unit/ImperialYank$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialYank$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/ImperialYank;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -10676,7 +10646,6 @@ public final class com/splendo/kaluga/scientific/unit/LuminousEnergy : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/LuminousEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/LuminousEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/LuminousEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11433,7 +11402,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAcceleration : com/s
 
 public final class com/splendo/kaluga/scientific/unit/MetricAcceleration$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAcceleration$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAcceleration;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11468,7 +11436,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAction : com/splendo
 
 public final class com/splendo/kaluga/scientific/unit/MetricAction$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAction$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAction;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11505,7 +11472,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAndImperialAction :
 
 public final class com/splendo/kaluga/scientific/unit/MetricAndImperialAction$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAndImperialAction$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAndImperialAction;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11552,7 +11518,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAndImperialMolarEner
 
 public final class com/splendo/kaluga/scientific/unit/MetricAndImperialMolarEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAndImperialMolarEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAndImperialMolarEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11603,7 +11568,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAndUKImperialHeatCap
 
 public final class com/splendo/kaluga/scientific/unit/MetricAndUKImperialHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAndUKImperialHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAndUKImperialHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11658,7 +11622,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAndUKImperialThermal
 
 public final class com/splendo/kaluga/scientific/unit/MetricAndUKImperialThermalResistance$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAndUKImperialThermalResistance$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAndUKImperialThermalResistance;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11704,7 +11667,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricAreaDensity : com/sp
 
 public final class com/splendo/kaluga/scientific/unit/MetricAreaDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricAreaDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricAreaDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11752,7 +11714,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricDensity : com/splend
 
 public final class com/splendo/kaluga/scientific/unit/MetricDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11787,7 +11748,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricDynamicViscosity : c
 
 public final class com/splendo/kaluga/scientific/unit/MetricDynamicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricDynamicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricDynamicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11843,7 +11803,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricHeatCapacity : com/s
 
 public final class com/splendo/kaluga/scientific/unit/MetricHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11900,7 +11859,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricJolt : com/splendo/k
 
 public final class com/splendo/kaluga/scientific/unit/MetricJolt$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricJolt$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricJolt;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11935,7 +11893,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricKinematicViscosity :
 
 public final class com/splendo/kaluga/scientific/unit/MetricKinematicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricKinematicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricKinematicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -11981,7 +11938,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricLinearMassDensity :
 
 public final class com/splendo/kaluga/scientific/unit/MetricLinearMassDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricLinearMassDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricLinearMassDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12026,7 +11982,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricLuminousExposure : c
 
 public final class com/splendo/kaluga/scientific/unit/MetricLuminousExposure$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricLuminousExposure$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricLuminousExposure;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12061,7 +12016,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMassFlowRate : com/s
 
 public final class com/splendo/kaluga/scientific/unit/MetricMassFlowRate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMassFlowRate$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMassFlowRate;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12098,7 +12052,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialEne
 
 public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12135,7 +12088,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialPow
 
 public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12170,7 +12122,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMolality : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/MetricMolality$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMolality$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMolality;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12205,7 +12156,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMolarEnergy : com/sp
 
 public final class com/splendo/kaluga/scientific/unit/MetricMolarEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMolarEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMolarEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12240,7 +12190,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMolarMass : com/sple
 
 public final class com/splendo/kaluga/scientific/unit/MetricMolarMass$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMolarMass$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMolarMass;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12275,7 +12224,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMolarVolume : com/sp
 
 public final class com/splendo/kaluga/scientific/unit/MetricMolarVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMolarVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMolarVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12310,7 +12258,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMolarity : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/MetricMolarity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMolarity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMolarity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12346,7 +12293,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricMomentum : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/MetricMomentum$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricMomentum$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricMomentum;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12408,7 +12354,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricSpecificEnergy : com
 
 public final class com/splendo/kaluga/scientific/unit/MetricSpecificEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricSpecificEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricSpecificEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12444,7 +12389,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricSpecificHeatCapacity
 
 public final class com/splendo/kaluga/scientific/unit/MetricSpecificHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricSpecificHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricSpecificHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12480,7 +12424,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricSpecificVolume : com
 
 public final class com/splendo/kaluga/scientific/unit/MetricSpecificVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricSpecificVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricSpecificVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12515,7 +12458,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricSpeed : com/splendo/
 
 public final class com/splendo/kaluga/scientific/unit/MetricSpeed$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricSpeed$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricSpeed;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12551,7 +12493,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricSurfaceTension : com
 
 public final class com/splendo/kaluga/scientific/unit/MetricSurfaceTension$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricSurfaceTension$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricSurfaceTension;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12587,7 +12528,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricThermalResistance :
 
 public final class com/splendo/kaluga/scientific/unit/MetricThermalResistance$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricThermalResistance$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricThermalResistance;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12632,7 +12572,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricVolumetricFlow : com
 
 public final class com/splendo/kaluga/scientific/unit/MetricVolumetricFlow$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricVolumetricFlow$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricVolumetricFlow;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12668,7 +12607,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricVolumetricFlux : com
 
 public final class com/splendo/kaluga/scientific/unit/MetricVolumetricFlux$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricVolumetricFlux$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricVolumetricFlux;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -12713,7 +12651,6 @@ public final class com/splendo/kaluga/scientific/unit/MetricYank : com/splendo/k
 
 public final class com/splendo/kaluga/scientific/unit/MetricYank$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricYank$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/MetricYank;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15619,7 +15556,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialAreaDensity : co
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialAreaDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialAreaDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialAreaDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15655,7 +15591,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialDensity : com/sp
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15690,7 +15625,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialDynamicViscosity
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialDynamicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialDynamicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialDynamicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15740,7 +15674,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialHeatCapacity : c
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15773,7 +15706,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialForceWra
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15806,7 +15738,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWr
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15838,7 +15769,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialWeightWr
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15874,7 +15804,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialLinearMassDensit
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialLinearMassDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialLinearMassDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialLinearMassDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15909,7 +15838,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMassFlowRate : c
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMassFlowRate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMassFlowRate$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMassFlowRate;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15944,7 +15872,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMolality : com/s
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMolality$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMolality$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMolality;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -15979,7 +15906,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMolarMass : com/
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMolarMass$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMolarMass$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMolarMass;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16014,7 +15940,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMolarVolume : co
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMolarVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMolarVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMolarVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16049,7 +15974,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMolarity : com/s
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMolarity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMolarity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMolarity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16085,7 +16009,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialMomentum : com/s
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialMomentum$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialMomentum$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialMomentum;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16132,7 +16055,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialPressureWrapper
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialPressureWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16171,7 +16093,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificEnergy :
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16207,7 +16128,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificHeatCapa
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16243,7 +16163,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificVolume :
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialSpecificVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialSpecificVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16279,7 +16198,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialSurfaceTension :
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialSurfaceTension$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialSurfaceTension$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialSurfaceTension;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16315,7 +16233,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialThermalResistanc
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialThermalResistance$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialThermalResistance$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialThermalResistance;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16364,7 +16281,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialVolumetricFlow :
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialVolumetricFlow$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialVolumetricFlow$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialVolumetricFlow;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16400,7 +16316,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialVolumetricFlux :
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialVolumetricFlux$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialVolumetricFlux$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialVolumetricFlux;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16451,7 +16366,6 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialYank : com/splen
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialYank$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UKImperialYank$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/UKImperialYank;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16487,7 +16401,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryAreaDensity : c
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryAreaDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryAreaDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryAreaDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16523,7 +16436,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryDensity : com/s
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16558,7 +16470,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryDynamicViscosit
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryDynamicViscosity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryDynamicViscosity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryDynamicViscosity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16608,7 +16519,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryHeatCapacity :
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16641,7 +16551,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialForceWr
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16674,7 +16583,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialPressur
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16707,7 +16615,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeW
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16739,7 +16646,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialWeightW
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16775,7 +16681,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryLinearMassDensi
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryLinearMassDensity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryLinearMassDensity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryLinearMassDensity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16810,7 +16715,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMassFlowRate :
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMassFlowRate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMassFlowRate$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMassFlowRate;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16845,7 +16749,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMolality : com/
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMolality$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMolality$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMolality;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16880,7 +16783,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarMass : com
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarMass$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarMass$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarMass;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16915,7 +16817,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarVolume : c
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16950,7 +16851,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarity : com/
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMolarity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMolarity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -16986,7 +16886,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryMomentum : com/
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryMomentum$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryMomentum$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryMomentum;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17039,7 +16938,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificEnergy
 
 public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificEnergy$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificEnergy$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificEnergy;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17075,7 +16973,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificHeatCap
 
 public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificHeatCapacity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificHeatCapacity$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificHeatCapacity;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17111,7 +17008,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificVolume
 
 public final class com/splendo/kaluga/scientific/unit/USCustomarySpecificVolume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificVolume$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomarySpecificVolume;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17147,7 +17043,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomarySurfaceTension
 
 public final class com/splendo/kaluga/scientific/unit/USCustomarySurfaceTension$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomarySurfaceTension$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomarySurfaceTension;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17197,7 +17092,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryThermalResistan
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryThermalResistance$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryThermalResistance$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryThermalResistance;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17246,7 +17140,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlow
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlow$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlow$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlow;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17282,7 +17175,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlux
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlux$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlux$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlux;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -17333,7 +17225,6 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryYank : com/sple
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryYank$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USCustomaryYank$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/USCustomaryYank;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;

From 60353425e860a359332b911d59ddb626fe00e9fe Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 23 Jan 2023 10:58:12 +0100
Subject: [PATCH 112/227] Fixed BigDecimal failing on JVM

---
 base/src/androidLibMain/kotlin/utils/Decimal.kt |  8 ++++----
 base/src/jvmMain/kotlin/utils/Decimal.kt        | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/base/src/androidLibMain/kotlin/utils/Decimal.kt b/base/src/androidLibMain/kotlin/utils/Decimal.kt
index 733fbf73c..4492136cf 100644
--- a/base/src/androidLibMain/kotlin/utils/Decimal.kt
+++ b/base/src/androidLibMain/kotlin/utils/Decimal.kt
@@ -50,9 +50,9 @@ actual fun Decimal.minus(
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.android)
 
-actual operator fun Decimal.div(value: Decimal) = if (value != Decimal.ZERO) this.divide(value, MathContext.DECIMAL128) else throw DecimalException("Divide by zero")
+actual operator fun Decimal.div(value: Decimal) = if ((value.compareTo(Decimal.ZERO)) != 0) this.divide(value, MathContext.DECIMAL128) else throw DecimalException("Divide by zero")
 
-actual fun Decimal.div(value: Decimal, scale: Int) = if (value != Decimal.ZERO)
+actual fun Decimal.div(value: Decimal, scale: Int) = if ((value.compareTo(Decimal.ZERO)) != 0)
     this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
 else throw DecimalException("Divide by zero")
 
@@ -60,7 +60,7 @@ actual fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
-) = if (value != Decimal.ZERO)
+) = if ((value.compareTo(Decimal.ZERO)) != 0)
     this.divide(
         value,
         MathContext(
@@ -108,7 +108,7 @@ actual fun Decimal.pow(
     )
 ).setScale(scale, roundingMode.android)
 
-actual fun Number.toDecimal() = BigDecimal(this.toString())
+actual fun Number.toDecimal() = BigDecimal(toString())
 actual fun String.toDecimal() = BigDecimal(this)
 
 actual fun Decimal.toDouble() = this.toDouble()
diff --git a/base/src/jvmMain/kotlin/utils/Decimal.kt b/base/src/jvmMain/kotlin/utils/Decimal.kt
index de1ae6c85..5eb0ab1d8 100644
--- a/base/src/jvmMain/kotlin/utils/Decimal.kt
+++ b/base/src/jvmMain/kotlin/utils/Decimal.kt
@@ -51,10 +51,10 @@ actual fun Decimal.minus(
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.java)
 
-actual operator fun Decimal.div(value: Decimal) = if (value != Decimal.ZERO) this.divide(value, MathContext.DECIMAL128)
-else throw DecimalException("Divide by zero")
+actual operator fun Decimal.div(value: Decimal) = if ((value.compareTo(Decimal.ZERO)) != 0) this.divide(value, MathContext.DECIMAL128)
+    else throw DecimalException("Divide by zero")
 
-actual fun Decimal.div(value: Decimal, scale: Int) = if (value != Decimal.ZERO)
+actual fun Decimal.div(value: Decimal, scale: Int) = if ((value.compareTo(Decimal.ZERO)) != 0)
     this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
 else throw DecimalException("Divide by zero")
 
@@ -62,7 +62,7 @@ actual fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
-) = if (value != Decimal.ZERO)
+) = if ((value.compareTo(Decimal.ZERO)) != 0)
     this.divide(
         value,
         MathContext(
@@ -110,7 +110,7 @@ actual fun Decimal.pow(
     )
 ).setScale(scale, roundingMode.java)
 
-actual fun Number.toDecimal() = BigDecimal(this.toString())
+actual fun Number.toDecimal() = BigDecimal(toString())
 actual fun String.toDecimal() = BigDecimal(this)
 
 actual fun Decimal.toDouble() = this.toDouble()

From 7256314a3bda8f252afe55fe916e6231ec614362 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 23 Jan 2023 11:48:41 +0100
Subject: [PATCH 113/227] Reenable Tiramisu BT writes

Now no longer does a read after a write callback. Note this means write no longer updates its state at all
---
 .../kotlin/device/BluetoothGattWrapper.kt     | 33 ++++++++++---------
 .../device/DefaultDeviceConnectionManager.kt  | 12 ++-----
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt b/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt
index add23332e..7758bd543 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt
@@ -21,6 +21,7 @@ import android.annotation.SuppressLint
 import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCharacteristic
 import android.bluetooth.BluetoothGattDescriptor
+import android.bluetooth.BluetoothStatusCodes
 import com.splendo.kaluga.bluetooth.CharacteristicWrapper
 import com.splendo.kaluga.bluetooth.DescriptorWrapper
 
@@ -80,26 +81,26 @@ class DefaultBluetoothGattWrapper(private val gatt: BluetoothGatt) : BluetoothGa
 
     override fun writeCharacteristic(wrapper: CharacteristicWrapper, value: ByteArray): Boolean {
         val characteristic = getCharacteristic(wrapper) ?: return false
-        // TODO update implementation to call non deprecated gatt.writeCharacteristic(characteristic, value, writeType)
-        //  if version >= TIRAMISU after DefaultDeviceConnectionManager is updated and is no longer dependent on characteristic.value
-        // https://github.com/splendo/kaluga/issues/609
-        // https://developer.android.com/reference/android/bluetooth/BluetoothGatt#writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic)
-        @Suppress("DEPRECATION")
-        characteristic.value = value
-        @Suppress("DEPRECATION")
-        return gatt.writeCharacteristic(characteristic)
+        return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+            gatt.writeCharacteristic(characteristic, value, characteristic.writeType) == BluetoothStatusCodes.SUCCESS
+        } else {
+            @Suppress("DEPRECATION")
+            characteristic.value = value
+            @Suppress("DEPRECATION")
+            gatt.writeCharacteristic(characteristic)
+        }
     }
 
     override fun writeDescriptor(wrapper: DescriptorWrapper, value: ByteArray): Boolean {
         val descriptor = getDescriptor(wrapper) ?: return false
-        // TODO update implementation to call non deprecated gatt.writeDescriptor(descriptor, value)
-        //  if version >= TIRAMISU after DefaultDeviceConnectionManager is updated and is no longer dependent on descriptor.value
-        // https://github.com/splendo/kaluga/issues/609
-        // https://developer.android.com/reference/android/bluetooth/BluetoothGatt#writeDescriptor(android.bluetooth.BluetoothGattDescriptor)
-        @Suppress("DEPRECATION")
-        descriptor.value = value
-        @Suppress("DEPRECATION")
-        return gatt.writeDescriptor(descriptor)
+        return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+            gatt.writeDescriptor(descriptor, value) == BluetoothStatusCodes.SUCCESS
+        } else {
+            @Suppress("DEPRECATION")
+            descriptor.value = value
+            @Suppress("DEPRECATION")
+            gatt.writeDescriptor(descriptor)
+        }
     }
 
     override fun setCharacteristicNotification(wrapper: CharacteristicWrapper, enable: Boolean): Boolean {
diff --git a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
index b0d089e06..a7bf059a6 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -94,11 +94,7 @@ internal actual class DefaultDeviceConnectionManager(
 
         override fun onCharacteristicWrite(gatt: BluetoothGatt?, characteristic: BluetoothGattCharacteristic?, status: Int) {
             characteristic ?: return
-            // TODO update implementation so it doesn't depend on characteristic.value which is deprecated
-            // https://github.com/splendo/kaluga/issues/609
-            // https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic#getValue()
-            @Suppress("DEPRECATION")
-            updateCharacteristic(characteristic, characteristic.value, status)
+            handleUpdatedCharacteristic(characteristic.uuid, succeeded = status == GATT_SUCCESS)
         }
 
         override fun onServicesDiscovered(gatt: BluetoothGatt?, status: Int) {
@@ -110,11 +106,7 @@ internal actual class DefaultDeviceConnectionManager(
 
         override fun onDescriptorWrite(gatt: BluetoothGatt?, descriptor: BluetoothGattDescriptor?, status: Int) {
             descriptor ?: return
-            // TODO update implementation so it doesn't depend on descriptor.value which is deprecated
-            // https://github.com/splendo/kaluga/issues/609
-            // https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor#getValue()
-            @Suppress("DEPRECATION")
-            updateDescriptor(descriptor, descriptor.value, status)
+            handleUpdatedDescriptor(descriptor.uuid, status == GATT_SUCCESS)
         }
 
         @Deprecated("Deprecated in Java")

From c4b937cd3c8f6bbbf3275ae83377c55b1dca86f3 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 23 Jan 2023 14:45:16 +0100
Subject: [PATCH 114/227] Added concurrent collections

---
 .../getOrPutAndRemoveOnDestroyFromCache.kt    |  3 +-
 .../kotlin/observable/Disposable.kt           | 28 ++++----
 .../kotlin/observable/Observable.kt           |  3 +-
 .../kotlin/observable/SimpleDisposable.kt     | 17 +++--
 .../kotlin/AndroidPermissionsManager.kt       |  6 +-
 .../src/commonMain/kotlin/Permission.kt       | 45 +++++-------
 .../kotlin/monitor/EnableServiceActivity.kt   | 10 ++-
 .../collections/ConcurrentMutableIterator.kt  | 47 +++++++++++++
 .../collections/ConcurrentMutableList.kt      | 69 +++++++++++++++++++
 .../collections/ConcurrentMutableMap.kt       | 50 ++++++++++++++
 .../collections/ConcurrentMutableSet.kt       | 59 ++++++++++++++++
 beacons/src/commonMain/kotlin/Beacons.kt      | 32 +++++----
 .../device/DefaultDeviceConnectionManager.kt  |  3 +-
 .../src/iosMain/kotlin/scanner/Scanner.kt     |  3 +-
 .../kotlin/LocationPermissionManager.kt       | 15 ++--
 .../kotlin/LocationPermissionManager.kt       |  7 +-
 .../kotlin/location/GoogleLocationProvider.kt |  3 +-
 logging/src/commonTest/kotlin/LogTest.kt      |  2 +-
 logging/src/commonTest/kotlin/LoggerMock.kt   | 31 ++++-----
 .../src/commonMain/kotlin/FlowTest.kt         |  3 +-
 .../src/commonMain/kotlin/flowExtensions.kt   |  3 +-
 .../src/commonMain/kotlin/mock/MockMethod.kt  | 15 ++--
 .../commonMain/kotlin/mock/matcher/Captor.kt  |  6 +-
 .../kotlin/MockDeviceWrapper.kt               |  3 +-
 .../kotlin/MockServiceWrapper.kt              |  5 +-
 .../device/MockDeviceConnectionManager.kt     |  3 +-
 .../commonMain/kotlin/scanner/MockScanner.kt  |  3 +-
 .../src/commonMain/kotlin/MockHUD.kt          |  3 +-
 .../commonMain/kotlin/MockKeyboardManager.kt  |  3 +-
 .../commonMain/kotlin/MockLocationManager.kt  |  3 +-
 .../kotlin/MockLocationStateRepoBuilder.kt    |  3 +-
 .../kotlin/MockPermissionManager.kt           |  3 +-
 .../kotlin/MockPermissionsBuilder.kt          | 17 ++---
 .../kotlin/network/MockNetworkManager.kt      |  3 +-
 .../network/MockNetworkStateRepoBuilder.kt    |  3 +-
 35 files changed, 379 insertions(+), 133 deletions(-)
 create mode 100644 base/src/commonMain/kotlin/collections/ConcurrentMutableIterator.kt
 create mode 100644 base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
 create mode 100644 base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
 create mode 100644 base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt

diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt b/architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt
index 57f195ab8..22b49ed7e 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.architecture.lifecycle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import kotlin.reflect.KClass
 
 /**
@@ -27,7 +28,7 @@ import kotlin.reflect.KClass
  *
  * Do not use directly, but use through [AppCompatActivity.getOrPutAndRemoveOnDestroyFromCache]
  */
-val lifecycleAwareActivityCache = mutableMapOf<Pair<AppCompatActivity, KClass<*>>, Any>()
+val lifecycleAwareActivityCache = concurrentMutableMapOf<Pair<AppCompatActivity, KClass<*>>, Any>()
 
 /**
  * Lifecycle aware caching on the activity level
diff --git a/architecture/src/commonMain/kotlin/observable/Disposable.kt b/architecture/src/commonMain/kotlin/observable/Disposable.kt
index 95d84ca33..adbcb46bc 100644
--- a/architecture/src/commonMain/kotlin/observable/Disposable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Disposable.kt
@@ -18,6 +18,8 @@
 @file:JvmName("DisposableCommonKt")
 package com.splendo.kaluga.architecture.observable
 
+import com.splendo.kaluga.base.collections.ConcurrentMutableList
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import kotlinx.atomicfu.locks.SynchronizedObject
 import kotlinx.atomicfu.locks.synchronized
 import kotlin.jvm.JvmName
@@ -81,27 +83,23 @@ abstract class BaseSimpleDisposable(onDispose: DisposeHandler) : SynchronizedObj
 /**
  * Container for multiple [Disposable]. Allows nested [DisposeBag].
  */
-class DisposeBag : SynchronizedObject(), Disposable {
+class DisposeBag : Disposable {
 
-    private val disposables: MutableList<Disposable> = mutableListOf()
-    private val nestedBags: MutableList<DisposeBag> = mutableListOf()
+    private val disposables: ConcurrentMutableList<Disposable> = concurrentMutableListOf()
+    private val nestedBags: ConcurrentMutableList<DisposeBag> = concurrentMutableListOf()
 
     /**
      * Adds a nested [DisposeBag]
      */
     fun add(disposeBag: DisposeBag) {
-        synchronized(this) {
-            nestedBags.add(disposeBag)
-        }
+        nestedBags.add(disposeBag)
     }
 
     /**
      * Adds a [Disposable] to this [DisposeBag]
      */
     fun add(disposable: Disposable) {
-        synchronized(this) {
-            disposables.add(disposable)
-        }
+        disposables.add(disposable)
     }
 
     override fun addTo(disposeBag: DisposeBag) {
@@ -113,11 +111,13 @@ class DisposeBag : SynchronizedObject(), Disposable {
      * Added elements can only be disposed once
      */
     override fun dispose() {
-        synchronized(this) {
-            disposables.forEach { it.dispose() }
-            disposables.clear()
-            nestedBags.forEach { it.dispose() }
-            nestedBags.clear()
+        disposables.synchronized {
+            forEach { it.dispose() }
+            clear()
+        }
+        nestedBags.synchronized {
+            forEach { it.dispose() }
+            clear()
         }
     }
 }
diff --git a/architecture/src/commonMain/kotlin/observable/Observable.kt b/architecture/src/commonMain/kotlin/observable/Observable.kt
index 3486c4307..d1d5d6c8b 100644
--- a/architecture/src/commonMain/kotlin/observable/Observable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observable.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.architecture.observable
 import com.splendo.kaluga.architecture.observable.ObservableOptional.Nothing
 import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
 import com.splendo.kaluga.base.KalugaThread
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.base.isOnMainThread
 import com.splendo.kaluga.base.runBlocking
 import kotlinx.atomicfu.atomic
@@ -186,7 +187,7 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
 ) : Initial<R, T> {
 
     // this is not used by iOS
-    internal val observers by lazy { mutableListOf<(R) -> Unit>() }
+    internal val observers by lazy { concurrentMutableListOf<(R) -> Unit>() }
 
     open val defaultValue: Value<R>? = null
 
diff --git a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
index c0378d8f3..54d4bf316 100644
--- a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
@@ -18,6 +18,9 @@
 package com.splendo.kaluga.architecture.observable
 
 import com.splendo.kaluga.base.GCScheduler
+import com.splendo.kaluga.base.collections.ConcurrentMutableList
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
+import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 
 actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : BaseSimpleDisposable(onDispose) {
 
@@ -27,20 +30,22 @@ actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : Ba
 }
 
 actual fun <R : T, T, OO : ObservableOptional<R>> addObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    val observers = observersForObservation.getOrPut(observation) { mutableListOf() }
+    val observers = observersForObservation.getOrPut(observation) { concurrentMutableListOf() }
     @Suppress("UNCHECKED_CAST")
     observers.add(observer as (Any?) -> Unit)
 }
 
 actual fun <R : T, T, OO : ObservableOptional<R>> removeObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    val observers = observersForObservation[observation] ?: return
-    observers.remove(observer)
-    if (observers.isEmpty())
-        observersForObservation.remove(observation)
+    observersForObservation.synchronized {
+        val observers = this[observation] ?: return@synchronized
+        observers.remove(observer)
+        if (observers.isEmpty())
+            remove(observation)
+    }
 }
 
 actual fun <R : T, T, OO : ObservableOptional<R>> observers(observation: Observation<R, T, OO>): List<(R) -> Unit> {
     return observersForObservation[observation] as? List<(R) -> Unit> ?: emptyList()
 }
 
-private val observersForObservation = mutableMapOf<Observation<*, *, *>, MutableList<(Any?)->Unit>>()
+private val observersForObservation = concurrentMutableMapOf<Observation<*, *, *>, ConcurrentMutableList<(Any?) -> Unit>>()
diff --git a/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt b/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt
index dbe2e686c..c32b00ee4 100644
--- a/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt
+++ b/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt
@@ -133,11 +133,7 @@ class AndroidPermissionsManager constructor(
                 pm.getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS)
             }
 
-            var declaredPermissions: List<String> = mutableListOf()
-
-            if (packageInfo != null) {
-                declaredPermissions = packageInfo.requestedPermissions.toList()
-            }
+            val declaredPermissions: List<String> = packageInfo?.requestedPermissions?.toList().orEmpty()
 
             if (declaredPermissions.isNotEmpty()) {
                 missingPermissions.toList().forEach { requestedPermissionName ->
diff --git a/base-permissions/src/commonMain/kotlin/Permission.kt b/base-permissions/src/commonMain/kotlin/Permission.kt
index e5136e638..9cb2cb01e 100644
--- a/base-permissions/src/commonMain/kotlin/Permission.kt
+++ b/base-permissions/src/commonMain/kotlin/Permission.kt
@@ -17,9 +17,8 @@
 
 package com.splendo.kaluga.permissions.base
 
+import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import com.splendo.kaluga.base.singleThreadDispatcher
-import kotlinx.atomicfu.locks.reentrantLock
-import kotlinx.atomicfu.locks.withLock
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.Flow
@@ -63,15 +62,13 @@ class PermissionsBuilderError(message: String) : Error(message)
  */
 open class PermissionsBuilder(val context: PermissionContext = defaultPermissionContext) {
 
-    private val buildersLock = reentrantLock()
-    private val builders = mutableMapOf<KClassifier, BasePermissionsBuilder<*>>()
-    private val repoBuildersLock = reentrantLock()
-    private val repoBuilders = mutableMapOf<KClassifier, PermissionStateRepoBuilder<*>>()
+    private val builders = concurrentMutableMapOf<KClassifier, BasePermissionsBuilder<*>>()
+    private val repoBuilders = concurrentMutableMapOf<KClassifier, PermissionStateRepoBuilder<*>>()
 
     inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> register(builder: B): B = register(P::class, builder)
-    fun <P : Permission, B : BasePermissionsBuilder<P>> register(permission: KClass<P>, builder: B): B = buildersLock.withLock {
-        if (builders[permission] == null) {
-            builders[permission] = builder
+    fun <P : Permission, B : BasePermissionsBuilder<P>> register(permission: KClass<P>, builder: B): B = builders.synchronized {
+        if (this[permission] == null) {
+            this[permission] = builder
             builder
         } else {
             throw PermissionsBuilderError("Builder for $permission was already registered")
@@ -80,14 +77,10 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
 
     inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(builder: B): BasePermissionsBuilder<P> = registerOrGet(P::class, builder)
     @Suppress("UNCHECKED_CAST")
-    fun <P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(permission: KClass<P>, builder: B): BasePermissionsBuilder<P> = buildersLock.withLock {
-        builders.getOrPut(permission::class) { builder } as BasePermissionsBuilder<P>
-    }
+    fun <P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(permission: KClass<P>, builder: B): BasePermissionsBuilder<P> = builders.getOrPut(permission::class) { builder } as BasePermissionsBuilder<P>
 
     fun <P : Permission> unregister(permission: P) {
-        buildersLock.withLock {
-            builders.remove(permission::class)
-        }
+        builders.remove(permission::class)
     }
 
     @Suppress("UNCHECKED_CAST")
@@ -96,9 +89,9 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
 
     inline fun <reified P : Permission> registerPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
     fun <P : Permission> registerPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) {
-        repoBuildersLock.withLock {
-            if (repoBuilders[permission] == null) {
-                createPermissionStateRepoBuilder(permissionStateRepoBuilder).also { repoBuilders[permission] = it }
+        repoBuilders.synchronized {
+            if (this[permission] == null) {
+                createPermissionStateRepoBuilder(permissionStateRepoBuilder).also { this[permission] = it }
             } else {
                 throw PermissionsBuilderError("Builder for $permission PermissionStateRepo was already registered")
             }
@@ -107,14 +100,10 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
 
     inline fun <reified P : Permission> registerOrGetPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerOrGetPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
     @Suppress("UNCHECKED_CAST")
-    fun <P : Permission> registerOrGetPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = repoBuildersLock.withLock {
-        repoBuilders.getOrPut(permission) { createPermissionStateRepoBuilder(permissionStateRepoBuilder) } as PermissionStateRepoBuilder<P>
-    }
+    fun <P : Permission> registerOrGetPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = repoBuilders.getOrPut(permission) { createPermissionStateRepoBuilder(permissionStateRepoBuilder) } as PermissionStateRepoBuilder<P>
 
     fun <P : Permission> unregisterPermissionStateRepoBuilder(permission: P) {
-        repoBuildersLock.withLock {
-            repoBuilders.remove(permission::class)
-        }
+        repoBuilders.remove(permission::class)
     }
 
     @Suppress("UNCHECKED_CAST")
@@ -146,7 +135,7 @@ class Permissions(
     private val coroutineContext: CoroutineContext = defaultPermissionDispatcher,
 ) {
 
-    private val permissionStateRepos = mutableMapOf<Permission, BasePermissionStateRepo<*>>()
+    private val permissionStateRepos = concurrentMutableMapOf<Permission, BasePermissionStateRepo<*>>()
 
     @Suppress("UNCHECKED_CAST")
     private fun <P : Permission> permissionStateRepo(permission: P): BasePermissionStateRepo<P> = permissionStateRepos.getOrPut(permission) {
@@ -175,8 +164,10 @@ class Permissions(
     }
 
     fun clean() {
-        permissionStateRepos.values.forEach { it.cancel() }
-        permissionStateRepos.clear()
+        permissionStateRepos.synchronized {
+            values.forEach { it.cancel() }
+            clear()
+        }
     }
 }
 
diff --git a/base/src/androidLibMain/kotlin/monitor/EnableServiceActivity.kt b/base/src/androidLibMain/kotlin/monitor/EnableServiceActivity.kt
index 7cbd38d52..d16a52670 100644
--- a/base/src/androidLibMain/kotlin/monitor/EnableServiceActivity.kt
+++ b/base/src/androidLibMain/kotlin/monitor/EnableServiceActivity.kt
@@ -24,6 +24,8 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import com.splendo.kaluga.base.collections.ConcurrentMutableMap
+import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import kotlinx.coroutines.CompletableDeferred
 
 class EnableServiceActivity : AppCompatActivity() {
@@ -31,7 +33,7 @@ class EnableServiceActivity : AppCompatActivity() {
     companion object {
         private const val EXTRA_CALLBACK_ID = "EXTRA_CALLBACK_ID"
         private const val EXTRA_SETTING_ID = "EXTRA_CALLBACK_ID"
-        val enablingHandlers: MutableMap<Pair<String, String>, CompletableDeferred<Boolean>> = mutableMapOf()
+        val enablingHandlers: ConcurrentMutableMap<Pair<String, String>, CompletableDeferred<Boolean>> = concurrentMutableMapOf()
 
         fun showEnableServiceActivity(context: Context, identifier: String, settingsIntent: Intent): CompletableDeferred<Boolean> {
             val settingKey = settingsIntent.action.orEmpty()
@@ -72,8 +74,10 @@ class EnableServiceActivity : AppCompatActivity() {
     private fun complete(success: Boolean) {
         val actionKey = settingsIntent?.action.orEmpty()
         intent.getStringExtra(EXTRA_CALLBACK_ID)?.let {
-            enablingHandlers[it to actionKey]?.complete(success)
-            enablingHandlers.remove(it to actionKey)
+            enablingHandlers.synchronized {
+                this[it to actionKey]?.complete(success)
+                remove(it to actionKey)
+            }
         }
         finish()
     }
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableIterator.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableIterator.kt
new file mode 100644
index 000000000..efc8e3012
--- /dev/null
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableIterator.kt
@@ -0,0 +1,47 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.base.collections
+
+import kotlinx.atomicfu.locks.reentrantLock
+import kotlinx.atomicfu.locks.withLock
+
+internal open class InternalConcurrentMutableIterator<E, I : MutableIterator<E>> internal constructor(private val internal: I) : MutableIterator<E> {
+    private val lock = reentrantLock()
+
+    override fun hasNext(): Boolean = synchronized { hasNext() }
+    override fun next(): E = synchronized { next() }
+    override fun remove() = synchronized { remove() }
+
+    fun <T> synchronized(action: I.() -> T): T = lock.withLock { internal.action() }
+}
+
+class ConcurrentMutableIterator<E> internal constructor(private val internal: InternalConcurrentMutableIterator<E, MutableIterator<E>>) : MutableIterator<E> by internal {
+    internal constructor(internal: MutableIterator<E>) : this(InternalConcurrentMutableIterator(internal))
+}
+
+class ConcurrentMutableListIterator<E> internal constructor(private val internal: InternalConcurrentMutableIterator<E, MutableListIterator<E>>) : MutableIterator<E> by internal, MutableListIterator<E> {
+
+    internal constructor(internal: MutableListIterator<E>) : this(InternalConcurrentMutableIterator(internal))
+
+    override fun add(element: E) = internal.synchronized { add(element) }
+    override fun hasPrevious(): Boolean = internal.synchronized { hasPrevious() }
+    override fun nextIndex(): Int = internal.synchronized { nextIndex() }
+    override fun previous(): E = internal.synchronized { previous() }
+    override fun previousIndex(): Int = internal.synchronized { previousIndex() }
+    override fun set(element: E) = internal.synchronized { set(element) }
+}
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
new file mode 100644
index 000000000..a88ce53b8
--- /dev/null
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
@@ -0,0 +1,69 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.base.collections
+
+import kotlinx.atomicfu.locks.reentrantLock
+import kotlinx.atomicfu.locks.withLock
+
+class ConcurrentMutableList<E> internal constructor(private val internal: MutableList<E> = mutableListOf()): MutableList<E> {
+    private val lock = reentrantLock()
+
+    override val size: Int get() = synchronized { size }
+    override fun add(element: E): Boolean = synchronized { add(element) }
+    override fun add(index: Int, element: E) = synchronized { add(index, element) }
+    override fun addAll(elements: Collection<E>): Boolean = synchronized { addAll(elements) }
+    override fun addAll(index: Int, elements: Collection<E>): Boolean = synchronized { addAll(index, elements) }
+    override fun get(index: Int): E = synchronized { get(index) }
+    override fun set(index: Int, element: E): E = synchronized { set(index, element) }
+    override fun indexOf(element: E): Int = synchronized { indexOf(element) }
+    override fun lastIndexOf(element: E): Int = synchronized { lastIndexOf(element) }
+    override fun contains(element: E): Boolean = synchronized { contains(element) }
+    override fun containsAll(elements: Collection<E>): Boolean = synchronized { containsAll(elements) }
+    override fun iterator(): ConcurrentMutableIterator<E> = synchronized { ConcurrentMutableIterator(iterator()) }
+    override fun listIterator(): ConcurrentMutableListIterator<E> = synchronized { ConcurrentMutableListIterator(listIterator()) }
+    override fun listIterator(index: Int): ConcurrentMutableListIterator<E> = synchronized { ConcurrentMutableListIterator(listIterator(index)) }
+    override fun remove(element: E): Boolean = synchronized { remove(element) }
+    override fun removeAt(index: Int): E = synchronized { removeAt(index) }
+    override fun removeAll(elements: Collection<E>): Boolean = synchronized { removeAll(elements.toSet()) }
+    override fun retainAll(elements: Collection<E>): Boolean = synchronized { retainAll(elements.toSet()) }
+    override fun clear() = synchronized { clear() }
+    override fun subList(fromIndex: Int, toIndex: Int): ConcurrentMutableList<E> = synchronized { ConcurrentMutableList(subList(fromIndex, toIndex)) }
+    override fun isEmpty(): Boolean = synchronized { isEmpty() }
+    override fun equals(other: Any?): Boolean = when (other) {
+        is ConcurrentMutableSet<*> -> {
+            synchronized {
+                val inner = this
+                other.synchronized {
+                    inner == this
+                }
+            }
+        }
+        is MutableSet<*> -> synchronized {
+            this == other
+        }
+        else -> false
+    }
+
+    override fun hashCode(): Int = internal.hashCode()
+    override fun toString(): String = internal.toString()
+
+    fun <T> synchronized(action: MutableList<E>.() -> T): T = lock.withLock { internal.action() }
+}
+
+fun <E> concurrentMutableListOf() = ConcurrentMutableList<E>(mutableListOf())
+fun <E> concurrentMutableListOf(vararg elements: E) = ConcurrentMutableList(mutableListOf(*elements))
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
new file mode 100644
index 000000000..b927dde31
--- /dev/null
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
@@ -0,0 +1,50 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.base.collections
+
+import kotlinx.atomicfu.locks.reentrantLock
+import kotlinx.atomicfu.locks.withLock
+
+class ConcurrentMutableMap<K, V> internal constructor(private val internal: MutableMap<K, V> = mutableMapOf()): MutableMap<K, V> {
+    private val lock = reentrantLock()
+
+    override val entries: MutableSet<MutableMap.MutableEntry<K, V>> get() = synchronized { entries }
+    override val keys: MutableSet<K> get() = synchronized { keys }
+    override val size: Int get() = synchronized { size }
+    override val values: MutableCollection<V> get() = synchronized { values }
+    override fun clear() = synchronized { clear() }
+    override fun containsKey(key: K): Boolean = synchronized { containsKey(key) }
+    override fun containsValue(value: V): Boolean = synchronized { containsValue(value) }
+    override fun get(key: K): V? = synchronized { get(key) }
+    override fun isEmpty(): Boolean = synchronized { isEmpty() }
+    override fun put(key: K, value: V): V?  = synchronized { put(key, value) }
+    override fun putAll(from: Map<out K, V>) = synchronized { putAll(from) }
+    override fun remove(key: K): V? = synchronized { remove(key) }
+    override fun equals(other: Any?): Boolean = when (other) {
+        is Map<*, *> -> entries == other.entries
+        else -> false
+    }
+
+    override fun hashCode(): Int = internal.hashCode()
+    override fun toString(): String = internal.toString()
+
+    fun <T> synchronized(action: MutableMap<K, V>.() -> T): T = lock.withLock { internal.action() }
+}
+
+fun <K, V> concurrentMutableMapOf() = ConcurrentMutableMap<K, V>(mutableMapOf())
+fun <K, V> concurrentMutableMapOf(vararg entries: Pair<K, V>) = ConcurrentMutableMap(mutableMapOf(*entries))
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
new file mode 100644
index 000000000..fc52f2684
--- /dev/null
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
@@ -0,0 +1,59 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.base.collections
+
+import kotlinx.atomicfu.locks.reentrantLock
+import kotlinx.atomicfu.locks.withLock
+
+class ConcurrentMutableSet<E> internal constructor(private val internal: MutableSet<E> = mutableSetOf()): MutableSet<E> {
+    private val lock = reentrantLock()
+
+    override val size: Int get() = synchronized { size }
+    override fun add(element: E): Boolean = synchronized { add(element) }
+    override fun addAll(elements: Collection<E>): Boolean = synchronized { addAll(elements) }
+    override fun contains(element: E): Boolean = synchronized { contains(element) }
+    override fun containsAll(elements: Collection<E>): Boolean = synchronized { containsAll(elements) }
+    override fun iterator(): ConcurrentMutableIterator<E> = synchronized { ConcurrentMutableIterator(iterator()) }
+    override fun remove(element: E): Boolean = synchronized { remove(element) }
+    override fun removeAll(elements: Collection<E>): Boolean = synchronized { removeAll(elements.toSet()) }
+    override fun retainAll(elements: Collection<E>): Boolean = synchronized { retainAll(elements.toSet()) }
+    override fun clear() = synchronized { clear() }
+    override fun isEmpty(): Boolean = synchronized { isEmpty() }
+    override fun equals(other: Any?): Boolean = when (other) {
+        is ConcurrentMutableSet<*> -> {
+            synchronized {
+                val inner = this
+                other.synchronized {
+                    inner == this
+                }
+            }
+        }
+        is MutableSet<*> -> synchronized {
+            this == other
+        }
+        else -> false
+    }
+
+    override fun hashCode(): Int = internal.hashCode()
+    override fun toString(): String = internal.toString()
+
+    fun <T> synchronized(action: MutableSet<E>.() -> T): T = lock.withLock { internal.action() }
+}
+
+fun <E> concurrentMutableSetOf() = ConcurrentMutableSet<E>(mutableSetOf())
+fun <E> concurrentMutableSetOf(vararg elements: E) = ConcurrentMutableSet(mutableSetOf(*elements))
diff --git a/beacons/src/commonMain/kotlin/Beacons.kt b/beacons/src/commonMain/kotlin/Beacons.kt
index 34fdf104c..b5360ddde 100644
--- a/beacons/src/commonMain/kotlin/Beacons.kt
+++ b/beacons/src/commonMain/kotlin/Beacons.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.beacons
 
+import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.bluetooth.BluetoothService
 import com.splendo.kaluga.bluetooth.device.Device
@@ -41,7 +42,6 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
 private typealias BeaconJob = Pair<BeaconInfo, Job>
-private typealias BeaconsMap = MutableMap<BeaconID, BeaconJob>
 
 class Beacons(
     private val bluetooth: BluetoothService,
@@ -52,7 +52,7 @@ class Beacons(
 
     private val monitoringLock = Mutex()
     private val updateLock = Mutex()
-    private val cache = mutableMapOf<BeaconID, BeaconJob>()
+    private val cache = concurrentMutableMapOf<BeaconID, BeaconJob>()
     private val cacheJob = Job()
     private val coroutineScope = CoroutineScope(Dispatchers.Default + cacheJob)
     private var monitoringJob: MutableStateFlow<Job?> = MutableStateFlow(null)
@@ -90,19 +90,21 @@ class Beacons(
     private suspend fun updateBeacons(discovered: List<BeaconInfo>) = updateLock.withLock {
         debug(TAG, "Total Beacons discovered: ${discovered.size}")
         discovered.forEach { beacon ->
-            if (cache.containsKey(beacon.beaconID)) {
-                debug(TAG, "[Found] $beacon")
-                cache.remove(beacon.beaconID)?.second?.cancel()
-                debug(TAG, "[Removed] $beacon")
-            } else {
-                debug(TAG, "[New] $beacon")
-            }
-            cache[beacon.beaconID] = beacon to coroutineScope.launch {
-                debug(TAG, "[Added] $beacon")
-                delay(beacon.lastSeen.millisecondSinceEpoch + timeout.inWholeMilliseconds - DefaultKalugaDate.now().millisecondSinceEpoch)
-                debug(TAG, "[Lost] $beacon")
-                cache.remove(beacon.beaconID)
-                updateList()
+            cache.synchronized {
+                if (containsKey(beacon.beaconID)) {
+                    debug(TAG, "[Found] $beacon")
+                    remove(beacon.beaconID)?.second?.cancel()
+                    debug(TAG, "[Removed] $beacon")
+                } else {
+                    debug(TAG, "[New] $beacon")
+                }
+                this[beacon.beaconID] = beacon to coroutineScope.launch {
+                    debug(TAG, "[Added] $beacon")
+                    delay(beacon.lastSeen.millisecondSinceEpoch + timeout.inWholeMilliseconds - DefaultKalugaDate.now().millisecondSinceEpoch)
+                    debug(TAG, "[Lost] $beacon")
+                    cache.remove(beacon.beaconID)
+                    updateList()
+                }
             }
         }
         updateList()
diff --git a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 75540831a..754b92d00 100644
--- a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.device
 
+import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import com.splendo.kaluga.bluetooth.Characteristic
 import com.splendo.kaluga.bluetooth.Descriptor
 import com.splendo.kaluga.bluetooth.Service
@@ -96,7 +97,7 @@ abstract class BaseDeviceConnectionManager(
     private val logger = settings.logger
 
     protected var currentAction: DeviceAction? = null
-    protected val notifyingCharacteristics = mutableMapOf<String, Characteristic>()
+    protected val notifyingCharacteristics = concurrentMutableMapOf<String, Characteristic>()
 
     private val eventChannel = Channel<DeviceConnectionManager.Event>(UNLIMITED)
     override val events: Flow<DeviceConnectionManager.Event> = eventChannel.receiveAsFlow()
diff --git a/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt b/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt
index e36ed3d86..a009f5443 100644
--- a/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.scanner
 
+import com.splendo.kaluga.base.collections.concurrentMutableSetOf
 import com.splendo.kaluga.base.utils.typedMap
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
@@ -96,7 +97,7 @@ actual class DefaultScanner internal constructor(
     private val centralManagersLock = Mutex()
     private val centralManagers = mutableListOf<CBCentralManager>()
     private val discoveringDelegates = mutableListOf<CBCentralManagerDelegateProtocol>()
-    private val activeDelegates = mutableSetOf<CBCentralManagerDelegateProtocol>()
+    private val activeDelegates = concurrentMutableSetOf<CBCentralManagerDelegateProtocol>()
     override val bluetoothEnabledMonitor: BluetoothMonitor = BluetoothMonitor.Builder { CBCentralManager(null, enabledQueue, emptyMap<Any?, Any>()) }.create()
 
     private suspend fun scan(filter: UUID? = null) {
diff --git a/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt b/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt
index ae4018ad9..613b4de67 100644
--- a/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt
+++ b/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt
@@ -33,14 +33,17 @@ actual class DefaultLocationPermissionManager(
     coroutineScope: CoroutineScope
 ) : BasePermissionManager<LocationPermission>(locationPermission, settings, coroutineScope) {
 
-    private val permissions: Array<String> get() {
-        val result = mutableListOf(Manifest.permission.ACCESS_COARSE_LOCATION)
+    private val permissions: Array<String> get() = listOfNotNull(
+        Manifest.permission.ACCESS_COARSE_LOCATION,
         if (permission.precise)
-            result.add(Manifest.permission.ACCESS_FINE_LOCATION)
+            Manifest.permission.ACCESS_FINE_LOCATION
+        else
+            null,
         if (permission.background && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q)
-            result.add(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
-        return result.toTypedArray()
-    }
+            Manifest.permission.ACCESS_BACKGROUND_LOCATION
+        else
+            null
+    ).toTypedArray()
 
     private val permissionHandler = DefaultAndroidPermissionStateHandler(eventChannel, logTag, logger)
     private val permissionsManager = AndroidPermissionsManager(context, permissions, coroutineScope, logTag, logger, permissionHandler)
diff --git a/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt b/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt
index d7f203e44..a42200efd 100644
--- a/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt
+++ b/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt
@@ -68,9 +68,10 @@ actual class DefaultLocationPermissionManager(
     private val authorizationDelegate = Delegate(permission, permissionHandler, coroutineScope)
 
     override fun requestPermissionDidStart() {
-        val locationDeclarations = mutableListOf(NSLocationWhenInUseUsageDescription)
-        if (permission.background) {
-            locationDeclarations.addAll(listOf(NSLocationAlwaysAndWhenInUseUsageDescription, NSLocationAlwaysUsageDescription))
+        val locationDeclarations = listOf(NSLocationWhenInUseUsageDescription) + if (permission.background) {
+            listOf(NSLocationAlwaysAndWhenInUseUsageDescription, NSLocationAlwaysUsageDescription)
+        } else {
+            emptyList()
         }
         if (IOSPermissionsHelper.missingDeclarationsInPList(bundle, *locationDeclarations.toTypedArray()).isEmpty()) {
             launch {
diff --git a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
index af5c92b00..509661b29 100644
--- a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
@@ -28,6 +28,7 @@ import com.google.android.gms.location.LocationCallback
 import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.LocationResult
 import com.google.android.gms.location.Priority
+import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import com.splendo.kaluga.permissions.location.LocationPermission
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -76,7 +77,7 @@ class GoogleLocationProvider(private val context: Context) : LocationProvider {
             private val identifier = hashCode().toString()
 
             companion object {
-                val updatingLocationInBackgroundManagers: MutableMap<String, MutableStateFlow<List<Location.KnownLocation>>> = mutableMapOf()
+                val updatingLocationInBackgroundManagers: MutableMap<String, MutableStateFlow<List<Location.KnownLocation>>> = concurrentMutableMapOf()
             }
 
             private val locationUpdatedPendingIntent = GoogleLocationUpdatesBroadcastReceiver.intent(context, identifier)
diff --git a/logging/src/commonTest/kotlin/LogTest.kt b/logging/src/commonTest/kotlin/LogTest.kt
index 6546a691d..100fec57f 100644
--- a/logging/src/commonTest/kotlin/LogTest.kt
+++ b/logging/src/commonTest/kotlin/LogTest.kt
@@ -202,7 +202,7 @@ class LogTest {
         assertEquals(logLevel, mockLogger.levelList[0])
         assertEquals(tag, mockLogger.tagList[0])
         assertEquals(throwable, mockLogger.throwableList[0])
-        assertEquals(message, mockLogger.messageList[0])
+        assertEquals(message, mockLogger.messageList[0]?.invoke())
 
         mockLogger.clear()
     }
diff --git a/logging/src/commonTest/kotlin/LoggerMock.kt b/logging/src/commonTest/kotlin/LoggerMock.kt
index b1e60ca7d..aba31916b 100644
--- a/logging/src/commonTest/kotlin/LoggerMock.kt
+++ b/logging/src/commonTest/kotlin/LoggerMock.kt
@@ -18,29 +18,22 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.logging
 
-import kotlinx.atomicfu.locks.SynchronizedObject
-import kotlinx.atomicfu.locks.synchronized
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 
-class LoggerMock : SynchronizedObject(), Logger {
+class LoggerMock : Logger {
 
-    val throwableList = mutableListOf<Throwable?>()
-    val messageList = mutableListOf<String?>()
-    val tagList = mutableListOf<String?>()
-    val levelList = mutableListOf<LogLevel?>()
+    private data class Log(val logLevel: LogLevel, val tag: String?, val throwable: Throwable?, val message: (() -> String)?)
 
-    fun clear() = synchronized(this) {
-        levelList.clear()
-        messageList.clear()
-        tagList.clear()
-        throwableList.clear()
-    }
+    private val logList = concurrentMutableListOf<Log>()
+
+    val throwableList get() = logList.map { it.throwable }
+    val messageList get() = logList.map { it.message }
+    val tagList get() = logList.map { it.tag }
+    val levelList get() = logList.map { it.logLevel }
+
+    fun clear() = logList.clear()
 
     override fun log(level: LogLevel, tag: String?, throwable: Throwable?, message: (() -> String)?) {
-        synchronized(this) {
-            levelList.add(level)
-            tagList.add(tag)
-            throwableList.add(throwable)
-            messageList.add(message?.invoke())
-        }
+        logList.add(Log(level, tag, throwable, message))
     }
 }
diff --git a/test-utils-base/src/commonMain/kotlin/FlowTest.kt b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
index 488558492..a335a818c 100644
--- a/test-utils-base/src/commonMain/kotlin/FlowTest.kt
+++ b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
@@ -18,6 +18,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.test.base
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
@@ -102,7 +103,7 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
 
     open val filter: (Flow<T>) -> Flow<T> = { it }
 
-    private val tests: MutableList<EmptyCompletableDeferred> = mutableListOf()
+    private val tests: MutableList<EmptyCompletableDeferred> = concurrentMutableListOf()
 
     var job: Job? = null
 
diff --git a/test-utils-base/src/commonMain/kotlin/flowExtensions.kt b/test-utils-base/src/commonMain/kotlin/flowExtensions.kt
index 6722c65c6..8d4a3d52d 100644
--- a/test-utils-base/src/commonMain/kotlin/flowExtensions.kt
+++ b/test-utils-base/src/commonMain/kotlin/flowExtensions.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.base
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -29,7 +30,7 @@ import kotlin.time.Duration
  * @return a list of flow items captured for [duration]
  */
 suspend fun <T> Flow<T>.captureFor(duration: Duration): List<T> {
-    val output = mutableListOf<T>()
+    val output = concurrentMutableListOf<T>()
 
     try {
         withTimeout(duration) {
diff --git a/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt b/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
index 9786e63e5..b28af25be 100644
--- a/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
+++ b/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
@@ -17,6 +17,8 @@
 
 package com.splendo.kaluga.test.base.mock
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
+import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import com.splendo.kaluga.test.base.mock.answer.Answer
 import com.splendo.kaluga.test.base.mock.answer.BaseAnswer
 import com.splendo.kaluga.test.base.mock.answer.SuspendedAnswer
@@ -86,8 +88,8 @@ sealed class BaseMethodMock<
         fun doThrow(throwable: Throwable) = doExecute { throw throwable }
     }
 
-    private val stubs = mutableMapOf<M, S>()
-    private val callParameters = mutableListOf<V>()
+    private val stubs = concurrentMutableMapOf<M, S>()
+    private val callParameters = concurrentMutableListOf<V>()
     protected abstract val ParametersSpec: W
 
     protected abstract fun createStub(matcher: M): S
@@ -100,9 +102,12 @@ sealed class BaseMethodMock<
     protected fun getStubFor(values: V): S {
         callParameters.add(values)
         // First find all the stubs whose matchers match the values received and sort their matchers per parameter in order of strongest constraint.
-        val matchingStubs = stubs.keys.mapNotNull { matchers ->
-            val stub = stubs[matchers]
-            if (ParametersSpec.run { matchers.matches(values) } && stub != null) matchers.asList().sorted() to stub else null
+        val matchingStubs = stubs.synchronized {
+            keys.mapNotNull { matchers ->
+                val stub = this[matchers]
+                if (ParametersSpec.run { matchers.matches(values) } && stub != null) matchers.asList()
+                    .sorted() to stub else null
+            }
         }
         // Ensure there is at least one stub. Otherwise fail
         if (matchingStubs.isEmpty()) { fail { "No matching stubs found for $values" } }
diff --git a/test-utils-base/src/commonMain/kotlin/mock/matcher/Captor.kt b/test-utils-base/src/commonMain/kotlin/mock/matcher/Captor.kt
index 8c487bb19..f254a9df0 100644
--- a/test-utils-base/src/commonMain/kotlin/mock/matcher/Captor.kt
+++ b/test-utils-base/src/commonMain/kotlin/mock/matcher/Captor.kt
@@ -17,6 +17,8 @@
 
 package com.splendo.kaluga.test.base.mock.matcher
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
+
 /**
  * Captures a parameter to it can be extracted from [com.splendo.kaluga.test.base.mock.verify]
  */
@@ -42,7 +44,7 @@ sealed interface Captor<T> : ParameterMatcherOrCaptor<T> {
  * A [Captor] for capturing non-nullable parameters
  */
 class AnyCaptor<T : Any> : Captor<T> {
-    private val _captured = mutableListOf<T>()
+    private val _captured = concurrentMutableListOf<T>()
     override val captured: List<T> get() = _captured.toList()
     override val lastCaptured: T? get() = _captured.lastOrNull()
 
@@ -57,7 +59,7 @@ class AnyCaptor<T : Any> : Captor<T> {
  * A [Captor] for capturing nullable parameters
  */
 class AnyOrNullCaptor<T : Any> : Captor<T?> {
-    private val _captured = mutableListOf<T?>()
+    private val _captured = concurrentMutableListOf<T?>()
     override val captured: List<T?> get() = _captured.toList()
     override val lastCaptured: T? get() = _captured.lastOrNull()
 
diff --git a/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt b/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt
index 355499399..107372887 100644
--- a/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt
+++ b/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.test.bluetooth
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGattCallback
 import android.content.Context
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.bluetooth.device.BluetoothGattWrapper
 import com.splendo.kaluga.bluetooth.device.DeviceWrapper
 import com.splendo.kaluga.bluetooth.device.Identifier
@@ -34,7 +35,7 @@ class MockDeviceWrapper(
     setupMocks: Boolean = true
 ) : DeviceWrapper {
 
-    val gattWrappers = mutableListOf<MockBluetoothGattWrapper>()
+    val gattWrappers = concurrentMutableListOf<MockBluetoothGattWrapper>()
     val connectGattMock = ::connectGatt.mock()
     val removeBondMock = ::removeBond.mock()
     val createBondMock = ::createBond.mock()
diff --git a/test-utils-bluetooth/src/androidLibMain/kotlin/MockServiceWrapper.kt b/test-utils-bluetooth/src/androidLibMain/kotlin/MockServiceWrapper.kt
index 5dcb7fa3d..53c2058c0 100644
--- a/test-utils-bluetooth/src/androidLibMain/kotlin/MockServiceWrapper.kt
+++ b/test-utils-bluetooth/src/androidLibMain/kotlin/MockServiceWrapper.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.test.bluetooth
 
 import android.bluetooth.BluetoothGattCharacteristic
 import android.bluetooth.BluetoothGattService
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.bluetooth.CharacteristicWrapper
 import com.splendo.kaluga.bluetooth.DefaultCharacteristicWrapper
 import com.splendo.kaluga.bluetooth.DefaultGattServiceWrapper
@@ -37,7 +38,7 @@ class MockServiceWrapper(
 
     override val type: Int = 0
     override val instanceId: Int = 0
-    private val mutableCharacteristics = mutableListOf<CharacteristicWrapper>(
+    private val mutableCharacteristics = concurrentMutableListOf<CharacteristicWrapper>(
         *initialCharacteristics.map {
             AndroidMockCharacteristicWrapper(
                 uuid = it.uuid,
@@ -49,7 +50,7 @@ class MockServiceWrapper(
     )
     override val characteristics: List<CharacteristicWrapper>
         get() = mutableCharacteristics
-    private val mutableIncludedServices = mutableListOf<ServiceWrapper>()
+    private val mutableIncludedServices = concurrentMutableListOf<ServiceWrapper>()
     override val includedServices: List<ServiceWrapper>
         get() = mutableIncludedServices
 
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
index bc73ec401..a3ffb9c7d 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.bluetooth.device
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.base.utils.toHexString
 import com.splendo.kaluga.bluetooth.asBytes
 import com.splendo.kaluga.bluetooth.device.BaseDeviceConnectionManager
@@ -58,7 +59,7 @@ class MockDeviceConnectionManager(
         /**
          * List of created [MockDeviceConnectionManager]
          */
-        val createdDeviceConnectionManager = mutableListOf<MockDeviceConnectionManager>()
+        val createdDeviceConnectionManager = concurrentMutableListOf<MockDeviceConnectionManager>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
index 86a78c5c4..7d0c782ac 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.bluetooth.scanner
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.scanner.BaseScanner
 import com.splendo.kaluga.bluetooth.scanner.EnableSensorAction
@@ -91,7 +92,7 @@ class MockBaseScanner(
         /**
          * List of created [MockScanner]
          */
-        val createdScanners = mutableListOf<MockBaseScanner>()
+        val createdScanners = concurrentMutableListOf<MockBaseScanner>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-hud/src/commonMain/kotlin/MockHUD.kt b/test-utils-hud/src/commonMain/kotlin/MockHUD.kt
index b31ba4391..3ec16824f 100644
--- a/test-utils-hud/src/commonMain/kotlin/MockHUD.kt
+++ b/test-utils-hud/src/commonMain/kotlin/MockHUD.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.hud
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.hud.BaseHUD
 import com.splendo.kaluga.hud.HudConfig
 import com.splendo.kaluga.test.base.mock.call
@@ -45,7 +46,7 @@ class MockHUD(
         /**
          * List of built [MockHUD]
          */
-        val builtHUDs = mutableListOf<MockHUD>()
+        val builtHUDs = concurrentMutableListOf<MockHUD>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt b/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt
index d01faef82..3eda70b47 100644
--- a/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt
+++ b/test-utils-keyboard/src/commonMain/kotlin/MockKeyboardManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.keyboard
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.keyboard.BaseKeyboardManager
 import com.splendo.kaluga.keyboard.FocusHandler
 import com.splendo.kaluga.test.base.mock.call
@@ -39,7 +40,7 @@ class MockKeyboardManager(setupMocks: Boolean = true) : BaseKeyboardManager {
         /**
          * List of created [MockKeyboardManager]
          */
-        val builtKeyboardManagers = mutableListOf<MockKeyboardManager>()
+        val builtKeyboardManagers = concurrentMutableListOf<MockKeyboardManager>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt b/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
index fd5dbd80b..d1b33a21b 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.location
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.location.BaseLocationManager
 import com.splendo.kaluga.location.Location
 import com.splendo.kaluga.location.LocationManager
@@ -77,7 +78,7 @@ class MockBaseLocationManager(
         /**
          * Ths list of built [MockBaseLocationManager]
          */
-        val builtLocationManagers = mutableListOf<MockBaseLocationManager>()
+        val builtLocationManagers = concurrentMutableListOf<MockBaseLocationManager>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt b/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
index 7bfde43fc..e0d700b90 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationStateRepoBuilder.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.location
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.location.BaseLocationManager
 import com.splendo.kaluga.location.BaseLocationStateRepoBuilder
 import com.splendo.kaluga.location.LocationStateRepo
@@ -42,7 +43,7 @@ class MockLocationStateRepoBuilder<LMB : BaseLocationManager.Builder>(
     /**
      * List of built [LocationStateRepo]
      */
-    val builtLocationStateRepo = mutableListOf<LocationStateRepo>()
+    val builtLocationStateRepo = concurrentMutableListOf<LocationStateRepo>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-permissions/src/commonMain/kotlin/MockPermissionManager.kt b/test-utils-permissions/src/commonMain/kotlin/MockPermissionManager.kt
index 973592c01..4ede1362e 100644
--- a/test-utils-permissions/src/commonMain/kotlin/MockPermissionManager.kt
+++ b/test-utils-permissions/src/commonMain/kotlin/MockPermissionManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.permissions
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.logging.debug
 import com.splendo.kaluga.permissions.base.BasePermissionManager
 import com.splendo.kaluga.permissions.base.Permission
@@ -57,7 +58,7 @@ class MockPermissionManager<P : Permission>(
         /**
          * List of built [MockPermissionManager]
          */
-        val createdManagers = mutableListOf<MockPermissionManager<P>>()
+        val createdManagers = concurrentMutableListOf<MockPermissionManager<P>>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-permissions/src/commonMain/kotlin/MockPermissionsBuilder.kt b/test-utils-permissions/src/commonMain/kotlin/MockPermissionsBuilder.kt
index 98292b568..6ea128948 100644
--- a/test-utils-permissions/src/commonMain/kotlin/MockPermissionsBuilder.kt
+++ b/test-utils-permissions/src/commonMain/kotlin/MockPermissionsBuilder.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.permissions
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.permissions.base.BasePermissionStateRepo
 import com.splendo.kaluga.permissions.base.BasePermissionsBuilder
 import com.splendo.kaluga.permissions.base.Permission
@@ -54,7 +55,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [CameraPermission]
      */
-    val buildCameraStateRepos = mutableListOf<MockBasePermissionStateRepo<CameraPermission>>()
+    val buildCameraStateRepos = concurrentMutableListOf<MockBasePermissionStateRepo<CameraPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [CameraPermission]
@@ -65,7 +66,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [ContactsPermission]
      */
-    val buildContactsStateRepos = mutableListOf<MockBasePermissionStateRepo<ContactsPermission>>()
+    val buildContactsStateRepos = concurrentMutableListOf<MockBasePermissionStateRepo<ContactsPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [ContactsPermission]
@@ -76,7 +77,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [MicrophonePermission]
      */
-    val buildMicrophoneStateRepos = mutableListOf<MockBasePermissionStateRepo<MicrophonePermission>>()
+    val buildMicrophoneStateRepos = concurrentMutableListOf<MockBasePermissionStateRepo<MicrophonePermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [MicrophonePermission]
@@ -87,7 +88,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [NotificationsPermission]
      */
-    val buildNotificationsStateRepos = mutableListOf<MockBasePermissionStateRepo<NotificationsPermission>>()
+    val buildNotificationsStateRepos = concurrentMutableListOf<MockBasePermissionStateRepo<NotificationsPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [NotificationsPermission]
@@ -98,7 +99,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [BluetoothPermission]
      */
-    val buildBluetoothStateRepos = mutableListOf<MockBasePermissionStateRepo<BluetoothPermission>>()
+    val buildBluetoothStateRepos = concurrentMutableListOf<MockBasePermissionStateRepo<BluetoothPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [BluetoothPermission]
@@ -109,7 +110,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [LocationPermission]
      */
-    val buildLocationStateRepos = mutableListOf<MockBasePermissionStateRepo<LocationPermission>>()
+    val buildLocationStateRepos = concurrentMutableListOf<MockBasePermissionStateRepo<LocationPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [LocationPermission]
@@ -120,7 +121,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [CalendarPermission]
      */
-    val buildCalendarStateRepos = mutableListOf<MockBasePermissionStateRepo<CalendarPermission>>()
+    val buildCalendarStateRepos = concurrentMutableListOf<MockBasePermissionStateRepo<CalendarPermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [CalendarPermission]
@@ -131,7 +132,7 @@ class MockPermissionsBuilder(
     /**
      * List of created [PermissionStateRepo] for [StoragePermission]
      */
-    val buildStorageStateRepos = mutableListOf<MockBasePermissionStateRepo<StoragePermission>>()
+    val buildStorageStateRepos = concurrentMutableListOf<MockBasePermissionStateRepo<StoragePermission>>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for creating [PermissionStateRepo] for [StoragePermission]
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
index 33ee86793..3d77bd31b 100644
--- a/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
@@ -16,6 +16,7 @@
 
 package com.splendo.kaluga.test.system.network
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.system.network.BaseNetworkManager
 import com.splendo.kaluga.system.network.NetworkConnectionType
 import com.splendo.kaluga.system.network.NetworkManager
@@ -50,7 +51,7 @@ class MockBaseNetworkManager(initialNetworkConnectionType: NetworkConnectionType
         /**
          * List of built [BaseNetworkManager]
          */
-        val builtNetworkManagers = mutableListOf<BaseNetworkManager>()
+        val builtNetworkManagers = concurrentMutableListOf<BaseNetworkManager>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt
index da8b47669..b5b3a5c3b 100644
--- a/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt
@@ -16,6 +16,7 @@
 
 package com.splendo.kaluga.test.system.network
 
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.system.network.BaseNetworkManager
 import com.splendo.kaluga.system.network.state.BaseNetworkStateRepoBuilder
 import com.splendo.kaluga.system.network.state.NetworkStateRepo
@@ -37,7 +38,7 @@ class MockNetworkStateRepoBuilder<NMB : BaseNetworkManager.Builder>(
     /**
      * List of built [NetworkStateRepo]
      */
-    val builtNetworkStateRepo = mutableListOf<NetworkStateRepo>()
+    val builtNetworkStateRepo = concurrentMutableListOf<NetworkStateRepo>()
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]

From f26959af917b87f24bcf06da130d4b50f27cf6cb Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 23 Jan 2023 16:50:32 +0100
Subject: [PATCH 115/227] Remove leftovers of ThreadLocal

---
 .../kotlin/observable/Disposable.kt           | 11 -----
 .../kotlin/observable/Disposable.kt           | 11 +++--
 .../kotlin/observable/SimpleDisposable.kt     | 21 ---------
 .../kotlin/observable/SimpleDisposable.kt     | 11 -----
 .../kotlin/observable/SimpleDisposable.kt     | 11 -----
 .../src/commonMain/kotlin/FlowTest.kt         | 45 +++++--------------
 6 files changed, 20 insertions(+), 90 deletions(-)

diff --git a/architecture/src/androidLibMain/kotlin/observable/Disposable.kt b/architecture/src/androidLibMain/kotlin/observable/Disposable.kt
index f32c378d5..9433ab32c 100644
--- a/architecture/src/androidLibMain/kotlin/observable/Disposable.kt
+++ b/architecture/src/androidLibMain/kotlin/observable/Disposable.kt
@@ -19,14 +19,3 @@
 package com.splendo.kaluga.architecture.observable
 
 actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : BaseSimpleDisposable(onDispose)
-
-internal actual fun <R : T, T, OO : ObservableOptional<R>> addObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    observation.observers.add(observer)
-}
-
-internal actual fun <R : T, T, OO : ObservableOptional<R>> removeObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    observation.observers.remove(observer)
-}
-
-internal actual fun <R : T, T, OO : ObservableOptional<R>> observers(observation: Observation<R, T, OO>): List<(R) -> Unit> =
-    observation.observers
diff --git a/architecture/src/commonMain/kotlin/observable/Disposable.kt b/architecture/src/commonMain/kotlin/observable/Disposable.kt
index adbcb46bc..8c60be5fd 100644
--- a/architecture/src/commonMain/kotlin/observable/Disposable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Disposable.kt
@@ -26,11 +26,16 @@ import kotlin.jvm.JvmName
 
 typealias DisposeHandler = () -> Unit
 
-internal expect fun <R : T, T, OO : ObservableOptional<R>> addObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit)
+internal fun <R : T, T, OO : ObservableOptional<R>> addObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
+    observation.observers.add(observer)
+}
 
-internal expect fun <R : T, T, OO : ObservableOptional<R>> removeObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit)
+internal fun <R : T, T, OO : ObservableOptional<R>> removeObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
+    observation.observers.remove(observer)
+}
 
-internal expect fun <R : T, T, OO : ObservableOptional<R>> observers(observation: Observation<R, T, OO>): List<(R) -> Unit>
+internal fun <R : T, T, OO : ObservableOptional<R>> observers(observation: Observation<R, T, OO>): List<(R) -> Unit> =
+    observation.observers
 
 /**
  * Reference to an object that should be disposed in time
diff --git a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
index 54d4bf316..314301ab5 100644
--- a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
@@ -28,24 +28,3 @@ actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : Ba
         GCScheduler.schedule()
     }
 }
-
-actual fun <R : T, T, OO : ObservableOptional<R>> addObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    val observers = observersForObservation.getOrPut(observation) { concurrentMutableListOf() }
-    @Suppress("UNCHECKED_CAST")
-    observers.add(observer as (Any?) -> Unit)
-}
-
-actual fun <R : T, T, OO : ObservableOptional<R>> removeObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    observersForObservation.synchronized {
-        val observers = this[observation] ?: return@synchronized
-        observers.remove(observer)
-        if (observers.isEmpty())
-            remove(observation)
-    }
-}
-
-actual fun <R : T, T, OO : ObservableOptional<R>> observers(observation: Observation<R, T, OO>): List<(R) -> Unit> {
-    return observersForObservation[observation] as? List<(R) -> Unit> ?: emptyList()
-}
-
-private val observersForObservation = concurrentMutableMapOf<Observation<*, *, *>, ConcurrentMutableList<(Any?) -> Unit>>()
diff --git a/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt
index c7da67726..968df5e9a 100644
--- a/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt
@@ -18,14 +18,3 @@
 package com.splendo.kaluga.architecture.observable
 
 actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : BaseSimpleDisposable(onDispose)
-
-internal actual fun <R : T, T, OO : ObservableOptional<R>> addObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    observation.observers.add(observer)
-}
-
-internal actual fun <R : T, T, OO : ObservableOptional<R>> removeObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    observation.observers.remove(observer)
-}
-
-internal actual fun <R : T, T, OO : ObservableOptional<R>> observers(observation: Observation<R, T, OO>): List<(R) -> Unit> =
-    observation.observers
diff --git a/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt
index c7da67726..968df5e9a 100644
--- a/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt
@@ -18,14 +18,3 @@
 package com.splendo.kaluga.architecture.observable
 
 actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : BaseSimpleDisposable(onDispose)
-
-internal actual fun <R : T, T, OO : ObservableOptional<R>> addObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    observation.observers.add(observer)
-}
-
-internal actual fun <R : T, T, OO : ObservableOptional<R>> removeObserver(observation: Observation<R, T, OO>, observer: (R) -> Unit) {
-    observation.observers.remove(observer)
-}
-
-internal actual fun <R : T, T, OO : ObservableOptional<R>> observers(observation: Observation<R, T, OO>): List<(R) -> Unit> =
-    observation.observers
diff --git a/test-utils-base/src/commonMain/kotlin/FlowTest.kt b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
index a335a818c..693f66c8d 100644
--- a/test-utils-base/src/commonMain/kotlin/FlowTest.kt
+++ b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
@@ -28,6 +28,8 @@ import com.splendo.kaluga.logging.warn
 import com.splendo.kaluga.test.base.BaseUIThreadTest.EmptyTestContext
 import com.splendo.kaluga.test.base.BaseUIThreadTest.TestContext
 import kotlinx.atomicfu.atomic
+import kotlinx.atomicfu.getAndUpdate
+import kotlinx.atomicfu.updateAndGet
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -77,28 +79,8 @@ abstract class FlowTest<T, F : Flow<T>>(scope: CoroutineScope = MainScope()) : B
         }
 }
 
-/*
-Context for each tests needs to be created and kept on the main thread for iOS.
-
-Since the class itself is created in the test thread
-*/
-
-val contextMap = mutableMapOf<Long, TestContext>()
-
-@Suppress("UNCHECKED_CAST")
-private suspend fun <TC : TestContext> testContext(cookie: Long, testContext: suspend () -> TC): TC {
-    if (!contextMap.containsKey(cookie))
-        contextMap[cookie] = testContext()
-    return contextMap[cookie] as TC
-}
-
-private val cookieTin = atomic(0L)
-
 abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: CoroutineScope = MainScope()) : BaseUIThreadTest<C, TC>(), CoroutineScope by scope {
 
-    // used for thread local map access to store the testContext
-    private val cookie = cookieTin.incrementAndGet()
-
     abstract val flowFromTestContext: suspend TC.() -> F
 
     open val filter: (Flow<T>) -> Flow<T> = { it }
@@ -107,12 +89,13 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
 
     var job: Job? = null
 
+    private val testContext = atomic<TC?>(null)
     private lateinit var testChannel: Channel<Pair<TestBlock<TC, T>, EmptyCompletableDeferred>>
 
     @AfterTest
     override fun afterTest() {
         runBlocking {
-            disposeContext(cookie)
+            disposeContext()
         }
         super.afterTest()
     }
@@ -170,8 +153,6 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
                 // startFlow is only called when the first test block is offered
 
                 val flow = flowFromTestContext
-
-                val cookie = cookie
                 val scope = scope
 
                 val createTestContextWithConfiguration = createTestContextWithConfiguration
@@ -179,12 +160,12 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
                 val f =
                     if (createFlowInMainScope) {
                         withContext(Dispatchers.Main.immediate) {
-                            (flow(testContext(cookie) { createTestContextWithConfiguration(configuration, scope) }))
+                            (flow(testContext.updateAndGet { it ?: createTestContextWithConfiguration(configuration, scope) }!!))
                         }
                     } else {
                         flow(
                             withContext(Dispatchers.Main.immediate) {
-                                (testContext(cookie) { createTestContextWithConfiguration(configuration, scope) })
+                                (testContext.updateAndGet { it ?: createTestContextWithConfiguration(configuration, scope) }!!)
                             }
                         )
                     }
@@ -195,7 +176,7 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
                 resetFlow()
             } finally {
                 if (!retainContextAfterTest) {
-                    disposeContext(cookie)
+                    disposeContext()
                 }
             }
         }
@@ -209,11 +190,11 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
         val filter = filter
         val scope = scope
         val createTestContextWithConfiguration = createTestContextWithConfiguration
-        val cookie = cookie
         try {
             job = launch(Dispatchers.Main.immediate) {
                 started.complete()
-                val testContext = testContext(cookie) { createTestContextWithConfiguration(configuration, scope) }
+                val testContext = testContext.updateAndGet { it
+                    ?: createTestContextWithConfiguration(configuration, scope) }!!
                 debug("main scope launched, about to flow, test channel ${if (testChannel.isEmpty) "" else "not "}empty ")
                 filter(flow).collect { value ->
                     debug("in flow received [$value], test channel ${if (testChannel.isEmpty) "" else "not "}empty \"")
@@ -249,14 +230,13 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
     suspend fun mainAction(action: ScopeActionBlock<TC>) {
         debug("start mainAction")
         awaitTestBlocks()
-        val cookie = cookie
         val createTestContextWithConfiguration = createTestContextWithConfiguration
         val scope = scope
         require(lateConfiguration != null) { "Only use mainAction from inside `testWith` methods" }
         val configuration = lateConfiguration!!
         withContext(Dispatchers.Main.immediate) {
             debug("in main scope for mainAction")
-            action(testContext(cookie) { createTestContextWithConfiguration(configuration, scope) })
+            action(testContext.updateAndGet { it ?: createTestContextWithConfiguration(configuration, scope) }!!)
         }
         debug("did mainAction")
     }
@@ -286,10 +266,9 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
         testChannel.trySend(Pair(test, completable)).isSuccess
     }
 
-    private suspend fun disposeContext(cookie: Long) {
+    private suspend fun disposeContext() {
         withContext(Dispatchers.Main.immediate) {
-            val testContext = contextMap.remove(cookie)
-            testContext?.dispose()
+            testContext.getAndUpdate { null }?.dispose()
         }
     }
 }

From 99d56b076eefd0260c3e6ddc9e3c68131ecbf8d4 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 23 Jan 2023 16:56:17 +0100
Subject: [PATCH 116/227] Lint fixes

---
 .../commonMain/kotlin/collections/ConcurrentMutableList.kt    | 2 +-
 .../src/commonMain/kotlin/collections/ConcurrentMutableMap.kt | 4 ++--
 .../src/commonMain/kotlin/collections/ConcurrentMutableSet.kt | 2 +-
 test-utils-base/src/commonMain/kotlin/FlowTest.kt             | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
index a88ce53b8..af6a7ec8b 100644
--- a/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.collections
 import kotlinx.atomicfu.locks.reentrantLock
 import kotlinx.atomicfu.locks.withLock
 
-class ConcurrentMutableList<E> internal constructor(private val internal: MutableList<E> = mutableListOf()): MutableList<E> {
+class ConcurrentMutableList<E> internal constructor(private val internal: MutableList<E> = mutableListOf()) : MutableList<E> {
     private val lock = reentrantLock()
 
     override val size: Int get() = synchronized { size }
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
index b927dde31..56834e1bf 100644
--- a/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.collections
 import kotlinx.atomicfu.locks.reentrantLock
 import kotlinx.atomicfu.locks.withLock
 
-class ConcurrentMutableMap<K, V> internal constructor(private val internal: MutableMap<K, V> = mutableMapOf()): MutableMap<K, V> {
+class ConcurrentMutableMap<K, V> internal constructor(private val internal: MutableMap<K, V> = mutableMapOf()) : MutableMap<K, V> {
     private val lock = reentrantLock()
 
     override val entries: MutableSet<MutableMap.MutableEntry<K, V>> get() = synchronized { entries }
@@ -32,7 +32,7 @@ class ConcurrentMutableMap<K, V> internal constructor(private val internal: Muta
     override fun containsValue(value: V): Boolean = synchronized { containsValue(value) }
     override fun get(key: K): V? = synchronized { get(key) }
     override fun isEmpty(): Boolean = synchronized { isEmpty() }
-    override fun put(key: K, value: V): V?  = synchronized { put(key, value) }
+    override fun put(key: K, value: V): V? = synchronized { put(key, value) }
     override fun putAll(from: Map<out K, V>) = synchronized { putAll(from) }
     override fun remove(key: K): V? = synchronized { remove(key) }
     override fun equals(other: Any?): Boolean = when (other) {
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
index fc52f2684..fd2f5fc5a 100644
--- a/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.collections
 import kotlinx.atomicfu.locks.reentrantLock
 import kotlinx.atomicfu.locks.withLock
 
-class ConcurrentMutableSet<E> internal constructor(private val internal: MutableSet<E> = mutableSetOf()): MutableSet<E> {
+class ConcurrentMutableSet<E> internal constructor(private val internal: MutableSet<E> = mutableSetOf()) : MutableSet<E> {
     private val lock = reentrantLock()
 
     override val size: Int get() = synchronized { size }
diff --git a/test-utils-base/src/commonMain/kotlin/FlowTest.kt b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
index 693f66c8d..69eec4925 100644
--- a/test-utils-base/src/commonMain/kotlin/FlowTest.kt
+++ b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
@@ -193,8 +193,7 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
         try {
             job = launch(Dispatchers.Main.immediate) {
                 started.complete()
-                val testContext = testContext.updateAndGet { it
-                    ?: createTestContextWithConfiguration(configuration, scope) }!!
+                val testContext = testContext.updateAndGet { it ?: createTestContextWithConfiguration(configuration, scope) }!!
                 debug("main scope launched, about to flow, test channel ${if (testChannel.isEmpty) "" else "not "}empty ")
                 filter(flow).collect { value ->
                     debug("in flow received [$value], test channel ${if (testChannel.isEmpty) "" else "not "}empty \"")

From c141dc35a2c0bf7d8299bb2e3ec9b0dc0344783a Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 23 Jan 2023 17:15:36 +0100
Subject: [PATCH 117/227] Introduce checked exceptions for navigation

---
 .../kotlin/navigation/Navigator.kt            | 68 +++++++++----------
 .../commonMain/kotlin/navigation/Navigator.kt | 28 ++++++++
 .../iosMain/kotlin/navigation/Navigator.kt    |  4 +-
 3 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index 92dc8bbd5..2fdd0933c 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.architecture.navigation
 
+import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.net.Uri
@@ -32,6 +33,9 @@ actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribableMarke
     actual fun navigate(action: A)
 }
 
+object MissingLifecycleManagerNavigationException : NavigationException("LifecycleManager not attached")
+object MissingActivityNavigationException : NavigationException("LifecycleManager does not have an activity")
+
 /**
  * Implementation of [Navigator]. Takes a mapper function to map all [NavigationAction] to a [NavigationSpec]
  * Whenever [navigate] is called, this class maps it to a [NavigationSpec] and performs navigation according to that
@@ -70,8 +74,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
         activitySpec: NavigationSpec.Activity<*>,
         bundle: NavigationBundle<*>?
     ) {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return
+        val activity = getActivity()
         val intent = Intent(activity, activitySpec.activityClass).apply {
             bundle?.let {
                 putExtras(it.toBundle())
@@ -88,8 +91,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun closeActivity(closeSpec: NavigationSpec.Close, bundle: NavigationBundle<*>?) {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return
+        val activity = getActivity()
         closeSpec.result?.let { resultCode ->
             val data = Intent().apply {
                 bundle?.let {
@@ -102,8 +104,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToFragment(fragmentSpec: NavigationSpec.Fragment, bundle: NavigationBundle<*>?) {
-        assert(manager != null)
-        val fragmentManager = fragmentSpec.getFragmentManager(manager!!)
+        val manager = manager ?: throw MissingLifecycleManagerNavigationException
+        val fragmentManager = fragmentSpec.getFragmentManager(manager)
         val transaction = fragmentManager.beginTransaction().let {
             when (val backtrackSettings = fragmentSpec.backStackSettings) {
                 is NavigationSpec.Fragment.BackStackSettings.Add -> it.addToBackStack(
@@ -142,8 +144,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun removeFragment(removeFragmentSpec: NavigationSpec.RemoveFragment, bundle: NavigationBundle<*>?) {
-        assert(manager != null)
-        val fragmentManager = removeFragmentSpec.getFragmentManager(manager!!).apply {
+        val manager = manager ?: throw MissingLifecycleManagerNavigationException
+        val fragmentManager = removeFragmentSpec.getFragmentManager(manager).apply {
             removeFragmentSpec.fragmentRequestKey?.let {
                 if (bundle != null)
                     setFragmentResult(it, bundle.toBundle())
@@ -157,8 +159,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun popFragment(popFragmentSpec: NavigationSpec.PopFragment, bundle: NavigationBundle<*>?) {
-        assert(manager != null)
-        val fragmentManager = popFragmentSpec.getFragmentManager(manager!!).apply {
+        val manager = manager ?: throw MissingLifecycleManagerNavigationException
+        val fragmentManager = popFragmentSpec.getFragmentManager(manager).apply {
             popFragmentSpec.fragmentRequestKey?.let {
                 if (bundle != null)
                     setFragmentResult(it, bundle.toBundle())
@@ -172,8 +174,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun popFragmentTo(popToFragmentSpec: NavigationSpec.PopFragmentTo, bundle: NavigationBundle<*>?) {
-        assert(manager != null)
-        val fragmentManager = popToFragmentSpec.getFragmentManager(manager!!).apply {
+        val manager = manager ?: throw MissingLifecycleManagerNavigationException
+        val fragmentManager = popToFragmentSpec.getFragmentManager(manager).apply {
             popToFragmentSpec.fragmentRequestKey?.let {
                 if (bundle != null)
                     setFragmentResult(it, bundle.toBundle())
@@ -188,8 +190,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToDialog(dialogSpec: NavigationSpec.Dialog, bundle: NavigationBundle<*>?) {
-        assert(manager != null)
-        val fragmentManager = dialogSpec.getFragmentManager(manager!!)
+        val manager = manager ?: throw MissingLifecycleManagerNavigationException
+        val fragmentManager = dialogSpec.getFragmentManager(manager)
         dialogSpec.createDialog().apply {
             arguments = bundle?.toBundle()
             show(fragmentManager, dialogSpec.tag)
@@ -197,8 +199,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun dismissDialog(spec: NavigationSpec.DismissDialog, bundle: NavigationBundle<*>?) {
-        assert(manager != null)
-        val fragmentManager = spec.getFragmentManager(manager!!).apply {
+        val manager = manager ?: throw MissingLifecycleManagerNavigationException
+        val fragmentManager = spec.getFragmentManager(manager).apply {
             spec.fragmentRequestKey?.let {
                 if (bundle != null)
                     setFragmentResult(it, bundle.toBundle())
@@ -209,8 +211,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToCamera(cameraSpec: NavigationSpec.Camera) {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return
+        val activity = getActivity()
         val intent = when (cameraSpec.type) {
             is NavigationSpec.Camera.Type.Image -> Intent(MediaStore.ACTION_IMAGE_CAPTURE)
             is NavigationSpec.Camera.Type.Video -> Intent(MediaStore.ACTION_VIDEO_CAPTURE)
@@ -226,8 +227,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToEmail(emailSpec: NavigationSpec.Email) {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return
+        val activity = getActivity()
         val intent = emailSpec.emailSettings.intent
 
         intent.resolveActivity(activity.packageManager)?.let {
@@ -236,8 +236,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToFileSelector(fileSelectorSpec: NavigationSpec.FileSelector) {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return
+        val activity = getActivity()
         val settings = fileSelectorSpec.fileSelectorSettings
         val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
             type = settings.type
@@ -251,8 +250,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToPhone(phoneSpec: NavigationSpec.Phone) {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return
+        val activity = getActivity()
 
         val intent = when (phoneSpec.type) {
             is NavigationSpec.Phone.Type.Dial -> Intent(Intent.ACTION_DIAL)
@@ -267,8 +265,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToSettings(settingsSpec: NavigationSpec.Settings) {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return
+        val activity = getActivity()
         val intent = settingsSpec.type.intent(activity)
 
         intent.resolveActivity(activity.packageManager)?.let {
@@ -277,8 +274,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToMessenger(messengerSpec: NavigationSpec.TextMessenger) {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return
+        val activity = getActivity()
         val intent = messengerSpec.settings.intent
 
         intent.resolveActivity(activity.packageManager)?.let {
@@ -287,8 +283,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToBrowser(browserSpec: NavigationSpec.Browser) {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return
+        val activity = getActivity()
 
         when (browserSpec.viewType) {
             NavigationSpec.Browser.Type.CustomTab -> {
@@ -329,8 +324,7 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToThirdPartyApp(packageName: String): Boolean {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return false
+        val activity = getActivity()
 
         val intent = activity.packageManager.getLaunchIntentForPackage(packageName) ?: return false
         return try {
@@ -363,9 +357,15 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     }
 
     private fun navigateToIntent(intentSpec: NavigationSpec.CustomIntent) {
-        assert(manager?.activity != null)
-        val activity = manager?.activity ?: return
+        val activity = getActivity()
 
         activity.startActivity(intentSpec.intent)
     }
+
+    private fun getActivity(): Activity {
+        return when (val manager = manager) {
+            null -> throw MissingLifecycleManagerNavigationException
+            else -> manager.activity ?: throw MissingActivityNavigationException
+        }
+    }
 }
diff --git a/architecture/src/commonMain/kotlin/navigation/Navigator.kt b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
index a9dcf75df..510987387 100644
--- a/architecture/src/commonMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
@@ -37,6 +37,11 @@ open class SingleValueNavigationAction<T>(
     }
 )
 
+/**
+ * Exception thrown by a [Navigator]
+ */
+open class NavigationException(message: String?) : RuntimeException(message)
+
 /**
  * Class that can trigger a given [NavigationAction]
  */
@@ -44,6 +49,29 @@ expect interface Navigator<A : NavigationAction<*>> {
     /**
      * Triggers a given [NavigationAction]
      * @param action The [NavigationAction] to trigger
+     * @throws [NavigationException] if navigation fails.
      */
     fun navigate(action: A)
 }
+
+/**
+ * Triggers a given [NavigationAction] and returns `true` if it succeeded.
+ * @param action The [NavigationAction] to trigger.
+ * @return `true` if the navigation succeeded, false otherwise
+ */
+fun <A : NavigationAction<*>> Navigator<A>.navigateWithSuccess(action: A): Boolean = try {
+    navigate(action)
+    true
+} catch (e: NavigationException) {
+    false
+}
+
+/**
+ * Triggers a given [NavigationAction] or executes a closure if the navigation failed to complete
+ * @param action The [NavigationAction] to trigger.
+ * @param onFailure Closure for handling case when navigation failed.
+ */
+fun <A : NavigationAction<*>> Navigator<A>.navigateOrElse(action: A, onFailure: () -> Unit) {
+    if (!navigateWithSuccess(action))
+        onFailure()
+}
diff --git a/architecture/src/iosMain/kotlin/navigation/Navigator.kt b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
index 9ca23f122..f23c09333 100644
--- a/architecture/src/iosMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
@@ -69,6 +69,8 @@ class DefaultNavigator<A : NavigationAction<*>>(val onAction: (A) -> Unit) : Nav
     }
 }
 
+object MissingViewControllerNavigationException : NavigationException("Missing Parent ViewController")
+
 /**
  * Implementation of [Navigator] used for navigating to and from [UIViewController]. Takes a mapper function to map all [NavigationAction] to a [NavigationSpec]
  * Whenever [navigate] is called, this class maps it to a [NavigationSpec] and performs navigation according to that
@@ -364,7 +366,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
         }
     }
 
-    private fun assertParent() = parent.get().also { assert(it != null) }
+    private fun assertParent() = parent.get() ?: throw MissingViewControllerNavigationException
 }
 
 // Seems to be a bug on commonizer using new targets sourcesets which is preventing to infer the correct type

From 6cdb16965a0e0d76e8d715094d2566597eba85bc Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 10:45:30 +0100
Subject: [PATCH 118/227] Api dump

---
 architecture/api/androidLib/architecture.api | 17 +++++++++++++++++
 architecture/api/jvm/architecture.api        |  9 +++++++++
 2 files changed, 26 insertions(+)

diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index d9ec117cd..fb4bcc46f 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -239,6 +239,14 @@ public final class com/splendo/kaluga/architecture/navigation/IntentFlagKt {
 	public static final fun toFlags (Ljava/util/Set;)I
 }
 
+public final class com/splendo/kaluga/architecture/navigation/MissingActivityNavigationException : com/splendo/kaluga/architecture/navigation/NavigationException {
+	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/MissingActivityNavigationException;
+}
+
+public final class com/splendo/kaluga/architecture/navigation/MissingLifecycleManagerNavigationException : com/splendo/kaluga/architecture/navigation/NavigationException {
+	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/MissingLifecycleManagerNavigationException;
+}
+
 public class com/splendo/kaluga/architecture/navigation/NavigationAction {
 	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)V
 	public final fun getBundle ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;
@@ -726,6 +734,10 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun getValue ()Lkotlin/Unit;
 }
 
+public class com/splendo/kaluga/architecture/navigation/NavigationException : java/lang/RuntimeException {
+	public fun <init> (Ljava/lang/String;)V
+}
+
 public abstract class com/splendo/kaluga/architecture/navigation/NavigationSpec {
 	public static final field Companion Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$Companion;
 }
@@ -1277,6 +1289,11 @@ public abstract interface class com/splendo/kaluga/architecture/navigation/Navig
 	public abstract fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
 }
 
+public final class com/splendo/kaluga/architecture/navigation/NavigatorKt {
+	public static final fun navigateOrElse (Lcom/splendo/kaluga/architecture/navigation/Navigator;Lcom/splendo/kaluga/architecture/navigation/NavigationAction;Lkotlin/jvm/functions/Function0;)V
+	public static final fun navigateWithSuccess (Lcom/splendo/kaluga/architecture/navigation/Navigator;Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)Z
+}
+
 public class com/splendo/kaluga/architecture/navigation/SingleValueNavigationAction : com/splendo/kaluga/architecture/navigation/NavigationAction {
 	public fun <init> (Ljava/lang/Object;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)V
 	public final fun getType ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;
diff --git a/architecture/api/jvm/architecture.api b/architecture/api/jvm/architecture.api
index d7ec3bd29..4e9a84f09 100644
--- a/architecture/api/jvm/architecture.api
+++ b/architecture/api/jvm/architecture.api
@@ -482,10 +482,19 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun getValue ()Lkotlin/Unit;
 }
 
+public class com/splendo/kaluga/architecture/navigation/NavigationException : java/lang/RuntimeException {
+	public fun <init> (Ljava/lang/String;)V
+}
+
 public abstract interface class com/splendo/kaluga/architecture/navigation/Navigator {
 	public abstract fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
 }
 
+public final class com/splendo/kaluga/architecture/navigation/NavigatorKt {
+	public static final fun navigateOrElse (Lcom/splendo/kaluga/architecture/navigation/Navigator;Lcom/splendo/kaluga/architecture/navigation/NavigationAction;Lkotlin/jvm/functions/Function0;)V
+	public static final fun navigateWithSuccess (Lcom/splendo/kaluga/architecture/navigation/Navigator;Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)Z
+}
+
 public class com/splendo/kaluga/architecture/navigation/SingleValueNavigationAction : com/splendo/kaluga/architecture/navigation/NavigationAction {
 	public fun <init> (Ljava/lang/Object;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)V
 	public final fun getType ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;

From 15615d7c562315f858826dd3557d8cedb1a5d2dd Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 14:21:59 +0100
Subject: [PATCH 119/227] Cleanup

---
 .../iosMain/kotlin/navigation/Navigator.kt    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/architecture/src/iosMain/kotlin/navigation/Navigator.kt b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
index f23c09333..2afa26378 100644
--- a/architecture/src/iosMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
@@ -119,7 +119,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
     }
 
     private fun pushViewController(pushSpec: NavigationSpec.Push) {
-        val parent = assertParent() ?: return
+        val parent = assertParent()
         assert(parent.navigationController != null)
         CATransaction.begin()
         CATransaction.setCompletionBlock {
@@ -130,7 +130,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
     }
 
     private fun popViewController(popSpec: NavigationSpec.Pop) {
-        val parent = assertParent() ?: return
+        val parent = assertParent()
         assert(parent.navigationController != null)
         CATransaction.begin()
         CATransaction.setCompletionBlock {
@@ -146,18 +146,18 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
         val toPresent = presentSpec.present()
         toPresent.modalPresentationStyle = presentSpec.presentationStyle
         toPresent.modalTransitionStyle = presentSpec.transitionStyle
-        assertParent()?.presentViewController(toPresent, presentSpec.animated) { presentSpec.completion?.invoke() }
+        assertParent().presentViewController(toPresent, presentSpec.animated) { presentSpec.completion?.invoke() }
     }
 
     private fun dismissViewController(dismissSpec: NavigationSpec.Dismiss) {
-        val parent = assertParent() ?: return
+        val parent = assertParent()
         val toDismiss = dismissSpec.toDismiss(parent)
         toDismiss.dismissViewControllerAnimated(dismissSpec.animated) { dismissSpec.completion?.invoke() }
     }
 
     private fun showViewController(showSpec: NavigationSpec.Show) {
         val toShow = showSpec.show()
-        val parent = assertParent() ?: return
+        val parent = assertParent()
         if (showSpec.detail) {
             parent.showDetailViewController(toShow, parent)
         } else {
@@ -166,11 +166,11 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
     }
 
     private fun segueToViewController(segueSpec: NavigationSpec.Segue, bundle: NavigationBundle<*>?) {
-        assertParent()?.performSegueWithIdentifier(segueSpec.identifier, bundle)
+        assertParent().performSegueWithIdentifier(segueSpec.identifier, bundle)
     }
 
     private fun embedNestedViewController(nestedSpec: NavigationSpec.Nested) {
-        val parent = assertParent() ?: return
+        val parent = assertParent()
         val type = nestedSpec.type
         if (type is NavigationSpec.Nested.Type.Replace) {
             parent.childViewControllers.map { it as UIViewController }.filter { it.view.tag.toLong() == type.tag }.forEach {
@@ -213,7 +213,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
         pickerVC.sourceType = imagePickerSpec.sourceType
         pickerVC.mediaTypes = mediaTypes
         pickerVC.delegate = imagePickerSpec.delegate
-        assertParent()?.presentViewController(pickerVC, imagePickerSpec.animated) { imagePickerSpec.completion?.invoke() }
+        assertParent().presentViewController(pickerVC, imagePickerSpec.animated) { imagePickerSpec.completion?.invoke() }
     }
 
     private fun presentMailComposer(mailSpec: NavigationSpec.Email) {
@@ -238,7 +238,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
             composeVC.addAttachmentData(it.data, it.mimeType, it.fileName)
         }
 
-        assertParent()?.presentViewController(composeVC, mailSpec.animated) { mailSpec.completion?.invoke() }
+        assertParent().presentViewController(composeVC, mailSpec.animated) { mailSpec.completion?.invoke() }
     }
 
     private fun presentDocumentBrowser(browserSpec: NavigationSpec.DocumentSelector) {
@@ -258,7 +258,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
 
         browserVc.delegate = browserSpec.delegate
 
-        assertParent()?.presentViewController(browserVc, browserSpec.animated) { browserSpec.completion?.invoke() }
+        assertParent().presentViewController(browserVc, browserSpec.animated) { browserSpec.completion?.invoke() }
     }
 
     private fun presentMessageComposer(messageSpec: NavigationSpec.Message) {
@@ -287,7 +287,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
             }
         }
 
-        assertParent()?.presentViewController(composeVC, messageSpec.animated) { messageSpec.completion?.invoke() }
+        assertParent().presentViewController(composeVC, messageSpec.animated) { messageSpec.completion?.invoke() }
     }
 
     private fun openDialer(phoneSpec: NavigationSpec.Phone) {
@@ -305,7 +305,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
             }
             is NavigationSpec.Browser.Type.SafariView -> {
                 val safariVc = SFSafariViewController(browserSpec.url)
-                assertParent()?.presentViewController(safariVc, spec.animated) {
+                assertParent().presentViewController(safariVc, spec.animated) {
                     spec.completion?.invoke()
                 }
             }
@@ -337,7 +337,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
     }
 
     private fun openAppStore(storeInfo: NavigationSpec.ThirdParty.StoreInfo) {
-        val parent = assertParent() ?: return
+        val parent = assertParent()
         val parameters = mutableMapOf<Any?, Any>(SKStoreProductParameterITunesItemIdentifier to NSNumber.numberWithInt(storeInfo.appId))
         storeInfo.productId?.let {
             parameters[SKStoreProductParameterProductIdentifier] = it

From 5cedf24981bfec12849915502ac28da090b08bd1 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 14:19:07 +0100
Subject: [PATCH 120/227] Changed LifecycleSubscribableMarker setup

Removed reflection in favour of explicit binding
---
 README.md                                     |  6 +-
 alerts/README.md                              |  2 +-
 .../kotlin/AlertsViewModel.kt                 |  4 ++
 architecture-compose/README.md                |  4 +-
 .../ComposableLifecycleSubscribable.kt        | 24 +++----
 .../compose/viewModel/ViewModelComposable.kt  | 43 ++++--------
 architecture/README.md                        | 19 ++----
 architecture/build.gradle.kts                 |  1 -
 .../KalugaViewModelLifecycleObserver.kt       | 67 +++++++++++++------
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  3 +-
 .../lifecycle/LifecycleSubscribableMarker.kt  |  3 -
 .../commonMain/kotlin/navigation/Navigator.kt |  4 +-
 .../kotlin/viewmodel/LifecycleViewModel.kt    | 38 +++++++++--
 .../iosMain/kotlin/navigation/Navigator.kt    |  3 +-
 .../src/jsMain/kotlin/navigation/Navigator.kt |  4 +-
 .../jvmMain/kotlin/navigation/Navigator.kt    |  4 +-
 base/src/jvmMain/kotlin/utils/Decimal.kt      |  5 +-
 bluetooth/README.md                           |  2 +-
 date-time-picker/README.md                    |  2 +-
 .../kotlin/DateTimePickerViewModel.kt         |  4 ++
 .../ios/Demo/Links/LinksViewController.swift  |  2 +-
 .../shared/viewmodel/alert/AlertViewModel.kt  |  2 +-
 .../datetimepicker/DateTimePickerViewModel.kt |  2 +-
 .../shared/viewmodel/hud/HudViewModel.kt      |  2 +-
 .../shared/viewmodel/info/InfoViewModel.kt    |  4 +-
 .../viewmodel/keyboard/KeyboardViewModel.kt   |  2 +-
 .../shared/viewmodel/link/LinksViewModel.kt   |  8 +--
 .../viewmodel/resources/ButtonViewModel.kt    |  6 +-
 .../viewmodel/resources/ColorViewModel.kt     |  5 +-
 .../scientific/ScientificViewModel.kt         |  4 +-
 hud/README.md                                 |  2 +-
 .../kotlin/HudViewModel.kt                    |  4 ++
 keyboard/README.md                            |  4 +-
 review/README.md                              | 10 ++-
 .../kotlin/MockAlertPresenterTest.kt          |  2 +-
 test-utils-architecture/README.md             |  2 +-
 .../androidLibMain/kotlin/test/BaseTest.kt    |  1 -
 .../src/commonTest/kotlin/MockHUDTest.kt      |  2 +-
 .../kotlin/MockKeyboardManagerTest.kt         |  2 +-
 39 files changed, 170 insertions(+), 138 deletions(-)

diff --git a/README.md b/README.md
index 0963eaa24..01f995725 100644
--- a/README.md
+++ b/README.md
@@ -53,10 +53,8 @@ However kaluga's [architecture module](architecture/) offers a cross-platform [`
 
 ```kotlin
 // this can just be in the commonMain source
-class HudViewModel: BaseViewModel() {
-
-    val hudBuilder = HUD.Builder()
-
+class HudViewModel(private val hudBuilder: HUD.Builder): BaseLifecycleViewModel(hudBuilder) {
+    
     suspend fun doWork() = 
         hudBuilder.presentDuring {
             delay(1000)
diff --git a/alerts/README.md b/alerts/README.md
index 301cf8e27..72018ffad 100644
--- a/alerts/README.md
+++ b/alerts/README.md
@@ -104,7 +104,7 @@ The `AlertPresenter.Builder` object should be created from the platform side.
   
 ### Android  
 On Android the builder is a `LifecycleSubscribable` (see Architecture) that needs a `LifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the alert.
-For `BaseLifecycleViewModel`, the builder should be made **publicly** visible and bound to a `KalugaViewModelLifecycleObserver`.
+For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
   
 ```kotlin  
 class AlertViewModel: LifecycleViewModel() {  
diff --git a/alerts/src/androidLibInstrumentedTest/kotlin/AlertsViewModel.kt b/alerts/src/androidLibInstrumentedTest/kotlin/AlertsViewModel.kt
index bc82afe34..d8d6301dd 100644
--- a/alerts/src/androidLibInstrumentedTest/kotlin/AlertsViewModel.kt
+++ b/alerts/src/androidLibInstrumentedTest/kotlin/AlertsViewModel.kt
@@ -21,4 +21,8 @@ import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 
 class AlertsViewModel : BaseLifecycleViewModel() {
     val alertBuilder = AlertPresenter.Builder()
+
+    init {
+        addLifecycleSubscribables(alertBuilder)
+    }
 }
diff --git a/architecture-compose/README.md b/architecture-compose/README.md
index 1a86c1f00..8e7996921 100644
--- a/architecture-compose/README.md
+++ b/architecture-compose/README.md
@@ -22,7 +22,7 @@ Compose architecture can be easily used by any Composable function.
 To do so, simply create a `BaseLifecycleViewModel`, preferably using a composable method that retains the viewModel on configuration changes such as [`androidx.lifecycle.viewmodel.compose.viewModel()`](https://developer.android.com/reference/kotlin/androidx/lifecycle/viewmodel/compose/package-summary#viewModel(androidx.lifecycle.ViewModelStoreOwner,kotlin.String,androidx.lifecycle.ViewModelProvider.Factory,androidx.lifecycle.viewmodel.CreationExtras)) or [`org.koin.androidx.compose.koinViewModel`](https://insert-koin.io/docs/reference/koin-android/compose#viewmodel-for-composable)
 Then wrap the ViewModel using the `ViewModelComposable` wrapping function.
 
-`ViewModelComposable` will automatically bind to all `LifecycleSubscribables` publicly exposed by the ViewModel using the activity that hosts the Composable.
+`ViewModelComposable` will automatically bind to all `LifecycleSubscribables` exposed by `BaseLifecycleViewModel.activeLifecycleSubscribables` using the activity that hosts the Composable.
 `FragmentViewModelComposable` can be called instead to provide an additional `FragmentManager` to bind to.
 
 A `KalugaViewModelComposeActivity` can be declared to automatically create a `BaseLifecycleViewModel` and wrap it in `ViewModelComposable` as the Content of the activity.
@@ -30,7 +30,7 @@ A `KalugaViewModelComposeActivity` can be declared to automatically create a `Ba
 ### ComposableLifecycleSubscribable
 This Kaluga library adds a new `LifecycleSubscribableMarker`: `ComposableLifecycleSubscribable`.
 The `ComposableLifecycleSubscribable` provides a modifying function to wrap around a composable view.
-`ViewModelComposable` will automatically modify its content with all `ComposableLifecycleSubscribable` publicly exposed by the provided `BaseLifecycleViewModel`.
+`ViewModelComposable` will automatically modify its content with all `ComposableLifecycleSubscribable` exposed by `BaseLifecycleViewModel.activeLifecycleSubscribables`.
 
 ### Navigation
 Navigation in Compose is quite different from regular Android navigation. Therefore `com.splendo.kaluga.architecture.navigation.ActivityNavigator` is not recommended as a `Navigator`.
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
index 40f0d8404..d230ba622 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
@@ -18,25 +18,21 @@
 package com.splendo.kaluga.architecture.compose.lifecycle
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.remember
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import kotlin.reflect.KMutableProperty1
-import kotlin.reflect.KProperty1
-import kotlin.reflect.KVisibility
-import kotlin.reflect.full.isSubtypeOf
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.full.starProjectedType
+import kotlinx.coroutines.flow.map
+import kotlin.coroutines.EmptyCoroutineContext
 
 interface ComposableLifecycleSubscribable : LifecycleSubscribableMarker {
     val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit
 }
 
-@Suppress("UNCHECKED_CAST")
-internal val <VM : BaseLifecycleViewModel> VM.ComposableLifecycleSubscribable: List<ComposableLifecycleSubscribable> get() = this::class.memberProperties
-    .filter { it !is KMutableProperty1 }
-    .mapNotNull { it as? KProperty1<VM, Any?> }
-    .filter {
-        it.getter.visibility == KVisibility.PUBLIC &&
-            it.getter.returnType.isSubtypeOf(LifecycleSubscribableMarker::class.starProjectedType)
+@Composable
+internal fun <VM : BaseLifecycleViewModel> VM.ComposableLifecycleSubscribable(): State<List<ComposableLifecycleSubscribable>> = remember {
+    activeLifecycleSubscribables.map { list ->
+        list.mapNotNull { it as? ComposableLifecycleSubscribable }
     }
-    .mapNotNull { it.getter(this) as? ComposableLifecycleSubscribable }
+}.collectAsState(emptyList(), EmptyCoroutineContext)
\ No newline at end of file
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index 976249644..c0b128de8 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -16,18 +16,11 @@ import androidx.lifecycle.ViewModelStoreOwner
 import com.splendo.kaluga.architecture.compose.activity
 import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
-import com.splendo.kaluga.architecture.lifecycle.subscribe
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
-import kotlin.reflect.KMutableProperty1
-import kotlin.reflect.KProperty1
-import kotlin.reflect.KVisibility
-import kotlin.reflect.full.isSubtypeOf
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.full.starProjectedType
+import com.splendo.kaluga.architecture.viewmodel.LifecycleSubscribableManager
 
 /**
- * Composable which manages [viewModel] lifecycle and binds to all its publically exposed [LifecycleSubscribable].
+ * Composable which manages [viewModel] lifecycle and binds to all its [BaseLifecycleViewModel.activeLifecycleSubscribables].
  * This automatically modifies the content using [ComposableLifecycleSubscribable.modifier].
  * @param viewModel [BaseLifecycleViewModel] to manage
  * @param content content based on [viewModel]
@@ -46,7 +39,7 @@ fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
  * Composable which manages [viewModel] lifecycle and binds to all its [LifecycleSubscribable] using [fragmentManager].
  * This automatically modifies the content using [ComposableLifecycleSubscribable.modifier].
  * @param viewModel [BaseLifecycleViewModel] to manage
- * @param fragmentManager The [FragmentManager] to bind to all [LifecycleSubscribable] publically exposed by the [viewModel].
+ * @param fragmentManager The [FragmentManager] to bind to all [LifecycleSubscribable] in [BaseLifecycleViewModel.activeLifecycleSubscribables].
  * @param content content based on [viewModel]
  */
 @Composable
@@ -67,17 +60,15 @@ private fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
     viewModel.linkLifecycle(activity, fragmentManager)
 
     // Get a List of all ComposableLifecycleSubscribable of the viewModel.
-    // Since these are static properties, a remember can be used.
-    val composeLifecycleSubscribables = remember(viewModel) {
-        viewModel.ComposableLifecycleSubscribable
-    }
+    val composeLifecycleSubscribables = viewModel.ComposableLifecycleSubscribable()
+
     // If no ComposableLifecycleSubscribable available, just show content
-    if (composeLifecycleSubscribables.isEmpty()) {
+    if (composeLifecycleSubscribables.value.isEmpty()) {
         content?.invoke(viewModel)
     } else {
         // Otherwise, modify the content using the modifier of all ComposableLifecycleSubscribable
         // Reduce right so the first ComposableLifecycleSubscribable acts as the first modifier (since we're wrapping)
-        val modifier = composeLifecycleSubscribables.reduceRight { new, acc ->
+        val modifier = composeLifecycleSubscribables.value.reduceRight { new, acc ->
             object : ComposableLifecycleSubscribable {
                 override val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = { modifiedContent ->
                     new.modifier(this) { acc.modifier(this, modifiedContent) }
@@ -182,23 +173,13 @@ private fun <VM : BaseLifecycleViewModel> VM.linkLifecycle(activity: AppCompatAc
     return this
 }
 
-private class VmObserver<VM : BaseLifecycleViewModel>(private val viewModel: VM, private val activity: AppCompatActivity?, private val fragmentManager: FragmentManager) : DefaultLifecycleObserver {
-    private var resumed = false
+private class VmObserver<VM : BaseLifecycleViewModel>(private val viewModel: VM, activity: AppCompatActivity?, fragmentManager: FragmentManager) : DefaultLifecycleObserver {
 
-    private val lifecycleSubscribables: List<LifecycleSubscribable> by lazy {
-        @Suppress("UNCHECKED_CAST")
-        viewModel::class.memberProperties
-            .filter { it !is KMutableProperty1 }
-            .mapNotNull { it as? KProperty1<VM, Any?> }
-            .filter {
-                it.getter.visibility == KVisibility.PUBLIC &&
-                    it.getter.returnType.isSubtypeOf(LifecycleSubscribableMarker::class.starProjectedType)
-            }
-            .mapNotNull { it.getter(viewModel) as? LifecycleSubscribable }
-    }
+    private val manager = LifecycleSubscribableManager(viewModel, activity, fragmentManager)
+    private var resumed = false
 
     override fun onCreate(owner: LifecycleOwner) {
-        lifecycleSubscribables.forEach { it.subscribe(activity, owner, fragmentManager) }
+        manager.onCreate(owner)
     }
 
     override fun onResume(owner: LifecycleOwner) {
@@ -212,6 +193,6 @@ private class VmObserver<VM : BaseLifecycleViewModel>(private val viewModel: VM,
         if (resumed) {
             viewModel.didPause()
         }
-        lifecycleSubscribables.forEach { it.unsubscribe() }
+        manager.onDestroy()
     }
 }
diff --git a/architecture/README.md b/architecture/README.md
index b8a91c0f9..420183a12 100644
--- a/architecture/README.md
+++ b/architecture/README.md
@@ -17,12 +17,12 @@ dependencies {
 ```
 
 ## ViewModels
-ViewModels can be created by subclassing the `BaseViewModel` class. The viewModel runs within its own coroutine scope that exists for the entire lifetime of the viewModel.
+ViewModels can be created by subclassing the `BaseLifecycleViewModel` class. The viewModel runs within its own coroutine scope that exists for the entire lifetime of the viewModel.
 In addition viewModels have their own lifecycle, allowing them to the paused and resumed by the view. When the viewModel is resumed a `CoroutineScope` with a lifecycle limited to the resumed state is provided.
 Launch any coroutines within this scope to automatically cancel when the viewModel is paused.
 
 ```kotlin
-class SomeViewModel : BaseViewModel() {
+class SomeViewModel : BaseLifecycleViewModel() {
 
     init {
         coroutineScope.launch {
@@ -64,7 +64,7 @@ class SomeActivity : KalugaViewModelActivity<SomeViewModel> {
 }
 ```
 
-The `KalugaViewModelLifecycleObserver` will automatically update the `LifecycleSubscribable.LifecycleManager` context of all **public** `LifecycleSubscribable` properties of the viewModel.
+The `KalugaViewModelLifecycleObserver` will automatically update the `LifecycleSubscribable.LifecycleManager` context of all `LifecycleSubscribable` added to `BaseLifecycleViewModel.activeLifecycleSubscribables` of the viewModel.
 Implement this interface if a viewModel has properties that should be lifecycle or context aware.
 It can be delegated using `LifecycleSubscriber`.
 The `LifecycleManagerObserver` is a default implementation of `LifecycleSubscribable` that provides updates to the context as a `Flow`.
@@ -279,15 +279,6 @@ class SomeViewController : UIViewController {
     }
 ```
 
-#### Kotlin/Native freezing and memory management
-
-By default observables do not freeze themselves or their values. The internally stored value for the current observation is held in a regular `var`, and it is mutated only from the supplied `CoroutineContext` (`Dispatchers.Main.immidiate` by default).
-Once access is done from another thread than that of the context this `var` gets frozen (due to the context switch), and future updates frozen and stored in an `AtomicReference`. This mean the value in memory at the time of freezing will be held in memory with the Observable.
-
-In practise, when operating in a ViewModel this should suffice. A caveat is that when the `stateFlow` field of an observable is used (which internally is lazily initialized) it will also hold the value and `StateFlow`s always freeze their values regardless of thread access.
-
-Subjects which require a `CoroutineScope` to be created usually `bind` the StateFlow automatically (which will cause it to be initialized, freezing values). This behaviour can be turned off with the `autoBind` paramater. 
-
 ## Navigation
 Navigation is available through a specialized `NavigatingViewModel`.
 This viewModel takes a `Navigator` interface that responds to a given `NavigationAction`.
@@ -322,7 +313,7 @@ val viewModel = SomeNavigatingViewModel(
     ActivityNavigator { action ->
         when (action) {
             is ActionA -> NavigationSpec.Activity(SomeActivity::class.java)
-            is ActionB -> NavigationSpec.Fragment(R.id.some_fragment_container, createFragment = {SomeFragment()})
+            is ActionB -> NavigationSpec.Fragment(R.id.some_fragment_container, createFragment = { SomeFragment() })
         }   
     })
 
@@ -331,7 +322,7 @@ val viewModel = SomeNavigatingViewModel(
     ViewControllerNavigator(viewController) { action ->
         when (action) {
             is ActionA -> NavigationSpec.Present(present = { someViewController() })
-            is ActionB -> NavigationSpec.Nested(containerView = containerView, nested = {someNestedViewController()})
+            is ActionB -> NavigationSpec.Nested(containerView = containerView, nested = { someNestedViewController() })
         }
     }
 )
diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts
index 13f728e7c..17d06d19d 100644
--- a/architecture/build.gradle.kts
+++ b/architecture/build.gradle.kts
@@ -11,7 +11,6 @@ plugins {
 publishableComponent()
 
 dependencies {
-    api("org.jetbrains.kotlin:kotlin-reflect:${Library.kotlinVersion}")
     apiDependency(Dependencies.AndroidX.Lifecycle.Runtime)
     apiDependency(Dependencies.AndroidX.Lifecycle.ViewModel)
     apiDependency(Dependencies.AndroidX.Lifecycle.LiveData)
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
index b250df5a5..c9701755c 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
@@ -22,15 +22,11 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.coroutineScope
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import com.splendo.kaluga.architecture.lifecycle.subscribe
-import kotlin.reflect.KMutableProperty1
-import kotlin.reflect.KProperty1
-import kotlin.reflect.KVisibility
-import kotlin.reflect.full.isSubtypeOf
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.full.starProjectedType
+import kotlinx.coroutines.flow.runningFold
 
 /**
  * [LifecycleObserver] used to manage the lifecycle of a [BaseLifecycleViewModel]
@@ -41,29 +37,18 @@ import kotlin.reflect.full.starProjectedType
 class KalugaViewModelLifecycleObserver<VM : BaseLifecycleViewModel> internal constructor(
     private val viewModel: VM,
     private val activity: Activity?,
-    private val lifecycleOwner: LifecycleOwner,
     private val fragmentManager: FragmentManager,
-    private val childFragmentManager: FragmentManager? = null
+    childFragmentManager: FragmentManager? = null
 ) : DefaultLifecycleObserver {
 
-    private val lifecycleSubscribables: List<LifecycleSubscribable> by lazy {
-        @Suppress("UNCHECKED_CAST")
-        viewModel::class.memberProperties
-            .filter { it !is KMutableProperty1 }
-            .mapNotNull { it as? KProperty1<VM, Any?> }
-            .filter {
-                it.getter.visibility == KVisibility.PUBLIC &&
-                    it.getter.returnType.isSubtypeOf(LifecycleSubscribableMarker::class.starProjectedType)
-            }
-            .mapNotNull { it.getter(viewModel) as? LifecycleSubscribable }
-    }
+    private val manager = LifecycleSubscribableManager(viewModel, activity, fragmentManager, childFragmentManager)
 
     override fun onCreate(owner: LifecycleOwner) {
-        lifecycleSubscribables.forEach { it.subscribe(activity, lifecycleOwner, fragmentManager, childFragmentManager) }
+        manager.onCreate(owner)
     }
 
     override fun onDestroy(owner: LifecycleOwner) {
-        lifecycleSubscribables.forEach { it.unsubscribe() }
+        manager.onDestroy()
     }
 
     override fun onResume(owner: LifecycleOwner) {
@@ -74,3 +59,43 @@ class KalugaViewModelLifecycleObserver<VM : BaseLifecycleViewModel> internal con
         viewModel.didPause()
     }
 }
+
+class LifecycleSubscribableManager<VM : BaseLifecycleViewModel>(
+    private val viewModel: VM,
+    private val activity: Activity?,
+    private val fragmentManager: FragmentManager,
+    private val childFragmentManager: FragmentManager? = null
+) {
+    fun onCreate(owner: LifecycleOwner) {
+        owner.lifecycle.coroutineScope.launchWhenCreated {
+            viewModel.activeLifecycleSubscribables.runningFold(emptySet<LifecycleSubscribableMarker>() to emptySet<LifecycleSubscribableMarker>()) { (_, previous), next ->
+                previous to next.toSet()
+            }.collect { (previous, next) ->
+                val toDelete = previous - next
+                val toAdd = next - previous
+                toDelete.forEach { it.onUnsubscribe() }
+                toAdd.forEach { it.onSubscribe(owner) }
+            }
+        }
+    }
+
+    fun onDestroy() {
+        viewModel.activeLifecycleSubscribables.value.forEach {
+            it.onUnsubscribe()
+        }
+    }
+
+    private fun LifecycleSubscribableMarker.onSubscribe(lifecycleOwner: LifecycleOwner) {
+        when (this) {
+            is LifecycleSubscribable -> subscribe(activity, lifecycleOwner, fragmentManager, childFragmentManager)
+            else -> {}
+        }
+    }
+
+    private fun LifecycleSubscribableMarker.onUnsubscribe() {
+        when (this) {
+            is LifecycleSubscribable -> unsubscribe()
+            else -> {}
+        }
+    }
+}
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
index 0f5e9028d..afa9024e2 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -35,7 +35,7 @@ actual open class LifecycleViewModel internal actual constructor() : androidx.li
  * @param activity The [AppCompatActivity] to bind to.
  */
 fun <VM : BaseLifecycleViewModel> VM.bind(activity: AppCompatActivity) {
-    activity.lifecycle.addObserver(KalugaViewModelLifecycleObserver(this, activity, activity, activity.supportFragmentManager))
+    activity.lifecycle.addObserver(KalugaViewModelLifecycleObserver(this, activity, activity.supportFragmentManager))
 }
 
 /**
@@ -47,7 +47,6 @@ fun <VM : BaseLifecycleViewModel> VM.bind(fragment: Fragment) =
         KalugaViewModelLifecycleObserver(
             viewModel = this,
             activity = fragment.activity,
-            lifecycleOwner = fragment.viewLifecycleOwner,
             fragmentManager = fragment.parentFragmentManager,
             childFragmentManager = fragment.childFragmentManager
         )
diff --git a/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt b/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
index df8acd897..b0613f02b 100644
--- a/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
+++ b/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
@@ -21,8 +21,5 @@ import com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel
 
 /**
  * Implementing this interface as a public property of a [LifecycleViewModel] allows for automatic binding to platform specific lifecycle aware manager.
- *
- * Be aware that classes implementing this interface that reside on a ViewModel as a property will have their getter invoked on instantiating the ViewModel to check if the instance is lifecycle aware (if the platform supports this).
- * This means, for example, that `lazy` delegation will have little effect.
  */
 interface LifecycleSubscribableMarker
diff --git a/architecture/src/commonMain/kotlin/navigation/Navigator.kt b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
index 510987387..1d6400df5 100644
--- a/architecture/src/commonMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
@@ -17,6 +17,8 @@
 
 package com.splendo.kaluga.architecture.navigation
 
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+
 /**
  * Action that describes the intent to navigate
  * @param bundle The [NavigationBundle] containing data used to configure navigation
@@ -45,7 +47,7 @@ open class NavigationException(message: String?) : RuntimeException(message)
 /**
  * Class that can trigger a given [NavigationAction]
  */
-expect interface Navigator<A : NavigationAction<*>> {
+expect interface Navigator<A : NavigationAction<*>> : LifecycleSubscribableMarker {
     /**
      * Triggers a given [NavigationAction]
      * @param action The [NavigationAction] to trigger
diff --git a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
index 73b1938df..4f7493c30 100644
--- a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -17,11 +17,16 @@
 
 package com.splendo.kaluga.architecture.viewmodel
 
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.Navigator
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
 
 @Deprecated(
     message = "ViewModel was renamed as the name didn't match it's function.",
@@ -51,10 +56,18 @@ expect open class LifecycleViewModel internal constructor() {
 }
 
 /**
- * Default [LifecycleViewModel] implementation respecting the Lifecycle of the presenting view
+ * Default [LifecycleViewModel] implementation respecting the Lifecycle of the presenting view.
+ * @param lifecycleSubscribables The [LifecycleSubscribableMarker] to be used by this viewModel.
  */
-open class BaseLifecycleViewModel : LifecycleViewModel() {
+open class BaseLifecycleViewModel(vararg lifecycleSubscribables: LifecycleSubscribableMarker) : LifecycleViewModel() {
 
+    private val _activeLifecycleSubscribables = MutableStateFlow(lifecycleSubscribables.toList())
+
+    /**
+     * A [StateFlow] of the list of [LifecycleSubscribableMarker] that are currently in use.
+     * Hook up your lifecycle to these markers where required.
+     */
+    val activeLifecycleSubscribables = _activeLifecycleSubscribables.asStateFlow()
     private val resumedJobs = SupervisorJob()
 
     /**
@@ -82,10 +95,25 @@ open class BaseLifecycleViewModel : LifecycleViewModel() {
      * Custom handler when the presenting views lifecycle ends
      */
     protected open fun onPause() {}
+
+    /**
+     * Adds a list of [LifecycleSubscribableMarker] to [activeLifecycleSubscribables].
+     */
+    protected fun addLifecycleSubscribables(vararg markers: LifecycleSubscribableMarker) {
+        _activeLifecycleSubscribables.update { it.toMutableSet().apply { addAll(markers) }.toList() }
+    }
+
+    /**
+     * Removes a list of [LifecycleSubscribableMarker] from [activeLifecycleSubscribables] (if added).
+     */
+    protected fun removeLifecycleSubscribables(vararg markers: LifecycleSubscribableMarker) {
+        _activeLifecycleSubscribables.update { it.toMutableSet().apply { removeAll(markers.toSet()) }.toList() }
+    }
 }
 
 /**
- * Default [LifecycleViewModel] allowing navigation
- * @param navigator The [Navigator] handling navigation
+ * Default [LifecycleViewModel] allowing navigation.
+ * @param navigator The [Navigator] handling navigation.
+ * @param lifecycleSubscribables The [LifecycleSubscribableMarker] to be used by this viewModel.
  */
-open class NavigatingViewModel<A : NavigationAction<*>>(val navigator: Navigator<A>) : BaseLifecycleViewModel()
+open class NavigatingViewModel<A : NavigationAction<*>>(protected val navigator: Navigator<A>, vararg lifecycleSubscribables: LifecycleSubscribableMarker) : BaseLifecycleViewModel(*lifecycleSubscribables, navigator)
diff --git a/architecture/src/iosMain/kotlin/navigation/Navigator.kt b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
index 2afa26378..84885b64b 100644
--- a/architecture/src/iosMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.architecture.navigation
 
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import com.splendo.kaluga.base.GCScheduler
 import kotlinx.cinterop.pointed
 import platform.CoreGraphics.CGFloat
@@ -59,7 +60,7 @@ import platform.UIKit.willMoveToParentViewController
 import platform.darwin.NSObject
 import kotlin.native.ref.WeakReference
 
-actual interface Navigator<A : NavigationAction<*>> {
+actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribableMarker {
     actual fun navigate(action: A)
 }
 
diff --git a/architecture/src/jsMain/kotlin/navigation/Navigator.kt b/architecture/src/jsMain/kotlin/navigation/Navigator.kt
index aae9a2d8d..91d6dfbae 100644
--- a/architecture/src/jsMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/jsMain/kotlin/navigation/Navigator.kt
@@ -17,7 +17,9 @@
 
 package com.splendo.kaluga.architecture.navigation
 
-actual interface Navigator<A : NavigationAction<*>> {
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+
+actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribableMarker {
 
     actual fun navigate(action: A)
 }
diff --git a/architecture/src/jvmMain/kotlin/navigation/Navigator.kt b/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
index aae9a2d8d..91d6dfbae 100644
--- a/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
@@ -17,7 +17,9 @@
 
 package com.splendo.kaluga.architecture.navigation
 
-actual interface Navigator<A : NavigationAction<*>> {
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+
+actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribableMarker {
 
     actual fun navigate(action: A)
 }
diff --git a/base/src/jvmMain/kotlin/utils/Decimal.kt b/base/src/jvmMain/kotlin/utils/Decimal.kt
index 5eb0ab1d8..666549057 100644
--- a/base/src/jvmMain/kotlin/utils/Decimal.kt
+++ b/base/src/jvmMain/kotlin/utils/Decimal.kt
@@ -51,8 +51,9 @@ actual fun Decimal.minus(
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.java)
 
-actual operator fun Decimal.div(value: Decimal) = if ((value.compareTo(Decimal.ZERO)) != 0) this.divide(value, MathContext.DECIMAL128)
-    else throw DecimalException("Divide by zero")
+actual operator fun Decimal.div(value: Decimal) = if ((value.compareTo(Decimal.ZERO)) != 0)
+    this.divide(value, MathContext.DECIMAL128)
+else throw DecimalException("Divide by zero")
 
 actual fun Decimal.div(value: Decimal, scale: Int) = if ((value.compareTo(Decimal.ZERO)) != 0)
     this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
diff --git a/bluetooth/README.md b/bluetooth/README.md
index 737b170b7..6c87e723e 100644
--- a/bluetooth/README.md
+++ b/bluetooth/README.md
@@ -83,7 +83,7 @@ CommonViewModel(bluetoothBuilder)
 ...
 
 // Common code
-class CommonViewModel(bltBuilder: BluetoothBuilder) : BaseViewModel() {
+class CommonViewModel(bltBuilder: BluetoothBuilder) : BaseLifecycleViewModel() {
     private val repo: Bluetooth = bltBuilder.create(
         connectionSettings = ConnectionSettings(
             ConnectionSettings.ReconnectionSettings.Never
diff --git a/date-time-picker/README.md b/date-time-picker/README.md
index e54964e91..dfcff71e9 100644
--- a/date-time-picker/README.md
+++ b/date-time-picker/README.md
@@ -62,7 +62,7 @@ Both methods for showing return the initial selectedDate passed through the buil
 
 ### Android
 On Android the builder is a `LifecycleSubscribable` (see Architecture) that needs a `LifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the date/time picker.
-For `BaseLifecycleViewModel`, the builder should be made **publicly** visible and bound to a `KalugaViewModelLifecycleObserver`.
+For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
 
 ```kotlin
 class DatePickerViewModel: LifecycleViewModel() {
diff --git a/date-time-picker/src/androidLibInstrumentedTest/kotlin/DateTimePickerViewModel.kt b/date-time-picker/src/androidLibInstrumentedTest/kotlin/DateTimePickerViewModel.kt
index edbd8829d..55738601a 100644
--- a/date-time-picker/src/androidLibInstrumentedTest/kotlin/DateTimePickerViewModel.kt
+++ b/date-time-picker/src/androidLibInstrumentedTest/kotlin/DateTimePickerViewModel.kt
@@ -21,4 +21,8 @@ import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 
 class DateTimePickerViewModel : BaseLifecycleViewModel() {
     val dateTimePickerBuilder = DateTimePickerPresenter.Builder()
+
+    init {
+        addLifecycleSubscribables(dateTimePickerBuilder)
+    }
 }
diff --git a/example/ios/Demo/Links/LinksViewController.swift b/example/ios/Demo/Links/LinksViewController.swift
index 14099c0d0..11b89d0f1 100644
--- a/example/ios/Demo/Links/LinksViewController.swift
+++ b/example/ios/Demo/Links/LinksViewController.swift
@@ -27,7 +27,7 @@ class LinksViewController: UIViewController {
     private lazy var navigator: ViewControllerNavigator<BrowserNavigationActions<AnyObject>> = BrowserNavigatorKt.BrowserNavigator(parent: self)
     private lazy var viewModel = LinksViewModel(
         linkRepoBuilder: LinksLinksBuilder(),
-        builder: AlertPresenter.Builder(viewController: self),
+        alertPresenterBuilder: AlertPresenter.Builder(viewController: self),
         navigator: navigator
     )
     private var lifecycleManager: LifecycleManager!
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
index 3f5616681..99dd62863 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/alert/AlertViewModel.kt
@@ -33,7 +33,7 @@ import kotlinx.coroutines.launch
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
-class AlertViewModel(val builder: BaseAlertPresenter.Builder) : BaseLifecycleViewModel() {
+class AlertViewModel(private val builder: BaseAlertPresenter.Builder) : BaseLifecycleViewModel(builder) {
 
     companion object {
         private val dismissTime: Duration = 3.seconds
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
index 7aa6d0265..8a54b9ce8 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/datetimepicker/DateTimePickerViewModel.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
-class DateTimePickerViewModel(val dateTimePickerPresenterBuilder: DateTimePickerPresenter.Builder) : BaseLifecycleViewModel() {
+class DateTimePickerViewModel(private val dateTimePickerPresenterBuilder: DateTimePickerPresenter.Builder) : BaseLifecycleViewModel(dateTimePickerPresenterBuilder) {
 
     companion object {
         private val formatter = KalugaDateFormatter.dateTimeFormat(DateFormatStyle.Long, DateFormatStyle.Long)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
index 01293ceb3..b52a1f12d 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/hud/HudViewModel.kt
@@ -30,7 +30,7 @@ import com.splendo.kaluga.resources.view.KalugaButton
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
-class HudViewModel(val builder: BaseHUD.Builder) : BaseLifecycleViewModel() {
+class HudViewModel(private val builder: BaseHUD.Builder) : BaseLifecycleViewModel(builder) {
 
     val showSystemButton = KalugaButton.Plain("show_loading_indicator_system".localized(), ButtonStyles.default) {
         // SYSTEM style by default
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
index e377a01c1..cd45f8073 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/info/InfoViewModel.kt
@@ -39,9 +39,9 @@ sealed class InfoNavigation<T>(value: T, type: NavigationBundleSpecType<T>) : Si
 }
 
 class InfoViewModel(
-    val reviewManagerBuilder: ReviewManager.Builder,
+    reviewManagerBuilder: ReviewManager.Builder,
     navigator: Navigator<InfoNavigation<*>>
-) : NavigatingViewModel<InfoNavigation<*>>(navigator) {
+) : NavigatingViewModel<InfoNavigation<*>>(navigator, reviewManagerBuilder) {
 
     sealed class Button(val title: String) {
         object About : Button("About")
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
index 79a6f4293..9a4b2a010 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/keyboard/KeyboardViewModel.kt
@@ -24,7 +24,7 @@ import com.splendo.kaluga.keyboard.FocusHandler
 import com.splendo.kaluga.resources.localized
 import com.splendo.kaluga.resources.view.KalugaButton
 
-class KeyboardViewModel<FH : FocusHandler>(val keyboardManagerBuilder: BaseKeyboardManager.Builder<FH>, private val editFieldFocusHandler: FH) : BaseLifecycleViewModel() {
+class KeyboardViewModel<FH : FocusHandler>(keyboardManagerBuilder: BaseKeyboardManager.Builder<FH>, private val editFieldFocusHandler: FH) : BaseLifecycleViewModel(keyboardManagerBuilder) {
 
     private val keyboardManager: BaseKeyboardManager<FH> = keyboardManagerBuilder.create(coroutineScope)
 
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
index 9f503c379..4e079443a 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.example.shared.viewmodel.link
 
 import com.splendo.kaluga.alerts.Alert
-import com.splendo.kaluga.alerts.AlertPresenter
+import com.splendo.kaluga.alerts.BaseAlertPresenter
 import com.splendo.kaluga.alerts.buildAlert
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.Navigator
@@ -42,9 +42,9 @@ sealed class BrowserNavigationActions<T>(value: T, type: NavigationBundleSpecTyp
 
 class LinksViewModel(
     linkRepoBuilder: LinksBuilder,
-    val builder: AlertPresenter.Builder,
+    private val alertPresenterBuilder: BaseAlertPresenter.Builder,
     navigator: Navigator<BrowserNavigationActions<*>>
-) : NavigatingViewModel<BrowserNavigationActions<*>>(navigator) {
+) : NavigatingViewModel<BrowserNavigationActions<*>>(navigator, alertPresenterBuilder) {
 
     val browserButtonText = observableOf("browser_button_text".localized())
     val linksInstructions = observableOf("links_instructions".localized())
@@ -54,7 +54,7 @@ class LinksViewModel(
     fun showAlert(title: String, message: String, style: Alert.Action.Style) {
         coroutineScope.launch {
             val action = Alert.Action("Ok", style)
-            val alert = builder.buildAlert(this) {
+            val alert = alertPresenterBuilder.buildAlert(this) {
                 setTitle(title)
                 setMessage(message)
                 addActions(action)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
index f18e49093..dfdc5f5d9 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ButtonViewModel.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.example.shared.viewmodel.resources
 
-import com.splendo.kaluga.alerts.AlertPresenter
+import com.splendo.kaluga.alerts.BaseAlertPresenter
 import com.splendo.kaluga.alerts.buildAlert
 import com.splendo.kaluga.architecture.observable.observableOf
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
@@ -31,8 +31,8 @@ import kotlinx.coroutines.launch
 
 class ButtonViewModel(
     styledStringBuilderProvider: StyledStringBuilder.Provider,
-    val alertPresenterBuilder: AlertPresenter.Builder
-) : BaseLifecycleViewModel() {
+    private val alertPresenterBuilder: BaseAlertPresenter.Builder
+) : BaseLifecycleViewModel(alertPresenterBuilder) {
 
     val buttons = observableOf(
         listOf(
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
index 0aa8460cd..3f43dc977 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.example.shared.viewmodel.resources
 
 import com.splendo.kaluga.alerts.Alert
 import com.splendo.kaluga.alerts.AlertPresenter
+import com.splendo.kaluga.alerts.BaseAlertPresenter
 import com.splendo.kaluga.alerts.buildActionSheet
 import com.splendo.kaluga.alerts.buildAlert
 import com.splendo.kaluga.architecture.observable.BaseInitializedObservable
@@ -77,8 +78,8 @@ enum class SelectableBlendMode {
 }
 
 class ColorViewModel(
-    val alertPresenterBuilder: AlertPresenter.Builder
-) : BaseLifecycleViewModel() {
+    private val alertPresenterBuilder: BaseAlertPresenter.Builder
+) : BaseLifecycleViewModel(alertPresenterBuilder) {
 
     private val backdropColor = MutableStateFlow(DefaultColors.mediumPurple)
     private val sourceColor = MutableStateFlow(DefaultColors.darkCyan)
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
index c608fcd3b..1bfd4f57c 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificViewModel.kt
@@ -56,9 +56,9 @@ sealed class ScientificNavigationAction<T>(value: T, spec: NavigationBundleSpecT
 }
 
 class ScientificViewModel(
-    val alertPresenterBuilder: BaseAlertPresenter.Builder,
+    private val alertPresenterBuilder: BaseAlertPresenter.Builder,
     navigator: Navigator<ScientificNavigationAction<*>>
-) : NavigatingViewModel<ScientificNavigationAction<*>>(navigator) {
+) : NavigatingViewModel<ScientificNavigationAction<*>>(navigator, alertPresenterBuilder) {
 
     data class Button(val name: String, val quantity: PhysicalQuantity, val index: Int, val navigator: Navigator<in ScientificNavigationAction.Converter>) {
         val id: String get() = "${quantity.name}_$index"
diff --git a/hud/README.md b/hud/README.md
index 18abfac41..4e011dce7 100644
--- a/hud/README.md
+++ b/hud/README.md
@@ -57,7 +57,7 @@ The `HUD.Builder` class can be used to build HUDs.
 
 ### Android
 On Android the builder is a `LifecycleSubscribable` (see Architecture) that needs a `LifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the HUD.
-For `BaseLifecycleViewModel`, the builder should be made **publicly** visible and bound to a `KalugaViewModelLifecycleObserver`.
+For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
 
 ```kotlin
 class HudViewModel: BaseLifecycleViewModel() {
diff --git a/hud/src/androidLibInstrumentedTest/kotlin/HudViewModel.kt b/hud/src/androidLibInstrumentedTest/kotlin/HudViewModel.kt
index 9f5b54c6e..48d3030ea 100644
--- a/hud/src/androidLibInstrumentedTest/kotlin/HudViewModel.kt
+++ b/hud/src/androidLibInstrumentedTest/kotlin/HudViewModel.kt
@@ -22,4 +22,8 @@ import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 open class HudViewModel : BaseLifecycleViewModel() {
 
     val builder = HUD.Builder()
+
+    init {
+        addLifecycleSubscribables(builder)
+    }
 }
diff --git a/keyboard/README.md b/keyboard/README.md
index bc0e43d20..8dc8631a3 100644
--- a/keyboard/README.md
+++ b/keyboard/README.md
@@ -37,11 +37,11 @@ The `KeyboardManager.Builder` and `FocusHandler` are provided on the platform.
 
 ### Android
 On Android the builder is a `LifecycleSubscribable` (see Architecture) that needs a `LifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the keyboard.
-For `BaseViewModel`, the builder should be made **publicly** visible and bound to a `KalugaViewModelLifecycleObserver`.
+For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
 The keyboardHostingView is any resource Id for a `View` attached to the `Activity` bound to the manager.
 
 ```kotlin
-class KeyboardViewModel(val builder: KeyboardManager.Builder): BaseViewModel() {
+class KeyboardViewModel(private val builder: KeyboardManager.Builder): BaseLifecycleViewModel(builder) {
 
     private val keyboardManager = builder.create(coroutineScope)
 
diff --git a/review/README.md b/review/README.md
index 177092b5e..0af0b80d9 100644
--- a/review/README.md
+++ b/review/README.md
@@ -38,16 +38,14 @@ For production apps this should refer to `Live`, though a `Fake` type may be pas
 Note that Fake will still not show a Review dialog on apps not installed though the Playstore.
 
 On Android the builder is a `LifecycleSubscribable` (see Architecture) that needs a `LifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the review manager.
-For `BaseLifecycleViewModel`, the builder should be made **publicly** visible and bound to a `KalugaViewModelLifecycleObserver`.
+For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
 
 ```kotlin
-class ReviewViewModel: BaseLifecycleViewModel() {
-
-    val builder = ReviewManager.Builder()
-
+class ReviewViewModel(val builder: ReviewManager.Builder): BaseLifecycleViewModel(builder) {
+    
     fun attemptToRequestReview() {
         coroutineScope.launch {
-            viewModel.builder.create().attemptToRequestReview()
+            builder.create().attemptToRequestReview()
         }
     }
 }
diff --git a/test-utils-alerts/src/commonTest/kotlin/MockAlertPresenterTest.kt b/test-utils-alerts/src/commonTest/kotlin/MockAlertPresenterTest.kt
index 168bad8b5..c0fa9cd92 100644
--- a/test-utils-alerts/src/commonTest/kotlin/MockAlertPresenterTest.kt
+++ b/test-utils-alerts/src/commonTest/kotlin/MockAlertPresenterTest.kt
@@ -34,7 +34,7 @@ import kotlin.time.Duration.Companion.seconds
 
 class MockAlertPresenterTest : UIThreadViewModelTest<MockAlertPresenterTest.TestContext, MockAlertPresenterTest.ViewModel>() {
 
-    class ViewModel(val alertBuilder: BaseAlertPresenter.Builder) : BaseLifecycleViewModel()
+    class ViewModel(val alertBuilder: BaseAlertPresenter.Builder) : BaseLifecycleViewModel(alertBuilder)
 
     class TestContext : ViewModelTestContext<ViewModel> {
         val mockAlertBuilder = MockAlertPresenter.Builder()
diff --git a/test-utils-architecture/README.md b/test-utils-architecture/README.md
index 94ca87ab9..c039c042e 100644
--- a/test-utils-architecture/README.md
+++ b/test-utils-architecture/README.md
@@ -25,7 +25,7 @@ This can be done by extending `BaseUIThreadViewModelTest` or `UIThreadViewModelT
 ```kotlin
 class CustomUIThreadViewModelTest : UIThreadViewModelTest<CustomViewModelTestContext, MyViewModel>() {
 
-    class MyViewModel(val alertBuilder: BaseAlertPresenter.Builder) : BaseViewModel()
+    class MyViewModel(private val alertBuilder: BaseAlertPresenter.Builder) : BaseLifecycleViewModel(alertBuilder)
 
     class CustomViewModelTestContext : ViewModelTestContext<MyViewModel> {
         val mockAlertBuilder = MockAlertPresenter.Builder() // creates on UI thread and can be passed to viewModel
diff --git a/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt b/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt
index a3cf308dc..5cccaff8a 100644
--- a/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt
+++ b/test-utils-base/src/androidLibMain/kotlin/test/BaseTest.kt
@@ -28,7 +28,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Runnable
 import kotlinx.coroutines.asCoroutineDispatcher
-import kotlinx.coroutines.debug.DebugProbes
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.setMain
 import java.util.concurrent.ExecutorService
diff --git a/test-utils-hud/src/commonTest/kotlin/MockHUDTest.kt b/test-utils-hud/src/commonTest/kotlin/MockHUDTest.kt
index 61bd5115f..64d6b3106 100644
--- a/test-utils-hud/src/commonTest/kotlin/MockHUDTest.kt
+++ b/test-utils-hud/src/commonTest/kotlin/MockHUDTest.kt
@@ -38,7 +38,7 @@ import kotlin.test.assertTrue
 
 class MockHUDTest : UIThreadViewModelTest<MockHUDTest.TestContext, MockHUDTest.ViewModel>() {
 
-    class ViewModel(val hudBuilder: BaseHUD.Builder) : BaseLifecycleViewModel() {
+    class ViewModel(val hudBuilder: BaseHUD.Builder) : BaseLifecycleViewModel(hudBuilder) {
         fun buildAndShowHud(config: HudConfig, isFinished: Deferred<Unit>): Pair<Deferred<BaseHUD>, Deferred<Unit>> {
             val isShowing = CompletableDeferred<BaseHUD>()
             val hasFinishedShowing = CompletableDeferred<Unit>()
diff --git a/test-utils-keyboard/src/commonTest/kotlin/MockKeyboardManagerTest.kt b/test-utils-keyboard/src/commonTest/kotlin/MockKeyboardManagerTest.kt
index 571ffa946..8396cde7a 100644
--- a/test-utils-keyboard/src/commonTest/kotlin/MockKeyboardManagerTest.kt
+++ b/test-utils-keyboard/src/commonTest/kotlin/MockKeyboardManagerTest.kt
@@ -27,7 +27,7 @@ import kotlin.test.assertTrue
 
 class MockKeyboardManagerTest : UIThreadViewModelTest<MockKeyboardManagerTest.TestContext, MockKeyboardManagerTest.ViewModel>() {
 
-    class ViewModel(keyboardManagerBuilder: MockKeyboardManager.Builder<MockFocusHandler>, val focusHandler: MockFocusHandler) : BaseLifecycleViewModel() {
+    class ViewModel(keyboardManagerBuilder: MockKeyboardManager.Builder<MockFocusHandler>, val focusHandler: MockFocusHandler) : BaseLifecycleViewModel(keyboardManagerBuilder) {
 
         val keyboardManager = keyboardManagerBuilder.create(coroutineScope)
 

From ff668ee8081d3e4b35ad2cd0a12936f9bed0d85a Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 14:28:32 +0100
Subject: [PATCH 121/227] Fixed equality checks

---
 .../kotlin/collections/ConcurrentMutableList.kt        |  4 ++--
 .../kotlin/collections/ConcurrentMutableMap.kt         | 10 +++++++++-
 .../kotlin/collections/ConcurrentMutableSet.kt         |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
index af6a7ec8b..91080c794 100644
--- a/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
@@ -45,7 +45,7 @@ class ConcurrentMutableList<E> internal constructor(private val internal: Mutabl
     override fun subList(fromIndex: Int, toIndex: Int): ConcurrentMutableList<E> = synchronized { ConcurrentMutableList(subList(fromIndex, toIndex)) }
     override fun isEmpty(): Boolean = synchronized { isEmpty() }
     override fun equals(other: Any?): Boolean = when (other) {
-        is ConcurrentMutableSet<*> -> {
+        is ConcurrentMutableList<*> -> {
             synchronized {
                 val inner = this
                 other.synchronized {
@@ -53,7 +53,7 @@ class ConcurrentMutableList<E> internal constructor(private val internal: Mutabl
                 }
             }
         }
-        is MutableSet<*> -> synchronized {
+        is List<*> -> synchronized {
             this == other
         }
         else -> false
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
index 56834e1bf..9932f96a4 100644
--- a/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
@@ -36,7 +36,15 @@ class ConcurrentMutableMap<K, V> internal constructor(private val internal: Muta
     override fun putAll(from: Map<out K, V>) = synchronized { putAll(from) }
     override fun remove(key: K): V? = synchronized { remove(key) }
     override fun equals(other: Any?): Boolean = when (other) {
-        is Map<*, *> -> entries == other.entries
+        is ConcurrentMutableMap<*, *> -> synchronized {
+            val inner = this
+            other.synchronized {
+                inner == this
+            }
+        }
+        is Map<*, *> -> synchronized {
+            this == other
+        }
         else -> false
     }
 
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
index fd2f5fc5a..393e7a7f5 100644
--- a/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
@@ -43,7 +43,7 @@ class ConcurrentMutableSet<E> internal constructor(private val internal: Mutable
                 }
             }
         }
-        is MutableSet<*> -> synchronized {
+        is Set<*> -> synchronized {
             this == other
         }
         else -> false

From c79dbfc7be98c11e3977f273cc15302b8f587981 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 14:36:39 +0100
Subject: [PATCH 122/227] Lint fix

---
 architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
index 314301ab5..13193ff24 100644
--- a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
@@ -18,9 +18,6 @@
 package com.splendo.kaluga.architecture.observable
 
 import com.splendo.kaluga.base.GCScheduler
-import com.splendo.kaluga.base.collections.ConcurrentMutableList
-import com.splendo.kaluga.base.collections.concurrentMutableListOf
-import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 
 actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : BaseSimpleDisposable(onDispose) {
 

From e3a75301b3b994fd37208b44daea6099b7e4946a Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 15:24:04 +0100
Subject: [PATCH 123/227] Api dump

---
 .../lifecycle/ComposableLifecycleSubscribable.kt |  4 ++--
 .../compose/viewModel/ViewModelComposable.kt     |  3 ++-
 architecture/api/androidLib/architecture.api     | 16 +++++++++++++---
 architecture/api/jvm/architecture.api            | 11 +++++++----
 .../src/main/kotlin/AndroidCompose.kt            |  2 ++
 .../src/main/kotlin/AndroidDatabinding.kt        |  2 ++
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
index d230ba622..77275e840 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
@@ -31,8 +31,8 @@ interface ComposableLifecycleSubscribable : LifecycleSubscribableMarker {
 }
 
 @Composable
-internal fun <VM : BaseLifecycleViewModel> VM.ComposableLifecycleSubscribable(): State<List<ComposableLifecycleSubscribable>> = remember {
+internal fun <VM : BaseLifecycleViewModel> VM.composableLifecycleSubscribable(): State<List<ComposableLifecycleSubscribable>> = remember {
     activeLifecycleSubscribables.map { list ->
         list.mapNotNull { it as? ComposableLifecycleSubscribable }
     }
-}.collectAsState(emptyList(), EmptyCoroutineContext)
\ No newline at end of file
+}.collectAsState(emptyList(), EmptyCoroutineContext)
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index c0b128de8..d88b2cd59 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -15,6 +15,7 @@ import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
 import com.splendo.kaluga.architecture.compose.activity
 import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
+import com.splendo.kaluga.architecture.compose.lifecycle.composableLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.architecture.viewmodel.LifecycleSubscribableManager
@@ -60,7 +61,7 @@ private fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
     viewModel.linkLifecycle(activity, fragmentManager)
 
     // Get a List of all ComposableLifecycleSubscribable of the viewModel.
-    val composeLifecycleSubscribables = viewModel.ComposableLifecycleSubscribable()
+    val composeLifecycleSubscribables = viewModel.composableLifecycleSubscribable()
 
     // If no ComposableLifecycleSubscribable available, just show content
     if (composeLifecycleSubscribables.value.isEmpty()) {
diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index fb4bcc46f..3f3aef35d 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -1826,11 +1826,14 @@ public abstract interface class com/splendo/kaluga/architecture/observable/WithS
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
-	public fun <init> ()V
+	public fun <init> ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
+	protected final fun addLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
 	public final fun didPause ()V
 	public final fun didResume ()V
+	public final fun getActiveLifecycleSubscribables ()Lkotlinx/coroutines/flow/StateFlow;
 	protected fun onPause ()V
 	protected fun onResume (Lkotlinx/coroutines/CoroutineScope;)V
+	protected final fun removeLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
@@ -1872,6 +1875,13 @@ public final class com/splendo/kaluga/architecture/viewmodel/KalugaViewModelLife
 	public fun onResume (Landroidx/lifecycle/LifecycleOwner;)V
 }
 
+public final class com/splendo/kaluga/architecture/viewmodel/LifecycleSubscribableManager {
+	public fun <init> (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroid/app/Activity;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroid/app/Activity;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun onCreate (Landroidx/lifecycle/LifecycleOwner;)V
+	public final fun onDestroy ()V
+}
+
 public class com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel : androidx/lifecycle/ViewModel {
 	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
 	protected fun onCleared ()V
@@ -1883,8 +1893,8 @@ public final class com/splendo/kaluga/architecture/viewmodel/LifecycleViewModelK
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/NavigatingViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
-	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;)V
-	public final fun getNavigator ()Lcom/splendo/kaluga/architecture/navigation/Navigator;
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;[Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
+	protected final fun getNavigator ()Lcom/splendo/kaluga/architecture/navigation/Navigator;
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/ViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
diff --git a/architecture/api/jvm/architecture.api b/architecture/api/jvm/architecture.api
index 4e9a84f09..24fe8e7cd 100644
--- a/architecture/api/jvm/architecture.api
+++ b/architecture/api/jvm/architecture.api
@@ -486,7 +486,7 @@ public class com/splendo/kaluga/architecture/navigation/NavigationException : ja
 	public fun <init> (Ljava/lang/String;)V
 }
 
-public abstract interface class com/splendo/kaluga/architecture/navigation/Navigator {
+public abstract interface class com/splendo/kaluga/architecture/navigation/Navigator : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
 	public abstract fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
 }
 
@@ -1000,11 +1000,14 @@ public abstract interface class com/splendo/kaluga/architecture/observable/WithS
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
-	public fun <init> ()V
+	public fun <init> ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
+	protected final fun addLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
 	public final fun didPause ()V
 	public final fun didResume ()V
+	public final fun getActiveLifecycleSubscribables ()Lkotlinx/coroutines/flow/StateFlow;
 	protected fun onPause ()V
 	protected fun onResume (Lkotlinx/coroutines/CoroutineScope;)V
+	protected final fun removeLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
@@ -1018,8 +1021,8 @@ public class com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/NavigatingViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
-	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;)V
-	public final fun getNavigator ()Lcom/splendo/kaluga/architecture/navigation/Navigator;
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;[Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
+	protected final fun getNavigator ()Lcom/splendo/kaluga/architecture/navigation/Navigator;
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/ViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
diff --git a/kaluga-library-components/src/main/kotlin/AndroidCompose.kt b/kaluga-library-components/src/main/kotlin/AndroidCompose.kt
index 0916076ed..1236bc57c 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidCompose.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidCompose.kt
@@ -37,5 +37,7 @@ fun org.gradle.api.Project.composeAndroidComponent() {
         }
     }
 
+    ktlint { disabledRules.set(listOf("no-wildcard-imports", "filename", "import-ordering")) }
+
     publish(ComponentType.Compose)
 }
diff --git a/kaluga-library-components/src/main/kotlin/AndroidDatabinding.kt b/kaluga-library-components/src/main/kotlin/AndroidDatabinding.kt
index 5a15541b2..0f1021bf3 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidDatabinding.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidDatabinding.kt
@@ -22,5 +22,7 @@ fun org.gradle.api.Project.databindingAndroidComponent() {
     version = Library.version
     commonAndroidComponent(ComponentType.DataBinding)
 
+    ktlint { disabledRules.set(listOf("no-wildcard-imports", "filename", "import-ordering")) }
+
     publish(ComponentType.DataBinding)
 }
\ No newline at end of file

From 1752e6318adbf1b8f250c2e38dfb5b84ca61a299 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 15:58:18 +0100
Subject: [PATCH 124/227] Renamed default to current state

---
 date-time/api/androidLib/date-time.api                        | 4 ++--
 date-time/api/jvm/date-time.api                               | 4 ++--
 .../com/splendo/kaluga/datetime/timer/RecurringTimer.kt       | 2 +-
 .../kotlin/com/splendo/kaluga/datetime/timer/Timer.kt         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/date-time/api/androidLib/date-time.api b/date-time/api/androidLib/date-time.api
index 54793266c..0c06cd558 100644
--- a/date-time/api/androidLib/date-time.api
+++ b/date-time/api/androidLib/date-time.api
@@ -6,7 +6,7 @@ public abstract interface class com/splendo/kaluga/datetime/timer/ControllableTi
 public final class com/splendo/kaluga/datetime/timer/RecurringTimer : com/splendo/kaluga/datetime/timer/ControllableTimer {
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getDefaultState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
+	public fun getCurrentState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
 	public fun getDuration-UwyO8pc ()J
 	public fun getState ()Lkotlinx/coroutines/flow/Flow;
 	public fun pause (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ public final class com/splendo/kaluga/datetime/timer/RecurringTimer : com/splend
 }
 
 public abstract interface class com/splendo/kaluga/datetime/timer/Timer {
-	public abstract fun getDefaultState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
+	public abstract fun getCurrentState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
 	public abstract fun getDuration-UwyO8pc ()J
 	public abstract fun getState ()Lkotlinx/coroutines/flow/Flow;
 }
diff --git a/date-time/api/jvm/date-time.api b/date-time/api/jvm/date-time.api
index 54793266c..0c06cd558 100644
--- a/date-time/api/jvm/date-time.api
+++ b/date-time/api/jvm/date-time.api
@@ -6,7 +6,7 @@ public abstract interface class com/splendo/kaluga/datetime/timer/ControllableTi
 public final class com/splendo/kaluga/datetime/timer/RecurringTimer : com/splendo/kaluga/datetime/timer/ControllableTimer {
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JJLkotlin/time/TimeSource;Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getDefaultState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
+	public fun getCurrentState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
 	public fun getDuration-UwyO8pc ()J
 	public fun getState ()Lkotlinx/coroutines/flow/Flow;
 	public fun pause (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -14,7 +14,7 @@ public final class com/splendo/kaluga/datetime/timer/RecurringTimer : com/splend
 }
 
 public abstract interface class com/splendo/kaluga/datetime/timer/Timer {
-	public abstract fun getDefaultState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
+	public abstract fun getCurrentState ()Lcom/splendo/kaluga/datetime/timer/Timer$State;
 	public abstract fun getDuration-UwyO8pc ()J
 	public abstract fun getState ()Lkotlinx/coroutines/flow/Flow;
 }
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
index 5acf9cbf0..56339ac0d 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
@@ -53,7 +53,7 @@ class RecurringTimer(
 ) : ControllableTimer {
     private val stateRepo = TimerStateRepo(duration, interval, timeSource, delayFunction, coroutineScope)
     override val state: Flow<Timer.State> = stateRepo.stateFlow.map { it.timerState }
-    override val defaultState: Timer.State = stateRepo.stateFlow.value.timerState
+    override val currentState: Timer.State get() = stateRepo.stateFlow.value.timerState
 
     override suspend fun start() = stateRepo.start()
 
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
index c5866f370..ccd16b21f 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
@@ -28,8 +28,8 @@ interface Timer {
     val duration: Duration
     /** Current state of the timer. */
     val state: Flow<State>
-    /** The Default [State] of the timer. */
-    val defaultState: State
+    /** The current [State] of the timer. */
+    val currentState: State
 
     sealed interface State {
         val elapsed: Flow<Duration>

From f90a002b2f4151b17751da2dd68b21d99cd0aed5 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 16:08:17 +0100
Subject: [PATCH 125/227] PR remark

---
 .../kotlin/navigation/Navigator.kt            | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index 92dc8bbd5..2308dfee8 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -144,9 +144,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     private fun removeFragment(removeFragmentSpec: NavigationSpec.RemoveFragment, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = removeFragmentSpec.getFragmentManager(manager!!).apply {
-            removeFragmentSpec.fragmentRequestKey?.let {
-                if (bundle != null)
-                    setFragmentResult(it, bundle.toBundle())
+            removeFragmentSpec.fragmentRequestKey?.let { key ->
+                bundle?.let { setFragmentResult(key, it.toBundle()) }
             }
         }
         val fragment = fragmentManager.findFragmentByTag(removeFragmentSpec.tag) ?: return
@@ -159,9 +158,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     private fun popFragment(popFragmentSpec: NavigationSpec.PopFragment, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = popFragmentSpec.getFragmentManager(manager!!).apply {
-            popFragmentSpec.fragmentRequestKey?.let {
-                if (bundle != null)
-                    setFragmentResult(it, bundle.toBundle())
+            popFragmentSpec.fragmentRequestKey?.let { key ->
+                bundle?.let { setFragmentResult(key, it.toBundle()) }
             }
         }
         if (popFragmentSpec.immediate) {
@@ -174,9 +172,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     private fun popFragmentTo(popToFragmentSpec: NavigationSpec.PopFragmentTo, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = popToFragmentSpec.getFragmentManager(manager!!).apply {
-            popToFragmentSpec.fragmentRequestKey?.let {
-                if (bundle != null)
-                    setFragmentResult(it, bundle.toBundle())
+            popToFragmentSpec.fragmentRequestKey?.let { key ->
+                bundle?.let { setFragmentResult(key, it.toBundle()) }
             }
         }
         val flags = if (popToFragmentSpec.inclusive) FragmentManager.POP_BACK_STACK_INCLUSIVE else 0
@@ -199,9 +196,8 @@ class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (
     private fun dismissDialog(spec: NavigationSpec.DismissDialog, bundle: NavigationBundle<*>?) {
         assert(manager != null)
         val fragmentManager = spec.getFragmentManager(manager!!).apply {
-            spec.fragmentRequestKey?.let {
-                if (bundle != null)
-                    setFragmentResult(it, bundle.toBundle())
+            spec.fragmentRequestKey?.let { key ->
+                bundle?.let { setFragmentResult(key, it.toBundle()) }
             }
         }
         val dialog = fragmentManager.findFragmentByTag(spec.tag) as? DialogFragment ?: return

From c244bf512baf5d8f51a8acb4bf776a580a7704cc Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 16:14:35 +0100
Subject: [PATCH 126/227] Track Kaluga SwiftUI

---
 example/ios/Kaluga-SwiftUI | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 9335df3ad..93783021e 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 9335df3ad4ce420e3fe74dfc9b7073f5ffce078f
+Subproject commit 93783021e2e6a0a0de0e9b82f1aa3c80f81ebf33

From a036bd138338868fb48c48110b7b31b67b2505e0 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 16:45:33 +0100
Subject: [PATCH 127/227] MockNavigator feature request

---
 .../api/androidLib/test-utils-architecture.api  | 11 +++++++++++
 .../api/jvm/test-utils-architecture.api         | 11 +++++++++++
 .../src/commonMain/kotlin/MockNavigator.kt      | 17 ++++++++++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/test-utils-architecture/api/androidLib/test-utils-architecture.api b/test-utils-architecture/api/androidLib/test-utils-architecture.api
index 55c7f331a..ec860dd38 100644
--- a/test-utils-architecture/api/androidLib/test-utils-architecture.api
+++ b/test-utils-architecture/api/androidLib/test-utils-architecture.api
@@ -27,12 +27,23 @@ public final class com/splendo/kaluga/test/architecture/MockLifecycleSubscriber
 	public fun unsubscribe ()V
 }
 
+public final class com/splendo/kaluga/test/architecture/MockNavigationException : com/splendo/kaluga/architecture/navigation/NavigationException {
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
+}
+
 public class com/splendo/kaluga/test/architecture/MockNavigator : com/splendo/kaluga/architecture/navigation/Navigator {
+	public static final field Companion Lcom/splendo/kaluga/test/architecture/MockNavigator$Companion;
 	public fun <init> ()V
+	public fun <init> (Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getNavigateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
 }
 
+public final class com/splendo/kaluga/test/architecture/MockNavigator$Companion {
+	public final fun navigatorThatThrows ()Lcom/splendo/kaluga/test/architecture/MockNavigator;
+}
+
 public abstract class com/splendo/kaluga/test/architecture/SimpleUIThreadViewModelTest : com/splendo/kaluga/test/architecture/UIThreadViewModelTest {
 	public fun <init> ()V
 	public abstract fun createViewModel ()Lcom/splendo/kaluga/architecture/viewmodel/LifecycleViewModel;
diff --git a/test-utils-architecture/api/jvm/test-utils-architecture.api b/test-utils-architecture/api/jvm/test-utils-architecture.api
index 33a001f81..7479b0fb8 100644
--- a/test-utils-architecture/api/jvm/test-utils-architecture.api
+++ b/test-utils-architecture/api/jvm/test-utils-architecture.api
@@ -17,12 +17,23 @@ public final class com/splendo/kaluga/test/architecture/BaseUIThreadViewModelTes
 	public static fun dispose (Lcom/splendo/kaluga/test/architecture/BaseUIThreadViewModelTest$ViewModelTestContext;)V
 }
 
+public final class com/splendo/kaluga/test/architecture/MockNavigationException : com/splendo/kaluga/architecture/navigation/NavigationException {
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
+}
+
 public class com/splendo/kaluga/test/architecture/MockNavigator : com/splendo/kaluga/architecture/navigation/Navigator {
+	public static final field Companion Lcom/splendo/kaluga/test/architecture/MockNavigator$Companion;
 	public fun <init> ()V
+	public fun <init> (Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getNavigateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
 }
 
+public final class com/splendo/kaluga/test/architecture/MockNavigator$Companion {
+	public final fun navigatorThatThrows ()Lcom/splendo/kaluga/test/architecture/MockNavigator;
+}
+
 public abstract class com/splendo/kaluga/test/architecture/SimpleUIThreadViewModelTest : com/splendo/kaluga/test/architecture/UIThreadViewModelTest {
 	public fun <init> ()V
 	public abstract fun createViewModel ()Lcom/splendo/kaluga/architecture/viewmodel/LifecycleViewModel;
diff --git a/test-utils-architecture/src/commonMain/kotlin/MockNavigator.kt b/test-utils-architecture/src/commonMain/kotlin/MockNavigator.kt
index f92933199..1daed06fd 100644
--- a/test-utils-architecture/src/commonMain/kotlin/MockNavigator.kt
+++ b/test-utils-architecture/src/commonMain/kotlin/MockNavigator.kt
@@ -18,18 +18,33 @@
 package com.splendo.kaluga.test.architecture
 
 import com.splendo.kaluga.architecture.navigation.NavigationAction
+import com.splendo.kaluga.architecture.navigation.NavigationException
 import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.test.base.mock.call
+import com.splendo.kaluga.test.base.mock.on
 import com.splendo.kaluga.test.base.mock.parameters.mock
 
+class MockNavigationException(action: NavigationAction<*>) : NavigationException("Mock exception for $action")
+
 /**
  * Mock implementation of [Navigator]
  */
-open class MockNavigator<A : NavigationAction<*>> : Navigator<A> {
+open class MockNavigator<A : NavigationAction<*>>(handleAction: (A) -> Unit = { }) : Navigator<A> {
+
+    companion object {
+        /**
+         * Creates a [MockNavigator] that automatically throws a [MockNavigationException] when [navigate] is called.
+         */
+        fun <A : NavigationAction<*>> navigatorThatThrows() = MockNavigator<A> { throw MockNavigationException(it) }
+    }
 
     /**
      * [com.splendo.kaluga.test.base.mock.BaseMethodMock] of [navigate]
      */
     val navigateMock = this::navigate.mock()
     override fun navigate(action: A): Unit = navigateMock.call(action)
+
+    init {
+        navigateMock.on().doExecute { (action) -> handleAction(action) }
+    }
 }

From f1b3fecd441f2805d8fc4f7a981435d914d0021d Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 24 Jan 2023 17:50:13 +0100
Subject: [PATCH 128/227] PR remark

---
 alerts/README.md                              |  2 +-
 alerts/api/androidLib/alerts.api              |  8 +-
 alerts/api/jvm/alerts.api                     |  2 +-
 .../androidLibMain/kotlin/AlertPresenter.kt   |  4 +-
 alerts/src/commonMain/kotlin/Alerts.kt        |  4 +-
 architecture-compose/README.md                |  4 +-
 .../api/architecture-compose.api              |  4 +-
 .../ComposableLifecycleSubscribable.kt        |  4 +-
 .../navigation/NavigationExtensions.kt        |  4 +-
 .../compose/viewModel/ViewModelComposable.kt  |  6 +-
 architecture/README.md                        |  4 +-
 architecture/api/androidLib/architecture.api  | 78 +++++++++----------
 architecture/api/jvm/architecture.api         | 13 ++--
 .../kotlin/lifecycle/LifecycleManagerTest.kt  |  2 +-
 ...le.kt => ActivityLifecycleSubscribable.kt} | 18 +++--
 .../lifecycle/LifecycleManagerObserver.kt     |  8 +-
 .../kotlin/navigation/NavigationSpec.kt       | 14 ++--
 .../kotlin/navigation/Navigator.kt            |  8 +-
 .../KalugaViewModelLifecycleObserver.kt       | 12 +--
 .../LifecycleManagerObserverTests.kt          |  5 +-
 .../lifecycle/LifecycleSubscribableMarker.kt  |  2 +-
 .../commonMain/kotlin/navigation/Navigator.kt |  4 +-
 .../kotlin/viewmodel/LifecycleViewModel.kt    | 26 +++----
 .../kotlin/lifecycle/LifecycleSubscribable.kt | 20 +++++
 .../iosMain/kotlin/navigation/Navigator.kt    |  4 +-
 .../kotlin/lifecycle/LifecycleSubscribable.kt | 20 +++++
 .../src/jsMain/kotlin/navigation/Navigator.kt |  4 +-
 .../kotlin/lifecycle/LifecycleSubscribable.kt | 20 +++++
 .../jvmMain/kotlin/navigation/Navigator.kt    |  4 +-
 date-time-picker/README.md                    |  2 +-
 .../api/androidLib/date-time-picker.api       |  8 +-
 date-time-picker/api/jvm/date-time-picker.api |  2 +-
 .../kotlin/DateTimePickerPresenter.kt         |  4 +-
 .../src/commonMain/kotlin/DateTimePicker.kt   |  4 +-
 .../xml/BottomSheetRootDialogFragment.kt      |  4 +-
 hud/README.md                                 |  2 +-
 hud/api/androidLib/hud.api                    |  8 +-
 hud/api/jvm/hud.api                           |  2 +-
 hud/src/androidLibMain/kotlin/HUD.kt          |  4 +-
 hud/src/commonMain/kotlin/HUD.kt              |  4 +-
 keyboard/README.md                            |  2 +-
 keyboard/api/androidLib/keyboard.api          |  8 +-
 keyboard/api/jvm/keyboard.api                 |  2 +-
 .../androidLibMain/kotlin/KeyboardManager.kt  |  4 +-
 .../kotlin/AndroidKeyboardManagerTests.kt     |  4 +-
 .../commonMain/kotlin/BaseKeyboardManager.kt  |  4 +-
 review/README.md                              |  2 +-
 review/api/androidLib/review.api              |  6 +-
 review/api/jvm/review.api                     |  2 +-
 .../androidLibMain/kotlin/ReviewManager.kt    |  4 +-
 review/src/commonMain/kotlin/ReviewManager.kt |  4 +-
 review/src/iosMain/kotlin/ReviewManager.kt    |  4 +-
 review/src/jsMain/kotlin/ReviewManager.kt     |  4 +-
 review/src/jvmMain/kotlin/ReviewManager.kt    |  4 +-
 .../androidLib/test-utils-architecture.api    |  8 +-
 ....kt => MockActivityLifecycleSubscriber.kt} |  8 +-
 56 files changed, 243 insertions(+), 179 deletions(-)
 rename architecture/src/androidLibMain/kotlin/lifecycle/{LifecycleSubscribable.kt => ActivityLifecycleSubscribable.kt} (60%)
 create mode 100644 architecture/src/iosMain/kotlin/lifecycle/LifecycleSubscribable.kt
 create mode 100644 architecture/src/jsMain/kotlin/lifecycle/LifecycleSubscribable.kt
 create mode 100644 architecture/src/jvmMain/kotlin/lifecycle/LifecycleSubscribable.kt
 rename test-utils-architecture/src/androidLibMain/kotlin/{MockLifecycleSubscriber.kt => MockActivityLifecycleSubscriber.kt} (70%)

diff --git a/alerts/README.md b/alerts/README.md
index 72018ffad..0dd636337 100644
--- a/alerts/README.md
+++ b/alerts/README.md
@@ -103,7 +103,7 @@ On iOS actions can be: `Default`, `Cancel` and `Destructive`.
 The `AlertPresenter.Builder` object should be created from the platform side.  
   
 ### Android  
-On Android the builder is a `LifecycleSubscribable` (see Architecture) that needs a `LifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the alert.
+On Android the builder is an `ActivityLifecycleSubscribable` (see Architecture) that needs an `ActivityLifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the alert.
 For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
   
 ```kotlin  
diff --git a/alerts/api/androidLib/alerts.api b/alerts/api/androidLib/alerts.api
index dc725ffc2..624d7e8e0 100644
--- a/alerts/api/androidLib/alerts.api
+++ b/alerts/api/androidLib/alerts.api
@@ -103,14 +103,14 @@ public final class com/splendo/kaluga/alerts/AlertPresenter : com/splendo/kaluga
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 }
 
-public final class com/splendo/kaluga/alerts/AlertPresenter$Builder : com/splendo/kaluga/alerts/BaseAlertPresenter$Builder, com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
+public final class com/splendo/kaluga/alerts/AlertPresenter$Builder : com/splendo/kaluga/alerts/BaseAlertPresenter$Builder, com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable {
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/AlertPresenter;
 	public synthetic fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
-	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
+	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
+	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
 	public fun unsubscribe ()V
 }
 
@@ -135,7 +135,7 @@ public abstract class com/splendo/kaluga/alerts/BaseAlertPresenter : com/splendo
 	public fun showAsync (ZLkotlin/jvm/functions/Function0;)V
 }
 
-public abstract class com/splendo/kaluga/alerts/BaseAlertPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract class com/splendo/kaluga/alerts/BaseAlertPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public fun <init> ()V
 	public abstract fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
 }
diff --git a/alerts/api/jvm/alerts.api b/alerts/api/jvm/alerts.api
index 525ae6b10..b581e203f 100644
--- a/alerts/api/jvm/alerts.api
+++ b/alerts/api/jvm/alerts.api
@@ -130,7 +130,7 @@ public abstract class com/splendo/kaluga/alerts/BaseAlertPresenter : com/splendo
 	public fun showAsync (ZLkotlin/jvm/functions/Function0;)V
 }
 
-public abstract class com/splendo/kaluga/alerts/BaseAlertPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract class com/splendo/kaluga/alerts/BaseAlertPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public fun <init> ()V
 	public abstract fun create (Lcom/splendo/kaluga/alerts/Alert;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
 }
diff --git a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
index 4e37a257b..5f73075af 100644
--- a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
@@ -27,7 +27,7 @@ import android.widget.EditText
 import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromCache
 import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
 import com.splendo.kaluga.base.utils.applyIf
@@ -45,7 +45,7 @@ actual class AlertPresenter(
 
     actual class Builder(
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
-    ) : BaseAlertPresenter.Builder(), LifecycleSubscribable by lifecycleManagerObserver {
+    ) : BaseAlertPresenter.Builder(), ActivityLifecycleSubscribable by lifecycleManagerObserver {
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope) =
             AlertPresenter(alert, lifecycleManagerObserver, coroutineScope)
     }
diff --git a/alerts/src/commonMain/kotlin/Alerts.kt b/alerts/src/commonMain/kotlin/Alerts.kt
index 33e2d2b7c..29c7863e6 100644
--- a/alerts/src/commonMain/kotlin/Alerts.kt
+++ b/alerts/src/commonMain/kotlin/Alerts.kt
@@ -18,7 +18,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.alerts
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
@@ -252,7 +252,7 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
      *
      * @see [AlertPresenter.Builder]
      */
-    abstract class Builder : LifecycleSubscribableMarker {
+    abstract class Builder : LifecycleSubscribable {
 
         /**
          * Creates the [BaseAlertPresenter] described by this builder.
diff --git a/architecture-compose/README.md b/architecture-compose/README.md
index 8e7996921..b2297ba0a 100644
--- a/architecture-compose/README.md
+++ b/architecture-compose/README.md
@@ -22,13 +22,13 @@ Compose architecture can be easily used by any Composable function.
 To do so, simply create a `BaseLifecycleViewModel`, preferably using a composable method that retains the viewModel on configuration changes such as [`androidx.lifecycle.viewmodel.compose.viewModel()`](https://developer.android.com/reference/kotlin/androidx/lifecycle/viewmodel/compose/package-summary#viewModel(androidx.lifecycle.ViewModelStoreOwner,kotlin.String,androidx.lifecycle.ViewModelProvider.Factory,androidx.lifecycle.viewmodel.CreationExtras)) or [`org.koin.androidx.compose.koinViewModel`](https://insert-koin.io/docs/reference/koin-android/compose#viewmodel-for-composable)
 Then wrap the ViewModel using the `ViewModelComposable` wrapping function.
 
-`ViewModelComposable` will automatically bind to all `LifecycleSubscribables` exposed by `BaseLifecycleViewModel.activeLifecycleSubscribables` using the activity that hosts the Composable.
+`ViewModelComposable` will automatically bind to all `LifecycleSubscribable` exposed by `BaseLifecycleViewModel.activeLifecycleSubscribables` using the activity that hosts the Composable.
 `FragmentViewModelComposable` can be called instead to provide an additional `FragmentManager` to bind to.
 
 A `KalugaViewModelComposeActivity` can be declared to automatically create a `BaseLifecycleViewModel` and wrap it in `ViewModelComposable` as the Content of the activity.
 
 ### ComposableLifecycleSubscribable
-This Kaluga library adds a new `LifecycleSubscribableMarker`: `ComposableLifecycleSubscribable`.
+This Kaluga library adds a new `LifecycleSubscribable`: `ComposableLifecycleSubscribable`.
 The `ComposableLifecycleSubscribable` provides a modifying function to wrap around a composable view.
 `ViewModelComposable` will automatically modify its content with all `ComposableLifecycleSubscribable` exposed by `BaseLifecycleViewModel.activeLifecycleSubscribables`.
 
diff --git a/architecture-compose/api/architecture-compose.api b/architecture-compose/api/architecture-compose.api
index 0d71a9151..e04bcc820 100644
--- a/architecture-compose/api/architecture-compose.api
+++ b/architecture-compose/api/architecture-compose.api
@@ -7,7 +7,7 @@ public final class com/splendo/kaluga/architecture/compose/ObservablesKt {
 	public static final fun state (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State;
 }
 
-public abstract interface class com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract interface class com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public abstract fun getModifier ()Lkotlin/jvm/functions/Function4;
 }
 
@@ -275,7 +275,7 @@ public final class com/splendo/kaluga/architecture/compose/navigation/NavHostRou
 
 public final class com/splendo/kaluga/architecture/compose/navigation/NavigationExtensionsKt {
 	public static final fun HardwareBackButtonNavigation (Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;I)V
-	public static final fun bind (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;Landroidx/compose/runtime/Composer;I)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;
+	public static final fun bind (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable;Landroidx/compose/runtime/Composer;I)Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable;
 }
 
 public abstract class com/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostComposableNavigator : com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator {
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
index 77275e840..61595ed9a 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
@@ -21,12 +21,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import kotlinx.coroutines.flow.map
 import kotlin.coroutines.EmptyCoroutineContext
 
-interface ComposableLifecycleSubscribable : LifecycleSubscribableMarker {
+interface ComposableLifecycleSubscribable : LifecycleSubscribable {
     val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit
 }
 
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
index a8dc7374b..153b80c85 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
@@ -12,7 +12,7 @@ import androidx.lifecycle.LifecycleOwner
 import com.splendo.kaluga.architecture.compose.activity
 import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
 import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.subscribe
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -21,7 +21,7 @@ import kotlinx.coroutines.launch
  * Current implementation expects [KalugaViewModelComposeActivity] to be a host since it provides [LocalAppCompatActivity].
  */
 @Composable
-fun LifecycleSubscribable.bind(): LifecycleSubscribable {
+fun ActivityLifecycleSubscribable.bind(): ActivityLifecycleSubscribable {
     LocalContext.current.activity?.let { activity ->
         DisposableEffect(Unit) {
             subscribe(activity)
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index d88b2cd59..b06e63fba 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -16,7 +16,7 @@ import androidx.lifecycle.ViewModelStoreOwner
 import com.splendo.kaluga.architecture.compose.activity
 import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
 import com.splendo.kaluga.architecture.compose.lifecycle.composableLifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.architecture.viewmodel.LifecycleSubscribableManager
 
@@ -37,10 +37,10 @@ fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
 }
 
 /**
- * Composable which manages [viewModel] lifecycle and binds to all its [LifecycleSubscribable] using [fragmentManager].
+ * Composable which manages [viewModel] lifecycle and binds to all its [ActivityLifecycleSubscribable] using [fragmentManager].
  * This automatically modifies the content using [ComposableLifecycleSubscribable.modifier].
  * @param viewModel [BaseLifecycleViewModel] to manage
- * @param fragmentManager The [FragmentManager] to bind to all [LifecycleSubscribable] in [BaseLifecycleViewModel.activeLifecycleSubscribables].
+ * @param fragmentManager The [FragmentManager] to bind to all [ActivityLifecycleSubscribable] in [BaseLifecycleViewModel.activeLifecycleSubscribables].
  * @param content content based on [viewModel]
  */
 @Composable
diff --git a/architecture/README.md b/architecture/README.md
index 420183a12..49e150afa 100644
--- a/architecture/README.md
+++ b/architecture/README.md
@@ -64,10 +64,10 @@ class SomeActivity : KalugaViewModelActivity<SomeViewModel> {
 }
 ```
 
-The `KalugaViewModelLifecycleObserver` will automatically update the `LifecycleSubscribable.LifecycleManager` context of all `LifecycleSubscribable` added to `BaseLifecycleViewModel.activeLifecycleSubscribables` of the viewModel.
+The `KalugaViewModelLifecycleObserver` will automatically update the `ActivityLifecycleSubscribable.LifecycleManager` context of all `ActivityLifecycleSubscribable` added to `BaseLifecycleViewModel.activeLifecycleSubscribables` of the viewModel.
 Implement this interface if a viewModel has properties that should be lifecycle or context aware.
 It can be delegated using `LifecycleSubscriber`.
-The `LifecycleManagerObserver` is a default implementation of `LifecycleSubscribable` that provides updates to the context as a `Flow`.
+The `LifecycleManagerObserver` is a default implementation of `ActivityLifecycleSubscribable` that provides updates to the context as a `Flow`.
 
 ### iOS
 On iOS the viewModel lifecycle should match 'onDidAppear'/`viewDidDisappear`.
diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index 3f3aef35d..0d0120691 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -1,33 +1,18 @@
-public final class com/splendo/kaluga/architecture/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheKt {
-	public static final fun getLifecycleAwareActivityCache ()Ljava/util/Map;
-}
-
-public final class com/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscriber {
-	public fun <init> ()V
-	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public final fun getManagerState ()Lkotlinx/coroutines/flow/StateFlow;
-	public fun setManager (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
-}
-
-public final class com/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserverKt {
-	public static final fun lifecycleManagerObserver (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;
-}
-
-public abstract interface class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
-	public abstract fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public abstract fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
+public abstract interface class com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
+	public abstract fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
+	public abstract fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
 	public abstract fun unsubscribe ()V
 }
 
-public final class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager {
+public final class com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager {
 	public fun <init> (Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;)V
 	public synthetic fun <init> (Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Landroid/app/Activity;
 	public final fun component2 ()Landroidx/lifecycle/LifecycleOwner;
 	public final fun component3 ()Landroidx/fragment/app/FragmentManager;
 	public final fun component4 ()Landroidx/fragment/app/FragmentManager;
-	public final fun copy (Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
+	public final fun copy (Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;)Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getActivity ()Landroid/app/Activity;
 	public final fun getChildFragmentManager ()Landroidx/fragment/app/FragmentManager;
@@ -37,28 +22,43 @@ public final class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribab
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableKt {
-	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;)V
-	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;)V
-	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;Landroidx/appcompat/app/AppCompatActivity;)V
+public final class com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribableKt {
+	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;)V
+	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;)V
+	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable;Landroidx/appcompat/app/AppCompatActivity;)V
+}
+
+public class com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscriber : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable {
+	public fun <init> ()V
+	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
+	public fun setManager (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
+	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
+	public fun unsubscribe ()V
 }
 
-public abstract interface class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public final class com/splendo/kaluga/architecture/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheKt {
+	public static final fun getLifecycleAwareActivityCache ()Ljava/util/Map;
 }
 
-public class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscriber : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
+public final class com/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscriber {
 	public fun <init> ()V
-	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public fun setManager (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
-	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
-	public fun unsubscribe ()V
+	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
+	public final fun getManagerState ()Lkotlinx/coroutines/flow/StateFlow;
+	public fun setManager (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
+}
+
+public final class com/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserverKt {
+	public static final fun lifecycleManagerObserver (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;
+}
+
+public abstract interface class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 }
 
-public final class com/splendo/kaluga/architecture/navigation/ActivityNavigator : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable, com/splendo/kaluga/architecture/navigation/Navigator {
+public final class com/splendo/kaluga/architecture/navigation/ActivityNavigator : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable, com/splendo/kaluga/architecture/navigation/Navigator {
 	public fun <init> (Lkotlin/jvm/functions/Function1;)V
-	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
+	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
 	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
-	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
+	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
 	public fun unsubscribe ()V
 }
 
@@ -1285,7 +1285,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationSpec$Thi
 	public static fun values ()[Lcom/splendo/kaluga/architecture/navigation/NavigationSpec$ThirdPartyApp$OpenMode;
 }
 
-public abstract interface class com/splendo/kaluga/architecture/navigation/Navigator : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract interface class com/splendo/kaluga/architecture/navigation/Navigator : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public abstract fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
 }
 
@@ -1826,14 +1826,14 @@ public abstract interface class com/splendo/kaluga/architecture/observable/WithS
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
-	public fun <init> ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
-	protected final fun addLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
+	public fun <init> ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;)V
+	protected final fun addLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;)V
 	public final fun didPause ()V
 	public final fun didResume ()V
 	public final fun getActiveLifecycleSubscribables ()Lkotlinx/coroutines/flow/StateFlow;
 	protected fun onPause ()V
 	protected fun onResume (Lkotlinx/coroutines/CoroutineScope;)V
-	protected final fun removeLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
+	protected final fun removeLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;)V
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
@@ -1893,7 +1893,7 @@ public final class com/splendo/kaluga/architecture/viewmodel/LifecycleViewModelK
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/NavigatingViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
-	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;[Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;[Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;)V
 	protected final fun getNavigator ()Lcom/splendo/kaluga/architecture/navigation/Navigator;
 }
 
diff --git a/architecture/api/jvm/architecture.api b/architecture/api/jvm/architecture.api
index 24fe8e7cd..35d5a83a6 100644
--- a/architecture/api/jvm/architecture.api
+++ b/architecture/api/jvm/architecture.api
@@ -1,3 +1,6 @@
+public abstract interface class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
+}
+
 public abstract interface class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
 }
 
@@ -486,7 +489,7 @@ public class com/splendo/kaluga/architecture/navigation/NavigationException : ja
 	public fun <init> (Ljava/lang/String;)V
 }
 
-public abstract interface class com/splendo/kaluga/architecture/navigation/Navigator : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract interface class com/splendo/kaluga/architecture/navigation/Navigator : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public abstract fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
 }
 
@@ -1000,14 +1003,14 @@ public abstract interface class com/splendo/kaluga/architecture/observable/WithS
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
-	public fun <init> ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
-	protected final fun addLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
+	public fun <init> ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;)V
+	protected final fun addLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;)V
 	public final fun didPause ()V
 	public final fun didResume ()V
 	public final fun getActiveLifecycleSubscribables ()Lkotlinx/coroutines/flow/StateFlow;
 	protected fun onPause ()V
 	protected fun onResume (Lkotlinx/coroutines/CoroutineScope;)V
-	protected final fun removeLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
+	protected final fun removeLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;)V
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/BaseViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
@@ -1021,7 +1024,7 @@ public class com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
 }
 
 public class com/splendo/kaluga/architecture/viewmodel/NavigatingViewModel : com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel {
-	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;[Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/Navigator;[Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;)V
 	protected final fun getNavigator ()Lcom/splendo/kaluga/architecture/navigation/Navigator;
 }
 
diff --git a/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt b/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
index ce5550d66..433acb394 100644
--- a/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
+++ b/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
@@ -45,7 +45,7 @@ class LifecycleManagerTest {
     fun testLifecycleManagerObserver() = runBlocking(Dispatchers.Main) {
         val activity = activity!!
         val observer = activity.lifecycleManagerObserver()
-        assertEquals(LifecycleSubscribable.LifecycleManager(activity, activity, activity.supportFragmentManager), observer.managerState.value)
+        assertEquals(ActivityLifecycleSubscribable.LifecycleManager(activity, activity, activity.supportFragmentManager), observer.managerState.value)
 
         withContext(Dispatchers.Default) {
             activityRule.scenario.moveToState(Lifecycle.State.DESTROYED)
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt b/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
similarity index 60%
rename from architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt
rename to architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
index 3027859d5..cbe63019f 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleSubscribable.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
@@ -23,7 +23,9 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 
-interface LifecycleSubscribable : LifecycleSubscribableMarker {
+actual interface LifecycleSubscribable
+
+interface ActivityLifecycleSubscribable : LifecycleSubscribable {
 
     data class LifecycleManager(
         val activity: Activity?,
@@ -48,11 +50,11 @@ interface LifecycleSubscribable : LifecycleSubscribableMarker {
     fun unsubscribe()
 }
 
-open class LifecycleSubscriber : LifecycleSubscribable {
+open class ActivityLifecycleSubscriber : ActivityLifecycleSubscribable {
 
-    override var manager: LifecycleSubscribable.LifecycleManager? = null
+    override var manager: ActivityLifecycleSubscribable.LifecycleManager? = null
 
-    override fun subscribe(manager: LifecycleSubscribable.LifecycleManager) {
+    override fun subscribe(manager: ActivityLifecycleSubscribable.LifecycleManager) {
         this.manager = manager
     }
 
@@ -62,8 +64,8 @@ open class LifecycleSubscriber : LifecycleSubscribable {
 }
 
 /**
- * Convenience method to subscribe an [AppCompatActivity] to this [LifecycleSubscribable] using its default [LifecycleOwner] and [FragmentManager].
+ * Convenience method to subscribe an [AppCompatActivity] to this [ActivityLifecycleSubscribable] using its default [LifecycleOwner] and [FragmentManager].
  */
-fun LifecycleSubscribable.subscribe(activity: AppCompatActivity) = subscribe(LifecycleSubscribable.LifecycleManager(activity, activity, activity.supportFragmentManager))
-fun LifecycleSubscribable.subscribe(activity: Activity?, owner: LifecycleOwner, fragmentManager: FragmentManager) = subscribe(LifecycleSubscribable.LifecycleManager(activity, owner, fragmentManager))
-fun LifecycleSubscribable.subscribe(activity: Activity?, owner: LifecycleOwner, parentFragmentManager: FragmentManager, childFragmentManager: FragmentManager?) = subscribe(LifecycleSubscribable.LifecycleManager(activity, owner, parentFragmentManager, childFragmentManager))
+fun ActivityLifecycleSubscribable.subscribe(activity: AppCompatActivity) = subscribe(ActivityLifecycleSubscribable.LifecycleManager(activity, activity, activity.supportFragmentManager))
+fun ActivityLifecycleSubscribable.subscribe(activity: Activity?, owner: LifecycleOwner, fragmentManager: FragmentManager) = subscribe(ActivityLifecycleSubscribable.LifecycleManager(activity, owner, fragmentManager))
+fun ActivityLifecycleSubscribable.subscribe(activity: Activity?, owner: LifecycleOwner, parentFragmentManager: FragmentManager, childFragmentManager: FragmentManager?) = subscribe(ActivityLifecycleSubscribable.LifecycleManager(activity, owner, parentFragmentManager, childFragmentManager))
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
index c8c41bc3c..c3c8b8285 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
@@ -21,17 +21,17 @@ import androidx.appcompat.app.AppCompatActivity
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
-class LifecycleManagerObserver : LifecycleSubscriber() {
+class LifecycleManagerObserver : ActivityLifecycleSubscriber() {
 
-    override var manager: LifecycleSubscribable.LifecycleManager?
+    override var manager: ActivityLifecycleSubscribable.LifecycleManager?
         get() = super.manager
         set(value) {
             super.manager = value
             _managerState.value = value
         }
 
-    private val _managerState = MutableStateFlow<LifecycleSubscribable.LifecycleManager?>(null)
-    val managerState: StateFlow<LifecycleSubscribable.LifecycleManager?> = _managerState
+    private val _managerState = MutableStateFlow<ActivityLifecycleSubscribable.LifecycleManager?>(null)
+    val managerState: StateFlow<ActivityLifecycleSubscribable.LifecycleManager?> = _managerState
 }
 
 /**
diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
index 8c30798af..3c86c00c2 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
@@ -26,7 +26,7 @@ import androidx.annotation.AnimatorRes
 import androidx.annotation.IdRes
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import java.net.URL
 import kotlin.reflect.KClass
 import kotlin.reflect.safeCast
@@ -120,7 +120,7 @@ sealed class NavigationSpec {
         val tag: String? = null,
         val backStackSettings: BackStackSettings = BackStackSettings.DontAdd,
         val animationSettings: AnimationSettings? = null,
-        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager },
+        val getFragmentManager: ActivityLifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager },
         val createFragment: () -> androidx.fragment.app.Fragment
     ) : NavigationSpec() {
 
@@ -179,7 +179,7 @@ sealed class NavigationSpec {
     data class RemoveFragment(
         val tag: String,
         val fragmentRequestKey: String? = null,
-        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+        val getFragmentManager: ActivityLifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
     ) : NavigationSpec()
 
     /**
@@ -191,7 +191,7 @@ sealed class NavigationSpec {
     data class PopFragment(
         val immediate: Boolean = false,
         val fragmentRequestKey: String? = null,
-        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+        val getFragmentManager: ActivityLifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
     ) : NavigationSpec()
 
     /**
@@ -205,7 +205,7 @@ sealed class NavigationSpec {
         val inclusive: Boolean,
         val immediate: Boolean = false,
         val fragmentRequestKey: String? = null,
-        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+        val getFragmentManager: ActivityLifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
     ) : NavigationSpec()
 
     /**
@@ -216,7 +216,7 @@ sealed class NavigationSpec {
      */
     data class Dialog(
         val tag: String? = null,
-        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager },
+        val getFragmentManager: ActivityLifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager },
         val createDialog: () -> DialogFragment
     ) : NavigationSpec()
 
@@ -229,7 +229,7 @@ sealed class NavigationSpec {
     data class DismissDialog(
         val tag: String,
         val fragmentRequestKey: String? = null,
-        val getFragmentManager: LifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
+        val getFragmentManager: ActivityLifecycleSubscribable.LifecycleManager.() -> FragmentManager = { fragmentManager }
     ) : NavigationSpec()
 
     /**
diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index 2fdd0933c..d014983d7 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -25,11 +25,11 @@ import android.provider.MediaStore
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscriber
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscriber
 
-actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribableMarker {
+actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
     actual fun navigate(action: A)
 }
 
@@ -42,7 +42,7 @@ object MissingActivityNavigationException : NavigationException("LifecycleManage
  * Requires to be subscribed to an activity via [subscribe] to work
  * @param navigationMapper A function mapping the [NavigationAction] to [NavigationSpec]
  */
-class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (A) -> NavigationSpec) : Navigator<A>, LifecycleSubscribable by LifecycleSubscriber() {
+class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (A) -> NavigationSpec) : Navigator<A>, ActivityLifecycleSubscribable by ActivityLifecycleSubscriber() {
 
     override fun navigate(action: A) {
         navigate(navigationMapper.invoke(action), action.bundle)
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
index c9701755c..051321f1d 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
@@ -23,8 +23,8 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.coroutineScope
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import com.splendo.kaluga.architecture.lifecycle.subscribe
 import kotlinx.coroutines.flow.runningFold
 
@@ -68,7 +68,7 @@ class LifecycleSubscribableManager<VM : BaseLifecycleViewModel>(
 ) {
     fun onCreate(owner: LifecycleOwner) {
         owner.lifecycle.coroutineScope.launchWhenCreated {
-            viewModel.activeLifecycleSubscribables.runningFold(emptySet<LifecycleSubscribableMarker>() to emptySet<LifecycleSubscribableMarker>()) { (_, previous), next ->
+            viewModel.activeLifecycleSubscribables.runningFold(emptySet<LifecycleSubscribable>() to emptySet<LifecycleSubscribable>()) { (_, previous), next ->
                 previous to next.toSet()
             }.collect { (previous, next) ->
                 val toDelete = previous - next
@@ -85,16 +85,16 @@ class LifecycleSubscribableManager<VM : BaseLifecycleViewModel>(
         }
     }
 
-    private fun LifecycleSubscribableMarker.onSubscribe(lifecycleOwner: LifecycleOwner) {
+    private fun LifecycleSubscribable.onSubscribe(lifecycleOwner: LifecycleOwner) {
         when (this) {
-            is LifecycleSubscribable -> subscribe(activity, lifecycleOwner, fragmentManager, childFragmentManager)
+            is ActivityLifecycleSubscribable -> subscribe(activity, lifecycleOwner, fragmentManager, childFragmentManager)
             else -> {}
         }
     }
 
-    private fun LifecycleSubscribableMarker.onUnsubscribe() {
+    private fun LifecycleSubscribable.onUnsubscribe() {
         when (this) {
-            is LifecycleSubscribable -> unsubscribe()
+            is ActivityLifecycleSubscribable -> unsubscribe()
             else -> {}
         }
     }
diff --git a/architecture/src/androidLibUnitTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt b/architecture/src/androidLibUnitTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt
index 61a58713a..d27c6595e 100644
--- a/architecture/src/androidLibUnitTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt
+++ b/architecture/src/androidLibUnitTest/kotlin/lifecycle/LifecycleManagerObserverTests.kt
@@ -24,7 +24,6 @@ import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.test.base.BaseTest
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.junit.Assert.assertNull
 import org.junit.Before
@@ -51,13 +50,13 @@ class LifecycleManagerObserverTests : BaseTest() {
     @Test
     fun testLifecycleManagerObserverHandlerCalled() = runBlocking {
         val observer = LifecycleManagerObserver()
-        val data: LifecycleSubscribable.LifecycleManager? = LifecycleSubscribable.LifecycleManager(
+        val data: ActivityLifecycleSubscribable.LifecycleManager? = ActivityLifecycleSubscribable.LifecycleManager(
             activity,
             lifecycleOwner,
             fragmentManager
         )
 
-        val deferredLifecycleManager = MutableList(3) { CompletableDeferred<LifecycleSubscribable.LifecycleManager?>() }
+        val deferredLifecycleManager = MutableList(3) { CompletableDeferred<ActivityLifecycleSubscribable.LifecycleManager?>() }
         val job = launch(Dispatchers.Main) {
             observer.managerState.collect { context ->
                 deferredLifecycleManager.firstOrNull { !it.isCompleted }?.complete(context)
diff --git a/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt b/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
index b0613f02b..3e4821f1b 100644
--- a/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
+++ b/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
@@ -22,4 +22,4 @@ import com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel
 /**
  * Implementing this interface as a public property of a [LifecycleViewModel] allows for automatic binding to platform specific lifecycle aware manager.
  */
-interface LifecycleSubscribableMarker
+expect interface LifecycleSubscribable
diff --git a/architecture/src/commonMain/kotlin/navigation/Navigator.kt b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
index 1d6400df5..99ee8ebc6 100644
--- a/architecture/src/commonMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.architecture.navigation
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
 /**
  * Action that describes the intent to navigate
@@ -47,7 +47,7 @@ open class NavigationException(message: String?) : RuntimeException(message)
 /**
  * Class that can trigger a given [NavigationAction]
  */
-expect interface Navigator<A : NavigationAction<*>> : LifecycleSubscribableMarker {
+expect interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
     /**
      * Triggers a given [NavigationAction]
      * @param action The [NavigationAction] to trigger
diff --git a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
index 4f7493c30..6b44d862f 100644
--- a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.architecture.viewmodel
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.architecture.navigation.NavigationAction
 import com.splendo.kaluga.architecture.navigation.Navigator
 import kotlinx.coroutines.CoroutineScope
@@ -57,14 +57,14 @@ expect open class LifecycleViewModel internal constructor() {
 
 /**
  * Default [LifecycleViewModel] implementation respecting the Lifecycle of the presenting view.
- * @param lifecycleSubscribables The [LifecycleSubscribableMarker] to be used by this viewModel.
+ * @param lifecycleSubscribables The [LifecycleSubscribable] to be used by this viewModel.
  */
-open class BaseLifecycleViewModel(vararg lifecycleSubscribables: LifecycleSubscribableMarker) : LifecycleViewModel() {
+open class BaseLifecycleViewModel(vararg lifecycleSubscribables: LifecycleSubscribable) : LifecycleViewModel() {
 
-    private val _activeLifecycleSubscribables = MutableStateFlow(lifecycleSubscribables.toList())
+    private val _activeLifecycleSubscribables = MutableStateFlow(lifecycleSubscribables.toSet())
 
     /**
-     * A [StateFlow] of the list of [LifecycleSubscribableMarker] that are currently in use.
+     * A [StateFlow] of the set of [LifecycleSubscribable] that are currently in use.
      * Hook up your lifecycle to these markers where required.
      */
     val activeLifecycleSubscribables = _activeLifecycleSubscribables.asStateFlow()
@@ -97,23 +97,23 @@ open class BaseLifecycleViewModel(vararg lifecycleSubscribables: LifecycleSubscr
     protected open fun onPause() {}
 
     /**
-     * Adds a list of [LifecycleSubscribableMarker] to [activeLifecycleSubscribables].
+     * Adds a list of [LifecycleSubscribable] to [activeLifecycleSubscribables].
      */
-    protected fun addLifecycleSubscribables(vararg markers: LifecycleSubscribableMarker) {
-        _activeLifecycleSubscribables.update { it.toMutableSet().apply { addAll(markers) }.toList() }
+    protected fun addLifecycleSubscribables(vararg markers: LifecycleSubscribable) {
+        _activeLifecycleSubscribables.update { it.toMutableSet().apply { addAll(markers.toSet()) }.toSet() }
     }
 
     /**
-     * Removes a list of [LifecycleSubscribableMarker] from [activeLifecycleSubscribables] (if added).
+     * Removes a list of [LifecycleSubscribable] from [activeLifecycleSubscribables] (if added).
      */
-    protected fun removeLifecycleSubscribables(vararg markers: LifecycleSubscribableMarker) {
-        _activeLifecycleSubscribables.update { it.toMutableSet().apply { removeAll(markers.toSet()) }.toList() }
+    protected fun removeLifecycleSubscribables(vararg markers: LifecycleSubscribable) {
+        _activeLifecycleSubscribables.update { it.toMutableSet().apply { removeAll(markers.toSet()) }.toSet() }
     }
 }
 
 /**
  * Default [LifecycleViewModel] allowing navigation.
  * @param navigator The [Navigator] handling navigation.
- * @param lifecycleSubscribables The [LifecycleSubscribableMarker] to be used by this viewModel.
+ * @param lifecycleSubscribables The [LifecycleSubscribable] to be used by this viewModel.
  */
-open class NavigatingViewModel<A : NavigationAction<*>>(protected val navigator: Navigator<A>, vararg lifecycleSubscribables: LifecycleSubscribableMarker) : BaseLifecycleViewModel(*lifecycleSubscribables, navigator)
+open class NavigatingViewModel<A : NavigationAction<*>>(protected val navigator: Navigator<A>, vararg lifecycleSubscribables: LifecycleSubscribable) : BaseLifecycleViewModel(*lifecycleSubscribables, navigator)
diff --git a/architecture/src/iosMain/kotlin/lifecycle/LifecycleSubscribable.kt b/architecture/src/iosMain/kotlin/lifecycle/LifecycleSubscribable.kt
new file mode 100644
index 000000000..31ac008c5
--- /dev/null
+++ b/architecture/src/iosMain/kotlin/lifecycle/LifecycleSubscribable.kt
@@ -0,0 +1,20 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.lifecycle
+
+actual interface LifecycleSubscribable
diff --git a/architecture/src/iosMain/kotlin/navigation/Navigator.kt b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
index 84885b64b..be8f53f40 100644
--- a/architecture/src/iosMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.architecture.navigation
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.base.GCScheduler
 import kotlinx.cinterop.pointed
 import platform.CoreGraphics.CGFloat
@@ -60,7 +60,7 @@ import platform.UIKit.willMoveToParentViewController
 import platform.darwin.NSObject
 import kotlin.native.ref.WeakReference
 
-actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribableMarker {
+actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
     actual fun navigate(action: A)
 }
 
diff --git a/architecture/src/jsMain/kotlin/lifecycle/LifecycleSubscribable.kt b/architecture/src/jsMain/kotlin/lifecycle/LifecycleSubscribable.kt
new file mode 100644
index 000000000..31ac008c5
--- /dev/null
+++ b/architecture/src/jsMain/kotlin/lifecycle/LifecycleSubscribable.kt
@@ -0,0 +1,20 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.lifecycle
+
+actual interface LifecycleSubscribable
diff --git a/architecture/src/jsMain/kotlin/navigation/Navigator.kt b/architecture/src/jsMain/kotlin/navigation/Navigator.kt
index 91d6dfbae..52ed83538 100644
--- a/architecture/src/jsMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/jsMain/kotlin/navigation/Navigator.kt
@@ -17,9 +17,9 @@
 
 package com.splendo.kaluga.architecture.navigation
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
-actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribableMarker {
+actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
 
     actual fun navigate(action: A)
 }
diff --git a/architecture/src/jvmMain/kotlin/lifecycle/LifecycleSubscribable.kt b/architecture/src/jvmMain/kotlin/lifecycle/LifecycleSubscribable.kt
new file mode 100644
index 000000000..31ac008c5
--- /dev/null
+++ b/architecture/src/jvmMain/kotlin/lifecycle/LifecycleSubscribable.kt
@@ -0,0 +1,20 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.lifecycle
+
+actual interface LifecycleSubscribable
diff --git a/architecture/src/jvmMain/kotlin/navigation/Navigator.kt b/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
index 91d6dfbae..52ed83538 100644
--- a/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
@@ -17,9 +17,9 @@
 
 package com.splendo.kaluga.architecture.navigation
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
-actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribableMarker {
+actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
 
     actual fun navigate(action: A)
 }
diff --git a/date-time-picker/README.md b/date-time-picker/README.md
index dfcff71e9..714cdc8f7 100644
--- a/date-time-picker/README.md
+++ b/date-time-picker/README.md
@@ -61,7 +61,7 @@ The can be shown using either `suspend fun show(animated: Boolean = true): Date?
 Both methods for showing return the initial selectedDate passed through the builder, modified by the selected date, or null if the date selection was cancelled.
 
 ### Android
-On Android the builder is a `LifecycleSubscribable` (see Architecture) that needs a `LifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the date/time picker.
+On Android the builder is an `ActivityLifecycleSubscribable` (see Architecture) that needs an `ActivityLifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the date/time picker.
 For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
 
 ```kotlin
diff --git a/date-time-picker/api/androidLib/date-time-picker.api b/date-time-picker/api/androidLib/date-time-picker.api
index 7b1d6874c..abff7f854 100644
--- a/date-time-picker/api/androidLib/date-time-picker.api
+++ b/date-time-picker/api/androidLib/date-time-picker.api
@@ -9,7 +9,7 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 	public static synthetic fun showDateTimePicker$default (Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 }
 
-public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public fun <init> ()V
 	public abstract fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
 }
@@ -82,14 +82,14 @@ public final class com/splendo/kaluga/datetimepicker/DateTimePickerPresenter : c
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 }
 
-public final class com/splendo/kaluga/datetimepicker/DateTimePickerPresenter$Builder : com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder, com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
+public final class com/splendo/kaluga/datetimepicker/DateTimePickerPresenter$Builder : com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder, com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable {
 	public fun <init> ()V
 	public fun <init> (ILcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;)V
 	public synthetic fun <init> (ILcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
 	public fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/DateTimePickerPresenter;
-	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
+	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
+	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
 	public fun unsubscribe ()V
 }
 
diff --git a/date-time-picker/api/jvm/date-time-picker.api b/date-time-picker/api/jvm/date-time-picker.api
index 2a0fd0189..5d434cacf 100644
--- a/date-time-picker/api/jvm/date-time-picker.api
+++ b/date-time-picker/api/jvm/date-time-picker.api
@@ -9,7 +9,7 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 	public static synthetic fun showDateTimePicker$default (Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 }
 
-public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public fun <init> ()V
 	public abstract fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
 }
diff --git a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
index 07cf592ad..2ee78b5a5 100644
--- a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
@@ -24,7 +24,7 @@ import android.content.Context
 import android.content.DialogInterface
 import androidx.appcompat.app.AppCompatActivity
 import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromCache
 import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
 import com.splendo.kaluga.base.utils.KalugaDate
@@ -44,7 +44,7 @@ actual class DateTimePickerPresenter(
     actual class Builder(
         private val themeResourceId: Int = 0,
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
-    ) : BaseDateTimePickerPresenter.Builder(), LifecycleSubscribable by lifecycleManagerObserver {
+    ) : BaseDateTimePickerPresenter.Builder(), ActivityLifecycleSubscribable by lifecycleManagerObserver {
         actual override fun create(
             dateTimePicker: DateTimePicker,
             coroutineScope: CoroutineScope
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 24d35ff75..24d5ab335 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -18,7 +18,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.datetimepicker
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
 import com.splendo.kaluga.base.utils.Locale
@@ -149,7 +149,7 @@ abstract class BaseDateTimePickerPresenter(private val dateTimePicker: DateTimeP
      *
      * @see [DateTimePickerPresenter.Builder]
      */
-    abstract class Builder : LifecycleSubscribableMarker {
+    abstract class Builder : LifecycleSubscribable {
 
         /**
          * Creates the [BaseDateTimePickerPresenter] described by this builder.
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
index 070510dde..ed8b057f5 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/BottomSheetRootDialogFragment.kt
@@ -26,7 +26,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelBottomSheetDialogFragment
@@ -83,7 +83,7 @@ class BottomSheetRootDialogFragment : KalugaViewModelBottomSheetDialogFragment<B
             override fun onCreate(owner: LifecycleOwner) {
                 super.onCreate(owner)
 
-                subPageNavigator.subscribe(LifecycleSubscribable.LifecycleManager(activity, viewLifecycleOwner, parentFragmentManager, childFragmentManager))
+                subPageNavigator.subscribe(ActivityLifecycleSubscribable.LifecycleManager(activity, viewLifecycleOwner, parentFragmentManager, childFragmentManager))
             }
 
             override fun onDestroy(owner: LifecycleOwner) {
diff --git a/hud/README.md b/hud/README.md
index 4e011dce7..2719d5675 100644
--- a/hud/README.md
+++ b/hud/README.md
@@ -56,7 +56,7 @@ The `HUD` has methods to show and dismiss a loading indicator view:
 The `HUD.Builder` class can be used to build HUDs.
 
 ### Android
-On Android the builder is a `LifecycleSubscribable` (see Architecture) that needs a `LifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the HUD.
+On Android the builder is an `ActivityLifecycleSubscribable` (see Architecture) that needs a `ActivityLifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the HUD.
 For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
 
 ```kotlin
diff --git a/hud/api/androidLib/hud.api b/hud/api/androidLib/hud.api
index c2be6f212..d9b642e9d 100644
--- a/hud/api/androidLib/hud.api
+++ b/hud/api/androidLib/hud.api
@@ -13,7 +13,7 @@ public abstract class com/splendo/kaluga/hud/BaseHUD : kotlinx/coroutines/Corout
 	public static synthetic fun present$default (Lcom/splendo/kaluga/hud/BaseHUD;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
-public abstract class com/splendo/kaluga/hud/BaseHUD$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract class com/splendo/kaluga/hud/BaseHUD$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public fun <init> ()V
 	public abstract fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/hud/BaseHUD;
 }
@@ -26,14 +26,14 @@ public final class com/splendo/kaluga/hud/HUD : com/splendo/kaluga/hud/BaseHUD {
 	public fun present (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/hud/HUD$Builder : com/splendo/kaluga/hud/BaseHUD$Builder, com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
+public final class com/splendo/kaluga/hud/HUD$Builder : com/splendo/kaluga/hud/BaseHUD$Builder, com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable {
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/hud/BaseHUD;
 	public fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/hud/HUD;
-	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
+	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
+	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
 	public fun unsubscribe ()V
 }
 
diff --git a/hud/api/jvm/hud.api b/hud/api/jvm/hud.api
index 596c8a70c..3ab1f43ea 100644
--- a/hud/api/jvm/hud.api
+++ b/hud/api/jvm/hud.api
@@ -9,7 +9,7 @@ public abstract class com/splendo/kaluga/hud/BaseHUD : kotlinx/coroutines/Corout
 	public static synthetic fun present$default (Lcom/splendo/kaluga/hud/BaseHUD;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
-public abstract class com/splendo/kaluga/hud/BaseHUD$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract class com/splendo/kaluga/hud/BaseHUD$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public fun <init> ()V
 	public abstract fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/hud/BaseHUD;
 }
diff --git a/hud/src/androidLibMain/kotlin/HUD.kt b/hud/src/androidLibMain/kotlin/HUD.kt
index 3bdcc6c08..12b8b562a 100644
--- a/hud/src/androidLibMain/kotlin/HUD.kt
+++ b/hud/src/androidLibMain/kotlin/HUD.kt
@@ -37,7 +37,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromCache
 import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
 import com.splendo.kaluga.base.mainHandler
@@ -51,7 +51,7 @@ import kotlin.coroutines.suspendCoroutine
 
 actual class HUD private constructor(@LayoutRes viewResId: Int, override val hudConfig: HudConfig, lifecycleManagerObserver: LifecycleManagerObserver, coroutineScope: CoroutineScope) : BaseHUD(coroutineScope) {
 
-    actual class Builder(private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()) : BaseHUD.Builder(), LifecycleSubscribable by lifecycleManagerObserver {
+    actual class Builder(private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()) : BaseHUD.Builder(), ActivityLifecycleSubscribable by lifecycleManagerObserver {
 
         actual override fun create(hudConfig: HudConfig, coroutineScope: CoroutineScope) = HUD(
             R.layout.loading_indicator_view,
diff --git a/hud/src/commonMain/kotlin/HUD.kt b/hud/src/commonMain/kotlin/HUD.kt
index 985c29434..c9912d185 100644
--- a/hud/src/commonMain/kotlin/HUD.kt
+++ b/hud/src/commonMain/kotlin/HUD.kt
@@ -18,7 +18,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.hud
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -42,7 +42,7 @@ abstract class BaseHUD(coroutineScope: CoroutineScope) : CoroutineScope by corou
     /**
      * Builder class for creating a [BaseHUD]
      */
-    abstract class Builder : LifecycleSubscribableMarker {
+    abstract class Builder : LifecycleSubscribable {
 
         /** */
         /**
diff --git a/keyboard/README.md b/keyboard/README.md
index 8dc8631a3..ac4e22d62 100644
--- a/keyboard/README.md
+++ b/keyboard/README.md
@@ -36,7 +36,7 @@ fun hideKeyboard(builder: KeyboardManager.Builder) {
 The `KeyboardManager.Builder` and `FocusHandler` are provided on the platform.
 
 ### Android
-On Android the builder is a `LifecycleSubscribable` (see Architecture) that needs a `LifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the keyboard.
+On Android the builder is an `ActivityLifecycleSubscribable` (see Architecture) that needs an `ActivityLifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the keyboard.
 For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
 The keyboardHostingView is any resource Id for a `View` attached to the `Activity` bound to the manager.
 
diff --git a/keyboard/api/androidLib/keyboard.api b/keyboard/api/androidLib/keyboard.api
index eca524d3c..da916a997 100644
--- a/keyboard/api/androidLib/keyboard.api
+++ b/keyboard/api/androidLib/keyboard.api
@@ -3,7 +3,7 @@ public abstract interface class com/splendo/kaluga/keyboard/BaseKeyboardManager
 	public abstract fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
 }
 
-public abstract interface class com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract interface class com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public abstract fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
 }
 
@@ -28,14 +28,14 @@ public final class com/splendo/kaluga/keyboard/ViewKeyboardManager : com/splendo
 	public fun show (Lcom/splendo/kaluga/keyboard/ViewFocusHandler;)V
 }
 
-public final class com/splendo/kaluga/keyboard/ViewKeyboardManager$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable, com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder {
+public final class com/splendo/kaluga/keyboard/ViewKeyboardManager$Builder : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable, com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder {
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
 	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/ViewKeyboardManager;
-	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
+	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
+	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
 	public fun unsubscribe ()V
 }
 
diff --git a/keyboard/api/jvm/keyboard.api b/keyboard/api/jvm/keyboard.api
index 67ae10b57..8644026bf 100644
--- a/keyboard/api/jvm/keyboard.api
+++ b/keyboard/api/jvm/keyboard.api
@@ -3,7 +3,7 @@ public abstract interface class com/splendo/kaluga/keyboard/BaseKeyboardManager
 	public abstract fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
 }
 
-public abstract interface class com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public abstract interface class com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public abstract fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
 }
 
diff --git a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
index ed8a45924..de34c37ac 100644
--- a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
@@ -21,7 +21,7 @@ import android.content.Context.INPUT_METHOD_SERVICE
 import android.view.inputmethod.InputMethodManager
 import androidx.appcompat.app.AppCompatActivity
 import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromCache
 import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
 import kotlinx.coroutines.CoroutineScope
@@ -33,7 +33,7 @@ class ViewKeyboardManager(
 
     class Builder(
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
-    ) : BaseKeyboardManager.Builder<ViewFocusHandler>, LifecycleSubscribable by lifecycleManagerObserver {
+    ) : BaseKeyboardManager.Builder<ViewFocusHandler>, ActivityLifecycleSubscribable by lifecycleManagerObserver {
         override fun create(coroutineScope: CoroutineScope) = ViewKeyboardManager(lifecycleManagerObserver, coroutineScope)
     }
 
diff --git a/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt b/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt
index 7ffa25c6e..af8555758 100644
--- a/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt
+++ b/keyboard/src/androidLibUnitTest/kotlin/AndroidKeyboardManagerTests.kt
@@ -21,7 +21,7 @@ import android.view.inputmethod.InputMethod.SHOW_EXPLICIT
 import android.view.inputmethod.InputMethodManager
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.LifecycleOwner
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.keyboard.AndroidKeyboardManagerTests.AndroidKeyboardTestContext
 import kotlinx.coroutines.CoroutineScope
 import org.mockito.ArgumentMatchers
@@ -73,7 +73,7 @@ class AndroidKeyboardManagerTests : KeyboardManagerTests<ViewFocusHandler, Andro
             builder = ViewKeyboardManager.Builder()
 
             builder.subscribe(
-                LifecycleSubscribable.LifecycleManager(
+                ActivityLifecycleSubscribable.LifecycleManager(
                     mockActivity,
                     mockLifecycleOwner,
                     mockFragmentManager
diff --git a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
index 811c4e522..ff78a49ca 100644
--- a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
+++ b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
@@ -19,7 +19,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.keyboard
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import kotlinx.coroutines.CoroutineScope
 
 /**
@@ -35,7 +35,7 @@ interface BaseKeyboardManager<FH : FocusHandler> {
     /**
      * Base KeyboardManager builder class, which used to create a [BaseKeyboardManager]
      */
-    interface Builder<FH : FocusHandler> : LifecycleSubscribableMarker {
+    interface Builder<FH : FocusHandler> : LifecycleSubscribable {
 
         /**
          * Creates KeyboardManager object
diff --git a/review/README.md b/review/README.md
index 0af0b80d9..d144450e7 100644
--- a/review/README.md
+++ b/review/README.md
@@ -37,7 +37,7 @@ In addition, Android allows you to pass a ReviewManager.Type.
 For production apps this should refer to `Live`, though a `Fake` type may be passed for testing purposes.
 Note that Fake will still not show a Review dialog on apps not installed though the Playstore.
 
-On Android the builder is a `LifecycleSubscribable` (see Architecture) that needs a `LifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the review manager.
+On Android the builder is an `ActivityLifecycleSubscribable` (see Architecture) that needs an `ActivityLifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the review manager.
 For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
 
 ```kotlin
diff --git a/review/api/androidLib/review.api b/review/api/androidLib/review.api
index 3c77511a9..062bd20d5 100644
--- a/review/api/androidLib/review.api
+++ b/review/api/androidLib/review.api
@@ -4,13 +4,13 @@ public final class com/splendo/kaluga/review/ReviewManager {
 	public final fun attemptToRequestReview (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/review/ReviewManager$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable, com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public final class com/splendo/kaluga/review/ReviewManager$Builder : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable, com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/review/ReviewManager$Type;Landroid/content/Context;Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/review/ReviewManager$Type;Landroid/content/Context;Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun create ()Lcom/splendo/kaluga/review/ReviewManager;
-	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
+	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
+	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
 	public fun unsubscribe ()V
 }
 
diff --git a/review/api/jvm/review.api b/review/api/jvm/review.api
index 8fae3c7ef..b401c4d1a 100644
--- a/review/api/jvm/review.api
+++ b/review/api/jvm/review.api
@@ -3,7 +3,7 @@ public final class com/splendo/kaluga/review/ReviewManager {
 	public final fun attemptToRequestReview (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/review/ReviewManager$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
+public final class com/splendo/kaluga/review/ReviewManager$Builder : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 	public fun <init> ()V
 	public final fun create ()Lcom/splendo/kaluga/review/ReviewManager;
 }
diff --git a/review/src/androidLibMain/kotlin/ReviewManager.kt b/review/src/androidLibMain/kotlin/ReviewManager.kt
index e29b38bec..9f1f78796 100644
--- a/review/src/androidLibMain/kotlin/ReviewManager.kt
+++ b/review/src/androidLibMain/kotlin/ReviewManager.kt
@@ -23,8 +23,8 @@ import com.google.android.play.core.ktx.requestReview
 import com.google.android.play.core.review.ReviewManagerFactory
 import com.google.android.play.core.review.testing.FakeReviewManager
 import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
 import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromCache
 import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
 import com.splendo.kaluga.base.ApplicationHolder
@@ -48,7 +48,7 @@ actual class ReviewManager(
         private val type: Type = Type.Live,
         private val context: Context = ApplicationHolder.applicationContext,
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
-    ) : LifecycleSubscribableMarker, LifecycleSubscribable by lifecycleManagerObserver {
+    ) : LifecycleSubscribable, ActivityLifecycleSubscribable by lifecycleManagerObserver {
         actual fun create(): ReviewManager = ReviewManager(type.reviewManager(context), lifecycleManagerObserver)
     }
 
diff --git a/review/src/commonMain/kotlin/ReviewManager.kt b/review/src/commonMain/kotlin/ReviewManager.kt
index 223e9bae5..e03fdff08 100644
--- a/review/src/commonMain/kotlin/ReviewManager.kt
+++ b/review/src/commonMain/kotlin/ReviewManager.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.review
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
 /**
  * Manager for requesting the system to show a Review Dialog.
@@ -25,7 +25,7 @@ import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
  */
 expect class ReviewManager {
 
-    class Builder : LifecycleSubscribableMarker {
+    class Builder : LifecycleSubscribable {
         fun create(): ReviewManager
     }
 
diff --git a/review/src/iosMain/kotlin/ReviewManager.kt b/review/src/iosMain/kotlin/ReviewManager.kt
index 34644417c..0d43e8322 100644
--- a/review/src/iosMain/kotlin/ReviewManager.kt
+++ b/review/src/iosMain/kotlin/ReviewManager.kt
@@ -17,12 +17,12 @@
 
 package com.splendo.kaluga.review
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import platform.StoreKit.SKStoreReviewController
 
 actual class ReviewManager {
 
-    actual class Builder : LifecycleSubscribableMarker {
+    actual class Builder : LifecycleSubscribable {
         actual fun create() = ReviewManager()
     }
 
diff --git a/review/src/jsMain/kotlin/ReviewManager.kt b/review/src/jsMain/kotlin/ReviewManager.kt
index c10a9cab2..2ca710ae5 100644
--- a/review/src/jsMain/kotlin/ReviewManager.kt
+++ b/review/src/jsMain/kotlin/ReviewManager.kt
@@ -17,11 +17,11 @@
 
 package com.splendo.kaluga.review
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
 actual class ReviewManager {
 
-    actual class Builder : LifecycleSubscribableMarker {
+    actual class Builder : LifecycleSubscribable {
         actual fun create() = ReviewManager()
     }
 
diff --git a/review/src/jvmMain/kotlin/ReviewManager.kt b/review/src/jvmMain/kotlin/ReviewManager.kt
index d95af22a6..7deb46f58 100644
--- a/review/src/jvmMain/kotlin/ReviewManager.kt
+++ b/review/src/jvmMain/kotlin/ReviewManager.kt
@@ -16,11 +16,11 @@
  */
 package com.splendo.kaluga.review
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribableMarker
+import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
 actual class ReviewManager {
 
-    actual class Builder : LifecycleSubscribableMarker {
+    actual class Builder : LifecycleSubscribable {
         actual fun create() = ReviewManager()
     }
 
diff --git a/test-utils-architecture/api/androidLib/test-utils-architecture.api b/test-utils-architecture/api/androidLib/test-utils-architecture.api
index ec860dd38..50fb6ba40 100644
--- a/test-utils-architecture/api/androidLib/test-utils-architecture.api
+++ b/test-utils-architecture/api/androidLib/test-utils-architecture.api
@@ -19,11 +19,11 @@ public final class com/splendo/kaluga/test/architecture/BuildConfig {
 	public fun <init> ()V
 }
 
-public final class com/splendo/kaluga/test/architecture/MockLifecycleSubscriber : com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
+public final class com/splendo/kaluga/test/architecture/MockActivityLifecycleSubscriber : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable {
 	public fun <init> ()V
-	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;
-	public fun setManager (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
-	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable$LifecycleManager;)V
+	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
+	public fun setManager (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
+	public fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
 	public fun unsubscribe ()V
 }
 
diff --git a/test-utils-architecture/src/androidLibMain/kotlin/MockLifecycleSubscriber.kt b/test-utils-architecture/src/androidLibMain/kotlin/MockActivityLifecycleSubscriber.kt
similarity index 70%
rename from test-utils-architecture/src/androidLibMain/kotlin/MockLifecycleSubscriber.kt
rename to test-utils-architecture/src/androidLibMain/kotlin/MockActivityLifecycleSubscriber.kt
index 99218699d..bdc76c95c 100644
--- a/test-utils-architecture/src/androidLibMain/kotlin/MockLifecycleSubscriber.kt
+++ b/test-utils-architecture/src/androidLibMain/kotlin/MockActivityLifecycleSubscriber.kt
@@ -16,12 +16,12 @@
  */
 package com.splendo.kaluga.test.architecture
 
-import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 
-class MockLifecycleSubscriber : LifecycleSubscribable {
-    override var manager: LifecycleSubscribable.LifecycleManager? = null
+class MockActivityLifecycleSubscriber : ActivityLifecycleSubscribable {
+    override var manager: ActivityLifecycleSubscribable.LifecycleManager? = null
 
-    override fun subscribe(manager: LifecycleSubscribable.LifecycleManager) {
+    override fun subscribe(manager: ActivityLifecycleSubscribable.LifecycleManager) {
         this.manager = manager
     }
 

From 2942acc12113c9ebd0f99de9ec2597b9107a414c Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 25 Jan 2023 09:33:29 +0100
Subject: [PATCH 129/227] Update
 architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt

Co-authored-by: Tijl <tijl@houtbecke.rs>
---
 .../src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
index 6b44d862f..6b95b721d 100644
--- a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -65,7 +65,7 @@ open class BaseLifecycleViewModel(vararg lifecycleSubscribables: LifecycleSubscr
 
     /**
      * A [StateFlow] of the set of [LifecycleSubscribable] that are currently in use.
-     * Hook up your lifecycle to these markers where required.
+     * Hook up your lifecycle to these [LifecycleSubscribable]s where required.
      */
     val activeLifecycleSubscribables = _activeLifecycleSubscribables.asStateFlow()
     private val resumedJobs = SupervisorJob()

From 48bc0bddcb5a339f13cfe157e3b4d59000a72fcb Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 25 Jan 2023 10:40:01 +0100
Subject: [PATCH 130/227] Fixed warnings

---
 .../kaluga/example/beacons/BeaconsAdapter.kt  | 18 ++++++++---------
 .../example/bluetooth/BluetoothAdapter.kt     | 20 +++++++++----------
 .../BluetoothCharacteristicAdapter.kt         | 20 +++++++++----------
 .../bluetooth/BluetoothDescriptorAdapter.kt   | 20 +++++++++----------
 .../bluetooth/BluetoothServiceAdapter.kt      | 20 +++++++++----------
 .../example/compose/ComposeOrXMLActivity.kt   | 18 ++++++++---------
 .../featurelist/FeaturesListFragment.kt       | 18 ++++++++---------
 .../kaluga/example/info/InfoFragment.kt       | 18 ++++++++---------
 .../permissions/PermissionsListActivity.kt    | 18 ++++++++---------
 .../example/resources/xml/ColorsActivity.kt   | 18 ++++++++---------
 .../example/resources/xml/LabelsActivity.kt   | 18 ++++++++---------
 .../resources/xml/XMLResourcesActivity.kt     | 18 ++++++++---------
 .../example/scientific/ScientificActivity.kt  | 16 ++++++++-------
 .../kaluga/example/system/SystemActivity.kt   | 18 ++++++++---------
 .../kaluga/example/view/ButtonAdapter.kt      | 18 ++++++++---------
 .../model/scientific/QuantityDetails.kt       |  1 +
 .../converters/QuantityConverter.kt           |  3 +++
 17 files changed, 143 insertions(+), 137 deletions(-)

diff --git a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
index 378d5bb15..76ede9720 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/beacons/BeaconsAdapter.kt
@@ -25,16 +25,16 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.example.databinding.BeaconItemBinding
 import com.splendo.kaluga.example.shared.viewmodel.beacons.BeaconsListBeaconViewModel
 
-class BeaconsAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BeaconsAdapter.BeaconItemViewHolder>() {
-
-    companion object {
-        @BindingAdapter("beacons")
-        @JvmStatic
-        fun bindBeacons(view: RecyclerView, beacons: List<BeaconsListBeaconViewModel>?) {
-            val beaconsAdapter = view.adapter as? BeaconsAdapter ?: return
-            beaconsAdapter.beacons = beacons ?: emptyList()
-        }
+object BeaconsBinding {
+    @BindingAdapter("beacons")
+    @JvmStatic
+    fun bindBeacons(view: RecyclerView, beacons: List<BeaconsListBeaconViewModel>?) {
+        val beaconsAdapter = view.adapter as? BeaconsAdapter ?: return
+        beaconsAdapter.beacons = beacons ?: emptyList()
     }
+}
+
+class BeaconsAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BeaconsAdapter.BeaconItemViewHolder>() {
 
     class BeaconItemViewHolder(val binding: BeaconItemBinding) : RecyclerView.ViewHolder(binding.root)
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
index f63f2a0db..87c59d40f 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothAdapter.kt
@@ -25,17 +25,17 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.example.databinding.BluetoothItemBinding
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothListDeviceViewModel
 
-class BluetoothAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothAdapter.BluetoothItemViewHolder>() {
-
-    companion object {
-        @BindingAdapter("devices")
-        @JvmStatic
-        fun bindDevices(view: RecyclerView, devices: List<BluetoothListDeviceViewModel>?) {
-            val bluetoothAdapter = view.adapter as? BluetoothAdapter
-                ?: return
-            bluetoothAdapter.bluetoothDevices = devices ?: emptyList()
-        }
+object DeviceBinding {
+    @BindingAdapter("devices")
+    @JvmStatic
+    fun bindDevices(view: RecyclerView, devices: List<BluetoothListDeviceViewModel>?) {
+        val bluetoothAdapter = view.adapter as? BluetoothAdapter
+            ?: return
+        bluetoothAdapter.bluetoothDevices = devices ?: emptyList()
     }
+}
+
+class BluetoothAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothAdapter.BluetoothItemViewHolder>() {
 
     class BluetoothItemViewHolder(val binding: BluetoothItemBinding) : RecyclerView.ViewHolder(binding.root)
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
index 3b25b9260..37c404dff 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothCharacteristicAdapter.kt
@@ -25,17 +25,17 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.example.databinding.BluetoothCharacteristicItemBinding
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothCharacteristicViewModel
 
-class BluetoothCharacteristicAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothCharacteristicAdapter.BluetoothCharacteristicItemViewHolder>() {
-
-    companion object {
-        @BindingAdapter("characteristics")
-        @JvmStatic
-        fun bindCharacteristics(view: RecyclerView, characteristics: List<BluetoothCharacteristicViewModel>?) {
-            val characteristicAdapter = view.adapter as? BluetoothCharacteristicAdapter
-                ?: return
-            characteristicAdapter.characteristics = characteristics ?: emptyList()
-        }
+object CharacteristicBinding {
+    @BindingAdapter("characteristics")
+    @JvmStatic
+    fun bindCharacteristics(view: RecyclerView, characteristics: List<BluetoothCharacteristicViewModel>?) {
+        val characteristicAdapter = view.adapter as? BluetoothCharacteristicAdapter
+            ?: return
+        characteristicAdapter.characteristics = characteristics ?: emptyList()
     }
+}
+
+class BluetoothCharacteristicAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothCharacteristicAdapter.BluetoothCharacteristicItemViewHolder>() {
 
     class BluetoothCharacteristicItemViewHolder(val characteristicItem: BluetoothCharacteristicItemBinding) : RecyclerView.ViewHolder(characteristicItem.root)
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
index d44545dd6..5c331c8b8 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothDescriptorAdapter.kt
@@ -25,17 +25,17 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.example.databinding.BluetoothDescriptorItemBinding
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothDescriptorViewModel
 
-class BluetoothDescriptorAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothDescriptorAdapter.BluetoothDescriptorItemViewHolder>() {
-
-    companion object {
-        @BindingAdapter("descriptors")
-        @JvmStatic
-        fun bindDescriptors(view: RecyclerView, descriptors: List<BluetoothDescriptorViewModel>?) {
-            val descriptorAdapter = view.adapter as? BluetoothDescriptorAdapter
-                ?: return
-            descriptorAdapter.descriptors = descriptors ?: emptyList()
-        }
+object DescriptorBinding {
+    @BindingAdapter("descriptors")
+    @JvmStatic
+    fun bindDescriptors(view: RecyclerView, descriptors: List<BluetoothDescriptorViewModel>?) {
+        val descriptorAdapter = view.adapter as? BluetoothDescriptorAdapter
+            ?: return
+        descriptorAdapter.descriptors = descriptors ?: emptyList()
     }
+}
+
+class BluetoothDescriptorAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothDescriptorAdapter.BluetoothDescriptorItemViewHolder>() {
 
     class BluetoothDescriptorItemViewHolder(val descriptorItem: BluetoothDescriptorItemBinding) : RecyclerView.ViewHolder(descriptorItem.root)
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
index 9182132a9..956d1477f 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/bluetooth/BluetoothServiceAdapter.kt
@@ -25,17 +25,17 @@ import androidx.recyclerview.widget.RecyclerView
 import com.splendo.kaluga.example.databinding.BluetoothServiceItemBinding
 import com.splendo.kaluga.example.shared.viewmodel.bluetooth.BluetoothServiceViewModel
 
-class BluetoothServiceAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothServiceAdapter.BluetoothServiceItemViewHolder>() {
-
-    companion object {
-        @BindingAdapter("services")
-        @JvmStatic
-        fun bindServices(view: RecyclerView, services: List<BluetoothServiceViewModel>?) {
-            val serviceAdapter = view.adapter as? BluetoothServiceAdapter
-                ?: return
-            serviceAdapter.services = services ?: emptyList()
-        }
+object ServiceBinding {
+    @BindingAdapter("services")
+    @JvmStatic
+    fun bindServices(view: RecyclerView, services: List<BluetoothServiceViewModel>?) {
+        val serviceAdapter = view.adapter as? BluetoothServiceAdapter
+            ?: return
+        serviceAdapter.services = services ?: emptyList()
     }
+}
+
+class BluetoothServiceAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<BluetoothServiceAdapter.BluetoothServiceItemViewHolder>() {
 
     class BluetoothServiceItemViewHolder(val serviceItem: BluetoothServiceItemBinding) : RecyclerView.ViewHolder(serviceItem.root)
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt
index 498a9baee..0613da812 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/compose/ComposeOrXMLActivity.kt
@@ -61,16 +61,16 @@ abstract class ComposeOrXMLActivity<ComposeActivity : AppCompatActivity, XMLActi
     }
 }
 
-class UITypesAdapter(private val viewModel: ComposeOrXMLSelectionViewModel) : RecyclerView.Adapter<UITypesAdapter.UITypesViewHolder>() {
-
-    companion object {
-        @BindingAdapter("uiTypes")
-        @JvmStatic
-        fun bindUITypes(view: RecyclerView, uiTypes: List<UIType>?) {
-            val adapter = (view.adapter as? UITypesAdapter) ?: return
-            adapter.uiTypes = uiTypes.orEmpty()
-        }
+object UITypeBinding {
+    @BindingAdapter("uiTypes")
+    @JvmStatic
+    fun bindUITypes(view: RecyclerView, uiTypes: List<UIType>?) {
+        val adapter = (view.adapter as? UITypesAdapter) ?: return
+        adapter.uiTypes = uiTypes.orEmpty()
     }
+}
+
+class UITypesAdapter(private val viewModel: ComposeOrXMLSelectionViewModel) : RecyclerView.Adapter<UITypesAdapter.UITypesViewHolder>() {
 
     class UITypesViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
         val button = binding.button
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
index b2525fd0a..d179b36fa 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/featurelist/FeaturesListFragment.kt
@@ -89,16 +89,16 @@ class FeaturesListFragment : KalugaViewModelFragment<FeatureListViewModel>() {
     }
 }
 
-class FeaturesAdapter(private val viewModel: FeatureListViewModel) : RecyclerView.Adapter<FeaturesAdapter.FeatureViewHolder>() {
-
-    companion object {
-        @BindingAdapter("features")
-        @JvmStatic
-        fun bindFeatures(view: RecyclerView, features: List<Feature>?) {
-            val adapter = (view.adapter as? FeaturesAdapter) ?: return
-            adapter.features = features.orEmpty()
-        }
+object FeatureBinding {
+    @BindingAdapter("features")
+    @JvmStatic
+    fun bindFeatures(view: RecyclerView, features: List<Feature>?) {
+        val adapter = (view.adapter as? FeaturesAdapter) ?: return
+        adapter.features = features.orEmpty()
     }
+}
+
+class FeaturesAdapter(private val viewModel: FeatureListViewModel) : RecyclerView.Adapter<FeaturesAdapter.FeatureViewHolder>() {
 
     class FeatureViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
         val button = binding.button
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt
index 8eb83a976..ba9ac57c3 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/info/InfoFragment.kt
@@ -81,16 +81,16 @@ class InfoFragment : KalugaViewModelFragment<InfoViewModel>(R.layout.fragment_in
     }
 }
 
-class InfoAdapter(private val viewModel: InfoViewModel) : RecyclerView.Adapter<InfoAdapter.InfoViewHolder>() {
-
-    companion object {
-        @BindingAdapter("infoButtons")
-        @JvmStatic
-        fun bindInfoButtons(view: RecyclerView, infoButtons: List<InfoViewModel.Button>?) {
-            val adapter = (view.adapter as? InfoAdapter) ?: return
-            adapter.buttons = infoButtons.orEmpty()
-        }
+object InfoButtonBinding {
+    @BindingAdapter("infoButtons")
+    @JvmStatic
+    fun bindInfoButtons(view: RecyclerView, infoButtons: List<InfoViewModel.Button>?) {
+        val adapter = (view.adapter as? InfoAdapter) ?: return
+        adapter.buttons = infoButtons.orEmpty()
     }
+}
+
+class InfoAdapter(private val viewModel: InfoViewModel) : RecyclerView.Adapter<InfoAdapter.InfoViewHolder>() {
 
     class InfoViewHolder(val button: AppCompatButton) : RecyclerView.ViewHolder(button)
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsListActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsListActivity.kt
index ec3f4fdcb..5a07532ea 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsListActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/permissions/PermissionsListActivity.kt
@@ -55,16 +55,16 @@ class PermissionsListActivity : KalugaViewModelActivity<PermissionsListViewModel
     }
 }
 
-class PermissionsAdapter(private val viewModel: PermissionsListViewModel) : RecyclerView.Adapter<PermissionsAdapter.PermissionsViewHolder>() {
-
-    companion object {
-        @BindingAdapter("permissions")
-        @JvmStatic
-        fun bindPermissions(view: RecyclerView, permissions: List<PermissionView>?) {
-            val adapter = (view.adapter as? PermissionsAdapter) ?: return
-            adapter.permissions = permissions.orEmpty()
-        }
+object PermissionBinding {
+    @BindingAdapter("permissions")
+    @JvmStatic
+    fun bindPermissions(view: RecyclerView, permissions: List<PermissionView>?) {
+        val adapter = (view.adapter as? PermissionsAdapter) ?: return
+        adapter.permissions = permissions.orEmpty()
     }
+}
+
+class PermissionsAdapter(private val viewModel: PermissionsListViewModel) : RecyclerView.Adapter<PermissionsAdapter.PermissionsViewHolder>() {
 
     class PermissionsViewHolder(val button: AppCompatButton) : RecyclerView.ViewHolder(button)
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
index 1951fe8cb..cdbcc7635 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ColorsActivity.kt
@@ -70,16 +70,16 @@ class ColorActivity : KalugaViewModelActivity<ColorViewModel>() {
     }
 }
 
-class BackgroundAdapter : RecyclerView.Adapter<BackgroundAdapter.BackgroundViewHolder>() {
-
-    companion object {
-        @BindingAdapter("backgroundStyles")
-        @JvmStatic
-        fun bindBackgroundStyles(view: RecyclerView, backgroundStyles: List<KalugaBackgroundStyle>?) {
-            val adapter = (view.adapter as? BackgroundAdapter) ?: return
-            adapter.backgrounds = backgroundStyles.orEmpty()
-        }
+object BackgroundStyleBinding {
+    @BindingAdapter("backgroundStyles")
+    @JvmStatic
+    fun bindBackgroundStyles(view: RecyclerView, backgroundStyles: List<KalugaBackgroundStyle>?) {
+        val adapter = (view.adapter as? BackgroundAdapter) ?: return
+        adapter.backgrounds = backgroundStyles.orEmpty()
     }
+}
+
+class BackgroundAdapter : RecyclerView.Adapter<BackgroundAdapter.BackgroundViewHolder>() {
 
     class BackgroundViewHolder(val binding: ViewResourceListBackgroundBinding) : RecyclerView.ViewHolder(binding.root) {
         val view = binding.root
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/LabelsActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/LabelsActivity.kt
index b761ad0e5..e592a1fc7 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/LabelsActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/LabelsActivity.kt
@@ -47,16 +47,16 @@ class LabelActivity : KalugaViewModelActivity<LabelViewModel>() {
     }
 }
 
-class LabelAdapter : RecyclerView.Adapter<LabelAdapter.LabelViewHolder>() {
-
-    companion object {
-        @BindingAdapter("labels")
-        @JvmStatic
-        fun bindLabels(view: RecyclerView, labels: List<KalugaLabel>?) {
-            val adapter = (view.adapter as? LabelAdapter) ?: return
-            adapter.labels = labels.orEmpty()
-        }
+object LabelsBinding {
+    @BindingAdapter("labels")
+    @JvmStatic
+    fun bindLabels(view: RecyclerView, labels: List<KalugaLabel>?) {
+        val adapter = (view.adapter as? LabelAdapter) ?: return
+        adapter.labels = labels.orEmpty()
     }
+}
+
+class LabelAdapter : RecyclerView.Adapter<LabelAdapter.LabelViewHolder>() {
 
     class LabelViewHolder(val binding: ViewListTextViewBinding) : RecyclerView.ViewHolder(binding.root) {
         val label = binding.label
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt
index 71b32caf5..7c9a03aa8 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt
@@ -57,18 +57,18 @@ class XMLResourcesActivity : KalugaViewModelActivity<ResourcesListViewModel>() {
     }
 }
 
+object ResourcesBinding {
+    @BindingAdapter("resources")
+    @JvmStatic
+    fun bindResources(view: RecyclerView, resources: List<Resource>?) {
+        val adapter = (view.adapter as? ResourcesAdapter) ?: return
+        adapter.resources = resources.orEmpty()
+    }
+}
+
 class ResourcesAdapter(private val viewModel: ResourcesListViewModel) :
     RecyclerView.Adapter<ResourcesAdapter.ResourceViewHolder>() {
 
-    companion object {
-        @BindingAdapter("resources")
-        @JvmStatic
-        fun bindResources(view: RecyclerView, resources: List<Resource>?) {
-            val adapter = (view.adapter as? ResourcesAdapter) ?: return
-            adapter.resources = resources.orEmpty()
-        }
-    }
-
     class ResourceViewHolder(val binding: ViewListButtonBinding) :
         RecyclerView.ViewHolder(binding.root) {
         val button = binding.button
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
index d649d778f..ed0633501 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificActivity.kt
@@ -34,18 +34,20 @@ import com.splendo.kaluga.resources.dpToPixel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
+object ScientificConverterButtonBinding {
+    @BindingAdapter("scientificConverterButtons")
+    @JvmStatic
+    fun bindButtons(view: RecyclerView, buttons: List<ScientificViewModel.Button>?) {
+        val adapter = (view.adapter as? ButtonAdapter) ?: return
+        adapter.buttons = buttons?.map { it.button }.orEmpty()
+    }
+}
+
 class ScientificActivity : KalugaViewModelActivity<ScientificViewModel>() {
 
     companion object {
         const val leftUnitRequestKey: String = "LeftUnit"
         const val rightUnitRequestKey: String = "RightUnit"
-
-        @BindingAdapter("scientificConverterButtons")
-        @JvmStatic
-        fun bindButtons(view: RecyclerView, buttons: List<ScientificViewModel.Button>?) {
-            val adapter = (view.adapter as? ButtonAdapter) ?: return
-            adapter.buttons = buttons?.map { it.button }.orEmpty()
-        }
     }
 
     class LeftUnitDialogSelectionFragment : ScientificUnitSelectionDialogFragment() {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
index 631ef9267..1ec146fa4 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/system/SystemActivity.kt
@@ -55,19 +55,19 @@ class SystemActivity : KalugaViewModelActivity<SystemViewModel>() {
     }
 }
 
+object SystemFeaturesBinding {
+    @BindingAdapter("systemFeatures")
+    @JvmStatic
+    fun bindSystemFeatures(view: RecyclerView, resources: List<SystemFeatures>?) {
+        val adapter = (view.adapter as? SystemFeatureAdapter) ?: return
+        adapter.systemFeatures = resources.orEmpty()
+    }
+}
+
 class SystemFeatureAdapter(
     private val viewModel: SystemViewModel
 ) : RecyclerView.Adapter<SystemFeatureAdapter.SystemFeatureViewHolder>() {
 
-    companion object {
-        @BindingAdapter("systemFeatures")
-        @JvmStatic
-        fun bindSystemFeatures(view: RecyclerView, resources: List<SystemFeatures>?) {
-            val adapter = (view.adapter as? SystemFeatureAdapter) ?: return
-            adapter.systemFeatures = resources.orEmpty()
-        }
-    }
-
     inner class SystemFeatureViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
         val button = binding.button
     }
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/view/ButtonAdapter.kt b/example/android/src/main/java/com/splendo/kaluga/example/view/ButtonAdapter.kt
index e192d4d29..c877aa7f6 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/view/ButtonAdapter.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/view/ButtonAdapter.kt
@@ -25,16 +25,16 @@ import com.splendo.kaluga.example.databinding.ViewListButtonBinding
 import com.splendo.kaluga.resources.view.KalugaButton
 import com.splendo.kaluga.resources.view.bindButton
 
-class ButtonAdapter : RecyclerView.Adapter<ButtonAdapter.ButtonViewHolder>() {
-
-    companion object {
-        @BindingAdapter("buttons")
-        @JvmStatic
-        fun bindButtons(view: RecyclerView, buttons: List<KalugaButton>?) {
-            val adapter = (view.adapter as? ButtonAdapter) ?: return
-            adapter.buttons = buttons.orEmpty()
-        }
+object ButtonsBinding {
+    @BindingAdapter("buttons")
+    @JvmStatic
+    fun bindButtons(view: RecyclerView, buttons: List<KalugaButton>?) {
+        val adapter = (view.adapter as? ButtonAdapter) ?: return
+        adapter.buttons = buttons.orEmpty()
     }
+}
+
+class ButtonAdapter : RecyclerView.Adapter<ButtonAdapter.ButtonViewHolder>() {
 
     class ButtonViewHolder(val binding: ViewListButtonBinding) : RecyclerView.ViewHolder(binding.root) {
         val button = binding.button
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
index fe7b15fd1..e665be6f4 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/QuantityDetails.kt
@@ -31,6 +31,7 @@ data class QuantityDetails<Quantity : PhysicalQuantity>(
     val units: Set<ScientificUnit<Quantity>>,
     val converters: List<QuantityConverter<Quantity, *>>
 ) {
+    @Suppress("UNCHECKED_CAST")
     fun convert(value: Decimal, unit: ScientificUnit<*>, to: ScientificUnit<*>): ScientificValue<Quantity, *>? = if (unit.quantity == quantity && to.quantity == quantity) {
         DefaultScientificValue(value, unit as ScientificUnit<Quantity>).convert(to as ScientificUnit<Quantity>)
     } else {
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
index c438be4b3..8621f6aeb 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/model/scientific/converters/QuantityConverter.kt
@@ -32,6 +32,8 @@ sealed class QuantityConverter<From : PhysicalQuantity, Result : PhysicalQuantit
         override val name: String,
         val converter: (Decimal, ScientificUnit<From>) -> ScientificValue<Result, *>
     ) : QuantityConverter<From, Result>() {
+
+        @Suppress("UNCHECKED_CAST")
         fun convert(
             value: Decimal,
             unit: ScientificUnit<*>
@@ -67,6 +69,7 @@ sealed class QuantityConverter<From : PhysicalQuantity, Result : PhysicalQuantit
             data class Custom(override val operatorSymbol: String) : Type()
         }
 
+        @Suppress("UNCHECKED_CAST")
         fun convert(
             left: Decimal,
             leftUnit: ScientificUnit<*>,

From 9d92af7e51df2694ba55c7249c02ad818617afbe Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 25 Jan 2023 11:26:07 +0100
Subject: [PATCH 131/227] Added convenience for Intent as well

---
 .../kotlin/navigation/ActivityParseExtra.kt   | 109 ++----
 .../navigation/BundleToTypedProperty.kt       |   3 +-
 .../kotlin/navigation/IntentParseExtra.kt     | 369 ++++++++++++++++++
 .../xml/XMLArchitectureActivity.kt            |   5 +-
 .../scientific/ScientificConverterActivity.kt |   3 +-
 .../ScientificUnitSelectionDialogFragment.kt  |   5 +-
 6 files changed, 419 insertions(+), 75 deletions(-)
 create mode 100644 architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt

diff --git a/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt b/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
index 0f0c236a5..32601640a 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
@@ -22,21 +22,6 @@ import android.os.Bundle
 import com.splendo.kaluga.base.utils.KalugaDate
 import kotlinx.serialization.KSerializer
 
-/**
- * Parses the [Bundle] of [android.app.Activity.getIntent] into [T] using a convert method.
- * @param convert The method for converting [Bundle] into [T]
- * @return The [T] value extracted from the [Bundle]
- * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
- */
-fun <T> Activity.parseExtra(convert: Bundle.() -> T): T = intent.extras!!.convert()
-
-/**
- * Parses the [Bundle] of [android.app.Activity.getIntent] into [T] using a convert method.
- * @param convert The method for converting [Bundle] into [T]
- * @return The [T] value extracted from the [Bundle] or `null` if [android.content.Intent.getExtras] is `null`
- */
-fun <T> Activity.parseExtraOrNull(convert: Bundle.() -> T?): T? = intent.extras?.convert()
-
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Boolean].
  * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType]
@@ -44,13 +29,13 @@ fun <T> Activity.parseExtraOrNull(convert: Bundle.() -> T?): T? = intent.extras?
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanType].
  */
-fun Activity.parseBoolean(): Boolean = parseExtra { asBoolean() }
+fun Activity.parseBoolean(): Boolean = intent.parseBoolean()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Boolean] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [Boolean] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseBooleanOrNull(): Boolean? = parseExtra { asBooleanOrNull() }
+fun Activity.parseBooleanOrNull(): Boolean? = intent.parseBooleanOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [BooleanArray].
@@ -59,13 +44,13 @@ fun Activity.parseBooleanOrNull(): Boolean? = parseExtra { asBooleanOrNull() }
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanArrayType].
  */
-fun Activity.parseBooleanArray(): BooleanArray = parseExtra { asBooleanArray() }
+fun Activity.parseBooleanArray(): BooleanArray = intent.parseBooleanArray()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [BooleanArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [BooleanArray] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseBooleanArrayOrNull(): BooleanArray? = parseExtra { asBooleanArrayOrNull() }
+fun Activity.parseBooleanArrayOrNull(): BooleanArray? = intent.parseBooleanArrayOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Byte].
@@ -74,13 +59,13 @@ fun Activity.parseBooleanArrayOrNull(): BooleanArray? = parseExtra { asBooleanAr
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteType].
  */
-fun Activity.parseByte(): Byte = parseExtra { asByte() }
+fun Activity.parseByte(): Byte = intent.parseByte()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Byte] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [Byte] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseByteOrNull(): Byte? = parseExtra { asByteOrNull() }
+fun Activity.parseByteOrNull(): Byte? = intent.parseByteOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [ByteArray].
@@ -89,13 +74,13 @@ fun Activity.parseByteOrNull(): Byte? = parseExtra { asByteOrNull() }
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType].
  */
-fun Activity.parseByteArray(): ByteArray = parseExtra { asByteArray() }
+fun Activity.parseByteArray(): ByteArray = intent.parseByteArray()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [ByteArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [ByteArray] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseByteArrayOrNull(): ByteArray? = parseExtra { asByteArrayOrNull() }
+fun Activity.parseByteArrayOrNull(): ByteArray? = intent.parseByteArrayOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Char].
@@ -104,13 +89,13 @@ fun Activity.parseByteArrayOrNull(): ByteArray? = parseExtra { asByteArrayOrNull
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharType].
  */
-fun Activity.parseChar(): Char = parseExtra { asChar() }
+fun Activity.parseChar(): Char = intent.parseChar()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Char] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [Char] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseCharOrNull(): Char? = parseExtra { asCharOrNull() }
+fun Activity.parseCharOrNull(): Char? = intent.parseCharOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [CharArray].
@@ -119,19 +104,19 @@ fun Activity.parseCharOrNull(): Char? = parseExtra { asCharOrNull() }
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharArrayType].
  */
-fun Activity.parseCharArray(): CharArray = parseExtra { asCharArray() }
+fun Activity.parseCharArray(): CharArray = intent.parseCharArray()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [CharArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [CharArray] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseCharArrayOrNull(): CharArray? = parseExtra { asCharArrayOrNull() }
+fun Activity.parseCharArrayOrNull(): CharArray? = intent.parseCharArrayOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [CharSequence] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharSequenceType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [CharSequence] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseCharSequenceOrNull(): CharSequence? = parseExtra { asCharSequenceOrNull() }
+fun Activity.parseCharSequenceOrNull(): CharSequence? = intent.parseCharSequenceOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [KalugaDate].
@@ -140,13 +125,13 @@ fun Activity.parseCharSequenceOrNull(): CharSequence? = parseExtra { asCharSeque
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateType].
  */
-fun Activity.parseDate(): KalugaDate = parseExtra { asDate() }
+fun Activity.parseDate(): KalugaDate = intent.parseDate()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [KalugaDate] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [KalugaDate] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseDateOrNull(): KalugaDate? = parseExtra { asDateOrNull() }
+fun Activity.parseDateOrNull(): KalugaDate? = intent.parseDateOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [List] of [KalugaDate].
@@ -155,13 +140,13 @@ fun Activity.parseDateOrNull(): KalugaDate? = parseExtra { asDateOrNull() }
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateArrayType].
  */
-fun Activity.parseDateArray(): List<KalugaDate> = parseExtra { asDateArray() }
+fun Activity.parseDateArray(): List<KalugaDate> = intent.parseDateArray()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [List] of [KalugaDate] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [List] of [KalugaDate] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseDateArrayOrNull(): List<KalugaDate>? = parseExtra { asDateArrayOrNull() }
+fun Activity.parseDateArrayOrNull(): List<KalugaDate>? = intent.parseDateArrayOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Double].
@@ -170,13 +155,13 @@ fun Activity.parseDateArrayOrNull(): List<KalugaDate>? = parseExtra { asDateArra
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleType].
  */
-fun Activity.parseDouble(): Double = parseExtra { asDouble() }
+fun Activity.parseDouble(): Double = intent.parseDouble()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Double] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [Double] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseDoubleOrNull(): Double? = parseExtra { asDoubleOrNull() }
+fun Activity.parseDoubleOrNull(): Double? = intent.parseDoubleOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [DoubleArray].
@@ -185,13 +170,13 @@ fun Activity.parseDoubleOrNull(): Double? = parseExtra { asDoubleOrNull() }
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleArrayType].
  */
-fun Activity.parseDoubleArray(): DoubleArray = parseExtra { asDoubleArray() }
+fun Activity.parseDoubleArray(): DoubleArray = intent.parseDoubleArray()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [DoubleArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [DoubleArray] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseDoubleArrayOrNull(): DoubleArray? = parseExtra { asDoubleArrayOrNull() }
+fun Activity.parseDoubleArrayOrNull(): DoubleArray? = intent.parseDoubleArrayOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Float].
@@ -200,13 +185,13 @@ fun Activity.parseDoubleArrayOrNull(): DoubleArray? = parseExtra { asDoubleArray
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatType].
  */
-fun Activity.parseFloat(): Float = parseExtra { asFloat() }
+fun Activity.parseFloat(): Float = intent.parseFloat()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Float] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [Float] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseFloatOrNull(): Float? = parseExtra { asFloatOrNull() }
+fun Activity.parseFloatOrNull(): Float? = intent.parseFloatOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [FloatArray].
@@ -215,13 +200,13 @@ fun Activity.parseFloatOrNull(): Float? = parseExtra { asFloatOrNull() }
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatArrayType].
  */
-fun Activity.parseFloatArray(): FloatArray = parseExtra { asFloatArray() }
+fun Activity.parseFloatArray(): FloatArray = intent.parseFloatArray()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [FloatArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [FloatArray] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseFloatArrayOrNull(): FloatArray? = parseExtra { asFloatArrayOrNull() }
+fun Activity.parseFloatArrayOrNull(): FloatArray? = intent.parseFloatArrayOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Int].
@@ -230,13 +215,13 @@ fun Activity.parseFloatArrayOrNull(): FloatArray? = parseExtra { asFloatArrayOrN
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerType].
  */
-fun Activity.parseInt(): Int = parseExtra { asInt() }
+fun Activity.parseInt(): Int = intent.parseInt()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Int] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [Int] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseIntOrNull(): Int? = parseExtra { asIntOrNull() }
+fun Activity.parseIntOrNull(): Int? = intent.parseIntOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [IntArray].
@@ -245,13 +230,13 @@ fun Activity.parseIntOrNull(): Int? = parseExtra { asIntOrNull() }
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerArrayType].
  */
-fun Activity.parseIntArray(): IntArray = parseExtra { asIntArray() }
+fun Activity.parseIntArray(): IntArray = intent.parseIntArray()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [IntArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [IntArray] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseIntArrayOrNull(): IntArray? = parseExtra { asIntArrayOrNull() }
+fun Activity.parseIntArrayOrNull(): IntArray? = intent.parseIntArrayOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Long].
@@ -260,13 +245,13 @@ fun Activity.parseIntArrayOrNull(): IntArray? = parseExtra { asIntArrayOrNull()
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongType].
  */
-fun Activity.parseLong(): Long = parseExtra { asLong() }
+fun Activity.parseLong(): Long = intent.parseLong()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Long] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [Long] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseLongOrNull(): Long? = parseExtra { asLongOrNull() }
+fun Activity.parseLongOrNull(): Long? = intent.parseLongOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [LongArray].
@@ -275,13 +260,13 @@ fun Activity.parseLongOrNull(): Long? = parseExtra { asLongOrNull() }
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongArrayType].
  */
-fun Activity.parseLongArray(): LongArray = parseExtra { asLongArray() }
+fun Activity.parseLongArray(): LongArray = intent.parseLongArray()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [LongArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [LongArray] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseLongArrayOrNull(): LongArray? = parseExtra { asLongArrayOrNull() }
+fun Activity.parseLongArrayOrNull(): LongArray? = intent.parseLongArrayOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Short].
@@ -290,13 +275,13 @@ fun Activity.parseLongArrayOrNull(): LongArray? = parseExtra { asLongArrayOrNull
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortType].
  */
-fun Activity.parseShort(): Short = parseExtra { asShort() }
+fun Activity.parseShort(): Short = intent.parseShort()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [Short] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [Short] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseShortOrNull(): Short? = parseExtra { asShortOrNull() }
+fun Activity.parseShortOrNull(): Short? = intent.parseShortOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [ShortArray].
@@ -305,13 +290,13 @@ fun Activity.parseShortOrNull(): Short? = parseExtra { asShortOrNull() }
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortArrayType].
  */
-fun Activity.parseShortArray(): ShortArray = parseExtra { asShortArray() }
+fun Activity.parseShortArray(): ShortArray = intent.parseShortArray()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [ShortArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [ShortArray] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseShortArrayOrNull(): ShortArray? = parseExtra { asShortArrayOrNull() }
+fun Activity.parseShortArrayOrNull(): ShortArray? = intent.parseShortArrayOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [String].
@@ -320,13 +305,13 @@ fun Activity.parseShortArrayOrNull(): ShortArray? = parseExtra { asShortArrayOrN
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringType].
  */
-fun Activity.parseString(): String = parseExtra { asString() }
+fun Activity.parseString(): String = intent.parseString()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [String] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [String] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseStringOrNull(): String? = parseExtra { asStringOrNull() }
+fun Activity.parseStringOrNull(): String? = intent.parseStringOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [List] of [String].
@@ -335,13 +320,13 @@ fun Activity.parseStringOrNull(): String? = parseExtra { asStringOrNull() }
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringArrayType].
  */
-fun Activity.parseStringList(): List<String> = parseExtra { asStringList() }
+fun Activity.parseStringList(): List<String> = intent.parseStringList()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [List] of [String] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @return The [List] of [String] stored in the bundle or null if no such value was found.
  */
-fun Activity.parseStringListOrNull(): List<String>? = parseExtra { asStringListOrNull() }
+fun Activity.parseStringListOrNull(): List<String>? = intent.parseStringListOrNull()
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [T].
@@ -351,19 +336,11 @@ fun Activity.parseStringListOrNull(): List<String>? = parseExtra { asStringListO
  * @throws NullPointerException if [android.content.Intent.getExtras] is `null`
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with [serializer].
  */
-fun <T> Activity.parseTypeOf(serializer: KSerializer<T>): T = parseExtra {
-    toTypedProperty(
-        NavigationBundleSpecType.SerializedType(serializer)
-    )
-}
+fun <T> Activity.parseTypeOf(serializer: KSerializer<T>): T = intent.parseTypeOf(serializer)
 
 /**
  * Parses the [Bundle] of [android.app.Activity.getIntent] into [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
  * @param serializer The [KSerializer] to deserialize [T] from the bundle.
  * @return The [T] stored in the bundle or null if no such value was found.
  */
-fun <T> Activity.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseExtraOrNull {
-    toTypedPropertyOrNull(
-        NavigationBundleSpecType.SerializedType(serializer)
-    )
-}
+fun <T> Activity.parseTypeOfOrNull(serializer: KSerializer<T>): T? = intent.parseTypeOfOrNull(serializer)
diff --git a/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt b/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
index 675d9ddf0..40c5a4ef9 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
@@ -354,5 +354,4 @@ fun <T> Bundle.asTypeOf(serializer: KSerializer<T>): T = toTypedProperty(Navigat
  * @param serializer The [KSerializer] to deserialize [T] from the bundle.
  * @return The [T] stored in the bundle or null if no such value was found.
  */
-fun <T> Bundle.asTypeOfOrNull(serializer: KSerializer<T>): T? = toTypedPropertyOrNull(
-    NavigationBundleSpecType.SerializedType(serializer))
\ No newline at end of file
+fun <T> Bundle.asTypeOfOrNull(serializer: KSerializer<T>): T? = toTypedPropertyOrNull(NavigationBundleSpecType.SerializedType(serializer))
diff --git a/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt b/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt
new file mode 100644
index 000000000..fd7a26541
--- /dev/null
+++ b/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt
@@ -0,0 +1,369 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.navigation
+
+import android.content.Intent
+import android.os.Bundle
+import com.splendo.kaluga.base.utils.KalugaDate
+import kotlinx.serialization.KSerializer
+
+/**
+ * Parses the [Bundle] of [Intent] into [T] using a convert method.
+ * @param convert The method for converting [Bundle] into [T]
+ * @return The [T] value extracted from the [Bundle]
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ */
+fun <T> Intent?.parseExtra(convert: Bundle.() -> T): T = this!!.extras!!.convert()
+
+/**
+ * Parses the [Bundle] of [Intent] into [T] using a convert method.
+ * @param convert The method for converting [Bundle] into [T]
+ * @return The [T] value extracted from the [Bundle] or `null` if [android.content.Intent?.getExtras] is `null`
+ */
+fun <T> Intent?.parseExtraOrNull(convert: Bundle.() -> T?): T? = this?.extras?.convert()
+
+/**
+ * Parses the [Bundle] of [Intent] into [Boolean].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType]
+ * @return The [Boolean] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanType].
+ */
+fun Intent?.parseBoolean(): Boolean = parseExtra { asBoolean() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Boolean] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Boolean] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseBooleanOrNull(): Boolean? = parseExtra { asBooleanOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [BooleanArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanArrayType]
+ * @return The [BooleanArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanArrayType].
+ */
+fun Intent?.parseBooleanArray(): BooleanArray = parseExtra { asBooleanArray() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [BooleanArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [BooleanArray] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseBooleanArrayOrNull(): BooleanArray? = parseExtra { asBooleanArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Byte].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteType]
+ * @return The [Byte] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteType].
+ */
+fun Intent?.parseByte(): Byte = parseExtra { asByte() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Byte] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Byte] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseByteOrNull(): Byte? = parseExtra { asByteOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [ByteArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteArrayType]
+ * @return The [ByteArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType].
+ */
+fun Intent?.parseByteArray(): ByteArray = parseExtra { asByteArray() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [ByteArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ByteArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [ByteArray] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseByteArrayOrNull(): ByteArray? = parseExtra { asByteArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Char].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharType]
+ * @return The [Char] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharType].
+ */
+fun Intent?.parseChar(): Char = parseExtra { asChar() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Char] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Char] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseCharOrNull(): Char? = parseExtra { asCharOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [CharArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharArrayType]
+ * @return The [CharArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharArrayType].
+ */
+fun Intent?.parseCharArray(): CharArray = parseExtra { asCharArray() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [CharArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [CharArray] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseCharArrayOrNull(): CharArray? = parseExtra { asCharArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [CharSequence] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.CharSequenceType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [CharSequence] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseCharSequenceOrNull(): CharSequence? = parseExtra { asCharSequenceOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [KalugaDate].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateType]
+ * @return The [KalugaDate] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateType].
+ */
+fun Intent?.parseDate(): KalugaDate = parseExtra { asDate() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [KalugaDate] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [KalugaDate] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseDateOrNull(): KalugaDate? = parseExtra { asDateOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [List] of [KalugaDate].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateArrayType]
+ * @return The [List] of [KalugaDate] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateArrayType].
+ */
+fun Intent?.parseDateArray(): List<KalugaDate> = parseExtra { asDateArray() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [List] of [KalugaDate] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DateArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [List] of [KalugaDate] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseDateArrayOrNull(): List<KalugaDate>? = parseExtra { asDateArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Double].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleType]
+ * @return The [Double] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleType].
+ */
+fun Intent?.parseDouble(): Double = parseExtra { asDouble() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Double] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Double] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseDoubleOrNull(): Double? = parseExtra { asDoubleOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [DoubleArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleArrayType]
+ * @return The [DoubleArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleArrayType].
+ */
+fun Intent?.parseDoubleArray(): DoubleArray = parseExtra { asDoubleArray() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [DoubleArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.DoubleArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [DoubleArray] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseDoubleArrayOrNull(): DoubleArray? = parseExtra { asDoubleArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Float].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatType]
+ * @return The [Float] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatType].
+ */
+fun Intent?.parseFloat(): Float = parseExtra { asFloat() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Float] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Float] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseFloatOrNull(): Float? = parseExtra { asFloatOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [FloatArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatArrayType]
+ * @return The [FloatArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatArrayType].
+ */
+fun Intent?.parseFloatArray(): FloatArray = parseExtra { asFloatArray() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [FloatArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.FloatArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [FloatArray] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseFloatArrayOrNull(): FloatArray? = parseExtra { asFloatArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Int].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerType]
+ * @return The [Int] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerType].
+ */
+fun Intent?.parseInt(): Int = parseExtra { asInt() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Int] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Int] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseIntOrNull(): Int? = parseExtra { asIntOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [IntArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerArrayType]
+ * @return The [IntArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerArrayType].
+ */
+fun Intent?.parseIntArray(): IntArray = parseExtra { asIntArray() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [IntArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.IntegerArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [IntArray] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseIntArrayOrNull(): IntArray? = parseExtra { asIntArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Long].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongType]
+ * @return The [Long] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongType].
+ */
+fun Intent?.parseLong(): Long = parseExtra { asLong() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Long] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Long] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseLongOrNull(): Long? = parseExtra { asLongOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [LongArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongArrayType]
+ * @return The [LongArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongArrayType].
+ */
+fun Intent?.parseLongArray(): LongArray = parseExtra { asLongArray() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [LongArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.LongArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [LongArray] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseLongArrayOrNull(): LongArray? = parseExtra { asLongArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Short].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortType]
+ * @return The [Short] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortType].
+ */
+fun Intent?.parseShort(): Short = parseExtra { asShort() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [Short] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [Short] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseShortOrNull(): Short? = parseExtra { asShortOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [ShortArray].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortArrayType]
+ * @return The [ShortArray] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortArrayType].
+ */
+fun Intent?.parseShortArray(): ShortArray = parseExtra { asShortArray() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [ShortArray] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.ShortArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [ShortArray] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseShortArrayOrNull(): ShortArray? = parseExtra { asShortArrayOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [String].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringType]
+ * @return The [String] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringType].
+ */
+fun Intent?.parseString(): String = parseExtra { asString() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [String] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [String] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseStringOrNull(): String? = parseExtra { asStringOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [List] of [String].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringArrayType]
+ * @return The [List] of [String] stored in the bundle
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringArrayType].
+ */
+fun Intent?.parseStringList(): List<String> = parseExtra { asStringList() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [List] of [String] if it is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.StringArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @return The [List] of [String] stored in the bundle or null if no such value was found.
+ */
+fun Intent?.parseStringListOrNull(): List<String>? = parseExtra { asStringListOrNull() }
+
+/**
+ * Parses the [Bundle] of [Intent] into [T].
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer]
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle.
+ * @throws NullPointerException if [android.content.Intent?.getExtras] is `null`
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with [serializer].
+ */
+fun <T> Intent?.parseTypeOf(serializer: KSerializer<T>): T = parseExtra {
+    toTypedProperty(
+        NavigationBundleSpecType.SerializedType(serializer)
+    )
+}
+
+/**
+ * Parses the [Bundle] of [Intent] into [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle or null if no such value was found.
+ */
+fun <T> Intent?.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseExtraOrNull {
+    toTypedPropertyOrNull(
+        NavigationBundleSpecType.SerializedType(serializer)
+    )
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt
index 2bab6aa53..ebca09170 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/xml/XMLArchitectureActivity.kt
@@ -23,9 +23,8 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContract
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.navigation.parseTypeOfOrNull
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityArchitectureInputBinding
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureNavigationAction
@@ -44,7 +43,7 @@ class XMLArchitectureActivity : KalugaViewModelActivity<ArchitectureViewModel>()
             resultCode: Int,
             intent: Intent?
         ): InputDetails? {
-            return intent?.extras?.toTypedProperty(NavigationBundleSpecType.SerializedType(InputDetails.serializer()))
+            return intent.parseTypeOfOrNull(InputDetails.serializer())
         }
     }
 
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt
index fcaa9bfda..968f0c501 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt
@@ -21,6 +21,7 @@ import android.os.Bundle
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
+import com.splendo.kaluga.architecture.navigation.parseTypeOf
 import com.splendo.kaluga.architecture.navigation.toTypedProperty
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
 import com.splendo.kaluga.example.databinding.ActivityScientificConverterBinding
@@ -45,7 +46,7 @@ class ScientificConverterActivity : KalugaViewModelActivity<ScientificConverterV
 
     override val viewModel: ScientificConverterViewModel by viewModel {
         parametersOf(
-            intent.extras!!.toTypedProperty(NavigationBundleSpecType.SerializedType(ScientificConverterViewModel.Arguments.serializer())),
+            parseTypeOf(ScientificConverterViewModel.Arguments.serializer()),
             ActivityNavigator<ScientificConverterNavigationAction<*>> { action ->
                 when (action) {
                     is ScientificConverterNavigationAction.Close -> NavigationSpec.Close()
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt
index 83e57a5df..3da9e61fd 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/scientific/ScientificUnitSelectionDialogFragment.kt
@@ -24,9 +24,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.navigation.parseTypeOfOrNull
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelDialogFragment
 import com.splendo.kaluga.example.databinding.DialogScientificUnitSelectionBinding
 import com.splendo.kaluga.example.shared.viewmodel.scientific.ScientificUnitSelectionAction
@@ -48,7 +47,7 @@ abstract class ScientificUnitSelectionDialogFragment : KalugaViewModelDialogFrag
 
     override val viewModel: ScientificUnitSelectionViewModel by viewModel {
         parametersOf(
-            requireArguments().toTypedProperty(NavigationBundleSpecType.SerializedType(PhysicalQuantity.serializer())),
+            parseTypeOfOrNull(PhysicalQuantity.serializer()),
             ActivityNavigator<ScientificUnitSelectionAction<*>> { action ->
                 when (action) {
                     is ScientificUnitSelectionAction.Cancelled -> NavigationSpec.DismissDialog(TAG)

From d315b41dc04d04f61a8927a48651937bc41fc6da Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 25 Jan 2023 11:35:48 +0100
Subject: [PATCH 132/227] Track KalugaSwiftUI

---
 example/ios/Kaluga-SwiftUI | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 9335df3ad..93783021e 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 9335df3ad4ce420e3fe74dfc9b7073f5ffce078f
+Subproject commit 93783021e2e6a0a0de0e9b82f1aa3c80f81ebf33

From 0ec5215523f344fd4ca045c33c69e8ceb9a6c79a Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 25 Jan 2023 11:59:00 +0100
Subject: [PATCH 133/227] Improvements to GoogleLocationProvider

---
 location/api/androidLib/location.api          | 43 +++++++----------
 .../kotlin/location/GoogleLocationProvider.kt | 47 ++++++++++++++-----
 2 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/location/api/androidLib/location.api b/location/api/androidLib/location.api
index 0eec9c6fb..4a47f4fc7 100644
--- a/location/api/androidLib/location.api
+++ b/location/api/androidLib/location.api
@@ -111,38 +111,31 @@ public final class com/splendo/kaluga/location/DefaultLocationMonitor : com/sple
 }
 
 public final class com/splendo/kaluga/location/GoogleLocationProvider : com/splendo/kaluga/location/LocationProvider {
-	public fun <init> (Landroid/content/Context;)V
+	public fun <init> (Landroid/content/Context;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;)V
+	public synthetic fun <init> (Landroid/content/Context;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun location (Lcom/splendo/kaluga/permissions/location/LocationPermission;)Lkotlinx/coroutines/flow/Flow;
 	public fun startMonitoringLocation (Lcom/splendo/kaluga/permissions/location/LocationPermission;)V
 	public fun stopMonitoringLocation (Lcom/splendo/kaluga/permissions/location/LocationPermission;)V
 }
 
-public abstract class com/splendo/kaluga/location/GoogleLocationProvider$FusedLocationProviderClientType {
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Landroid/content/Context;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	protected final fun getContext ()Landroid/content/Context;
-	protected final fun getFusedLocationProviderClient ()Lcom/google/android/gms/location/FusedLocationProviderClient;
-	protected final fun getLocationRequest ()Lcom/google/android/gms/location/LocationRequest;
-	public final fun getLocations ()Lkotlinx/coroutines/flow/Flow;
-	protected final fun getLocationsState ()Lkotlinx/coroutines/flow/MutableStateFlow;
-	public abstract fun startRequestingUpdates ()V
-	public abstract fun stopRequestingUpdates ()V
-}
-
-public final class com/splendo/kaluga/location/GoogleLocationProvider$FusedLocationProviderClientType$Background : com/splendo/kaluga/location/GoogleLocationProvider$FusedLocationProviderClientType {
-	public static final field Companion Lcom/splendo/kaluga/location/GoogleLocationProvider$FusedLocationProviderClientType$Background$Companion;
-	public fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Landroid/content/Context;)V
-	public fun startRequestingUpdates ()V
-	public fun stopRequestingUpdates ()V
-}
-
-public final class com/splendo/kaluga/location/GoogleLocationProvider$FusedLocationProviderClientType$Background$Companion {
-	public final fun getUpdatingLocationInBackgroundManagers ()Ljava/util/Map;
+public final class com/splendo/kaluga/location/GoogleLocationProvider$Settings {
+	public static final field Companion Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings$Companion;
+	public synthetic fun <init> (JJJLkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1-UwyO8pc ()J
+	public final fun component2-UwyO8pc ()J
+	public final fun component3-UwyO8pc ()J
+	public final fun copy-WzaCiaA (JJJ)Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;
+	public static synthetic fun copy-WzaCiaA$default (Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;JJJILjava/lang/Object;)Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getInterval-UwyO8pc ()J
+	public final fun getMaxUpdateDelay-UwyO8pc ()J
+	public final fun getMinUpdateInterval-UwyO8pc ()J
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/location/GoogleLocationProvider$FusedLocationProviderClientType$Foreground : com/splendo/kaluga/location/GoogleLocationProvider$FusedLocationProviderClientType {
-	public fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Landroid/content/Context;)V
-	public fun startRequestingUpdates ()V
-	public fun stopRequestingUpdates ()V
+public final class com/splendo/kaluga/location/GoogleLocationProvider$Settings$Companion {
+	public final fun getDefault ()Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;
 }
 
 public final class com/splendo/kaluga/location/GoogleLocationUpdatesBroadcastReceiver : android/content/BroadcastReceiver {
diff --git a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
index 3b1fcf491..8dcd6476f 100644
--- a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
@@ -33,17 +33,42 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * A [LocationProvider] using the Google Location Services
+ * @param context The [Context] to run this [LocationProvider] in.
+ * @param settings The [GoogleLocationProvider.Settings] to use to configure this location provider.
+ */
+class GoogleLocationProvider(private val context: Context, private val settings: Settings = Settings.default) : LocationProvider {
+
+    /**
+     * Settings for a [GoogleLocationProvider]
+     * @param interval The desired interval of location updates.
+     * @param maxUpdateDelay The longest a location update may be delayed.
+     * @param minUpdateInterval The fastest allowed interval of location updates.
+     */
+    data class Settings(
+        val interval: Duration,
+        val maxUpdateDelay: Duration,
+        val minUpdateInterval: Duration
+    ) {
+        companion object {
+            val default = Settings(interval = 1.milliseconds, maxUpdateDelay = 1.seconds, minUpdateInterval = 1.milliseconds)
+        }
+    }
 
-class GoogleLocationProvider(private val context: Context) : LocationProvider {
-
-    sealed class FusedLocationProviderClientType(
+    internal sealed class FusedLocationProviderClientType(
         permission: LocationPermission,
-        protected val context: Context
+        context: Context,
+        settings: Settings
     ) {
         protected val fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context)
-        protected val locationRequest = LocationRequest.Builder(1)
-            .setMaxUpdateDelayMillis(1000)
-            .setMinUpdateIntervalMillis(1)
+        protected val locationRequest = LocationRequest.Builder(settings.interval.inWholeMilliseconds)
+            .setMaxUpdateDelayMillis(settings.maxUpdateDelay.inWholeMilliseconds)
+            .setMinUpdateIntervalMillis(settings.minUpdateInterval.inWholeMilliseconds)
             .setPriority(
                 if (permission.precise)
                     Priority.PRIORITY_HIGH_ACCURACY
@@ -57,7 +82,7 @@ class GoogleLocationProvider(private val context: Context) : LocationProvider {
         abstract fun startRequestingUpdates()
         abstract fun stopRequestingUpdates()
 
-        class Foreground(permission: LocationPermission, context: Context) : FusedLocationProviderClientType(permission, context) {
+        class Foreground(permission: LocationPermission, context: Context, settings: Settings) : FusedLocationProviderClientType(permission, context, settings) {
 
             private val locationCallback = object : LocationCallback() {
 
@@ -78,7 +103,7 @@ class GoogleLocationProvider(private val context: Context) : LocationProvider {
             }
         }
 
-        class Background(permission: LocationPermission, context: Context) : FusedLocationProviderClientType(permission, context) {
+        class Background(permission: LocationPermission, context: Context, settings: Settings) : FusedLocationProviderClientType(permission, context, settings) {
 
             private val identifier = hashCode().toString()
 
@@ -122,9 +147,9 @@ class GoogleLocationProvider(private val context: Context) : LocationProvider {
     private fun getLocationProviderForPermission(permission: LocationPermission): FusedLocationProviderClientType {
         return fusedLocationProviderClients.value[permission] ?: run {
             val fusedLocationProviderClient = if (permission.background) {
-                FusedLocationProviderClientType.Background(permission, context)
+                FusedLocationProviderClientType.Background(permission, context, settings)
             } else {
-                FusedLocationProviderClientType.Foreground(permission, context)
+                FusedLocationProviderClientType.Foreground(permission, context, settings)
             }
 
             fusedLocationProviderClients.value = fusedLocationProviderClients.value.toMutableMap().apply {

From 820a4f10a805ae95513b0a7530d4d5db712ea3ed Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 25 Jan 2023 12:38:37 +0100
Subject: [PATCH 134/227] Renamed some generics for clarity/consistency

---
 .../ComposableLifecycleSubscribable.kt        |  2 +-
 .../compose/navigation/ComposableNavSpec.kt   | 82 +++++++++----------
 .../KalugaViewModelComposeActivity.kt         | 12 +--
 .../compose/viewModel/ViewModelComposable.kt  | 12 +--
 .../kotlin/navigation/NavigationBundle.kt     |  4 +-
 .../kotlin/navigation/Navigator.kt            |  8 +-
 .../viewmodel/KalugaViewModelActivity.kt      |  4 +-
 .../KalugaViewModelDialogFragment.kt          |  8 +-
 .../KalugaViewModelLifecycleObserver.kt       |  8 +-
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  4 +-
 .../viewmodel/ViewModelLifecycleManager.kt    |  4 +-
 .../src/commonMain/kotlin/ViewModelTest.kt    | 36 ++++----
 .../commonMain/kotlin/ui_thread_testing.kt    | 16 ++--
 .../kotlin/KoinUIThreadViewModelTest.kt       | 16 ++--
 test-utils/src/commonMain/kotlin/legacy.kt    | 28 +++----
 15 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
index 61595ed9a..d6d8a7828 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
@@ -31,7 +31,7 @@ interface ComposableLifecycleSubscribable : LifecycleSubscribable {
 }
 
 @Composable
-internal fun <VM : BaseLifecycleViewModel> VM.composableLifecycleSubscribable(): State<List<ComposableLifecycleSubscribable>> = remember {
+internal fun <ViewModel : BaseLifecycleViewModel> ViewModel.composableLifecycleSubscribable(): State<List<ComposableLifecycleSubscribable>> = remember {
     activeLifecycleSubscribables.map { list ->
         list.mapNotNull { it as? ComposableLifecycleSubscribable }
     }
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
index 6f224ad71..486e358db 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
@@ -54,8 +54,8 @@ sealed class ComposableNavSpec {
          * @param uri The [Uri] where the taken picture should be stored.
          * @param onResult Returns `true` if a picture was taken successfully.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> TakePicture(uri: Uri?, noinline onResult: VM.(Boolean) -> Unit) = Launcher(
-            VM::class,
+        inline fun <reified ViewModel : BaseLifecycleViewModel> TakePicture(uri: Uri?, noinline onResult: ViewModel.(Boolean) -> Unit) = Launcher(
+            ViewModel::class,
             ActivityResultContracts.TakePicture(),
             { uri },
             onResult
@@ -66,8 +66,8 @@ sealed class ComposableNavSpec {
          * @param uri The [Uri] where the captured video should be stored.
          * @param onResult Returns `true` if a video was captured successfully.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> CaptureVideo(uri: Uri?, noinline onResult: VM.(Boolean) -> Unit) = Launcher(
-            VM::class,
+        inline fun <reified ViewModel : BaseLifecycleViewModel> CaptureVideo(uri: Uri?, noinline onResult: ViewModel.(Boolean) -> Unit) = Launcher(
+            ViewModel::class,
             ActivityResultContracts.CaptureVideo(),
             { uri },
             onResult
@@ -84,11 +84,11 @@ sealed class ComposableNavSpec {
          * @param type The [ActivityResultContracts.PickVisualMedia.VisualMediaType] to be selected.
          * @param onResult Returns an [Uri] of the image or video selected, or `null` if nothing was selected.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> PickVisualMedia(
+        inline fun <reified ViewModel : BaseLifecycleViewModel> PickVisualMedia(
             type: ActivityResultContracts.PickVisualMedia.VisualMediaType = ActivityResultContracts.PickVisualMedia.ImageAndVideo,
-            noinline onResult: VM.(Uri?) -> Unit
+            noinline onResult: ViewModel.(Uri?) -> Unit
         ) = Launcher(
-            VM::class,
+            ViewModel::class,
             ActivityResultContracts.PickVisualMedia(),
             { PickVisualMediaRequest(mediaType = type) },
             onResult
@@ -99,12 +99,12 @@ sealed class ComposableNavSpec {
          * @param type The [ActivityResultContracts.PickVisualMedia.VisualMediaType] to be selected.
          * @param onResult Returns a list of [Uri] of the images or videos selected.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> PickMultipleVisualMedia(
+        inline fun <reified ViewModel : BaseLifecycleViewModel> PickMultipleVisualMedia(
             maxItems: Int? = null,
             type: ActivityResultContracts.PickVisualMedia.VisualMediaType = ActivityResultContracts.PickVisualMedia.ImageAndVideo,
-            noinline onResult: VM.(List<Uri>) -> Unit
+            noinline onResult: ViewModel.(List<Uri>) -> Unit
         ) = Launcher(
-            VM::class,
+            ViewModel::class,
             maxItems?.let { ActivityResultContracts.PickMultipleVisualMedia(it) } ?: ActivityResultContracts.PickMultipleVisualMedia(),
             { PickVisualMediaRequest(mediaType = type) },
             onResult
@@ -115,8 +115,8 @@ sealed class ComposableNavSpec {
          * @param types List of mime types allowed to be selected.
          * @param onResult Returns an [Uri] of the file selected, or `null` if nothing was selected.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> OpenDocument(types: List<String>, noinline onResult: VM.(Uri?) -> Unit) = Launcher(
-            VM::class,
+        inline fun <reified ViewModel : BaseLifecycleViewModel> OpenDocument(types: List<String>, noinline onResult: ViewModel.(Uri?) -> Unit) = Launcher(
+            ViewModel::class,
             ActivityResultContracts.OpenDocument(),
             { types.toTypedArray() },
             onResult
@@ -127,8 +127,8 @@ sealed class ComposableNavSpec {
          * @param types List of mime types allowed to be selected.
          * @param onResult Returns a list of [Uri] of the documents selected.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> OpenMultipleDocument(types: List<String>, noinline onResult: VM.(List<Uri>) -> Unit) = Launcher(
-            VM::class,
+        inline fun <reified ViewModel : BaseLifecycleViewModel> OpenMultipleDocument(types: List<String>, noinline onResult: ViewModel.(List<Uri>) -> Unit) = Launcher(
+            ViewModel::class,
             ActivityResultContracts.OpenMultipleDocuments(),
             { types.toTypedArray() },
             onResult
@@ -140,8 +140,8 @@ sealed class ComposableNavSpec {
          * @param mimeType The mime type of the file.
          * @param onResult Returns the [Uri] of the document created.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> CreateDocument(fileName: String, mimeType: String, noinline onResult: VM.(Uri?) -> Unit) = Launcher(
-            VM::class,
+        inline fun <reified ViewModel : BaseLifecycleViewModel> CreateDocument(fileName: String, mimeType: String, noinline onResult: ViewModel.(Uri?) -> Unit) = Launcher(
+            ViewModel::class,
             ActivityResultContracts.CreateDocument(mimeType),
             { fileName },
             onResult
@@ -152,8 +152,8 @@ sealed class ComposableNavSpec {
          * @param startingLocation Optional [Uri] of the folder to start in.
          * @param onResult Returns an [Uri] of the folder selected, or `null` if nothing was selected.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> OpenDocumentTree(startingLocation: Uri? = null, noinline onResult: VM.(Uri?) -> Unit) = Launcher(
-            VM::class,
+        inline fun <reified ViewModel : BaseLifecycleViewModel> OpenDocumentTree(startingLocation: Uri? = null, noinline onResult: ViewModel.(Uri?) -> Unit) = Launcher(
+            ViewModel::class,
             ActivityResultContracts.OpenDocumentTree(),
             { startingLocation },
             onResult
@@ -163,8 +163,8 @@ sealed class ComposableNavSpec {
          * Creates a [ComposableNavSpec.Launcher] to open the contacts list to select a contact.
          * @param onResult Returns an [Uri] of the contact selected, or `null` if nothing was selected.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> PickContact(noinline onResult: VM.(Uri?) -> Unit) = Launcher(
-            VM::class,
+        inline fun <reified ViewModel : BaseLifecycleViewModel> PickContact(noinline onResult: ViewModel.(Uri?) -> Unit) = Launcher(
+            ViewModel::class,
             ActivityResultContracts.PickContact(),
             { null },
             onResult
@@ -175,8 +175,8 @@ sealed class ComposableNavSpec {
          * @param permission Key of the permission to be requested. E.g. [android.Manifest.permission.ACCESS_COARSE_LOCATION].
          * @param onResult Returns `true` if the permission was granted, `false` otherwise.
          */
-        inline fun <reified VM : BaseLifecycleViewModel> RequestPermission(permission: String, noinline onResult: VM.(Boolean) -> Unit) = Launcher(
-            VM::class,
+        inline fun <reified ViewModel : BaseLifecycleViewModel> RequestPermission(permission: String, noinline onResult: ViewModel.(Boolean) -> Unit) = Launcher(
+            ViewModel::class,
             ActivityResultContracts.RequestPermission(),
             { permission },
             onResult
@@ -187,8 +187,8 @@ sealed class ComposableNavSpec {
          * @param permissions Keys of the permission to be requested. E.g. [android.Manifest.permission.ACCESS_COARSE_LOCATION].
          * @param onResult Returns map containing whether the permission was granted for each permission in [permissions].
          */
-        inline fun <reified VM : BaseLifecycleViewModel> RequestMultiplePermissions(permissions: List<String>, noinline onResult: VM.(Map<String, Boolean>) -> Unit) = Launcher(
-            VM::class,
+        inline fun <reified ViewModel : BaseLifecycleViewModel> RequestMultiplePermissions(permissions: List<String>, noinline onResult: ViewModel.(Map<String, Boolean>) -> Unit) = Launcher(
+            ViewModel::class,
             ActivityResultContracts.RequestMultiplePermissions(),
             { permissions.toTypedArray() },
             onResult
@@ -280,11 +280,11 @@ sealed class ComposableNavSpec {
      * @param getInput The input to be provided to [activityResultContract]
      * @param onResult Callback to handle the result of [activityResultContract]
      */
-    data class Launcher<VM : BaseLifecycleViewModel, I, O>(
-        val viewModelClass: KClass<VM>,
-        val activityResultContract: ActivityResultContract<I, O>,
-        val getInput: @Composable () -> I?,
-        val onResult: VM.(O) -> Unit
+    data class Launcher<ViewModel : BaseLifecycleViewModel, Input, Output>(
+        val viewModelClass: KClass<ViewModel>,
+        val activityResultContract: ActivityResultContract<Input, Output>,
+        val getInput: @Composable () -> Input?,
+        val onResult: ViewModel.(Output) -> Unit
     ) : LaunchedNavigation() {
 
         @Composable
@@ -379,10 +379,10 @@ sealed class ComposableNavSpec {
  * @param activityResultContract The [ActivityResultContract] to launch.
  * @param onResult The result received after the launched screen has completed.
  */
-inline fun <reified VM : BaseLifecycleViewModel, I, O> SingleValueNavigationAction<I>.Launcher(
-    activityResultContract: ActivityResultContract<I, O>,
-    noinline onResult: VM.(O) -> Unit
-) = ComposableNavSpec.Launcher(VM::class, activityResultContract, { value }, onResult)
+inline fun <reified ViewModel : BaseLifecycleViewModel, Input, Output> SingleValueNavigationAction<Input>.Launcher(
+    activityResultContract: ActivityResultContract<Input, Output>,
+    noinline onResult: ViewModel.(Output) -> Unit
+) = ComposableNavSpec.Launcher(ViewModel::class, activityResultContract, { value }, onResult)
 
 /**
  * Creates a [ComposableNavSpec.Launcher] that takes an [Intent] containing the [NavigationAction.bundle] as the input of its [ActivityResultContract].
@@ -390,14 +390,14 @@ inline fun <reified VM : BaseLifecycleViewModel, I, O> SingleValueNavigationActi
  * @param flags A set of [IntentFlag] to be applied to the next screen.
  * @param onResult The result received after the launched screen has completed.
  */
-inline fun <reified A : Activity, reified VM : BaseLifecycleViewModel, O> NavigationAction<*>.Launcher(
-    activityResultContract: ActivityResultContract<Intent, O>,
+inline fun <reified Activity : android.app.Activity, reified ViewModel : BaseLifecycleViewModel, Output> NavigationAction<*>.Launcher(
+    activityResultContract: ActivityResultContract<Intent, Output>,
     flags: Set<IntentFlag> = emptySet(),
-    noinline onResult: VM.(O) -> Unit
-): ComposableNavSpec.Launcher<VM, Intent, O> {
+    noinline onResult: ViewModel.(Output) -> Unit
+): ComposableNavSpec.Launcher<ViewModel, Intent, Output> {
     val getInput = @Composable {
         LocalContext.current.activity?.let { activity ->
-            Intent(activity, A::class.java).apply {
+            Intent(activity, Activity::class.java).apply {
                 bundle?.let {
                     putExtras(it.toBundle())
                 }
@@ -405,17 +405,17 @@ inline fun <reified A : Activity, reified VM : BaseLifecycleViewModel, O> Naviga
             }
         }
     }
-    return ComposableNavSpec.Launcher(VM::class, activityResultContract, getInput, onResult)
+    return ComposableNavSpec.Launcher(ViewModel::class, activityResultContract, getInput, onResult)
 }
 
 /**
  * Creates a [ComposableNavSpec.IntentLauncher] to show a given [Activity]
  * @param flags A set of [IntentFlag] to be applied to the next screen.
  */
-inline fun <reified A : Activity> NavigationAction<*>.ShowActivity(
+inline fun <reified Activity : android.app.Activity> NavigationAction<*>.ShowActivity(
     flags: Set<IntentFlag> = emptySet()
 ) = ComposableNavSpec.IntentLauncher {
-    Intent(this, A::class.java).apply {
+    Intent(this, Activity::class.java).apply {
         bundle?.let {
             putExtras(it.toBundle())
         }
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
index b69797c79..a37f4a66d 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity.kt
@@ -31,10 +31,10 @@ import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 val LocalAppCompatActivity = staticCompositionLocalOf<AppCompatActivity?> { null }
 
 /**
- * An implementation of [AppCompatActivity] which creates a [VM] and renders it using [ViewModelComposable].
+ * An implementation of [AppCompatActivity] which creates a [ViewModel] and renders it using [ViewModelComposable].
  * Also provides a reference to this [AppCompatActivity] using [LocalAppCompatActivity].
  */
-abstract class KalugaViewModelComposeActivity<VM : BaseLifecycleViewModel> : AppCompatActivity() {
+abstract class KalugaViewModelComposeActivity<ViewModel : BaseLifecycleViewModel> : AppCompatActivity() {
 
     @SuppressLint("MissingSuperCall") // Lint bug
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -62,14 +62,14 @@ abstract class KalugaViewModelComposeActivity<VM : BaseLifecycleViewModel> : App
     }
 
     /**
-     * Creates the [VM]. Vms should be stores so they can be retained, e.g using [androidx.lifecycle.viewmodel.compose.viewModel]
+     * Creates the [ViewModel]. Vms should be stores so they can be retained, e.g using [androidx.lifecycle.viewmodel.compose.viewModel]
      */
     @Composable
-    protected abstract fun createViewModel(): VM
+    protected abstract fun createViewModel(): ViewModel
 
     /**
-     * Creates the layout associated with a [VM]
+     * Creates the layout associated with a [ViewModel]
      */
     @Composable
-    protected abstract fun VM.Layout()
+    protected abstract fun ViewModel.Layout()
 }
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index b06e63fba..3e0118ac1 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -89,7 +89,7 @@ private fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
     "Does not work for configuration changes (e.g. rotation).",
     replaceWith = ReplaceWith("viewModel()", "androidx.lifecycle.viewmodel.compose.viewModel")
 )
-fun <VM : BaseLifecycleViewModel> store(provider: @Composable () -> VM): VM =
+fun <ViewModel : BaseLifecycleViewModel> store(provider: @Composable () -> ViewModel): ViewModel =
     provider().also { handleLocalViewModelStore(it) }
 
 /**
@@ -103,7 +103,7 @@ fun <VM : BaseLifecycleViewModel> store(provider: @Composable () -> VM): VM =
     replaceWith = ReplaceWith("viewModel()", "androidx.lifecycle.viewmodel.compose.viewModel")
 )
 @Suppress("Deprecation")
-fun <VM : BaseLifecycleViewModel> storeAndRemember(provider: @DisallowComposableCalls () -> VM): VM = store {
+fun <ViewModel : BaseLifecycleViewModel> storeAndRemember(provider: @DisallowComposableCalls () -> ViewModel): ViewModel = store {
     remember(provider)
 }
 
@@ -118,12 +118,12 @@ fun <VM : BaseLifecycleViewModel> storeAndRemember(provider: @DisallowComposable
     replaceWith = ReplaceWith("viewModel()", "androidx.lifecycle.viewmodel.compose.viewModel")
 )
 @Suppress("Deprecation")
-fun <VM : BaseLifecycleViewModel> storeAndRemember(key: Any?, provider: @DisallowComposableCalls () -> VM): VM = store {
+fun <ViewModel : BaseLifecycleViewModel> storeAndRemember(key: Any?, provider: @DisallowComposableCalls () -> ViewModel): ViewModel = store {
     remember(key, provider)
 }
 
 @Composable
-private fun <VM : BaseLifecycleViewModel> handleLocalViewModelStore(viewModel: VM): VM {
+private fun <ViewModel : BaseLifecycleViewModel> handleLocalViewModelStore(viewModel: ViewModel): ViewModel {
     // we delegate VM cleanup to the ViewModelStore, which lives in scope of the current @Composable
     val viewModelStoreOwner = rememberComposableViewModelStoreOwner(viewModel)
 
@@ -160,7 +160,7 @@ private fun rememberComposableViewModelStoreOwner(viewModel: BaseLifecycleViewMo
 }
 
 @Composable
-private fun <VM : BaseLifecycleViewModel> VM.linkLifecycle(activity: AppCompatActivity?, fragmentManager: FragmentManager): VM {
+private fun <ViewModel : BaseLifecycleViewModel> ViewModel.linkLifecycle(activity: AppCompatActivity?, fragmentManager: FragmentManager): ViewModel {
     val lifecycle = LocalLifecycleOwner.current.lifecycle
     DisposableEffect(Unit) {
         val observer = VmObserver(this@linkLifecycle, activity, fragmentManager)
@@ -174,7 +174,7 @@ private fun <VM : BaseLifecycleViewModel> VM.linkLifecycle(activity: AppCompatAc
     return this
 }
 
-private class VmObserver<VM : BaseLifecycleViewModel>(private val viewModel: VM, activity: AppCompatActivity?, fragmentManager: FragmentManager) : DefaultLifecycleObserver {
+private class VmObserver<ViewModel : BaseLifecycleViewModel>(private val viewModel: ViewModel, activity: AppCompatActivity?, fragmentManager: FragmentManager) : DefaultLifecycleObserver {
 
     private val manager = LifecycleSubscribableManager(viewModel, activity, fragmentManager)
     private var resumed = false
diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
index 290ab017b..dbf42773c 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
@@ -24,7 +24,7 @@ import com.splendo.kaluga.base.utils.DefaultKalugaDate
  * Converts a [NavigationBundle] to a [Bundle]
  * @return The converted [Bundle]
  */
-fun <R : NavigationBundleSpecRow<*>> NavigationBundle<R>.toBundle(): Bundle {
+fun <Row : NavigationBundleSpecRow<*>> NavigationBundle<Row>.toBundle(): Bundle {
     val bundle = Bundle()
 
     values.entries.forEach { (key, value) ->
@@ -70,7 +70,7 @@ internal fun mapValue(key: String, value: NavigationBundleValue<*>, bundle: Bund
  * @param spec The [NavigationBundleSpec] used to create the [NavigationBundle]
  * @throws [BundleConversionError] if the [Bundle] does not contain the correct keys or values associated with the [NavigationBundleSpec]
  */
-fun <R : NavigationBundleSpecRow<*>> Bundle.toNavigationBundle(spec: NavigationBundleSpec<R>): NavigationBundle<R> {
+fun <Row : NavigationBundleSpecRow<*>> Bundle.toNavigationBundle(spec: NavigationBundleSpec<Row>): NavigationBundle<Row> {
     return NavigationBundle(
         spec,
         spec.rows.associate { row ->
diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index 4ecae4c44..bdf168b7e 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -29,8 +29,8 @@ import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscriber
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
-actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
-    actual fun navigate(action: A)
+actual interface Navigator<Action : NavigationAction<*>> : LifecycleSubscribable {
+    actual fun navigate(action: Action)
 }
 
 object MissingLifecycleManagerNavigationException : NavigationException("LifecycleManager not attached")
@@ -42,9 +42,9 @@ object MissingActivityNavigationException : NavigationException("LifecycleManage
  * Requires to be subscribed to an activity via [subscribe] to work
  * @param navigationMapper A function mapping the [NavigationAction] to [NavigationSpec]
  */
-class ActivityNavigator<A : NavigationAction<*>>(private val navigationMapper: (A) -> NavigationSpec) : Navigator<A>, ActivityLifecycleSubscribable by ActivityLifecycleSubscriber() {
+class ActivityNavigator<Action : NavigationAction<*>>(private val navigationMapper: (Action) -> NavigationSpec) : Navigator<Action>, ActivityLifecycleSubscribable by ActivityLifecycleSubscriber() {
 
-    override fun navigate(action: A) {
+    override fun navigate(action: Action) {
         navigate(navigationMapper.invoke(action), action.bundle)
     }
 
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelActivity.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelActivity.kt
index f6e6b73be..e9972652b 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelActivity.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelActivity.kt
@@ -24,9 +24,9 @@ import androidx.appcompat.app.AppCompatActivity
 /**
  * Convenience [AppCompatActivity] that is bound to a [LifecycleViewModel]
  */
-abstract class KalugaViewModelActivity<VM : BaseLifecycleViewModel>(@LayoutRes layout: Int = 0) : AppCompatActivity(layout) {
+abstract class KalugaViewModelActivity<ViewModel : BaseLifecycleViewModel>(@LayoutRes layout: Int = 0) : AppCompatActivity(layout) {
 
-    abstract val viewModel: VM
+    abstract val viewModel: ViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt
index aa55c4c82..5cb8a294d 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelDialogFragment.kt
@@ -25,9 +25,9 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 /**
  * Convenience [DialogFragment] that is bound to a [LifecycleViewModel]
  */
-abstract class KalugaViewModelDialogFragment<VM : BaseLifecycleViewModel> : DialogFragment() {
+abstract class KalugaViewModelDialogFragment<ViewModel : BaseLifecycleViewModel> : DialogFragment() {
 
-    abstract val viewModel: VM
+    abstract val viewModel: ViewModel
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -38,9 +38,9 @@ abstract class KalugaViewModelDialogFragment<VM : BaseLifecycleViewModel> : Dial
 /**
  * Convenience [BottomSheetDialogFragment] that is bound to a [LifecycleViewModel]
  */
-abstract class KalugaViewModelBottomSheetDialogFragment<VM : BaseLifecycleViewModel> : BottomSheetDialogFragment() {
+abstract class KalugaViewModelBottomSheetDialogFragment<ViewModel : BaseLifecycleViewModel> : BottomSheetDialogFragment() {
 
-    abstract val viewModel: VM
+    abstract val viewModel: ViewModel
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
index 051321f1d..2f94a32b2 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
@@ -34,8 +34,8 @@ import kotlinx.coroutines.flow.runningFold
  * @param activity The [Activity] managing the lifecycle
  * @param fragmentManager The [FragmentManager] for this lifecycle
  */
-class KalugaViewModelLifecycleObserver<VM : BaseLifecycleViewModel> internal constructor(
-    private val viewModel: VM,
+class KalugaViewModelLifecycleObserver<ViewModel : BaseLifecycleViewModel> internal constructor(
+    private val viewModel: ViewModel,
     private val activity: Activity?,
     private val fragmentManager: FragmentManager,
     childFragmentManager: FragmentManager? = null
@@ -60,8 +60,8 @@ class KalugaViewModelLifecycleObserver<VM : BaseLifecycleViewModel> internal con
     }
 }
 
-class LifecycleSubscribableManager<VM : BaseLifecycleViewModel>(
-    private val viewModel: VM,
+class LifecycleSubscribableManager<ViewModel : BaseLifecycleViewModel>(
+    private val viewModel: ViewModel,
     private val activity: Activity?,
     private val fragmentManager: FragmentManager,
     private val childFragmentManager: FragmentManager? = null
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
index afa9024e2..68c4b364c 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -34,7 +34,7 @@ actual open class LifecycleViewModel internal actual constructor() : androidx.li
  * Binds an [AppCompatActivity] to the [LifecycleViewModel] to manage the viewmodel lifecycle.
  * @param activity The [AppCompatActivity] to bind to.
  */
-fun <VM : BaseLifecycleViewModel> VM.bind(activity: AppCompatActivity) {
+fun <ViewModel : BaseLifecycleViewModel> ViewModel.bind(activity: AppCompatActivity) {
     activity.lifecycle.addObserver(KalugaViewModelLifecycleObserver(this, activity, activity.supportFragmentManager))
 }
 
@@ -42,7 +42,7 @@ fun <VM : BaseLifecycleViewModel> VM.bind(activity: AppCompatActivity) {
  * Binds a [Fragment] to the [LifecycleViewModel] to manage the viewmodel lifecycle
  * @param fragment The [Fragment] to bind to.
  */
-fun <VM : BaseLifecycleViewModel> VM.bind(fragment: Fragment) =
+fun <ViewModel : BaseLifecycleViewModel> ViewModel.bind(fragment: Fragment) =
     fragment.lifecycle.addObserver(
         KalugaViewModelLifecycleObserver(
             viewModel = this,
diff --git a/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt b/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
index 9b95932a0..03a8d6b35 100644
--- a/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
+++ b/architecture/src/iosMain/kotlin/viewmodel/ViewModelLifecycleManager.kt
@@ -53,7 +53,7 @@ class LifecycleManager internal constructor(clearViewModel: () -> Unit) {
  */
 typealias onLifeCycleChanged = () -> List<Disposable>
 
-internal class ViewModelLifecycleManager<VM : BaseLifecycleViewModel>(private val viewModel: VM, private val onLifecycle: onLifeCycleChanged) : UIViewController(null, null) {
+internal class ViewModelLifecycleManager<ViewModel : BaseLifecycleViewModel>(private val viewModel: ViewModel, private val onLifecycle: onLifeCycleChanged) : UIViewController(null, null) {
 
     internal val lifecycleManager = LifecycleManager {
         viewModel.clear()
@@ -86,7 +86,7 @@ internal class ViewModelLifecycleManager<VM : BaseLifecycleViewModel>(private va
  * @param onLifecycle This callback is invoked on each start of a new lifecycle.
  * @return The [LifecycleManager] bound to the [BaseLifecycleViewModel]
  */
-fun <VM : BaseLifecycleViewModel> VM.addLifecycleManager(parent: UIViewController, onLifecycle: onLifeCycleChanged): LifecycleManager {
+fun <ViewModel : BaseLifecycleViewModel> ViewModel.addLifecycleManager(parent: UIViewController, onLifecycle: onLifeCycleChanged): LifecycleManager {
     val lifecycleManager = ViewModelLifecycleManager(this, onLifecycle)
     parent.addChildViewController(lifecycleManager)
     parent.view.addSubview(lifecycleManager.view)
diff --git a/test-utils-architecture/src/commonMain/kotlin/ViewModelTest.kt b/test-utils-architecture/src/commonMain/kotlin/ViewModelTest.kt
index 3feae2a24..53cacec0e 100644
--- a/test-utils-architecture/src/commonMain/kotlin/ViewModelTest.kt
+++ b/test-utils-architecture/src/commonMain/kotlin/ViewModelTest.kt
@@ -24,11 +24,11 @@ import com.splendo.kaluga.test.base.UIThreadTest
 import kotlinx.coroutines.CoroutineScope
 import kotlin.test.BeforeTest
 
-abstract class ViewModelTest<VM : LifecycleViewModel> : BaseTest() {
+abstract class ViewModelTest<ViewModel : LifecycleViewModel> : BaseTest() {
 
-    lateinit var viewModel: VM
+    lateinit var viewModel: ViewModel
 
-    protected abstract fun createViewModel(): VM
+    protected abstract fun createViewModel(): ViewModel
 
     @BeforeTest
     override fun beforeTest() {
@@ -37,54 +37,54 @@ abstract class ViewModelTest<VM : LifecycleViewModel> : BaseTest() {
     }
 }
 
-abstract class SimpleUIThreadViewModelTest<VM : LifecycleViewModel> :
-    UIThreadViewModelTest<UIThreadViewModelTest.ViewModelTestContext<VM>, VM>() {
+abstract class SimpleUIThreadViewModelTest<ViewModel : LifecycleViewModel> :
+    UIThreadViewModelTest<UIThreadViewModelTest.ViewModelTestContext<ViewModel>, ViewModel>() {
 
-    override val createTestContext: suspend (CoroutineScope) -> ViewModelTestContext<VM> =
+    override val createTestContext: suspend (CoroutineScope) -> ViewModelTestContext<ViewModel> =
         { LazyViewModelTestContext(it, ::createViewModel) }
 
-    abstract fun createViewModel(): VM
+    abstract fun createViewModel(): ViewModel
 }
 
 /**
  * A [UIThreadTest] that takes a [ViewModelTestContext]
  */
-abstract class UIThreadViewModelTest<VMC : UIThreadViewModelTest.ViewModelTestContext<VM>, VM : LifecycleViewModel>() :
-    UIThreadTest<VMC>() {
+abstract class UIThreadViewModelTest<Context : UIThreadViewModelTest.ViewModelTestContext<ViewModel>, ViewModel : LifecycleViewModel>() :
+    UIThreadTest<Context>() {
 
     /**
      * [ViewModelTestContext] that lazily creates the view model
      * @param coroutineScope The [CoroutineScope] of the [LazyViewModelTestContext]
      * @param createViewModel Creator for the [LifecycleViewModel]
      */
-    open class LazyViewModelTestContext<VM : LifecycleViewModel>(coroutineScope: CoroutineScope, private val createViewModel: () -> VM) : BaseUIThreadViewModelTest.LazyViewModelTestContext<VM>(coroutineScope, createViewModel), ViewModelTestContext<VM>
+    open class LazyViewModelTestContext<ViewModel : LifecycleViewModel>(coroutineScope: CoroutineScope, private val createViewModel: () -> ViewModel) : BaseUIThreadViewModelTest.LazyViewModelTestContext<ViewModel>(coroutineScope, createViewModel), ViewModelTestContext<ViewModel>
 
     /**
      * A [UIThreadTest.TestContext] that provides a [LifecycleViewModel]
      */
-    interface ViewModelTestContext<VM : LifecycleViewModel> : BaseUIThreadViewModelTest.ViewModelTestContext<VM>, TestContext
+    interface ViewModelTestContext<ViewModel : LifecycleViewModel> : BaseUIThreadViewModelTest.ViewModelTestContext<ViewModel>, TestContext
 }
 
 /**
  * A [BaseUIThreadTest] that takes a [ViewModelTestContext]
  */
-abstract class BaseUIThreadViewModelTest<C, VMC : BaseUIThreadViewModelTest.ViewModelTestContext<VM>, VM : LifecycleViewModel>() :
-    BaseUIThreadTest<C, VMC>() {
+abstract class BaseUIThreadViewModelTest<Configuration, Context : BaseUIThreadViewModelTest.ViewModelTestContext<ViewModel>, ViewModel : LifecycleViewModel> :
+    BaseUIThreadTest<Configuration, Context>() {
 
     /**
      * [ViewModelTestContext] that lazily creates the view model
      * @param coroutineScope The [CoroutineScope] of the [LazyViewModelTestContext]
      * @param createViewModel Creator for the [LifecycleViewModel]
      */
-    open class LazyViewModelTestContext<VM : LifecycleViewModel>(coroutineScope: CoroutineScope, private val createViewModel: () -> VM) :
-        ViewModelTestContext<VM>, CoroutineScope by coroutineScope {
-        override val viewModel: VM by lazy { createViewModel() }
+    open class LazyViewModelTestContext<ViewModel : LifecycleViewModel>(coroutineScope: CoroutineScope, private val createViewModel: () -> ViewModel) :
+        ViewModelTestContext<ViewModel>, CoroutineScope by coroutineScope {
+        override val viewModel: ViewModel by lazy { createViewModel() }
     }
 
     /**
      * A [BaseUIThreadTest.TestContext] that provides a [LifecycleViewModel]
      */
-    interface ViewModelTestContext<VM : LifecycleViewModel> : TestContext {
-        val viewModel: VM
+    interface ViewModelTestContext<ViewModel : LifecycleViewModel> : TestContext {
+        val viewModel: ViewModel
     }
 }
diff --git a/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt b/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
index a7e7b6f6c..aacd6f916 100644
--- a/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
+++ b/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
@@ -40,7 +40,7 @@ open class SimpleUIThreadTest : UIThreadTest<SimpleUIThreadTest.SimpleTestContex
  * as it eases dealing with immutability and allows a shared context.
  *
  */
-abstract class UIThreadTest<TC : UIThreadTest.TestContext> : BaseUIThreadTest<Unit, TC>() {
+abstract class UIThreadTest<Context : UIThreadTest.TestContext> : BaseUIThreadTest<Unit, Context>() {
     interface TestContext : BaseUIThreadTest.TestContext
 
     class EmptyTestContext private constructor() : TestContext {
@@ -52,8 +52,8 @@ abstract class UIThreadTest<TC : UIThreadTest.TestContext> : BaseUIThreadTest<Un
     /**
      * Creates the Test Context based on a CoroutineScope
      */
-    abstract val createTestContext: suspend (scope: CoroutineScope) -> TC
-    override val createTestContextWithConfiguration: suspend (configuration: Unit, scope: CoroutineScope) -> TC get() {
+    abstract val createTestContext: suspend (scope: CoroutineScope) -> Context
+    override val createTestContextWithConfiguration: suspend (configuration: Unit, scope: CoroutineScope) -> Context get() {
         val createTestContext = this.createTestContext
         return { _, scope ->
             createTestContext(scope)
@@ -74,7 +74,7 @@ abstract class UIThreadTest<TC : UIThreadTest.TestContext> : BaseUIThreadTest<Un
      * @param cancelScopeAfterTest whether to cancel the coroutinescope your block ran in after it's done.
      *
      */
-    fun testOnUIThread(cancelScopeAfterTest: Boolean = false, block: suspend TC.() -> Unit) = testOnUIThread(Unit, cancelScopeAfterTest, block)
+    fun testOnUIThread(cancelScopeAfterTest: Boolean = false, block: suspend Context.() -> Unit) = testOnUIThread(Unit, cancelScopeAfterTest, block)
 }
 
 /**
@@ -88,7 +88,7 @@ abstract class UIThreadTest<TC : UIThreadTest.TestContext> : BaseUIThreadTest<Un
  * as it eases dealing with immutability and allows a shared context.
  *
  */
-abstract class BaseUIThreadTest<C, TC : BaseUIThreadTest.TestContext>() : BaseTest() {
+abstract class BaseUIThreadTest<Configuration, Context : BaseUIThreadTest.TestContext>() : BaseTest() {
 
     interface TestContext {
         fun dispose() {}
@@ -103,7 +103,7 @@ abstract class BaseUIThreadTest<C, TC : BaseUIThreadTest.TestContext>() : BaseTe
     /**
      * Creates the TestContext based on Configuration and CoroutineScope
      */
-    abstract val createTestContextWithConfiguration: suspend (configuration: C, scope: CoroutineScope) -> TC
+    abstract val createTestContextWithConfiguration: suspend (configuration: Configuration, scope: CoroutineScope) -> Context
 
     private companion object {
         val cancellationException = CancellationException("Scope canceled by testOnUIThread because cancelScopeAfterTest was set to true.")
@@ -118,13 +118,13 @@ abstract class BaseUIThreadTest<C, TC : BaseUIThreadTest.TestContext>() : BaseTe
      * This can be handy for testing classes that rely on scopes that eventually get canceled,
      * e.g. because they are canceled automatically by a lifecycle event.
      *
-     * @param configuration The [C] to configure the TestContext.
+     * @param configuration The [Configuration] to configure the TestContext.
      * @param block test block to be run on the UI thread and in the test context.
      *
      * @param cancelScopeAfterTest whether to cancel the coroutinescope your block ran in after it's done.
      *
      */
-    fun testOnUIThread(configuration: C, cancelScopeAfterTest: Boolean = false, block: suspend TC.() -> Unit) {
+    fun testOnUIThread(configuration: Configuration, cancelScopeAfterTest: Boolean = false, block: suspend Context.() -> Unit) {
         try {
 
             val createTestContextWithConfiguration = createTestContextWithConfiguration
diff --git a/test-utils-koin/src/commonMain/kotlin/KoinUIThreadViewModelTest.kt b/test-utils-koin/src/commonMain/kotlin/KoinUIThreadViewModelTest.kt
index 2fc455db1..4c44bfa18 100644
--- a/test-utils-koin/src/commonMain/kotlin/KoinUIThreadViewModelTest.kt
+++ b/test-utils-koin/src/commonMain/kotlin/KoinUIThreadViewModelTest.kt
@@ -23,14 +23,14 @@ import com.splendo.kaluga.test.architecture.UIThreadViewModelTest
 import org.koin.core.module.Module
 import org.koin.dsl.KoinAppDeclaration
 
-abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : LifecycleViewModel> :
-    KoinUIThreadTest<KVMC>() {
+abstract class KoinUIThreadViewModelTest<Context : KoinUIThreadViewModelTest.KoinViewModelTestContext<ViewModel>, ViewModel : LifecycleViewModel> :
+    KoinUIThreadTest<Context>() {
 
-    abstract class KoinViewModelTestContext<VM : LifecycleViewModel>(
+    abstract class KoinViewModelTestContext<ViewModel : LifecycleViewModel>(
         appDeclaration: KoinAppDeclaration? = null,
         koinModules: List<Module>
     ) : KoinUIThreadTest.KoinTestContext(appDeclaration, koinModules),
-        UIThreadViewModelTest.ViewModelTestContext<VM> {
+        UIThreadViewModelTest.ViewModelTestContext<ViewModel> {
         constructor(vararg koinModules: Module) : this(null, koinModules.toList())
         constructor(appDeclaration: KoinAppDeclaration, vararg koinModules: Module) : this(
             appDeclaration,
@@ -39,14 +39,14 @@ abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinVi
     }
 }
 
-abstract class BaseKoinUIThreadViewModelTest<C, KVMC : BaseKoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : LifecycleViewModel> :
-    BaseKoinUIThreadTest<C, KVMC>() {
+abstract class BaseKoinUIThreadViewModelTest<Configuration, Context : BaseKoinUIThreadViewModelTest.KoinViewModelTestContext<ViewModel>, ViewModel : LifecycleViewModel> :
+    BaseKoinUIThreadTest<Configuration, Context>() {
 
-    abstract class KoinViewModelTestContext<VM : LifecycleViewModel>(
+    abstract class KoinViewModelTestContext<ViewModel : LifecycleViewModel>(
         appDeclaration: KoinAppDeclaration? = null,
         koinModules: List<Module>
     ) : BaseKoinUIThreadTest.KoinTestContext(appDeclaration, koinModules),
-        BaseUIThreadViewModelTest.ViewModelTestContext<VM> {
+        BaseUIThreadViewModelTest.ViewModelTestContext<ViewModel> {
         constructor(vararg koinModules: Module) : this(null, koinModules.toList())
         constructor(appDeclaration: KoinAppDeclaration, vararg koinModules: Module) : this(
             appDeclaration,
diff --git a/test-utils/src/commonMain/kotlin/legacy.kt b/test-utils/src/commonMain/kotlin/legacy.kt
index a0984bad8..fe5317185 100644
--- a/test-utils/src/commonMain/kotlin/legacy.kt
+++ b/test-utils/src/commonMain/kotlin/legacy.kt
@@ -42,28 +42,28 @@ open class SimpleUIThreadTest : UIThreadTest<SimpleUIThreadTest.SimpleTestContex
     override val createTestContext: suspend (CoroutineScope) -> SimpleTestContext = { SimpleTestContext(it) }
 }
 @Deprecated("Moved to test-utils-base", ReplaceWith("UIThreadTest", "com.splendo.kaluga.test.base.UIThreadTest"))
-abstract class UIThreadTest<TC : UIThreadTest.TestContext> : com.splendo.kaluga.test.base.UIThreadTest<TC>() {
+abstract class UIThreadTest<Context : UIThreadTest.TestContext> : com.splendo.kaluga.test.base.UIThreadTest<Context>() {
     @Deprecated("Moved to test-utils-base", ReplaceWith("TestContext", "com.splendo.kaluga.test.base.UIThreadTest.TestContext"))
     interface TestContext : com.splendo.kaluga.test.base.UIThreadTest.TestContext
 }
 
 @Deprecated("Moved to test-utils-base", ReplaceWith("FlowTestBlockWithContext", "com.splendo.kaluga.test.base.FlowTestBlockWithContext"))
-typealias FlowTestBlockWithContext<TC, T, F> = com.splendo.kaluga.test.base.FlowTestBlockWithContext<Unit, TC, T, F>
+typealias FlowTestBlockWithContext<Context, T, F> = com.splendo.kaluga.test.base.FlowTestBlockWithContext<Unit, Context, T, F>
 @Deprecated("Moved to test-utils-base", ReplaceWith("FlowableTest", "com.splendo.kaluga.test.base.FlowableTest"))
 typealias FlowableTest<T> = com.splendo.kaluga.test.base.FlowableTest<T>
 @Deprecated("Moved to test-utils-base", ReplaceWith("FlowTest", "com.splendo.kaluga.test.base.FlowTest"))
 typealias FlowTest<T, F> = com.splendo.kaluga.test.base.FlowTest<T, F>
 @Deprecated("Moved to test-utils-base", ReplaceWith("BaseFlowTest", "com.splendo.kaluga.test.base.BaseFlowTest"))
-abstract class BaseFlowTest<TC : UIThreadTest.TestContext, T, F : Flow<T>> : com.splendo.kaluga.test.base.BaseFlowTest<Unit, TC, T, F>() {
+abstract class BaseFlowTest<Context : UIThreadTest.TestContext, T, F : Flow<T>> : com.splendo.kaluga.test.base.BaseFlowTest<Unit, Context, T, F>() {
     fun testWithFlowAndTestContext(
         createFlowInMainScope: Boolean = true,
         retainContextAfterTest: Boolean = false,
-        blockWithContext: FlowTestBlockWithContext<TC, T, F>
+        blockWithContext: FlowTestBlockWithContext<Context, T, F>
     ) = super.testWithFlowAndTestContext(Unit, createFlowInMainScope, retainContextAfterTest, blockWithContext)
 }
 
 @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinUIThreadTest", "com.splendo.kaluga.test.koin.KoinUIThreadTest"))
-abstract class KoinUIThreadTest<TC : KoinUIThreadTest.KoinTestContext> : com.splendo.kaluga.test.koin.KoinUIThreadTest<TC>() {
+abstract class KoinUIThreadTest<Context : KoinUIThreadTest.KoinTestContext> : com.splendo.kaluga.test.koin.KoinUIThreadTest<Context>() {
     @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinUIThreadTest.KoinTestContext", "com.splendo.kaluga.test.koin.KoinUIThreadTest"))
     open class KoinTestContext(
         appDeclaration: KoinAppDeclaration? = null,
@@ -72,11 +72,11 @@ abstract class KoinUIThreadTest<TC : KoinUIThreadTest.KoinTestContext> : com.spl
 }
 
 @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinFlowTestBlock", "com.splendo.kaluga.test.koin.KoinFlowTestBlock"))
-typealias KoinFlowTestBlock<TC, T, F> = suspend KoinFlowTest<TC, T, F>.(F) -> Unit
+typealias KoinFlowTestBlock<Context, T, F> = suspend KoinFlowTest<Context, T, F>.(F) -> Unit
 @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinFlowTest", "com.splendo.kaluga.test.koin.KoinFlowTest"))
-abstract class KoinFlowTest<TC : KoinUIThreadTest.KoinTestContext, T, F : Flow<T>> : com.splendo.kaluga.test.koin.BaseKoinFlowTest<Unit, TC, T, F>() {
-    abstract val createTestContext: suspend (scope: CoroutineScope) -> TC
-    override val createTestContextWithConfiguration: suspend (configuration: Unit, scope: CoroutineScope) -> TC get() {
+abstract class KoinFlowTest<Context : KoinUIThreadTest.KoinTestContext, T, F : Flow<T>> : com.splendo.kaluga.test.koin.BaseKoinFlowTest<Unit, Context, T, F>() {
+    abstract val createTestContext: suspend (scope: CoroutineScope) -> Context
+    override val createTestContextWithConfiguration: suspend (configuration: Unit, scope: CoroutineScope) -> Context get() {
         val createTestContext = this.createTestContext
         return { _, scope ->
             createTestContext(scope)
@@ -84,22 +84,22 @@ abstract class KoinFlowTest<TC : KoinUIThreadTest.KoinTestContext, T, F : Flow<T
     }
 
     @Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
-    fun testWithFlow(block: KoinFlowTestBlock<TC, T, F>) =
+    fun testWithFlow(block: KoinFlowTestBlock<Context, T, F>) =
         super.testWithFlowAndTestContext(Unit, createFlowInMainScope = false, retainContextAfterTest = false) {
             block(this@KoinFlowTest, it)
         }
 }
 
 @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinUIThreadViewModelTest", "com.splendo.kaluga.test.koin.KoinUIThreadViewModelTest"))
-abstract class KoinUIThreadViewModelTest<KVMC : KoinUIThreadViewModelTest.KoinViewModelTestContext<VM>, VM : LifecycleViewModel> :
-    KoinUIThreadTest<KVMC>() {
+abstract class KoinUIThreadViewModelTest<Context : KoinUIThreadViewModelTest.KoinViewModelTestContext<ViewModel>, ViewModel : LifecycleViewModel> :
+    KoinUIThreadTest<Context>() {
 
     @Deprecated("Moved to test-utils-koin", ReplaceWith("KoinViewModelTestContext", "com.splendo.kaluga.test.koin.KoinUIThreadViewModelTest"))
-    abstract class KoinViewModelTestContext<VM : LifecycleViewModel>(
+    abstract class KoinViewModelTestContext<ViewModel : LifecycleViewModel>(
         appDeclaration: KoinAppDeclaration? = null,
         koinModules: List<Module>
     ) : KoinUIThreadTest.KoinTestContext(appDeclaration, koinModules),
-        UIThreadViewModelTest.ViewModelTestContext<VM> {
+        UIThreadViewModelTest.ViewModelTestContext<ViewModel> {
         constructor(vararg koinModules: Module) : this(null, koinModules.toList())
         constructor(appDeclaration: KoinAppDeclaration, vararg koinModules: Module) : this(
             appDeclaration,

From 48ee2e331fb8b7159624505b7fe693ff740848a2 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 25 Jan 2023 15:25:56 +0100
Subject: [PATCH 135/227] Fixed some JVm issues

---
 example/ios/Kaluga-SwiftUI                    |  2 +-
 .../src/commonMain/kotlin/FlowTest.kt         | 46 +++++++++++--------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 9335df3ad..93783021e 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 9335df3ad4ce420e3fe74dfc9b7073f5ffce078f
+Subproject commit 93783021e2e6a0a0de0e9b82f1aa3c80f81ebf33
diff --git a/test-utils-base/src/commonMain/kotlin/FlowTest.kt b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
index 69eec4925..0f1b9dc5f 100644
--- a/test-utils-base/src/commonMain/kotlin/FlowTest.kt
+++ b/test-utils-base/src/commonMain/kotlin/FlowTest.kt
@@ -29,7 +29,6 @@ import com.splendo.kaluga.test.base.BaseUIThreadTest.EmptyTestContext
 import com.splendo.kaluga.test.base.BaseUIThreadTest.TestContext
 import kotlinx.atomicfu.atomic
 import kotlinx.atomicfu.getAndUpdate
-import kotlinx.atomicfu.updateAndGet
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -45,11 +44,11 @@ import kotlinx.coroutines.withTimeout
 import kotlin.test.AfterTest
 import kotlin.time.Duration.Companion.seconds
 
-typealias TestBlock<TC, T> = suspend TC.(T) -> Unit
+typealias TestBlock<Context, T> = suspend Context.(T) -> Unit
 typealias ActionBlock = suspend() -> Unit
-typealias ScopeActionBlock<TC> = suspend TC.() -> Unit
+typealias ScopeActionBlock<Context> = suspend Context.() -> Unit
 
-typealias FlowTestBlockWithContext<C, TC, T, F> = suspend BaseFlowTest<C, TC, T, F>.(F) -> Unit
+typealias FlowTestBlockWithContext<Configuration, Context, T, F> = suspend BaseFlowTest<Configuration, Context, T, F>.(F) -> Unit
 
 typealias FlowTestBlock<T, F> = suspend FlowTest<T, F>.(F) -> Unit
 
@@ -79,9 +78,9 @@ abstract class FlowTest<T, F : Flow<T>>(scope: CoroutineScope = MainScope()) : B
         }
 }
 
-abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: CoroutineScope = MainScope()) : BaseUIThreadTest<C, TC>(), CoroutineScope by scope {
+abstract class BaseFlowTest<Configration, Context : TestContext, T, F : Flow<T>>(val scope: CoroutineScope = MainScope()) : BaseUIThreadTest<Configration, Context>(), CoroutineScope by scope {
 
-    abstract val flowFromTestContext: suspend TC.() -> F
+    abstract val flowFromTestContext: suspend Context.() -> F
 
     open val filter: (Flow<T>) -> Flow<T> = { it }
 
@@ -89,8 +88,8 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
 
     var job: Job? = null
 
-    private val testContext = atomic<TC?>(null)
-    private lateinit var testChannel: Channel<Pair<TestBlock<TC, T>, EmptyCompletableDeferred>>
+    private val testContext = atomic<Context?>(null)
+    private lateinit var testChannel: Channel<Pair<TestBlock<Context, T>, EmptyCompletableDeferred>>
 
     @AfterTest
     override fun afterTest() {
@@ -137,13 +136,13 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
     }
 
     private var lateflow: F? = null
-    private var lateConfiguration: C? = null
+    private var lateConfiguration: Configration? = null
 
     fun testWithFlowAndTestContext(
-        configuration: C,
+        configuration: Configration,
         createFlowInMainScope: Boolean = true,
         retainContextAfterTest: Boolean = false,
-        blockWithContext: FlowTestBlockWithContext<C, TC, T, F>
+        blockWithContext: FlowTestBlockWithContext<Configration, Context, T, F>
     ) {
 
         runBlocking {
@@ -160,12 +159,12 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
                 val f =
                     if (createFlowInMainScope) {
                         withContext(Dispatchers.Main.immediate) {
-                            (flow(testContext.updateAndGet { it ?: createTestContextWithConfiguration(configuration, scope) }!!))
+                            (flow(getOrCreateContext { createTestContextWithConfiguration(configuration, scope) }))
                         }
                     } else {
                         flow(
                             withContext(Dispatchers.Main.immediate) {
-                                (testContext.updateAndGet { it ?: createTestContextWithConfiguration(configuration, scope) }!!)
+                                (getOrCreateContext { createTestContextWithConfiguration(configuration, scope) })
                             }
                         )
                     }
@@ -183,7 +182,7 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
     }
 
     @Suppress("SuspendFunctionOnCoroutineScope")
-    private suspend fun startFlow(configuration: C, flow: F) {
+    private suspend fun startFlow(configuration: Configration, flow: F) {
         debug("launch flow scope...")
         val testChannel = testChannel
         val started = EmptyCompletableDeferred()
@@ -193,7 +192,7 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
         try {
             job = launch(Dispatchers.Main.immediate) {
                 started.complete()
-                val testContext = testContext.updateAndGet { it ?: createTestContextWithConfiguration(configuration, scope) }!!
+                val testContext = getOrCreateContext { createTestContextWithConfiguration(configuration, scope) }
                 debug("main scope launched, about to flow, test channel ${if (testChannel.isEmpty) "" else "not "}empty ")
                 filter(flow).collect { value ->
                     debug("in flow received [$value], test channel ${if (testChannel.isEmpty) "" else "not "}empty \"")
@@ -226,7 +225,7 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
         debug("waited for main thread to be launched")
     }
 
-    suspend fun mainAction(action: ScopeActionBlock<TC>) {
+    suspend fun mainAction(action: ScopeActionBlock<Context>) {
         debug("start mainAction")
         awaitTestBlocks()
         val createTestContextWithConfiguration = createTestContextWithConfiguration
@@ -235,7 +234,7 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
         val configuration = lateConfiguration!!
         withContext(Dispatchers.Main.immediate) {
             debug("in main scope for mainAction")
-            action(testContext.updateAndGet { it ?: createTestContextWithConfiguration(configuration, scope) }!!)
+            action(getOrCreateContext { createTestContextWithConfiguration(configuration, scope) })
         }
         debug("did mainAction")
     }
@@ -249,7 +248,7 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
 
     var firstTestBlock = true
 
-    suspend fun test(skip: Int = 0, test: TestBlock<TC, T>) {
+    suspend fun test(skip: Int = 0, test: TestBlock<Context, T>) {
         if (firstTestBlock) {
             firstTestBlock = false
             debug("first test offered, starting collection")
@@ -270,4 +269,15 @@ abstract class BaseFlowTest<C, TC : TestContext, T, F : Flow<T>>(val scope: Coro
             testContext.getAndUpdate { null }?.dispose()
         }
     }
+
+    private suspend fun getOrCreateContext(create: suspend () -> Context): Context {
+        // updateAndGet doesnt work properly on JVM so we built it ourselves
+        while (true) {
+            val currentContext = testContext.value
+            val nextContext = currentContext ?: create()
+            if (testContext.compareAndSet(currentContext, nextContext)) {
+                return nextContext
+            }
+        }
+    }
 }

From 9712313d8a40796ea0165d45828cd9a542ad04d7 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 25 Jan 2023 17:33:32 +0100
Subject: [PATCH 136/227] Added tests

---
 .../collections/ConcurrentMutableListTest.kt  | 66 +++++++++++++++++++
 .../collections/ConcurrentMutableMapTest.kt   | 58 ++++++++++++++++
 .../collections/ConcurrentMutableSetTest.kt   | 57 ++++++++++++++++
 3 files changed, 181 insertions(+)
 create mode 100644 base/src/commonTest/kotlin/collections/ConcurrentMutableListTest.kt
 create mode 100644 base/src/commonTest/kotlin/collections/ConcurrentMutableMapTest.kt
 create mode 100644 base/src/commonTest/kotlin/collections/ConcurrentMutableSetTest.kt

diff --git a/base/src/commonTest/kotlin/collections/ConcurrentMutableListTest.kt b/base/src/commonTest/kotlin/collections/ConcurrentMutableListTest.kt
new file mode 100644
index 000000000..0ea40f405
--- /dev/null
+++ b/base/src/commonTest/kotlin/collections/ConcurrentMutableListTest.kt
@@ -0,0 +1,66 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package collections
+
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
+import com.splendo.kaluga.base.runBlocking
+import com.splendo.kaluga.test.base.BaseTest
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class ConcurrentMutableListTest : BaseTest() {
+
+    @Test
+    fun testConcurrentMutableList() = runBlocking {
+        val list = concurrentMutableListOf(0, 1, 2)
+        withContext(Dispatchers.Main.immediate) {
+            assertEquals(0, list[0])
+            list.add(3)
+            list.addAll(listOf(4, 5))
+        }
+        assertEquals(6, list.size)
+        val otherList = concurrentMutableListOf(0, 1, 2, 3, 4, 5)
+        assertEquals(otherList, list)
+
+        list.add(0, -1)
+        list.addAll(0, listOf(0, -2))
+        list[0] = -3
+        assertEquals(listOf(-3, -2, -1, 0, 1, 2, 3, 4, 5), list)
+        assertEquals(listOf(-3, -2, -1), list.subList(0, 3))
+        assertTrue(list.contains(5))
+        assertTrue(list.containsAll(listOf(3, 4, 5)))
+        assertFalse(list.contains(6))
+        assertFalse(list.containsAll(listOf(3, 6)))
+        assertEquals(3, list.indexOf(0))
+
+        list.remove(0)
+        list.removeAll(listOf(-3, -2, -1))
+        list.removeAt(1)
+        assertEquals(listOf(1, 3, 4, 5), list)
+
+        list.retainAll(listOf(4, 5))
+        assertEquals(listOf(4, 5), list)
+
+        list.clear()
+        assertTrue(list.isEmpty())
+    }
+}
diff --git a/base/src/commonTest/kotlin/collections/ConcurrentMutableMapTest.kt b/base/src/commonTest/kotlin/collections/ConcurrentMutableMapTest.kt
new file mode 100644
index 000000000..346189055
--- /dev/null
+++ b/base/src/commonTest/kotlin/collections/ConcurrentMutableMapTest.kt
@@ -0,0 +1,58 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package collections
+
+import com.splendo.kaluga.base.collections.concurrentMutableMapOf
+import com.splendo.kaluga.base.runBlocking
+import com.splendo.kaluga.test.base.BaseTest
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class ConcurrentMutableMapTest : BaseTest() {
+
+    @Test
+    fun testConcurrentMutableMap() = runBlocking {
+        val map = concurrentMutableMapOf(0 to "Zero", 1 to "One", 2 to "Two")
+        withContext(Dispatchers.Main.immediate) {
+            assertEquals("Zero", map[0])
+            map[3] = "Three"
+            map.putAll(mapOf(4 to "Four", 5 to "Five"))
+        }
+        assertEquals(6, map.size)
+        val otherMap = concurrentMutableMapOf(0 to "Zero", 1 to "One", 2 to "Two", 3 to "Three", 4 to "Four", 5 to "Five")
+        assertEquals(otherMap, map)
+        assertEquals(otherMap.toMap().entries, map.entries)
+        assertEquals(setOf(0, 1, 2, 3, 4, 5), map.keys)
+        assertEquals(listOf("Zero", "One", "Two", "Three", "Four", "Five"), map.values.toList())
+        assertTrue(map.containsKey(0))
+        assertFalse(map.containsKey(6))
+        assertTrue(map.containsValue("One"))
+        assertFalse(map.containsValue("Six"))
+
+        map[0] = "Minus One"
+        map.remove(1)
+        assertEquals(mapOf(0 to "Minus One", 2 to "Two", 3 to "Three", 4 to "Four", 5 to "Five"), map)
+
+        map.clear()
+        assertTrue(map.isEmpty())
+    }
+}
diff --git a/base/src/commonTest/kotlin/collections/ConcurrentMutableSetTest.kt b/base/src/commonTest/kotlin/collections/ConcurrentMutableSetTest.kt
new file mode 100644
index 000000000..51afeb52e
--- /dev/null
+++ b/base/src/commonTest/kotlin/collections/ConcurrentMutableSetTest.kt
@@ -0,0 +1,57 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package collections
+
+import com.splendo.kaluga.base.collections.concurrentMutableSetOf
+import com.splendo.kaluga.base.runBlocking
+import com.splendo.kaluga.test.base.BaseTest
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class ConcurrentMutableSetTest : BaseTest() {
+
+    @Test
+    fun testConcurrentMutableSet() = runBlocking {
+        val set = concurrentMutableSetOf(0, 1, 2)
+        withContext(Dispatchers.Main.immediate) {
+            set.add(3)
+            set.addAll(listOf(4, 5, 5))
+        }
+        assertEquals(6, set.size)
+        val otherSet = concurrentMutableSetOf(0, 1, 2, 3, 4, 5)
+        assertEquals(otherSet, set)
+        assertTrue(set.contains(0))
+        assertFalse(set.contains(6))
+        assertTrue(set.containsAll(listOf(1, 2)))
+        assertFalse(set.containsAll(listOf(0, 6)))
+
+        set.remove(0)
+        set.removeAll(listOf(4, 5))
+        assertEquals(setOf(1, 2, 3), set)
+
+        set.retainAll(listOf(2, 3))
+        assertEquals(setOf(2, 3), set)
+
+        set.clear()
+        assertTrue(set.isEmpty())
+    }
+}

From 44c82bc0a91c8cff1e015ebdc2a71eaca794db4e Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 26 Jan 2023 12:22:48 +0100
Subject: [PATCH 137/227] Added proper concurrency test

API Dump
Fix some packages
---
 architecture/api/androidLib/architecture.api  |   2 +-
 .../api/androidLib/base-permissions.api       |  12 +-
 base-permissions/api/jvm/base-permissions.api |  12 +-
 .../src/commonMain/kotlin/PermissionState.kt  |   6 +-
 .../commonMain/kotlin/PermissionStateRepo.kt  |   4 +-
 base/api/androidLib/base.api                  | 353 ++++++++++++------
 base/api/jvm/base.api                         | 238 ++++++++++++
 .../kotlin/text/DateFormatterTest.kt          |   2 +-
 .../kotlin/ApplicationHolder.kt               |  10 +-
 .../kotlin/MainQueueDispatcher.kt             |  10 +-
 .../kotlin/utils/Serializable.kt              |   1 +
 .../kotlin/text/DateFormatterTest.kt          |   2 +-
 .../commonMain/kotlin/state/KalugaState.kt    |   2 +-
 base/src/commonMain/kotlin/utils/ApplyIf.kt   |   3 +-
 .../kotlin/utils/EmptyCompletableDeferred.kt  |   3 +-
 .../collections/ConcurrentMutableListTest.kt  |  22 +-
 .../collections/ConcurrentMutableMapTest.kt   |  22 +-
 .../collections/ConcurrentMutableSetTest.kt   |  22 +-
 .../kotlin/flow/SpecialFlowValueTest.kt       |  16 +-
 .../kotlin/state/ColdStateFlowRepoTest.kt     |   3 +-
 .../kotlin/state/ColdStateRepoTest.kt         |   2 +-
 .../kotlin/state/ReplayBufferStateRepoTest.kt |   2 +-
 .../commonTest/kotlin/state/StateRepoTest.kt  |   2 +-
 .../kotlin/text/DateFormatterTest.kt          |   6 +-
 .../kotlin/text/NumberFormatterTest.kt        |   4 +-
 .../kotlin/text/StringFormatterTest.kt        |   3 +-
 base/src/iosMain/kotlin/utils/DataUtils.kt    |   2 +-
 base/src/iosMain/kotlin/utils/RangeUtils.kt   |  17 +
 .../kotlin/{ => text}/DateFormatterTest.kt    |   4 +-
 .../kotlin/{ => utils}/DataUtilsTest.kt       |   2 +-
 base/src/jsMain/kotlin/MainQueueDispatcher.kt |  10 +-
 base/src/jsMain/kotlin/utils/BigDecimal.kt    |   1 +
 .../jsTest/kotlin/text/DateFormatterTest.kt   |   2 +-
 .../jvmTest/kotlin/text/DateFormatterTest.kt  |   2 +-
 bluetooth/api/androidLib/bluetooth.api        |  52 +--
 bluetooth/api/jvm/bluetooth.api               |  52 +--
 .../src/commonMain/kotlin/device/Device.kt    |   4 +-
 .../commonMain/kotlin/device/DeviceState.kt   |   4 +-
 .../kotlin/scanner/ScanningState.kt           |  10 +-
 .../kotlin/scanner/ScanningStateRepo.kt       |   4 +-
 bluetooth/src/iosMain/kotlin/Descriptor.kt    |   2 +-
 bluetooth/src/iosMain/kotlin/Value.kt         |   2 +-
 .../kotlin/device/AdvertisementData.kt        |   2 +-
 .../device/DefaultDeviceConnectionManager.kt  |   2 +-
 .../kaluga/datetime/timer/RecurringTimer.kt   |   8 +-
 example/gradle.properties                     |   2 +-
 gradle.properties                             |   2 +-
 .../src/main/kotlin/AndroidCommon.kt          |   1 +
 .../src/main/kotlin/Dependencies.kt           |   8 +-
 location/api/androidLib/location.api          |  18 +-
 location/api/jvm/location.api                 |  18 +-
 .../kotlin/location/LocationState.kt          |   6 +-
 .../kotlin/location/LocationStateRepo.kt      |   6 +-
 system/api/androidLib/system.api              |  10 +-
 system/api/jvm/system.api                     |  10 +-
 .../system/network/state/NetworkState.kt      |   6 +-
 .../system/network/state/NetworkStateRepo.kt  |   4 +-
 .../api/androidLib/test-utils-base.api        |   4 -
 test-utils-base/api/jvm/test-utils-base.api   |   4 -
 test-utils-base/build.gradle.kts              |   2 -
 .../api/androidLib/test-utils-bluetooth.api   |   6 +-
 .../api/jvm/test-utils-bluetooth.api          |   4 +-
 .../kotlin/IOSMockCharacteristicWrapper.kt    |   2 +-
 .../kotlin/IOSMockDescriptorWrapper.kt        |   2 +-
 .../api/androidLib/test-utils-hud.api         |   2 +-
 test-utils-hud/api/jvm/test-utils-hud.api     |   2 +-
 .../api/androidLib/test-utils-keyboard.api    |   2 +-
 .../api/jvm/test-utils-keyboard.api           |   2 +-
 .../api/androidLib/test-utils-location.api    |   4 +-
 .../api/jvm/test-utils-location.api           |   4 +-
 .../api/androidLib/test-utils-permissions.api |  18 +-
 .../api/jvm/test-utils-permissions.api        |  18 +-
 .../api/androidLib/test-utils-system.api      |   4 +-
 .../api/jvm/test-utils-system.api             |   4 +-
 74 files changed, 767 insertions(+), 354 deletions(-)
 rename base/src/iosTest/kotlin/{ => text}/DateFormatterTest.kt (87%)
 rename base/src/iosTest/kotlin/{ => utils}/DataUtilsTest.kt (96%)

diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index 3a274a775..d6744e85c 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -37,7 +37,7 @@ public class com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscrib
 }
 
 public final class com/splendo/kaluga/architecture/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheKt {
-	public static final fun getLifecycleAwareActivityCache ()Ljava/util/Map;
+	public static final fun getLifecycleAwareActivityCache ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
 }
 
 public final class com/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscriber {
diff --git a/base-permissions/api/androidLib/base-permissions.api b/base-permissions/api/androidLib/base-permissions.api
index c1a4dc7dc..c023936f3 100644
--- a/base-permissions/api/androidLib/base-permissions.api
+++ b/base-permissions/api/androidLib/base-permissions.api
@@ -56,7 +56,7 @@ public final class com/splendo/kaluga/permissions/base/BasePermissionManager$Set
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/permissions/base/BasePermissionStateRepo : com/splendo/kaluga/state/ColdStateFlowRepo {
+public abstract class com/splendo/kaluga/permissions/base/BasePermissionStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
@@ -119,7 +119,7 @@ public final class com/splendo/kaluga/permissions/base/PermissionManager$Event$P
 	public static final field INSTANCE Lcom/splendo/kaluga/permissions/base/PermissionManager$Event$PermissionGranted;
 }
 
-public abstract interface class com/splendo/kaluga/permissions/base/PermissionState : com/splendo/kaluga/state/KalugaState {
+public abstract interface class com/splendo/kaluga/permissions/base/PermissionState : com/splendo/kaluga/base/state/KalugaState {
 }
 
 public abstract interface class com/splendo/kaluga/permissions/base/PermissionState$Active : com/splendo/kaluga/permissions/base/PermissionState {
@@ -163,11 +163,11 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl {
 }
 
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Active : com/splendo/kaluga/permissions/base/PermissionStateImpl, com/splendo/kaluga/state/HandleAfterNewStateIsSet, com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
+public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Active : com/splendo/kaluga/permissions/base/PermissionStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
 	public abstract fun getMonitoringInterval-UwyO8pc ()J
 	public abstract fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
@@ -275,7 +275,7 @@ public final class com/splendo/kaluga/permissions/base/Permissions {
 	public fun <init> (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun clean ()V
-	public final fun get (Lcom/splendo/kaluga/permissions/base/Permission;)Lcom/splendo/kaluga/state/StateRepo;
+	public final fun get (Lcom/splendo/kaluga/permissions/base/Permission;)Lcom/splendo/kaluga/base/state/StateRepo;
 	public final fun request (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
diff --git a/base-permissions/api/jvm/base-permissions.api b/base-permissions/api/jvm/base-permissions.api
index 3b0b54ad9..7239a4cb5 100644
--- a/base-permissions/api/jvm/base-permissions.api
+++ b/base-permissions/api/jvm/base-permissions.api
@@ -28,7 +28,7 @@ public final class com/splendo/kaluga/permissions/base/BasePermissionManager$Set
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/permissions/base/BasePermissionStateRepo : com/splendo/kaluga/state/ColdStateFlowRepo {
+public abstract class com/splendo/kaluga/permissions/base/BasePermissionStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
@@ -79,7 +79,7 @@ public final class com/splendo/kaluga/permissions/base/PermissionManager$Event$P
 	public static final field INSTANCE Lcom/splendo/kaluga/permissions/base/PermissionManager$Event$PermissionGranted;
 }
 
-public abstract interface class com/splendo/kaluga/permissions/base/PermissionState : com/splendo/kaluga/state/KalugaState {
+public abstract interface class com/splendo/kaluga/permissions/base/PermissionState : com/splendo/kaluga/base/state/KalugaState {
 }
 
 public abstract interface class com/splendo/kaluga/permissions/base/PermissionState$Active : com/splendo/kaluga/permissions/base/PermissionState {
@@ -167,11 +167,11 @@ public final class com/splendo/kaluga/permissions/base/PermissionState$Uninitial
 public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl {
 }
 
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Active : com/splendo/kaluga/permissions/base/PermissionStateImpl, com/splendo/kaluga/state/HandleAfterNewStateIsSet, com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
+public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Active : com/splendo/kaluga/permissions/base/PermissionStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
 	public abstract fun getMonitoringInterval-UwyO8pc ()J
 	public abstract fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
@@ -285,7 +285,7 @@ public final class com/splendo/kaluga/permissions/base/Permissions {
 	public fun <init> (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/PermissionsBuilder;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun clean ()V
-	public final fun get (Lcom/splendo/kaluga/permissions/base/Permission;)Lcom/splendo/kaluga/state/StateRepo;
+	public final fun get (Lcom/splendo/kaluga/permissions/base/Permission;)Lcom/splendo/kaluga/base/state/StateRepo;
 	public final fun request (Lcom/splendo/kaluga/permissions/base/Permission;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
diff --git a/base-permissions/src/commonMain/kotlin/PermissionState.kt b/base-permissions/src/commonMain/kotlin/PermissionState.kt
index 711a72f80..1de3bc486 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionState.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionState.kt
@@ -19,9 +19,9 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 package com.splendo.kaluga.permissions.base
 
 import com.splendo.kaluga.base.flow.SpecialFlowValue
-import com.splendo.kaluga.state.HandleAfterNewStateIsSet
-import com.splendo.kaluga.state.HandleBeforeOldStateIsRemoved
-import com.splendo.kaluga.state.KalugaState
+import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
+import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
+import com.splendo.kaluga.base.state.KalugaState
 import kotlin.time.Duration
 
 /**
diff --git a/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt b/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt
index 39f59465a..c3290d339 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt
@@ -17,8 +17,8 @@
 
 package com.splendo.kaluga.permissions.base
 
-import com.splendo.kaluga.state.ColdStateFlowRepo
-import com.splendo.kaluga.state.StateRepo
+import com.splendo.kaluga.base.state.ColdStateFlowRepo
+import com.splendo.kaluga.base.state.StateRepo
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index 563d8e361..129d79077 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -55,6 +55,123 @@ public final class com/splendo/kaluga/base/SingleThreadDispatcherKt {
 	public static final fun singleThreadDispatcher (Ljava/lang/String;)Lkotlinx/coroutines/ExecutorCoroutineDispatcher;
 }
 
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableIterator : java/util/Iterator, kotlin/jvm/internal/markers/KMutableIterator {
+	public fun hasNext ()Z
+	public fun next ()Ljava/lang/Object;
+	public fun remove ()V
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableList : java/util/List, kotlin/jvm/internal/markers/KMutableList {
+	public fun <init> ()V
+	public fun add (ILjava/lang/Object;)V
+	public fun add (Ljava/lang/Object;)Z
+	public fun addAll (ILjava/util/Collection;)Z
+	public fun addAll (Ljava/util/Collection;)Z
+	public fun clear ()V
+	public fun contains (Ljava/lang/Object;)Z
+	public fun containsAll (Ljava/util/Collection;)Z
+	public fun equals (Ljava/lang/Object;)Z
+	public fun get (I)Ljava/lang/Object;
+	public fun getSize ()I
+	public fun hashCode ()I
+	public fun indexOf (Ljava/lang/Object;)I
+	public fun isEmpty ()Z
+	public fun iterator ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableIterator;
+	public synthetic fun iterator ()Ljava/util/Iterator;
+	public fun lastIndexOf (Ljava/lang/Object;)I
+	public fun listIterator ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableListIterator;
+	public synthetic fun listIterator ()Ljava/util/ListIterator;
+	public fun listIterator (I)Lcom/splendo/kaluga/base/collections/ConcurrentMutableListIterator;
+	public synthetic fun listIterator (I)Ljava/util/ListIterator;
+	public final fun remove (I)Ljava/lang/Object;
+	public fun remove (Ljava/lang/Object;)Z
+	public fun removeAll (Ljava/util/Collection;)Z
+	public fun removeAt (I)Ljava/lang/Object;
+	public fun retainAll (Ljava/util/Collection;)Z
+	public fun set (ILjava/lang/Object;)Ljava/lang/Object;
+	public final fun size ()I
+	public fun subList (II)Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public synthetic fun subList (II)Ljava/util/List;
+	public final fun synchronized (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public fun toArray ()[Ljava/lang/Object;
+	public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableListIterator : java/util/Iterator, java/util/ListIterator, kotlin/jvm/internal/markers/KMutableIterator, kotlin/jvm/internal/markers/KMutableListIterator {
+	public fun add (Ljava/lang/Object;)V
+	public fun hasNext ()Z
+	public fun hasPrevious ()Z
+	public fun next ()Ljava/lang/Object;
+	public fun nextIndex ()I
+	public fun previous ()Ljava/lang/Object;
+	public fun previousIndex ()I
+	public fun remove ()V
+	public fun set (Ljava/lang/Object;)V
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableListKt {
+	public static final fun concurrentMutableListOf ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public static final fun concurrentMutableListOf ([Ljava/lang/Object;)Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableMap : java/util/Map, kotlin/jvm/internal/markers/KMutableMap {
+	public fun <init> ()V
+	public fun clear ()V
+	public fun containsKey (Ljava/lang/Object;)Z
+	public fun containsValue (Ljava/lang/Object;)Z
+	public final fun entrySet ()Ljava/util/Set;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun get (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun getEntries ()Ljava/util/Set;
+	public fun getKeys ()Ljava/util/Set;
+	public fun getSize ()I
+	public fun getValues ()Ljava/util/Collection;
+	public fun hashCode ()I
+	public fun isEmpty ()Z
+	public final fun keySet ()Ljava/util/Set;
+	public fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun putAll (Ljava/util/Map;)V
+	public fun remove (Ljava/lang/Object;)Ljava/lang/Object;
+	public final fun size ()I
+	public final fun synchronized (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public fun toString ()Ljava/lang/String;
+	public final fun values ()Ljava/util/Collection;
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableMapKt {
+	public static final fun concurrentMutableMapOf ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
+	public static final fun concurrentMutableMapOf ([Lkotlin/Pair;)Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableSet : java/util/Set, kotlin/jvm/internal/markers/KMutableSet {
+	public fun <init> ()V
+	public fun add (Ljava/lang/Object;)Z
+	public fun addAll (Ljava/util/Collection;)Z
+	public fun clear ()V
+	public fun contains (Ljava/lang/Object;)Z
+	public fun containsAll (Ljava/util/Collection;)Z
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getSize ()I
+	public fun hashCode ()I
+	public fun isEmpty ()Z
+	public fun iterator ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableIterator;
+	public synthetic fun iterator ()Ljava/util/Iterator;
+	public fun remove (Ljava/lang/Object;)Z
+	public fun removeAll (Ljava/util/Collection;)Z
+	public fun retainAll (Ljava/util/Collection;)Z
+	public final fun size ()I
+	public final fun synchronized (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public fun toArray ()[Ljava/lang/Object;
+	public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableSetKt {
+	public static final fun concurrentMutableSetOf ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableSet;
+	public static final fun concurrentMutableSetOf ([Ljava/lang/Object;)Lcom/splendo/kaluga/base/collections/ConcurrentMutableSet;
+}
+
 public final class com/splendo/kaluga/base/flow/FlowKt {
 	public static final fun collectImportant (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun collectImportantUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -101,7 +218,7 @@ public final class com/splendo/kaluga/base/monitor/EnableServiceActivity : andro
 }
 
 public final class com/splendo/kaluga/base/monitor/EnableServiceActivity$Companion {
-	public final fun getEnablingHandlers ()Ljava/util/Map;
+	public final fun getEnablingHandlers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
 	public final fun showEnableServiceActivity (Landroid/content/Context;Ljava/lang/String;Landroid/content/Intent;)Lkotlinx/coroutines/CompletableDeferred;
 }
 
@@ -112,6 +229,123 @@ public abstract interface class com/splendo/kaluga/base/monitor/ServiceMonitor {
 	public abstract fun stopMonitoring ()V
 }
 
+public abstract class com/splendo/kaluga/base/state/BaseColdStateRepo : com/splendo/kaluga/base/state/StateRepo {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public abstract fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getLazyMutableFlow ()Lkotlin/Lazy;
+	protected fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
+	public abstract fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class com/splendo/kaluga/base/state/BaseHotStateRepo : com/splendo/kaluga/base/state/StateRepo {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public abstract fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
+	protected fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
+}
+
+public class com/splendo/kaluga/base/state/ColdStateFlowRepo : com/splendo/kaluga/base/state/BaseColdStateRepo, com/splendo/kaluga/base/state/StateFlowRepo {
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun getDeinitChangeStateWithRepo ()Lkotlin/jvm/functions/Function3;
+	public final fun getFirstState ()Lkotlin/jvm/functions/Function0;
+	public final fun getInitChangeStateWithRepo ()Lkotlin/jvm/functions/Function3;
+	public fun getLazyMutableFlow ()Lkotlin/Lazy;
+	public fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
+	public final fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class com/splendo/kaluga/base/state/ColdStateRepo : com/splendo/kaluga/base/state/BaseColdStateRepo {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/Lazy;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/Lazy;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public abstract fun deinitialize (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getLazyMutableFlow ()Lkotlin/Lazy;
+	public final fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/HandleAfterCreating {
+	public abstract fun afterCreatingNewState (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/HandleAfterNewStateIsSet {
+	public abstract fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved {
+	public abstract fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/HandleBeforeCreating {
+	public abstract fun beforeCreatingNewState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
+	public abstract fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class com/splendo/kaluga/base/state/HotStateFlowRepo : com/splendo/kaluga/base/state/BaseHotStateRepo, com/splendo/kaluga/base/state/StateFlowRepo {
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getInitialState ()Lkotlin/jvm/functions/Function1;
+	public fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
+	public fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
+	public final fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class com/splendo/kaluga/base/state/HotStateRepo : com/splendo/kaluga/base/state/BaseHotStateRepo {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/KalugaState {
+	public fun remain ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/base/state/KalugaStateKt {
+	public static final fun defaultLazySharedFlow ()Lkotlin/Lazy;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/StateFlowRepo {
+	public abstract fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
+}
+
+public abstract class com/splendo/kaluga/base/state/StateRepo : kotlinx/coroutines/CoroutineScope, kotlinx/coroutines/flow/Flow {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun collect (Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
+	protected abstract fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
+	public final fun getSubscriptionCount ()Lkotlinx/coroutines/flow/StateFlow;
+	public abstract fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun launchTakeAndChangeState (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+	public final fun launchTakeAndChangeState (Lkotlin/coroutines/CoroutineContext;Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+	public static synthetic fun launchTakeAndChangeState$default (Lcom/splendo/kaluga/base/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+	public static synthetic fun launchTakeAndChangeState$default (Lcom/splendo/kaluga/base/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+	public final fun launchUseState (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+	public static synthetic fun launchUseState$default (Lcom/splendo/kaluga/base/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+	public final fun peekState ()Lcom/splendo/kaluga/base/state/KalugaState;
+	public final fun takeAndChangeState (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun takeAndChangeState (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun useState (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
 public final class com/splendo/kaluga/base/text/DateFormatStyle : java/lang/Enum {
 	public static final field Full Lcom/splendo/kaluga/base/text/DateFormatStyle;
 	public static final field Long Lcom/splendo/kaluga/base/text/DateFormatStyle;
@@ -873,120 +1107,3 @@ public final class com/splendo/kaluga/base/utils/UnitSystem$Companion {
 	public final fun withRawValue (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/UnitSystem;
 }
 
-public abstract class com/splendo/kaluga/state/BaseColdStateRepo : com/splendo/kaluga/state/StateRepo {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public abstract fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun getLazyMutableFlow ()Lkotlin/Lazy;
-	protected fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-	public abstract fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/state/BaseHotStateRepo : com/splendo/kaluga/state/StateRepo {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public abstract fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
-	protected fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-}
-
-public class com/splendo/kaluga/state/ColdStateFlowRepo : com/splendo/kaluga/state/BaseColdStateRepo, com/splendo/kaluga/state/StateFlowRepo {
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitChangeStateWithRepo ()Lkotlin/jvm/functions/Function3;
-	public final fun getFirstState ()Lkotlin/jvm/functions/Function0;
-	public final fun getInitChangeStateWithRepo ()Lkotlin/jvm/functions/Function3;
-	public fun getLazyMutableFlow ()Lkotlin/Lazy;
-	public fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
-	public final fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/state/ColdStateRepo : com/splendo/kaluga/state/BaseColdStateRepo {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/Lazy;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/Lazy;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public abstract fun deinitialize (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getLazyMutableFlow ()Lkotlin/Lazy;
-	public final fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/splendo/kaluga/state/HandleAfterCreating {
-	public abstract fun afterCreatingNewState (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/splendo/kaluga/state/HandleAfterNewStateIsSet {
-	public abstract fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
-	public abstract fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/splendo/kaluga/state/HandleBeforeCreating {
-	public abstract fun beforeCreatingNewState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
-	public abstract fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/state/HotStateFlowRepo : com/splendo/kaluga/state/BaseHotStateRepo, com/splendo/kaluga/state/StateFlowRepo {
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getInitialState ()Lkotlin/jvm/functions/Function1;
-	public fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
-	public fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
-	public final fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/state/HotStateRepo : com/splendo/kaluga/state/BaseHotStateRepo {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
-}
-
-public abstract interface class com/splendo/kaluga/state/KalugaState {
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/state/KalugaStateKt {
-	public static final fun defaultLazySharedFlow ()Lkotlin/Lazy;
-}
-
-public abstract interface class com/splendo/kaluga/state/StateFlowRepo {
-	public abstract fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
-}
-
-public abstract class com/splendo/kaluga/state/StateRepo : kotlinx/coroutines/CoroutineScope, kotlinx/coroutines/flow/Flow {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun collect (Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
-	protected abstract fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-	public final fun getSubscriptionCount ()Lkotlinx/coroutines/flow/StateFlow;
-	public abstract fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun launchTakeAndChangeState (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
-	public final fun launchTakeAndChangeState (Lkotlin/coroutines/CoroutineContext;Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
-	public static synthetic fun launchTakeAndChangeState$default (Lcom/splendo/kaluga/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
-	public static synthetic fun launchTakeAndChangeState$default (Lcom/splendo/kaluga/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
-	public final fun launchUseState (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
-	public static synthetic fun launchUseState$default (Lcom/splendo/kaluga/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
-	public final fun peekState ()Lcom/splendo/kaluga/state/KalugaState;
-	public final fun takeAndChangeState (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun takeAndChangeState (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun useState (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index acb444f44..cf523f79d 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -42,6 +42,123 @@ public final class com/splendo/kaluga/base/SingleThreadDispatcherKt {
 	public static final fun singleThreadDispatcher (Ljava/lang/String;)Lkotlinx/coroutines/ExecutorCoroutineDispatcher;
 }
 
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableIterator : java/util/Iterator, kotlin/jvm/internal/markers/KMutableIterator {
+	public fun hasNext ()Z
+	public fun next ()Ljava/lang/Object;
+	public fun remove ()V
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableList : java/util/List, kotlin/jvm/internal/markers/KMutableList {
+	public fun <init> ()V
+	public fun add (ILjava/lang/Object;)V
+	public fun add (Ljava/lang/Object;)Z
+	public fun addAll (ILjava/util/Collection;)Z
+	public fun addAll (Ljava/util/Collection;)Z
+	public fun clear ()V
+	public fun contains (Ljava/lang/Object;)Z
+	public fun containsAll (Ljava/util/Collection;)Z
+	public fun equals (Ljava/lang/Object;)Z
+	public fun get (I)Ljava/lang/Object;
+	public fun getSize ()I
+	public fun hashCode ()I
+	public fun indexOf (Ljava/lang/Object;)I
+	public fun isEmpty ()Z
+	public fun iterator ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableIterator;
+	public synthetic fun iterator ()Ljava/util/Iterator;
+	public fun lastIndexOf (Ljava/lang/Object;)I
+	public fun listIterator ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableListIterator;
+	public synthetic fun listIterator ()Ljava/util/ListIterator;
+	public fun listIterator (I)Lcom/splendo/kaluga/base/collections/ConcurrentMutableListIterator;
+	public synthetic fun listIterator (I)Ljava/util/ListIterator;
+	public final fun remove (I)Ljava/lang/Object;
+	public fun remove (Ljava/lang/Object;)Z
+	public fun removeAll (Ljava/util/Collection;)Z
+	public fun removeAt (I)Ljava/lang/Object;
+	public fun retainAll (Ljava/util/Collection;)Z
+	public fun set (ILjava/lang/Object;)Ljava/lang/Object;
+	public final fun size ()I
+	public fun subList (II)Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public synthetic fun subList (II)Ljava/util/List;
+	public final fun synchronized (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public fun toArray ()[Ljava/lang/Object;
+	public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableListIterator : java/util/Iterator, java/util/ListIterator, kotlin/jvm/internal/markers/KMutableIterator, kotlin/jvm/internal/markers/KMutableListIterator {
+	public fun add (Ljava/lang/Object;)V
+	public fun hasNext ()Z
+	public fun hasPrevious ()Z
+	public fun next ()Ljava/lang/Object;
+	public fun nextIndex ()I
+	public fun previous ()Ljava/lang/Object;
+	public fun previousIndex ()I
+	public fun remove ()V
+	public fun set (Ljava/lang/Object;)V
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableListKt {
+	public static final fun concurrentMutableListOf ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public static final fun concurrentMutableListOf ([Ljava/lang/Object;)Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableMap : java/util/Map, kotlin/jvm/internal/markers/KMutableMap {
+	public fun <init> ()V
+	public fun clear ()V
+	public fun containsKey (Ljava/lang/Object;)Z
+	public fun containsValue (Ljava/lang/Object;)Z
+	public final fun entrySet ()Ljava/util/Set;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun get (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun getEntries ()Ljava/util/Set;
+	public fun getKeys ()Ljava/util/Set;
+	public fun getSize ()I
+	public fun getValues ()Ljava/util/Collection;
+	public fun hashCode ()I
+	public fun isEmpty ()Z
+	public final fun keySet ()Ljava/util/Set;
+	public fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun putAll (Ljava/util/Map;)V
+	public fun remove (Ljava/lang/Object;)Ljava/lang/Object;
+	public final fun size ()I
+	public final fun synchronized (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public fun toString ()Ljava/lang/String;
+	public final fun values ()Ljava/util/Collection;
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableMapKt {
+	public static final fun concurrentMutableMapOf ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
+	public static final fun concurrentMutableMapOf ([Lkotlin/Pair;)Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableSet : java/util/Set, kotlin/jvm/internal/markers/KMutableSet {
+	public fun <init> ()V
+	public fun add (Ljava/lang/Object;)Z
+	public fun addAll (Ljava/util/Collection;)Z
+	public fun clear ()V
+	public fun contains (Ljava/lang/Object;)Z
+	public fun containsAll (Ljava/util/Collection;)Z
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getSize ()I
+	public fun hashCode ()I
+	public fun isEmpty ()Z
+	public fun iterator ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableIterator;
+	public synthetic fun iterator ()Ljava/util/Iterator;
+	public fun remove (Ljava/lang/Object;)Z
+	public fun removeAll (Ljava/util/Collection;)Z
+	public fun retainAll (Ljava/util/Collection;)Z
+	public final fun size ()I
+	public final fun synchronized (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public fun toArray ()[Ljava/lang/Object;
+	public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/base/collections/ConcurrentMutableSetKt {
+	public static final fun concurrentMutableSetOf ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableSet;
+	public static final fun concurrentMutableSetOf ([Ljava/lang/Object;)Lcom/splendo/kaluga/base/collections/ConcurrentMutableSet;
+}
+
 public final class com/splendo/kaluga/base/flow/FlowKt {
 	public static final fun collectImportant (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun collectImportantUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -89,6 +206,127 @@ public abstract interface class com/splendo/kaluga/base/monitor/ServiceMonitor {
 	public abstract fun stopMonitoring ()V
 }
 
+public abstract class com/splendo/kaluga/base/state/BaseColdStateRepo : com/splendo/kaluga/base/state/StateRepo {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public abstract fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getLazyMutableFlow ()Lkotlin/Lazy;
+	protected fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
+	public abstract fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class com/splendo/kaluga/base/state/BaseHotStateRepo : com/splendo/kaluga/base/state/StateRepo {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public abstract fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
+	protected fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
+}
+
+public class com/splendo/kaluga/base/state/ColdStateFlowRepo : com/splendo/kaluga/base/state/BaseColdStateRepo, com/splendo/kaluga/base/state/StateFlowRepo {
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun getDeinitChangeStateWithRepo ()Lkotlin/jvm/functions/Function3;
+	public final fun getFirstState ()Lkotlin/jvm/functions/Function0;
+	public final fun getInitChangeStateWithRepo ()Lkotlin/jvm/functions/Function3;
+	public fun getLazyMutableFlow ()Lkotlin/Lazy;
+	public fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
+	public final fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class com/splendo/kaluga/base/state/ColdStateRepo : com/splendo/kaluga/base/state/BaseColdStateRepo {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/Lazy;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/Lazy;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public abstract fun deinitialize (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getLazyMutableFlow ()Lkotlin/Lazy;
+	public final fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/HandleAfterCreating {
+	public abstract fun afterCreatingNewState (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/HandleAfterNewStateIsSet {
+	public abstract fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved {
+	public abstract fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/HandleBeforeCreating {
+	public abstract fun beforeCreatingNewState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
+	public abstract fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class com/splendo/kaluga/base/state/HotStateFlowRepo : com/splendo/kaluga/base/state/BaseHotStateRepo, com/splendo/kaluga/base/state/StateFlowRepo {
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getInitialState ()Lkotlin/jvm/functions/Function1;
+	public fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
+	public fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
+	public final fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class com/splendo/kaluga/base/state/HotStateRepo : com/splendo/kaluga/base/state/BaseHotStateRepo {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/KalugaState {
+	public abstract fun remain ()Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/base/state/KalugaState$DefaultImpls {
+	public static fun remain (Lcom/splendo/kaluga/base/state/KalugaState;)Lkotlin/jvm/functions/Function1;
+}
+
+public final class com/splendo/kaluga/base/state/KalugaStateKt {
+	public static final fun defaultLazySharedFlow ()Lkotlin/Lazy;
+}
+
+public abstract interface class com/splendo/kaluga/base/state/StateFlowRepo {
+	public abstract fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
+}
+
+public abstract class com/splendo/kaluga/base/state/StateRepo : kotlinx/coroutines/CoroutineScope, kotlinx/coroutines/flow/Flow {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun collect (Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
+	protected abstract fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
+	public final fun getSubscriptionCount ()Lkotlinx/coroutines/flow/StateFlow;
+	public abstract fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun launchTakeAndChangeState (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+	public final fun launchTakeAndChangeState (Lkotlin/coroutines/CoroutineContext;Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+	public static synthetic fun launchTakeAndChangeState$default (Lcom/splendo/kaluga/base/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+	public static synthetic fun launchTakeAndChangeState$default (Lcom/splendo/kaluga/base/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+	public final fun launchUseState (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+	public static synthetic fun launchUseState$default (Lcom/splendo/kaluga/base/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+	public final fun peekState ()Lcom/splendo/kaluga/base/state/KalugaState;
+	public final fun takeAndChangeState (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun takeAndChangeState (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun useState (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
 public final class com/splendo/kaluga/base/text/DateFormatStyle : java/lang/Enum {
 	public static final field Full Lcom/splendo/kaluga/base/text/DateFormatStyle;
 	public static final field Long Lcom/splendo/kaluga/base/text/DateFormatStyle;
diff --git a/base/src/androidLibInstrumentedTest/kotlin/text/DateFormatterTest.kt b/base/src/androidLibInstrumentedTest/kotlin/text/DateFormatterTest.kt
index 50094c766..15e37a42f 100644
--- a/base/src/androidLibInstrumentedTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/androidLibInstrumentedTest/kotlin/text/DateFormatterTest.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.base.test.text
+package com.splendo.kaluga.base.text
 
 actual val usdForNL: String = "US$"
 actual val jpyForUS: String = "¥"
diff --git a/base/src/androidLibMain/kotlin/ApplicationHolder.kt b/base/src/androidLibMain/kotlin/ApplicationHolder.kt
index 7df656670..3a25243d8 100644
--- a/base/src/androidLibMain/kotlin/ApplicationHolder.kt
+++ b/base/src/androidLibMain/kotlin/ApplicationHolder.kt
@@ -1,8 +1,3 @@
-package com.splendo.kaluga.base
-
-import android.app.Application
-import android.content.Context
-
 /*
 
 Copyright 2022 Splendo Consulting B.V. The Netherlands
@@ -21,6 +16,11 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
+package com.splendo.kaluga.base
+
+import android.app.Application
+import android.content.Context
+
 class ApplicationHolder {
     companion object {
         var application: Application? = null
diff --git a/base/src/androidLibMain/kotlin/MainQueueDispatcher.kt b/base/src/androidLibMain/kotlin/MainQueueDispatcher.kt
index 14c9cb9ef..8aad125b1 100644
--- a/base/src/androidLibMain/kotlin/MainQueueDispatcher.kt
+++ b/base/src/androidLibMain/kotlin/MainQueueDispatcher.kt
@@ -1,8 +1,3 @@
-package com.splendo.kaluga.base
-
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
 /*
 
 Copyright 2022 Splendo Consulting B.V. The Netherlands
@@ -21,5 +16,10 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
+package com.splendo.kaluga.base
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
 @Deprecated("Use Dispatchers.Main")
 actual val MainQueueDispatcher: CoroutineDispatcher = Dispatchers.Main
diff --git a/base/src/androidLibMain/kotlin/utils/Serializable.kt b/base/src/androidLibMain/kotlin/utils/Serializable.kt
index 3a6850f11..1dc665d81 100644
--- a/base/src/androidLibMain/kotlin/utils/Serializable.kt
+++ b/base/src/androidLibMain/kotlin/utils/Serializable.kt
@@ -15,6 +15,7 @@
 
  */
 package com.splendo.kaluga.base.utils
+
 import java.io.Serializable
 
 actual typealias Serializable = Serializable
diff --git a/base/src/androidLibUnitTest/kotlin/text/DateFormatterTest.kt b/base/src/androidLibUnitTest/kotlin/text/DateFormatterTest.kt
index 343c50cd2..48d3a999f 100644
--- a/base/src/androidLibUnitTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/androidLibUnitTest/kotlin/text/DateFormatterTest.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.base.test.text
+package com.splendo.kaluga.base.text
 
 // your IDE might not understand having multiple actuals in the android test sets is actually ok (even though this is fine for compiling)
 // close the file and restart to clear the error.
diff --git a/base/src/commonMain/kotlin/state/KalugaState.kt b/base/src/commonMain/kotlin/state/KalugaState.kt
index 2d95f3adb..02b84354f 100644
--- a/base/src/commonMain/kotlin/state/KalugaState.kt
+++ b/base/src/commonMain/kotlin/state/KalugaState.kt
@@ -15,7 +15,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
    limitations under the License.
 
 */
-package com.splendo.kaluga.state
+package com.splendo.kaluga.base.state
 
 import com.splendo.kaluga.base.flow.SharedFlowCollectionEvent.FirstCollection
 import com.splendo.kaluga.base.flow.SharedFlowCollectionEvent.LaterCollections
diff --git a/base/src/commonMain/kotlin/utils/ApplyIf.kt b/base/src/commonMain/kotlin/utils/ApplyIf.kt
index 7f72cd789..68c49e28d 100644
--- a/base/src/commonMain/kotlin/utils/ApplyIf.kt
+++ b/base/src/commonMain/kotlin/utils/ApplyIf.kt
@@ -1,4 +1,3 @@
-package com.splendo.kaluga.base.utils
 /*
 
 Copyright 2022 Splendo Consulting B.V. The Netherlands
@@ -17,6 +16,8 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
+package com.splendo.kaluga.base.utils
+
 /**
  * Applies a given code block if a given condition is met
  * @param condition The condition that should be met
diff --git a/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt b/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt
index 2c461ba6c..716b1e8b1 100644
--- a/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt
+++ b/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt
@@ -1,4 +1,3 @@
-package com.splendo.kaluga.base.utils
 /*
 
 Copyright 2022 Splendo Consulting B.V. The Netherlands
@@ -17,6 +16,8 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
+package com.splendo.kaluga.base.utils
+
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Job
 
diff --git a/base/src/commonTest/kotlin/collections/ConcurrentMutableListTest.kt b/base/src/commonTest/kotlin/collections/ConcurrentMutableListTest.kt
index 0ea40f405..fdfd23ac4 100644
--- a/base/src/commonTest/kotlin/collections/ConcurrentMutableListTest.kt
+++ b/base/src/commonTest/kotlin/collections/ConcurrentMutableListTest.kt
@@ -15,12 +15,14 @@
 
  */
 
-package collections
+package com.splendo.kaluga.base.collections
 
-import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.base.runBlocking
+import com.splendo.kaluga.base.singleThreadDispatcher
 import com.splendo.kaluga.test.base.BaseTest
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -63,4 +65,20 @@ class ConcurrentMutableListTest : BaseTest() {
         list.clear()
         assertTrue(list.isEmpty())
     }
+
+    @Test
+    fun testConcurrency() = runBlocking {
+        val dispatchers = List(10) { singleThreadDispatcher("Thread $it") }
+        val list = concurrentMutableListOf<Int>()
+        val jobs = dispatchers.mapIndexed { index, dispatcher ->
+            launch(coroutineContext + dispatcher) {
+                repeat(1000) {
+                    list.add(index * 1000 + it)
+                }
+            }
+        }
+        jobs.joinAll()
+        assertEquals(10000, list.size)
+        dispatchers.forEach { it.close() }
+    }
 }
diff --git a/base/src/commonTest/kotlin/collections/ConcurrentMutableMapTest.kt b/base/src/commonTest/kotlin/collections/ConcurrentMutableMapTest.kt
index 346189055..f2de03ac5 100644
--- a/base/src/commonTest/kotlin/collections/ConcurrentMutableMapTest.kt
+++ b/base/src/commonTest/kotlin/collections/ConcurrentMutableMapTest.kt
@@ -15,12 +15,14 @@
 
  */
 
-package collections
+package com.splendo.kaluga.base.collections
 
-import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import com.splendo.kaluga.base.runBlocking
+import com.splendo.kaluga.base.singleThreadDispatcher
 import com.splendo.kaluga.test.base.BaseTest
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -55,4 +57,20 @@ class ConcurrentMutableMapTest : BaseTest() {
         map.clear()
         assertTrue(map.isEmpty())
     }
+
+    @Test
+    fun testConcurrency() = runBlocking {
+        val dispatchers = List(10) { singleThreadDispatcher("Thread $it") }
+        val map = concurrentMutableMapOf<Int, String>()
+        val jobs = dispatchers.mapIndexed { index, dispatcher ->
+            launch(coroutineContext + dispatcher) {
+                repeat(1000) {
+                    map[index * 1000 + it] = "$it on Thread $index"
+                }
+            }
+        }
+        jobs.joinAll()
+        assertEquals(10000, map.size)
+        dispatchers.forEach { it.close() }
+    }
 }
diff --git a/base/src/commonTest/kotlin/collections/ConcurrentMutableSetTest.kt b/base/src/commonTest/kotlin/collections/ConcurrentMutableSetTest.kt
index 51afeb52e..9e6866b0b 100644
--- a/base/src/commonTest/kotlin/collections/ConcurrentMutableSetTest.kt
+++ b/base/src/commonTest/kotlin/collections/ConcurrentMutableSetTest.kt
@@ -15,12 +15,14 @@
 
  */
 
-package collections
+package com.splendo.kaluga.base.collections
 
-import com.splendo.kaluga.base.collections.concurrentMutableSetOf
 import com.splendo.kaluga.base.runBlocking
+import com.splendo.kaluga.base.singleThreadDispatcher
 import com.splendo.kaluga.test.base.BaseTest
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -54,4 +56,20 @@ class ConcurrentMutableSetTest : BaseTest() {
         set.clear()
         assertTrue(set.isEmpty())
     }
+
+    @Test
+    fun testConcurrency() = runBlocking {
+        val dispatchers = List(10) { singleThreadDispatcher("Thread $it") }
+        val set = concurrentMutableSetOf<Int>()
+        val jobs = dispatchers.mapIndexed { index, dispatcher ->
+            launch(coroutineContext + dispatcher) {
+                repeat(1000) {
+                    set.add(index * 1000 + it)
+                }
+            }
+        }
+        jobs.joinAll()
+        assertEquals(10000, set.size)
+        dispatchers.forEach { it.close() }
+    }
 }
diff --git a/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt b/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt
index ac886593c..a5e840044 100644
--- a/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt
+++ b/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt
@@ -15,17 +15,13 @@
 
  */
 
-package com.splendo.kaluga.base
+package com.splendo.kaluga.base.flow
 
-import com.splendo.kaluga.base.SpecialFlowValueTest.Special.Last
-import com.splendo.kaluga.base.SpecialFlowValueTest.Special.More
-import com.splendo.kaluga.base.SpecialFlowValueTest.Special.Normal
-import com.splendo.kaluga.base.SpecialFlowValueTest.Special.NotImportant
-import com.splendo.kaluga.base.flow.SpecialFlowValue
-import com.splendo.kaluga.base.flow.collectImportant
-import com.splendo.kaluga.base.flow.collectImportantUntilLast
-import com.splendo.kaluga.base.flow.collectUntilLast
-import com.splendo.kaluga.base.flow.filterOnlyImportant
+import com.splendo.kaluga.base.flow.SpecialFlowValueTest.Special.Last
+import com.splendo.kaluga.base.flow.SpecialFlowValueTest.Special.More
+import com.splendo.kaluga.base.flow.SpecialFlowValueTest.Special.Normal
+import com.splendo.kaluga.base.flow.SpecialFlowValueTest.Special.NotImportant
+import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.test.base.BaseTest
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.flowOf
diff --git a/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt b/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt
index 5305b0e04..f871e71e4 100644
--- a/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt
@@ -15,13 +15,12 @@
 
  */
 
-package com.splendo.kaluga.state
+package com.splendo.kaluga.base.state
 
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.test.base.BaseTest
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
diff --git a/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt b/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
index bcc4fbf48..81e603050 100644
--- a/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/ColdStateRepoTest.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.state
+package com.splendo.kaluga.base.state
 
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.logging.debug
diff --git a/base/src/commonTest/kotlin/state/ReplayBufferStateRepoTest.kt b/base/src/commonTest/kotlin/state/ReplayBufferStateRepoTest.kt
index 43461babd..f76175220 100644
--- a/base/src/commonTest/kotlin/state/ReplayBufferStateRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/ReplayBufferStateRepoTest.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.state
+package com.splendo.kaluga.base.state
 
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.test.base.BaseTest
diff --git a/base/src/commonTest/kotlin/state/StateRepoTest.kt b/base/src/commonTest/kotlin/state/StateRepoTest.kt
index d32ab7f87..cde07f70e 100644
--- a/base/src/commonTest/kotlin/state/StateRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/StateRepoTest.kt
@@ -16,7 +16,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
-package com.splendo.kaluga.state
+package com.splendo.kaluga.base.state
 
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
diff --git a/base/src/commonTest/kotlin/text/DateFormatterTest.kt b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
index d4ec7f83f..748628579 100644
--- a/base/src/commonTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
@@ -15,12 +15,8 @@
 
  */
 
-package com.splendo.kaluga.base.test.text
+package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.text.DateFormatStyle
-import com.splendo.kaluga.base.text.KalugaDateFormatter
-import com.splendo.kaluga.base.text.dateFormat
-import com.splendo.kaluga.base.text.iso8601Pattern
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.Locale
 import com.splendo.kaluga.base.utils.Locale.Companion.createLocale
diff --git a/base/src/commonTest/kotlin/text/NumberFormatterTest.kt b/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
index 57d27e0c3..fbdafbfba 100644
--- a/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
@@ -15,10 +15,8 @@
 
  */
 
-package com.splendo.kaluga.base.test.text
+package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.text.NumberFormatStyle
-import com.splendo.kaluga.base.text.NumberFormatter
 import com.splendo.kaluga.base.utils.Locale.Companion.createLocale
 import com.splendo.kaluga.test.base.BaseTest
 import kotlin.test.Ignore
diff --git a/base/src/commonTest/kotlin/text/StringFormatterTest.kt b/base/src/commonTest/kotlin/text/StringFormatterTest.kt
index 57b5e5e7a..649aa19e9 100644
--- a/base/src/commonTest/kotlin/text/StringFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/StringFormatterTest.kt
@@ -15,9 +15,8 @@
 
  */
 
-package com.splendo.kaluga.base.test.text
+package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.text.format
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.Locale.Companion.createLocale
 import com.splendo.kaluga.base.utils.TimeZone
diff --git a/base/src/iosMain/kotlin/utils/DataUtils.kt b/base/src/iosMain/kotlin/utils/DataUtils.kt
index e1099c83e..7904f8885 100644
--- a/base/src/iosMain/kotlin/utils/DataUtils.kt
+++ b/base/src/iosMain/kotlin/utils/DataUtils.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.base
+package com.splendo.kaluga.base.utils
 
 import kotlinx.cinterop.ByteVar
 import kotlinx.cinterop.CPointer
diff --git a/base/src/iosMain/kotlin/utils/RangeUtils.kt b/base/src/iosMain/kotlin/utils/RangeUtils.kt
index 04483acee..dffc8d9bc 100644
--- a/base/src/iosMain/kotlin/utils/RangeUtils.kt
+++ b/base/src/iosMain/kotlin/utils/RangeUtils.kt
@@ -1,3 +1,20 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
 package com.splendo.kaluga.base.utils
 
 import kotlinx.cinterop.CValue
diff --git a/base/src/iosTest/kotlin/DateFormatterTest.kt b/base/src/iosTest/kotlin/text/DateFormatterTest.kt
similarity index 87%
rename from base/src/iosTest/kotlin/DateFormatterTest.kt
rename to base/src/iosTest/kotlin/text/DateFormatterTest.kt
index 50094c766..0d3526401 100644
--- a/base/src/iosTest/kotlin/DateFormatterTest.kt
+++ b/base/src/iosTest/kotlin/text/DateFormatterTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.base.test.text
+package com.splendo.kaluga.base.text
 
 actual val usdForNL: String = "US$"
 actual val jpyForUS: String = "¥"
diff --git a/base/src/iosTest/kotlin/DataUtilsTest.kt b/base/src/iosTest/kotlin/utils/DataUtilsTest.kt
similarity index 96%
rename from base/src/iosTest/kotlin/DataUtilsTest.kt
rename to base/src/iosTest/kotlin/utils/DataUtilsTest.kt
index 44fe76a36..f296b469c 100644
--- a/base/src/iosTest/kotlin/DataUtilsTest.kt
+++ b/base/src/iosTest/kotlin/utils/DataUtilsTest.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.base
+package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.test.base.BaseTest
 import kotlin.test.Test
diff --git a/base/src/jsMain/kotlin/MainQueueDispatcher.kt b/base/src/jsMain/kotlin/MainQueueDispatcher.kt
index c1509f5ab..450ffbf02 100644
--- a/base/src/jsMain/kotlin/MainQueueDispatcher.kt
+++ b/base/src/jsMain/kotlin/MainQueueDispatcher.kt
@@ -1,8 +1,3 @@
-package com.splendo.kaluga.base
-
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
 /*
 
 Copyright 2022 Splendo Consulting B.V. The Netherlands
@@ -21,4 +16,9 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
+package com.splendo.kaluga.base
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
 actual val MainQueueDispatcher: CoroutineDispatcher = Dispatchers.Main
diff --git a/base/src/jsMain/kotlin/utils/BigDecimal.kt b/base/src/jsMain/kotlin/utils/BigDecimal.kt
index 72aee66fe..0c6d34973 100644
--- a/base/src/jsMain/kotlin/utils/BigDecimal.kt
+++ b/base/src/jsMain/kotlin/utils/BigDecimal.kt
@@ -14,6 +14,7 @@
     limitations under the License.
 
  */
+
 @file:JsModule("@splendo/bigdecimal")
 @file:JsNonModule
 package com.splendo.kaluga.base.utils
diff --git a/base/src/jsTest/kotlin/text/DateFormatterTest.kt b/base/src/jsTest/kotlin/text/DateFormatterTest.kt
index a2b8247a4..54e4532cf 100644
--- a/base/src/jsTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/jsTest/kotlin/text/DateFormatterTest.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.base.test.text
+package com.splendo.kaluga.base.text
 
 actual val usdForNL: String = "USD"
 actual val jpyForUS: String = "JPY"
diff --git a/base/src/jvmTest/kotlin/text/DateFormatterTest.kt b/base/src/jvmTest/kotlin/text/DateFormatterTest.kt
index a2b8247a4..54e4532cf 100644
--- a/base/src/jvmTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/jvmTest/kotlin/text/DateFormatterTest.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.base.test.text
+package com.splendo.kaluga.base.text
 
 actual val usdForNL: String = "USD"
 actual val jpyForUS: String = "JPY"
diff --git a/bluetooth/api/androidLib/bluetooth.api b/bluetooth/api/androidLib/bluetooth.api
index ab9b0cd0d..b7958fd93 100644
--- a/bluetooth/api/androidLib/bluetooth.api
+++ b/bluetooth/api/androidLib/bluetooth.api
@@ -280,7 +280,7 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/BaseAdvertis
 	public abstract fun isConnectable ()Z
 }
 
-public abstract class com/splendo/kaluga/bluetooth/device/BaseConnectableDeviceStateRepo : com/splendo/kaluga/state/HotStateFlowRepo {
+public abstract class com/splendo/kaluga/bluetooth/device/BaseConnectableDeviceStateRepo : com/splendo/kaluga/base/state/HotStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/CoroutineContext;)V
 }
 
@@ -292,7 +292,7 @@ public abstract class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionMa
 	protected final fun getCurrentAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 	public final fun getDeviceWrapper ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
 	public fun getEvents ()Lkotlinx/coroutines/flow/Flow;
-	protected final fun getNotifyingCharacteristics ()Ljava/util/Map;
+	protected final fun getNotifyingCharacteristics ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
 	public synthetic fun getRssi ()Lkotlinx/coroutines/flow/Flow;
 	public fun getRssi ()Lkotlinx/coroutines/flow/SharedFlow;
 	public fun handleConnect ()V
@@ -333,7 +333,7 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/BluetoothGat
 	public abstract fun writeDescriptor (Lcom/splendo/kaluga/bluetooth/DescriptorWrapper;[B)Z
 }
 
-public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState : com/splendo/kaluga/bluetooth/device/DeviceState, com/splendo/kaluga/state/KalugaState {
+public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState : com/splendo/kaluga/base/state/KalugaState, com/splendo/kaluga/bluetooth/device/DeviceState {
 	public abstract fun getDidDisconnect ()Lkotlin/jvm/functions/Function1;
 	public abstract fun getDisconnecting ()Lkotlin/jvm/functions/Function1;
 	public abstract fun unpair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -412,10 +412,10 @@ public abstract class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState
 	public final fun startDisconnected ()V
 }
 
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering {
 	public fun <init> (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun component1 ()Ljava/lang/Integer;
 	public final fun copy (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;
@@ -427,11 +427,11 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
 	public fun addAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)Lkotlin/jvm/functions/Function1;
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun component1 ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 	public final fun component2 ()Ljava/util/List;
 	public final fun component3 ()Ljava/lang/Integer;
@@ -478,10 +478,10 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
 	public fun equals (Ljava/lang/Object;)Z
@@ -503,10 +503,10 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
 	public fun equals (Ljava/lang/Object;)Z
@@ -514,10 +514,10 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting {
 	public fun <init> (ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun component1 ()I
 	public final fun component2 ()Ljava/util/List;
 	public final fun copy (ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;
@@ -879,7 +879,7 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanner : com/spl
 	protected abstract fun didStartScanning (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected abstract fun didStopScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected abstract fun getBluetoothEnabledMonitor ()Lcom/splendo/kaluga/bluetooth/BluetoothMonitor;
-	protected final fun getBluetoothPermissionRepo ()Lcom/splendo/kaluga/state/StateRepo;
+	protected final fun getBluetoothPermissionRepo ()Lcom/splendo/kaluga/base/state/StateRepo;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	protected fun getEnabledFlow ()Lkotlinx/coroutines/flow/Flow;
 	protected final fun getEventChannel ()Lkotlinx/coroutines/channels/Channel;
@@ -922,7 +922,7 @@ public final class com/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings {
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanningStateRepo : com/splendo/kaluga/state/ColdStateFlowRepo {
+public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanningStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
 }
 
@@ -1042,7 +1042,7 @@ public final class com/splendo/kaluga/bluetooth/scanner/Scanner$Event$Permission
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningState : com/splendo/kaluga/state/KalugaState {
+public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningState : com/splendo/kaluga/base/state/KalugaState {
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningState$Active : com/splendo/kaluga/bluetooth/scanner/ScanningState {
@@ -1118,11 +1118,11 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl {
 	public static final field Companion Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Companion;
 }
 
-public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/state/HandleAfterNewStateIsSet, com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
+public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
 	public abstract fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public abstract fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
@@ -1168,10 +1168,10 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Device
 }
 
 public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getDisable ()Lkotlin/jvm/functions/Function1;
 	protected abstract fun getPermittedHandler ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$PermittedHandler;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
@@ -1187,11 +1187,11 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enable
 	public fun startScanning (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
 }
 
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Scanning : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning, com/splendo/kaluga/state/HandleAfterCreating, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Scanning : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/base/state/HandleAfterCreating, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning {
+	public synthetic fun afterCreatingNewState (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterCreatingNewState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterCreatingNewState (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun discoverDevice (Ljava/lang/String;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
@@ -1225,10 +1225,10 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoB
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth$Disabled : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index b33831ca4..16c7e1d87 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -242,7 +242,7 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/BaseAdvertis
 	public abstract fun isConnectable ()Z
 }
 
-public abstract class com/splendo/kaluga/bluetooth/device/BaseConnectableDeviceStateRepo : com/splendo/kaluga/state/HotStateFlowRepo {
+public abstract class com/splendo/kaluga/bluetooth/device/BaseConnectableDeviceStateRepo : com/splendo/kaluga/base/state/HotStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/CoroutineContext;)V
 }
 
@@ -254,7 +254,7 @@ public abstract class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionMa
 	protected final fun getCurrentAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 	public final fun getDeviceWrapper ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
 	public fun getEvents ()Lkotlinx/coroutines/flow/Flow;
-	protected final fun getNotifyingCharacteristics ()Ljava/util/Map;
+	protected final fun getNotifyingCharacteristics ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
 	public synthetic fun getRssi ()Lkotlinx/coroutines/flow/Flow;
 	public fun getRssi ()Lkotlinx/coroutines/flow/SharedFlow;
 	public fun handleConnect ()V
@@ -281,7 +281,7 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/BaseDeviceCo
 	public abstract fun create (Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager;
 }
 
-public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState : com/splendo/kaluga/bluetooth/device/DeviceState, com/splendo/kaluga/state/KalugaState {
+public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState : com/splendo/kaluga/base/state/KalugaState, com/splendo/kaluga/bluetooth/device/DeviceState {
 	public abstract fun getDidDisconnect ()Lkotlin/jvm/functions/Function1;
 	public abstract fun getDisconnecting ()Lkotlin/jvm/functions/Function1;
 	public abstract fun unpair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -405,10 +405,10 @@ public abstract class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState
 	public final fun startDisconnected ()V
 }
 
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering {
 	public fun <init> (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun component1 ()Ljava/lang/Integer;
 	public final fun copy (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;
@@ -421,11 +421,11 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
 	public fun addAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)Lkotlin/jvm/functions/Function1;
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun component1 ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 	public final fun component2 ()Ljava/util/List;
 	public final fun component3 ()Ljava/lang/Integer;
@@ -475,10 +475,10 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
 	public fun equals (Ljava/lang/Object;)Z
@@ -502,10 +502,10 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
 	public fun equals (Ljava/lang/Object;)Z
@@ -514,10 +514,10 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImp
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting {
 	public fun <init> (ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun component1 ()I
 	public final fun component2 ()Ljava/util/List;
 	public final fun copy (ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;
@@ -856,7 +856,7 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanner : com/spl
 	protected abstract fun didStartScanning (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected abstract fun didStopScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected abstract fun getBluetoothEnabledMonitor ()Lcom/splendo/kaluga/bluetooth/BluetoothMonitor;
-	protected final fun getBluetoothPermissionRepo ()Lcom/splendo/kaluga/state/StateRepo;
+	protected final fun getBluetoothPermissionRepo ()Lcom/splendo/kaluga/base/state/StateRepo;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	protected fun getEnabledFlow ()Lkotlinx/coroutines/flow/Flow;
 	protected final fun getEventChannel ()Lkotlinx/coroutines/channels/Channel;
@@ -899,7 +899,7 @@ public final class com/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings {
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanningStateRepo : com/splendo/kaluga/state/ColdStateFlowRepo {
+public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanningStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
 }
 
@@ -1010,7 +1010,7 @@ public final class com/splendo/kaluga/bluetooth/scanner/Scanner$Event$Permission
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningState : com/splendo/kaluga/state/KalugaState {
+public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningState : com/splendo/kaluga/base/state/KalugaState {
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningState$Active : com/splendo/kaluga/bluetooth/scanner/ScanningState {
@@ -1150,11 +1150,11 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl {
 	public static final field Companion Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Companion;
 }
 
-public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/state/HandleAfterNewStateIsSet, com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
+public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
 	public abstract fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public abstract fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
@@ -1202,10 +1202,10 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Device
 }
 
 public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getDisable ()Lkotlin/jvm/functions/Function1;
 	protected abstract fun getPermittedHandler ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$PermittedHandler;
 	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
@@ -1222,11 +1222,11 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enable
 	public fun startScanning (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
 }
 
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Scanning : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning, com/splendo/kaluga/state/HandleAfterCreating, com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
+public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Scanning : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/base/state/HandleAfterCreating, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning {
+	public synthetic fun afterCreatingNewState (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterCreatingNewState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterCreatingNewState (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun discoverDevice (Lcom/splendo/kaluga/bluetooth/UUID;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
 	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
@@ -1262,10 +1262,10 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoB
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth$Disabled : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
diff --git a/bluetooth/src/commonMain/kotlin/device/Device.kt b/bluetooth/src/commonMain/kotlin/device/Device.kt
index 4636f66d4..33fc3ecb5 100644
--- a/bluetooth/src/commonMain/kotlin/device/Device.kt
+++ b/bluetooth/src/commonMain/kotlin/device/Device.kt
@@ -18,8 +18,8 @@ package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.base.utils.getCompletedOrNull
 import com.splendo.kaluga.logging.debug
-import com.splendo.kaluga.state.HotStateFlowRepo
-import com.splendo.kaluga.state.StateRepo
+import com.splendo.kaluga.base.state.HotStateFlowRepo
+import com.splendo.kaluga.base.state.StateRepo
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
index 9978d10ea..f2376ae16 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
@@ -18,8 +18,8 @@
 package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.bluetooth.Service
-import com.splendo.kaluga.state.HandleAfterOldStateIsRemoved
-import com.splendo.kaluga.state.KalugaState
+import com.splendo.kaluga.base.state.HandleAfterOldStateIsRemoved
+import com.splendo.kaluga.base.state.KalugaState
 import kotlinx.coroutines.CompletableDeferred
 
 sealed class DeviceAction {
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
index 8ce95348b..04912efd0 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
@@ -22,11 +22,11 @@ import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.device.BaseAdvertisementData
 import com.splendo.kaluga.bluetooth.device.Device
 import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.state.HandleAfterCreating
-import com.splendo.kaluga.state.HandleAfterNewStateIsSet
-import com.splendo.kaluga.state.HandleAfterOldStateIsRemoved
-import com.splendo.kaluga.state.HandleBeforeOldStateIsRemoved
-import com.splendo.kaluga.state.KalugaState
+import com.splendo.kaluga.base.state.HandleAfterCreating
+import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
+import com.splendo.kaluga.base.state.HandleAfterOldStateIsRemoved
+import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
+import com.splendo.kaluga.base.state.KalugaState
 
 typealias Filter = Set<UUID>
 
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
index c674fdf0a..27bf2bb54 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
@@ -21,8 +21,8 @@ import com.splendo.kaluga.bluetooth.device.Device
 import com.splendo.kaluga.bluetooth.device.DeviceInfoImpl
 import com.splendo.kaluga.bluetooth.device.DeviceWrapper
 import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.state.ColdStateFlowRepo
-import com.splendo.kaluga.state.StateRepo
+import com.splendo.kaluga.base.state.ColdStateFlowRepo
+import com.splendo.kaluga.base.state.StateRepo
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
diff --git a/bluetooth/src/iosMain/kotlin/Descriptor.kt b/bluetooth/src/iosMain/kotlin/Descriptor.kt
index c6a72786a..bafab88e7 100644
--- a/bluetooth/src/iosMain/kotlin/Descriptor.kt
+++ b/bluetooth/src/iosMain/kotlin/Descriptor.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.bluetooth
 
-import com.splendo.kaluga.base.toNSData
+import com.splendo.kaluga.base.utils.toNSData
 import platform.CoreBluetooth.CBDescriptor
 import platform.CoreBluetooth.CBPeripheral
 import platform.CoreBluetooth.CBUUID
diff --git a/bluetooth/src/iosMain/kotlin/Value.kt b/bluetooth/src/iosMain/kotlin/Value.kt
index 03e116da1..7e7b2f8aa 100644
--- a/bluetooth/src/iosMain/kotlin/Value.kt
+++ b/bluetooth/src/iosMain/kotlin/Value.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.bluetooth
 
-import com.splendo.kaluga.base.toByteArray
+import com.splendo.kaluga.base.utils.toByteArray
 import platform.Foundation.NSData
 
 actual typealias Value = NSData
diff --git a/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
index 804dac681..78aadd533 100644
--- a/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.device
 
-import com.splendo.kaluga.base.toByteArray
+import com.splendo.kaluga.base.utils.toByteArray
 import com.splendo.kaluga.base.utils.typedList
 import com.splendo.kaluga.base.utils.typedMap
 import com.splendo.kaluga.bluetooth.UUID
diff --git a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
index c8559740a..8b69213f2 100644
--- a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.device
 
-import com.splendo.kaluga.base.toNSData
+import com.splendo.kaluga.base.utils.toNSData
 import com.splendo.kaluga.base.utils.typedList
 import com.splendo.kaluga.bluetooth.DefaultServiceWrapper
 import com.splendo.kaluga.bluetooth.uuidString
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
index 56339ac0d..eee693219 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
@@ -16,9 +16,9 @@
  */
 package com.splendo.kaluga.datetime.timer
 
-import com.splendo.kaluga.state.HandleAfterNewStateIsSet
-import com.splendo.kaluga.state.HandleBeforeOldStateIsRemoved
-import com.splendo.kaluga.state.HotStateFlowRepo
+import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
+import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
+import com.splendo.kaluga.base.state.HotStateFlowRepo
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.SupervisorJob
@@ -34,7 +34,7 @@ import kotlinx.coroutines.withContext
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.TimeSource
-import com.splendo.kaluga.state.KalugaState as KalugaState
+import com.splendo.kaluga.base.state.KalugaState as KalugaState
 
 /** A coroutine delay function. */
 typealias DelayFunction = suspend (Duration) -> Unit
diff --git a/example/gradle.properties b/example/gradle.properties
index 84c837739..c9358bc1d 100644
--- a/example/gradle.properties
+++ b/example/gradle.properties
@@ -1,6 +1,6 @@
 ## ## keep in sync with gradle.properties in root ## ##
 # Gradle
-org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4096M"
+org.gradle.jvmargs=-Xmx8G -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx8G"
 
 #Kotlin
 kotlin.code.style=official
diff --git a/gradle.properties b/gradle.properties
index a639dbb41..c935df353 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ kaluga.kotlinVersion=1.8.0
 kaluga.googleServicesGradlePluginVersion=4.3.14
 kaluga.ktLintGradlePluginVersion=11.0.0
 kaluga.atomicFuGradlePluginVersion=0.19.0
-org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx4096M"
+org.gradle.jvmargs=-Xmx8G -Dkotlin.daemon.jvm.options\="-Xmx8G"
 
 #MPP
 kotlin.mpp.enableGranularSourceSetsMetadata=true
diff --git a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
index 24c633011..0dcd8985f 100644
--- a/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
+++ b/kaluga-library-components/src/main/kotlin/AndroidCommon.kt
@@ -30,6 +30,7 @@ fun org.gradle.api.Project.commonAndroidComponent(type: ComponentType = Componen
 
         testImplementationDependency(Dependencies.JUnit)
         testImplementationDependency(Dependencies.Mockito.Core)
+        testImplementationDependency(Dependencies.ByteBuddy.Agent)
         testImplementationDependency(Dependencies.Kotlin.Test)
         testImplementationDependency(Dependencies.Kotlin.JUnit)
 
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index 4c0d29e1a..c3211f762 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -32,8 +32,12 @@ fun KotlinDependencyHandler.implementationDependency(dependency: Dependency, han
     handler?.invoke(this)
 }
 
-fun DependencyHandler.apiDependency(dependency: Dependency) {
-    add("api", dependency.notation)
+fun DependencyHandler.apiDependency(dependency: Dependency, handler: ModuleDependencyHandler? = null) {
+    add("api", dependency.notation).apply {
+        (this as? ModuleDependency)?.let {
+            handler?.invoke(it)
+        }
+    }
 }
 fun DependencyHandler.implementationDependency(dependency: Dependency, handler: ModuleDependencyHandler? = null) {
     add("implementation", dependency.notation).apply {
diff --git a/location/api/androidLib/location.api b/location/api/androidLib/location.api
index 4a47f4fc7..46c5ff9a0 100644
--- a/location/api/androidLib/location.api
+++ b/location/api/androidLib/location.api
@@ -45,7 +45,7 @@ public final class com/splendo/kaluga/location/BaseLocationManager$Settings {
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/location/BaseLocationStateRepo : com/splendo/kaluga/state/ColdStateFlowRepo {
+public abstract class com/splendo/kaluga/location/BaseLocationStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
@@ -306,7 +306,7 @@ public abstract interface class com/splendo/kaluga/location/LocationProvider {
 	public abstract fun stopMonitoringLocation (Lcom/splendo/kaluga/permissions/location/LocationPermission;)V
 }
 
-public abstract interface class com/splendo/kaluga/location/LocationState : com/splendo/kaluga/state/KalugaState {
+public abstract interface class com/splendo/kaluga/location/LocationState : com/splendo/kaluga/base/state/KalugaState {
 	public abstract fun getLocation ()Lcom/splendo/kaluga/location/Location;
 }
 
@@ -355,11 +355,11 @@ public abstract class com/splendo/kaluga/location/LocationStateImpl {
 	public abstract fun getLocation ()Lcom/splendo/kaluga/location/Location;
 }
 
-public abstract class com/splendo/kaluga/location/LocationStateImpl$Active : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/state/HandleAfterNewStateIsSet, com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
+public abstract class com/splendo/kaluga/location/LocationStateImpl$Active : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getDeinitialized ()Lkotlin/jvm/functions/Function1;
 	protected abstract fun getLocationManager ()Lcom/splendo/kaluga/location/LocationManager;
 }
@@ -381,10 +381,10 @@ public abstract class com/splendo/kaluga/location/LocationStateImpl$Disabled : c
 
 public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NoGPS : com/splendo/kaluga/location/LocationStateImpl$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NoGPS {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
@@ -398,10 +398,10 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NotPer
 
 public final class com/splendo/kaluga/location/LocationStateImpl$Enabled : com/splendo/kaluga/location/LocationStateImpl$Active, com/splendo/kaluga/location/LocationState$Enabled {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun component1 ()Lcom/splendo/kaluga/location/Location;
 	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index 0afc56d86..ac5849d48 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -45,7 +45,7 @@ public final class com/splendo/kaluga/location/BaseLocationManager$Settings {
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/location/BaseLocationStateRepo : com/splendo/kaluga/state/ColdStateFlowRepo {
+public abstract class com/splendo/kaluga/location/BaseLocationStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
@@ -256,7 +256,7 @@ public final class com/splendo/kaluga/location/LocationMonitor$Builder {
 	public final fun create ()Lcom/splendo/kaluga/location/LocationMonitor;
 }
 
-public abstract interface class com/splendo/kaluga/location/LocationState : com/splendo/kaluga/state/KalugaState {
+public abstract interface class com/splendo/kaluga/location/LocationState : com/splendo/kaluga/base/state/KalugaState {
 	public abstract fun getLocation ()Lcom/splendo/kaluga/location/Location;
 }
 
@@ -353,11 +353,11 @@ public abstract class com/splendo/kaluga/location/LocationStateImpl {
 	public abstract fun getLocation ()Lcom/splendo/kaluga/location/Location;
 }
 
-public abstract class com/splendo/kaluga/location/LocationStateImpl$Active : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/state/HandleAfterNewStateIsSet, com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
+public abstract class com/splendo/kaluga/location/LocationStateImpl$Active : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getDeinitialized ()Lkotlin/jvm/functions/Function1;
 	protected abstract fun getLocationManager ()Lcom/splendo/kaluga/location/LocationManager;
 }
@@ -380,10 +380,10 @@ public abstract class com/splendo/kaluga/location/LocationStateImpl$Disabled : c
 
 public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NoGPS : com/splendo/kaluga/location/LocationStateImpl$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NoGPS {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getEnable ()Lkotlin/jvm/functions/Function1;
 	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
 	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
@@ -399,10 +399,10 @@ public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NotPer
 
 public final class com/splendo/kaluga/location/LocationStateImpl$Enabled : com/splendo/kaluga/location/LocationStateImpl$Active, com/splendo/kaluga/location/LocationState$Enabled {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun component1 ()Lcom/splendo/kaluga/location/Location;
 	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
diff --git a/location/src/commonMain/kotlin/location/LocationState.kt b/location/src/commonMain/kotlin/location/LocationState.kt
index 59269908b..c6b7d2d90 100644
--- a/location/src/commonMain/kotlin/location/LocationState.kt
+++ b/location/src/commonMain/kotlin/location/LocationState.kt
@@ -19,9 +19,9 @@ package com.splendo.kaluga.location
 
 import com.splendo.kaluga.base.flow.SpecialFlowValue
 import com.splendo.kaluga.base.flow.filterOnlyImportant
-import com.splendo.kaluga.state.HandleAfterNewStateIsSet
-import com.splendo.kaluga.state.HandleBeforeOldStateIsRemoved
-import com.splendo.kaluga.state.KalugaState
+import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
+import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
+import com.splendo.kaluga.base.state.KalugaState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
diff --git a/location/src/commonMain/kotlin/location/LocationStateRepo.kt b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
index cc3b9485e..cac6e6154 100644
--- a/location/src/commonMain/kotlin/location/LocationStateRepo.kt
+++ b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
@@ -20,9 +20,9 @@ package com.splendo.kaluga.location
 import com.splendo.kaluga.base.singleThreadDispatcher
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.location.LocationPermission
-import com.splendo.kaluga.state.ColdStateFlowRepo
-import com.splendo.kaluga.state.ColdStateRepo
-import com.splendo.kaluga.state.StateRepo
+import com.splendo.kaluga.base.state.ColdStateFlowRepo
+import com.splendo.kaluga.base.state.ColdStateRepo
+import com.splendo.kaluga.base.state.StateRepo
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/system/api/androidLib/system.api b/system/api/androidLib/system.api
index af7c4cf39..93fb096bd 100644
--- a/system/api/androidLib/system.api
+++ b/system/api/androidLib/system.api
@@ -107,7 +107,7 @@ public abstract interface class com/splendo/kaluga/system/network/ReachableNetwo
 	public abstract fun isExpensive ()Z
 }
 
-public abstract class com/splendo/kaluga/system/network/state/BaseNetworkStateRepo : com/splendo/kaluga/state/ColdStateFlowRepo {
+public abstract class com/splendo/kaluga/system/network/state/BaseNetworkStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
 }
 
@@ -116,7 +116,7 @@ public abstract interface class com/splendo/kaluga/system/network/state/BaseNetw
 	public static synthetic fun create$default (Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
 }
 
-public abstract interface class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/state/KalugaState {
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/base/state/KalugaState {
 	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 }
 
@@ -166,10 +166,10 @@ public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl {
 	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 }
 
-public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Active : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/state/HandleAfterNewStateIsSet, com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Active : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
 	public abstract fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
diff --git a/system/api/jvm/system.api b/system/api/jvm/system.api
index af4f615f1..3a5a5ffb0 100644
--- a/system/api/jvm/system.api
+++ b/system/api/jvm/system.api
@@ -108,7 +108,7 @@ public abstract interface class com/splendo/kaluga/system/network/ReachableNetwo
 	public abstract fun isExpensive ()Z
 }
 
-public abstract class com/splendo/kaluga/system/network/state/BaseNetworkStateRepo : com/splendo/kaluga/state/ColdStateFlowRepo {
+public abstract class com/splendo/kaluga/system/network/state/BaseNetworkStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
 }
 
@@ -120,7 +120,7 @@ public final class com/splendo/kaluga/system/network/state/BaseNetworkStateRepoB
 	public static synthetic fun create$default (Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
 }
 
-public abstract interface class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/state/KalugaState {
+public abstract interface class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/base/state/KalugaState {
 	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 }
 
@@ -214,10 +214,10 @@ public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl {
 	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 }
 
-public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Active : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/state/HandleAfterNewStateIsSet, com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Active : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
+	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun afterNewStateIsSet (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
 	public abstract fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
index d1ec59baf..b2f6d61d7 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
@@ -18,9 +18,9 @@
 package com.splendo.kaluga.system.network.state
 
 import com.splendo.kaluga.base.flow.SpecialFlowValue
-import com.splendo.kaluga.state.HandleAfterNewStateIsSet
-import com.splendo.kaluga.state.HandleBeforeOldStateIsRemoved
-import com.splendo.kaluga.state.KalugaState
+import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
+import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
+import com.splendo.kaluga.base.state.KalugaState
 import com.splendo.kaluga.system.network.NetworkConnectionType
 import com.splendo.kaluga.system.network.NetworkManager
 import com.splendo.kaluga.system.network.unknown
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
index 3264bb0d4..5bd3134ca 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
+++ b/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
@@ -18,8 +18,8 @@
 package com.splendo.kaluga.system.network.state
 
 import com.splendo.kaluga.base.flow.filterOnlyImportant
-import com.splendo.kaluga.state.ColdStateFlowRepo
-import com.splendo.kaluga.state.StateRepo
+import com.splendo.kaluga.base.state.ColdStateFlowRepo
+import com.splendo.kaluga.base.state.StateRepo
 import com.splendo.kaluga.system.network.BaseNetworkManager
 import com.splendo.kaluga.system.network.NetworkConnectionType
 import com.splendo.kaluga.system.network.NetworkManager
diff --git a/test-utils-base/api/androidLib/test-utils-base.api b/test-utils-base/api/androidLib/test-utils-base.api
index 314929fae..058a5d42a 100644
--- a/test-utils-base/api/androidLib/test-utils-base.api
+++ b/test-utils-base/api/androidLib/test-utils-base.api
@@ -77,10 +77,6 @@ public abstract class com/splendo/kaluga/test/base/FlowTest : com/splendo/kaluga
 	public final fun testWithFlow (Lkotlin/jvm/functions/Function3;)V
 }
 
-public final class com/splendo/kaluga/test/base/FlowTestKt {
-	public static final fun getContextMap ()Ljava/util/Map;
-}
-
 public abstract class com/splendo/kaluga/test/base/FlowableTest : com/splendo/kaluga/test/base/BaseTest {
 	public fun <init> ()V
 	public abstract fun mutableSharedFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
diff --git a/test-utils-base/api/jvm/test-utils-base.api b/test-utils-base/api/jvm/test-utils-base.api
index 6b47d58f5..117f3d436 100644
--- a/test-utils-base/api/jvm/test-utils-base.api
+++ b/test-utils-base/api/jvm/test-utils-base.api
@@ -74,10 +74,6 @@ public abstract class com/splendo/kaluga/test/base/FlowTest : com/splendo/kaluga
 	public final fun testWithFlow (Lkotlin/jvm/functions/Function3;)V
 }
 
-public final class com/splendo/kaluga/test/base/FlowTestKt {
-	public static final fun getContextMap ()Ljava/util/Map;
-}
-
 public abstract class com/splendo/kaluga/test/base/FlowableTest : com/splendo/kaluga/test/base/BaseTest {
 	public fun <init> ()V
 	public abstract fun mutableSharedFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
diff --git a/test-utils-base/build.gradle.kts b/test-utils-base/build.gradle.kts
index 3a8cf5b78..b44db92a0 100644
--- a/test-utils-base/build.gradle.kts
+++ b/test-utils-base/build.gradle.kts
@@ -47,9 +47,7 @@ android {
         apiDependency(Dependencies.AndroidX.ArchCore)
 
         implementationDependency(Dependencies.Mockito.Core)
-        implementationDependency(Dependencies.Mockito.Android)
         implementationDependency(Dependencies.ByteBuddy.Agent)
-        implementationDependency(Dependencies.ByteBuddy.Android)
 
         apiDependency(Dependencies.KotlinX.Coroutines.Test)
         apiDependency(Dependencies.KotlinX.Coroutines.Debug)
diff --git a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
index 2cc7d38de..755135223 100644
--- a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
@@ -138,7 +138,7 @@ public final class com/splendo/kaluga/test/bluetooth/MockDeviceWrapper : com/spl
 	public final fun getConnectGattMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getCreateBondMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public fun getDevice ()Landroid/bluetooth/BluetoothDevice;
-	public final fun getGattWrappers ()Ljava/util/List;
+	public final fun getGattWrappers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public fun getIdentifier ()Ljava/lang/String;
 	public fun getName ()Ljava/lang/String;
 	public final fun getRemoveBondMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
@@ -278,7 +278,7 @@ public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnection
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedDeviceConnectionManager ()Ljava/util/List;
+	public final fun getCreatedDeviceConnectionManager ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner : com/splendo/kaluga/bluetooth/scanner/BaseScanner {
@@ -309,7 +309,7 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner$Bui
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedScanners ()Ljava/util/List;
+	public final fun getCreatedScanners ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanner : com/splendo/kaluga/bluetooth/scanner/Scanner {
diff --git a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
index 8fcbe2f64..8c9e2aa73 100644
--- a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
@@ -188,7 +188,7 @@ public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnection
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedDeviceConnectionManager ()Ljava/util/List;
+	public final fun getCreatedDeviceConnectionManager ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner : com/splendo/kaluga/bluetooth/scanner/BaseScanner {
@@ -219,7 +219,7 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner$Bui
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedScanners ()Ljava/util/List;
+	public final fun getCreatedScanners ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanner : com/splendo/kaluga/bluetooth/scanner/Scanner {
diff --git a/test-utils-bluetooth/src/iosMain/kotlin/IOSMockCharacteristicWrapper.kt b/test-utils-bluetooth/src/iosMain/kotlin/IOSMockCharacteristicWrapper.kt
index 178f61a01..fc6401a6d 100644
--- a/test-utils-bluetooth/src/iosMain/kotlin/IOSMockCharacteristicWrapper.kt
+++ b/test-utils-bluetooth/src/iosMain/kotlin/IOSMockCharacteristicWrapper.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.test.bluetooth
 
-import com.splendo.kaluga.base.toNSData
+import com.splendo.kaluga.base.utils.toNSData
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
 import com.splendo.kaluga.bluetooth.DescriptorWrapper
diff --git a/test-utils-bluetooth/src/iosMain/kotlin/IOSMockDescriptorWrapper.kt b/test-utils-bluetooth/src/iosMain/kotlin/IOSMockDescriptorWrapper.kt
index 472405232..67ef1aca9 100644
--- a/test-utils-bluetooth/src/iosMain/kotlin/IOSMockDescriptorWrapper.kt
+++ b/test-utils-bluetooth/src/iosMain/kotlin/IOSMockDescriptorWrapper.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.test.bluetooth
 
-import com.splendo.kaluga.base.toNSData
+import com.splendo.kaluga.base.utils.toNSData
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
 import kotlinx.coroutines.CompletableDeferred
diff --git a/test-utils-hud/api/androidLib/test-utils-hud.api b/test-utils-hud/api/androidLib/test-utils-hud.api
index 2dc8365d1..79606987f 100644
--- a/test-utils-hud/api/androidLib/test-utils-hud.api
+++ b/test-utils-hud/api/androidLib/test-utils-hud.api
@@ -23,7 +23,7 @@ public final class com/splendo/kaluga/test/hud/MockHUD$Builder : com/splendo/kal
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/hud/BaseHUD;
 	public fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/hud/MockHUD;
-	public final fun getBuiltHUDs ()Ljava/util/List;
+	public final fun getBuiltHUDs ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
diff --git a/test-utils-hud/api/jvm/test-utils-hud.api b/test-utils-hud/api/jvm/test-utils-hud.api
index 0a9134f6c..da018f547 100644
--- a/test-utils-hud/api/jvm/test-utils-hud.api
+++ b/test-utils-hud/api/jvm/test-utils-hud.api
@@ -16,7 +16,7 @@ public final class com/splendo/kaluga/test/hud/MockHUD$Builder : com/splendo/kal
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/hud/BaseHUD;
 	public fun create (Lcom/splendo/kaluga/hud/HudConfig;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/hud/MockHUD;
-	public final fun getBuiltHUDs ()Ljava/util/List;
+	public final fun getBuiltHUDs ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
diff --git a/test-utils-keyboard/api/androidLib/test-utils-keyboard.api b/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
index 12811d002..c771c929a 100644
--- a/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
+++ b/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
@@ -30,7 +30,7 @@ public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager$Builder
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
 	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/keyboard/MockKeyboardManager;
-	public final fun getBuiltKeyboardManagers ()Ljava/util/List;
+	public final fun getBuiltKeyboardManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
diff --git a/test-utils-keyboard/api/jvm/test-utils-keyboard.api b/test-utils-keyboard/api/jvm/test-utils-keyboard.api
index 2d3af61d9..cd4a15032 100644
--- a/test-utils-keyboard/api/jvm/test-utils-keyboard.api
+++ b/test-utils-keyboard/api/jvm/test-utils-keyboard.api
@@ -23,7 +23,7 @@ public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager$Builder
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
 	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/keyboard/MockKeyboardManager;
-	public final fun getBuiltKeyboardManagers ()Ljava/util/List;
+	public final fun getBuiltKeyboardManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
diff --git a/test-utils-location/api/androidLib/test-utils-location.api b/test-utils-location/api/androidLib/test-utils-location.api
index ced6b01c9..a0089c6ee 100644
--- a/test-utils-location/api/androidLib/test-utils-location.api
+++ b/test-utils-location/api/androidLib/test-utils-location.api
@@ -30,7 +30,7 @@ public final class com/splendo/kaluga/test/location/MockBaseLocationManager$Buil
 	public fun <init> (ZZ)V
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/location/BaseLocationManager;
-	public final fun getBuiltLocationManagers ()Ljava/util/List;
+	public final fun getBuiltLocationManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getInitialLocationEnabled ()Z
 }
@@ -147,7 +147,7 @@ public final class com/splendo/kaluga/test/location/MockLocationStateRepoBuilder
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Z)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
-	public final fun getBuiltLocationStateRepo ()Ljava/util/List;
+	public final fun getBuiltLocationStateRepo ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getLocationManagerBuilder ()Lcom/splendo/kaluga/location/BaseLocationManager$Builder;
 }
diff --git a/test-utils-location/api/jvm/test-utils-location.api b/test-utils-location/api/jvm/test-utils-location.api
index 0f8241a3b..30de75751 100644
--- a/test-utils-location/api/jvm/test-utils-location.api
+++ b/test-utils-location/api/jvm/test-utils-location.api
@@ -23,7 +23,7 @@ public final class com/splendo/kaluga/test/location/MockBaseLocationManager$Buil
 	public fun <init> (ZZ)V
 	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/location/BaseLocationManager;
-	public final fun getBuiltLocationManagers ()Ljava/util/List;
+	public final fun getBuiltLocationManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getInitialLocationEnabled ()Z
 }
@@ -146,7 +146,7 @@ public final class com/splendo/kaluga/test/location/MockLocationStateRepoBuilder
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Z)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/location/BaseLocationManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
-	public final fun getBuiltLocationStateRepo ()Ljava/util/List;
+	public final fun getBuiltLocationStateRepo ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getLocationManagerBuilder ()Lcom/splendo/kaluga/location/BaseLocationManager$Builder;
 }
diff --git a/test-utils-permissions/api/androidLib/test-utils-permissions.api b/test-utils-permissions/api/androidLib/test-utils-permissions.api
index 6d5d913c4..6ae56d052 100644
--- a/test-utils-permissions/api/androidLib/test-utils-permissions.api
+++ b/test-utils-permissions/api/androidLib/test-utils-permissions.api
@@ -45,7 +45,7 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionManager$Bui
 	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun create (Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/permissions/MockPermissionManager;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedManagers ()Ljava/util/List;
+	public final fun getCreatedManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getInitialState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
 	public final fun getMonitoringInterval-UwyO8pc ()J
 	public final fun getPermission ()Lcom/splendo/kaluga/permissions/base/Permission;
@@ -114,14 +114,14 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionsBuilder :
 	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;Z)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getBluetoothStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getBuildBluetoothStateRepos ()Ljava/util/List;
-	public final fun getBuildCalendarStateRepos ()Ljava/util/List;
-	public final fun getBuildCameraStateRepos ()Ljava/util/List;
-	public final fun getBuildContactsStateRepos ()Ljava/util/List;
-	public final fun getBuildLocationStateRepos ()Ljava/util/List;
-	public final fun getBuildMicrophoneStateRepos ()Ljava/util/List;
-	public final fun getBuildNotificationsStateRepos ()Ljava/util/List;
-	public final fun getBuildStorageStateRepos ()Ljava/util/List;
+	public final fun getBuildBluetoothStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildCalendarStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildCameraStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildContactsStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildLocationStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildMicrophoneStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildNotificationsStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildStorageStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCalendarStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getCameraStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getContactsStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
diff --git a/test-utils-permissions/api/jvm/test-utils-permissions.api b/test-utils-permissions/api/jvm/test-utils-permissions.api
index 964a9c3d3..7b6ad61fe 100644
--- a/test-utils-permissions/api/jvm/test-utils-permissions.api
+++ b/test-utils-permissions/api/jvm/test-utils-permissions.api
@@ -34,7 +34,7 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionManager$Bui
 	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permission;JLcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun create (Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/permissions/MockPermissionManager;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getCreatedManagers ()Ljava/util/List;
+	public final fun getCreatedManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getInitialState ()Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;
 	public final fun getMonitoringInterval-UwyO8pc ()J
 	public final fun getPermission ()Lcom/splendo/kaluga/permissions/base/Permission;
@@ -109,14 +109,14 @@ public final class com/splendo/kaluga/test/permissions/MockPermissionsBuilder :
 	public fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;Z)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/test/permissions/MockPermissionState$ActiveState;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getBluetoothStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getBuildBluetoothStateRepos ()Ljava/util/List;
-	public final fun getBuildCalendarStateRepos ()Ljava/util/List;
-	public final fun getBuildCameraStateRepos ()Ljava/util/List;
-	public final fun getBuildContactsStateRepos ()Ljava/util/List;
-	public final fun getBuildLocationStateRepos ()Ljava/util/List;
-	public final fun getBuildMicrophoneStateRepos ()Ljava/util/List;
-	public final fun getBuildNotificationsStateRepos ()Ljava/util/List;
-	public final fun getBuildStorageStateRepos ()Ljava/util/List;
+	public final fun getBuildBluetoothStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildCalendarStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildCameraStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildContactsStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildLocationStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildMicrophoneStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildNotificationsStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getBuildStorageStateRepos ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCalendarStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getCameraStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getContactsStateRepoBuilderMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
diff --git a/test-utils-system/api/androidLib/test-utils-system.api b/test-utils-system/api/androidLib/test-utils-system.api
index 4f8a0fe75..7c3a3ac7a 100644
--- a/test-utils-system/api/androidLib/test-utils-system.api
+++ b/test-utils-system/api/androidLib/test-utils-system.api
@@ -19,7 +19,7 @@ public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager
 	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Z)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
-	public final fun getBuiltNetworkManagers ()Ljava/util/List;
+	public final fun getBuiltNetworkManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
@@ -117,7 +117,7 @@ public final class com/splendo/kaluga/test/system/network/MockNetworkStateRepoBu
 	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;Z)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
-	public final fun getBuiltNetworkStateRepo ()Ljava/util/List;
+	public final fun getBuiltNetworkStateRepo ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getNetworkManagerBuilder ()Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;
 }
diff --git a/test-utils-system/api/jvm/test-utils-system.api b/test-utils-system/api/jvm/test-utils-system.api
index 961ffcf95..be22fb324 100644
--- a/test-utils-system/api/jvm/test-utils-system.api
+++ b/test-utils-system/api/jvm/test-utils-system.api
@@ -12,7 +12,7 @@ public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager
 	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Z)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
-	public final fun getBuiltNetworkManagers ()Ljava/util/List;
+	public final fun getBuiltNetworkManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
@@ -116,7 +116,7 @@ public final class com/splendo/kaluga/test/system/network/MockNetworkStateRepoBu
 	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;Z)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
-	public final fun getBuiltNetworkStateRepo ()Ljava/util/List;
+	public final fun getBuiltNetworkStateRepo ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getNetworkManagerBuilder ()Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;
 }

From 2457a938e9951f285316d1a03919b8a407e8e478 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 30 Jan 2023 12:04:15 +0100
Subject: [PATCH 138/227] Fixed issue where Notifying characteristic locked on
 Android API 33

---
 .../device/DefaultDeviceConnectionManager.kt  | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
index a7bf059a6..93d8e4996 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -104,11 +104,6 @@ internal actual class DefaultDeviceConnectionManager(
             }
         }
 
-        override fun onDescriptorWrite(gatt: BluetoothGatt?, descriptor: BluetoothGattDescriptor?, status: Int) {
-            descriptor ?: return
-            handleUpdatedDescriptor(descriptor.uuid, status == GATT_SUCCESS)
-        }
-
         @Deprecated("Deprecated in Java")
         override fun onCharacteristicChanged(gatt: BluetoothGatt?, characteristic: BluetoothGattCharacteristic?) {
             characteristic ?: return
@@ -136,9 +131,19 @@ internal actual class DefaultDeviceConnectionManager(
             value: ByteArray
         ) = updateDescriptor(descriptor, value, status)
 
+        override fun onDescriptorWrite(gatt: BluetoothGatt?, descriptor: BluetoothGattDescriptor?, status: Int) {
+            descriptor ?: return
+            val succeeded = status == GATT_SUCCESS
+            // Notification enable/disable done by client configuration descriptor write
+            if (descriptor.uuid == CLIENT_CONFIGURATION && currentAction is DeviceAction.Notification) {
+                handleCurrentActionCompleted(succeeded)
+            }
+            handleUpdatedDescriptor(descriptor.uuid, succeeded)
+        }
+
         override fun onConnectionStateChange(gatt: BluetoothGatt?, status: Int, newState: Int) {
             lastKnownState = newState
-            launch() {
+            launch {
                 when (newState) {
                     BluetoothProfile.STATE_DISCONNECTED -> {
                         handleDisconnect {
@@ -292,10 +297,6 @@ internal actual class DefaultDeviceConnectionManager(
 
     private fun updateDescriptor(descriptor: BluetoothGattDescriptor, value: ByteArray, status: Int) {
         val succeeded = status == GATT_SUCCESS
-        // Notification enable/disable done by client configuration descriptor write
-        if (descriptor.uuid == CLIENT_CONFIGURATION && currentAction is DeviceAction.Notification) {
-            handleCurrentActionCompleted(succeeded)
-        }
         handleUpdatedDescriptor(descriptor.uuid, succeeded) {
             it.wrapper.updateValue(value)
         }

From 9d1a0f2d80717e85ab3777239046be71e0d499ad Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 30 Jan 2023 10:23:28 +0100
Subject: [PATCH 139/227] Updating KDoc

---
 .../androidLibMain/kotlin/AlertPresenter.kt   |   9 +
 alerts/src/commonMain/kotlin/Alerts.kt        |   4 +-
 .../ActivityLifecycleSubscribable.kt          |  47 +++-
 .../lifecycle/LifecycleManagerObserver.kt     |   9 +-
 .../kotlin/navigation/ActivityParseExtra.kt   |   2 +-
 .../navigation/BundleToTypedProperty.kt       |   8 +-
 .../navigation/FragmentParseArguments.kt      |   2 +-
 .../kotlin/navigation/IntentParseExtra.kt     |   2 +-
 .../kotlin/navigation/Navigator.kt            |   7 +-
 .../kotlin/observable/Observable.kt           |   6 +-
 .../KalugaViewModelLifecycleObserver.kt       |   6 +-
 .../kotlin/navigation/NavigationBundle.kt     | 189 +++++++++++++---
 .../kotlin/navigation/NavigationBundleSpec.kt | 214 +++++++++++++-----
 .../commonMain/kotlin/navigation/Navigator.kt |  24 +-
 .../kotlin/observable/Observable.kt           | 163 ++++++++++---
 .../kotlin/observable/Observables.kt          |  59 ++---
 .../kotlin/viewmodel/LifecycleViewModel.kt    |   7 +-
 .../iosMain/kotlin/observable/Observable.kt   |   6 +-
 .../jsMain/kotlin/observable/Observable.kt    |   6 +-
 .../jvmMain/kotlin/observable/Observable.kt   |   6 +-
 .../src/commonMain/kotlin/DateTimePicker.kt   |   2 +-
 .../kotlin/location/GoogleLocationProvider.kt |   6 +-
 .../kotlin/mock/parameters/PairParameters.kt  |  14 +-
 23 files changed, 609 insertions(+), 189 deletions(-)

diff --git a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
index 5f73075af..6cf4b0342 100644
--- a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
@@ -37,12 +37,21 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 
+/**
+ * Class for presenting an [Alert].
+ * @param alert The [Alert] being presented.
+ * @param lifecycleManagerObserver The [LifecycleManagerObserver]
+ */
 actual class AlertPresenter(
     private val alert: Alert,
     private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver(),
     coroutineScope: CoroutineScope
 ) : BaseAlertPresenter(alert), CoroutineScope by coroutineScope {
 
+    /**
+     * Builder for creating an [AlertPresenter]
+     * @param lifecycleManagerObserver The [LifecycleManagerObserver]
+     */
     actual class Builder(
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
     ) : BaseAlertPresenter.Builder(), ActivityLifecycleSubscribable by lifecycleManagerObserver {
diff --git a/alerts/src/commonMain/kotlin/Alerts.kt b/alerts/src/commonMain/kotlin/Alerts.kt
index 29c7863e6..8673686f3 100644
--- a/alerts/src/commonMain/kotlin/Alerts.kt
+++ b/alerts/src/commonMain/kotlin/Alerts.kt
@@ -242,7 +242,7 @@ interface AlertActions {
  * Abstract alert presenter, used to show and dismiss given [Alert]
  * @see [AlertPresenter]
  *
- * @property alert The alert to present (and dismiss if needed)
+ * @param alert The alert to present (and dismiss if needed)
  */
 abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
 
@@ -291,7 +291,7 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
 }
 
 /**
- * Class for presenting an [Alert].
+ * Class for presenting an [Alert]. Implementation of [BaseAlertPresenter]
  */
 expect class AlertPresenter : BaseAlertPresenter {
     class Builder : BaseAlertPresenter.Builder {
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt b/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
index cbe63019f..1c44c2c10 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
@@ -19,14 +19,25 @@ package com.splendo.kaluga.architecture.lifecycle
 
 import android.app.Activity
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 
 actual interface LifecycleSubscribable
 
+/**
+ * A [LifecycleSubscribable] bound to a [ActivityLifecycleSubscribable.LifecycleManager]
+ */
 interface ActivityLifecycleSubscribable : LifecycleSubscribable {
 
+    /**
+     * A reflection of the manager of a lifecycle.
+     * @param activity The [Activity] managing the lifecycle if available.
+     * @param lifecycleOwner The [LifecycleOwner] owning the lifecycle.
+     * @param fragmentManager The [FragmentManager] attached to the lifecycle.
+     * @param childFragmentManager Optional [FragmentManager] that hosts [androidx.fragment.app.Fragment] with the Fragment owning the lifecycle.
+     */
     data class LifecycleManager(
         val activity: Activity?,
         val lifecycleOwner: LifecycleOwner,
@@ -34,23 +45,29 @@ interface ActivityLifecycleSubscribable : LifecycleSubscribable {
         val childFragmentManager: FragmentManager? = null
     )
 
+    /**
+     * The current [LifecycleManager] subscribed to this [LifecycleSubscribable]
+     */
     val manager: LifecycleManager?
 
     /**
-     * Subscribes this subscribable to [LifecycleManager].
+     * Subscribes a [LifecycleManager] to this [LifecycleSubscribable].
      * Called on [Lifecycle.Event.ON_CREATE]
      * @param manager The [LifecycleManager] managing the lifecycle.
      */
     fun subscribe(manager: LifecycleManager)
 
     /**
-     * Unsubscribes this subscribable from its current subscribable.
+     * Unsubscribes the current [LifecycleManager] from this [LifecycleSubscribable].
      * Called on [Lifecycle.Event.ON_DESTROY]
      */
     fun unsubscribe()
 }
 
-open class ActivityLifecycleSubscriber : ActivityLifecycleSubscribable {
+/**
+ * Default implementation of [ActivityLifecycleSubscribable]
+ */
+open class DefaultActivityLifecycleSubscribable : ActivityLifecycleSubscribable {
 
     override var manager: ActivityLifecycleSubscribable.LifecycleManager? = null
 
@@ -66,6 +83,26 @@ open class ActivityLifecycleSubscriber : ActivityLifecycleSubscribable {
 /**
  * Convenience method to subscribe an [AppCompatActivity] to this [ActivityLifecycleSubscribable] using its default [LifecycleOwner] and [FragmentManager].
  */
-fun ActivityLifecycleSubscribable.subscribe(activity: AppCompatActivity) = subscribe(ActivityLifecycleSubscribable.LifecycleManager(activity, activity, activity.supportFragmentManager))
+fun ActivityLifecycleSubscribable.subscribe(activity: AppCompatActivity) = subscribe(activity, activity, activity.supportFragmentManager)
+
+/**
+ * Convenience method to subscribe a [Fragment] to this [ActivityLifecycleSubscribable] using its default [LifecycleOwner] and [FragmentManager]s.
+ */
+fun ActivityLifecycleSubscribable.subscribe(fragment: Fragment) = subscribe(fragment.activity, fragment.viewLifecycleOwner, fragment.parentFragmentManager, fragment.childFragmentManager)
+
+/**
+ * Subscribes a [LifecycleOwner] to this [ActivityLifecycleSubscribable].
+ * @param activity The [Activity] associated with the lifecycle or `null` if none exist.
+ * @param owner The [LifecycleOwner] owning the lifecycle.
+ * @param fragmentManager The [FragmentManager] attached to the lifecycle.
+ */
 fun ActivityLifecycleSubscribable.subscribe(activity: Activity?, owner: LifecycleOwner, fragmentManager: FragmentManager) = subscribe(ActivityLifecycleSubscribable.LifecycleManager(activity, owner, fragmentManager))
-fun ActivityLifecycleSubscribable.subscribe(activity: Activity?, owner: LifecycleOwner, parentFragmentManager: FragmentManager, childFragmentManager: FragmentManager?) = subscribe(ActivityLifecycleSubscribable.LifecycleManager(activity, owner, parentFragmentManager, childFragmentManager))
+
+/**
+ * Subscribes a [LifecycleOwner] to this [ActivityLifecycleSubscribable].
+ * @param activity The [Activity] associated with the lifecycle or `null` if none exist.
+ * @param owner The [LifecycleOwner] owning the lifecycle.
+ * @param parentFragmentManager The [FragmentManager] attached to the lifecycle.
+ * @param childFragmentManager Optional [FragmentManager] that hosts [androidx.fragment.app.Fragment] with the Fragment owning the lifecycle.
+ */
+fun ActivityLifecycleSubscribable.subscribe(activity: Activity?, owner: LifecycleOwner, parentFragmentManager: FragmentManager, childFragmentManager: FragmentManager) = subscribe(ActivityLifecycleSubscribable.LifecycleManager(activity, owner, parentFragmentManager, childFragmentManager))
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
index c3c8b8285..11a684141 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
@@ -21,7 +21,10 @@ import androidx.appcompat.app.AppCompatActivity
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
-class LifecycleManagerObserver : ActivityLifecycleSubscriber() {
+/**
+ * A [ActivityLifecycleSubscribable] that provides [ActivityLifecycleSubscribable.manager] as a [StateFlow]
+ */
+class LifecycleManagerObserver : DefaultActivityLifecycleSubscribable() {
 
     override var manager: ActivityLifecycleSubscribable.LifecycleManager?
         get() = super.manager
@@ -31,6 +34,10 @@ class LifecycleManagerObserver : ActivityLifecycleSubscriber() {
         }
 
     private val _managerState = MutableStateFlow<ActivityLifecycleSubscribable.LifecycleManager?>(null)
+
+    /**
+     * A [StateFlow] of the current [manager]
+     */
     val managerState: StateFlow<ActivityLifecycleSubscribable.LifecycleManager?> = _managerState
 }
 
diff --git a/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt b/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
index 32601640a..5e08a8ed1 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
@@ -343,4 +343,4 @@ fun <T> Activity.parseTypeOf(serializer: KSerializer<T>): T = intent.parseTypeOf
  * @param serializer The [KSerializer] to deserialize [T] from the bundle.
  * @return The [T] stored in the bundle or null if no such value was found.
  */
-fun <T> Activity.parseTypeOfOrNull(serializer: KSerializer<T>): T? = intent.parseTypeOfOrNull(serializer)
+fun <T : Any> Activity.parseTypeOfOrNull(serializer: KSerializer<T>): T? = intent.parseTypeOfOrNull(serializer)
diff --git a/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt b/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
index 40c5a4ef9..ceac9e016 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
@@ -36,11 +36,13 @@ fun <R> Bundle.toTypedProperty(type: NavigationBundleSpecType<R>): R {
  * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType] either directly or wrapped in [NavigationBundleSpecType.OptionalType]
  * @return The [R] value stored in the bundle.
  */
-fun <R> Bundle.toTypedPropertyOrNull(type: NavigationBundleSpecType<R>): R? = try {
+fun <R : Any> Bundle.toTypedPropertyOrNull(type: NavigationBundleSpecType<R>): R? = try {
     toTypedProperty(type)
 } catch (e: BundleConversionError) {
     try {
-        toTypedProperty(NavigationBundleSpecType.OptionalType(type))
+        (type as? NavigationBundleSpecType.NonNullableNavigationBundleSpecType)?.let {
+            toTypedProperty(NavigationBundleSpecType.OptionalType(it))
+        }
     } catch (e: BundleConversionError) {
         null
     }
@@ -354,4 +356,4 @@ fun <T> Bundle.asTypeOf(serializer: KSerializer<T>): T = toTypedProperty(Navigat
  * @param serializer The [KSerializer] to deserialize [T] from the bundle.
  * @return The [T] stored in the bundle or null if no such value was found.
  */
-fun <T> Bundle.asTypeOfOrNull(serializer: KSerializer<T>): T? = toTypedPropertyOrNull(NavigationBundleSpecType.SerializedType(serializer))
+fun <T : Any> Bundle.asTypeOfOrNull(serializer: KSerializer<T>): T? = toTypedPropertyOrNull(NavigationBundleSpecType.SerializedType(serializer))
diff --git a/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt b/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt
index 7525680db..b107a5d13 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt
@@ -362,7 +362,7 @@ fun <T> Fragment.parseTypeOf(serializer: KSerializer<T>): T = parseExtra {
  * @param serializer The [KSerializer] to deserialize [T] from the bundle.
  * @return The [T] stored in the bundle or null if no such value was found.
  */
-fun <T> Fragment.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseExtraOrNull {
+fun <T : Any> Fragment.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseExtraOrNull {
     toTypedPropertyOrNull(
         NavigationBundleSpecType.SerializedType(serializer)
     )
diff --git a/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt b/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt
index fd7a26541..b105e9bbb 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt
@@ -362,7 +362,7 @@ fun <T> Intent?.parseTypeOf(serializer: KSerializer<T>): T = parseExtra {
  * @param serializer The [KSerializer] to deserialize [T] from the bundle.
  * @return The [T] stored in the bundle or null if no such value was found.
  */
-fun <T> Intent?.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseExtraOrNull {
+fun <T : Any> Intent?.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseExtraOrNull {
     toTypedPropertyOrNull(
         NavigationBundleSpecType.SerializedType(serializer)
     )
diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index bdf168b7e..9d92845bf 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -26,7 +26,7 @@ import androidx.browser.customtabs.CustomTabsIntent
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
 import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscriber
+import com.splendo.kaluga.architecture.lifecycle.DefaultActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
 actual interface Navigator<Action : NavigationAction<*>> : LifecycleSubscribable {
@@ -40,9 +40,10 @@ object MissingActivityNavigationException : NavigationException("LifecycleManage
  * Implementation of [Navigator]. Takes a mapper function to map all [NavigationAction] to a [NavigationSpec]
  * Whenever [navigate] is called, this class maps it to a [NavigationSpec] and performs navigation according to that
  * Requires to be subscribed to an activity via [subscribe] to work
- * @param navigationMapper A function mapping the [NavigationAction] to [NavigationSpec]
+ * @param Action The type of [NavigationAction] handled by this navigator.
+ * @param navigationMapper A function mapping the [Action] to [NavigationSpec]
  */
-class ActivityNavigator<Action : NavigationAction<*>>(private val navigationMapper: (Action) -> NavigationSpec) : Navigator<Action>, ActivityLifecycleSubscribable by ActivityLifecycleSubscriber() {
+class ActivityNavigator<Action : NavigationAction<*>>(private val navigationMapper: (Action) -> NavigationSpec) : Navigator<Action>, ActivityLifecycleSubscribable by DefaultActivityLifecycleSubscribable() {
 
     override fun navigate(action: Action) {
         navigate(navigationMapper.invoke(action), action.bundle)
diff --git a/architecture/src/androidLibMain/kotlin/observable/Observable.kt b/architecture/src/androidLibMain/kotlin/observable/Observable.kt
index f31992501..0bc8168cc 100644
--- a/architecture/src/androidLibMain/kotlin/observable/Observable.kt
+++ b/architecture/src/androidLibMain/kotlin/observable/Observable.kt
@@ -120,8 +120,8 @@ actual abstract class BaseInitializedSubject<T> actual constructor(observation:
     ) : this (ObservationInitialized(initialValue))
 }
 
-actual abstract class BaseDefaultSubject<R : T?, T> actual constructor(
-    observation: ObservationDefault<R, T?>
+actual abstract class BaseDefaultSubject<R : T?, T : Any> actual constructor(
+    observation: ObservationDefault<R, T>
 ) : AbstractBaseDefaultSubject<R, T>(observation) {
 
     override fun createLiveData(): MutableLiveData<R> = this.mutableLiveData()
@@ -130,7 +130,7 @@ actual abstract class BaseDefaultSubject<R : T?, T> actual constructor(
     actual constructor(
         defaultValue: ObservableOptional.Value<R>,
         initialValue: ObservableOptional.Value<T?>
-    ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
+    ) : this(observation = ObservationDefault<R, T>(defaultValue, initialValue))
 }
 
 fun <T> WithState<T>.observeOnLifecycle(
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
index 2f94a32b2..573eed0c4 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/KalugaViewModelLifecycleObserver.kt
@@ -87,7 +87,11 @@ class LifecycleSubscribableManager<ViewModel : BaseLifecycleViewModel>(
 
     private fun LifecycleSubscribable.onSubscribe(lifecycleOwner: LifecycleOwner) {
         when (this) {
-            is ActivityLifecycleSubscribable -> subscribe(activity, lifecycleOwner, fragmentManager, childFragmentManager)
+            is ActivityLifecycleSubscribable -> if (childFragmentManager != null) {
+                subscribe(activity, lifecycleOwner, fragmentManager, childFragmentManager)
+            } else {
+                subscribe(activity, lifecycleOwner, fragmentManager)
+            }
             else -> {}
         }
     }
diff --git a/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt b/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
index 419777d01..f247a230e 100644
--- a/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
+++ b/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
@@ -22,17 +22,45 @@ import kotlinx.serialization.KSerializer
 import kotlinx.serialization.json.Json
 
 /**
- * Value of a [NavigationBundleSpecRow]
+ * Value of a [NavigationBundleSpecRow] where [T] describes the type of the value.
+ * @param T the type of the value.
  */
 sealed class NavigationBundleValue<T> {
 
+    /**
+     * The [T] value of this [NavigationBundleValue]
+     */
     abstract val value: T
 
-    object UnitValue : NavigationBundleValue<Unit>() {
+    /**
+     * A [NavigationBundleValue] containing a non-nullable [T]
+     * @param T the type of the value.
+     */
+    sealed class NonNullableNavigationBundleValue<T : Any> : NavigationBundleValue<T>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a List of [T]
+     * @param T the type of the values in the list.
+     */
+    sealed class ListNavigationBundleValue<T : Any> : NonNullableNavigationBundleValue<List<T>>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [Unit]
+     */
+    object UnitValue : NonNullableNavigationBundleValue<Unit>() {
         override val value: Unit = Unit
     }
-    data class BooleanValue internal constructor(override val value: Boolean) : NavigationBundleValue<Boolean>()
-    data class BooleanArrayValue internal constructor(override val value: BooleanArray) : NavigationBundleValue<BooleanArray>() {
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [Boolean]
+     * @property value The [Boolean] value of this [NavigationBundleValue]
+     */
+    data class BooleanValue internal constructor(override val value: Boolean) : NonNullableNavigationBundleValue<Boolean>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [BooleanArray]
+     * @property value The [BooleanArray] value of this [NavigationBundleValue]
+     */
+    data class BooleanArrayValue internal constructor(override val value: BooleanArray) : NonNullableNavigationBundleValue<BooleanArray>() {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other == null || this::class != other::class) return false
@@ -47,8 +75,17 @@ sealed class NavigationBundleValue<T> {
         }
     }
 
-    data class ByteValue internal constructor(override val value: Byte) : NavigationBundleValue<Byte>()
-    data class ByteArrayValue internal constructor(override val value: ByteArray) : NavigationBundleValue<ByteArray>() {
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [Byte]
+     * @property value The [Byte] value of this [NavigationBundleValue]
+     */
+    data class ByteValue internal constructor(override val value: Byte) : NonNullableNavigationBundleValue<Byte>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [ByteArray]
+     * @property value The [ByteArray] value of this [NavigationBundleValue]
+     */
+    data class ByteArrayValue internal constructor(override val value: ByteArray) : NonNullableNavigationBundleValue<ByteArray>() {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other == null || this::class != other::class) return false
@@ -62,9 +99,24 @@ sealed class NavigationBundleValue<T> {
             return value.contentHashCode()
         }
     }
-    data class BundleValue<R : NavigationBundleSpecRow<*>> internal constructor(override val value: NavigationBundle<R>) : NavigationBundleValue<NavigationBundle<R>>()
-    data class CharValue internal constructor(override val value: Char) : NavigationBundleValue<Char>()
-    data class CharArrayValue internal constructor(override val value: CharArray) : NavigationBundleValue<CharArray>() {
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [NavigationBundle]
+     * @property value The [NavigationBundle] value of this [NavigationBundleValue]
+     */
+    data class BundleValue<R : NavigationBundleSpecRow<*>> internal constructor(override val value: NavigationBundle<R>) : NonNullableNavigationBundleValue<NavigationBundle<R>>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [Char]
+     * @property value The [Char] value of this [NavigationBundleValue]
+     */
+    data class CharValue internal constructor(override val value: Char) : NonNullableNavigationBundleValue<Char>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [CharArray]
+     * @property value The [CharArray] value of this [NavigationBundleValue]
+     */
+    data class CharArrayValue internal constructor(override val value: CharArray) : NonNullableNavigationBundleValue<CharArray>() {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other == null || this::class != other::class) return false
@@ -79,9 +131,23 @@ sealed class NavigationBundleValue<T> {
         }
     }
 
-    data class CharSequenceValue internal constructor(override val value: CharSequence) : NavigationBundleValue<CharSequence>()
-    data class DoubleValue internal constructor(override val value: Double) : NavigationBundleValue<Double>()
-    data class DoubleArrayValue internal constructor(override val value: DoubleArray) : NavigationBundleValue<DoubleArray>() {
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [CharSequence]
+     * @property value The [CharSequence] value of this [NavigationBundleValue]
+     */
+    data class CharSequenceValue internal constructor(override val value: CharSequence) : NonNullableNavigationBundleValue<CharSequence>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [Double]
+     * @property value The [Double] value of this [NavigationBundleValue]
+     */
+    data class DoubleValue internal constructor(override val value: Double) : NonNullableNavigationBundleValue<Double>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [DoubleArray]
+     * @property value The [DoubleArray] value of this [NavigationBundleValue]
+     */
+    data class DoubleArrayValue internal constructor(override val value: DoubleArray) : NonNullableNavigationBundleValue<DoubleArray>() {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other == null || this::class != other::class) return false
@@ -96,8 +162,17 @@ sealed class NavigationBundleValue<T> {
         }
     }
 
-    data class FloatValue internal constructor(override val value: Float) : NavigationBundleValue<Float>()
-    data class FloatArrayValue internal constructor(override val value: FloatArray) : NavigationBundleValue<FloatArray>() {
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [Float]
+     * @property value The [Float] value of this [NavigationBundleValue]
+     */
+    data class FloatValue internal constructor(override val value: Float) : NonNullableNavigationBundleValue<Float>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [FloatArray]
+     * @property value The [FloatArray] value of this [NavigationBundleValue]
+     */
+    data class FloatArrayValue internal constructor(override val value: FloatArray) : NonNullableNavigationBundleValue<FloatArray>() {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other == null || this::class != other::class) return false
@@ -112,8 +187,17 @@ sealed class NavigationBundleValue<T> {
         }
     }
 
-    data class IntegerValue internal constructor(override val value: Int) : NavigationBundleValue<Int>()
-    data class IntegerArrayValue internal constructor(override val value: IntArray) : NavigationBundleValue<IntArray>() {
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [Int]
+     * @property value The [Int] value of this [NavigationBundleValue]
+     */
+    data class IntegerValue internal constructor(override val value: Int) : NonNullableNavigationBundleValue<Int>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [IntArray]
+     * @property value The [IntArray] value of this [NavigationBundleValue]
+     */
+    data class IntegerArrayValue internal constructor(override val value: IntArray) : NonNullableNavigationBundleValue<IntArray>() {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other == null || this::class != other::class) return false
@@ -128,8 +212,17 @@ sealed class NavigationBundleValue<T> {
         }
     }
 
-    data class LongValue internal constructor(override val value: Long) : NavigationBundleValue<Long>()
-    data class LongArrayValue internal constructor(override val value: LongArray) : NavigationBundleValue<LongArray>() {
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [Long]
+     * @property value The [Long] value of this [NavigationBundleValue]
+     */
+    data class LongValue internal constructor(override val value: Long) : NonNullableNavigationBundleValue<Long>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [LongArray]
+     * @property value The [LongArray] value of this [NavigationBundleValue]
+     */
+    data class LongArrayValue internal constructor(override val value: LongArray) : NonNullableNavigationBundleValue<LongArray>() {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other == null || this::class != other::class) return false
@@ -144,17 +237,32 @@ sealed class NavigationBundleValue<T> {
         }
     }
 
+    /**
+     * A [NavigationBundleValue] containing a value of a serializable class [T]
+     * @param T the serializable type of the value
+     * @property serializer The [KSerializer] to (de)serialize [value]
+     * @property value The [T] value of this [NavigationBundleValue]
+     */
     data class SerializedValue<T> internal constructor(val serializer: KSerializer<T>, override val value: T) : NavigationBundleValue<T>() {
 
         companion object {
-            private val json = Json {}
+            private val json = Json
         }
 
         val valueString: String = json.encodeToString(serializer, value)
     }
 
-    data class ShortValue internal constructor(override val value: Short) : NavigationBundleValue<Short>()
-    data class ShortArrayValue internal constructor(override val value: ShortArray) : NavigationBundleValue<ShortArray>() {
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [Short]
+     * @property value The [Short] value of this [NavigationBundleValue]
+     */
+    data class ShortValue internal constructor(override val value: Short) : NonNullableNavigationBundleValue<Short>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [ShortArray]
+     * @property value The [ShortArray] value of this [NavigationBundleValue]
+     */
+    data class ShortArrayValue internal constructor(override val value: ShortArray) : NonNullableNavigationBundleValue<ShortArray>() {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other == null || this::class != other::class) return false
@@ -169,21 +277,50 @@ sealed class NavigationBundleValue<T> {
         }
     }
 
-    data class StringValue internal constructor(override val value: String) : NavigationBundleValue<String>()
-    data class StringArrayValue internal constructor(override val value: List<String>) : NavigationBundleValue<List<String>>()
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [String]
+     * @property value The [String] value of this [NavigationBundleValue]
+     */
+    data class StringValue internal constructor(override val value: String) : NonNullableNavigationBundleValue<String>()
+
+    /**
+     * A [ListNavigationBundleValue] containing a List of [String]
+     * @property value The List of [String] value of this [NavigationBundleValue]
+     */
+    data class StringArrayValue internal constructor(override val value: List<String>) : ListNavigationBundleValue<String>()
+
+    /**
+     * A [NonNullableNavigationBundleValue] containing a [KalugaDate]
+     * @property value The [KalugaDate] value of this [NavigationBundleValue]
+     */
+    data class DateValue internal constructor(override val value: KalugaDate) : NonNullableNavigationBundleValue<KalugaDate>()
 
-    data class DateValue internal constructor(override val value: KalugaDate) : NavigationBundleValue<KalugaDate>()
-    data class DateArrayValue internal constructor(override val value: List<KalugaDate>) : NavigationBundleValue<List<KalugaDate>>()
+    /**
+     * A [ListNavigationBundleValue] containing a List of [KalugaDate]
+     * @property value The List of [KalugaDate] value of this [NavigationBundleValue]
+     */
+    data class DateArrayValue internal constructor(override val value: List<KalugaDate>) : ListNavigationBundleValue<KalugaDate>()
 
-    data class OptionalValue<T> internal constructor(val optionalValue: NavigationBundleValue<T>?) : NavigationBundleValue<T?>() {
+    /**
+     * A [NavigationBundleValue] containing a nullable [T]
+     * @param T the non-nullable type of the value
+     * @property optionalValue The [NavigationBundleValue] associated with a non-nullable [T], or `null` if the value is to be `null`.
+     */
+    data class OptionalValue<T : Any> internal constructor(val optionalValue: NonNullableNavigationBundleValue<T>?) : NavigationBundleValue<T?>() {
         override val value: T? = optionalValue?.value
     }
 }
 
+/**
+ * [Exception] to be thrown when [NavigationBundle.get] is called with a [NavigationBundleSpecRow] that does not match the [NavigationBundleSpec] of the bundle.
+ */
 class NavigationBundleGetError : Exception()
 
 /**
  * A container class that bundles a set of data for sharing between classes. Only takes values in a [NavigationBundleSpec] [R]
+ * @param R the [NavigationBundleSpecRow] associated with this bundle.
+ * @property spec The [NavigationBundleSpec] describing the bundle.
+ * @property values A map of the [NavigationBundleValue] for each [NavigationBundleSpecRow] in [spec].
  */
 class NavigationBundle<R : NavigationBundleSpecRow<*>> internal constructor(val spec: NavigationBundleSpec<R>, val values: Map<R, NavigationBundleValue<*>>) {
 
diff --git a/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt b/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
index faa459555..fd40b2fd6 100644
--- a/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
+++ b/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
@@ -24,7 +24,8 @@ import kotlinx.serialization.json.Json
 
 /**
  * A row within a [NavigationBundleSpec] that is associated with a given [NavigationBundleSpecType]
- * @param associatedType The [NavigationBundleSpecType] associated with this row
+ * @param T the type of the [NavigationBundleSpecType]
+ * @property associatedType The [NavigationBundleSpecType] associated with this row
  */
 open class NavigationBundleSpecRow<T>(val associatedType: NavigationBundleSpecType<T>) {
     /**
@@ -42,127 +43,200 @@ open class NavigationBundleSpecRow<T>(val associatedType: NavigationBundleSpecTy
 }
 
 /**
- * Types of data a [NavigationBundleSpecRow] can be associated with
+ * Types of data a [NavigationBundleSpecRow] can be associated with.
+ * @param T the type of value this [NavigationBundleSpecType] is representing.
  */
 sealed class NavigationBundleSpecType<T> {
 
     /**
-     * Converts a given value to the [NavigationBundleValue] associated with this type
-     * @param value The value to convert
+     * Converts a given value [T] to the [NavigationBundleValue] associated with this type
+     * @param value The value [T] to convert
      * @return The [NavigationBundleValue] associated with the value
      */
     abstract fun convertValue(value: T): NavigationBundleValue<T>
 
-    object UnitType : NavigationBundleSpecType<Unit>() {
-        override fun convertValue(value: Unit): NavigationBundleValue<Unit> {
+    /**
+     * A [NavigationBundleSpecType] that takes a non-nullable [T]
+     * @param T the type of value this [NavigationBundleSpecType] is representing.
+     */
+    sealed class NonNullableNavigationBundleSpecType<T : Any> : NavigationBundleSpecType<T>() {
+        abstract override fun convertValue(value: T): NavigationBundleValue.NonNullableNavigationBundleValue<T>
+    }
+
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [Unit]
+     */
+    object UnitType : NonNullableNavigationBundleSpecType<Unit>() {
+        override fun convertValue(value: Unit): NavigationBundleValue.UnitValue {
             return NavigationBundleValue.UnitValue
         }
     }
 
-    object BooleanType : NavigationBundleSpecType<Boolean>() {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [Boolean]
+     */
+    object BooleanType : NonNullableNavigationBundleSpecType<Boolean>() {
 
-        override fun convertValue(value: Boolean): NavigationBundleValue<Boolean> {
+        override fun convertValue(value: Boolean): NavigationBundleValue.BooleanValue {
             return NavigationBundleValue.BooleanValue(value)
         }
     }
 
-    object BooleanArrayType : NavigationBundleSpecType<BooleanArray>() {
-        override fun convertValue(value: BooleanArray): NavigationBundleValue<BooleanArray> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [BooleanArray]
+     */
+    object BooleanArrayType : NonNullableNavigationBundleSpecType<BooleanArray>() {
+        override fun convertValue(value: BooleanArray): NavigationBundleValue.BooleanArrayValue {
             return NavigationBundleValue.BooleanArrayValue(value)
         }
     }
 
-    object ByteType : NavigationBundleSpecType<Byte>() {
-        override fun convertValue(value: Byte): NavigationBundleValue<Byte> {
-            return NavigationBundleValue.ByteValue(value)
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [NavigationBundle] with [NavigationBundleSpecRow] [R].
+     * @param R the type of [NavigationBundleSpecRow] to represent
+     * @property spec The [NavigationBundleSpec] of the [NavigationBundle] to represents.
+     */
+    class BundleType<R : NavigationBundleSpecRow<*>> internal constructor(val spec: NavigationBundleSpec<R>) : NonNullableNavigationBundleSpecType<NavigationBundle<R>>() {
+        override fun convertValue(value: NavigationBundle<R>): NavigationBundleValue.BundleValue<R> {
+            return NavigationBundleValue.BundleValue(value)
         }
     }
-    class BundleType<R : NavigationBundleSpecRow<*>> internal constructor(val spec: NavigationBundleSpec<R>) : NavigationBundleSpecType<NavigationBundle<R>>() {
-        override fun convertValue(value: NavigationBundle<R>): NavigationBundleValue<NavigationBundle<R>> {
-            return NavigationBundleValue.BundleValue(value)
+
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [Byte]
+     */
+    object ByteType : NonNullableNavigationBundleSpecType<Byte>() {
+        override fun convertValue(value: Byte): NavigationBundleValue.ByteValue {
+            return NavigationBundleValue.ByteValue(value)
         }
     }
 
-    object ByteArrayType : NavigationBundleSpecType<ByteArray>() {
-        override fun convertValue(value: ByteArray): NavigationBundleValue<ByteArray> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [ByteArray]
+     */
+    object ByteArrayType : NonNullableNavigationBundleSpecType<ByteArray>() {
+        override fun convertValue(value: ByteArray): NavigationBundleValue.ByteArrayValue {
             return NavigationBundleValue.ByteArrayValue(value)
         }
     }
 
-    object CharType : NavigationBundleSpecType<Char>() {
-        override fun convertValue(value: Char): NavigationBundleValue<Char> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [Char]
+     */
+    object CharType : NonNullableNavigationBundleSpecType<Char>() {
+        override fun convertValue(value: Char): NavigationBundleValue.CharValue {
             return NavigationBundleValue.CharValue(value)
         }
     }
 
-    object CharArrayType : NavigationBundleSpecType<CharArray>() {
-        override fun convertValue(value: CharArray): NavigationBundleValue<CharArray> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [CharArray]
+     */
+    object CharArrayType : NonNullableNavigationBundleSpecType<CharArray>() {
+        override fun convertValue(value: CharArray): NavigationBundleValue.CharArrayValue {
             return NavigationBundleValue.CharArrayValue(value)
         }
     }
 
-    object CharSequenceType : NavigationBundleSpecType<CharSequence>() {
-        override fun convertValue(value: CharSequence): NavigationBundleValue<CharSequence> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [CharSequence]
+     */
+    object CharSequenceType : NonNullableNavigationBundleSpecType<CharSequence>() {
+        override fun convertValue(value: CharSequence): NavigationBundleValue.CharSequenceValue {
             return NavigationBundleValue.CharSequenceValue(value)
         }
     }
 
-    object DoubleType : NavigationBundleSpecType<Double>() {
-        override fun convertValue(value: Double): NavigationBundleValue<Double> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [Double]
+     */
+    object DoubleType : NonNullableNavigationBundleSpecType<Double>() {
+        override fun convertValue(value: Double): NavigationBundleValue.DoubleValue {
             return NavigationBundleValue.DoubleValue(value)
         }
     }
 
-    object DoubleArrayType : NavigationBundleSpecType<DoubleArray>() {
-        override fun convertValue(value: DoubleArray): NavigationBundleValue<DoubleArray> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [DoubleArray]
+     */
+    object DoubleArrayType : NonNullableNavigationBundleSpecType<DoubleArray>() {
+        override fun convertValue(value: DoubleArray): NavigationBundleValue.DoubleArrayValue {
             return NavigationBundleValue.DoubleArrayValue(value)
         }
     }
 
-    object FloatType : NavigationBundleSpecType<Float>() {
-        override fun convertValue(value: Float): NavigationBundleValue<Float> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [Float]
+     */
+    object FloatType : NonNullableNavigationBundleSpecType<Float>() {
+        override fun convertValue(value: Float): NavigationBundleValue.FloatValue {
             return NavigationBundleValue.FloatValue(value)
         }
     }
 
-    object FloatArrayType : NavigationBundleSpecType<FloatArray>() {
-        override fun convertValue(value: FloatArray): NavigationBundleValue<FloatArray> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [FloatArray]
+     */
+    object FloatArrayType : NonNullableNavigationBundleSpecType<FloatArray>() {
+        override fun convertValue(value: FloatArray): NavigationBundleValue.FloatArrayValue {
             return NavigationBundleValue.FloatArrayValue(value)
         }
     }
 
-    object IntegerType : NavigationBundleSpecType<Int>() {
-        override fun convertValue(value: Int): NavigationBundleValue<Int> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents an [Int]
+     */
+    object IntegerType : NonNullableNavigationBundleSpecType<Int>() {
+        override fun convertValue(value: Int): NavigationBundleValue.IntegerValue {
             return NavigationBundleValue.IntegerValue(value)
         }
     }
 
-    object IntegerArrayType : NavigationBundleSpecType<IntArray>() {
-        override fun convertValue(value: IntArray): NavigationBundleValue<IntArray> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents an [IntArray]
+     */
+    object IntegerArrayType : NonNullableNavigationBundleSpecType<IntArray>() {
+        override fun convertValue(value: IntArray): NavigationBundleValue.IntegerArrayValue {
             return NavigationBundleValue.IntegerArrayValue(value)
         }
     }
 
-    object LongType : NavigationBundleSpecType<Long>() {
-        override fun convertValue(value: Long): NavigationBundleValue<Long> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [Long]
+     */
+    object LongType : NonNullableNavigationBundleSpecType<Long>() {
+        override fun convertValue(value: Long): NavigationBundleValue.LongValue {
             return NavigationBundleValue.LongValue(value)
         }
     }
 
-    object LongArrayType : NavigationBundleSpecType<LongArray>() {
-        override fun convertValue(value: LongArray): NavigationBundleValue<LongArray> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [LongArray]
+     */
+    object LongArrayType : NonNullableNavigationBundleSpecType<LongArray>() {
+        override fun convertValue(value: LongArray): NavigationBundleValue.LongArrayValue {
             return NavigationBundleValue.LongArrayValue(value)
         }
     }
+
+    /**
+     * A [NavigationBundleSpecType] that represents a serializable [T]
+     * @param T the serializable type to represent.
+     * @param serializer The [KSerializer] to (de)serialize [T]
+     */
     data class SerializedType<T>(private val serializer: KSerializer<T>) : NavigationBundleSpecType<T>() {
         companion object {
-            private val json = Json { }
+            private val json = Json
         }
 
         override fun convertValue(value: T): NavigationBundleValue<T> {
             return NavigationBundleValue.SerializedValue(serializer, value)
         }
 
+        /**
+         * Generates a [NavigationBundleValue] from a given string
+         * @param stringValue The string to describe [T]. Must match the provided serializer.
+         */
         fun generateValue(stringValue: String): NavigationBundleValue<T>? {
             return try {
                 NavigationBundleValue.SerializedValue(serializer, json.decodeFromString(serializer, stringValue))
@@ -172,43 +246,66 @@ sealed class NavigationBundleSpecType<T> {
         }
     }
 
-    object ShortType : NavigationBundleSpecType<Short>() {
-        override fun convertValue(value: Short): NavigationBundleValue<Short> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [Short]
+     */
+    object ShortType : NonNullableNavigationBundleSpecType<Short>() {
+        override fun convertValue(value: Short): NavigationBundleValue.ShortValue {
             return NavigationBundleValue.ShortValue(value)
         }
     }
 
-    object ShortArrayType : NavigationBundleSpecType<ShortArray>() {
-        override fun convertValue(value: ShortArray): NavigationBundleValue<ShortArray> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [ShortArray]
+     */
+    object ShortArrayType : NonNullableNavigationBundleSpecType<ShortArray>() {
+        override fun convertValue(value: ShortArray): NavigationBundleValue.ShortArrayValue {
             return NavigationBundleValue.ShortArrayValue(value)
         }
     }
 
-    object StringType : NavigationBundleSpecType<String>() {
-        override fun convertValue(value: String): NavigationBundleValue<String> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [String]
+     */
+    object StringType : NonNullableNavigationBundleSpecType<String>() {
+        override fun convertValue(value: String): NavigationBundleValue.StringValue{
             return NavigationBundleValue.StringValue(value)
         }
     }
 
-    object StringArrayType : NavigationBundleSpecType<List<String>>() {
-        override fun convertValue(value: List<String>): NavigationBundleValue<List<String>> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a List of [String]
+     */
+    object StringArrayType : NonNullableNavigationBundleSpecType<List<String>>() {
+        override fun convertValue(value: List<String>): NavigationBundleValue.StringArrayValue {
             return NavigationBundleValue.StringArrayValue(value)
         }
     }
 
-    object DateType : NavigationBundleSpecType<KalugaDate>() {
-        override fun convertValue(value: KalugaDate): NavigationBundleValue<KalugaDate> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a [KalugaDate]
+     */
+    object DateType : NonNullableNavigationBundleSpecType<KalugaDate>() {
+        override fun convertValue(value: KalugaDate): NavigationBundleValue.DateValue {
             return NavigationBundleValue.DateValue(value)
         }
     }
 
-    object DateArrayType : NavigationBundleSpecType<List<KalugaDate>>() {
-        override fun convertValue(value: List<KalugaDate>): NavigationBundleValue<List<KalugaDate>> {
+    /**
+     * A [NonNullableNavigationBundleSpecType] that represents a List of[KalugaDate]
+     */
+    object DateArrayType : NonNullableNavigationBundleSpecType<List<KalugaDate>>() {
+        override fun convertValue(value: List<KalugaDate>): NavigationBundleValue.DateArrayValue {
             return NavigationBundleValue.DateArrayValue(value)
         }
     }
 
-    data class OptionalType<T>(val type: NavigationBundleSpecType<T>) : NavigationBundleSpecType<T?>() {
+    /**
+     * A [NavigationBundleSpecType] that represents a nullable [T].
+     * @param T the nullable type to represent.
+     * @property type The [NonNullableNavigationBundleSpecType] describing the non-nullable version of [T].
+     */
+    data class OptionalType<T : Any>(val type: NonNullableNavigationBundleSpecType<T>) : NavigationBundleSpecType<T?>() {
         override fun convertValue(value: T?): NavigationBundleValue<T?> {
             return value?.let {
                 NavigationBundleValue.OptionalValue(type.convertValue(it))
@@ -219,19 +316,28 @@ sealed class NavigationBundleSpecType<T> {
 
 /**
  * A set of [NavigationBundleSpecRow]s that can be used to form a [NavigationBundle] using [NavigationBundleSpec.toBundle]
+ * @param R The [NavigationBundleSpecRow] associated with this [NavigationBundleSpec].
+ * @property rows The set of [rows][R] in this [NavigationBundleSpec].
  */
 open class NavigationBundleSpec<R : NavigationBundleSpecRow<*>>(val rows: Set<R>)
 
 /**
  * A [NavigationBundleSpec] that only provides a single [NavigationBundleSpecRow]
+ * @param T The type of value stored in this spec.
  * @param type The [NavigationBundleSpecType] used for the [NavigationBundleSpecRow]
  */
 class SingleValueNavigationSpec<T>(type: NavigationBundleSpecType<T>) : NavigationBundleSpec<SingleValueNavigationSpec.Row<T>>(setOf(Row(type))) {
+    /**
+     * A [NavigationBundleSpecRow] that contains only a single value.
+     * @param T the type to be stored in this row.
+     * @param type The [NavigationBundleSpecType] used for the [SingleValueNavigationSpec.Row]
+     */
     data class Row<T>(val type: NavigationBundleSpecType<T>) : NavigationBundleSpecRow<T>(type)
 }
 
 /**
  * Creates a [NavigationBundle] from the [NavigationBundleSpec]
+ * @param R The type of [NavigationBundleSpecRow] associated with the [NavigationBundleSpec].
  * @param mapper Function mapping the [NavigationBundleSpecRow] in this spec to their respective [NavigationBundleValue]
  * @return A [NavigationBundle] matching this [NavigationBundleSpec]
  */
diff --git a/architecture/src/commonMain/kotlin/navigation/Navigator.kt b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
index 99ee8ebc6..894f9a296 100644
--- a/architecture/src/commonMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
@@ -20,15 +20,17 @@ package com.splendo.kaluga.architecture.navigation
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
 /**
- * Action that describes the intent to navigate
- * @param bundle The [NavigationBundle] containing data used to configure navigation
+ * Action that describes the intent to navigate.
+ * @param B the type of [NavigationBundleSpecRow] associated with this action.
+ * @property bundle The [NavigationBundle] containing rows of [B] used to configure navigation.
  */
 open class NavigationAction<B : NavigationBundleSpecRow<*>>(val bundle: NavigationBundle<B>?)
 
 /**
- * A [NavigationAction] that has a [SingleValueNavigationSpec] bundle
- * @param value The value passed by the action
- * @param type The [NavigationBundleSpecType] describing the object passed by the action
+ * A [NavigationAction] that has a [SingleValueNavigationSpec] bundle.
+ * @param T the value type to be passed when navigating using this action.
+ * @property value The value passed by the action
+ * @property type The [NavigationBundleSpecType] associated with [T].
  */
 open class SingleValueNavigationAction<T>(
     val value: T,
@@ -41,16 +43,18 @@ open class SingleValueNavigationAction<T>(
 
 /**
  * Exception thrown by a [Navigator]
+ * @param message The message of this exception.
  */
 open class NavigationException(message: String?) : RuntimeException(message)
 
 /**
  * Class that can trigger a given [NavigationAction]
+ * @param A the type of [NavigationAction] this navigator should respond to.
  */
 expect interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
     /**
      * Triggers a given [NavigationAction]
-     * @param action The [NavigationAction] to trigger
+     * @param action The [A] to trigger
      * @throws [NavigationException] if navigation fails.
      */
     fun navigate(action: A)
@@ -58,7 +62,8 @@ expect interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
 
 /**
  * Triggers a given [NavigationAction] and returns `true` if it succeeded.
- * @param action The [NavigationAction] to trigger.
+ * @param A The type of [NavigationAction] to be given.
+ * @param action The [A] to trigger.
  * @return `true` if the navigation succeeded, false otherwise
  */
 fun <A : NavigationAction<*>> Navigator<A>.navigateWithSuccess(action: A): Boolean = try {
@@ -69,8 +74,9 @@ fun <A : NavigationAction<*>> Navigator<A>.navigateWithSuccess(action: A): Boole
 }
 
 /**
- * Triggers a given [NavigationAction] or executes a closure if the navigation failed to complete
- * @param action The [NavigationAction] to trigger.
+ * Triggers a given [NavigationAction] or executes a closure if the navigation failed to complete.
+ * @param A The type of [NavigationAction] to be given.
+ * @param action The [A] to trigger.
  * @param onFailure Closure for handling case when navigation failed.
  */
 fun <A : NavigationAction<*>> Navigator<A>.navigateOrElse(action: A, onFailure: () -> Unit) {
diff --git a/architecture/src/commonMain/kotlin/observable/Observable.kt b/architecture/src/commonMain/kotlin/observable/Observable.kt
index d1d5d6c8b..e0ebc0588 100644
--- a/architecture/src/commonMain/kotlin/observable/Observable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observable.kt
@@ -35,6 +35,11 @@ import kotlin.properties.ReadOnlyProperty
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
+/**
+ * Casts the value of an [ObservableOptional] to its subtype [R] or returns [defaultValue] if no such casting is possible.
+ * @param defaultValue The default [R] to be returned if [ObservableOptional.valueOrNull] is not [R] or `null`.
+ * @return The current value [R] if it exists or [defaultValue]
+ */
 inline fun <reified R : T, T> ObservableOptional<T>.resultValueOrDefault(defaultValue: R): R =
     try {
         valueOrNull?.let { it as? R } ?: defaultValue
@@ -42,6 +47,11 @@ inline fun <reified R : T, T> ObservableOptional<T>.resultValueOrDefault(default
         defaultValue
     }
 
+/**
+ * Casts an [ObservableOptional] to an [ObservableOptional] its subtype [R] or returns [defaultValue] if no such casting is possible.
+ * @param defaultValue The default [Value] of [R] to be returned if [ObservableOptional] is not a [Value] of [R] or `null`.
+ * @return An [ObservableOptional] containing the current [Value] of [R] if it exists or [defaultValue]
+ */
 fun <R : T, T> ObservableOptional<T>.asResult(defaultValue: Value<R>?): ObservableOptional<R> =
     try {
         if (this is Value<*> && (this.value != null || defaultValue == null))
@@ -54,14 +64,20 @@ fun <R : T, T> ObservableOptional<T>.asResult(defaultValue: Value<R>?): Observab
     }
 
 /**
- * Result type for an [BaseObservable]. Used to allow for the distinction between `null` and optional values
+ * Result type for an [BaseObservable]. Used to allow for the distinction between `null` and optional values.
+ * @param T the type this [ObservableOptional] represents. Can be a nullable.
  */
 sealed class ObservableOptional<T> : ReadOnlyProperty<Any?, T?> {
 
+    /**
+     * The value of [T] or `null` if this result is [Nothing].
+     */
     abstract val valueOrNull: T?
 
     /**
-     * The [BaseObservable] has a result, this result could be `null`
+     * The [BaseObservable] has a result, this result could be `null`.
+     * @param T the type of the [Value]
+     * @property value the value of this result. Can be `null`.
      */
     data class Value<T>(val value: T) : ObservableOptional<T>() {
 
@@ -71,7 +87,8 @@ sealed class ObservableOptional<T> : ReadOnlyProperty<Any?, T?> {
     }
 
     /**
-     * The Observable does not have a result
+     * The Observable does not have a result.
+     * @param T the type of [Value] that corresponds to this empty result.
      */
     class Nothing<T> : ObservableOptional<T>() {
         override fun getValue(thisRef: Any?, property: KProperty<*>): T? {
@@ -91,12 +108,17 @@ sealed class ObservableOptional<T> : ReadOnlyProperty<Any?, T?> {
     }
 }
 
-open class ObservationDefault<R : T?, T>(
+/**
+ * An [Observation] that implements [MutableDefaultInitialized]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ */
+open class ObservationDefault<R : T?, T : Any>(
     override val defaultValue: Value<R>,
     override val initialValue: Value<T?>
 ) : Observation<R, T?, Value<R>>(initialValue),
     ReadWriteProperty<Any?, R>,
-    MutableDefaultInitialized<R, T?> {
+    MutableDefaultInitialized<R, T> {
 
     constructor(
         defaultValue: R,
@@ -128,6 +150,9 @@ open class ObservationDefault<R : T?, T>(
     }
 }
 
+/**
+ * An [Observation] that implements [MutableUninitialized]
+ */
 class ObservationUninitialized<T> :
     Observation<T, T, ObservableOptional<T>>(Nothing()),
     MutableUninitialized<T>,
@@ -205,12 +230,6 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
 
     var beforeObservedValueGet: ((OO) -> ObservableOptional<T>)? = null
 
-    // alternate implementation with freezing references
-
-    // This implementation's withContext below should freeze this reference if it's accessed from another thread
-    // but if all access is from the main thread it should not be frozen.
-    // if it does get frozen, instead the atomic reference is used to update into.
-
     @Suppress("SENSELESS_COMPARISON") // if not initialized this can still happen
     private var backingInternalValue: ObservableOptional<R>? = null
         get() =
@@ -227,7 +246,6 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
      *  set the value of this Observable from a suspended context.
      */
     suspend fun setValue(value: ObservableOptional<T>): ObservableOptional<T> =
-        // this avoids unneeded freezing that sometimes occurs in the runtime anyway
         if (isOnMainThread) {
             setValueUnconfined(value)
         } else withContext(Dispatchers.Main) {
@@ -396,18 +414,23 @@ interface InitializedSubject<T> :
     InitializedObservable<T>,
     MutableInitialized<T, T>
 
-interface DefaultObservable<R : T?, T> :
+interface DefaultObservable<R : T?, T : Any> :
     BasicObservable<R, T?, Value<R>>,
-    DefaultInitialized<R, T?>
+    DefaultInitialized<R, T>
 
-interface DefaultSubject<R : T?, T> :
+interface DefaultSubject<R : T?, T : Any> :
     BasicSubject<R, T?, Value<R>>,
     DefaultObservable<R, T>,
-    MutableDefaultInitialized<R, T?>
+    MutableDefaultInitialized<R, T>
 
+/**
+ * Interface indicating an observable has a state of [T]
+ * @param T the type of the state.
+ */
 expect interface WithState<T> {
+
     /**
-     * Stateflow that expresses the content from the observable.
+     * [StateFlow] that expresses the content from the observable.
      *
      * This can be initialized lazily.
      *
@@ -416,41 +439,114 @@ expect interface WithState<T> {
      *
      */
     val stateFlow: StateFlow<T>
+
+    /**
+     * A [ReadOnlyProperty] of [T]
+     */
     val valueDelegate: ReadOnlyProperty<Any?, T>
 }
 
+/**
+ * A [WithState] where [stateFlow] is mutable
+ */
 interface WithMutableState<T> : WithState<T> {
+
+    /**
+     * [MutableStateFlow] that expresses the content from the observable.
+     *
+     * This can be initialized lazily.
+     *
+     * Accessing this from property outside the main thread might cause a race condition,
+     * since observing the initial value needed for the stateflow has to happen on the main thread.
+     *
+     */
     override val stateFlow: MutableStateFlow<T>
+
+    /**
+     * A [ReadWriteProperty] of [T]
+     */
     override val valueDelegate: ReadWriteProperty<Any?, T>
 }
 
-interface MutableDefaultInitialized<R : T?, T> : DefaultInitialized<R, T?>, WithMutableState<R>
+/**
+ * A [DefaultInitialized] that implements [WithMutableState]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ */
+interface MutableDefaultInitialized<R : T?, T : Any> : DefaultInitialized<R, T>, WithMutableState<R>
 
-interface DefaultInitialized<R : T?, T> : Initialized<R, T?>, WithState<R> {
+/**
+ * An [Initialized] that has a [defaultValue]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ */
+interface DefaultInitialized<R : T?, T : Any> : Initialized<R, T?> {
+    /**
+     * The default [Value] of [R]. Can be used in case [Nothing] is [Initial.initialValue]
+     */
     val defaultValue: Value<R>
 }
 
 interface MutableUninitialized<T> : Uninitialized<T>, WithMutableState<T?>
+
+/**
+ * An [Initial] that has [Nothing] as its [initialValue]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ */
 interface Uninitialized<T> : Initial<T, T>, WithState<T?> {
     override val initialValue: Nothing<T>
 }
 
+/**
+ * An [Initialized] that implements [WithMutableState].
+ */
 interface MutableInitialized<R : T, T> : Initialized<R, T>, WithMutableState<R>
+
+/**
+ * An [Initial] that has [Value] as its [initialValue]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ */
 interface Initialized<R : T, T> : Initial<R, T>, WithState<R> {
     override val initialValue: Value<T>
+
+    /**
+     * The current value of [R]
+     */
     val current: R
     fun observeInitialized(onNext: (R) -> Unit): Disposable
 }
 
+/**
+ * Marks a class that has an initial [ObservableOptional] value, where [T] is the expected input value and [R] is its result.
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ */
 interface Initial<R : T, T> {
+    /**
+     * The initial [ObservableOptional] value of [T].
+     */
     val initialValue: ObservableOptional<T>
+
+    /**
+     * The current value [T] or `null` being observed
+     */
     val currentOrNull: T?
+
+    /**
+     * Creates an observation that calls [onNext] each time a new value is observed until the resulting [Disposable] is [disposed][Disposable.dispose]
+     */
     fun observe(onNext: (R?) -> Unit): Disposable
 }
 
+/**
+ * A [Postable] that can be set in a suspended manner.
+ * @param T the type of value that can be posted.
+ */
 interface SuspendableSetter<T> : Postable<T> {
     /**
-     * Updates the value of this [Postable]
+     * Updates the value of this [Postable] in a suspended manner.
      * @param newValue The new value of the postable
      */
     suspend fun set(newValue: T)
@@ -458,6 +554,7 @@ interface SuspendableSetter<T> : Postable<T> {
 
 /**
  * A Postable can handle values being posted to it.
+ * @param T the type of value that can be posted.
  */
 interface Postable<T> {
     /**
@@ -469,16 +566,16 @@ interface Postable<T> {
 }
 
 @Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE") // we want our delegate to override
-abstract class BaseDefaultObservable<R : T?, T>(
-    override val observation: ObservationDefault<R, T?>
+abstract class BaseDefaultObservable<R : T?, T : Any>(
+    override val observation: ObservationDefault<R, T>
 ) :
     BaseObservable<R, T?, Value<R>>(observation),
-    DefaultObservable<R, T?>,
-    DefaultInitialized<R, T?> by observation {
+    DefaultObservable<R, T>,
+    DefaultInitialized<R, T> by observation {
     constructor(
         defaultValue: R,
         initialValue: Value<T?>
-    ) : this(ObservationDefault<R, T?>(Value(defaultValue), initialValue))
+    ) : this(ObservationDefault<R, T>(Value<R>(defaultValue), initialValue))
 
     override fun getValue(thisRef: Any?, property: KProperty<*>): Value<R> =
         observation.currentObserved
@@ -593,11 +690,11 @@ class SimpleInitializedSubject<T>(
     }
 }
 
-class SimpleDefaultSubject<R : T?, T>(
+class SimpleDefaultSubject<R : T?, T : Any>(
     defaultValue: R,
     initialValue: T? = defaultValue
 ) :
-    BaseDefaultSubject<R, T?>(
+    BaseDefaultSubject<R, T>(
         Value(defaultValue),
         Value(initialValue)
     ) {
@@ -612,25 +709,25 @@ class SimpleDefaultSubject<R : T?, T>(
 }
 
 @Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE") // deliberate
-abstract class AbstractBaseDefaultSubject<R : T?, T>(
-    override val observation: ObservationDefault<R, T?>
+abstract class AbstractBaseDefaultSubject<R : T?, T : Any>(
+    override val observation: ObservationDefault<R, T>
 ) : BaseSubject<R, T?, Value<R>>(
     observation,
     { observation.stateFlow }
 ),
     DefaultSubject<R, T>,
-    MutableDefaultInitialized<R, T?> by observation {
+    MutableDefaultInitialized<R, T> by observation {
     constructor(
         defaultValue: Value<R>,
         initialValue: Value<T?>
-    ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
+    ) : this(observation = ObservationDefault<R, T>(defaultValue, initialValue))
 
     override fun getValue(thisRef: Any?, property: KProperty<*>): Value<R> =
         observation.currentObserved
 }
 
-expect abstract class BaseDefaultSubject<R : T?, T>(
-    observation: ObservationDefault<R, T?>
+expect abstract class BaseDefaultSubject<R : T?, T : Any>(
+    observation: ObservationDefault<R, T>
 ) : AbstractBaseDefaultSubject<R, T> {
 
     constructor(
diff --git a/architecture/src/commonMain/kotlin/observable/Observables.kt b/architecture/src/commonMain/kotlin/observable/Observables.kt
index 3b1f33bca..39298f767 100644
--- a/architecture/src/commonMain/kotlin/observable/Observables.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observables.kt
@@ -30,6 +30,13 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.properties.ReadOnlyProperty
 import kotlin.properties.ReadWriteProperty
 
+/**
+ * Observes a [Flow] and sets updates value to an [Observation] while it is being observed
+ * @param observation The [Observation] to observe the [Flow]
+ * @param coroutineScope The [CoroutineScope] on which to observe the [Flow]
+ * @param context The [CoroutineContext] in which to observe the [Flow]
+ * @param flow The [Flow] to observe.
+ */
 fun <R : T, T, OO : ObservableOptional<R>> observeFlow(
     observation: Observation<R, T, OO>,
     coroutineScope: CoroutineScope,
@@ -46,14 +53,14 @@ fun <R : T, T, OO : ObservableOptional<R>> observeFlow(
     }
 }
 
-class DefaultFlowObservable<R : T?, T>(
+class DefaultFlowObservable<R : T?, T : Any>(
     defaultValue: R,
     initialValue: T? = defaultValue,
     coroutineScope: CoroutineScope,
     context: CoroutineContext = coroutineScope.coroutineContext,
     flow: Flow<T?>,
-    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue, Value(initialValue)),
-) : BaseDefaultObservable<R, T?>(observation) {
+    observation: ObservationDefault<R, T> = ObservationDefault<R, T>(defaultValue, Value<T?>(initialValue)),
+) : BaseDefaultObservable<R, T>(observation) {
     init {
         observeFlow(observation, coroutineScope, context, flow)
     }
@@ -119,14 +126,14 @@ open class StateFlowSubject<T>(
     }
 }
 
-open class StateFlowDefaultSubject<R : T?, T>(
+open class StateFlowDefaultSubject<R : T?, T : Any>(
     defaultValue: R,
     val coroutineScope: CoroutineScope,
     val context: CoroutineContext = coroutineScope.coroutineContext,
     private val observedStateFlow: MutableStateFlow<T?>,
     autoBind: Boolean = true,
-    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue, Value(observedStateFlow.value)),
-) : BaseDefaultSubject<R, T?>(observation),
+    observation: ObservationDefault<R, T> = ObservationDefault<R, T>(defaultValue, Value<T?>(observedStateFlow.value)),
+) : BaseDefaultSubject<R, T>(observation),
     SuspendableSetter<T?> by MutableFlowSubjectHelper(
         coroutineScope,
         context,
@@ -165,15 +172,15 @@ open class StateFlowInitializedSubject<T>(
     }
 }
 
-open class SharedFlowDefaultSubject<R : T?, T>(
+open class SharedFlowDefaultSubject<R : T?, T : Any>(
     defaultValue: R,
     initialValue: T? = defaultValue,
     coroutineScope: CoroutineScope,
     context: CoroutineContext = coroutineScope.coroutineContext,
     sharedFlow: MutableSharedFlow<T?>,
     autoBind: Boolean = true,
-    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue, Value(initialValue)),
-) : BaseDefaultSubject<R, T?>(
+    observation: ObservationDefault<R, T> = ObservationDefault<R, T>(defaultValue, Value<T?>(initialValue)),
+) : BaseDefaultSubject<R, T>(
     observation
 ),
     SuspendableSetter<T?> by MutableFlowSubjectHelper(
@@ -245,12 +252,12 @@ fun <R : T, T> readOnlyPropertyObservableHelper(readOnlyProperty: ReadOnlyProper
     }
 }
 
-class ReadOnlyPropertyDefaultObservable<R : T, T>(
+class ReadOnlyPropertyDefaultObservable<R : T?, T : Any>(
     defaultValue: R,
-    readOnlyProperty: ReadOnlyProperty<Any?, T>,
-    observation: ObservationDefault<R, T?> = ObservationDefault(
+    readOnlyProperty: ReadOnlyProperty<Any?, T?>,
+    observation: ObservationDefault<R, T> = ObservationDefault<R, T>(
         defaultValue,
-        Value(
+        Value<T?>(
             run {
                 val v by readOnlyProperty
                 v
@@ -335,7 +342,7 @@ class ReadWritePropertyInitializedSubject<T>(
     }
 }
 
-class ReadWritePropertyDefaultSubject<R : T?, T>(
+class ReadWritePropertyDefaultSubject<R : T?, T : Any>(
     defaultValue: R,
     readWriteProperty: ReadWriteProperty<Any?, T?>,
     initialValue: Value<T?> = Value(
@@ -346,7 +353,7 @@ class ReadWritePropertyDefaultSubject<R : T?, T>(
     ),
     coroutineScope: CoroutineScope?,
     context: CoroutineContext? = coroutineScope?.coroutineContext,
-    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue, initialValue)
+    observation: ObservationDefault<R, T> = ObservationDefault<R, T>(defaultValue, initialValue)
 ) :
     BaseDefaultSubject<R, T>(
         observation
@@ -359,7 +366,7 @@ class ReadWritePropertyDefaultSubject<R : T?, T>(
     }
 }
 
-fun <R : T, T> ReadOnlyProperty<Any?, T?>.toDefaultObservable(defaultValue: R) =
+fun <R : T, T : Any> ReadOnlyProperty<Any?, T?>.toDefaultObservable(defaultValue: R) =
     ReadOnlyPropertyDefaultObservable(defaultValue, this)
 
 fun <T> ReadOnlyProperty<Any?, T>.toInitializedObservable() =
@@ -371,11 +378,11 @@ fun <T> ReadWriteProperty<Any?, T>.toInitializedSubject(
 ) =
     ReadWritePropertyInitializedSubject(this, context = context, coroutineScope = coroutineScope)
 
-fun <R : T, T> ReadWriteProperty<Any?, T?>.toDefaultSubject(
+fun <R : T, T : Any> ReadWriteProperty<Any?, T?>.toDefaultSubject(
     defaultValue: R,
     coroutineScope: CoroutineScope? = null,
     context: CoroutineContext? = coroutineScope?.coroutineContext
-): ReadWritePropertyDefaultSubject<R, T?> =
+): ReadWritePropertyDefaultSubject<R, T> =
     ReadWritePropertyDefaultSubject(
         defaultValue = defaultValue,
         readWriteProperty = this,
@@ -399,14 +406,14 @@ fun <T> Flow<T>.toInitializedObservable(
     context: CoroutineContext = coroutineScope.coroutineContext
 ) = FlowInitializedObservable(initialValue, coroutineScope, context, this)
 
-fun <R : T, T> Flow<T?>.toDefaultObservable(
+fun <R : T, T : Any> Flow<T?>.toDefaultObservable(
     defaultValue: R,
     initialValue: T? = defaultValue,
     coroutineScope: CoroutineScope,
     context: CoroutineContext = coroutineScope.coroutineContext,
 ) = DefaultFlowObservable(defaultValue, initialValue, coroutineScope, context, this)
 
-fun <R : T, T> MutableStateFlow<T?>.toDefaultSubject(
+fun <R : T, T : Any> MutableStateFlow<T?>.toDefaultSubject(
     defaultValue: R,
     coroutineScope: CoroutineScope,
     context: CoroutineContext = coroutineScope.coroutineContext
@@ -437,16 +444,16 @@ fun <T> MutableSharedFlow<T>.toInitializedSubject(
     this
 )
 
-fun <R : T?, T> MutableSharedFlow<T?>.toDefaultSubject(
+fun <R : T?, T : Any> MutableSharedFlow<T?>.toDefaultSubject(
     defaultValue: R,
     initialValue: T? = defaultValue,
     coroutineScope: CoroutineScope,
     context: CoroutineContext = coroutineScope.coroutineContext
-) = SharedFlowDefaultSubject(
-    defaultValue,
-    initialValue,
-    coroutineScope,
-    context,
+) = SharedFlowDefaultSubject<R, T>(
+    defaultValue = defaultValue,
+    initialValue = initialValue,
+    coroutineScope = coroutineScope,
+    context = context,
     this
 )
 
diff --git a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
index 6b95b721d..300baf684 100644
--- a/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -41,16 +41,17 @@ open class ViewModel : LifecycleViewModel()
 open class BaseViewModel : BaseLifecycleViewModel()
 
 /**
- * Simple ViewModel class
+ * Simple ViewModel class that is to be bound to a View lifecycle
  */
 expect open class LifecycleViewModel internal constructor() {
     /**
-     * [CoroutineScope] of the ViewModel
+     * [CoroutineScope] of the ViewModel.
+     * This scope is active until the ViewModel lifecycle is cleared.
      */
     val coroutineScope: CoroutineScope
 
     /**
-     * Called when the ViewModel is cleared
+     * Called when the ViewModel lifecycle is cleared
      */
     protected open fun onCleared()
 }
diff --git a/architecture/src/iosMain/kotlin/observable/Observable.kt b/architecture/src/iosMain/kotlin/observable/Observable.kt
index 8baa31313..70a3aefde 100644
--- a/architecture/src/iosMain/kotlin/observable/Observable.kt
+++ b/architecture/src/iosMain/kotlin/observable/Observable.kt
@@ -47,12 +47,12 @@ actual abstract class BaseInitializedSubject<T> actual constructor(observation:
     ) : this (ObservationInitialized(initialValue))
 }
 
-actual abstract class BaseDefaultSubject<R : T?, T> actual constructor(
-    observation: ObservationDefault<R, T?>
+actual abstract class BaseDefaultSubject<R : T?, T : Any> actual constructor(
+    observation: ObservationDefault<R, T>
 ) : AbstractBaseDefaultSubject<R, T>(observation) {
 
     actual constructor(
         defaultValue: ObservableOptional.Value<R>,
         initialValue: ObservableOptional.Value<T?>
-    ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
+    ) : this(observation = ObservationDefault<R, T>(defaultValue, initialValue))
 }
diff --git a/architecture/src/jsMain/kotlin/observable/Observable.kt b/architecture/src/jsMain/kotlin/observable/Observable.kt
index 8baa31313..70a3aefde 100644
--- a/architecture/src/jsMain/kotlin/observable/Observable.kt
+++ b/architecture/src/jsMain/kotlin/observable/Observable.kt
@@ -47,12 +47,12 @@ actual abstract class BaseInitializedSubject<T> actual constructor(observation:
     ) : this (ObservationInitialized(initialValue))
 }
 
-actual abstract class BaseDefaultSubject<R : T?, T> actual constructor(
-    observation: ObservationDefault<R, T?>
+actual abstract class BaseDefaultSubject<R : T?, T : Any> actual constructor(
+    observation: ObservationDefault<R, T>
 ) : AbstractBaseDefaultSubject<R, T>(observation) {
 
     actual constructor(
         defaultValue: ObservableOptional.Value<R>,
         initialValue: ObservableOptional.Value<T?>
-    ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
+    ) : this(observation = ObservationDefault<R, T>(defaultValue, initialValue))
 }
diff --git a/architecture/src/jvmMain/kotlin/observable/Observable.kt b/architecture/src/jvmMain/kotlin/observable/Observable.kt
index 8baa31313..70a3aefde 100644
--- a/architecture/src/jvmMain/kotlin/observable/Observable.kt
+++ b/architecture/src/jvmMain/kotlin/observable/Observable.kt
@@ -47,12 +47,12 @@ actual abstract class BaseInitializedSubject<T> actual constructor(observation:
     ) : this (ObservationInitialized(initialValue))
 }
 
-actual abstract class BaseDefaultSubject<R : T?, T> actual constructor(
-    observation: ObservationDefault<R, T?>
+actual abstract class BaseDefaultSubject<R : T?, T : Any> actual constructor(
+    observation: ObservationDefault<R, T>
 ) : AbstractBaseDefaultSubject<R, T>(observation) {
 
     actual constructor(
         defaultValue: ObservableOptional.Value<R>,
         initialValue: ObservableOptional.Value<T?>
-    ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
+    ) : this(observation = ObservationDefault<R, T>(defaultValue, initialValue))
 }
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 24d5ab335..5ecfc4cb3 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -139,7 +139,7 @@ interface DateTimePickerActions {
  * Abstract DateTimePicker presenter, used to show and dismiss given [DateTimePicker]
  * @see [DateTimePickerPresenter]
  *
- * @property dateTimePicker The alert to present (and dismiss if needed)
+ * @param dateTimePicker The alert to present (and dismiss if needed)
  */
 abstract class BaseDateTimePickerPresenter(private val dateTimePicker: DateTimePicker) : DateTimePickerActions {
 
diff --git a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
index de9da3c1c..4f1b2f4bf 100644
--- a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
@@ -47,9 +47,9 @@ class GoogleLocationProvider(private val context: Context, private val settings:
 
     /**
      * Settings for a [GoogleLocationProvider]
-     * @param interval The desired interval of location updates.
-     * @param maxUpdateDelay The longest a location update may be delayed.
-     * @param minUpdateInterval The fastest allowed interval of location updates.
+     * @property interval The desired interval of location updates.
+     * @property maxUpdateDelay The longest a location update may be delayed.
+     * @property minUpdateInterval The fastest allowed interval of location updates.
      */
     data class Settings(
         val interval: Duration,
diff --git a/test-utils-base/src/commonMain/kotlin/mock/parameters/PairParameters.kt b/test-utils-base/src/commonMain/kotlin/mock/parameters/PairParameters.kt
index c0da0b309..f9a27feeb 100644
--- a/test-utils-base/src/commonMain/kotlin/mock/parameters/PairParameters.kt
+++ b/test-utils-base/src/commonMain/kotlin/mock/parameters/PairParameters.kt
@@ -35,8 +35,10 @@ class PairParameters<T0, T1> : ParametersSpec<PairParameters.Matchers<T0, T1>, P
 
     /**
      * The [ParametersSpec.Matchers] for two parameters
-     * @param first the first parameters [ParameterMatcher]
-     * @param second the second parameters [ParameterMatcher]
+     * @param T0 the type of the first [ParameterMatcher]
+     * @param T1 the type of the second [ParameterMatcher]
+     * @property first the first parameters [ParameterMatcher]
+     * @property second the second parameters [ParameterMatcher]
      */
     data class Matchers<T0, T1>(val first: ParameterMatcher<T0>, val second: ParameterMatcher<T1>) :
         ParametersSpec.Matchers {
@@ -45,8 +47,10 @@ class PairParameters<T0, T1> : ParametersSpec<PairParameters.Matchers<T0, T1>, P
 
     /**
      * The [ParametersSpec.MatchersOrCaptor] for two parameters
-     * @param first the first parameters [ParameterMatcherOrCaptor]
-     * @param second the second parameters [ParameterMatcherOrCaptor]
+     * @param T0 the type of the first [ParameterMatcherOrCaptor]
+     * @param T1 the type of the second [ParameterMatcherOrCaptor]
+     * @property first the first parameters [ParameterMatcherOrCaptor]
+     * @property second the second parameters [ParameterMatcherOrCaptor]
      */
     data class MatchersOrCaptor<T0, T1>(val first: ParameterMatcherOrCaptor<T0>, val second: ParameterMatcherOrCaptor<T1>) :
         ParametersSpec.MatchersOrCaptor<Matchers<T0, T1>> {
@@ -55,6 +59,8 @@ class PairParameters<T0, T1> : ParametersSpec<PairParameters.Matchers<T0, T1>, P
 
     /**
      * The [ParametersSpec.Values] for two parameters
+     * @param T0 the type of the first value
+     * @param T1 the type of the second value
      * @property first the first parameter
      * @property second the second parameter
      */

From f028ec56175c0a023bb3370c39ee0dcf73110e13 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 31 Jan 2023 23:21:31 +0100
Subject: [PATCH 140/227] Improved Architecture documentation

Moved getOrPutAndRemoveOnDestroyFromCache and related methods to test-utils
---
 alerts/build.gradle.kts                       |   2 +-
 .../kotlin/AndroidAlertPresenterTest.kt       |   2 +-
 .../kotlin/TestActivity.kt                    |   1 +
 .../androidLibMain/kotlin/AlertPresenter.kt   |  19 +-
 .../commonTest/kotlin/AlertPresenterTests.kt  |   5 +-
 .../iosTest/kotlin/IOSAlertPresenterTests.kt  |   3 +-
 .../kaluga/architecture/compose/RouteTests.kt |   5 +-
 architecture/build.gradle.kts                 |   2 +-
 ...GetOrPutAndRemoveOnDestroyFromCacheTest.kt |   1 +
 .../kotlin/lifecycle/LifecycleManagerTest.kt  |   9 +-
 .../ActivityLifecycleSubscribable.kt          |   5 +
 .../lifecycle/LifecycleManagerObserver.kt     |  19 -
 .../kotlin/navigation/ActivityParseExtra.kt   |   8 +
 .../navigation/BundleToTypedProperty.kt       |  20 +
 .../navigation/FragmentParseArguments.kt      |  12 +
 .../kotlin/navigation/IntentParseExtra.kt     |  12 +
 .../kotlin/navigation/Navigator.kt            |  10 +
 .../kotlin/observable/Disposable.kt           |   4 +
 .../observable/{Observable.kt => Subject.kt}  | 102 +--
 .../kotlin/observable/WithState.kt            | 106 +++
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  11 +
 ...ableMarker.kt => LifecycleSubscribable.kt} |   5 +-
 .../commonMain/kotlin/navigation/Navigator.kt |  20 +-
 .../kotlin/observable/Disposable.kt           |   8 +-
 .../kotlin/observable/FlowObservable.kt       | 135 ++++
 .../kotlin/observable/FlowSubject.kt          | 280 +++++++
 .../kotlin/observable/Observable.kt           | 702 ++----------------
 .../kotlin/observable/ObservableOptional.kt   |  96 +++
 .../kotlin/observable/ObservableState.kt      | 171 +++++
 .../kotlin/observable/Observables.kt          | 462 ------------
 .../kotlin/observable/Observation.kt          | 335 +++++++++
 .../observable/ReadOnlyPropertyObservable.kt  | 104 +++
 .../observable/ReadWritePropertySubject.kt    | 152 ++++
 .../commonMain/kotlin/observable/Subject.kt   | 305 ++++++++
 .../kotlin/lifecycle/LifecycleSubscribable.kt |   6 +
 .../iosMain/kotlin/navigation/Navigator.kt    |  20 +-
 .../iosMain/kotlin/observable/Observable.kt   |  58 +-
 .../kotlin/observable/SimpleDisposable.kt     |   4 +
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  10 +
 .../kotlin/lifecycle/LifecycleSubscribable.kt |   6 +
 .../src/jsMain/kotlin/navigation/Navigator.kt |   8 +-
 .../jsMain/kotlin/observable/Observable.kt    |  60 +-
 .../kotlin/observable/SimpleDisposable.kt     |   4 +
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  13 +
 .../kotlin/lifecycle/LifecycleSubscribable.kt |   6 +
 .../jvmMain/kotlin/navigation/Navigator.kt    |   8 +-
 .../jvmMain/kotlin/observable/Observable.kt   |  58 +-
 .../kotlin/observable/SimpleDisposable.kt     |   4 +
 .../kotlin/viewmodel/LifecycleViewModel.kt    |  13 +
 .../src/androidLibMain/kotlin/utils/Locale.kt |   2 +-
 base/src/iosMain/kotlin/utils/Locale.kt       |   2 +-
 base/src/jsMain/kotlin/utils/Locale.kt        |   2 +-
 base/src/jvmMain/kotlin/utils/Locale.kt       |   2 +-
 date-time-picker/build.gradle.kts             |   2 +-
 .../kotlin/TestActivity.kt                    |   1 +
 .../kotlin/DateTimePickerPresenter.kt         |  17 -
 .../src/commonMain/kotlin/DateTimePicker.kt   |   2 +-
 hud/build.gradle.kts                          |   2 +-
 .../kotlin/TestActivity.kt                    |   1 +
 hud/src/androidLibMain/kotlin/HUD.kt          |  16 -
 .../src/main/kotlin/Component.kt              |   4 +
 keyboard/build.gradle.kts                     |   2 +-
 .../kotlin/TestActivity.kt                    |   1 +
 .../androidLibMain/kotlin/KeyboardManager.kt  |  16 -
 .../androidLibMain/kotlin/ReviewManager.kt    |  18 +-
 settings.gradle.kts                           |   1 +
 test-utils-alerts/build.gradle.kts            |   8 +-
 .../kotlin/alertPresenterBuilder.kt           |  37 +
 .../getOrPutAndRemoveOnDestroyFromCache.kt    |   4 +-
 .../kotlin/lifecycleManagerObserver.kt        |  40 +
 test-utils-date-time-picker/README.md         |  21 +
 .../api/androidLib/test-utils-keyboard.api    |  36 +
 .../api/jvm/test-utils-keyboard.api           |  29 +
 test-utils-date-time-picker/build.gradle.kts  |  20 +
 .../AndroidManifest.xml                       |   6 +
 .../kotlin/TestActivity.kt                    |  27 +
 .../src/androidLibMain/AndroidManifest.xml    |   2 +
 .../kotlin/datePickerPresenterBuilder.kt      |  37 +
 .../kotlin/MockDateTimePickerPresenter.kt     | 109 +++
 .../kotlin/MockDateTimePickerPresenterTest.kt |  86 +++
 test-utils-hud/build.gradle.kts               |   8 +-
 .../src/androidLibMain/kotlin/hudBuilder.kt   |  36 +
 test-utils-keyboard/build.gradle.kts          |   8 +-
 .../kotlin/TestActivity.kt                    |   2 +-
 .../kotlin/keyboardManagerBuilder.kt          |  36 +
 85 files changed, 2723 insertions(+), 1331 deletions(-)
 rename architecture/src/androidLibMain/kotlin/observable/{Observable.kt => Subject.kt} (65%)
 create mode 100644 architecture/src/androidLibMain/kotlin/observable/WithState.kt
 rename architecture/src/commonMain/kotlin/lifecycle/{LifecycleSubscribableMarker.kt => LifecycleSubscribable.kt} (73%)
 create mode 100644 architecture/src/commonMain/kotlin/observable/FlowObservable.kt
 create mode 100644 architecture/src/commonMain/kotlin/observable/FlowSubject.kt
 create mode 100644 architecture/src/commonMain/kotlin/observable/ObservableOptional.kt
 create mode 100644 architecture/src/commonMain/kotlin/observable/ObservableState.kt
 delete mode 100644 architecture/src/commonMain/kotlin/observable/Observables.kt
 create mode 100644 architecture/src/commonMain/kotlin/observable/Observation.kt
 create mode 100644 architecture/src/commonMain/kotlin/observable/ReadOnlyPropertyObservable.kt
 create mode 100644 architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt
 create mode 100644 architecture/src/commonMain/kotlin/observable/Subject.kt
 create mode 100644 test-utils-alerts/src/androidLibMain/kotlin/alertPresenterBuilder.kt
 rename {architecture/src/androidLibMain/kotlin/lifecycle => test-utils-architecture/src/androidLibMain/kotlin}/getOrPutAndRemoveOnDestroyFromCache.kt (94%)
 create mode 100644 test-utils-architecture/src/androidLibMain/kotlin/lifecycleManagerObserver.kt
 create mode 100644 test-utils-date-time-picker/README.md
 create mode 100644 test-utils-date-time-picker/api/androidLib/test-utils-keyboard.api
 create mode 100644 test-utils-date-time-picker/api/jvm/test-utils-keyboard.api
 create mode 100644 test-utils-date-time-picker/build.gradle.kts
 create mode 100644 test-utils-date-time-picker/src/androidLibInstrumentedTest/AndroidManifest.xml
 create mode 100644 test-utils-date-time-picker/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
 create mode 100644 test-utils-date-time-picker/src/androidLibMain/AndroidManifest.xml
 create mode 100644 test-utils-date-time-picker/src/androidLibMain/kotlin/datePickerPresenterBuilder.kt
 create mode 100644 test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
 create mode 100644 test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
 create mode 100644 test-utils-hud/src/androidLibMain/kotlin/hudBuilder.kt
 create mode 100644 test-utils-keyboard/src/androidLibMain/kotlin/keyboardManagerBuilder.kt

diff --git a/alerts/build.gradle.kts b/alerts/build.gradle.kts
index 38b66a17c..3b3548a93 100644
--- a/alerts/build.gradle.kts
+++ b/alerts/build.gradle.kts
@@ -25,7 +25,7 @@ kotlin {
         }
         getByName("commonTest") {
             dependencies {
-                implementation(project(":test-utils-base", ""))
+                implementation(project(":test-utils-alerts", ""))
             }
         }
     }
diff --git a/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt b/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
index b015be281..5b09e60de 100644
--- a/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
+++ b/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
@@ -22,7 +22,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.Until
-import com.splendo.kaluga.test.AlertPresenterTests
+import com.splendo.kaluga.alerts.AlertPresenterTests
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
diff --git a/alerts/src/androidLibInstrumentedTest/kotlin/TestActivity.kt b/alerts/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
index 91b5fd345..b0c46e5e4 100644
--- a/alerts/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
+++ b/alerts/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
@@ -2,6 +2,7 @@ package com.splendo.kaluga.alerts
 
 import androidx.activity.viewModels
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.test.alerts.alertPresenterBuilder
 
 class TestActivity : KalugaViewModelActivity<AlertsViewModel>() {
 
diff --git a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
index 6cf4b0342..aab8ba95b 100644
--- a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
@@ -25,11 +25,8 @@ import android.text.TextWatcher
 import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.LinearLayout
-import androidx.appcompat.app.AppCompatActivity
-import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
 import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromCache
-import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
+import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
 import com.splendo.kaluga.base.utils.applyIf
 import com.splendo.kaluga.resources.dpToPixel
 import kotlinx.coroutines.CoroutineScope
@@ -206,17 +203,3 @@ actual class AlertPresenter(
         return linearLayout
     }
 }
-
-/**
- * @return The [AlertPresenter.Builder] which can be used to present alerts while this Activity is active
- * Will be created if need but only one instance will exist.
- *
- * Warning: Do not attempt to use this builder outside of the lifespan of the Activity.
- * Instead, for example use a [com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel],
- * which can automatically track which Activity is active for it.
- *
- */
-fun AppCompatActivity.alertPresenterBuilder(): AlertPresenter.Builder =
-    getOrPutAndRemoveOnDestroyFromCache {
-        AlertPresenter.Builder(lifecycleManagerObserver())
-    }
diff --git a/alerts/src/commonTest/kotlin/AlertPresenterTests.kt b/alerts/src/commonTest/kotlin/AlertPresenterTests.kt
index ebc75e5d3..f18e6855b 100644
--- a/alerts/src/commonTest/kotlin/AlertPresenterTests.kt
+++ b/alerts/src/commonTest/kotlin/AlertPresenterTests.kt
@@ -16,11 +16,8 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
-package com.splendo.kaluga.test
+package com.splendo.kaluga.alerts
 
-import com.splendo.kaluga.alerts.AlertPresenter
-import com.splendo.kaluga.alerts.buildActionSheet
-import com.splendo.kaluga.alerts.buildAlert
 import com.splendo.kaluga.base.runBlocking
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/alerts/src/iosTest/kotlin/IOSAlertPresenterTests.kt b/alerts/src/iosTest/kotlin/IOSAlertPresenterTests.kt
index dc1c88a14..18df30e94 100644
--- a/alerts/src/iosTest/kotlin/IOSAlertPresenterTests.kt
+++ b/alerts/src/iosTest/kotlin/IOSAlertPresenterTests.kt
@@ -1,6 +1,5 @@
-package com.splendo.kaluga.test
+package com.splendo.kaluga.alerts
 
-import com.splendo.kaluga.alerts.AlertPresenter
 import platform.UIKit.UIViewController
 
 class IOSAlertPresenterTests : AlertPresenterTests() {
diff --git a/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt b/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
index 9c6bfb258..04562e495 100644
--- a/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
+++ b/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
@@ -31,6 +31,7 @@ import com.splendo.kaluga.base.utils.KalugaDate
 import com.splendo.kaluga.base.utils.TimeZone
 import com.splendo.kaluga.base.utils.utc
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.nullable
 import org.junit.Test
 import kotlin.test.assertEquals
 
@@ -57,7 +58,7 @@ sealed class MockSpecRow<V>(associatedType: NavigationBundleSpecType<V>) : Navig
     object SerializableSpecRow : MockSpecRow<MockSerializable>(NavigationBundleSpecType.SerializedType(MockSerializable.serializer()))
     object OptionalString : MockSpecRow<String?>(NavigationBundleSpecType.OptionalType(NavigationBundleSpecType.StringType))
     object OptionalFloat : MockSpecRow<Float?>(NavigationBundleSpecType.OptionalType(NavigationBundleSpecType.FloatType))
-    object OptionalMockSerializable : MockSpecRow<MockSerializable?>(NavigationBundleSpecType.OptionalType(NavigationBundleSpecType.SerializedType(MockSerializable.serializer())))
+    object OptionalMockSerializable : MockSpecRow<MockSerializable?>(NavigationBundleSpecType.SerializedType(MockSerializable.serializer().nullable))
     object DateSpecRow : MockSpecRow<KalugaDate>(NavigationBundleSpecType.DateType)
 }
 
@@ -88,6 +89,6 @@ class RouteTests {
             }
         }
         val action = TestNavigationAction(bundle)
-        assertEquals("TestNavigationAction/string/true/0.5/{\"value\":\"Mock\"}/${KalugaDateFormatter.iso8601Pattern().format(time)}?OptionalString={optional}&OptionalMockSerializable={{\"value\":\"OptionalMock\"}}", action.route())
+        assertEquals("TestNavigationAction/string/true/0.5/{\"value\":\"Mock\"}/{\"value\":\"OptionalMock\"}/${KalugaDateFormatter.iso8601Pattern().format(time)}?OptionalString={optional}", action.route())
     }
 }
diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts
index 17d06d19d..0b9ec17d4 100644
--- a/architecture/build.gradle.kts
+++ b/architecture/build.gradle.kts
@@ -31,7 +31,7 @@ kotlin {
 
         getByName("commonTest") {
             dependencies {
-                api(project(":test-utils-base", ""))
+                api(project(":test-utils-architecture", ""))
             }
         }
     }
diff --git a/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt b/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt
index 9e5202e51..d50af9d40 100644
--- a/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt
+++ b/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheTest.kt
@@ -23,6 +23,7 @@ import com.splendo.kaluga.architecture.TestActivity
 import com.splendo.kaluga.base.runBlocking
 import com.splendo.kaluga.base.utils.EmptyCompletableDeferred
 import com.splendo.kaluga.base.utils.complete
+import com.splendo.kaluga.test.architecture.getOrPutAndRemoveOnDestroyFromCache
 import com.splendo.kaluga.test.base.BaseTest
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
diff --git a/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt b/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
index 433acb394..5147f8e4b 100644
--- a/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
+++ b/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.architecture.lifecycle
 import androidx.lifecycle.Lifecycle
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import com.splendo.kaluga.architecture.TestActivity
+import com.splendo.kaluga.test.architecture.lifecycleManagerObserver
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -45,7 +46,13 @@ class LifecycleManagerTest {
     fun testLifecycleManagerObserver() = runBlocking(Dispatchers.Main) {
         val activity = activity!!
         val observer = activity.lifecycleManagerObserver()
-        assertEquals(ActivityLifecycleSubscribable.LifecycleManager(activity, activity, activity.supportFragmentManager), observer.managerState.value)
+        assertEquals(
+            ActivityLifecycleSubscribable.LifecycleManager(
+                activity,
+                activity,
+                activity.supportFragmentManager
+            ), observer.managerState.value
+        )
 
         withContext(Dispatchers.Default) {
             activityRule.scenario.moveToState(Lifecycle.State.DESTROYED)
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt b/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
index 1c44c2c10..f1bac6ff0 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
@@ -23,7 +23,12 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 
+/**
+ * This interface can be provided to a [BaseLifecycleViewModel] to bind to platform specific lifecycle.
+ * Extend this on classes that need to have some setup during lifecycle events.
+ */
 actual interface LifecycleSubscribable
 
 /**
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
index 11a684141..4fb31eeb2 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/LifecycleManagerObserver.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.architecture.lifecycle
 
-import androidx.appcompat.app.AppCompatActivity
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
@@ -40,21 +39,3 @@ class LifecycleManagerObserver : DefaultActivityLifecycleSubscribable() {
      */
     val managerState: StateFlow<ActivityLifecycleSubscribable.LifecycleManager?> = _managerState
 }
-
-/**
- * @return The [LifecycleManagerObserver] that only reports the lifecycle of this [AppCompatActivity].
- * Will be created if need but only one instance will exist.
- *
- * For example can be used by code in the Activity itself.
- *
- * Warning: do not use this attempt to use this observer in cases where a dependent class such a Builder
- * exists over the lifespan of several Activities (e.g. when recreated due to rotation etc).
- * In particular this applies to places such as a ViewModel, which can outlive a single Activity.
- *
- */
-fun AppCompatActivity.lifecycleManagerObserver(): LifecycleManagerObserver =
-    getOrPutAndRemoveOnDestroyFromCache(
-        onCreate = { it.subscribe(this@lifecycleManagerObserver) },
-        onDestroy = { it.unsubscribe() },
-        defaultValue = { LifecycleManagerObserver() }
-    )
diff --git a/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt b/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
index 5e08a8ed1..307944c83 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/ActivityParseExtra.kt
@@ -344,3 +344,11 @@ fun <T> Activity.parseTypeOf(serializer: KSerializer<T>): T = intent.parseTypeOf
  * @return The [T] stored in the bundle or null if no such value was found.
  */
 fun <T : Any> Activity.parseTypeOfOrNull(serializer: KSerializer<T>): T? = intent.parseTypeOfOrNull(serializer)
+
+/**
+ * Parses the [Bundle] of [android.app.Activity.getIntent] into [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle or null if no such value was found.
+ */
+@JvmName("parseNullableTypeOfOrNull")
+fun <T> Activity.parseTypeOfOrNull(serializer: KSerializer<T>): T? = intent.parseTypeOfOrNull(serializer)
diff --git a/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt b/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
index ceac9e016..b47c32bfd 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
@@ -48,6 +48,18 @@ fun <R : Any> Bundle.toTypedPropertyOrNull(type: NavigationBundleSpecType<R>): R
     }
 }
 
+/**
+ * Converts a [Bundle] to a [R] property associated with a [NavigationBundleSpecType]
+ * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType].
+ * @return The [R] value stored in the bundle.
+ */
+@JvmName("toNullableTypedPropertyOrNull")
+fun <R> Bundle.toTypedPropertyOrNull(type: NavigationBundleSpecType<R>): R? = try {
+    toTypedProperty(type)
+} catch (e: BundleConversionError) {
+    null
+}
+
 /**
  * Converts a [Bundle] to a [Boolean].
  * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.BooleanType]
@@ -357,3 +369,11 @@ fun <T> Bundle.asTypeOf(serializer: KSerializer<T>): T = toTypedProperty(Navigat
  * @return The [T] stored in the bundle or null if no such value was found.
  */
 fun <T : Any> Bundle.asTypeOfOrNull(serializer: KSerializer<T>): T? = toTypedPropertyOrNull(NavigationBundleSpecType.SerializedType(serializer))
+
+/**
+ * Converts a [Bundle] to [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle or null if no such value was found.
+ */
+@JvmName("asNullableTypeOfOrNull")
+fun <T> Bundle.asTypeOfOrNull(serializer: KSerializer<T>): T? = toTypedPropertyOrNull(NavigationBundleSpecType.SerializedType(serializer))
diff --git a/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt b/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt
index b107a5d13..cf505d3c9 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/FragmentParseArguments.kt
@@ -367,3 +367,15 @@ fun <T : Any> Fragment.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parse
         NavigationBundleSpecType.SerializedType(serializer)
     )
 }
+
+/**
+ * Parses the [Bundle] of [androidx.fragment.app.Fragment.getArguments] into [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle or null if no such value was found.
+ */
+@JvmName("parseNullableTypeOfOrNull")
+fun <T> Fragment.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseExtraOrNull {
+    toTypedPropertyOrNull(
+        NavigationBundleSpecType.SerializedType(serializer)
+    )
+}
diff --git a/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt b/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt
index b105e9bbb..5e1130965 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/IntentParseExtra.kt
@@ -367,3 +367,15 @@ fun <T : Any> Intent?.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseE
         NavigationBundleSpecType.SerializedType(serializer)
     )
 }
+
+/**
+ * Parses the [Bundle] of [Intent] into [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @param serializer The [KSerializer] to deserialize [T] from the bundle.
+ * @return The [T] stored in the bundle or null if no such value was found.
+ */
+@JvmName("parseNullableTypeOfOrNull")
+fun <T> Intent?.parseTypeOfOrNull(serializer: KSerializer<T>): T? = parseExtraOrNull {
+    toTypedPropertyOrNull(
+        NavigationBundleSpecType.SerializedType(serializer)
+    )
+}
diff --git a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
index 9d92845bf..2349826e0 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/Navigator.kt
@@ -29,7 +29,17 @@ import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.DefaultActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
+/**
+ * Class that can trigger a given [NavigationAction]
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ */
 actual interface Navigator<Action : NavigationAction<*>> : LifecycleSubscribable {
+
+    /**
+     * Triggers a given [NavigationAction]
+     * @param action The [A] to trigger
+     * @throws [NavigationException] if navigation fails.
+     */
     actual fun navigate(action: Action)
 }
 
diff --git a/architecture/src/androidLibMain/kotlin/observable/Disposable.kt b/architecture/src/androidLibMain/kotlin/observable/Disposable.kt
index 9433ab32c..80d605a25 100644
--- a/architecture/src/androidLibMain/kotlin/observable/Disposable.kt
+++ b/architecture/src/androidLibMain/kotlin/observable/Disposable.kt
@@ -18,4 +18,8 @@
 @file:JvmName("DisposableJVMKt")
 package com.splendo.kaluga.architecture.observable
 
+/**
+ * A [Disposable] that has a [DisposeHandler]
+ * @param onDispose Function to call when disposing the object.
+ */
 actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : BaseSimpleDisposable(onDispose)
diff --git a/architecture/src/androidLibMain/kotlin/observable/Observable.kt b/architecture/src/androidLibMain/kotlin/observable/Subject.kt
similarity index 65%
rename from architecture/src/androidLibMain/kotlin/observable/Observable.kt
rename to architecture/src/androidLibMain/kotlin/observable/Subject.kt
index 0bc8168cc..6dde53151 100644
--- a/architecture/src/androidLibMain/kotlin/observable/Observable.kt
+++ b/architecture/src/androidLibMain/kotlin/observable/Subject.kt
@@ -18,30 +18,22 @@
 
 package com.splendo.kaluga.architecture.observable
 
-import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.asLiveData
-import androidx.lifecycle.lifecycleScope
+import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.awaitCancellation
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
-import kotlin.properties.ReadOnlyProperty
-
-actual interface WithState<T> {
-    actual val stateFlow: StateFlow<T>
-    actual val valueDelegate: ReadOnlyProperty<Any?, T>
-    val liveData: LiveData<T>
-        get() = stateFlow.asLiveData()
-}
 
+/**
+ * The [Observer] that observes the observable value.
+ */
 val <R : T, T, OO : ObservableOptional<R>> BasicSubject<R, T, OO>.liveDataObserver: Observer<T>
     get() = Observer<T> { this.post(it) }
 
@@ -54,6 +46,11 @@ private fun <B, R : T, T, OO : ObservableOptional<R>> B.mutableLiveData(): Mutab
     return mediatorLiveData
 }
 
+/**
+ * Observes [LiveData] using an [Observer] on a [CoroutineScope]
+ * @param coroutineScope The [CoroutineScope] on which to observe.
+ * @param observer The [Observer] to observe the [LiveData]
+ */
 fun <T> LiveData<T>.observeOnCoroutine(
     coroutineScope: CoroutineScope,
     observer: Observer<T>
@@ -68,6 +65,14 @@ fun <T> LiveData<T>.observeOnCoroutine(
     }
 }
 
+/**
+ * An abstract class that extends [AbstractBaseSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param OO the type of [ObservableOptional] to store the result in.
+ * @param observation The [Observation] to handle observing the value.
+ * @param stateFlowToBind A function to get the [StateFlow] that will automatically call [SuspendableSetter.set] when a new value is posted after [BasicSubject.post] has been called.
+ */
 actual abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>> actual constructor(
     observation: Observation<R, T, OO>,
     stateFlowToBind: suspend () -> StateFlow<R?>
@@ -81,8 +86,16 @@ actual abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>> actual c
             }
         }
     }
+
+    /**
+     * The [MutableLiveData] synchronizing the value of the subject.
+     */
     val mutableLiveData by mutableLiveDataDelegate
     protected abstract fun createLiveData(): MutableLiveData<R>
+
+    /**
+     * Gets an [Observer] to observe changes to this subject.
+     */
     abstract fun liveDataObserver(): Observer<R>
 
     final override fun bind(coroutineScope: CoroutineScope, context: CoroutineContext) {
@@ -94,6 +107,11 @@ actual abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>> actual c
     }
 }
 
+/**
+ * An abstract class extending [AbstractBaseUninitializedSubject].
+ * @param T the type of value to expect.
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
 actual abstract class BaseUninitializedSubject<T> actual constructor(
     observation: ObservationUninitialized<T>
 ) : AbstractBaseUninitializedSubject<T>(observation) {
@@ -109,56 +127,46 @@ actual abstract class BaseUninitializedSubject<T> actual constructor(
     override fun liveDataObserver() = Observer<T> { value -> value?.let { post(it) } }
 }
 
+/**
+ * Abstract class implementing [AbstractBaseInitializedSubject]
+ * @param T the type of value to expect.
+ * @param observation The [ObservationInitialized] to handle value being observed
+ */
 actual abstract class BaseInitializedSubject<T> actual constructor(observation: ObservationInitialized<T>) :
     AbstractBaseInitializedSubject<T>(observation) {
 
     override fun createLiveData(): MutableLiveData<T> = this.mutableLiveData()
     override fun liveDataObserver() = liveDataObserver
 
+    /**
+     * Constructor using an inital value.
+     * @param initialValue The [Value] to use as the initial value.
+     */
     actual constructor(
         initialValue: ObservableOptional.Value<T>
     ) : this (ObservationInitialized(initialValue))
 }
 
-actual abstract class BaseDefaultSubject<R : T?, T : Any> actual constructor(
-    observation: ObservationDefault<R, T>
+/**
+ * An abstract class extending [AbstractBaseDefaultSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
+actual abstract class BaseDefaultSubject<R : T?, T> actual constructor(
+    observation: ObservationDefault<R, T?>
 ) : AbstractBaseDefaultSubject<R, T>(observation) {
 
     override fun createLiveData(): MutableLiveData<R> = this.mutableLiveData()
     override fun liveDataObserver() = Observer<R> { post(it) }
 
+    /**
+     * Constructor
+     * @param defaultValue The default [Value] of [R] to return if the current value is [ObservableOptional.Nothing] or [ObservableOptional.Value] containing `null`.
+     * @param initialValue The initial [Value] of [T].
+     */
     actual constructor(
-        defaultValue: ObservableOptional.Value<R>,
-        initialValue: ObservableOptional.Value<T?>
-    ) : this(observation = ObservationDefault<R, T>(defaultValue, initialValue))
-}
-
-fun <T> WithState<T>.observeOnLifecycle(
-    lifecycleOwner: LifecycleOwner,
-    filter: suspend (T) -> Boolean = { true },
-    onNext: (T) -> Unit
-) =
-    observeOnLifecycle(lifecycleOwner, filter = filter, transform = { it }, onNext = onNext)
-
-fun <T> WithState<T?>.observeNotNullOnLifecycle(
-    lifecycleOwner: LifecycleOwner,
-    filter: suspend (T) -> Boolean = { true },
-    onNext: (T) -> Unit
-) =
-    observeOnLifecycle(
-        lifecycleOwner,
-        filter = { value -> value?.let { filter(it) } ?: false },
-        transform = { it!! },
-        onNext = onNext
-    )
-
-fun <T, R> WithState<T>.observeOnLifecycle(
-    lifecycleOwner: LifecycleOwner,
-    filter: suspend (T) -> Boolean = { true },
-    transform: suspend (T) -> R,
-    onNext: (R) -> Unit
-) = lifecycleOwner.lifecycleScope.launch {
-    stateFlow.filter { filter(it) }.map { transform(it) }.collect {
-        onNext(it)
-    }
+        defaultValue: Value<R>,
+        initialValue: Value<T?>
+    ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
 }
diff --git a/architecture/src/androidLibMain/kotlin/observable/WithState.kt b/architecture/src/androidLibMain/kotlin/observable/WithState.kt
new file mode 100644
index 000000000..7fc131a59
--- /dev/null
+++ b/architecture/src/androidLibMain/kotlin/observable/WithState.kt
@@ -0,0 +1,106 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.observable
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import kotlin.properties.ReadOnlyProperty
+
+/**
+ * Interface indicating an observable has a state of [T]
+ * @param T the type of the state.
+ */
+actual interface WithState<T> {
+
+    /**
+     * [StateFlow] that expresses the content from the observable.
+     *
+     * This can be initialized lazily.
+     *
+     * Accessing this from property outside the main thread might cause a race condition,
+     * since observing the initial value needed for the stateflow has to happen on the main thread.
+     *
+     */
+    actual val stateFlow: StateFlow<T>
+
+    /**
+     * A [ReadOnlyProperty] of [T]
+     */
+    actual val valueDelegate: ReadOnlyProperty<Any?, T>
+
+    /**
+     * The [LiveData] matching [stateFlow]
+     */
+    val liveData: LiveData<T>
+        get() = stateFlow.asLiveData()
+}
+
+/**
+ * Observes [WithState] on the lifecycle of a [LifecycleOwner]
+ * @param lifecycleOwner The [LifecycleOwner] on which to observe.
+ * @param filter A filtering function to filter out certain values.
+ * @param onNext Action to execute when a new value is observed.
+ */
+fun <T> WithState<T>.observeOnLifecycle(
+    lifecycleOwner: LifecycleOwner,
+    filter: suspend (T) -> Boolean = { true },
+    onNext: (T) -> Unit
+) =
+    observeOnLifecycle(lifecycleOwner, filter = filter, transform = { it }, onNext = onNext)
+
+/**
+ * Observes [WithState] of a nullable value on the lifecycle of a [LifecycleOwner]
+ * @param lifecycleOwner The [LifecycleOwner] on which to observe.
+ * @param filter A filtering function to filter out certain values.
+ * @param onNext Action to execute when a new non-null value is observed.
+ */
+fun <T> WithState<T?>.observeNotNullOnLifecycle(
+    lifecycleOwner: LifecycleOwner,
+    filter: suspend (T) -> Boolean = { true },
+    onNext: (T) -> Unit
+) =
+    observeOnLifecycle(
+        lifecycleOwner,
+        filter = { value -> value?.let { filter(it) } ?: false },
+        transform = { it!! },
+        onNext = onNext
+    )
+
+/**
+ * Observes [WithState] on the lifecycle of a [LifecycleOwner] by transforming the observed value.
+ * @param lifecycleOwner The [LifecycleOwner] on which to observe.
+ * @param filter A filtering function to filter out certain values.
+ * @param transform Transforms the next value into a different value of type [R].
+ * @param onNext Action to execute when a new value is observed.
+ */
+fun <T, R> WithState<T>.observeOnLifecycle(
+    lifecycleOwner: LifecycleOwner,
+    filter: suspend (T) -> Boolean = { true },
+    transform: suspend (T) -> R,
+    onNext: (R) -> Unit
+) = lifecycleOwner.lifecycleScope.launch {
+    stateFlow.filter { filter(it) }.map { transform(it) }.collect {
+        onNext(it)
+    }
+}
diff --git a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
index 68c4b364c..7049a5852 100644
--- a/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/androidLibMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -20,11 +20,22 @@ package com.splendo.kaluga.architecture.viewmodel
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineScope
 
+/**
+ * Simple ViewModel class that is to be bound to a View lifecycle
+ */
 actual open class LifecycleViewModel internal actual constructor() : androidx.lifecycle.ViewModel() {
 
+    /**
+     * [CoroutineScope] of the ViewModel.
+     * This scope is active until the ViewModel lifecycle is cleared.
+     */
     actual val coroutineScope = viewModelScope
 
+    /**
+     * Called when the ViewModel lifecycle is cleared
+     */
     actual override fun onCleared() {
         super.onCleared()
     }
diff --git a/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt b/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribable.kt
similarity index 73%
rename from architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
rename to architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribable.kt
index 3e4821f1b..071a8d674 100644
--- a/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribableMarker.kt
+++ b/architecture/src/commonMain/kotlin/lifecycle/LifecycleSubscribable.kt
@@ -17,9 +17,10 @@
 
 package com.splendo.kaluga.architecture.lifecycle
 
-import com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 
 /**
- * Implementing this interface as a public property of a [LifecycleViewModel] allows for automatic binding to platform specific lifecycle aware manager.
+ * This interface can be provided to a [BaseLifecycleViewModel] to bind to platform specific lifecycle.
+ * Extend this on classes that need to have some setup during lifecycle events.
  */
 expect interface LifecycleSubscribable
diff --git a/architecture/src/commonMain/kotlin/navigation/Navigator.kt b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
index 894f9a296..5163be495 100644
--- a/architecture/src/commonMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
@@ -49,24 +49,24 @@ open class NavigationException(message: String?) : RuntimeException(message)
 
 /**
  * Class that can trigger a given [NavigationAction]
- * @param A the type of [NavigationAction] this navigator should respond to.
+ * @param Action the type of [NavigationAction] this navigator should respond to.
  */
-expect interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
+expect interface Navigator<Action : NavigationAction<*>> : LifecycleSubscribable {
     /**
      * Triggers a given [NavigationAction]
-     * @param action The [A] to trigger
+     * @param action The [Action] to trigger
      * @throws [NavigationException] if navigation fails.
      */
-    fun navigate(action: A)
+    fun navigate(action: Action)
 }
 
 /**
  * Triggers a given [NavigationAction] and returns `true` if it succeeded.
- * @param A The type of [NavigationAction] to be given.
- * @param action The [A] to trigger.
+ * @param Action The type of [NavigationAction] to be given.
+ * @param action The [Action] to trigger.
  * @return `true` if the navigation succeeded, false otherwise
  */
-fun <A : NavigationAction<*>> Navigator<A>.navigateWithSuccess(action: A): Boolean = try {
+fun <Action : NavigationAction<*>> Navigator<Action>.navigateWithSuccess(action: Action): Boolean = try {
     navigate(action)
     true
 } catch (e: NavigationException) {
@@ -75,11 +75,11 @@ fun <A : NavigationAction<*>> Navigator<A>.navigateWithSuccess(action: A): Boole
 
 /**
  * Triggers a given [NavigationAction] or executes a closure if the navigation failed to complete.
- * @param A The type of [NavigationAction] to be given.
- * @param action The [A] to trigger.
+ * @param Action The type of [NavigationAction] to be given.
+ * @param action The [Action] to trigger.
  * @param onFailure Closure for handling case when navigation failed.
  */
-fun <A : NavigationAction<*>> Navigator<A>.navigateOrElse(action: A, onFailure: () -> Unit) {
+fun <Action : NavigationAction<*>> Navigator<Action>.navigateOrElse(action: Action, onFailure: () -> Unit) {
     if (!navigateWithSuccess(action))
         onFailure()
 }
diff --git a/architecture/src/commonMain/kotlin/observable/Disposable.kt b/architecture/src/commonMain/kotlin/observable/Disposable.kt
index 8c60be5fd..b91904817 100644
--- a/architecture/src/commonMain/kotlin/observable/Disposable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Disposable.kt
@@ -52,8 +52,6 @@ interface Disposable {
     fun addTo(disposeBag: DisposeBag)
 }
 
-expect class SimpleDisposable(onDispose: DisposeHandler) : BaseSimpleDisposable
-
 /**
  * Plain [Disposable] to an object that should be disposed in time
  * @param onDispose Function to call when disposing the object
@@ -85,6 +83,12 @@ abstract class BaseSimpleDisposable(onDispose: DisposeHandler) : SynchronizedObj
     }
 }
 
+/**
+ * A [Disposable] that has a [DisposeHandler]
+ * @param onDispose Function to call when disposing the object.
+ */
+expect class SimpleDisposable(onDispose: DisposeHandler) : BaseSimpleDisposable
+
 /**
  * Container for multiple [Disposable]. Allows nested [DisposeBag].
  */
diff --git a/architecture/src/commonMain/kotlin/observable/FlowObservable.kt b/architecture/src/commonMain/kotlin/observable/FlowObservable.kt
new file mode 100644
index 000000000..8d8b9819d
--- /dev/null
+++ b/architecture/src/commonMain/kotlin/observable/FlowObservable.kt
@@ -0,0 +1,135 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.observable
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * A [BaseUninitializedObservable] that observes the state of a [Flow]
+ * @param T the type of value to expect.
+ * @param coroutineScope The [CoroutineScope] on which to observe the [Flow]
+ * @param context The [CoroutineContext] in which to observe the [Flow]
+ * @param flow The [Flow] to observe
+ * @param observation The [ObservationUninitialized] to observe the Flow
+ */
+class FlowObservable<T>(
+    val coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext,
+    val flow: Flow<T>,
+    observation: ObservationUninitialized<T> = ObservationUninitialized()
+) : BaseUninitializedObservable<T>(observation) {
+    init {
+        observeFlow(observation, coroutineScope, context, flow)
+    }
+}
+
+/**
+ * A [BaseInitializedObservable] that observes the state of a [Flow]
+ * @param T the type of value to expect.
+ * @param initialValue The initial value of [T]
+ * @param coroutineScope The [CoroutineScope] on which to observe the [Flow]
+ * @param context The [CoroutineContext] in which to observe the [Flow]
+ * @param flow The [Flow] to observe
+ * @param observation The [ObservationInitialized] to observe the Flow
+ */
+class FlowInitializedObservable<T>(
+    initialValue: T,
+    val coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext,
+    val flow: Flow<T>,
+    observation: ObservationInitialized<T> = ObservationInitialized(initialValue)
+) : BaseInitializedObservable<T>(observation) {
+    init {
+        observeFlow(observation, coroutineScope, context, flow)
+    }
+}
+
+/**
+ * A [BaseDefaultObservable] that observes the state of a [Flow].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param defaultValue The default value of [R] to observe if the [Flow] emits `null`.
+ * @param initialValue The initial value of [T]
+ * @param coroutineScope The [CoroutineScope] on which to observe the [Flow]
+ * @param context The [CoroutineContext] in which to observe the [Flow]
+ * @param flow The [Flow] to observe
+ * @param observation The [ObservationUninitialized] to observe the Flow
+ */
+class DefaultFlowObservable<R : T?, T>(
+    defaultValue: R,
+    initialValue: T? = defaultValue,
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext,
+    flow: Flow<T?>,
+    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue,
+        ObservableOptional.Value(initialValue)
+    ),
+) : BaseDefaultObservable<R, T?>(observation) {
+    init {
+        observeFlow(observation, coroutineScope, context, flow)
+    }
+}
+
+/**
+ * Converts a [Flow] into a [FlowObservable]
+ * @param coroutineScope The [CoroutineScope] on which to observe the [Flow]
+ * @param context The [CoroutineContext] in which to observe the [Flow]
+ */
+fun <T> Flow<T>.toUninitializedObservable(
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext
+) = FlowObservable(coroutineScope, context, this)
+
+/**
+ * Converts a [MutableStateFlow] into a [FlowInitializedObservable]
+ * @param coroutineScope The [CoroutineScope] on which to observe the [Flow]
+ * @param context The [CoroutineContext] in which to observe the [Flow]
+ */
+fun <T> MutableStateFlow<T>.toInitializedObservable(
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext
+) = FlowInitializedObservable(this.value, coroutineScope, context, this)
+
+/**
+ * Converts a [Flow] into a [FlowInitializedObservable]
+ * @param initialValue The initial value to observe until the [Flow] emits.
+ * @param coroutineScope The [CoroutineScope] on which to observe the [Flow]
+ * @param context The [CoroutineContext] in which to observe the [Flow]
+ */
+fun <T> Flow<T>.toInitializedObservable(
+    initialValue: T,
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext
+) = FlowInitializedObservable(initialValue, coroutineScope, context, this)
+
+/**
+ * Converts a [Flow] into a [DefaultFlowObservable]
+ * @param defaultValue The default value to observe if the [Flow] emits `null`.
+ * @param initialValue The initial value to observe until the [Flow] emits.
+ * @param coroutineScope The [CoroutineScope] on which to observe the [Flow]
+ * @param context The [CoroutineContext] in which to observe the [Flow]
+ */
+fun <R : T, T> Flow<T?>.toDefaultObservable(
+    defaultValue: R,
+    initialValue: T? = defaultValue,
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext,
+) = DefaultFlowObservable(defaultValue, initialValue, coroutineScope, context, this)
diff --git a/architecture/src/commonMain/kotlin/observable/FlowSubject.kt b/architecture/src/commonMain/kotlin/observable/FlowSubject.kt
new file mode 100644
index 000000000..b10a7e033
--- /dev/null
+++ b/architecture/src/commonMain/kotlin/observable/FlowSubject.kt
@@ -0,0 +1,280 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.observable
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+import kotlin.coroutines.CoroutineContext
+
+private class MutableFlowSubjectHelper<R : T, T, OO : ObservableOptional<R>>(
+    val coroutineScope: CoroutineScope,
+    val context: CoroutineContext,
+    val flow: () -> Flow<T>,
+    val setter: suspend (T) -> Unit,
+    val poster: (T) -> Unit = { coroutineScope.launch(context) { setter(it) } },
+    observation: Observation<R, T, OO>
+) : SuspendableSetter<T> {
+
+    init {
+        observeFlow(observation, coroutineScope, context, flow())
+    }
+
+    override suspend fun set(newValue: T) = setter(newValue)
+    override fun post(newValue: T) = poster(newValue)
+}
+
+/**
+ * A [BaseInitializedSubject] that matches the state of a [MutableStateFlow].
+ * @param T the type of value to expect.
+ * @property coroutineScope The [CoroutineScope] on which to observe the [MutableStateFlow]
+ * @property context The [CoroutineContext] in which to observe the [MutableStateFlow]
+ * @param observedStateFlow The [MutableStateFlow] to match the state of.
+ * @param autoBind If `true` this will automatically call [bind].
+ * @param observation The [ObservationInitialized] to handle value being observed
+ */
+open class StateFlowInitializedSubject<T>(
+    val coroutineScope: CoroutineScope,
+    val context: CoroutineContext = coroutineScope.coroutineContext,
+    private val observedStateFlow: MutableStateFlow<T>,
+    autoBind: Boolean = true,
+    observation: ObservationInitialized<T> = ObservationInitialized(
+        ObservableOptional.Value(
+            observedStateFlow.value
+        )
+    ),
+) : BaseInitializedSubject<T>(observation),
+    SuspendableSetter<T> by MutableFlowSubjectHelper(
+        coroutineScope,
+        context,
+        { observedStateFlow },
+        { observedStateFlow.value = it },
+        { observedStateFlow.value = it },
+        observation
+    ) {
+    init {
+        if (autoBind) bind(coroutineScope, context)
+    }
+}
+
+/**
+ * A [BaseDefaultSubject] that matches the state of a [MutableStateFlow].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param defaultValue The default [R] to return if the value of the [MutableStateFlow] is `null`.
+ * @property coroutineScope The [CoroutineScope] on which to observe the [MutableStateFlow]
+ * @property context The [CoroutineContext] in which to observe the [MutableStateFlow]
+ * @param observedStateFlow The [MutableStateFlow] to match the state of.
+ * @param autoBind If `true` this will automatically call [bind].
+ * @param observation The [ObservationDefault] to handle value being observed
+ */
+open class StateFlowDefaultSubject<R : T?, T>(
+    defaultValue: R,
+    val coroutineScope: CoroutineScope,
+    val context: CoroutineContext = coroutineScope.coroutineContext,
+    private val observedStateFlow: MutableStateFlow<T?>,
+    autoBind: Boolean = true,
+    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue,
+        ObservableOptional.Value(observedStateFlow.value)
+    ),
+) : BaseDefaultSubject<R, T?>(observation),
+    SuspendableSetter<T?> by MutableFlowSubjectHelper(
+        coroutineScope,
+        context,
+        { observedStateFlow },
+        { observedStateFlow.value = it },
+        { observedStateFlow.value = it },
+        observation
+    ) {
+    init {
+        if (autoBind) bind(coroutineScope, context)
+    }
+}
+
+/**
+ * A [BaseUninitializedSubject] that matches the state of a [MutableSharedFlow].
+ * @param T the type of value to expect.
+ * @param coroutineScope The [CoroutineScope] on which to observe the [MutableSharedFlow]
+ * @param context The [CoroutineContext] in which to observe the [MutableSharedFlow]
+ * @param sharedFlow The [MutableSharedFlow] to match the state of.
+ * @param autoBind If `true` this will automatically call [bind].
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
+open class SharedFlowSubject<T>(
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext,
+    sharedFlow: MutableSharedFlow<T>,
+    autoBind: Boolean = true,
+    observation: ObservationUninitialized<T> = ObservationUninitialized()
+) : BaseUninitializedSubject<T>(
+    observation
+),
+    SuspendableSetter<T> by MutableFlowSubjectHelper(
+        coroutineScope,
+        context,
+        { sharedFlow },
+        { sharedFlow.emit(it) },
+        observation = observation
+    ) {
+    init {
+        if (autoBind) bind(coroutineScope, context)
+    }
+}
+
+/**
+ * A [BaseInitializedSubject] that matches the state of a [MutableSharedFlow].
+ * @param T the type of value to expect.
+ * @param initialValue The initial value of [T]
+ * @param coroutineScope The [CoroutineScope] on which to observe the [MutableSharedFlow]
+ * @param context The [CoroutineContext] in which to observe the [MutableSharedFlow]
+ * @param sharedFlow The [MutableSharedFlow] to match the state of.
+ * @param autoBind If `true` this will automatically call [bind].
+ * @param observation The [ObservationInitialized] to handle value being observed
+ */
+open class SharedFlowInitializedSubject<T>(
+    initialValue: T,
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext,
+    sharedFlow: MutableSharedFlow<T>,
+    autoBind: Boolean = true,
+    observation: ObservationInitialized<T> = ObservationInitialized(initialValue)
+) : BaseInitializedSubject<T>(
+    observation
+),
+    SuspendableSetter<T> by MutableFlowSubjectHelper(
+        coroutineScope,
+        context,
+        { sharedFlow },
+        { sharedFlow.emit(it) },
+        observation = observation
+    ) {
+    init {
+        if (autoBind) bind(coroutineScope, context)
+    }
+}
+
+/**
+ * A [BaseDefaultSubject] that matches the state of a [MutableSharedFlow].
+ * @param T the type of value to expect.
+ * @param defaultValue The default value of [R] to observe if the [MutableSharedFlow] emits `null`.
+ * @param initialValue The initial value of [T]
+ * @param coroutineScope The [CoroutineScope] on which to observe the [MutableSharedFlow]
+ * @param context The [CoroutineContext] in which to observe the [MutableSharedFlow]
+ * @param sharedFlow The [MutableSharedFlow] to match the state of.
+ * @param autoBind If `true` this will automatically call [bind].
+ * @param observation The [ObservationInitialized] to handle value being observed
+ */
+open class SharedFlowDefaultSubject<R : T?, T>(
+    defaultValue: R,
+    initialValue: T? = defaultValue,
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext,
+    sharedFlow: MutableSharedFlow<T?>,
+    autoBind: Boolean = true,
+    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue,
+        ObservableOptional.Value(initialValue)
+    ),
+) : BaseDefaultSubject<R, T?>(
+    observation
+),
+    SuspendableSetter<T?> by MutableFlowSubjectHelper(
+        coroutineScope,
+        context,
+        { sharedFlow },
+        { sharedFlow.emit(it) },
+        observation = observation
+    ) {
+    init {
+        if (autoBind) bind(coroutineScope, context)
+    }
+}
+
+/**
+ * Converts a [MutableSharedFlow] to a [SharedFlowSubject]
+ * @param coroutineScope The [CoroutineScope] on which to observe the [MutableSharedFlow]
+ * @param context The [CoroutineContext] in which to observe the [MutableSharedFlow]
+ */
+fun <T> MutableSharedFlow<T>.toUninitializedSubject(
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext
+) = SharedFlowSubject(
+    coroutineScope,
+    context,
+    this
+)
+
+/**
+ * Converts a [MutableStateFlow] to a [StateFlowInitializedSubject]
+ * @param coroutineScope The [CoroutineScope] on which to observe the [MutableStateFlow]
+ * @param context The [CoroutineContext] in which to observe the [MutableStateFlow]
+ */
+fun <T> MutableStateFlow<T>.toInitializedSubject(
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext
+) = StateFlowInitializedSubject(coroutineScope, context, this)
+
+/**
+ * Converts a [MutableSharedFlow] to a [SharedFlowInitializedSubject]
+ * @param initialValue The initial value to observe until the [MutableSharedFlow] emits.
+ * @param coroutineScope The [CoroutineScope] on which to observe the [MutableSharedFlow]
+ * @param context The [CoroutineContext] in which to observe the [MutableSharedFlow]
+ */
+fun <T> MutableSharedFlow<T>.toInitializedSubject(
+    initialValue: T,
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext
+) = SharedFlowInitializedSubject(
+    initialValue,
+    coroutineScope,
+    context,
+    this
+)
+
+/**
+ * Converts a [MutableStateFlow] to a [StateFlowDefaultSubject]
+ * @param defaultValue The default value of [R] to observe if the [MutableStateFlow] emits `null`.
+ * @param coroutineScope The [CoroutineScope] on which to observe the [MutableStateFlow]
+ * @param context The [CoroutineContext] in which to observe the [MutableStateFlow]
+ */
+fun <R : T, T> MutableStateFlow<T?>.toDefaultSubject(
+    defaultValue: R,
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext
+) = StateFlowDefaultSubject(defaultValue, coroutineScope, context, this)
+
+/**
+ * Converts a [MutableSharedFlow] to a [SharedFlowDefaultSubject]
+ * @param defaultValue The default value of [R] to observe if the [MutableSharedFlow] emits `null`.
+ * @param initialValue The initial value to observe until the [MutableSharedFlow] emits.
+ * @param coroutineScope The [CoroutineScope] on which to observe the [MutableSharedFlow]
+ * @param context The [CoroutineContext] in which to observe the [MutableSharedFlow]
+ */
+fun <R : T?, T> MutableSharedFlow<T?>.toDefaultSubject(
+    defaultValue: R,
+    initialValue: T? = defaultValue,
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext
+) = SharedFlowDefaultSubject(
+    defaultValue,
+    initialValue,
+    coroutineScope,
+    context,
+    this
+)
diff --git a/architecture/src/commonMain/kotlin/observable/Observable.kt b/architecture/src/commonMain/kotlin/observable/Observable.kt
index e0ebc0588..8f30f8c77 100644
--- a/architecture/src/commonMain/kotlin/observable/Observable.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observable.kt
@@ -17,336 +17,42 @@
 
 package com.splendo.kaluga.architecture.observable
 
-import com.splendo.kaluga.architecture.observable.ObservableOptional.Nothing
 import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
-import com.splendo.kaluga.base.KalugaThread
-import com.splendo.kaluga.base.collections.concurrentMutableListOf
-import com.splendo.kaluga.base.isOnMainThread
-import com.splendo.kaluga.base.runBlocking
-import kotlinx.atomicfu.atomic
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import kotlin.coroutines.CoroutineContext
 import kotlin.properties.ReadOnlyProperty
-import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
 /**
- * Casts the value of an [ObservableOptional] to its subtype [R] or returns [defaultValue] if no such casting is possible.
- * @param defaultValue The default [R] to be returned if [ObservableOptional.valueOrNull] is not [R] or `null`.
- * @return The current value [R] if it exists or [defaultValue]
+ * A read-only property that can be observed.
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param OO the type of [ObservableOptional] to store the result in.
  */
-inline fun <reified R : T, T> ObservableOptional<T>.resultValueOrDefault(defaultValue: R): R =
-    try {
-        valueOrNull?.let { it as? R } ?: defaultValue
-    } catch (e: ClassCastException) {
-        defaultValue
-    }
+interface BasicObservable<R : T, T, OO : ObservableOptional<R>> :
+    ReadOnlyProperty<Any?, OO>,
+    Initial<R, T>
 
 /**
- * Casts an [ObservableOptional] to an [ObservableOptional] its subtype [R] or returns [defaultValue] if no such casting is possible.
- * @param defaultValue The default [Value] of [R] to be returned if [ObservableOptional] is not a [Value] of [R] or `null`.
- * @return An [ObservableOptional] containing the current [Value] of [R] if it exists or [defaultValue]
+ * A [BaseObservable] that is [Initialized].
+ * @param T the type of value to expect.
  */
-fun <R : T, T> ObservableOptional<T>.asResult(defaultValue: Value<R>?): ObservableOptional<R> =
-    try {
-        if (this is Value<*> && (this.value != null || defaultValue == null))
-            @Suppress("UNCHECKED_CAST")
-            Value(this.value as R)
-        else
-            defaultValue ?: Nothing()
-    } catch (e: ClassCastException) {
-        defaultValue ?: Nothing()
-    }
+interface InitializedObservable<T> : BasicObservable<T, T, Value<T>>, Initialized<T, T>
 
 /**
- * Result type for an [BaseObservable]. Used to allow for the distinction between `null` and optional values.
- * @param T the type this [ObservableOptional] represents. Can be a nullable.
+ * A [BasicObservable] that is [Uninitialized].
+ * @param T the type of value to expect.
  */
-sealed class ObservableOptional<T> : ReadOnlyProperty<Any?, T?> {
-
-    /**
-     * The value of [T] or `null` if this result is [Nothing].
-     */
-    abstract val valueOrNull: T?
-
-    /**
-     * The [BaseObservable] has a result, this result could be `null`.
-     * @param T the type of the [Value]
-     * @property value the value of this result. Can be `null`.
-     */
-    data class Value<T>(val value: T) : ObservableOptional<T>() {
-
-        override fun getValue(thisRef: Any?, property: KProperty<*>): T = value
-        override fun toString(): String = "Value[$value]"
-        override val valueOrNull: T? = value
-    }
-
-    /**
-     * The Observable does not have a result.
-     * @param T the type of [Value] that corresponds to this empty result.
-     */
-    class Nothing<T> : ObservableOptional<T>() {
-        override fun getValue(thisRef: Any?, property: KProperty<*>): T? {
-            return null
-        }
-
-        override val valueOrNull: T? = null
-        override fun toString(): String = "Nothing"
-
-        override fun equals(other: Any?): Boolean {
-            return other is Nothing<*>
-        }
-
-        override fun hashCode(): Int {
-            return this::class.hashCode()
-        }
-    }
-}
+interface UninitializedObservable<T> :
+    BasicObservable<T, T, ObservableOptional<T>>,
+    Uninitialized<T>
 
 /**
- * An [Observation] that implements [MutableDefaultInitialized]
+ * A [BasicObservable] that is [DefaultInitialized]
  * @param T the type of value to expect.
  * @param R the type of result to expect. Must be a subclass of [T].
  */
-open class ObservationDefault<R : T?, T : Any>(
-    override val defaultValue: Value<R>,
-    override val initialValue: Value<T?>
-) : Observation<R, T?, Value<R>>(initialValue),
-    ReadWriteProperty<Any?, R>,
-    MutableDefaultInitialized<R, T> {
-
-    constructor(
-        defaultValue: R,
-        initialValue: Value<T?>
-    ) : this(Value<R>(defaultValue), initialValue)
-
-    override fun getValue(thisRef: Any?, property: KProperty<*>): R = current
-    override fun setValue(thisRef: Any?, property: KProperty<*>, value: R) {
-        observedValue = Value(value)
-    }
-
-    override val current: R
-        get() = currentObserved.value
-
-    override val stateFlow: MutableStateFlow<R> by lazy {
-        MutableStateFlow(current).also { stateFlow ->
-            this.observeInitialized {
-                stateFlow.value = it
-            }
-        }
-    }
-
-    override val valueDelegate: ReadWriteProperty<Any?, R>
-        get() = this
-
-    override fun observeInitialized(onNext: (R) -> Unit): Disposable {
-        @Suppress("UNCHECKED_CAST")
-        return observe { onNext(it as R) }
-    }
-}
-
-/**
- * An [Observation] that implements [MutableUninitialized]
- */
-class ObservationUninitialized<T> :
-    Observation<T, T, ObservableOptional<T>>(Nothing()),
-    MutableUninitialized<T>,
-    ReadWriteProperty<Any?, T?> {
-
-    override val initialValue: Nothing<T> = Nothing()
-
-    override fun getValue(thisRef: Any?, property: KProperty<*>): T? =
-        currentObserved.valueOrNull
-
-    override fun setValue(thisRef: Any?, property: KProperty<*>, value: T?) {
-        observedValue = value?.let { Value(value) } ?: Nothing()
-    }
-
-    override val stateFlow: MutableStateFlow<T?> by lazy {
-        MutableStateFlow(currentOrNull).also { stateFlow ->
-            observe { stateFlow.value = it }
-        }
-    }
-    override val valueDelegate: ReadWriteProperty<Any?, T?>
-        get() = this
-}
-
-open class ObservationInitialized<T>(
-    override val initialValue: Value<T>
-) : Observation<T, T, Value<T>>(initialValue),
-    ReadWriteProperty<Any?, T>,
-    MutableInitialized<T, T> {
-
-    constructor(initialValue: T) : this(Value(initialValue))
-
-    override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
-        observedValue = Value(value)
-    }
-
-    override fun getValue(thisRef: Any?, property: KProperty<*>): T = current
-    override val current: T
-        get() = currentObserved.value
-
-    override val stateFlow: MutableStateFlow<T> by lazy {
-        MutableStateFlow(current).also { stateFlow ->
-            observeInitialized { stateFlow.value = it }
-        }
-    }
-
-    override fun observeInitialized(onNext: (T) -> Unit): Disposable {
-        @Suppress("UNCHECKED_CAST")
-        return observe { onNext(it as T) }
-    }
-
-    override val valueDelegate: ReadWriteProperty<Any?, T>
-        get() = this
-}
-
-open class Observation<R : T, T, OO : ObservableOptional<R>>(
-    override val initialValue: ObservableOptional<T>
-) : Initial<R, T> {
-
-    // this is not used by iOS
-    internal val observers by lazy { concurrentMutableListOf<(R) -> Unit>() }
-
-    open val defaultValue: Value<R>? = null
-
-    var onFirstObservation: (() -> Unit)? = null
-        set(value) {
-            // if an observation took place before this field was set, invoke immediately
-            if (firstObservation.value) {
-                value?.invoke()
-            } else {
-                field = value
-            }
-        }
-
-    private val firstObservation = atomic(false)
-
-    var beforeObservedValueGet: ((OO) -> ObservableOptional<T>)? = null
-
-    @Suppress("SENSELESS_COMPARISON") // if not initialized this can still happen
-    private var backingInternalValue: ObservableOptional<R>? = null
-        get() =
-            field ?: if (initialValue == null) // "lazy" var
-                throw RuntimeException("Observing before class is initialized. Are you observing from the constructor of your observable?")
-            else
-                initialValue.asResult(defaultValue)
-        set(value) {
-            checkNotNull(value) { "internal value can not be set to null" }
-            field = value
-        }
-
-    /**
-     *  set the value of this Observable from a suspended context.
-     */
-    suspend fun setValue(value: ObservableOptional<T>): ObservableOptional<T> =
-        if (isOnMainThread) {
-            setValueUnconfined(value)
-        } else withContext(Dispatchers.Main) {
-            setValueUnconfined(value)
-        }
-
-    @Suppress("UNUSED_VALUE", "UNCHECKED_CAST") // should always downcast as R extends T
-    /**
-     * Used internally to set the [observedValue]. Make sure you are in [Dispatchers.Main] or the main thread
-     *
-     * @param value the new value that will be observed
-     */
-    private fun setValueUnconfined(value: ObservableOptional<T>): ObservableOptional<T> {
-        val v = value.asResult(defaultValue)
-        val before = backingInternalValue
-
-        if (before != v) {
-            backingInternalValue = v
-
-            val result = (v as? Value<*>)?.value as R
-
-            observers(this@Observation).forEach {
-                it(result)
-            }
-            return v as ObservableOptional<T>
-        }
-        return before as ObservableOptional<T>
-    }
-
-    private fun getValue(): OO {
-        if (firstObservation.compareAndSet(expect = false, update = true)) {
-            onFirstObservation?.invoke()
-        }
-
-        @Suppress("UNCHECKED_CAST")
-        return handleOnMain {
-            backingInternalValue ?: error("unexpected null")
-        } as OO
-    }
-
-    /**
-     * Adds an observing function to the Observable to be notified on each change to the observable.
-     * If there is a current value, there will be an immediate notification
-     *
-     * @param onNext Function to be called each time the value of the Observable changes
-     * @return [Disposable] that removes the observing function when disposed
-     */
-    @Suppress("UNCHECKED_CAST")
-    override fun observe(onNext: (R?) -> Unit): Disposable = handleOnMain {
-        // send the value before adding
-        val lastResult = currentObserved
-        onNext((lastResult as? Value<*>)?.value as R)
-        addObserver(this@Observation, onNext)
-        // adding an observer often happens concurrently with initialization,
-        // if we detect a change in the current observed value we re-send it to the added observer
-        val newResult = currentObserved
-        if (newResult != lastResult)
-            onNext((newResult as? Value<*>)?.value as R)
-        SimpleDisposable {
-            handleOnMain {
-                removeObserver(this@Observation, onNext)
-            }
-        }
-    }
-
-    val currentObserved: OO
-        @Suppress("UNCHECKED_CAST")
-        get() = observedValue as OO
-
-    @Suppress("UNCHECKED_CAST")
-    var observedValue: ObservableOptional<T>
-        // use getter and setter to avoid lazy initialization of observable
-        get() {
-            beforeObservedValueGet?.let { beforeObservedValueGet ->
-                val current = getValue()
-                val new = beforeObservedValueGet(current)
-                return if (new != current) // state not events
-                    handleOnMain {
-                        setValueUnconfined(new)
-                    }
-                else new
-            }
-            return getValue() as ObservableOptional<T>
-        }
-        set(v) {
-            handleOnMain {
-                setValueUnconfined(v)
-            }
-        }
-
-    override val currentOrNull: R?
-        get() = currentObserved.valueOrNull
-
-    private fun <T> handleOnMain(block: () -> T): T = if (KalugaThread.currentThread.isMainThread) {
-        block()
-    } else {
-        runBlocking(Dispatchers.Main) {
-            block()
-        }
-    }
-}
+interface DefaultObservable<R : T?, T> :
+    BasicObservable<R, T?, Value<R>>,
+    DefaultInitialized<R, T?>
 
 /**
  * An observable value.
@@ -358,6 +64,10 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
  * The actual implementation of holding the observed value is done by [Observation].
  *
  * Observable also implements [ReadOnlyProperty] so it can act as a delegate for an [ObservableOptional] val
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param OO the type of [ObservableOptional] to store the result in.
+ * @param observation The [Observation] to handle observing the value.
  */
 abstract class BaseObservable<R : T, T, OO : ObservableOptional<R>>(
     protected open val observation: Observation<R, T, OO>
@@ -368,10 +78,11 @@ abstract class BaseObservable<R : T, T, OO : ObservableOptional<R>>(
     ) : this(Observation(initialValue))
 }
 
-class SimpleInitializedObservable<T>(
-    initialValue: T
-) : BaseInitializedObservable<T>(Value(initialValue))
-
+/**
+ * A [BaseObservable] that implements [InitializedObservable]
+ * @param T the type of value to expect.
+ * @param observation The [ObservationInitialized] to handle observing the value.
+ */
 @Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
 abstract class BaseInitializedObservable<T>(
     observation: ObservationInitialized<T>
@@ -387,272 +98,11 @@ abstract class BaseInitializedObservable<T>(
     ) : this(ObservationInitialized(initialValue))
 }
 
-interface BasicObservable<R : T, T, OO : ObservableOptional<R>> :
-    ReadOnlyProperty<Any?, OO>,
-    Initial<R, T>
-
-interface InitializedObservable<T> : BasicObservable<T, T, Value<T>>, Initialized<T, T>
-
-interface UninitializedObservable<T> :
-    BasicObservable<T, T, ObservableOptional<T>>,
-    Uninitialized<T>
-
-interface BasicSubject<R : T, T, OO : ObservableOptional<R>> :
-    BasicObservable<R, T, OO>,
-    SuspendableSetter<T> {
-    fun bind(coroutineScope: CoroutineScope)
-    fun bind(coroutineScope: CoroutineScope, context: CoroutineContext)
-}
-
-interface UninitializedSubject<T> :
-    BasicSubject<T, T, ObservableOptional<T>>,
-    UninitializedObservable<T>,
-    MutableUninitialized<T>
-
-interface InitializedSubject<T> :
-    BasicSubject<T, T, Value<T>>,
-    InitializedObservable<T>,
-    MutableInitialized<T, T>
-
-interface DefaultObservable<R : T?, T : Any> :
-    BasicObservable<R, T?, Value<R>>,
-    DefaultInitialized<R, T>
-
-interface DefaultSubject<R : T?, T : Any> :
-    BasicSubject<R, T?, Value<R>>,
-    DefaultObservable<R, T>,
-    MutableDefaultInitialized<R, T>
-
-/**
- * Interface indicating an observable has a state of [T]
- * @param T the type of the state.
- */
-expect interface WithState<T> {
-
-    /**
-     * [StateFlow] that expresses the content from the observable.
-     *
-     * This can be initialized lazily.
-     *
-     * Accessing this from property outside the main thread might cause a race condition,
-     * since observing the initial value needed for the stateflow has to happen on the main thread.
-     *
-     */
-    val stateFlow: StateFlow<T>
-
-    /**
-     * A [ReadOnlyProperty] of [T]
-     */
-    val valueDelegate: ReadOnlyProperty<Any?, T>
-}
-
-/**
- * A [WithState] where [stateFlow] is mutable
- */
-interface WithMutableState<T> : WithState<T> {
-
-    /**
-     * [MutableStateFlow] that expresses the content from the observable.
-     *
-     * This can be initialized lazily.
-     *
-     * Accessing this from property outside the main thread might cause a race condition,
-     * since observing the initial value needed for the stateflow has to happen on the main thread.
-     *
-     */
-    override val stateFlow: MutableStateFlow<T>
-
-    /**
-     * A [ReadWriteProperty] of [T]
-     */
-    override val valueDelegate: ReadWriteProperty<Any?, T>
-}
-
 /**
- * A [DefaultInitialized] that implements [WithMutableState]
+ * An abstract class extending [BaseObservable] that implements [UninitializedObservable]
  * @param T the type of value to expect.
- * @param R the type of result to expect. Must be a subclass of [T].
+ * @param observation The [ObservationUninitialized] to handle observing the value.
  */
-interface MutableDefaultInitialized<R : T?, T : Any> : DefaultInitialized<R, T>, WithMutableState<R>
-
-/**
- * An [Initialized] that has a [defaultValue]
- * @param T the type of value to expect.
- * @param R the type of result to expect. Must be a subclass of [T]
- */
-interface DefaultInitialized<R : T?, T : Any> : Initialized<R, T?> {
-    /**
-     * The default [Value] of [R]. Can be used in case [Nothing] is [Initial.initialValue]
-     */
-    val defaultValue: Value<R>
-}
-
-interface MutableUninitialized<T> : Uninitialized<T>, WithMutableState<T?>
-
-/**
- * An [Initial] that has [Nothing] as its [initialValue]
- * @param T the type of value to expect.
- * @param R the type of result to expect. Must be a subclass of [T]
- */
-interface Uninitialized<T> : Initial<T, T>, WithState<T?> {
-    override val initialValue: Nothing<T>
-}
-
-/**
- * An [Initialized] that implements [WithMutableState].
- */
-interface MutableInitialized<R : T, T> : Initialized<R, T>, WithMutableState<R>
-
-/**
- * An [Initial] that has [Value] as its [initialValue]
- * @param T the type of value to expect.
- * @param R the type of result to expect. Must be a subclass of [T]
- */
-interface Initialized<R : T, T> : Initial<R, T>, WithState<R> {
-    override val initialValue: Value<T>
-
-    /**
-     * The current value of [R]
-     */
-    val current: R
-    fun observeInitialized(onNext: (R) -> Unit): Disposable
-}
-
-/**
- * Marks a class that has an initial [ObservableOptional] value, where [T] is the expected input value and [R] is its result.
- * @param T the type of value to expect.
- * @param R the type of result to expect. Must be a subclass of [T]
- */
-interface Initial<R : T, T> {
-    /**
-     * The initial [ObservableOptional] value of [T].
-     */
-    val initialValue: ObservableOptional<T>
-
-    /**
-     * The current value [T] or `null` being observed
-     */
-    val currentOrNull: T?
-
-    /**
-     * Creates an observation that calls [onNext] each time a new value is observed until the resulting [Disposable] is [disposed][Disposable.dispose]
-     */
-    fun observe(onNext: (R?) -> Unit): Disposable
-}
-
-/**
- * A [Postable] that can be set in a suspended manner.
- * @param T the type of value that can be posted.
- */
-interface SuspendableSetter<T> : Postable<T> {
-    /**
-     * Updates the value of this [Postable] in a suspended manner.
-     * @param newValue The new value of the postable
-     */
-    suspend fun set(newValue: T)
-}
-
-/**
- * A Postable can handle values being posted to it.
- * @param T the type of value that can be posted.
- */
-interface Postable<T> {
-    /**
-     * Updates the value of this [Postable]
-     * @param newValue The new value of the postable
-     */
-
-    fun post(newValue: T)
-}
-
-@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE") // we want our delegate to override
-abstract class BaseDefaultObservable<R : T?, T : Any>(
-    override val observation: ObservationDefault<R, T>
-) :
-    BaseObservable<R, T?, Value<R>>(observation),
-    DefaultObservable<R, T>,
-    DefaultInitialized<R, T> by observation {
-    constructor(
-        defaultValue: R,
-        initialValue: Value<T?>
-    ) : this(ObservationDefault<R, T>(Value<R>(defaultValue), initialValue))
-
-    override fun getValue(thisRef: Any?, property: KProperty<*>): Value<R> =
-        observation.currentObserved
-}
-
-/**
- * A Subject is an [BaseObservable] with a value that can be changed using the [post] method from the [Postable] interface
- */
-abstract class AbstractBaseSubject<R : T, T, OO : ObservableOptional<R>>(
-    observation: Observation<R, T, OO>,
-    private val stateFlowToBind: suspend () -> StateFlow<R?>
-) :
-    BaseObservable<R, T, OO>(observation), BasicSubject<R, T, OO> {
-
-    final override fun bind(coroutineScope: CoroutineScope) =
-        bind(coroutineScope, coroutineScope.coroutineContext)
-
-    override fun bind(coroutineScope: CoroutineScope, context: CoroutineContext) {
-        coroutineScope.launch(context) {
-            @Suppress("UNCHECKED_CAST")
-            stateFlowToBind().collect { set(it as T) }
-        }
-    }
-}
-
-expect abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>>(
-    observation: Observation<R, T, OO>,
-    stateFlowToBind: suspend () -> StateFlow<R?>
-) :
-    AbstractBaseSubject<R, T, OO>
-
-@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
-abstract class AbstractBaseInitializedSubject<T>(override val observation: ObservationInitialized<T>) :
-    BaseSubject<T, T, Value<T>>(
-        observation,
-        suspend {
-            // switch context to Main since value observations for observable also happen on that thread
-            withContext(Dispatchers.Main.immediate) {
-                observation.stateFlow
-            }
-        }
-    ),
-    InitializedSubject<T>,
-    MutableInitialized<T, T> by observation {
-
-    constructor(
-        initialValue: Value<T>,
-    ) : this(ObservationInitialized(initialValue))
-
-    override fun getValue(thisRef: Any?, property: KProperty<*>): Value<T> =
-        observation.currentObserved
-}
-
-expect abstract class BaseInitializedSubject<T>(observation: ObservationInitialized<T>) :
-    AbstractBaseInitializedSubject<T> {
-    constructor(
-        initialValue: Value<T>
-    )
-}
-
-@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
-abstract class AbstractBaseUninitializedSubject<T>(
-    override val observation: ObservationUninitialized<T>
-) : BaseSubject<T, T, ObservableOptional<T>>(
-    observation,
-    { observation.stateFlow }
-),
-    UninitializedSubject<T>,
-    MutableUninitialized<T> by observation {
-    override fun getValue(thisRef: Any?, property: KProperty<*>): ObservableOptional<T> =
-        observation.observedValue
-}
-
-expect abstract class BaseUninitializedSubject<T>(
-    observation: ObservationUninitialized<T>
-) : AbstractBaseUninitializedSubject<T>
-
 @Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
 abstract class BaseUninitializedObservable<T>(
     override val observation: ObservationUninitialized<T>
@@ -666,72 +116,46 @@ abstract class BaseUninitializedObservable<T>(
         observation.currentObserved
 }
 
-@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
-class SimpleInitializedSubject<T>(
-    override val observation: ObservationInitialized<T>
-) : BaseInitializedSubject<T>(
-    observation
-) {
-
-    constructor(
-        initialValue: T
-    ) : this(Value(initialValue))
-
-    constructor(
-        initialValue: Value<T>
-    ) : this(ObservationInitialized(initialValue))
-
-    override suspend fun set(newValue: T) {
-        observation.setValue(Value(newValue))
-    }
-
-    override fun post(newValue: T) {
-        observation.observedValue = Value(newValue)
-    }
-}
-
-class SimpleDefaultSubject<R : T?, T : Any>(
-    defaultValue: R,
-    initialValue: T? = defaultValue
+/**
+ * An abstract class extending [BaseObservable] that implements [DefaultObservable]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param observation The [ObservationDefault] to handle observing the value.
+ */
+@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE") // we want our delegate to override
+abstract class BaseDefaultObservable<R : T?, T>(
+    override val observation: ObservationDefault<R, T?>
 ) :
-    BaseDefaultSubject<R, T>(
-        Value(defaultValue),
-        Value(initialValue)
-    ) {
-
-    override fun post(newValue: T?) {
-        observation.observedValue = Value(newValue)
-    }
-
-    override suspend fun set(newValue: T?) {
-        observation.setValue(Value(newValue))
-    }
-}
+    BaseObservable<R, T?, Value<R>>(observation),
+    DefaultObservable<R, T?>,
+    DefaultInitialized<R, T?> by observation {
 
-@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE") // deliberate
-abstract class AbstractBaseDefaultSubject<R : T?, T : Any>(
-    override val observation: ObservationDefault<R, T>
-) : BaseSubject<R, T?, Value<R>>(
-    observation,
-    { observation.stateFlow }
-),
-    DefaultSubject<R, T>,
-    MutableDefaultInitialized<R, T> by observation {
+    /**
+     * Constructor
+     * @param defaultValue The default value of [R] to return if the current value is [ObservableOptional.Nothing] or [ObservableOptional.Value] containing `null`.
+     * @param initialValue A [Value] of [T] to use as the initial value
+     */
     constructor(
-        defaultValue: Value<R>,
+        defaultValue: R,
         initialValue: Value<T?>
-    ) : this(observation = ObservationDefault<R, T>(defaultValue, initialValue))
+    ) : this(ObservationDefault<R, T?>(Value(defaultValue), initialValue))
 
     override fun getValue(thisRef: Any?, property: KProperty<*>): Value<R> =
         observation.currentObserved
 }
 
-expect abstract class BaseDefaultSubject<R : T?, T : Any>(
-    observation: ObservationDefault<R, T>
-) : AbstractBaseDefaultSubject<R, T> {
+/**
+ * A [BaseInitializedObservable] that has a fixed value.
+ * @param T the type of value to expect.
+ * @param value The fixed value of the observable
+ */
+class SimpleInitializedObservable<T>(
+    value: T
+) : BaseInitializedObservable<T>(Value(value))
 
-    constructor(
-        defaultValue: Value<R>,
-        initialValue: Value<T?>
-    )
-}
+/**
+ * Creates a [SimpleInitializedObservable] from a value.
+ * @param T the type of value to expect.
+ * @param value The fixed value to observe.
+ */
+fun <T> observableOf(value: T) = SimpleInitializedObservable(value)
diff --git a/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt b/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt
new file mode 100644
index 000000000..d3ea5b37b
--- /dev/null
+++ b/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt
@@ -0,0 +1,96 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.observable
+
+import com.splendo.kaluga.architecture.observable.ObservableOptional.Nothing
+import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+/**
+ * Casts the value of an [ObservableOptional] to its subtype [R] or returns [defaultValue] if no such casting is possible.
+ * @param defaultValue The default [R] to be returned if [ObservableOptional.valueOrNull] is not [R] or `null`.
+ * @return The current value [R] if it exists or [defaultValue]
+ */
+inline fun <reified R : T, T> ObservableOptional<T>.resultValueOrDefault(defaultValue: R): R =
+    try {
+        valueOrNull?.let { it as? R } ?: defaultValue
+    } catch (e: ClassCastException) {
+        defaultValue
+    }
+
+/**
+ * Casts an [ObservableOptional] to an [ObservableOptional] its subtype [R] or returns [defaultValue] if no such casting is possible.
+ * @param defaultValue The default [Value] of [R] to be returned if [ObservableOptional] is not a [Value] of [R] or `null`.
+ * @return An [ObservableOptional] containing the current [Value] of [R] if it exists or [defaultValue]
+ */
+fun <R : T, T> ObservableOptional<T>.asResult(defaultValue: Value<R>?): ObservableOptional<R> =
+    try {
+        if (this is Value<*> && (this.value != null || defaultValue == null))
+            @Suppress("UNCHECKED_CAST")
+            Value(this.value as R)
+        else
+            defaultValue ?: Nothing()
+    } catch (e: ClassCastException) {
+        defaultValue ?: Nothing()
+    }
+
+/**
+ * Result type for an [BaseObservable]. Used to allow for the distinction between `null` and optional values.
+ * @param T the type this [ObservableOptional] represents. Can be a nullable.
+ */
+sealed class ObservableOptional<T> : ReadOnlyProperty<Any?, T?> {
+
+    /**
+     * The value of [T] or `null` if this result is [Nothing].
+     */
+    abstract val valueOrNull: T?
+
+    /**
+     * The [BaseObservable] has a result, this result could be `null`.
+     * @param T the type of the [Value]
+     * @property value the value of this result. Can be `null`.
+     */
+    data class Value<T>(val value: T) : ObservableOptional<T>() {
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T = value
+        override fun toString(): String = "Value[$value]"
+        override val valueOrNull: T? = value
+    }
+
+    /**
+     * The Observable does not have a result.
+     * @param T the type of [Value] that corresponds to this empty result.
+     */
+    class Nothing<T> : ObservableOptional<T>() {
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T? {
+            return null
+        }
+
+        override val valueOrNull: T? = null
+        override fun toString(): String = "Nothing"
+
+        override fun equals(other: Any?): Boolean {
+            return other is Nothing<*>
+        }
+
+        override fun hashCode(): Int {
+            return this::class.hashCode()
+        }
+    }
+}
diff --git a/architecture/src/commonMain/kotlin/observable/ObservableState.kt b/architecture/src/commonMain/kotlin/observable/ObservableState.kt
new file mode 100644
index 000000000..0c6280ae4
--- /dev/null
+++ b/architecture/src/commonMain/kotlin/observable/ObservableState.kt
@@ -0,0 +1,171 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.observable
+
+import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlin.properties.ReadOnlyProperty
+import kotlin.properties.ReadWriteProperty
+
+/**
+ * Interface indicating an observable has a state of [T]
+ * @param T the type of the state.
+ */
+expect interface WithState<T> {
+
+    /**
+     * [StateFlow] that expresses the content from the observable.
+     *
+     * This can be initialized lazily.
+     *
+     * Accessing this from property outside the main thread might cause a race condition,
+     * since observing the initial value needed for the stateflow has to happen on the main thread.
+     *
+     */
+    val stateFlow: StateFlow<T>
+
+    /**
+     * A [ReadOnlyProperty] of [T]
+     */
+    val valueDelegate: ReadOnlyProperty<Any?, T>
+}
+
+/**
+ * A [WithState] where [stateFlow] is mutable
+ */
+interface WithMutableState<T> : WithState<T> {
+
+    /**
+     * [MutableStateFlow] that expresses the content from the observable.
+     *
+     * This can be initialized lazily.
+     *
+     * Accessing this from property outside the main thread might cause a race condition,
+     * since observing the initial value needed for the stateflow has to happen on the main thread.
+     *
+     */
+    override val stateFlow: MutableStateFlow<T>
+
+    /**
+     * A [ReadWriteProperty] of [T]
+     */
+    override val valueDelegate: ReadWriteProperty<Any?, T>
+}
+
+/**
+ * A [DefaultInitialized] that implements [WithMutableState]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ */
+interface MutableDefaultInitialized<R : T?, T> : DefaultInitialized<R, T?>, WithMutableState<R>
+
+/**
+ * An [Initialized] that has a [defaultValue]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ */
+interface DefaultInitialized<R : T?, T> : Initialized<R, T?> {
+    /**
+     * The default [Value] of [R]. Can be used in case [Nothing] is [Initial.initialValue]
+     */
+    val defaultValue: Value<R>
+}
+
+/**
+ * An [Uninitialized] that implements [WithMutableState]
+ * @param T the type of value to expect.
+ */
+interface MutableUninitialized<T> : Uninitialized<T>, WithMutableState<T?>
+
+/**
+ * An [Initial] that has [Nothing] as its [initialValue]
+ * @param T the type of value to expect.
+ */
+interface Uninitialized<T> : Initial<T, T>, WithState<T?> {
+    override val initialValue: ObservableOptional.Nothing<T>
+}
+
+/**
+ * An [Initialized] that implements [WithMutableState]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ */
+interface MutableInitialized<R : T, T> : Initialized<R, T>, WithMutableState<R>
+
+/**
+ * An [Initial] that has [Value] as its [initialValue]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ */
+interface Initialized<R : T, T> : Initial<R, T>, WithState<R> {
+    override val initialValue: Value<T>
+
+    /**
+     * The current value of [R]
+     */
+    val current: R
+    fun observeInitialized(onNext: (R) -> Unit): Disposable
+}
+
+/**
+ * Marks a class that has an initial [ObservableOptional] value, where [T] is the expected input value and [R] is its result.
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ */
+interface Initial<R : T, T> {
+    /**
+     * The initial [ObservableOptional] value of [T].
+     */
+    val initialValue: ObservableOptional<T>
+
+    /**
+     * The current value [T] or `null` being observed
+     */
+    val currentOrNull: T?
+
+    /**
+     * Creates an observation that calls [onNext] each time a new value is observed until the resulting [Disposable] is [disposed][Disposable.dispose]
+     */
+    fun observe(onNext: (R?) -> Unit): Disposable
+}
+
+/**
+ * A [Postable] that can be set in a suspended manner.
+ * @param T the type of value that can be posted.
+ */
+interface SuspendableSetter<T> : Postable<T> {
+    /**
+     * Updates the value of this [Postable] in a suspended manner.
+     * @param newValue The new value of the postable
+     */
+    suspend fun set(newValue: T)
+}
+
+/**
+ * A Postable can handle values being posted to it.
+ * @param T the type of value that can be posted.
+ */
+interface Postable<T> {
+    /**
+     * Updates the value of this [Postable]
+     * @param newValue The new value of the postable
+     */
+
+    fun post(newValue: T)
+}
diff --git a/architecture/src/commonMain/kotlin/observable/Observables.kt b/architecture/src/commonMain/kotlin/observable/Observables.kt
deleted file mode 100644
index 39298f767..000000000
--- a/architecture/src/commonMain/kotlin/observable/Observables.kt
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-@file:Suppress("DEPRECATION")
-
-package com.splendo.kaluga.architecture.observable
-
-import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.launch
-import kotlin.coroutines.CoroutineContext
-import kotlin.properties.ReadOnlyProperty
-import kotlin.properties.ReadWriteProperty
-
-/**
- * Observes a [Flow] and sets updates value to an [Observation] while it is being observed
- * @param observation The [Observation] to observe the [Flow]
- * @param coroutineScope The [CoroutineScope] on which to observe the [Flow]
- * @param context The [CoroutineContext] in which to observe the [Flow]
- * @param flow The [Flow] to observe.
- */
-fun <R : T, T, OO : ObservableOptional<R>> observeFlow(
-    observation: Observation<R, T, OO>,
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext,
-    flow: Flow<T>
-) {
-
-    observation.onFirstObservation = {
-        coroutineScope.launch(context) {
-            flow.collect {
-                observation.setValue(Value(it))
-            }
-        }
-    }
-}
-
-class DefaultFlowObservable<R : T?, T : Any>(
-    defaultValue: R,
-    initialValue: T? = defaultValue,
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext,
-    flow: Flow<T?>,
-    observation: ObservationDefault<R, T> = ObservationDefault<R, T>(defaultValue, Value<T?>(initialValue)),
-) : BaseDefaultObservable<R, T>(observation) {
-    init {
-        observeFlow(observation, coroutineScope, context, flow)
-    }
-}
-
-class FlowObservable<T>(
-    val coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext,
-    val flow: Flow<T>,
-    observation: ObservationUninitialized<T> = ObservationUninitialized()
-) : BaseUninitializedObservable<T>(observation) {
-    init {
-        observeFlow(observation, coroutineScope, context, flow)
-    }
-}
-
-class FlowInitializedObservable<T>(
-    initialValue: T,
-    val coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext,
-    val flow: Flow<T>,
-    observation: ObservationInitialized<T> = ObservationInitialized(initialValue)
-) : BaseInitializedObservable<T>(observation) {
-    init {
-        observeFlow(observation, coroutineScope, context, flow)
-    }
-}
-
-class MutableFlowSubjectHelper<R : T, T, OO : ObservableOptional<R>>(
-    val coroutineScope: CoroutineScope,
-    val context: CoroutineContext,
-    val flow: () -> Flow<T>,
-    val setter: suspend (T) -> Unit,
-    val poster: (T) -> Unit = { coroutineScope.launch(context) { setter(it) } },
-    observation: Observation<R, T, OO>
-) : SuspendableSetter<T> {
-
-    init {
-        observeFlow(observation, coroutineScope, context, flow())
-    }
-
-    override suspend fun set(newValue: T) = setter(newValue)
-    override fun post(newValue: T) = poster(newValue)
-}
-
-open class StateFlowSubject<T>(
-    val coroutineScope: CoroutineScope,
-    val context: CoroutineContext = coroutineScope.coroutineContext,
-    private val observedStateFlow: MutableStateFlow<T>,
-    autoBind: Boolean = true,
-    observation: ObservationInitialized<T> = ObservationInitialized(Value(observedStateFlow.value)),
-) : BaseInitializedSubject<T>(observation),
-    SuspendableSetter<T> by MutableFlowSubjectHelper(
-        coroutineScope,
-        context,
-        { observedStateFlow },
-        { observedStateFlow.value = it },
-        { observedStateFlow.value = it },
-        observation
-    ) {
-    init {
-        if (autoBind) bind(coroutineScope, context)
-    }
-}
-
-open class StateFlowDefaultSubject<R : T?, T : Any>(
-    defaultValue: R,
-    val coroutineScope: CoroutineScope,
-    val context: CoroutineContext = coroutineScope.coroutineContext,
-    private val observedStateFlow: MutableStateFlow<T?>,
-    autoBind: Boolean = true,
-    observation: ObservationDefault<R, T> = ObservationDefault<R, T>(defaultValue, Value<T?>(observedStateFlow.value)),
-) : BaseDefaultSubject<R, T>(observation),
-    SuspendableSetter<T?> by MutableFlowSubjectHelper(
-        coroutineScope,
-        context,
-        { observedStateFlow },
-        { observedStateFlow.value = it },
-        { observedStateFlow.value = it },
-        observation
-    ) {
-    init {
-        if (autoBind) bind(coroutineScope, context)
-    }
-}
-
-/**
- * [BaseSubject] that synchronizes its value to a [MutableStateFlow]
- * @param observedStateFlow The [MutableStateFlow] to synchronize to
- * @param coroutineScope The [CoroutineScope] on which to observe changes to the [StateFlow]
- */
-open class StateFlowInitializedSubject<T>(
-    val coroutineScope: CoroutineScope,
-    val context: CoroutineContext = coroutineScope.coroutineContext,
-    private val observedStateFlow: MutableStateFlow<T>,
-    autoBind: Boolean = true,
-    observation: ObservationInitialized<T> = ObservationInitialized(Value(observedStateFlow.value)),
-) : BaseInitializedSubject<T>(observation),
-    SuspendableSetter<T> by MutableFlowSubjectHelper(
-        coroutineScope,
-        context,
-        { observedStateFlow },
-        { observedStateFlow.value = it },
-        { observedStateFlow.value = it },
-        observation
-    ) {
-    init {
-        if (autoBind) bind(coroutineScope, context)
-    }
-}
-
-open class SharedFlowDefaultSubject<R : T?, T : Any>(
-    defaultValue: R,
-    initialValue: T? = defaultValue,
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext,
-    sharedFlow: MutableSharedFlow<T?>,
-    autoBind: Boolean = true,
-    observation: ObservationDefault<R, T> = ObservationDefault<R, T>(defaultValue, Value<T?>(initialValue)),
-) : BaseDefaultSubject<R, T>(
-    observation
-),
-    SuspendableSetter<T?> by MutableFlowSubjectHelper(
-        coroutineScope,
-        context,
-        { sharedFlow },
-        { sharedFlow.emit(it) },
-        observation = observation
-    ) {
-    init {
-        if (autoBind) bind(coroutineScope, context)
-    }
-}
-
-open class SharedFlowSubject<T>(
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext,
-    sharedFlow: MutableSharedFlow<T>,
-    autoBind: Boolean = true,
-    observation: ObservationUninitialized<T> = ObservationUninitialized()
-) : BaseUninitializedSubject<T>(
-    observation
-),
-    SuspendableSetter<T> by MutableFlowSubjectHelper(
-        coroutineScope,
-        context,
-        { sharedFlow },
-        { sharedFlow.emit(it) },
-        observation = observation
-    ) {
-    init {
-        if (autoBind) bind(coroutineScope, context)
-    }
-}
-
-open class SharedFlowInitializedSubject<T>(
-    initialValue: T,
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext,
-    sharedFlow: MutableSharedFlow<T>,
-    autoBind: Boolean = true,
-    observation: ObservationInitialized<T> = ObservationInitialized(initialValue)
-) : BaseInitializedSubject<T>(
-    observation
-),
-    SuspendableSetter<T> by MutableFlowSubjectHelper(
-        coroutineScope,
-        context,
-        { sharedFlow },
-        { sharedFlow.emit(it) },
-        observation = observation
-    ) {
-    init {
-        if (autoBind) bind(coroutineScope, context)
-    }
-}
-
-fun <R : T, T> readOnlyPropertyObservableHelper(readOnlyProperty: ReadOnlyProperty<Any?, T>, observation: Observation<R, T, Value<R>>) {
-
-    val readOnlyValue by readOnlyProperty
-
-    observation.beforeObservedValueGet = { current ->
-        @Suppress("UnnecessaryVariable") val new = readOnlyValue // variable actually needed due to delegation
-        if (new != current.valueOrNull)
-            Value(new)
-        else
-            @Suppress("UNCHECKED_CAST")
-            current as ObservableOptional<T>
-    }
-}
-
-class ReadOnlyPropertyDefaultObservable<R : T?, T : Any>(
-    defaultValue: R,
-    readOnlyProperty: ReadOnlyProperty<Any?, T?>,
-    observation: ObservationDefault<R, T> = ObservationDefault<R, T>(
-        defaultValue,
-        Value<T?>(
-            run {
-                val v by readOnlyProperty
-                v
-            }
-        )
-    )
-) :
-    BaseDefaultObservable<R, T> (observation) { // no default is needed, since this is for use with non-optionals
-
-    init {
-        readOnlyPropertyObservableHelper(readOnlyProperty, observation)
-    }
-}
-
-class ReadOnlyPropertyInitializedObservable<T>(
-    readOnlyProperty: ReadOnlyProperty<Any?, T>,
-    observation: ObservationInitialized<T> = ObservationInitialized(
-        Value(
-            run {
-                val v by readOnlyProperty
-                v
-            }
-        )
-    )
-) :
-    BaseInitializedObservable<T> (observation), InitializedObservable<T> {
-
-    init {
-        readOnlyPropertyObservableHelper(readOnlyProperty, observation)
-    }
-}
-
-class ReadWritePropertyObservableHelper<R : T, T>(
-    readWriteProperty: ReadWriteProperty<Any?, T>,
-    private val observation: Observation<R, T, Value<R>>,
-) : SuspendableSetter<T> {
-
-    private var readWriteValue by readWriteProperty
-
-    init {
-        observation.beforeObservedValueGet = { current ->
-            val new = readWriteValue
-            if (new != current.valueOrNull)
-                Value(new)
-            else
-                @Suppress("UNCHECKED_CAST")
-                current as ObservableOptional<T>
-        }
-    }
-
-    override suspend fun set(newValue: T) = post(newValue)
-
-    override fun post(newValue: T) {
-        readWriteValue = newValue
-        observation.observedValue = Value(newValue)
-    }
-}
-
-/**
- * [Initialized] subject that matches its value to a [ReadWriteProperty].
- * While the subject updated the [ReadWriteProperty], changes to the property are not immediately delegated back to the subject.
- * Use a [Flow] based subject if synchronized values are required
- */
-class ReadWritePropertyInitializedSubject<T>(
-    readWriteProperty: ReadWriteProperty<Any?, T>,
-    initialValue: Value<T> = Value(
-        run {
-            val v by readWriteProperty
-            v
-        }
-    ),
-    coroutineScope: CoroutineScope?,
-    context: CoroutineContext? = coroutineScope?.coroutineContext,
-    observation: ObservationInitialized<T> = ObservationInitialized(initialValue)
-) :
-    BaseInitializedSubject<T>(
-        observation
-    ),
-    SuspendableSetter<T> by ReadWritePropertyObservableHelper(readWriteProperty, observation) {
-    init {
-        coroutineScope?.let { bind(it, context ?: coroutineScope.coroutineContext) }
-    }
-}
-
-class ReadWritePropertyDefaultSubject<R : T?, T : Any>(
-    defaultValue: R,
-    readWriteProperty: ReadWriteProperty<Any?, T?>,
-    initialValue: Value<T?> = Value(
-        run {
-            val v by readWriteProperty
-            v
-        }
-    ),
-    coroutineScope: CoroutineScope?,
-    context: CoroutineContext? = coroutineScope?.coroutineContext,
-    observation: ObservationDefault<R, T> = ObservationDefault<R, T>(defaultValue, initialValue)
-) :
-    BaseDefaultSubject<R, T>(
-        observation
-    ),
-    SuspendableSetter<T?> by ReadWritePropertyObservableHelper(readWriteProperty, observation) {
-    init {
-        coroutineScope?.let {
-            bind(coroutineScope, context ?: coroutineScope.coroutineContext)
-        }
-    }
-}
-
-fun <R : T, T : Any> ReadOnlyProperty<Any?, T?>.toDefaultObservable(defaultValue: R) =
-    ReadOnlyPropertyDefaultObservable(defaultValue, this)
-
-fun <T> ReadOnlyProperty<Any?, T>.toInitializedObservable() =
-    ReadOnlyPropertyInitializedObservable(this)
-
-fun <T> ReadWriteProperty<Any?, T>.toInitializedSubject(
-    coroutineScope: CoroutineScope? = null,
-    context: CoroutineContext? = coroutineScope?.coroutineContext
-) =
-    ReadWritePropertyInitializedSubject(this, context = context, coroutineScope = coroutineScope)
-
-fun <R : T, T : Any> ReadWriteProperty<Any?, T?>.toDefaultSubject(
-    defaultValue: R,
-    coroutineScope: CoroutineScope? = null,
-    context: CoroutineContext? = coroutineScope?.coroutineContext
-): ReadWritePropertyDefaultSubject<R, T> =
-    ReadWritePropertyDefaultSubject(
-        defaultValue = defaultValue,
-        readWriteProperty = this,
-        coroutineScope = coroutineScope,
-        context = context,
-    )
-
-fun <T> Flow<T>.toUninitializedObservable(
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext
-) = FlowObservable(coroutineScope, context, this)
-
-fun <T> MutableStateFlow<T>.toInitializedObservable(
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext
-) = FlowInitializedObservable(this.value, coroutineScope, context, this)
-
-fun <T> Flow<T>.toInitializedObservable(
-    initialValue: T,
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext
-) = FlowInitializedObservable(initialValue, coroutineScope, context, this)
-
-fun <R : T, T : Any> Flow<T?>.toDefaultObservable(
-    defaultValue: R,
-    initialValue: T? = defaultValue,
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext,
-) = DefaultFlowObservable(defaultValue, initialValue, coroutineScope, context, this)
-
-fun <R : T, T : Any> MutableStateFlow<T?>.toDefaultSubject(
-    defaultValue: R,
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext
-) = StateFlowDefaultSubject(defaultValue, coroutineScope, context, this)
-
-fun <T> MutableStateFlow<T>.toInitializedSubject(
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext
-) = StateFlowInitializedSubject(coroutineScope, context, this)
-
-fun <T> MutableSharedFlow<T>.toUninitializedSubject(
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext
-) = SharedFlowSubject(
-    coroutineScope,
-    context,
-    this
-)
-
-fun <T> MutableSharedFlow<T>.toInitializedSubject(
-    initialValue: T,
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext
-) = SharedFlowInitializedSubject(
-    initialValue,
-    coroutineScope,
-    context,
-    this
-)
-
-fun <R : T?, T : Any> MutableSharedFlow<T?>.toDefaultSubject(
-    defaultValue: R,
-    initialValue: T? = defaultValue,
-    coroutineScope: CoroutineScope,
-    context: CoroutineContext = coroutineScope.coroutineContext
-) = SharedFlowDefaultSubject<R, T>(
-    defaultValue = defaultValue,
-    initialValue = initialValue,
-    coroutineScope = coroutineScope,
-    context = context,
-    this
-)
-
-fun <T> observableOf(initialValue: T) = SimpleInitializedObservable(initialValue)
-
-fun <T> subjectOf(initialValue: T) = SimpleInitializedSubject(initialValue)
diff --git a/architecture/src/commonMain/kotlin/observable/Observation.kt b/architecture/src/commonMain/kotlin/observable/Observation.kt
new file mode 100644
index 000000000..59295a03c
--- /dev/null
+++ b/architecture/src/commonMain/kotlin/observable/Observation.kt
@@ -0,0 +1,335 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.observable
+
+import com.splendo.kaluga.base.KalugaThread
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
+import com.splendo.kaluga.base.isOnMainThread
+import com.splendo.kaluga.base.runBlocking
+import kotlinx.atomicfu.atomic
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlin.coroutines.CoroutineContext
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+/**
+ * Class that handles observing value changes for a value of a given type
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param OO the type of [ObservableOptional] to store the result in.
+ * @param initialValue The initial value this observation should contain.
+ */
+open class Observation<R : T, T, OO : ObservableOptional<R>>(
+    override val initialValue: ObservableOptional<T>
+) : Initial<R, T> {
+
+    // this is not used by iOS
+    internal val observers by lazy { concurrentMutableListOf<(R) -> Unit>() }
+
+    /**
+     * The default [ObservableOptional.Value] to return if the current value is [ObservableOptional.Nothing] or [ObservableOptional.Value] containing `null`.
+     */
+    open val defaultValue: ObservableOptional.Value<R>? = null
+
+    /**
+     * Action to execute when this observable is observed for the first time.
+     */
+    var onFirstObservation: (() -> Unit)? = null
+        set(value) {
+            // if an observation took place before this field was set, invoke immediately
+            if (firstObservation.value) {
+                value?.invoke()
+            } else {
+                field = value
+            }
+        }
+
+    private val firstObservation = atomic(false)
+
+    /**
+     * Transformation to apply to the latest value when [observedValue] is called.
+     */
+    var beforeObservedValueGet: ((OO) -> ObservableOptional<T>)? = null
+
+    @Suppress("SENSELESS_COMPARISON") // if not initialized this can still happen
+    private var backingInternalValue: ObservableOptional<R>? = null
+        get() =
+            field ?: if (initialValue == null) // "lazy" var
+                throw RuntimeException("Observing before class is initialized. Are you observing from the constructor of your observable?")
+            else
+                initialValue.asResult(defaultValue)
+        set(value) {
+            checkNotNull(value) { "internal value can not be set to null" }
+            field = value
+        }
+
+    /**
+     *  set the value of this Observable from a suspended context.
+     */
+    suspend fun setValue(value: ObservableOptional<T>): ObservableOptional<T> =
+        if (isOnMainThread) {
+            setValueUnconfined(value)
+        } else withContext(Dispatchers.Main) {
+            setValueUnconfined(value)
+        }
+
+    @Suppress("UNCHECKED_CAST") // should always downcast as R extends T
+    /**
+     * Used internally to set the [observedValue]. Make sure you are in [Dispatchers.Main] or the main thread
+     *
+     * @param value the new value that will be observed
+     */
+    private fun setValueUnconfined(value: ObservableOptional<T>): ObservableOptional<T> {
+        val v = value.asResult(defaultValue)
+        val before = backingInternalValue
+
+        if (before != v) {
+            backingInternalValue = v
+
+            val result = (v as? ObservableOptional.Value<*>)?.value as R
+
+            observers(this@Observation).forEach {
+                it(result)
+            }
+            return v as ObservableOptional<T>
+        }
+        return before as ObservableOptional<T>
+    }
+
+    private fun getValue(): OO {
+        if (firstObservation.compareAndSet(expect = false, update = true)) {
+            onFirstObservation?.invoke()
+        }
+
+        @Suppress("UNCHECKED_CAST")
+        return handleOnMain {
+            backingInternalValue ?: error("unexpected null")
+        } as OO
+    }
+
+    /**
+     * Adds an observing function to the Observable to be notified on each change to the observable.
+     * If there is a current value, there will be an immediate notification
+     *
+     * @param onNext Function to be called each time the value of the Observable changes
+     * @return [Disposable] that removes the observing function when disposed
+     */
+    @Suppress("UNCHECKED_CAST")
+    override fun observe(onNext: (R?) -> Unit): Disposable = handleOnMain {
+        // send the value before adding
+        val lastResult = currentObserved
+        onNext((lastResult as? ObservableOptional.Value<*>)?.value as R)
+        addObserver(this@Observation, onNext)
+        // adding an observer often happens concurrently with initialization,
+        // if we detect a change in the current observed value we re-send it to the added observer
+        val newResult = currentObserved
+        if (newResult != lastResult)
+            onNext((newResult as? ObservableOptional.Value<*>)?.value as R)
+        SimpleDisposable {
+            handleOnMain {
+                removeObserver(this@Observation, onNext)
+            }
+        }
+    }
+
+    /**
+     * The currently observed [OO]
+     */
+    val currentObserved: OO
+        @Suppress("UNCHECKED_CAST")
+        get() = observedValue as OO
+
+    /**
+     * The [ObservableOptional] or [T] that is currently being observed.
+     */
+    @Suppress("UNCHECKED_CAST")
+    var observedValue: ObservableOptional<T>
+        // use getter and setter to avoid lazy initialization of observable
+        get() {
+            beforeObservedValueGet?.let { beforeObservedValueGet ->
+                val current = getValue()
+                val new = beforeObservedValueGet(current)
+                return if (new != current) // state not events
+                    handleOnMain {
+                        setValueUnconfined(new)
+                    }
+                else new
+            }
+            return getValue() as ObservableOptional<T>
+        }
+        set(v) {
+            handleOnMain {
+                setValueUnconfined(v)
+            }
+        }
+
+    override val currentOrNull: R?
+        get() = currentObserved.valueOrNull
+
+    private fun <T> handleOnMain(block: () -> T): T = if (KalugaThread.currentThread.isMainThread) {
+        block()
+    } else {
+        runBlocking(Dispatchers.Main) {
+            block()
+        }
+    }
+}
+
+/**
+ * An [Observation] that implements [MutableInitialized]
+ * @param T the type of value to expect.
+ * @param initialValue The initial [ObservableOptional.Value] this observation should contain.
+ */
+open class ObservationInitialized<T>(
+    override val initialValue: ObservableOptional.Value<T>
+) : Observation<T, T, ObservableOptional.Value<T>>(initialValue),
+    ReadWriteProperty<Any?, T>,
+    MutableInitialized<T, T> {
+
+    /**
+     * Constructor
+     * @param initialValue The initial [T] this observation should contain.
+     */
+    constructor(initialValue: T) : this(ObservableOptional.Value(initialValue))
+
+    override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
+        observedValue = ObservableOptional.Value(value)
+    }
+
+    override fun getValue(thisRef: Any?, property: KProperty<*>): T = current
+    override val current: T
+        get() = currentObserved.value
+
+    override val stateFlow: MutableStateFlow<T> by lazy {
+        MutableStateFlow(current).also { stateFlow ->
+            observeInitialized { stateFlow.value = it }
+        }
+    }
+
+    override fun observeInitialized(onNext: (T) -> Unit): Disposable {
+        @Suppress("UNCHECKED_CAST")
+        return observe { onNext(it as T) }
+    }
+
+    override val valueDelegate: ReadWriteProperty<Any?, T>
+        get() = this
+}
+
+/**
+ * An [Observation] that implements [MutableUninitialized]
+ * @param T the type of value to expect.
+ */
+class ObservationUninitialized<T> :
+    Observation<T, T, ObservableOptional<T>>(ObservableOptional.Nothing()),
+    MutableUninitialized<T>,
+    ReadWriteProperty<Any?, T?> {
+
+    override val initialValue: ObservableOptional.Nothing<T> = ObservableOptional.Nothing()
+
+    override fun getValue(thisRef: Any?, property: KProperty<*>): T? =
+        currentObserved.valueOrNull
+
+    override fun setValue(thisRef: Any?, property: KProperty<*>, value: T?) {
+        observedValue = value?.let { ObservableOptional.Value(value) } ?: ObservableOptional.Nothing()
+    }
+
+    override val stateFlow: MutableStateFlow<T?> by lazy {
+        MutableStateFlow(currentOrNull).also { stateFlow ->
+            observe { stateFlow.value = it }
+        }
+    }
+    override val valueDelegate: ReadWriteProperty<Any?, T?>
+        get() = this
+}
+
+/**
+ * An [Observation] that implements [MutableDefaultInitialized]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param defaultValue The default [ObservableOptional.Value] to return if the current value is [ObservableOptional.Nothing] or [ObservableOptional.Value] containing `null`.
+ * @param initialValue The initial [ObservableOptional.Value] this observation should contain.
+ */
+open class ObservationDefault<R : T?, T>(
+    override val defaultValue: ObservableOptional.Value<R>,
+    override val initialValue: ObservableOptional.Value<T?>
+) : Observation<R, T?, ObservableOptional.Value<R>>(initialValue),
+    ReadWriteProperty<Any?, R>,
+    MutableDefaultInitialized<R, T?> {
+
+    /**
+     * Constructor
+     * @param defaultValue The default [R] to return if the current value is [ObservableOptional.Nothing] or [ObservableOptional.Value] containing `null`.
+     * @param initialValue The initial [ObservableOptional.Value] this observation should contain.
+     */
+    constructor(
+        defaultValue: R,
+        initialValue: ObservableOptional.Value<T?>
+    ) : this(ObservableOptional.Value<R>(defaultValue), initialValue)
+
+    override fun getValue(thisRef: Any?, property: KProperty<*>): R = current
+    override fun setValue(thisRef: Any?, property: KProperty<*>, value: R) {
+        observedValue = ObservableOptional.Value(value)
+    }
+
+    override val current: R
+        get() = currentObserved.value
+
+    override val stateFlow: MutableStateFlow<R> by lazy {
+        MutableStateFlow(current).also { stateFlow ->
+            this.observeInitialized {
+                stateFlow.value = it
+            }
+        }
+    }
+
+    override val valueDelegate: ReadWriteProperty<Any?, R>
+        get() = this
+
+    override fun observeInitialized(onNext: (R) -> Unit): Disposable {
+        @Suppress("UNCHECKED_CAST")
+        return observe { onNext(it as R) }
+    }
+}
+
+/**
+ * Observes a [Flow] and sets updates value to an [Observation] while it is being observed
+ * @param observation The [Observation] to observe the [Flow]
+ * @param coroutineScope The [CoroutineScope] on which to observe the [Flow]
+ * @param context The [CoroutineContext] in which to observe the [Flow]
+ * @param flow The [Flow] to observe.
+ */
+fun <R : T, T, OO : ObservableOptional<R>> observeFlow(
+    observation: Observation<R, T, OO>,
+    coroutineScope: CoroutineScope,
+    context: CoroutineContext = coroutineScope.coroutineContext,
+    flow: Flow<T>
+) {
+
+    observation.onFirstObservation = {
+        coroutineScope.launch(context) {
+            flow.collect {
+                observation.setValue(ObservableOptional.Value(it))
+            }
+        }
+    }
+}
diff --git a/architecture/src/commonMain/kotlin/observable/ReadOnlyPropertyObservable.kt b/architecture/src/commonMain/kotlin/observable/ReadOnlyPropertyObservable.kt
new file mode 100644
index 000000000..4a1e8f355
--- /dev/null
+++ b/architecture/src/commonMain/kotlin/observable/ReadOnlyPropertyObservable.kt
@@ -0,0 +1,104 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.observable
+
+import kotlinx.coroutines.flow.Flow
+import kotlin.properties.ReadOnlyProperty
+
+private fun <R : T, T> readOnlyPropertyObservableHelper(readOnlyProperty: ReadOnlyProperty<Any?, T>, observation: Observation<R, T, ObservableOptional.Value<R>>) {
+
+    val readOnlyValue by readOnlyProperty
+
+    observation.beforeObservedValueGet = { current ->
+        @Suppress("UnnecessaryVariable") val new = readOnlyValue // variable actually needed due to delegation
+        if (new != current.valueOrNull)
+            ObservableOptional.Value(new)
+        else
+            @Suppress("UNCHECKED_CAST")
+            current as ObservableOptional<T>
+    }
+}
+
+/**
+ * A [BaseInitializedObservable] that matches its value to a [ReadOnlyProperty].
+ * When the [ReadOnlyProperty] updates, changes to the property are not immediately delegated back to the observable.
+ * Use a [Flow] based observable if synchronized values are required.
+ * @param T the type of value to expect.
+ * @param readOnlyProperty The [ReadOnlyProperty] to track.
+ * @param observation The [ObservationInitialized] to handle observation.
+ */
+class ReadOnlyPropertyInitializedObservable<T>(
+    readOnlyProperty: ReadOnlyProperty<Any?, T>,
+    observation: ObservationInitialized<T> = ObservationInitialized(
+        ObservableOptional.Value(
+            run {
+                val v by readOnlyProperty
+                v
+            }
+        )
+    )
+) :
+    BaseInitializedObservable<T>(observation), InitializedObservable<T> {
+
+    init {
+        readOnlyPropertyObservableHelper(readOnlyProperty, observation)
+    }
+}
+
+/**
+ * A [BaseDefaultObservable] that matches its value to a [ReadOnlyProperty].
+ * When the [ReadOnlyProperty] updates, changes to the property are not immediately delegated back to the observable.
+ * Use a [Flow] based observable if synchronized values are required
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param defaultValue The default [R] to return if the value of the [ReadOnlyProperty] is `null`.
+ * @param readOnlyProperty The [ReadOnlyProperty] to track.
+ * @param observation The [ObservationInitialized] to handle observation.
+ */
+class ReadOnlyPropertyDefaultObservable<R : T?, T>(
+    defaultValue: R,
+    readOnlyProperty: ReadOnlyProperty<Any?, T>,
+    observation: ObservationDefault<R, T?> = ObservationDefault(
+        defaultValue,
+        ObservableOptional.Value(
+            run {
+                val v by readOnlyProperty
+                v
+            }
+        )
+    )
+) :
+    BaseDefaultObservable<R, T>(observation) { // no default is needed, since this is for use with non-optionals
+
+    init {
+        readOnlyPropertyObservableHelper(readOnlyProperty, observation)
+    }
+}
+
+/**
+ * Converts a [ReadOnlyProperty] into a [ReadOnlyPropertyInitializedObservable]
+ */
+fun <T> ReadOnlyProperty<Any?, T>.toInitializedObservable() =
+    ReadOnlyPropertyInitializedObservable(this)
+
+/**
+ * Converts a [ReadOnlyProperty] into a [ReadOnlyPropertyDefaultObservable]
+ * @param defaultValue The default value of [R] to observe if the [ReadOnlyProperty] has a value of `null`.
+ */
+fun <R : T, T> ReadOnlyProperty<Any?, T?>.toDefaultObservable(defaultValue: R) =
+    ReadOnlyPropertyDefaultObservable(defaultValue, this)
diff --git a/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt b/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt
new file mode 100644
index 000000000..78811428c
--- /dev/null
+++ b/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt
@@ -0,0 +1,152 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+@file:Suppress("DEPRECATION")
+
+package com.splendo.kaluga.architecture.observable
+
+import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlin.coroutines.CoroutineContext
+import kotlin.properties.ReadOnlyProperty
+import kotlin.properties.ReadWriteProperty
+
+private class ReadWritePropertyObservableHelper<R : T, T>(
+    readWriteProperty: ReadWriteProperty<Any?, T>,
+    private val observation: Observation<R, T, Value<R>>,
+) : SuspendableSetter<T> {
+
+    private var readWriteValue by readWriteProperty
+
+    init {
+        observation.beforeObservedValueGet = { current ->
+            val new = readWriteValue
+            if (new != current.valueOrNull)
+                Value(new)
+            else
+                @Suppress("UNCHECKED_CAST")
+                current as ObservableOptional<T>
+        }
+    }
+
+    override suspend fun set(newValue: T) = post(newValue)
+
+    override fun post(newValue: T) {
+        readWriteValue = newValue
+        observation.observedValue = Value(newValue)
+    }
+}
+
+/**
+ * A [BaseInitializedSubject] that matches its value to a [ReadWriteProperty].
+ * When the [ReadWriteProperty] updates, changes to the property are not immediately delegated back to the subject.
+ * Use a [Flow] based subject if synchronized values are required
+ * @param T the type of value to expect.
+ * @param readWriteProperty The [ReadWriteProperty] to track.
+ * @param initialValue The initial value of [T]. Defaults to the current value of the [ReadWriteProperty].
+ * @property coroutineScope The [CoroutineScope] on which to emit changes to the [ReadWriteProperty]
+ * @property context The [CoroutineContext] in which to emit changes to the [ReadWriteProperty]
+ * @param observation The [ObservationInitialized] to handle observation.
+ */
+class ReadWritePropertyInitializedSubject<T>(
+    readWriteProperty: ReadWriteProperty<Any?, T>,
+    initialValue: Value<T> = Value(
+        run {
+            val v by readWriteProperty
+            v
+        }
+    ),
+    coroutineScope: CoroutineScope?,
+    context: CoroutineContext? = coroutineScope?.coroutineContext,
+    observation: ObservationInitialized<T> = ObservationInitialized(initialValue)
+) :
+    BaseInitializedSubject<T>(
+        observation
+    ),
+    SuspendableSetter<T> by ReadWritePropertyObservableHelper(readWriteProperty, observation) {
+    init {
+        coroutineScope?.let { bind(it, context ?: coroutineScope.coroutineContext) }
+    }
+}
+
+/**
+ * A [BaseDefaultSubject] that matches its value to a [ReadWriteProperty].
+ * When the [ReadWriteProperty] updates, changes to the property are not immediately delegated back to the subject.
+ * Use a [Flow] based subject if synchronized values are required
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param defaultValue The default [R] to return if the value of the [ReadWriteProperty] is `null`.
+ * @param readWriteProperty The [ReadWriteProperty] to track.
+ * @param initialValue The initial value of [T]. Defaults to the current value of the [ReadWriteProperty].
+ * @param coroutineScope The [CoroutineScope] on which to emit changes to the [ReadWriteProperty]
+ * @param context The [CoroutineContext] in which to emit changes to the [ReadWriteProperty]
+ * @param observation The [ObservationInitialized] to handle observation.
+ */
+class ReadWritePropertyDefaultSubject<R : T?, T>(
+    defaultValue: R,
+    readWriteProperty: ReadWriteProperty<Any?, T?>,
+    initialValue: Value<T?> = Value(
+        run {
+            val v by readWriteProperty
+            v
+        }
+    ),
+    coroutineScope: CoroutineScope?,
+    context: CoroutineContext? = coroutineScope?.coroutineContext,
+    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue, initialValue)
+) :
+    BaseDefaultSubject<R, T>(
+        observation
+    ),
+    SuspendableSetter<T?> by ReadWritePropertyObservableHelper(readWriteProperty, observation) {
+    init {
+        coroutineScope?.let {
+            bind(coroutineScope, context ?: coroutineScope.coroutineContext)
+        }
+    }
+}
+
+/**
+ * Converts a [ReadWriteProperty] to a [ReadWritePropertyInitializedSubject]
+ * @param coroutineScope The [CoroutineScope] on which to emit changes to the [ReadWriteProperty]
+ * @param context The [CoroutineContext] in which to emit changes to the [ReadWriteProperty]
+ */
+fun <T> ReadWriteProperty<Any?, T>.toInitializedSubject(
+    coroutineScope: CoroutineScope? = null,
+    context: CoroutineContext? = coroutineScope?.coroutineContext
+) =
+    ReadWritePropertyInitializedSubject(this, context = context, coroutineScope = coroutineScope)
+
+/**
+ * Converts a [ReadWriteProperty] to a [ReadWritePropertyDefaultSubject]
+ * @param defaultValue The default value of [R] to observe if the [ReadWriteProperty] has a value of `null`.
+ * @param coroutineScope The [CoroutineScope] on which to emit changes to the [ReadWriteProperty]
+ * @param context The [CoroutineContext] in which to emit changes to the [ReadWriteProperty]
+ */
+fun <R : T, T> ReadWriteProperty<Any?, T?>.toDefaultSubject(
+    defaultValue: R,
+    coroutineScope: CoroutineScope? = null,
+    context: CoroutineContext? = coroutineScope?.coroutineContext
+): ReadWritePropertyDefaultSubject<R, T?> =
+    ReadWritePropertyDefaultSubject(
+        defaultValue = defaultValue,
+        readWriteProperty = this,
+        coroutineScope = coroutineScope,
+        context = context,
+    )
diff --git a/architecture/src/commonMain/kotlin/observable/Subject.kt b/architecture/src/commonMain/kotlin/observable/Subject.kt
new file mode 100644
index 000000000..98cb8c4af
--- /dev/null
+++ b/architecture/src/commonMain/kotlin/observable/Subject.kt
@@ -0,0 +1,305 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.observable
+
+import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlin.coroutines.CoroutineContext
+import kotlin.reflect.KProperty
+
+/**
+ * A read-write property that can be observed.
+ * The value that can be changed using the [post] method from the [Postable] interface
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param OO the type of [ObservableOptional] to store the result in.
+ */
+interface BasicSubject<R : T, T, OO : ObservableOptional<R>> :
+    BasicObservable<R, T, OO>,
+    SuspendableSetter<T> {
+
+    /**
+     * Bind changes in value to a [CoroutineScope] in a [CoroutineContext]
+     * @param coroutineScope The [CoroutineScope] to bind to.
+     * @param context The [CoroutineContext] to bind to.
+     */
+    fun bind(coroutineScope: CoroutineScope, context: CoroutineContext)
+}
+
+/**
+ * Convenience method for [BasicSubject] that calls [BasicSubject.bind] using the [CoroutineContext] of the provided [CoroutineScope]
+ * @param coroutineScope The [CoroutineScope] to bind to.
+ */
+fun <R :  T, T, OO : ObservableOptional<R>> BasicSubject<R, T, OO>.bind(coroutineScope: CoroutineScope) = bind(coroutineScope, coroutineScope.coroutineContext)
+
+/**
+ * A [BasicSubject] that is [Initialized]
+ * @param T the type of value to expect.
+ */
+interface InitializedSubject<T> :
+    BasicSubject<T, T, Value<T>>,
+    InitializedObservable<T>,
+    MutableInitialized<T, T>
+
+/**
+ * A [BasicSubject] that is [Uninitialized]
+ * @param T the type of value to expect.
+ */
+interface UninitializedSubject<T> :
+    BasicSubject<T, T, ObservableOptional<T>>,
+    UninitializedObservable<T>,
+    MutableUninitialized<T>
+
+/**
+ * A [BasicSubject] that is [DefaultInitialized]
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ */
+interface DefaultSubject<R : T?, T> :
+    BasicSubject<R, T?, Value<R>>,
+    DefaultObservable<R, T>,
+    MutableDefaultInitialized<R, T?>
+
+/**
+ * An abstract class extending [BaseObservable] that is a [BasicSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param OO the type of [ObservableOptional] to store the result in.
+ * @param observation The [Observation] to handle observing the value.
+ * @param stateFlowToBind A function to get the [StateFlow] that will automatically call [SuspendableSetter.set] when a new value is posted after [BasicSubject.post] has been called.
+ */
+abstract class AbstractBaseSubject<R : T, T, OO : ObservableOptional<R>>(
+    observation: Observation<R, T, OO>,
+    private val stateFlowToBind: suspend () -> StateFlow<R?>
+) :
+    BaseObservable<R, T, OO>(observation), BasicSubject<R, T, OO> {
+
+    override fun bind(coroutineScope: CoroutineScope, context: CoroutineContext) {
+        coroutineScope.launch(context) {
+            @Suppress("UNCHECKED_CAST")
+            stateFlowToBind().collect { set(it as T) }
+        }
+    }
+}
+
+/**
+ * An abstract class that extends [AbstractBaseSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param OO the type of [ObservableOptional] to store the result in.
+ * @param observation The [Observation] to handle observing the value.
+ * @param stateFlowToBind A function to get the [StateFlow] that will automatically call [SuspendableSetter.set] when a new value is posted after [BasicSubject.post] has been called.
+ */
+expect abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>>(
+    observation: Observation<R, T, OO>,
+    stateFlowToBind: suspend () -> StateFlow<R?>
+) :
+    AbstractBaseSubject<R, T, OO>
+
+/**
+ * An abstract class extending [BaseSubject] that implements [InitializedSubject].
+ * @param T the type of value to expect.
+ * @param observation The [ObservationInitialized] to handle value being observed
+ */
+@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
+abstract class AbstractBaseInitializedSubject<T>(override val observation: ObservationInitialized<T>) :
+    BaseSubject<T, T, Value<T>>(
+        observation,
+        suspend {
+            // switch context to Main since value observations for observable also happen on that thread
+            withContext(Dispatchers.Main.immediate) {
+                observation.stateFlow
+            }
+        }
+    ),
+    InitializedSubject<T>,
+    MutableInitialized<T, T> by observation {
+
+    /**
+     * Constructor using an inital value.
+     * @param initialValue The [Value] to use as the initial value.
+     */
+    constructor(
+        initialValue: Value<T>,
+    ) : this(ObservationInitialized(initialValue))
+
+    override fun getValue(thisRef: Any?, property: KProperty<*>): Value<T> =
+        observation.currentObserved
+}
+
+/**
+ * Abstract class implementing [AbstractBaseInitializedSubject]
+ * @param T the type of value to expect.
+ * @param observation The [ObservationInitialized] to handle value being observed
+ */
+expect abstract class BaseInitializedSubject<T>(observation: ObservationInitialized<T>) :
+    AbstractBaseInitializedSubject<T> {
+
+    /**
+     * Constructor using an inital value.
+     * @param initialValue The [Value] to use as the initial value.
+     */
+    constructor(
+        initialValue: Value<T>
+    )
+}
+
+/**
+ * An abstract class extending [BaseSubject] that implements [UninitializedSubject].
+ * @param T the type of value to expect.
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
+@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
+abstract class AbstractBaseUninitializedSubject<T>(
+    override val observation: ObservationUninitialized<T>
+) : BaseSubject<T, T, ObservableOptional<T>>(
+    observation,
+    { observation.stateFlow }
+),
+    UninitializedSubject<T>,
+    MutableUninitialized<T> by observation {
+    override fun getValue(thisRef: Any?, property: KProperty<*>): ObservableOptional<T> =
+        observation.observedValue
+}
+
+/**
+ * An abstract class extending [AbstractBaseUninitializedSubject].
+ * @param T the type of value to expect.
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
+expect abstract class BaseUninitializedSubject<T>(
+    observation: ObservationUninitialized<T>
+) : AbstractBaseUninitializedSubject<T>
+
+/**
+ * An abstract class extending [BaseSubject] that implements [DefaultSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param observation The [ObservationDefault] to handle value being observed
+ */
+@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE") // deliberate
+abstract class AbstractBaseDefaultSubject<R : T?, T>(
+    override val observation: ObservationDefault<R, T?>
+) : BaseSubject<R, T?, Value<R>>(
+    observation,
+    { observation.stateFlow }
+),
+    DefaultSubject<R, T>,
+    MutableDefaultInitialized<R, T?> by observation {
+    constructor(
+        defaultValue: Value<R>,
+        initialValue: Value<T?>
+    ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
+
+    override fun getValue(thisRef: Any?, property: KProperty<*>): Value<R> =
+        observation.currentObserved
+}
+
+/**
+ * An abstract class extending [AbstractBaseDefaultSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
+expect abstract class BaseDefaultSubject<R : T?, T>(
+    observation: ObservationDefault<R, T?>
+) : AbstractBaseDefaultSubject<R, T> {
+
+    /**
+     * Constructor
+     * @param defaultValue The default [Value] of [R] to return if the current value is [ObservableOptional.Nothing] or [ObservableOptional.Value] containing `null`.
+     * @param initialValue The initial [Value] of [T].
+     */
+    constructor(
+        defaultValue: Value<R>,
+        initialValue: Value<T?>
+    )
+}
+
+/**
+ * A [BaseInitializedSubject] that initialized to a given value.
+ * @param T the type of value to expect.
+ * @param observation The [ObservationInitialized] to handle observation.
+ */
+@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
+class SimpleInitializedSubject<T>(
+    override val observation: ObservationInitialized<T>
+) : BaseInitializedSubject<T>(
+    observation
+) {
+
+    /**
+     * Constructor
+     * @param initialValue The initial value of [T]
+     */
+    constructor(
+        initialValue: T
+    ) : this(Value(initialValue))
+
+    /**
+     * Constructor
+     * @param initialValue The initial [Value] of [T]
+     */
+    constructor(
+        initialValue: Value<T>
+    ) : this(ObservationInitialized(initialValue))
+
+    override suspend fun set(newValue: T) {
+        observation.setValue(Value(newValue))
+    }
+
+    override fun post(newValue: T) {
+        observation.observedValue = Value(newValue)
+    }
+}
+
+/**
+ * A [BaseDefaultSubject] that initialized to a given value.
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param defaultValue The default [R] to return if the current value is [ObservableOptional.Nothing] or [ObservableOptional.Value] containing `null`.
+ * @param initialValue The initial value of [T].
+ */
+class SimpleDefaultSubject<R : T?, T>(
+    defaultValue: R,
+    initialValue: T? = defaultValue
+) :
+    BaseDefaultSubject<R, T?>(
+        Value(defaultValue),
+        Value(initialValue)
+    ) {
+
+    override fun post(newValue: T?) {
+        observation.observedValue = Value(newValue)
+    }
+
+    override suspend fun set(newValue: T?) {
+        observation.setValue(Value(newValue))
+    }
+}
+
+/**
+ * Creates a [SimpleInitializedSubject] with an initial value
+ * @param T the type of value to expect.
+ * @param initialValue The initial value of [T].
+ */
+fun <T> subjectOf(initialValue: T) = SimpleInitializedSubject(initialValue)
diff --git a/architecture/src/iosMain/kotlin/lifecycle/LifecycleSubscribable.kt b/architecture/src/iosMain/kotlin/lifecycle/LifecycleSubscribable.kt
index 31ac008c5..6a7e1d632 100644
--- a/architecture/src/iosMain/kotlin/lifecycle/LifecycleSubscribable.kt
+++ b/architecture/src/iosMain/kotlin/lifecycle/LifecycleSubscribable.kt
@@ -17,4 +17,10 @@
 
 package com.splendo.kaluga.architecture.lifecycle
 
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+
+/**
+ * This interface can be provided to a [BaseLifecycleViewModel] to bind to platform specific lifecycle.
+ * Extend this on classes that need to have some setup during lifecycle events.
+ */
 actual interface LifecycleSubscribable
diff --git a/architecture/src/iosMain/kotlin/navigation/Navigator.kt b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
index be8f53f40..0e92c2928 100644
--- a/architecture/src/iosMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/iosMain/kotlin/navigation/Navigator.kt
@@ -60,12 +60,16 @@ import platform.UIKit.willMoveToParentViewController
 import platform.darwin.NSObject
 import kotlin.native.ref.WeakReference
 
-actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
-    actual fun navigate(action: A)
+/**
+ * Class that can trigger a given [NavigationAction]
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ */
+actual interface Navigator<Action : NavigationAction<*>> : LifecycleSubscribable {
+    actual fun navigate(action: Action)
 }
 
-class DefaultNavigator<A : NavigationAction<*>>(val onAction: (A) -> Unit) : Navigator<A> {
-    override fun navigate(action: A) {
+class DefaultNavigator<Action : NavigationAction<*>>(val onAction: (Action) -> Unit) : Navigator<Action> {
+    override fun navigate(action: Action) {
         onAction(action)
     }
 }
@@ -78,10 +82,10 @@ object MissingViewControllerNavigationException : NavigationException("Missing P
  * @param parent The [UIViewController] managing the navigation
  * @param navigationMapper A function mapping the [NavigationAction] to [NavigationSpec]
  */
-class ViewControllerNavigator<A : NavigationAction<*>>(
+class ViewControllerNavigator<Action : NavigationAction<*>>(
     parentVC: UIViewController,
-    private val navigationMapper: (A) -> NavigationSpec
-) : Navigator<A> {
+    private val navigationMapper: (Action) -> NavigationSpec
+) : Navigator<Action> {
 
     private inner class StoreKitDelegate : NSObject(), SKStoreProductViewControllerDelegateProtocol {
 
@@ -93,7 +97,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
     private val parent = WeakReference(parentVC)
     private val storeKitDelegate: StoreKitDelegate by lazy { StoreKitDelegate() }
 
-    override fun navigate(action: A) {
+    override fun navigate(action: Action) {
         navigate(navigationMapper.invoke(action), action.bundle)
     }
 
diff --git a/architecture/src/iosMain/kotlin/observable/Observable.kt b/architecture/src/iosMain/kotlin/observable/Observable.kt
index 70a3aefde..493cd28cc 100644
--- a/architecture/src/iosMain/kotlin/observable/Observable.kt
+++ b/architecture/src/iosMain/kotlin/observable/Observable.kt
@@ -16,16 +16,43 @@
  */
 package com.splendo.kaluga.architecture.observable
 
+import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.StateFlow
 import kotlin.coroutines.CoroutineContext
 import kotlin.properties.ReadOnlyProperty
 
+/**
+ * Interface indicating an observable has a state of [T]
+ * @param T the type of the state.
+ */
 actual interface WithState<T> {
+
+    /**
+     * [StateFlow] that expresses the content from the observable.
+     *
+     * This can be initialized lazily.
+     *
+     * Accessing this from property outside the main thread might cause a race condition,
+     * since observing the initial value needed for the stateflow has to happen on the main thread.
+     *
+     */
     actual val stateFlow: StateFlow<T>
+
+    /**
+     * A [ReadOnlyProperty] of [T]
+     */
     actual val valueDelegate: ReadOnlyProperty<Any?, T>
 }
 
+/**
+ * An abstract class that extends [AbstractBaseSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param OO the type of [ObservableOptional] to store the result in.
+ * @param observation The [Observation] to handle observing the value.
+ * @param stateFlowToBind A function to get the [StateFlow] that will automatically call [SuspendableSetter.set] when a new value is posted after [BasicSubject.post] has been called.
+ */
 actual abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>> actual constructor(
     observation: Observation<R, T, OO>,
     stateFlowToBind: suspend () -> StateFlow<R?>
@@ -36,23 +63,48 @@ actual abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>> actual c
     }
 }
 
+/**
+ * An abstract class extending [AbstractBaseUninitializedSubject].
+ * @param T the type of value to expect.
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
 actual abstract class BaseUninitializedSubject<T> actual constructor(
     observation: ObservationUninitialized<T>
 ) : AbstractBaseUninitializedSubject<T>(observation)
 
+/**
+ * Abstract class implementing [AbstractBaseInitializedSubject]
+ * @param T the type of value to expect.
+ * @param observation The [ObservationInitialized] to handle value being observed
+ */
 actual abstract class BaseInitializedSubject<T> actual constructor(observation: ObservationInitialized<T>) : AbstractBaseInitializedSubject<T>(observation) {
 
+    /**
+     * Constructor using an inital value.
+     * @param initialValue The [Value] to use as the initial value.
+     */
     actual constructor(
         initialValue: ObservableOptional.Value<T>
     ) : this (ObservationInitialized(initialValue))
 }
 
-actual abstract class BaseDefaultSubject<R : T?, T : Any> actual constructor(
-    observation: ObservationDefault<R, T>
+/**
+ * An abstract class extending [AbstractBaseDefaultSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
+actual abstract class BaseDefaultSubject<R : T?, T> actual constructor(
+    observation: ObservationDefault<R, T?>
 ) : AbstractBaseDefaultSubject<R, T>(observation) {
 
+    /**
+     * Constructor
+     * @param defaultValue The default [Value] of [R] to return if the current value is [ObservableOptional.Nothing] or [ObservableOptional.Value] containing `null`.
+     * @param initialValue The initial [Value] of [T].
+     */
     actual constructor(
         defaultValue: ObservableOptional.Value<R>,
         initialValue: ObservableOptional.Value<T?>
-    ) : this(observation = ObservationDefault<R, T>(defaultValue, initialValue))
+    ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
 }
diff --git a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
index 13193ff24..1945d3fb6 100644
--- a/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/iosMain/kotlin/observable/SimpleDisposable.kt
@@ -19,6 +19,10 @@ package com.splendo.kaluga.architecture.observable
 
 import com.splendo.kaluga.base.GCScheduler
 
+/**
+ * A [Disposable] that has a [DisposeHandler]
+ * @param onDispose Function to call when disposing the object.
+ */
 actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : BaseSimpleDisposable(onDispose) {
 
     override fun afterDispose() {
diff --git a/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt
index 843b1cb25..75b7c7758 100644
--- a/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/iosMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -22,10 +22,17 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 
+/**
+ * Simple ViewModel class that is to be bound to a View lifecycle
+ */
 actual open class LifecycleViewModel internal actual constructor() {
 
     private val lifecycleJob = SupervisorJob()
 
+    /**
+     * [CoroutineScope] of the ViewModel.
+     * This scope is active until the ViewModel lifecycle is cleared.
+     */
     actual val coroutineScope = CoroutineScope(Dispatchers.Main + lifecycleJob)
 
     /**
@@ -35,6 +42,9 @@ actual open class LifecycleViewModel internal actual constructor() {
         onCleared()
     }
 
+    /**
+     * Called when the ViewModel lifecycle is cleared
+     */
     protected actual open fun onCleared() {
         lifecycleJob.cancelChildren()
     }
diff --git a/architecture/src/jsMain/kotlin/lifecycle/LifecycleSubscribable.kt b/architecture/src/jsMain/kotlin/lifecycle/LifecycleSubscribable.kt
index 31ac008c5..6a7e1d632 100644
--- a/architecture/src/jsMain/kotlin/lifecycle/LifecycleSubscribable.kt
+++ b/architecture/src/jsMain/kotlin/lifecycle/LifecycleSubscribable.kt
@@ -17,4 +17,10 @@
 
 package com.splendo.kaluga.architecture.lifecycle
 
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+
+/**
+ * This interface can be provided to a [BaseLifecycleViewModel] to bind to platform specific lifecycle.
+ * Extend this on classes that need to have some setup during lifecycle events.
+ */
 actual interface LifecycleSubscribable
diff --git a/architecture/src/jsMain/kotlin/navigation/Navigator.kt b/architecture/src/jsMain/kotlin/navigation/Navigator.kt
index 52ed83538..ae0056b6a 100644
--- a/architecture/src/jsMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/jsMain/kotlin/navigation/Navigator.kt
@@ -19,7 +19,11 @@ package com.splendo.kaluga.architecture.navigation
 
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
-actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
+/**
+ * Class that can trigger a given [NavigationAction]
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ */
+actual interface Navigator<Action : NavigationAction<*>> : LifecycleSubscribable {
 
-    actual fun navigate(action: A)
+    actual fun navigate(action: Action)
 }
diff --git a/architecture/src/jsMain/kotlin/observable/Observable.kt b/architecture/src/jsMain/kotlin/observable/Observable.kt
index 70a3aefde..e61df5866 100644
--- a/architecture/src/jsMain/kotlin/observable/Observable.kt
+++ b/architecture/src/jsMain/kotlin/observable/Observable.kt
@@ -16,16 +16,43 @@
  */
 package com.splendo.kaluga.architecture.observable
 
+import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.StateFlow
 import kotlin.coroutines.CoroutineContext
 import kotlin.properties.ReadOnlyProperty
 
+/**
+ * Interface indicating an observable has a state of [T]
+ * @param T the type of the state.
+ */
 actual interface WithState<T> {
+
+    /**
+     * [StateFlow] that expresses the content from the observable.
+     *
+     * This can be initialized lazily.
+     *
+     * Accessing this from property outside the main thread might cause a race condition,
+     * since observing the initial value needed for the stateflow has to happen on the main thread.
+     *
+     */
     actual val stateFlow: StateFlow<T>
+
+    /**
+     * A [ReadOnlyProperty] of [T]
+     */
     actual val valueDelegate: ReadOnlyProperty<Any?, T>
 }
 
+/**
+ * An abstract class that extends [AbstractBaseSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param OO the type of [ObservableOptional] to store the result in.
+ * @param observation The [Observation] to handle observing the value.
+ * @param stateFlowToBind A function to get the [StateFlow] that will automatically call [SuspendableSetter.set] when a new value is posted after [BasicSubject.post] has been called.
+ */
 actual abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>> actual constructor(
     observation: Observation<R, T, OO>,
     stateFlowToBind: suspend () -> StateFlow<R?>
@@ -36,23 +63,48 @@ actual abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>> actual c
     }
 }
 
+/**
+ * An abstract class extending [AbstractBaseUninitializedSubject].
+ * @param T the type of value to expect.
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
 actual abstract class BaseUninitializedSubject<T> actual constructor(
     observation: ObservationUninitialized<T>
 ) : AbstractBaseUninitializedSubject<T>(observation)
 
+/**
+ * Abstract class implementing [AbstractBaseInitializedSubject]
+ * @param T the type of value to expect.
+ * @param observation The [ObservationInitialized] to handle value being observed
+ */
 actual abstract class BaseInitializedSubject<T> actual constructor(observation: ObservationInitialized<T>) : AbstractBaseInitializedSubject<T>(observation) {
 
+    /**
+     * Constructor using an inital value.
+     * @param initialValue The [Value] to use as the initial value.
+     */
     actual constructor(
         initialValue: ObservableOptional.Value<T>
     ) : this (ObservationInitialized(initialValue))
 }
 
-actual abstract class BaseDefaultSubject<R : T?, T : Any> actual constructor(
-    observation: ObservationDefault<R, T>
+/**
+ * An abstract class extending [AbstractBaseDefaultSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
+actual abstract class BaseDefaultSubject<R : T?, T> actual constructor(
+    observation: ObservationDefault<R, T?>
 ) : AbstractBaseDefaultSubject<R, T>(observation) {
 
+    /**
+     * Constructor
+     * @param defaultValue The default [Value] of [R] to return if the current value is [ObservableOptional.Nothing] or [ObservableOptional.Value] containing `null`.
+     * @param initialValue The initial [Value] of [T].
+     */
     actual constructor(
         defaultValue: ObservableOptional.Value<R>,
         initialValue: ObservableOptional.Value<T?>
-    ) : this(observation = ObservationDefault<R, T>(defaultValue, initialValue))
-}
+    ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
+}
\ No newline at end of file
diff --git a/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt
index 968df5e9a..0593a4592 100644
--- a/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/jsMain/kotlin/observable/SimpleDisposable.kt
@@ -17,4 +17,8 @@
 
 package com.splendo.kaluga.architecture.observable
 
+/**
+ * A [Disposable] that has a [DisposeHandler]
+ * @param onDispose Function to call when disposing the object.
+ */
 actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : BaseSimpleDisposable(onDispose)
diff --git a/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt
index 55c63fdc9..75b7c7758 100644
--- a/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/jsMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -22,16 +22,29 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 
+/**
+ * Simple ViewModel class that is to be bound to a View lifecycle
+ */
 actual open class LifecycleViewModel internal actual constructor() {
 
     private val lifecycleJob = SupervisorJob()
 
+    /**
+     * [CoroutineScope] of the ViewModel.
+     * This scope is active until the ViewModel lifecycle is cleared.
+     */
     actual val coroutineScope = CoroutineScope(Dispatchers.Main + lifecycleJob)
 
+    /**
+     * Call this when the [LifecycleViewModel] should be cleared to cancel all its coroutines.
+     */
     fun clear() {
         onCleared()
     }
 
+    /**
+     * Called when the ViewModel lifecycle is cleared
+     */
     protected actual open fun onCleared() {
         lifecycleJob.cancelChildren()
     }
diff --git a/architecture/src/jvmMain/kotlin/lifecycle/LifecycleSubscribable.kt b/architecture/src/jvmMain/kotlin/lifecycle/LifecycleSubscribable.kt
index 31ac008c5..6a7e1d632 100644
--- a/architecture/src/jvmMain/kotlin/lifecycle/LifecycleSubscribable.kt
+++ b/architecture/src/jvmMain/kotlin/lifecycle/LifecycleSubscribable.kt
@@ -17,4 +17,10 @@
 
 package com.splendo.kaluga.architecture.lifecycle
 
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+
+/**
+ * This interface can be provided to a [BaseLifecycleViewModel] to bind to platform specific lifecycle.
+ * Extend this on classes that need to have some setup during lifecycle events.
+ */
 actual interface LifecycleSubscribable
diff --git a/architecture/src/jvmMain/kotlin/navigation/Navigator.kt b/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
index 52ed83538..ae0056b6a 100644
--- a/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/jvmMain/kotlin/navigation/Navigator.kt
@@ -19,7 +19,11 @@ package com.splendo.kaluga.architecture.navigation
 
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
-actual interface Navigator<A : NavigationAction<*>> : LifecycleSubscribable {
+/**
+ * Class that can trigger a given [NavigationAction]
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ */
+actual interface Navigator<Action : NavigationAction<*>> : LifecycleSubscribable {
 
-    actual fun navigate(action: A)
+    actual fun navigate(action: Action)
 }
diff --git a/architecture/src/jvmMain/kotlin/observable/Observable.kt b/architecture/src/jvmMain/kotlin/observable/Observable.kt
index 70a3aefde..493cd28cc 100644
--- a/architecture/src/jvmMain/kotlin/observable/Observable.kt
+++ b/architecture/src/jvmMain/kotlin/observable/Observable.kt
@@ -16,16 +16,43 @@
  */
 package com.splendo.kaluga.architecture.observable
 
+import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.StateFlow
 import kotlin.coroutines.CoroutineContext
 import kotlin.properties.ReadOnlyProperty
 
+/**
+ * Interface indicating an observable has a state of [T]
+ * @param T the type of the state.
+ */
 actual interface WithState<T> {
+
+    /**
+     * [StateFlow] that expresses the content from the observable.
+     *
+     * This can be initialized lazily.
+     *
+     * Accessing this from property outside the main thread might cause a race condition,
+     * since observing the initial value needed for the stateflow has to happen on the main thread.
+     *
+     */
     actual val stateFlow: StateFlow<T>
+
+    /**
+     * A [ReadOnlyProperty] of [T]
+     */
     actual val valueDelegate: ReadOnlyProperty<Any?, T>
 }
 
+/**
+ * An abstract class that extends [AbstractBaseSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T].
+ * @param OO the type of [ObservableOptional] to store the result in.
+ * @param observation The [Observation] to handle observing the value.
+ * @param stateFlowToBind A function to get the [StateFlow] that will automatically call [SuspendableSetter.set] when a new value is posted after [BasicSubject.post] has been called.
+ */
 actual abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>> actual constructor(
     observation: Observation<R, T, OO>,
     stateFlowToBind: suspend () -> StateFlow<R?>
@@ -36,23 +63,48 @@ actual abstract class BaseSubject<R : T, T, OO : ObservableOptional<R>> actual c
     }
 }
 
+/**
+ * An abstract class extending [AbstractBaseUninitializedSubject].
+ * @param T the type of value to expect.
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
 actual abstract class BaseUninitializedSubject<T> actual constructor(
     observation: ObservationUninitialized<T>
 ) : AbstractBaseUninitializedSubject<T>(observation)
 
+/**
+ * Abstract class implementing [AbstractBaseInitializedSubject]
+ * @param T the type of value to expect.
+ * @param observation The [ObservationInitialized] to handle value being observed
+ */
 actual abstract class BaseInitializedSubject<T> actual constructor(observation: ObservationInitialized<T>) : AbstractBaseInitializedSubject<T>(observation) {
 
+    /**
+     * Constructor using an inital value.
+     * @param initialValue The [Value] to use as the initial value.
+     */
     actual constructor(
         initialValue: ObservableOptional.Value<T>
     ) : this (ObservationInitialized(initialValue))
 }
 
-actual abstract class BaseDefaultSubject<R : T?, T : Any> actual constructor(
-    observation: ObservationDefault<R, T>
+/**
+ * An abstract class extending [AbstractBaseDefaultSubject].
+ * @param T the type of value to expect.
+ * @param R the type of result to expect. Must be a subclass of [T]
+ * @param observation The [ObservationUninitialized] to handle value being observed
+ */
+actual abstract class BaseDefaultSubject<R : T?, T> actual constructor(
+    observation: ObservationDefault<R, T?>
 ) : AbstractBaseDefaultSubject<R, T>(observation) {
 
+    /**
+     * Constructor
+     * @param defaultValue The default [Value] of [R] to return if the current value is [ObservableOptional.Nothing] or [ObservableOptional.Value] containing `null`.
+     * @param initialValue The initial [Value] of [T].
+     */
     actual constructor(
         defaultValue: ObservableOptional.Value<R>,
         initialValue: ObservableOptional.Value<T?>
-    ) : this(observation = ObservationDefault<R, T>(defaultValue, initialValue))
+    ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
 }
diff --git a/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt b/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt
index 968df5e9a..0593a4592 100644
--- a/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt
+++ b/architecture/src/jvmMain/kotlin/observable/SimpleDisposable.kt
@@ -17,4 +17,8 @@
 
 package com.splendo.kaluga.architecture.observable
 
+/**
+ * A [Disposable] that has a [DisposeHandler]
+ * @param onDispose Function to call when disposing the object.
+ */
 actual class SimpleDisposable actual constructor(onDispose: DisposeHandler) : BaseSimpleDisposable(onDispose)
diff --git a/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt b/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt
index 55c63fdc9..75b7c7758 100644
--- a/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt
+++ b/architecture/src/jvmMain/kotlin/viewmodel/LifecycleViewModel.kt
@@ -22,16 +22,29 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 
+/**
+ * Simple ViewModel class that is to be bound to a View lifecycle
+ */
 actual open class LifecycleViewModel internal actual constructor() {
 
     private val lifecycleJob = SupervisorJob()
 
+    /**
+     * [CoroutineScope] of the ViewModel.
+     * This scope is active until the ViewModel lifecycle is cleared.
+     */
     actual val coroutineScope = CoroutineScope(Dispatchers.Main + lifecycleJob)
 
+    /**
+     * Call this when the [LifecycleViewModel] should be cleared to cancel all its coroutines.
+     */
     fun clear() {
         onCleared()
     }
 
+    /**
+     * Called when the ViewModel lifecycle is cleared
+     */
     protected actual open fun onCleared() {
         lifecycleJob.cancelChildren()
     }
diff --git a/base/src/androidLibMain/kotlin/utils/Locale.kt b/base/src/androidLibMain/kotlin/utils/Locale.kt
index 9cf685a1a..c905c1fdb 100644
--- a/base/src/androidLibMain/kotlin/utils/Locale.kt
+++ b/base/src/androidLibMain/kotlin/utils/Locale.kt
@@ -22,7 +22,7 @@ import android.icu.util.ULocale
 import android.os.Build
 import com.splendo.kaluga.base.text.upperCased
 
-actual class Locale internal constructor(val locale: java.util.Locale) {
+actual data class Locale internal constructor(val locale: java.util.Locale) {
     actual companion object {
         actual fun createLocale(language: String): Locale = Locale(java.util.Locale(language))
         actual fun createLocale(language: String, country: String): Locale = Locale(java.util.Locale(language, country))
diff --git a/base/src/iosMain/kotlin/utils/Locale.kt b/base/src/iosMain/kotlin/utils/Locale.kt
index 425e8867f..e08ddcfe1 100644
--- a/base/src/iosMain/kotlin/utils/Locale.kt
+++ b/base/src/iosMain/kotlin/utils/Locale.kt
@@ -35,7 +35,7 @@ import platform.Foundation.quotationEndDelimiter
 import platform.Foundation.scriptCode
 import platform.Foundation.variantCode
 
-actual class Locale internal constructor(val nsLocale: NSLocale) {
+actual data class Locale internal constructor(val nsLocale: NSLocale) {
 
     actual companion object {
         actual fun createLocale(language: String): Locale = Locale(NSLocale(language))
diff --git a/base/src/jsMain/kotlin/utils/Locale.kt b/base/src/jsMain/kotlin/utils/Locale.kt
index 7a4ddf02e..0f5679400 100644
--- a/base/src/jsMain/kotlin/utils/Locale.kt
+++ b/base/src/jsMain/kotlin/utils/Locale.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.base.utils
 
 // TODO Implement with proper locale solution for Java Script
-actual class Locale internal constructor(
+actual data class Locale internal constructor(
     actual val languageCode: String,
     actual val countryCode: String = "",
     actual val variantCode: String = "",
diff --git a/base/src/jvmMain/kotlin/utils/Locale.kt b/base/src/jvmMain/kotlin/utils/Locale.kt
index ef2d4e541..894cf65d0 100644
--- a/base/src/jvmMain/kotlin/utils/Locale.kt
+++ b/base/src/jvmMain/kotlin/utils/Locale.kt
@@ -19,7 +19,7 @@ package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.base.text.upperCased
 
-actual class Locale internal constructor(val locale: java.util.Locale) {
+actual data class Locale internal constructor(val locale: java.util.Locale) {
     actual companion object {
         actual fun createLocale(language: String): Locale = Locale(java.util.Locale(language))
         actual fun createLocale(language: String, country: String): Locale = Locale(java.util.Locale(language, country))
diff --git a/date-time-picker/build.gradle.kts b/date-time-picker/build.gradle.kts
index 2f1bf40bd..89c796682 100644
--- a/date-time-picker/build.gradle.kts
+++ b/date-time-picker/build.gradle.kts
@@ -22,7 +22,7 @@ kotlin {
         }
         getByName("commonTest") {
             dependencies {
-                implementation(project(":test-utils-base", ""))
+                implementation(project(":test-utils-date-time-picker", ""))
             }
         }
     }
diff --git a/date-time-picker/src/androidLibInstrumentedTest/kotlin/TestActivity.kt b/date-time-picker/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
index b7e1ca02e..0eb7b6550 100644
--- a/date-time-picker/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
+++ b/date-time-picker/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
@@ -2,6 +2,7 @@ package com.splendo.kaluga.datetimepicker
 
 import androidx.activity.viewModels
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.test.datetimepicker.datePickerPresenterBuilder
 
 class TestActivity : KalugaViewModelActivity<DateTimePickerViewModel>() {
 
diff --git a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
index 2ee78b5a5..d930ecea9 100644
--- a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
@@ -22,11 +22,8 @@ import android.app.DatePickerDialog
 import android.app.TimePickerDialog
 import android.content.Context
 import android.content.DialogInterface
-import androidx.appcompat.app.AppCompatActivity
 import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
 import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromCache
-import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
 import com.splendo.kaluga.base.utils.KalugaDate
 import com.splendo.kaluga.base.utils.uses24HourClock
 import kotlinx.coroutines.CoroutineScope
@@ -147,17 +144,3 @@ actual class DateTimePickerPresenter(
         alertDialog.show()
     }
 }
-
-/**
- * @return The [DateTimePickerPresenter.Builder] which can be used to present alerts while this Activity is active
- * Will be created if need but only one instance will exist.
- *
- * Warning: Do not attempt to use this builder outside of the lifespan of the Activity.
- * Instead, for example use a [com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel],
- * which can automatically track which Activity is active for it.
- *
- */
-fun AppCompatActivity.datePickerPresenterBuilder(themeResourceId: Int = 0): DateTimePickerPresenter.Builder =
-    getOrPutAndRemoveOnDestroyFromCache {
-        DateTimePickerPresenter.Builder(themeResourceId, lifecycleManagerObserver())
-    }
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 5ecfc4cb3..02111f0c3 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -44,7 +44,7 @@ data class DateTimePicker(
          * Selects a Date
          * A range can be provided to limit the dates selectable
          */
-        class DateType(
+        data class DateType(
             val earliestDate: KalugaDate? = null,
             val latestDate: KalugaDate? = null
         ) : Type()
diff --git a/hud/build.gradle.kts b/hud/build.gradle.kts
index 3b0898e46..bf41cd714 100644
--- a/hud/build.gradle.kts
+++ b/hud/build.gradle.kts
@@ -24,7 +24,7 @@ kotlin {
 
         getByName("commonTest") {
             dependencies {
-                api(project(":test-utils-base", ""))
+                api(project(":test-utils-hud", ""))
             }
         }
     }
diff --git a/hud/src/androidLibInstrumentedTest/kotlin/TestActivity.kt b/hud/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
index e98aafe7c..49bc3df03 100644
--- a/hud/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
+++ b/hud/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.hud
 
 import androidx.activity.viewModels
 import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.test.hud.hudBuilder
 
 class TestActivity : KalugaViewModelActivity<HudViewModel>() {
 
diff --git a/hud/src/androidLibMain/kotlin/HUD.kt b/hud/src/androidLibMain/kotlin/HUD.kt
index 12b8b562a..7364d1925 100644
--- a/hud/src/androidLibMain/kotlin/HUD.kt
+++ b/hud/src/androidLibMain/kotlin/HUD.kt
@@ -33,13 +33,10 @@ import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.LayoutRes
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
 import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromCache
-import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
 import com.splendo.kaluga.base.mainHandler
 import com.splendo.kaluga.base.utils.byOrdinalOrDefault
 import kotlinx.coroutines.CoroutineScope
@@ -184,16 +181,3 @@ actual class HUD private constructor(@LayoutRes viewResId: Int, override val hud
         }
     }
 }
-
-/**
- * @return A [HUD.Builder] which can be used to show an HUD while this Activity is active.
- *  Will be created if need but only one instance will exist.
- *
- * Warning: Do not attempt to use this builder outside of the lifespan of the Activity.
- * Instead, for example use a [com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel],
- * which can automatically track which Activity is active for it.
- *
- */
-fun AppCompatActivity.hudBuilder(): HUD.Builder = getOrPutAndRemoveOnDestroyFromCache {
-    HUD.Builder(lifecycleManagerObserver())
-}
diff --git a/kaluga-library-components/src/main/kotlin/Component.kt b/kaluga-library-components/src/main/kotlin/Component.kt
index 744963b7a..f1ec2818c 100644
--- a/kaluga-library-components/src/main/kotlin/Component.kt
+++ b/kaluga-library-components/src/main/kotlin/Component.kt
@@ -190,6 +190,10 @@ fun KotlinMultiplatformExtension.commonMultiplatformComponent(currentProject: Pr
         }
     }
 
+    sourceSets.maybeCreate("androidLibInstrumentedTest").apply {
+        dependsOn(commonTest)
+    }
+
     sourceSets.all {
         languageSettings {
             optIn("kotlinx.coroutines.DelicateCoroutinesApi")
diff --git a/keyboard/build.gradle.kts b/keyboard/build.gradle.kts
index a4b76534b..bad79219b 100644
--- a/keyboard/build.gradle.kts
+++ b/keyboard/build.gradle.kts
@@ -19,7 +19,7 @@ kotlin {
 
         getByName("commonTest") {
             dependencies {
-                api(project(":test-utils-base", ""))
+                api(project(":test-utils-keyboard", ""))
             }
         }
     }
diff --git a/keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt b/keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
index d8529aa17..4c949c0e8 100644
--- a/keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
+++ b/keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
@@ -21,6 +21,7 @@ import android.os.Bundle
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
+import com.splendo.kaluga.test.keyboard.keyboardManagerBuilder
 
 class TestActivity : AppCompatActivity() {
 
diff --git a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
index de34c37ac..c8d0e6c6e 100644
--- a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
@@ -19,11 +19,8 @@ package com.splendo.kaluga.keyboard
 
 import android.content.Context.INPUT_METHOD_SERVICE
 import android.view.inputmethod.InputMethodManager
-import androidx.appcompat.app.AppCompatActivity
 import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
 import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromCache
-import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
 import kotlinx.coroutines.CoroutineScope
 
 class ViewKeyboardManager(
@@ -54,16 +51,3 @@ class ViewKeyboardManager(
         }
     }
 }
-
-/**
- * @return A [KeyboardManager.Builder] which can be used to manipulate the soft keyboard while this Activity is active.
- * Will be created if need but only one instance will exist.
- *
- * Warning: Do not attempt to use this builder outside of the lifespan of the Activity.
- * Instead, for example use a [com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel],
- * which can automatically track which Activity is active for it.
- *
- */
-fun AppCompatActivity.keyboardManagerBuilder(): ViewKeyboardManager.Builder = getOrPutAndRemoveOnDestroyFromCache {
-    ViewKeyboardManager.Builder(lifecycleManagerObserver())
-}
diff --git a/review/src/androidLibMain/kotlin/ReviewManager.kt b/review/src/androidLibMain/kotlin/ReviewManager.kt
index 9f1f78796..ba7c5a7cf 100644
--- a/review/src/androidLibMain/kotlin/ReviewManager.kt
+++ b/review/src/androidLibMain/kotlin/ReviewManager.kt
@@ -17,16 +17,13 @@
 package com.splendo.kaluga.review
 
 import android.content.Context
-import androidx.appcompat.app.AppCompatActivity
 import com.google.android.play.core.ktx.launchReview
 import com.google.android.play.core.ktx.requestReview
 import com.google.android.play.core.review.ReviewManagerFactory
 import com.google.android.play.core.review.testing.FakeReviewManager
-import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
 import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
+import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
-import com.splendo.kaluga.architecture.lifecycle.getOrPutAndRemoveOnDestroyFromCache
-import com.splendo.kaluga.architecture.lifecycle.lifecycleManagerObserver
 import com.splendo.kaluga.base.ApplicationHolder
 
 actual class ReviewManager(
@@ -59,16 +56,3 @@ actual class ReviewManager(
         }
     }
 }
-
-/**
- * @return A [ReviewManager.Builder] which can be used to show a Review Dialog while this Activity is active.
- *  Will be created if need but only one instance will exist.
- *
- * Warning: Do not attempt to use this builder outside of the lifespan of the Activity.
- * Instead, for example use a [com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel],
- * which can automatically track which Activity is active for it.
- *
- */
-fun AppCompatActivity.reviewManager(): ReviewManager.Builder = getOrPutAndRemoveOnDestroyFromCache {
-    ReviewManager.Builder(lifecycleManagerObserver = lifecycleManagerObserver())
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7f1f0775f..d25a8e0e6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -89,6 +89,7 @@ include(":test-utils-base")
 include(":test-utils-alerts")
 include(":test-utils-architecture")
 include(":test-utils-bluetooth")
+include(":test-utils-date-time-picker")
 include(":test-utils-hud")
 include(":test-utils-keyboard")
 include(":test-utils-koin")
diff --git a/test-utils-alerts/build.gradle.kts b/test-utils-alerts/build.gradle.kts
index d7be158f8..b485bcb9f 100644
--- a/test-utils-alerts/build.gradle.kts
+++ b/test-utils-alerts/build.gradle.kts
@@ -11,15 +11,9 @@ publishableComponent()
 kotlin {
     sourceSets {
         commonMain {
-            dependencies {
-                api(project(":test-utils-base"))
-                implementation(project(":architecture"))
-                implementation(project(":alerts"))
-            }
-        }
-        commonTest {
             dependencies {
                 api(project(":test-utils-architecture"))
+                implementation(project(":alerts"))
             }
         }
     }
diff --git a/test-utils-alerts/src/androidLibMain/kotlin/alertPresenterBuilder.kt b/test-utils-alerts/src/androidLibMain/kotlin/alertPresenterBuilder.kt
new file mode 100644
index 000000000..92f78d123
--- /dev/null
+++ b/test-utils-alerts/src/androidLibMain/kotlin/alertPresenterBuilder.kt
@@ -0,0 +1,37 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.test.alerts
+
+import androidx.appcompat.app.AppCompatActivity
+import com.splendo.kaluga.alerts.AlertPresenter
+import com.splendo.kaluga.test.architecture.getOrPutAndRemoveOnDestroyFromCache
+import com.splendo.kaluga.test.architecture.lifecycleManagerObserver
+
+/**
+ * @return The [AlertPresenter.Builder] which can be used to present alerts while this Activity is active
+ * Will be created if need but only one instance will exist.
+ *
+ * Warning: Do not attempt to use this builder outside of the lifespan of the Activity.
+ * Instead, for example use a [com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel],
+ * which can automatically track which Activity is active for it.
+ *
+ */
+fun AppCompatActivity.alertPresenterBuilder(): AlertPresenter.Builder =
+    getOrPutAndRemoveOnDestroyFromCache {
+        AlertPresenter.Builder(lifecycleManagerObserver())
+    }
diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt b/test-utils-architecture/src/androidLibMain/kotlin/getOrPutAndRemoveOnDestroyFromCache.kt
similarity index 94%
rename from architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt
rename to test-utils-architecture/src/androidLibMain/kotlin/getOrPutAndRemoveOnDestroyFromCache.kt
index 22b49ed7e..f415fb44a 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/getOrPutAndRemoveOnDestroyFromCache.kt
+++ b/test-utils-architecture/src/androidLibMain/kotlin/getOrPutAndRemoveOnDestroyFromCache.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.architecture.lifecycle
+package com.splendo.kaluga.test.architecture
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.DefaultLifecycleObserver
diff --git a/test-utils-architecture/src/androidLibMain/kotlin/lifecycleManagerObserver.kt b/test-utils-architecture/src/androidLibMain/kotlin/lifecycleManagerObserver.kt
new file mode 100644
index 000000000..a1cd36d7b
--- /dev/null
+++ b/test-utils-architecture/src/androidLibMain/kotlin/lifecycleManagerObserver.kt
@@ -0,0 +1,40 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.test.architecture
+
+import androidx.appcompat.app.AppCompatActivity
+import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
+import com.splendo.kaluga.architecture.lifecycle.subscribe
+
+/**
+ * @return The [LifecycleManagerObserver] that only reports the lifecycle of this [AppCompatActivity].
+ * Will be created if need but only one instance will exist.
+ *
+ * For example can be used by code in the Activity itself.
+ *
+ * Warning: do not use this attempt to use this observer in cases where a dependent class such a Builder
+ * exists over the lifespan of several Activities (e.g. when recreated due to rotation etc).
+ * In particular this applies to places such as a ViewModel, which can outlive a single Activity.
+ *
+ */
+fun AppCompatActivity.lifecycleManagerObserver(): LifecycleManagerObserver =
+    getOrPutAndRemoveOnDestroyFromCache(
+        onCreate = { it.subscribe(this@lifecycleManagerObserver) },
+        onDestroy = { it.unsubscribe() },
+        defaultValue = { LifecycleManagerObserver() }
+    )
\ No newline at end of file
diff --git a/test-utils-date-time-picker/README.md b/test-utils-date-time-picker/README.md
new file mode 100644
index 000000000..0e616851b
--- /dev/null
+++ b/test-utils-date-time-picker/README.md
@@ -0,0 +1,21 @@
+# Test Utils Keyboard
+
+This library adds support for testing the [`keyboard` module](../keyboard) to [`test-utils`](../test-utils-base)
+
+## Installing
+This library is available on Maven Central. You can import Kaluga Test Utils Keyboard as follows:
+
+```kotlin
+repositories {
+    // ...
+    mavenCentral()
+}
+// ...
+dependencies {
+    // ...
+    implementation("com.splendo.kaluga:test-utils-keyboard:$kalugaVersion")
+}
+```
+
+## Mocks
+This library contains mock classes for `KeyboardManager`, `KeyboardManager.Builder`, and `FocusHandler`.
diff --git a/test-utils-date-time-picker/api/androidLib/test-utils-keyboard.api b/test-utils-date-time-picker/api/androidLib/test-utils-keyboard.api
new file mode 100644
index 000000000..c771c929a
--- /dev/null
+++ b/test-utils-date-time-picker/api/androidLib/test-utils-keyboard.api
@@ -0,0 +1,36 @@
+public final class com/splendo/kaluga/test/keyboard/BuildConfig {
+	public static final field BUILD_TYPE Ljava/lang/String;
+	public static final field DEBUG Z
+	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
+	public fun <init> ()V
+}
+
+public final class com/splendo/kaluga/test/keyboard/MockFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
+	public fun <init> ()V
+	public final fun giveFocus ()V
+	public final fun isFocused ()Z
+	public final fun removeFocus ()V
+}
+
+public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager : com/splendo/kaluga/keyboard/BaseKeyboardManager {
+	public fun <init> ()V
+	public fun <init> (Z)V
+	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getFocusHandler ()Lcom/splendo/kaluga/keyboard/FocusHandler;
+	public final fun getHideMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getShowMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public fun hide ()V
+	public final fun setFocusHandler (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
+	public fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
+}
+
+public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager$Builder : com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder {
+	public fun <init> ()V
+	public fun <init> (Z)V
+	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
+	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/keyboard/MockKeyboardManager;
+	public final fun getBuiltKeyboardManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+}
+
diff --git a/test-utils-date-time-picker/api/jvm/test-utils-keyboard.api b/test-utils-date-time-picker/api/jvm/test-utils-keyboard.api
new file mode 100644
index 000000000..cd4a15032
--- /dev/null
+++ b/test-utils-date-time-picker/api/jvm/test-utils-keyboard.api
@@ -0,0 +1,29 @@
+public final class com/splendo/kaluga/test/keyboard/MockFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
+	public fun <init> ()V
+	public final fun giveFocus ()V
+	public final fun isFocused ()Z
+	public final fun removeFocus ()V
+}
+
+public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager : com/splendo/kaluga/keyboard/BaseKeyboardManager {
+	public fun <init> ()V
+	public fun <init> (Z)V
+	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getFocusHandler ()Lcom/splendo/kaluga/keyboard/FocusHandler;
+	public final fun getHideMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getShowMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public fun hide ()V
+	public final fun setFocusHandler (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
+	public fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
+}
+
+public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager$Builder : com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder {
+	public fun <init> ()V
+	public fun <init> (Z)V
+	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
+	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/keyboard/MockKeyboardManager;
+	public final fun getBuiltKeyboardManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+}
+
diff --git a/test-utils-date-time-picker/build.gradle.kts b/test-utils-date-time-picker/build.gradle.kts
new file mode 100644
index 000000000..54af338a3
--- /dev/null
+++ b/test-utils-date-time-picker/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    kotlin("multiplatform")
+    id("jacoco")
+    id("convention.publication")
+    id("com.android.library")
+    id("org.jlleitschuh.gradle.ktlint")
+}
+
+publishableComponent()
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(project(":test-utils-architecture"))
+                api(project(":date-time-picker"))
+            }
+        }
+    }
+}
diff --git a/test-utils-date-time-picker/src/androidLibInstrumentedTest/AndroidManifest.xml b/test-utils-date-time-picker/src/androidLibInstrumentedTest/AndroidManifest.xml
new file mode 100644
index 000000000..02b8cb9e4
--- /dev/null
+++ b/test-utils-date-time-picker/src/androidLibInstrumentedTest/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest package="com.splendo.kaluga.test.datetimepicker"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:theme="@style/Theme.AppCompat">
+        <activity android:name=".TestActivity"/>
+    </application>
+</manifest>
diff --git a/test-utils-date-time-picker/src/androidLibInstrumentedTest/kotlin/TestActivity.kt b/test-utils-date-time-picker/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
new file mode 100644
index 000000000..765c31b43
--- /dev/null
+++ b/test-utils-date-time-picker/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
@@ -0,0 +1,27 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+*/
+
+package com.splendo.kaluga.test.datetimepicker
+
+import androidx.appcompat.app.AppCompatActivity
+
+class TestActivity : AppCompatActivity()
+
+class CorrectlySetupTest {
+    @kotlin.test.Test
+    fun testSetup() = assert(true)
+}
diff --git a/test-utils-date-time-picker/src/androidLibMain/AndroidManifest.xml b/test-utils-date-time-picker/src/androidLibMain/AndroidManifest.xml
new file mode 100644
index 000000000..1ff75aac3
--- /dev/null
+++ b/test-utils-date-time-picker/src/androidLibMain/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest package="com.splendo.kaluga.test.datetimepicker"
+          xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/test-utils-date-time-picker/src/androidLibMain/kotlin/datePickerPresenterBuilder.kt b/test-utils-date-time-picker/src/androidLibMain/kotlin/datePickerPresenterBuilder.kt
new file mode 100644
index 000000000..869d237d7
--- /dev/null
+++ b/test-utils-date-time-picker/src/androidLibMain/kotlin/datePickerPresenterBuilder.kt
@@ -0,0 +1,37 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.test.datetimepicker
+
+import androidx.appcompat.app.AppCompatActivity
+import com.splendo.kaluga.datetimepicker.DateTimePickerPresenter
+import com.splendo.kaluga.test.architecture.getOrPutAndRemoveOnDestroyFromCache
+import com.splendo.kaluga.test.architecture.lifecycleManagerObserver
+
+/**
+ * @return The [DateTimePickerPresenter.Builder] which can be used to present alerts while this Activity is active
+ * Will be created if need but only one instance will exist.
+ *
+ * Warning: Do not attempt to use this builder outside of the lifespan of the Activity.
+ * Instead, for example use a [com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel],
+ * which can automatically track which Activity is active for it.
+ *
+ */
+fun AppCompatActivity.datePickerPresenterBuilder(themeResourceId: Int = 0): DateTimePickerPresenter.Builder =
+    getOrPutAndRemoveOnDestroyFromCache {
+        DateTimePickerPresenter.Builder(themeResourceId, lifecycleManagerObserver())
+    }
diff --git a/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt b/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
new file mode 100644
index 000000000..9b15e6218
--- /dev/null
+++ b/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
@@ -0,0 +1,109 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.test.datetimepicker
+
+import com.splendo.kaluga.base.collections.concurrentMutableListOf
+import com.splendo.kaluga.base.utils.KalugaDate
+import com.splendo.kaluga.datetimepicker.BaseDateTimePickerPresenter
+import com.splendo.kaluga.datetimepicker.DateTimePicker
+import com.splendo.kaluga.test.base.mock.call
+import com.splendo.kaluga.test.base.mock.on
+import com.splendo.kaluga.test.base.mock.parameters.mock
+import kotlinx.coroutines.CoroutineScope
+
+/**
+ * Mock implementation of [BaseKeyboardManager]
+ * @param setupMocks If `true` configure mocks to display the keyboard
+ */
+class MockDateTimePickerPresenter(val dateTimePicker: DateTimePicker, setupMocks: Boolean = true) : BaseDateTimePickerPresenter(dateTimePicker) {
+
+    /**
+     * Mock implementation of [BaseKeyboardManager.Builder]
+     * @param setupMocks If `true` sets up [createMock] to build [MockDateTimePicker]
+     */
+    class Builder(setupMocks: Boolean = true) : BaseDateTimePickerPresenter.Builder() {
+
+        /**
+         * List of created [MockDateTimePicker]
+         */
+        val builtDateTimePickerPresenters = concurrentMutableListOf<MockDateTimePickerPresenter>()
+
+        /**
+         * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
+         */
+        val createMock = ::create.mock()
+
+        init {
+            if (setupMocks) {
+                createMock.on().doExecute { (dateTimePicker, _) ->
+                    MockDateTimePickerPresenter(dateTimePicker, setupMocks).also {
+                        builtDateTimePickerPresenters.add(it)
+                    }
+                }
+            }
+        }
+
+        override fun create(
+            dateTimePicker: DateTimePicker,
+            coroutineScope: CoroutineScope
+        ): MockDateTimePickerPresenter = createMock.call(dateTimePicker, coroutineScope)
+    }
+
+    /**
+     * `true` if the [MockDateTimePickerPresenter] is currently being presented
+     */
+    var isPresented = false
+
+    private var completionHandler: ((KalugaDate?) -> Unit)? = null
+
+    val showAsyncMock = this::showAsync.mock()
+    val dismissMock = this::dismiss.mock()
+
+    init {
+        if (setupMocks) {
+            showAsyncMock.on().doExecute { (animated, completion) ->
+                showDateTimePicker(animated, completion = completion)
+            }
+            dismissMock.on().doExecute { (animated) ->
+                dismissDateTimePicker(animated)
+            }
+        }
+    }
+
+    /**
+     * Closes the [MockDateTimePickerPresenter] by providing a [KalugaDate]
+     * @param date The [KalugaDate] to provide.
+     */
+    fun closeWithDate(date: KalugaDate?) {
+        completionHandler?.invoke(date)
+        dismissDateTimePicker(false)
+    }
+
+    override fun showAsync(animated: Boolean, completion: (KalugaDate?) -> Unit): Unit = showAsyncMock.call(animated, completion)
+    override fun dismiss(animated: Boolean): Unit = dismissMock.call(animated)
+
+    override fun showDateTimePicker(animated: Boolean, completion: (KalugaDate?) -> Unit) {
+        isPresented = true
+        completionHandler = completion
+    }
+
+    override fun dismissDateTimePicker(animated: Boolean) {
+        isPresented = false
+        completionHandler = null
+    }
+}
diff --git a/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt b/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
new file mode 100644
index 000000000..60eef1c75
--- /dev/null
+++ b/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
@@ -0,0 +1,86 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.test.keyboard
+
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.base.utils.DefaultKalugaDate
+import com.splendo.kaluga.base.utils.KalugaDate
+import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.enUsPosix
+import com.splendo.kaluga.datetimepicker.DateTimePicker
+import com.splendo.kaluga.datetimepicker.buildDatePicker
+import com.splendo.kaluga.test.architecture.UIThreadViewModelTest
+import com.splendo.kaluga.test.base.mock.matcher.AnyCaptor
+import com.splendo.kaluga.test.base.mock.verify
+import com.splendo.kaluga.test.datetimepicker.MockDateTimePickerPresenter
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.withTimeout
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.time.Duration.Companion.seconds
+
+class MockDateTimePickerPresenterTest : UIThreadViewModelTest<MockDateTimePickerPresenterTest.TestContext, MockDateTimePickerPresenterTest.ViewModel>() {
+
+    class ViewModel(val dateTimePickerPresenterBuilder: MockDateTimePickerPresenter.Builder) : BaseLifecycleViewModel(dateTimePickerPresenterBuilder)
+
+    class TestContext : ViewModelTestContext<ViewModel> {
+        val mockDateTimePickerPresenterBuilder = MockDateTimePickerPresenter.Builder()
+        override val viewModel: ViewModel = ViewModel(mockDateTimePickerPresenterBuilder)
+    }
+
+    override val createTestContext: suspend (scope: CoroutineScope) -> TestContext = { TestContext() }
+
+    @Test
+    fun testMockDateTimePickerPresenter() = testOnUIThread {
+        val earliest = DefaultKalugaDate.epoch()
+        val latest = DefaultKalugaDate.now()
+        val selected = DefaultKalugaDate.epoch(offsetInMilliseconds = 568623600000)
+
+        val done = CompletableDeferred<KalugaDate?>()
+        withTimeout(2.seconds) {
+            // we can use date time picker from our viewModel
+            viewModel.dateTimePickerPresenterBuilder.buildDatePicker(this, earliest, latest) {
+                setMessage("Hello world")
+                setSelectedDate(selected)
+                setConfirmButtonTitle("OK")
+                setCancelButtonTitle("Cancel")
+                setLocale(Locale.enUsPosix)
+            }.showAsync {
+                done.complete(it)
+            }
+
+            val captor = AnyCaptor<DateTimePicker>()
+            mockDateTimePickerPresenterBuilder.createMock.verify(captor)
+            assertEquals(DateTimePicker.Type.DateType(earliest, latest), captor.lastCaptured?.type)
+            assertEquals(selected, captor.lastCaptured?.selectedDate)
+            assertEquals("Hello world", captor.lastCaptured?.message)
+            assertEquals("OK", captor.lastCaptured?.confirmButtonTitle)
+            assertEquals("Cancel", captor.lastCaptured?.cancelButtonTitle)
+            assertEquals(Locale.enUsPosix, captor.lastCaptured?.locale)
+
+            // **mock**AlertBuilder is available also from our context
+            mockDateTimePickerPresenterBuilder.builtDateTimePickerPresenters.first().apply {
+                assertEquals(dateTimePicker, captor.lastCaptured)
+                closeWithDate(latest)
+            }
+
+            assertEquals(latest, done.await())
+        }
+    }
+}
diff --git a/test-utils-hud/build.gradle.kts b/test-utils-hud/build.gradle.kts
index 869b33505..7824c4b93 100644
--- a/test-utils-hud/build.gradle.kts
+++ b/test-utils-hud/build.gradle.kts
@@ -11,15 +11,9 @@ publishableComponent()
 kotlin {
     sourceSets {
         commonMain {
-            dependencies {
-                api(project(":test-utils-base"))
-                implementation(project(":architecture"))
-                api(project(":hud"))
-            }
-        }
-        commonTest {
             dependencies {
                 api(project(":test-utils-architecture"))
+                api(project(":hud"))
             }
         }
     }
diff --git a/test-utils-hud/src/androidLibMain/kotlin/hudBuilder.kt b/test-utils-hud/src/androidLibMain/kotlin/hudBuilder.kt
new file mode 100644
index 000000000..892e280c8
--- /dev/null
+++ b/test-utils-hud/src/androidLibMain/kotlin/hudBuilder.kt
@@ -0,0 +1,36 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.test.hud
+
+import androidx.appcompat.app.AppCompatActivity
+import com.splendo.kaluga.hud.HUD
+import com.splendo.kaluga.test.architecture.getOrPutAndRemoveOnDestroyFromCache
+import com.splendo.kaluga.test.architecture.lifecycleManagerObserver
+
+/**
+ * @return A [HUD.Builder] which can be used to show an HUD while this Activity is active.
+ *  Will be created if need but only one instance will exist.
+ *
+ * Warning: Do not attempt to use this builder outside of the lifespan of the Activity.
+ * Instead, for example use a [com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel],
+ * which can automatically track which Activity is active for it.
+ *
+ */
+fun AppCompatActivity.hudBuilder(): HUD.Builder = getOrPutAndRemoveOnDestroyFromCache {
+    HUD.Builder(lifecycleManagerObserver())
+}
diff --git a/test-utils-keyboard/build.gradle.kts b/test-utils-keyboard/build.gradle.kts
index 47a59bf69..6247bd2b8 100644
--- a/test-utils-keyboard/build.gradle.kts
+++ b/test-utils-keyboard/build.gradle.kts
@@ -12,15 +12,9 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":test-utils-base"))
-                implementation(project(":architecture"))
+                api(project(":test-utils-architecture"))
                 api(project(":keyboard"))
             }
         }
-        commonTest {
-            dependencies {
-                implementation(project(":test-utils-architecture"))
-            }
-        }
     }
 }
diff --git a/test-utils-keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt b/test-utils-keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
index 8b4936ed6..62ff460e4 100644
--- a/test-utils-keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
+++ b/test-utils-keyboard/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
@@ -15,7 +15,7 @@
 
 */
 
-package com.splendo.kaluga.tes.keyboard
+package com.splendo.kaluga.test.keyboard
 
 import androidx.appcompat.app.AppCompatActivity
 
diff --git a/test-utils-keyboard/src/androidLibMain/kotlin/keyboardManagerBuilder.kt b/test-utils-keyboard/src/androidLibMain/kotlin/keyboardManagerBuilder.kt
new file mode 100644
index 000000000..c36ce111c
--- /dev/null
+++ b/test-utils-keyboard/src/androidLibMain/kotlin/keyboardManagerBuilder.kt
@@ -0,0 +1,36 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.test.keyboard
+
+import androidx.appcompat.app.AppCompatActivity
+import com.splendo.kaluga.keyboard.ViewKeyboardManager
+import com.splendo.kaluga.test.architecture.getOrPutAndRemoveOnDestroyFromCache
+import com.splendo.kaluga.test.architecture.lifecycleManagerObserver
+
+/**
+ * @return A [KeyboardManager.Builder] which can be used to manipulate the soft keyboard while this Activity is active.
+ * Will be created if need but only one instance will exist.
+ *
+ * Warning: Do not attempt to use this builder outside of the lifespan of the Activity.
+ * Instead, for example use a [com.splendo.kaluga.architecture.viewmodel.LifecycleViewModel],
+ * which can automatically track which Activity is active for it.
+ *
+ */
+fun AppCompatActivity.keyboardManagerBuilder(): ViewKeyboardManager.Builder = getOrPutAndRemoveOnDestroyFromCache {
+    ViewKeyboardManager.Builder(lifecycleManagerObserver())
+}

From 06b2d98dec31840f8f4a02db1ca144eb674fa9d7 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 11:53:32 +0100
Subject: [PATCH 141/227] Add Dokka

---
 adding-a-new-module/template/build.gradle.kts |  1 +
 alerts/build.gradle.kts                       |  1 +
 architecture-compose/build.gradle.kts         |  1 +
 architecture/build.gradle.kts                 |  1 +
 base-permissions/build.gradle.kts             |  1 +
 base/build.gradle.kts                         |  1 +
 .../collections/ConcurrentMutableIterator.kt  | 21 +++++++++
 .../collections/ConcurrentMutableList.kt      | 17 +++++++
 .../collections/ConcurrentMutableMap.kt       | 18 ++++++++
 .../collections/ConcurrentMutableSet.kt       | 17 +++++++
 base/src/commonMain/kotlin/flow/flow.kt       | 45 ++++++++++++-------
 beacons/build.gradle.kts                      |  1 +
 bluetooth-permissions/build.gradle.kts        |  1 +
 bluetooth/build.gradle.kts                    |  1 +
 build.gradle.kts                              |  1 +
 calendar-permissions/build.gradle.kts         |  1 +
 camera-permissions/build.gradle.kts           |  1 +
 contacts-permissions/build.gradle.kts         |  1 +
 date-time-picker/build.gradle.kts             |  1 +
 date-time/build.gradle.kts                    |  1 +
 gradle.properties                             |  1 +
 hud/build.gradle.kts                          |  1 +
 keyboard-compose/build.gradle.kts             |  1 +
 keyboard/build.gradle.kts                     |  1 +
 links/build.gradle.kts                        |  1 +
 location-permissions/build.gradle.kts         |  1 +
 location/build.gradle.kts                     |  1 +
 logging/build.gradle.kts                      |  1 +
 microphone-permissions/build.gradle.kts       |  1 +
 notifications-permissions/build.gradle.kts    |  1 +
 permissions/build.gradle.kts                  |  1 +
 resources-compose/build.gradle.kts            |  1 +
 resources-databinding/build.gradle.kts        |  1 +
 resources/build.gradle.kts                    |  1 +
 review/build.gradle.kts                       |  1 +
 scientific/build.gradle.kts                   |  1 +
 settings.gradle.kts                           |  3 ++
 storage-permissions/build.gradle.kts          |  1 +
 system/build.gradle.kts                       |  1 +
 test-utils-alerts/build.gradle.kts            |  1 +
 test-utils-architecture/build.gradle.kts      |  1 +
 test-utils-base/build.gradle.kts              |  1 +
 test-utils-bluetooth/build.gradle.kts         |  1 +
 test-utils-date-time-picker/build.gradle.kts  |  1 +
 test-utils-hud/build.gradle.kts               |  1 +
 test-utils-keyboard/build.gradle.kts          |  1 +
 test-utils-koin/build.gradle.kts              |  1 +
 test-utils-location/build.gradle.kts          |  1 +
 test-utils-permissions/build.gradle.kts       |  1 +
 test-utils-resources/build.gradle.kts         |  1 +
 test-utils-system/build.gradle.kts            |  1 +
 test-utils/build.gradle.kts                   |  1 +
 52 files changed, 152 insertions(+), 15 deletions(-)

diff --git a/adding-a-new-module/template/build.gradle.kts b/adding-a-new-module/template/build.gradle.kts
index a9a3c2b9b..c23b7e48e 100644
--- a/adding-a-new-module/template/build.gradle.kts
+++ b/adding-a-new-module/template/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/alerts/build.gradle.kts b/alerts/build.gradle.kts
index 3b3548a93..1ef9d89b7 100644
--- a/alerts/build.gradle.kts
+++ b/alerts/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/architecture-compose/build.gradle.kts b/architecture-compose/build.gradle.kts
index bd978363d..49a40415c 100644
--- a/architecture-compose/build.gradle.kts
+++ b/architecture-compose/build.gradle.kts
@@ -21,6 +21,7 @@ plugins {
     kotlin("plugin.serialization")
     id("jacoco")
     id("convention.publication")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts
index 0b9ec17d4..b7eda3b9e 100644
--- a/architecture/build.gradle.kts
+++ b/architecture/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("jacoco")
     id("com.android.library")
     id("convention.publication")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
     id("kotlinx-atomicfu")
 }
diff --git a/base-permissions/build.gradle.kts b/base-permissions/build.gradle.kts
index 207b7287a..00072b904 100644
--- a/base-permissions/build.gradle.kts
+++ b/base-permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
     id("kotlinx-atomicfu")
 }
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index caa4c68d6..5a9af9e16 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
     id("kotlinx-atomicfu")
 }
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableIterator.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableIterator.kt
index efc8e3012..4cef4c4f9 100644
--- a/base/src/commonMain/kotlin/collections/ConcurrentMutableIterator.kt
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableIterator.kt
@@ -30,10 +30,24 @@ internal open class InternalConcurrentMutableIterator<E, I : MutableIterator<E>>
     fun <T> synchronized(action: I.() -> T): T = lock.withLock { internal.action() }
 }
 
+/**
+ * A [MutableIterator] that ensures all calls to is happen in a concurrent way.
+ * @see [MutableCollection.iterator]
+ */
 class ConcurrentMutableIterator<E> internal constructor(private val internal: InternalConcurrentMutableIterator<E, MutableIterator<E>>) : MutableIterator<E> by internal {
     internal constructor(internal: MutableIterator<E>) : this(InternalConcurrentMutableIterator(internal))
+
+    /**
+     * Synchronizes an action block on the [MutableIterator]
+     * @param action The action block to execute concurrently
+     * @return The result of the [action] block
+     */
+    fun <T> synchronized(action: MutableIterator<E>.() -> T): T = internal.synchronized(action)
 }
 
+/**
+ * A [MutableListIterator] that ensures all calls to is happen in a concurrent way.
+ */
 class ConcurrentMutableListIterator<E> internal constructor(private val internal: InternalConcurrentMutableIterator<E, MutableListIterator<E>>) : MutableIterator<E> by internal, MutableListIterator<E> {
 
     internal constructor(internal: MutableListIterator<E>) : this(InternalConcurrentMutableIterator(internal))
@@ -44,4 +58,11 @@ class ConcurrentMutableListIterator<E> internal constructor(private val internal
     override fun previous(): E = internal.synchronized { previous() }
     override fun previousIndex(): Int = internal.synchronized { previousIndex() }
     override fun set(element: E) = internal.synchronized { set(element) }
+
+    /**
+     * Synchronizes an action block on the [MutableListIterator]
+     * @param action The action block to execute concurrently
+     * @return The result of the [action] block
+     */
+    fun <T> synchronized(action: MutableListIterator<E>.() -> T): T = internal.synchronized(action)
 }
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
index 91080c794..7a086127c 100644
--- a/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableList.kt
@@ -20,6 +20,10 @@ package com.splendo.kaluga.base.collections
 import kotlinx.atomicfu.locks.reentrantLock
 import kotlinx.atomicfu.locks.withLock
 
+/**
+ * A [MutableList] that ensures all calls to is happen in a concurrent way.
+ * @param E the type of elements contained in the list. The mutable list is invariant in its element type.
+ */
 class ConcurrentMutableList<E> internal constructor(private val internal: MutableList<E> = mutableListOf()) : MutableList<E> {
     private val lock = reentrantLock()
 
@@ -62,8 +66,21 @@ class ConcurrentMutableList<E> internal constructor(private val internal: Mutabl
     override fun hashCode(): Int = internal.hashCode()
     override fun toString(): String = internal.toString()
 
+    /**
+     * Synchronizes an action block on the [MutableList]
+     * @param action The action block to execute concurrently
+     * @return The result of the [action] block
+     */
     fun <T> synchronized(action: MutableList<E>.() -> T): T = lock.withLock { internal.action() }
 }
 
+/**
+ * Creates an empty [ConcurrentMutableList]
+ */
 fun <E> concurrentMutableListOf() = ConcurrentMutableList<E>(mutableListOf())
+
+/**
+ * Creates a [ConcurrentMutableList] containing [elements].
+ * @param elements The elements to add to the [ConcurrentMutableList]
+ */
 fun <E> concurrentMutableListOf(vararg elements: E) = ConcurrentMutableList(mutableListOf(*elements))
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
index 9932f96a4..c92549fe1 100644
--- a/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableMap.kt
@@ -20,6 +20,11 @@ package com.splendo.kaluga.base.collections
 import kotlinx.atomicfu.locks.reentrantLock
 import kotlinx.atomicfu.locks.withLock
 
+/**
+ * A [MutableMap] that ensures all calls to is happen in a concurrent way.
+ * @param K the type of map keys. The map is invariant in its key type.
+ * @param V the type of map values. The mutable map is invariant in its value type.
+ */
 class ConcurrentMutableMap<K, V> internal constructor(private val internal: MutableMap<K, V> = mutableMapOf()) : MutableMap<K, V> {
     private val lock = reentrantLock()
 
@@ -51,8 +56,21 @@ class ConcurrentMutableMap<K, V> internal constructor(private val internal: Muta
     override fun hashCode(): Int = internal.hashCode()
     override fun toString(): String = internal.toString()
 
+    /**
+     * Synchronizes an action block on the [MutableMap]
+     * @param action The action block to execute concurrently
+     * @return The result of the [action] block
+     */
     fun <T> synchronized(action: MutableMap<K, V>.() -> T): T = lock.withLock { internal.action() }
 }
 
+/**
+ * Creates an empty [ConcurrentMutableMap]
+ */
 fun <K, V> concurrentMutableMapOf() = ConcurrentMutableMap<K, V>(mutableMapOf())
+
+/**
+ * Creates a [ConcurrentMutableMap] containing [entries].
+ * @param entries The key-value pairs to add to the [ConcurrentMutableMap]
+ */
 fun <K, V> concurrentMutableMapOf(vararg entries: Pair<K, V>) = ConcurrentMutableMap(mutableMapOf(*entries))
diff --git a/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt b/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
index 393e7a7f5..c9bb75577 100644
--- a/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
+++ b/base/src/commonMain/kotlin/collections/ConcurrentMutableSet.kt
@@ -20,6 +20,10 @@ package com.splendo.kaluga.base.collections
 import kotlinx.atomicfu.locks.reentrantLock
 import kotlinx.atomicfu.locks.withLock
 
+/**
+ * A [MutableSet] that ensures all calls to is happen in a concurrent way.
+ * @param E the type of elements contained in the set. The mutable set is invariant in its element type.
+ */
 class ConcurrentMutableSet<E> internal constructor(private val internal: MutableSet<E> = mutableSetOf()) : MutableSet<E> {
     private val lock = reentrantLock()
 
@@ -52,8 +56,21 @@ class ConcurrentMutableSet<E> internal constructor(private val internal: Mutable
     override fun hashCode(): Int = internal.hashCode()
     override fun toString(): String = internal.toString()
 
+    /**
+     * Synchronizes an action block on the [MutableSet]
+     * @param action The action block to execute concurrently
+     * @return The result of the [action] block
+     */
     fun <T> synchronized(action: MutableSet<E>.() -> T): T = lock.withLock { internal.action() }
 }
 
+/**
+ * Creates an empty [ConcurrentMutableSet]
+ */
 fun <E> concurrentMutableSetOf() = ConcurrentMutableSet<E>(mutableSetOf())
+
+/**
+ * Creates a [ConcurrentMutableSet] containing [elements].
+ * @param elements The elements to add to the [ConcurrentMutableList]
+ */
 fun <E> concurrentMutableSetOf(vararg elements: E) = ConcurrentMutableSet(mutableSetOf(*elements))
diff --git a/base/src/commonMain/kotlin/flow/flow.kt b/base/src/commonMain/kotlin/flow/flow.kt
index a3678558f..8ba852bca 100644
--- a/base/src/commonMain/kotlin/flow/flow.kt
+++ b/base/src/commonMain/kotlin/flow/flow.kt
@@ -81,6 +81,11 @@ sealed interface SpecialFlowValue {
     interface NotImportant : SpecialFlowValue
 }
 
+/**
+ * Transforms a [Flow] to emit only up to the first [SpecialFlowValue.Last] received.
+ * @param includeLast if `true` the first [SpecialFlowValue.Last] will be emitted before emission stops.
+ * @return A flow that emits up to the first [SpecialFlowValue.Last] emitted by the original flow.
+ */
 fun <T> Flow<T>.takeUntilLast(includeLast: Boolean = true): Flow<T> = transformWhile {
     val notLast = it !is SpecialFlowValue.Last
     if (notLast || includeLast)
@@ -88,30 +93,40 @@ fun <T> Flow<T>.takeUntilLast(includeLast: Boolean = true): Flow<T> = transformW
     notLast
 }
 
+/**
+ * Filters out all values marked as [SpecialFlowValue.NotImportant] from a given [Flow]
+ * @return A flow that doesn't emit any elements implementing [SpecialFlowValue.NotImportant].
+ */
 @Suppress("NOTHING_TO_INLINE") // copies from filter()
 inline fun <T> Flow<T>.filterOnlyImportant(): Flow<T> =
     filterNot { it is SpecialFlowValue.NotImportant }
 
+/**
+ * Collects all elements from a [Flow] up to the first [SpecialFlowValue.Last] received.
+ * @param includeLast if `true` the first [SpecialFlowValue.Last] will be collected before emission stops.
+ * @param collector The [FlowCollector] to collect the values.
+ */
 suspend inline fun <T> Flow<T>.collectUntilLast(
     includeLast: Boolean = true,
-    crossinline action: suspend (value: T) -> Unit
+    collector: FlowCollector<T>
 ) =
-    takeUntilLast(includeLast).collect(object : FlowCollector<T> {
-        override suspend fun emit(value: T) = action(value)
-    }
-    )
+    takeUntilLast(includeLast).collect(collector)
 
-suspend inline fun <T> Flow<T>.collectImportant(crossinline action: suspend (value: T) -> Unit) =
-    filterOnlyImportant().collect(object : FlowCollector<T> {
-        override suspend fun emit(value: T) = action(value)
-    }
-    )
+/**
+ * Collects all elements not implementing [SpecialFlowValue.NotImportant] from a [Flow].
+ * @param collector The [FlowCollector] to collect the values.
+ */
+suspend inline fun <T> Flow<T>.collectImportant(
+    collector: FlowCollector<T>) =
+    filterOnlyImportant().collect(collector)
 
+/**
+ * Collects all elements not implementing [SpecialFlowValue.NotImportant] from a [Flow] up to the first [SpecialFlowValue.Last] received.
+ * @param includeLast if `true` the first [SpecialFlowValue.Last] will be collected before emission stops.
+ * @param collector The [FlowCollector] to collect the values.
+ */
 suspend inline fun <T> Flow<T>.collectImportantUntilLast(
     includeLast: Boolean = true,
-    crossinline action: suspend (value: T) -> Unit
+    collector: FlowCollector<T>
 ) =
-    takeUntilLast(includeLast).filterOnlyImportant().collect(object : FlowCollector<T> {
-        override suspend fun emit(value: T) = action(value)
-    }
-    )
+    takeUntilLast(includeLast).filterOnlyImportant().collect(collector)
diff --git a/beacons/build.gradle.kts b/beacons/build.gradle.kts
index b9d2292be..20c95f936 100644
--- a/beacons/build.gradle.kts
+++ b/beacons/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/bluetooth-permissions/build.gradle.kts b/bluetooth-permissions/build.gradle.kts
index ce7e10c83..136faca30 100644
--- a/bluetooth-permissions/build.gradle.kts
+++ b/bluetooth-permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts
index 347b8f7fd..6abab80cc 100644
--- a/bluetooth/build.gradle.kts
+++ b/bluetooth/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
     id("kotlinx-atomicfu")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index a54ea0a5b..5d50c285b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,6 +21,7 @@ plugins {
     id("convention.publication")
     id("org.jlleitschuh.gradle.ktlint")
     id("org.jlleitschuh.gradle.ktlint-idea")
+    id("org.jetbrains.dokka")
     id("org.jetbrains.kotlin.multiplatform") apply false
     id("org.jetbrains.kotlinx.binary-compatibility-validator")
 }
diff --git a/calendar-permissions/build.gradle.kts b/calendar-permissions/build.gradle.kts
index e149787d0..de607eb83 100644
--- a/calendar-permissions/build.gradle.kts
+++ b/calendar-permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/camera-permissions/build.gradle.kts b/camera-permissions/build.gradle.kts
index e149787d0..de607eb83 100644
--- a/camera-permissions/build.gradle.kts
+++ b/camera-permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/contacts-permissions/build.gradle.kts b/contacts-permissions/build.gradle.kts
index e149787d0..de607eb83 100644
--- a/contacts-permissions/build.gradle.kts
+++ b/contacts-permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/date-time-picker/build.gradle.kts b/date-time-picker/build.gradle.kts
index 89c796682..f2f010af7 100644
--- a/date-time-picker/build.gradle.kts
+++ b/date-time-picker/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/date-time/build.gradle.kts b/date-time/build.gradle.kts
index d18e64f74..fb91c6530 100644
--- a/date-time/build.gradle.kts
+++ b/date-time/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/gradle.properties b/gradle.properties
index c935df353..2fb501e84 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,7 @@ android.useAndroidX=true
 
 kaluga.androidGradlePluginVersion=7.4.0
 kaluga.kotlinVersion=1.8.0
+kaluga.dokkaVersion=1.7.20
 kaluga.googleServicesGradlePluginVersion=4.3.14
 kaluga.ktLintGradlePluginVersion=11.0.0
 kaluga.atomicFuGradlePluginVersion=0.19.0
diff --git a/hud/build.gradle.kts b/hud/build.gradle.kts
index bf41cd714..1d8d41b39 100644
--- a/hud/build.gradle.kts
+++ b/hud/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/keyboard-compose/build.gradle.kts b/keyboard-compose/build.gradle.kts
index 2488de54d..26d50d1a4 100644
--- a/keyboard-compose/build.gradle.kts
+++ b/keyboard-compose/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     kotlin("android")
     id("jacoco")
     id("convention.publication")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/keyboard/build.gradle.kts b/keyboard/build.gradle.kts
index bad79219b..928327aed 100644
--- a/keyboard/build.gradle.kts
+++ b/keyboard/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("com.android.library")
     id("convention.publication")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/links/build.gradle.kts b/links/build.gradle.kts
index 723734c7b..2be490c4c 100644
--- a/links/build.gradle.kts
+++ b/links/build.gradle.kts
@@ -21,6 +21,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/location-permissions/build.gradle.kts b/location-permissions/build.gradle.kts
index 961396e82..f2f662e89 100644
--- a/location-permissions/build.gradle.kts
+++ b/location-permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/location/build.gradle.kts b/location/build.gradle.kts
index 3ac9224c5..7f797eadb 100644
--- a/location/build.gradle.kts
+++ b/location/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
     id("kotlinx-atomicfu")
 }
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
index 3b427b75e..56eb19acf 100644
--- a/logging/build.gradle.kts
+++ b/logging/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("com.android.library")
     id("convention.publication")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
     id("kotlinx-atomicfu")
 }
diff --git a/microphone-permissions/build.gradle.kts b/microphone-permissions/build.gradle.kts
index e149787d0..de607eb83 100644
--- a/microphone-permissions/build.gradle.kts
+++ b/microphone-permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/notifications-permissions/build.gradle.kts b/notifications-permissions/build.gradle.kts
index e149787d0..de607eb83 100644
--- a/notifications-permissions/build.gradle.kts
+++ b/notifications-permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/permissions/build.gradle.kts b/permissions/build.gradle.kts
index 286ea1998..200f4bdcf 100644
--- a/permissions/build.gradle.kts
+++ b/permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/resources-compose/build.gradle.kts b/resources-compose/build.gradle.kts
index 0a23f934f..f97d0d91b 100644
--- a/resources-compose/build.gradle.kts
+++ b/resources-compose/build.gradle.kts
@@ -20,6 +20,7 @@ plugins {
     kotlin("android")
     id("jacoco")
     id("convention.publication")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/resources-databinding/build.gradle.kts b/resources-databinding/build.gradle.kts
index e7646c771..e5cd104a3 100644
--- a/resources-databinding/build.gradle.kts
+++ b/resources-databinding/build.gradle.kts
@@ -21,6 +21,7 @@ plugins {
     kotlin("kapt")
     id("jacoco")
     id("convention.publication")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts
index cca7252b2..49cf0ba25 100644
--- a/resources/build.gradle.kts
+++ b/resources/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/review/build.gradle.kts b/review/build.gradle.kts
index 587f4033f..dd87d65e7 100644
--- a/review/build.gradle.kts
+++ b/review/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/scientific/build.gradle.kts b/scientific/build.gradle.kts
index 29282d032..4a07d7e55 100644
--- a/scientific/build.gradle.kts
+++ b/scientific/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d25a8e0e6..e0f5364c7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -23,6 +23,7 @@ pluginManagement {
             val kalugaGoogleServicesGradlePluginVersion = settings.extra["kaluga.googleServicesGradlePluginVersion"]
             val kalugaAtomicFuGradlePluginVersion = settings.extra["kaluga.atomicFuGradlePluginVersion"]
             val kalugaBinaryCompatibilityValidatorVersion = settings.extra["kaluga.binaryCompatibilityValidatorVersion"]
+            val kalugaDokkaVersion = settings.extra["kaluga.dokkaVersion"]
 
             when (requested.id.id) {
                 "org.jetbrains.kotlin.multiplatform",
@@ -30,6 +31,8 @@ pluginManagement {
                 "org.jetbrains.kotlin.android",
                 "org.jetbrains.kotlin.kapt",
                 -> useVersion("$kalugaKotlinVersion")
+                "org.jetbrains.dokka"
+                -> useVersion("$kalugaDokkaVersion")
                 "com.android.library",
                 "com.android.application",
                 -> useVersion("$kalugaAndroidGradlePluginVersion")
diff --git a/storage-permissions/build.gradle.kts b/storage-permissions/build.gradle.kts
index e149787d0..de607eb83 100644
--- a/storage-permissions/build.gradle.kts
+++ b/storage-permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/system/build.gradle.kts b/system/build.gradle.kts
index 54f576471..07ea72bd1 100644
--- a/system/build.gradle.kts
+++ b/system/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-alerts/build.gradle.kts b/test-utils-alerts/build.gradle.kts
index b485bcb9f..a2e7db166 100644
--- a/test-utils-alerts/build.gradle.kts
+++ b/test-utils-alerts/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-architecture/build.gradle.kts b/test-utils-architecture/build.gradle.kts
index bdc5101b6..069f9b944 100644
--- a/test-utils-architecture/build.gradle.kts
+++ b/test-utils-architecture/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
     id("kotlinx-atomicfu")
 }
diff --git a/test-utils-base/build.gradle.kts b/test-utils-base/build.gradle.kts
index b44db92a0..b2779b58d 100644
--- a/test-utils-base/build.gradle.kts
+++ b/test-utils-base/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
     id("kotlinx-atomicfu")
 }
diff --git a/test-utils-bluetooth/build.gradle.kts b/test-utils-bluetooth/build.gradle.kts
index 1957a9301..d72fb16e4 100644
--- a/test-utils-bluetooth/build.gradle.kts
+++ b/test-utils-bluetooth/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-date-time-picker/build.gradle.kts b/test-utils-date-time-picker/build.gradle.kts
index 54af338a3..ddbecf1d3 100644
--- a/test-utils-date-time-picker/build.gradle.kts
+++ b/test-utils-date-time-picker/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-hud/build.gradle.kts b/test-utils-hud/build.gradle.kts
index 7824c4b93..e863bf2b4 100644
--- a/test-utils-hud/build.gradle.kts
+++ b/test-utils-hud/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-keyboard/build.gradle.kts b/test-utils-keyboard/build.gradle.kts
index 6247bd2b8..310e2891d 100644
--- a/test-utils-keyboard/build.gradle.kts
+++ b/test-utils-keyboard/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-koin/build.gradle.kts b/test-utils-koin/build.gradle.kts
index a68d2b538..8f50d91fe 100644
--- a/test-utils-koin/build.gradle.kts
+++ b/test-utils-koin/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-location/build.gradle.kts b/test-utils-location/build.gradle.kts
index bdca0d829..627dcbb2f 100644
--- a/test-utils-location/build.gradle.kts
+++ b/test-utils-location/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-permissions/build.gradle.kts b/test-utils-permissions/build.gradle.kts
index 245297644..47660a065 100644
--- a/test-utils-permissions/build.gradle.kts
+++ b/test-utils-permissions/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-resources/build.gradle.kts b/test-utils-resources/build.gradle.kts
index 210f27579..6febebbbe 100644
--- a/test-utils-resources/build.gradle.kts
+++ b/test-utils-resources/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-system/build.gradle.kts b/test-utils-system/build.gradle.kts
index 3ed49f0a7..d182e1821 100644
--- a/test-utils-system/build.gradle.kts
+++ b/test-utils-system/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index 124305731..edd408360 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 

From add2326bf35c57289ab0acaa96a2b3a43e18f685 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 12:38:12 +0100
Subject: [PATCH 142/227] Extract ServiceMonitor to separate module

---
 base/src/androidLibMain/AndroidManifest.xml   |  8 +---
 bluetooth/build.gradle.kts                    |  1 +
 .../androidLibMain/kotlin/BluetoothMonitor.kt |  4 +-
 .../androidLibMain/kotlin/scanner/Scanner.kt  |  1 -
 .../src/commonMain/kotlin/BluetoothMonitor.kt |  2 +-
 .../src/iosMain/kotlin/BluetoothMonitor.kt    |  4 +-
 .../src/jsMain/kotlin/BluetoothMonitor.kt     |  4 +-
 .../src/jvmMain/kotlin/BluetoothMonitor.kt    |  4 +-
 location/build.gradle.kts                     |  1 +
 .../kotlin/location/LocationManager.kt        |  1 -
 .../kotlin/location/LocationMonitor.kt        |  4 +-
 .../kotlin/location/LocationMonitor.kt        |  2 +-
 .../kotlin/location/LocationMonitor.kt        |  4 +-
 location/src/jsMain/kotlin/LocationMonitor.kt |  4 +-
 .../src/jvmMain/kotlin/LocationMonitor.kt     |  4 +-
 service/README.md                             | 17 ++++++++
 service/build.gradle.kts                      | 26 +++++++++++++
 .../src/androidLibMain/AndroidManifest.xml    |  8 ++++
 .../kotlin}/EnableServiceActivity.kt          |  4 +-
 .../src/commonMain/kotlin}/ServiceMonitor.kt  | 39 +++++++++++++++----
 .../src/main/res/values/service_themes.xml    |  0
 settings.gradle.kts                           |  2 +
 test-utils-bluetooth/build.gradle.kts         |  1 +
 .../commonMain/kotlin/MockBluetoothMonitor.kt |  2 +-
 test-utils-location/build.gradle.kts          |  1 +
 .../commonMain/kotlin/MockLocationMonitor.kt  |  2 +-
 test-utils-service/build.gradle.kts           | 27 +++++++++++++
 .../src/androidLibMain/AndroidManifest.xml    |  2 +
 .../commonMain/kotlin}/MockServiceMonitor.kt  |  6 +--
 29 files changed, 144 insertions(+), 41 deletions(-)
 create mode 100644 service/README.md
 create mode 100644 service/build.gradle.kts
 create mode 100644 service/src/androidLibMain/AndroidManifest.xml
 rename {base/src/androidLibMain/kotlin/monitor => service/src/androidLibMain/kotlin}/EnableServiceActivity.kt (97%)
 rename {base/src/commonMain/kotlin/monitor => service/src/commonMain/kotlin}/ServiceMonitor.kt (53%)
 rename {base => service}/src/main/res/values/service_themes.xml (100%)
 create mode 100644 test-utils-service/build.gradle.kts
 create mode 100644 test-utils-service/src/androidLibMain/AndroidManifest.xml
 rename {test-utils-base/src/commonMain/kotlin/monitor => test-utils-service/src/commonMain/kotlin}/MockServiceMonitor.kt (89%)

diff --git a/base/src/androidLibMain/AndroidManifest.xml b/base/src/androidLibMain/AndroidManifest.xml
index 841806823..f6d251827 100644
--- a/base/src/androidLibMain/AndroidManifest.xml
+++ b/base/src/androidLibMain/AndroidManifest.xml
@@ -1,9 +1,3 @@
 <manifest package="com.splendo.kaluga.base"
           xmlns:android="http://schemas.android.com/apk/res/android"
->
-    <application>
-        <activity
-            android:name=".monitor.EnableServiceActivity"
-            android:theme="@style/Service"/>
-    </application>
-</manifest>
+/>
diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts
index 347b8f7fd..38e9d18fd 100644
--- a/bluetooth/build.gradle.kts
+++ b/bluetooth/build.gradle.kts
@@ -20,6 +20,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
+                implementation(project(":service"))
                 api(project(":bluetooth-permissions", ""))
                 apiDependency(Dependencies.KotlinX.Serialization.Core)
             }
diff --git a/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt
index c7995817b..3a092ba11 100644
--- a/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt
@@ -23,8 +23,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import com.splendo.kaluga.base.ApplicationHolder
-import com.splendo.kaluga.base.monitor.DefaultServiceMonitor
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.DefaultServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 
 actual interface BluetoothMonitor : ServiceMonitor {
 
diff --git a/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt b/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
index 9628b2bcb..40b4e16d0 100644
--- a/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
@@ -31,7 +31,6 @@ import android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS
 import androidx.core.app.ActivityCompat
 import com.splendo.kaluga.base.ApplicationHolder
 import com.splendo.kaluga.base.flow.filterOnlyImportant
-import com.splendo.kaluga.base.monitor.EnableServiceActivity
 import com.splendo.kaluga.base.utils.containsAny
 import com.splendo.kaluga.bluetooth.BluetoothMonitor
 import com.splendo.kaluga.bluetooth.UUID
diff --git a/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt
index 588460e7e..0f875bb2a 100644
--- a/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.bluetooth
 
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 
 expect interface BluetoothMonitor : ServiceMonitor {
 
diff --git a/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
index 3f85e7a20..466026682 100644
--- a/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
@@ -17,8 +17,8 @@
 
 package com.splendo.kaluga.bluetooth
 
-import com.splendo.kaluga.base.monitor.DefaultServiceMonitor
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.DefaultServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 import kotlinx.atomicfu.locks.reentrantLock
 import kotlinx.atomicfu.locks.withLock
 import platform.CoreBluetooth.CBCentralManager
diff --git a/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt
index 59f406826..13bf6cc89 100644
--- a/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt
@@ -17,8 +17,8 @@
 
 package com.splendo.kaluga.bluetooth
 
-import com.splendo.kaluga.base.monitor.DefaultServiceMonitor
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.DefaultServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 
 actual interface BluetoothMonitor : ServiceMonitor {
     actual class Builder {
diff --git a/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt
index 59f406826..13bf6cc89 100644
--- a/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt
@@ -17,8 +17,8 @@
 
 package com.splendo.kaluga.bluetooth
 
-import com.splendo.kaluga.base.monitor.DefaultServiceMonitor
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.DefaultServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 
 actual interface BluetoothMonitor : ServiceMonitor {
     actual class Builder {
diff --git a/location/build.gradle.kts b/location/build.gradle.kts
index 3ac9224c5..23bbe7634 100644
--- a/location/build.gradle.kts
+++ b/location/build.gradle.kts
@@ -19,6 +19,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
+                implementation(project(":service"))
                 api(project(":location-permissions", ""))
             }
         }
diff --git a/location/src/androidLibMain/kotlin/location/LocationManager.kt b/location/src/androidLibMain/kotlin/location/LocationManager.kt
index d6e2638b7..0203b17cd 100644
--- a/location/src/androidLibMain/kotlin/location/LocationManager.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationManager.kt
@@ -21,7 +21,6 @@ import android.content.Context
 import android.content.Intent
 import android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS
 import com.splendo.kaluga.base.ApplicationHolder
-import com.splendo.kaluga.base.monitor.EnableServiceActivity
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
diff --git a/location/src/androidLibMain/kotlin/location/LocationMonitor.kt b/location/src/androidLibMain/kotlin/location/LocationMonitor.kt
index 2dff4d429..2b9294702 100644
--- a/location/src/androidLibMain/kotlin/location/LocationMonitor.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationMonitor.kt
@@ -24,8 +24,8 @@ import android.content.IntentFilter
 import android.location.LocationManager
 import androidx.core.location.LocationManagerCompat
 import com.splendo.kaluga.base.ApplicationHolder
-import com.splendo.kaluga.base.monitor.DefaultServiceMonitor
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.DefaultServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 
 actual interface LocationMonitor : ServiceMonitor {
 
diff --git a/location/src/commonMain/kotlin/location/LocationMonitor.kt b/location/src/commonMain/kotlin/location/LocationMonitor.kt
index 69a4fa4a4..6b853284a 100644
--- a/location/src/commonMain/kotlin/location/LocationMonitor.kt
+++ b/location/src/commonMain/kotlin/location/LocationMonitor.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.location
 
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 
 expect interface LocationMonitor : ServiceMonitor {
     class Builder {
diff --git a/location/src/iosMain/kotlin/location/LocationMonitor.kt b/location/src/iosMain/kotlin/location/LocationMonitor.kt
index cedbfb60f..2caeeeaad 100644
--- a/location/src/iosMain/kotlin/location/LocationMonitor.kt
+++ b/location/src/iosMain/kotlin/location/LocationMonitor.kt
@@ -17,8 +17,8 @@
 
 package com.splendo.kaluga.location
 
-import com.splendo.kaluga.base.monitor.DefaultServiceMonitor
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.DefaultServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 import platform.CoreLocation.CLLocationManager
 import platform.CoreLocation.CLLocationManagerDelegateProtocol
 import platform.darwin.NSObject
diff --git a/location/src/jsMain/kotlin/LocationMonitor.kt b/location/src/jsMain/kotlin/LocationMonitor.kt
index 5d38daa8d..651e4365d 100644
--- a/location/src/jsMain/kotlin/LocationMonitor.kt
+++ b/location/src/jsMain/kotlin/LocationMonitor.kt
@@ -17,8 +17,8 @@
 
 package com.splendo.kaluga.location
 
-import com.splendo.kaluga.base.monitor.DefaultServiceMonitor
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.DefaultServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 
 actual interface LocationMonitor : ServiceMonitor {
 
diff --git a/location/src/jvmMain/kotlin/LocationMonitor.kt b/location/src/jvmMain/kotlin/LocationMonitor.kt
index 5d38daa8d..651e4365d 100644
--- a/location/src/jvmMain/kotlin/LocationMonitor.kt
+++ b/location/src/jvmMain/kotlin/LocationMonitor.kt
@@ -17,8 +17,8 @@
 
 package com.splendo.kaluga.location
 
-import com.splendo.kaluga.base.monitor.DefaultServiceMonitor
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.DefaultServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 
 actual interface LocationMonitor : ServiceMonitor {
 
diff --git a/service/README.md b/service/README.md
new file mode 100644
index 000000000..da595ade7
--- /dev/null
+++ b/service/README.md
@@ -0,0 +1,17 @@
+## Service
+Basic utilities for adding new services to Kaluga. Services are platform features that can be enabled/disabled by the user or OS.
+
+## Installing
+This library is available on Maven Central. You can import Kaluga Storage Permissions as follows:
+
+ ```kotlin
+ repositories {
+     // ...
+     mavenCentral()
+ }
+ // ...
+ dependencies {
+     // ...
+     implementation("com.splendo.kaluga:service:$kalugaVersion")
+ }
+ ```
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
new file mode 100644
index 000000000..16226d995
--- /dev/null
+++ b/service/build.gradle.kts
@@ -0,0 +1,26 @@
+plugins {
+    kotlin("multiplatform")
+    id("jacoco")
+    id("convention.publication")
+    id("com.android.library")
+    id("org.jlleitschuh.gradle.ktlint")
+}
+
+publishableComponent()
+
+dependencies { }
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(project(":logging"))
+                implementation(project(":base"))
+            }
+        }
+        commonTest {
+            dependencies {
+            }
+        }
+    }
+}
diff --git a/service/src/androidLibMain/AndroidManifest.xml b/service/src/androidLibMain/AndroidManifest.xml
new file mode 100644
index 000000000..728745135
--- /dev/null
+++ b/service/src/androidLibMain/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest package="com.splendo.kaluga.service"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+            android:name=".EnableServiceActivity"
+            android:theme="@style/Service"/>
+    </application>
+</manifest>
diff --git a/base/src/androidLibMain/kotlin/monitor/EnableServiceActivity.kt b/service/src/androidLibMain/kotlin/EnableServiceActivity.kt
similarity index 97%
rename from base/src/androidLibMain/kotlin/monitor/EnableServiceActivity.kt
rename to service/src/androidLibMain/kotlin/EnableServiceActivity.kt
index d16a52670..502f4644e 100644
--- a/base/src/androidLibMain/kotlin/monitor/EnableServiceActivity.kt
+++ b/service/src/androidLibMain/kotlin/EnableServiceActivity.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.base.monitor
+package com.splendo.kaluga.service
 
 import android.app.Activity
 import android.content.Context
diff --git a/base/src/commonMain/kotlin/monitor/ServiceMonitor.kt b/service/src/commonMain/kotlin/ServiceMonitor.kt
similarity index 53%
rename from base/src/commonMain/kotlin/monitor/ServiceMonitor.kt
rename to service/src/commonMain/kotlin/ServiceMonitor.kt
index 3f317f96a..f8fcef8a2 100644
--- a/base/src/commonMain/kotlin/monitor/ServiceMonitor.kt
+++ b/service/src/commonMain/kotlin/ServiceMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,29 +15,54 @@
 
  */
 
-package com.splendo.kaluga.base.monitor
+package com.splendo.kaluga.service
 
+import com.splendo.kaluga.logging.Logger
+import com.splendo.kaluga.logging.RestrictedLogLevel
+import com.splendo.kaluga.logging.RestrictedLogger
 import com.splendo.kaluga.logging.debug
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.filterNotNull
 
+/**
+ * Interface to monitor whether a given service is enabled
+ */
 interface ServiceMonitor {
+    /**
+     * If `true` the service is currently enabled.
+     */
     val isServiceEnabled: Boolean
+
+    /**
+     * A [Flow] representing the enabled status of the service
+     */
     val isEnabled: Flow<Boolean>
+
+    /**
+     * When called, the [ServiceMonitor] will start monitoring for changes to [isServiceEnabled]
+     */
     fun startMonitoring()
+
+    /**
+     * When called, the [ServiceMonitor] will stop monitoring for changes to [isServiceEnabled]
+     */
     fun stopMonitoring()
 }
 
-abstract class DefaultServiceMonitor : ServiceMonitor {
+/**
+ * Default implementation of [ServiceMonitor].
+ * @param logger The [Logger] to log and changes to.
+ */
+abstract class DefaultServiceMonitor(protected val logger: Logger = RestrictedLogger(RestrictedLogLevel.None)) : ServiceMonitor {
 
-    protected val TAG: String = this::class.simpleName ?: "ServiceMonitor"
+    protected open val TAG: String = this::class.simpleName ?: "ServiceMonitor"
 
     private val _isEnabled = MutableStateFlow<Boolean?>(null)
     override val isEnabled get() = _isEnabled.filterNotNull()
 
     final override fun startMonitoring() {
-        debug(TAG) { "Start monitoring service state ($isServiceEnabled)" }
+        logger.debug(TAG) { "Start monitoring service state ($isServiceEnabled)" }
         updateState()
         monitoringDidStart()
     }
@@ -45,7 +70,7 @@ abstract class DefaultServiceMonitor : ServiceMonitor {
     abstract fun monitoringDidStart()
 
     final override fun stopMonitoring() {
-        debug(TAG) { "Stop monitoring service state" }
+        logger.debug(TAG) { "Stop monitoring service state" }
         _isEnabled.value = null
         monitoringDidStop()
     }
@@ -53,7 +78,7 @@ abstract class DefaultServiceMonitor : ServiceMonitor {
     abstract fun monitoringDidStop()
 
     protected fun updateState() {
-        debug(TAG) { "updateState isLocationEnabled = $isServiceEnabled" }
+        logger.debug(TAG) { "updateState isLocationEnabled = $isServiceEnabled" }
         _isEnabled.value = isServiceEnabled
     }
 }
diff --git a/base/src/main/res/values/service_themes.xml b/service/src/main/res/values/service_themes.xml
similarity index 100%
rename from base/src/main/res/values/service_themes.xml
rename to service/src/main/res/values/service_themes.xml
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7f1f0775f..5863cb094 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -82,6 +82,7 @@ include(":resources-compose")
 include(":resources-databinding")
 include(":review")
 include(":scientific")
+include(":service")
 include(":system")
 // Test Utils
 include(":test-utils")
@@ -95,4 +96,5 @@ include(":test-utils-koin")
 include(":test-utils-location")
 include(":test-utils-permissions")
 include(":test-utils-resources")
+include(":test-utils-service")
 include(":test-utils-system")
diff --git a/test-utils-bluetooth/build.gradle.kts b/test-utils-bluetooth/build.gradle.kts
index 1957a9301..bee9c0f98 100644
--- a/test-utils-bluetooth/build.gradle.kts
+++ b/test-utils-bluetooth/build.gradle.kts
@@ -13,6 +13,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":test-utils-permissions"))
+                api(project(":test-utils-service"))
                 api(project(":bluetooth"))
             }
         }
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/MockBluetoothMonitor.kt b/test-utils-bluetooth/src/commonMain/kotlin/MockBluetoothMonitor.kt
index 4b1d236fc..11af00d0d 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/MockBluetoothMonitor.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/MockBluetoothMonitor.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.test.bluetooth
 
 import com.splendo.kaluga.bluetooth.BluetoothMonitor
-import com.splendo.kaluga.test.base.monitor.MockServiceMonitor
+import com.splendo.kaluga.test.service.MockServiceMonitor
 import kotlinx.coroutines.flow.StateFlow
 
 /**
diff --git a/test-utils-location/build.gradle.kts b/test-utils-location/build.gradle.kts
index bdca0d829..b5a0a28c6 100644
--- a/test-utils-location/build.gradle.kts
+++ b/test-utils-location/build.gradle.kts
@@ -14,6 +14,7 @@ kotlin {
             dependencies {
                 api(project(":location"))
                 api(project(":test-utils-permissions"))
+                api(project(":test-utils-service"))
             }
         }
         commonTest {
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationMonitor.kt b/test-utils-location/src/commonMain/kotlin/MockLocationMonitor.kt
index 646266e97..ab3a899f7 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationMonitor.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationMonitor.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.test.location
 
 import com.splendo.kaluga.location.LocationMonitor
-import com.splendo.kaluga.test.base.monitor.MockServiceMonitor
+import com.splendo.kaluga.test.service.MockServiceMonitor
 import kotlinx.coroutines.flow.StateFlow
 
 /**
diff --git a/test-utils-service/build.gradle.kts b/test-utils-service/build.gradle.kts
new file mode 100644
index 000000000..489012e58
--- /dev/null
+++ b/test-utils-service/build.gradle.kts
@@ -0,0 +1,27 @@
+plugins {
+    kotlin("multiplatform")
+    id("jacoco")
+    id("convention.publication")
+    id("com.android.library")
+    id("org.jlleitschuh.gradle.ktlint")
+}
+
+/* Multiplatform component */
+publishableComponent()
+
+dependencies { }
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(project(":service"))
+                api(project(":test-utils-base"))
+            }
+        }
+        commonTest {
+            dependencies {
+            }
+        }
+    }
+}
diff --git a/test-utils-service/src/androidLibMain/AndroidManifest.xml b/test-utils-service/src/androidLibMain/AndroidManifest.xml
new file mode 100644
index 000000000..00cb601f9
--- /dev/null
+++ b/test-utils-service/src/androidLibMain/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest package="com.splendo.kaluga.test.service"
+          xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/test-utils-base/src/commonMain/kotlin/monitor/MockServiceMonitor.kt b/test-utils-service/src/commonMain/kotlin/MockServiceMonitor.kt
similarity index 89%
rename from test-utils-base/src/commonMain/kotlin/monitor/MockServiceMonitor.kt
rename to test-utils-service/src/commonMain/kotlin/MockServiceMonitor.kt
index d73bff82f..0a97c1c8e 100644
--- a/test-utils-base/src/commonMain/kotlin/monitor/MockServiceMonitor.kt
+++ b/test-utils-service/src/commonMain/kotlin/MockServiceMonitor.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
 
  */
 
-package com.splendo.kaluga.test.base.monitor
+package com.splendo.kaluga.test.service
 
-import com.splendo.kaluga.base.monitor.ServiceMonitor
+import com.splendo.kaluga.service.ServiceMonitor
 import com.splendo.kaluga.test.base.mock.call
 import com.splendo.kaluga.test.base.mock.parameters.mock
 import kotlinx.coroutines.flow.StateFlow

From 6a2d538647dd2396e138c9dbe06436c0c6eedee6 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 13:07:33 +0100
Subject: [PATCH 143/227] Documentation fixes

---
 README.md                                         |  2 ++
 .../src/androidLibMain/kotlin/scanner/Scanner.kt  |  1 +
 .../kotlin/location/LocationManager.kt            |  1 +
 .../kotlin/EnableServiceActivity.kt               | 15 +++++++++++++--
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 01f995725..2374a4e4e 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,7 @@ To use kaluga with SwiftUI and/or Combine we have a [repo with Sourcery template
 | [resources-databinding](resources-databinding/)         | Databinding extensions for resources                                               | com.splendo.kaluga:resources-databinding     |
 | [review](review/)                                       | Used for requesting the user to review the app                                     | com.splendo.kaluga:review                    |
 | [scientific](scientific/)                               | Scientific units and conversions                                                   | com.splendo.kaluga:scientific                |
+| [service](service/)                                     | Used for adding services to Kaluga                                                 | com.splendo.kaluga:service                   |
 | [system](system/)                                       | System APIs such as network, audio, battery                                        | com.splendo.kaluga:system                    |
 | [test-utils](test-utils/)                               | Enables easier testing of Kaluga components                                        | com.splendo.kaluga:test-utils                |
 | [test-utils-base](test-utils-base/)                     | Enables easier testing of Kaluga components                                        | com.splendo.kaluga:test-utils-base           |
@@ -138,6 +139,7 @@ To use kaluga with SwiftUI and/or Combine we have a [repo with Sourcery template
 | [test-utils-location](test-utils-location/)             | Enables easier testing of Location module                                          | com.splendo.kaluga:test-utils-location       |
 | [test-utils-permissions](test-utils-permissions/)       | Enables easier testing of Permissions modules                                      | com.splendo.kaluga:test-utils-permissions    |
 | [test-utils-resources](test-utils-resources/)           | Enables easier testing of Resources module                                         | com.splendo.kaluga:test-utils-resources      |
+| [test-utils-service](test-utils-service/)               | Enables easier testing of Service module                                           | com.splendo.kaluga:test-utils-service        |
 | [test-utils-system](test-utils-system/)                 | Enables easier testing of System module                                            | com.splendo.kaluga:test-utils-system         |
 
 ### Friends of kaluga
diff --git a/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt b/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
index 40b4e16d0..249e8bca1 100644
--- a/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
@@ -42,6 +42,7 @@ import com.splendo.kaluga.location.LocationMonitor
 import com.splendo.kaluga.logging.e
 import com.splendo.kaluga.permissions.base.PermissionState
 import com.splendo.kaluga.permissions.location.LocationPermission
+import com.splendo.kaluga.service.EnableServiceActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
diff --git a/location/src/androidLibMain/kotlin/location/LocationManager.kt b/location/src/androidLibMain/kotlin/location/LocationManager.kt
index 0203b17cd..ff589d949 100644
--- a/location/src/androidLibMain/kotlin/location/LocationManager.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationManager.kt
@@ -26,6 +26,7 @@ import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.location.LocationPermission
 import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
+import com.splendo.kaluga.service.EnableServiceActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
diff --git a/service/src/androidLibMain/kotlin/EnableServiceActivity.kt b/service/src/androidLibMain/kotlin/EnableServiceActivity.kt
index 502f4644e..a3ed30df7 100644
--- a/service/src/androidLibMain/kotlin/EnableServiceActivity.kt
+++ b/service/src/androidLibMain/kotlin/EnableServiceActivity.kt
@@ -28,13 +28,24 @@ import com.splendo.kaluga.base.collections.ConcurrentMutableMap
 import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import kotlinx.coroutines.CompletableDeferred
 
+/**
+ * An [AppCompatActivity] for requesting the user to enable a service.
+ * Do not create directly, instead launch using [showEnableServiceActivity].
+ */
 class EnableServiceActivity : AppCompatActivity() {
 
     companion object {
         private const val EXTRA_CALLBACK_ID = "EXTRA_CALLBACK_ID"
         private const val EXTRA_SETTING_ID = "EXTRA_CALLBACK_ID"
-        val enablingHandlers: ConcurrentMutableMap<Pair<String, String>, CompletableDeferred<Boolean>> = concurrentMutableMapOf()
-
+        private val enablingHandlers: ConcurrentMutableMap<Pair<String, String>, CompletableDeferred<Boolean>> = concurrentMutableMapOf()
+
+        /**
+         * Shows an [EnableServiceActivity] that launches a given [Intent] and waits for it to return.
+         * @param context The [Context] in which to launch the [EnableServiceActivity]
+         * @param identifier Unique identifier used to ensure the [Intent] returns to the right result.
+         * @param settingsIntent An [Intent] that requests the user to enable a service. Should work with [ActivityResultContracts.StartActivityForResult] to get a proper result.
+         * @return A [CompletableDeferred] that completes when [settingsIntent] has completed. `true` indicates that the service was successfully enabled.
+         */
         fun showEnableServiceActivity(context: Context, identifier: String, settingsIntent: Intent): CompletableDeferred<Boolean> {
             val settingKey = settingsIntent.action.orEmpty()
             val intent = Intent(context, EnableServiceActivity::class.java).apply {

From 9bf3e078008790ebdf8e04123821f45459719f34 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 13:21:37 +0100
Subject: [PATCH 144/227] API Dump

---
 architecture/api/jvm/architecture.api         |  63 ++++++++-
 base/api/androidLib/base.api                  |  28 ----
 base/api/jvm/base.api                         | 121 ------------------
 bluetooth/api/androidLib/bluetooth.api        |   4 +-
 bluetooth/api/jvm/bluetooth.api               |   4 +-
 location/api/androidLib/location.api          |   4 +-
 location/api/jvm/location.api                 |   4 +-
 service/api/androidLib/service.api            |  30 +++++
 service/api/jvm/service.api                   |  21 +++
 .../api/androidLib/test-utils-base.api        |  10 --
 .../api/androidLib/test-utils-bluetooth.api   |   2 +-
 .../api/jvm/test-utils-bluetooth.api          |   2 +-
 .../api/androidLib/test-utils-location.api    |   2 +-
 .../api/jvm/test-utils-location.api           |   2 +-
 .../api/androidLib/test-utils-service.api     |  17 +++
 .../api/jvm/test-utils-service.api            |  10 ++
 16 files changed, 150 insertions(+), 174 deletions(-)
 create mode 100644 service/api/androidLib/service.api
 create mode 100644 service/api/jvm/service.api
 create mode 100644 test-utils-service/api/androidLib/test-utils-service.api
 create mode 100644 test-utils-service/api/jvm/test-utils-service.api

diff --git a/architecture/api/jvm/architecture.api b/architecture/api/jvm/architecture.api
index 35d5a83a6..7379c8e79 100644
--- a/architecture/api/jvm/architecture.api
+++ b/architecture/api/jvm/architecture.api
@@ -1,9 +1,6 @@
 public abstract interface class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 }
 
-public abstract interface class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribableMarker {
-}
-
 public class com/splendo/kaluga/architecture/navigation/NavigationAction {
 	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)V
 	public final fun getBundle ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;
@@ -148,6 +145,10 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSp
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
+public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+	public abstract fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
+}
+
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
 	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)V
 	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;
@@ -385,6 +386,9 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
+public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ListNavigationBundleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
+}
+
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
 	public final fun component1 ()[J
 	public final fun copy ([J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue;
@@ -407,6 +411,9 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
+public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+}
+
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
 	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;
@@ -712,6 +719,30 @@ public final class com/splendo/kaluga/architecture/observable/FlowObservable : c
 	public final fun getFlow ()Lkotlinx/coroutines/flow/Flow;
 }
 
+public final class com/splendo/kaluga/architecture/observable/FlowObservableKt {
+	public static final fun toDefaultObservable (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
+	public static synthetic fun toDefaultObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
+	public static final fun toInitializedObservable (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
+	public static final fun toInitializedObservable (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
+	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
+	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
+	public static final fun toUninitializedObservable (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowObservable;
+	public static synthetic fun toUninitializedObservable$default (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowObservable;
+}
+
+public final class com/splendo/kaluga/architecture/observable/FlowSubjectKt {
+	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
+	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
+	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
+	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
+	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
+	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
+	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
+	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
+	public static final fun toUninitializedSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowSubject;
+	public static synthetic fun toUninitializedSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowSubject;
+}
+
 public abstract interface class com/splendo/kaluga/architecture/observable/Initial {
 	public abstract fun getCurrentOrNull ()Ljava/lang/Object;
 	public abstract fun getInitialValue ()Lcom/splendo/kaluga/architecture/observable/ObservableOptional;
@@ -781,6 +812,10 @@ public final class com/splendo/kaluga/architecture/observable/ObservableOptional
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/splendo/kaluga/architecture/observable/ObservableOptionalKt {
+	public static final fun asResult (Lcom/splendo/kaluga/architecture/observable/ObservableOptional;Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;)Lcom/splendo/kaluga/architecture/observable/ObservableOptional;
+}
+
 public final class com/splendo/kaluga/architecture/observable/ObservablesKt {
 	public static final fun observableOf (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SimpleInitializedObservable;
 	public static final fun observeFlow (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;)V
@@ -860,6 +895,11 @@ public class com/splendo/kaluga/architecture/observable/ObservationInitialized :
 	public fun setValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
 }
 
+public final class com/splendo/kaluga/architecture/observable/ObservationKt {
+	public static final fun observeFlow (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;)V
+	public static synthetic fun observeFlow$default (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;ILjava/lang/Object;)V
+}
+
 public final class com/splendo/kaluga/architecture/observable/ObservationUninitialized : com/splendo/kaluga/architecture/observable/Observation, com/splendo/kaluga/architecture/observable/MutableUninitialized, kotlin/properties/ReadWriteProperty {
 	public fun <init> ()V
 	public fun getInitialValue ()Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Nothing;
@@ -886,6 +926,11 @@ public final class com/splendo/kaluga/architecture/observable/ReadOnlyPropertyIn
 	public synthetic fun <init> (Lkotlin/properties/ReadOnlyProperty;Lcom/splendo/kaluga/architecture/observable/ObservationInitialized;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
+public final class com/splendo/kaluga/architecture/observable/ReadOnlyPropertyObservableKt {
+	public static final fun toDefaultObservable (Lkotlin/properties/ReadOnlyProperty;Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadOnlyPropertyDefaultObservable;
+	public static final fun toInitializedObservable (Lkotlin/properties/ReadOnlyProperty;)Lcom/splendo/kaluga/architecture/observable/ReadOnlyPropertyInitializedObservable;
+}
+
 public final class com/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject : com/splendo/kaluga/architecture/observable/BaseDefaultSubject, com/splendo/kaluga/architecture/observable/SuspendableSetter {
 	public fun <init> (Ljava/lang/Object;Lkotlin/properties/ReadWriteProperty;Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/architecture/observable/ObservationDefault;)V
 	public synthetic fun <init> (Ljava/lang/Object;Lkotlin/properties/ReadWriteProperty;Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/architecture/observable/ObservationDefault;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -906,6 +951,13 @@ public final class com/splendo/kaluga/architecture/observable/ReadWritePropertyO
 	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
+public final class com/splendo/kaluga/architecture/observable/ReadWritePropertySubjectKt {
+	public static final fun toDefaultSubject (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
+	public static synthetic fun toDefaultSubject$default (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
+	public static final fun toInitializedSubject (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
+	public static synthetic fun toInitializedSubject$default (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
+}
+
 public class com/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject : com/splendo/kaluga/architecture/observable/BaseDefaultSubject, com/splendo/kaluga/architecture/observable/SuspendableSetter {
 	public fun <init> (Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/MutableSharedFlow;ZLcom/splendo/kaluga/architecture/observable/ObservationDefault;)V
 	public synthetic fun <init> (Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/MutableSharedFlow;ZLcom/splendo/kaluga/architecture/observable/ObservationDefault;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -978,6 +1030,11 @@ public class com/splendo/kaluga/architecture/observable/StateFlowSubject : com/s
 	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
+public final class com/splendo/kaluga/architecture/observable/SubjectKt {
+	public static final fun bind (Lcom/splendo/kaluga/architecture/observable/BasicSubject;Lkotlinx/coroutines/CoroutineScope;)V
+	public static final fun subjectOf (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SimpleInitializedSubject;
+}
+
 public abstract interface class com/splendo/kaluga/architecture/observable/SuspendableSetter : com/splendo/kaluga/architecture/observable/Postable {
 	public abstract fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index 129d79077..4e6150e80 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -201,34 +201,6 @@ public abstract interface class com/splendo/kaluga/base/flow/SpecialFlowValue$La
 public abstract interface class com/splendo/kaluga/base/flow/SpecialFlowValue$NotImportant : com/splendo/kaluga/base/flow/SpecialFlowValue {
 }
 
-public abstract class com/splendo/kaluga/base/monitor/DefaultServiceMonitor : com/splendo/kaluga/base/monitor/ServiceMonitor {
-	public fun <init> ()V
-	protected final fun getTAG ()Ljava/lang/String;
-	public fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
-	public abstract fun monitoringDidStart ()V
-	public abstract fun monitoringDidStop ()V
-	public final fun startMonitoring ()V
-	public final fun stopMonitoring ()V
-	protected final fun updateState ()V
-}
-
-public final class com/splendo/kaluga/base/monitor/EnableServiceActivity : androidx/appcompat/app/AppCompatActivity {
-	public static final field Companion Lcom/splendo/kaluga/base/monitor/EnableServiceActivity$Companion;
-	public fun <init> ()V
-}
-
-public final class com/splendo/kaluga/base/monitor/EnableServiceActivity$Companion {
-	public final fun getEnablingHandlers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
-	public final fun showEnableServiceActivity (Landroid/content/Context;Ljava/lang/String;Landroid/content/Intent;)Lkotlinx/coroutines/CompletableDeferred;
-}
-
-public abstract interface class com/splendo/kaluga/base/monitor/ServiceMonitor {
-	public abstract fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
-	public abstract fun isServiceEnabled ()Z
-	public abstract fun startMonitoring ()V
-	public abstract fun stopMonitoring ()V
-}
-
 public abstract class com/splendo/kaluga/base/state/BaseColdStateRepo : com/splendo/kaluga/base/state/StateRepo {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index cf523f79d..5c00bc5aa 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -1089,124 +1089,3 @@ public final class com/splendo/kaluga/base/utils/UnitSystem$Companion {
 	public final fun withRawValue (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/UnitSystem;
 }
 
-public abstract class com/splendo/kaluga/state/BaseColdStateRepo : com/splendo/kaluga/state/StateRepo {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public abstract fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun getLazyMutableFlow ()Lkotlin/Lazy;
-	protected fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-	public abstract fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/state/BaseHotStateRepo : com/splendo/kaluga/state/StateRepo {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public abstract fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
-	protected fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-}
-
-public class com/splendo/kaluga/state/ColdStateFlowRepo : com/splendo/kaluga/state/BaseColdStateRepo, com/splendo/kaluga/state/StateFlowRepo {
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitChangeStateWithRepo ()Lkotlin/jvm/functions/Function3;
-	public final fun getFirstState ()Lkotlin/jvm/functions/Function0;
-	public final fun getInitChangeStateWithRepo ()Lkotlin/jvm/functions/Function3;
-	public fun getLazyMutableFlow ()Lkotlin/Lazy;
-	public fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
-	public final fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/state/ColdStateRepo : com/splendo/kaluga/state/BaseColdStateRepo {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/Lazy;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/Lazy;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public abstract fun deinitialize (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun firstCollection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getLazyMutableFlow ()Lkotlin/Lazy;
-	public final fun laterCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun noMoreCollections (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/splendo/kaluga/state/HandleAfterCreating {
-	public abstract fun afterCreatingNewState (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/splendo/kaluga/state/HandleAfterNewStateIsSet {
-	public abstract fun afterNewStateIsSet (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/splendo/kaluga/state/HandleAfterOldStateIsRemoved {
-	public abstract fun afterOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/splendo/kaluga/state/HandleBeforeCreating {
-	public abstract fun beforeCreatingNewState (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/splendo/kaluga/state/HandleBeforeOldStateIsRemoved {
-	public abstract fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/state/HotStateFlowRepo : com/splendo/kaluga/state/BaseHotStateRepo, com/splendo/kaluga/state/StateFlowRepo {
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getInitialState ()Lkotlin/jvm/functions/Function1;
-	public fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
-	public fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
-	public final fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/state/HotStateRepo : com/splendo/kaluga/state/BaseHotStateRepo {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getLazyMutableSharedFlow ()Lkotlin/Lazy;
-}
-
-public abstract interface class com/splendo/kaluga/state/KalugaState {
-	public abstract fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/state/KalugaState$DefaultImpls {
-	public static fun remain (Lcom/splendo/kaluga/state/KalugaState;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/state/KalugaStateKt {
-	public static final fun defaultLazySharedFlow ()Lkotlin/Lazy;
-}
-
-public abstract interface class com/splendo/kaluga/state/StateFlowRepo {
-	public abstract fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
-}
-
-public abstract class com/splendo/kaluga/state/StateRepo : kotlinx/coroutines/CoroutineScope, kotlinx/coroutines/flow/Flow {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun collect (Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
-	protected abstract fun getMutableFlow ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-	public final fun getSubscriptionCount ()Lkotlinx/coroutines/flow/StateFlow;
-	public abstract fun initialValue (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun launchTakeAndChangeState (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
-	public final fun launchTakeAndChangeState (Lkotlin/coroutines/CoroutineContext;Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
-	public static synthetic fun launchTakeAndChangeState$default (Lcom/splendo/kaluga/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
-	public static synthetic fun launchTakeAndChangeState$default (Lcom/splendo/kaluga/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
-	public final fun launchUseState (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
-	public static synthetic fun launchUseState$default (Lcom/splendo/kaluga/state/StateRepo;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
-	public final fun peekState ()Lcom/splendo/kaluga/state/KalugaState;
-	public final fun takeAndChangeState (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun takeAndChangeState (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun useState (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
diff --git a/bluetooth/api/androidLib/bluetooth.api b/bluetooth/api/androidLib/bluetooth.api
index b7958fd93..67dcfc296 100644
--- a/bluetooth/api/androidLib/bluetooth.api
+++ b/bluetooth/api/androidLib/bluetooth.api
@@ -65,7 +65,7 @@ public final class com/splendo/kaluga/bluetooth/BluetoothKt {
 	public static final fun value (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
 }
 
-public abstract interface class com/splendo/kaluga/bluetooth/BluetoothMonitor : com/splendo/kaluga/base/monitor/ServiceMonitor {
+public abstract interface class com/splendo/kaluga/bluetooth/BluetoothMonitor : com/splendo/kaluga/service/ServiceMonitor {
 }
 
 public final class com/splendo/kaluga/bluetooth/BluetoothMonitor$Builder {
@@ -158,7 +158,7 @@ public final class com/splendo/kaluga/bluetooth/CommonUUID {
 	public static final fun uuidFrom (Ljava/lang/String;)Ljava/util/UUID;
 }
 
-public final class com/splendo/kaluga/bluetooth/DefaultBluetoothMonitor : com/splendo/kaluga/base/monitor/DefaultServiceMonitor, com/splendo/kaluga/bluetooth/BluetoothMonitor {
+public final class com/splendo/kaluga/bluetooth/DefaultBluetoothMonitor : com/splendo/kaluga/service/DefaultServiceMonitor, com/splendo/kaluga/bluetooth/BluetoothMonitor {
 	public fun isServiceEnabled ()Z
 	public fun monitoringDidStart ()V
 	public fun monitoringDidStop ()V
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index 16c7e1d87..e9c095113 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -68,7 +68,7 @@ public final class com/splendo/kaluga/bluetooth/BluetoothKt {
 	public static final fun value (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
 }
 
-public abstract interface class com/splendo/kaluga/bluetooth/BluetoothMonitor : com/splendo/kaluga/base/monitor/ServiceMonitor {
+public abstract interface class com/splendo/kaluga/bluetooth/BluetoothMonitor : com/splendo/kaluga/service/ServiceMonitor {
 }
 
 public final class com/splendo/kaluga/bluetooth/BluetoothMonitor$Builder {
@@ -157,7 +157,7 @@ public final class com/splendo/kaluga/bluetooth/CommonUUID {
 	public static final fun uuidFrom (Ljava/lang/String;)Lcom/splendo/kaluga/bluetooth/UUID;
 }
 
-public final class com/splendo/kaluga/bluetooth/DefaultBluetoothMonitor : com/splendo/kaluga/base/monitor/DefaultServiceMonitor, com/splendo/kaluga/bluetooth/BluetoothMonitor {
+public final class com/splendo/kaluga/bluetooth/DefaultBluetoothMonitor : com/splendo/kaluga/service/DefaultServiceMonitor, com/splendo/kaluga/bluetooth/BluetoothMonitor {
 	public fun <init> ()V
 	public fun isServiceEnabled ()Z
 	public fun monitoringDidStart ()V
diff --git a/location/api/androidLib/location.api b/location/api/androidLib/location.api
index 46c5ff9a0..04d367eb7 100644
--- a/location/api/androidLib/location.api
+++ b/location/api/androidLib/location.api
@@ -103,7 +103,7 @@ public final class com/splendo/kaluga/location/DefaultLocationManager$Builder :
 	public fun create (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/location/BaseLocationManager;
 }
 
-public final class com/splendo/kaluga/location/DefaultLocationMonitor : com/splendo/kaluga/base/monitor/DefaultServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
+public final class com/splendo/kaluga/location/DefaultLocationMonitor : com/splendo/kaluga/service/DefaultServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
 	public fun <init> (Landroid/content/Context;Landroid/location/LocationManager;)V
 	public fun isServiceEnabled ()Z
 	public fun monitoringDidStart ()V
@@ -290,7 +290,7 @@ public final class com/splendo/kaluga/location/LocationManager$Event$PermissionC
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract interface class com/splendo/kaluga/location/LocationMonitor : com/splendo/kaluga/base/monitor/ServiceMonitor {
+public abstract interface class com/splendo/kaluga/location/LocationMonitor : com/splendo/kaluga/service/ServiceMonitor {
 }
 
 public final class com/splendo/kaluga/location/LocationMonitor$Builder {
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index ac5849d48..5c9315021 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -104,7 +104,7 @@ public final class com/splendo/kaluga/location/DefaultLocationManager$Builder :
 	public fun create (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/location/BaseLocationManager;
 }
 
-public final class com/splendo/kaluga/location/DefaultLocationMonitor : com/splendo/kaluga/base/monitor/DefaultServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
+public final class com/splendo/kaluga/location/DefaultLocationMonitor : com/splendo/kaluga/service/DefaultServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
 	public fun <init> ()V
 	public fun isServiceEnabled ()Z
 	public fun monitoringDidStart ()V
@@ -248,7 +248,7 @@ public final class com/splendo/kaluga/location/LocationManager$Event$PermissionC
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract interface class com/splendo/kaluga/location/LocationMonitor : com/splendo/kaluga/base/monitor/ServiceMonitor {
+public abstract interface class com/splendo/kaluga/location/LocationMonitor : com/splendo/kaluga/service/ServiceMonitor {
 }
 
 public final class com/splendo/kaluga/location/LocationMonitor$Builder {
diff --git a/service/api/androidLib/service.api b/service/api/androidLib/service.api
new file mode 100644
index 000000000..db7a0f0a6
--- /dev/null
+++ b/service/api/androidLib/service.api
@@ -0,0 +1,30 @@
+public abstract class com/splendo/kaluga/service/DefaultServiceMonitor : com/splendo/kaluga/service/ServiceMonitor {
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/logging/Logger;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	protected final fun getLogger ()Lcom/splendo/kaluga/logging/Logger;
+	protected fun getTAG ()Ljava/lang/String;
+	public fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
+	public abstract fun monitoringDidStart ()V
+	public abstract fun monitoringDidStop ()V
+	public final fun startMonitoring ()V
+	public final fun stopMonitoring ()V
+	protected final fun updateState ()V
+}
+
+public final class com/splendo/kaluga/service/EnableServiceActivity : androidx/appcompat/app/AppCompatActivity {
+	public static final field Companion Lcom/splendo/kaluga/service/EnableServiceActivity$Companion;
+	public fun <init> ()V
+}
+
+public final class com/splendo/kaluga/service/EnableServiceActivity$Companion {
+	public final fun showEnableServiceActivity (Landroid/content/Context;Ljava/lang/String;Landroid/content/Intent;)Lkotlinx/coroutines/CompletableDeferred;
+}
+
+public abstract interface class com/splendo/kaluga/service/ServiceMonitor {
+	public abstract fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
+	public abstract fun isServiceEnabled ()Z
+	public abstract fun startMonitoring ()V
+	public abstract fun stopMonitoring ()V
+}
+
diff --git a/service/api/jvm/service.api b/service/api/jvm/service.api
new file mode 100644
index 000000000..16dc51160
--- /dev/null
+++ b/service/api/jvm/service.api
@@ -0,0 +1,21 @@
+public abstract class com/splendo/kaluga/service/DefaultServiceMonitor : com/splendo/kaluga/service/ServiceMonitor {
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/logging/Logger;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	protected final fun getLogger ()Lcom/splendo/kaluga/logging/Logger;
+	protected fun getTAG ()Ljava/lang/String;
+	public fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
+	public abstract fun monitoringDidStart ()V
+	public abstract fun monitoringDidStop ()V
+	public final fun startMonitoring ()V
+	public final fun stopMonitoring ()V
+	protected final fun updateState ()V
+}
+
+public abstract interface class com/splendo/kaluga/service/ServiceMonitor {
+	public abstract fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
+	public abstract fun isServiceEnabled ()Z
+	public abstract fun startMonitoring ()V
+	public abstract fun stopMonitoring ()V
+}
+
diff --git a/test-utils-base/api/androidLib/test-utils-base.api b/test-utils-base/api/androidLib/test-utils-base.api
index 058a5d42a..68e53742d 100644
--- a/test-utils-base/api/androidLib/test-utils-base.api
+++ b/test-utils-base/api/androidLib/test-utils-base.api
@@ -1276,13 +1276,3 @@ public final class com/splendo/kaluga/test/base/mock/verification/VerificationRu
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/test/base/monitor/MockServiceMonitor : com/splendo/kaluga/base/monitor/ServiceMonitor {
-	public fun <init> ()V
-	public final fun getStartMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public abstract fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
-	public fun isServiceEnabled ()Z
-	public fun startMonitoring ()V
-	public fun stopMonitoring ()V
-}
-
diff --git a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
index 755135223..4ece99794 100644
--- a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
@@ -74,7 +74,7 @@ public final class com/splendo/kaluga/test/bluetooth/MockBluetoothGattWrapper :
 	public fun writeDescriptor (Lcom/splendo/kaluga/bluetooth/DescriptorWrapper;[B)Z
 }
 
-public final class com/splendo/kaluga/test/bluetooth/MockBluetoothMonitor : com/splendo/kaluga/test/base/monitor/MockServiceMonitor, com/splendo/kaluga/bluetooth/BluetoothMonitor {
+public final class com/splendo/kaluga/test/bluetooth/MockBluetoothMonitor : com/splendo/kaluga/test/service/MockServiceMonitor, com/splendo/kaluga/bluetooth/BluetoothMonitor {
 	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;)V
 	public synthetic fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
 	public fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
diff --git a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
index 8c9e2aa73..8ebc95f05 100644
--- a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
@@ -9,7 +9,7 @@ public final class com/splendo/kaluga/test/bluetooth/Jvm_mocksKt {
 	public static final fun randomIdentifier ()Lcom/splendo/kaluga/bluetooth/UUID;
 }
 
-public final class com/splendo/kaluga/test/bluetooth/MockBluetoothMonitor : com/splendo/kaluga/test/base/monitor/MockServiceMonitor, com/splendo/kaluga/bluetooth/BluetoothMonitor {
+public final class com/splendo/kaluga/test/bluetooth/MockBluetoothMonitor : com/splendo/kaluga/test/service/MockServiceMonitor, com/splendo/kaluga/bluetooth/BluetoothMonitor {
 	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;)V
 	public synthetic fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
 	public fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
diff --git a/test-utils-location/api/androidLib/test-utils-location.api b/test-utils-location/api/androidLib/test-utils-location.api
index a0089c6ee..3f45ad9fd 100644
--- a/test-utils-location/api/androidLib/test-utils-location.api
+++ b/test-utils-location/api/androidLib/test-utils-location.api
@@ -60,7 +60,7 @@ public final class com/splendo/kaluga/test/location/MockLocationManager : com/sp
 	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/test/location/MockLocationMonitor : com/splendo/kaluga/test/base/monitor/MockServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
+public final class com/splendo/kaluga/test/location/MockLocationMonitor : com/splendo/kaluga/test/service/MockServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
 	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;)V
 	public synthetic fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
 	public fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
diff --git a/test-utils-location/api/jvm/test-utils-location.api b/test-utils-location/api/jvm/test-utils-location.api
index 30de75751..3a3580b57 100644
--- a/test-utils-location/api/jvm/test-utils-location.api
+++ b/test-utils-location/api/jvm/test-utils-location.api
@@ -53,7 +53,7 @@ public final class com/splendo/kaluga/test/location/MockLocationManager : com/sp
 	public fun stopMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/test/location/MockLocationMonitor : com/splendo/kaluga/test/base/monitor/MockServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
+public final class com/splendo/kaluga/test/location/MockLocationMonitor : com/splendo/kaluga/test/service/MockServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
 	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;)V
 	public synthetic fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
 	public fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
diff --git a/test-utils-service/api/androidLib/test-utils-service.api b/test-utils-service/api/androidLib/test-utils-service.api
new file mode 100644
index 000000000..0d4f963e3
--- /dev/null
+++ b/test-utils-service/api/androidLib/test-utils-service.api
@@ -0,0 +1,17 @@
+public final class com/splendo/kaluga/test/service/BuildConfig {
+	public static final field BUILD_TYPE Ljava/lang/String;
+	public static final field DEBUG Z
+	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
+	public fun <init> ()V
+}
+
+public abstract class com/splendo/kaluga/test/service/MockServiceMonitor : com/splendo/kaluga/service/ServiceMonitor {
+	public fun <init> ()V
+	public final fun getStartMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStopMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public abstract fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
+	public fun isServiceEnabled ()Z
+	public fun startMonitoring ()V
+	public fun stopMonitoring ()V
+}
+
diff --git a/test-utils-service/api/jvm/test-utils-service.api b/test-utils-service/api/jvm/test-utils-service.api
new file mode 100644
index 000000000..03f319282
--- /dev/null
+++ b/test-utils-service/api/jvm/test-utils-service.api
@@ -0,0 +1,10 @@
+public abstract class com/splendo/kaluga/test/service/MockServiceMonitor : com/splendo/kaluga/service/ServiceMonitor {
+	public fun <init> ()V
+	public final fun getStartMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStopMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public abstract fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
+	public fun isServiceEnabled ()Z
+	public fun startMonitoring ()V
+	public fun stopMonitoring ()V
+}
+

From 352620dc0c5b12b242f029b95ec8585fb8b3f6c6 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 17:22:06 +0100
Subject: [PATCH 145/227] Documentation for Base

---
 .../kotlin/ApplicationHolder.kt               |  12 +
 .../src/androidLibMain/kotlin/KalugaThread.kt |  14 +
 base/src/androidLibMain/kotlin/runBlocking.kt |   5 +
 base/src/androidLibMain/kotlin/runOnMain.kt   |   4 +
 .../kotlin/singleThreadDispatcher.kt          |  16 +
 .../kotlin/text/KalugaDateFormatter.kt        |  55 +++-
 .../kotlin/text/NumberFormatter.kt            |  51 +--
 .../androidLibMain/kotlin/text/StringUtils.kt |  11 +
 .../androidLibMain/kotlin/utils/Decimal.kt    | 118 ++++++-
 .../androidLibMain/kotlin/utils/KalugaDate.kt |  19 ++
 .../src/androidLibMain/kotlin/utils/Locale.kt |  61 +++-
 .../androidLibMain/kotlin/utils/TimeZone.kt   |  18 ++
 base/src/commonMain/kotlin/KalugaThread.kt    |  16 +
 base/src/commonMain/kotlin/runBlocking.kt     |   5 +
 base/src/commonMain/kotlin/runOnMain.kt       |   4 +
 .../kotlin/singleThreadDispatcher.kt          |  11 +
 .../commonMain/kotlin/state/KalugaState.kt    | 305 ++++++++++++------
 base/src/commonMain/kotlin/text/Flags.kt      |  36 +++
 .../kotlin/text/KalugaDateFormatter.kt        | 119 +++----
 .../commonMain/kotlin/text/NumberFormatter.kt |  11 +-
 .../src/commonMain/kotlin/text/StringUtils.kt |  11 +
 base/src/commonMain/kotlin/utils/Decimal.kt   | 186 ++++++++++-
 .../kotlin/utils/EmptyCompletableDeferred.kt  |   3 +
 base/src/commonMain/kotlin/utils/Int.kt       |   3 +
 .../src/commonMain/kotlin/utils/KalugaDate.kt |   7 +
 base/src/commonMain/kotlin/utils/Locale.kt    | 108 ++++---
 .../commonMain/kotlin/utils/Serializable.kt   |   3 +
 base/src/commonMain/kotlin/utils/TimeZone.kt  |  18 ++
 .../src/commonMain/kotlin/utils/UnitSystem.kt |  22 +-
 base/src/iosMain/kotlin/GCScheduler.kt        |   3 +
 base/src/iosMain/kotlin/IOSVersion.kt         |   3 +
 base/src/iosMain/kotlin/KalugaThread.kt       |  14 +
 base/src/iosMain/kotlin/runOnMain.kt          |   4 +
 .../iosMain/kotlin/singleThreadDispatcher.kt  |  16 +
 .../kotlin/text/KalugaDateFormatter.kt        |  56 +++-
 .../iosMain/kotlin/text/NumberFormatter.kt    |  51 +--
 base/src/iosMain/kotlin/text/StringUtils.kt   |  11 +
 base/src/iosMain/kotlin/utils/Decimal.kt      | 121 ++++++-
 base/src/iosMain/kotlin/utils/KalugaDate.kt   |  21 +-
 base/src/iosMain/kotlin/utils/Locale.kt       |  61 +++-
 base/src/iosMain/kotlin/utils/Serializable.kt |   3 +
 base/src/iosMain/kotlin/utils/TimeZone.kt     |  20 +-
 base/src/jsMain/kotlin/KalugaThread.kt        |  14 +-
 base/src/jsMain/kotlin/runBlocking.kt         |   6 +
 base/src/jsMain/kotlin/runOnMain.kt           |   5 +
 .../jsMain/kotlin/singleThreadDispatcher.kt   |  14 +
 .../jsMain/kotlin/text/KalugaDateFormatter.kt |  56 +++-
 .../src/jsMain/kotlin/text/NumberFormatter.kt |  53 +--
 base/src/jsMain/kotlin/text/StringUtils.kt    |  11 +
 base/src/jsMain/kotlin/utils/Decimal.kt       | 137 +++++++-
 base/src/jsMain/kotlin/utils/KalugaDate.kt    |  19 ++
 base/src/jsMain/kotlin/utils/Locale.kt        |  61 +++-
 base/src/jsMain/kotlin/utils/Serializable.kt  |   3 +
 base/src/jsMain/kotlin/utils/TimeZone.kt      |  18 ++
 base/src/jvmMain/kotlin/KalugaThread.kt       |  14 +
 base/src/jvmMain/kotlin/runBlocking.kt        |   5 +
 base/src/jvmMain/kotlin/runOnMain.kt          |   4 +
 .../jvmMain/kotlin/singleThreadDispatcher.kt  |  16 +
 .../kotlin/text/KalugaDateFormatter.kt        |  58 +++-
 .../jvmMain/kotlin/text/NumberFormatter.kt    |  51 +--
 base/src/jvmMain/kotlin/text/StringUtils.kt   |  11 +
 base/src/jvmMain/kotlin/utils/Decimal.kt      | 118 ++++++-
 base/src/jvmMain/kotlin/utils/KalugaDate.kt   |  19 ++
 base/src/jvmMain/kotlin/utils/Locale.kt       |  61 +++-
 base/src/jvmMain/kotlin/utils/TimeZone.kt     |  18 ++
 service/build.gradle.kts                      |   1 +
 test-utils-service/build.gradle.kts           |   1 +
 67 files changed, 1988 insertions(+), 422 deletions(-)

diff --git a/base/src/androidLibMain/kotlin/ApplicationHolder.kt b/base/src/androidLibMain/kotlin/ApplicationHolder.kt
index 3a25243d8..bb8716354 100644
--- a/base/src/androidLibMain/kotlin/ApplicationHolder.kt
+++ b/base/src/androidLibMain/kotlin/ApplicationHolder.kt
@@ -21,13 +21,25 @@ package com.splendo.kaluga.base
 import android.app.Application
 import android.content.Context
 
+/**
+ * Class holding reference to the [Application] running Kaluga
+ * set [application] to your Application so default constructors work with the proper [Context]
+ */
 class ApplicationHolder {
     companion object {
+
+        /**
+         * The [Application] running Kaluga
+         */
         var application: Application? = null
             set(application) {
                 check(field == null) { "Application object can only be set once." }
                 field = application
             }
+
+        /**
+         * The [Context] of the [application]
+         */
         val applicationContext: Context
             get() {
                 val application = this.application
diff --git a/base/src/androidLibMain/kotlin/KalugaThread.kt b/base/src/androidLibMain/kotlin/KalugaThread.kt
index 85b44e29c..0305b4b03 100644
--- a/base/src/androidLibMain/kotlin/KalugaThread.kt
+++ b/base/src/androidLibMain/kotlin/KalugaThread.kt
@@ -19,13 +19,27 @@ package com.splendo.kaluga.base
 import android.os.Looper
 import kotlinx.coroutines.Dispatchers
 
+/**
+ * The thread of execution
+ */
 actual data class KalugaThread(val thread: Thread) {
 
     actual companion object {
+
+        /**
+         * The [KalugaThread] the calling method is running on
+         */
         actual val currentThread: KalugaThread get() = KalugaThread(Thread.currentThread())
     }
 
+    /**
+     * Name of the thread
+     */
     actual var name: String by thread::name
+
+    /**
+     * When `true` this thread is the main thread.
+     */
     actual val isMainThread: Boolean get() {
         val mainThread = Looper.getMainLooper()?.thread ?: run {
             // Fallback when no MainLooper is present. This should only occur in tests
diff --git a/base/src/androidLibMain/kotlin/runBlocking.kt b/base/src/androidLibMain/kotlin/runBlocking.kt
index e105e89c2..461955675 100644
--- a/base/src/androidLibMain/kotlin/runBlocking.kt
+++ b/base/src/androidLibMain/kotlin/runBlocking.kt
@@ -21,4 +21,9 @@ package com.splendo.kaluga.base
 import kotlinx.coroutines.CoroutineScope
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * Runs a new coroutine and blocks the current thread interruptibly until its completion. This function should not be used from a coroutine. It is designed to bridge regular blocking code to libraries that are written in suspending style, to be used in main functions and in tests.
+ * @param context the context of the coroutine. The default value is an event loop on the current thread.
+ * @param block the coroutine code.
+ */
 actual fun <T> runBlocking(context: CoroutineContext, block: suspend CoroutineScope.() -> T): T = kotlinx.coroutines.runBlocking(context, block)
diff --git a/base/src/androidLibMain/kotlin/runOnMain.kt b/base/src/androidLibMain/kotlin/runOnMain.kt
index a7634e1ee..12968727d 100644
--- a/base/src/androidLibMain/kotlin/runOnMain.kt
+++ b/base/src/androidLibMain/kotlin/runOnMain.kt
@@ -23,6 +23,10 @@ import android.os.Looper
 
 var mainHandler = Handler(Looper.getMainLooper())
 
+/**
+ * Runs the provided [block] on the main thread
+ * @param block the code to run on the main thread.
+ */
 actual fun runOnMain(block: () -> Unit) {
     mainHandler.post(block)
 }
diff --git a/base/src/androidLibMain/kotlin/singleThreadDispatcher.kt b/base/src/androidLibMain/kotlin/singleThreadDispatcher.kt
index 1def316dc..4cabcc18b 100644
--- a/base/src/androidLibMain/kotlin/singleThreadDispatcher.kt
+++ b/base/src/androidLibMain/kotlin/singleThreadDispatcher.kt
@@ -17,6 +17,22 @@
 package com.splendo.kaluga.base
 
 import kotlinx.coroutines.CloseableCoroutineDispatcher
+import kotlinx.coroutines.newFixedThreadPoolContext
 import kotlinx.coroutines.newSingleThreadContext
 
+/**
+ * Creates a coroutine execution context using a single thread.
+ *
+ * **NOTE: The resulting [CloseableCoroutineDispatcher] owns native resources (its thread).
+ * Resources are reclaimed by [CloseableCoroutineDispatcher.close].**
+ * @param name The name of the thread to be created.
+ */
 actual fun singleThreadDispatcher(name: String): CloseableCoroutineDispatcher = newSingleThreadContext(name)
+
+/**
+ * Creates a coroutine execution context using a thread pool.
+ *
+ * **NOTE: The resulting [CloseableCoroutineDispatcher] owns native resources (its thread).
+ * Resources are reclaimed by [CloseableCoroutineDispatcher.close].**
+ */
+actual fun threadPoolDispatcher(numberOfThreads: UInt, name: String): CloseableCoroutineDispatcher = newFixedThreadPoolContext(numberOfThreads.toInt(), name)
diff --git a/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt b/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
index 9a6df3ff0..0f9f6e3c9 100644
--- a/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
@@ -28,22 +28,44 @@ import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Calendar
 
-actual class KalugaDateFormatter private constructor(private val format: SimpleDateFormat) {
+/**
+ * Default implementation of [BaseDateFormatter]
+ */
+actual class KalugaDateFormatter private constructor(private val format: SimpleDateFormat) : BaseDateFormatter {
 
     actual companion object {
 
+        /**
+         * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
+         * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun dateFormat(
             style: DateFormatStyle,
             timeZone: TimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
+        /**
+         * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
+         * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun timeFormat(
             style: DateFormatStyle,
             timeZone: TimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getTimeInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
+        /**
+         * Creates a [KalugaDateFormatter] that formats both date and time components of a [KalugaDate]
+         * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
@@ -51,6 +73,15 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateTimeInstance(dateStyle.javaStyle(), timeStyle.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
+        /**
+         * Creates a [KalugaDateFormatter] using a custom Date format pattern.
+         * On iOS some user settings may take precedent over the format (i.e. using 12 hour clock).
+         * To prevent this, ensure that the provided [locale] is of a `POSIX` type.
+         * A convenience [fixedPatternFormat] method exists to default to this behaviour.
+         * @param pattern The pattern to apply.
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun patternFormat(pattern: String, timeZone: TimeZone, locale: Locale): KalugaDateFormatter = createDateFormatter(SimpleDateFormat(pattern, locale.locale), timeZone)
 
         private fun createDateFormatter(simpleDateFormat: SimpleDateFormat, timeZone: TimeZone): KalugaDateFormatter {
@@ -62,26 +93,26 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
 
     private val symbols: DateFormatSymbols get() = format.dateFormatSymbols
 
-    actual var pattern: String
+    override var pattern: String
         get() = format.toPattern()
         set(value) = format.applyPattern(value)
 
-    actual var timeZone: TimeZone
+    override var timeZone: TimeZone
         get() = TimeZone(format.timeZone)
         set(value) { format.timeZone = value.timeZone }
 
-    actual var eras: List<String>
+    override var eras: List<String>
         get() = symbols.eras.toList()
         set(value) { updateSymbols { it.eras = value.toTypedArray() } }
 
-    actual var months: List<String>
+    override var months: List<String>
         get() = symbols.months.toList()
         set(value) { updateSymbols { it.months = value.toTypedArray() } }
-    actual var shortMonths: List<String>
+    override var shortMonths: List<String>
         get() = symbols.shortMonths.toList()
         set(value) { updateSymbols { it.shortMonths = value.toTypedArray() } }
 
-    actual var weekdays: List<String>
+    override var weekdays: List<String>
         get() {
             val weekdaysWithEmptyFirst = symbols.weekdays.toList()
             return if (weekdaysWithEmptyFirst.size > 1) {
@@ -98,7 +129,7 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
                 it.weekdays = weekdaysWithEmptyFirst.toTypedArray()
             }
         }
-    actual var shortWeekdays: List<String>
+    override var shortWeekdays: List<String>
         get() {
             val weekdaysWithEmptyFirst = symbols.shortWeekdays.toList()
             return if (weekdaysWithEmptyFirst.size > 1) {
@@ -116,15 +147,15 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
             }
         }
 
-    actual var amString: String
+    override var amString: String
         get() = symbols.amPmStrings.toList()[0]
         set(value) { updateSymbols { it.amPmStrings = it.amPmStrings.toMutableList().apply { this[0] = value }.toTypedArray() } }
-    actual var pmString: String
+    override var pmString: String
         get() = symbols.amPmStrings.toList()[1]
         set(value) { updateSymbols { it.amPmStrings = it.amPmStrings.toMutableList().apply { this[1] = value }.toTypedArray() } }
 
-    actual fun format(date: KalugaDate): String = format.format(date.date)
-    actual fun parse(string: String): KalugaDate? {
+    override fun format(date: KalugaDate): String = format.format(date.date)
+    override fun parse(string: String): KalugaDate? {
         val currentTimeZone = timeZone
         return try {
             format.parse(string)?.let { date ->
diff --git a/base/src/androidLibMain/kotlin/text/NumberFormatter.kt b/base/src/androidLibMain/kotlin/text/NumberFormatter.kt
index 765217837..972656e12 100644
--- a/base/src/androidLibMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/androidLibMain/kotlin/text/NumberFormatter.kt
@@ -23,7 +23,12 @@ import java.text.ParseException
 import java.util.Currency
 
 @ExperimentalUnsignedTypes
-actual class NumberFormatter actual constructor(actual val locale: Locale, style: NumberFormatStyle) {
+/**
+ * Default implementation of [BaseNumberFormatter]
+ * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
+ * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
+ */
+actual class NumberFormatter actual constructor(override val locale: Locale, style: NumberFormatStyle) : BaseNumberFormatter {
 
     private val format: DecimalFormat = when (style) {
         is NumberFormatStyle.Integer -> DecimalFormat.getInstance(locale.locale).apply {
@@ -78,72 +83,72 @@ actual class NumberFormatter actual constructor(actual val locale: Locale, style
         }
     }
 
-    actual var percentSymbol: Char
+    override var percentSymbol: Char
         get() = symbols.percent
         set(value) { applySymbols { it.percent = value } }
-    actual var perMillSymbol: Char
+    override var perMillSymbol: Char
         get() = symbols.perMill
         set(value) { applySymbols { it.perMill = value } }
-    actual var minusSign: Char
+    override var minusSign: Char
         get() = symbols.minusSign
         set(value) { applySymbols { it.minusSign = value } }
-    actual var exponentSymbol: String
+    override var exponentSymbol: String
         get() = symbols.exponentSeparator
         set(value) { applySymbols { it.exponentSeparator = value } }
-    actual var zeroSymbol: Char
+    override var zeroSymbol: Char
         get() = symbols.zeroDigit
         set(value) { applySymbols { it.zeroDigit = value } }
-    actual var notANumberSymbol: String
+    override var notANumberSymbol: String
         get() = symbols.naN
         set(value) { applySymbols { it.naN = value } }
-    actual var infinitySymbol: String
+    override var infinitySymbol: String
         get() = symbols.infinity
         set(value) { applySymbols { it.infinity = value } }
 
-    actual var currencySymbol: String
+    override var currencySymbol: String
         get() = symbols.currencySymbol
         set(value) { applySymbols { it.currencySymbol = value } }
-    actual var currencyCode: String
+    override var currencyCode: String
         get() = symbols.currency.currencyCode
         set(value) { applySymbols { it.currency = Currency.getInstance(value) } }
 
-    actual var positivePrefix: String
+    override var positivePrefix: String
         get() = format.positivePrefix
         set(value) { format.positivePrefix = value }
-    actual var positiveSuffix: String
+    override var positiveSuffix: String
         get() = format.positiveSuffix
         set(value) { format.positiveSuffix = value }
-    actual var negativePrefix: String
+    override var negativePrefix: String
         get() = format.negativePrefix
         set(value) { format.negativePrefix = value }
-    actual var negativeSuffix: String
+    override var negativeSuffix: String
         get() = format.negativeSuffix
         set(value) { format.negativeSuffix = value }
 
-    actual var groupingSeparator: Char
+    override var groupingSeparator: Char
         get() = symbols.groupingSeparator
         set(value) { applySymbols { it.groupingSeparator = value } }
-    actual var usesGroupingSeparator: Boolean
+    override var usesGroupingSeparator: Boolean
         get() = format.isGroupingUsed
         set(value) { format.isGroupingUsed = value }
-    actual var decimalSeparator: Char
+    override var decimalSeparator: Char
         get() = symbols.decimalSeparator
         set(value) { applySymbols { it.decimalSeparator = value } }
-    actual var alwaysShowsDecimalSeparator: Boolean
+    override var alwaysShowsDecimalSeparator: Boolean
         get() = format.isDecimalSeparatorAlwaysShown
         set(value) { format.isDecimalSeparatorAlwaysShown = value }
-    actual var currencyDecimalSeparator: Char
+    override var currencyDecimalSeparator: Char
         get() = symbols.monetaryDecimalSeparator
         set(value) { applySymbols { it.monetaryDecimalSeparator = value } }
-    actual var groupingSize: Int
+    override var groupingSize: Int
         get() = format.groupingSize
         set(value) { format.groupingSize = value }
-    actual var multiplier: Int
+    override var multiplier: Int
         get() = format.multiplier
         set(value) { format.multiplier = value }
 
-    actual fun format(number: Number): String = format.format(number.toDouble())
-    actual fun parse(string: String): Number? = try { format.parse(string) } catch (e: ParseException) { null }
+    override fun format(number: Number): String = format.format(number.toDouble())
+    override fun parse(string: String): Number? = try { format.parse(string) } catch (e: ParseException) { null }
     private fun applySymbols(apply: (DecimalFormatSymbols) -> Unit) {
         val symbols = format.decimalFormatSymbols
         apply(symbols)
diff --git a/base/src/androidLibMain/kotlin/text/StringUtils.kt b/base/src/androidLibMain/kotlin/text/StringUtils.kt
index 7a7714310..daa6a96d0 100644
--- a/base/src/androidLibMain/kotlin/text/StringUtils.kt
+++ b/base/src/androidLibMain/kotlin/text/StringUtils.kt
@@ -19,8 +19,19 @@ package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.Locale
 
+/**
+ * The String that serves as a line separator.
+ */
 actual val lineSeparator = System.lineSeparator()
 
+/**
+ * Converts a String to its lower cased variant based on a given [Locale]
+ * @param locale The [Locale] to use for transforming to lower case.
+ */
 actual fun String.lowerCased(locale: Locale): String = this.lowercase(locale.locale)
 
+/**
+ * Converts a String to its upper cased variant based on a given [Locale]
+ * @param locale The [Locale] to use for transforming to upper case.
+ */
 actual fun String.upperCased(locale: Locale): String = this.uppercase(locale.locale)
diff --git a/base/src/androidLibMain/kotlin/utils/Decimal.kt b/base/src/androidLibMain/kotlin/utils/Decimal.kt
index 4492136cf..9699da384 100644
--- a/base/src/androidLibMain/kotlin/utils/Decimal.kt
+++ b/base/src/androidLibMain/kotlin/utils/Decimal.kt
@@ -28,34 +28,88 @@ import java.math.RoundingMode as NativeRoundingMode
 
 actual typealias Decimal = BigDecimal
 
+/**
+ * Adds two [Decimal] together.
+ * @param value the [Decimal] to add
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual operator fun Decimal.plus(value: Decimal) = this.add(value)
 
+/**
+ * Adds two [Decimal] together scaled to a given precision.
+ * @param value the [Decimal] to add
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual fun Decimal.plus(value: Decimal, scale: Int) =
     this.add(value).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
+/**
+ * Adds two [Decimal] together scaled to a given precision.
+ * @param value the [Decimal] to add
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual fun Decimal.plus(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
 ) = this.add(value).setScale(scale, roundingMode.android)
 
+/**
+ * Subtracts two [Decimal].
+ * @param value the [Decimal] to subtract
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual operator fun Decimal.minus(value: Decimal) = this.subtract(value)
 
+/**
+ * Subtracts two [Decimal] to a given precision.
+ * @param value the [Decimal] to subtract
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual fun Decimal.minus(value: Decimal, scale: Int) =
     this.subtract(value).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
+/**
+ * Subtracts two [Decimal] to a given precision.
+ * @param value the [Decimal] to subtract
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual fun Decimal.minus(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.android)
 
+/**
+ * Divides two [Decimal].
+ * @param value the [Decimal] to divide
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual operator fun Decimal.div(value: Decimal) = if ((value.compareTo(Decimal.ZERO)) != 0) this.divide(value, MathContext.DECIMAL128) else throw DecimalException("Divide by zero")
 
+/**
+ * Divides two [Decimal] to a given precision.
+ * @param value the [Decimal] to divide
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual fun Decimal.div(value: Decimal, scale: Int) = if ((value.compareTo(Decimal.ZERO)) != 0)
     this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
 else throw DecimalException("Divide by zero")
 
+/**
+ * Divides two [Decimal] to a given precision.
+ * @param value the [Decimal] to divide
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual fun Decimal.div(
     value: Decimal,
     scale: Int,
@@ -70,12 +124,30 @@ actual fun Decimal.div(
     ).setScale(scale, roundingMode.android)
 else throw DecimalException("Divide by zero")
 
+/**
+ * Multiplies two [Decimal].
+ * @param value the [Decimal] to multiply
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual operator fun Decimal.times(value: Decimal) =
     this.multiply(value, MathContext.DECIMAL128)
 
+/**
+ * Multiplies two [Decimal] to a given precision.
+ * @param value the [Decimal] to multiply
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual fun Decimal.times(value: Decimal, scale: Int) =
     this.multiply(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
+/**
+ * Multiplies two [Decimal] to a given precision.
+ * @param value the [Decimal] to multiply
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual fun Decimal.times(
     value: Decimal,
     scale: Int,
@@ -88,14 +160,40 @@ actual fun Decimal.times(
     )
 ).setScale(scale, roundingMode.android)
 
+/**
+ * Rounds a [Decimal] to a [scale].
+ * @param scale The number of digits the rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return A [Decimal] rounded to [scale] digits after the decimal point.
+ */
 actual fun Decimal.round(scale: Int, roundingMode: RoundingMode) =
     this.setScale(
         scale,
         roundingMode.android
     )
 
+/**
+ * Raises two [Decimal].
+ * @param n the [Decimal] to raise to
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual infix fun Decimal.pow(n: Int): Decimal = this.pow(n, MathContext.DECIMAL128)
+
+/**
+ * Raises two [Decimal] to a given precision.
+ * @param n the [Decimal] to raise to
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual fun Decimal.pow(n: Int, scale: Int): Decimal = this.pow(n, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
+
+/**
+ * Raises two [Decimal] to a given precision.
+ * @param n the [Decimal] to raise to
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual fun Decimal.pow(
     n: Int,
     scale: Int,
@@ -108,14 +206,32 @@ actual fun Decimal.pow(
     )
 ).setScale(scale, roundingMode.android)
 
+/**
+ * Converts a [Number] to a [Decimal]
+ */
 actual fun Number.toDecimal() = BigDecimal(toString())
+
+/**
+ * Converts a String to a [Decimal]
+ */
 actual fun String.toDecimal() = BigDecimal(this)
 
+/**
+ * Gets the double value of a [Decimal]
+ */
 actual fun Decimal.toDouble() = this.toDouble()
+
+/**
+ * Gets the integer value of a [Decimal]
+ */
 actual fun Decimal.toInt() = this.toInt()
+
+/**
+ * Gets the string value of a [Decimal]
+ */
 actual fun Decimal.toString() = this.stripTrailingZeros().toString()
 
-val RoundingMode.android
+private val RoundingMode.android
     get() = when (this) {
         RoundDown -> NativeRoundingMode.DOWN
         RoundHalfEven -> NativeRoundingMode.HALF_EVEN
diff --git a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
index 531bf4566..38357dddc 100644
--- a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
@@ -22,14 +22,33 @@ import java.util.Date
 
 actual typealias KalugaDateHolder = Date
 
+/**
+ * Default implementation of [KalugaDate]
+ */
 actual class DefaultKalugaDate internal constructor(internal val calendar: Calendar) : KalugaDate() {
 
     actual companion object {
+
+        /**
+         * Creates a [KalugaDate] relative to the current time
+         * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
+         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @return A [KalugaDate] relative to the current time
+         */
         actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 add(Calendar.MILLISECOND, offsetInMilliseconds.toInt())
             }
         )
+
+        /**
+         * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
+         * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
+         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @return A [KalugaDate] relative to the current time
+         */
         actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 timeInMillis = offsetInMilliseconds
diff --git a/base/src/androidLibMain/kotlin/utils/Locale.kt b/base/src/androidLibMain/kotlin/utils/Locale.kt
index c905c1fdb..fbbf57087 100644
--- a/base/src/androidLibMain/kotlin/utils/Locale.kt
+++ b/base/src/androidLibMain/kotlin/utils/Locale.kt
@@ -22,25 +22,56 @@ import android.icu.util.ULocale
 import android.os.Build
 import com.splendo.kaluga.base.text.upperCased
 
-actual data class Locale internal constructor(val locale: java.util.Locale) {
+/**
+ * Default implementation of [BaseLocale]
+ */
+actual data class Locale internal constructor(internal val locale: java.util.Locale) : BaseLocale() {
     actual companion object {
+
+        /**
+         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
+         * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
+         * @return The [Locale] for the given [language]
+         */
         actual fun createLocale(language: String): Locale = Locale(java.util.Locale(language))
+
+        /**
+         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
+         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
+         * @param country a ISO 3166 alpha-2 `country` code.
+         * @return The [Locale] for the given [language] and [country]
+         */
         actual fun createLocale(language: String, country: String): Locale = Locale(java.util.Locale(language, country))
+
+        /**
+         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
+         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
+         * @param country a ISO 3166 alpha-2 `country` code.
+         * @param variant Arbitrary value used to indicate a variation of a [Locale]
+         * @return The [Locale] for the given [language], [country], and [variant]
+         */
         actual fun createLocale(language: String, country: String, variant: String): Locale = Locale(java.util.Locale(language, country, variant))
 
+        /**
+         * The default [Locale] of the user
+         */
         actual val defaultLocale: Locale get() = Locale(java.util.Locale.getDefault())
+
+        /**
+         * A list of [Locale] available to the user.
+         */
         actual val availableLocales: List<Locale> = java.util.Locale.getAvailableLocales().asList().map { Locale(it) }
     }
 
-    actual val countryCode: String
+    override val countryCode: String
         get() = locale.country
-    actual val languageCode: String
+    override val languageCode: String
         get() = locale.language
-    actual val scriptCode: String
+    override val scriptCode: String
         get() = locale.script
-    actual val variantCode: String
+    override val variantCode: String
         get() = locale.variant
-    actual val unitSystem: UnitSystem
+    override val unitSystem: UnitSystem
         get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             when (LocaleData.getMeasurementSystem(ULocale.forLocale(locale))) {
                 LocaleData.MeasurementSystem.US -> UnitSystem.IMPERIAL
@@ -51,31 +82,31 @@ actual data class Locale internal constructor(val locale: java.util.Locale) {
             UnitSystem.withCountryCode(countryCode.upperCased(this))
         }
 
-    actual fun name(forLocale: Locale): String = locale.getDisplayName(forLocale.locale)
-    actual fun countryName(forLocale: Locale): String = locale.getDisplayCountry(forLocale.locale)
-    actual fun languageName(forLocale: Locale): String = locale.getDisplayLanguage(forLocale.locale)
-    actual fun variantName(forLocale: Locale): String = locale.getDisplayVariant(forLocale.locale)
-    actual fun scriptName(forLocale: Locale): String = locale.getDisplayScript(forLocale.locale)
+    override fun name(forLocale: Locale): String = locale.getDisplayName(forLocale.locale)
+    override fun countryName(forLocale: Locale): String = locale.getDisplayCountry(forLocale.locale)
+    override fun languageName(forLocale: Locale): String = locale.getDisplayLanguage(forLocale.locale)
+    override fun variantName(forLocale: Locale): String = locale.getDisplayVariant(forLocale.locale)
+    override fun scriptName(forLocale: Locale): String = locale.getDisplayScript(forLocale.locale)
 
-    actual val quotationStart: String
+    override val quotationStart: String
         get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             LocaleData.getInstance(ULocale.forLocale(locale)).getDelimiter(LocaleData.QUOTATION_START)
         } else {
             "\""
         }
-    actual val quotationEnd: String
+    override val quotationEnd: String
         get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             LocaleData.getInstance(ULocale.forLocale(locale)).getDelimiter(LocaleData.QUOTATION_END)
         } else {
             "\""
         }
-    actual val alternateQuotationStart: String
+    override val alternateQuotationStart: String
         get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             LocaleData.getInstance(ULocale.forLocale(locale)).getDelimiter(LocaleData.ALT_QUOTATION_START)
         } else {
             "\""
         }
-    actual val alternateQuotationEnd: String
+    override val alternateQuotationEnd: String
         get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             LocaleData.getInstance(ULocale.forLocale(locale)).getDelimiter(LocaleData.ALT_QUOTATION_END)
         } else {
diff --git a/base/src/androidLibMain/kotlin/utils/TimeZone.kt b/base/src/androidLibMain/kotlin/utils/TimeZone.kt
index add30ff1f..8c4ea0c42 100644
--- a/base/src/androidLibMain/kotlin/utils/TimeZone.kt
+++ b/base/src/androidLibMain/kotlin/utils/TimeZone.kt
@@ -17,17 +17,35 @@
 
 package com.splendo.kaluga.base.utils
 
+/**
+ * A default implementation of [BaseTimeZone].
+ */
 actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) : BaseTimeZone() {
 
     actual companion object {
+
+        /**
+         * Gets a [TimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [TimeZone] for
+         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         */
         actual fun get(identifier: String): TimeZone? {
             return java.util.TimeZone.getTimeZone(identifier)?.let {
                 TimeZone(it)
             }
         }
+
+        /**
+         * Gets the current [TimeZone] configured by the user
+         * @return The current [TimeZone] of the user
+         */
         actual fun current(): TimeZone {
             return TimeZone(java.util.TimeZone.getDefault())
         }
+
+        /**
+         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         */
         actual val availableIdentifiers get() = java.util.TimeZone.getAvailableIDs().asList()
     }
 
diff --git a/base/src/commonMain/kotlin/KalugaThread.kt b/base/src/commonMain/kotlin/KalugaThread.kt
index 15950cba5..f6862a5a6 100644
--- a/base/src/commonMain/kotlin/KalugaThread.kt
+++ b/base/src/commonMain/kotlin/KalugaThread.kt
@@ -16,15 +16,31 @@
 
 package com.splendo.kaluga.base
 
+/**
+ * `true` if called from the main thread.
+ */
 val isOnMainThread: Boolean
     get() = KalugaThread.currentThread.isMainThread
 
+/**
+ * The thread of execution
+ */
 expect class KalugaThread {
 
     companion object {
+        /**
+         * The [KalugaThread] the calling method is running on
+         */
         val currentThread: KalugaThread
     }
 
+    /**
+     * Name of the thread
+     */
     var name: String
+
+    /**
+     * When `true` this thread is the main thread.
+     */
     val isMainThread: Boolean
 }
diff --git a/base/src/commonMain/kotlin/runBlocking.kt b/base/src/commonMain/kotlin/runBlocking.kt
index 354a69a69..74fee5bc2 100644
--- a/base/src/commonMain/kotlin/runBlocking.kt
+++ b/base/src/commonMain/kotlin/runBlocking.kt
@@ -22,4 +22,9 @@ import kotlinx.coroutines.CoroutineScope
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
+/**
+ * Runs a new coroutine and blocks the current thread interruptibly until its completion. This function should not be used from a coroutine. It is designed to bridge regular blocking code to libraries that are written in suspending style, to be used in main functions and in tests.
+ * @param context the context of the coroutine. The default value is an event loop on the current thread.
+ * @param block the coroutine code.
+ */
 expect fun <T> runBlocking(context: CoroutineContext = EmptyCoroutineContext, block: suspend CoroutineScope.() -> T): T
diff --git a/base/src/commonMain/kotlin/runOnMain.kt b/base/src/commonMain/kotlin/runOnMain.kt
index 056f78108..384eb53d2 100644
--- a/base/src/commonMain/kotlin/runOnMain.kt
+++ b/base/src/commonMain/kotlin/runOnMain.kt
@@ -18,4 +18,8 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.base
 
+/**
+ * Runs the provided [block] on the main thread
+ * @param block the code to run on the main thread.
+ */
 expect fun runOnMain(block: () -> Unit)
diff --git a/base/src/commonMain/kotlin/singleThreadDispatcher.kt b/base/src/commonMain/kotlin/singleThreadDispatcher.kt
index 9aed5a4cc..0e61ada87 100644
--- a/base/src/commonMain/kotlin/singleThreadDispatcher.kt
+++ b/base/src/commonMain/kotlin/singleThreadDispatcher.kt
@@ -23,5 +23,16 @@ import kotlinx.coroutines.CloseableCoroutineDispatcher
  *
  * **NOTE: The resulting [CloseableCoroutineDispatcher] owns native resources (its thread).
  * Resources are reclaimed by [CloseableCoroutineDispatcher.close].**
+ * @param name The name of the thread to be created.
  */
 expect fun singleThreadDispatcher(name: String): CloseableCoroutineDispatcher
+
+/**
+ * Creates a coroutine execution context using a thread pool.
+ *
+ * **NOTE: The resulting [CloseableCoroutineDispatcher] owns native resources (its thread).
+ * Resources are reclaimed by [CloseableCoroutineDispatcher.close].**
+ * @param numberOfThreads The number of the threads that the thread pool should consist of.
+ * @param name The name of the thread pool to be created.
+ */
+expect fun threadPoolDispatcher(numberOfThreads: UInt, name: String): CloseableCoroutineDispatcher
\ No newline at end of file
diff --git a/base/src/commonMain/kotlin/state/KalugaState.kt b/base/src/commonMain/kotlin/state/KalugaState.kt
index 02b84354f..1d958b600 100644
--- a/base/src/commonMain/kotlin/state/KalugaState.kt
+++ b/base/src/commonMain/kotlin/state/KalugaState.kt
@@ -59,6 +59,9 @@ interface KalugaState {
     fun <S : KalugaState> remain(): suspend() -> S = remain as suspend () -> S
 }
 
+/**
+ * Marker interface to indicate a [KalugaState] should execute an action before creating a new state to transition to.
+ */
 interface HandleBeforeCreating {
     /**
      * Called while transitioning to a new state before the new state is created
@@ -66,54 +69,71 @@ interface HandleBeforeCreating {
     suspend fun beforeCreatingNewState()
 }
 
-interface HandleAfterCreating<S : KalugaState> {
+/**
+ * Marker interface to indicate a [KalugaState] should execute an action after creating a new state to transition to.
+ * @param NewState the type of [KalugaState] created
+ */
+interface HandleAfterCreating<NewState : KalugaState> {
     /**
      * Called while transitioning to a new state after the new state is created
      *
      * @param newState the newly created state
      */
-    suspend fun afterCreatingNewState(newState: S)
+    suspend fun afterCreatingNewState(newState: NewState)
 }
 
-interface HandleAfterNewStateIsSet<S : KalugaState> {
+/**
+ * Marker interface to indicate a [KalugaState] should execute an action after it has been transitioned into a new state.
+ * @param NewState the type of [KalugaState] transitioned to.
+ */
+interface HandleAfterNewStateIsSet<NewState : KalugaState> {
 
     /**
      * Called while transitioning to a new state after the new state is set.
      *
      * @param newState the newly set [KalugaState]
      */
-    suspend fun afterNewStateIsSet(newState: S)
+    suspend fun afterNewStateIsSet(newState: NewState)
 }
 
-interface HandleBeforeOldStateIsRemoved<S : KalugaState> {
+/**
+ * Marker interface to indicate a [KalugaState] should execute an action before replacing another state.
+ * @param OldState the type of [KalugaState] that is to be replaced.
+ */
+interface HandleBeforeOldStateIsRemoved<OldState : KalugaState> {
 
     /**
      * Called while transitioning from an old state before it is removed.
      *
      * @param oldState the [KalugaState] to be removed
      */
-    suspend fun beforeOldStateIsRemoved(oldState: S)
+    suspend fun beforeOldStateIsRemoved(oldState: OldState)
 }
 
-interface HandleAfterOldStateIsRemoved<S : KalugaState> {
+/**
+ * Marker interface to indicate a [KalugaState] should execute an action after replacing another state.
+ * @param OldState the type of [KalugaState] that was replaced.
+ */
+interface HandleAfterOldStateIsRemoved<OldState : KalugaState> {
 
     /**
      * Called while transitioning from an old state after it is removed
      *
      * @param oldState the removed state
      */
-    suspend fun afterOldStateIsRemoved(oldState: S)
+    suspend fun afterOldStateIsRemoved(oldState: OldState)
 }
 
 /**
  * The state repo can change holds the current [KalugaState] (which can be accessed as a flow), and can be used to change the current state
  *
- * @param S the [KalugaState] represented by this repo.
+ * @param State the type of [KalugaState] represented by this repo.
+ * @param F the type of [MutableSharedFlow] the state will be collected in.
  * @param coroutineContext the [CoroutineContext] used to create a coroutine scope for this state machine. Make sure that if you pass a coroutine context that has sequential execution if you do not want simultaneous state changes. The default Main dispatcher meets these criteria.
  */
-abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineContext: CoroutineContext = Dispatchers.Main.immediate) : CoroutineScope by CoroutineScope(coroutineContext + CoroutineName("State Repo")), Flow<S> {
+abstract class StateRepo<State : KalugaState, F : MutableSharedFlow<State>>(coroutineContext: CoroutineContext = Dispatchers.Main.immediate) : CoroutineScope by CoroutineScope(coroutineContext + CoroutineName("State Repo")), Flow<State> {
 
-    override suspend fun collect(collector: FlowCollector<S>) = mutableFlow.collect(collector)
+    override suspend fun collect(collector: FlowCollector<State>) = mutableFlow.collect(collector)
 
     /**
      * Semaphore used as a mutex for changing state.
@@ -123,12 +143,16 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
     private val stateMutex = Semaphore(1, 1)
 
     protected abstract val mutableFlow: F
+
+    /**
+     * Number of subscribers to the state repo
+     */
     val subscriptionCount
         get() = mutableFlow.subscriptionCount
 
     private val initialized = atomic(false)
 
-    internal open suspend fun initialize(initialValue: S? = null): S =
+    internal open suspend fun initialize(initialValue: State? = null): State =
         if (initialized.compareAndSet(expect = false, update = true)) {
             (initialValue ?: initialValue()).also { value ->
                 mutableFlow.emit(value)
@@ -140,11 +164,11 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
 
     /**
      * Gets the initial value of the repo
-     * @return the initial value of the repo
+     * @return the initial [State] of the repo
      */
-    abstract suspend fun initialValue(): S
+    abstract suspend fun initialValue(): State
 
-    internal suspend fun state(): S {
+    internal suspend fun state(): State {
         // TODO:
         // if this state machine is backed by a SharedFlow instead of a pure StateFlow this will suspend indefinitely if no state is set
         // this only occurs (normally) if the initial state is not set.
@@ -159,7 +183,7 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
         // The replay cache instantiation is somewhat heavy but there is no method to get only the the last entry in the cache
         // if no or a small replayCache is used it is not so bad. Also is a StateFlow is used, this problem does not occur.
         @Suppress("UNCHECKED_CAST")
-        return (mutableFlow as? StateFlow<S>)?.value ?: mutableFlow.replayCache.lastOrNull() ?: mutableFlow.first()
+        return (mutableFlow as? StateFlow<State>)?.value ?: mutableFlow.replayCache.lastOrNull() ?: mutableFlow.first()
     }
 
     /**
@@ -172,7 +196,7 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
      * If your code relies on the state not changing use [useState].
      * If you want to change the state based on the current state use [takeAndChangeState]
      *
-     * @return the current [KalugaState] of the [StateRepo]
+     * @return the current [State] of the [StateRepo]
      */
     fun peekState() = runBlocking {
         initialize()
@@ -180,14 +204,14 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
     }
 
     /**
-     * Makes the current [KalugaState] available in [action]. The state is guaranteed not to change during the execution of [action].
+     * Makes the current [State] available in [action]. The state is guaranteed not to change during the execution of [action].
      * This operation ensures atomic state observations, so the state will not change while the [action] is being executed.
      *
      * This method uses a separate coroutineScope, meaning it will suspend until all child Jobs are completed, including those that asynchronously call this method itself (however a different state might be current at that point).
      *
-     * @param action the function for which will [KalugaState] receive the state, guaranteed to be unchanged for the duration of the function.
+     * @param action the function for which will [State] receive the state, guaranteed to be unchanged for the duration of the function.
      */
-    suspend fun useState(action: suspend (S) -> Unit) = coroutineScope {
+    suspend fun useState(action: suspend (State) -> Unit) = coroutineScope {
         initialize()
         stateMutex.withPermit {
             val result = EmptyCompletableDeferred()
@@ -203,55 +227,89 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
         }
     }
 
+    /**
+     * Launches in a given [CoroutineContext] and calls [action] on the current [State]. The state is guaranteed not to change during the execution of [action].
+     * This operation ensures atomic state observations, so the state will not change while the [action] is being executed.
+     *
+     * @param context The [CoroutineContext] in which to use the state.
+     * @param action The action to execute on the current [State]
+     * @see [useState]
+     */
     fun launchUseState(
         context: CoroutineContext = coroutineContext,
-        action: suspend(S) -> Unit
+        action: suspend(State) -> Unit
     ) = launch(context) {
         useState(action)
     }
 
-    suspend fun takeAndChangeState(action: suspend(S) -> suspend () -> S) =
+    /**
+     * Changes from the current [State] to a new [State]. This operation ensures atomic state changes.
+     * The new state is determined by an [action], which takes the current [State] upon starting the state transition and provides a deferred state creation.
+     * You are strongly encouraged to use the [State] provided by the [action] to determine the new state, to ensure no illegal state transitions occur, as the state may have changed between calling [doTakeAndChangeState] and the execution of [action].
+     * If the [action] returns [KalugaState.remain] no state transition will occur.
+     * Since this operation is atomic, the [action] should not directly call [doTakeAndChangeState] itself. If required to do this, handle the additional transition in a separate coroutine.
+     *
+     * This method uses a separate coroutineScope, meaning it will suspend until all child Jobs are completed, including those that asynchronously call this method itself.
+     *
+     * @param action Function to determine the [State] to be transitioned to from the current [State]. If no state transition should occur, return [KalugaState.remain]
+     */
+    suspend fun takeAndChangeState(action: suspend(State) -> suspend () -> State) =
         doTakeAndChangeState(remainIfStateNot = null, action)
 
     /**
-     * Changes from the current [KalugaState] to a new [KalugaState]. This operation ensures atomic state changes.
-     * The new state is determined by an [action], which takes the current [KalugaState] upon starting the state transition and provides a deferred state creation.
-     * You are strongly encouraged to use the [KalugaState] provided by the [action] to determine the new state, to ensure no illegal state transitions occur, as the state may have changed between calling [doTakeAndChangeState] and the execution of [action].
+     * Changes from the current [State] to a new [State]. This operation ensures atomic state changes.
+     * The new state is determined by an [action], which takes the current [State] upon starting the state transition and provides a deferred state creation.
+     * You are strongly encouraged to use the [State] provided by the [action] to determine the new state, to ensure no illegal state transitions occur, as the state may have changed between calling [doTakeAndChangeState] and the execution of [action].
      * If the [action] returns [KalugaState.remain] no state transition will occur.
      * Since this operation is atomic, the [action] should not directly call [doTakeAndChangeState] itself. If required to do this, handle the additional transition in a separate coroutine.
      *
      * This method uses a separate coroutineScope, meaning it will suspend until all child Jobs are completed, including those that asynchronously call this method itself.
      *
      * @param remainIfStateNot If the current state at the time of Action is not an instance of this class, the state will automatically remain.
-     * @param action Function to determine the [KalugaState] to be transitioned to from the current [KalugaState]. If no state transition should occur, return [KalugaState.remain]
+     * @param action Function to determine the [State] to be transitioned to from the current [State]. If no state transition should occur, return [KalugaState.remain]
      */
-    suspend fun <K : S> takeAndChangeState(remainIfStateNot: KClass<K>, action: suspend(K) -> suspend () -> S) =
+    suspend fun <K : State> takeAndChangeState(remainIfStateNot: KClass<K>, action: suspend(K) -> suspend () -> State) =
         doTakeAndChangeState(remainIfStateNot) {
             action(it)
         }
 
-    fun <K : S> launchTakeAndChangeState(
+    /**
+     * Launches in a given [CoroutineContext] to change from the current [State] to a new [State]. This operation ensures atomic state changes.
+     *
+     * @param context The [CoroutineContext] in which to use the state.
+     * @param action Function to determine the [State] to be transitioned to from the current [State]. If no state transition should occur, return [KalugaState.remain]
+     * @see [takeAndChangeState]
+     */
+    fun launchTakeAndChangeState(
         context: CoroutineContext = coroutineContext,
-        remainIfStateNot: KClass<K>,
-        action: suspend(K) -> suspend () -> S
+        action: suspend(State) -> suspend () -> State
     ) = launch(context) {
-        takeAndChangeState(remainIfStateNot) {
-            action(it)
-        }
+        takeAndChangeState(action)
     }
 
-    fun launchTakeAndChangeState(
+    /**
+     * Launches in a given [CoroutineContext] to change from the current [State] to a new [State]. This operation ensures atomic state changes.
+     *
+     * @param context The [CoroutineContext] in which to use the state.
+     * @param remainIfStateNot If the current state at the time of Action is not an instance of this class, the state will automatically remain.
+     * @param action Function to determine the [State] to be transitioned to from the current [State]. If no state transition should occur, return [KalugaState.remain]
+     * @see [takeAndChangeState]
+     */
+    fun <K : State> launchTakeAndChangeState(
         context: CoroutineContext = coroutineContext,
-        action: suspend(S) -> suspend () -> S
+        remainIfStateNot: KClass<K>,
+        action: suspend(K) -> suspend () -> State
     ) = launch(context) {
-        takeAndChangeState(action)
+        takeAndChangeState(remainIfStateNot) {
+            action(it)
+        }
     }
 
     @Suppress("UNCHECKED_CAST")
-    private suspend inline fun <K : S> doTakeAndChangeState(remainIfStateNot: KClass<K>?, crossinline action: suspend(K) -> suspend () -> S): S = coroutineScope { // scope around the mutex so asynchronously scheduled coroutines that also use this method can run before the scope completed without deadlocks
+    private suspend inline fun <K : State> doTakeAndChangeState(remainIfStateNot: KClass<K>?, crossinline action: suspend(K) -> suspend () -> State): State = coroutineScope { // scope around the mutex so asynchronously scheduled coroutines that also use this method can run before the scope completed without deadlocks
         initialize()
         stateMutex.withPermit {
-            val result = CompletableDeferred<S>()
+            val result = CompletableDeferred<State>()
             launch {
                 try {
                     val beforeState = state()
@@ -263,16 +321,16 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
                             else -> beforeState.remain() // else just remain
                         }
 
-                    if (beforeState.remain<S>() === transition) {
+                    if (beforeState.remain<State>() === transition) {
                         result.complete(beforeState)
                     } else {
                         (beforeState as? HandleBeforeCreating)?.beforeCreatingNewState()
                         val newState = transition()
-                        (beforeState as? HandleAfterCreating<S>)?.afterCreatingNewState(newState)
-                        (newState as? HandleBeforeOldStateIsRemoved<S>)?.beforeOldStateIsRemoved(beforeState)
+                        (beforeState as? HandleAfterCreating<State>)?.afterCreatingNewState(newState)
+                        (newState as? HandleBeforeOldStateIsRemoved<State>)?.beforeOldStateIsRemoved(beforeState)
                         mutableFlow.emit(newState)
-                        (beforeState as? HandleAfterNewStateIsSet<S>)?.afterNewStateIsSet(newState)
-                        (newState as? HandleAfterOldStateIsRemoved<S>)?.afterOldStateIsRemoved(beforeState)
+                        (beforeState as? HandleAfterNewStateIsSet<State>)?.afterNewStateIsSet(newState)
+                        (newState as? HandleAfterOldStateIsRemoved<State>)?.afterOldStateIsRemoved(beforeState)
                         result.complete(newState)
                     }
                 } catch (t: Throwable) {
@@ -286,37 +344,31 @@ abstract class StateRepo<S : KalugaState, F : MutableSharedFlow<S>>(coroutineCon
 
 @Suppress("NOTHING_TO_INLINE")
 // Somewhat similar to a ConflatedBroadcastChannel, which was used in the previous implementation
-inline fun <S> defaultLazySharedFlow(): Lazy<MutableSharedFlow<S>> = lazy { MutableSharedFlow(replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST) }
-
-interface StateFlowRepo<S : KalugaState> {
-    val stateFlow: StateFlow<S>
-}
+internal inline fun <S> defaultLazySharedFlow(): Lazy<MutableSharedFlow<S>> = lazy { MutableSharedFlow(replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST) }
 
 /**
- * A [StateRepo] that represents its [KalugaState] as a Hot flow.
+ * A wrapper for a [StateFlow] containing a [KalugaState]
+ * @param State the type of [KalugaState] to store.
  */
-abstract class HotStateRepo<S : KalugaState>(coroutineContext: CoroutineContext = Dispatchers.Main.immediate) :
-    BaseHotStateRepo<S, MutableSharedFlow<S>>(coroutineContext) {
-    final override val lazyMutableSharedFlow: Lazy<MutableSharedFlow<S>> = defaultLazySharedFlow()
+interface StateFlowRepo<State : KalugaState> {
+    val stateFlow: StateFlow<State>
 }
 
-abstract class HotStateFlowRepo<S : KalugaState>(
-    coroutineContext: CoroutineContext = Dispatchers.Main.immediate,
-    val initialState: (HotStateFlowRepo<S>) -> S
-) : StateFlowRepo<S>,
-    BaseHotStateRepo<S, MutableStateFlow<S>>(coroutineContext) {
-
-    override val lazyMutableSharedFlow = lazy { MutableStateFlow(initialState(this)) }
-
-    override val stateFlow
-        get() = mutableFlow.asStateFlow()
-
-    final override suspend fun initialValue(): S = mutableFlow.value
-}
-
-abstract class BaseHotStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
+/**
+ * A Hot [StateRepo], using a MutableSharedFlow as it's backing implementation.
+ *
+ * The repo will get initialized when the state is first read and remain initialized after.
+ *
+ * Be aware an initialization can take place if state is read, for example by [useState] or [takeAndChangeState], without actual collection events occurring.
+ * However a SharedFlow without a replay buffer might trigger a collection to get the initial state if no explicit state is provided
+ *
+ * @param State the type of [KalugaState] represented by this repo.
+ * @param F the type of [MutableSharedFlow] the state will be collected in.
+ * @param coroutineContext the [CoroutineContext] used to create a coroutine scope for this state machine. Make sure that if you pass a coroutine context that has sequential execution if you do not want simultaneous state changes. The default Main dispatcher meets these criteria.
+ */
+abstract class BaseHotStateRepo<State : KalugaState, F : MutableSharedFlow<State>>(
     coroutineContext: CoroutineContext = Dispatchers.Main.immediate
-) : StateRepo<S, F>(coroutineContext) {
+) : StateRepo<State, F>(coroutineContext) {
 
     abstract val lazyMutableSharedFlow: Lazy<F>
 
@@ -337,7 +389,38 @@ abstract class BaseHotStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
 }
 
 /**
- * A Cold StateRepo, using a MutableSharedFlow as it's backing implementation.
+ * An abstract [BaseHotStateRepo] that uses a [MutableSharedFlow] with a replay cache of `1` and configured with [BufferOverflow.DROP_OLDEST] to back up data.
+ * @param State the type of [KalugaState] represented by this repo.
+ * @param coroutineContext the [CoroutineContext] used to create a coroutine scope for this state machine. Make sure that if you pass a coroutine context that has sequential execution if you do not want simultaneous state changes. The default Main dispatcher meets these criteria.
+ * @see BaseHotStateRepo
+ */
+abstract class HotStateRepo<State : KalugaState>(coroutineContext: CoroutineContext = Dispatchers.Main.immediate) :
+    BaseHotStateRepo<State, MutableSharedFlow<State>>(coroutineContext) {
+    final override val lazyMutableSharedFlow: Lazy<MutableSharedFlow<State>> = defaultLazySharedFlow()
+}
+
+/**
+ * An abstract [BaseHotStateRepo] that uses a [MutableStateFlow] to back up its data.
+ * @param State the type of [KalugaState] represented by this repo.
+ * @param coroutineContext the [CoroutineContext] used to create a coroutine scope for this state machine. Make sure that if you pass a coroutine context that has sequential execution if you do not want simultaneous state changes. The default Main dispatcher meets these criteria.
+ * @param initialState A method for generating the initial [State] the provided repo should be set in when observation starts.
+ */
+abstract class HotStateFlowRepo<State : KalugaState>(
+    coroutineContext: CoroutineContext = Dispatchers.Main.immediate,
+    val initialState: (HotStateFlowRepo<State>) -> State
+) : StateFlowRepo<State>,
+    BaseHotStateRepo<State, MutableStateFlow<State>>(coroutineContext) {
+
+    override val lazyMutableSharedFlow = lazy { MutableStateFlow(initialState(this)) }
+
+    override val stateFlow
+        get() = mutableFlow.asStateFlow()
+
+    final override suspend fun initialValue(): State = mutableFlow.value
+}
+
+/**
+ * A Cold [StateRepo], using a MutableSharedFlow as it's backing implementation.
  *
  * The repo will get initialized when the state is first read.
  *
@@ -345,10 +428,14 @@ abstract class BaseHotStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
  *
  * Be aware an initialization can take place if state is read, for example by [useState] or [takeAndChangeState], without actual collection events occurring.
  * However a SharedFlow without a replay buffer might trigger a collection to get the initial state if no explicit state is provided
+ *
+ * @param State the type of [KalugaState] represented by this repo.
+ * @param F the type of [MutableSharedFlow] the state will be collected in.
+ * @param context the [CoroutineContext] used to create a coroutine scope for this state machine. Make sure that if you pass a coroutine context that has sequential execution if you do not want simultaneous state changes. The default Main dispatcher meets these criteria.
  */
-abstract class BaseColdStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
+abstract class BaseColdStateRepo<State : KalugaState, F : MutableSharedFlow<State>>(
     context: CoroutineContext = Dispatchers.Main.immediate
-) : StateRepo<S, F>(context) {
+) : StateRepo<State, F>(context) {
 
     private val initialized = atomic(false)
 
@@ -375,35 +462,48 @@ abstract class BaseColdStateRepo<S : KalugaState, F : MutableSharedFlow<S>>(
 
     abstract suspend fun firstCollection()
 
-    abstract suspend fun laterCollections(): S
+    abstract suspend fun laterCollections(): State
 
-    abstract suspend fun noMoreCollections(): S
+    abstract suspend fun noMoreCollections(): State
 }
 
 /**
- * A ColdStateRepo based on a StateFlow.
+ * A [BaseColdStateRepo] based on a [MutableStateFlow].
  *
  * This implementation allows for full fledged state transitions when the repo gains it's first subscriber
  * or loses all of it's subscribers.
  *
  * It also has an optional initial state.
+ *
+ * @param State the type of [KalugaState] represented by this repo.
+ * @param coroutineContext the [CoroutineContext] used to create a coroutine scope for this state machine. Make sure that if you pass a coroutine context that has sequential execution if you do not want simultaneous state changes. The default Main dispatcher meets these criteria.
+ * @param initChangeStateWithRepo method called when the repo transitions from no subscriptions to being subscribed to. Contains the last known [State] and provides a reference to this [ColdStateFlowRepo], and should result in a state transition.
+ * @param deinitChangeStateWithRepo method called when the repo transitions from being subscribed to to no subscriptions. Contains the last known [State] and provides a reference to this [ColdStateFlowRepo], and allows to transition into a deinitialized state.
+ * @param firstState Creates the first [State] when observation first takes place.
  */
-open class ColdStateFlowRepo<S : KalugaState>(
+open class ColdStateFlowRepo<State : KalugaState>(
     coroutineContext: CoroutineContext = Dispatchers.Main.immediate,
-    val initChangeStateWithRepo: suspend (S, ColdStateFlowRepo<S>) -> (suspend () -> S),
-    val deinitChangeStateWithRepo: suspend (S, ColdStateFlowRepo<S>) -> (suspend () -> S)?,
-    val firstState: () -> S
-) : StateFlowRepo<S>,
-    BaseColdStateRepo<S, MutableStateFlow<S>>(
+    val initChangeStateWithRepo: suspend (State, ColdStateFlowRepo<State>) -> (suspend () -> State),
+    val deinitChangeStateWithRepo: suspend (State, ColdStateFlowRepo<State>) -> (suspend () -> State)?,
+    val firstState: () -> State
+) : StateFlowRepo<State>,
+    BaseColdStateRepo<State, MutableStateFlow<State>>(
         context = coroutineContext,
     ) {
 
+    /**
+     * Constructor
+     * @param coroutineContext the [CoroutineContext] used to create a coroutine scope for this state machine. Make sure that if you pass a coroutine context that has sequential execution if you do not want simultaneous state changes. The default Main dispatcher meets these criteria.
+     * @param firstState Creates the first [State] when observation first takes place.
+     * @param initChangeState method called when the repo transitions from no subscriptions to being subscribed to. Contains the last known [State] and should result in a state transition.
+     * @param deinitChangeState method called when the repo transitions from being subscribed to to no subscriptions. Contains the last known [State] and should result in a state transition.
+     */
     constructor(
         coroutineContext: CoroutineContext = Dispatchers.Main.immediate,
         // order is different than below because here firstState is mandatory, and to avoid JVM signature clashes
-        firstState: () -> S,
-        initChangeState: suspend (S) -> (suspend () -> S),
-        deinitChangeState: suspend (S) -> (suspend () -> S)
+        firstState: () -> State,
+        initChangeState: suspend (State) -> (suspend () -> State),
+        deinitChangeState: suspend (State) -> (suspend () -> State)
     ) : this(
         coroutineContext,
         initChangeStateWithRepo = { state, _ -> initChangeState(state) },
@@ -411,11 +511,18 @@ open class ColdStateFlowRepo<S : KalugaState>(
         firstState = firstState
     )
 
+    /**
+     * Constructor
+     * @param coroutineContext the [CoroutineContext] used to create a coroutine scope for this state machine. Make sure that if you pass a coroutine context that has sequential execution if you do not want simultaneous state changes. The default Main dispatcher meets these criteria.
+     * @param init method called when the repo transitions from no subscriptions to being subscribed to. Contains a reference to the [ColdStateFlowRepo] and should result in a [State] to transition to.
+     * @param deinit method called when the repo transitions from being subscribed to to no subscriptions. Contains a reference to the [ColdStateFlowRepo] and should result in a [State] to transition to.
+     * @param firstState Creates the first [State] when observation first takes place.
+     * */
     constructor(
         coroutineContext: CoroutineContext = Dispatchers.Main.immediate,
-        init: suspend (ColdStateFlowRepo<S>) -> S,
-        deinit: suspend (ColdStateFlowRepo<S>) -> S?,
-        firstState: () -> S
+        init: suspend (ColdStateFlowRepo<State>) -> State,
+        deinit: suspend (ColdStateFlowRepo<State>) -> State?,
+        firstState: () -> State
     ) : this(
         coroutineContext,
         initChangeStateWithRepo = { _, repo -> { init(repo) } },
@@ -423,17 +530,17 @@ open class ColdStateFlowRepo<S : KalugaState>(
         firstState = firstState
     )
 
-    override val stateFlow: StateFlow<S>
+    override val stateFlow: StateFlow<State>
         get() = mutableFlow.asStateFlow()
 
     // the first initialization is done in the lazy block below since StateFlow requires an initial value
-    final override suspend fun initialValue(): S = mutableFlow.value
+    final override suspend fun initialValue(): State = mutableFlow.value
 
     final override suspend fun noMoreCollections() = takeAndChangeState { state ->
         deinitChangeStateWithRepo(state, this) ?: state.remain()
     }
 
-    override val lazyMutableFlow: Lazy<MutableStateFlow<S>> =
+    override val lazyMutableFlow: Lazy<MutableStateFlow<State>> =
         lazy {
             MutableStateFlow(
                 firstState()
@@ -450,17 +557,21 @@ open class ColdStateFlowRepo<S : KalugaState>(
 }
 
 /**
- * A [StateRepo] that represents its [KalugaState] as a Cold flow. Data will only be set when the state is observed.
+ * A [BaseColdStateRepo] that represents its [State] as a Cold flow. Data will only be set when the state is observed.
  *
  * This class uses a very simple initialize and deinitialize pattern without changes of state by default
  *
  * This implementation uses a [MutableSharedFlow]. If you want to use a cold state repo based on StateFlow,
  * consider [ColdStateFlowRepo]
+ * @param State the type of [KalugaState] represented by this repo.
+ * @param coroutineContext the [CoroutineContext] used to create a coroutine scope for this state machine. Make sure that if you pass a coroutine context that has sequential execution if you do not want simultaneous state changes. The default Main dispatcher meets these criteria.
+ * @param lazyMutableFlow A [Lazy] [MutableSharedFlow] of [State] in which to store the backing data
+ * @see [BaseColdStateRepo]
  */
-abstract class ColdStateRepo<S : KalugaState>(
+abstract class ColdStateRepo<State : KalugaState>(
     coroutineContext: CoroutineContext = Dispatchers.Main.immediate,
-    override val lazyMutableFlow: Lazy<MutableSharedFlow<S>> = defaultLazySharedFlow()
-) : BaseColdStateRepo<S, MutableSharedFlow<S>>(coroutineContext) {
+    override val lazyMutableFlow: Lazy<MutableSharedFlow<State>> = defaultLazySharedFlow()
+) : BaseColdStateRepo<State, MutableSharedFlow<State>>(coroutineContext) {
 
     final override suspend fun firstCollection() {
         initialize()
@@ -470,10 +581,14 @@ abstract class ColdStateRepo<S : KalugaState>(
         { initialValue() }
     }
 
-    final override suspend fun noMoreCollections(): S = takeAndChangeState {
+    final override suspend fun noMoreCollections(): State = takeAndChangeState {
         deinitialize(it)
         it.remain()
     }
 
-    abstract suspend fun deinitialize(state: S)
+    /**
+     * Called when the repo is no longer observed
+     * @param state The last [State] before observation stopped.
+     */
+    abstract suspend fun deinitialize(state: State)
 }
diff --git a/base/src/commonMain/kotlin/text/Flags.kt b/base/src/commonMain/kotlin/text/Flags.kt
index fd414e3ba..902060406 100644
--- a/base/src/commonMain/kotlin/text/Flags.kt
+++ b/base/src/commonMain/kotlin/text/Flags.kt
@@ -17,19 +17,55 @@
 
 package com.splendo.kaluga.base.text
 
+/**
+ * Modifying flags for a [Formattable] that modify the output
+ */
 enum class Flag(val char: Char) {
+    /**
+     * Left-justifies the result of [Formattable]
+     */
     LEFT_JUSTIFY('-'),
+
+    /**
+     * Upper cases the result of [Formattable]
+     */
     UPPERCASE('^'),
+
+    /**
+     * The result of [Formattable] should use a conversion-dependent alternative form.
+     */
     ALTERNATE('#'),
 
     // numerics
+    /**
+     * Number results of [Formattable] will always include a sign, even when positive.
+     */
     PLUS('+'),
+
+    /**
+     * Number results of [Formattable] will include a leading space when positive.
+     */
     LEADING_SPACE(' '),
+
+    /**
+     * Number results of [Formattable] will be zero-padded.
+     */
     ZERO_PAD('0'),
+
+    /**
+     * Number results of [Formattable] will include locale specific grouping separators.
+     */
     GROUP(','),
+
+    /**
+     * Number results of [Formattable] will enclose negative numbers in parentheses.
+     */
     PARENTHESES('('),
 
     // indexing
+    /**
+     * Causes the arguments of the previous [Formattable] to be used.
+     */
     PREVIOUS('<');
 
     companion object {
diff --git a/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt b/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
index 4e16e2b2b..bc6665e53 100644
--- a/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
@@ -49,9 +49,70 @@ enum class DateFormatStyle {
 }
 
 /**
- * Class for parsing and formatting a [KalugaDate] from/to a [String].
+ * Interface for parsing and formatting a [KalugaDate] from/to a [String].
  */
-expect class KalugaDateFormatter {
+interface BaseDateFormatter {
+
+    var pattern: String
+
+    /**
+     * The [TimeZone] this [KalugaDateFormatter] formats its dates to.
+     */
+    var timeZone: TimeZone
+
+    /**
+     * A list containing the names of all eras used by this date formatter.
+     */
+    var eras: List<String>
+
+    /**
+     * A list containing the names of all months used by this date formatter.
+     */
+    var months: List<String>
+
+    /**
+     * A list containing the shortened names of all months used by this date formatter.
+     */
+    var shortMonths: List<String>
+
+    /**
+     * A list containing the names of all weekdays used by this date formatter.
+     */
+    var weekdays: List<String>
+    /**
+     * A list containing the shortened names of all weekdays used by this date formatter.
+     */
+    var shortWeekdays: List<String>
+
+    /**
+     * The name used to describe A.M. when using a twelve hour clock.
+     */
+    var amString: String
+
+    /**
+     * The name used to describe P.M. when using a twelve hour clock.
+     */
+    var pmString: String
+
+    /**
+     * Formats a given [KalugaDate] to a [String] using the format described by this [KalugaDateFormatter].
+     * @param date The [KalugaDate] to format.
+     * @return The formatted [KalugaDate] as a [String]
+     */
+    fun format(date: KalugaDate): String
+
+    /**
+     * Attempts to parse a given [String] into a [KalugaDate] using the format described.
+     * @param string The [String] to parse.
+     * @return A [KalugaDate] matching the format described by [string] or `null` if no such match could be made.
+     */
+    fun parse(string: String): KalugaDate?
+}
+
+/**
+ * Default implementation of [BaseDateFormatter]
+ */
+expect class KalugaDateFormatter : BaseDateFormatter {
 
     companion object {
         /**
@@ -108,60 +169,6 @@ expect class KalugaDateFormatter {
         ): KalugaDateFormatter
     }
 
-    var pattern: String
-
-    /**
-     * The [TimeZone] this [KalugaDateFormatter] formats its dates to.
-     */
-    var timeZone: TimeZone
-
-    /**
-     * A list containing the names of all eras used by this date formatter.
-     */
-    var eras: List<String>
-
-    /**
-     * A list containing the names of all months used by this date formatter.
-     */
-    var months: List<String>
-
-    /**
-     * A list containing the shortened names of all months used by this date formatter.
-     */
-    var shortMonths: List<String>
-
-    /**
-     * A list containing the names of all weekdays used by this date formatter.
-     */
-    var weekdays: List<String>
-    /**
-     * A list containing the shortened names of all weekdays used by this date formatter.
-     */
-    var shortWeekdays: List<String>
-
-    /**
-     * The name used to describe A.M. when using a twelve hour clock.
-     */
-    var amString: String
-
-    /**
-     * The name used to describe P.M. when using a twelve hour clock.
-     */
-    var pmString: String
-
-    /**
-     * Formats a given [KalugaDate] to a [String] using the format described by this [KalugaDateFormatter].
-     * @param date The [KalugaDate] to format.
-     * @return The formatted [KalugaDate] as a [String]
-     */
-    fun format(date: KalugaDate): String
-
-    /**
-     * Attempts to parse a given [String] into a [KalugaDate] using the format described.
-     * @param string The [String] to parse.
-     * @return A [KalugaDate] matching the format described by [string] or `null` if no such match could be made.
-     */
-    fun parse(string: String): KalugaDate?
 }
 
 @Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaState"))
diff --git a/base/src/commonMain/kotlin/text/NumberFormatter.kt b/base/src/commonMain/kotlin/text/NumberFormatter.kt
index 807fd46fb..34537c568 100644
--- a/base/src/commonMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/commonMain/kotlin/text/NumberFormatter.kt
@@ -190,10 +190,8 @@ sealed class NumberFormatStyle(open val roundingMode: RoundingMode) {
 
 /**
  * Class for parsing and formatting a [Number] from/to a [String].
- * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
- * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
  */
-expect class NumberFormatter constructor(locale: Locale = defaultLocale, style: NumberFormatStyle = NumberFormatStyle.Decimal()) {
+interface BaseNumberFormatter {
     /**
      * [Locale] used for formatting.
      */
@@ -310,3 +308,10 @@ expect class NumberFormatter constructor(locale: Locale = defaultLocale, style:
      */
     fun parse(string: String): Number?
 }
+
+/**
+ * Default implementation of [BaseNumberFormatter]
+ * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
+ * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
+ */
+expect class NumberFormatter constructor(locale: Locale = defaultLocale, style: NumberFormatStyle = NumberFormatStyle.Decimal()) : BaseNumberFormatter
diff --git a/base/src/commonMain/kotlin/text/StringUtils.kt b/base/src/commonMain/kotlin/text/StringUtils.kt
index 4beaea0f0..3aa06df5b 100644
--- a/base/src/commonMain/kotlin/text/StringUtils.kt
+++ b/base/src/commonMain/kotlin/text/StringUtils.kt
@@ -19,8 +19,19 @@ package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.Locale
 
+/**
+ * The String that serves as a line separator.
+ */
 expect val lineSeparator: String
 
+/**
+ * Converts a String to its lower cased variant based on a given [Locale]
+ * @param locale The [Locale] to use for transforming to lower case.
+ */
 expect fun String.lowerCased(locale: Locale): String
 
+/**
+ * Converts a String to its upper cased variant based on a given [Locale]
+ * @param locale The [Locale] to use for transforming to upper case.
+ */
 expect fun String.upperCased(locale: Locale): String
diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index 2578eb5d4..00578ce2d 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -21,71 +21,251 @@ package com.splendo.kaluga.base.utils
 
 class DecimalException(message: String?) : ArithmeticException(message)
 
+/**
+ * Immutable, arbitrary-precision signed decimal numbers.
+ */
 expect class Decimal : Comparable<Decimal>
 
+/**
+ * Adds two [Decimal] together.
+ * @param value the [Decimal] to add
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 expect operator fun Decimal.plus(value: Decimal): Decimal
+
+/**
+ * Adds two [Decimal] together scaled to a given precision.
+ * @param value the [Decimal] to add
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 expect fun Decimal.plus(value: Decimal, scale: Int): Decimal
+
+/**
+ * Adds two [Decimal] together scaled to a given precision.
+ * @param value the [Decimal] to add
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 expect fun Decimal.plus(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
 ): Decimal
 
+/**
+ * Subtracts two [Decimal].
+ * @param value the [Decimal] to subtract
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 expect operator fun Decimal.minus(value: Decimal): Decimal
+
+/**
+ * Subtracts two [Decimal] to a given precision.
+ * @param value the [Decimal] to subtract
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 expect fun Decimal.minus(value: Decimal, scale: Int): Decimal
+
+/**
+ * Subtracts two [Decimal] to a given precision.
+ * @param value the [Decimal] to subtract
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 expect fun Decimal.minus(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
 ): Decimal
 
+/**
+ * Divides two [Decimal].
+ * @param value the [Decimal] to divide
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 expect operator fun Decimal.div(value: Decimal): Decimal
+
+/**
+ * Divides two [Decimal] to a given precision.
+ * @param value the [Decimal] to divide
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 expect fun Decimal.div(value: Decimal, scale: Int): Decimal
+
+/**
+ * Divides two [Decimal] to a given precision.
+ * @param value the [Decimal] to divide
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 expect fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
 ): Decimal
 
+/**
+ * Multiplies two [Decimal].
+ * @param value the [Decimal] to multiply
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 expect operator fun Decimal.times(value: Decimal): Decimal
+
+/**
+ * Multiplies two [Decimal] to a given precision.
+ * @param value the [Decimal] to multiply
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 expect fun Decimal.times(value: Decimal, scale: Int): Decimal
+
+/**
+ * Multiplies two [Decimal] to a given precision.
+ * @param value the [Decimal] to multiply
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 expect fun Decimal.times(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
 ): Decimal
 
+/**
+ * Raises two [Decimal].
+ * @param n the [Decimal] to raise to
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 expect infix fun Decimal.pow(n: Int): Decimal
+
+/**
+ * Raises two [Decimal] to a given precision.
+ * @param n the [Decimal] to raise to
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 expect fun Decimal.pow(n: Int, scale: Int): Decimal
+
+/**
+ * Raises two [Decimal] to a given precision.
+ * @param n the [Decimal] to raise to
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 expect fun Decimal.pow(
     n: Int,
     scale: Int,
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
 ): Decimal
 
+/**
+ * Rounding Mode for rounding a [Decimal]
+ */
 sealed class RoundingMode {
+    /**
+     * Rounds values down
+     */
     object RoundDown : RoundingMode()
+
+    /**
+     * Rounds values to the closest possible return value; when halfway between two possibilities, return the possibility whose last digit is even.
+     */
     object RoundHalfEven : RoundingMode()
+
+    /**
+     * Rounds values up
+     */
     object RoundUp : RoundingMode()
 }
 
+/**
+ * Rounds a [Decimal] to a [scale].
+ * @param scale The number of digits the rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return A [Decimal] rounded to [scale] digits after the decimal point.
+ */
 expect fun Decimal.round(scale: Int, roundingMode: RoundingMode = RoundingMode.RoundHalfEven): Decimal
 
+/**
+ * Converts a [Number] to a [Decimal]
+ */
 expect fun Number.toDecimal(): Decimal
+
+/**
+ * Converts a String to a [Decimal]
+ */
 expect fun String.toDecimal(): Decimal
 
+/**
+ * Converts a [ByteArray] to a list of [Decimal]
+ */
 fun ByteArray.toDecimalList(): List<Decimal> = map { it.toDecimal() }
+
+/**
+ * Converts a [DoubleArray] to a list of [Decimal]
+ */
 fun DoubleArray.toDecimalList(): List<Decimal> = map { it.toDecimal() }
+
+/**
+ * Converts a [FloatArray] to a list of [Decimal]
+ */
 fun FloatArray.toDecimalList(): List<Decimal> = map { it.toDecimal() }
+
+/**
+ * Converts an [IntArray] to a list of [Decimal]
+ */
 fun IntArray.toDecimalList(): List<Decimal> = map { it.toDecimal() }
+
+/**
+ * Converts a [ShortArray] to a list of [Decimal]
+ */
 fun ShortArray.toDecimalList(): List<Decimal> = map { it.toDecimal() }
+
+/**
+ * Converts a [LongArray] to a list of [Decimal]
+ */
 fun LongArray.toDecimalList(): List<Decimal> = map { it.toDecimal() }
+
+/**
+ * Converts a [Collection] of [NumberType] to a list of [Decimal]
+ * @param NumberType the type of [Number] in the collection.
+ */
 fun <NumberType : Number> Collection<NumberType>.toDecimalList(): List<Decimal> = map { it.toDecimal() }
 
+/**
+ * Gets the double value of a [Decimal]
+ */
 expect fun Decimal.toDouble(): Double
+
+/**
+ * Gets the string value of a [Decimal]
+ */
 expect fun Decimal.toString(): String
+
+/**
+ * Gets the integer value of a [Decimal]
+ */
 expect fun Decimal.toInt(): Int
 
-fun List<Decimal>.toDoubleArray(): DoubleArray = map { it.toDouble() }.toDoubleArray()
-fun List<Decimal>.toStringList(): List<String> = map { it.toString() }
-fun List<Decimal>.toIntArray(): IntArray = map { it.toInt() }.toIntArray()
+/**
+ * Converts a collection of [Decimal] to a [DoubleArray]
+ */
+fun Collection<Decimal>.toDoubleArray(): DoubleArray = map { it.toDouble() }.toDoubleArray()
+
+/**
+ * Converts a collection of [Decimal] to a list of String
+ */
+fun Collection<Decimal>.toStringList(): List<String> = map { it.toString() }
+
+/**
+ * Converts a collection of [Decimal] to an [IntArray]
+ */
+fun Collection<Decimal>.toIntArray(): IntArray = map { it.toInt() }.toIntArray()
diff --git a/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt b/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt
index 716b1e8b1..afd3262bf 100644
--- a/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt
+++ b/base/src/commonMain/kotlin/utils/EmptyCompletableDeferred.kt
@@ -21,6 +21,9 @@ package com.splendo.kaluga.base.utils
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Job
 
+/**
+ * Completes an [EmptyCompletableDeferred] with [Unit]
+ */
 fun EmptyCompletableDeferred.complete() {
     complete(Unit)
 }
diff --git a/base/src/commonMain/kotlin/utils/Int.kt b/base/src/commonMain/kotlin/utils/Int.kt
index aa7a8389e..b2deef63a 100644
--- a/base/src/commonMain/kotlin/utils/Int.kt
+++ b/base/src/commonMain/kotlin/utils/Int.kt
@@ -20,6 +20,9 @@ package com.splendo.kaluga.base.utils
 import kotlin.math.abs
 import kotlin.math.log10
 
+/**
+ * Determines the number of digits in an Integer
+ */
 fun Int.length() = when (this) {
     0 -> 1
     else -> log10(abs(toDouble())).toInt() + 1
diff --git a/base/src/commonMain/kotlin/utils/KalugaDate.kt b/base/src/commonMain/kotlin/utils/KalugaDate.kt
index 0bfd2999d..23f625ec4 100644
--- a/base/src/commonMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaDate.kt
@@ -132,11 +132,18 @@ abstract class KalugaDate : Comparable<KalugaDate> {
         return formatter.format(this)
     }
 
+    /**
+     * Reference to the underlying [KalugaDateHolder]
+     */
     abstract val date: KalugaDateHolder
 }
 
+/**
+ * Default implementation of [KalugaDate]
+ */
 expect class DefaultKalugaDate : KalugaDate {
     companion object {
+
         /**
          * Creates a [KalugaDate] relative to the current time
          * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
diff --git a/base/src/commonMain/kotlin/utils/Locale.kt b/base/src/commonMain/kotlin/utils/Locale.kt
index 1fc53b593..68cfcb4d4 100644
--- a/base/src/commonMain/kotlin/utils/Locale.kt
+++ b/base/src/commonMain/kotlin/utils/Locale.kt
@@ -21,59 +21,29 @@ import com.splendo.kaluga.base.text.DateFormatStyle
 import com.splendo.kaluga.base.text.KalugaDateFormatter
 
 /**
- * A [Locale] object represents a specific geographical, political, or cultural region.
+ * An object representing a specific geographical, political, or cultural region.
  */
-expect class Locale {
-    companion object {
-
-        /**
-         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
-         * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
-         * @return The [Locale] for the given [language]
-         */
-        fun createLocale(language: String): Locale
-
-        /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
-         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
-         * @param country a ISO 3166 alpha-2 `country` code.
-         * @return The [Locale] for the given [language] and [country]
-         */
-        fun createLocale(language: String, country: String): Locale
-
-        /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
-         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
-         * @param country a ISO 3166 alpha-2 `country` code.
-         * @param variant Arbitrary value used to indicate a variation of a [Locale]
-         * @return The [Locale] for the given [language], [country], and [variant]
-         */
-        fun createLocale(language: String, country: String, variant: String): Locale
-
-        val defaultLocale: Locale
-        val availableLocales: List<Locale>
-    }
-
+abstract class BaseLocale {
     /**
      *  ISO 3166 alpha-2 country code or UN M.49 numeric-3 area code.
      *
      *  Example: "US" (United States), "FR" (France), "029" (Caribbean)
      */
-    val countryCode: String
+    abstract val countryCode: String
 
     /**
      * ISO 639 alpha-2 or alpha-3 language code.
      *
      * Example: "en" (English), "ja" (Japanese), "kok" (Konkani)
      */
-    val languageCode: String
+    abstract val languageCode: String
 
     /**
      * ISO 15924 alpha-4 script code.
      *
      * Example: "Latn" (Latin), "Cyrl" (Cyrillic)
      */
-    val scriptCode: String
+    abstract val scriptCode: String
 
     /**
      * Any arbitrary value used to indicate a variation of a [Locale].
@@ -81,64 +51,110 @@ expect class Locale {
      *
      * Example: "polyton" (Polytonic Greek), "POSIX"
      */
-    val variantCode: String
+    abstract val variantCode: String
 
     /**
      * Returns [UnitSystem] for the [Locale].
      */
-    val unitSystem: UnitSystem
+    abstract val unitSystem: UnitSystem
 
     /**
      * Gets the name of the [Locale], localized according to a given [Locale]
      * @param forLocale The [Locale] for which the name should be localized
      * @return The name of this [Locale]
      */
-    fun name(forLocale: Locale): String
+    abstract fun name(forLocale: Locale): String
 
     /**
      * Gets the county name of the [Locale], localized according to a given [Locale]
      * @param forLocale The [Locale] for which the country name should be localized
      * @return The country name of this [Locale]
      */
-    fun countryName(forLocale: Locale): String
+    abstract fun countryName(forLocale: Locale): String
 
     /**
      * Gets the language name of the [Locale], localized according to a given [Locale]
      * @param forLocale The [Locale] for which the language name should be localized
      * @return The language name of this [Locale]
      */
-    fun languageName(forLocale: Locale): String
+    abstract fun languageName(forLocale: Locale): String
 
     /**
      * Gets the variant name of the [Locale], localized according to a given [Locale]
      * @param forLocale The [Locale] for which the variant name should be localized
      * @return The variant name of this [Locale]
      */
-    fun variantName(forLocale: Locale): String
+    abstract fun variantName(forLocale: Locale): String
 
     /**
      * Gets the script name of the [Locale], localized according to a given [Locale]
      * @param forLocale The [Locale] for which the script name should be localized
      * @return The script name of this [Locale]
      */
-    fun scriptName(forLocale: Locale): String
+    abstract fun scriptName(forLocale: Locale): String
 
     /**
      * The Character(s) used for indicating the start of a quote
      */
-    val quotationStart: String
+    abstract val quotationStart: String
     /**
      * The Character(s) used for indicating the end of a quote
      */
-    val quotationEnd: String
+    abstract val quotationEnd: String
     /**
      * The alternative Character(s) used for indicating the start of a quote
      */
-    val alternateQuotationStart: String
+    abstract val alternateQuotationStart: String
     /**
      * The alternative Character(s) used for indicating the end of a quote
      */
-    val alternateQuotationEnd: String
+    abstract val alternateQuotationEnd: String
+
+    override fun toString(): String {
+        return listOf(languageCode, countryCode, variantCode).filterNot { it.isEmpty() }.joinToString("_")
+    }
+}
+
+/**
+ * Default implementation of [BaseLocale]
+ */
+expect class Locale : BaseLocale {
+    companion object {
+
+        /**
+         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
+         * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
+         * @return The [Locale] for the given [language]
+         */
+        fun createLocale(language: String): Locale
+
+        /**
+         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
+         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
+         * @param country a ISO 3166 alpha-2 `country` code.
+         * @return The [Locale] for the given [language] and [country]
+         */
+        fun createLocale(language: String, country: String): Locale
+
+        /**
+         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
+         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
+         * @param country a ISO 3166 alpha-2 `country` code.
+         * @param variant Arbitrary value used to indicate a variation of a [Locale]
+         * @return The [Locale] for the given [language], [country], and [variant]
+         */
+        fun createLocale(language: String, country: String, variant: String): Locale
+
+        /**
+         * The default [Locale] of the user
+         */
+        val defaultLocale: Locale
+
+        /**
+         * A list of [Locale] available to the user.
+         */
+        val availableLocales: List<Locale>
+    }
 }
 
 /**
diff --git a/base/src/commonMain/kotlin/utils/Serializable.kt b/base/src/commonMain/kotlin/utils/Serializable.kt
index 0dde0e837..de9febd6f 100644
--- a/base/src/commonMain/kotlin/utils/Serializable.kt
+++ b/base/src/commonMain/kotlin/utils/Serializable.kt
@@ -17,4 +17,7 @@
 
 package com.splendo.kaluga.base.utils
 
+/**
+ * Interface that indicates that the implementing object can be serialized using platform specific serialization.
+ */
 expect interface Serializable
diff --git a/base/src/commonMain/kotlin/utils/TimeZone.kt b/base/src/commonMain/kotlin/utils/TimeZone.kt
index dfec4ac08..753c9a465 100644
--- a/base/src/commonMain/kotlin/utils/TimeZone.kt
+++ b/base/src/commonMain/kotlin/utils/TimeZone.kt
@@ -25,12 +25,26 @@ import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
  * Can be either [Short] or [Long]
  */
 enum class TimeZoneNameStyle {
+
+    /**
+     * A style specifier for [TimeZone.displayName] indicating a short name, such as "CET"
+     */
     Short,
+
+    /**
+     * A style specifier for [TimeZone.displayName] indicating a long name, such as "Central European Time"
+     */
     Long
 }
 
+/**
+ * Gets the UTC [TimeZone]
+ */
 val TimeZone.Companion.utc: TimeZone by lazy { TimeZone.get("UTC")!! }
 
+/**
+ * A TimeZone represents a time zone. Accounts for Daylight Savings
+ */
 abstract class BaseTimeZone {
 
     /**
@@ -78,8 +92,12 @@ abstract class BaseTimeZone {
     override fun toString(): String = displayName(TimeZoneNameStyle.Long)
 }
 
+/**
+ * A default implementation of [BaseTimeZone].
+ */
 expect class TimeZone : BaseTimeZone {
     companion object {
+
         /**
          * Gets a [TimeZone] based on a given Identifier
          * @param identifier The identifier to create a [TimeZone] for
diff --git a/base/src/commonMain/kotlin/utils/UnitSystem.kt b/base/src/commonMain/kotlin/utils/UnitSystem.kt
index 2e25984eb..000c74396 100644
--- a/base/src/commonMain/kotlin/utils/UnitSystem.kt
+++ b/base/src/commonMain/kotlin/utils/UnitSystem.kt
@@ -17,19 +17,35 @@
 
 package com.splendo.kaluga.base.utils
 
+/**
+ * The unit system used by a country.
+ * For more advanced functionality please use Kaluga Scientific
+ */
 enum class UnitSystem {
 
-    METRIC, MIXED, IMPERIAL;
+    /**
+     * Metric Unit system
+     */
+    METRIC,
+
+    /**
+     * Unit system that mixes metric and (UK) Imperial
+     */
+    MIXED,
+
+    /**
+     * Unit system used in the United States.
+     */
+    IMPERIAL;
 
     companion object {
-        // FIXME IMPERIAL and US customary seem reversed
+
         fun withRawValue(value: String): UnitSystem = when (value) {
             "U.S." -> IMPERIAL
             "U.K." -> MIXED
             else -> METRIC
         }
 
-        // FIXME IMPERIAL and US customary seem reversed
         fun withCountryCode(code: String): UnitSystem = when {
             listOf("GB", "MM", "LR").contains(code) -> MIXED
             "US" == code -> IMPERIAL
diff --git a/base/src/iosMain/kotlin/GCScheduler.kt b/base/src/iosMain/kotlin/GCScheduler.kt
index 267f73e52..cd10458b3 100644
--- a/base/src/iosMain/kotlin/GCScheduler.kt
+++ b/base/src/iosMain/kotlin/GCScheduler.kt
@@ -22,6 +22,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlin.native.internal.GC
 
+/**
+ * Scheduler for the Garbage Collector
+ */
 object GCScheduler {
 
     private val collectingMutex = Mutex()
diff --git a/base/src/iosMain/kotlin/IOSVersion.kt b/base/src/iosMain/kotlin/IOSVersion.kt
index 42994b6d4..db7195722 100644
--- a/base/src/iosMain/kotlin/IOSVersion.kt
+++ b/base/src/iosMain/kotlin/IOSVersion.kt
@@ -21,6 +21,9 @@ import platform.UIKit.UIDevice
 
 /**
  * Wrapper for the iOS OS Version
+ * @property major The major version of the OS
+ * @property minor The minor version of the OS
+ * @property patch The patch version of the OS
  */
 data class IOSVersion(val major: Int, val minor: Int = 0, val patch: Int = 0) : Comparable<IOSVersion> {
 
diff --git a/base/src/iosMain/kotlin/KalugaThread.kt b/base/src/iosMain/kotlin/KalugaThread.kt
index 5b5e4595d..d752cd42e 100644
--- a/base/src/iosMain/kotlin/KalugaThread.kt
+++ b/base/src/iosMain/kotlin/KalugaThread.kt
@@ -18,13 +18,23 @@ package com.splendo.kaluga.base
 
 import platform.Foundation.NSThread
 
+/**
+ * The thread of execution
+ */
 actual data class KalugaThread(val thread: NSThread) {
 
     actual companion object {
+
+        /**
+         * The [KalugaThread] the calling method is running on
+         */
         actual val currentThread: KalugaThread get() = KalugaThread(NSThread.currentThread)
         private val threadDescriptionRegex = "^.*\\{(.*)}\$".toRegex()
     }
 
+    /**
+     * Name of the thread
+     */
     actual var name: String get() = thread.name.orEmpty().ifEmpty {
         // On iOS the Thread name is not actually always accessible via name (only if set via custom setter)
         // To still grab the name, we should parse the thread description
@@ -40,5 +50,9 @@ actual data class KalugaThread(val thread: NSThread) {
         }
     }
         set(value) { thread.name = value }
+
+    /**
+     * When `true` this thread is the main thread.
+     */
     actual val isMainThread: Boolean get() = thread.isMainThread
 }
diff --git a/base/src/iosMain/kotlin/runOnMain.kt b/base/src/iosMain/kotlin/runOnMain.kt
index 4cb51e67f..12145b3f7 100644
--- a/base/src/iosMain/kotlin/runOnMain.kt
+++ b/base/src/iosMain/kotlin/runOnMain.kt
@@ -21,6 +21,10 @@ package com.splendo.kaluga.base
 import platform.darwin.dispatch_async
 import platform.darwin.dispatch_get_main_queue
 
+/**
+ * Runs the provided [block] on the main thread
+ * @param block the code to run on the main thread.
+ */
 actual fun runOnMain(block: () -> Unit) {
     dispatch_async(dispatch_get_main_queue(), block)
 }
diff --git a/base/src/iosMain/kotlin/singleThreadDispatcher.kt b/base/src/iosMain/kotlin/singleThreadDispatcher.kt
index 1def316dc..4cabcc18b 100644
--- a/base/src/iosMain/kotlin/singleThreadDispatcher.kt
+++ b/base/src/iosMain/kotlin/singleThreadDispatcher.kt
@@ -17,6 +17,22 @@
 package com.splendo.kaluga.base
 
 import kotlinx.coroutines.CloseableCoroutineDispatcher
+import kotlinx.coroutines.newFixedThreadPoolContext
 import kotlinx.coroutines.newSingleThreadContext
 
+/**
+ * Creates a coroutine execution context using a single thread.
+ *
+ * **NOTE: The resulting [CloseableCoroutineDispatcher] owns native resources (its thread).
+ * Resources are reclaimed by [CloseableCoroutineDispatcher.close].**
+ * @param name The name of the thread to be created.
+ */
 actual fun singleThreadDispatcher(name: String): CloseableCoroutineDispatcher = newSingleThreadContext(name)
+
+/**
+ * Creates a coroutine execution context using a thread pool.
+ *
+ * **NOTE: The resulting [CloseableCoroutineDispatcher] owns native resources (its thread).
+ * Resources are reclaimed by [CloseableCoroutineDispatcher.close].**
+ */
+actual fun threadPoolDispatcher(numberOfThreads: UInt, name: String): CloseableCoroutineDispatcher = newFixedThreadPoolContext(numberOfThreads.toInt(), name)
diff --git a/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt b/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
index 9ac131342..7145e1199 100644
--- a/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
@@ -31,21 +31,44 @@ import platform.Foundation.NSDateFormatterNoStyle
 import platform.Foundation.NSDateFormatterShortStyle
 import platform.Foundation.NSDateFormatterStyle
 
-actual class KalugaDateFormatter private constructor(private val format: NSDateFormatter) {
+/**
+ * Default implementation of [BaseDateFormatter]
+ */
+actual class KalugaDateFormatter private constructor(private val format: NSDateFormatter) : BaseDateFormatter {
 
     actual companion object {
+
+        /**
+         * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
+         * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun dateFormat(
             style: DateFormatStyle,
             timeZone: TimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(style, null, timeZone, locale)
 
+        /**
+         * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
+         * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun timeFormat(
             style: DateFormatStyle,
             timeZone: TimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(null, style, timeZone, locale)
 
+        /**
+         * Creates a [KalugaDateFormatter] that formats both date and time components of a [KalugaDate]
+         * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
@@ -53,6 +76,15 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(dateStyle, timeStyle, timeZone, locale)
 
+        /**
+         * Creates a [KalugaDateFormatter] using a custom Date format pattern.
+         * On iOS some user settings may take precedent over the format (i.e. using 12 hour clock).
+         * To prevent this, ensure that the provided [locale] is of a `POSIX` type.
+         * A convenience [fixedPatternFormat] method exists to default to this behaviour.
+         * @param pattern The pattern to apply.
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun patternFormat(pattern: String, timeZone: TimeZone, locale: Locale): KalugaDateFormatter = KalugaDateFormatter(
             NSDateFormatter().apply {
                 this.locale = locale.nsLocale
@@ -103,41 +135,41 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
             }.date
     }
 
-    actual var pattern: String
+    override var pattern: String
         get() = format.dateFormat
         set(value) { format.dateFormat = value }
 
-    actual var timeZone: TimeZone
+    override var timeZone: TimeZone
         get() = TimeZone(format.timeZone)
         set(value) { format.timeZone = value.timeZone }
 
-    actual var eras: List<String>
+    override var eras: List<String>
         get() = format.eraSymbols.typedList()
         set(value) { format.eraSymbols = value }
 
-    actual var months: List<String>
+    override var months: List<String>
         get() = format.monthSymbols.typedList()
         set(value) { format.monthSymbols = value }
-    actual var shortMonths: List<String>
+    override var shortMonths: List<String>
         get() = format.shortMonthSymbols.typedList()
         set(value) { format.shortMonthSymbols = value }
 
-    actual var weekdays: List<String>
+    override var weekdays: List<String>
         get() = format.weekdaySymbols.typedList()
         set(value) { format.weekdaySymbols = value }
-    actual var shortWeekdays: List<String>
+    override var shortWeekdays: List<String>
         get() = format.shortWeekdaySymbols.typedList()
         set(value) { format.shortWeekdaySymbols = value }
 
-    actual var amString: String
+    override var amString: String
         get() = format.AMSymbol
         set(value) { format.AMSymbol = value }
-    actual var pmString: String
+    override var pmString: String
         get() = format.PMSymbol
         set(value) { format.PMSymbol = value }
 
-    actual fun format(date: KalugaDate): String = format.stringFromDate(date.date)
-    actual fun parse(string: String): KalugaDate? {
+    override fun format(date: KalugaDate): String = format.stringFromDate(date.date)
+    override fun parse(string: String): KalugaDate? {
         return format.dateFromString(string)?.let { date ->
             val calendar = format.calendar.copy() as NSCalendar
             calendar.timeZone = timeZone.timeZone
diff --git a/base/src/iosMain/kotlin/text/NumberFormatter.kt b/base/src/iosMain/kotlin/text/NumberFormatter.kt
index 718e649da..b0f3cedf2 100644
--- a/base/src/iosMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/iosMain/kotlin/text/NumberFormatter.kt
@@ -32,7 +32,12 @@ import platform.Foundation.NSNumberFormatterRoundUp
 import platform.Foundation.NSNumberFormatterScientificStyle
 import platform.Foundation.numberWithInt
 
-actual class NumberFormatter actual constructor(actual val locale: Locale, style: NumberFormatStyle) {
+/**
+ * Default implementation of [BaseNumberFormatter]
+ * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
+ * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
+ */
+actual class NumberFormatter actual constructor(override val locale: Locale, style: NumberFormatStyle) : BaseNumberFormatter {
 
     @ExperimentalUnsignedTypes
     private val formatter = NSNumberFormatter().apply {
@@ -105,84 +110,84 @@ actual class NumberFormatter actual constructor(actual val locale: Locale, style
         }
     }
 
-    actual var percentSymbol: Char
+    override var percentSymbol: Char
         get() = formatter.percentSymbol.getOrNull(0) ?: Char.MIN_VALUE
         set(value) { formatter.percentSymbol = charArrayOf(value).concatToString() }
-    actual var perMillSymbol: Char
+    override var perMillSymbol: Char
         get() = formatter.perMillSymbol.getOrNull(0) ?: Char.MIN_VALUE
         set(value) { formatter.perMillSymbol = charArrayOf(value).concatToString() }
-    actual var minusSign: Char
+    override var minusSign: Char
         get() = formatter.minusSign.getOrNull(0) ?: Char.MIN_VALUE
         set(value) { formatter.minusSign = charArrayOf(value).concatToString() }
-    actual var exponentSymbol: String
+    override var exponentSymbol: String
         get() = formatter.exponentSymbol
         set(value) { formatter.exponentSymbol = value }
-    actual var zeroSymbol: Char
+    override var zeroSymbol: Char
         get() = formatter.zeroSymbol?.getOrNull(0) ?: '0'
         set(value) { formatter.zeroSymbol = charArrayOf(value).concatToString() }
-    actual var notANumberSymbol: String
+    override var notANumberSymbol: String
         get() = formatter.notANumberSymbol
         set(value) { formatter.notANumberSymbol = value }
-    actual var infinitySymbol: String
+    override var infinitySymbol: String
         get() = formatter.positiveInfinitySymbol
         set(value) {
             formatter.positiveInfinitySymbol = value
             formatter.negativeInfinitySymbol = value
         }
-    actual var currencySymbol: String
+    override var currencySymbol: String
         get() = formatter.currencySymbol
         set(value) { formatter.currencySymbol = value }
-    actual var currencyCode: String
+    override var currencyCode: String
         get() = formatter.currencyCode
         set(value) { formatter.currencyCode = value }
-    actual var positivePrefix: String
+    override var positivePrefix: String
         get() = formatter.positivePrefix
         set(value) { formatter.positivePrefix = value }
-    actual var positiveSuffix: String
+    override var positiveSuffix: String
         get() = formatter.positiveSuffix
         set(value) { formatter.positiveSuffix = value }
-    actual var negativePrefix: String
+    override var negativePrefix: String
         get() = formatter.negativePrefix
         set(value) { formatter.negativePrefix = value }
-    actual var negativeSuffix: String
+    override var negativeSuffix: String
         get() = formatter.negativeSuffix
         set(value) { formatter.negativeSuffix = value }
-    actual var groupingSeparator: Char
+    override var groupingSeparator: Char
         get() = formatter.groupingSeparator.getOrNull(0) ?: Char.MIN_VALUE
         set(value) {
             val charValue = charArrayOf(value).concatToString()
             formatter.groupingSeparator = charValue
             formatter.currencyGroupingSeparator = charValue
         }
-    actual var usesGroupingSeparator: Boolean
+    override var usesGroupingSeparator: Boolean
         get() = formatter.usesGroupingSeparator
         set(value) { formatter.usesGroupingSeparator = value }
-    actual var decimalSeparator: Char
+    override var decimalSeparator: Char
         get() = formatter.decimalSeparator.getOrNull(0) ?: Char.MIN_VALUE
         set(value) { formatter.decimalSeparator = charArrayOf(value).concatToString() }
-    actual var alwaysShowsDecimalSeparator: Boolean
+    override var alwaysShowsDecimalSeparator: Boolean
         get() = formatter.alwaysShowsDecimalSeparator
         set(value) { formatter.alwaysShowsDecimalSeparator = value }
-    actual var currencyDecimalSeparator: Char
+    override var currencyDecimalSeparator: Char
         get() = formatter.currencyDecimalSeparator.getOrNull(0) ?: Char.MIN_VALUE
         set(value) { formatter.currencyDecimalSeparator = charArrayOf(value).concatToString() }
-    actual var groupingSize: Int
+    override var groupingSize: Int
         get() = formatter.groupingSize.toInt()
         set(value) {
             formatter.groupingSize = value.toULong()
             formatter.secondaryGroupingSize = value.toULong()
         }
-    actual var multiplier: Int
+    override var multiplier: Int
         get() = formatter.multiplier?.intValue ?: 1
         set(value) { formatter.multiplier = NSNumber.numberWithInt(value) }
 
     @Suppress("CAST_NEVER_SUCCEEDS") // Should succeed just fine
-    actual fun format(number: Number): String {
+    override fun format(number: Number): String {
         return (formatter.stringFromNumber(number as NSNumber) ?: "")
     }
 
     @Suppress("CAST_NEVER_SUCCEEDS") // Should succeed just fine
-    actual fun parse(string: String): Number? {
+    override fun parse(string: String): Number? {
         return formatter.numberFromString(string) as? Number
     }
 }
diff --git a/base/src/iosMain/kotlin/text/StringUtils.kt b/base/src/iosMain/kotlin/text/StringUtils.kt
index 669fa9249..17b531300 100644
--- a/base/src/iosMain/kotlin/text/StringUtils.kt
+++ b/base/src/iosMain/kotlin/text/StringUtils.kt
@@ -24,8 +24,19 @@ import platform.Foundation.NSString
 import platform.Foundation.lowercaseStringWithLocale
 import platform.Foundation.uppercaseStringWithLocale
 
+/**
+ * The String that serves as a line separator.
+ */
 actual val lineSeparator = "\n"
 
+/**
+ * Converts a String to its lower cased variant based on a given [Locale]
+ * @param locale The [Locale] to use for transforming to lower case.
+ */
 actual fun String.lowerCased(locale: Locale): String = (this as NSString).lowercaseStringWithLocale(locale.nsLocale)
 
+/**
+ * Converts a String to its upper cased variant based on a given [Locale]
+ * @param locale The [Locale] to use for transforming to upper case.
+ */
 actual fun String.upperCased(locale: Locale): String = (this as NSString).uppercaseStringWithLocale(locale.nsLocale)
diff --git a/base/src/iosMain/kotlin/utils/Decimal.kt b/base/src/iosMain/kotlin/utils/Decimal.kt
index 4a20a6088..c01c79119 100644
--- a/base/src/iosMain/kotlin/utils/Decimal.kt
+++ b/base/src/iosMain/kotlin/utils/Decimal.kt
@@ -22,6 +22,10 @@ import platform.Foundation.NSDecimalNumberHandler
 import platform.Foundation.NSRoundingMode
 import kotlin.math.absoluteValue
 
+/**
+ * Immutable, arbitrary-precision signed decimal numbers.
+ * @param nsDecimal the internal [NSDecimalNumber] corresponding to this decimal
+ */
 actual data class Decimal(val nsDecimal: NSDecimalNumber) : Comparable<Decimal> {
     override fun compareTo(other: Decimal): Int = nsDecimal.compare(other.nsDecimal).toInt()
     override fun equals(other: Any?): Boolean = (other as? Decimal)?.let { nsDecimal.isEqualToNumber(it.nsDecimal) } ?: false
@@ -30,8 +34,19 @@ actual data class Decimal(val nsDecimal: NSDecimalNumber) : Comparable<Decimal>
     }
 }
 
+/**
+ * Adds two [Decimal] together.
+ * @param value the [Decimal] to add
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual operator fun Decimal.plus(value: Decimal) = copy(nsDecimal = nsDecimal.decimalNumberByAdding(value.nsDecimal))
 
+/**
+ * Adds two [Decimal] together scaled to a given precision.
+ * @param value the [Decimal] to add
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual fun Decimal.plus(value: Decimal, scale: Int) = copy(
     nsDecimal = nsDecimal.decimalNumberByAdding(
         decimalNumber = value.nsDecimal,
@@ -46,6 +61,13 @@ actual fun Decimal.plus(value: Decimal, scale: Int) = copy(
     )
 )
 
+/**
+ * Adds two [Decimal] together scaled to a given precision.
+ * @param value the [Decimal] to add
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual fun Decimal.plus(value: Decimal, scale: Int, roundingMode: RoundingMode) = copy(
     nsDecimal = nsDecimal.decimalNumberByAdding(
         decimalNumber = value.nsDecimal,
@@ -60,8 +82,19 @@ actual fun Decimal.plus(value: Decimal, scale: Int, roundingMode: RoundingMode)
     )
 )
 
+/**
+ * Subtracts two [Decimal].
+ * @param value the [Decimal] to subtract
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual operator fun Decimal.minus(value: Decimal) = copy(nsDecimal = nsDecimal.decimalNumberBySubtracting(value.nsDecimal))
 
+/**
+ * Subtracts two [Decimal] to a given precision.
+ * @param value the [Decimal] to subtract
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual fun Decimal.minus(value: Decimal, scale: Int) = copy(
     nsDecimal = nsDecimal.decimalNumberBySubtracting(
         decimalNumber = value.nsDecimal,
@@ -76,6 +109,13 @@ actual fun Decimal.minus(value: Decimal, scale: Int) = copy(
     )
 )
 
+/**
+ * Subtracts two [Decimal] to a given precision.
+ * @param value the [Decimal] to subtract
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual fun Decimal.minus(value: Decimal, scale: Int, roundingMode: RoundingMode) = copy(
     nsDecimal = nsDecimal.decimalNumberBySubtracting(
         decimalNumber = value.nsDecimal,
@@ -90,8 +130,19 @@ actual fun Decimal.minus(value: Decimal, scale: Int, roundingMode: RoundingMode)
     )
 )
 
+/**
+ * Divides two [Decimal].
+ * @param value the [Decimal] to divide
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual operator fun Decimal.div(value: Decimal) = if (value.nsDecimal != NSDecimalNumber.zero) copy(nsDecimal = nsDecimal.decimalNumberByDividingBy(value.nsDecimal)) else throw DecimalException("Divide by zero")
 
+/**
+ * Divides two [Decimal] to a given precision.
+ * @param value the [Decimal] to divide
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual fun Decimal.div(value: Decimal, scale: Int) = if (value.nsDecimal != NSDecimalNumber.zero)
     copy(
         nsDecimal = nsDecimal.decimalNumberByDividingBy(
@@ -108,6 +159,13 @@ actual fun Decimal.div(value: Decimal, scale: Int) = if (value.nsDecimal != NSDe
     )
 else throw DecimalException("Divide by zero")
 
+/**
+ * Divides two [Decimal] to a given precision.
+ * @param value the [Decimal] to divide
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual fun Decimal.div(value: Decimal, scale: Int, roundingMode: RoundingMode) = if (value.nsDecimal != NSDecimalNumber.zero)
     copy(
         nsDecimal = nsDecimal.decimalNumberByDividingBy(
@@ -124,8 +182,19 @@ actual fun Decimal.div(value: Decimal, scale: Int, roundingMode: RoundingMode) =
     )
 else throw DecimalException("Divide by zero")
 
+/**
+ * Multiplies two [Decimal].
+ * @param value the [Decimal] to multiply
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual operator fun Decimal.times(value: Decimal) = copy(nsDecimal = nsDecimal.decimalNumberByMultiplyingBy(value.nsDecimal))
 
+/**
+ * Multiplies two [Decimal] to a given precision.
+ * @param value the [Decimal] to multiply
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual fun Decimal.times(value: Decimal, scale: Int) = copy(
     nsDecimal = nsDecimal.decimalNumberByMultiplyingBy(
         decimalNumber = value.nsDecimal,
@@ -140,6 +209,13 @@ actual fun Decimal.times(value: Decimal, scale: Int) = copy(
     )
 )
 
+/**
+ * Multiplies two [Decimal] to a given precision.
+ * @param value the [Decimal] to multiply
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual fun Decimal.times(value: Decimal, scale: Int, roundingMode: RoundingMode) = copy(
     nsDecimal = nsDecimal.decimalNumberByMultiplyingBy(
         decimalNumber = value.nsDecimal,
@@ -154,11 +230,22 @@ actual fun Decimal.times(value: Decimal, scale: Int, roundingMode: RoundingMode)
     )
 )
 
+/**
+ * Raises two [Decimal].
+ * @param n the [Decimal] to raise to
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual infix fun Decimal.pow(n: Int): Decimal = if (n < 0)
     1.toDecimal() / pow(n.absoluteValue)
 else
     copy(nsDecimal = nsDecimal.decimalNumberByRaisingToPower(n.toULong()))
 
+/**
+ * Raises two [Decimal] to a given precision.
+ * @param n the [Decimal] to raise to
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual fun Decimal.pow(n: Int, scale: Int): Decimal = if (n < 0)
     1.toDecimal() / pow(n.absoluteValue, scale)
 else
@@ -175,6 +262,14 @@ else
             )
         )
     )
+
+/**
+ * Raises two [Decimal] to a given precision.
+ * @param n the [Decimal] to raise to
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual fun Decimal.pow(
     n: Int,
     scale: Int,
@@ -196,14 +291,38 @@ else
         )
     )
 
+/**
+ * Converts a [Number] to a [Decimal]
+ */
 actual fun Number.toDecimal() = Decimal(NSDecimalNumber(this.toString()))
+
+/**
+ * Converts a String to a [Decimal]
+ */
 actual fun String.toDecimal() = Decimal(NSDecimalNumber(this))
 
+/**
+ * Gets the double value of a [Decimal]
+ */
 actual fun Decimal.toDouble() = nsDecimal.toString().toDouble()
+
+/**
+ * Gets the integer value of a [Decimal]
+ */
 actual fun Decimal.toInt() = nsDecimal.intValue
+
+/**
+ * Gets the string value of a [Decimal]
+ */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 actual fun Decimal.toString() = nsDecimal.stringValue
 
+/**
+ * Rounds a [Decimal] to a [scale].
+ * @param scale The number of digits the rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return A [Decimal] rounded to [scale] digits after the decimal point.
+ */
 actual fun Decimal.round(scale: Int, roundingMode: RoundingMode) = copy(
     nsDecimal = nsDecimal.decimalNumberByRoundingAccordingToBehavior(
         NSDecimalNumberHandler(
@@ -217,7 +336,7 @@ actual fun Decimal.round(scale: Int, roundingMode: RoundingMode) = copy(
     )
 )
 
-val RoundingMode.nsRoundingMode
+private val RoundingMode.nsRoundingMode
     get() = when (this) {
         RoundingMode.RoundDown -> NSRoundingMode.NSRoundDown
         RoundingMode.RoundHalfEven -> NSRoundingMode.NSRoundBankers
diff --git a/base/src/iosMain/kotlin/utils/KalugaDate.kt b/base/src/iosMain/kotlin/utils/KalugaDate.kt
index ff8645cf3..98a092c53 100644
--- a/base/src/iosMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaDate.kt
@@ -40,14 +40,25 @@ import platform.Foundation.dateWithTimeIntervalSince1970
 import platform.Foundation.dateWithTimeIntervalSinceNow
 import platform.Foundation.timeIntervalSince1970
 import kotlin.math.round
+import kotlin.time.Duration.Companion.milliseconds
 
 actual typealias KalugaDateHolder = NSDate
 
+/**
+ * Default implementation of [KalugaDate]
+ */
 actual class DefaultKalugaDate internal constructor(private val calendar: NSCalendar, initialDate: NSDate) : KalugaDate() {
     actual companion object {
 
-        const val nanoSecondPerMilliSecond = 1000 * 1000
+        private val nanoSecondPerMilliSecond = 1.milliseconds.inWholeNanoseconds.toInt()
 
+        /**
+         * Creates a [KalugaDate] relative to the current time
+         * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
+         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @return A [KalugaDate] relative to the current time
+         */
         actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate {
             val calendar = NSCalendar.currentCalendar.apply {
                 this.locale = locale.nsLocale
@@ -56,6 +67,14 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
             val date = NSDate.dateWithTimeIntervalSinceNow(offsetInMilliseconds.toDouble() / 1000.0)
             return DefaultKalugaDate(calendar, date)
         }
+
+        /**
+         * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
+         * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
+         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @return A [KalugaDate] relative to the current time
+         */
         actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate {
             val calendar = NSCalendar.currentCalendar.apply {
                 this.locale = locale.nsLocale
diff --git a/base/src/iosMain/kotlin/utils/Locale.kt b/base/src/iosMain/kotlin/utils/Locale.kt
index e08ddcfe1..5bed9c474 100644
--- a/base/src/iosMain/kotlin/utils/Locale.kt
+++ b/base/src/iosMain/kotlin/utils/Locale.kt
@@ -35,38 +35,69 @@ import platform.Foundation.quotationEndDelimiter
 import platform.Foundation.scriptCode
 import platform.Foundation.variantCode
 
-actual data class Locale internal constructor(val nsLocale: NSLocale) {
+/**
+ * Default implementation of [BaseLocale]
+ */
+actual data class Locale internal constructor(internal val nsLocale: NSLocale) : BaseLocale() {
 
     actual companion object {
+
+        /**
+         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
+         * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
+         * @return The [Locale] for the given [language]
+         */
         actual fun createLocale(language: String): Locale = Locale(NSLocale(language))
+
+        /**
+         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
+         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
+         * @param country a ISO 3166 alpha-2 `country` code.
+         * @return The [Locale] for the given [language] and [country]
+         */
         actual fun createLocale(language: String, country: String): Locale = Locale(NSLocale("${language}_$country"))
+
+        /**
+         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
+         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
+         * @param country a ISO 3166 alpha-2 `country` code.
+         * @param variant Arbitrary value used to indicate a variation of a [Locale]
+         * @return The [Locale] for the given [language], [country], and [variant]
+         */
         actual fun createLocale(language: String, country: String, variant: String): Locale = Locale(NSLocale("${language}_${country}_$variant"))
 
+        /**
+         * The default [Locale] of the user
+         */
         actual val defaultLocale: Locale get() = Locale(NSLocale.currentLocale)
+
+        /**
+         * A list of [Locale] available to the user.
+         */
         actual val availableLocales: List<Locale> = NSLocale.availableLocaleIdentifiers.typedList<String>().map { Locale(NSLocale(it)) }
     }
 
-    actual val countryCode: String
+    override val countryCode: String
         get() = nsLocale.countryCode ?: ""
-    actual val languageCode: String
+    override val languageCode: String
         get() = nsLocale.languageCode
-    actual val scriptCode: String
+    override val scriptCode: String
         get() = nsLocale.scriptCode ?: ""
-    actual val variantCode: String
+    override val variantCode: String
         get() = nsLocale.variantCode ?: ""
-    actual val unitSystem: UnitSystem
+    override val unitSystem: UnitSystem
         get() = (nsLocale.objectForKey("kCFLocaleMeasurementSystemKey") as? String)?.let {
             UnitSystem.withRawValue(it)
         } ?: UnitSystem.METRIC
 
-    actual fun name(forLocale: Locale): String = forLocale.nsLocale.localizedStringForLocaleIdentifier(nsLocale.localeIdentifier)
-    actual fun countryName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForCountryCode(countryCode) ?: ""
-    actual fun languageName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForLanguageCode(languageCode) ?: ""
-    actual fun variantName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForVariantCode(variantCode) ?: ""
-    actual fun scriptName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForScriptCode(scriptCode) ?: ""
+    override fun name(forLocale: Locale): String = forLocale.nsLocale.localizedStringForLocaleIdentifier(nsLocale.localeIdentifier)
+    override fun countryName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForCountryCode(countryCode) ?: ""
+    override fun languageName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForLanguageCode(languageCode) ?: ""
+    override fun variantName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForVariantCode(variantCode) ?: ""
+    override fun scriptName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForScriptCode(scriptCode) ?: ""
 
-    actual val quotationStart: String = nsLocale.quotationBeginDelimiter
-    actual val quotationEnd: String = nsLocale.quotationEndDelimiter
-    actual val alternateQuotationStart: String = nsLocale.alternateQuotationBeginDelimiter
-    actual val alternateQuotationEnd: String = nsLocale.alternateQuotationEndDelimiter
+    override val quotationStart: String = nsLocale.quotationBeginDelimiter
+    override val quotationEnd: String = nsLocale.quotationEndDelimiter
+    override val alternateQuotationStart: String = nsLocale.alternateQuotationBeginDelimiter
+    override val alternateQuotationEnd: String = nsLocale.alternateQuotationEndDelimiter
 }
diff --git a/base/src/iosMain/kotlin/utils/Serializable.kt b/base/src/iosMain/kotlin/utils/Serializable.kt
index f44b6e8d2..9b69452dd 100644
--- a/base/src/iosMain/kotlin/utils/Serializable.kt
+++ b/base/src/iosMain/kotlin/utils/Serializable.kt
@@ -17,4 +17,7 @@
 
 package com.splendo.kaluga.base.utils
 
+/**
+ * Not supported on iOS
+ */
 actual interface Serializable
diff --git a/base/src/iosMain/kotlin/utils/TimeZone.kt b/base/src/iosMain/kotlin/utils/TimeZone.kt
index 709aa0f75..d2f77ed1e 100644
--- a/base/src/iosMain/kotlin/utils/TimeZone.kt
+++ b/base/src/iosMain/kotlin/utils/TimeZone.kt
@@ -30,9 +30,18 @@ import platform.Foundation.secondsFromGMT
 import platform.Foundation.timeZoneWithAbbreviation
 import platform.Foundation.timeZoneWithName
 
-actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZone() {
+/**
+ * A default implementation of [BaseTimeZone].
+ */
+actual class TimeZone internal constructor(internal val timeZone: NSTimeZone) : BaseTimeZone() {
 
     actual companion object {
+
+        /**
+         * Gets a [TimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [TimeZone] for
+         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         */
         actual fun get(identifier: String): TimeZone? {
             return if (NSTimeZone.abbreviationDictionary.typedMap<String, String>().containsKey(identifier)) {
                 NSTimeZone.timeZoneWithAbbreviation(identifier)
@@ -42,7 +51,16 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZ
                 TimeZone(it)
             }
         }
+
+        /**
+         * Gets the current [TimeZone] configured by the user
+         * @return The current [TimeZone] of the user
+         */
         actual fun current(): TimeZone = TimeZone(NSTimeZone.defaultTimeZone)
+
+        /**
+         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         */
         actual val availableIdentifiers: List<String> = NSTimeZone.knownTimeZoneNames.typedList()
     }
 
diff --git a/base/src/jsMain/kotlin/KalugaThread.kt b/base/src/jsMain/kotlin/KalugaThread.kt
index bcd4b60d2..16f11605c 100644
--- a/base/src/jsMain/kotlin/KalugaThread.kt
+++ b/base/src/jsMain/kotlin/KalugaThread.kt
@@ -17,16 +17,28 @@
 package com.splendo.kaluga.base
 
 /**
- * On JS there is only one thread, so everything is the main thread
+ * The thread of execution
+ * On JavaScript there is only one thread, so everything is the main thread
  */
 actual class KalugaThread {
 
     actual companion object {
+        /**
+         * The [KalugaThread] the calling method is running on.
+         * Since on JavaScript there is only one thread, this always results in the same thread.
+         */
         actual val currentThread: KalugaThread get() = KalugaThread()
     }
 
+    /**
+     * Name of the thread
+     */
     actual var name: String = "Main Thread"
         set(_) = Unit
+
+    /**
+     * Always `true` since on JavaScript there is only one thread.
+     */
     actual val isMainThread: Boolean = true
 
     override fun equals(other: Any?): Boolean {
diff --git a/base/src/jsMain/kotlin/runBlocking.kt b/base/src/jsMain/kotlin/runBlocking.kt
index 50a475b61..5a33495d7 100644
--- a/base/src/jsMain/kotlin/runBlocking.kt
+++ b/base/src/jsMain/kotlin/runBlocking.kt
@@ -23,6 +23,12 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * Runs a new coroutine and blocks the current thread interruptibly until its completion.
+ * Since JavaScript does not support threading, this will just run block on [GlobalScope]
+ * @param context the context of the coroutine. The default value is an event loop on the current thread.
+ * @param block the coroutine code.
+ */
 actual fun <T> runBlocking(
     context: CoroutineContext,
     block: suspend CoroutineScope.() -> T
diff --git a/base/src/jsMain/kotlin/runOnMain.kt b/base/src/jsMain/kotlin/runOnMain.kt
index 185d51cc7..648789c10 100644
--- a/base/src/jsMain/kotlin/runOnMain.kt
+++ b/base/src/jsMain/kotlin/runOnMain.kt
@@ -18,6 +18,11 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.base
 
+/**
+ * Runs the provided [block] on the main thread.
+ * Since JavaScript does not have any threading, this will just run [block]
+ * @param block the code to run on the main thread.
+ */
 actual fun runOnMain(block: () -> Unit) {
     block()
 }
diff --git a/base/src/jsMain/kotlin/singleThreadDispatcher.kt b/base/src/jsMain/kotlin/singleThreadDispatcher.kt
index 2411f2ec5..1478298a0 100644
--- a/base/src/jsMain/kotlin/singleThreadDispatcher.kt
+++ b/base/src/jsMain/kotlin/singleThreadDispatcher.kt
@@ -22,9 +22,23 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Runnable
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * Creates a coroutine execution context using a single thread.
+ * Since JavaScript does not have threading support, this will just return [Dispatchers.Default]
+ * @param name The name of the thread to be created.
+ */
 actual fun singleThreadDispatcher(name: String): CloseableCoroutineDispatcher =
     CoroutineDispatcherWrapper(Dispatchers.Default)
 
+/**
+ * Creates a coroutine execution context using a thread pool.
+ * Since JavaScript does not have threading support, this will just return [Dispatchers.Default]
+ * @param numberOfThreads The number of the threads that the thread pool should consist of.
+ * @param name The name of the thread pool to be created.
+ */
+actual fun threadPoolDispatcher(numberOfThreads: UInt, name: String): CloseableCoroutineDispatcher =
+    CoroutineDispatcherWrapper(Dispatchers.Default)
+
 private class CoroutineDispatcherWrapper(
     private val base: CoroutineDispatcher
 ) : CloseableCoroutineDispatcher() {
diff --git a/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt b/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
index 67a9f2ca5..30e26656e 100644
--- a/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
@@ -22,21 +22,44 @@ import com.splendo.kaluga.base.utils.Locale
 import com.splendo.kaluga.base.utils.TimeZone
 
 // TODO Implement with proper dateformatter solution for Java Script
-actual class KalugaDateFormatter private constructor(initialTimeZone: TimeZone, private val formatter: (kotlin.js.Date) -> String) {
+/**
+ * Default implementation of [BaseDateFormatter]
+ */
+actual class KalugaDateFormatter private constructor(initialTimeZone: TimeZone, private val formatter: (kotlin.js.Date) -> String) : BaseDateFormatter {
 
     actual companion object {
+
+        /**
+         * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
+         * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun dateFormat(
             style: DateFormatStyle,
             timeZone: TimeZone,
             locale: Locale
         ): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleDateString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
 
+        /**
+         * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
+         * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun timeFormat(
             style: DateFormatStyle,
             timeZone: TimeZone,
             locale: Locale
         ): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleTimeString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
 
+        /**
+         * Creates a [KalugaDateFormatter] that formats both date and time components of a [KalugaDate]
+         * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
@@ -44,25 +67,34 @@ actual class KalugaDateFormatter private constructor(initialTimeZone: TimeZone,
             locale: Locale
         ): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
 
+        /**
+         * Creates a [KalugaDateFormatter] using a custom Date format pattern.
+         * On iOS some user settings may take precedent over the format (i.e. using 12 hour clock).
+         * To prevent this, ensure that the provided [locale] is of a `POSIX` type.
+         * A convenience [fixedPatternFormat] method exists to default to this behaviour.
+         * @param pattern The pattern to apply.
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun patternFormat(pattern: String, timeZone: TimeZone, locale: Locale): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
     }
 
-    actual var pattern: String = ""
+    override var pattern: String = ""
 
-    actual var timeZone: TimeZone = initialTimeZone
-    actual var eras: List<String> = emptyList()
+    override var timeZone: TimeZone = initialTimeZone
+    override var eras: List<String> = emptyList()
 
-    actual var months: List<String> = emptyList()
-    actual var shortMonths: List<String> = emptyList()
+    override var months: List<String> = emptyList()
+    override var shortMonths: List<String> = emptyList()
 
-    actual var weekdays: List<String> = emptyList()
-    actual var shortWeekdays: List<String> = emptyList()
+    override var weekdays: List<String> = emptyList()
+    override var shortWeekdays: List<String> = emptyList()
 
-    actual var amString: String = ""
-    actual var pmString: String = ""
+    override var amString: String = ""
+    override var pmString: String = ""
 
-    actual fun format(date: KalugaDate): String = formatter(date.date)
-    actual fun parse(string: String): KalugaDate? = null
+    override fun format(date: KalugaDate): String = formatter(date.date)
+    override fun parse(string: String): KalugaDate? = null
 }
 
 private fun DateFormatStyle.stringValue(): String = when (this) {
diff --git a/base/src/jsMain/kotlin/text/NumberFormatter.kt b/base/src/jsMain/kotlin/text/NumberFormatter.kt
index 9b811e5b0..f83a21a86 100644
--- a/base/src/jsMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/jsMain/kotlin/text/NumberFormatter.kt
@@ -20,28 +20,33 @@ package com.splendo.kaluga.base.text
 import com.splendo.kaluga.base.utils.Locale
 
 // TODO Implement with proper number formatter solution for Java Script
-actual class NumberFormatter actual constructor(actual val locale: Locale, style: NumberFormatStyle) {
-    actual var percentSymbol: Char = '%'
-    actual var perMillSymbol: Char = '\u2030'
-    actual var minusSign: Char = '-'
-    actual var exponentSymbol: String = "E"
-    actual var zeroSymbol: Char = '0'
-    actual var notANumberSymbol: String = "NaN"
-    actual var infinitySymbol: String = "\u221E"
-    actual var currencySymbol: String = ""
-    actual var currencyCode: String = ""
-    actual var positivePrefix: String = ""
-    actual var positiveSuffix: String = ""
-    actual var negativePrefix: String = "-"
-    actual var negativeSuffix: String = ""
-    actual var groupingSeparator: Char = ','
-    actual var usesGroupingSeparator: Boolean = false
-    actual var decimalSeparator: Char = '.'
-    actual var alwaysShowsDecimalSeparator: Boolean = false
-    actual var currencyDecimalSeparator: Char = '.'
-    actual var groupingSize: Int = 0
-    actual var multiplier: Int = 1
-
-    actual fun format(number: Number): String = "$number"
-    actual fun parse(string: String): Number? = string.toFloatOrNull()
+/**
+ * Default implementation of [BaseNumberFormatter]
+ * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
+ * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
+ */
+actual class NumberFormatter actual constructor(override val locale: Locale, style: NumberFormatStyle) : BaseNumberFormatter {
+    override var percentSymbol: Char = '%'
+    override var perMillSymbol: Char = '\u2030'
+    override var minusSign: Char = '-'
+    override var exponentSymbol: String = "E"
+    override var zeroSymbol: Char = '0'
+    override var notANumberSymbol: String = "NaN"
+    override var infinitySymbol: String = "\u221E"
+    override var currencySymbol: String = ""
+    override var currencyCode: String = ""
+    override var positivePrefix: String = ""
+    override var positiveSuffix: String = ""
+    override var negativePrefix: String = "-"
+    override var negativeSuffix: String = ""
+    override var groupingSeparator: Char = ','
+    override var usesGroupingSeparator: Boolean = false
+    override var decimalSeparator: Char = '.'
+    override var alwaysShowsDecimalSeparator: Boolean = false
+    override var currencyDecimalSeparator: Char = '.'
+    override var groupingSize: Int = 0
+    override var multiplier: Int = 1
+
+    override fun format(number: Number): String = "$number"
+    override fun parse(string: String): Number? = string.toFloatOrNull()
 }
diff --git a/base/src/jsMain/kotlin/text/StringUtils.kt b/base/src/jsMain/kotlin/text/StringUtils.kt
index 8c8fcc07b..e52fbc66f 100644
--- a/base/src/jsMain/kotlin/text/StringUtils.kt
+++ b/base/src/jsMain/kotlin/text/StringUtils.kt
@@ -19,8 +19,19 @@ package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.Locale
 
+/**
+ * The String that serves as a line separator.
+ */
 actual val lineSeparator = "\n"
 
+/**
+ * Converts a String to its lower cased variant based on a given [Locale]
+ * @param locale The [Locale] to use for transforming to lower case.
+ */
 actual fun String.lowerCased(locale: Locale): String = this.lowercase()
 
+/**
+ * Converts a String to its upper cased variant based on a given [Locale]
+ * @param locale The [Locale] to use for transforming to upper case.
+ */
 actual fun String.upperCased(locale: Locale): String = this.uppercase()
diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index 0b48af645..00096c396 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -25,21 +25,25 @@ import com.splendo.kaluga.base.utils.RoundingMode.RoundUp
 import kotlin.math.pow
 
 // 34 digits of the IEEE 754R Decimal128 format
-val DECIMAL_128_SIGNIFICANT_DIGITS = 34
+private const val DECIMAL_128_SIGNIFICANT_DIGITS = 34
 // Max decimal digits + 1 for intermediate division
-val DIV_DECIMAL_128_SIGNIFICANT_DIGITS = DECIMAL_128_SIGNIFICANT_DIGITS + 1
+private const val DIV_DECIMAL_128_SIGNIFICANT_DIGITS = DECIMAL_128_SIGNIFICANT_DIGITS + 1
 
 // Default is half-even
-val ROUNDING_MODE = "half-even"
-val CEIL = "ceil"
-val FLOOR = "floor"
+private const val ROUNDING_MODE = "half-even"
+private const val CEIL = "ceil"
+private const val FLOOR = "floor"
 
-data class Rounding(
+private data class Rounding(
     val maximumFractionDigits: Int? = null,
     val roundingMode: String = ROUNDING_MODE,
     val maximumSignificantDigits: Int = DECIMAL_128_SIGNIFICANT_DIGITS
 )
 
+/**
+ * Immutable, arbitrary-precision signed decimal numbers.
+ * @param bd the internal [BigDecimal] corresponding to this decimal
+ */
 actual data class Decimal(val bd: BigDecimal) : Comparable<Decimal> {
     override fun compareTo(other: Decimal): Int = BigDecimal.compare(bd, other.bd)
     override fun equals(other: Any?): Boolean = (other as? Decimal)?.let { BigDecimal.equal(bd, it.bd) } ?: false
@@ -48,9 +52,9 @@ actual data class Decimal(val bd: BigDecimal) : Comparable<Decimal> {
     }
 }
 
-val ZERO = BigDecimal.BigDecimal(0)
+private val ZERO = BigDecimal.BigDecimal(0)
 
-fun round(
+private fun round(
     a: BigDecimal,
     roundingMode: RoundingMode,
     maximumFractionDigits: Int? = null
@@ -71,41 +75,95 @@ fun round(
     return Decimal(BigDecimal.round(a, Rounding(maximumFractionDigits, mode)))
 }
 
+/**
+ * Adds two [Decimal] together.
+ * @param value the [Decimal] to add
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual operator fun Decimal.plus(value: Decimal): Decimal = Decimal(BigDecimal.add(bd, value.bd))
 
+/**
+ * Adds two [Decimal] together scaled to a given precision.
+ * @param value the [Decimal] to add
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual fun Decimal.plus(
     value: Decimal,
     scale: Int
 ): Decimal = Decimal(BigDecimal.add(bd, value.bd, Rounding(scale)))
 
+/**
+ * Adds two [Decimal] together scaled to a given precision.
+ * @param value the [Decimal] to add
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual fun Decimal.plus(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
 ): Decimal = round(BigDecimal.add(bd, value.bd), roundingMode, scale)
 
+/**
+ * Subtracts two [Decimal].
+ * @param value the [Decimal] to subtract
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual operator fun Decimal.minus(value: Decimal): Decimal = Decimal(BigDecimal.subtract(bd, value.bd))
 
+/**
+ * Subtracts two [Decimal] to a given precision.
+ * @param value the [Decimal] to subtract
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual fun Decimal.minus(
     value: Decimal,
     scale: Int
 ): Decimal = Decimal(BigDecimal.subtract(bd, value.bd, Rounding(scale)))
 
+/**
+ * Subtracts two [Decimal] to a given precision.
+ * @param value the [Decimal] to subtract
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual fun Decimal.minus(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
 ): Decimal = round(BigDecimal.subtract(bd, value.bd), roundingMode, scale)
 
+/**
+ * Divides two [Decimal].
+ * @param value the [Decimal] to divide
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual operator fun Decimal.div(
     value: Decimal
 ): Decimal = if (!BigDecimal.equal(value.bd, ZERO)) Decimal(BigDecimal.divide(bd, value.bd, Rounding())) else throw DecimalException("Divide by zero")
 
+/**
+ * Divides two [Decimal] to a given precision.
+ * @param value the [Decimal] to divide
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual fun Decimal.div(
     value: Decimal,
     scale: Int
 ): Decimal = if (!BigDecimal.equal(value.bd, ZERO)) Decimal(BigDecimal.divide(bd, value.bd, Rounding(scale))) else throw DecimalException("Divide by zero")
 
+/**
+ * Divides two [Decimal] to a given precision.
+ * @param value the [Decimal] to divide
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual fun Decimal.div(
     value: Decimal,
     scale: Int,
@@ -115,37 +173,100 @@ actual fun Decimal.div(
 else
     throw DecimalException("Divide by zero")
 
+/**
+ * Multiplies two [Decimal].
+ * @param value the [Decimal] to multiply
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual operator fun Decimal.times(
     value: Decimal
 ): Decimal = Decimal(BigDecimal.multiply(bd, value.bd, Rounding()))
 
+/**
+ * Multiplies two [Decimal] to a given precision.
+ * @param value the [Decimal] to multiply
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual fun Decimal.times(
     value: Decimal,
     scale: Int
 ): Decimal = Decimal(BigDecimal.multiply(bd, value.bd, Rounding(scale)))
 
+/**
+ * Multiplies two [Decimal] to a given precision.
+ * @param value the [Decimal] to multiply
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual fun Decimal.times(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
 ): Decimal = round(BigDecimal.multiply(bd, value.bd), roundingMode, scale)
 
+
+/**
+ * Raises two [Decimal].
+ * @param n the [Decimal] to raise to
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual infix fun Decimal.pow(n: Int): Decimal = Decimal(BigDecimal.BigDecimal(toDouble().pow(n)))
+
+/**
+ * Raises two [Decimal] to a given precision.
+ * @param n the [Decimal] to raise to
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual fun Decimal.pow(n: Int, scale: Int): Decimal = Decimal(BigDecimal.round((this pow n).bd, Rounding(scale)))
+
+/**
+ * Raises two [Decimal] to a given precision.
+ * @param n the [Decimal] to raise to
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual fun Decimal.pow(
     n: Int,
     scale: Int,
     roundingMode: RoundingMode
 ): Decimal = this pow n
 
+/**
+ * Rounds a [Decimal] to a [scale].
+ * @param scale The number of digits the rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return A [Decimal] rounded to [scale] digits after the decimal point.
+ */
 actual fun Decimal.round(
     scale: Int,
     roundingMode: RoundingMode
 ): Decimal = round(bd, roundingMode, scale)
 
+/**
+ * Converts a [Number] to a [Decimal]
+ */
 actual fun Number.toDecimal(): Decimal = this.toString().toDecimal()
+
+/**
+ * Converts a String to a [Decimal]
+ */
 actual fun String.toDecimal(): Decimal = Decimal(BigDecimal.BigDecimal(this))
 
+/**
+ * Gets the double value of a [Decimal]
+ */
 actual fun Decimal.toDouble(): Double = bd.toString().toDouble()
+
+/**
+ * Gets the integer value of a [Decimal]
+ */
 actual fun Decimal.toInt(): Int = bd.toFixed(0).toInt()
+
+/**
+ * Gets the string value of a [Decimal]
+ */
 actual fun Decimal.toString(): String = bd.toString()
diff --git a/base/src/jsMain/kotlin/utils/KalugaDate.kt b/base/src/jsMain/kotlin/utils/KalugaDate.kt
index dff22be5f..be50d5614 100644
--- a/base/src/jsMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaDate.kt
@@ -20,10 +20,29 @@ package com.splendo.kaluga.base.utils
 actual typealias KalugaDateHolder = kotlin.js.Date
 
 // TODO Implement with proper date solution for Java Script
+/**
+ * Default implementation of [KalugaDate]
+ */
 actual class DefaultKalugaDate internal constructor(override val date: KalugaDateHolder) : KalugaDate() {
 
     actual companion object {
+
+        /**
+         * Creates a [KalugaDate] relative to the current time
+         * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
+         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @return A [KalugaDate] relative to the current time
+         */
         actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(kotlin.js.Date.now() + offsetInMilliseconds))
+
+        /**
+         * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
+         * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
+         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @return A [KalugaDate] relative to the current time
+         */
         actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(offsetInMilliseconds))
     }
 
diff --git a/base/src/jsMain/kotlin/utils/Locale.kt b/base/src/jsMain/kotlin/utils/Locale.kt
index 0f5679400..7ad0c99ca 100644
--- a/base/src/jsMain/kotlin/utils/Locale.kt
+++ b/base/src/jsMain/kotlin/utils/Locale.kt
@@ -18,31 +18,62 @@
 package com.splendo.kaluga.base.utils
 
 // TODO Implement with proper locale solution for Java Script
+/**
+ * Default implementation of [BaseLocale]
+ */
 actual data class Locale internal constructor(
-    actual val languageCode: String,
-    actual val countryCode: String = "",
-    actual val variantCode: String = "",
-    actual val scriptCode: String = "",
-    actual val unitSystem: UnitSystem = UnitSystem.METRIC
-) {
+    override val languageCode: String,
+    override val countryCode: String = "",
+    override val variantCode: String = "",
+    override val scriptCode: String = "",
+    override val unitSystem: UnitSystem = UnitSystem.METRIC
+) : BaseLocale() {
 
     actual companion object {
+
+        /**
+         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
+         * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
+         * @return The [Locale] for the given [language]
+         */
         actual fun createLocale(language: String): Locale = Locale(language)
+
+        /**
+         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
+         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
+         * @param country a ISO 3166 alpha-2 `country` code.
+         * @return The [Locale] for the given [language] and [country]
+         */
         actual fun createLocale(language: String, country: String): Locale = Locale(language, country)
+
+        /**
+         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
+         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
+         * @param country a ISO 3166 alpha-2 `country` code.
+         * @param variant Arbitrary value used to indicate a variation of a [Locale]
+         * @return The [Locale] for the given [language], [country], and [variant]
+         */
         actual fun createLocale(language: String, country: String, variant: String): Locale = Locale(language, country, variant)
 
+        /**
+         * The default [Locale] of the user
+         */
         actual val defaultLocale: Locale get() = Locale("en")
+
+        /**
+         * A list of [Locale] available to the user.
+         */
         actual val availableLocales: List<Locale> = emptyList()
     }
 
-    actual fun name(forLocale: Locale): String = "${languageCode}_${countryCode}_$variantCode"
-    actual fun countryName(forLocale: Locale): String = countryCode
-    actual fun languageName(forLocale: Locale): String = languageCode
-    actual fun variantName(forLocale: Locale): String = variantCode
-    actual fun scriptName(forLocale: Locale): String = scriptCode
+    override fun name(forLocale: Locale): String = "${languageCode}_${countryCode}_$variantCode"
+    override fun countryName(forLocale: Locale): String = countryCode
+    override fun languageName(forLocale: Locale): String = languageCode
+    override fun variantName(forLocale: Locale): String = variantCode
+    override fun scriptName(forLocale: Locale): String = scriptCode
 
-    actual val quotationStart: String = "\""
-    actual val quotationEnd: String = "\""
-    actual val alternateQuotationStart: String = "\""
-    actual val alternateQuotationEnd: String = "\""
+    override val quotationStart: String = "\""
+    override val quotationEnd: String = "\""
+    override val alternateQuotationStart: String = "\""
+    override val alternateQuotationEnd: String = "\""
 }
diff --git a/base/src/jsMain/kotlin/utils/Serializable.kt b/base/src/jsMain/kotlin/utils/Serializable.kt
index f44b6e8d2..b3a2e6998 100644
--- a/base/src/jsMain/kotlin/utils/Serializable.kt
+++ b/base/src/jsMain/kotlin/utils/Serializable.kt
@@ -17,4 +17,7 @@
 
 package com.splendo.kaluga.base.utils
 
+/**
+ * Not supported on JavaScript
+ */
 actual interface Serializable
diff --git a/base/src/jsMain/kotlin/utils/TimeZone.kt b/base/src/jsMain/kotlin/utils/TimeZone.kt
index 64b449fbc..b455907e9 100644
--- a/base/src/jsMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jsMain/kotlin/utils/TimeZone.kt
@@ -18,11 +18,29 @@
 package com.splendo.kaluga.base.utils
 
 // TODO Implement with proper timezone solution for Java Script
+/**
+ * A default implementation of [BaseTimeZone].
+ */
 actual class TimeZone internal constructor() : BaseTimeZone() {
 
     actual companion object {
+
+        /**
+         * Gets a [TimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [TimeZone] for
+         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         */
         actual fun get(identifier: String): TimeZone? = TimeZone()
+
+        /**
+         * Gets the current [TimeZone] configured by the user
+         * @return The current [TimeZone] of the user
+         */
         actual fun current(): TimeZone = TimeZone()
+
+        /**
+         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         */
         actual val availableIdentifiers: List<String> = emptyList()
     }
 
diff --git a/base/src/jvmMain/kotlin/KalugaThread.kt b/base/src/jvmMain/kotlin/KalugaThread.kt
index 506e7c024..73efd21ba 100644
--- a/base/src/jvmMain/kotlin/KalugaThread.kt
+++ b/base/src/jvmMain/kotlin/KalugaThread.kt
@@ -18,13 +18,27 @@ package com.splendo.kaluga.base
 
 import kotlinx.coroutines.Dispatchers
 
+/**
+ * The thread of execution
+ */
 actual data class KalugaThread(val thread: Thread) {
 
     actual companion object {
+
+        /**
+         * The [KalugaThread] the calling method is running on
+         */
         actual val currentThread: KalugaThread get() = KalugaThread(Thread.currentThread())
     }
 
+    /**
+     * Name of the thread
+     */
     actual var name: String by thread::name
+
+    /**
+     * When `true` this thread is the main thread.
+     */
     actual val isMainThread: Boolean get() = runBlocking(Dispatchers.Main.immediate) { // safest way also for synthetic main threads
         thread == Thread.currentThread()
     }
diff --git a/base/src/jvmMain/kotlin/runBlocking.kt b/base/src/jvmMain/kotlin/runBlocking.kt
index e105e89c2..461955675 100644
--- a/base/src/jvmMain/kotlin/runBlocking.kt
+++ b/base/src/jvmMain/kotlin/runBlocking.kt
@@ -21,4 +21,9 @@ package com.splendo.kaluga.base
 import kotlinx.coroutines.CoroutineScope
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * Runs a new coroutine and blocks the current thread interruptibly until its completion. This function should not be used from a coroutine. It is designed to bridge regular blocking code to libraries that are written in suspending style, to be used in main functions and in tests.
+ * @param context the context of the coroutine. The default value is an event loop on the current thread.
+ * @param block the coroutine code.
+ */
 actual fun <T> runBlocking(context: CoroutineContext, block: suspend CoroutineScope.() -> T): T = kotlinx.coroutines.runBlocking(context, block)
diff --git a/base/src/jvmMain/kotlin/runOnMain.kt b/base/src/jvmMain/kotlin/runOnMain.kt
index 7fcd861e0..f626feb56 100644
--- a/base/src/jvmMain/kotlin/runOnMain.kt
+++ b/base/src/jvmMain/kotlin/runOnMain.kt
@@ -20,6 +20,10 @@ package com.splendo.kaluga.base
 
 import javax.swing.SwingUtilities
 
+/**
+ * Runs the provided [block] on the main thread
+ * @param block the code to run on the main thread.
+ */
 actual fun runOnMain(block: () -> Unit) {
     SwingUtilities.invokeLater(block)
 }
diff --git a/base/src/jvmMain/kotlin/singleThreadDispatcher.kt b/base/src/jvmMain/kotlin/singleThreadDispatcher.kt
index 1def316dc..4cabcc18b 100644
--- a/base/src/jvmMain/kotlin/singleThreadDispatcher.kt
+++ b/base/src/jvmMain/kotlin/singleThreadDispatcher.kt
@@ -17,6 +17,22 @@
 package com.splendo.kaluga.base
 
 import kotlinx.coroutines.CloseableCoroutineDispatcher
+import kotlinx.coroutines.newFixedThreadPoolContext
 import kotlinx.coroutines.newSingleThreadContext
 
+/**
+ * Creates a coroutine execution context using a single thread.
+ *
+ * **NOTE: The resulting [CloseableCoroutineDispatcher] owns native resources (its thread).
+ * Resources are reclaimed by [CloseableCoroutineDispatcher.close].**
+ * @param name The name of the thread to be created.
+ */
 actual fun singleThreadDispatcher(name: String): CloseableCoroutineDispatcher = newSingleThreadContext(name)
+
+/**
+ * Creates a coroutine execution context using a thread pool.
+ *
+ * **NOTE: The resulting [CloseableCoroutineDispatcher] owns native resources (its thread).
+ * Resources are reclaimed by [CloseableCoroutineDispatcher.close].**
+ */
+actual fun threadPoolDispatcher(numberOfThreads: UInt, name: String): CloseableCoroutineDispatcher = newFixedThreadPoolContext(numberOfThreads.toInt(), name)
diff --git a/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt b/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
index 1557691ea..d68954108 100644
--- a/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
@@ -28,21 +28,44 @@ import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Calendar
 
-actual class KalugaDateFormatter private constructor(private val format: SimpleDateFormat) {
+/**
+ * Default implementation of [BaseDateFormatter]
+ */
+actual class KalugaDateFormatter private constructor(private val format: SimpleDateFormat) : BaseDateFormatter {
 
     actual companion object {
+
+        /**
+         * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
+         * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun dateFormat(
             style: DateFormatStyle,
             timeZone: TimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
+        /**
+         * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
+         * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun timeFormat(
             style: DateFormatStyle,
             timeZone: TimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getTimeInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
+        /**
+         * Creates a [KalugaDateFormatter] that formats both date and time components of a [KalugaDate]
+         * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
@@ -50,13 +73,22 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateTimeInstance(dateStyle.javaStyle(), timeStyle.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
+        /**
+         * Creates a [KalugaDateFormatter] using a custom Date format pattern.
+         * On iOS some user settings may take precedent over the format (i.e. using 12 hour clock).
+         * To prevent this, ensure that the provided [locale] is of a `POSIX` type.
+         * A convenience [fixedPatternFormat] method exists to default to this behaviour.
+         * @param pattern The pattern to apply.
+         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         */
         actual fun patternFormat(
             pattern: String,
             timeZone: TimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(SimpleDateFormat(pattern, locale.locale), timeZone)
 
-        fun createDateFormatter(simpleDateFormat: SimpleDateFormat, timeZone: TimeZone): KalugaDateFormatter {
+        private fun createDateFormatter(simpleDateFormat: SimpleDateFormat, timeZone: TimeZone): KalugaDateFormatter {
             return KalugaDateFormatter(simpleDateFormat).apply {
                 this.timeZone = timeZone
             }
@@ -65,26 +97,26 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
 
     private val symbols: DateFormatSymbols get() = format.dateFormatSymbols
 
-    actual var pattern: String
+    override var pattern: String
         get() = format.toPattern()
         set(value) = format.applyPattern(value)
 
-    actual var timeZone: TimeZone
+    override var timeZone: TimeZone
         get() = TimeZone(format.timeZone)
         set(value) { format.timeZone = value.timeZone }
 
-    actual var eras: List<String>
+    override var eras: List<String>
         get() = symbols.eras.toList()
         set(value) { updateSymbols { it.eras = value.toTypedArray() } }
 
-    actual var months: List<String>
+    override var months: List<String>
         get() = symbols.months.toList()
         set(value) { updateSymbols { it.months = value.toTypedArray() } }
-    actual var shortMonths: List<String>
+    override var shortMonths: List<String>
         get() = symbols.shortMonths.toList()
         set(value) { updateSymbols { it.shortMonths = value.toTypedArray() } }
 
-    actual var weekdays: List<String>
+    override var weekdays: List<String>
         get() {
             val weekdaysWithEmptyFirst = symbols.weekdays.toList()
             return if (weekdaysWithEmptyFirst.size > 1) {
@@ -101,7 +133,7 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
                 it.weekdays = weekdaysWithEmptyFirst.toTypedArray()
             }
         }
-    actual var shortWeekdays: List<String>
+    override var shortWeekdays: List<String>
         get() {
             val weekdaysWithEmptyFirst = symbols.shortWeekdays.toList()
             return if (weekdaysWithEmptyFirst.size > 1) {
@@ -119,15 +151,15 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
             }
         }
 
-    actual var amString: String
+    override var amString: String
         get() = symbols.amPmStrings.toList()[0]
         set(value) { updateSymbols { it.amPmStrings = it.amPmStrings.toMutableList().apply { this[0] = value }.toTypedArray() } }
-    actual var pmString: String
+    override var pmString: String
         get() = symbols.amPmStrings.toList()[1]
         set(value) { updateSymbols { it.amPmStrings = it.amPmStrings.toMutableList().apply { this[1] = value }.toTypedArray() } }
 
-    actual fun format(date: KalugaDate): String = format.format(date.date)
-    actual fun parse(string: String): KalugaDate? {
+    override fun format(date: KalugaDate): String = format.format(date.date)
+    override fun parse(string: String): KalugaDate? {
         val currentTimeZone = timeZone
         return try {
             format.parse(string)?.let { date ->
diff --git a/base/src/jvmMain/kotlin/text/NumberFormatter.kt b/base/src/jvmMain/kotlin/text/NumberFormatter.kt
index 44d779a8b..d5fabedf0 100644
--- a/base/src/jvmMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/jvmMain/kotlin/text/NumberFormatter.kt
@@ -24,7 +24,12 @@ import java.text.ParseException
 import java.util.Currency
 
 @ExperimentalUnsignedTypes
-actual class NumberFormatter actual constructor(actual val locale: Locale, style: NumberFormatStyle) {
+/**
+ * Default implementation of [BaseNumberFormatter]
+ * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
+ * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
+ */
+actual class NumberFormatter actual constructor(override val locale: Locale, style: NumberFormatStyle) : BaseNumberFormatter {
 
     private val format: DecimalFormat = when (style) {
         is NumberFormatStyle.Integer -> DecimalFormat.getInstance(locale.locale).apply {
@@ -85,70 +90,70 @@ actual class NumberFormatter actual constructor(actual val locale: Locale, style
         }
     }
 
-    actual var percentSymbol: Char
+    override var percentSymbol: Char
         get() = symbols.percent
         set(value) { applySymbols { it.percent = value } }
-    actual var perMillSymbol: Char
+    override var perMillSymbol: Char
         get() = symbols.perMill
         set(value) { applySymbols { it.perMill = value } }
-    actual var minusSign: Char
+    override var minusSign: Char
         get() = symbols.minusSign
         set(value) { applySymbols { it.minusSign = value } }
-    actual var exponentSymbol: String
+    override var exponentSymbol: String
         get() = symbols.exponentSeparator
         set(value) { applySymbols { it.exponentSeparator = value } }
-    actual var zeroSymbol: Char
+    override var zeroSymbol: Char
         get() = symbols.zeroDigit
         set(value) { applySymbols { it.zeroDigit = value } }
-    actual var notANumberSymbol: String
+    override var notANumberSymbol: String
         get() = symbols.naN
         set(value) { applySymbols { it.naN = value } }
-    actual var infinitySymbol: String
+    override var infinitySymbol: String
         get() = symbols.infinity
         set(value) { applySymbols { it.infinity = value } }
 
-    actual var currencySymbol: String
+    override var currencySymbol: String
         get() = symbols.currencySymbol
         set(value) { applySymbols { it.currencySymbol = value } }
-    actual var currencyCode: String
+    override var currencyCode: String
         get() = symbols.currency.currencyCode
         set(value) { applySymbols { it.currency = Currency.getInstance(value) } }
 
-    actual var positivePrefix: String
+    override var positivePrefix: String
         get() = format.positivePrefix
         set(value) { format.positivePrefix = value }
-    actual var positiveSuffix: String
+    override var positiveSuffix: String
         get() = format.positiveSuffix
         set(value) { format.positiveSuffix = value }
-    actual var negativePrefix: String
+    override var negativePrefix: String
         get() = format.negativePrefix
         set(value) { format.negativePrefix = value }
-    actual var negativeSuffix: String
+    override var negativeSuffix: String
         get() = format.negativeSuffix
         set(value) { format.negativeSuffix = value }
 
-    actual var groupingSeparator: Char
+    override var groupingSeparator: Char
         get() = symbols.groupingSeparator
         set(value) { applySymbols { it.groupingSeparator = value } }
-    actual var usesGroupingSeparator: Boolean
+    override var usesGroupingSeparator: Boolean
         get() = format.isGroupingUsed
         set(value) { format.isGroupingUsed = value }
-    actual var decimalSeparator: Char
+    override var decimalSeparator: Char
         get() = symbols.decimalSeparator
         set(value) { applySymbols { it.decimalSeparator = value } }
-    actual var alwaysShowsDecimalSeparator: Boolean
+    override var alwaysShowsDecimalSeparator: Boolean
         get() = format.isDecimalSeparatorAlwaysShown
         set(value) { format.isDecimalSeparatorAlwaysShown = value }
-    actual var currencyDecimalSeparator: Char
+    override var currencyDecimalSeparator: Char
         get() = symbols.monetaryDecimalSeparator
         set(value) { applySymbols { it.monetaryDecimalSeparator = value } }
-    actual var groupingSize: Int
+    override var groupingSize: Int
         get() = format.groupingSize
         set(value) { format.groupingSize = value }
-    actual var multiplier: Int
+    override var multiplier: Int
         get() = format.multiplier
         set(value) { format.multiplier = value }
 
-    actual fun format(number: Number): String = format.format(number.toDouble())
-    actual fun parse(string: String): Number? = try { format.parse(string) } catch (e: ParseException) { null }
+    override fun format(number: Number): String = format.format(number.toDouble())
+    override fun parse(string: String): Number? = try { format.parse(string) } catch (e: ParseException) { null }
 }
diff --git a/base/src/jvmMain/kotlin/text/StringUtils.kt b/base/src/jvmMain/kotlin/text/StringUtils.kt
index 7a7714310..daa6a96d0 100644
--- a/base/src/jvmMain/kotlin/text/StringUtils.kt
+++ b/base/src/jvmMain/kotlin/text/StringUtils.kt
@@ -19,8 +19,19 @@ package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.Locale
 
+/**
+ * The String that serves as a line separator.
+ */
 actual val lineSeparator = System.lineSeparator()
 
+/**
+ * Converts a String to its lower cased variant based on a given [Locale]
+ * @param locale The [Locale] to use for transforming to lower case.
+ */
 actual fun String.lowerCased(locale: Locale): String = this.lowercase(locale.locale)
 
+/**
+ * Converts a String to its upper cased variant based on a given [Locale]
+ * @param locale The [Locale] to use for transforming to upper case.
+ */
 actual fun String.upperCased(locale: Locale): String = this.uppercase(locale.locale)
diff --git a/base/src/jvmMain/kotlin/utils/Decimal.kt b/base/src/jvmMain/kotlin/utils/Decimal.kt
index 666549057..d58ea05f8 100644
--- a/base/src/jvmMain/kotlin/utils/Decimal.kt
+++ b/base/src/jvmMain/kotlin/utils/Decimal.kt
@@ -29,36 +29,90 @@ import java.math.RoundingMode as NativeRoundingMode
 
 actual typealias Decimal = BigDecimal
 
+/**
+ * Adds two [Decimal] together.
+ * @param value the [Decimal] to add
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual operator fun Decimal.plus(value: Decimal) = this.add(value)
 
+/**
+ * Adds two [Decimal] together scaled to a given precision.
+ * @param value the [Decimal] to add
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual fun Decimal.plus(value: Decimal, scale: Int) =
     this.add(value).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
+/**
+ * Adds two [Decimal] together scaled to a given precision.
+ * @param value the [Decimal] to add
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the total of the two provided decimals.
+ */
 actual fun Decimal.plus(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
 ) = this.add(value).setScale(scale, roundingMode.java)
 
+/**
+ * Subtracts two [Decimal].
+ * @param value the [Decimal] to subtract
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual operator fun Decimal.minus(value: Decimal) = this.subtract(value)
 
+/**
+ * Subtracts two [Decimal] to a given precision.
+ * @param value the [Decimal] to subtract
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual fun Decimal.minus(value: Decimal, scale: Int) =
     this.subtract(value).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
+/**
+ * Subtracts two [Decimal] to a given precision.
+ * @param value the [Decimal] to subtract
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the subtraction of the two provided decimals.
+ */
 actual fun Decimal.minus(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.java)
 
+/**
+ * Divides two [Decimal].
+ * @param value the [Decimal] to divide
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual operator fun Decimal.div(value: Decimal) = if ((value.compareTo(Decimal.ZERO)) != 0)
     this.divide(value, MathContext.DECIMAL128)
 else throw DecimalException("Divide by zero")
 
+/**
+ * Divides two [Decimal] to a given precision.
+ * @param value the [Decimal] to divide
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual fun Decimal.div(value: Decimal, scale: Int) = if ((value.compareTo(Decimal.ZERO)) != 0)
     this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
 else throw DecimalException("Divide by zero")
 
+/**
+ * Divides two [Decimal] to a given precision.
+ * @param value the [Decimal] to divide
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the division of the two provided decimals.
+ */
 actual fun Decimal.div(
     value: Decimal,
     scale: Int,
@@ -73,12 +127,30 @@ actual fun Decimal.div(
     ).setScale(scale, roundingMode.java)
 else throw DecimalException("Divide by zero")
 
+/**
+ * Multiplies two [Decimal].
+ * @param value the [Decimal] to multiply
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual operator fun Decimal.times(value: Decimal) =
     this.multiply(value, MathContext.DECIMAL128)
 
+/**
+ * Multiplies two [Decimal] to a given precision.
+ * @param value the [Decimal] to multiply
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual fun Decimal.times(value: Decimal, scale: Int) =
     this.multiply(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
+/**
+ * Multiplies two [Decimal] to a given precision.
+ * @param value the [Decimal] to multiply
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the multiplication of the two provided decimals.
+ */
 actual fun Decimal.times(
     value: Decimal,
     scale: Int,
@@ -91,14 +163,40 @@ actual fun Decimal.times(
     )
 ).setScale(scale, roundingMode.java)
 
+/**
+ * Rounds a [Decimal] to a [scale].
+ * @param scale The number of digits the rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return A [Decimal] rounded to [scale] digits after the decimal point.
+ */
 actual fun Decimal.round(scale: Int, roundingMode: RoundingMode) =
     this.setScale(
         scale,
         roundingMode.java
     )
 
+/**
+ * Raises two [Decimal].
+ * @param n the [Decimal] to raise to
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual infix fun Decimal.pow(n: Int): Decimal = this.pow(n, MathContext.DECIMAL128)
+
+/**
+ * Raises two [Decimal] to a given precision.
+ * @param n the [Decimal] to raise to
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual fun Decimal.pow(n: Int, scale: Int): Decimal = this.pow(n, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
+
+/**
+ * Raises two [Decimal] to a given precision.
+ * @param n the [Decimal] to raise to
+ * @param scale The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] that is the exponent of the two provided decimals.
+ */
 actual fun Decimal.pow(
     n: Int,
     scale: Int,
@@ -111,14 +209,32 @@ actual fun Decimal.pow(
     )
 ).setScale(scale, roundingMode.java)
 
+/**
+ * Converts a [Number] to a [Decimal]
+ */
 actual fun Number.toDecimal() = BigDecimal(toString())
+
+/**
+ * Converts a String to a [Decimal]
+ */
 actual fun String.toDecimal() = BigDecimal(this)
 
+/**
+ * Gets the double value of a [Decimal]
+ */
 actual fun Decimal.toDouble() = this.toDouble()
+
+/**
+ * Gets the integer value of a [Decimal]
+ */
 actual fun Decimal.toInt() = this.toInt()
+
+/**
+ * Gets the string value of a [Decimal]
+ */
 actual fun Decimal.toString() = this.stripTrailingZeros().toString()
 
-val RoundingMode.java
+private val RoundingMode.java
     get() = when (this) {
         RoundDown -> NativeRoundingMode.DOWN
         RoundHalfEven -> NativeRoundingMode.HALF_EVEN
diff --git a/base/src/jvmMain/kotlin/utils/KalugaDate.kt b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
index 0f9d9a29c..7bd6be088 100644
--- a/base/src/jvmMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
@@ -22,14 +22,33 @@ import java.util.Date
 
 actual typealias KalugaDateHolder = Date
 
+/**
+ * Default implementation of [KalugaDate]
+ */
 actual class DefaultKalugaDate internal constructor(internal val calendar: Calendar) : KalugaDate() {
 
     actual companion object {
+
+        /**
+         * Creates a [KalugaDate] relative to the current time
+         * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
+         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @return A [KalugaDate] relative to the current time
+         */
         actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 add(Calendar.MILLISECOND, offsetInMilliseconds.toInt())
             }
         )
+
+        /**
+         * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
+         * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
+         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @return A [KalugaDate] relative to the current time
+         */
         actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 timeInMillis = offsetInMilliseconds
diff --git a/base/src/jvmMain/kotlin/utils/Locale.kt b/base/src/jvmMain/kotlin/utils/Locale.kt
index 894cf65d0..4aa2dca64 100644
--- a/base/src/jvmMain/kotlin/utils/Locale.kt
+++ b/base/src/jvmMain/kotlin/utils/Locale.kt
@@ -19,35 +19,66 @@ package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.base.text.upperCased
 
-actual data class Locale internal constructor(val locale: java.util.Locale) {
+/**
+ * Default implementation of [BaseLocale]
+ */
+actual data class Locale internal constructor(internal val locale: java.util.Locale) : BaseLocale() {
     actual companion object {
+
+        /**
+         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
+         * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
+         * @return The [Locale] for the given [language]
+         */
         actual fun createLocale(language: String): Locale = Locale(java.util.Locale(language))
+
+        /**
+         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
+         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
+         * @param country a ISO 3166 alpha-2 `country` code.
+         * @return The [Locale] for the given [language] and [country]
+         */
         actual fun createLocale(language: String, country: String): Locale = Locale(java.util.Locale(language, country))
+
+        /**
+         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
+         * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
+         * @param country a ISO 3166 alpha-2 `country` code.
+         * @param variant Arbitrary value used to indicate a variation of a [Locale]
+         * @return The [Locale] for the given [language], [country], and [variant]
+         */
         actual fun createLocale(language: String, country: String, variant: String): Locale = Locale(java.util.Locale(language, country, variant))
 
+        /**
+         * The default [Locale] of the user
+         */
         actual val defaultLocale: Locale get() = Locale(java.util.Locale.getDefault())
+
+        /**
+         * A list of [Locale] available to the user.
+         */
         actual val availableLocales: List<Locale> = java.util.Locale.getAvailableLocales().asList().map { Locale(it) }
     }
 
-    actual val countryCode: String
+    override val countryCode: String
         get() = locale.country
-    actual val languageCode: String
+    override val languageCode: String
         get() = locale.language
-    actual val scriptCode: String
+    override val scriptCode: String
         get() = locale.script
-    actual val variantCode: String
+    override val variantCode: String
         get() = locale.variant
-    actual val unitSystem: UnitSystem
+    override val unitSystem: UnitSystem
         get() = UnitSystem.withCountryCode(countryCode.upperCased(this))
 
-    actual fun name(forLocale: Locale): String = locale.getDisplayName(forLocale.locale)
-    actual fun countryName(forLocale: Locale): String = locale.getDisplayCountry(forLocale.locale)
-    actual fun languageName(forLocale: Locale): String = locale.getDisplayLanguage(forLocale.locale)
-    actual fun variantName(forLocale: Locale): String = locale.getDisplayVariant(forLocale.locale)
-    actual fun scriptName(forLocale: Locale): String = locale.getDisplayScript(forLocale.locale)
+    override fun name(forLocale: Locale): String = locale.getDisplayName(forLocale.locale)
+    override fun countryName(forLocale: Locale): String = locale.getDisplayCountry(forLocale.locale)
+    override fun languageName(forLocale: Locale): String = locale.getDisplayLanguage(forLocale.locale)
+    override fun variantName(forLocale: Locale): String = locale.getDisplayVariant(forLocale.locale)
+    override fun scriptName(forLocale: Locale): String = locale.getDisplayScript(forLocale.locale)
 
-    actual val quotationStart: String = "\""
-    actual val quotationEnd: String = "\""
-    actual val alternateQuotationStart: String = "\""
-    actual val alternateQuotationEnd: String = "\""
+    override val quotationStart: String = "\""
+    override val quotationEnd: String = "\""
+    override val alternateQuotationStart: String = "\""
+    override val alternateQuotationEnd: String = "\""
 }
diff --git a/base/src/jvmMain/kotlin/utils/TimeZone.kt b/base/src/jvmMain/kotlin/utils/TimeZone.kt
index add30ff1f..8c4ea0c42 100644
--- a/base/src/jvmMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jvmMain/kotlin/utils/TimeZone.kt
@@ -17,17 +17,35 @@
 
 package com.splendo.kaluga.base.utils
 
+/**
+ * A default implementation of [BaseTimeZone].
+ */
 actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) : BaseTimeZone() {
 
     actual companion object {
+
+        /**
+         * Gets a [TimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [TimeZone] for
+         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         */
         actual fun get(identifier: String): TimeZone? {
             return java.util.TimeZone.getTimeZone(identifier)?.let {
                 TimeZone(it)
             }
         }
+
+        /**
+         * Gets the current [TimeZone] configured by the user
+         * @return The current [TimeZone] of the user
+         */
         actual fun current(): TimeZone {
             return TimeZone(java.util.TimeZone.getDefault())
         }
+
+        /**
+         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         */
         actual val availableIdentifiers get() = java.util.TimeZone.getAvailableIDs().asList()
     }
 
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
index 16226d995..46d90c417 100644
--- a/service/build.gradle.kts
+++ b/service/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
diff --git a/test-utils-service/build.gradle.kts b/test-utils-service/build.gradle.kts
index 489012e58..30ce8efa0 100644
--- a/test-utils-service/build.gradle.kts
+++ b/test-utils-service/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("jacoco")
     id("convention.publication")
     id("com.android.library")
+    id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
 }
 

From dfe71590972ebd4b65b3f01e4b96e2cd5c221f0b Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 17:28:27 +0100
Subject: [PATCH 146/227] API dump

---
 alerts/api/androidLib/alerts.api              |   4 -
 architecture/api/androidLib/architecture.api  | 325 ++++++++++--------
 architecture/api/jvm/architecture.api         | 203 +++++------
 base/api/androidLib/base.api                  | 278 ++++++++++-----
 base/api/jvm/base.api                         | 279 ++++++++++-----
 .../api/androidLib/date-time-picker.api       |  12 +-
 date-time-picker/api/jvm/date-time-picker.api |   7 +
 hud/api/androidLib/hud.api                    |   4 -
 keyboard/api/androidLib/keyboard.api          |   4 -
 review/api/androidLib/review.api              |   4 -
 .../api/androidLib/test-utils-alerts.api      |   4 +
 .../androidLib/test-utils-architecture.api    |   8 +
 .../test-utils-date-time-picker.api           |  35 ++
 .../api/androidLib/test-utils-keyboard.api    |  36 --
 .../api/jvm/test-utils-date-time-picker.api   |  23 ++
 .../api/jvm/test-utils-keyboard.api           |  29 --
 .../api/androidLib/test-utils-hud.api         |   4 +
 .../api/androidLib/test-utils-keyboard.api    |   4 +
 18 files changed, 737 insertions(+), 526 deletions(-)
 create mode 100644 test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
 delete mode 100644 test-utils-date-time-picker/api/androidLib/test-utils-keyboard.api
 create mode 100644 test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
 delete mode 100644 test-utils-date-time-picker/api/jvm/test-utils-keyboard.api

diff --git a/alerts/api/androidLib/alerts.api b/alerts/api/androidLib/alerts.api
index 624d7e8e0..33c17beff 100644
--- a/alerts/api/androidLib/alerts.api
+++ b/alerts/api/androidLib/alerts.api
@@ -114,10 +114,6 @@ public final class com/splendo/kaluga/alerts/AlertPresenter$Builder : com/splend
 	public fun unsubscribe ()V
 }
 
-public final class com/splendo/kaluga/alerts/AlertPresenterKt {
-	public static final fun alertPresenterBuilder (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/alerts/AlertPresenter$Builder;
-}
-
 public final class com/splendo/kaluga/alerts/AlertsKt {
 	public static final fun buildActionSheet (Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
 	public static final fun buildAlert (Lcom/splendo/kaluga/alerts/BaseAlertPresenter$Builder;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/alerts/BaseAlertPresenter;
diff --git a/architecture/api/androidLib/architecture.api b/architecture/api/androidLib/architecture.api
index d6744e85c..04b3a00f0 100644
--- a/architecture/api/androidLib/architecture.api
+++ b/architecture/api/androidLib/architecture.api
@@ -26,9 +26,10 @@ public final class com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSu
 	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;)V
 	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable;Landroid/app/Activity;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/FragmentManager;)V
 	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable;Landroidx/appcompat/app/AppCompatActivity;)V
+	public static final fun subscribe (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable;Landroidx/fragment/app/Fragment;)V
 }
 
-public class com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscriber : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable {
+public class com/splendo/kaluga/architecture/lifecycle/DefaultActivityLifecycleSubscribable : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable {
 	public fun <init> ()V
 	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
 	public fun setManager (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
@@ -36,21 +37,13 @@ public class com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscrib
 	public fun unsubscribe ()V
 }
 
-public final class com/splendo/kaluga/architecture/lifecycle/GetOrPutAndRemoveOnDestroyFromCacheKt {
-	public static final fun getLifecycleAwareActivityCache ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
-}
-
-public final class com/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscriber {
+public final class com/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver : com/splendo/kaluga/architecture/lifecycle/DefaultActivityLifecycleSubscribable {
 	public fun <init> ()V
 	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
 	public final fun getManagerState ()Lkotlinx/coroutines/flow/StateFlow;
 	public fun setManager (Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;)V
 }
 
-public final class com/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserverKt {
-	public static final fun lifecycleManagerObserver (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;
-}
-
 public abstract interface class com/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable {
 }
 
@@ -96,6 +89,7 @@ public final class com/splendo/kaluga/architecture/navigation/ActivityParseExtra
 	public static final fun parseLongArray (Landroid/app/Activity;)[J
 	public static final fun parseLongArrayOrNull (Landroid/app/Activity;)[J
 	public static final fun parseLongOrNull (Landroid/app/Activity;)Ljava/lang/Long;
+	public static final fun parseNullableTypeOfOrNull (Landroid/app/Activity;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public static final fun parseShort (Landroid/app/Activity;)S
 	public static final fun parseShortArray (Landroid/app/Activity;)[S
 	public static final fun parseShortArrayOrNull (Landroid/app/Activity;)[S
@@ -147,6 +141,7 @@ public final class com/splendo/kaluga/architecture/navigation/BundleToTypedPrope
 	public static final fun asLongArray (Landroid/os/Bundle;)[J
 	public static final fun asLongArrayOrNull (Landroid/os/Bundle;)[J
 	public static final fun asLongOrNull (Landroid/os/Bundle;)Ljava/lang/Long;
+	public static final fun asNullableTypeOfOrNull (Landroid/os/Bundle;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public static final fun asShort (Landroid/os/Bundle;)S
 	public static final fun asShortArray (Landroid/os/Bundle;)[S
 	public static final fun asShortArrayOrNull (Landroid/os/Bundle;)[S
@@ -157,6 +152,7 @@ public final class com/splendo/kaluga/architecture/navigation/BundleToTypedPrope
 	public static final fun asStringOrNull (Landroid/os/Bundle;)Ljava/lang/String;
 	public static final fun asTypeOf (Landroid/os/Bundle;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public static final fun asTypeOfOrNull (Landroid/os/Bundle;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
+	public static final fun toNullableTypedPropertyOrNull (Landroid/os/Bundle;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)Ljava/lang/Object;
 	public static final fun toTypedProperty (Landroid/os/Bundle;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)Ljava/lang/Object;
 	public static final fun toTypedPropertyOrNull (Landroid/os/Bundle;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)Ljava/lang/Object;
 }
@@ -197,6 +193,7 @@ public final class com/splendo/kaluga/architecture/navigation/FragmentParseArgum
 	public static final fun parseLongArray (Landroidx/fragment/app/Fragment;)[J
 	public static final fun parseLongArrayOrNull (Landroidx/fragment/app/Fragment;)[J
 	public static final fun parseLongOrNull (Landroidx/fragment/app/Fragment;)Ljava/lang/Long;
+	public static final fun parseNullableTypeOfOrNull (Landroidx/fragment/app/Fragment;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public static final fun parseShort (Landroidx/fragment/app/Fragment;)S
 	public static final fun parseShortArray (Landroidx/fragment/app/Fragment;)[S
 	public static final fun parseShortArrayOrNull (Landroidx/fragment/app/Fragment;)[S
@@ -418,6 +415,7 @@ public final class com/splendo/kaluga/architecture/navigation/IntentParseExtraKt
 	public static final fun parseLongArray (Landroid/content/Intent;)[J
 	public static final fun parseLongArrayOrNull (Landroid/content/Intent;)[J
 	public static final fun parseLongOrNull (Landroid/content/Intent;)Ljava/lang/Long;
+	public static final fun parseNullableTypeOfOrNull (Landroid/content/Intent;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public static final fun parseShort (Landroid/content/Intent;)S
 	public static final fun parseShortArray (Landroid/content/Intent;)[S
 	public static final fun parseShortArrayOrNull (Landroid/content/Intent;)[S
@@ -479,122 +477,144 @@ public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundl
 	public abstract fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BundleType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
-	public fun convertValue (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BundleType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
+	public fun convertValue (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 	public final fun getSpec ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteType;
-	public fun convertValue (B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharSequenceType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharSequenceType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharSequenceType;
-	public fun convertValue (Ljava/lang/CharSequence;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Ljava/lang/CharSequence;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharType;
-	public fun convertValue (C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateType;
-	public fun convertValue (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleType;
-	public fun convertValue (D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatType;
-	public fun convertValue (F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerType;
-	public fun convertValue (I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongType;
-	public fun convertValue (J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
+public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+	public abstract fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
+}
+
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
-	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)V
-	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType;)V
+	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType;
 	public fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;
+	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getType ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;
+	public final fun getType ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
@@ -614,41 +634,46 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSp
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$SerializedType$Companion {
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (Ljava/lang/String;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Ljava/lang/String;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$UnitType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$UnitType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$UnitType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (Lkotlin/Unit;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Lkotlin/Unit;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$UnitValue;
 }
 
 public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
 	public abstract fun getValue ()Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[Z
 	public final fun copy ([Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue;[ZILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue;
@@ -659,7 +684,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()Z
 	public final fun copy (Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue;ZILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue;
@@ -670,7 +695,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;
 	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue;Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue;
@@ -681,7 +706,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[B
 	public final fun copy ([B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue;[BILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue;
@@ -692,7 +717,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()B
 	public final fun copy (B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue;BILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue;
@@ -703,7 +728,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[C
 	public final fun copy ([C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue;[CILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue;
@@ -714,7 +739,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()Ljava/lang/CharSequence;
 	public final fun copy (Ljava/lang/CharSequence;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue;Ljava/lang/CharSequence;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue;
@@ -725,7 +750,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()C
 	public final fun copy (C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue;CILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue;
@@ -736,7 +761,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ListNavigationBundleValue {
 	public final fun component1 ()Ljava/util/List;
 	public final fun copy (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue;Ljava/util/List;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue;
@@ -747,7 +772,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public final fun copy (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue;
@@ -758,7 +783,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[D
 	public final fun copy ([D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue;[DILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue;
@@ -769,7 +794,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()D
 	public final fun copy (D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue;DILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue;
@@ -780,7 +805,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[F
 	public final fun copy ([F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue;[FILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue;
@@ -791,7 +816,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()F
 	public final fun copy (F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue;FILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue;
@@ -802,7 +827,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[I
 	public final fun copy ([I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue;[IILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue;
@@ -813,7 +838,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()I
 	public final fun copy (I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue;IILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue;
@@ -824,7 +849,10 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ListNavigationBundleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
+}
+
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[J
 	public final fun copy ([J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue;[JILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue;
@@ -835,7 +863,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()J
 	public final fun copy (J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue;JILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue;
@@ -846,12 +874,15 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
+public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+}
+
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
-	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;
+	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
+	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getOptionalValue ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public final fun getOptionalValue ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public fun getValue ()Ljava/lang/Object;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -874,7 +905,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$SerializedValue$Companion {
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[S
 	public final fun copy ([S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue;[SILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue;
@@ -885,7 +916,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()S
 	public final fun copy (S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue;SILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue;
@@ -896,7 +927,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ListNavigationBundleValue {
 	public final fun component1 ()Ljava/util/List;
 	public final fun copy (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue;Ljava/util/List;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue;
@@ -907,7 +938,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()Ljava/lang/String;
 	public final fun copy (Ljava/lang/String;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue;Ljava/lang/String;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue;
@@ -918,7 +949,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$UnitValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$UnitValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$UnitValue;
 	public synthetic fun getValue ()Ljava/lang/Object;
 	public fun getValue ()Lkotlin/Unit;
@@ -1548,7 +1579,6 @@ public abstract class com/splendo/kaluga/architecture/observable/AbstractBaseIni
 
 public abstract class com/splendo/kaluga/architecture/observable/AbstractBaseSubject : com/splendo/kaluga/architecture/observable/BaseObservable, com/splendo/kaluga/architecture/observable/BasicSubject {
 	public fun <init> (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlin/jvm/functions/Function1;)V
-	public final fun bind (Lkotlinx/coroutines/CoroutineScope;)V
 	public fun bind (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)V
 }
 
@@ -1571,13 +1601,7 @@ public abstract class com/splendo/kaluga/architecture/observable/AbstractBaseUni
 
 public final class com/splendo/kaluga/architecture/observable/AndroidObservable {
 	public static final fun getLiveDataObserver (Lcom/splendo/kaluga/architecture/observable/BasicSubject;)Landroidx/lifecycle/Observer;
-	public static final fun observeNotNullOnLifecycle (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/Job;
-	public static synthetic fun observeNotNullOnLifecycle$default (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 	public static final fun observeOnCoroutine (Landroidx/lifecycle/LiveData;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/Observer;)V
-	public static final fun observeOnLifecycle (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/Job;
-	public static final fun observeOnLifecycle (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/Job;
-	public static synthetic fun observeOnLifecycle$default (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
-	public static synthetic fun observeOnLifecycle$default (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 }
 
 public abstract class com/splendo/kaluga/architecture/observable/BaseDefaultObservable : com/splendo/kaluga/architecture/observable/BaseObservable, com/splendo/kaluga/architecture/observable/DefaultInitialized, com/splendo/kaluga/architecture/observable/DefaultObservable {
@@ -1678,7 +1702,6 @@ public abstract interface class com/splendo/kaluga/architecture/observable/Basic
 }
 
 public abstract interface class com/splendo/kaluga/architecture/observable/BasicSubject : com/splendo/kaluga/architecture/observable/BasicObservable, com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public abstract fun bind (Lkotlinx/coroutines/CoroutineScope;)V
 	public abstract fun bind (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)V
 }
 
@@ -1687,7 +1710,7 @@ public final class com/splendo/kaluga/architecture/observable/DefaultFlowObserva
 	public synthetic fun <init> (Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;Lcom/splendo/kaluga/architecture/observable/ObservationDefault;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
-public abstract interface class com/splendo/kaluga/architecture/observable/DefaultInitialized : com/splendo/kaluga/architecture/observable/Initialized, com/splendo/kaluga/architecture/observable/WithState {
+public abstract interface class com/splendo/kaluga/architecture/observable/DefaultInitialized : com/splendo/kaluga/architecture/observable/Initialized {
 	public abstract fun getDefaultValue ()Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;
 }
 
@@ -1724,6 +1747,30 @@ public final class com/splendo/kaluga/architecture/observable/FlowObservable : c
 	public final fun getFlow ()Lkotlinx/coroutines/flow/Flow;
 }
 
+public final class com/splendo/kaluga/architecture/observable/FlowObservableKt {
+	public static final fun toDefaultObservable (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
+	public static synthetic fun toDefaultObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
+	public static final fun toInitializedObservable (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
+	public static final fun toInitializedObservable (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
+	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
+	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
+	public static final fun toUninitializedObservable (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowObservable;
+	public static synthetic fun toUninitializedObservable$default (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowObservable;
+}
+
+public final class com/splendo/kaluga/architecture/observable/FlowSubjectKt {
+	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
+	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
+	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
+	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
+	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
+	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
+	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
+	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
+	public static final fun toUninitializedSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowSubject;
+	public static synthetic fun toUninitializedSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowSubject;
+}
+
 public abstract interface class com/splendo/kaluga/architecture/observable/Initial {
 	public abstract fun getCurrentOrNull ()Ljava/lang/Object;
 	public abstract fun getInitialValue ()Lcom/splendo/kaluga/architecture/observable/ObservableOptional;
@@ -1745,18 +1792,6 @@ public abstract interface class com/splendo/kaluga/architecture/observable/Initi
 public abstract interface class com/splendo/kaluga/architecture/observable/MutableDefaultInitialized : com/splendo/kaluga/architecture/observable/DefaultInitialized, com/splendo/kaluga/architecture/observable/WithMutableState {
 }
 
-public final class com/splendo/kaluga/architecture/observable/MutableFlowSubjectHelper : com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/architecture/observable/Observation;)V
-	public synthetic fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/architecture/observable/Observation;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getContext ()Lkotlin/coroutines/CoroutineContext;
-	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
-	public final fun getFlow ()Lkotlin/jvm/functions/Function0;
-	public final fun getPoster ()Lkotlin/jvm/functions/Function1;
-	public final fun getSetter ()Lkotlin/jvm/functions/Function2;
-	public fun post (Ljava/lang/Object;)V
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public abstract interface class com/splendo/kaluga/architecture/observable/MutableInitialized : com/splendo/kaluga/architecture/observable/Initialized, com/splendo/kaluga/architecture/observable/WithMutableState {
 }
 
@@ -1764,7 +1799,7 @@ public abstract interface class com/splendo/kaluga/architecture/observable/Mutab
 }
 
 public final class com/splendo/kaluga/architecture/observable/ObservableKt {
-	public static final fun asResult (Lcom/splendo/kaluga/architecture/observable/ObservableOptional;Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;)Lcom/splendo/kaluga/architecture/observable/ObservableOptional;
+	public static final fun observableOf (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SimpleInitializedObservable;
 }
 
 public abstract class com/splendo/kaluga/architecture/observable/ObservableOptional : kotlin/properties/ReadOnlyProperty {
@@ -1793,36 +1828,8 @@ public final class com/splendo/kaluga/architecture/observable/ObservableOptional
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/observable/ObservablesKt {
-	public static final fun observableOf (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SimpleInitializedObservable;
-	public static final fun observeFlow (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;)V
-	public static synthetic fun observeFlow$default (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;ILjava/lang/Object;)V
-	public static final fun readOnlyPropertyObservableHelper (Lkotlin/properties/ReadOnlyProperty;Lcom/splendo/kaluga/architecture/observable/Observation;)V
-	public static final fun subjectOf (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SimpleInitializedSubject;
-	public static final fun toDefaultObservable (Lkotlin/properties/ReadOnlyProperty;Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadOnlyPropertyDefaultObservable;
-	public static final fun toDefaultObservable (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
-	public static synthetic fun toDefaultObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
-	public static final fun toDefaultSubject (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
-	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
-	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
-	public static synthetic fun toDefaultSubject$default (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
-	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
-	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
-	public static final fun toInitializedObservable (Lkotlin/properties/ReadOnlyProperty;)Lcom/splendo/kaluga/architecture/observable/ReadOnlyPropertyInitializedObservable;
-	public static final fun toInitializedObservable (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
-	public static final fun toInitializedObservable (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
-	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
-	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
-	public static final fun toInitializedSubject (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
-	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
-	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
-	public static synthetic fun toInitializedSubject$default (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
-	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
-	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
-	public static final fun toUninitializedObservable (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowObservable;
-	public static synthetic fun toUninitializedObservable$default (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowObservable;
-	public static final fun toUninitializedSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowSubject;
-	public static synthetic fun toUninitializedSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowSubject;
+public final class com/splendo/kaluga/architecture/observable/ObservableOptionalKt {
+	public static final fun asResult (Lcom/splendo/kaluga/architecture/observable/ObservableOptional;Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;)Lcom/splendo/kaluga/architecture/observable/ObservableOptional;
 }
 
 public class com/splendo/kaluga/architecture/observable/Observation : com/splendo/kaluga/architecture/observable/Initial {
@@ -1872,6 +1879,11 @@ public class com/splendo/kaluga/architecture/observable/ObservationInitialized :
 	public fun setValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
 }
 
+public final class com/splendo/kaluga/architecture/observable/ObservationKt {
+	public static final fun observeFlow (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;)V
+	public static synthetic fun observeFlow$default (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;ILjava/lang/Object;)V
+}
+
 public final class com/splendo/kaluga/architecture/observable/ObservationUninitialized : com/splendo/kaluga/architecture/observable/Observation, com/splendo/kaluga/architecture/observable/MutableUninitialized, kotlin/properties/ReadWriteProperty {
 	public fun <init> ()V
 	public fun getInitialValue ()Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Nothing;
@@ -1898,6 +1910,11 @@ public final class com/splendo/kaluga/architecture/observable/ReadOnlyPropertyIn
 	public synthetic fun <init> (Lkotlin/properties/ReadOnlyProperty;Lcom/splendo/kaluga/architecture/observable/ObservationInitialized;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
+public final class com/splendo/kaluga/architecture/observable/ReadOnlyPropertyObservableKt {
+	public static final fun toDefaultObservable (Lkotlin/properties/ReadOnlyProperty;Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadOnlyPropertyDefaultObservable;
+	public static final fun toInitializedObservable (Lkotlin/properties/ReadOnlyProperty;)Lcom/splendo/kaluga/architecture/observable/ReadOnlyPropertyInitializedObservable;
+}
+
 public final class com/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject : com/splendo/kaluga/architecture/observable/BaseDefaultSubject, com/splendo/kaluga/architecture/observable/SuspendableSetter {
 	public fun <init> (Ljava/lang/Object;Lkotlin/properties/ReadWriteProperty;Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/architecture/observable/ObservationDefault;)V
 	public synthetic fun <init> (Ljava/lang/Object;Lkotlin/properties/ReadWriteProperty;Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lcom/splendo/kaluga/architecture/observable/ObservationDefault;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -1912,10 +1929,11 @@ public final class com/splendo/kaluga/architecture/observable/ReadWritePropertyI
 	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/architecture/observable/ReadWritePropertyObservableHelper : com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public fun <init> (Lkotlin/properties/ReadWriteProperty;Lcom/splendo/kaluga/architecture/observable/Observation;)V
-	public fun post (Ljava/lang/Object;)V
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public final class com/splendo/kaluga/architecture/observable/ReadWritePropertySubjectKt {
+	public static final fun toDefaultSubject (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
+	public static synthetic fun toDefaultSubject$default (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
+	public static final fun toInitializedSubject (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
+	public static synthetic fun toInitializedSubject$default (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
 }
 
 public class com/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject : com/splendo/kaluga/architecture/observable/BaseDefaultSubject, com/splendo/kaluga/architecture/observable/SuspendableSetter {
@@ -1981,13 +1999,9 @@ public class com/splendo/kaluga/architecture/observable/StateFlowInitializedSubj
 	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public class com/splendo/kaluga/architecture/observable/StateFlowSubject : com/splendo/kaluga/architecture/observable/BaseInitializedSubject, com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/MutableStateFlow;ZLcom/splendo/kaluga/architecture/observable/ObservationInitialized;)V
-	public synthetic fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/MutableStateFlow;ZLcom/splendo/kaluga/architecture/observable/ObservationInitialized;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getContext ()Lkotlin/coroutines/CoroutineContext;
-	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
-	public fun post (Ljava/lang/Object;)V
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public final class com/splendo/kaluga/architecture/observable/SubjectKt {
+	public static final fun bind (Lcom/splendo/kaluga/architecture/observable/BasicSubject;Lkotlinx/coroutines/CoroutineScope;)V
+	public static final fun subjectOf (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SimpleInitializedSubject;
 }
 
 public abstract interface class com/splendo/kaluga/architecture/observable/SuspendableSetter : com/splendo/kaluga/architecture/observable/Postable {
@@ -2015,6 +2029,15 @@ public abstract interface class com/splendo/kaluga/architecture/observable/WithS
 	public abstract fun getValueDelegate ()Lkotlin/properties/ReadOnlyProperty;
 }
 
+public final class com/splendo/kaluga/architecture/observable/WithStateKt {
+	public static final fun observeNotNullOnLifecycle (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/Job;
+	public static synthetic fun observeNotNullOnLifecycle$default (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+	public static final fun observeOnLifecycle (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/Job;
+	public static final fun observeOnLifecycle (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/Job;
+	public static synthetic fun observeOnLifecycle$default (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+	public static synthetic fun observeOnLifecycle$default (Lcom/splendo/kaluga/architecture/observable/WithState;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+}
+
 public class com/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel : com/splendo/kaluga/architecture/viewmodel/LifecycleViewModel {
 	public fun <init> ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;)V
 	protected final fun addLifecycleSubscribables ([Lcom/splendo/kaluga/architecture/lifecycle/LifecycleSubscribable;)V
diff --git a/architecture/api/jvm/architecture.api b/architecture/api/jvm/architecture.api
index 7379c8e79..05e5f483c 100644
--- a/architecture/api/jvm/architecture.api
+++ b/architecture/api/jvm/architecture.api
@@ -37,111 +37,129 @@ public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundl
 	public abstract fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BooleanType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BundleType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
-	public fun convertValue (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$BundleType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
+	public fun convertValue (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 	public final fun getSpec ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ByteType;
-	public fun convertValue (B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharSequenceType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharSequenceType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharSequenceType;
-	public fun convertValue (Ljava/lang/CharSequence;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Ljava/lang/CharSequence;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$CharType;
-	public fun convertValue (C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DateType;
-	public fun convertValue (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$DoubleType;
-	public fun convertValue (D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$FloatType;
-	public fun convertValue (F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$IntegerType;
-	public fun convertValue (I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$LongType;
-	public fun convertValue (J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
 }
 
@@ -150,13 +168,13 @@ public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundl
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
-	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)V
-	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;
+	public fun <init> (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType;)V
+	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType;
 	public fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;
+	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$OptionalType;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getType ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;
+	public final fun getType ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
@@ -176,41 +194,46 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSp
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$SerializedType$Companion {
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue ([S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue ([S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$ShortType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringArrayType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringArrayType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$StringType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (Ljava/lang/String;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Ljava/lang/String;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$UnitType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$UnitType : com/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$NonNullableNavigationBundleSpecType {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType$UnitType;
+	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public synthetic fun convertValue (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public fun convertValue (Lkotlin/Unit;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public fun convertValue (Lkotlin/Unit;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$UnitValue;
 }
 
 public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
 	public abstract fun getValue ()Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[Z
 	public final fun copy ([Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue;[ZILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanArrayValue;
@@ -221,7 +244,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()Z
 	public final fun copy (Z)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue;ZILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BooleanValue;
@@ -232,7 +255,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;
 	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue;Lcom/splendo/kaluga/architecture/navigation/NavigationBundle;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$BundleValue;
@@ -243,7 +266,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[B
 	public final fun copy ([B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue;[BILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteArrayValue;
@@ -254,7 +277,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()B
 	public final fun copy (B)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue;BILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ByteValue;
@@ -265,7 +288,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[C
 	public final fun copy ([C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue;[CILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharArrayValue;
@@ -276,7 +299,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()Ljava/lang/CharSequence;
 	public final fun copy (Ljava/lang/CharSequence;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue;Ljava/lang/CharSequence;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharSequenceValue;
@@ -287,7 +310,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()C
 	public final fun copy (C)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue;CILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$CharValue;
@@ -298,7 +321,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ListNavigationBundleValue {
 	public final fun component1 ()Ljava/util/List;
 	public final fun copy (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue;Ljava/util/List;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateArrayValue;
@@ -309,7 +332,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public final fun copy (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DateValue;
@@ -320,7 +343,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[D
 	public final fun copy ([D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue;[DILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleArrayValue;
@@ -331,7 +354,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()D
 	public final fun copy (D)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue;DILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$DoubleValue;
@@ -342,7 +365,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[F
 	public final fun copy ([F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue;[FILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatArrayValue;
@@ -353,7 +376,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()F
 	public final fun copy (F)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue;FILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$FloatValue;
@@ -364,7 +387,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[I
 	public final fun copy ([I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue;[IILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerArrayValue;
@@ -375,7 +398,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()I
 	public final fun copy (I)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue;IILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$IntegerValue;
@@ -389,7 +412,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ListNavigationBundleValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[J
 	public final fun copy ([J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue;[JILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongArrayValue;
@@ -400,7 +423,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()J
 	public final fun copy (J)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue;JILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$LongValue;
@@ -415,11 +438,11 @@ public abstract class com/splendo/kaluga/architecture/navigation/NavigationBundl
 }
 
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
-	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
-	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;
+	public final fun component1 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
+	public final fun copy (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$OptionalValue;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getOptionalValue ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue;
+	public final fun getOptionalValue ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue;
 	public fun getValue ()Ljava/lang/Object;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -442,7 +465,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$SerializedValue$Companion {
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()[S
 	public final fun copy ([S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue;[SILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortArrayValue;
@@ -453,7 +476,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()S
 	public final fun copy (S)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue;SILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$ShortValue;
@@ -464,7 +487,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$ListNavigationBundleValue {
 	public final fun component1 ()Ljava/util/List;
 	public final fun copy (Ljava/util/List;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue;Ljava/util/List;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringArrayValue;
@@ -475,7 +498,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public final fun component1 ()Ljava/lang/String;
 	public final fun copy (Ljava/lang/String;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue;Ljava/lang/String;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$StringValue;
@@ -486,7 +509,7 @@ public final class com/splendo/kaluga/architecture/navigation/NavigationBundleVa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$UnitValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue {
+public final class com/splendo/kaluga/architecture/navigation/NavigationBundleValue$UnitValue : com/splendo/kaluga/architecture/navigation/NavigationBundleValue$NonNullableNavigationBundleValue {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/navigation/NavigationBundleValue$UnitValue;
 	public synthetic fun getValue ()Ljava/lang/Object;
 	public fun getValue ()Lkotlin/Unit;
@@ -567,7 +590,6 @@ public abstract class com/splendo/kaluga/architecture/observable/AbstractBaseIni
 
 public abstract class com/splendo/kaluga/architecture/observable/AbstractBaseSubject : com/splendo/kaluga/architecture/observable/BaseObservable, com/splendo/kaluga/architecture/observable/BasicSubject {
 	public fun <init> (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlin/jvm/functions/Function1;)V
-	public final fun bind (Lkotlinx/coroutines/CoroutineScope;)V
 	public fun bind (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)V
 }
 
@@ -673,7 +695,6 @@ public abstract interface class com/splendo/kaluga/architecture/observable/Basic
 }
 
 public abstract interface class com/splendo/kaluga/architecture/observable/BasicSubject : com/splendo/kaluga/architecture/observable/BasicObservable, com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public abstract fun bind (Lkotlinx/coroutines/CoroutineScope;)V
 	public abstract fun bind (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)V
 }
 
@@ -682,7 +703,7 @@ public final class com/splendo/kaluga/architecture/observable/DefaultFlowObserva
 	public synthetic fun <init> (Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;Lcom/splendo/kaluga/architecture/observable/ObservationDefault;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
-public abstract interface class com/splendo/kaluga/architecture/observable/DefaultInitialized : com/splendo/kaluga/architecture/observable/Initialized, com/splendo/kaluga/architecture/observable/WithState {
+public abstract interface class com/splendo/kaluga/architecture/observable/DefaultInitialized : com/splendo/kaluga/architecture/observable/Initialized {
 	public abstract fun getDefaultValue ()Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;
 }
 
@@ -764,18 +785,6 @@ public abstract interface class com/splendo/kaluga/architecture/observable/Initi
 public abstract interface class com/splendo/kaluga/architecture/observable/MutableDefaultInitialized : com/splendo/kaluga/architecture/observable/DefaultInitialized, com/splendo/kaluga/architecture/observable/WithMutableState {
 }
 
-public final class com/splendo/kaluga/architecture/observable/MutableFlowSubjectHelper : com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/architecture/observable/Observation;)V
-	public synthetic fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lcom/splendo/kaluga/architecture/observable/Observation;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getContext ()Lkotlin/coroutines/CoroutineContext;
-	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
-	public final fun getFlow ()Lkotlin/jvm/functions/Function0;
-	public final fun getPoster ()Lkotlin/jvm/functions/Function1;
-	public final fun getSetter ()Lkotlin/jvm/functions/Function2;
-	public fun post (Ljava/lang/Object;)V
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public abstract interface class com/splendo/kaluga/architecture/observable/MutableInitialized : com/splendo/kaluga/architecture/observable/Initialized, com/splendo/kaluga/architecture/observable/WithMutableState {
 }
 
@@ -783,7 +792,7 @@ public abstract interface class com/splendo/kaluga/architecture/observable/Mutab
 }
 
 public final class com/splendo/kaluga/architecture/observable/ObservableKt {
-	public static final fun asResult (Lcom/splendo/kaluga/architecture/observable/ObservableOptional;Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;)Lcom/splendo/kaluga/architecture/observable/ObservableOptional;
+	public static final fun observableOf (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SimpleInitializedObservable;
 }
 
 public abstract class com/splendo/kaluga/architecture/observable/ObservableOptional : kotlin/properties/ReadOnlyProperty {
@@ -945,12 +954,6 @@ public final class com/splendo/kaluga/architecture/observable/ReadWritePropertyI
 	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/architecture/observable/ReadWritePropertyObservableHelper : com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public fun <init> (Lkotlin/properties/ReadWriteProperty;Lcom/splendo/kaluga/architecture/observable/Observation;)V
-	public fun post (Ljava/lang/Object;)V
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public final class com/splendo/kaluga/architecture/observable/ReadWritePropertySubjectKt {
 	public static final fun toDefaultSubject (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
 	public static synthetic fun toDefaultSubject$default (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index 4e6150e80..d1a5f036a 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -53,12 +53,14 @@ public final class com/splendo/kaluga/base/RunOnMainKt {
 
 public final class com/splendo/kaluga/base/SingleThreadDispatcherKt {
 	public static final fun singleThreadDispatcher (Ljava/lang/String;)Lkotlinx/coroutines/ExecutorCoroutineDispatcher;
+	public static final fun threadPoolDispatcher-qim9Vi0 (ILjava/lang/String;)Lkotlinx/coroutines/ExecutorCoroutineDispatcher;
 }
 
 public final class com/splendo/kaluga/base/collections/ConcurrentMutableIterator : java/util/Iterator, kotlin/jvm/internal/markers/KMutableIterator {
 	public fun hasNext ()Z
 	public fun next ()Ljava/lang/Object;
 	public fun remove ()V
+	public final fun synchronized (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/base/collections/ConcurrentMutableList : java/util/List, kotlin/jvm/internal/markers/KMutableList {
@@ -108,6 +110,7 @@ public final class com/splendo/kaluga/base/collections/ConcurrentMutableListIter
 	public fun previousIndex ()I
 	public fun remove ()V
 	public fun set (Ljava/lang/Object;)V
+	public final fun synchronized (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/base/collections/ConcurrentMutableListKt {
@@ -173,11 +176,11 @@ public final class com/splendo/kaluga/base/collections/ConcurrentMutableSetKt {
 }
 
 public final class com/splendo/kaluga/base/flow/FlowKt {
-	public static final fun collectImportant (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun collectImportantUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun collectImportantUntilLast$default (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun collectUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun collectUntilLast$default (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun collectImportant (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun collectImportantUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun collectImportantUntilLast$default (Lkotlinx/coroutines/flow/Flow;ZLkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun collectUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun collectUntilLast$default (Lkotlinx/coroutines/flow/Flow;ZLkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 	public static final fun filterOnlyImportant (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
 	public static final fun onCollectionEvent (Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun takeUntilLast (Lkotlinx/coroutines/flow/Flow;Z)Lkotlinx/coroutines/flow/Flow;
@@ -289,10 +292,6 @@ public abstract interface class com/splendo/kaluga/base/state/KalugaState {
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
-public final class com/splendo/kaluga/base/state/KalugaStateKt {
-	public static final fun defaultLazySharedFlow ()Lkotlin/Lazy;
-}
-
 public abstract interface class com/splendo/kaluga/base/state/StateFlowRepo {
 	public abstract fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
 }
@@ -318,6 +317,75 @@ public abstract class com/splendo/kaluga/base/state/StateRepo : kotlinx/coroutin
 	public final fun useState (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
+public abstract interface class com/splendo/kaluga/base/text/BaseDateFormatter {
+	public abstract fun format (Lcom/splendo/kaluga/base/utils/KalugaDate;)Ljava/lang/String;
+	public abstract fun getAmString ()Ljava/lang/String;
+	public abstract fun getEras ()Ljava/util/List;
+	public abstract fun getMonths ()Ljava/util/List;
+	public abstract fun getPattern ()Ljava/lang/String;
+	public abstract fun getPmString ()Ljava/lang/String;
+	public abstract fun getShortMonths ()Ljava/util/List;
+	public abstract fun getShortWeekdays ()Ljava/util/List;
+	public abstract fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public abstract fun getWeekdays ()Ljava/util/List;
+	public abstract fun parse (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public abstract fun setAmString (Ljava/lang/String;)V
+	public abstract fun setEras (Ljava/util/List;)V
+	public abstract fun setMonths (Ljava/util/List;)V
+	public abstract fun setPattern (Ljava/lang/String;)V
+	public abstract fun setPmString (Ljava/lang/String;)V
+	public abstract fun setShortMonths (Ljava/util/List;)V
+	public abstract fun setShortWeekdays (Ljava/util/List;)V
+	public abstract fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public abstract fun setWeekdays (Ljava/util/List;)V
+}
+
+public abstract interface class com/splendo/kaluga/base/text/BaseNumberFormatter {
+	public abstract fun format (Ljava/lang/Number;)Ljava/lang/String;
+	public abstract fun getAlwaysShowsDecimalSeparator ()Z
+	public abstract fun getCurrencyCode ()Ljava/lang/String;
+	public abstract fun getCurrencyDecimalSeparator ()C
+	public abstract fun getCurrencySymbol ()Ljava/lang/String;
+	public abstract fun getDecimalSeparator ()C
+	public abstract fun getExponentSymbol ()Ljava/lang/String;
+	public abstract fun getGroupingSeparator ()C
+	public abstract fun getGroupingSize ()I
+	public abstract fun getInfinitySymbol ()Ljava/lang/String;
+	public abstract fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public abstract fun getMinusSign ()C
+	public abstract fun getMultiplier ()I
+	public abstract fun getNegativePrefix ()Ljava/lang/String;
+	public abstract fun getNegativeSuffix ()Ljava/lang/String;
+	public abstract fun getNotANumberSymbol ()Ljava/lang/String;
+	public abstract fun getPerMillSymbol ()C
+	public abstract fun getPercentSymbol ()C
+	public abstract fun getPositivePrefix ()Ljava/lang/String;
+	public abstract fun getPositiveSuffix ()Ljava/lang/String;
+	public abstract fun getUsesGroupingSeparator ()Z
+	public abstract fun getZeroSymbol ()C
+	public abstract fun parse (Ljava/lang/String;)Ljava/lang/Number;
+	public abstract fun setAlwaysShowsDecimalSeparator (Z)V
+	public abstract fun setCurrencyCode (Ljava/lang/String;)V
+	public abstract fun setCurrencyDecimalSeparator (C)V
+	public abstract fun setCurrencySymbol (Ljava/lang/String;)V
+	public abstract fun setDecimalSeparator (C)V
+	public abstract fun setExponentSymbol (Ljava/lang/String;)V
+	public abstract fun setGroupingSeparator (C)V
+	public abstract fun setGroupingSize (I)V
+	public abstract fun setInfinitySymbol (Ljava/lang/String;)V
+	public abstract fun setMinusSign (C)V
+	public abstract fun setMultiplier (I)V
+	public abstract fun setNegativePrefix (Ljava/lang/String;)V
+	public abstract fun setNegativeSuffix (Ljava/lang/String;)V
+	public abstract fun setNotANumberSymbol (Ljava/lang/String;)V
+	public abstract fun setPerMillSymbol (C)V
+	public abstract fun setPercentSymbol (C)V
+	public abstract fun setPositivePrefix (Ljava/lang/String;)V
+	public abstract fun setPositiveSuffix (Ljava/lang/String;)V
+	public abstract fun setUsesGroupingSeparator (Z)V
+	public abstract fun setZeroSymbol (C)V
+}
+
 public final class com/splendo/kaluga/base/text/DateFormatStyle : java/lang/Enum {
 	public static final field Full Lcom/splendo/kaluga/base/text/DateFormatStyle;
 	public static final field Long Lcom/splendo/kaluga/base/text/DateFormatStyle;
@@ -355,29 +423,29 @@ public abstract interface class com/splendo/kaluga/base/text/Formattable {
 	public abstract fun formatFor (Lcom/splendo/kaluga/base/utils/Locale;Ljava/util/Set;II)Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/base/text/KalugaDateFormatter {
+public final class com/splendo/kaluga/base/text/KalugaDateFormatter : com/splendo/kaluga/base/text/BaseDateFormatter {
 	public static final field Companion Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;
 	public synthetic fun <init> (Ljava/text/SimpleDateFormat;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun format (Lcom/splendo/kaluga/base/utils/KalugaDate;)Ljava/lang/String;
-	public final fun getAmString ()Ljava/lang/String;
-	public final fun getEras ()Ljava/util/List;
-	public final fun getMonths ()Ljava/util/List;
-	public final fun getPattern ()Ljava/lang/String;
-	public final fun getPmString ()Ljava/lang/String;
-	public final fun getShortMonths ()Ljava/util/List;
-	public final fun getShortWeekdays ()Ljava/util/List;
-	public final fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun getWeekdays ()Ljava/util/List;
-	public final fun parse (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun setAmString (Ljava/lang/String;)V
-	public final fun setEras (Ljava/util/List;)V
-	public final fun setMonths (Ljava/util/List;)V
-	public final fun setPattern (Ljava/lang/String;)V
-	public final fun setPmString (Ljava/lang/String;)V
-	public final fun setShortMonths (Ljava/util/List;)V
-	public final fun setShortWeekdays (Ljava/util/List;)V
-	public final fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
-	public final fun setWeekdays (Ljava/util/List;)V
+	public fun format (Lcom/splendo/kaluga/base/utils/KalugaDate;)Ljava/lang/String;
+	public fun getAmString ()Ljava/lang/String;
+	public fun getEras ()Ljava/util/List;
+	public fun getMonths ()Ljava/util/List;
+	public fun getPattern ()Ljava/lang/String;
+	public fun getPmString ()Ljava/lang/String;
+	public fun getShortMonths ()Ljava/util/List;
+	public fun getShortWeekdays ()Ljava/util/List;
+	public fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public fun getWeekdays ()Ljava/util/List;
+	public fun parse (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public fun setAmString (Ljava/lang/String;)V
+	public fun setEras (Ljava/util/List;)V
+	public fun setMonths (Ljava/util/List;)V
+	public fun setPattern (Ljava/lang/String;)V
+	public fun setPmString (Ljava/lang/String;)V
+	public fun setShortMonths (Ljava/util/List;)V
+	public fun setShortWeekdays (Ljava/util/List;)V
+	public fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public fun setWeekdays (Ljava/util/List;)V
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatter$Companion {
@@ -544,53 +612,53 @@ public final class com/splendo/kaluga/base/text/NumberFormatStyle$Scientific : c
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/base/text/NumberFormatter {
+public final class com/splendo/kaluga/base/text/NumberFormatter : com/splendo/kaluga/base/text/BaseNumberFormatter {
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun format (Ljava/lang/Number;)Ljava/lang/String;
-	public final fun getAlwaysShowsDecimalSeparator ()Z
-	public final fun getCurrencyCode ()Ljava/lang/String;
-	public final fun getCurrencyDecimalSeparator ()C
-	public final fun getCurrencySymbol ()Ljava/lang/String;
-	public final fun getDecimalSeparator ()C
-	public final fun getExponentSymbol ()Ljava/lang/String;
-	public final fun getGroupingSeparator ()C
-	public final fun getGroupingSize ()I
-	public final fun getInfinitySymbol ()Ljava/lang/String;
-	public final fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
-	public final fun getMinusSign ()C
-	public final fun getMultiplier ()I
-	public final fun getNegativePrefix ()Ljava/lang/String;
-	public final fun getNegativeSuffix ()Ljava/lang/String;
-	public final fun getNotANumberSymbol ()Ljava/lang/String;
-	public final fun getPerMillSymbol ()C
-	public final fun getPercentSymbol ()C
-	public final fun getPositivePrefix ()Ljava/lang/String;
-	public final fun getPositiveSuffix ()Ljava/lang/String;
-	public final fun getUsesGroupingSeparator ()Z
-	public final fun getZeroSymbol ()C
-	public final fun parse (Ljava/lang/String;)Ljava/lang/Number;
-	public final fun setAlwaysShowsDecimalSeparator (Z)V
-	public final fun setCurrencyCode (Ljava/lang/String;)V
-	public final fun setCurrencyDecimalSeparator (C)V
-	public final fun setCurrencySymbol (Ljava/lang/String;)V
-	public final fun setDecimalSeparator (C)V
-	public final fun setExponentSymbol (Ljava/lang/String;)V
-	public final fun setGroupingSeparator (C)V
-	public final fun setGroupingSize (I)V
-	public final fun setInfinitySymbol (Ljava/lang/String;)V
-	public final fun setMinusSign (C)V
-	public final fun setMultiplier (I)V
-	public final fun setNegativePrefix (Ljava/lang/String;)V
-	public final fun setNegativeSuffix (Ljava/lang/String;)V
-	public final fun setNotANumberSymbol (Ljava/lang/String;)V
-	public final fun setPerMillSymbol (C)V
-	public final fun setPercentSymbol (C)V
-	public final fun setPositivePrefix (Ljava/lang/String;)V
-	public final fun setPositiveSuffix (Ljava/lang/String;)V
-	public final fun setUsesGroupingSeparator (Z)V
-	public final fun setZeroSymbol (C)V
+	public fun format (Ljava/lang/Number;)Ljava/lang/String;
+	public fun getAlwaysShowsDecimalSeparator ()Z
+	public fun getCurrencyCode ()Ljava/lang/String;
+	public fun getCurrencyDecimalSeparator ()C
+	public fun getCurrencySymbol ()Ljava/lang/String;
+	public fun getDecimalSeparator ()C
+	public fun getExponentSymbol ()Ljava/lang/String;
+	public fun getGroupingSeparator ()C
+	public fun getGroupingSize ()I
+	public fun getInfinitySymbol ()Ljava/lang/String;
+	public fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public fun getMinusSign ()C
+	public fun getMultiplier ()I
+	public fun getNegativePrefix ()Ljava/lang/String;
+	public fun getNegativeSuffix ()Ljava/lang/String;
+	public fun getNotANumberSymbol ()Ljava/lang/String;
+	public fun getPerMillSymbol ()C
+	public fun getPercentSymbol ()C
+	public fun getPositivePrefix ()Ljava/lang/String;
+	public fun getPositiveSuffix ()Ljava/lang/String;
+	public fun getUsesGroupingSeparator ()Z
+	public fun getZeroSymbol ()C
+	public fun parse (Ljava/lang/String;)Ljava/lang/Number;
+	public fun setAlwaysShowsDecimalSeparator (Z)V
+	public fun setCurrencyCode (Ljava/lang/String;)V
+	public fun setCurrencyDecimalSeparator (C)V
+	public fun setCurrencySymbol (Ljava/lang/String;)V
+	public fun setDecimalSeparator (C)V
+	public fun setExponentSymbol (Ljava/lang/String;)V
+	public fun setGroupingSeparator (C)V
+	public fun setGroupingSize (I)V
+	public fun setInfinitySymbol (Ljava/lang/String;)V
+	public fun setMinusSign (C)V
+	public fun setMultiplier (I)V
+	public fun setNegativePrefix (Ljava/lang/String;)V
+	public fun setNegativeSuffix (Ljava/lang/String;)V
+	public fun setNotANumberSymbol (Ljava/lang/String;)V
+	public fun setPerMillSymbol (C)V
+	public fun setPercentSymbol (C)V
+	public fun setPositivePrefix (Ljava/lang/String;)V
+	public fun setPositiveSuffix (Ljava/lang/String;)V
+	public fun setUsesGroupingSeparator (Z)V
+	public fun setZeroSymbol (C)V
 }
 
 public final class com/splendo/kaluga/base/text/RoundingMode : java/lang/Enum {
@@ -782,6 +850,25 @@ public final class com/splendo/kaluga/base/utils/ApplyIfKt {
 	public static final fun applyIf (Ljava/lang/Object;ZLkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
+public abstract class com/splendo/kaluga/base/utils/BaseLocale {
+	public fun <init> ()V
+	public abstract fun countryName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun getAlternateQuotationEnd ()Ljava/lang/String;
+	public abstract fun getAlternateQuotationStart ()Ljava/lang/String;
+	public abstract fun getCountryCode ()Ljava/lang/String;
+	public abstract fun getLanguageCode ()Ljava/lang/String;
+	public abstract fun getQuotationEnd ()Ljava/lang/String;
+	public abstract fun getQuotationStart ()Ljava/lang/String;
+	public abstract fun getScriptCode ()Ljava/lang/String;
+	public abstract fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
+	public abstract fun getVariantCode ()Ljava/lang/String;
+	public abstract fun languageName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun name (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun scriptName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun toString ()Ljava/lang/String;
+	public abstract fun variantName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+}
+
 public abstract class com/splendo/kaluga/base/utils/BaseTimeZone {
 	public fun <init> ()V
 	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
@@ -819,7 +906,6 @@ public final class com/splendo/kaluga/base/utils/DecimalAndroid {
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/BigDecimal;
 	public static synthetic fun div$default (Ljava/math/BigDecimal;Ljava/math/BigDecimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Ljava/math/BigDecimal;
-	public static final fun getAndroid (Lcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/RoundingMode;
 	public static final fun minus (Ljava/math/BigDecimal;Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public static final fun minus (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;
 	public static final fun minus (Ljava/math/BigDecimal;Ljava/math/BigDecimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/BigDecimal;
@@ -857,9 +943,9 @@ public final class com/splendo/kaluga/base/utils/DecimalKt {
 	public static final fun toDecimalList ([I)Ljava/util/List;
 	public static final fun toDecimalList ([J)Ljava/util/List;
 	public static final fun toDecimalList ([S)Ljava/util/List;
-	public static final fun toDoubleArray (Ljava/util/List;)[D
-	public static final fun toIntArray (Ljava/util/List;)[I
-	public static final fun toStringList (Ljava/util/List;)Ljava/util/List;
+	public static final fun toDoubleArray (Ljava/util/Collection;)[D
+	public static final fun toIntArray (Ljava/util/Collection;)[I
+	public static final fun toStringList (Ljava/util/Collection;)Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo/kaluga/base/utils/KalugaDate {
@@ -988,23 +1074,27 @@ public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
 	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
-public final class com/splendo/kaluga/base/utils/Locale {
+public final class com/splendo/kaluga/base/utils/Locale : com/splendo/kaluga/base/utils/BaseLocale {
 	public static final field Companion Lcom/splendo/kaluga/base/utils/Locale$Companion;
-	public final fun countryName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public final fun getAlternateQuotationEnd ()Ljava/lang/String;
-	public final fun getAlternateQuotationStart ()Ljava/lang/String;
-	public final fun getCountryCode ()Ljava/lang/String;
-	public final fun getLanguageCode ()Ljava/lang/String;
-	public final fun getLocale ()Ljava/util/Locale;
-	public final fun getQuotationEnd ()Ljava/lang/String;
-	public final fun getQuotationStart ()Ljava/lang/String;
-	public final fun getScriptCode ()Ljava/lang/String;
-	public final fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
-	public final fun getVariantCode ()Ljava/lang/String;
-	public final fun languageName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public final fun name (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public final fun scriptName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public final fun variantName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public final fun copy (Ljava/util/Locale;)Lcom/splendo/kaluga/base/utils/Locale;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/base/utils/Locale;Ljava/util/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Locale;
+	public fun countryName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getAlternateQuotationEnd ()Ljava/lang/String;
+	public fun getAlternateQuotationStart ()Ljava/lang/String;
+	public fun getCountryCode ()Ljava/lang/String;
+	public fun getLanguageCode ()Ljava/lang/String;
+	public fun getQuotationEnd ()Ljava/lang/String;
+	public fun getQuotationStart ()Ljava/lang/String;
+	public fun getScriptCode ()Ljava/lang/String;
+	public fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
+	public fun getVariantCode ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun languageName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun name (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun scriptName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun toString ()Ljava/lang/String;
+	public fun variantName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/utils/Locale$Companion {
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index 5c00bc5aa..ad5108a64 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -40,12 +40,14 @@ public final class com/splendo/kaluga/base/RunOnMainKt {
 
 public final class com/splendo/kaluga/base/SingleThreadDispatcherKt {
 	public static final fun singleThreadDispatcher (Ljava/lang/String;)Lkotlinx/coroutines/ExecutorCoroutineDispatcher;
+	public static final fun threadPoolDispatcher-qim9Vi0 (ILjava/lang/String;)Lkotlinx/coroutines/ExecutorCoroutineDispatcher;
 }
 
 public final class com/splendo/kaluga/base/collections/ConcurrentMutableIterator : java/util/Iterator, kotlin/jvm/internal/markers/KMutableIterator {
 	public fun hasNext ()Z
 	public fun next ()Ljava/lang/Object;
 	public fun remove ()V
+	public final fun synchronized (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/base/collections/ConcurrentMutableList : java/util/List, kotlin/jvm/internal/markers/KMutableList {
@@ -95,6 +97,7 @@ public final class com/splendo/kaluga/base/collections/ConcurrentMutableListIter
 	public fun previousIndex ()I
 	public fun remove ()V
 	public fun set (Ljava/lang/Object;)V
+	public final fun synchronized (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/base/collections/ConcurrentMutableListKt {
@@ -160,11 +163,11 @@ public final class com/splendo/kaluga/base/collections/ConcurrentMutableSetKt {
 }
 
 public final class com/splendo/kaluga/base/flow/FlowKt {
-	public static final fun collectImportant (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun collectImportantUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun collectImportantUntilLast$default (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun collectUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun collectUntilLast$default (Lkotlinx/coroutines/flow/Flow;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun collectImportant (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun collectImportantUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun collectImportantUntilLast$default (Lkotlinx/coroutines/flow/Flow;ZLkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun collectUntilLast (Lkotlinx/coroutines/flow/Flow;ZLkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun collectUntilLast$default (Lkotlinx/coroutines/flow/Flow;ZLkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 	public static final fun filterOnlyImportant (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
 	public static final fun onCollectionEvent (Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun takeUntilLast (Lkotlinx/coroutines/flow/Flow;Z)Lkotlinx/coroutines/flow/Flow;
@@ -298,10 +301,6 @@ public final class com/splendo/kaluga/base/state/KalugaState$DefaultImpls {
 	public static fun remain (Lcom/splendo/kaluga/base/state/KalugaState;)Lkotlin/jvm/functions/Function1;
 }
 
-public final class com/splendo/kaluga/base/state/KalugaStateKt {
-	public static final fun defaultLazySharedFlow ()Lkotlin/Lazy;
-}
-
 public abstract interface class com/splendo/kaluga/base/state/StateFlowRepo {
 	public abstract fun getStateFlow ()Lkotlinx/coroutines/flow/StateFlow;
 }
@@ -327,6 +326,75 @@ public abstract class com/splendo/kaluga/base/state/StateRepo : kotlinx/coroutin
 	public final fun useState (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
+public abstract interface class com/splendo/kaluga/base/text/BaseDateFormatter {
+	public abstract fun format (Lcom/splendo/kaluga/base/utils/KalugaDate;)Ljava/lang/String;
+	public abstract fun getAmString ()Ljava/lang/String;
+	public abstract fun getEras ()Ljava/util/List;
+	public abstract fun getMonths ()Ljava/util/List;
+	public abstract fun getPattern ()Ljava/lang/String;
+	public abstract fun getPmString ()Ljava/lang/String;
+	public abstract fun getShortMonths ()Ljava/util/List;
+	public abstract fun getShortWeekdays ()Ljava/util/List;
+	public abstract fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public abstract fun getWeekdays ()Ljava/util/List;
+	public abstract fun parse (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public abstract fun setAmString (Ljava/lang/String;)V
+	public abstract fun setEras (Ljava/util/List;)V
+	public abstract fun setMonths (Ljava/util/List;)V
+	public abstract fun setPattern (Ljava/lang/String;)V
+	public abstract fun setPmString (Ljava/lang/String;)V
+	public abstract fun setShortMonths (Ljava/util/List;)V
+	public abstract fun setShortWeekdays (Ljava/util/List;)V
+	public abstract fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public abstract fun setWeekdays (Ljava/util/List;)V
+}
+
+public abstract interface class com/splendo/kaluga/base/text/BaseNumberFormatter {
+	public abstract fun format (Ljava/lang/Number;)Ljava/lang/String;
+	public abstract fun getAlwaysShowsDecimalSeparator ()Z
+	public abstract fun getCurrencyCode ()Ljava/lang/String;
+	public abstract fun getCurrencyDecimalSeparator ()C
+	public abstract fun getCurrencySymbol ()Ljava/lang/String;
+	public abstract fun getDecimalSeparator ()C
+	public abstract fun getExponentSymbol ()Ljava/lang/String;
+	public abstract fun getGroupingSeparator ()C
+	public abstract fun getGroupingSize ()I
+	public abstract fun getInfinitySymbol ()Ljava/lang/String;
+	public abstract fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public abstract fun getMinusSign ()C
+	public abstract fun getMultiplier ()I
+	public abstract fun getNegativePrefix ()Ljava/lang/String;
+	public abstract fun getNegativeSuffix ()Ljava/lang/String;
+	public abstract fun getNotANumberSymbol ()Ljava/lang/String;
+	public abstract fun getPerMillSymbol ()C
+	public abstract fun getPercentSymbol ()C
+	public abstract fun getPositivePrefix ()Ljava/lang/String;
+	public abstract fun getPositiveSuffix ()Ljava/lang/String;
+	public abstract fun getUsesGroupingSeparator ()Z
+	public abstract fun getZeroSymbol ()C
+	public abstract fun parse (Ljava/lang/String;)Ljava/lang/Number;
+	public abstract fun setAlwaysShowsDecimalSeparator (Z)V
+	public abstract fun setCurrencyCode (Ljava/lang/String;)V
+	public abstract fun setCurrencyDecimalSeparator (C)V
+	public abstract fun setCurrencySymbol (Ljava/lang/String;)V
+	public abstract fun setDecimalSeparator (C)V
+	public abstract fun setExponentSymbol (Ljava/lang/String;)V
+	public abstract fun setGroupingSeparator (C)V
+	public abstract fun setGroupingSize (I)V
+	public abstract fun setInfinitySymbol (Ljava/lang/String;)V
+	public abstract fun setMinusSign (C)V
+	public abstract fun setMultiplier (I)V
+	public abstract fun setNegativePrefix (Ljava/lang/String;)V
+	public abstract fun setNegativeSuffix (Ljava/lang/String;)V
+	public abstract fun setNotANumberSymbol (Ljava/lang/String;)V
+	public abstract fun setPerMillSymbol (C)V
+	public abstract fun setPercentSymbol (C)V
+	public abstract fun setPositivePrefix (Ljava/lang/String;)V
+	public abstract fun setPositiveSuffix (Ljava/lang/String;)V
+	public abstract fun setUsesGroupingSeparator (Z)V
+	public abstract fun setZeroSymbol (C)V
+}
+
 public final class com/splendo/kaluga/base/text/DateFormatStyle : java/lang/Enum {
 	public static final field Full Lcom/splendo/kaluga/base/text/DateFormatStyle;
 	public static final field Long Lcom/splendo/kaluga/base/text/DateFormatStyle;
@@ -364,33 +432,32 @@ public abstract interface class com/splendo/kaluga/base/text/Formattable {
 	public abstract fun formatFor (Lcom/splendo/kaluga/base/utils/Locale;Ljava/util/Set;II)Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/base/text/KalugaDateFormatter {
+public final class com/splendo/kaluga/base/text/KalugaDateFormatter : com/splendo/kaluga/base/text/BaseDateFormatter {
 	public static final field Companion Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;
 	public synthetic fun <init> (Ljava/text/SimpleDateFormat;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun format (Lcom/splendo/kaluga/base/utils/KalugaDate;)Ljava/lang/String;
-	public final fun getAmString ()Ljava/lang/String;
-	public final fun getEras ()Ljava/util/List;
-	public final fun getMonths ()Ljava/util/List;
-	public final fun getPattern ()Ljava/lang/String;
-	public final fun getPmString ()Ljava/lang/String;
-	public final fun getShortMonths ()Ljava/util/List;
-	public final fun getShortWeekdays ()Ljava/util/List;
-	public final fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun getWeekdays ()Ljava/util/List;
-	public final fun parse (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun setAmString (Ljava/lang/String;)V
-	public final fun setEras (Ljava/util/List;)V
-	public final fun setMonths (Ljava/util/List;)V
-	public final fun setPattern (Ljava/lang/String;)V
-	public final fun setPmString (Ljava/lang/String;)V
-	public final fun setShortMonths (Ljava/util/List;)V
-	public final fun setShortWeekdays (Ljava/util/List;)V
-	public final fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
-	public final fun setWeekdays (Ljava/util/List;)V
+	public fun format (Lcom/splendo/kaluga/base/utils/KalugaDate;)Ljava/lang/String;
+	public fun getAmString ()Ljava/lang/String;
+	public fun getEras ()Ljava/util/List;
+	public fun getMonths ()Ljava/util/List;
+	public fun getPattern ()Ljava/lang/String;
+	public fun getPmString ()Ljava/lang/String;
+	public fun getShortMonths ()Ljava/util/List;
+	public fun getShortWeekdays ()Ljava/util/List;
+	public fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public fun getWeekdays ()Ljava/util/List;
+	public fun parse (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public fun setAmString (Ljava/lang/String;)V
+	public fun setEras (Ljava/util/List;)V
+	public fun setMonths (Ljava/util/List;)V
+	public fun setPattern (Ljava/lang/String;)V
+	public fun setPmString (Ljava/lang/String;)V
+	public fun setShortMonths (Ljava/util/List;)V
+	public fun setShortWeekdays (Ljava/util/List;)V
+	public fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public fun setWeekdays (Ljava/util/List;)V
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatter$Companion {
-	public final fun createDateFormatter (Ljava/text/SimpleDateFormat;Lcom/splendo/kaluga/base/utils/TimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 	public final fun dateFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 	public final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
@@ -554,53 +621,53 @@ public final class com/splendo/kaluga/base/text/NumberFormatStyle$Scientific : c
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/base/text/NumberFormatter {
+public final class com/splendo/kaluga/base/text/NumberFormatter : com/splendo/kaluga/base/text/BaseNumberFormatter {
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun format (Ljava/lang/Number;)Ljava/lang/String;
-	public final fun getAlwaysShowsDecimalSeparator ()Z
-	public final fun getCurrencyCode ()Ljava/lang/String;
-	public final fun getCurrencyDecimalSeparator ()C
-	public final fun getCurrencySymbol ()Ljava/lang/String;
-	public final fun getDecimalSeparator ()C
-	public final fun getExponentSymbol ()Ljava/lang/String;
-	public final fun getGroupingSeparator ()C
-	public final fun getGroupingSize ()I
-	public final fun getInfinitySymbol ()Ljava/lang/String;
-	public final fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
-	public final fun getMinusSign ()C
-	public final fun getMultiplier ()I
-	public final fun getNegativePrefix ()Ljava/lang/String;
-	public final fun getNegativeSuffix ()Ljava/lang/String;
-	public final fun getNotANumberSymbol ()Ljava/lang/String;
-	public final fun getPerMillSymbol ()C
-	public final fun getPercentSymbol ()C
-	public final fun getPositivePrefix ()Ljava/lang/String;
-	public final fun getPositiveSuffix ()Ljava/lang/String;
-	public final fun getUsesGroupingSeparator ()Z
-	public final fun getZeroSymbol ()C
-	public final fun parse (Ljava/lang/String;)Ljava/lang/Number;
-	public final fun setAlwaysShowsDecimalSeparator (Z)V
-	public final fun setCurrencyCode (Ljava/lang/String;)V
-	public final fun setCurrencyDecimalSeparator (C)V
-	public final fun setCurrencySymbol (Ljava/lang/String;)V
-	public final fun setDecimalSeparator (C)V
-	public final fun setExponentSymbol (Ljava/lang/String;)V
-	public final fun setGroupingSeparator (C)V
-	public final fun setGroupingSize (I)V
-	public final fun setInfinitySymbol (Ljava/lang/String;)V
-	public final fun setMinusSign (C)V
-	public final fun setMultiplier (I)V
-	public final fun setNegativePrefix (Ljava/lang/String;)V
-	public final fun setNegativeSuffix (Ljava/lang/String;)V
-	public final fun setNotANumberSymbol (Ljava/lang/String;)V
-	public final fun setPerMillSymbol (C)V
-	public final fun setPercentSymbol (C)V
-	public final fun setPositivePrefix (Ljava/lang/String;)V
-	public final fun setPositiveSuffix (Ljava/lang/String;)V
-	public final fun setUsesGroupingSeparator (Z)V
-	public final fun setZeroSymbol (C)V
+	public fun format (Ljava/lang/Number;)Ljava/lang/String;
+	public fun getAlwaysShowsDecimalSeparator ()Z
+	public fun getCurrencyCode ()Ljava/lang/String;
+	public fun getCurrencyDecimalSeparator ()C
+	public fun getCurrencySymbol ()Ljava/lang/String;
+	public fun getDecimalSeparator ()C
+	public fun getExponentSymbol ()Ljava/lang/String;
+	public fun getGroupingSeparator ()C
+	public fun getGroupingSize ()I
+	public fun getInfinitySymbol ()Ljava/lang/String;
+	public fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public fun getMinusSign ()C
+	public fun getMultiplier ()I
+	public fun getNegativePrefix ()Ljava/lang/String;
+	public fun getNegativeSuffix ()Ljava/lang/String;
+	public fun getNotANumberSymbol ()Ljava/lang/String;
+	public fun getPerMillSymbol ()C
+	public fun getPercentSymbol ()C
+	public fun getPositivePrefix ()Ljava/lang/String;
+	public fun getPositiveSuffix ()Ljava/lang/String;
+	public fun getUsesGroupingSeparator ()Z
+	public fun getZeroSymbol ()C
+	public fun parse (Ljava/lang/String;)Ljava/lang/Number;
+	public fun setAlwaysShowsDecimalSeparator (Z)V
+	public fun setCurrencyCode (Ljava/lang/String;)V
+	public fun setCurrencyDecimalSeparator (C)V
+	public fun setCurrencySymbol (Ljava/lang/String;)V
+	public fun setDecimalSeparator (C)V
+	public fun setExponentSymbol (Ljava/lang/String;)V
+	public fun setGroupingSeparator (C)V
+	public fun setGroupingSize (I)V
+	public fun setInfinitySymbol (Ljava/lang/String;)V
+	public fun setMinusSign (C)V
+	public fun setMultiplier (I)V
+	public fun setNegativePrefix (Ljava/lang/String;)V
+	public fun setNegativeSuffix (Ljava/lang/String;)V
+	public fun setNotANumberSymbol (Ljava/lang/String;)V
+	public fun setPerMillSymbol (C)V
+	public fun setPercentSymbol (C)V
+	public fun setPositivePrefix (Ljava/lang/String;)V
+	public fun setPositiveSuffix (Ljava/lang/String;)V
+	public fun setUsesGroupingSeparator (Z)V
+	public fun setZeroSymbol (C)V
 }
 
 public final class com/splendo/kaluga/base/text/RoundingMode : java/lang/Enum {
@@ -792,6 +859,25 @@ public final class com/splendo/kaluga/base/utils/ApplyIfKt {
 	public static final fun applyIf (Ljava/lang/Object;ZLkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
+public abstract class com/splendo/kaluga/base/utils/BaseLocale {
+	public fun <init> ()V
+	public abstract fun countryName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun getAlternateQuotationEnd ()Ljava/lang/String;
+	public abstract fun getAlternateQuotationStart ()Ljava/lang/String;
+	public abstract fun getCountryCode ()Ljava/lang/String;
+	public abstract fun getLanguageCode ()Ljava/lang/String;
+	public abstract fun getQuotationEnd ()Ljava/lang/String;
+	public abstract fun getQuotationStart ()Ljava/lang/String;
+	public abstract fun getScriptCode ()Ljava/lang/String;
+	public abstract fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
+	public abstract fun getVariantCode ()Ljava/lang/String;
+	public abstract fun languageName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun name (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun scriptName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun toString ()Ljava/lang/String;
+	public abstract fun variantName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+}
+
 public abstract class com/splendo/kaluga/base/utils/BaseTimeZone {
 	public fun <init> ()V
 	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
@@ -833,7 +919,6 @@ public final class com/splendo/kaluga/base/utils/DecimalJVM {
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/BigDecimal;
 	public static synthetic fun div$default (Ljava/math/BigDecimal;Ljava/math/BigDecimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Ljava/math/BigDecimal;
-	public static final fun getJava (Lcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/RoundingMode;
 	public static final fun minus (Ljava/math/BigDecimal;Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public static final fun minus (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;
 	public static final fun minus (Ljava/math/BigDecimal;Ljava/math/BigDecimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/BigDecimal;
@@ -867,9 +952,9 @@ public final class com/splendo/kaluga/base/utils/DecimalKt {
 	public static final fun toDecimalList ([I)Ljava/util/List;
 	public static final fun toDecimalList ([J)Ljava/util/List;
 	public static final fun toDecimalList ([S)Ljava/util/List;
-	public static final fun toDoubleArray (Ljava/util/List;)[D
-	public static final fun toIntArray (Ljava/util/List;)[I
-	public static final fun toStringList (Ljava/util/List;)Ljava/util/List;
+	public static final fun toDoubleArray (Ljava/util/Collection;)[D
+	public static final fun toIntArray (Ljava/util/Collection;)[I
+	public static final fun toStringList (Ljava/util/Collection;)Ljava/util/List;
 }
 
 public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo/kaluga/base/utils/KalugaDate {
@@ -998,23 +1083,27 @@ public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
 	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
-public final class com/splendo/kaluga/base/utils/Locale {
+public final class com/splendo/kaluga/base/utils/Locale : com/splendo/kaluga/base/utils/BaseLocale {
 	public static final field Companion Lcom/splendo/kaluga/base/utils/Locale$Companion;
-	public final fun countryName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public final fun getAlternateQuotationEnd ()Ljava/lang/String;
-	public final fun getAlternateQuotationStart ()Ljava/lang/String;
-	public final fun getCountryCode ()Ljava/lang/String;
-	public final fun getLanguageCode ()Ljava/lang/String;
-	public final fun getLocale ()Ljava/util/Locale;
-	public final fun getQuotationEnd ()Ljava/lang/String;
-	public final fun getQuotationStart ()Ljava/lang/String;
-	public final fun getScriptCode ()Ljava/lang/String;
-	public final fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
-	public final fun getVariantCode ()Ljava/lang/String;
-	public final fun languageName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public final fun name (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public final fun scriptName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public final fun variantName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public final fun copy (Ljava/util/Locale;)Lcom/splendo/kaluga/base/utils/Locale;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/base/utils/Locale;Ljava/util/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Locale;
+	public fun countryName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getAlternateQuotationEnd ()Ljava/lang/String;
+	public fun getAlternateQuotationStart ()Ljava/lang/String;
+	public fun getCountryCode ()Ljava/lang/String;
+	public fun getLanguageCode ()Ljava/lang/String;
+	public fun getQuotationEnd ()Ljava/lang/String;
+	public fun getQuotationStart ()Ljava/lang/String;
+	public fun getScriptCode ()Ljava/lang/String;
+	public fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
+	public fun getVariantCode ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun languageName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun name (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun scriptName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun toString ()Ljava/lang/String;
+	public fun variantName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/utils/Locale$Companion {
diff --git a/date-time-picker/api/androidLib/date-time-picker.api b/date-time-picker/api/androidLib/date-time-picker.api
index abff7f854..93153b472 100644
--- a/date-time-picker/api/androidLib/date-time-picker.api
+++ b/date-time-picker/api/androidLib/date-time-picker.api
@@ -54,8 +54,15 @@ public final class com/splendo/kaluga/datetimepicker/DateTimePicker$Type$DateTyp
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun component2 ()Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun copy (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type$DateType;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type$DateType;Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type$DateType;
+	public fun equals (Ljava/lang/Object;)Z
 	public final fun getEarliestDate ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public final fun getLatestDate ()Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/datetimepicker/DateTimePicker$Type$TimeType : com/splendo/kaluga/datetimepicker/DateTimePicker$Type {
@@ -93,8 +100,3 @@ public final class com/splendo/kaluga/datetimepicker/DateTimePickerPresenter$Bui
 	public fun unsubscribe ()V
 }
 
-public final class com/splendo/kaluga/datetimepicker/DateTimePickerPresenterKt {
-	public static final fun datePickerPresenterBuilder (Landroidx/appcompat/app/AppCompatActivity;I)Lcom/splendo/kaluga/datetimepicker/DateTimePickerPresenter$Builder;
-	public static synthetic fun datePickerPresenterBuilder$default (Landroidx/appcompat/app/AppCompatActivity;IILjava/lang/Object;)Lcom/splendo/kaluga/datetimepicker/DateTimePickerPresenter$Builder;
-}
-
diff --git a/date-time-picker/api/jvm/date-time-picker.api b/date-time-picker/api/jvm/date-time-picker.api
index 5d434cacf..aef3a90a8 100644
--- a/date-time-picker/api/jvm/date-time-picker.api
+++ b/date-time-picker/api/jvm/date-time-picker.api
@@ -54,8 +54,15 @@ public final class com/splendo/kaluga/datetimepicker/DateTimePicker$Type$DateTyp
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun component2 ()Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun copy (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type$DateType;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type$DateType;Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type$DateType;
+	public fun equals (Ljava/lang/Object;)Z
 	public final fun getEarliestDate ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public final fun getLatestDate ()Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/datetimepicker/DateTimePicker$Type$TimeType : com/splendo/kaluga/datetimepicker/DateTimePicker$Type {
diff --git a/hud/api/androidLib/hud.api b/hud/api/androidLib/hud.api
index d9b642e9d..6702ff0fa 100644
--- a/hud/api/androidLib/hud.api
+++ b/hud/api/androidLib/hud.api
@@ -1,7 +1,3 @@
-public final class com/splendo/kaluga/hud/AndroidHUD {
-	public static final fun hudBuilder (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/hud/HUD$Builder;
-}
-
 public abstract class com/splendo/kaluga/hud/BaseHUD : kotlinx/coroutines/CoroutineScope {
 	public fun <init> (Lkotlinx/coroutines/CoroutineScope;)V
 	public abstract fun dismiss (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/keyboard/api/androidLib/keyboard.api b/keyboard/api/androidLib/keyboard.api
index da916a997..dcbd65ce5 100644
--- a/keyboard/api/androidLib/keyboard.api
+++ b/keyboard/api/androidLib/keyboard.api
@@ -10,10 +10,6 @@ public abstract interface class com/splendo/kaluga/keyboard/BaseKeyboardManager$
 public abstract interface class com/splendo/kaluga/keyboard/FocusHandler {
 }
 
-public final class com/splendo/kaluga/keyboard/KeyboardManagerKt {
-	public static final fun keyboardManagerBuilder (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/keyboard/ViewKeyboardManager$Builder;
-}
-
 public final class com/splendo/kaluga/keyboard/ViewFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
 	public fun <init> (I)V
 	public final fun requestFocus (Landroid/app/Activity;)V
diff --git a/review/api/androidLib/review.api b/review/api/androidLib/review.api
index 062bd20d5..ce84dca58 100644
--- a/review/api/androidLib/review.api
+++ b/review/api/androidLib/review.api
@@ -21,7 +21,3 @@ public final class com/splendo/kaluga/review/ReviewManager$Type : java/lang/Enum
 	public static fun values ()[Lcom/splendo/kaluga/review/ReviewManager$Type;
 }
 
-public final class com/splendo/kaluga/review/ReviewManagerKt {
-	public static final fun reviewManager (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/review/ReviewManager$Builder;
-}
-
diff --git a/test-utils-alerts/api/androidLib/test-utils-alerts.api b/test-utils-alerts/api/androidLib/test-utils-alerts.api
index 711352b67..41f2d3471 100644
--- a/test-utils-alerts/api/androidLib/test-utils-alerts.api
+++ b/test-utils-alerts/api/androidLib/test-utils-alerts.api
@@ -1,3 +1,7 @@
+public final class com/splendo/kaluga/test/alerts/AlertPresenterBuilderKt {
+	public static final fun alertPresenterBuilder (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/alerts/AlertPresenter$Builder;
+}
+
 public final class com/splendo/kaluga/test/alerts/BuildConfig {
 	public static final field BUILD_TYPE Ljava/lang/String;
 	public static final field DEBUG Z
diff --git a/test-utils-architecture/api/androidLib/test-utils-architecture.api b/test-utils-architecture/api/androidLib/test-utils-architecture.api
index 50fb6ba40..bde2d303a 100644
--- a/test-utils-architecture/api/androidLib/test-utils-architecture.api
+++ b/test-utils-architecture/api/androidLib/test-utils-architecture.api
@@ -19,6 +19,14 @@ public final class com/splendo/kaluga/test/architecture/BuildConfig {
 	public fun <init> ()V
 }
 
+public final class com/splendo/kaluga/test/architecture/GetOrPutAndRemoveOnDestroyFromCacheKt {
+	public static final fun getLifecycleAwareActivityCache ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
+}
+
+public final class com/splendo/kaluga/test/architecture/LifecycleManagerObserverKt {
+	public static final fun lifecycleManagerObserver (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/architecture/lifecycle/LifecycleManagerObserver;
+}
+
 public final class com/splendo/kaluga/test/architecture/MockActivityLifecycleSubscriber : com/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable {
 	public fun <init> ()V
 	public fun getManager ()Lcom/splendo/kaluga/architecture/lifecycle/ActivityLifecycleSubscribable$LifecycleManager;
diff --git a/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api b/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
new file mode 100644
index 000000000..f20b595a8
--- /dev/null
+++ b/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
@@ -0,0 +1,35 @@
+public final class com/splendo/kaluga/test/datetimepicker/BuildConfig {
+	public static final field BUILD_TYPE Ljava/lang/String;
+	public static final field DEBUG Z
+	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
+	public fun <init> ()V
+}
+
+public final class com/splendo/kaluga/test/datetimepicker/DatePickerPresenterBuilderKt {
+	public static final fun datePickerPresenterBuilder (Landroidx/appcompat/app/AppCompatActivity;I)Lcom/splendo/kaluga/datetimepicker/DateTimePickerPresenter$Builder;
+	public static synthetic fun datePickerPresenterBuilder$default (Landroidx/appcompat/app/AppCompatActivity;IILjava/lang/Object;)Lcom/splendo/kaluga/datetimepicker/DateTimePickerPresenter$Builder;
+}
+
+public final class com/splendo/kaluga/test/datetimepicker/MockDateTimePickerPresenter : com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter {
+	public fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Z)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun closeWithDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)V
+	public fun dismiss (Z)V
+	public final fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	public final fun getDismissMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getShowAsyncMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun isPresented ()Z
+	public final fun setPresented (Z)V
+	public fun showAsync (ZLkotlin/jvm/functions/Function1;)V
+}
+
+public final class com/splendo/kaluga/test/datetimepicker/MockDateTimePickerPresenter$Builder : com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder {
+	public fun <init> ()V
+	public fun <init> (Z)V
+	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
+	public fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/datetimepicker/MockDateTimePickerPresenter;
+	public final fun getBuiltDateTimePickerPresenters ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+}
+
diff --git a/test-utils-date-time-picker/api/androidLib/test-utils-keyboard.api b/test-utils-date-time-picker/api/androidLib/test-utils-keyboard.api
deleted file mode 100644
index c771c929a..000000000
--- a/test-utils-date-time-picker/api/androidLib/test-utils-keyboard.api
+++ /dev/null
@@ -1,36 +0,0 @@
-public final class com/splendo/kaluga/test/keyboard/BuildConfig {
-	public static final field BUILD_TYPE Ljava/lang/String;
-	public static final field DEBUG Z
-	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
-	public fun <init> ()V
-}
-
-public final class com/splendo/kaluga/test/keyboard/MockFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
-	public fun <init> ()V
-	public final fun giveFocus ()V
-	public final fun isFocused ()Z
-	public final fun removeFocus ()V
-}
-
-public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager : com/splendo/kaluga/keyboard/BaseKeyboardManager {
-	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getFocusHandler ()Lcom/splendo/kaluga/keyboard/FocusHandler;
-	public final fun getHideMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getShowMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public fun hide ()V
-	public final fun setFocusHandler (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
-	public fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
-}
-
-public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager$Builder : com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder {
-	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
-	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/keyboard/MockKeyboardManager;
-	public final fun getBuiltKeyboardManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
-	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-}
-
diff --git a/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api b/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
new file mode 100644
index 000000000..9c55470f6
--- /dev/null
+++ b/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
@@ -0,0 +1,23 @@
+public final class com/splendo/kaluga/test/datetimepicker/MockDateTimePickerPresenter : com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter {
+	public fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Z)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun closeWithDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)V
+	public fun dismiss (Z)V
+	public final fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	public final fun getDismissMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getShowAsyncMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun isPresented ()Z
+	public final fun setPresented (Z)V
+	public fun showAsync (ZLkotlin/jvm/functions/Function1;)V
+}
+
+public final class com/splendo/kaluga/test/datetimepicker/MockDateTimePickerPresenter$Builder : com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter$Builder {
+	public fun <init> ()V
+	public fun <init> (Z)V
+	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;
+	public fun create (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/datetimepicker/MockDateTimePickerPresenter;
+	public final fun getBuiltDateTimePickerPresenters ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
+	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+}
+
diff --git a/test-utils-date-time-picker/api/jvm/test-utils-keyboard.api b/test-utils-date-time-picker/api/jvm/test-utils-keyboard.api
deleted file mode 100644
index cd4a15032..000000000
--- a/test-utils-date-time-picker/api/jvm/test-utils-keyboard.api
+++ /dev/null
@@ -1,29 +0,0 @@
-public final class com/splendo/kaluga/test/keyboard/MockFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
-	public fun <init> ()V
-	public final fun giveFocus ()V
-	public final fun isFocused ()Z
-	public final fun removeFocus ()V
-}
-
-public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager : com/splendo/kaluga/keyboard/BaseKeyboardManager {
-	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getFocusHandler ()Lcom/splendo/kaluga/keyboard/FocusHandler;
-	public final fun getHideMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getShowMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public fun hide ()V
-	public final fun setFocusHandler (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
-	public fun show (Lcom/splendo/kaluga/keyboard/FocusHandler;)V
-}
-
-public final class com/splendo/kaluga/test/keyboard/MockKeyboardManager$Builder : com/splendo/kaluga/keyboard/BaseKeyboardManager$Builder {
-	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/keyboard/BaseKeyboardManager;
-	public fun create (Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/test/keyboard/MockKeyboardManager;
-	public final fun getBuiltKeyboardManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
-	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-}
-
diff --git a/test-utils-hud/api/androidLib/test-utils-hud.api b/test-utils-hud/api/androidLib/test-utils-hud.api
index 79606987f..980921fa3 100644
--- a/test-utils-hud/api/androidLib/test-utils-hud.api
+++ b/test-utils-hud/api/androidLib/test-utils-hud.api
@@ -5,6 +5,10 @@ public final class com/splendo/kaluga/test/hud/BuildConfig {
 	public fun <init> ()V
 }
 
+public final class com/splendo/kaluga/test/hud/HudBuilderKt {
+	public static final fun hudBuilder (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/hud/HUD$Builder;
+}
+
 public final class com/splendo/kaluga/test/hud/MockHUD : com/splendo/kaluga/hud/BaseHUD {
 	public fun <init> (Lcom/splendo/kaluga/hud/HudConfig;ZLkotlinx/coroutines/CoroutineScope;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/hud/HudConfig;ZLkotlinx/coroutines/CoroutineScope;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/test-utils-keyboard/api/androidLib/test-utils-keyboard.api b/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
index c771c929a..6677b773e 100644
--- a/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
+++ b/test-utils-keyboard/api/androidLib/test-utils-keyboard.api
@@ -5,6 +5,10 @@ public final class com/splendo/kaluga/test/keyboard/BuildConfig {
 	public fun <init> ()V
 }
 
+public final class com/splendo/kaluga/test/keyboard/KeyboardManagerBuilderKt {
+	public static final fun keyboardManagerBuilder (Landroidx/appcompat/app/AppCompatActivity;)Lcom/splendo/kaluga/keyboard/ViewKeyboardManager$Builder;
+}
+
 public final class com/splendo/kaluga/test/keyboard/MockFocusHandler : com/splendo/kaluga/keyboard/FocusHandler {
 	public fun <init> ()V
 	public final fun giveFocus ()V

From 71b36a74e1b046fee00812a2fef1a429f67db8c7 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 17:43:18 +0100
Subject: [PATCH 147/227] Lint fixes

---
 .../kotlin/AndroidAlertPresenterTest.kt                     | 1 -
 .../kotlin/lifecycle/LifecycleManagerTest.kt                | 3 ++-
 .../commonMain/kotlin/navigation/NavigationBundleSpec.kt    | 2 +-
 .../src/commonMain/kotlin/observable/FlowObservable.kt      | 3 ++-
 .../src/commonMain/kotlin/observable/FlowSubject.kt         | 6 ++++--
 .../kotlin/observable/ReadWritePropertySubject.kt           | 2 --
 architecture/src/commonMain/kotlin/observable/Subject.kt    | 2 +-
 architecture/src/jsMain/kotlin/observable/Observable.kt     | 2 +-
 base/src/commonMain/kotlin/flow/flow.kt                     | 3 +--
 base/src/commonMain/kotlin/singleThreadDispatcher.kt        | 2 +-
 base/src/commonMain/kotlin/text/KalugaDateFormatter.kt      | 1 -
 base/src/jsMain/kotlin/utils/Decimal.kt                     | 1 -
 .../src/androidLibMain/kotlin/lifecycleManagerObserver.kt   | 2 +-
 13 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt b/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
index 5b09e60de..c07b7b4c5 100644
--- a/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
+++ b/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
@@ -22,7 +22,6 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.Until
-import com.splendo.kaluga.alerts.AlertPresenterTests
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
diff --git a/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt b/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
index 5147f8e4b..db782b59d 100644
--- a/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
+++ b/architecture/src/androidLibInstrumentedTest/kotlin/lifecycle/LifecycleManagerTest.kt
@@ -51,7 +51,8 @@ class LifecycleManagerTest {
                 activity,
                 activity,
                 activity.supportFragmentManager
-            ), observer.managerState.value
+            ),
+            observer.managerState.value
         )
 
         withContext(Dispatchers.Default) {
diff --git a/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt b/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
index fd40b2fd6..453599515 100644
--- a/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
+++ b/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
@@ -268,7 +268,7 @@ sealed class NavigationBundleSpecType<T> {
      * A [NonNullableNavigationBundleSpecType] that represents a [String]
      */
     object StringType : NonNullableNavigationBundleSpecType<String>() {
-        override fun convertValue(value: String): NavigationBundleValue.StringValue{
+        override fun convertValue(value: String): NavigationBundleValue.StringValue {
             return NavigationBundleValue.StringValue(value)
         }
     }
diff --git a/architecture/src/commonMain/kotlin/observable/FlowObservable.kt b/architecture/src/commonMain/kotlin/observable/FlowObservable.kt
index 8d8b9819d..919fdc72d 100644
--- a/architecture/src/commonMain/kotlin/observable/FlowObservable.kt
+++ b/architecture/src/commonMain/kotlin/observable/FlowObservable.kt
@@ -79,7 +79,8 @@ class DefaultFlowObservable<R : T?, T>(
     coroutineScope: CoroutineScope,
     context: CoroutineContext = coroutineScope.coroutineContext,
     flow: Flow<T?>,
-    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue,
+    observation: ObservationDefault<R, T?> = ObservationDefault(
+        defaultValue,
         ObservableOptional.Value(initialValue)
     ),
 ) : BaseDefaultObservable<R, T?>(observation) {
diff --git a/architecture/src/commonMain/kotlin/observable/FlowSubject.kt b/architecture/src/commonMain/kotlin/observable/FlowSubject.kt
index b10a7e033..f9b505649 100644
--- a/architecture/src/commonMain/kotlin/observable/FlowSubject.kt
+++ b/architecture/src/commonMain/kotlin/observable/FlowSubject.kt
@@ -91,7 +91,8 @@ open class StateFlowDefaultSubject<R : T?, T>(
     val context: CoroutineContext = coroutineScope.coroutineContext,
     private val observedStateFlow: MutableStateFlow<T?>,
     autoBind: Boolean = true,
-    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue,
+    observation: ObservationDefault<R, T?> = ObservationDefault(
+        defaultValue,
         ObservableOptional.Value(observedStateFlow.value)
     ),
 ) : BaseDefaultSubject<R, T?>(observation),
@@ -188,7 +189,8 @@ open class SharedFlowDefaultSubject<R : T?, T>(
     context: CoroutineContext = coroutineScope.coroutineContext,
     sharedFlow: MutableSharedFlow<T?>,
     autoBind: Boolean = true,
-    observation: ObservationDefault<R, T?> = ObservationDefault(defaultValue,
+    observation: ObservationDefault<R, T?> = ObservationDefault(
+        defaultValue,
         ObservableOptional.Value(initialValue)
     ),
 ) : BaseDefaultSubject<R, T?>(
diff --git a/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt b/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt
index 78811428c..76d2c94c2 100644
--- a/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt
+++ b/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt
@@ -22,9 +22,7 @@ package com.splendo.kaluga.architecture.observable
 import com.splendo.kaluga.architecture.observable.ObservableOptional.Value
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlin.coroutines.CoroutineContext
-import kotlin.properties.ReadOnlyProperty
 import kotlin.properties.ReadWriteProperty
 
 private class ReadWritePropertyObservableHelper<R : T, T>(
diff --git a/architecture/src/commonMain/kotlin/observable/Subject.kt b/architecture/src/commonMain/kotlin/observable/Subject.kt
index 98cb8c4af..acf82e280 100644
--- a/architecture/src/commonMain/kotlin/observable/Subject.kt
+++ b/architecture/src/commonMain/kotlin/observable/Subject.kt
@@ -49,7 +49,7 @@ interface BasicSubject<R : T, T, OO : ObservableOptional<R>> :
  * Convenience method for [BasicSubject] that calls [BasicSubject.bind] using the [CoroutineContext] of the provided [CoroutineScope]
  * @param coroutineScope The [CoroutineScope] to bind to.
  */
-fun <R :  T, T, OO : ObservableOptional<R>> BasicSubject<R, T, OO>.bind(coroutineScope: CoroutineScope) = bind(coroutineScope, coroutineScope.coroutineContext)
+fun <R : T, T, OO : ObservableOptional<R>> BasicSubject<R, T, OO>.bind(coroutineScope: CoroutineScope) = bind(coroutineScope, coroutineScope.coroutineContext)
 
 /**
  * A [BasicSubject] that is [Initialized]
diff --git a/architecture/src/jsMain/kotlin/observable/Observable.kt b/architecture/src/jsMain/kotlin/observable/Observable.kt
index e61df5866..493cd28cc 100644
--- a/architecture/src/jsMain/kotlin/observable/Observable.kt
+++ b/architecture/src/jsMain/kotlin/observable/Observable.kt
@@ -107,4 +107,4 @@ actual abstract class BaseDefaultSubject<R : T?, T> actual constructor(
         defaultValue: ObservableOptional.Value<R>,
         initialValue: ObservableOptional.Value<T?>
     ) : this(observation = ObservationDefault<R, T?>(defaultValue, initialValue))
-}
\ No newline at end of file
+}
diff --git a/base/src/commonMain/kotlin/flow/flow.kt b/base/src/commonMain/kotlin/flow/flow.kt
index 8ba852bca..0752450a8 100644
--- a/base/src/commonMain/kotlin/flow/flow.kt
+++ b/base/src/commonMain/kotlin/flow/flow.kt
@@ -116,8 +116,7 @@ suspend inline fun <T> Flow<T>.collectUntilLast(
  * Collects all elements not implementing [SpecialFlowValue.NotImportant] from a [Flow].
  * @param collector The [FlowCollector] to collect the values.
  */
-suspend inline fun <T> Flow<T>.collectImportant(
-    collector: FlowCollector<T>) =
+suspend inline fun <T> Flow<T>.collectImportant(collector: FlowCollector<T>) =
     filterOnlyImportant().collect(collector)
 
 /**
diff --git a/base/src/commonMain/kotlin/singleThreadDispatcher.kt b/base/src/commonMain/kotlin/singleThreadDispatcher.kt
index 0e61ada87..51e1cce79 100644
--- a/base/src/commonMain/kotlin/singleThreadDispatcher.kt
+++ b/base/src/commonMain/kotlin/singleThreadDispatcher.kt
@@ -35,4 +35,4 @@ expect fun singleThreadDispatcher(name: String): CloseableCoroutineDispatcher
  * @param numberOfThreads The number of the threads that the thread pool should consist of.
  * @param name The name of the thread pool to be created.
  */
-expect fun threadPoolDispatcher(numberOfThreads: UInt, name: String): CloseableCoroutineDispatcher
\ No newline at end of file
+expect fun threadPoolDispatcher(numberOfThreads: UInt, name: String): CloseableCoroutineDispatcher
diff --git a/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt b/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
index bc6665e53..3f2dfa0a9 100644
--- a/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
@@ -168,7 +168,6 @@ expect class KalugaDateFormatter : BaseDateFormatter {
             locale: Locale = defaultLocale
         ): KalugaDateFormatter
     }
-
 }
 
 @Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaState"))
diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index 00096c396..a1fcc9d77 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -206,7 +206,6 @@ actual fun Decimal.times(
     roundingMode: RoundingMode
 ): Decimal = round(BigDecimal.multiply(bd, value.bd), roundingMode, scale)
 
-
 /**
  * Raises two [Decimal].
  * @param n the [Decimal] to raise to
diff --git a/test-utils-architecture/src/androidLibMain/kotlin/lifecycleManagerObserver.kt b/test-utils-architecture/src/androidLibMain/kotlin/lifecycleManagerObserver.kt
index a1cd36d7b..77d3edc96 100644
--- a/test-utils-architecture/src/androidLibMain/kotlin/lifecycleManagerObserver.kt
+++ b/test-utils-architecture/src/androidLibMain/kotlin/lifecycleManagerObserver.kt
@@ -37,4 +37,4 @@ fun AppCompatActivity.lifecycleManagerObserver(): LifecycleManagerObserver =
         onCreate = { it.subscribe(this@lifecycleManagerObserver) },
         onDestroy = { it.unsubscribe() },
         defaultValue = { LifecycleManagerObserver() }
-    )
\ No newline at end of file
+    )

From 20abef7590b6456a9538634d4ed853f31b4ecde0 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 17:49:47 +0100
Subject: [PATCH 148/227] Fix for API and gradle example

---
 architecture/api/jvm/architecture.api       | 41 ---------------------
 base/api/jvm/base.api                       | 18 ---------
 example/settings.gradle.kts                 |  5 ++-
 test-utils-base/api/jvm/test-utils-base.api | 10 -----
 4 files changed, 4 insertions(+), 70 deletions(-)

diff --git a/architecture/api/jvm/architecture.api b/architecture/api/jvm/architecture.api
index 05e5f483c..5cc69a99f 100644
--- a/architecture/api/jvm/architecture.api
+++ b/architecture/api/jvm/architecture.api
@@ -825,38 +825,6 @@ public final class com/splendo/kaluga/architecture/observable/ObservableOptional
 	public static final fun asResult (Lcom/splendo/kaluga/architecture/observable/ObservableOptional;Lcom/splendo/kaluga/architecture/observable/ObservableOptional$Value;)Lcom/splendo/kaluga/architecture/observable/ObservableOptional;
 }
 
-public final class com/splendo/kaluga/architecture/observable/ObservablesKt {
-	public static final fun observableOf (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SimpleInitializedObservable;
-	public static final fun observeFlow (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;)V
-	public static synthetic fun observeFlow$default (Lcom/splendo/kaluga/architecture/observable/Observation;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;ILjava/lang/Object;)V
-	public static final fun readOnlyPropertyObservableHelper (Lkotlin/properties/ReadOnlyProperty;Lcom/splendo/kaluga/architecture/observable/Observation;)V
-	public static final fun subjectOf (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SimpleInitializedSubject;
-	public static final fun toDefaultObservable (Lkotlin/properties/ReadOnlyProperty;Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadOnlyPropertyDefaultObservable;
-	public static final fun toDefaultObservable (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
-	public static synthetic fun toDefaultObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/DefaultFlowObservable;
-	public static final fun toDefaultSubject (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
-	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
-	public static final fun toDefaultSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
-	public static synthetic fun toDefaultSubject$default (Lkotlin/properties/ReadWriteProperty;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyDefaultSubject;
-	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowDefaultSubject;
-	public static synthetic fun toDefaultSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowDefaultSubject;
-	public static final fun toInitializedObservable (Lkotlin/properties/ReadOnlyProperty;)Lcom/splendo/kaluga/architecture/observable/ReadOnlyPropertyInitializedObservable;
-	public static final fun toInitializedObservable (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
-	public static final fun toInitializedObservable (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
-	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
-	public static synthetic fun toInitializedObservable$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowInitializedObservable;
-	public static final fun toInitializedSubject (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
-	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
-	public static final fun toInitializedSubject (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
-	public static synthetic fun toInitializedSubject$default (Lkotlin/properties/ReadWriteProperty;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/ReadWritePropertyInitializedSubject;
-	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowInitializedSubject;
-	public static synthetic fun toInitializedSubject$default (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/StateFlowInitializedSubject;
-	public static final fun toUninitializedObservable (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/FlowObservable;
-	public static synthetic fun toUninitializedObservable$default (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/FlowObservable;
-	public static final fun toUninitializedSubject (Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/architecture/observable/SharedFlowSubject;
-	public static synthetic fun toUninitializedSubject$default (Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SharedFlowSubject;
-}
-
 public class com/splendo/kaluga/architecture/observable/Observation : com/splendo/kaluga/architecture/observable/Initial {
 	public fun <init> (Lcom/splendo/kaluga/architecture/observable/ObservableOptional;)V
 	public final fun getBeforeObservedValueGet ()Lkotlin/jvm/functions/Function1;
@@ -1024,15 +992,6 @@ public class com/splendo/kaluga/architecture/observable/StateFlowInitializedSubj
 	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public class com/splendo/kaluga/architecture/observable/StateFlowSubject : com/splendo/kaluga/architecture/observable/BaseInitializedSubject, com/splendo/kaluga/architecture/observable/SuspendableSetter {
-	public fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/MutableStateFlow;ZLcom/splendo/kaluga/architecture/observable/ObservationInitialized;)V
-	public synthetic fun <init> (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/MutableStateFlow;ZLcom/splendo/kaluga/architecture/observable/ObservationInitialized;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getContext ()Lkotlin/coroutines/CoroutineContext;
-	public final fun getCoroutineScope ()Lkotlinx/coroutines/CoroutineScope;
-	public fun post (Ljava/lang/Object;)V
-	public fun set (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public final class com/splendo/kaluga/architecture/observable/SubjectKt {
 	public static final fun bind (Lcom/splendo/kaluga/architecture/observable/BasicSubject;Lkotlinx/coroutines/CoroutineScope;)V
 	public static final fun subjectOf (Ljava/lang/Object;)Lcom/splendo/kaluga/architecture/observable/SimpleInitializedSubject;
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index ad5108a64..f71c3c33b 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -191,24 +191,6 @@ public abstract interface class com/splendo/kaluga/base/flow/SpecialFlowValue$La
 public abstract interface class com/splendo/kaluga/base/flow/SpecialFlowValue$NotImportant : com/splendo/kaluga/base/flow/SpecialFlowValue {
 }
 
-public abstract class com/splendo/kaluga/base/monitor/DefaultServiceMonitor : com/splendo/kaluga/base/monitor/ServiceMonitor {
-	public fun <init> ()V
-	protected final fun getTAG ()Ljava/lang/String;
-	public fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
-	public abstract fun monitoringDidStart ()V
-	public abstract fun monitoringDidStop ()V
-	public final fun startMonitoring ()V
-	public final fun stopMonitoring ()V
-	protected final fun updateState ()V
-}
-
-public abstract interface class com/splendo/kaluga/base/monitor/ServiceMonitor {
-	public abstract fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
-	public abstract fun isServiceEnabled ()Z
-	public abstract fun startMonitoring ()V
-	public abstract fun stopMonitoring ()V
-}
-
 public abstract class com/splendo/kaluga/base/state/BaseColdStateRepo : com/splendo/kaluga/base/state/StateRepo {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/coroutines/CoroutineContext;)V
diff --git a/example/settings.gradle.kts b/example/settings.gradle.kts
index 85adad83e..422543c51 100644
--- a/example/settings.gradle.kts
+++ b/example/settings.gradle.kts
@@ -37,7 +37,10 @@ pluginManagement {
 }
 
 val props = Properties()
-props.load(FileInputStream(File("$rootDir/local.properties")))
+val file = File("$rootDir/local.properties")
+if (file.exists()) {
+    props.load(FileInputStream(file))
+}
 
 val exampleEmbeddingMethod = if (System.getenv().containsKey("EXAMPLE_EMBEDDING_METHOD")) {
     System.getenv()["EXAMPLE_EMBEDDING_METHOD"].also {
diff --git a/test-utils-base/api/jvm/test-utils-base.api b/test-utils-base/api/jvm/test-utils-base.api
index 117f3d436..0ba90adb9 100644
--- a/test-utils-base/api/jvm/test-utils-base.api
+++ b/test-utils-base/api/jvm/test-utils-base.api
@@ -1137,13 +1137,3 @@ public final class com/splendo/kaluga/test/base/mock/verification/VerificationRu
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/test/base/monitor/MockServiceMonitor : com/splendo/kaluga/base/monitor/ServiceMonitor {
-	public fun <init> ()V
-	public final fun getStartMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getStopMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public abstract fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
-	public fun isServiceEnabled ()Z
-	public fun startMonitoring ()V
-	public fun stopMonitoring ()V
-}
-

From a41a7c38a413f453e8ab97d6aa640824020d7e01 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 21:08:57 +0100
Subject: [PATCH 149/227] Fixing minor issues

---
 base/src/iosMain/kotlin/utils/Locale.kt                        | 3 ++-
 base/src/iosMain/kotlin/utils/TimeZone.kt                      | 3 ++-
 .../example/shared/viewmodel/resources/ColorViewModel.kt       | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/base/src/iosMain/kotlin/utils/Locale.kt b/base/src/iosMain/kotlin/utils/Locale.kt
index 5bed9c474..c8b053ced 100644
--- a/base/src/iosMain/kotlin/utils/Locale.kt
+++ b/base/src/iosMain/kotlin/utils/Locale.kt
@@ -37,8 +37,9 @@ import platform.Foundation.variantCode
 
 /**
  * Default implementation of [BaseLocale]
+ * @property nsLocale the internal [NSLocale] tracking this locale.
  */
-actual data class Locale internal constructor(internal val nsLocale: NSLocale) : BaseLocale() {
+actual data class Locale internal constructor(val nsLocale: NSLocale) : BaseLocale() {
 
     actual companion object {
 
diff --git a/base/src/iosMain/kotlin/utils/TimeZone.kt b/base/src/iosMain/kotlin/utils/TimeZone.kt
index d2f77ed1e..129b7d701 100644
--- a/base/src/iosMain/kotlin/utils/TimeZone.kt
+++ b/base/src/iosMain/kotlin/utils/TimeZone.kt
@@ -32,8 +32,9 @@ import platform.Foundation.timeZoneWithName
 
 /**
  * A default implementation of [BaseTimeZone].
+ * @property timeZone the internal [NSTimeZone] tracking this timezone.
  */
-actual class TimeZone internal constructor(internal val timeZone: NSTimeZone) : BaseTimeZone() {
+actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZone() {
 
     actual companion object {
 
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
index 3f43dc977..4a3cac421 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ColorViewModel.kt
@@ -18,7 +18,6 @@
 package com.splendo.kaluga.example.shared.viewmodel.resources
 
 import com.splendo.kaluga.alerts.Alert
-import com.splendo.kaluga.alerts.AlertPresenter
 import com.splendo.kaluga.alerts.BaseAlertPresenter
 import com.splendo.kaluga.alerts.buildActionSheet
 import com.splendo.kaluga.alerts.buildAlert

From f81b2f49fc6e953e03048cebb8da1266e17501fd Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 21:22:09 +0100
Subject: [PATCH 150/227] More build fixes

---
 base/src/jsMain/kotlin/utils/Decimal.kt      | 2 +-
 example/android/src/main/AndroidManifest.xml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index a1fcc9d77..f8a235e75 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -34,7 +34,7 @@ private const val ROUNDING_MODE = "half-even"
 private const val CEIL = "ceil"
 private const val FLOOR = "floor"
 
-private data class Rounding(
+internal data class Rounding(
     val maximumFractionDigits: Int? = null,
     val roundingMode: String = ROUNDING_MODE,
     val maximumSignificantDigits: Int = DECIMAL_128_SIGNIFICANT_DIGITS
diff --git a/example/android/src/main/AndroidManifest.xml b/example/android/src/main/AndroidManifest.xml
index 07300891d..6d3d319b7 100644
--- a/example/android/src/main/AndroidManifest.xml
+++ b/example/android/src/main/AndroidManifest.xml
@@ -24,6 +24,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
     <!-- When the app is not using Custom Tabs to open a URL, Android 11 requires a "queries" tag in order to look for apps that can open a given URL.
     In this case the query will go through the apps with an intent that refers to a browser. -->
     <queries>

From e2580812536b19c571aded9702f9328c1701642a Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 22:40:43 +0100
Subject: [PATCH 151/227] Temp workaround for Android post notification
 permission

---
 .../example/location/LocationBackgroundService.kt     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
index 13e52d6f8..887150a3a 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
@@ -17,12 +17,15 @@
 
 package com.splendo.kaluga.example.location
 
+import android.Manifest
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Build
+import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.splendo.kaluga.example.R
@@ -47,7 +50,13 @@ class LocationBackgroundService : androidx.lifecycle.LifecycleService() {
         super.onCreate()
 
         viewModel.location.observeInitialized { message ->
-            NotificationManagerCompat.from(applicationContext).notify(notificationId, getNotification(message))
+            if (ActivityCompat.checkSelfPermission(
+                    this,
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) {
+                NotificationManagerCompat.from(applicationContext).notify(notificationId, getNotification(message))
+            }
         }
 
         startForeground(notificationId, getNotification(""))

From 44789cae6124058f2d32c84b39fc6eac623a595d Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 23:01:59 +0100
Subject: [PATCH 152/227] Fox for Javascript

---
 base/src/jsMain/kotlin/utils/Decimal.kt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index f8a235e75..c8c09e97a 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -34,7 +34,13 @@ private const val ROUNDING_MODE = "half-even"
 private const val CEIL = "ceil"
 private const val FLOOR = "floor"
 
-internal data class Rounding(
+/**
+ * Rounding for [BigDecimal]
+ * @property maximumFractionDigits The maximum number of digits as part of the fraction.
+ * @property roundingMode Describes the rounding mode. Can be either `half-even`, `ceil`, or `floor`
+ * @property maximumSignificantDigits The maximum number of significant digits
+ */
+data class Rounding(
     val maximumFractionDigits: Int? = null,
     val roundingMode: String = ROUNDING_MODE,
     val maximumSignificantDigits: Int = DECIMAL_128_SIGNIFICANT_DIGITS

From 4402909eb84304a60ae4b6dfc378552efb36e3c2 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 2 Feb 2023 01:18:04 +0100
Subject: [PATCH 153/227] Fixing iOS test targets

---
 example/ios/Demo.xcodeproj/project.pbxproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 27961d913..849e93bcf 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -926,6 +926,7 @@
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
 				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -974,6 +975,7 @@
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1056,6 +1058,7 @@
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
 				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1074,6 +1077,7 @@
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

From c6c24d1b6817b58834508468df0ef515d24e71a8 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 2 Feb 2023 15:25:13 +0100
Subject: [PATCH 154/227] Fixed DemoTest

---
 example/ios/DemoTests/DemoTests.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/example/ios/DemoTests/DemoTests.swift b/example/ios/DemoTests/DemoTests.swift
index 55851ad9d..51c5a5878 100644
--- a/example/ios/DemoTests/DemoTests.swift
+++ b/example/ios/DemoTests/DemoTests.swift
@@ -31,7 +31,6 @@ class DemoTests: XCTestCase {
     }
 
     func testExample() {
-        assert(KotlinNativeFramework().hello() == "Hello from the shared module common source")
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct results.
     }

From 9fa8320df245e507981d2a80f8953e884427db73 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 2 Feb 2023 15:59:32 +0100
Subject: [PATCH 155/227] ios cleanup

---
 example/ios/Demo.xcodeproj/project.pbxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index 849e93bcf..f1e5d5ecb 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -924,7 +924,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -973,7 +973,7 @@
 		74C4C9BEEE5FE949D448C58D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1056,7 +1056,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1075,7 +1075,7 @@
 		74F864CC21F489CA494FD856 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/KotlinNativeFramework/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = DemoUITests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (

From 1038f3070bcd6382d593a6923800c6472b515e5a Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 1 Feb 2023 22:58:11 +0100
Subject: [PATCH 156/227] Adding Android notification permissions

---
 notifications-permissions/README.md           |  2 +-
 .../kotlin/NotificationsPermissionManager.kt  | 40 ++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/notifications-permissions/README.md b/notifications-permissions/README.md
index 67e609f6c..615bcff95 100644
--- a/notifications-permissions/README.md
+++ b/notifications-permissions/README.md
@@ -1,7 +1,7 @@
 ## Notifications Permissions
 Adds a `NotificationsPermission`. Register this permission by calling `PermissionsBuilder.registerNotificationsPermission`.
 
-On Android this permission will be granted automatically.
+On Android this permission will be granted automatically for devices running API 32 or lower.
 
 ## Installing
 This library is available on Maven Central. You can import Kaluga Notifications Permissions as follows:
diff --git a/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt b/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt
index 1127bbfd9..9db10cd77 100644
--- a/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt
+++ b/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt
@@ -17,7 +17,11 @@
 
 package com.splendo.kaluga.permissions.notifications
 
+import android.Manifest
+import android.content.Context
+import android.os.Build
 import com.splendo.kaluga.permissions.base.AndroidPermissionState
+import com.splendo.kaluga.permissions.base.AndroidPermissionsManager
 import com.splendo.kaluga.permissions.base.BasePermissionManager
 import com.splendo.kaluga.permissions.base.DefaultAndroidPermissionStateHandler
 import com.splendo.kaluga.permissions.base.PermissionContext
@@ -27,27 +31,53 @@ import kotlin.time.Duration
 actual class NotificationOptions
 
 actual class DefaultNotificationsPermissionManager(
+    context: Context,
     notificationsPermission: NotificationsPermission,
     settings: Settings,
     coroutineScope: CoroutineScope
 ) : BasePermissionManager<NotificationsPermission>(notificationsPermission, settings, coroutineScope) {
 
     private val permissionHandler = DefaultAndroidPermissionStateHandler(eventChannel, logTag, logger)
+    private val permissionsManager =
+        AndroidPermissionsManager(
+            context,
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                arrayOf(Manifest.permission.POST_NOTIFICATIONS)
+            } else {
+               emptyArray()
+           },
+            coroutineScope,
+            logTag,
+            logger,
+            permissionHandler
+        )
 
     override fun requestPermissionDidStart() {
-        permissionHandler.status(AndroidPermissionState.GRANTED)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            permissionsManager.requestPermissions()
+        } else {
+            permissionHandler.status(AndroidPermissionState.GRANTED)
+        }
     }
 
     override fun monitoringDidStart(interval: Duration) {
-        permissionHandler.status(AndroidPermissionState.GRANTED)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            permissionsManager.startMonitoring(interval)
+        } else {
+            permissionHandler.status(AndroidPermissionState.GRANTED)
+        }
     }
 
-    override fun monitoringDidStop() {}
+    override fun monitoringDidStop() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            permissionsManager.stopMonitoring()
+        }
+    }
 }
 
-actual class NotificationsPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseNotificationsPermissionManagerBuilder {
+actual class NotificationsPermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseNotificationsPermissionManagerBuilder {
 
     override fun create(notificationsPermission: NotificationsPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): NotificationsPermissionManager {
-        return DefaultNotificationsPermissionManager(notificationsPermission, settings, coroutineScope)
+        return DefaultNotificationsPermissionManager(context.context, notificationsPermission, settings, coroutineScope)
     }
 }

From 328f77c8851f166857ee749a4151b26f9d456e70 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 3 Feb 2023 11:37:12 +0100
Subject: [PATCH 157/227] Fixed Background location & added to example

---
 .../example/location/LocationActivity.kt      |  4 +-
 .../location/LocationBackgroundService.kt     | 36 +++++++---
 .../example/shared/di/DependencyInjection.kt  |  3 +
 .../NotificationPermissionViewModel.kt        | 70 +++++++++++++++++++
 .../kotlin/location/GoogleLocationProvider.kt |  2 +-
 .../kotlin/NotificationsPermissionManager.kt  |  4 +-
 6 files changed, 105 insertions(+), 14 deletions(-)
 create mode 100644 example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationPermissionViewModel.kt

diff --git a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
index e8d73e09d..5e8868a37 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationActivity.kt
@@ -31,11 +31,11 @@ import org.koin.core.parameter.parametersOf
 class LocationActivity : KalugaViewModelActivity<LocationViewModel>() {
 
     companion object {
-        private val permission = LocationPermission(background = false, precise = true)
+        private val locationPermission = LocationPermission(background = false, precise = true)
     }
 
     override val viewModel: LocationViewModel by viewModel {
-        parametersOf(permission)
+        parametersOf(locationPermission)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
index 887150a3a..0cf911b79 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/location/LocationBackgroundService.kt
@@ -28,9 +28,13 @@ import android.os.Build
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.lifecycle.lifecycleScope
 import com.splendo.kaluga.example.R
 import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
+import com.splendo.kaluga.example.shared.viewmodel.permissions.NotificationPermissionViewModel
 import com.splendo.kaluga.permissions.location.LocationPermission
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNot
 
 class LocationBackgroundService : androidx.lifecycle.LifecycleService() {
 
@@ -39,23 +43,34 @@ class LocationBackgroundService : androidx.lifecycle.LifecycleService() {
         const val channelId = "location_channel"
         const val channelName = "Kaluga Location"
 
-        private val permission = LocationPermission(background = true, precise = true)
+        private val locationPermission = LocationPermission(background = true, precise = true)
     }
 
     private val notificationService by lazy { applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager }
 
-    private val viewModel = LocationViewModel(permission)
+    private val viewModel = LocationViewModel(locationPermission)
+    private val notificationsViewModel = NotificationPermissionViewModel()
 
     override fun onCreate() {
         super.onCreate()
 
-        viewModel.location.observeInitialized { message ->
-            if (ActivityCompat.checkSelfPermission(
-                    this,
-                    Manifest.permission.POST_NOTIFICATIONS
-                ) == PackageManager.PERMISSION_GRANTED
-            ) {
-                NotificationManagerCompat.from(applicationContext).notify(notificationId, getNotification(message))
+        lifecycleScope.launchWhenCreated {
+            combine(viewModel.location.stateFlow, notificationsViewModel.hasPermission.stateFlow) { message, hasNotificationsPermission ->
+                if (hasNotificationsPermission) message else null
+            }.collect { message ->
+                if (message != null && ActivityCompat.checkSelfPermission(
+                        this@LocationBackgroundService,
+                        Manifest.permission.POST_NOTIFICATIONS
+                    ) == PackageManager.PERMISSION_GRANTED
+                ) {
+                    NotificationManagerCompat.from(applicationContext).notify(notificationId, getNotification(message))
+                }
+            }
+        }
+
+        lifecycleScope.launchWhenCreated {
+            notificationsViewModel.hasPermission.stateFlow.filterNot { it }.collect {
+                notificationsViewModel.requestPermission()
             }
         }
 
@@ -65,6 +80,7 @@ class LocationBackgroundService : androidx.lifecycle.LifecycleService() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
         viewModel.didResume()
+        notificationsViewModel.didResume()
         return START_NOT_STICKY
     }
 
@@ -72,6 +88,8 @@ class LocationBackgroundService : androidx.lifecycle.LifecycleService() {
         super.onDestroy()
         viewModel.didPause()
         viewModel.onCleared()
+        notificationsViewModel.didPause()
+        notificationsViewModel.onCleared()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             stopForeground(STOP_FOREGROUND_REMOVE)
         } else {
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index 6c37b1321..b56876769 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -51,6 +51,7 @@ import com.splendo.kaluga.example.shared.viewmodel.info.InfoViewModel
 import com.splendo.kaluga.example.shared.viewmodel.link.BrowserNavigationActions
 import com.splendo.kaluga.example.shared.viewmodel.link.LinksViewModel
 import com.splendo.kaluga.example.shared.viewmodel.location.LocationViewModel
+import com.splendo.kaluga.example.shared.viewmodel.permissions.NotificationPermissionViewModel
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionViewModel
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListViewModel
@@ -111,6 +112,8 @@ internal val androidModule = module {
 
     viewModel { (permission: LocationPermission) -> LocationViewModel(permission) }
 
+    viewModel { NotificationPermissionViewModel() }
+
     viewModel { (navigator: Navigator<ArchitectureNavigationAction<*>>) ->
         ArchitectureViewModel(navigator)
     }
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationPermissionViewModel.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationPermissionViewModel.kt
new file mode 100644
index 000000000..2148de324
--- /dev/null
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/permissions/NotificationPermissionViewModel.kt
@@ -0,0 +1,70 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.permissions
+
+import com.splendo.kaluga.architecture.observable.toInitializedObservable
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.base.singleThreadDispatcher
+import com.splendo.kaluga.logging.RestrictedLogLevel
+import com.splendo.kaluga.logging.RestrictedLogger
+import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.PermissionState
+import com.splendo.kaluga.permissions.base.Permissions
+import com.splendo.kaluga.permissions.base.PermissionsBuilder
+import com.splendo.kaluga.permissions.notifications.NotificationsPermission
+import com.splendo.kaluga.permissions.notifications.registerNotificationsPermissionIfNotRegistered
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+private val permissionsDispatcher = singleThreadDispatcher("NotificationPermissionsDispatcher")
+
+class NotificationPermissionViewModel : BaseLifecycleViewModel(), KoinComponent {
+
+    companion object {
+        private val permission = NotificationsPermission(notificationOptions)
+    }
+
+    private val permissionsBuilder: PermissionsBuilder by inject()
+    private val permissions = Permissions(permissionsBuilder, coroutineScope.coroutineContext + permissionsDispatcher)
+
+    val hasPermission by lazy {
+        permissions[permission]
+            .map { permissionState -> permissionState is PermissionState.Allowed }
+            .toInitializedObservable(false, coroutineScope)
+    }
+
+    init {
+        permissionsBuilder.registerNotificationsPermissionIfNotRegistered(
+            settings = BasePermissionManager.Settings(
+                logger = RestrictedLogger(RestrictedLogLevel.None)
+            )
+        )
+    }
+
+    fun requestPermission() {
+        coroutineScope.launch {
+            permissions.request(permission)
+        }
+    }
+
+    public override fun onCleared() {
+        super.onCleared()
+    }
+}
diff --git a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
index 4f1b2f4bf..80a88b382 100644
--- a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
@@ -171,7 +171,7 @@ class GoogleLocationUpdatesBroadcastReceiver : BroadcastReceiver() {
                 action = ACTION_NAME
                 addCategory(locationManagerId)
             }
-            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+            return PendingIntent.getBroadcast(context, 0, intent, if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT else PendingIntent.FLAG_UPDATE_CURRENT)
         }
     }
 
diff --git a/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt b/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt
index 9db10cd77..99bcf6d0e 100644
--- a/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt
+++ b/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt
@@ -44,8 +44,8 @@ actual class DefaultNotificationsPermissionManager(
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 arrayOf(Manifest.permission.POST_NOTIFICATIONS)
             } else {
-               emptyArray()
-           },
+                emptyArray()
+            },
             coroutineScope,
             logTag,
             logger,

From 32d4f5fdc7c7616ef64d8389766a9d88f2258286 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 3 Feb 2023 12:16:30 +0100
Subject: [PATCH 158/227] Api dump

---
 .../api/androidLib/notifications-permissions.api                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notifications-permissions/api/androidLib/notifications-permissions.api b/notifications-permissions/api/androidLib/notifications-permissions.api
index 2cc828448..8f797b15a 100644
--- a/notifications-permissions/api/androidLib/notifications-permissions.api
+++ b/notifications-permissions/api/androidLib/notifications-permissions.api
@@ -4,7 +4,7 @@ public abstract interface class com/splendo/kaluga/permissions/notifications/Bas
 }
 
 public final class com/splendo/kaluga/permissions/notifications/DefaultNotificationsPermissionManager : com/splendo/kaluga/permissions/base/BasePermissionManager {
-	public fun <init> (Lcom/splendo/kaluga/permissions/notifications/NotificationsPermission;Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlinx/coroutines/CoroutineScope;)V
+	public fun <init> (Landroid/content/Context;Lcom/splendo/kaluga/permissions/notifications/NotificationsPermission;Lcom/splendo/kaluga/permissions/base/BasePermissionManager$Settings;Lkotlinx/coroutines/CoroutineScope;)V
 }
 
 public final class com/splendo/kaluga/permissions/notifications/NotificationOptions {

From 1b7b7ece85eef4513d2b6a8c8f379120147c421f Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 6 Feb 2023 17:01:17 +0100
Subject: [PATCH 159/227] Documentation + some convenience ResultHandler for
 Architecture compose

---
 .../api/architecture-compose.api              | 114 +--
 .../architecture/compose/ContextExtensions.kt |   4 +
 .../ComposableLifecycleSubscribable.kt        |   8 +
 .../navigation/BottomSheetNavigator.kt        |  38 +-
 .../navigation/BottomSheetNavigatorState.kt   |   6 +-
 .../compose/navigation/BottomSheetRoute.kt    |  10 +-
 .../navigation/BottomSheetRouteController.kt  |   8 +-
 .../compose/navigation/ComposableNavSpec.kt   |  75 +-
 .../compose/navigation/ComposableNavigator.kt |  90 ++-
 .../navigation/NavigationExtensions.kt        |   5 +-
 .../architecture/compose/navigation/Route.kt  |  98 ++-
 .../compose/navigation/RouteController.kt     |   6 +-
 .../compose/navigation/result/HandleResult.kt | 635 +++++++++++++++-
 .../navigation/result/NavHostResultHandler.kt | 705 ++++++++++++++++--
 .../architecture/compose/observables.kt       |   6 +
 .../compose/viewModel/ViewModelComposable.kt  |   6 +-
 .../navigation/BundleToTypedProperty.kt       |   5 +-
 17 files changed, 1579 insertions(+), 240 deletions(-)

diff --git a/architecture-compose/api/architecture-compose.api b/architecture-compose/api/architecture-compose.api
index e04bcc820..be19b3b08 100644
--- a/architecture-compose/api/architecture-compose.api
+++ b/architecture-compose/api/architecture-compose.api
@@ -47,7 +47,7 @@ public abstract class com/splendo/kaluga/architecture/compose/navigation/BottomS
 	protected final fun SetupNavigationAction (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/compose/runtime/Composer;I)V
 	protected abstract fun getContentModifier ()Lkotlin/jvm/functions/Function4;
 	public final fun getModifier ()Lkotlin/jvm/functions/Function4;
-	public abstract fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;
+	protected abstract fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;
 	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
 }
 
@@ -111,8 +111,6 @@ public final class com/splendo/kaluga/architecture/compose/navigation/BottomShee
 	public static final field $stable I
 	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Lkotlin/jvm/functions/Function3;)V
 	public synthetic fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getContentModifier ()Lkotlin/jvm/functions/Function4;
-	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetSheetContentRouteController;
 	public synthetic fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
 }
 
@@ -218,9 +216,9 @@ public abstract class com/splendo/kaluga/architecture/compose/navigation/Composa
 	public static final field $stable I
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	protected final fun SetupNavigationAction (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/compose/runtime/Composer;I)V
-	public abstract fun getContentModifier ()Lkotlin/jvm/functions/Function4;
+	protected abstract fun getContentModifier ()Lkotlin/jvm/functions/Function4;
 	public final fun getModifier ()Lkotlin/jvm/functions/Function4;
-	public abstract fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
+	protected abstract fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
 	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
 }
 
@@ -243,15 +241,12 @@ public final class com/splendo/kaluga/architecture/compose/navigation/Composable
 public final class com/splendo/kaluga/architecture/compose/navigation/LaunchedComposableNavigator : com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator {
 	public static final field $stable I
 	public fun <init> (Lkotlin/jvm/functions/Function3;)V
-	public fun getContentModifier ()Lkotlin/jvm/functions/Function4;
-	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/ModalBottomSheetNavigator : com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator {
 	public static final field $stable I
 	public fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Ljava/util/List;Lkotlin/jvm/functions/Function3;)V
 	public synthetic fun <init> (Lkotlinx/coroutines/flow/StateFlow;Ljava/util/List;Ljava/util/List;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilderKt {
@@ -282,8 +277,8 @@ public abstract class com/splendo/kaluga/architecture/compose/navigation/Providi
 	public static final field $stable I
 	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController;Ljava/util/List;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController;Ljava/util/List;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getContentModifier ()Lkotlin/jvm/functions/Function4;
-	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController;
+	protected fun getContentModifier ()Lkotlin/jvm/functions/Function4;
+	protected fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/ProvidingNavHostRouteController;
 	public synthetic fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
 }
 
@@ -302,15 +297,12 @@ public final class com/splendo/kaluga/architecture/compose/navigation/RootModalB
 	public static final field $stable I
 	public fun <init> (Lkotlin/jvm/functions/Function3;Landroidx/compose/material/ModalBottomSheetValue;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Landroidx/compose/material/ModalBottomSheetValue;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/RootNavHostComposableNavigator : com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator {
 	public static final field $stable I
 	public fun <init> (Lkotlin/jvm/functions/Function3;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Ljava/util/List;Lkotlin/jvm/functions/Function2;)V
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;Ljava/util/List;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getContentModifier ()Lkotlin/jvm/functions/Function4;
-	public fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
 }
 
 public abstract class com/splendo/kaluga/architecture/compose/navigation/Route : com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec {
@@ -470,52 +462,60 @@ public final class com/splendo/kaluga/architecture/compose/navigation/SetupNavHo
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/result/HandleResultKt {
+	public static final fun HandleBooleanArrayOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleBooleanArrayResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleBooleanOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleBooleanResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleByteArrayOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleByteArrayResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleByteOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleByteResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleCharArrayOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleCharArrayResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleCharOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleCharResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleCharSequenceOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleCharSequenceResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleDateArrayOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleDateArrayResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleDateOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleDateResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleDoubleArrayOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleDoubleArrayResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleDoubleOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleDoubleResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleFloatArrayOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleFloatArrayResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleFloatOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleFloatResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleIntArrayOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleIntArrayResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleIntOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleIntResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleLongArrayOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleLongArrayResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleLongOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleLongResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleNullableResultOrNull (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
 	public static final fun HandleResult (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
 	public static final fun HandleResult (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
-}
-
-public abstract class com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler {
-	public static final field $stable I
-	public abstract fun getOnResult ()Lkotlin/jvm/functions/Function2;
-	public abstract fun getRetain ()Z
-	public abstract fun getViewModelClass ()Lkotlin/reflect/KClass;
-}
-
-public final class com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Bundle : com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler {
-	public static final field $stable I
-	public fun <init> (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function2;)V
-	public synthetic fun <init> (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lkotlin/reflect/KClass;
-	public final fun component2 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;
-	public final fun component3 ()Z
-	public final fun component4 ()Lkotlin/jvm/functions/Function2;
-	public final fun copy (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Bundle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Bundle;Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Bundle;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getOnResult ()Lkotlin/jvm/functions/Function2;
-	public fun getRetain ()Z
-	public final fun getSpec ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpec;
-	public fun getViewModelClass ()Lkotlin/reflect/KClass;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Type : com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler {
-	public static final field $stable I
-	public fun <init> (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function2;)V
-	public final fun component1 ()Lkotlin/reflect/KClass;
-	public final fun component2 ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;
-	public final fun component3 ()Z
-	public final fun component4 ()Lkotlin/jvm/functions/Function2;
-	public final fun copy (Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Type;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Type;Lkotlin/reflect/KClass;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler$Type;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getOnResult ()Lkotlin/jvm/functions/Function2;
-	public fun getRetain ()Z
-	public final fun getSpec ()Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;
-	public fun getViewModelClass ()Lkotlin/reflect/KClass;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
+	public static final fun HandleResultOfNullableTypeOrNull (Landroidx/navigation/NavHostController;Lkotlinx/serialization/KSerializer;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleResultOfType (Landroidx/navigation/NavHostController;Lkotlinx/serialization/KSerializer;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleResultOfTypeOrNull (Landroidx/navigation/NavHostController;Lkotlinx/serialization/KSerializer;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleResultOrNull (Landroidx/navigation/NavHostController;Lcom/splendo/kaluga/architecture/navigation/NavigationBundleSpecType;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleShortArrayOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleShortArrayResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleShortOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleShortResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleStringListOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleStringListResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleStringOrNullResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun HandleStringResult (Landroidx/navigation/NavHostController;ZLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+}
+
+public final class com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler {
+	public static final field $stable I
+	public fun <init> (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function2;)V
 }
 
 public abstract class com/splendo/kaluga/architecture/compose/viewModel/KalugaViewModelComposeActivity : androidx/appcompat/app/AppCompatActivity {
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
index 2097c341b..a96a1d791 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/ContextExtensions.kt
@@ -21,6 +21,10 @@ import android.content.Context
 import android.content.ContextWrapper
 import androidx.appcompat.app.AppCompatActivity
 
+/**
+ * Gets the [AppCompatActivity] of a [Context] if it exists.
+ * This does a recursive lookup if [Context] is a [ContextWrapper]
+ */
 val Context.activity: AppCompatActivity? get() = when (this) {
     is AppCompatActivity -> this
     is ContextWrapper -> baseContext.activity // recursive lookup
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
index d6d8a7828..a1ce55749 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/lifecycle/ComposableLifecycleSubscribable.kt
@@ -26,7 +26,15 @@ import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import kotlinx.coroutines.flow.map
 import kotlin.coroutines.EmptyCoroutineContext
 
+/**
+ * A [LifecycleSubscribable] that binds to a [Composable] View using [com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable].
+ * This subscribable provides a [modifier] that modifies a [Composable] view builder to wrap it with functionality associated with the [ComposableLifecycleSubscribable].
+ */
 interface ComposableLifecycleSubscribable : LifecycleSubscribable {
+
+    /**
+     * This [Composable] modifier method transforms the View Builder associated with a [BaseLifecycleViewModel] to wrap the functionality of the subscribable.
+     */
     val modifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit
 }
 
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
index dc8e578ce..05669167b 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigator.kt
@@ -23,18 +23,19 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
 /**
- * A Navigator managed by a [BottomSheetRouteController]
- * @param navigationMapper A mapper that converts an [NavigationAction] handled by this navigator into a [BottomSheetRoute]
+ * A [Navigator] managed by a [BottomSheetRouteController].
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ * @param navigationMapper A mapper that converts an [Action] handled by this navigator into a [BottomSheetComposableNavSpec]
  */
-sealed class BottomSheetNavigator<A : NavigationAction<*>>(
-    private val navigationMapper: @Composable (A) -> BottomSheetComposableNavSpec
-) : Navigator<A>, ComposableLifecycleSubscribable {
+sealed class BottomSheetNavigator<Action : NavigationAction<*>>(
+    private val navigationMapper: @Composable (Action) -> BottomSheetComposableNavSpec
+) : Navigator<Action>, ComposableLifecycleSubscribable {
 
-    abstract val routeController: BottomSheetRouteController
+    protected abstract val routeController: BottomSheetRouteController
 
-    private val actionState = MutableStateFlow<A?>(null)
+    private val actionState = MutableStateFlow<Action?>(null)
 
-    override fun navigate(action: A) {
+    override fun navigate(action: Action) {
         actionState.value = action
     }
 
@@ -70,22 +71,23 @@ sealed class BottomSheetNavigator<A : NavigationAction<*>>(
 }
 
 /**
- * A [BottomSheetNavigator] that creates and manages a [ModalBottomSheetLayout]. This should be on top of any [ModalBottomSheetNavigator]
- * @param navigationMapper Maps [A] to a [BottomSheetComposableNavSpec] to be navigated to.
+ * A [BottomSheetNavigator] that creates and manages a [ModalBottomSheetLayout]. This should be on top of any [ModalBottomSheetNavigator] in the View-hierarchy
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ * @param navigationMapper Maps [Action] to a [BottomSheetComposableNavSpec] to be navigated to.
  * @param initialSheetValue The [ModalBottomSheetValue] the [ModalBottomSheetLayout] should default to.
  * @param parentRouteController A [RouteController] managing the parent view of the [ModalBottomSheetLayout]
  * @param contentRootResultHandlers A list of [NavHostResultHandler] to be added to the root view of the content.
  * @param contentBuilder The [BottomSheetContentBuilder] describing the navigation graph of the content.
  * @param sheetContentBuilder The [BottomSheetContentBuilder] describing the navigation graph of the sheet content.
  */
-class RootModalBottomSheetNavigator<A : NavigationAction<*>>(
-    navigationMapper: @Composable (A) -> BottomSheetComposableNavSpec,
+class RootModalBottomSheetNavigator<Action : NavigationAction<*>>(
+    navigationMapper: @Composable (Action) -> BottomSheetComposableNavSpec,
     private val initialSheetValue: ModalBottomSheetValue = ModalBottomSheetValue.Hidden,
     parentRouteController: RouteController? = null,
     contentRootResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     contentBuilder: BottomSheetContentBuilder,
     sheetContentBuilder: BottomSheetContentBuilder
-) : BottomSheetNavigator<A>(navigationMapper) {
+) : BottomSheetNavigator<Action>(navigationMapper) {
 
     private val bottomSheetNavigationState = MutableStateFlow<BottomSheetNavigatorState?>(null)
     private val sheetStateCoroutineScope = MutableStateFlow<CoroutineScope?>(null)
@@ -128,17 +130,19 @@ class RootModalBottomSheetNavigator<A : NavigationAction<*>>(
 
 /**
  * A [BottomSheetNavigator] that is managed by a [ModalBottomSheetLayout].
+ * Must have a ModalBottomSheetLayout set up higher in the View-hierarchy.
+ * @param Action the type of [NavigationAction] this navigator should respond to.
  * @param bottomSheetNavigatorState The [BottomSheetNavigatorState] controlling the routes.
  * @param contentResultHandlers A list of [NavHostResultHandler] to be added to the content of this navigator.
  * @param sheetContentResultHandlers A list of [NavHostResultHandler] to be added to the sheet content of this navigator.
- * @param navigationMapper Maps [A] to a [BottomSheetComposableNavSpec] to be navigated to.
+ * @param navigationMapper Maps [Action] to a [BottomSheetComposableNavSpec] to be navigated to.
  */
-class ModalBottomSheetNavigator<A : NavigationAction<*>>(
+class ModalBottomSheetNavigator<Action : NavigationAction<*>>(
     bottomSheetNavigatorState: StateFlow<BottomSheetNavigatorState?>,
     contentResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     sheetContentResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
-    navigationMapper: @Composable (A) -> BottomSheetComposableNavSpec
-) : BottomSheetNavigator<A>(navigationMapper) {
+    navigationMapper: @Composable (Action) -> BottomSheetComposableNavSpec
+) : BottomSheetNavigator<Action>(navigationMapper) {
 
     private val sheetStateCoroutineScope = MutableStateFlow<CoroutineScope?>(null)
 
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt
index 8bc399798..d3d486ea2 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetNavigatorState.kt
@@ -24,9 +24,9 @@ import kotlinx.coroutines.flow.StateFlow
 
 /**
  * The State of a [BottomSheetNavigator]
- * @param contentNavHostController The [NavHostController] managing the content of the bottom sheet.
- * @param sheetContentNavHostController The [NavHostController] managing the sheet content of the bottom sheet.
- * @param sheetState The [ModalBottomSheetState] of the bottom sheet.
+ * @property contentNavHostController The [NavHostController] managing the content of the bottom sheet.
+ * @property sheetContentNavHostController The [NavHostController] managing the sheet content of the bottom sheet.
+ * @property sheetState The [ModalBottomSheetState] of the bottom sheet.
  */
 data class BottomSheetNavigatorState(
     val contentNavHostController: NavHostController,
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
index 311115e3b..996061b2f 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRoute.kt
@@ -19,12 +19,16 @@ package com.splendo.kaluga.architecture.compose.navigation
 
 import androidx.compose.material.ModalBottomSheetLayout
 
+/**
+ * The specification for navigating from a [ModalBottomSheetLayout]
+ */
 sealed class BottomSheetComposableNavSpec
 
 /**
- * Route for navigating a [ModalBottomSheetLayout] using a [BottomSheetSheetContentRouteController]
+ * A [BottomSheetComposableNavSpec] for navigating using a [Route]
  */
 sealed class BottomSheetRoute : BottomSheetComposableNavSpec() {
+
     /**
      * Navigates within the sheet content of the [ModalBottomSheetLayout]
      * @param route The [Route] to navigate
@@ -38,6 +42,10 @@ sealed class BottomSheetRoute : BottomSheetComposableNavSpec() {
     data class Content(val route: Route) : BottomSheetRoute()
 }
 
+/**
+ * A [BottomSheetComposableNavSpec] that executes a [ComposableNavSpec.LaunchedNavigation] when navigating.
+ * @property launchedNavigation the [ComposableNavSpec.LaunchedNavigation] to launch when navigating.
+ */
 data class BottomSheetLaunchedNavigation(val launchedNavigation: ComposableNavSpec.LaunchedNavigation) : BottomSheetComposableNavSpec()
 
 /**
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt
index f29530abb..3f6dc1a40 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController.kt
@@ -20,12 +20,18 @@ package com.splendo.kaluga.architecture.compose.navigation
 import androidx.compose.material.ModalBottomSheetLayout
 
 /**
- * A controller that handles the [Route] for a [ModalBottomSheetLayout]
+ * A controller that handles the [BottomSheetRoute] for a [ModalBottomSheetLayout]
+ * @param contentRouteController The [RouteController] managing the content.
+ * @param sheetContentRouteController The [RouteController] managing the sheet content.
  */
 class BottomSheetRouteController(
     internal val contentRouteController: RouteController,
     internal val sheetContentRouteController: BottomSheetSheetContentRouteController
 ) {
+
+    /**
+     * Navigates using a given [BottomSheetRoute]
+     */
     fun navigate(route: BottomSheetRoute) = when (route) {
         is BottomSheetRoute.SheetContent -> sheetContentRouteController.navigate(route.route)
         is BottomSheetRoute.Content -> contentRouteController.navigate(route.route)
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
index 486e358db..ef9199e50 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavSpec.kt
@@ -51,8 +51,9 @@ sealed class ComposableNavSpec {
     companion object {
         /**
          * Creates a [ComposableNavSpec.Launcher] to open the camera to take a picture.
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
          * @param uri The [Uri] where the taken picture should be stored.
-         * @param onResult Returns `true` if a picture was taken successfully.
+         * @param onResult Callback method that returns whether a picture was taken successfully.
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> TakePicture(uri: Uri?, noinline onResult: ViewModel.(Boolean) -> Unit) = Launcher(
             ViewModel::class,
@@ -63,8 +64,9 @@ sealed class ComposableNavSpec {
 
         /**
          * Creates a [ComposableNavSpec.Launcher] to open the camera to capture a video.
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
          * @param uri The [Uri] where the captured video should be stored.
-         * @param onResult Returns `true` if a video was captured successfully.
+         * @param onResult Callback method that returns whether a video was captured successfully.
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> CaptureVideo(uri: Uri?, noinline onResult: ViewModel.(Boolean) -> Unit) = Launcher(
             ViewModel::class,
@@ -81,8 +83,9 @@ sealed class ComposableNavSpec {
 
         /**
          * Creates a [ComposableNavSpec.Launcher] to open Photo app to pick an image or video
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
          * @param type The [ActivityResultContracts.PickVisualMedia.VisualMediaType] to be selected.
-         * @param onResult Returns an [Uri] of the image or video selected, or `null` if nothing was selected.
+         * @param onResult Callback method that returns an [Uri] of the image or video selected, or `null` if nothing was selected.
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> PickVisualMedia(
             type: ActivityResultContracts.PickVisualMedia.VisualMediaType = ActivityResultContracts.PickVisualMedia.ImageAndVideo,
@@ -96,8 +99,9 @@ sealed class ComposableNavSpec {
 
         /**
          * Creates a [ComposableNavSpec.Launcher] to open Photo app to pick a number of images or videos
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
          * @param type The [ActivityResultContracts.PickVisualMedia.VisualMediaType] to be selected.
-         * @param onResult Returns a list of [Uri] of the images or videos selected.
+         * @param onResult Callback method that returns a list of [Uri] of the images or videos selected.
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> PickMultipleVisualMedia(
             maxItems: Int? = null,
@@ -112,8 +116,9 @@ sealed class ComposableNavSpec {
 
         /**
          * Creates a [ComposableNavSpec.Launcher] to open the file manager app to pick a file.
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
          * @param types List of mime types allowed to be selected.
-         * @param onResult Returns an [Uri] of the file selected, or `null` if nothing was selected.
+         * @param onResult Callback method that returns an [Uri] of the file selected, or `null` if nothing was selected.
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> OpenDocument(types: List<String>, noinline onResult: ViewModel.(Uri?) -> Unit) = Launcher(
             ViewModel::class,
@@ -124,8 +129,9 @@ sealed class ComposableNavSpec {
 
         /**
          * Creates a [ComposableNavSpec.Launcher] to open the file manager app to pick a number of files.
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
          * @param types List of mime types allowed to be selected.
-         * @param onResult Returns a list of [Uri] of the documents selected.
+         * @param onResult Callback method that returns a list of [Uri] of the documents selected.
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> OpenMultipleDocument(types: List<String>, noinline onResult: ViewModel.(List<Uri>) -> Unit) = Launcher(
             ViewModel::class,
@@ -136,9 +142,10 @@ sealed class ComposableNavSpec {
 
         /**
          * Creates a [ComposableNavSpec.Launcher] to open create a new file.
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
          * @param fileName The suggested name of the file.
          * @param mimeType The mime type of the file.
-         * @param onResult Returns the [Uri] of the document created.
+         * @param onResult Callback method that returns the [Uri] of the document created.
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> CreateDocument(fileName: String, mimeType: String, noinline onResult: ViewModel.(Uri?) -> Unit) = Launcher(
             ViewModel::class,
@@ -149,8 +156,9 @@ sealed class ComposableNavSpec {
 
         /**
          * Creates a [ComposableNavSpec.Launcher] to open the file manager app to pick a folder.
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
          * @param startingLocation Optional [Uri] of the folder to start in.
-         * @param onResult Returns an [Uri] of the folder selected, or `null` if nothing was selected.
+         * @param onResult Callback method that returns an [Uri] of the folder selected, or `null` if nothing was selected.
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> OpenDocumentTree(startingLocation: Uri? = null, noinline onResult: ViewModel.(Uri?) -> Unit) = Launcher(
             ViewModel::class,
@@ -161,7 +169,8 @@ sealed class ComposableNavSpec {
 
         /**
          * Creates a [ComposableNavSpec.Launcher] to open the contacts list to select a contact.
-         * @param onResult Returns an [Uri] of the contact selected, or `null` if nothing was selected.
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
+         * @param onResult Callback method that returns an [Uri] of the contact selected, or `null` if nothing was selected.
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> PickContact(noinline onResult: ViewModel.(Uri?) -> Unit) = Launcher(
             ViewModel::class,
@@ -172,8 +181,9 @@ sealed class ComposableNavSpec {
 
         /**
          * Creates a [ComposableNavSpec.Launcher] to request a permission.
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
          * @param permission Key of the permission to be requested. E.g. [android.Manifest.permission.ACCESS_COARSE_LOCATION].
-         * @param onResult Returns `true` if the permission was granted, `false` otherwise.
+         * @param onResult Callback method that returns `true` if the permission was granted, `false` otherwise.
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> RequestPermission(permission: String, noinline onResult: ViewModel.(Boolean) -> Unit) = Launcher(
             ViewModel::class,
@@ -184,8 +194,9 @@ sealed class ComposableNavSpec {
 
         /**
          * Creates a [ComposableNavSpec.Launcher] to request multiple permissions.
+         * @param ViewModel the type of [BaseLifecycleViewModel] the result should be called on.
          * @param permissions Keys of the permission to be requested. E.g. [android.Manifest.permission.ACCESS_COARSE_LOCATION].
-         * @param onResult Returns map containing whether the permission was granted for each permission in [permissions].
+         * @param onResult Callback method that returns a map containing whether the permission was granted for each permission in [permissions].
          */
         inline fun <reified ViewModel : BaseLifecycleViewModel> RequestMultiplePermissions(permissions: List<String>, noinline onResult: ViewModel.(Map<String, Boolean>) -> Unit) = Launcher(
             ViewModel::class,
@@ -259,6 +270,8 @@ sealed class ComposableNavSpec {
 
         /**
          * Launch this [LaunchedNavigation] for a given [viewModel].
+         * @param viewModel The [BaseLifecycleViewModel] to launch for.
+         * @param onDispose disposing method to be called when launching has completed.
          */
         @Composable
         fun Launch(viewModel: BaseLifecycleViewModel, onDispose: () -> Unit) {
@@ -274,11 +287,12 @@ sealed class ComposableNavSpec {
     }
 
     /**
-     * Navigates using an [ActivityResultLauncher] and a valid input.
-     * @param viewModelClass The class of the ViewModel the result of this launcher is to be applied to.
-     * @param activityResultContract The [ActivityResultContract] to launch with.
-     * @param getInput The input to be provided to [activityResultContract]
-     * @param onResult Callback to handle the result of [activityResultContract]
+     * A [LaunchedNavigation] that navigates using an [ActivityResultLauncher] and a valid input.
+     * @param ViewModel the type of [BaseLifecycleViewModel] that any [onResult] should be applied to.
+     * @property viewModelClass The class of the ViewModel the result of this launcher is to be applied to.
+     * @property activityResultContract The [ActivityResultContract] to launch with.
+     * @property getInput The input to be provided to [activityResultContract]
+     * @property onResult Callback to handle the result of [activityResultContract]
      */
     data class Launcher<ViewModel : BaseLifecycleViewModel, Input, Output>(
         val viewModelClass: KClass<ViewModel>,
@@ -289,7 +303,7 @@ sealed class ComposableNavSpec {
 
         @Composable
         override fun createLauncher(viewModel: BaseLifecycleViewModel, onDispose: () -> Unit): () -> Unit {
-            // Create a ManagedActivityResultLauncher to hadle the contract.
+            // Create a ManagedActivityResultLauncher to handle the contract.
             // This launcher needs to remain in the Compose stack since otherwise onResult will not return.
             // Therefore only call onDispose when onResult is received.
             val launcher = rememberLauncherForActivityResult(activityResultContract) { result ->
@@ -310,8 +324,8 @@ sealed class ComposableNavSpec {
     }
 
     /**
-     * Closes the current [android.app.Activity]
-     * @param result Optional result code and
+     * A [LaunchedNavigation] that closes the current [android.app.Activity]
+     * @property result Optional result code and [NavigationBundle] to be sent to the previous screen.
      */
     data class CloseActivity(val result: Pair<Int, NavigationBundle<*>?>? = null) : LaunchedNavigation() {
         @Composable
@@ -333,9 +347,9 @@ sealed class ComposableNavSpec {
     }
 
     /**
-     * Shows a [DialogFragment]
-     * @param tag Optional tag to add to the Dialog
-     * @param createDialog Function to create the [DialogFragment] to display
+     * A [LaunchedNavigation] that shows a [DialogFragment]
+     * @property tag Optional tag to add to the Dialog
+     * @property createDialog Function to create the [DialogFragment] to display
      */
     data class Dialog(
         val tag: String? = null,
@@ -355,8 +369,8 @@ sealed class ComposableNavSpec {
     }
 
     /**
-     * Navigates according to a given [Intent]
-     * @param createIntent Creates the [Intent] to navigate to
+     * A [LaunchedNavigation] that navigates according to a given [Intent]
+     * @property createIntent Creates the [Intent] to navigate to
      */
     data class IntentLauncher(val createIntent: @Composable Activity.() -> Intent?) : LaunchedNavigation() {
 
@@ -376,6 +390,9 @@ sealed class ComposableNavSpec {
 
 /**
  * Creates a [ComposableNavSpec.Launcher] that takes the [SingleValueNavigationAction.value] as the input of its [ActivityResultContract].
+ * @param ViewModel the type of [BaseLifecycleViewModel] that any [onResult] should be applied to.
+ * @param Input the type of input the [activityResultContract] expects.
+ * @param Output the type of output the [activityResultContract] produces.
  * @param activityResultContract The [ActivityResultContract] to launch.
  * @param onResult The result received after the launched screen has completed.
  */
@@ -385,9 +402,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, Input, Output> SingleVal
 ) = ComposableNavSpec.Launcher(ViewModel::class, activityResultContract, { value }, onResult)
 
 /**
- * Creates a [ComposableNavSpec.Launcher] that takes an [Intent] containing the [NavigationAction.bundle] as the input of its [ActivityResultContract].
- * @param activityResultContract The [ActivityResultContract] to launch.
- * @param flags A set of [IntentFlag] to be applied to the next screen.
+ * Creates a [ComposableNavSpec.Launcher] to launch an [Activity] with the [NavigationAction.bundle].
+ * @param Activity The type of [android.app.Activity] to launch.
+ * @param ViewModel the type of [BaseLifecycleViewModel] that any [onResult] should be applied to.
+ * @param Output the type of output the [activityResultContract] produces.
+ * @param activityResultContract The [ActivityResultContract] to launch. Must have [Intent] as its input type.
+ * @param flags A set of [IntentFlag] to be applied to the launched activity.
  * @param onResult The result received after the launched screen has completed.
  */
 inline fun <reified Activity : android.app.Activity, reified ViewModel : BaseLifecycleViewModel, Output> NavigationAction<*>.Launcher(
@@ -410,6 +430,7 @@ inline fun <reified Activity : android.app.Activity, reified ViewModel : BaseLif
 
 /**
  * Creates a [ComposableNavSpec.IntentLauncher] to show a given [Activity]
+ * @param Activity The type of [android.app.Activity] to launch.
  * @param flags A set of [IntentFlag] to be applied to the next screen.
  */
 inline fun <reified Activity : android.app.Activity> NavigationAction<*>.ShowActivity(
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
index fb6ca09d8..a601f8189 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/ComposableNavigator.kt
@@ -22,20 +22,18 @@ typealias RouteContentBuilder = NavGraphBuilder.(StateFlow<NavHostController?>)
 
 /**
  * A Navigator managed by a [RouteController]
- * @param navigationMapper A mapper that converts an [NavigationAction] handled by this navigator into a [Route]
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ * @param navigationMapper A mapper that converts an [Action] handled by this navigator into a [ComposableNavSpec]
  */
-sealed class ComposableNavigator<A : NavigationAction<*>>(
-    private val navigationMapper: @Composable (A) -> ComposableNavSpec
-) : Navigator<A>, ComposableLifecycleSubscribable {
+sealed class ComposableNavigator<Action : NavigationAction<*>>(
+    private val navigationMapper: @Composable (Action) -> ComposableNavSpec
+) : Navigator<Action>, ComposableLifecycleSubscribable {
 
-    /**
-     * [RouteController] managing the [Route] navigation
-     */
-    abstract val routeController: RouteController?
+    protected abstract val routeController: RouteController?
 
-    private val actionState = MutableStateFlow<A?>(null)
+    private val actionState = MutableStateFlow<Action?>(null)
 
-    override fun navigate(action: A) {
+    override fun navigate(action: Action) {
         actionState.value = action
     }
 
@@ -46,7 +44,7 @@ sealed class ComposableNavigator<A : NavigationAction<*>>(
         contentModifier(content)
     }
 
-    abstract val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit
+    protected abstract val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit
 
     @Composable
     protected fun BaseLifecycleViewModel.SetupNavigationAction() {
@@ -71,18 +69,19 @@ sealed class ComposableNavigator<A : NavigationAction<*>>(
 }
 
 /**
- * A [ComposableNavigator] that creates and manages a [NavHost]. This should be on top of any [NavHostComposableNavigator]
- * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
+ * A [ComposableNavigator] that creates and manages a [NavHost]. This should be on top of any [NavHostComposableNavigator] in the View-hierarchy
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ * @param navigationMapper Maps [Action] to a [ComposableNavSpec] to be navigated to.
  * @param parentRouteController A [RouteController] managing the parent layout of the [NavHost].
  * @param rootResultHandlers A list of [NavHostResultHandler] to be added to the root view.
  * @param contentBuilder The [RouteContentBuilder] describing the navigation graph
  */
-class RootNavHostComposableNavigator<A : NavigationAction<*>>(
-    navigationMapper: @Composable (A) -> ComposableNavSpec,
+class RootNavHostComposableNavigator<Action : NavigationAction<*>>(
+    navigationMapper: @Composable (Action) -> ComposableNavSpec,
     parentRouteController: RouteController? = null,
     rootResultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     contentBuilder: RouteContentBuilder
-) : ComposableNavigator<A>(navigationMapper) {
+) : ComposableNavigator<Action>(navigationMapper) {
 
     private val navHostController = MutableStateFlow<NavHostController?>(null)
     override val routeController: RouteController = NavHostRouteController(navHostController, parentRouteController)
@@ -110,16 +109,19 @@ class RootNavHostComposableNavigator<A : NavigationAction<*>>(
 }
 
 /**
- * A [ComposableNavigator] that is managed by a [NavHost]
+ * A [ComposableNavigator] that is managed by a [NavHost].
+ * Must have a NavHost set up higher up in the View-hierarchy.
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ * @param Provider the type of provider associated with the [ProvidingNavHostRouteController] controlling the route.
  * @param routeController The [ProvidingNavHostRouteController] controlling the route.
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
- * @param navigationMapper Maps [A] to a [Route] to be navigated to.
+ * @param navigationMapper Maps [Action] to a [Route] to be navigated to.
  */
-sealed class ProvidingNavHostComposableNavigator<A : NavigationAction<*>, Provider>(
+sealed class ProvidingNavHostComposableNavigator<Action : NavigationAction<*>, Provider>(
     override val routeController: ProvidingNavHostRouteController<Provider>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
-    navigationMapper: @Composable (A) -> ComposableNavSpec
-) : ComposableNavigator<A>(navigationMapper) {
+    navigationMapper: @Composable (Action) -> ComposableNavSpec
+) : ComposableNavigator<Action>(navigationMapper) {
 
     override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content ->
         // Add Result Handlers
@@ -129,34 +131,38 @@ sealed class ProvidingNavHostComposableNavigator<A : NavigationAction<*>, Provid
 }
 
 /**
- * A [ComposableNavigator] that navigates for a flow of [NavHostController]
- * @param navHostController The flow of [NavHostController] to manage this navigator
+ * A [ProvidingNavHostComposableNavigator] that navigates for a flow of [NavHostController]
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ * @param navHostController The [StateFlow] of [NavHostController] to manage this navigator
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
- * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
+ * @param parentRouteController An optional parent [RouteController] managing the navigation of a view higher in the hierarchy.
+ * @param navigationMapper Maps [Action] to a [ComposableNavSpec] to be navigated to.
  */
-class NavHostComposableNavigator<A : NavigationAction<*>>(
+class NavHostComposableNavigator<Action : NavigationAction<*>>(
     navHostController: StateFlow<NavHostController?>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     parentRouteController: RouteController? = null,
-    navigationMapper: @Composable (A) -> ComposableNavSpec
-) : ProvidingNavHostComposableNavigator<A, NavHostController>(
+    navigationMapper: @Composable (Action) -> ComposableNavSpec
+) : ProvidingNavHostComposableNavigator<Action, NavHostController>(
     NavHostRouteController(navHostController, parentRouteController),
     resultHandlers,
     navigationMapper
 )
 
 /**
- * A [ComposableNavigator] that navigates for the content of a flow of [BottomSheetNavigatorState]
- * @param bottomSheetNavigator The flow of [BottomSheetNavigatorState] to manage this navigator
+ * A [ProvidingNavHostComposableNavigator] that navigates for the [BottomSheetNavigatorState.contentNavHostController] of a flow of [BottomSheetNavigatorState]
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ * @param bottomSheetNavigator The [StateFlow] of [BottomSheetNavigatorState] to manage this navigator
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
- * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
+ * @param parentRouteController An optional parent [RouteController] managing the navigation of a view higher in the hierarchy.
+ * @param navigationMapper Maps [Action] to a [ComposableNavSpec] to be navigated to.
  */
-class BottomSheetContentNavHostComposableNavigator<A : NavigationAction<*>>(
+class BottomSheetContentNavHostComposableNavigator<Action : NavigationAction<*>>(
     bottomSheetNavigator: StateFlow<BottomSheetNavigatorState?>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
     parentRouteController: RouteController? = null,
-    navigationMapper: @Composable (A) -> ComposableNavSpec
-) : ProvidingNavHostComposableNavigator<A, BottomSheetNavigatorState>(
+    navigationMapper: @Composable (Action) -> ComposableNavSpec
+) : ProvidingNavHostComposableNavigator<Action, BottomSheetNavigatorState>(
     BottomSheetContentRouteController(bottomSheetNavigator, parentRouteController),
     resultHandlers,
     navigationMapper
@@ -164,15 +170,16 @@ class BottomSheetContentNavHostComposableNavigator<A : NavigationAction<*>>(
 
 /**
  * A [ComposableNavigator] that navigates for the sheet content of a flow of [BottomSheetNavigatorState]
+ * @param Action the type of [NavigationAction] this navigator should respond to.
  * @param bottomSheetNavigator The flow of [BottomSheetNavigatorState] to manage this navigator
  * @param resultHandlers The [NavHostResultHandler] to add to this navigator.
- * @param navigationMapper Maps [A] to a [ComposableNavSpec] to be navigated to.
+ * @param navigationMapper Maps [Action] to a [ComposableNavSpec] to be navigated to.
  */
-class BottomSheetSheetContentNavHostComposableNavigator<A : NavigationAction<*>>(
+class BottomSheetSheetContentNavHostComposableNavigator<Action : NavigationAction<*>>(
     bottomSheetNavigator: StateFlow<BottomSheetNavigatorState?>,
     resultHandlers: List<NavHostResultHandler<*, *>> = emptyList(),
-    navigationMapper: @Composable (A) -> ComposableNavSpec
-) : ComposableNavigator<A>(navigationMapper) {
+    navigationMapper: @Composable (Action) -> ComposableNavSpec
+) : ComposableNavigator<Action>(navigationMapper) {
 
     private val coroutineScopeState = MutableStateFlow<CoroutineScope?>(null)
     override val routeController = BottomSheetSheetContentRouteController(bottomSheetNavigator, coroutineScopeState)
@@ -187,11 +194,12 @@ class BottomSheetSheetContentNavHostComposableNavigator<A : NavigationAction<*>>
 
 /**
  * A [ComposableNavigator] that only supports [ComposableNavSpec.LaunchedNavigation] navigation.
- * @param navigationMapper Maps [A] to a [ComposableNavSpec.LaunchedNavigation] to be navigated to.
+ * @param Action the type of [NavigationAction] this navigator should respond to.
+ * @param navigationMapper Maps [Action] to a [ComposableNavSpec.LaunchedNavigation] to be navigated to.
  */
-class LaunchedComposableNavigator<A : NavigationAction<*>>(
-    navigationMapper: @Composable (A) -> ComposableNavSpec.LaunchedNavigation
-) : ComposableNavigator<A>(navigationMapper) {
+class LaunchedComposableNavigator<Action : NavigationAction<*>>(
+    navigationMapper: @Composable (Action) -> ComposableNavSpec.LaunchedNavigation
+) : ComposableNavigator<Action>(navigationMapper) {
     override val routeController: RouteController? = null
     override val contentModifier: @Composable BaseLifecycleViewModel.(@Composable BaseLifecycleViewModel.() -> Unit) -> Unit = @Composable { content -> content() }
 }
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
index 153b80c85..ce3baf2e6 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
@@ -10,15 +10,13 @@ import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import com.splendo.kaluga.architecture.compose.activity
-import com.splendo.kaluga.architecture.compose.viewModel.KalugaViewModelComposeActivity
-import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.subscribe
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 /**
- * Current implementation expects [KalugaViewModelComposeActivity] to be a host since it provides [LocalAppCompatActivity].
+ * Binds an [ActivityLifecycleSubscribable] to the lifecycle of the [androidx.appcompat.app.AppCompatActivity] associated with the current [LocalContext]
  */
 @Composable
 fun ActivityLifecycleSubscribable.bind(): ActivityLifecycleSubscribable {
@@ -36,6 +34,7 @@ fun ActivityLifecycleSubscribable.bind(): ActivityLifecycleSubscribable {
 
 /**
  * Adds a handler for a hardware back button
+ * @param onBackButtonClickHandler The handler to execute when the back button is pressed.
  */
 @Composable
 fun HardwareBackButtonNavigation(onBackButtonClickHandler: suspend () -> Unit) {
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
index 7ed6977af..bb0ae8247 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
@@ -49,7 +49,9 @@ val NavigationBundleSpecRow<*>.argumentKey: String get() = key ?: javaClass.simp
 /**
  * Creates a route string associated with a [NavigationAction] class given its [NavigationBundleSpec].
  * The route created by this method will create placeholders for all properties of the [spec]
- * @param spec The [NavigationBundleSpec] describing the associated [NavigationAction]
+ * @param SpecRow the type of [NavigationBundleSpecRow] associated with this action.
+ * @param Action the type [NavigationAction] to create the route string for.
+ * @param spec The [NavigationBundleSpec] describing the [Action]
  */
 inline fun <SpecRow : NavigationBundleSpecRow<*>, reified Action : NavigationAction<SpecRow>> route(
     spec: NavigationBundleSpec<SpecRow>
@@ -58,11 +60,13 @@ inline fun <SpecRow : NavigationBundleSpecRow<*>, reified Action : NavigationAct
 /**
  * Creates a route string associated with a [NavigationAction] class given its [NavigationBundleSpec].
  * The route created by this method will create placeholders for all properties of the [spec]
- * @param actionClass The [KClass] of the [NavigationAction] to create the route for
+ * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+ * @param Action the type [NavigationAction] to create the route string for.
+ * @param actionClass The [KClass] of the [Action] to create the route for
  * @param spec The [NavigationBundleSpec] describing the associated [NavigationAction]
  */
-fun <SpecRow : NavigationBundleSpecRow<*>, T : NavigationAction<SpecRow>> route(
-    actionClass: KClass<T>,
+fun <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> route(
+    actionClass: KClass<Action>,
     spec: NavigationBundleSpec<SpecRow>
 ): String {
     val arguments = spec.rows.mapNotNull { row ->
@@ -78,7 +82,8 @@ fun <SpecRow : NavigationBundleSpecRow<*>, T : NavigationAction<SpecRow>> route(
 
 /**
  * Creates a route string for a [NavigationAction].
- * The route created by this method will will in all arguments of the action into the route
+ * The route created by this method will will in all arguments of the action into the route.
+ * @param SpecRow the type of [NavigationBundleSpecRow] associated with this action.
  */
 fun <SpecRow : NavigationBundleSpecRow<*>> NavigationAction<SpecRow>.route(): String {
     val arguments = bundle?.values?.mapNotNull { (row, value) ->
@@ -170,20 +175,43 @@ private val NavigationBundleValue<*>.routeArgument: String?
 sealed class Route : ComposableNavSpec() {
 
     companion object {
+        /**
+         * Convenience method to create a [Route.Back] with an empty result
+         */
         val Back = Back()
+
+        /**
+         * Convenience method to create a [Route.PopToRoot] with an empty result
+         */
         val PopToRoot = PopToRoot()
     }
 
+    /**
+     * The result of a [Route].
+     */
     sealed class Result {
         companion object {
             const val KEY = "com.splendo.kaluga.architecture.compose.navigation.Route.Result.KEY"
         }
+
+        /**
+         * An empty result
+         */
         object Empty : Result()
+
+        /**
+         * Result of a given type
+         * @param SpecRow the type of [NavigationBundleSpecRow] stored in [bundle]
+         * @param Bundle the type of [NavigationBundle] to to use as a result
+         * @property bundle The [Bundle] value of the result
+         */
         data class Data<SpecRow : NavigationBundleSpecRow<*>, Bundle : NavigationBundle<SpecRow>>(val bundle: Bundle) : Result()
     }
 
     /**
-     * Route that navigates to a new screen using a [NavigationAction]
+     * [Route] that navigates to a new screen using a [NavigationAction]
+     * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+     * @param Action the type [NavigationAction] to navigate for.
      */
     sealed class Navigate<SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> :
         Route() {
@@ -196,17 +224,21 @@ sealed class Route : ComposableNavSpec() {
     }
 
     /**
-     * Route that navigates from the current screen to the screen associated with a [NavigationAction]
-     * @param routeAction The [Action] associated with the screen to navigate to
+     * [Navigate] that navigates from the current screen to the screen associated with a [NavigationAction]
+     * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+     * @param Action the type [NavigationAction] to navigate for.
+     * @property routeAction The [Action] associated with the screen to navigate to
      */
     data class NextRoute<SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>>(
         override val routeAction: Action
     ) : Navigate<SpecRow, Action>()
 
     /**
-     * Route that navigates from a given route to the screen associated with a [NavigationAction]
-     * @param routeAction The [Action] associated with the screen to navigate to
-     * @param from The route to navigate from
+     * [Navigate] that navigates from a given route to the screen associated with a [NavigationAction]
+     * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+     * @param Action the type [NavigationAction] to navigate for.
+     * @property routeAction The [Action] associated with the screen to navigate to
+     * @property from The route string to navigate from
      */
     data class FromRoute<SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>>(
         override val routeAction: Action,
@@ -214,9 +246,11 @@ sealed class Route : ComposableNavSpec() {
     ) : Navigate<SpecRow, Action>()
 
     /**
-     * Route that navigates back to the screen associated with a [NavigationAction]
-     * @param routeAction The [Action] associated with the screen to navigate back to.
-     * @param result The [Result] to be provided to the screen to navigate back to.
+     * [Navigate] that navigates back to the screen associated with a [NavigationAction]
+     * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+     * @param Action the type [NavigationAction] to navigate for.
+     * @property routeAction The [Action] associated with the screen to navigate back to.
+     * @property result The [Result] to be provided to the screen to navigate back to.
      */
     data class PopTo<
         SpecRow : NavigationBundleSpecRow<*>,
@@ -227,41 +261,47 @@ sealed class Route : ComposableNavSpec() {
     ) : Navigate<SpecRow, Action>()
 
     /**
-     * Route that navigates back from the screen associated with a [NavigationAction]
-     * @param routeAction The [Action] associated with the screen to navigate back from
+     * [Navigate] that navigates back from the screen associated with a [NavigationAction]
+     * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+     * @param Action the type [NavigationAction] to navigate for.
+     * @property routeAction The [Action] associated with the screen to navigate back from
      */
     data class PopToIncluding<SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>>(
         override val routeAction: Action
     ) : Navigate<SpecRow, Action>()
 
     /**
-     * Route that replaces the current screen to the screen associated with a [NavigationAction]
-     * @param routeAction The [Action] associated with the screen to replace the current screen with
+     * [Navigate] that replaces the current screen to the screen associated with a [NavigationAction]
+     * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+     * @param Action the type [NavigationAction] to navigate for.
+     * @property routeAction The [Action] associated with the screen to replace the current screen with
      */
     data class Replace<SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>>(
         override val routeAction: Action
     ) : Navigate<SpecRow, Action>()
 
     /**
-     * Navigates back one step in the hierarchy
-     * @param result The [Result] to provide to the previous view.
+     * [Route] that navigates back one step in the hierarchy
+     * @property result The [Result] to provide to the previous view.
      */
     data class Back(val result: Result = Result.Empty) : Route()
 
     /**
-     * Navigates to the Root of a navigation stack
-     * @param result The [Result] to provide to the root view.
+     * [Route] that navigates to the Root of a navigation stack
+     * @property result The [Result] to provide to the root view.
      */
     data class PopToRoot(val result: Result = Result.Empty) : Route()
 
     /**
-     * Closes all screens in the navigation stack
+     * [Route] that closes all screens in the navigation stack
      */
     object Close : Route()
 }
 
 /**
  * Creates a [Route.NextRoute] from [Action]
+ * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+ * @param Action the type [NavigationAction] to create the [Route] for.
  */
 val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> Action.next
     get() = Route.NextRoute(
@@ -270,6 +310,8 @@ val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> A
 
 /**
  * Creates a [Route.FromRoute] from [Action]
+ * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+ * @param Action the type [NavigationAction] to create the [Route] for.
  * @param route The string route to navigate from
  */
 fun <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> Action.from(route: String) =
@@ -277,6 +319,8 @@ fun <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> A
 
 /**
  * Creates a [Route.FromRoute] that navigates to the Root view from [Action]
+ * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+ * @param Action the type [NavigationAction] to create the [Route] for.
  */
 val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> Action.fromRoot
     get() = Route.FromRoute(
@@ -286,6 +330,8 @@ val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> A
 
 /**
  * Creates a [Route.PopTo] from [Action]
+ * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+ * @param Action the type [NavigationAction] to create the [Route] for.
  */
 val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> Action.popTo
     get() = Route.PopTo(
@@ -295,6 +341,8 @@ val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> A
 
 /**
  * Creates a [Route.PopToIncluding] from [Action]
+ * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+ * @param Action the type [NavigationAction] to create the [Route] for.
  */
 val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> Action.popToIncluding
     get() = Route.PopToIncluding(
@@ -303,6 +351,8 @@ val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> A
 
 /**
  * Creates a [Route.Replace] from [Action]
+ * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+ * @param Action the type [NavigationAction] to create the [Route] for.
  */
 val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> Action.replace
     get() = Route.Replace(
@@ -311,6 +361,8 @@ val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> A
 
 /**
  * Creates a [Route.Back] from [Action]
+ * @param SpecRow the type of [NavigationBundleSpecRow] associated with the action.
+ * @param Action the type [NavigationAction] to create the [Route] for.
  */
 val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> Action.back
     get() = Route.Back(
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
index 7465d0774..5809bc2a3 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/RouteController.kt
@@ -36,6 +36,9 @@ import kotlinx.coroutines.launch
  */
 sealed interface RouteController {
 
+    /**
+     * Adds a list of [NavHostResultHandler] to handles results for this route controller.
+     */
     @Composable
     fun AddResultHandlers(viewModel: BaseLifecycleViewModel, resultHandlers: List<NavHostResultHandler<*, *>>)
 
@@ -58,7 +61,8 @@ sealed interface RouteController {
 
 /**
  * Abstract [RouteController] that navigates on a [NavHostController] provided by a [Provider]
- * @param provider The [Provider] of the [NavHostController]
+ * @param Provider a type of class that can provide a [NavHostController]
+ * @param provider A [StateFlow] of [Provider].
  * @param parentRouteController An optional parent [RouteController] managing this controller.
  */
 sealed class ProvidingNavHostRouteController<Provider>(
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
index fdb05af4a..a05811fdf 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
@@ -23,41 +23,644 @@ import androidx.compose.runtime.collectAsState
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import com.splendo.kaluga.architecture.compose.navigation.Route
-import com.splendo.kaluga.architecture.navigation.NavigationBundle
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
-import com.splendo.kaluga.architecture.navigation.SingleValueNavigationSpec
-import com.splendo.kaluga.architecture.navigation.toNavigationBundle
-import com.splendo.kaluga.architecture.navigation.toTypedProperty
+import com.splendo.kaluga.architecture.navigation.*
+import com.splendo.kaluga.base.utils.KalugaDate
+import kotlinx.serialization.KSerializer
 
 /**
- * Handles a [Route.Result] matching a given [NavigationBundleSpec]
+ * Handles a [Route.Result.Data] matching a given [NavigationBundleSpec]
+ * @param Row the type of [NavigationBundleSpecRow] to .
  * @param spec The [NavigationBundleSpec] used to create the [Route.Result]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result
+ * @throws [BundleConversionError] if the [Bundle] does not contain the correct keys or values associated with the [NavigationBundleSpec]
  */
 @Composable
-fun <R : NavigationBundleSpecRow<*>> NavHostController.HandleResult(
-    spec: NavigationBundleSpec<R>,
+fun <Row : NavigationBundleSpecRow<*>> NavHostController.HandleResult(
+    spec: NavigationBundleSpec<Row>,
     retain: Boolean = false,
-    onResult: NavigationBundle<R>.() -> Unit
+    onResult: NavigationBundle<Row>.() -> Unit
 ) = HandleResult(retain) { toNavigationBundle(spec).onResult() }
 
 /**
- * Handles a [Route.Result] matching a given [NavigationBundleSpecType]
- * Requires that the [Route.Result] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType]
+ * Handles a [Route.Result.Data] matching a given [NavigationBundleSpecType]
+ * Requires that [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType]
+ * @param T the type of the result.
  * @param type The [NavigationBundleSpecType] stored in the result
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec]
  */
 @Composable
-fun <R> NavHostController.HandleResult(
-    type: NavigationBundleSpecType<R>,
+fun <T> NavHostController.HandleResult(
+    type: NavigationBundleSpecType<T>,
     retain: Boolean = false,
-    onResult: R.() -> Unit
+    onResult: T.() -> Unit
 ) = HandleResult(retain) { toTypedProperty(type).onResult() }
 
+/**
+ * Handles a [Route.Result.Data] matching a given [NavigationBundleSpecType]
+ * Requires that [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType] either directly or wrapped in [NavigationBundleSpecType.OptionalType]
+ * @param T the type of the result.
+ * @param type The [NavigationBundleSpecType] stored in the result
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received result
+ */
+@Composable
+fun <T : Any> NavHostController.HandleResultOrNull(
+    type: NavigationBundleSpecType<T>,
+    retain: Boolean = false,
+    onResult: T?.() -> Unit
+) = HandleResult(retain) { toTypedPropertyOrNull(type).onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a given [NavigationBundleSpecType]
+ * Requires that [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType]
+ * @param T the type of the result.
+ * @param type The [NavigationBundleSpecType] stored in the result
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received result
+ */
+@Composable
+@JvmName("HandleNullableResultOrNull")
+fun <T> NavHostController.HandleResultOrNull(
+    type: NavigationBundleSpecType<T>,
+    retain: Boolean = false,
+    onResult: T?.() -> Unit
+) = HandleResult(retain) { toTypedPropertyOrNull(type).onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Boolean
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Boolean
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanType].
+ */
+@Composable
+fun NavHostController.HandleBooleanResult(
+    retain: Boolean = false,
+    onResult: Boolean.() -> Unit
+) = HandleResult(retain) { asBoolean().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Boolean or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Boolean
+ */
+@Composable
+fun NavHostController.HandleBooleanOrNullResult(
+    retain: Boolean = false,
+    onResult: Boolean?.() -> Unit
+) = HandleResult(retain) { asBooleanOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [BooleanArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanArrayType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Boolean
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanArrayType].
+ */
+@Composable
+fun NavHostController.HandleBooleanArrayResult(
+    retain: Boolean = false,
+    onResult: BooleanArray.() -> Unit
+) = HandleResult(retain) { asBooleanArray().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [BooleanArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Boolean
+ */
+@Composable
+fun NavHostController.HandleBooleanArrayOrNullResult(
+    retain: Boolean = false,
+    onResult: BooleanArray?.() -> Unit
+) = HandleResult(retain) { asBooleanArrayOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Byte
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Byte
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteType].
+ */
+@Composable
+fun NavHostController.HandleByteResult(
+    retain: Boolean = false,
+    onResult: Byte.() -> Unit
+) = HandleResult(retain) { asByte().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Byte or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Byte
+ */
+@Composable
+fun NavHostController.HandleByteOrNullResult(
+    retain: Boolean = false,
+    onResult: Byte?.() -> Unit
+) = HandleResult(retain) { asByteOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [ByteArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [ByteArray]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType].
+ */
+@Composable
+fun NavHostController.HandleByteArrayResult(
+    retain: Boolean = false,
+    onResult: ByteArray.() -> Unit
+) = HandleResult(retain) { asByteArray().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [ByteArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [ByteArray] or`null`
+ */
+@Composable
+fun NavHostController.HandleByteArrayOrNullResult(
+    retain: Boolean = false,
+    onResult: ByteArray?.() -> Unit
+) = HandleResult(retain) { asByteArrayOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Char
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Char
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharType].
+ */
+@Composable
+fun NavHostController.HandleCharResult(
+    retain: Boolean = false,
+    onResult: Char.() -> Unit
+) = HandleResult(retain) { asChar().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Char or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Char or`null`
+ */
+@Composable
+fun NavHostController.HandleCharOrNullResult(
+    retain: Boolean = false,
+    onResult: Char?.() -> Unit
+) = HandleResult(retain) { asCharOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [CharArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharArrayType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [CharArray]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharArrayType].
+ */
+@Composable
+fun NavHostController.HandleCharArrayResult(
+    retain: Boolean = false,
+    onResult: CharArray.() -> Unit
+) = HandleResult(retain) { asCharArray().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [CharArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [CharArray] or`null`
+ */
+@Composable
+fun NavHostController.HandleCharArrayOrNullResult(
+    retain: Boolean = false,
+    onResult: CharArray?.() -> Unit
+) = HandleResult(retain) { asCharArrayOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [CharSequence]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharSequenceType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [CharSequence]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharSequenceType].
+ */
+@Composable
+fun NavHostController.HandleCharSequenceResult(
+    retain: Boolean = false,
+    onResult: CharSequence.() -> Unit
+) = HandleResult(retain) { asCharSequence().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [CharSequence] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharSequenceType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [CharSequence] or`null`
+ */
+@Composable
+fun NavHostController.HandleCharSequenceOrNullResult(
+    retain: Boolean = false,
+    onResult: CharSequence?.() -> Unit
+) = HandleResult(retain) { asCharSequenceOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [KalugaDate]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [KalugaDate]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateType].
+ */
+@Composable
+fun NavHostController.HandleDateResult(
+    retain: Boolean = false,
+    onResult: KalugaDate.() -> Unit
+) = HandleResult(retain) { asDate().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [KalugaDate] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [KalugaDate] or`null`
+ */
+@Composable
+fun NavHostController.HandleDateOrNullResult(
+    retain: Boolean = false,
+    onResult: KalugaDate?.() -> Unit
+) = HandleResult(retain) { asDateOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a list of [KalugaDate]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateArrayType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received list of [KalugaDate]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateArrayType].
+ */
+@Composable
+fun NavHostController.HandleDateArrayResult(
+    retain: Boolean = false,
+    onResult: List<KalugaDate>.() -> Unit
+) = HandleResult(retain) { asDateArray().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a list of [KalugaDate] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received list of [KalugaDate] or`null`
+ */
+@Composable
+fun NavHostController.HandleDateArrayOrNullResult(
+    retain: Boolean = false,
+    onResult: List<KalugaDate>?.() -> Unit
+) = HandleResult(retain) { asDateArrayOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Double
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Double
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleType].
+ */
+@Composable
+fun NavHostController.HandleDoubleResult(
+    retain: Boolean = false,
+    onResult: Double.() -> Unit
+) = HandleResult(retain) { asDouble().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Double or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Double or`null`
+ */
+@Composable
+fun NavHostController.HandleDoubleOrNullResult(
+    retain: Boolean = false,
+    onResult: Double?.() -> Unit
+) = HandleResult(retain) { asDoubleOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [DoubleArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleArrayType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [DoubleArray]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleArrayType].
+ */
+@Composable
+fun NavHostController.HandleDoubleArrayResult(
+    retain: Boolean = false,
+    onResult: DoubleArray.() -> Unit
+) = HandleResult(retain) { asDoubleArray().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [DoubleArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [DoubleArray] or`null`
+ */
+@Composable
+fun NavHostController.HandleDoubleArrayOrNullResult(
+    retain: Boolean = false,
+    onResult: DoubleArray?.() -> Unit
+) = HandleResult(retain) { asDoubleArrayOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Float
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Float
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatType].
+ */
+@Composable
+fun NavHostController.HandleFloatResult(
+    retain: Boolean = false,
+    onResult: Float.() -> Unit
+) = HandleResult(retain) { asFloat().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Float or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Float or`null`
+ */
+@Composable
+fun NavHostController.HandleFloatOrNullResult(
+    retain: Boolean = false,
+    onResult: Float?.() -> Unit
+) = HandleResult(retain) { asFloatOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [FloatArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatArrayType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [FloatArray]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatArrayType].
+ */
+@Composable
+fun NavHostController.HandleFloatArrayResult(
+    retain: Boolean = false,
+    onResult: FloatArray.() -> Unit
+) = HandleResult(retain) { asFloatArray().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [FloatArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [FloatArray] or`null`
+ */
+@Composable
+fun NavHostController.HandleFloatArrayOrNullResult(
+    retain: Boolean = false,
+    onResult: FloatArray?.() -> Unit
+) = HandleResult(retain) { asFloatArrayOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching an Int
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Int
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerType].
+ */
+@Composable
+fun NavHostController.HandleIntResult(
+    retain: Boolean = false,
+    onResult: Int.() -> Unit
+) = HandleResult(retain) { asInt().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching an Int or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Int or`null`
+ */
+@Composable
+fun NavHostController.HandleIntOrNullResult(
+    retain: Boolean = false,
+    onResult: Int?.() -> Unit
+) = HandleResult(retain) { asIntOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching an [IntArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerArrayType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [IntArray]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerArrayType].
+ */
+@Composable
+fun NavHostController.HandleIntArrayResult(
+    retain: Boolean = false,
+    onResult: IntArray.() -> Unit
+) = HandleResult(retain) { asIntArray().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching an [IntArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [IntArray] or`null`
+ */
+@Composable
+fun NavHostController.HandleIntArrayOrNullResult(
+    retain: Boolean = false,
+    onResult: IntArray?.() -> Unit
+) = HandleResult(retain) { asIntArrayOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Long
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Long
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongType].
+ */
+@Composable
+fun NavHostController.HandleLongResult(
+    retain: Boolean = false,
+    onResult: Long.() -> Unit
+) = HandleResult(retain) { asLong().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Long or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Long or`null`
+ */
+@Composable
+fun NavHostController.HandleLongOrNullResult(
+    retain: Boolean = false,
+    onResult: Long?.() -> Unit
+) = HandleResult(retain) { asLongOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [LongArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongArrayType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [LongArray]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongArrayType].
+ */
+@Composable
+fun NavHostController.HandleLongArrayResult(
+    retain: Boolean = false,
+    onResult: LongArray.() -> Unit
+) = HandleResult(retain) { asLongArray().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [LongArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [LongArray] or`null`
+ */
+@Composable
+fun NavHostController.HandleLongArrayOrNullResult(
+    retain: Boolean = false,
+    onResult: LongArray?.() -> Unit
+) = HandleResult(retain) { asLongArrayOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Short
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Short
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortType].
+ */
+@Composable
+fun NavHostController.HandleShortResult(
+    retain: Boolean = false,
+    onResult: Short.() -> Unit
+) = HandleResult(retain) { asShort().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a Short or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Short or`null`
+ */
+@Composable
+fun NavHostController.HandleShortOrNullResult(
+    retain: Boolean = false,
+    onResult: Short?.() -> Unit
+) = HandleResult(retain) { asShortOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [ShortArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortArrayType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [ShortArray]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortArrayType].
+ */
+@Composable
+fun NavHostController.HandleShortArrayResult(
+    retain: Boolean = false,
+    onResult: ShortArray.() -> Unit
+) = HandleResult(retain) { asShortArray().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a [ShortArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [ShortArray] or`null`
+ */
+@Composable
+fun NavHostController.HandleShortArrayOrNullResult(
+    retain: Boolean = false,
+    onResult: ShortArray?.() -> Unit
+) = HandleResult(retain) { asShortArrayOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a String
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received String
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringType].
+ */
+@Composable
+fun NavHostController.HandleStringResult(
+    retain: Boolean = false,
+    onResult: String.() -> Unit
+) = HandleResult(retain) { asString().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a String or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received String or `null`
+ */
+@Composable
+fun NavHostController.HandleStringOrNullResult(
+    retain: Boolean = false,
+    onResult: String?.() -> Unit
+) = HandleResult(retain) { asStringOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a list of [String]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringArrayType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received list of [String]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringArrayType].
+ */
+@Composable
+fun NavHostController.HandleStringListResult(
+    retain: Boolean = false,
+    onResult: List<String>.() -> Unit
+) = HandleResult(retain) { asStringList().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a list of [String] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received list of [String] or `null`
+ */
+@Composable
+fun NavHostController.HandleStringListOrNullResult(
+    retain: Boolean = false,
+    onResult: List<String>?.() -> Unit
+) = HandleResult(retain) { asStringListOrNull().onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a given type [T].
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with [serializer]
+ * @param T the type of serialized property stored in the result
+ * @param serializer The [KSerializer] to deserialize [T] from the result.
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [T]
+ * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with [serializer].
+ */
+@Composable
+fun <T> NavHostController.HandleResultOfType(
+    serializer: KSerializer<T>,
+    retain: Boolean = false,
+    onResult: T.() -> Unit
+) = HandleResult(retain) { asTypeOf(serializer).onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a given type [T].
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param T the type of serialized property stored in the result
+ * @param serializer The [KSerializer] to deserialize [T] from the result.
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [T] or `null`
+ */
+@Composable
+fun <T : Any> NavHostController.HandleResultOfTypeOrNull(
+    serializer: KSerializer<T>,
+    retain: Boolean = false,
+    onResult: T?.() -> Unit
+) = HandleResult(retain) { asTypeOfOrNull(serializer).onResult() }
+
+/**
+ * Handles a [Route.Result.Data] matching a given type [T].
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param T the type of serialized property stored in the result
+ * @param serializer The [KSerializer] to deserialize [T] from the result.
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [T] or `null`
+ */
+@Composable
+@JvmName("HandleResultOfNullableTypeOrNull")
+fun <T> NavHostController.HandleResultOfTypeOrNull(
+    serializer: KSerializer<T>,
+    retain: Boolean = false,
+    onResult: T?.() -> Unit
+) = HandleResult(retain) { asTypeOfOrNull(serializer).onResult() }
+
 @Composable
 internal fun NavHostController.HandleResult(retain: Boolean = false, onResult: Bundle.() -> Unit) {
     // Check if we have a result in the current BackStack.
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
index 6a34866d9..bbafc22c1 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
@@ -18,81 +18,692 @@
 package com.splendo.kaluga.architecture.compose.navigation.result
 
 import androidx.compose.runtime.Composable
+import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
+import com.splendo.kaluga.architecture.compose.navigation.Route
 import com.splendo.kaluga.architecture.navigation.NavigationBundle
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpec
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecRow
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
+import com.splendo.kaluga.architecture.navigation.SingleValueNavigationSpec
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.base.utils.KalugaDate
 import kotlinx.serialization.KSerializer
 import kotlin.reflect.KClass
 import kotlin.reflect.safeCast
 
 /**
- * A Handler that will allow a [NavHostController] to handle [Route.Result] of a given type [R] to be received by a given [ViewModel]
+ * A Handler that will allow a [NavHostController] to handle [com.splendo.kaluga.architecture.compose.navigation.Route.Result] of a given type [Result] to be received by a given [ViewModel]
+ * @param ViewModel the type of [BaseLifecycleViewModel] that will respond to the [Route.Result]
+ * @param Result the type of the result to expect
+ * @param viewModelClass the [KClass] of [ViewModel]
+ * @param handleResult A [Composable] method for setting up a [NavHostController] to return a [Result] through a callback.
+ * @param onResult Callback method called on a [ViewModel] to handle a given [Result]
  */
-sealed class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, R> {
-    abstract val viewModelClass: KClass<ViewModel>
-    abstract val retain: Boolean
-    abstract val onResult: ViewModel.(R) -> Unit
-    @Composable
-    internal abstract fun NavHostController.HandleResult(callback: (R) -> Unit)
-
-    /**
-     * [NavHostResultHandler] that handles a result of a [NavigationBundle]
-     */
-    data class Bundle<ViewModel : BaseLifecycleViewModel, R : NavigationBundleSpecRow<*>>(
-        override val viewModelClass: KClass<ViewModel>,
-        val spec: NavigationBundleSpec<R>,
-        override val retain: Boolean = false,
-        override val onResult: ViewModel.(NavigationBundle<R>) -> Unit
-    ) : NavHostResultHandler<ViewModel, NavigationBundle<R>>() {
-        @Composable
-        override fun NavHostController.HandleResult(callback: (NavigationBundle<R>) -> Unit) = HandleResult(spec, retain) { callback(this) }
-    }
-
-    /**
-     * [NavHostResultHandler] that handles a result of a [NavigationBundleSpecType]
-     */
-    data class Type<ViewModel : BaseLifecycleViewModel, R>(
-        override val viewModelClass: KClass<ViewModel>,
-        val spec: NavigationBundleSpecType<R>,
-        override val retain: Boolean,
-        override val onResult: ViewModel.(R) -> Unit
-    ) : NavHostResultHandler<ViewModel, R>() {
-
-        @Composable
-        override fun NavHostController.HandleResult(callback: (R) -> Unit) = HandleResult(spec, retain) { callback(this) }
-    }
+class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, Result>(
+    private val viewModelClass: KClass<ViewModel>,
+    private val handleResult:  @Composable NavHostController.((Result) -> Unit) -> Unit,
+    private val onResult: ViewModel.(Result) -> Unit
+) {
 
     @Composable
     internal fun HandleResult(viewModel: BaseLifecycleViewModel, navHostController: NavHostController) {
         viewModelClass.safeCast(viewModel)?.let { vm ->
-            navHostController.HandleResult { vm.onResult(it) }
+            navHostController.handleResult { vm.onResult(it) }
         }
     }
 }
 
 /**
- * Creates a [NavHostResultHandler.Bundle] of [R] for this [NavigationBundleSpec]
+ * Creates a [NavHostResultHandler] of [Row] for this [NavigationBundleSpec]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param Row the type of [NavigationBundleSpecRow] associated with this [NavigationBundleSpec]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received result
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel, Row : NavigationBundleSpecRow<*>> NavigationBundleSpec<Row>.NavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(NavigationBundle<Row>) -> Unit
+) {
+    val spec = this
+    NavHostResultHandler(ViewModel::class, { HandleResult(spec, retain, it) },  onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [T] for this [NavigationBundleSpecType]
+ * Requires that [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param T the type of result to expect
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received result
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel, T> NavigationBundleSpecType<T>.NavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(T) -> Unit
+) {
+    val spec = this
+    NavHostResultHandler(ViewModel::class, { HandleResult(spec, retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [T] for this [NavigationBundleSpecType]
+ * Requires that [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType] either directly or wrapped in [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param T the type of result to expect
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received result
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel, T : Any> NavigationBundleSpecType<T>.NavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(T?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleResultOrNull(this@NavHostResultOrNullHandler, retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [T] for this [NavigationBundleSpecType]
+ * Requires that [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param T the type of result to expect
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received result
+ */
+@JvmName("NavHostNullableResultOrNullHandler")
+inline fun <reified ViewModel : BaseLifecycleViewModel, T> NavigationBundleSpecType<T>.NavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(T?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleResultOrNull(this@NavHostResultOrNullHandler, retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of Boolean
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Boolean
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Boolean) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleBooleanResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of Boolean or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received Boolean or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Boolean?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleBooleanOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [BooleanArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanArrayType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [BooleanArray]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanArrayNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(BooleanArray) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleBooleanArrayResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [BooleanArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.BooleanArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [BooleanArray] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanArrayNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(BooleanArray?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleBooleanArrayOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [Byte]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Byte]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> ByteNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Byte) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleByteResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [Byte] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Byte] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> ByteNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Byte?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleByteOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [ByteArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [ByteArray]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> ByteArrayNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(ByteArray) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleByteArrayResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [ByteArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ByteArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [ByteArray] or `null`
  */
-inline fun <reified ViewModel : BaseLifecycleViewModel, R : NavigationBundleSpecRow<*>> NavigationBundleSpec<R>.NavHostResultHandler(
+inline fun <reified ViewModel : BaseLifecycleViewModel> ByteArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
-    noinline onResult: ViewModel.(NavigationBundle<R>) -> Unit
-) = NavHostResultHandler.Bundle(ViewModel::class, this, retain, onResult)
+    noinline onResult: ViewModel.(ByteArray?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleByteArrayOrNullResult(retain, it) }, onResult)
 
 /**
- * Creates a [NavHostResultHandler.Type] of [R] for this [NavigationBundleSpecType]
+ * Creates a [NavHostResultHandler] of [Char]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Char]
  */
-inline fun <reified ViewModel : BaseLifecycleViewModel, R> NavigationBundleSpecType<R>.NavHostResultHandler(
+inline fun <reified ViewModel : BaseLifecycleViewModel> CharNavHostResultHandler(
     retain: Boolean = false,
-    noinline onResult: ViewModel.(R) -> Unit
-) = NavHostResultHandler.Type(ViewModel::class, this, retain, onResult)
+    noinline onResult: ViewModel.(Char) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleCharResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [Char] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Char] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> CharNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Char?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleCharOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [CharArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharArrayType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [CharArray]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> CharArrayNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(CharArray) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleCharArrayResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [CharArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [CharArray] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> CharArrayNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(CharArray?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleCharArrayOrNullResult(retain, it) }, onResult)
+
+
+/**
+ * Creates a [NavHostResultHandler] of [CharSequence]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharSequenceType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [CharSequence]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> CharSequenceNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(CharSequence) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleCharSequenceResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [CharSequence] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.CharSequenceType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [CharSequence] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> CharSequenceNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(CharSequence?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleCharSequenceOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [KalugaDate]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [KalugaDate]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> DateNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(KalugaDate) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleDateResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [KalugaDate] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [KalugaDate] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> DateNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(KalugaDate?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleDateOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of a list of [KalugaDate]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateArrayType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received list of [KalugaDate]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> DateArrayNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(List<KalugaDate>) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleDateArrayResult(retain, it) }, onResult)
+}
 
 /**
- * Creates a [NavHostResultHandler.Type] of [R] for this [KSerializer]
+ * Creates a [NavHostResultHandler] of a List of [KalugaDate] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DateArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received list of [KalugaDate] or `null`
  */
-inline fun <reified ViewModel : BaseLifecycleViewModel, R> KSerializer<R>.NavHostResultHandler(
+inline fun <reified ViewModel : BaseLifecycleViewModel> DateArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
-    noinline onResult: ViewModel.(R) -> Unit
-) = NavHostResultHandler.Type(ViewModel::class, NavigationBundleSpecType.SerializedType(this), retain, onResult)
+    noinline onResult: ViewModel.(List<KalugaDate>?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleDateArrayOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [Double]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Double]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Double) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleDoubleResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [Double] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Double] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Double?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleDoubleOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [DoubleArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleArrayType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [DoubleArray]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleArrayNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(DoubleArray) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleDoubleArrayResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [DoubleArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.DoubleArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [DoubleArray] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleArrayNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(DoubleArray?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleDoubleArrayOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [Float]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Float]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> FloatNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Float) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleFloatResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [Float] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Float] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> FloatNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Float?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleFloatOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [FloatArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatArrayType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [FloatArray]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> FloatArrayNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(FloatArray) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleFloatArrayResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [FloatArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.FloatArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [FloatArray] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> FloatArrayNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(FloatArray?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleFloatArrayOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [Int]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Int]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> IntNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Int) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleIntResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [Int] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Int] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> IntNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Int?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleIntOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [IntArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerArrayType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [IntArray]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> IntArrayNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(IntArray) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleIntArrayResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [IntArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.IntegerArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [IntArray] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> IntArrayNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(IntArray?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleIntArrayOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [Long]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Long]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> LongNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Long) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleLongResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [Long] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Long] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> LongNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Long?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleLongOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [LongArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongArrayType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [LongArray]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> LongArrayNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(LongArray) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleLongArrayResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [LongArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.LongArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [LongArray] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> LongArrayNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(LongArray?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleLongArrayOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [Short]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Short]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> ShortNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Short) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleShortResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [Short] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [Short] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> ShortNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(Short?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleShortOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [ShortArray]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortArrayType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [ShortArray]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> ShortArrayNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(ShortArray) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleShortArrayResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [ShortArray] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.ShortArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [ShortArray] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> ShortArrayNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(ShortArray?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleShortArrayOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [String]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [String]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> StringNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(String) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleStringResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [String] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [String] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> StringNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(String?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleStringOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of a list of [String]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringArrayType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received list of [String]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> StringListNavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(List<String>) -> Unit
+) {
+    NavHostResultHandler(ViewModel::class, { HandleStringListResult(retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of a list of [String] or `null`
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.StringArrayType] either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received list of [String] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel> StringListNavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(List<String>?) -> Unit
+) = NavHostResultHandler(ViewModel::class, { HandleStringListOrNullResult(retain, it) }, onResult)
+
+/**
+ * Creates a [NavHostResultHandler] of [T] for this [KSerializer]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with this Serializer
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param T the type of serialized property stored in the result
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [T]
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel, T> KSerializer<T>.NavHostResultHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(T) -> Unit
+) {
+    val serializer = this
+    NavHostResultHandler(ViewModel::class, { HandleResultOfType(serializer, retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [T] for this [KSerializer]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with this Serializer either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param T the type of serialized property stored in the result
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [T] or `null`
+ */
+inline fun <reified ViewModel : BaseLifecycleViewModel, T : Any> KSerializer<T>.NavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(T?) -> Unit
+) {
+    val serializer = this
+    NavHostResultHandler(ViewModel::class, { HandleResultOfTypeOrNull(serializer, retain, it) }, onResult)
+}
+
+/**
+ * Creates a [NavHostResultHandler] of [T] for this [KSerializer]
+ * Requires that the [Route.Result.Data.bundle] is described by a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with this Serializer either directly or wrapped by [NavigationBundleSpecType.OptionalType]
+ * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
+ * @param T the type of serialized property stored in the result
+ * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
+ * @param onResult Method for handling the received [T] or `null`
+ */
+@JvmName("NavHostNullableResultOrNullHandler")
+inline fun <reified ViewModel : BaseLifecycleViewModel, T> KSerializer<T>.NavHostResultOrNullHandler(
+    retain: Boolean = false,
+    noinline onResult: ViewModel.(T?) -> Unit
+) {
+    val serializer = this
+    NavHostResultHandler(ViewModel::class, { HandleResultOfTypeOrNull(serializer, retain, it) }, onResult)
+}
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/observables.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/observables.kt
index df67ecff3..452e6ad19 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/observables.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/observables.kt
@@ -24,11 +24,17 @@ import androidx.compose.runtime.remember
 import com.splendo.kaluga.architecture.observable.WithMutableState
 import com.splendo.kaluga.architecture.observable.WithState
 
+/**
+ * Creates a [State] whose value always matches a [WithState] using [WithState.stateFlow]
+ */
 @Suppress("NOTHING_TO_INLINE")
 @Composable
 inline fun <R> WithState<R>.state(): State<R> =
     this.stateFlow.collectAsState()
 
+/**
+ * Creates a [MutableState] that is synchronized with a [WithMutableState].
+ */
 // @Suppress("NOTHING_TO_INLINE") // inlining currently breaks compilation
 @Composable
 fun <R> WithMutableState<R>.mutableState(): MutableState<R> {
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
index 3e0118ac1..75ced958f 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -23,7 +23,8 @@ import com.splendo.kaluga.architecture.viewmodel.LifecycleSubscribableManager
 /**
  * Composable which manages [viewModel] lifecycle and binds to all its [BaseLifecycleViewModel.activeLifecycleSubscribables].
  * This automatically modifies the content using [ComposableLifecycleSubscribable.modifier].
- * @param viewModel [BaseLifecycleViewModel] to manage
+ * @param ViewModel the type of [BaseLifecycleViewModel] to manage.
+ * @param viewModel [ViewModel] to manage
  * @param content content based on [viewModel]
  */
 @Composable
@@ -39,7 +40,8 @@ fun <ViewModel : BaseLifecycleViewModel> ViewModelComposable(
 /**
  * Composable which manages [viewModel] lifecycle and binds to all its [ActivityLifecycleSubscribable] using [fragmentManager].
  * This automatically modifies the content using [ComposableLifecycleSubscribable.modifier].
- * @param viewModel [BaseLifecycleViewModel] to manage
+ * @param ViewModel the type of [BaseLifecycleViewModel] to manage.
+ * @param viewModel [ViewModel] to manage
  * @param fragmentManager The [FragmentManager] to bind to all [ActivityLifecycleSubscribable] in [BaseLifecycleViewModel.activeLifecycleSubscribables].
  * @param content content based on [viewModel]
  */
diff --git a/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt b/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
index b47c32bfd..23d87dbcf 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/BundleToTypedProperty.kt
@@ -357,6 +357,7 @@ fun Bundle.asStringListOrNull(): List<String>? = toTypedPropertyOrNull(Navigatio
 /**
  * Converts a [Bundle] to [T].
  * Requires that the [Bundle] is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer]
+ * @param T the type of serialized property stored in the bundle
  * @param serializer The [KSerializer] to deserialize [T] from the bundle.
  * @return The [T] stored in the bundle.
  * @throws [BundleConversionError] if the [Bundle] is not associated with a [SingleValueNavigationSpec] matching [NavigationBundleSpecType.SerializedType] with [serializer].
@@ -365,13 +366,15 @@ fun <T> Bundle.asTypeOf(serializer: KSerializer<T>): T = toTypedProperty(Navigat
 
 /**
  * Converts a [Bundle] to [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * @param T the type of serialized property stored in the bundle
  * @param serializer The [KSerializer] to deserialize [T] from the bundle.
  * @return The [T] stored in the bundle or null if no such value was found.
  */
 fun <T : Any> Bundle.asTypeOfOrNull(serializer: KSerializer<T>): T? = toTypedPropertyOrNull(NavigationBundleSpecType.SerializedType(serializer))
 
 /**
- * Converts a [Bundle] to [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer] either directly or wrapped by [NavigationBundleSpecType.OptionalType].
+ * Converts a [Bundle] to [T] if is described by a [SingleValueNavigationSpec] matching the [NavigationBundleSpecType.SerializedType] with [serializer].
+ * @param T the type of serialized property stored in the bundle
  * @param serializer The [KSerializer] to deserialize [T] from the bundle.
  * @return The [T] stored in the bundle or null if no such value was found.
  */

From 33a2ed0ced0ab65db805839a65cd4627a879a580 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 8 Feb 2023 16:38:20 +0100
Subject: [PATCH 160/227] DateTimePicker documentation

Also moved from Milliseconds in Long to using Kotlin Dutation for Kaluga Base
---
 .../androidLibMain/kotlin/AlertPresenter.kt   |   9 +-
 alerts/src/commonMain/kotlin/Alerts.kt        | 125 +++++++++++++-----
 alerts/src/iosMain/kotlin/AlertPresenter.kt   |   9 ++
 alerts/src/jsMain/kotlin/AlertPresenter.kt    |  10 ++
 alerts/src/jvmMain/kotlin/AlertPresenter.kt   |  10 ++
 .../kotlin/navigation/NavigationBundle.kt     |   9 +-
 base/api/androidLib/base.api                  |  46 ++++---
 base/api/jvm/base.api                         |  46 ++++---
 .../androidLibMain/kotlin/utils/KalugaDate.kt |  22 +--
 .../androidLibMain/kotlin/utils/TimeZone.kt   |   9 +-
 .../commonMain/kotlin/text/FormatSpecifier.kt |  11 +-
 .../src/commonMain/kotlin/utils/KalugaDate.kt |  95 +++++++++----
 base/src/commonMain/kotlin/utils/TimeZone.kt  |  24 +++-
 base/src/commonTest/kotlin/utils/DateTest.kt  |  21 +--
 base/src/iosMain/kotlin/utils/KalugaDate.kt   |  16 ++-
 base/src/iosMain/kotlin/utils/TimeZone.kt     |  12 +-
 base/src/jsMain/kotlin/utils/KalugaDate.kt    |  12 +-
 base/src/jsMain/kotlin/utils/TimeZone.kt      |   9 +-
 base/src/jvmMain/kotlin/utils/KalugaDate.kt   |  22 +--
 base/src/jvmMain/kotlin/utils/TimeZone.kt     |   9 +-
 beacons/src/commonMain/kotlin/Beacons.kt      |   2 +-
 .../api/androidLib/date-time-picker.api       |   1 +
 date-time-picker/api/jvm/date-time-picker.api |   1 +
 .../kotlin/DateTimePickerPresenter.kt         |  26 +++-
 .../src/commonMain/kotlin/DateTimePicker.kt   | 118 ++++++++++++-----
 .../iosMain/kotlin/DateTimePickerPresenter.kt |  63 ++++++---
 .../jsMain/kotlin/DateTimePickerPresenter.kt  |  17 +++
 .../jvmMain/kotlin/DateTimePickerPresenter.kt |  21 ++-
 .../kaluga/datetime/timer/RecurringTimer.kt   |   8 +-
 .../splendo/kaluga/datetime/timer/Timer.kt    |  31 ++++-
 .../test-utils-date-time-picker.api           |   1 -
 .../api/jvm/test-utils-date-time-picker.api   |   1 -
 .../kotlin/MockDateTimePickerPresenter.kt     |   2 +-
 33 files changed, 586 insertions(+), 232 deletions(-)

diff --git a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
index aab8ba95b..1a6871aeb 100644
--- a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
@@ -35,9 +35,10 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 
 /**
- * Class for presenting an [Alert].
+ * A [BaseAlertPresenter] for presenting an [Alert].
  * @param alert The [Alert] being presented.
- * @param lifecycleManagerObserver The [LifecycleManagerObserver]
+ * @param lifecycleManagerObserver The [LifecycleManagerObserver] to observe lifecycle changes
+ * @param coroutineScope The [CoroutineScope] managing changes to the alert presentation.
  */
 actual class AlertPresenter(
     private val alert: Alert,
@@ -46,8 +47,8 @@ actual class AlertPresenter(
 ) : BaseAlertPresenter(alert), CoroutineScope by coroutineScope {
 
     /**
-     * Builder for creating an [AlertPresenter]
-     * @param lifecycleManagerObserver The [LifecycleManagerObserver]
+     * A [BaseAlertPresenter.Builder] for creating an [AlertPresenter]
+     * @param lifecycleManagerObserver The [LifecycleManagerObserver] to observe lifecycle changes
      */
     actual class Builder(
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
diff --git a/alerts/src/commonMain/kotlin/Alerts.kt b/alerts/src/commonMain/kotlin/Alerts.kt
index 8673686f3..bc7eac16c 100644
--- a/alerts/src/commonMain/kotlin/Alerts.kt
+++ b/alerts/src/commonMain/kotlin/Alerts.kt
@@ -46,7 +46,20 @@ data class Alert(
      * Alert style
      */
     enum class Style {
-        ALERT, ACTION_LIST, TEXT_INPUT
+        /**
+         * Alert that shows only a title/message and positive/neutral/negative actions.
+         */
+        ALERT,
+
+        /**
+         * Alert that shows a list of [Action]
+         */
+        ACTION_LIST,
+
+        /**
+         * Alert that shows some Text Inout
+         */
+        TEXT_INPUT
     }
 
     /**
@@ -62,6 +75,7 @@ data class Alert(
          * Sets the [title] displayed in the alert
          *
          * @param title The title of the alert
+         * @return The modified [Alert.Builder]
          */
         fun setTitle(title: String?) = apply { this.title = title }
 
@@ -69,39 +83,43 @@ data class Alert(
          * Sets the [message] displayed in the alert
          *
          * @param message The message of the alert
+         * @return The modified [Alert.Builder]
          */
         fun setMessage(message: String?) = apply { this.message = message }
 
         /**
-         * Sets button with the id `BUTTON_POSITIVE` on Android
-         * and action with style `UIAlertActionStyleDefault` on iOS
+         * Sets an [Action] with [Action.Style.POSITIVE]. If one already exists it will be replaced.
          *
          * @param title The title of the button
          * @param handler The block to execute after user taps a button
+         * @return The modified [Alert.Builder]
          */
         fun setPositiveButton(title: String, handler: AlertActionHandler = {}) = apply {
+            this.actions.removeAll { it.style == Action.Style.POSITIVE || it.style == Action.Style.DEFAULT }
             addAction(Action(title, Action.Style.POSITIVE, handler))
         }
 
         /**
-         * Sets button with the id `BUTTON_NEGATIVE` on Android
-         * and action with style `UIAlertActionStyleCancel` on iOS
+         * Sets an [Action] with [Action.Style.NEGATIVE]. If one already exists it will be replaced.
          *
          * @param title The title of the button
          * @param handler The block to execute after user taps a button
+         * @return The modified [Alert.Builder]
          */
         fun setNegativeButton(title: String, handler: AlertActionHandler = {}) = apply {
+            this.actions.removeAll { it.style == Action.Style.NEGATIVE || it.style == Action.Style.CANCEL }
             addAction(Action(title, Action.Style.NEGATIVE, handler))
         }
 
         /**
-         * Sets button with the id `BUTTON_NEUTRAL` on Android
-         * and action with style `UIAlertActionStyleDestructive` on iOS
+         * Sets the [Action] with [Action.Style.NEUTRAL]. If one already exists it will be replaced.
          *
          * @param title The title of the button
          * @param handler The block to execute after user taps a button
+         * @return The modified [Alert.Builder]
          */
         fun setNeutralButton(title: String, handler: AlertActionHandler = {}) = apply {
+            this.actions.removeAll { it.style == Action.Style.NEUTRAL || it.style == Action.Style.DESTRUCTIVE }
             addAction(Action(title, Action.Style.NEUTRAL, handler))
         }
 
@@ -111,6 +129,7 @@ data class Alert(
          * @param text The initial text of the input field
          * @param placeholder The input field hint
          * @param textObserver The callback for text change events of inout field
+         * @return The modified [Alert.Builder]
          */
         fun setTextInput(
             text: String? = null,
@@ -121,30 +140,34 @@ data class Alert(
         }
 
         /**
-         * Adds a list of [actions] to the alert
+         * Adds a list of [Action] to the alert
          *
-         * @param actions The list of action objects
+         * @param actions The list of [Action] objects
+         * @return The modified [Alert.Builder]
          */
         fun addActions(actions: List<Action>) = apply { this.actions.addAll(actions) }
 
         /**
-         * Adds a list of [actions] to the alert
+         * Adds a list of [Action] to the alert
          *
-         * @param actions The list of action objects
+         * @param actions The list of [Action] objects
+         * @return The modified [Alert.Builder]
          */
         fun addActions(vararg actions: Action) = apply { this.actions.addAll(actions) }
 
         /**
-         * Sets a style of the alert
+         * Sets a [Style] of the alert
          *
-         * @param style The style of an alert
+         * @param style The [Style] of an alert
+         * @return The modified [Alert.Builder]
          */
         internal fun setStyle(style: Style) = apply { this.style = style }
 
         /**
-         * Adds an [action] to the alert
+         * Adds an [Action] to the alert
          *
          * @param action The action object
+         * @return The modified [Alert.Builder]
          */
         private fun addAction(action: Action) = apply { this.actions.add(action) }
 
@@ -152,14 +175,15 @@ data class Alert(
          * Adds an [Alert.TextInputAction] to the alert
          *
          * @param action The action object
+         * @return The modified [Alert.Builder]
          */
         private fun setTextInputAction(action: TextInputAction) =
             apply { this.textInputAction = action }
 
         /**
-         * Creates an alert based on [title], [message], [actions] and [textInputAction] properties
+         * Creates an [Alert] based on [title], [message], [actions] and [textInputAction] properties
          *
-         * @return The alert object
+         * @return The [Alert] object
          * @throws IllegalArgumentException in case missing title and/or message or actions
          */
         fun build(): Alert {
@@ -177,7 +201,7 @@ data class Alert(
      * An action that represents a button in the alert
      *
      * @property title The title of the action's button
-     * @property style The style that is applied to the action's button
+     * @property style The [Style] that is applied to the action's button
      * @property handler The block to execute when the user taps a button
      */
     data class Action(
@@ -185,12 +209,38 @@ data class Alert(
         val style: Style = Style.DEFAULT,
         val handler: AlertActionHandler = {}
     ) {
+        /**
+         * The style of an action. This determines the look of the button when displayed in the alert.
+         */
         enum class Style(val value: Int) {
+            /**
+             * Default button. Synonymous with [POSITIVE]
+             */
             DEFAULT(0),
+
+            /**
+             * Positive button. Synonymous with [DEFAULT]
+             */
             POSITIVE(DEFAULT.value),
+
+            /**
+             * Destructive button. Synonymous with [NEUTRAL]
+             */
             DESTRUCTIVE(1),
+
+            /**
+             * Neutral button. Synonymous with [DESTRUCTIVE]
+             */
             NEUTRAL(DESTRUCTIVE.value),
+
+            /**
+             * Cancel button. Synonymous with [NEGATIVE]
+             */
             CANCEL(2),
+
+            /**
+             * Negative button. Synonymous with [CANCEL]
+             */
             NEGATIVE(CANCEL.value)
         }
     }
@@ -210,11 +260,11 @@ data class Alert(
 }
 
 /**
- * Interface that defines actions that can be applied to the alert.
+ * Interface that defines actions that can be used for presenting an [Alert].
  */
 interface AlertActions {
     /**
-     * Presents an alert
+     * Presents an [Alert]
      *
      * @param animated Pass `true` to animate the presentation
      * @param completion The block to execute after the presentation finishes
@@ -222,16 +272,16 @@ interface AlertActions {
     fun showAsync(animated: Boolean = true, completion: () -> Unit = {})
 
     /**
-     * Presents an alert and suspends
+     * Presents an [Alert] and suspends until completion
      *
-     * @param animated
-     * @return The action that was performed by button click
-     *         or `null` if the alert was cancelled by pressing back (on Android)
+     * @param animated Pass `true` to animate the presentation
+     * @return The [Alert.Action] that was performed by button click
+     *         or `null` if the alert was cancelled by the user.
      */
     suspend fun show(animated: Boolean = true): Alert.Action?
 
     /**
-     * Dismisses the alert, which was presented previously
+     * Dismisses the currently presented [Alert]
      *
      * @param animated Pass `true` to animate the transition
      */
@@ -242,13 +292,12 @@ interface AlertActions {
  * Abstract alert presenter, used to show and dismiss given [Alert]
  * @see [AlertPresenter]
  *
- * @param alert The alert to present (and dismiss if needed)
+ * @param alert The [Alert] to present (and dismiss if needed)
  */
 abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
 
     /**
-     * Abstract alert builder class, used to create an [Alert].
-     * The resulting Alert that can be shown and dismissed using an [AlertPresenter].
+     * Abstract alert builder class, used to create a [BaseAlertPresenter].
      *
      * @see [AlertPresenter.Builder]
      */
@@ -294,6 +343,10 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
  * Class for presenting an [Alert]. Implementation of [BaseAlertPresenter]
  */
 expect class AlertPresenter : BaseAlertPresenter {
+
+    /**
+     * A [BaseAlertPresenter.Builder] for creating an [AlertPresenter]
+     */
     class Builder : BaseAlertPresenter.Builder {
         /**
          * Creates an [AlertPresenter]
@@ -307,11 +360,11 @@ expect class AlertPresenter : BaseAlertPresenter {
 }
 
 /**
- * Builds an alert of type [Alert.Style.ALERT] using DSL syntax (thread safe)
+ * Builds a [BaseAlertPresenter] of type [Alert.Style.ALERT] using DSL syntax (thread safe)
  *
  * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
- * @param initialize The block to construct an Alert
- * @return The built alert interface object
+ * @param initialize The block to construct an [Alert]
+ * @return The built [BaseAlertPresenter]
  */
 fun BaseAlertPresenter.Builder.buildAlert(
     coroutineScope: CoroutineScope,
@@ -324,11 +377,11 @@ fun BaseAlertPresenter.Builder.buildAlert(
 )
 
 /**
- * Builds an alert of type [Alert.Style.ACTION_LIST] using DSL syntax (thread safe)
+ * Builds a [BaseAlertPresenter] of type [Alert.Style.ACTION_LIST] using DSL syntax (thread safe)
  *
  * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
- * @param initialize The block to construct an Alert
- * @return The built alert interface object
+ * @param initialize The block to construct an [Alert]
+ * @return The built [BaseAlertPresenter]
  */
 fun BaseAlertPresenter.Builder.buildActionSheet(
     coroutineScope: CoroutineScope,
@@ -341,11 +394,11 @@ fun BaseAlertPresenter.Builder.buildActionSheet(
 )
 
 /**
- * Builds an alert of type [Alert.Style.TEXT_INPUT] using DSL syntax (thread safe)
+ * Builds a [BaseAlertPresenter] of type [Alert.Style.TEXT_INPUT] using DSL syntax (thread safe)
  *
  * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
- * @param initialize The block to construct an Alert
- * @return The built alert interface object
+ * @param initialize The block to construct an [Alert]
+ * @return The built [BaseAlertPresenter]
  */
 fun BaseAlertPresenter.Builder.buildAlertWithInput(
     coroutineScope: CoroutineScope,
diff --git a/alerts/src/iosMain/kotlin/AlertPresenter.kt b/alerts/src/iosMain/kotlin/AlertPresenter.kt
index b416c4187..9d4d104eb 100644
--- a/alerts/src/iosMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/iosMain/kotlin/AlertPresenter.kt
@@ -36,6 +36,11 @@ import platform.UIKit.UITextField
 import platform.UIKit.UIViewController
 import platform.objc.sel_registerName
 
+/**
+ * A [BaseAlertPresenter] for presenting an [Alert].
+ * @param alert The [Alert] being presented.
+ * @param parent The [UIViewController] to present the [Alert]
+ */
 actual class AlertPresenter(
     private val alert: Alert,
     private val parent: UIViewController
@@ -74,6 +79,10 @@ actual class AlertPresenter(
         }
     }
 
+    /**
+     * A [BaseAlertPresenter.Builder] for creating an [AlertPresenter]
+     * @param viewController The [UIViewController] to present any [AlertPresenter] built using this builder.
+     */
     actual class Builder(private val viewController: UIViewController) : BaseAlertPresenter.Builder() {
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope) = AlertPresenter(alert, viewController)
     }
diff --git a/alerts/src/jsMain/kotlin/AlertPresenter.kt b/alerts/src/jsMain/kotlin/AlertPresenter.kt
index 8bc9a8f44..6135478f4 100644
--- a/alerts/src/jsMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/jsMain/kotlin/AlertPresenter.kt
@@ -20,10 +20,20 @@ package com.splendo.kaluga.alerts
 
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * A [BaseAlertPresenter] for presenting an [Alert].
+ *
+ * This is not yet fully implemented on JavaScript
+ *
+ * @param alert The [Alert] being presented.
+ */
 actual class AlertPresenter(
     alert: Alert
 ) : BaseAlertPresenter(alert) {
 
+    /**
+     * A [BaseAlertPresenter.Builder] for creating an [AlertPresenter]
+     */
     actual class Builder : BaseAlertPresenter.Builder() {
 
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope): AlertPresenter {
diff --git a/alerts/src/jvmMain/kotlin/AlertPresenter.kt b/alerts/src/jvmMain/kotlin/AlertPresenter.kt
index 8bc9a8f44..f769908aa 100644
--- a/alerts/src/jvmMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/jvmMain/kotlin/AlertPresenter.kt
@@ -20,10 +20,20 @@ package com.splendo.kaluga.alerts
 
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * A [BaseAlertPresenter] for presenting an [Alert].
+ *
+ * This is not yet fully implemented on JVM
+ *
+ * @param alert The [Alert] being presented.
+ */
 actual class AlertPresenter(
     alert: Alert
 ) : BaseAlertPresenter(alert) {
 
+    /**
+     * A [BaseAlertPresenter.Builder] for creating an [AlertPresenter]
+     */
     actual class Builder : BaseAlertPresenter.Builder() {
 
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope): AlertPresenter {
diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
index dbf42773c..9c22cd6a2 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationBundle.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.architecture.navigation
 
 import android.os.Bundle
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
+import kotlin.time.Duration.Companion.milliseconds
 
 /**
  * Converts a [NavigationBundle] to a [Bundle]
@@ -59,9 +60,9 @@ internal fun mapValue(key: String, value: NavigationBundleValue<*>, bundle: Bund
         is NavigationBundleValue.StringValue -> bundle.putString(key, value.value)
         is NavigationBundleValue.StringArrayValue -> bundle.putStringArrayList(key, ArrayList(value.value))
         is NavigationBundleValue.OptionalValue<*> -> value.optionalValue?.let { mapValue(key, it, bundle) }
-        is NavigationBundleValue.DateValue -> bundle.putLong(key, value.value.millisecondSinceEpoch)
+        is NavigationBundleValue.DateValue -> bundle.putLong(key, value.value.durationSinceEpoch.inWholeMilliseconds)
         is NavigationBundleValue.DateArrayValue ->
-            bundle.putLongArray(key, LongArray(value.value.size) { value.value[it].millisecondSinceEpoch })
+            bundle.putLongArray(key, LongArray(value.value.size) { value.value[it].durationSinceEpoch.inWholeMilliseconds })
     }
 }
 
@@ -123,10 +124,10 @@ internal fun Bundle.mapValue(key: String, specType: NavigationBundleSpecType<*>)
             }
         }
         is NavigationBundleSpecType.DateType -> getLong(key).let { value ->
-            specType.convertValue(DefaultKalugaDate.epoch(value))
+            specType.convertValue(DefaultKalugaDate.epoch(value.milliseconds))
         }
         is NavigationBundleSpecType.DateArrayType -> getLongArray(key)?.let { array ->
-            specType.convertValue(array.map { DefaultKalugaDate.epoch(it) })
+            specType.convertValue(array.map { DefaultKalugaDate.epoch(it.milliseconds) })
         }
     }
 }
diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index d1a5f036a..452487fad 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -874,10 +874,14 @@ public abstract class com/splendo/kaluga/base/utils/BaseTimeZone {
 	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
 	public abstract fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
 	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
-	public abstract fun getDaylightSavingsOffsetInMilliseconds ()J
+	public abstract fun getDaylightSavingsOffset-UwyO8pc ()J
+	public final fun getDaylightSavingsOffsetInMilliseconds ()J
 	public abstract fun getIdentifier ()Ljava/lang/String;
-	public abstract fun getOffsetFromGMTInMilliseconds ()J
-	public abstract fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public abstract fun getOffsetFromGMT-UwyO8pc ()J
+	public final fun getOffsetFromGMTInMilliseconds ()J
+	public abstract fun offsetFromGMTAtDate-5sfh64U (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public static synthetic fun offsetFromGMTAtDate-5sfh64U$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
+	public final fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
 	public static synthetic fun offsetFromGMTAtDateInMilliseconds$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
 	public fun toString ()Ljava/lang/String;
 	public abstract fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
@@ -958,11 +962,11 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 	public fun getDay ()I
 	public fun getDayOfYear ()I
 	public fun getDaysInMonth ()I
+	public fun getDurationSinceEpoch-UwyO8pc ()J
 	public fun getEra ()I
 	public fun getFirstWeekDay ()I
 	public fun getHour ()I
 	public fun getMillisecond ()I
-	public fun getMillisecondSinceEpoch ()J
 	public fun getMinute ()I
 	public fun getMonth ()I
 	public fun getSecond ()I
@@ -974,11 +978,11 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 	public fun hashCode ()I
 	public fun setDay (I)V
 	public fun setDayOfYear (I)V
+	public fun setDurationSinceEpoch-LRDsOJo (J)V
 	public fun setEra (I)V
 	public fun setFirstWeekDay (I)V
 	public fun setHour (I)V
 	public fun setMillisecond (I)V
-	public fun setMillisecondSinceEpoch (J)V
 	public fun setMinute (I)V
 	public fun setMonth (I)V
 	public fun setSecond (I)V
@@ -990,10 +994,10 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 }
 
 public final class com/splendo/kaluga/base/utils/DefaultKalugaDate$Companion {
-	public final fun epoch (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun now (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun epoch-KLykuaI (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun now-KLykuaI (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
 public final class com/splendo/kaluga/base/utils/Deferred_getCompletedOrNullKt {
@@ -1018,11 +1022,12 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public abstract fun getDay ()I
 	public abstract fun getDayOfYear ()I
 	public abstract fun getDaysInMonth ()I
+	public abstract fun getDurationSinceEpoch-UwyO8pc ()J
 	public abstract fun getEra ()I
 	public abstract fun getFirstWeekDay ()I
 	public abstract fun getHour ()I
 	public abstract fun getMillisecond ()I
-	public abstract fun getMillisecondSinceEpoch ()J
+	public final fun getMillisecondSinceEpoch ()J
 	public abstract fun getMinute ()I
 	public abstract fun getMonth ()I
 	public abstract fun getSecond ()I
@@ -1034,11 +1039,12 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public abstract fun hashCode ()I
 	public abstract fun setDay (I)V
 	public abstract fun setDayOfYear (I)V
+	public abstract fun setDurationSinceEpoch-LRDsOJo (J)V
 	public abstract fun setEra (I)V
 	public abstract fun setFirstWeekDay (I)V
 	public abstract fun setHour (I)V
 	public abstract fun setMillisecond (I)V
-	public abstract fun setMillisecondSinceEpoch (J)V
+	public final fun setMillisecondSinceEpoch (J)V
 	public abstract fun setMinute (I)V
 	public abstract fun setMonth (I)V
 	public abstract fun setSecond (I)V
@@ -1051,6 +1057,8 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 }
 
 public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
+	public static final fun epoch (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun isInSameYear (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isLastMonth (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isLastYear (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
@@ -1063,10 +1071,16 @@ public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
 	public static final fun isToday (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isTomorrow (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isYesterday (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-	public static final fun minus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public static final fun minus-HG0u8IE (Lcom/splendo/kaluga/base/utils/KalugaDate;J)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun now (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun nowUtc (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static synthetic fun nowUtc$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun plus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun nowUtc-8Mi8wO0 (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun nowUtc-8Mi8wO0$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun plus-HG0u8IE (Lcom/splendo/kaluga/base/utils/KalugaDate;J)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun toEndOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun toStartOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
@@ -1131,10 +1145,10 @@ public final class com/splendo/kaluga/base/utils/TimeZone : com/splendo/kaluga/b
 	public fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
 	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getDaylightSavingsOffsetInMilliseconds ()J
+	public fun getDaylightSavingsOffset-UwyO8pc ()J
 	public fun getIdentifier ()Ljava/lang/String;
-	public fun getOffsetFromGMTInMilliseconds ()J
-	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public fun getOffsetFromGMT-UwyO8pc ()J
+	public fun offsetFromGMTAtDate-5sfh64U (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
 	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 }
 
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index f71c3c33b..a72e3fb07 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -865,10 +865,14 @@ public abstract class com/splendo/kaluga/base/utils/BaseTimeZone {
 	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
 	public abstract fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
 	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
-	public abstract fun getDaylightSavingsOffsetInMilliseconds ()J
+	public abstract fun getDaylightSavingsOffset-UwyO8pc ()J
+	public final fun getDaylightSavingsOffsetInMilliseconds ()J
 	public abstract fun getIdentifier ()Ljava/lang/String;
-	public abstract fun getOffsetFromGMTInMilliseconds ()J
-	public abstract fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public abstract fun getOffsetFromGMT-UwyO8pc ()J
+	public final fun getOffsetFromGMTInMilliseconds ()J
+	public abstract fun offsetFromGMTAtDate-5sfh64U (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public static synthetic fun offsetFromGMTAtDate-5sfh64U$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
+	public final fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
 	public static synthetic fun offsetFromGMTAtDateInMilliseconds$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)J
 	public fun toString ()Ljava/lang/String;
 	public abstract fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
@@ -949,11 +953,11 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 	public fun getDay ()I
 	public fun getDayOfYear ()I
 	public fun getDaysInMonth ()I
+	public fun getDurationSinceEpoch-UwyO8pc ()J
 	public fun getEra ()I
 	public fun getFirstWeekDay ()I
 	public fun getHour ()I
 	public fun getMillisecond ()I
-	public fun getMillisecondSinceEpoch ()J
 	public fun getMinute ()I
 	public fun getMonth ()I
 	public fun getSecond ()I
@@ -965,11 +969,11 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 	public fun hashCode ()I
 	public fun setDay (I)V
 	public fun setDayOfYear (I)V
+	public fun setDurationSinceEpoch-LRDsOJo (J)V
 	public fun setEra (I)V
 	public fun setFirstWeekDay (I)V
 	public fun setHour (I)V
 	public fun setMillisecond (I)V
-	public fun setMillisecondSinceEpoch (J)V
 	public fun setMinute (I)V
 	public fun setMonth (I)V
 	public fun setSecond (I)V
@@ -981,10 +985,10 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 }
 
 public final class com/splendo/kaluga/base/utils/DefaultKalugaDate$Companion {
-	public final fun epoch (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun now (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun epoch-KLykuaI (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun now-KLykuaI (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
 public final class com/splendo/kaluga/base/utils/Deferred_getCompletedOrNullKt {
@@ -1009,11 +1013,12 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public abstract fun getDay ()I
 	public abstract fun getDayOfYear ()I
 	public abstract fun getDaysInMonth ()I
+	public abstract fun getDurationSinceEpoch-UwyO8pc ()J
 	public abstract fun getEra ()I
 	public abstract fun getFirstWeekDay ()I
 	public abstract fun getHour ()I
 	public abstract fun getMillisecond ()I
-	public abstract fun getMillisecondSinceEpoch ()J
+	public final fun getMillisecondSinceEpoch ()J
 	public abstract fun getMinute ()I
 	public abstract fun getMonth ()I
 	public abstract fun getSecond ()I
@@ -1025,11 +1030,12 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public abstract fun hashCode ()I
 	public abstract fun setDay (I)V
 	public abstract fun setDayOfYear (I)V
+	public abstract fun setDurationSinceEpoch-LRDsOJo (J)V
 	public abstract fun setEra (I)V
 	public abstract fun setFirstWeekDay (I)V
 	public abstract fun setHour (I)V
 	public abstract fun setMillisecond (I)V
-	public abstract fun setMillisecondSinceEpoch (J)V
+	public final fun setMillisecondSinceEpoch (J)V
 	public abstract fun setMinute (I)V
 	public abstract fun setMonth (I)V
 	public abstract fun setSecond (I)V
@@ -1042,6 +1048,8 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 }
 
 public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
+	public static final fun epoch (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun isInSameYear (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isLastMonth (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isLastYear (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
@@ -1054,10 +1062,16 @@ public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
 	public static final fun isToday (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isTomorrow (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isYesterday (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-	public static final fun minus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public static final fun minus-HG0u8IE (Lcom/splendo/kaluga/base/utils/KalugaDate;J)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun now (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun nowUtc (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static synthetic fun nowUtc$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun plus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun nowUtc-8Mi8wO0 (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun nowUtc-8Mi8wO0$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun plus-HG0u8IE (Lcom/splendo/kaluga/base/utils/KalugaDate;J)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun toEndOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun toStartOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
@@ -1122,10 +1136,10 @@ public final class com/splendo/kaluga/base/utils/TimeZone : com/splendo/kaluga/b
 	public fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
 	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getDaylightSavingsOffsetInMilliseconds ()J
+	public fun getDaylightSavingsOffset-UwyO8pc ()J
 	public fun getIdentifier ()Ljava/lang/String;
-	public fun getOffsetFromGMTInMilliseconds ()J
-	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public fun getOffsetFromGMT-UwyO8pc ()J
+	public fun offsetFromGMTAtDate-5sfh64U (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
 	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 }
 
diff --git a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
index 38357dddc..4c0f9790b 100644
--- a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
@@ -19,6 +19,8 @@ package com.splendo.kaluga.base.utils
 
 import java.util.Calendar
 import java.util.Date
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 
 actual typealias KalugaDateHolder = Date
 
@@ -31,27 +33,27 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
 
         /**
          * Creates a [KalugaDate] relative to the current time
-         * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
+         * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
          * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun now(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
-                add(Calendar.MILLISECOND, offsetInMilliseconds.toInt())
+                add(Calendar.MILLISECOND, offset.inWholeMilliseconds.toInt())
             }
         )
 
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
-         * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
+         * @param offset The [Duration] from the epoch time. Defaults to 0 milliseconds
          * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun epoch(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
-                timeInMillis = offsetInMilliseconds
+                timeInMillis = offset.inWholeMilliseconds
             }
         )
     }
@@ -101,15 +103,15 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
     override var millisecond: Int
         get() = calendar.get(Calendar.MILLISECOND)
         set(value) { calendar.set(Calendar.MILLISECOND, value) }
-    override var millisecondSinceEpoch: Long
-        get() = calendar.timeInMillis
-        set(value) { calendar.timeInMillis = value }
+    override var durationSinceEpoch: Duration
+        get() = calendar.timeInMillis.milliseconds
+        set(value) { calendar.timeInMillis = value.inWholeMilliseconds }
 
     override fun copy(): KalugaDate = DefaultKalugaDate(calendar.clone() as Calendar)
 
     override fun equals(other: Any?): Boolean {
         return (other as? KalugaDate)?.let {
-            timeZone == other.timeZone && millisecondSinceEpoch == other.millisecondSinceEpoch
+            timeZone == other.timeZone && durationSinceEpoch == other.durationSinceEpoch
         } ?: false
     }
 
diff --git a/base/src/androidLibMain/kotlin/utils/TimeZone.kt b/base/src/androidLibMain/kotlin/utils/TimeZone.kt
index 8c4ea0c42..274aec47d 100644
--- a/base/src/androidLibMain/kotlin/utils/TimeZone.kt
+++ b/base/src/androidLibMain/kotlin/utils/TimeZone.kt
@@ -17,6 +17,9 @@
 
 package com.splendo.kaluga.base.utils
 
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+
 /**
  * A default implementation of [BaseTimeZone].
  */
@@ -57,9 +60,9 @@ actual class TimeZone internal constructor(internal val timeZone: java.util.Time
         }
         return timeZone.getDisplayName(withDaylightSavings, styleJava, locale.locale)
     }
-    override val offsetFromGMTInMilliseconds = timeZone.rawOffset.toLong()
-    override val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
-    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
+    override val offsetFromGMT = timeZone.rawOffset.milliseconds
+    override val daylightSavingsOffset = timeZone.dstSavings.milliseconds
+    override fun offsetFromGMTAtDate(date: KalugaDate): Duration = timeZone.getOffset(date.durationSinceEpoch.inWholeMilliseconds).milliseconds
     override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
     override fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
     override fun equals(other: Any?): Boolean {
diff --git a/base/src/commonMain/kotlin/text/FormatSpecifier.kt b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
index a166b492d..80a01abef 100644
--- a/base/src/commonMain/kotlin/text/FormatSpecifier.kt
+++ b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
@@ -26,6 +26,7 @@ import com.splendo.kaluga.base.utils.TimeZoneNameStyle
 import com.splendo.kaluga.base.utils.toHexString
 import kotlin.math.abs
 import kotlin.math.absoluteValue
+import kotlin.time.Duration.Companion.milliseconds
 
 internal sealed class ParsingCharacter(val char: Char) {
     data class RegularCharacter(val regular: RegularFormatCharacter) : ParsingCharacter(regular.char)
@@ -108,7 +109,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
             is Long,
             is Int,
             is Short -> {
-                DefaultKalugaDate.epoch((arg as Number).toLong(), TimeZone.current(), locale)
+                DefaultKalugaDate.epoch((arg as Number).toLong().milliseconds, TimeZone.current(), locale)
             }
             is KalugaDate -> {
                 arg.copy()
@@ -380,7 +381,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
             }
             DateTime.NANOSECOND -> {
                 // 'N' (000000000 - 999999999)
-                val i: Int = time.millisecond * 1000000
+                val i: Int = time.millisecond.milliseconds.inWholeNanoseconds.toInt()
                 val flags = setOf(Flag.ZERO_PAD)
                 sb.append(localizedMagnitude(value = i, flags = flags, width = 9, locale = locale))
             }
@@ -392,7 +393,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
             }
             DateTime.MILLISECOND_SINCE_EPOCH -> {
                 // 'Q' (0 - 99...?)
-                val i: Long = time.millisecondSinceEpoch
+                val i: Long = time.durationSinceEpoch.inWholeMilliseconds
                 sb.append(localizedMagnitude(value = i.toString(10), offset = 0, flags = emptySet(), width = width, locale = locale))
             }
             DateTime.AM_PM -> {
@@ -403,7 +404,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
             }
             DateTime.SECONDS_SINCE_EPOCH -> {
                 // 's' (0 - 99...?)
-                val i: Long = time.millisecondSinceEpoch / 1000
+                val i: Long = time.durationSinceEpoch.inWholeSeconds
                 sb.append(localizedMagnitude(value = i.toString(10), offset = 0, flags = emptySet(), width = width, locale = locale))
             }
             DateTime.SECOND -> {
@@ -414,7 +415,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
             }
             DateTime.ZONE_NUMERIC -> {
                 // 'z' ({-|+}####) - ls minus?
-                var i: Long = time.timeZone.offsetFromGMTAtDateInMilliseconds(time)
+                var i: Long = time.timeZone.offsetFromGMTAtDate(time).inWholeMilliseconds
                 val neg = i < 0
                 sb.append(if (neg) '-' else '+')
                 if (neg) i = -i
diff --git a/base/src/commonMain/kotlin/utils/KalugaDate.kt b/base/src/commonMain/kotlin/utils/KalugaDate.kt
index 23f625ec4..e4d20f978 100644
--- a/base/src/commonMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaDate.kt
@@ -22,6 +22,8 @@ import com.splendo.kaluga.base.text.KalugaDateFormatter
 import com.splendo.kaluga.base.text.iso8601Pattern
 import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
 import kotlin.jvm.JvmName
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 
 /**
  * Class holding the platform value of the desired Date.
@@ -108,10 +110,19 @@ abstract class KalugaDate : Comparable<KalugaDate> {
      */
     abstract var millisecond: Int
 
+    /**
+     * The [Duration] passed since epoch time (January 1st 1970 00:00:00:00 GMT)
+     */
+    abstract var durationSinceEpoch: Duration
+
     /**
      * The number of milliseconds passed since epoch time (January 1st 1970 00:00:00:00 GMT)
      */
-    abstract var millisecondSinceEpoch: Long
+    var millisecondSinceEpoch: Long
+        get() = durationSinceEpoch.inWholeMilliseconds
+        set(value) {
+            durationSinceEpoch = value.milliseconds
+        }
 
     /**
      * Creates a copy of a [KalugaDate]
@@ -120,7 +131,7 @@ abstract class KalugaDate : Comparable<KalugaDate> {
     abstract fun copy(): KalugaDate
 
     /**
-     * Returns whether this Date is in the same [timeZone] and has the same time based on [millisecondSinceEpoch]
+     * Returns whether this Date is in the same [timeZone] and has the same time based on [durationSinceEpoch]
      * @return `true` if the two dates are equal
      */
     abstract override fun equals(other: Any?): Boolean
@@ -146,57 +157,84 @@ expect class DefaultKalugaDate : KalugaDate {
 
         /**
          * Creates a [KalugaDate] relative to the current time
-         * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
+         * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
          * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        fun now(offsetInMilliseconds: Long = 0L, timeZone: TimeZone = TimeZone.current(), locale: Locale = Locale.defaultLocale): KalugaDate
+        fun now(offset: Duration = 0.milliseconds, timeZone: TimeZone = TimeZone.current(), locale: Locale = defaultLocale): KalugaDate
 
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
-         * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
+         * @param offset The [Duration] from the epoch time. Defaults to 0 milliseconds
          * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        fun epoch(offsetInMilliseconds: Long = 0L, timeZone: TimeZone = TimeZone.current(), locale: Locale = Locale.defaultLocale): KalugaDate
+        fun epoch(offset: Duration = 0.milliseconds, timeZone: TimeZone = TimeZone.current(), locale: Locale = defaultLocale): KalugaDate
     }
 }
 
+/**
+ * Creates a [KalugaDate] relative to the current time
+ * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
+ * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+ * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+ * @return A [KalugaDate] relative to the current time
+ */
+fun DefaultKalugaDate.Companion.now(offsetInMilliseconds: Long, timeZone: TimeZone = TimeZone.current(), locale: Locale = defaultLocale): KalugaDate = now(offsetInMilliseconds.milliseconds, timeZone, locale)
+
+/**
+ * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
+ * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
+ * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+ * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+ * @return A [KalugaDate] relative to the current time
+ */
+fun DefaultKalugaDate.Companion.epoch(offsetInMilliseconds: Long, timeZone: TimeZone = TimeZone.current(), locale: Locale = defaultLocale): KalugaDate = epoch(offsetInMilliseconds.milliseconds, timeZone, locale)
+
 @Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaDate"))
 typealias Date = KalugaDate
 
 /**
- * Creates a [KalugaDate] with the same [Locale] and [TimeZone] as the left date, but earlier by the right date millisecondSinceEpoch
- * @param date The [KalugaDate] of which the millisecondSinceEpoch to subtract should be retrieved
- * @return A new [KalugaDate] with the same [Locale] and [TimeZone] as the left date, but earlier by the right date millisecondSinceEpoch
+ * Gets the [Duration] between two [KalugaDate]
+ * @param other the [KalugaDate] to subtract
+ * @return the [Duration] between both dates.
  */
-operator fun KalugaDate.minus(date: KalugaDate): KalugaDate {
-    return copy().apply {
-        millisecondSinceEpoch -= date.millisecondSinceEpoch
-    }
-}
+infix operator fun KalugaDate.minus(other: KalugaDate) = durationSinceEpoch - other.durationSinceEpoch
 
 /**
- * Creates a [KalugaDate] with the same [Locale] and [TimeZone] as the left date, but later by the right date millisecondSinceEpoch
- * @param date The [KalugaDate] of which the millisecondSinceEpoch to add should be retrieved
- * @return A new [KalugaDate] with the same [Locale] and [TimeZone] as the left date, but later by the right date millisecondSinceEpoch
+ * Gets a [KalugaDate] that is [duration] after this date.
+ * @param duration the [Duration] to add to this date.
+ * @return A [KalugaDate] that is [duration] after this date
  */
-operator fun KalugaDate.plus(date: KalugaDate): KalugaDate {
-    return copy().apply {
-        millisecondSinceEpoch += date.millisecondSinceEpoch
-    }
+infix operator fun KalugaDate.plus(duration: Duration) = copy().apply {
+    durationSinceEpoch += duration
 }
 
+/**
+ * Gets a [KalugaDate] that is [duration] before this date.
+ * @param duration the [Duration] to subtract from this date.
+ * @return A [KalugaDate] that is [duration] before this date
+ */
+infix operator fun KalugaDate.minus(duration: Duration) = this + (-duration)
+
+/**
+ * Creates a [KalugaDate] relative to the current time, in the UTC timezone
+ * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
+ * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+ * @return A [KalugaDate] relative to the current time, in the UTC timezone
+ */
+fun DefaultKalugaDate.Companion.nowUtc(offset: Duration = 0.milliseconds, locale: Locale = defaultLocale): KalugaDate =
+    now(offset, TimeZone.utc, locale)
+
 /**
  * Creates a [KalugaDate] relative to the current time, in the UTC timezone
  * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
  * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
  * @return A [KalugaDate] relative to the current time, in the UTC timezone
  */
-fun DefaultKalugaDate.Companion.nowUtc(offsetInMilliseconds: Long = 0L, locale: Locale = defaultLocale): KalugaDate =
-    now(offsetInMilliseconds, TimeZone.utc, locale)
+fun DefaultKalugaDate.Companion.nowUtc(offsetInMilliseconds: Long, locale: Locale = defaultLocale): KalugaDate = nowUtc(offsetInMilliseconds.milliseconds, locale)
 
 /**
  * Gets a [KalugaDate] equal to midnight on the same day as this Date
@@ -209,6 +247,17 @@ fun KalugaDate.toStartOfDay() = this.copy().apply {
     millisecond = 0
 }
 
+/**
+ * Gets a [KalugaDate] equal to `23:59:59:999` on the same day as this Date
+ * @return A [KalugaDate] equal to `23:59:59:999` on the same day as this Date
+ */
+fun KalugaDate.toEndOfDay() = this.copy().apply {
+    hour = 23
+    minute = 59
+    second = 59
+    millisecond = 999
+}
+
 /**
  * Gets a [KalugaDate] that is set at midnight on the same day as the current time.
  * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
diff --git a/base/src/commonMain/kotlin/utils/TimeZone.kt b/base/src/commonMain/kotlin/utils/TimeZone.kt
index 753c9a465..3138d38d7 100644
--- a/base/src/commonMain/kotlin/utils/TimeZone.kt
+++ b/base/src/commonMain/kotlin/utils/TimeZone.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate.Companion.now
 import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
+import kotlin.time.Duration
 
 /**
  * Style for writing the name of a [TimeZone]
@@ -59,23 +60,40 @@ abstract class BaseTimeZone {
      * @param locale The [Locale] used for naming the [TimeZone]. Defaults to [Locale.defaultLocale]
      */
     abstract fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean = usesDaylightSavingsTime(), locale: Locale = defaultLocale): String
+    
+    /**
+     * The [Duration] this timezone differs from GMT when daylight savings time is not active
+     */
+    abstract val offsetFromGMT: Duration
 
     /**
      * The number of milliseconds this timezone differs from GMT when daylight savings time is not active
      */
-    abstract val offsetFromGMTInMilliseconds: Long
+    val offsetFromGMTInMilliseconds: Long get() = offsetFromGMT.inWholeMilliseconds
+
+    /**
+     * The [Duration] this timezone differs from itself during Daylight Savings
+     */
+    abstract val daylightSavingsOffset: Duration
 
     /**
      * The number of milliseconds this timezone differs from itself during Daylight Savings
      */
-    abstract val daylightSavingsOffsetInMilliseconds: Long
+    val daylightSavingsOffsetInMilliseconds: Long get() = daylightSavingsOffset.inWholeMilliseconds
+
+    /**
+     * The [Duration] this [TimeZone] differs from GMT at a given [KalugaDate]
+     * @param date The [KalugaDate] for which to check the offset. Defaults to [DefaultKalugaDate.now]
+     * @return The number of milliseconds this [TimeZone] differs from GMT at [date]
+     */
+    abstract fun offsetFromGMTAtDate(date: KalugaDate = now()): Duration
 
     /**
      * The number of milliseconds this [TimeZone] differs from GMT at a given [KalugaDate]
      * @param date The [KalugaDate] for which to check the offset. Defaults to [DefaultKalugaDate.now]
      * @return The number of milliseconds this [TimeZone] differs from GMT at [date]
      */
-    abstract fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate = now()): Long
+    fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate = now()): Long = offsetFromGMTAtDate(date).inWholeMilliseconds
 
     /**
      * Returns `true` if this [TimeZone] is observing daylight savings at a given [KalugaDate]
diff --git a/base/src/commonTest/kotlin/utils/DateTest.kt b/base/src/commonTest/kotlin/utils/DateTest.kt
index 9d6014cab..438dd6f05 100644
--- a/base/src/commonTest/kotlin/utils/DateTest.kt
+++ b/base/src/commonTest/kotlin/utils/DateTest.kt
@@ -28,6 +28,7 @@ import com.splendo.kaluga.base.utils.utc
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.milliseconds
 
 class DateTest {
 
@@ -36,18 +37,18 @@ class DateTest {
         val now = DefaultKalugaDate.now(locale = Locale.enUsPosix)
         assertEquals(now, now.copy(), "copied Date should be equal")
 
-        val nearEpoch = DefaultKalugaDate.epoch(1001)
-        assertEquals(DefaultKalugaDate.epoch(1001), nearEpoch, "equally created dates should be equal")
+        val nearEpoch = DefaultKalugaDate.epoch(1001.milliseconds)
+        assertEquals(DefaultKalugaDate.epoch(1001.milliseconds), nearEpoch, "equally created dates should be equal")
 
-        assertEquals(DefaultKalugaDate.epoch(1002), nearEpoch + DefaultKalugaDate.epoch(1), "Date from addition should be equal")
+        assertEquals(DefaultKalugaDate.epoch(1002.milliseconds), nearEpoch + 1.milliseconds, "Date from addition should be equal")
     }
 
     @Test
     fun testUTCDate() {
         val utcNow = DefaultKalugaDate.nowUtc(locale = Locale.enUsPosix)
-        val epochNow = utcNow.millisecondSinceEpoch
+        val epochNow = utcNow.durationSinceEpoch
         val now = DefaultKalugaDate.epoch(epochNow, TimeZone.utc, locale = Locale.enUsPosix)
-        assertEquals(utcNow.millisecondSinceEpoch, now.millisecondSinceEpoch)
+        assertEquals(utcNow.durationSinceEpoch, now.durationSinceEpoch)
         assertEquals(utcNow, now)
     }
 
@@ -76,7 +77,7 @@ class DateTest {
     @Test
     fun testUpdateDate() {
         val epoch = DefaultKalugaDate.epoch(locale = Locale.enUsPosix)
-        val isEarlierThanGMT = epoch.timeZone.offsetFromGMTAtDateInMilliseconds(epoch) < 0
+        val isEarlierThanGMT = epoch.timeZone.offsetFromGMTAtDate(epoch).isNegative()
         assertEquals(if (isEarlierThanGMT) 1969 else 1970, epoch.year)
         assertEquals(if (isEarlierThanGMT) 12 else 1, epoch.month)
         epoch.month += 22
@@ -86,7 +87,7 @@ class DateTest {
 
     @Test
     fun testGet() {
-        val someDay = DefaultKalugaDate.epoch(574695462750, TimeZone.utc, locale = Locale.enUsPosix)
+        val someDay = DefaultKalugaDate.epoch(574695462750.milliseconds, TimeZone.utc, locale = Locale.enUsPosix)
 
         assertEquals(1, someDay.era)
         assertEquals(1988, someDay.year)
@@ -108,8 +109,8 @@ class DateTest {
         val france = Locale.createLocale("fr", "FR")
         val us = Locale.createLocale("en", "US")
 
-        val frenchNow = DefaultKalugaDate.now(0, TimeZone.utc, france)
-        val usNow = DefaultKalugaDate.now(0, TimeZone.utc, us)
+        val frenchNow = DefaultKalugaDate.now(0.milliseconds, TimeZone.utc, france)
+        val usNow = DefaultKalugaDate.now(0.milliseconds, TimeZone.utc, us)
 
         assertEquals(2, frenchNow.firstWeekDay)
         assertEquals(1, usNow.firstWeekDay)
@@ -117,7 +118,7 @@ class DateTest {
 
     @Test
     fun testDaylightSavings() {
-        val dayBeforeDLS = DefaultKalugaDate.epoch(1616828400000, locale = Locale.createLocale("nl", "NL"), timeZone = TimeZone.get("Europe/Amsterdam")!!)
+        val dayBeforeDLS = DefaultKalugaDate.epoch(1616828400000.milliseconds, locale = Locale.createLocale("nl", "NL"), timeZone = TimeZone.get("Europe/Amsterdam")!!)
         val startOfDayBeforeDLS = dayBeforeDLS.toStartOfDay()
         assertEquals(0, startOfDayBeforeDLS.hour)
         assertEquals(27, startOfDayBeforeDLS.day)
diff --git a/base/src/iosMain/kotlin/utils/KalugaDate.kt b/base/src/iosMain/kotlin/utils/KalugaDate.kt
index 98a092c53..aa16b959a 100644
--- a/base/src/iosMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaDate.kt
@@ -40,7 +40,9 @@ import platform.Foundation.dateWithTimeIntervalSince1970
 import platform.Foundation.dateWithTimeIntervalSinceNow
 import platform.Foundation.timeIntervalSince1970
 import kotlin.math.round
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.DurationUnit
 
 actual typealias KalugaDateHolder = NSDate
 
@@ -54,33 +56,33 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
 
         /**
          * Creates a [KalugaDate] relative to the current time
-         * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
+         * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
          * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate {
+        actual fun now(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate {
             val calendar = NSCalendar.currentCalendar.apply {
                 this.locale = locale.nsLocale
                 this.timeZone = timeZone.timeZone
             }
-            val date = NSDate.dateWithTimeIntervalSinceNow(offsetInMilliseconds.toDouble() / 1000.0)
+            val date = NSDate.dateWithTimeIntervalSinceNow(offset.toDouble(DurationUnit.SECONDS))
             return DefaultKalugaDate(calendar, date)
         }
 
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
-         * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
+         * @param offset The [Duration] from the epoch time. Defaults to 0 milliseconds
          * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate {
+        actual fun epoch(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate {
             val calendar = NSCalendar.currentCalendar.apply {
                 this.locale = locale.nsLocale
                 this.timeZone = timeZone.timeZone
             }
-            val date = NSDate.dateWithTimeIntervalSince1970(offsetInMilliseconds.toDouble() / 1000.0)
+            val date = NSDate.dateWithTimeIntervalSince1970(offset.toDouble(DurationUnit.SECONDS))
             return DefaultKalugaDate(calendar, date)
         }
     }
@@ -143,7 +145,7 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
 
     override fun equals(other: Any?): Boolean {
         return if (other is DefaultKalugaDate) {
-            calendar.calendarIdentifier == other.calendar.calendarIdentifier && millisecondSinceEpoch == other.millisecondSinceEpoch && this.calendar.timeZone == other.calendar.timeZone
+            calendar.calendarIdentifier == other.calendar.calendarIdentifier && durationSinceEpoch == other.durationSinceEpoch && this.calendar.timeZone == other.calendar.timeZone
         } else false
     }
 
diff --git a/base/src/iosMain/kotlin/utils/TimeZone.kt b/base/src/iosMain/kotlin/utils/TimeZone.kt
index 129b7d701..75a08022a 100644
--- a/base/src/iosMain/kotlin/utils/TimeZone.kt
+++ b/base/src/iosMain/kotlin/utils/TimeZone.kt
@@ -29,6 +29,8 @@ import platform.Foundation.nextDaylightSavingTimeTransition
 import platform.Foundation.secondsFromGMT
 import platform.Foundation.timeZoneWithAbbreviation
 import platform.Foundation.timeZoneWithName
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
 /**
  * A default implementation of [BaseTimeZone].
@@ -73,16 +75,16 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZ
         }
         return timeZone.localizedName(nameStyle, locale.nsLocale) ?: ""
     }
-    override val offsetFromGMTInMilliseconds: Long get() {
+    override val offsetFromGMT: Duration get() {
         val rawOffset = if (timeZone.isDaylightSavingTime())
             timeZone.secondsFromGMT.toDouble() - timeZone.daylightSavingTimeOffset
         else
             timeZone.secondsFromGMT.toDouble()
 
-        return rawOffset.toLong() * 1000L
+        return rawOffset.seconds
     }
 
-    override val daylightSavingsOffsetInMilliseconds: Long get() {
+    override val daylightSavingsOffset: Duration get() {
         val rawOffset = if (timeZone.isDaylightSavingTime()) {
             timeZone.daylightSavingTimeOffset.toLong()
         } else {
@@ -90,9 +92,9 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZ
                 timeZone.daylightSavingTimeOffsetForDate(it).toLong()
             } ?: 0L
         }
-        return rawOffset * 1000L
+        return rawOffset.seconds
     }
-    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = (timeZone.secondsFromGMTForDate(date.date) * 1000L)
+    override fun offsetFromGMTAtDate(date: KalugaDate): Duration = timeZone.secondsFromGMTForDate(date.date).seconds
     override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.isDaylightSavingTimeForDate(date.date)
     override fun copy(): TimeZone = TimeZone(timeZone.copy() as NSTimeZone)
     override fun equals(other: Any?): Boolean {
diff --git a/base/src/jsMain/kotlin/utils/KalugaDate.kt b/base/src/jsMain/kotlin/utils/KalugaDate.kt
index be50d5614..696ab800d 100644
--- a/base/src/jsMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaDate.kt
@@ -17,6 +17,8 @@
 
 package com.splendo.kaluga.base.utils
 
+import kotlin.time.Duration
+
 actual typealias KalugaDateHolder = kotlin.js.Date
 
 // TODO Implement with proper date solution for Java Script
@@ -29,21 +31,21 @@ actual class DefaultKalugaDate internal constructor(override val date: KalugaDat
 
         /**
          * Creates a [KalugaDate] relative to the current time
-         * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
+         * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
          * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(kotlin.js.Date.now() + offsetInMilliseconds))
+        actual fun now(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(kotlin.js.Date.now() + offset.inWholeMilliseconds))
 
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
-         * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
+         * @param offset The [Duration] from the epoch time. Defaults to 0 milliseconds
          * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(offsetInMilliseconds))
+        actual fun epoch(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(offset.inWholeMilliseconds))
     }
 
     override var timeZone: TimeZone
@@ -99,7 +101,7 @@ actual class DefaultKalugaDate internal constructor(override val date: KalugaDat
 
     override fun equals(other: Any?): Boolean {
         return (other as? KalugaDate)?.let {
-            timeZone == other.timeZone && millisecondSinceEpoch == other.millisecondSinceEpoch
+            timeZone == other.timeZone && durationSinceEpoch == other.durationSinceEpoch
         } ?: false
     }
 
diff --git a/base/src/jsMain/kotlin/utils/TimeZone.kt b/base/src/jsMain/kotlin/utils/TimeZone.kt
index b455907e9..c7cd42b2b 100644
--- a/base/src/jsMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jsMain/kotlin/utils/TimeZone.kt
@@ -17,6 +17,9 @@
 
 package com.splendo.kaluga.base.utils
 
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+
 // TODO Implement with proper timezone solution for Java Script
 /**
  * A default implementation of [BaseTimeZone].
@@ -46,9 +49,9 @@ actual class TimeZone internal constructor() : BaseTimeZone() {
 
     override val identifier: String = ""
     override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String = ""
-    override val offsetFromGMTInMilliseconds = 0L
-    override val daylightSavingsOffsetInMilliseconds: Long = 0L
-    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = 0L
+    override val offsetFromGMT = 0.milliseconds
+    override val daylightSavingsOffset = 0.milliseconds
+    override fun offsetFromGMTAtDate(date: KalugaDate): Duration = 0.milliseconds
     override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = false
     override fun copy(): TimeZone = TimeZone()
 }
diff --git a/base/src/jvmMain/kotlin/utils/KalugaDate.kt b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
index 7bd6be088..0a4c777e7 100644
--- a/base/src/jvmMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
@@ -19,6 +19,8 @@ package com.splendo.kaluga.base.utils
 
 import java.util.Calendar
 import java.util.Date
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 
 actual typealias KalugaDateHolder = Date
 
@@ -31,27 +33,27 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
 
         /**
          * Creates a [KalugaDate] relative to the current time
-         * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
+         * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
          * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun now(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
-                add(Calendar.MILLISECOND, offsetInMilliseconds.toInt())
+                add(Calendar.MILLISECOND, offset.inWholeMilliseconds.toInt())
             }
         )
 
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
-         * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
+         * @param offset The [Duration] from the epoch time. Defaults to 0 milliseconds
          * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun epoch(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
-                timeInMillis = offsetInMilliseconds
+                timeInMillis = offset.inWholeMilliseconds
             }
         )
     }
@@ -101,15 +103,15 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
     override var millisecond: Int
         get() = calendar.get(Calendar.MILLISECOND)
         set(value) { calendar.set(Calendar.MILLISECOND, value) }
-    override var millisecondSinceEpoch: Long
-        get() = calendar.timeInMillis
-        set(value) { calendar.timeInMillis = value }
+    override var durationSinceEpoch: Duration
+        get() = calendar.timeInMillis.milliseconds
+        set(value) { calendar.timeInMillis = value.inWholeMilliseconds }
 
     override fun copy(): KalugaDate = DefaultKalugaDate(calendar.clone() as Calendar)
 
     override fun equals(other: Any?): Boolean {
         return (other as? KalugaDate)?.let {
-            timeZone == other.timeZone && millisecondSinceEpoch == other.millisecondSinceEpoch
+            timeZone == other.timeZone && durationSinceEpoch == other.durationSinceEpoch
         } ?: false
     }
 
diff --git a/base/src/jvmMain/kotlin/utils/TimeZone.kt b/base/src/jvmMain/kotlin/utils/TimeZone.kt
index 8c4ea0c42..274aec47d 100644
--- a/base/src/jvmMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jvmMain/kotlin/utils/TimeZone.kt
@@ -17,6 +17,9 @@
 
 package com.splendo.kaluga.base.utils
 
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+
 /**
  * A default implementation of [BaseTimeZone].
  */
@@ -57,9 +60,9 @@ actual class TimeZone internal constructor(internal val timeZone: java.util.Time
         }
         return timeZone.getDisplayName(withDaylightSavings, styleJava, locale.locale)
     }
-    override val offsetFromGMTInMilliseconds = timeZone.rawOffset.toLong()
-    override val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
-    override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
+    override val offsetFromGMT = timeZone.rawOffset.milliseconds
+    override val daylightSavingsOffset = timeZone.dstSavings.milliseconds
+    override fun offsetFromGMTAtDate(date: KalugaDate): Duration = timeZone.getOffset(date.durationSinceEpoch.inWholeMilliseconds).milliseconds
     override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
     override fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
     override fun equals(other: Any?): Boolean {
diff --git a/beacons/src/commonMain/kotlin/Beacons.kt b/beacons/src/commonMain/kotlin/Beacons.kt
index b5360ddde..7478eb14c 100644
--- a/beacons/src/commonMain/kotlin/Beacons.kt
+++ b/beacons/src/commonMain/kotlin/Beacons.kt
@@ -100,7 +100,7 @@ class Beacons(
                 }
                 this[beacon.beaconID] = beacon to coroutineScope.launch {
                     debug(TAG, "[Added] $beacon")
-                    delay(beacon.lastSeen.millisecondSinceEpoch + timeout.inWholeMilliseconds - DefaultKalugaDate.now().millisecondSinceEpoch)
+                    delay(beacon.lastSeen.durationSinceEpoch + timeout - DefaultKalugaDate.now().durationSinceEpoch)
                     debug(TAG, "[Lost] $beacon")
                     cache.remove(beacon.beaconID)
                     updateList()
diff --git a/date-time-picker/api/androidLib/date-time-picker.api b/date-time-picker/api/androidLib/date-time-picker.api
index 93153b472..123ae6e12 100644
--- a/date-time-picker/api/androidLib/date-time-picker.api
+++ b/date-time-picker/api/androidLib/date-time-picker.api
@@ -3,6 +3,7 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 	public fun dismiss (Z)V
 	protected abstract fun dismissDateTimePicker (Z)V
 	public static synthetic fun dismissDateTimePicker$default (Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;ZILjava/lang/Object;)V
+	protected final fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public fun show (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun showAsync (ZLkotlin/jvm/functions/Function1;)V
 	protected abstract fun showDateTimePicker (ZLkotlin/jvm/functions/Function1;)V
diff --git a/date-time-picker/api/jvm/date-time-picker.api b/date-time-picker/api/jvm/date-time-picker.api
index aef3a90a8..454cb2d00 100644
--- a/date-time-picker/api/jvm/date-time-picker.api
+++ b/date-time-picker/api/jvm/date-time-picker.api
@@ -3,6 +3,7 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 	public fun dismiss (Z)V
 	protected abstract fun dismissDateTimePicker (Z)V
 	public static synthetic fun dismissDateTimePicker$default (Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;ZILjava/lang/Object;)V
+	protected final fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public fun show (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun showAsync (ZLkotlin/jvm/functions/Function1;)V
 	protected abstract fun showDateTimePicker (ZLkotlin/jvm/functions/Function1;)V
diff --git a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
index d930ecea9..3e1f7d373 100644
--- a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
@@ -31,17 +31,37 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 
+/**
+ * A [BaseDateTimePickerPresenter] for presenting an [DateTimePicker].
+ * @param dateTimePicker The [DateTimePicker] being presented.
+ * @param themeResourceId the resource ID of the theme to apply to the date-time picker dialog
+ * @param lifecycleManagerObserver The [LifecycleManagerObserver] to observe lifecycle changes
+ * @param coroutineScope The [CoroutineScope] managing changes to the alert presentation.
+ */
 actual class DateTimePickerPresenter(
-    private val dateTimePicker: DateTimePicker,
+    dateTimePicker: DateTimePicker,
     private val themeResourceId: Int,
     private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver(),
     coroutineScope: CoroutineScope
 ) : BaseDateTimePickerPresenter(dateTimePicker), CoroutineScope by coroutineScope {
 
+    /**
+     * A [BaseDateTimePickerPresenter.Builder] for creating a [DateTimePickerPresenter]
+     * @param themeResourceId the resource ID of the theme to apply to the date-time picker dialog
+     * @param lifecycleManagerObserver The [LifecycleManagerObserver] to observe lifecycle changes
+     */
     actual class Builder(
         private val themeResourceId: Int = 0,
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
     ) : BaseDateTimePickerPresenter.Builder(), ActivityLifecycleSubscribable by lifecycleManagerObserver {
+
+        /**
+         * Creates a [DateTimePickerPresenter]
+         *
+         * @param dateTimePicker The [DateTimePicker] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [DateTimePickerPresenter]
+         */
         actual override fun create(
             dateTimePicker: DateTimePicker,
             coroutineScope: CoroutineScope
@@ -112,10 +132,10 @@ actual class DateTimePickerPresenter(
                     dateTimePicker.selectedDate.day
                 ).apply {
                     type.earliestDate?.let {
-                        datePicker.minDate = it.millisecondSinceEpoch
+                        datePicker.minDate = it.durationSinceEpoch.inWholeMilliseconds
                     }
                     type.latestDate?.let {
-                        datePicker.maxDate = it.millisecondSinceEpoch
+                        datePicker.maxDate = it.durationSinceEpoch.inWholeMilliseconds
                     }
                 }
             }
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 02111f0c3..769933efe 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -27,6 +27,18 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 
+/**
+ * An object that represents a date-time picker view
+ *
+ * @property message (optional) message to show in the date-time picker
+ * @property cancelButtonTitle the text to show in the button to cancel picking a date
+ * @property confirmButtonTitle the text to show in the button to confirm picking a date
+ * @property type the [Type] of date time picker
+ * @property locale the [Locale] used for representing time in the date-time picker
+ * @property selectedDate the [KalugaDate] that the date-time picker will use as a base for picking the date.
+ * This will determine the initial time/day to be selected in the picker, depending on the [type].
+ * Upon completion, a copy of this date modified with the selected date or time will be provided, keeping timezone and components not selected the same.
+ */
 data class DateTimePicker(
     val message: String?,
     val cancelButtonTitle: String,
@@ -43,11 +55,21 @@ data class DateTimePicker(
         /**
          * Selects a Date
          * A range can be provided to limit the dates selectable
+         *
+         * @property earliestDate if provided, no date kan be picked that is before this [KalugaDate]
+         * @property latestDate if provided, no date kan be picked that is after this [KalugaDate]
          */
         data class DateType(
             val earliestDate: KalugaDate? = null,
             val latestDate: KalugaDate? = null
-        ) : Type()
+        ) : Type() {
+
+            internal fun adjustDate(date: KalugaDate) = when {
+                earliestDate != null && earliestDate > date -> earliestDate
+                latestDate != null && latestDate < date -> latestDate
+                else -> date
+            }
+        }
 
         /**
          * Selects a Time
@@ -55,43 +77,74 @@ data class DateTimePicker(
         object TimeType : Type()
     }
 
-    class Builder(private var type: Type = Type.TimeType) {
+    /**
+     * Builder class for creating a [DateTimePicker]
+     * @param type the [Type] of [DateTimePicker] to build.
+     */
+    class Builder(private val type: Type = Type.TimeType) {
         private var message: String? = null
         private var cancelButtonTitle: String = ""
         private var confirmButtonTitle: String = ""
         private var locale: Locale = defaultLocale
-        private var selectedDate: KalugaDate = DefaultKalugaDate.epoch()
+        private var selectedDate: KalugaDate = when (type) {
+            is Type.DateType -> type.adjustDate(
+                DefaultKalugaDate.now().apply {
+                    hour = 0
+                    minute = 0
+                    second = 0
+                    millisecond = 0
+                }
+            )
+            is Type.TimeType -> DefaultKalugaDate.epoch().apply {
+                val now = DefaultKalugaDate.now()
+                hour = now.hour
+                minute = now.minute
+                second = 0
+                millisecond = 0
+            }
+        }
 
         /**
          * Sets the [message] displayed in the DateTimePicker
          *
-         * @param message The message of the alert
+         * @param message The message of the DateTimePicker
          */
         fun setMessage(message: String?) = apply { this.message = message }
 
         /**
-         * Sets this [cancelButtonTitle] shown in the DateTimePicker
+         * Sets the text to show in the DateTimePicker button to cancel picking a date
+         *
+         * @param cancelButtonTitle the text to show in the cancel button
          */
         fun setCancelButtonTitle(cancelButtonTitle: String) = apply { this.cancelButtonTitle = cancelButtonTitle }
 
         /**
-         * Sets this [cancelButtonTitle] shown in the DateTimePicker
+         * Sets the text to show in the DateTimePicker button to confirm picking a date
+         *
+         * @param confirmButtonTitle the text to show in the confirm button
          */
         fun setConfirmButtonTitle(confirmButtonTitle: String) = apply { this.confirmButtonTitle = confirmButtonTitle }
 
         /**
-         * Sets the Locale for which a Date is selected
+         * Sets the [Locale] for which a Date is selected
+         *
+         * @param locale the [Locale] for which the date is selected
          */
         fun setLocale(locale: Locale) = apply { this.locale = locale }
 
-        fun setSelectedDate(date: KalugaDate) = apply { this.selectedDate = date }
-
         /**
-         * Sets a style of the alert
+         * Sets the [KalugaDate] that the date-time picker will use as a base for picking the date.
+         * This will determine the initial time/day to be selected in the picker, depending on the [type].
+         * Upon completion, a copy of this date modified with the selected date or time will be provided, keeping timezone and components not selected the same.
          *
-         * @param type The style of an alert
+         * @param date the date to use as a basis for selection.
          */
-        internal fun setType(type: Type) = apply { this.type = type }
+        fun setSelectedDate(date: KalugaDate) = apply {
+            this.selectedDate = when (type) {
+                is Type.DateType -> type.adjustDate(date)
+                is Type.TimeType -> date
+            }
+        }
 
         /**
          * Creates a [DateTimePicker]
@@ -108,27 +161,27 @@ data class DateTimePicker(
 }
 
 /**
- * Interface that defines actions that can be applied to the alert.
+ * Interface that defines actions that can used to present a [DateTimePicker].
  */
 interface DateTimePickerActions {
     /**
-     * Presents an DateTimePicker
+     * Presents a [DateTimePicker]
      *
      * @param animated Pass `true` to animate the presentation
-     * @param completion The callback invoked when a Date is selected or the dialog is cancelled
+     * @param completion The callback invoked when a [KalugaDate] is selected or the dialog is cancelled
      */
     fun showAsync(animated: Boolean = true, completion: (KalugaDate?) -> Unit = {})
 
     /**
-     * Presents an DateTimePicker and suspends
+     * Presents a [DateTimePicker] and suspends until completion
      *
-     * @param animated
+     * @param animated Pass `true` to animate the presentation
      * @return The [KalugaDate] that was selected or `null` if the DateTimePicker was cancelled
      */
     suspend fun show(animated: Boolean = true): KalugaDate?
 
     /**
-     * Dismisses the DateTimePicker, which was presented previously
+     * Dismisses the currently presented [DateTimePicker].
      *
      * @param animated Pass `true` to animate the transition
      */
@@ -139,13 +192,12 @@ interface DateTimePickerActions {
  * Abstract DateTimePicker presenter, used to show and dismiss given [DateTimePicker]
  * @see [DateTimePickerPresenter]
  *
- * @param dateTimePicker The alert to present (and dismiss if needed)
+ * @param dateTimePicker The [DateTimePicker] to present (and dismiss if needed)
  */
-abstract class BaseDateTimePickerPresenter(private val dateTimePicker: DateTimePicker) : DateTimePickerActions {
+abstract class BaseDateTimePickerPresenter(protected val dateTimePicker: DateTimePicker) : DateTimePickerActions {
 
     /**
-     * Abstract alert builder class, used to create an [DateTimePicker].
-     * The resulting DateTimePicker that can be shown and dismissed using an [DateTimePickerPresenter].
+     * Abstract alert builder class, used to create an [BaseDateTimePickerPresenter].
      *
      * @see [DateTimePickerPresenter.Builder]
      */
@@ -155,7 +207,7 @@ abstract class BaseDateTimePickerPresenter(private val dateTimePicker: DateTimeP
          * Creates the [BaseDateTimePickerPresenter] described by this builder.
          *
          * @param dateTimePicker The [DateTimePicker] to be presented with the built presenter
-         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @param coroutineScope The [CoroutineScope] managing the date-time picker lifecycle.
          * @return The [BaseDateTimePickerPresenter] described by this builder.
          */
         abstract fun create(dateTimePicker: DateTimePicker, coroutineScope: CoroutineScope): BaseDateTimePickerPresenter
@@ -187,26 +239,32 @@ abstract class BaseDateTimePickerPresenter(private val dateTimePicker: DateTimeP
 }
 
 /**
- * Class for presenting an [DateTimePicker].
+ * Class for presenting a [DateTimePicker]. Implementation of [BaseDateTimePickerPresenter]
  */
 expect class DateTimePickerPresenter : BaseDateTimePickerPresenter {
+
+    /**
+     * A [BaseDateTimePickerPresenter.Builder] for creating a [DateTimePickerPresenter]
+     */
     class Builder : BaseDateTimePickerPresenter.Builder {
         /**
-         * Creates DateTimePickerPresenter object
+         * Creates a [DateTimePickerPresenter]
          *
          * @param dateTimePicker The [DateTimePicker] to be presented with the built presenter.
          * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
-         * @return The DateTimePickerPresenter object
+         * @return The created [DateTimePickerPresenter]
          */
         override fun create(dateTimePicker: DateTimePicker, coroutineScope: CoroutineScope): DateTimePickerPresenter
     }
 }
 
 /**
- * Builds an alert using DSL syntax (thread safe)
+ * Builds a date picker using DSL syntax (thread safe)
  *
  * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
- * @param initialize The block to construct an [DateTimePicker]
+ * @property earliestDate if provided, no date kan be picked that is before this [KalugaDate]
+ * @property latestDate if provided, no date kan be picked that is after this [KalugaDate]
+ * @param initialize The block to construct a [DateTimePicker] with type [DateTimePicker.Type.DateType]
  * @return The built alert interface object
  */
 fun BaseDateTimePickerPresenter.Builder.buildDatePicker(
@@ -222,10 +280,10 @@ fun BaseDateTimePickerPresenter.Builder.buildDatePicker(
 )
 
 /**
- * Builds an alert using DSL syntax (thread safe)
+ * Builds a time picker using DSL syntax (thread safe)
  *
  * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
- * @param initialize The block to construct an Alert
+ * @param initialize The block to construct a [DateTimePicker] with type [DateTimePicker.Type.TimeType]
  * @return The built alert interface object
  */
 fun BaseDateTimePickerPresenter.Builder.buildTimePicker(
diff --git a/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
index 5e564db8f..bd8cc0e54 100644
--- a/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/iosMain/kotlin/DateTimePickerPresenter.kt
@@ -49,13 +49,39 @@ import platform.UIKit.topAnchor
 import platform.UIKit.trailingAnchor
 import platform.UIKit.translatesAutoresizingMaskIntoConstraints
 import platform.objc.sel_registerName
-
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.DurationUnit
+
+/**
+ * A [BaseDateTimePickerPresenter] for presenting a [DateTimePicker]
+ * @param dateTimePicker the [DateTimePicker] to present
+ * @param parent The [UIViewController] to present the [DateTimePicker]
+ */
 actual class DateTimePickerPresenter(
-    private val datePicker: DateTimePicker,
+    dateTimePicker: DateTimePicker,
     private val parent: UIViewController
-) : BaseDateTimePickerPresenter(datePicker) {
+) : BaseDateTimePickerPresenter(dateTimePicker) {
+
+    /**
+     * A [BaseDateTimePickerPresenter.Builder] for creating a [DateTimePickerPresenter]
+     * @param viewController The [UIViewController] to present any [DateTimePickerPresenter] built using this builder.
+     */
+    actual class Builder(private val viewController: UIViewController) : BaseDateTimePickerPresenter.Builder() {
+
+        /**
+         * Creates a [DateTimePickerPresenter]
+         *
+         * @param dateTimePicker The [DateTimePicker] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [DateTimePickerPresenter]
+         */
+        actual override fun create(
+            dateTimePicker: DateTimePicker,
+            coroutineScope: CoroutineScope
+        ) = DateTimePickerPresenter(dateTimePicker, viewController)
+    }
 
-    private inner class DateTimePickerViewController(private val datePicker: DateTimePicker, private val completion: (KalugaDate?) -> Unit) : UIViewController(null, null) {
+    private inner class DateTimePickerViewController(private val completion: (KalugaDate?) -> Unit) : UIViewController(null, null) {
 
         private lateinit var datePickerView: UIDatePicker
 
@@ -78,20 +104,20 @@ actual class DateTimePickerPresenter(
 
             datePickerView = UIDatePicker().apply {
                 calendar = NSCalendar.currentCalendar.apply {
-                    this.locale = datePicker.locale.nsLocale
-                    this.timeZone = datePicker.selectedDate.timeZone.timeZone
+                    this.locale = this@DateTimePickerPresenter.dateTimePicker.locale.nsLocale
+                    this.timeZone = this@DateTimePickerPresenter.dateTimePicker.selectedDate.timeZone.timeZone
                 }
-                date = NSDate.dateWithTimeIntervalSince1970((datePicker.selectedDate.millisecondSinceEpoch.toDouble() / 1000.0))
-                locale = datePicker.locale.nsLocale
-                timeZone = datePicker.selectedDate.timeZone.timeZone
-                datePickerMode = when (val type = datePicker.type) {
+                date = NSDate.dateWithTimeIntervalSince1970(this@DateTimePickerPresenter.dateTimePicker.selectedDate.durationSinceEpoch.toDouble(DurationUnit.SECONDS))
+                locale = this@DateTimePickerPresenter.dateTimePicker.locale.nsLocale
+                timeZone = this@DateTimePickerPresenter.dateTimePicker.selectedDate.timeZone.timeZone
+                datePickerMode = when (val type = this@DateTimePickerPresenter.dateTimePicker.type) {
                     is DateTimePicker.Type.TimeType -> UIDatePickerMode.UIDatePickerModeTime
                     is DateTimePicker.Type.DateType -> {
                         type.latestDate?.let {
-                            maximumDate = NSDate.dateWithTimeIntervalSince1970((it.millisecondSinceEpoch.toDouble() / 1000.0))
+                            maximumDate = NSDate.dateWithTimeIntervalSince1970(it.durationSinceEpoch.toDouble(DurationUnit.SECONDS))
                         }
                         type.earliestDate?.let {
-                            minimumDate = NSDate.dateWithTimeIntervalSince1970((it.millisecondSinceEpoch.toDouble() / 1000.0))
+                            minimumDate = NSDate.dateWithTimeIntervalSince1970(it.durationSinceEpoch.toDouble(DurationUnit.SECONDS))
                         }
                         UIDatePickerMode.UIDatePickerModeDate
                     }
@@ -112,7 +138,7 @@ actual class DateTimePickerPresenter(
                 bottomAnchor.constraintEqualToAnchor(containerView.bottomAnchor, -10.0).active = true
             }
 
-            val topAnchor = datePicker.message?.let {
+            val topAnchor = this@DateTimePickerPresenter.dateTimePicker.message?.let {
                 UILabel().apply {
                     text = it
                     containerView.addSubview(this)
@@ -148,23 +174,16 @@ actual class DateTimePickerPresenter(
 
         @ObjCAction
         private fun onSelected() {
-            completion(DefaultKalugaDate.epoch((datePickerView.date.timeIntervalSince1970 * 1000.0).toLong(), datePicker.selectedDate.timeZone, datePicker.locale))
+            completion(DefaultKalugaDate.epoch(datePickerView.date.timeIntervalSince1970.seconds, this@DateTimePickerPresenter.dateTimePicker.selectedDate.timeZone, this@DateTimePickerPresenter.dateTimePicker.locale))
             dismissDateTimePicker(true)
         }
     }
 
-    actual class Builder(private val viewController: UIViewController) : BaseDateTimePickerPresenter.Builder() {
-        actual override fun create(
-            dateTimePicker: DateTimePicker,
-            coroutineScope: CoroutineScope
-        ) = DateTimePickerPresenter(dateTimePicker, viewController)
-    }
-
     override fun dismissDateTimePicker(animated: Boolean) {
         parent.dismissModalViewControllerAnimated(animated)
     }
 
     override fun showDateTimePicker(animated: Boolean, completion: (KalugaDate?) -> Unit) {
-        parent.presentViewController(DateTimePickerViewController(datePicker, completion), animated, null)
+        parent.presentViewController(DateTimePickerViewController(completion), animated, null)
     }
 }
diff --git a/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt
index dbecca829..379b04704 100644
--- a/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/jsMain/kotlin/DateTimePickerPresenter.kt
@@ -21,12 +21,29 @@ package com.splendo.kaluga.datetimepicker
 import com.splendo.kaluga.base.utils.KalugaDate
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * A [DateTimePickerPresenter] for presenting a [DateTimePicker].
+ *
+ * This is not yet fully implemented on JVM
+ *
+ * @param dateTimePicker The [DateTimePicker] being presented.
+ */
 actual class DateTimePickerPresenter(
     dateTimePicker: DateTimePicker
 ) : BaseDateTimePickerPresenter(dateTimePicker) {
 
+    /**
+     * A [BaseDateTimePickerPresenter.Builder] for creating a [DateTimePickerPresenter]
+     */
     actual class Builder : BaseDateTimePickerPresenter.Builder() {
 
+        /**
+         * Creates a [DateTimePickerPresenter]
+         *
+         * @param dateTimePicker The [DateTimePicker] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [DateTimePickerPresenter]
+         */
         actual override fun create(dateTimePicker: DateTimePicker, coroutineScope: CoroutineScope): DateTimePickerPresenter {
             return DateTimePickerPresenter(dateTimePicker)
         }
diff --git a/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt
index 791ea86cb..4b5639afa 100644
--- a/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/jvmMain/kotlin/DateTimePickerPresenter.kt
@@ -20,12 +20,29 @@ package com.splendo.kaluga.datetimepicker
 import com.splendo.kaluga.base.utils.KalugaDate
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * A [DateTimePickerPresenter] for presenting a [DateTimePicker].
+ *
+ * This is not yet fully implemented on JVM
+ *
+ * @param dateTimePicker The [DateTimePicker] being presented.
+ */
 actual class DateTimePickerPresenter(
-    datePicker: DateTimePicker
-) : BaseDateTimePickerPresenter(datePicker) {
+    dateTimePicker: DateTimePicker
+) : BaseDateTimePickerPresenter(dateTimePicker) {
 
+    /**
+     * A [BaseDateTimePickerPresenter.Builder] for creating a [DateTimePickerPresenter]
+     */
     actual class Builder : BaseDateTimePickerPresenter.Builder() {
 
+        /**
+         * Creates a [DateTimePickerPresenter]
+         *
+         * @param dateTimePicker The [DateTimePicker] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [DateTimePickerPresenter]
+         */
         actual override fun create(dateTimePicker: DateTimePicker, coroutineScope: CoroutineScope): DateTimePickerPresenter {
             return DateTimePickerPresenter(dateTimePicker)
         }
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
index eee693219..856a84d05 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/RecurringTimer.kt
@@ -39,9 +39,11 @@ import com.splendo.kaluga.base.state.KalugaState as KalugaState
 /** A coroutine delay function. */
 typealias DelayFunction = suspend (Duration) -> Unit
 /**
- * Timer based on the system clock.
- * @param duration timer duration
- * @param interval timer tick interval
+ * [Timer] based on the system clock.
+ * @property duration timer duration
+ * @param interval The [Duration] between timer ticks
+ * @param timeSource The [TimeSource] for measuring intervals
+ * @param delayFunction Method for delaying a given [Duration]
  * @param coroutineScope a parent coroutine scope for the timer
  */
 class RecurringTimer(
diff --git a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
index ccd16b21f..340648c86 100644
--- a/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
+++ b/date-time/src/commonMain/kotlin/com/splendo/kaluga/datetime/timer/Timer.kt
@@ -24,25 +24,46 @@ import kotlin.time.Duration
 
 /** A timer ticking a certain [duration]. */
 interface Timer {
-    /** Timer duration. */
+    /** Timer [Duration]. */
     val duration: Duration
-    /** Current state of the timer. */
+    /** Flow of [State] of the timer. */
     val state: Flow<State>
     /** The current [State] of the timer. */
     val currentState: State
 
+    /**
+     * The state of a [Timer]
+     */
     sealed interface State {
+        /**
+         * A [Flow] of the [Duration] that has elapsed while the timer was in a [Running] state
+         */
         val elapsed: Flow<Duration>
+
+        /**
+         * A [State] that indicates the [Timer] is currently running. This may result in changes to [elapsed]
+         */
         interface Running : State
 
+        /**
+         * A [State] that indicates that a [Timer] is not currently running.
+         */
         sealed interface NotRunning : State {
+
+            /**
+             * A [NotRunning] state to indicate that the [Timer] has been paused
+             */
             interface Paused : NotRunning
+
+            /**
+             * A [NotRunning] state to indicate that the [Timer] has finished running.
+             */
             interface Finished : NotRunning
         }
     }
 }
 
-/** A timer ticking a certain [duration] with ability to [start] and [pause]. */
+/** A [Timer] ticking a certain [duration] with the ability to [start] and [pause]. */
 interface ControllableTimer : Timer {
     /** Starts the timer. */
     suspend fun start()
@@ -50,7 +71,7 @@ interface ControllableTimer : Timer {
     suspend fun pause()
 }
 
-/** Time elapsed from the timer start. */
+/** [Duration] that has elapsed while [Timer.state] was [Timer.State.Running]. */
 fun Timer.elapsed(): Flow<Duration> = state
     .transformWhile { stateValue ->
         // [Finished] is the final state, ensure the consumer's [collect] would be able to exit
@@ -59,7 +80,7 @@ fun Timer.elapsed(): Flow<Duration> = state
     }
     .flatMapLatest { state -> state.elapsed }
 
-/** Awaits for the timer to finish. */
+/** Awaits for the [Timer] to reach the [Timer.State.NotRunning.Finished] state. */
 suspend fun Timer.awaitFinish() {
     state.firstInstance<Timer.State.NotRunning.Finished>()
 }
diff --git a/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api b/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
index f20b595a8..1f2fe0888 100644
--- a/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
+++ b/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
@@ -15,7 +15,6 @@ public final class com/splendo/kaluga/test/datetimepicker/MockDateTimePickerPres
 	public synthetic fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun closeWithDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)V
 	public fun dismiss (Z)V
-	public final fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public final fun getDismissMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getShowAsyncMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun isPresented ()Z
diff --git a/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api b/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
index 9c55470f6..761e795cc 100644
--- a/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
+++ b/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
@@ -3,7 +3,6 @@ public final class com/splendo/kaluga/test/datetimepicker/MockDateTimePickerPres
 	public synthetic fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun closeWithDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)V
 	public fun dismiss (Z)V
-	public final fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public final fun getDismissMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getShowAsyncMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun isPresented ()Z
diff --git a/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt b/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
index 9b15e6218..b047bb282 100644
--- a/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
+++ b/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
@@ -30,7 +30,7 @@ import kotlinx.coroutines.CoroutineScope
  * Mock implementation of [BaseKeyboardManager]
  * @param setupMocks If `true` configure mocks to display the keyboard
  */
-class MockDateTimePickerPresenter(val dateTimePicker: DateTimePicker, setupMocks: Boolean = true) : BaseDateTimePickerPresenter(dateTimePicker) {
+class MockDateTimePickerPresenter(dateTimePicker: DateTimePicker, setupMocks: Boolean = true) : BaseDateTimePickerPresenter(dateTimePicker) {
 
     /**
      * Mock implementation of [BaseKeyboardManager.Builder]

From 196ed34bb84d5eb69d67bc587e0bc1fb72c60460 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 8 Feb 2023 17:50:00 +0100
Subject: [PATCH 161/227] Added Kdoc for HUD, Keyboard, Logging and Review

---
 base/src/commonMain/kotlin/utils/TimeZone.kt  |  2 +-
 hud/api/androidLib/hud.api                    |  2 +
 hud/api/jvm/hud.api                           |  2 +
 hud/src/androidLibMain/kotlin/HUD.kt          | 13 +++++++
 hud/src/commonMain/kotlin/HUD.kt              | 39 ++++++++++++++++---
 hud/src/iosMain/kotlin/HUD.kt                 | 18 +++++++++
 hud/src/jsMain/kotlin/HUD.kt                  | 14 +++++++
 hud/src/jvmMain/kotlin/HUD.kt                 | 14 +++++++
 .../src/main/kotlin/ComposeFocusHandler.kt    |  4 ++
 .../src/main/kotlin/ComposeKeyboardManager.kt |  7 ++++
 .../src/androidLibMain/kotlin/FocusHandler.kt |  4 ++
 .../androidLibMain/kotlin/KeyboardManager.kt  |  9 +++++
 .../commonMain/kotlin/BaseKeyboardManager.kt  |  7 +++-
 keyboard/src/iosMain/kotlin/FocusHandler.kt   |  9 +++++
 .../src/iosMain/kotlin/KeyboardManager.kt     | 13 +++++++
 keyboard/src/jsMain/kotlin/KeyboardManager.kt |  6 +++
 .../src/jvmMain/kotlin/KeyboardManager.kt     |  6 +++
 logging/api/androidLib/logging.api            |  5 ---
 logging/api/jvm/logging.api                   |  5 ---
 logging/src/androidLibMain/kotlin/log.kt      |  8 ++++
 logging/src/commonMain/kotlin/LogLevel.kt     |  6 ++-
 logging/src/commonMain/kotlin/Logger.kt       | 14 ++++++-
 logging/src/commonMain/kotlin/NapierLogger.kt |  8 +++-
 .../src/commonMain/kotlin/RestrictedLogger.kt | 37 ++++++++++++++++++
 logging/src/commonMain/kotlin/log.kt          | 11 +++++-
 logging/src/iosMain/kotlin/log.kt             |  8 ++++
 logging/src/jsMain/kotlin/log.kt              |  9 +++++
 logging/src/jvmMain/kotlin/log.kt             |  9 +++++
 .../androidLibMain/kotlin/ReviewManager.kt    | 31 +++++++++++++++
 review/src/commonMain/kotlin/ReviewManager.kt |  9 ++++-
 review/src/iosMain/kotlin/ReviewManager.kt    | 15 +++++++
 review/src/jsMain/kotlin/ReviewManager.kt     | 15 +++++++
 review/src/jvmMain/kotlin/ReviewManager.kt    | 15 +++++++
 33 files changed, 349 insertions(+), 25 deletions(-)

diff --git a/base/src/commonMain/kotlin/utils/TimeZone.kt b/base/src/commonMain/kotlin/utils/TimeZone.kt
index 3138d38d7..5052efbf8 100644
--- a/base/src/commonMain/kotlin/utils/TimeZone.kt
+++ b/base/src/commonMain/kotlin/utils/TimeZone.kt
@@ -60,7 +60,7 @@ abstract class BaseTimeZone {
      * @param locale The [Locale] used for naming the [TimeZone]. Defaults to [Locale.defaultLocale]
      */
     abstract fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean = usesDaylightSavingsTime(), locale: Locale = defaultLocale): String
-    
+
     /**
      * The [Duration] this timezone differs from GMT when daylight savings time is not active
      */
diff --git a/hud/api/androidLib/hud.api b/hud/api/androidLib/hud.api
index 6702ff0fa..705ab9c2d 100644
--- a/hud/api/androidLib/hud.api
+++ b/hud/api/androidLib/hud.api
@@ -38,6 +38,8 @@ public final class com/splendo/kaluga/hud/HUDKt {
 	public static synthetic fun build$default (Lcom/splendo/kaluga/hud/BaseHUD$Builder;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/hud/BaseHUD;
 	public static final fun dismissAfter (Lcom/splendo/kaluga/hud/BaseHUD;JZ)Lcom/splendo/kaluga/hud/BaseHUD;
 	public static synthetic fun dismissAfter$default (Lcom/splendo/kaluga/hud/BaseHUD;JZILjava/lang/Object;)Lcom/splendo/kaluga/hud/BaseHUD;
+	public static final fun dismissAfter-8Mi8wO0 (Lcom/splendo/kaluga/hud/BaseHUD;JZ)Lcom/splendo/kaluga/hud/BaseHUD;
+	public static synthetic fun dismissAfter-8Mi8wO0$default (Lcom/splendo/kaluga/hud/BaseHUD;JZILjava/lang/Object;)Lcom/splendo/kaluga/hud/BaseHUD;
 	public static final fun getStyle (Lcom/splendo/kaluga/hud/BaseHUD;)Lcom/splendo/kaluga/hud/HUDStyle;
 	public static final fun getTitle (Lcom/splendo/kaluga/hud/BaseHUD;)Ljava/lang/String;
 	public static final fun presentDuring (Lcom/splendo/kaluga/hud/BaseHUD;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/hud/api/jvm/hud.api b/hud/api/jvm/hud.api
index 3ab1f43ea..e87d4e8c6 100644
--- a/hud/api/jvm/hud.api
+++ b/hud/api/jvm/hud.api
@@ -33,6 +33,8 @@ public final class com/splendo/kaluga/hud/HUDKt {
 	public static synthetic fun build$default (Lcom/splendo/kaluga/hud/BaseHUD$Builder;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/splendo/kaluga/hud/BaseHUD;
 	public static final fun dismissAfter (Lcom/splendo/kaluga/hud/BaseHUD;JZ)Lcom/splendo/kaluga/hud/BaseHUD;
 	public static synthetic fun dismissAfter$default (Lcom/splendo/kaluga/hud/BaseHUD;JZILjava/lang/Object;)Lcom/splendo/kaluga/hud/BaseHUD;
+	public static final fun dismissAfter-8Mi8wO0 (Lcom/splendo/kaluga/hud/BaseHUD;JZ)Lcom/splendo/kaluga/hud/BaseHUD;
+	public static synthetic fun dismissAfter-8Mi8wO0$default (Lcom/splendo/kaluga/hud/BaseHUD;JZILjava/lang/Object;)Lcom/splendo/kaluga/hud/BaseHUD;
 	public static final fun getStyle (Lcom/splendo/kaluga/hud/BaseHUD;)Lcom/splendo/kaluga/hud/HUDStyle;
 	public static final fun getTitle (Lcom/splendo/kaluga/hud/BaseHUD;)Ljava/lang/String;
 	public static final fun presentDuring (Lcom/splendo/kaluga/hud/BaseHUD;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/hud/src/androidLibMain/kotlin/HUD.kt b/hud/src/androidLibMain/kotlin/HUD.kt
index 7364d1925..720bdda41 100644
--- a/hud/src/androidLibMain/kotlin/HUD.kt
+++ b/hud/src/androidLibMain/kotlin/HUD.kt
@@ -46,10 +46,23 @@ import kotlinx.coroutines.launch
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
+/**
+ * Default [BaseHUD] implementation.
+ */
 actual class HUD private constructor(@LayoutRes viewResId: Int, override val hudConfig: HudConfig, lifecycleManagerObserver: LifecycleManagerObserver, coroutineScope: CoroutineScope) : BaseHUD(coroutineScope) {
 
+    /**
+     * Builder class for creating a [HUD]
+     * @param lifecycleManagerObserver the [LifecycleManagerObserver] to observe lifecycle changes.
+     */
     actual class Builder(private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()) : BaseHUD.Builder(), ActivityLifecycleSubscribable by lifecycleManagerObserver {
 
+        /**
+         * Creates a [HUD] based on [hudConfig].
+         * @param hudConfig The [HudConfig] to apply to the [HUD].
+         * @param coroutineScope The [CoroutineScope] managing the lifecycle of the HUD.
+         * @return the created [HUD]
+         */
         actual override fun create(hudConfig: HudConfig, coroutineScope: CoroutineScope) = HUD(
             R.layout.loading_indicator_view,
             hudConfig,
diff --git a/hud/src/commonMain/kotlin/HUD.kt b/hud/src/commonMain/kotlin/HUD.kt
index c9912d185..b1f4cc944 100644
--- a/hud/src/commonMain/kotlin/HUD.kt
+++ b/hud/src/commonMain/kotlin/HUD.kt
@@ -23,6 +23,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 
 /**
  * Style of the Loading Indicator
@@ -36,6 +38,7 @@ enum class HUDStyle {
 
 /**
  * Class showing a loading indicator HUD.
+ * @param coroutineScope The [CoroutineScope] managing the HUD lifecycle
  */
 abstract class BaseHUD(coroutineScope: CoroutineScope) : CoroutineScope by coroutineScope {
 
@@ -50,11 +53,14 @@ abstract class BaseHUD(coroutineScope: CoroutineScope) : CoroutineScope by corou
          *
          * @param hudConfig The [HudConfig] used for configuring the HUD style.
          * @param coroutineScope The [CoroutineScope] managing the HUD lifecycle.
-         * @return The [BaseHUD] to diplay.
+         * @return The [BaseHUD] to display.
          */
         abstract fun create(hudConfig: HudConfig, coroutineScope: CoroutineScope): BaseHUD
     }
 
+    /**
+     * The [HudConfig] of the HUD being presented.
+     */
     abstract val hudConfig: HudConfig
 
     /**
@@ -66,6 +72,7 @@ abstract class BaseHUD(coroutineScope: CoroutineScope) : CoroutineScope by corou
      * Presents as indicator
      *
      * @param animated Pass `true` to animate the presentation
+     * @return The [BaseHUD] being presented.
      */
     abstract suspend fun present(animated: Boolean = true): BaseHUD
 
@@ -86,27 +93,49 @@ expect class HUD : BaseHUD {
      * Builder class for creating a [HUD]
      */
     class Builder : BaseHUD.Builder {
+
+        /**
+         * Creates a [HUD] based on [hudConfig].
+         * @param hudConfig The [HudConfig] to apply to the [HUD].
+         * @param coroutineScope The [CoroutineScope] managing the lifecycle of the HUD.
+         * @return the created [HUD]
+         */
         override fun create(hudConfig: HudConfig, coroutineScope: CoroutineScope): HUD
     }
 }
 
+/**
+ * The title of the HUD.
+ */
 val BaseHUD.title: String? get() = hudConfig.title
+
+/**
+ * The [HUDStyle] of the HUD.
+ */
 val BaseHUD.style: HUDStyle get() = hudConfig.style
 
 /**
- * Dismisses the indicator after [timeMillis] milliseconds
- * @param timeMillis The number of milliseconds to wait
+ * Dismisses the indicator after [duration]
+ * @param duration The [Duration] to wait
+ * @param animated Pass `true` to animate the transition
  */
-fun BaseHUD.dismissAfter(timeMillis: Long, animated: Boolean = true): BaseHUD = apply {
+fun BaseHUD.dismissAfter(duration: Duration, animated: Boolean = true): BaseHUD = apply {
     launch(Dispatchers.Main) {
-        delay(timeMillis)
+        delay(duration)
         dismiss(animated)
     }
 }
+/**
+ * Dismisses the indicator after [timeMillis] milliseconds
+ * @param timeMillis The number of milliseconds to wait
+ * @param animated Pass `true` to animate the transition
+ */
+fun BaseHUD.dismissAfter(timeMillis: Long, animated: Boolean = true): BaseHUD = dismissAfter(timeMillis.milliseconds, animated)
 
 /**
  * Presents and keep presenting the indicator during block execution,
  * hides view after block finished.
+ * @param animated Pass `true` to animate the transition
  * @param block The block to execute with hud visible
  */
 suspend fun <T> BaseHUD.presentDuring(animated: Boolean = true, block: suspend BaseHUD.() -> T): T {
diff --git a/hud/src/iosMain/kotlin/HUD.kt b/hud/src/iosMain/kotlin/HUD.kt
index b30fcdd85..e6ce70917 100644
--- a/hud/src/iosMain/kotlin/HUD.kt
+++ b/hud/src/iosMain/kotlin/HUD.kt
@@ -60,12 +60,30 @@ import platform.UIKit.window
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
+/**
+ * Default [BaseHUD] implementation.
+ */
 actual class HUD private constructor(private val containerView: ContainerView, private val viewController: UIViewController, wrapper: (UIViewController) -> UIViewController, coroutineScope: CoroutineScope) : BaseHUD(coroutineScope) {
 
+    /**
+     * Builder class for creating a [HUD]
+     * @param viewController The [UIViewController] to present the loading indicator
+     * @param wrapper a modifier method for modifying the ViewController representing the loading indicator before it is presented.
+     */
     actual class Builder(private val viewController: UIViewController, private val wrapper: (UIViewController) -> UIViewController) : BaseHUD.Builder() {
 
+        /**
+         * Constructor
+         * @param viewController The [UIViewController] to present the loading indicator
+         */
         constructor(viewController: UIViewController) : this(viewController, { it })
 
+        /**
+         * Creates a [HUD] based on [hudConfig].
+         * @param hudConfig The [HudConfig] to apply to the [HUD].
+         * @param coroutineScope The [CoroutineScope] managing the lifecycle of the HUD.
+         * @return the created [HUD]
+         */
         actual override fun create(hudConfig: HudConfig, coroutineScope: CoroutineScope) = HUD(
             ContainerView(hudConfig, viewController.view.window?.bounds ?: UIScreen.mainScreen.bounds),
             viewController,
diff --git a/hud/src/jsMain/kotlin/HUD.kt b/hud/src/jsMain/kotlin/HUD.kt
index 952aa1fea..aecc97777 100644
--- a/hud/src/jsMain/kotlin/HUD.kt
+++ b/hud/src/jsMain/kotlin/HUD.kt
@@ -19,8 +19,22 @@ package com.splendo.kaluga.hud
 
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * Default [BaseHUD] implementation.
+ */
 actual class HUD(override val hudConfig: HudConfig, coroutineScope: CoroutineScope) : BaseHUD(coroutineScope) {
+
+    /**
+     * Builder class for creating a [HUD]
+     */
     actual class Builder : BaseHUD.Builder() {
+
+        /**
+         * Creates a [HUD] based on [hudConfig].
+         * @param hudConfig The [HudConfig] to apply to the [HUD].
+         * @param coroutineScope The [CoroutineScope] managing the lifecycle of the HUD.
+         * @return the created [HUD]
+         */
         actual override fun create(hudConfig: HudConfig, coroutineScope: CoroutineScope) = HUD(hudConfig, coroutineScope)
     }
 
diff --git a/hud/src/jvmMain/kotlin/HUD.kt b/hud/src/jvmMain/kotlin/HUD.kt
index 952aa1fea..aecc97777 100644
--- a/hud/src/jvmMain/kotlin/HUD.kt
+++ b/hud/src/jvmMain/kotlin/HUD.kt
@@ -19,8 +19,22 @@ package com.splendo.kaluga.hud
 
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * Default [BaseHUD] implementation.
+ */
 actual class HUD(override val hudConfig: HudConfig, coroutineScope: CoroutineScope) : BaseHUD(coroutineScope) {
+
+    /**
+     * Builder class for creating a [HUD]
+     */
     actual class Builder : BaseHUD.Builder() {
+
+        /**
+         * Creates a [HUD] based on [hudConfig].
+         * @param hudConfig The [HudConfig] to apply to the [HUD].
+         * @param coroutineScope The [CoroutineScope] managing the lifecycle of the HUD.
+         * @return the created [HUD]
+         */
         actual override fun create(hudConfig: HudConfig, coroutineScope: CoroutineScope) = HUD(hudConfig, coroutineScope)
     }
 
diff --git a/keyboard-compose/src/main/kotlin/ComposeFocusHandler.kt b/keyboard-compose/src/main/kotlin/ComposeFocusHandler.kt
index 052b9c513..a1bfd032a 100644
--- a/keyboard-compose/src/main/kotlin/ComposeFocusHandler.kt
+++ b/keyboard-compose/src/main/kotlin/ComposeFocusHandler.kt
@@ -20,4 +20,8 @@ package com.splendo.kaluga.keyboard.compose
 import androidx.compose.ui.focus.FocusRequester
 import com.splendo.kaluga.keyboard.FocusHandler
 
+/**
+ * A [FocusHandler] that focuses using a given [FocusRequester]
+ * @param focusRequester the [FocusRequester] to handle focusing.
+ */
 class ComposeFocusHandler(val focusRequester: FocusRequester) : FocusHandler
diff --git a/keyboard-compose/src/main/kotlin/ComposeKeyboardManager.kt b/keyboard-compose/src/main/kotlin/ComposeKeyboardManager.kt
index 27638c75a..de2f7482c 100644
--- a/keyboard-compose/src/main/kotlin/ComposeKeyboardManager.kt
+++ b/keyboard-compose/src/main/kotlin/ComposeKeyboardManager.kt
@@ -26,8 +26,15 @@ import com.splendo.kaluga.keyboard.BaseKeyboardManager
 import kotlinx.coroutines.CoroutineScope
 import java.util.WeakHashMap
 
+/**
+ * A [BaseKeyboardManager] that takes a [ComposeFocusHandler]. Uses for managing the keyboard in Compose views.
+ * @param currentFocusManager The initial [FocusManager] to manage the focus.
+ */
 class ComposeKeyboardManager(internal var currentFocusManager: FocusManager? = null) : BaseKeyboardManager<ComposeFocusHandler> {
 
+    /**
+     * A [BaseKeyboardManager.Builder] for creating a [ComposeKeyboardManager]
+     */
     class Builder : BaseKeyboardManager.Builder<ComposeFocusHandler>, ComposableLifecycleSubscribable {
 
         private val builtManagers = WeakHashMap<Int, ComposeKeyboardManager>()
diff --git a/keyboard/src/androidLibMain/kotlin/FocusHandler.kt b/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
index c9ce25cc7..00e92804f 100644
--- a/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
+++ b/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
@@ -24,6 +24,10 @@ import android.view.inputmethod.InputMethod.SHOW_EXPLICIT
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.IdRes
 
+/**
+ * A [FocusHandler] that focuses on a view with a given ID.
+ * @param id the ID of the View to focus on
+ */
 class ViewFocusHandler(
     @IdRes private val id: Int
 ) : FocusHandler {
diff --git a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
index c8d0e6c6e..6bb5c0468 100644
--- a/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/androidLibMain/kotlin/KeyboardManager.kt
@@ -23,11 +23,20 @@ import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
 import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * A [BaseKeyboardManager] that takes a [ViewFocusHandler]. Used managing the keyboard in XML Views.
+ * @param lifecycleManagerObserver The [LifecycleManagerObserver] to observe lifecycle changes.
+ * @param coroutineScope The [CoroutineScope] managing the keyboard lifecycle.
+ */
 class ViewKeyboardManager(
     private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver(),
     coroutineScope: CoroutineScope
 ) : BaseKeyboardManager<ViewFocusHandler>, CoroutineScope by coroutineScope {
 
+    /**
+     * A [BaseKeyboardManager.Builder] for creating a [ViewKeyboardManager]
+     * @param lifecycleManagerObserver The [LifecycleManagerObserver] to observe lifecycle changes.
+     */
     class Builder(
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
     ) : BaseKeyboardManager.Builder<ViewFocusHandler>, ActivityLifecycleSubscribable by lifecycleManagerObserver {
diff --git a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
index ff78a49ca..74451d503 100644
--- a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
+++ b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
@@ -29,26 +29,29 @@ interface FocusHandler
 
 /**
  * Interface that defines the actions available for the Keyboard Manager
+ * @param FH the type of [FocusHandler] to handle focus requests.
  */
 interface BaseKeyboardManager<FH : FocusHandler> {
 
     /**
      * Base KeyboardManager builder class, which used to create a [BaseKeyboardManager]
+     * @param FH the type of [FocusHandler] to handle focus requests.
      */
     interface Builder<FH : FocusHandler> : LifecycleSubscribable {
 
         /**
          * Creates KeyboardManager object
          *
+         * @param coroutineScope The [CoroutineScope] managing the keyboard lifecycle.
          * @return The KeyboardManager object
          */
         fun create(coroutineScope: CoroutineScope): BaseKeyboardManager<FH>
     }
 
     /**
-     * Shows the keyboard for a given [FocusHandler]
+     * Shows the keyboard for a given [FH]
      *
-     * @param focusHandler The [FocusHandler] for which the keyboard will be shown
+     * @param focusHandler The [FH] for which the keyboard will be shown
      */
     fun show(focusHandler: FH)
 
diff --git a/keyboard/src/iosMain/kotlin/FocusHandler.kt b/keyboard/src/iosMain/kotlin/FocusHandler.kt
index 577344da8..fa6b90765 100644
--- a/keyboard/src/iosMain/kotlin/FocusHandler.kt
+++ b/keyboard/src/iosMain/kotlin/FocusHandler.kt
@@ -19,6 +19,10 @@ package com.splendo.kaluga.keyboard
 
 import platform.UIKit.UIView
 
+/**
+ * A [FocusHandler] that focuses on a given [UIView]
+ * @param view the [UIView] to focus on
+ */
 class UIKitFocusHandler(val view: UIView) : FocusHandler {
     fun requestFocus() {
         if (view.canBecomeFirstResponder) {
@@ -27,4 +31,9 @@ class UIKitFocusHandler(val view: UIView) : FocusHandler {
     }
 }
 
+/**
+ * A [FocusHandler] that stores a given [Value] to focus on.
+ * This generic implementation allows for usage from SwiftUI.
+ * @param Value the type of Value to focus on.
+ */
 class ValueFocusHandler<Value>(val value: Value) : FocusHandler
diff --git a/keyboard/src/iosMain/kotlin/KeyboardManager.kt b/keyboard/src/iosMain/kotlin/KeyboardManager.kt
index bf546629d..9e4468c30 100644
--- a/keyboard/src/iosMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/iosMain/kotlin/KeyboardManager.kt
@@ -22,8 +22,16 @@ import kotlinx.coroutines.CoroutineScope
 import platform.UIKit.UIApplication
 import platform.darwin.sel_registerName
 
+/**
+ * A [BaseKeyboardManager] that takes a [UIKitFocusHandler]. Used for managing the keyboard in UIKit views.
+ * @param application The [UIApplication] that the keyboard is running in.
+ */
 class UIKitKeyboardManager(private val application: UIApplication) : BaseKeyboardManager<UIKitFocusHandler> {
 
+    /**
+     * Builder for an [UIKitKeyboardManager]
+     * @param application The [UIApplication] that the keyboard is running in.
+     */
     class Builder(private val application: UIApplication = UIApplication.sharedApplication) : BaseKeyboardManager.Builder<UIKitFocusHandler> {
         override fun create(coroutineScope: CoroutineScope) = UIKitKeyboardManager(application)
     }
@@ -37,6 +45,11 @@ class UIKitKeyboardManager(private val application: UIApplication) : BaseKeyboar
     }
 }
 
+/**
+ * A [BaseKeyboardManager] that takes a [ValueFocusHandler]. Uses for managing keyboard in a generic way so that it allows for usage from SwiftUI.
+ * @param Value the type of value to expect
+ * @param onFocusOnValue callback method to indicate how to handle a focus change to a [Value]. When `null` is provided, they keyboard should be dismissed.
+ */
 open class ValueKeyboardManager<Value>(private val onFocusOnValue: (Value?) -> Unit) : BaseKeyboardManager<ValueFocusHandler<Value>> {
     override fun show(focusHandler: ValueFocusHandler<Value>) {
         onFocusOnValue(focusHandler.value)
diff --git a/keyboard/src/jsMain/kotlin/KeyboardManager.kt b/keyboard/src/jsMain/kotlin/KeyboardManager.kt
index 930e0cf06..764d5d6f9 100644
--- a/keyboard/src/jsMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/jsMain/kotlin/KeyboardManager.kt
@@ -20,8 +20,14 @@ package com.splendo.kaluga.keyboard
 
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * A [BaseKeyboardManager] that takes any [FocusHandler]
+ */
 class KeyboardManager : BaseKeyboardManager<FocusHandler> {
 
+    /**
+     * A [BaseKeyboardManager.Builder] to create a [KeyboardManager]
+     */
     class Builder : BaseKeyboardManager.Builder<FocusHandler> {
         override fun create(coroutineScope: CoroutineScope) = KeyboardManager()
     }
diff --git a/keyboard/src/jvmMain/kotlin/KeyboardManager.kt b/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
index 930e0cf06..764d5d6f9 100644
--- a/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/jvmMain/kotlin/KeyboardManager.kt
@@ -20,8 +20,14 @@ package com.splendo.kaluga.keyboard
 
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * A [BaseKeyboardManager] that takes any [FocusHandler]
+ */
 class KeyboardManager : BaseKeyboardManager<FocusHandler> {
 
+    /**
+     * A [BaseKeyboardManager.Builder] to create a [KeyboardManager]
+     */
     class Builder : BaseKeyboardManager.Builder<FocusHandler> {
         override fun create(coroutineScope: CoroutineScope) = KeyboardManager()
     }
diff --git a/logging/api/androidLib/logging.api b/logging/api/androidLib/logging.api
index e85105866..7e4cdbeb5 100644
--- a/logging/api/androidLib/logging.api
+++ b/logging/api/androidLib/logging.api
@@ -178,11 +178,6 @@ public final class com/splendo/kaluga/logging/NapierLogger : com/splendo/kaluga/
 	public fun log (Lcom/splendo/kaluga/logging/LogLevel;Ljava/lang/String;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;)V
 }
 
-public final class com/splendo/kaluga/logging/NapierLoggerKt {
-	public static final fun getLogLevel ()[Lio/github/aakira/napier/LogLevel;
-	public static final fun logLevel (Lcom/splendo/kaluga/logging/LogLevel;)Lio/github/aakira/napier/LogLevel;
-}
-
 public abstract class com/splendo/kaluga/logging/RestrictedLogLevel {
 	public static final field Companion Lcom/splendo/kaluga/logging/RestrictedLogLevel$Companion;
 	public synthetic fun <init> (Ljava/util/Set;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/logging/api/jvm/logging.api b/logging/api/jvm/logging.api
index fbf7728b6..555f07ed2 100644
--- a/logging/api/jvm/logging.api
+++ b/logging/api/jvm/logging.api
@@ -181,11 +181,6 @@ public final class com/splendo/kaluga/logging/NapierLogger : com/splendo/kaluga/
 	public fun log (Lcom/splendo/kaluga/logging/LogLevel;Ljava/lang/String;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;)V
 }
 
-public final class com/splendo/kaluga/logging/NapierLoggerKt {
-	public static final fun getLogLevel ()[Lio/github/aakira/napier/LogLevel;
-	public static final fun logLevel (Lcom/splendo/kaluga/logging/LogLevel;)Lio/github/aakira/napier/LogLevel;
-}
-
 public abstract class com/splendo/kaluga/logging/RestrictedLogLevel {
 	public static final field Companion Lcom/splendo/kaluga/logging/RestrictedLogLevel$Companion;
 	public synthetic fun <init> (Ljava/util/Set;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/logging/src/androidLibMain/kotlin/log.kt b/logging/src/androidLibMain/kotlin/log.kt
index e5d5f3b6d..1d0ad0bac 100644
--- a/logging/src/androidLibMain/kotlin/log.kt
+++ b/logging/src/androidLibMain/kotlin/log.kt
@@ -22,6 +22,9 @@ import android.os.Build
 import io.github.aakira.napier.DebugAntilog
 import java.lang.Integer.min
 
+/**
+ * The default [Logger] to be used if no logger is set.
+ */
 actual val defaultLogger: Logger =
     if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M)
         TransformLogger(
@@ -40,4 +43,9 @@ actual val defaultLogger: Logger =
     else
         NapierLogger(DebugAntilog())
 
+/**
+ * The standard [Logger] to be used when logging.
+ *
+ * This is used by the package level logging methods, and might be used directly as well
+ */
 actual var logger: Logger = defaultLogger
diff --git a/logging/src/commonMain/kotlin/LogLevel.kt b/logging/src/commonMain/kotlin/LogLevel.kt
index 5b7e1d13e..ac39924b9 100644
--- a/logging/src/commonMain/kotlin/LogLevel.kt
+++ b/logging/src/commonMain/kotlin/LogLevel.kt
@@ -1,4 +1,3 @@
-package com.splendo.kaluga.logging
 /*
 
 Copyright 2022 Splendo Consulting B.V. The Netherlands
@@ -17,6 +16,11 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 */
 
+package com.splendo.kaluga.logging
+
+/**
+ * The different levels at which a [Logger] can log messages.
+ */
 enum class LogLevel {
     /**
      * Debug Log Level. Should be shown only for debugging.
diff --git a/logging/src/commonMain/kotlin/Logger.kt b/logging/src/commonMain/kotlin/Logger.kt
index e40528289..b85307224 100644
--- a/logging/src/commonMain/kotlin/Logger.kt
+++ b/logging/src/commonMain/kotlin/Logger.kt
@@ -1,4 +1,3 @@
-package com.splendo.kaluga.logging
 /*
 
 Copyright 2022 Splendo Consulting B.V. The Netherlands
@@ -17,6 +16,11 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
  */
 
+package com.splendo.kaluga.logging
+
+/**
+ * An interface for managing logging messages of various [LogLevel]
+ */
 interface Logger {
 
     /**
@@ -29,6 +33,14 @@ interface Logger {
     fun log(level: LogLevel, tag: String? = null, throwable: Throwable? = null, message: (() -> String)? = null)
 }
 
+/**
+ * A [Logger] that transforms the logs of a given [logger] before outputting them.
+ * @param logger the [Logger] whose results should be transformed
+ * @param transformLogLevel When provided, changes the [LogLevel] using this transformation method
+ * @param transformLogLevel When provided, changes the tag using this transformation method
+ * @param transformLogLevel When provided, changes the [Throwable] using this transformation method
+ * @param transformLogLevel When provided, changes the message using this transformation method
+ */
 open class TransformLogger(
     private val logger: Logger,
     private val transformLogLevel: ((LogLevel) -> LogLevel)? = null,
diff --git a/logging/src/commonMain/kotlin/NapierLogger.kt b/logging/src/commonMain/kotlin/NapierLogger.kt
index da995ef3a..ae57281b4 100644
--- a/logging/src/commonMain/kotlin/NapierLogger.kt
+++ b/logging/src/commonMain/kotlin/NapierLogger.kt
@@ -20,7 +20,7 @@ import com.splendo.kaluga.logging.LogLevel as KalugaLogLevel
 import io.github.aakira.napier.Antilog as NapierLog
 import io.github.aakira.napier.LogLevel as NapierLogLevel
 
-val logLevel = arrayOf(
+internal val logLevel = arrayOf(
     NapierLogLevel.VERBOSE,
     NapierLogLevel.DEBUG,
     NapierLogLevel.INFO,
@@ -29,10 +29,14 @@ val logLevel = arrayOf(
     NapierLogLevel.ASSERT
 )
 
-fun KalugaLogLevel.logLevel(): NapierLogLevel {
+internal fun KalugaLogLevel.logLevel(): NapierLogLevel {
     return logLevel[this.ordinal]
 }
 
+/**
+ * A [Logger] that uses a [NapierLog] for actually logging.
+ * @param logger the [NapierLog] handling logging.
+ */
 class NapierLogger(val logger: NapierLog) : Logger {
     override fun log(level: KalugaLogLevel, tag: String?, throwable: Throwable?, message: (() -> String)?) {
         logger.log(priority = level.logLevel(), tag = tag, throwable = throwable, message = message?.invoke())
diff --git a/logging/src/commonMain/kotlin/RestrictedLogger.kt b/logging/src/commonMain/kotlin/RestrictedLogger.kt
index 42ea58871..36c5dcd4e 100644
--- a/logging/src/commonMain/kotlin/RestrictedLogger.kt
+++ b/logging/src/commonMain/kotlin/RestrictedLogger.kt
@@ -17,22 +17,59 @@
 
 package com.splendo.kaluga.logging
 
+/**
+ * A LogLevel that only outputs if a [Logger] attempts to log with a [LogLevel] matching the restriction.
+ * @property levels the set of [LogLevel] that are allowed to be logged.
+ */
 sealed class RestrictedLogLevel(val levels: Set<LogLevel>) {
 
     companion object {
+
+        /**
+         * A [RestrictedLogLevel] that logs all [LogLevel]
+         */
         val Verbose = Info or Error or Debug or Warn
+
+        /**
+         * A [RestrictedLogLevel] that logs none of the [LogLevel]
+         */
         val None: RestrictedLogLevel = Custom(emptySet())
     }
 
+    /**
+     * A [RestrictedLogLevel] that logs only [LogLevel.INFO]
+     */
     object Info : RestrictedLogLevel(setOf(LogLevel.INFO))
+
+    /**
+     * A [RestrictedLogLevel] that logs only [LogLevel.ERROR]
+     */
     object Error : RestrictedLogLevel(setOf(LogLevel.ERROR))
+
+    /**
+     * A [RestrictedLogLevel] that logs only [LogLevel.DEBUG]
+     */
     object Debug : RestrictedLogLevel(setOf(LogLevel.DEBUG))
+
+    /**
+     * A [RestrictedLogLevel] that logs only [LogLevel.WARN]
+     */
     object Warn : RestrictedLogLevel(setOf(LogLevel.WARN))
     internal class Custom(levels: Set<LogLevel>) : RestrictedLogLevel(levels)
 }
 
+/**
+ * Creates a [RestrictedLogLevel] by combining the [RestrictedLogLevel.levels] of two Restricted Log Levels.
+ * @param other The [RestrictedLogLevel] to combine with
+ * @return A [RestrictedLogLevel] whose [RestrictedLogLevel.levels] contains all [LogLevel] of both Restricted Log Levels.
+ */
 infix fun RestrictedLogLevel.or(other: RestrictedLogLevel): RestrictedLogLevel = RestrictedLogLevel.Custom(levels + other.levels)
 
+/**
+ * A [Logger] that logs only when the [LogLevel] is allowed by its [RestrictedLogLevel]
+ * @param restrictedLogLevel The [RestrictedLogLevel] to limit the [LogLevel] allowed
+ * @param logger The [Logger] to actually log.
+ */
 class RestrictedLogger(private val restrictedLogLevel: RestrictedLogLevel, private val logger: Logger = defaultLogger) : Logger {
 
     override fun log(
diff --git a/logging/src/commonMain/kotlin/log.kt b/logging/src/commonMain/kotlin/log.kt
index 6a2f8c76e..1d779f98e 100644
--- a/logging/src/commonMain/kotlin/log.kt
+++ b/logging/src/commonMain/kotlin/log.kt
@@ -19,22 +19,29 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 package com.splendo.kaluga.logging
 
 // the default logger should be set per platform
+/**
+ * The default [Logger] to be used if no logger is set.
+ */
 expect val defaultLogger: Logger
 
 /**
- * The standard logger.
+ * The standard [Logger] to be used when logging.
  *
  * This is used by the package level logging methods, and might be used directly as well
  */
 expect var logger: Logger // how the actual logger is set can also differ per platform (e.g. Atomic references on native) so we expect it
 
 /**
- * Reset the standard logger to the default
+ * Reset [logger] to the default
  */
 fun resetLogger() {
     logger = defaultLogger
 }
 
+/**
+ * Wraps [logger] with a wrapper method
+ * @param wrapper a method for wrapping the standard logger into a different logger.
+ */
 fun wrapLogger(wrapper: (Logger) -> Logger) {
     logger = wrapper(logger)
 }
diff --git a/logging/src/iosMain/kotlin/log.kt b/logging/src/iosMain/kotlin/log.kt
index 6bbd0dbdd..6a53e22ea 100644
--- a/logging/src/iosMain/kotlin/log.kt
+++ b/logging/src/iosMain/kotlin/log.kt
@@ -19,6 +19,14 @@ package com.splendo.kaluga.logging
 
 import io.github.aakira.napier.DebugAntilog
 
+/**
+ * The default [Logger] to be used if no logger is set.
+ */
 actual val defaultLogger: Logger = NapierLogger(DebugAntilog())
 
+/**
+ * The standard [Logger] to be used when logging.
+ *
+ * This is used by the package level logging methods, and might be used directly as well
+ */
 actual var logger = defaultLogger
diff --git a/logging/src/jsMain/kotlin/log.kt b/logging/src/jsMain/kotlin/log.kt
index 8d6d3823d..6a53e22ea 100644
--- a/logging/src/jsMain/kotlin/log.kt
+++ b/logging/src/jsMain/kotlin/log.kt
@@ -19,5 +19,14 @@ package com.splendo.kaluga.logging
 
 import io.github.aakira.napier.DebugAntilog
 
+/**
+ * The default [Logger] to be used if no logger is set.
+ */
 actual val defaultLogger: Logger = NapierLogger(DebugAntilog())
+
+/**
+ * The standard [Logger] to be used when logging.
+ *
+ * This is used by the package level logging methods, and might be used directly as well
+ */
 actual var logger = defaultLogger
diff --git a/logging/src/jvmMain/kotlin/log.kt b/logging/src/jvmMain/kotlin/log.kt
index 98ba03d97..e85762776 100644
--- a/logging/src/jvmMain/kotlin/log.kt
+++ b/logging/src/jvmMain/kotlin/log.kt
@@ -19,5 +19,14 @@ package com.splendo.kaluga.logging
 
 import io.github.aakira.napier.DebugAntilog
 
+/**
+ * The default [Logger] to be used if no logger is set.
+ */
 actual val defaultLogger: Logger = NapierLogger(DebugAntilog())
+
+/**
+ * The standard [Logger] to be used when logging.
+ *
+ * This is used by the package level logging methods, and might be used directly as well
+ */
 actual var logger = defaultLogger
diff --git a/review/src/androidLibMain/kotlin/ReviewManager.kt b/review/src/androidLibMain/kotlin/ReviewManager.kt
index ba7c5a7cf..f0457dab8 100644
--- a/review/src/androidLibMain/kotlin/ReviewManager.kt
+++ b/review/src/androidLibMain/kotlin/ReviewManager.kt
@@ -26,13 +26,30 @@ import com.splendo.kaluga.architecture.lifecycle.LifecycleManagerObserver
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.base.ApplicationHolder
 
+/**
+ * Manager for requesting the system to show a Review Dialog.
+ * This library does not guarantee such a dialog will be shown, as the OS may block such an action.
+ *
+ * @param reviewManager The [com.google.android.play.core.review.ReviewManager] managing the reviews.
+ * @param lifecycleManagerObserver The [LifecycleManagerObserver] to observe lifecycle changes.
+ */
 actual class ReviewManager(
     private val reviewManager: com.google.android.play.core.review.ReviewManager,
     private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
 ) {
 
+    /**
+     * Type of Review Manager in use
+     */
     enum class Type {
+        /**
+         * Review Manager in use for Live production. This will only work for Apps distributed over the Google Play Store
+         */
         Live,
+
+        /**
+         * Review Manager for testing purposes. This will not result in actual reviews being posted.
+         */
         Fake;
 
         internal fun reviewManager(context: Context): com.google.android.play.core.review.ReviewManager = when (this) {
@@ -41,14 +58,28 @@ actual class ReviewManager(
         }
     }
 
+    /**
+     * A builder for creating a [ReviewManager]
+     * @param type The [Type] of review manager to show.
+     * @param context The [Context] of the Application used for getting the correct Review Manager.
+     * @param lifecycleManagerObserver The [LifecycleManagerObserver] to observe lifecycle changes.
+     */
     actual class Builder(
         private val type: Type = Type.Live,
         private val context: Context = ApplicationHolder.applicationContext,
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
     ) : LifecycleSubscribable, ActivityLifecycleSubscribable by lifecycleManagerObserver {
+
+        /**
+         * Creates a [ReviewManager]
+         */
         actual fun create(): ReviewManager = ReviewManager(type.reviewManager(context), lifecycleManagerObserver)
     }
 
+    /**
+     * Attempts to show a dialog that asks the user to submit a review of the app.
+     * This method does not guarantee such a dialog will be shown as the OS may block it.
+     */
     actual suspend fun attemptToRequestReview() {
         val info = reviewManager.requestReview()
         lifecycleManagerObserver.manager?.activity?.let {
diff --git a/review/src/commonMain/kotlin/ReviewManager.kt b/review/src/commonMain/kotlin/ReviewManager.kt
index e03fdff08..ed337e008 100644
--- a/review/src/commonMain/kotlin/ReviewManager.kt
+++ b/review/src/commonMain/kotlin/ReviewManager.kt
@@ -25,12 +25,19 @@ import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
  */
 expect class ReviewManager {
 
+    /**
+     * Builder for creating a [ReviewManager]
+     */
     class Builder : LifecycleSubscribable {
+
+        /**
+         * Creates a [ReviewManager]
+         */
         fun create(): ReviewManager
     }
 
     /**
-     * Attemps to show a dialog that asks the user to submit a review of the app.
+     * Attempts to show a dialog that asks the user to submit a review of the app.
      * This method does not guarantee such a dialog will be shown as the OS may block it.
      */
     suspend fun attemptToRequestReview()
diff --git a/review/src/iosMain/kotlin/ReviewManager.kt b/review/src/iosMain/kotlin/ReviewManager.kt
index 0d43e8322..ce0b77415 100644
--- a/review/src/iosMain/kotlin/ReviewManager.kt
+++ b/review/src/iosMain/kotlin/ReviewManager.kt
@@ -20,12 +20,27 @@ package com.splendo.kaluga.review
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import platform.StoreKit.SKStoreReviewController
 
+/**
+ * Manager for requesting the system to show a Review Dialog.
+ * This library does not guarantee such a dialog will be shown, as the OS may block such an action.
+ */
 actual class ReviewManager {
 
+    /**
+     * Builder for creating a [ReviewManager]
+     */
     actual class Builder : LifecycleSubscribable {
+
+        /**
+         * Creates a [ReviewManager]
+         */
         actual fun create() = ReviewManager()
     }
 
+    /**
+     * Attempts to show a dialog that asks the user to submit a review of the app.
+     * This method does not guarantee such a dialog will be shown as the OS may block it.
+     */
     actual suspend fun attemptToRequestReview() {
         SKStoreReviewController.requestReview()
     }
diff --git a/review/src/jsMain/kotlin/ReviewManager.kt b/review/src/jsMain/kotlin/ReviewManager.kt
index 2ca710ae5..58ded7cdd 100644
--- a/review/src/jsMain/kotlin/ReviewManager.kt
+++ b/review/src/jsMain/kotlin/ReviewManager.kt
@@ -19,11 +19,26 @@ package com.splendo.kaluga.review
 
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
+/**
+ * Manager for requesting the system to show a Review Dialog.
+ * This library does not guarantee such a dialog will be shown, as the OS may block such an action.
+ */
 actual class ReviewManager {
 
+    /**
+     * Builder for creating a [ReviewManager]
+     */
     actual class Builder : LifecycleSubscribable {
+
+        /**
+         * Creates a [ReviewManager]
+         */
         actual fun create() = ReviewManager()
     }
 
+    /**
+     * Attempts to show a dialog that asks the user to submit a review of the app.
+     * This method does not guarantee such a dialog will be shown as the OS may block it.
+     */
     actual suspend fun attemptToRequestReview() { }
 }
diff --git a/review/src/jvmMain/kotlin/ReviewManager.kt b/review/src/jvmMain/kotlin/ReviewManager.kt
index 7deb46f58..57c833aa6 100644
--- a/review/src/jvmMain/kotlin/ReviewManager.kt
+++ b/review/src/jvmMain/kotlin/ReviewManager.kt
@@ -18,11 +18,26 @@ package com.splendo.kaluga.review
 
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 
+/**
+ * Manager for requesting the system to show a Review Dialog.
+ * This library does not guarantee such a dialog will be shown, as the OS may block such an action.
+ */
 actual class ReviewManager {
 
+    /**
+     * Builder for creating a [ReviewManager]
+     */
     actual class Builder : LifecycleSubscribable {
+
+        /**
+         * Creates a [ReviewManager]
+         */
         actual fun create() = ReviewManager()
     }
 
+    /**
+     * Attempts to show a dialog that asks the user to submit a review of the app.
+     * This method does not guarantee such a dialog will be shown as the OS may block it.
+     */
     actual suspend fun attemptToRequestReview() { }
 }

From a95e92f65229d5f24ed7937ceaf8cbcd2693cfe2 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 10 Feb 2023 12:34:46 +0100
Subject: [PATCH 162/227] Adding documentation for permissions

---
 .../src/commonMain/kotlin/Permission.kt       | 73 +++++++++++++++++--
 1 file changed, 65 insertions(+), 8 deletions(-)

diff --git a/base-permissions/src/commonMain/kotlin/Permission.kt b/base-permissions/src/commonMain/kotlin/Permission.kt
index 9cb2cb01e..56eb932dc 100644
--- a/base-permissions/src/commonMain/kotlin/Permission.kt
+++ b/base-permissions/src/commonMain/kotlin/Permission.kt
@@ -34,39 +34,85 @@ import kotlin.reflect.KClassifier
  * Each permission component should declare subclass of [Permission]
  */
 abstract class Permission {
+
+    /**
+     * The name of the permission
+     */
     abstract val name: String
 }
 
 /**
- *  Base type for all permissions builders. Each permission component implements a concrete permissions builder
- *  and declares helper methods for registering this builder in the [PermissionsBuilder].
+ *  Base type for all permissions builders.
+ *  Each permission component implements a concrete permissions builder and registers it in [PermissionsBuilder.register].
+ *  @param P the type of [Permission] represented by this permission builder.
  */
 interface BasePermissionsBuilder<P : Permission>
 
 /**
- * Closure that takes permission and coroutine contexts and creates [PermissionStateRepo].
- * Each platform registers [PermissionStateRepoBuilder] in the register permission helper method.
+ * Interface that takes permission and coroutine contexts and creates [BasePermissionStateRepo].
+ * Each platform registers [PermissionStateRepoBuilder] in [PermissionsBuilder.registerPermissionStateRepoBuilder].
+ *  @param P the type of [Permission] represented by this permission state repo builder.
  */
 interface PermissionStateRepoBuilder<P : Permission> {
+
+    /**
+     * Creates a [BasePermissionStateRepo] associated with [permission]
+     * @param permission the [P] the resulting [BasePermissionStateRepo] should manage.
+     * @param coroutineContext the [CoroutineContext] to manage the [BasePermissionStateRepo]
+     */
     fun create(permission: P, coroutineContext: CoroutineContext): BasePermissionStateRepo<P>
 }
 
+/**
+ * Platform specific context for creating a [BasePermissionsBuilder]
+ */
 expect class PermissionContext
+
+/**
+ * Default [PermissionContext] of the system
+ */
 expect val defaultPermissionContext: PermissionContext
 
+/**
+ * Error when [PermissionsBuilder] tries to register or access invalid permissions.
+ */
 class PermissionsBuilderError(message: String) : Error(message)
 
 /**
- * Builder for providing the proper [PermissionManager] for each [Permission]
- * @param context [PermissionContext] an additional parameter platform can pass to the [PermissionsBuilder]. [NSBundle] on iOS and [Contect] on Andoid.
+ * Builder for providing the proper [BasePermissionsBuilder] and [PermissionStateRepoBuilder] for each [Permission]
+ * @param context the [PermissionContext] to be used
  */
 open class PermissionsBuilder(val context: PermissionContext = defaultPermissionContext) {
 
     private val builders = concurrentMutableMapOf<KClassifier, BasePermissionsBuilder<*>>()
     private val repoBuilders = concurrentMutableMapOf<KClassifier, PermissionStateRepoBuilder<*>>()
 
-    inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> register(builder: B): B = register(P::class, builder)
-    fun <P : Permission, B : BasePermissionsBuilder<P>> register(permission: KClass<P>, builder: B): B = builders.synchronized {
+    /**
+     * Registers a [BasePermissionsBuilder] for a a given type of [Permission].
+     * Only one builder can be registered per type of [Permission].
+     * Make sure to call [unregister] before calling this if a permission has been registered before.
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to register the builder.
+     * @param Builder the type of [BasePermissionsBuilder] to register for this permission
+     * @param builder the [Builder] to register for the permission.
+     * @throws [PermissionsBuilderError] if the permission was already registered.
+     * @return the registered [Builder]
+     */
+    inline fun <reified P : Permission, Builder : BasePermissionsBuilder<P>> register(builder: Builder): Builder = register(P::class, builder)
+
+    /**
+     * Registers a [BasePermissionsBuilder] for a a given type of [Permission].
+     * Only one builder can be registered per type of [Permission].
+     * Make sure to call [unregister] before calling this if a permission has been registered before.
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to register the builder.
+     * @param Builder the type of [BasePermissionsBuilder] to register for this permission
+     * @param permission the [KClass] of the [P] to register
+     * @param builder the [Builder] to register for the permission.
+     * @throws [PermissionsBuilderError] if the permission was already registered.
+     * @return the registered [Builder]
+     */
+    fun <P : Permission, Builder : BasePermissionsBuilder<P>> register(permission: KClass<P>, builder: Builder): Builder = builders.synchronized {
         if (this[permission] == null) {
             this[permission] = builder
             builder
@@ -75,6 +121,17 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
         }
     }
 
+    /**
+     * Gets the registered [BasePermissionsBuilder] for a a given type of [Permission].
+     * If no bulder has been registered yet
+     * Make sure to call [unregister] before calling this if a permission has been registered before.
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to register the builder.
+     * @param Builder the type of [BasePermissionsBuilder] to register for this permission
+     * @param builder the [Builder] to register for the permission.
+     * @throws [PermissionsBuilderError] if the permission was already registered.
+     * @return the registered [Builder]
+     */
     inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(builder: B): BasePermissionsBuilder<P> = registerOrGet(P::class, builder)
     @Suppress("UNCHECKED_CAST")
     fun <P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(permission: KClass<P>, builder: B): BasePermissionsBuilder<P> = builders.getOrPut(permission::class) { builder } as BasePermissionsBuilder<P>

From 3dd8795a21576968b9c03f1feeb4533cfcaa3ff7 Mon Sep 17 00:00:00 2001
From: Alex <alexandros@splendo.com>
Date: Fri, 10 Feb 2023 16:02:32 +0100
Subject: [PATCH 163/227] Exposed location settings to builders and added
 extension to get KnowLocation based on a max age

---
 .../kotlin/location/GoogleLocationProvider.kt | 41 ++++++++-----------
 .../kotlin/location/LocationExtensions.kt     |  3 +-
 .../kotlin/location/LocationManager.kt        | 20 +++++++--
 .../commonMain/kotlin/location/Location.kt    | 12 +-----
 .../kotlin/location/LocationManager.kt        | 15 +++++++
 .../kotlin/location/LocationState.kt          | 40 +++++++++++++++++-
 .../kotlin/location/CLLocationExtensions.kt   |  3 +-
 .../kotlin/location/LocationManager.kt        |  1 +
 8 files changed, 95 insertions(+), 40 deletions(-)

diff --git a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
index de9da3c1c..5b3b50569 100644
--- a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
@@ -36,48 +36,41 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.seconds
 
 /**
  * A [LocationProvider] using the Google Location Services
  * @param context The [Context] to run this [LocationProvider] in.
  * @param settings The [GoogleLocationProvider.Settings] to use to configure this location provider.
  */
-class GoogleLocationProvider(private val context: Context, private val settings: Settings = Settings.default) : LocationProvider {
+class GoogleLocationProvider(private val context: Context, private val settings: Settings) : LocationProvider {
 
     /**
      * Settings for a [GoogleLocationProvider]
-     * @param interval The desired interval of location updates.
-     * @param maxUpdateDelay The longest a location update may be delayed.
-     * @param minUpdateInterval The fastest allowed interval of location updates.
+     * @param interval The desired interval of location updates. (Best effort)
+     * @param minUpdateDistanceMeters The min distance traversed for a location update to be reported.
      */
     data class Settings(
         val interval: Duration,
-        val maxUpdateDelay: Duration,
-        val minUpdateInterval: Duration
-    ) {
-        companion object {
-            val default = Settings(interval = 1.milliseconds, maxUpdateDelay = 1.seconds, minUpdateInterval = 1.milliseconds)
-        }
-    }
+        val minUpdateDistanceMeters: Float
+    )
 
     internal sealed class FusedLocationProviderClientType(
         permission: LocationPermission,
         context: Context,
         settings: Settings
     ) {
-        protected val fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context)
-        protected val locationRequest = LocationRequest.Builder(settings.interval.inWholeMilliseconds)
-            .setMaxUpdateDelayMillis(settings.maxUpdateDelay.inWholeMilliseconds)
-            .setMinUpdateIntervalMillis(settings.minUpdateInterval.inWholeMilliseconds)
-            .setPriority(
-                if (permission.precise)
-                    Priority.PRIORITY_HIGH_ACCURACY
-                else
-                    Priority.PRIORITY_BALANCED_POWER_ACCURACY
-            )
-            .build()
-        protected val locationsState: MutableStateFlow<List<Location.KnownLocation>> = MutableStateFlow(emptyList())
+        protected val fusedLocationProviderClient =
+            LocationServices.getFusedLocationProviderClient(context)
+        protected val locationRequest =
+            LocationRequest.Builder(settings.interval.inWholeMilliseconds)
+                .setMinUpdateDistanceMeters(settings.minUpdateDistanceMeters)
+                .setPriority(
+                    if (permission.precise) Priority.PRIORITY_HIGH_ACCURACY
+                    else Priority.PRIORITY_BALANCED_POWER_ACCURACY
+                )
+                .build()
+        protected val locationsState: MutableStateFlow<List<Location.KnownLocation>> =
+            MutableStateFlow(emptyList())
         val locations: Flow<List<Location.KnownLocation>> = locationsState
 
         abstract fun startRequestingUpdates()
diff --git a/location/src/androidLibMain/kotlin/location/LocationExtensions.kt b/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
index f6d9f0e88..e7b43d041 100644
--- a/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.location
 
 import android.os.Build
 import com.google.android.gms.location.LocationResult
+import com.splendo.kaluga.base.utils.DefaultKalugaDate
 
 fun android.location.Location.toKnownLocation(): Location.KnownLocation {
     return Location.KnownLocation(
@@ -29,7 +30,7 @@ fun android.location.Location.toKnownLocation(): Location.KnownLocation {
         horizontalAccuracy = accuracy.toDouble(),
         verticalAccuracy = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) verticalAccuracyMeters.toDouble() else 0.0,
         speed = speed.toDouble(),
-        time = Location.Time.MeasuredTime(time)
+        time = DefaultKalugaDate.epoch(time)
     )
 }
 
diff --git a/location/src/androidLibMain/kotlin/location/LocationManager.kt b/location/src/androidLibMain/kotlin/location/LocationManager.kt
index ff589d949..50380bd8e 100644
--- a/location/src/androidLibMain/kotlin/location/LocationManager.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationManager.kt
@@ -44,15 +44,29 @@ actual class DefaultLocationManager(
 
     class Builder(
         private val context: Context = ApplicationHolder.applicationContext,
-        private val locationManager: android.location.LocationManager? = context.getSystemService(Context.LOCATION_SERVICE) as? android.location.LocationManager,
-        private val locationProvider: LocationProvider = GoogleLocationProvider(context)
+        private val locationManager: android.location.LocationManager? = context.getSystemService(
+            Context.LOCATION_SERVICE
+        ) as? android.location.LocationManager,
     ) : BaseLocationManager.Builder {
 
         override fun create(
             settings: Settings,
             coroutineScope: CoroutineScope
         ): BaseLocationManager {
-            return DefaultLocationManager(context, locationManager, locationProvider, settings, coroutineScope)
+            val locationProvider: LocationProvider = GoogleLocationProvider(
+                context,
+                GoogleLocationProvider.Settings(
+                    interval = settings.updateIntervalMillis,
+                    minUpdateDistanceMeters = settings.minUpdateDistanceMeters
+                )
+            )
+            return DefaultLocationManager(
+                context,
+                locationManager,
+                locationProvider,
+                settings,
+                coroutineScope
+            )
         }
     }
 
diff --git a/location/src/commonMain/kotlin/location/Location.kt b/location/src/commonMain/kotlin/location/Location.kt
index 66af16e57..64116bf4c 100644
--- a/location/src/commonMain/kotlin/location/Location.kt
+++ b/location/src/commonMain/kotlin/location/Location.kt
@@ -18,19 +18,11 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.location
 
+import com.splendo.kaluga.base.utils.KalugaDate
 import kotlin.math.absoluteValue
 
 sealed class Location {
 
-    /**
-     * [ms] holds the unixtime (ms since 1970) for when the location was detected. Either a time provided by the location framework,
-     * or a time guessed upon receival by the implementation.
-     */
-    sealed class Time(open val ms: Long) {
-        data class MeasuredTime(override val ms: Long) : Time(ms)
-        data class GuessedTime(override val ms: Long) : Time(ms)
-    }
-
     /**
      * A known location, [latitude], [longitude] and [time] are always available, the rest are optional
      */
@@ -42,7 +34,7 @@ sealed class Location {
         val verticalAccuracy: Double? = null,
         val speed: Double? = null,
         val course: Double? = null,
-        val time: Time
+        val time: KalugaDate
     ) : Location() {
 
         /**
diff --git a/location/src/commonMain/kotlin/location/LocationManager.kt b/location/src/commonMain/kotlin/location/LocationManager.kt
index cc059e8a8..aa32c5b3a 100644
--- a/location/src/commonMain/kotlin/location/LocationManager.kt
+++ b/location/src/commonMain/kotlin/location/LocationManager.kt
@@ -38,6 +38,8 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 
 interface LocationManager {
 
@@ -71,12 +73,24 @@ abstract class BaseLocationManager(
         private const val LOG_TAG = "Location Manager"
     }
 
+    /**
+     * @param locationPermission If passing your own settings pass LocationPermission returned from settingsBuilder when you call [BaseLocationStateRepoBuilder.create]
+     * @param permissions If passing your own settings pass permissions returned from settingsBuilder when you call [BaseLocationStateRepoBuilder.create]
+     * @param autoRequestPermission Set to true to request permissions right away
+     * @param autoEnableLocations Set to true to enable location if disabled right away
+     * @param locationBufferCapacity Max location that can be buffered, if exceed oldest is dropped
+     * @param updateIntervalMillis Controls Android only emission rate, iOS does not expose this but makes it depend on set accuracy and [minUpdateDistanceMeters]
+     * @param minUpdateDistanceMeters Min update distance for a location update to trigger
+     * @param logger Pass your own [RestrictedLogger] to enable logging while debugging
+     */
     data class Settings(
         val locationPermission: LocationPermission,
         val permissions: Permissions,
         val autoRequestPermission: Boolean = true,
         val autoEnableLocations: Boolean = true,
         val locationBufferCapacity: Int = 16,
+        val updateIntervalMillis: Duration = 100.milliseconds,
+        val minUpdateDistanceMeters: Float = 0f,
         val logger: Logger = RestrictedLogger(RestrictedLogLevel.None)
     )
 
@@ -152,6 +166,7 @@ abstract class BaseLocationManager(
             }
         }
     }
+
     override suspend fun stopMonitoringLocationEnabled() = enabledLock.withLock {
         locationMonitor.stopMonitoring()
         monitoringLocationEnabledJob?.cancel()
diff --git a/location/src/commonMain/kotlin/location/LocationState.kt b/location/src/commonMain/kotlin/location/LocationState.kt
index c6b7d2d90..4f126c312 100644
--- a/location/src/commonMain/kotlin/location/LocationState.kt
+++ b/location/src/commonMain/kotlin/location/LocationState.kt
@@ -22,9 +22,15 @@ import com.splendo.kaluga.base.flow.filterOnlyImportant
 import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
 import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
 import com.splendo.kaluga.base.state.KalugaState
+import com.splendo.kaluga.base.utils.DefaultKalugaDate
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
 /**
  * State of a [LocationStateRepo]
@@ -45,18 +51,22 @@ sealed interface LocationState : KalugaState {
     interface Initializing : Active, SpecialFlowValue.NotImportant {
         fun initialize(hasPermission: Boolean, enabled: Boolean): suspend () -> Initialized
     }
+
     sealed interface Initialized : Active
     sealed interface Permitted : Initialized {
         val revokePermission: suspend () -> Disabled.NotPermitted
     }
+
     sealed interface Disabled : Initialized {
         interface NoGPS : Disabled, Permitted {
             val enable: suspend () -> Enabled
         }
+
         interface NotPermitted : Disabled {
             fun permit(enabled: Boolean): suspend () -> Permitted
         }
     }
+
     interface Enabled : Permitted {
         val disable: suspend () -> Disabled.NoGPS
         fun updateWithLocation(location: Location.KnownLocation): suspend () -> Enabled
@@ -239,4 +249,32 @@ fun Flow<LocationState>.location(): Flow<Location> {
     return this.filterOnlyImportant().map { it.location }
 }
 
-fun Flow<Location>.known(): Flow<Location.KnownLocation> = mapNotNull { location -> location.known }
+/**
+ * Transforms a [Flow] of [LocationState] into a flow of its associated optional [Location.KnownLocation]
+ *
+ * @param maxAge Controls both the max age of a location by filtering out locations that are older and
+ * is used to set a timeout for the last emission that will emit null when triggered
+ */
+fun Flow<Location>.known(maxAge: Duration = 0.seconds): Flow<Location.KnownLocation?> {
+    fun filterExpired(location: Location.KnownLocation): Location.KnownLocation? {
+        val hasExpired = location.time <= DefaultKalugaDate.now(-maxAge.inWholeMilliseconds)
+        return if (hasExpired) null
+        else location
+    }
+
+    val knownLocation = mapNotNull { location -> location.known }
+    if (maxAge.inWholeMilliseconds == 0L || maxAge.isNegative())
+        return knownLocation
+    return knownLocation.flatMapLatest { location ->
+        flow {
+            emit(filterExpired(location))
+            val locationTimeMillis = location.known?.time?.millisecondSinceEpoch
+                ?: DefaultKalugaDate.now(-maxAge.inWholeMilliseconds).millisecondSinceEpoch
+            val dateDiffMillis =
+                (DefaultKalugaDate.now().millisecondSinceEpoch - locationTimeMillis)
+            val delayMillis = maxAge.inWholeMilliseconds - dateDiffMillis
+            delay(delayMillis)
+            emit(null)
+        }
+    }
+}
diff --git a/location/src/iosMain/kotlin/location/CLLocationExtensions.kt b/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
index 61b3904d6..c3162f66d 100644
--- a/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
+++ b/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
@@ -18,6 +18,7 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 
 package com.splendo.kaluga.location
 
+import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import kotlinx.cinterop.useContents
 import platform.CoreLocation.CLLocation
 import platform.Foundation.timeIntervalSince1970
@@ -32,6 +33,6 @@ val CLLocation.knownLocation
             verticalAccuracy = verticalAccuracy,
             course = course,
             speed = speed,
-            time = Location.Time.MeasuredTime(timestamp.timeIntervalSince1970.toLong() * 1_000L)
+            time = DefaultKalugaDate.epoch(timestamp.timeIntervalSince1970.toLong() * 1_000L)
         )
     }
diff --git a/location/src/iosMain/kotlin/location/LocationManager.kt b/location/src/iosMain/kotlin/location/LocationManager.kt
index 24e8140cc..ffb10df30 100644
--- a/location/src/iosMain/kotlin/location/LocationManager.kt
+++ b/location/src/iosMain/kotlin/location/LocationManager.kt
@@ -77,6 +77,7 @@ actual class DefaultLocationManager(
     override val locationMonitor: LocationMonitor = LocationMonitor.Builder(CLLocationManager()).create()
     private val locationManager = MainCLLocationManagerAccessor {
         desiredAccuracy = if (locationPermission.precise) kCLLocationAccuracyBest else kCLLocationAccuracyReduced
+        distanceFilter = settings.minUpdateDistanceMeters.toDouble()
     }
 
     private val locationUpdateDelegate: Delegate

From 663db61e4ad449ad6389f47f487f7f35a1e17f10 Mon Sep 17 00:00:00 2001
From: Alex <alexandros@splendo.com>
Date: Fri, 10 Feb 2023 17:23:14 +0100
Subject: [PATCH 164/227] Fixed dates on tests

---
 location/src/commonTest/kotlin/location/LocationStateTest.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/location/src/commonTest/kotlin/location/LocationStateTest.kt b/location/src/commonTest/kotlin/location/LocationStateTest.kt
index 56701931a..5f5c9efc6 100644
--- a/location/src/commonTest/kotlin/location/LocationStateTest.kt
+++ b/location/src/commonTest/kotlin/location/LocationStateTest.kt
@@ -18,6 +18,7 @@
 package com.splendo.kaluga.location
 
 import com.splendo.kaluga.base.flow.filterOnlyImportant
+import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.location.LocationPermission
 import com.splendo.kaluga.test.base.BaseFlowTest
@@ -41,7 +42,7 @@ class LocationStateTest :
         private val location1 = Location.KnownLocation(
             latitude = 52.15,
             longitude = 4.4303,
-            time = Location.Time.MeasuredTime(1000),
+            time = DefaultKalugaDate.now(),
             horizontalAccuracy = 1.0,
             verticalAccuracy = 1.0,
             altitude = 1.0,
@@ -51,7 +52,7 @@ class LocationStateTest :
         private val location2 = Location.KnownLocation(
             latitude = 52.079,
             longitude = 4.3413,
-            time = Location.Time.MeasuredTime(1000),
+            time =  DefaultKalugaDate.now(),
             horizontalAccuracy = 2.0,
             verticalAccuracy = 2.0,
             altitude = 2.0,

From 813192932dcecda97035bacbbefdd8ee18d8a4dc Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 10 Feb 2023 18:03:17 +0100
Subject: [PATCH 165/227] Docs for Permissions modules

---
 .../api/androidLib/base-permissions.api       |   9 +-
 base-permissions/api/jvm/base-permissions.api |   8 +-
 .../kotlin/AndroidPermissionsManager.kt       |  59 +++---
 .../kotlin/PermissionContext.kt               |   4 +
 .../kotlin/PermissionsActivity.kt             |   9 +-
 .../src/commonMain/kotlin/Permission.kt       | 127 ++++++++++---
 .../commonMain/kotlin/PermissionManager.kt    |  37 +++-
 .../src/commonMain/kotlin/PermissionState.kt  | 176 +++++++++++++++++-
 .../commonMain/kotlin/PermissionStateRepo.kt  |  19 ++
 .../iosMain/kotlin/IOSPermissionsHelper.kt    |  51 ++++-
 .../src/iosMain/kotlin/PermissionContext.kt   |   6 +
 .../kotlin/PermissionRefreshScheduler.kt      |  19 +-
 .../iosMain/kotlin/av/AVPermissionHelper.kt   |  39 +++-
 .../kotlin/PermissionRefreshSchedulerTest.kt  |   2 +-
 .../src/jsMain/kotlin/PermissionContext.kt    |   6 +
 .../src/jvmMain/kotlin/PermissionContext.kt   |   6 +
 .../kotlin/BluetoothPermissionManager.kt      |  17 ++
 .../commonMain/kotlin/BluetoothPermission.kt  |  16 +-
 .../src/commonMain/kotlin/Permission.kt       |  34 +++-
 .../kotlin/BluetoothPermissionManager.kt      |  11 ++
 .../kotlin/BluetoothPermissionManager.kt      |  10 +
 .../kotlin/BluetoothPermissionManager.kt      |  10 +
 .../kotlin/CalendarPermissionManager.kt       |  12 ++
 .../commonMain/kotlin/CalendarPermission.kt   |  18 +-
 .../src/commonMain/kotlin/Permission.kt       |  34 +++-
 .../kotlin/CalendarPermissionManager.kt       |  12 ++
 .../kotlin/CalendarPermissionManager.kt       |  11 ++
 .../kotlin/CalendarPermissionManager.kt       |  11 ++
 .../kotlin/CameraPermissionManager.kt         |  11 ++
 .../src/commonMain/kotlin/CameraPermission.kt |  15 +-
 .../src/commonMain/kotlin/Permission.kt       |  34 +++-
 .../src/iosMain/kotlin/AVTypeCamera.kt        |   3 +
 .../iosMain/kotlin/CameraPermissionManager.kt |  11 ++
 .../jsMain/kotlin/CameraPermissionManager.kt  |  10 +
 .../jvmMain/kotlin/CameraPermissionManager.kt |  10 +
 .../kotlin/ContactsPermissionManager.kt       |  12 ++
 .../commonMain/kotlin/ContactsPermission.kt   |  18 +-
 .../src/commonMain/kotlin/Permission.kt       |  34 +++-
 .../kotlin/ContactsPermissionManager.kt       |  12 ++
 .../kotlin/ContactsPermissionManager.kt       |  11 ++
 .../kotlin/ContactsPermissionManager.kt       |  11 ++
 .../kotlin/LocationPermissionManager.kt       |  12 ++
 .../commonMain/kotlin/LocationPermission.kt   |  18 +-
 .../src/commonMain/kotlin/Permission.kt       |  34 +++-
 .../kotlin/LocationPermissionManager.kt       |  12 ++
 .../kotlin/MainCLLocationManagerAccessor.kt   |   1 +
 .../kotlin/LocationPermissionManager.kt       |  11 ++
 .../kotlin/LocationPermissionManager.kt       |  11 ++
 .../kotlin/MicrophonePermissionManager.kt     |  11 ++
 .../commonMain/kotlin/MicrophonePermission.kt |  15 +-
 .../src/commonMain/kotlin/Permission.kt       |  34 +++-
 .../src/iosMain/kotlin/AVTypeMicrophone.kt    |   3 +
 .../kotlin/MicrophonePermissionManager.kt     |  11 ++
 .../kotlin/MicrophonePermissionManager.kt     |  10 +
 .../kotlin/MicrophonePermissionManager.kt     |  10 +
 .../kotlin/NotificationsPermissionManager.kt  |  15 ++
 .../kotlin/NotificationsPermission.kt         |  19 +-
 .../src/commonMain/kotlin/Permission.kt       |  34 +++-
 .../kotlin/NotificationsPermissionManager.kt  |  15 ++
 .../kotlin/NotificationsPermissionManager.kt  |  14 ++
 .../kotlin/NotificationsPermissionManager.kt  |  14 ++
 .../kotlin/StoragePermissionManager.kt        |  12 ++
 .../src/commonMain/kotlin/Permission.kt       |  34 +++-
 .../commonMain/kotlin/StoragePermission.kt    |  18 +-
 .../kotlin/StoragePermissionManager.kt        |  12 ++
 .../jsMain/kotlin/StoragePermissionManager.kt |  11 ++
 .../kotlin/StoragePermissionManager.kt        |  11 ++
 67 files changed, 1246 insertions(+), 121 deletions(-)

diff --git a/base-permissions/api/androidLib/base-permissions.api b/base-permissions/api/androidLib/base-permissions.api
index c023936f3..58b48310a 100644
--- a/base-permissions/api/androidLib/base-permissions.api
+++ b/base-permissions/api/androidLib/base-permissions.api
@@ -89,10 +89,6 @@ public final class com/splendo/kaluga/permissions/base/PermissionContextKt {
 	public static final fun getDefaultPermissionContext ()Lcom/splendo/kaluga/permissions/base/PermissionContext;
 }
 
-public final class com/splendo/kaluga/permissions/base/PermissionKt {
-	public static final fun request (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public abstract interface class com/splendo/kaluga/permissions/base/PermissionManager {
 	public abstract fun getEvents ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun getPermission ()Lcom/splendo/kaluga/permissions/base/Permission;
@@ -256,6 +252,10 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Unini
 	public final fun initialize-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lkotlin/jvm/functions/Function1;
 }
 
+public final class com/splendo/kaluga/permissions/base/PermissionStateKt {
+	public static final fun request (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
 public class com/splendo/kaluga/permissions/base/PermissionStateRepo : com/splendo/kaluga/permissions/base/BasePermissionStateRepo {
 	public static final field Companion Lcom/splendo/kaluga/permissions/base/PermissionStateRepo$Companion;
 	public synthetic fun <init> (JLkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -287,7 +287,6 @@ public final class com/splendo/kaluga/permissions/base/PermissionsActivity : and
 }
 
 public final class com/splendo/kaluga/permissions/base/PermissionsActivity$Companion {
-	public final fun getRequestedPermissions (Landroid/content/Intent;)[Ljava/lang/String;
 	public final fun intent (Landroid/content/Context;[Ljava/lang/String;)Landroid/content/Intent;
 }
 
diff --git a/base-permissions/api/jvm/base-permissions.api b/base-permissions/api/jvm/base-permissions.api
index 7239a4cb5..520547a57 100644
--- a/base-permissions/api/jvm/base-permissions.api
+++ b/base-permissions/api/jvm/base-permissions.api
@@ -49,10 +49,6 @@ public final class com/splendo/kaluga/permissions/base/PermissionContextKt {
 	public static final fun getDefaultPermissionContext ()Lcom/splendo/kaluga/permissions/base/PermissionContext;
 }
 
-public final class com/splendo/kaluga/permissions/base/PermissionKt {
-	public static final fun request (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public abstract interface class com/splendo/kaluga/permissions/base/PermissionManager {
 	public abstract fun getEvents ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun getPermission ()Lcom/splendo/kaluga/permissions/base/Permission;
@@ -266,6 +262,10 @@ public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Unini
 	public fun remain ()Lkotlin/jvm/functions/Function1;
 }
 
+public final class com/splendo/kaluga/permissions/base/PermissionStateKt {
+	public static final fun request (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
 public class com/splendo/kaluga/permissions/base/PermissionStateRepo : com/splendo/kaluga/permissions/base/BasePermissionStateRepo {
 	public static final field Companion Lcom/splendo/kaluga/permissions/base/PermissionStateRepo$Companion;
 	public synthetic fun <init> (JLkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt b/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt
index c32b00ee4..103277c87 100644
--- a/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt
+++ b/base-permissions/src/androidLibMain/kotlin/AndroidPermissionsManager.kt
@@ -40,22 +40,32 @@ import java.util.concurrent.ConcurrentHashMap
 import kotlin.concurrent.fixedRateTimer
 import kotlin.time.Duration
 
+/**
+ * The state of a permission according to the Android System
+ */
 enum class AndroidPermissionState {
+
+    /**
+     * Permission has been granted
+     */
     GRANTED,
+
+    /**
+     * Permission is denied
+     */
     DENIED,
+
+    /**
+     * Permission is denied and the user has selected `Do not ask again`
+     */
     DENIED_DO_NOT_ASK;
 
     companion object {
 
         /**
-         * According to my understanding shouldShowRationalePermissionRationale() method
-         * returns false in three cases:
-         * 1. If we call this method very first time before asking permission.
-         * 2. If user selects "Don't ask again" and deny permission.
-         * 3. If the device policy prohibits the app from having that permission.
-         *
-         * That's the reason we utilize shouldShowRationalePermissionRationale()
-         * only from [Activity.onRequestPermissionsResult].
+         * Gets the [AndroidPermissionState] of a [permission] for a given [Activity].
+         * @param activity The [Activity] on which to check for the permission state
+         * @param permission The name of the permission being checked. Should correspond to [android.Manifest.permission].
          */
         fun get(activity: Activity, permission: String): AndroidPermissionState {
             val permissionState = ContextCompat.checkSelfPermission(activity, permission)
@@ -63,6 +73,7 @@ enum class AndroidPermissionState {
                 return GRANTED
             }
 
+            // This returns false if the `do not ask again` checkbox has been checked before.
             return if (ActivityCompat.shouldShowRequestPermissionRationale(activity, permission)) {
                 DENIED
             } else {
@@ -70,6 +81,12 @@ enum class AndroidPermissionState {
             }
         }
 
+        /**
+         * Gets the [AndroidPermissionState] of a [permission] for a given [Context].
+         * Does not return [DENIED_DO_NOT_ASK].
+         * @param context The [Context] on which to check for the permission state
+         * @param permission The name of the permission being checked. Should correspond to [android.Manifest.permission].
+         */
         fun get(context: Context, permission: String): AndroidPermissionState {
             val permissionState = ContextCompat.checkSelfPermission(context, permission)
 
@@ -81,7 +98,8 @@ enum class AndroidPermissionState {
 /**
  * Convenience class for requesting a [Permission] and monitoring [AndroidPermissionState]
  * @param context The context for which to request the [Permission]
- * @param permissions List of permissions to request. Should correspond to [Manifest.permission].
+ * @param permissions List of permissions to request. Should correspond to [android.Manifest.permission].
+ * @param coroutineScope the [CoroutineScope] to launch permission requests in.
  * @param logTag The tag used for logging
  * @param logger The [Logger] used for logging
  * @param onPermissionChanged A [AndroidPermissionStateHandler] that will be notified of changes to [AndroidPermissionState]
@@ -105,8 +123,8 @@ class AndroidPermissionsManager constructor(
 
     /**
      * Starts to request the permissions.
-     * Use [startMonitoring] to get notified of the permission change.
-     * Calls [PermissionManager.requestPermission] if the permission cannot be granted.
+     * Ensure [startMonitoring] was called to get notified of the permission change.
+     * Sets the state to [AndroidPermissionState.DENIED_DO_NOT_ASK] if the permission cannot be requested.
      */
     fun requestPermissions() {
         if (missingPermissionsInManifest().isEmpty()) {
@@ -153,10 +171,8 @@ class AndroidPermissionsManager constructor(
     }
 
     /**
-     * Starts monitoring for changes to the permission.
-     * Calls [PermissionManager.grantPermission] if the permission became granted
-     * and [PermissionManager.revokePermission] if it became denied.
-     * @param interval The interval in milliseconds between checks in changes to the permission state.
+     * Starts monitoring for changes to the [AndroidPermissionState].
+     * @param interval The [Duration] between checks in changes to the permission state.
      */
     fun startMonitoring(interval: Duration) {
         updatePermissionsStates()
@@ -181,7 +197,7 @@ class AndroidPermissionsManager constructor(
     }
 
     /**
-     * Stops monitoring for changes to the permission.
+     * Stops monitoring for changes to the [AndroidPermissionState].
      */
     fun stopMonitoring() {
         timer?.cancel()
@@ -198,12 +214,11 @@ class AndroidPermissionsManager constructor(
         permissions.forEach {
             val oldPermissionState = permissionsStates[it]
             val newPermissionState = AndroidPermissionState.get(context, it)
-            /**
-             * Since [AndroidPermissionState.get] doesn't distinguish between
-             * [AndroidPermissionState.DENIED] and [AndroidPermissionState.DENIED_DO_NOT_ASK] states,
-             * we need to prevent [updatePermissionsStates] from over-writing
-             * current [AndroidPermissionState.DENIED_DO_NOT_ASK] state.
-             */
+
+            // Since [AndroidPermissionState.get] doesn't distinguish between
+            // [AndroidPermissionState.DENIED] and [AndroidPermissionState.DENIED_DO_NOT_ASK] states,
+            // we need to prevent [updatePermissionsStates] from over-writing
+            // current [AndroidPermissionState.DENIED_DO_NOT_ASK] state.
             if (oldPermissionState == AndroidPermissionState.DENIED_DO_NOT_ASK &&
                 newPermissionState == AndroidPermissionState.DENIED
             ) {
diff --git a/base-permissions/src/androidLibMain/kotlin/PermissionContext.kt b/base-permissions/src/androidLibMain/kotlin/PermissionContext.kt
index 112bb4bd4..e2d1e34fc 100644
--- a/base-permissions/src/androidLibMain/kotlin/PermissionContext.kt
+++ b/base-permissions/src/androidLibMain/kotlin/PermissionContext.kt
@@ -20,6 +20,10 @@ package com.splendo.kaluga.permissions.base
 import android.content.Context
 import com.splendo.kaluga.base.ApplicationHolder
 
+/**
+ * Android context for creating a [BasePermissionsBuilder]
+ * @property context the [Context] in which the permission is to be granted
+ */
 actual data class PermissionContext(val context: Context)
 
 actual val defaultPermissionContext get() = PermissionContext(ApplicationHolder.applicationContext)
diff --git a/base-permissions/src/androidLibMain/kotlin/PermissionsActivity.kt b/base-permissions/src/androidLibMain/kotlin/PermissionsActivity.kt
index a1d6f2838..8d700b7ca 100644
--- a/base-permissions/src/androidLibMain/kotlin/PermissionsActivity.kt
+++ b/base-permissions/src/androidLibMain/kotlin/PermissionsActivity.kt
@@ -28,8 +28,8 @@ import com.splendo.kaluga.logging.info
 
 /**
  * An [AppCompatActivity] responsible for requesting a [Permission]
+ * Use [PermissionsActivity.Companion.intent] for getting an [Intent] to this activity
  */
-
 class PermissionsActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -66,6 +66,11 @@ class PermissionsActivity : AppCompatActivity() {
         private const val PERMISSIONS_REQUEST_CODE = 32131
         private const val EXTRA_REQUESTED_PERMISSIONS = "EXTRA_REQUESTED_PERMISSIONS"
 
+        /**
+         * Creates the [Intent] to a [PermissionsActivity]
+         * @param context the [Context] of the [Intent]
+         * @param requestedPermissions the list of permissions to request. Should correspond to [android.Manifest.permission].
+         */
         fun intent(context: Context, vararg requestedPermissions: String): Intent {
             val intent = Intent(context, PermissionsActivity::class.java)
 
@@ -76,7 +81,7 @@ class PermissionsActivity : AppCompatActivity() {
             return intent
         }
 
-        fun getRequestedPermissions(intent: Intent): Array<String> {
+        internal fun getRequestedPermissions(intent: Intent): Array<String> {
             return intent.getStringArrayExtra(EXTRA_REQUESTED_PERMISSIONS) ?: emptyArray()
         }
     }
diff --git a/base-permissions/src/commonMain/kotlin/Permission.kt b/base-permissions/src/commonMain/kotlin/Permission.kt
index 56eb932dc..72a20b987 100644
--- a/base-permissions/src/commonMain/kotlin/Permission.kt
+++ b/base-permissions/src/commonMain/kotlin/Permission.kt
@@ -21,9 +21,6 @@ import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import com.splendo.kaluga.base.singleThreadDispatcher
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext
 import kotlin.reflect.KClass
@@ -123,28 +120,72 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
 
     /**
      * Gets the registered [BasePermissionsBuilder] for a a given type of [Permission].
-     * If no bulder has been registered yet
-     * Make sure to call [unregister] before calling this if a permission has been registered before.
+     * If no builder has been registered yet, [builder] will be registered instead.
      * This method is thread-safe.
      * @param P the type of [Permission] for which to register the builder.
      * @param Builder the type of [BasePermissionsBuilder] to register for this permission
      * @param builder the [Builder] to register for the permission.
-     * @throws [PermissionsBuilderError] if the permission was already registered.
-     * @return the registered [Builder]
+     * @return the registered [BasePermissionsBuilder]
+     */
+    inline fun <reified P : Permission, Builder : BasePermissionsBuilder<P>> registerOrGet(builder: Builder): BasePermissionsBuilder<P> = registerOrGet(P::class, builder)
+
+    /**
+     * Gets the registered [BasePermissionsBuilder] for a a given type of [Permission].
+     * If no builder has been registered yet, [builder] will be registered instead.
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to register the builder.
+     * @param Builder the type of [BasePermissionsBuilder] to register for this permission
+     * @param permission the [KClass] of the [P] to register
+     * @param builder the [Builder] to register for the permission.
+     * @return the registered [BasePermissionsBuilder]
      */
-    inline fun <reified P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(builder: B): BasePermissionsBuilder<P> = registerOrGet(P::class, builder)
     @Suppress("UNCHECKED_CAST")
-    fun <P : Permission, B : BasePermissionsBuilder<P>> registerOrGet(permission: KClass<P>, builder: B): BasePermissionsBuilder<P> = builders.getOrPut(permission::class) { builder } as BasePermissionsBuilder<P>
+    fun <P : Permission, Builder : BasePermissionsBuilder<P>> registerOrGet(permission: KClass<P>, builder: Builder): BasePermissionsBuilder<P> = builders.getOrPut(permission::class) { builder } as BasePermissionsBuilder<P>
 
+    /**
+     * Unregisters the [BasePermissionsBuilder] associated with a given [Permission].
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to unregister the builder.
+     * @param permission The [P] for which to unregister the builder.
+     */
     fun <P : Permission> unregister(permission: P) {
         builders.remove(permission::class)
     }
 
+    /**
+     * Gets the [BasePermissionsBuilder] registered for a given [Permission].
+     * Requires a builder to be registered using [register].
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to get the builder
+     * @param permission the [P] for which to get the builder
+     * @return the [BasePermissionsBuilder] registered for [permission]
+     * @throws PermissionsBuilderError if no builder was registered.
+     */
     @Suppress("UNCHECKED_CAST")
     operator fun <P : Permission> get(permission: P): BasePermissionsBuilder<P> =
         builders[permission::class] as? BasePermissionsBuilder<P> ?: throw PermissionsBuilderError("The Builder for $permission was not registered")
 
+    /**
+     * Registers a [PermissionStateRepoBuilder] for a a given type of [Permission].
+     * Only one builder can be registered per type of [Permission].
+     * Make sure to call [unregisterPermissionStateRepoBuilder] before calling this if a permission has been registered before.
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to register the builder.
+     * @param permissionStateRepoBuilder the closure to build a [BasePermissionStateRepo] for a given [P].
+     * @throws [PermissionsBuilderError] if the permission was already registered.
+     */
     inline fun <reified P : Permission> registerPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
+
+    /**
+     * Registers a [PermissionStateRepoBuilder] for a a given type of [Permission].
+     * Only one builder can be registered per type of [Permission].
+     * Make sure to call [unregisterPermissionStateRepoBuilder] before calling this if a permission has been registered before.
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to register the builder.
+     * @param permission the [KClass] of the [P] to register
+     * @param permissionStateRepoBuilder the closure to build a [BasePermissionStateRepo] for a given [P].
+     * @throws [PermissionsBuilderError] if the permission was already registered.
+     */
     fun <P : Permission> registerPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) {
         repoBuilders.synchronized {
             if (this[permission] == null) {
@@ -155,14 +196,47 @@ open class PermissionsBuilder(val context: PermissionContext = defaultPermission
         }
     }
 
+    /**
+     * Gets the [PermissionStateRepoBuilder] registered for a a given type of [Permission].
+     * If no builder has been registered yet, [permissionStateRepoBuilder] will be registered instead.
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to register the builder.
+     * @param permissionStateRepoBuilder the closure to build a [BasePermissionStateRepo] for a given [P].
+     * @return the [PermissionStateRepoBuilder] registered.
+     */
     inline fun <reified P : Permission> registerOrGetPermissionStateRepoBuilder(noinline permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = registerOrGetPermissionStateRepoBuilder(P::class, permissionStateRepoBuilder)
+
+    /**
+     * Gets the [PermissionStateRepoBuilder] registered for a a given type of [Permission].
+     * If no builder has been registered yet, [permissionStateRepoBuilder] will be registered instead.
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to register the builder.
+     * @param permission the [KClass] of the [P] to register
+     * @param permissionStateRepoBuilder the closure to build a [BasePermissionStateRepo] for a given [P].
+     * @return the [PermissionStateRepoBuilder] registered.
+     */
     @Suppress("UNCHECKED_CAST")
     fun <P : Permission> registerOrGetPermissionStateRepoBuilder(permission: KClass<P>, permissionStateRepoBuilder: (P, CoroutineContext) -> BasePermissionStateRepo<P>) = repoBuilders.getOrPut(permission) { createPermissionStateRepoBuilder(permissionStateRepoBuilder) } as PermissionStateRepoBuilder<P>
 
+    /**
+     * Unregisters the [PermissionStateRepoBuilder] associated with a given [Permission].
+     * This method is thread-safe.
+     * @param P the type of [Permission] for which to unregister the builder.
+     * @param permission The [P] for which to unregister the builder.
+     */
     fun <P : Permission> unregisterPermissionStateRepoBuilder(permission: P) {
         repoBuilders.remove(permission::class)
     }
 
+    /**
+     * Creates a [BasePermissionStateRepo] for a given [Permission].
+     * Requires that [registerPermissionStateRepoBuilder] has been called for the [Permission] type
+     * @param P the type of [Permission] for which to get a [BasePermissionStateRepo]
+     * @param permission the [Permission] for which to get a [BasePermissionStateRepo]
+     * @param coroutineContext the [CoroutineContext] managing the [BasePermissionStateRepo]
+     * @return the [BasePermissionStateRepo] created for [permission]
+     * @throws PermissionsBuilderError if [registerPermissionStateRepoBuilder] has not been called for the permission.
+     */
     @Suppress("UNCHECKED_CAST")
     fun <P : Permission> createPermissionStateRepo(permission: P, coroutineContext: CoroutineContext): BasePermissionStateRepo<*> =
         (repoBuilders[permission::class] as? PermissionStateRepoBuilder<P>)?.create(permission, coroutineContext)
@@ -183,7 +257,7 @@ private val defaultPermissionDispatcher by lazy {
 }
 
 /**
- * Manager to request the [PermissionStateRepo] of a given [Permission]
+ * Holder class for all the [PermissionStateFlowRepo] associated with [Permission]
  * @param builder The [PermissionsBuilder] to build the [PermissionManager] associated with each [Permission]
  * @param coroutineContext The [CoroutineContext] to run permission checks from
  */
@@ -200,9 +274,11 @@ class Permissions(
     } as BasePermissionStateRepo<P>
 
     /**
-     * Gets a [Flow] of [PermissionState] for a given [Permission]
-     * @param permission The [Permission] for which the [PermissionState] flow should be provided
-     * @return A [Flow] of [PermissionState] for the given [Permission]
+     * Gets a [PermissionStateFlowRepo] for a given [Permission].
+     * @param P the type of [Permission] for which to get the repo.
+     * @param permission The [Permission] for which to get the repo.
+     * @return A [PermissionStateFlowRepo] for the given [Permission]
+     * @throws PermissionsBuilderError if the provided [PermissionsBuilder] has not registered a [PermissionStateRepoBuilder] for the permission.
      */
     operator fun <P : Permission> get(permission: P): PermissionStateFlowRepo<P> {
         return permissionStateRepo(permission)
@@ -210,16 +286,22 @@ class Permissions(
 
     /**
      * Requests a [Permission]
+     * @param P the type of [Permission] to request.
+     * @param permission the [P] to request
      * @return `true` if the permission was granted, `false` otherwise.
+     * @throws PermissionsBuilderError if the provided [PermissionsBuilder] has not registered a [PermissionStateRepoBuilder] for the permission.
      */
-    suspend fun <P : Permission> request(p: P): Boolean {
-        return get(p).run {
+    suspend fun <P : Permission> request(permission: P): Boolean {
+        return get(permission).run {
             withContext(coroutineContext) {
                 request()
             }
         }
     }
 
+    /**
+     * Removes all [PermissionStateFlowRepo] generated previously.
+     */
     fun clean() {
         permissionStateRepos.synchronized {
             values.forEach { it.cancel() }
@@ -227,18 +309,3 @@ class Permissions(
         }
     }
 }
-
-/**
- * Requests a [Permission] on a [Flow] of [PermissionState]
- * @return `true` if the permission was granted, `false` otherwise.
- */
-suspend fun <P : Permission> Flow<PermissionState<out P>>.request(): Boolean {
-    return this.transformLatest { state ->
-        when (state) {
-            is PermissionState.Allowed -> emit(true)
-            is PermissionState.Denied.Requestable -> state.request()
-            is PermissionState.Denied.Locked -> emit(false)
-            is PermissionState.Inactive, is PermissionState.Active -> {}
-        }
-    }.first()
-}
diff --git a/base-permissions/src/commonMain/kotlin/PermissionManager.kt b/base-permissions/src/commonMain/kotlin/PermissionManager.kt
index ff02c4d3d..5c1035a14 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionManager.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionManager.kt
@@ -30,14 +30,36 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlin.time.Duration
 
+/**
+ * Manager for handling and monitoring a given [Permission]
+ * @param P the type of [Permission] to manage
+ */
 interface PermissionManager<P : Permission> {
 
+    /**
+     * Events that can be detected by a [PermissionManager]
+     */
     sealed class Event {
+        /**
+         * An [Event] indicating the permission has been granted by the user.
+         */
         object PermissionGranted : Event()
+
+        /**
+         * An [Event] indicating the permission has been denied by the user
+         * @property locked if `true` the permission can no longer be requested.
+         */
         data class PermissionDenied(val locked: Boolean) : Event()
     }
 
+    /**
+     * The [P] managed by this manager
+     */
     val permission: P
+
+    /**
+     * A [Flow] of [Event] detected by the manager
+     */
     val events: Flow<Event>
 
     /**
@@ -58,8 +80,11 @@ interface PermissionManager<P : Permission> {
 }
 
 /**
- * Manager for maintaining the [PermissionState] of a given [Permission]
- * @param stateRepo The [PermissionStateRepo] managed by this manager.
+ * An abstract [PermissionManager] that ensures [events] wont be missed
+ * @param P the type of [Permission] to manage
+ * @param permission the [P] managed by this manager
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
  */
 abstract class BasePermissionManager<P : Permission>(
     final override val permission: P,
@@ -67,6 +92,10 @@ abstract class BasePermissionManager<P : Permission>(
     coroutineScope: CoroutineScope
 ) : PermissionManager<P>, CoroutineScope by coroutineScope {
 
+    /**
+     * Settings to configure a [BasePermissionManager]
+     * @property logger the [Logger] the [BasePermissionManager] should use for logging
+     */
     data class Settings(
         val logger: Logger = RestrictedLogger(RestrictedLogLevel.None)
     )
@@ -98,6 +127,10 @@ abstract class BasePermissionManager<P : Permission>(
 
     protected abstract fun monitoringDidStop()
 
+    /**
+     * Emits a [PermissionManager.Event]
+     * @param event the [PermissionManager.Event] to emit
+     */
     protected fun emitEvent(event: PermissionManager.Event) {
         eventChannel.trySend(event)
     }
diff --git a/base-permissions/src/commonMain/kotlin/PermissionState.kt b/base-permissions/src/commonMain/kotlin/PermissionState.kt
index 1de3bc486..10626fc7e 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionState.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionState.kt
@@ -22,52 +22,167 @@ import com.splendo.kaluga.base.flow.SpecialFlowValue
 import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
 import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
 import com.splendo.kaluga.base.state.KalugaState
+import com.splendo.kaluga.permissions.base.PermissionState.Active
+import com.splendo.kaluga.permissions.base.PermissionState.Allowed
+import com.splendo.kaluga.permissions.base.PermissionState.Deinitialized
+import com.splendo.kaluga.permissions.base.PermissionState.Denied
+import com.splendo.kaluga.permissions.base.PermissionState.Inactive
+import com.splendo.kaluga.permissions.base.PermissionState.Initialized
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.transformLatest
 import kotlin.time.Duration
 
 /**
- * State of a [Permission]
+ * A [KalugaState] of a [Permission]
+ * @param P the type of [Permission] associated with the state
  */
 sealed interface PermissionState<P : Permission> : KalugaState {
+
+    /**
+     * A [PermissionState] indicating observation is not active
+     * @param P the type of [Permission] associated with the state
+     */
     sealed interface Inactive<P : Permission> : PermissionState<P>, SpecialFlowValue.NotImportant
+
+    /**
+     * A [Inactive] State indicating observation has not started yet
+     * @param P the type of [Permission] associated with the state
+     */
     interface Uninitialized<P : Permission> : Inactive<P>
+
+    /**
+     * A [Inactive] State indicating observation has stopped after being started
+     * @param P the type of [Permission] associated with the state
+     */
     interface Deinitialized<P : Permission> : Inactive<P> {
+
+        /**
+         * Transitions into an [Initializing] State
+         */
         val reinitialize: suspend () -> Initializing<P>
     }
 
+    /**
+     * A [PermissionState] indicating observation has started
+     * @param P the type of [Permission] associated with the state
+     */
     sealed interface Active<P : Permission> : PermissionState<P> {
+
+        /**
+         * Transitions into a [Deinitialized] State
+         */
         val deinitialize: suspend () -> Deinitialized<P>
     }
+
+    /**
+     * A [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
+     * @param P the type of [Permission] associated with the state
+     */
     interface Initializing<P : Permission> : Active<P>, SpecialFlowValue.NotImportant {
+
+        /**
+         * Transitions into an [Initialized] state
+         * @param allowed if `true` the permission is currently granted
+         * @param locked if `true` and [allowed] is `false`, this indicates the permission can not be requested.
+         */
         fun initialize(allowed: Boolean, locked: Boolean): suspend () -> Initialized<P>
     }
 
+    /**
+     * A [Active] State indicating observation has started and initialization has completed
+     * @param P the type of [Permission] associated with the state
+     */
     sealed interface Initialized<P : Permission> : Active<P>
+
+    /**
+     * A [Initialized] State indicating the permission has been granted
+     * @param P the type of [Permission] associated with the state
+     */
     interface Allowed<P : Permission> : Initialized<P> {
+
+        /**
+         * Transitions into a [Denied] State
+         * @param locked if `true` this indicates the permission can not be requested again
+         */
         fun deny(locked: Boolean): suspend () -> Denied<P>
     }
 
+    /**
+     * A [Initialized] State indicating the permission has been denied.
+     * @param P the type of [Permission] associated with the state
+     */
     sealed interface Denied<P : Permission> : Initialized<P> {
+
+        /**
+         * Transitions into an [Allowed] State
+         */
         val allow: suspend () -> Allowed<P>
 
+        /**
+         * A [Denied] State indicating the permission cannot be granted
+         * @param P the type of [Permission] associated with the state
+         */
         interface Locked<P : Permission> : Denied<P> {
+
+            /**
+             * Transitions into a [Requestable] State
+             */
             val unlock: suspend () -> Requestable<P>
         }
 
+        /**
+         * A [Denied] State indicating the permission can be granted
+         * Use [request] to request the permission.
+         * @param P the type of [Permission] associated with the state
+         */
         interface Requestable<P : Permission> : Denied<P> {
+
+            /**
+             * Transitions into a [Locked] State
+             */
             val lock: suspend () -> Locked<P>
 
+            /**
+             * Attempts to request the permission
+             */
             fun request()
         }
     }
 }
 
+/**
+ * State of a [Permission] closely matching [PermissionState]
+ * @param P the type of [Permission] associated with the state
+ */
 sealed class PermissionStateImpl<P : Permission> {
 
+    /**
+     * A [PermissionStateImpl] indicating observation is not active
+     * @param P the type of [Permission] associated with the state
+     */
     sealed class Inactive<P : Permission> : PermissionStateImpl<P>()
+
+    /**
+     * A [Inactive] State indicating observation has not started yet
+     * @param P the type of [Permission] associated with the state
+     */
     class Uninitialized<P : Permission> : Inactive<P>(), PermissionState.Uninitialized<P> {
+
+        /**
+         * Transitions into a [Initializing] state
+         * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+         * @param permissionManager the [PermissionManager] managing the [P] if this State
+         */
         fun initialize(monitoringInterval: Duration, permissionManager: PermissionManager<P>): suspend () -> Initializing<P> = { Initializing(monitoringInterval, permissionManager) }
     }
 
+    /**
+     * A [Inactive] State indicating observation has stopped after being started
+     * @param P the type of [Permission] associated with the state
+     * @property monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+     * @property permissionManager the [PermissionManager] managing the [P] if this State
+     */
     data class Deinitialized<P : Permission>(
         val monitoringInterval: Duration,
         val permissionManager: PermissionManager<P>
@@ -75,10 +190,25 @@ sealed class PermissionStateImpl<P : Permission> {
         override val reinitialize: suspend () -> Initializing<P> = { Initializing(monitoringInterval, permissionManager) }
     }
 
+    /**
+     * A [PermissionState] indicating observation has started
+     * @param P the type of [Permission] associated with the state
+     */
     sealed class Active<P : Permission> : PermissionStateImpl<P>(), HandleBeforeOldStateIsRemoved<PermissionState<P>>, HandleAfterNewStateIsSet<PermissionState<P>> {
+
+        /**
+         * The [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+         */
         abstract val monitoringInterval: Duration
+
+        /**
+         * The [PermissionManager] managing the [P] if this State
+         */
         abstract val permissionManager: PermissionManager<P>
 
+        /**
+         * Transitions into a [Deinitialized] State
+         */
         val deinitialize: suspend () -> Deinitialized<P> = { Deinitialized(monitoringInterval, permissionManager) }
 
         override suspend fun afterNewStateIsSet(newState: PermissionState<P>) {
@@ -96,6 +226,12 @@ sealed class PermissionStateImpl<P : Permission> {
         }
     }
 
+    /**
+     * A [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
+     * @param P the type of [Permission] associated with the state
+     * @property monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+     * @property permissionManager the [PermissionManager] managing the [P] if this State
+     */
     data class Initializing<P : Permission>(
         override val monitoringInterval: Duration,
         override val permissionManager: PermissionManager<P>
@@ -110,7 +246,10 @@ sealed class PermissionStateImpl<P : Permission> {
     }
 
     /**
-     * When in this state the [Permission] has been granted
+     * A [Active] State indicating the permission has been granted
+     * @param P the type of [Permission] associated with the state
+     * @property monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+     * @property permissionManager the [PermissionManager] managing the [P] if this State
      */
     data class Allowed<P : Permission>(
         override val monitoringInterval: Duration,
@@ -123,16 +262,23 @@ sealed class PermissionStateImpl<P : Permission> {
     }
 
     /**
-     * When in this state the [Permission] is denied. If can either be requestable of blocked from request.
+     * A [Active] State indicating the permission has been denied.
+     * @param P the type of [Permission] associated with the state
      */
     sealed class Denied<P : Permission> : Active<P>() {
 
+        /**
+         * Transitions into an [Allowed] State
+         */
         val allow: suspend () -> Allowed<P> = {
             Allowed(monitoringInterval, permissionManager)
         }
 
         /**
-         * When in this state the [Permission] is denied and cannot be requested
+         * A [Denied] State indicating the permission cannot be granted
+         * @param P the type of [Permission] associated with the state
+         * @property monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+         * @property permissionManager the [PermissionManager] managing the [P] if this State
          */
         data class Locked<P : Permission>(
             override val monitoringInterval: Duration,
@@ -145,7 +291,11 @@ sealed class PermissionStateImpl<P : Permission> {
         }
 
         /**
-         * When in this state the [Permission] is denied but can be requested. Use [request] to request the permission.
+         * A [Denied] State indicating the permission can be granted
+         * Use [request] to request the permission.
+         * @param P the type of [Permission] associated with the state
+         * @property monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+         * @property permissionManager the [PermissionManager] managing the [P] if this State
          */
         data class Requestable<P : Permission>(
             override val monitoringInterval: Duration,
@@ -162,3 +312,19 @@ sealed class PermissionStateImpl<P : Permission> {
         }
     }
 }
+
+/**
+ * Requests a [Permission] on a [Flow] of [PermissionState]
+ * @param P the type of [Permission] associated with the [PermissionState]
+ * @return `true` if the permission was granted, `false` otherwise.
+ */
+suspend fun <P : Permission> Flow<PermissionState<out P>>.request(): Boolean {
+    return this.transformLatest { state ->
+        when (state) {
+            is PermissionState.Allowed -> emit(true)
+            is PermissionState.Denied.Requestable -> state.request()
+            is PermissionState.Denied.Locked -> emit(false)
+            is PermissionState.Inactive, is PermissionState.Active -> {}
+        }
+    }.first()
+}
diff --git a/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt b/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt
index c3290d339..a6adbdd16 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionStateRepo.kt
@@ -30,8 +30,20 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
+/**
+ * A [StateRepo]/[MutableStateFlow] of [PermissionState]
+ * @param P the type of [Permission] of the [PermissionState]
+ */
 typealias PermissionStateFlowRepo<P> = StateRepo<PermissionState<P>, MutableStateFlow<PermissionState<P>>>
 
+/**
+ * An abstract [ColdStateFlowRepo] for managing [PermissionState]
+ * @param P the type of [Permission] of the [PermissionState]
+ * @param createUninitializedState method for creating the initial [PermissionState.Uninitialized] State
+ * @param createInitializingState method for transitioning from a [PermissionState.Inactive] into a [PermissionState.Initializing] given an implementation of this [ColdStateFlowRepo]
+ * @param createDeinitializedState method for transitioning from a [PermissionState.Active] into a [PermissionState.Deinitialized] given an implementation of this [ColdStateFlowRepo]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine.
+ */
 abstract class BasePermissionStateRepo<P : Permission>(
     createUninitializedState: () -> PermissionState.Uninitialized<P>,
     createInitializingState: suspend ColdStateFlowRepo<PermissionState<P>>.(PermissionState.Inactive<P>) -> suspend () -> PermissionState.Initializing<P>,
@@ -54,6 +66,13 @@ abstract class BasePermissionStateRepo<P : Permission>(
     firstState = createUninitializedState
 )
 
+/**
+ * A [BasePermissionStateRepo] for managing [PermissionState]
+ * @param P the type of [Permission] of the [PermissionState]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param createPermissionManager method for creating a [PermissionManager] associated with the [Permission]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine.
+ */
 open class PermissionStateRepo<P : Permission>(
     protected val monitoringInterval: Duration = defaultMonitoringInterval,
     createPermissionManager: (CoroutineScope) -> PermissionManager<P>,
diff --git a/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt b/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt
index 6a9c284a1..16b1f51a6 100644
--- a/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt
+++ b/base-permissions/src/iosMain/kotlin/IOSPermissionsHelper.kt
@@ -38,9 +38,24 @@ class IOSPermissionsHelper {
      * Type of AuthorizationStatus that can be given by a permission.
      */
     enum class AuthorizationStatus {
+        /**
+         * The status of Authorization has not yet been determined by the user and can thus be requested.
+         */
         NotDetermined,
+
+        /**
+         * The Authorization status cannot be granted because it is restricted
+         */
         Restricted,
+
+        /**
+         * The Authorization status cannot be granted because the user has denied it
+         */
         Denied,
+
+        /**
+         * The Authorization status has been granted
+         */
         Authorized
     }
 
@@ -74,18 +89,20 @@ class IOSPermissionsHelper {
     }
 }
 
-fun AuthorizationStatusHandler.requestAuthorizationStatus(timerHelper: PermissionRefreshScheduler? = null, coroutineScope: CoroutineScope, request: suspend () -> AuthorizationStatus) {
-    coroutineScope.launch {
-        timerHelper?.waitingLock?.withLock {
-            request()
-        }?.let { status(it) }
-    }
-}
-
+/**
+ * Handles changes to [AuthorizationStatus]
+ */
 interface AuthorizationStatusHandler {
     fun status(status: AuthorizationStatus)
 }
 
+/**
+ * Default implementation of [AuthorizationStatusHandler].
+ * Maps [AuthorizationStatus] to a [PermissionManager.Event] and sends this to a channel
+ * @param eventChannel the [SendChannel] that should emit the [PermissionManager.Event]
+ * @param logTag the tag wto use for logging
+ * @param logger the [Logger] to use for logging
+ */
 class DefaultAuthorizationStatusHandler(
     private val eventChannel: SendChannel<PermissionManager.Event>,
     private val logTag: String,
@@ -113,3 +130,21 @@ class DefaultAuthorizationStatusHandler(
         eventChannel.trySend(event)
     }
 }
+
+/**
+ * Pauses a [PermissionRefreshScheduler] while requesting an [AuthorizationStatus] and calls [AuthorizationStatusHandler.status] once the request has been completed.
+ * @param timerHelper the [PermissionRefreshScheduler] to pause.
+ * @param coroutineScope the [CoroutineScope] on which to request the [AuthorizationStatus]
+ * @param request the method for requesting the [AuthorizationStatus]
+ */
+fun AuthorizationStatusHandler.requestAuthorizationStatus(
+    timerHelper: PermissionRefreshScheduler? = null,
+    coroutineScope: CoroutineScope,
+    request: suspend () -> AuthorizationStatus
+) {
+    coroutineScope.launch {
+        timerHelper?.waitingLock?.withLock {
+            request()
+        }?.let { status(it) }
+    }
+}
diff --git a/base-permissions/src/iosMain/kotlin/PermissionContext.kt b/base-permissions/src/iosMain/kotlin/PermissionContext.kt
index 8afc58a8e..248ce4d40 100644
--- a/base-permissions/src/iosMain/kotlin/PermissionContext.kt
+++ b/base-permissions/src/iosMain/kotlin/PermissionContext.kt
@@ -19,6 +19,12 @@ package com.splendo.kaluga.permissions.base
 
 import platform.Foundation.NSBundle
 
+/**
+ * iOS context for creating a [BasePermissionsBuilder]. Type-alias for [NSBundle]
+ */
 actual typealias PermissionContext = NSBundle
 
+/**
+ * Default [PermissionContext] of the system
+ */
 actual val defaultPermissionContext get() = NSBundle.mainBundle
diff --git a/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt b/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt
index aaa7f2600..8106c3312 100644
--- a/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt
+++ b/base-permissions/src/iosMain/kotlin/PermissionRefreshScheduler.kt
@@ -25,19 +25,22 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlin.time.Duration
 
+/**
+ * Provides the current [IOSPermissionsHelper.AuthorizationStatus] of a given permission.
+ */
 interface CurrentAuthorizationStatusProvider {
     suspend fun provide(): IOSPermissionsHelper.AuthorizationStatus
 }
 
 /**
  * Convenience class for scheduling checks to changes in permission state.
- * @param authorizationStatus Method for requesting a the current [IOSPermissionsHelper.AuthorizationStatus] for the permission associated with the [PermissionManager]
- * @param onPermissionChangedFlow [AuthorizationStatusHandler] that is notified when changes to a permission occurs.
+ * @param currentAuthorizationStatusProvider The [CurrentAuthorizationStatusProvider] used for getting the [IOSPermissionsHelper.AuthorizationStatus] of the permission.
+ * @param authorizationStatusHandler [AuthorizationStatusHandler] that is notified when changes to a permission occurs.
  * @param coroutineScope The [CoroutineScope] on which to run the checks.
  */
 class PermissionRefreshScheduler(
     private val currentAuthorizationStatusProvider: CurrentAuthorizationStatusProvider,
-    private val onPermissionChangedFlow: AuthorizationStatusHandler,
+    private val authorizationStatusHandler: AuthorizationStatusHandler,
     coroutineScope: CoroutineScope
 ) : CoroutineScope by coroutineScope {
 
@@ -59,13 +62,13 @@ class PermissionRefreshScheduler(
     }
 
     private var lastPermission: IOSPermissionsHelper.AuthorizationStatus? = null
-    val waitingLock = Mutex()
+    internal val waitingLock = Mutex()
     private var timerState: TimerJobState = TimerJobState.TimerNotRunning
     private val lock = Mutex()
 
     /**
-     * Starts monitoring for changes to the permission
-     * @param interval The interval in milliseconds between checking for changes to the permission.
+     * Starts monitoring for changes to the [IOSPermissionsHelper.AuthorizationStatus]
+     * @param interval The [Duration] between checking for changes to the permission.
      */
     fun startMonitoring(interval: Duration) {
         launch {
@@ -81,7 +84,7 @@ class PermissionRefreshScheduler(
                     val status = currentAuthorizationStatusProvider.provide()
                     if (!waitingLock.isLocked && lastPermission != status) {
                         lastPermission = currentAuthorizationStatusProvider.provide()
-                        onPermissionChangedFlow.status(status)
+                        authorizationStatusHandler.status(status)
                     }
                 }
             }
@@ -89,7 +92,7 @@ class PermissionRefreshScheduler(
     }
 
     /**
-     * Stops monitoring for changes to the permission.
+     * Stops monitoring for changes to the [IOSPermissionsHelper.AuthorizationStatus].
      */
     fun stopMonitoring() {
         launch {
diff --git a/base-permissions/src/iosMain/kotlin/av/AVPermissionHelper.kt b/base-permissions/src/iosMain/kotlin/av/AVPermissionHelper.kt
index 106f86e08..cd5cced91 100644
--- a/base-permissions/src/iosMain/kotlin/av/AVPermissionHelper.kt
+++ b/base-permissions/src/iosMain/kotlin/av/AVPermissionHelper.kt
@@ -37,15 +37,32 @@ import platform.AVFoundation.requestAccessForMediaType
 import platform.Foundation.NSBundle
 import kotlin.time.Duration
 
+/**
+ * A type of permission associated with an [AVMediaType]
+ */
 abstract class AVType {
+    /**
+     * The [AVMediaType] associated with this permission
+     */
     abstract val avMediaType: AVMediaType
+
+    /**
+     * The declaration name that should be added to the PList in order to request this permission
+     */
     abstract val declarationName: String
 }
 
+/**
+ * A helper for managing the [IOSPermissionsHelper.AuthorizationStatus] of an [AVType] permission.
+ * @param bundle the [NSBundle] for which the permission should be applied
+ * @param type the [AVType] of the permission to manage
+ * @param authorizationStatusHandler the [AuthorizationStatusHandler] to handle changes to the permission
+ * @param coroutineScope the [CoroutineScope] to manage monitoring the permission
+ */
 class AVPermissionHelper(
     private val bundle: NSBundle,
     private val type: AVType,
-    private val onPermissionChangedFlow: AuthorizationStatusHandler,
+    private val authorizationStatusHandler: AuthorizationStatusHandler,
     private val coroutineScope: CoroutineScope
 ) : CoroutineScope by coroutineScope {
 
@@ -54,13 +71,16 @@ class AVPermissionHelper(
     }
 
     private val provider = Provider(type.avMediaType)
-    private val timerHelper = PermissionRefreshScheduler(provider, onPermissionChangedFlow, coroutineScope)
+    private val timerHelper = PermissionRefreshScheduler(provider, authorizationStatusHandler, coroutineScope)
 
+    /**
+     * Attempts to request the [AVType] permission and updates the provided [AuthorizationStatusHandler]
+     */
     fun requestPermission() {
-        val onPermissionChangedFlow = onPermissionChangedFlow
+        val authorizationStatusHandler = authorizationStatusHandler
         if (IOSPermissionsHelper.missingDeclarationsInPList(bundle, type.declarationName).isEmpty()) {
             val mediaType = type.avMediaType
-            onPermissionChangedFlow.requestAuthorizationStatus(timerHelper, coroutineScope) {
+            authorizationStatusHandler.requestAuthorizationStatus(timerHelper, coroutineScope) {
                 val deferred = CompletableDeferred<Boolean>()
                 AVCaptureDevice.requestAccessForMediaType(
                     mediaType
@@ -71,19 +91,26 @@ class AVPermissionHelper(
                 if (deferred.await()) IOSPermissionsHelper.AuthorizationStatus.Authorized else IOSPermissionsHelper.AuthorizationStatus.Denied
             }
         } else {
-            onPermissionChangedFlow.status(IOSPermissionsHelper.AuthorizationStatus.Denied)
+            authorizationStatusHandler.status(IOSPermissionsHelper.AuthorizationStatus.Denied)
         }
     }
 
+    /**
+     * Starts monitoring for changes to the [IOSPermissionsHelper.AuthorizationStatus]
+     * @param interval the [Duration] between checks for changes to the [IOSPermissionsHelper.AuthorizationStatus]
+     */
     fun startMonitoring(interval: Duration) {
         when {
             AVCaptureDevice.devicesWithMediaType(type.avMediaType).isEmpty() -> {
-                onPermissionChangedFlow.status(IOSPermissionsHelper.AuthorizationStatus.Denied)
+                authorizationStatusHandler.status(IOSPermissionsHelper.AuthorizationStatus.Denied)
             }
             else -> timerHelper.startMonitoring(interval)
         }
     }
 
+    /**
+     * Stops monitoring for changes to the [IOSPermissionsHelper.AuthorizationStatus]
+     */
     fun stopMonitoring() {
         timerHelper.stopMonitoring()
     }
diff --git a/base-permissions/src/iosTest/kotlin/PermissionRefreshSchedulerTest.kt b/base-permissions/src/iosTest/kotlin/PermissionRefreshSchedulerTest.kt
index ecba50ade..ed57a1611 100644
--- a/base-permissions/src/iosTest/kotlin/PermissionRefreshSchedulerTest.kt
+++ b/base-permissions/src/iosTest/kotlin/PermissionRefreshSchedulerTest.kt
@@ -40,7 +40,7 @@ class PermissionRefreshSchedulerTest : BaseTest() {
         val onPermissionChangedFlow = MutableStateFlow<IOSPermissionsHelper.AuthorizationStatus?>(null)
         val timerHelper = PermissionRefreshScheduler(
             currentAuthorizationStatusProvider = authorizationProvider,
-            onPermissionChangedFlow = object : AuthorizationStatusHandler {
+            authorizationStatusHandler = object : AuthorizationStatusHandler {
                 override fun status(status: IOSPermissionsHelper.AuthorizationStatus) {
                     onPermissionChangedFlow.value = status
                 }
diff --git a/base-permissions/src/jsMain/kotlin/PermissionContext.kt b/base-permissions/src/jsMain/kotlin/PermissionContext.kt
index c40eadaa9..80d17e2d6 100644
--- a/base-permissions/src/jsMain/kotlin/PermissionContext.kt
+++ b/base-permissions/src/jsMain/kotlin/PermissionContext.kt
@@ -16,6 +16,12 @@
  */
 package com.splendo.kaluga.permissions.base
 
+/**
+ * JavaScript context for creating a [BasePermissionsBuilder]
+ */
 actual class PermissionContext
 
+/**
+ * Default [PermissionContext] of the system
+ */
 actual val defaultPermissionContext = PermissionContext()
diff --git a/base-permissions/src/jvmMain/kotlin/PermissionContext.kt b/base-permissions/src/jvmMain/kotlin/PermissionContext.kt
index c40eadaa9..06beacfbb 100644
--- a/base-permissions/src/jvmMain/kotlin/PermissionContext.kt
+++ b/base-permissions/src/jvmMain/kotlin/PermissionContext.kt
@@ -16,6 +16,12 @@
  */
 package com.splendo.kaluga.permissions.base
 
+/**
+ * Java context for creating a [BasePermissionsBuilder]
+ */
 actual class PermissionContext
 
+/**
+ * Default [PermissionContext] of the system
+ */
 actual val defaultPermissionContext = PermissionContext()
diff --git a/bluetooth-permissions/src/androidLibMain/kotlin/BluetoothPermissionManager.kt b/bluetooth-permissions/src/androidLibMain/kotlin/BluetoothPermissionManager.kt
index cbb1cfc11..9dd4da5e9 100644
--- a/bluetooth-permissions/src/androidLibMain/kotlin/BluetoothPermissionManager.kt
+++ b/bluetooth-permissions/src/androidLibMain/kotlin/BluetoothPermissionManager.kt
@@ -25,11 +25,19 @@ import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.AndroidPermissionState
 import com.splendo.kaluga.permissions.base.AndroidPermissionsManager
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.DefaultAndroidPermissionStateHandler
 import com.splendo.kaluga.permissions.base.PermissionContext
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [BluetoothPermission]
+ * @param context the [Context] the [BluetoothPermission] is to be granted in
+ * @param bluetoothAdapter the [BluetoothAdapter] of the system
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultBluetoothPermissionManager(
     context: Context,
     bluetoothAdapter: BluetoothAdapter?,
@@ -82,11 +90,20 @@ actual class DefaultBluetoothPermissionManager(
     }
 }
 
+/**
+ * A [BaseBluetoothPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ * @param bluetoothAdapter the [BluetoothAdapter] of the system
+ */
 actual class BluetoothPermissionManagerBuilder(
     private val context: PermissionContext,
     private val bluetoothAdapter: BluetoothAdapter?
 ) : BaseBluetoothPermissionManagerBuilder {
 
+    /**
+     * Constructor
+     * @param context the [PermissionContext] this permissions manager builder runs on
+     */
     actual constructor(context: PermissionContext) : this(context, (context.context.getSystemService(Context.BLUETOOTH_SERVICE) as? BluetoothManager)?.adapter)
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): BluetoothPermissionManager {
diff --git a/bluetooth-permissions/src/commonMain/kotlin/BluetoothPermission.kt b/bluetooth-permissions/src/commonMain/kotlin/BluetoothPermission.kt
index ac7a5b722..b82f22b1d 100644
--- a/bluetooth-permissions/src/commonMain/kotlin/BluetoothPermission.kt
+++ b/bluetooth-permissions/src/commonMain/kotlin/BluetoothPermission.kt
@@ -32,25 +32,37 @@ import kotlin.time.Duration
  * A [PermissionManager] for managing [BluetoothPermission]
  */
 typealias BluetoothPermissionManager = PermissionManager<BluetoothPermission>
+
+/**
+ * The [BasePermissionManager] to use as a default for [BluetoothPermission]
+ */
 expect class DefaultBluetoothPermissionManager : BasePermissionManager<BluetoothPermission>
 
+/**
+ * A [BasePermissionsBuilder] for [BluetoothPermission]
+ */
 interface BaseBluetoothPermissionManagerBuilder : BasePermissionsBuilder<BluetoothPermission> {
+
     /**
      * Creates a [BluetoothPermissionManager]
-     * @param settings [BasePermissionManager.Settings] to configure the manager
+     * @param settings [BasePermissionManager.Settings] to apply to the manager
      * @param coroutineScope The [CoroutineScope] the manager runs on
+     * @return a [BluetoothPermissionManager]
      */
     fun create(settings: BasePermissionManager.Settings = BasePermissionManager.Settings(), coroutineScope: CoroutineScope): BluetoothPermissionManager
 }
 
 /**
- * A builder for creating a [BluetoothPermissionManager]
+ * A [BaseBluetoothPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
  */
 expect class BluetoothPermissionManagerBuilder(context: PermissionContext = defaultPermissionContext) : BaseBluetoothPermissionManagerBuilder
 
 /**
  * A [PermissionStateRepo] for [BluetoothPermission]
  * @param builder The [BluetoothPermissionManagerBuilder] for creating the [BluetoothPermissionManager] associated with the permission
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] used by the [BluetoothPermissionManager] created by the builder
  * @param coroutineContext The [CoroutineContext] to run the state machine on.
  */
 class BluetoothPermissionStateRepo(
diff --git a/bluetooth-permissions/src/commonMain/kotlin/Permission.kt b/bluetooth-permissions/src/commonMain/kotlin/Permission.kt
index be5a92137..c9e9dc5f5 100644
--- a/bluetooth-permissions/src/commonMain/kotlin/Permission.kt
+++ b/bluetooth-permissions/src/commonMain/kotlin/Permission.kt
@@ -26,12 +26,21 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 
 /**
- * Permission to access the Bluetooth scanner
+ * [Permission] to access the Bluetooth scanner
  */
 object BluetoothPermission : Permission() {
     override val name: String = "Bluetooth"
 }
 
+/**
+ * Registers a [BaseBluetoothPermissionManagerBuilder] and [PermissionStateRepo] for [BluetoothPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param bluetoothPermissionManagerBuilderBuilder method for creating a [BaseBluetoothPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseBluetoothPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseBluetoothPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerBluetoothPermission(
     bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -46,6 +55,14 @@ fun PermissionsBuilder.registerBluetoothPermission(
         )
     }
 
+/**
+ * Registers a [BaseBluetoothPermissionManagerBuilder] and [PermissionStateRepo] for [BluetoothPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param bluetoothPermissionManagerBuilderBuilder method for creating a [BaseBluetoothPermissionManagerBuilder] from a [PermissionContext]
+ * @param stateRepoBuilder method for creating a [PermissionStateRepo] for [BluetoothPermission] given a [BaseBluetoothPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseBluetoothPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseBluetoothPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerBluetoothPermission(
     bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
     stateRepoBuilder: (BaseBluetoothPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<BluetoothPermission>
@@ -56,6 +73,14 @@ fun PermissionsBuilder.registerBluetoothPermission(
     }
 }
 
+/**
+ * Gets the [BaseBluetoothPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseBluetoothPermissionManagerBuilder] and [PermissionStateRepo] for [BluetoothPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param bluetoothPermissionManagerBuilderBuilder method for creating a [BaseBluetoothPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseBluetoothPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerBluetoothPermissionIfNotRegistered(
     bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -70,6 +95,13 @@ fun PermissionsBuilder.registerBluetoothPermissionIfNotRegistered(
         )
     }
 
+/**
+ * Gets the [BaseBluetoothPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseBluetoothPermissionManagerBuilder] and [PermissionStateRepo] for [BluetoothPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param bluetoothPermissionManagerBuilderBuilder method for creating a [BaseBluetoothPermissionManagerBuilder] from a [PermissionContext]
+ * @param stateRepoBuilder method for creating a [PermissionStateRepo] for [BluetoothPermission] given a [BaseBluetoothPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseBluetoothPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerBluetoothPermissionIfNotRegistered(
     bluetoothPermissionManagerBuilderBuilder: (PermissionContext) -> BaseBluetoothPermissionManagerBuilder = ::BluetoothPermissionManagerBuilder,
     stateRepoBuilder: (BaseBluetoothPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<BluetoothPermission>
diff --git a/bluetooth-permissions/src/iosMain/kotlin/BluetoothPermissionManager.kt b/bluetooth-permissions/src/iosMain/kotlin/BluetoothPermissionManager.kt
index 2a583d028..e6df30564 100644
--- a/bluetooth-permissions/src/iosMain/kotlin/BluetoothPermissionManager.kt
+++ b/bluetooth-permissions/src/iosMain/kotlin/BluetoothPermissionManager.kt
@@ -21,6 +21,7 @@ package com.splendo.kaluga.permissions.bluetooth
 import com.splendo.kaluga.base.IOSVersion
 import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.CurrentAuthorizationStatusProvider
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.IOSPermissionsHelper
@@ -48,6 +49,12 @@ import kotlin.time.Duration
 const val NSBluetoothAlwaysUsageDescription = "NSBluetoothAlwaysUsageDescription"
 const val NSBluetoothPeripheralUsageDescription = "NSBluetoothPeripheralUsageDescription"
 
+/**
+ * The [BasePermissionManager] to use as a default for [BluetoothPermission]
+ * @param bundle the [NSBundle] the [BluetoothPermission] is to be granted in
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultBluetoothPermissionManager(
     private val bundle: NSBundle,
     settings: Settings,
@@ -109,6 +116,10 @@ actual class DefaultBluetoothPermissionManager(
     }
 }
 
+/**
+ * A [BaseBluetoothPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class BluetoothPermissionManagerBuilder actual constructor(
     private val context: PermissionContext
 ) : BaseBluetoothPermissionManagerBuilder {
diff --git a/bluetooth-permissions/src/jsMain/kotlin/BluetoothPermissionManager.kt b/bluetooth-permissions/src/jsMain/kotlin/BluetoothPermissionManager.kt
index a07e48c9a..e540ba3d9 100644
--- a/bluetooth-permissions/src/jsMain/kotlin/BluetoothPermissionManager.kt
+++ b/bluetooth-permissions/src/jsMain/kotlin/BluetoothPermissionManager.kt
@@ -18,11 +18,17 @@
 package com.splendo.kaluga.permissions.bluetooth
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [BluetoothPermission]
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultBluetoothPermissionManager(settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<BluetoothPermission>(BluetoothPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +44,10 @@ actual class DefaultBluetoothPermissionManager(settings: Settings, coroutineScop
     }
 }
 
+/**
+ * A [BaseBluetoothPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class BluetoothPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseBluetoothPermissionManagerBuilder {
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<BluetoothPermission> {
diff --git a/bluetooth-permissions/src/jvmMain/kotlin/BluetoothPermissionManager.kt b/bluetooth-permissions/src/jvmMain/kotlin/BluetoothPermissionManager.kt
index 1e60ef67e..3ce57592c 100644
--- a/bluetooth-permissions/src/jvmMain/kotlin/BluetoothPermissionManager.kt
+++ b/bluetooth-permissions/src/jvmMain/kotlin/BluetoothPermissionManager.kt
@@ -18,11 +18,17 @@
 package com.splendo.kaluga.permissions.bluetooth
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [BluetoothPermission]
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultBluetoothPermissionManager(settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<BluetoothPermission>(BluetoothPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +44,10 @@ actual class DefaultBluetoothPermissionManager(settings: Settings, coroutineScop
     }
 }
 
+/**
+ * A [BaseBluetoothPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class BluetoothPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseBluetoothPermissionManagerBuilder {
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<BluetoothPermission> {
diff --git a/calendar-permissions/src/androidLibMain/kotlin/CalendarPermissionManager.kt b/calendar-permissions/src/androidLibMain/kotlin/CalendarPermissionManager.kt
index cd711d4ac..bc7610507 100644
--- a/calendar-permissions/src/androidLibMain/kotlin/CalendarPermissionManager.kt
+++ b/calendar-permissions/src/androidLibMain/kotlin/CalendarPermissionManager.kt
@@ -21,11 +21,19 @@ import android.Manifest
 import android.content.Context
 import com.splendo.kaluga.permissions.base.AndroidPermissionsManager
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.DefaultAndroidPermissionStateHandler
 import com.splendo.kaluga.permissions.base.PermissionContext
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [CalendarPermission]
+ * @param context the [Context] the [CalendarPermission] is to be granted in
+ * @param calendarPermission the [CalendarPermission] to manage.
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultCalendarPermissionManager(
     context: Context,
     calendarPermission: CalendarPermission,
@@ -56,6 +64,10 @@ actual class DefaultCalendarPermissionManager(
     }
 }
 
+/**
+ * A [BaseCalendarPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class CalendarPermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseCalendarPermissionManagerBuilder {
 
     override fun create(calendarPermission: CalendarPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): CalendarPermissionManager {
diff --git a/calendar-permissions/src/commonMain/kotlin/CalendarPermission.kt b/calendar-permissions/src/commonMain/kotlin/CalendarPermission.kt
index dae0b6ef4..84a18dd70 100644
--- a/calendar-permissions/src/commonMain/kotlin/CalendarPermission.kt
+++ b/calendar-permissions/src/commonMain/kotlin/CalendarPermission.kt
@@ -31,15 +31,23 @@ import kotlin.time.Duration
  * A [PermissionManager] for managing [CalendarPermission]
  */
 typealias CalendarPermissionManager = PermissionManager<CalendarPermission>
+
+/**
+ * The [BasePermissionManager] to use as a default for [CalendarPermission]
+ */
 expect class DefaultCalendarPermissionManager : BasePermissionManager<CalendarPermission>
 
+/**
+ * A [BasePermissionsBuilder] for [CalendarPermission]
+ */
 interface BaseCalendarPermissionManagerBuilder : BasePermissionsBuilder<CalendarPermission> {
 
     /**
      * Creates a [CalendarPermissionManager]
-     * @param calendarPermission The [CalendarPermission] for the PermissionManager to be created
-     * @param settings [BasePermissionManager.Settings] to configure the manager
+     * @param calendarPermission the [CalendarPermission] to manage.
+     * @param settings [BasePermissionManager.Settings] to apply to the manager
      * @param coroutineScope The [CoroutineScope] the manager runs on
+     * @return a [CalendarPermissionManager]
      */
     fun create(
         calendarPermission: CalendarPermission,
@@ -49,13 +57,17 @@ interface BaseCalendarPermissionManagerBuilder : BasePermissionsBuilder<Calendar
 }
 
 /**
- * A builder for creating a [CalendarPermissionManager]
+ * A [BaseCalendarPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
  */
 expect class CalendarPermissionManagerBuilder(context: PermissionContext = defaultPermissionContext) : BaseCalendarPermissionManagerBuilder
 
 /**
  * A [PermissionStateRepo] for [CalendarPermission]
+ * @param calendarPermission the [CalendarPermission] to manage.
  * @param builder The [CalendarPermissionManagerBuilder] for creating the [CalendarPermissionManager] associated with the permission
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] used by the [CalendarPermissionManager] created by the builder
  * @param coroutineContext The [CoroutineContext] to run the state machine on.
  */
 class CalendarPermissionStateRepo(
diff --git a/calendar-permissions/src/commonMain/kotlin/Permission.kt b/calendar-permissions/src/commonMain/kotlin/Permission.kt
index 85f389e1f..0cec200d2 100644
--- a/calendar-permissions/src/commonMain/kotlin/Permission.kt
+++ b/calendar-permissions/src/commonMain/kotlin/Permission.kt
@@ -26,13 +26,22 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 
 /**
- * Permission to access the users Calendar
+ * [Permission] to access the users Calendar
  * @param allowWrite If `true` writing to the calendar is permitted
  */
 data class CalendarPermission(val allowWrite: Boolean = false) : Permission() {
     override val name: String = "Calendar - ${if (allowWrite) "ReadWrite" else "ReadOnly"}"
 }
 
+/**
+ * Registers a [BaseCalendarPermissionManagerBuilder] and [PermissionStateRepo] for [CalendarPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param calendarPermissionManagerBuilderBuilder method for creating a [BaseCalendarPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseCalendarPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseCalendarPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerCalendarPermission(
     calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -42,6 +51,14 @@ fun PermissionsBuilder.registerCalendarPermission(
         CalendarPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Registers a [BaseCalendarPermissionManagerBuilder] and [PermissionStateRepo] for [CalendarPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param calendarPermissionManagerBuilderBuilder method for creating a [BaseCalendarPermissionManagerBuilder] from a [PermissionContext]
+ * @param calendarPermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [CalendarPermission] given a [BaseCalendarPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseCalendarPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseCalendarPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerCalendarPermission(
     calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
     calendarPermissionStateRepoBuilder: (CalendarPermission, BaseCalendarPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CalendarPermission>
@@ -52,6 +69,14 @@ fun PermissionsBuilder.registerCalendarPermission(
     }
 }
 
+/**
+ * Gets the [BaseCalendarPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseCalendarPermissionManagerBuilder] and [PermissionStateRepo] for [CalendarPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param calendarPermissionManagerBuilderBuilder method for creating a [BaseCalendarPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseCalendarPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerCalendarPermissionIfNotRegistered(
     calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -61,6 +86,13 @@ fun PermissionsBuilder.registerCalendarPermissionIfNotRegistered(
         CalendarPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Gets the [BaseCalendarPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseCalendarPermissionManagerBuilder] and [PermissionStateRepo] for [CalendarPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param calendarPermissionManagerBuilderBuilder method for creating a [BaseCalendarPermissionManagerBuilder] from a [PermissionContext]
+ * @param calendarPermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [CalendarPermission] given a [BaseCalendarPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseCalendarPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerCalendarPermissionIfNotRegistered(
     calendarPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCalendarPermissionManagerBuilder = ::CalendarPermissionManagerBuilder,
     calendarPermissionStateRepoBuilder: (CalendarPermission, BaseCalendarPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CalendarPermission>
diff --git a/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt b/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
index edfd4d7c0..3dd79d2f2 100644
--- a/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
+++ b/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.permissions.calendar
 
 import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.CurrentAuthorizationStatusProvider
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.IOSPermissionsHelper
@@ -39,6 +40,13 @@ import kotlin.time.Duration
 
 const val NSCalendarsUsageDescription = "NSCalendarsUsageDescription"
 
+/**
+ * The [BasePermissionManager] to use as a default for [CalendarPermission]
+ * @param bundle the [NSBundle] the [CalendarPermission] is to be granted in
+ * @param calendarPermission the [CalendarPermission] to manage.
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultCalendarPermissionManager(
     private val bundle: NSBundle,
     calendarPermission: CalendarPermission,
@@ -91,6 +99,10 @@ actual class DefaultCalendarPermissionManager(
     }
 }
 
+/**
+ * A [BaseCalendarPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class CalendarPermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseCalendarPermissionManagerBuilder {
 
     override fun create(calendarPermission: CalendarPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): CalendarPermissionManager {
diff --git a/calendar-permissions/src/jsMain/kotlin/CalendarPermissionManager.kt b/calendar-permissions/src/jsMain/kotlin/CalendarPermissionManager.kt
index e81d62a4b..ef8e316b0 100644
--- a/calendar-permissions/src/jsMain/kotlin/CalendarPermissionManager.kt
+++ b/calendar-permissions/src/jsMain/kotlin/CalendarPermissionManager.kt
@@ -18,11 +18,18 @@
 package com.splendo.kaluga.permissions.calendar
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [CalendarPermission]
+ * @param calendarPermission the [CalendarPermission] to manage.
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultCalendarPermissionManager(calendarPermission: CalendarPermission, settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<CalendarPermission>(calendarPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +45,10 @@ actual class DefaultCalendarPermissionManager(calendarPermission: CalendarPermis
     }
 }
 
+/**
+ * A [BaseCalendarPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class CalendarPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseCalendarPermissionManagerBuilder {
 
     override fun create(calendarPermission: CalendarPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<CalendarPermission> {
diff --git a/calendar-permissions/src/jvmMain/kotlin/CalendarPermissionManager.kt b/calendar-permissions/src/jvmMain/kotlin/CalendarPermissionManager.kt
index e81d62a4b..ef8e316b0 100644
--- a/calendar-permissions/src/jvmMain/kotlin/CalendarPermissionManager.kt
+++ b/calendar-permissions/src/jvmMain/kotlin/CalendarPermissionManager.kt
@@ -18,11 +18,18 @@
 package com.splendo.kaluga.permissions.calendar
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [CalendarPermission]
+ * @param calendarPermission the [CalendarPermission] to manage.
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultCalendarPermissionManager(calendarPermission: CalendarPermission, settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<CalendarPermission>(calendarPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +45,10 @@ actual class DefaultCalendarPermissionManager(calendarPermission: CalendarPermis
     }
 }
 
+/**
+ * A [BaseCalendarPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class CalendarPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseCalendarPermissionManagerBuilder {
 
     override fun create(calendarPermission: CalendarPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<CalendarPermission> {
diff --git a/camera-permissions/src/androidLibMain/kotlin/CameraPermissionManager.kt b/camera-permissions/src/androidLibMain/kotlin/CameraPermissionManager.kt
index 7de5a6e7d..a8d0494a5 100644
--- a/camera-permissions/src/androidLibMain/kotlin/CameraPermissionManager.kt
+++ b/camera-permissions/src/androidLibMain/kotlin/CameraPermissionManager.kt
@@ -24,11 +24,18 @@ import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.AndroidPermissionState
 import com.splendo.kaluga.permissions.base.AndroidPermissionsManager
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.DefaultAndroidPermissionStateHandler
 import com.splendo.kaluga.permissions.base.PermissionContext
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [CameraPermission]
+ * @param context the [Context] the [CameraPermission] is to be granted in
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultCameraPermissionManager(
     context: Context,
     settings: Settings,
@@ -67,6 +74,10 @@ actual class DefaultCameraPermissionManager(
     }
 }
 
+/**
+ * A [BaseCameraPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class CameraPermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseCameraPermissionManagerBuilder {
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): CameraPermissionManager {
diff --git a/camera-permissions/src/commonMain/kotlin/CameraPermission.kt b/camera-permissions/src/commonMain/kotlin/CameraPermission.kt
index 6414c99da..4cbba15ad 100644
--- a/camera-permissions/src/commonMain/kotlin/CameraPermission.kt
+++ b/camera-permissions/src/commonMain/kotlin/CameraPermission.kt
@@ -31,26 +31,37 @@ import kotlin.time.Duration
  * A [PermissionManager] for managing [CameraPermission]
  */
 typealias CameraPermissionManager = PermissionManager<CameraPermission>
+
+/**
+ * The [BasePermissionManager] to use as a default for [CameraPermission]
+ */
 expect class DefaultCameraPermissionManager : BasePermissionManager<CameraPermission>
 
+/**
+ * A [BasePermissionsBuilder] for [CameraPermission]
+ */
 interface BaseCameraPermissionManagerBuilder : BasePermissionsBuilder<CameraPermission> {
 
     /**
      * Creates a [CameraPermissionManager]
-     * @param settings [BasePermissionManager.Settings] to configure the manager
+     * @param settings [BasePermissionManager.Settings] to apply to the manager
      * @param coroutineScope The [CoroutineScope] the manager runs on
+     * @return a [CameraPermissionManager]
      */
     fun create(settings: BasePermissionManager.Settings = BasePermissionManager.Settings(), coroutineScope: CoroutineScope): CameraPermissionManager
 }
 
 /**
- * A builder for creating a [CameraPermissionManager]
+ * A [BaseCameraPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
  */
 expect class CameraPermissionManagerBuilder(context: PermissionContext = defaultPermissionContext) : BaseCameraPermissionManagerBuilder
 
 /**
  * A [PermissionStateRepo] for [CameraPermission]
  * @param builder The [CameraPermissionManagerBuilder] for creating the [CameraPermissionManager] associated with the permission
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] used by the [CameraPermissionManager] created by the builder
  * @param coroutineContext The [CoroutineContext] to run the state machine on.
  */
 class CameraPermissionStateRepo(
diff --git a/camera-permissions/src/commonMain/kotlin/Permission.kt b/camera-permissions/src/commonMain/kotlin/Permission.kt
index d3b5ccb06..01d24c7d1 100644
--- a/camera-permissions/src/commonMain/kotlin/Permission.kt
+++ b/camera-permissions/src/commonMain/kotlin/Permission.kt
@@ -26,12 +26,21 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 
 /**
- * Permission to access the users Camera
+ * [Permission] to access the users Camera
  */
 object CameraPermission : Permission() {
     override val name: String = "Camera"
 }
 
+/**
+ * Registers a [BaseCameraPermissionManagerBuilder] and [PermissionStateRepo] for [CameraPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param cameraPermissionManagerBuilderBuilder method for creating a [BaseCameraPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseCameraPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseCameraPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerCameraPermission(
     cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -41,6 +50,14 @@ fun PermissionsBuilder.registerCameraPermission(
         CameraPermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Registers a [BaseCameraPermissionManagerBuilder] and [PermissionStateRepo] for [CameraPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param cameraPermissionManagerBuilderBuilder method for creating a [BaseCameraPermissionManagerBuilder] from a [PermissionContext]
+ * @param cameraPermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [CameraPermission] given a [BaseCameraPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseCameraPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseCameraPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerCameraPermission(
     cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
     cameraPermissionStateRepoBuilder: (BaseCameraPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CameraPermission>
@@ -51,6 +68,14 @@ fun PermissionsBuilder.registerCameraPermission(
     }
 }
 
+/**
+ * Gets the [BaseCameraPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseCameraPermissionManagerBuilder] and [PermissionStateRepo] for [CameraPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param cameraPermissionManagerBuilderBuilder method for creating a [BaseCameraPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseCameraPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerCameraPermissionIfNotRegistered(
     cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -60,6 +85,13 @@ fun PermissionsBuilder.registerCameraPermissionIfNotRegistered(
         CameraPermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Gets the [BaseCameraPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseCameraPermissionManagerBuilder] and [PermissionStateRepo] for [CameraPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param cameraPermissionManagerBuilderBuilder method for creating a [BaseCameraPermissionManagerBuilder] from a [PermissionContext]
+ * @param cameraPermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [CameraPermission] given a [BaseCameraPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseCameraPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerCameraPermissionIfNotRegistered(
     cameraPermissionManagerBuilderBuilder: (PermissionContext) -> BaseCameraPermissionManagerBuilder = ::CameraPermissionManagerBuilder,
     cameraPermissionStateRepoBuilder: (BaseCameraPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<CameraPermission>
diff --git a/camera-permissions/src/iosMain/kotlin/AVTypeCamera.kt b/camera-permissions/src/iosMain/kotlin/AVTypeCamera.kt
index 4d1d2217c..b187992f2 100644
--- a/camera-permissions/src/iosMain/kotlin/AVTypeCamera.kt
+++ b/camera-permissions/src/iosMain/kotlin/AVTypeCamera.kt
@@ -21,6 +21,9 @@ import platform.AVFoundation.AVMediaTypeVideo
 
 const val NSCameraUsageDescription = "NSCameraUsageDescription"
 
+/**
+ * The [AVType] of the [CameraPermission]
+ */
 class AVTypeCamera : AVType() {
     override val avMediaType = AVMediaTypeVideo
     override val declarationName = NSCameraUsageDescription
diff --git a/camera-permissions/src/iosMain/kotlin/CameraPermissionManager.kt b/camera-permissions/src/iosMain/kotlin/CameraPermissionManager.kt
index 6dc8fae41..82b1919cc 100644
--- a/camera-permissions/src/iosMain/kotlin/CameraPermissionManager.kt
+++ b/camera-permissions/src/iosMain/kotlin/CameraPermissionManager.kt
@@ -19,12 +19,19 @@ package com.splendo.kaluga.permissions.camera
 
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.av.AVPermissionHelper
 import kotlinx.coroutines.CoroutineScope
 import platform.Foundation.NSBundle
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [CameraPermission]
+ * @param bundle the [NSBundle] the [CameraPermission] is to be granted in
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultCameraPermissionManager(
     bundle: NSBundle,
     settings: Settings,
@@ -47,6 +54,10 @@ actual class DefaultCameraPermissionManager(
     }
 }
 
+/**
+ * A [BaseCameraPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class CameraPermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseCameraPermissionManagerBuilder {
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): CameraPermissionManager {
diff --git a/camera-permissions/src/jsMain/kotlin/CameraPermissionManager.kt b/camera-permissions/src/jsMain/kotlin/CameraPermissionManager.kt
index 4fff252e4..714abac1d 100644
--- a/camera-permissions/src/jsMain/kotlin/CameraPermissionManager.kt
+++ b/camera-permissions/src/jsMain/kotlin/CameraPermissionManager.kt
@@ -18,11 +18,17 @@
 package com.splendo.kaluga.permissions.camera
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [CameraPermission]
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultCameraPermissionManager(settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<CameraPermission>(CameraPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +44,10 @@ actual class DefaultCameraPermissionManager(settings: Settings, coroutineScope:
     }
 }
 
+/**
+ * A [BaseCameraPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class CameraPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseCameraPermissionManagerBuilder {
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<CameraPermission> {
diff --git a/camera-permissions/src/jvmMain/kotlin/CameraPermissionManager.kt b/camera-permissions/src/jvmMain/kotlin/CameraPermissionManager.kt
index 4fff252e4..714abac1d 100644
--- a/camera-permissions/src/jvmMain/kotlin/CameraPermissionManager.kt
+++ b/camera-permissions/src/jvmMain/kotlin/CameraPermissionManager.kt
@@ -18,11 +18,17 @@
 package com.splendo.kaluga.permissions.camera
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [CameraPermission]
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultCameraPermissionManager(settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<CameraPermission>(CameraPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +44,10 @@ actual class DefaultCameraPermissionManager(settings: Settings, coroutineScope:
     }
 }
 
+/**
+ * A [BaseCameraPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class CameraPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseCameraPermissionManagerBuilder {
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<CameraPermission> {
diff --git a/contacts-permissions/src/androidLibMain/kotlin/ContactsPermissionManager.kt b/contacts-permissions/src/androidLibMain/kotlin/ContactsPermissionManager.kt
index 1abc135c1..e44c306c3 100644
--- a/contacts-permissions/src/androidLibMain/kotlin/ContactsPermissionManager.kt
+++ b/contacts-permissions/src/androidLibMain/kotlin/ContactsPermissionManager.kt
@@ -21,11 +21,19 @@ import android.Manifest
 import android.content.Context
 import com.splendo.kaluga.permissions.base.AndroidPermissionsManager
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.DefaultAndroidPermissionStateHandler
 import com.splendo.kaluga.permissions.base.PermissionContext
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [ContactsPermission]
+ * @param context the [Context] the [ContactsPermission] is to be granted in
+ * @param contactsPermission the [ContactsPermission] to manage.
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultContactsPermissionManager(
     context: Context,
     contactsPermission: ContactsPermission,
@@ -59,6 +67,10 @@ actual class DefaultContactsPermissionManager(
     }
 }
 
+/**
+ * A [BaseContactsPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class ContactsPermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseContactsPermissionManagerBuilder {
 
     override fun create(contactsPermission: ContactsPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): ContactsPermissionManager {
diff --git a/contacts-permissions/src/commonMain/kotlin/ContactsPermission.kt b/contacts-permissions/src/commonMain/kotlin/ContactsPermission.kt
index 26f493000..284b5ab73 100644
--- a/contacts-permissions/src/commonMain/kotlin/ContactsPermission.kt
+++ b/contacts-permissions/src/commonMain/kotlin/ContactsPermission.kt
@@ -31,25 +31,39 @@ import kotlin.time.Duration
  * A [PermissionManager] for managing [ContactsPermission]
  */
 typealias ContactsPermissionManager = PermissionManager<ContactsPermission>
+
+/**
+ * The [BasePermissionManager] to use as a default for [ContactsPermission]
+ */
 expect class DefaultContactsPermissionManager : BasePermissionManager<ContactsPermission>
 
+/**
+ * A [BasePermissionsBuilder] for [ContactsPermission]
+ */
 interface BaseContactsPermissionManagerBuilder : BasePermissionsBuilder<ContactsPermission> {
 
     /**
      * Creates a [ContactsPermissionManager]
-     * @param repo The [ContactsPermissionStateRepo] associated with the [ContactsPermission]
+     * @param contactsPermission the [ContactsPermission] to manage.
+     * @param settings [BasePermissionManager.Settings] to apply to the manager
+     * @param coroutineScope The [CoroutineScope] the manager runs on
+     * @return a [ContactsPermissionManager]
      */
     fun create(contactsPermission: ContactsPermission, settings: BasePermissionManager.Settings = BasePermissionManager.Settings(), coroutineScope: CoroutineScope): ContactsPermissionManager
 }
 
 /**
- * A builder for creating a [ContactsPermissionManager]
+ * A [BaseContactsPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
  */
 expect class ContactsPermissionManagerBuilder(context: PermissionContext = defaultPermissionContext) : BaseContactsPermissionManagerBuilder
 
 /**
  * A [PermissionStateRepo] for [ContactsPermission]
+ * @param contactsPermission the [ContactsPermission] to manage.
  * @param builder The [ContactsPermissionManagerBuilder] for creating the [ContactsPermissionManager] associated with the permission
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] used by the [ContactsPermissionManager] created by the builder
  * @param coroutineContext The [CoroutineContext] to run the state machine on.
  */
 class ContactsPermissionStateRepo(
diff --git a/contacts-permissions/src/commonMain/kotlin/Permission.kt b/contacts-permissions/src/commonMain/kotlin/Permission.kt
index c6cd7c963..1ca6da1eb 100644
--- a/contacts-permissions/src/commonMain/kotlin/Permission.kt
+++ b/contacts-permissions/src/commonMain/kotlin/Permission.kt
@@ -26,13 +26,22 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 
 /**
- * Permission to access the users Contacts
+ * [Permission] to access the users Contacts
  * @param allowWrite If `true` writing to the contacts is permitted
  */
 data class ContactsPermission(val allowWrite: Boolean = false) : Permission() {
     override val name: String = "Contacts - ${if (allowWrite) "ReadWrite" else "ReadOnly"}"
 }
 
+/**
+ * Registers a [BaseContactsPermissionManagerBuilder] and [PermissionStateRepo] for [ContactsPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param contactsPermissionManagerBuilderBuilder method for creating a [BaseContactsPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseContactsPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseContactsPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerContactsPermission(
     contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -42,6 +51,14 @@ fun PermissionsBuilder.registerContactsPermission(
         ContactsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Registers a [BaseContactsPermissionManagerBuilder] and [PermissionStateRepo] for [ContactsPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param contactsPermissionManagerBuilderBuilder method for creating a [BaseContactsPermissionManagerBuilder] from a [PermissionContext]
+ * @param contactsPermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [ContactsPermission] given a [BaseContactsPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseContactsPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseContactsPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerContactsPermission(
     contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
     contactsPermissionStateRepoBuilder: (ContactsPermission, BaseContactsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<ContactsPermission>
@@ -52,6 +69,14 @@ fun PermissionsBuilder.registerContactsPermission(
     }
 }
 
+/**
+ * Gets the [BaseContactsPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseContactsPermissionManagerBuilder] and [PermissionStateRepo] for [ContactsPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param contactsPermissionManagerBuilderBuilder method for creating a [BaseContactsPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseContactsPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerContactsPermissionIfNotRegistered(
     contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -61,6 +86,13 @@ fun PermissionsBuilder.registerContactsPermissionIfNotRegistered(
         ContactsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Gets the [BaseContactsPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseContactsPermissionManagerBuilder] and [PermissionStateRepo] for [ContactsPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param contactsPermissionManagerBuilderBuilder method for creating a [BaseContactsPermissionManagerBuilder] from a [PermissionContext]
+ * @param contactsPermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [ContactsPermission] given a [BaseContactsPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseContactsPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerContactsPermissionIfNotRegistered(
     contactsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseContactsPermissionManagerBuilder = ::ContactsPermissionManagerBuilder,
     contactsPermissionStateRepoBuilder: (ContactsPermission, BaseContactsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<ContactsPermission>
diff --git a/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt b/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
index b4e3c0785..a74852eb4 100644
--- a/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
+++ b/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.permissions.contacts
 
 import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.CurrentAuthorizationStatusProvider
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.IOSPermissionsHelper
@@ -39,6 +40,13 @@ import kotlin.time.Duration
 
 const val NSContactsUsageDescription = "NSContactsUsageDescription"
 
+/**
+ * The [BasePermissionManager] to use as a default for [ContactsPermission]
+ * @param bundle the [NSBundle] the [ContactsPermission] is to be granted in
+ * @param contactsPermission the [ContactsPermission] to manage.
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultContactsPermissionManager(
     private val bundle: NSBundle,
     contactsPermission: ContactsPermission,
@@ -91,6 +99,10 @@ actual class DefaultContactsPermissionManager(
     }
 }
 
+/**
+ * A [BaseContactsPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class ContactsPermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseContactsPermissionManagerBuilder {
 
     override fun create(contactsPermission: ContactsPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): ContactsPermissionManager {
diff --git a/contacts-permissions/src/jsMain/kotlin/ContactsPermissionManager.kt b/contacts-permissions/src/jsMain/kotlin/ContactsPermissionManager.kt
index c7bbe93ec..7c02e97e0 100644
--- a/contacts-permissions/src/jsMain/kotlin/ContactsPermissionManager.kt
+++ b/contacts-permissions/src/jsMain/kotlin/ContactsPermissionManager.kt
@@ -18,11 +18,18 @@
 package com.splendo.kaluga.permissions.contacts
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [ContactsPermission]
+ * @param contactsPermission the [ContactsPermission] to manage.
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultContactsPermissionManager(contactsPermission: ContactsPermission, settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<ContactsPermission>(contactsPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +45,10 @@ actual class DefaultContactsPermissionManager(contactsPermission: ContactsPermis
     }
 }
 
+/**
+ * A [BaseContactsPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class ContactsPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseContactsPermissionManagerBuilder {
 
     override fun create(contactsPermission: ContactsPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<ContactsPermission> {
diff --git a/contacts-permissions/src/jvmMain/kotlin/ContactsPermissionManager.kt b/contacts-permissions/src/jvmMain/kotlin/ContactsPermissionManager.kt
index c7bbe93ec..7c02e97e0 100644
--- a/contacts-permissions/src/jvmMain/kotlin/ContactsPermissionManager.kt
+++ b/contacts-permissions/src/jvmMain/kotlin/ContactsPermissionManager.kt
@@ -18,11 +18,18 @@
 package com.splendo.kaluga.permissions.contacts
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [ContactsPermission]
+ * @param contactsPermission the [ContactsPermission] to manage.
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultContactsPermissionManager(contactsPermission: ContactsPermission, settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<ContactsPermission>(contactsPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +45,10 @@ actual class DefaultContactsPermissionManager(contactsPermission: ContactsPermis
     }
 }
 
+/**
+ * A [BaseContactsPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class ContactsPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseContactsPermissionManagerBuilder {
 
     override fun create(contactsPermission: ContactsPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<ContactsPermission> {
diff --git a/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt b/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt
index 613b4de67..53a10ac29 100644
--- a/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt
+++ b/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt
@@ -21,11 +21,19 @@ import android.Manifest
 import android.content.Context
 import com.splendo.kaluga.permissions.base.AndroidPermissionsManager
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.DefaultAndroidPermissionStateHandler
 import com.splendo.kaluga.permissions.base.PermissionContext
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [LocationPermission]
+ * @param context the [Context] the [LocationPermission] is to be granted in
+ * @param locationPermission the [LocationPermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultLocationPermissionManager(
     context: Context,
     locationPermission: LocationPermission,
@@ -61,6 +69,10 @@ actual class DefaultLocationPermissionManager(
     }
 }
 
+/**
+ * A [BaseLocationPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class LocationPermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseLocationPermissionManagerBuilder {
 
     override fun create(
diff --git a/location-permissions/src/commonMain/kotlin/LocationPermission.kt b/location-permissions/src/commonMain/kotlin/LocationPermission.kt
index a5a5a7f32..82e36d44b 100644
--- a/location-permissions/src/commonMain/kotlin/LocationPermission.kt
+++ b/location-permissions/src/commonMain/kotlin/LocationPermission.kt
@@ -31,15 +31,23 @@ import kotlin.time.Duration
  * A [PermissionManager] for managing [LocationPermission]
  */
 typealias LocationPermissionManager = PermissionManager<LocationPermission>
+
+/**
+ * The [BasePermissionManager] to use as a default for [LocationPermission]
+ */
 expect class DefaultLocationPermissionManager : BasePermissionManager<LocationPermission>
 
+/**
+ * A [BasePermissionsBuilder] for [LocationPermission]
+ */
 interface BaseLocationPermissionManagerBuilder : BasePermissionsBuilder<LocationPermission> {
 
     /**
      * Creates a [LocationPermissionManager]
-     * @param locationPermission The [LocationPermission] for the PermissionManager to be created
-     * @param settings [BasePermissionManager.Settings] to configure the manager
+     * @param locationPermission the [LocationPermission] to manage
+     * @param settings [BasePermissionManager.Settings] to apply to the manager
      * @param coroutineScope The [CoroutineScope] the manager runs on
+     * @return a [LocationPermissionManager]
      */
     fun create(
         locationPermission: LocationPermission,
@@ -49,13 +57,17 @@ interface BaseLocationPermissionManagerBuilder : BasePermissionsBuilder<Location
 }
 
 /**
- * A builder for creating a [LocationPermissionManager]
+ * A [BaseLocationPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
  */
 expect class LocationPermissionManagerBuilder(context: PermissionContext = defaultPermissionContext) : BaseLocationPermissionManagerBuilder
 
 /**
  * A [PermissionStateRepo] for [LocationPermission]
+ * @param locationPermission the [LocationPermission] to manage
  * @param builder The [LocationPermissionManagerBuilder] for creating the [LocationPermissionManager] associated with the permission
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] used by the [LocationPermissionManager] created by the builder
  * @param coroutineContext The [CoroutineContext] to run the state machine on.
  */
 class LocationPermissionStateRepo(
diff --git a/location-permissions/src/commonMain/kotlin/Permission.kt b/location-permissions/src/commonMain/kotlin/Permission.kt
index 86ede8435..5449fefef 100644
--- a/location-permissions/src/commonMain/kotlin/Permission.kt
+++ b/location-permissions/src/commonMain/kotlin/Permission.kt
@@ -26,7 +26,7 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 
 /**
- * Permission to access the users Location
+ * [Permission] to access the users Location
  * @param background If `true` scanning for location in the background is permitted
  * @param precise If `true` precise location scanning is permitted
  */
@@ -35,6 +35,15 @@ data class LocationPermission(val background: Boolean = false, val precise: Bool
     override val name: String = listOfNotNull(if (background) "Background" else null, "Location", "-", if (precise) "Precise" else "Coarse").joinToString(" ")
 }
 
+/**
+ * Registers a [BaseLocationPermissionManagerBuilder] and [PermissionStateRepo] for [LocationPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param locationPermissionManagerBuilderBuilder method for creating a [BaseLocationPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseLocationPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseLocationPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerLocationPermission(
     locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -44,6 +53,14 @@ fun PermissionsBuilder.registerLocationPermission(
         LocationPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Registers a [BaseLocationPermissionManagerBuilder] and [PermissionStateRepo] for [LocationPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param locationPermissionManagerBuilderBuilder method for creating a [BaseLocationPermissionManagerBuilder] from a [PermissionContext]
+ * @param locationPermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [LocationPermission] given a [BaseLocationPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseLocationPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseLocationPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerLocationPermission(
     locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
     locationPermissionStateRepoBuilder: (LocationPermission, BaseLocationPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<LocationPermission>
@@ -54,6 +71,14 @@ fun PermissionsBuilder.registerLocationPermission(
     }
 }
 
+/**
+ * Gets the [BaseLocationPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseLocationPermissionManagerBuilder] and [PermissionStateRepo] for [LocationPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param locationPermissionManagerBuilderBuilder method for creating a [BaseLocationPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseLocationPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerLocationPermissionIfNotRegistered(
     locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -63,6 +88,13 @@ fun PermissionsBuilder.registerLocationPermissionIfNotRegistered(
         LocationPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Gets the [BaseLocationPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseLocationPermissionManagerBuilder] and [PermissionStateRepo] for [LocationPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param locationPermissionManagerBuilderBuilder method for creating a [BaseLocationPermissionManagerBuilder] from a [PermissionContext]
+ * @param locationPermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [LocationPermission] given a [BaseLocationPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseLocationPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerLocationPermissionIfNotRegistered(
     locationPermissionManagerBuilderBuilder: (PermissionContext) -> BaseLocationPermissionManagerBuilder = ::LocationPermissionManagerBuilder,
     locationPermissionStateRepoBuilder: (LocationPermission, BaseLocationPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<LocationPermission>
diff --git a/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt b/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt
index a42200efd..588bf617d 100644
--- a/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt
+++ b/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt
@@ -21,6 +21,7 @@ import com.splendo.kaluga.base.IOSVersion
 import com.splendo.kaluga.permissions.base.AuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.IOSPermissionsHelper
 import com.splendo.kaluga.permissions.base.PermissionContext
 import kotlinx.coroutines.CoroutineScope
@@ -44,6 +45,13 @@ const val NSLocationWhenInUseUsageDescription = "NSLocationWhenInUseUsageDescrip
 const val NSLocationAlwaysAndWhenInUseUsageDescription = "NSLocationAlwaysAndWhenInUseUsageDescription"
 const val NSLocationAlwaysUsageDescription = "NSLocationAlwaysUsageDescription"
 
+/**
+ * The [BasePermissionManager] to use as a default for [LocationPermission]
+ * @param bundle the [NSBundle] the [LocationPermission] is to be granted in
+ * @param locationPermission the [LocationPermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultLocationPermissionManager(
     private val bundle: NSBundle,
     locationPermission: LocationPermission,
@@ -107,6 +115,10 @@ actual class DefaultLocationPermissionManager(
     }
 }
 
+/**
+ * A [BaseLocationPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class LocationPermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseLocationPermissionManagerBuilder {
 
     override fun create(locationPermission: LocationPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): LocationPermissionManager {
diff --git a/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt b/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt
index 84f5e23ed..ab9678a8d 100644
--- a/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt
+++ b/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt
@@ -24,6 +24,7 @@ import platform.CoreLocation.CLLocationManager
 /**
  * Accessor to ensure a [CLLocationManager] is only managed from the Main Thread.
  * Use [updateLocationManager] to gain access to the LocationManager
+ * @param onInit callback to modify a the [CLLocationManager] after it is initialized
  */
 class MainCLLocationManagerAccessor(private val onInit: CLLocationManager.() -> Unit) {
 
diff --git a/location-permissions/src/jsMain/kotlin/LocationPermissionManager.kt b/location-permissions/src/jsMain/kotlin/LocationPermissionManager.kt
index a2e54f146..00e42ed96 100644
--- a/location-permissions/src/jsMain/kotlin/LocationPermissionManager.kt
+++ b/location-permissions/src/jsMain/kotlin/LocationPermissionManager.kt
@@ -18,11 +18,18 @@
 package com.splendo.kaluga.permissions.location
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [LocationPermission]
+ * @param locationPermission the [LocationPermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultLocationPermissionManager(locationPermission: LocationPermission, settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<LocationPermission>(locationPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +45,10 @@ actual class DefaultLocationPermissionManager(locationPermission: LocationPermis
     }
 }
 
+/**
+ * A [BaseLocationPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class LocationPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseLocationPermissionManagerBuilder {
 
     override fun create(locationPermission: LocationPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<LocationPermission> {
diff --git a/location-permissions/src/jvmMain/kotlin/LocationPermissionManager.kt b/location-permissions/src/jvmMain/kotlin/LocationPermissionManager.kt
index a2e54f146..00e42ed96 100644
--- a/location-permissions/src/jvmMain/kotlin/LocationPermissionManager.kt
+++ b/location-permissions/src/jvmMain/kotlin/LocationPermissionManager.kt
@@ -18,11 +18,18 @@
 package com.splendo.kaluga.permissions.location
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [LocationPermission]
+ * @param locationPermission the [LocationPermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultLocationPermissionManager(locationPermission: LocationPermission, settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<LocationPermission>(locationPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +45,10 @@ actual class DefaultLocationPermissionManager(locationPermission: LocationPermis
     }
 }
 
+/**
+ * A [BaseLocationPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class LocationPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseLocationPermissionManagerBuilder {
 
     override fun create(locationPermission: LocationPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<LocationPermission> {
diff --git a/microphone-permissions/src/androidLibMain/kotlin/MicrophonePermissionManager.kt b/microphone-permissions/src/androidLibMain/kotlin/MicrophonePermissionManager.kt
index 964e02151..ce610b7b5 100644
--- a/microphone-permissions/src/androidLibMain/kotlin/MicrophonePermissionManager.kt
+++ b/microphone-permissions/src/androidLibMain/kotlin/MicrophonePermissionManager.kt
@@ -23,11 +23,18 @@ import android.content.pm.PackageManager
 import com.splendo.kaluga.permissions.base.AndroidPermissionState
 import com.splendo.kaluga.permissions.base.AndroidPermissionsManager
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.DefaultAndroidPermissionStateHandler
 import com.splendo.kaluga.permissions.base.PermissionContext
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [MicrophonePermission]
+ * @param context the [Context] the [MicrophonePermission] is to be granted in
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultMicrophonePermissionManager(
     context: Context,
     settings: Settings,
@@ -60,6 +67,10 @@ actual class DefaultMicrophonePermissionManager(
     }
 }
 
+/**
+ * A [BaseMicrophonePermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class MicrophonePermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseMicrophonePermissionManagerBuilder {
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): MicrophonePermissionManager {
diff --git a/microphone-permissions/src/commonMain/kotlin/MicrophonePermission.kt b/microphone-permissions/src/commonMain/kotlin/MicrophonePermission.kt
index 576b16e40..eec14cb4e 100644
--- a/microphone-permissions/src/commonMain/kotlin/MicrophonePermission.kt
+++ b/microphone-permissions/src/commonMain/kotlin/MicrophonePermission.kt
@@ -31,26 +31,37 @@ import kotlin.time.Duration
  * A [PermissionManager] for managing [MicrophonePermission]
  */
 typealias MicrophonePermissionManager = PermissionManager<MicrophonePermission>
+
+/**
+ * The [BasePermissionManager] to use as a default for [MicrophonePermission]
+ */
 expect class DefaultMicrophonePermissionManager : BasePermissionManager<MicrophonePermission>
 
+/**
+ * A [BasePermissionsBuilder] for [MicrophonePermission]
+ */
 interface BaseMicrophonePermissionManagerBuilder : BasePermissionsBuilder<MicrophonePermission> {
 
     /**
      * Creates a [MicrophonePermissionManager]
-     * @param settings [BasePermissionManager.Settings] to configure the manager
+     * @param settings [BasePermissionManager.Settings] to apply to the manager
      * @param coroutineScope The [CoroutineScope] the manager runs on
+     * @return a [MicrophonePermissionManager]
      */
     fun create(settings: BasePermissionManager.Settings = BasePermissionManager.Settings(), coroutineScope: CoroutineScope): MicrophonePermissionManager
 }
 
 /**
- * A builder for creating a [MicrophonePermissionManager]
+ * A [BaseMicrophonePermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
  */
 expect class MicrophonePermissionManagerBuilder(context: PermissionContext = defaultPermissionContext) : BaseMicrophonePermissionManagerBuilder
 
 /**
  * A [PermissionStateRepo] for [MicrophonePermission]
  * @param builder The [MicrophonePermissionManagerBuilder] for creating the [MicrophonePermissionManager] associated with the permission
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] used by the [MicrophonePermissionManager] created by the builder
  * @param coroutineContext The [CoroutineContext] to run the state machine on.
  */
 class MicrophonePermissionStateRepo(
diff --git a/microphone-permissions/src/commonMain/kotlin/Permission.kt b/microphone-permissions/src/commonMain/kotlin/Permission.kt
index dae04629b..d6cc72de5 100644
--- a/microphone-permissions/src/commonMain/kotlin/Permission.kt
+++ b/microphone-permissions/src/commonMain/kotlin/Permission.kt
@@ -26,12 +26,21 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 
 /**
- * Permission to access the users Microphone
+ * [Permission] to access the users Microphone
  */
 object MicrophonePermission : Permission() {
     override val name: String = "Microphone"
 }
 
+/**
+ * Registers a [BaseMicrophonePermissionManagerBuilder] and [PermissionStateRepo] for [MicrophonePermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param microphonePermissionManagerBuilderBuilder method for creating a [BaseMicrophonePermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseMicrophonePermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseMicrophonePermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerMicrophonePermission(
     microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -41,6 +50,14 @@ fun PermissionsBuilder.registerMicrophonePermission(
         MicrophonePermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Registers a [BaseMicrophonePermissionManagerBuilder] and [PermissionStateRepo] for [MicrophonePermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param microphonePermissionManagerBuilderBuilder method for creating a [BaseMicrophonePermissionManagerBuilder] from a [PermissionContext]
+ * @param microphonePermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [MicrophonePermission] given a [BaseMicrophonePermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseMicrophonePermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseMicrophonePermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerMicrophonePermission(
     microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
     microphonePermissionStateRepoBuilder: (BaseMicrophonePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<MicrophonePermission>
@@ -51,6 +68,14 @@ fun PermissionsBuilder.registerMicrophonePermission(
     }
 }
 
+/**
+ * Gets the [BaseMicrophonePermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseMicrophonePermissionManagerBuilder] and [PermissionStateRepo] for [MicrophonePermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param microphonePermissionManagerBuilderBuilder method for creating a [BaseMicrophonePermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseMicrophonePermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerMicrophonePermissionIfNotRegistered(
     microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -60,6 +85,13 @@ fun PermissionsBuilder.registerMicrophonePermissionIfNotRegistered(
         MicrophonePermissionStateRepo(builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Gets the [BaseMicrophonePermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseMicrophonePermissionManagerBuilder] and [PermissionStateRepo] for [MicrophonePermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param microphonePermissionManagerBuilderBuilder method for creating a [BaseMicrophonePermissionManagerBuilder] from a [PermissionContext]
+ * @param microphonePermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [MicrophonePermission] given a [BaseMicrophonePermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseMicrophonePermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerMicrophonePermissionIfNotRegistered(
     microphonePermissionManagerBuilderBuilder: (PermissionContext) -> BaseMicrophonePermissionManagerBuilder = ::MicrophonePermissionManagerBuilder,
     microphonePermissionStateRepoBuilder: (BaseMicrophonePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<MicrophonePermission>
diff --git a/microphone-permissions/src/iosMain/kotlin/AVTypeMicrophone.kt b/microphone-permissions/src/iosMain/kotlin/AVTypeMicrophone.kt
index 4c6833dff..d3446bfb6 100644
--- a/microphone-permissions/src/iosMain/kotlin/AVTypeMicrophone.kt
+++ b/microphone-permissions/src/iosMain/kotlin/AVTypeMicrophone.kt
@@ -21,6 +21,9 @@ import platform.AVFoundation.AVMediaTypeAudio
 
 const val NSMicrophoneUsageDescription = "NSMicrophoneUsageDescription"
 
+/**
+ * The [AVType] of the [MicrophonePermission]
+ */
 class AVTypeMicrophone : AVType() {
     override val avMediaType = AVMediaTypeAudio
     override val declarationName = NSMicrophoneUsageDescription
diff --git a/microphone-permissions/src/iosMain/kotlin/MicrophonePermissionManager.kt b/microphone-permissions/src/iosMain/kotlin/MicrophonePermissionManager.kt
index a1b18bd36..47fe1c75f 100644
--- a/microphone-permissions/src/iosMain/kotlin/MicrophonePermissionManager.kt
+++ b/microphone-permissions/src/iosMain/kotlin/MicrophonePermissionManager.kt
@@ -19,12 +19,19 @@ package com.splendo.kaluga.permissions.microphone
 
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.av.AVPermissionHelper
 import kotlinx.coroutines.CoroutineScope
 import platform.Foundation.NSBundle
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [MicrophonePermission]
+ * @param bundle the [NSBundle] the [MicrophonePermission] is to be granted in
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultMicrophonePermissionManager(
     bundle: NSBundle,
     settings: Settings,
@@ -47,6 +54,10 @@ actual class DefaultMicrophonePermissionManager(
     }
 }
 
+/**
+ * A [BaseMicrophonePermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class MicrophonePermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseMicrophonePermissionManagerBuilder {
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): MicrophonePermissionManager {
diff --git a/microphone-permissions/src/jsMain/kotlin/MicrophonePermissionManager.kt b/microphone-permissions/src/jsMain/kotlin/MicrophonePermissionManager.kt
index 9c3bb0927..e9d0494d8 100644
--- a/microphone-permissions/src/jsMain/kotlin/MicrophonePermissionManager.kt
+++ b/microphone-permissions/src/jsMain/kotlin/MicrophonePermissionManager.kt
@@ -18,11 +18,17 @@
 package com.splendo.kaluga.permissions.microphone
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [MicrophonePermission]
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultMicrophonePermissionManager(settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<MicrophonePermission>(MicrophonePermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +44,10 @@ actual class DefaultMicrophonePermissionManager(settings: Settings, coroutineSco
     }
 }
 
+/**
+ * A [BaseMicrophonePermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class MicrophonePermissionManagerBuilder actual constructor(context: PermissionContext) : BaseMicrophonePermissionManagerBuilder {
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<MicrophonePermission> {
diff --git a/microphone-permissions/src/jvmMain/kotlin/MicrophonePermissionManager.kt b/microphone-permissions/src/jvmMain/kotlin/MicrophonePermissionManager.kt
index 9c3bb0927..e9d0494d8 100644
--- a/microphone-permissions/src/jvmMain/kotlin/MicrophonePermissionManager.kt
+++ b/microphone-permissions/src/jvmMain/kotlin/MicrophonePermissionManager.kt
@@ -18,11 +18,17 @@
 package com.splendo.kaluga.permissions.microphone
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [MicrophonePermission]
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultMicrophonePermissionManager(settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<MicrophonePermission>(MicrophonePermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +44,10 @@ actual class DefaultMicrophonePermissionManager(settings: Settings, coroutineSco
     }
 }
 
+/**
+ * A [BaseMicrophonePermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class MicrophonePermissionManagerBuilder actual constructor(context: PermissionContext) : BaseMicrophonePermissionManagerBuilder {
 
     override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<MicrophonePermission> {
diff --git a/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt b/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt
index 99bcf6d0e..f916a298d 100644
--- a/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt
+++ b/notifications-permissions/src/androidLibMain/kotlin/NotificationsPermissionManager.kt
@@ -23,13 +23,24 @@ import android.os.Build
 import com.splendo.kaluga.permissions.base.AndroidPermissionState
 import com.splendo.kaluga.permissions.base.AndroidPermissionsManager
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.DefaultAndroidPermissionStateHandler
 import com.splendo.kaluga.permissions.base.PermissionContext
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * Options for configuring a [NotificationsPermission]
+ */
 actual class NotificationOptions
 
+/**
+ * The [BasePermissionManager] to use as a default for [NotificationsPermission]
+ * @param context the [Context] the [NotificationsPermission] is to be granted in
+ * @param notificationsPermission the [NotificationsPermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultNotificationsPermissionManager(
     context: Context,
     notificationsPermission: NotificationsPermission,
@@ -75,6 +86,10 @@ actual class DefaultNotificationsPermissionManager(
     }
 }
 
+/**
+ * A [BaseNotificationsPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class NotificationsPermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseNotificationsPermissionManagerBuilder {
 
     override fun create(notificationsPermission: NotificationsPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): NotificationsPermissionManager {
diff --git a/notifications-permissions/src/commonMain/kotlin/NotificationsPermission.kt b/notifications-permissions/src/commonMain/kotlin/NotificationsPermission.kt
index c027e9f74..617de3172 100644
--- a/notifications-permissions/src/commonMain/kotlin/NotificationsPermission.kt
+++ b/notifications-permissions/src/commonMain/kotlin/NotificationsPermission.kt
@@ -36,26 +36,39 @@ expect class NotificationOptions
  * A [PermissionManager] for managing [NotificationsPermission]
  */
 typealias NotificationsPermissionManager = PermissionManager<NotificationsPermission>
+
+/**
+ * The [BasePermissionManager] to use as a default for [NotificationsPermission]
+ */
 expect class DefaultNotificationsPermissionManager : BasePermissionManager<NotificationsPermission>
 
+/**
+ * A [BasePermissionsBuilder] for [NotificationsPermission]
+ */
 interface BaseNotificationsPermissionManagerBuilder : BasePermissionsBuilder<NotificationsPermission> {
+
     /**
      * Creates a [NotificationsPermissionManager]
-     * @param notificationsPermission The [NotificationsPermission] for the PermissionManager to be created
-     * @param settings [BasePermissionManager.Settings] to configure the manager
+     * @param notificationsPermission the [NotificationsPermission] to be managed.
+     * @param settings [BasePermissionManager.Settings] to apply to the manager
      * @param coroutineScope The [CoroutineScope] the manager runs on
+     * @return a [NotificationsPermissionManager]
      */
     fun create(notificationsPermission: NotificationsPermission, settings: BasePermissionManager.Settings = BasePermissionManager.Settings(), coroutineScope: CoroutineScope): NotificationsPermissionManager
 }
 
 /**
- * A builder for creating a [NotificationsPermissionManager]
+ * A [BaseNotificationsPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
  */
 expect class NotificationsPermissionManagerBuilder(context: PermissionContext = defaultPermissionContext) : BaseNotificationsPermissionManagerBuilder
 
 /**
  * A [PermissionStateRepo] for [NotificationsPermission]
+ * @param notificationsPermission the [NotificationsPermission] to be managed
  * @param builder The [NotificationsPermissionManagerBuilder] for creating the [NotificationsPermissionManager] associated with the permission
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] used by the [NotificationsPermissionManager] created by the builder
  * @param coroutineContext The [CoroutineContext] to run the state machine on.
  */
 class NotificationsPermissionStateRepo(
diff --git a/notifications-permissions/src/commonMain/kotlin/Permission.kt b/notifications-permissions/src/commonMain/kotlin/Permission.kt
index cad514755..02c5dee4a 100644
--- a/notifications-permissions/src/commonMain/kotlin/Permission.kt
+++ b/notifications-permissions/src/commonMain/kotlin/Permission.kt
@@ -26,13 +26,22 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 
 /**
- * Permission to access the users Notifications.
+ * [Permission] to access the users Notifications.
  * @param options The [NotificationOptions] determining the type of notifications that can be accessed
  */
 data class NotificationsPermission(val options: NotificationOptions? = null) : Permission() {
     override val name: String = "Notifications - ${options?.toString().orEmpty().ifEmpty { "Without Options" }}"
 }
 
+/**
+ * Registers a [BaseNotificationsPermissionManagerBuilder] and [PermissionStateRepo] for [NotificationsPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param notificationsPermissionManagerBuilderBuilder method for creating a [BaseNotificationsPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseNotificationsPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseNotificationsPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerNotificationsPermission(
     notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -42,6 +51,14 @@ fun PermissionsBuilder.registerNotificationsPermission(
         NotificationsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Registers a [BaseNotificationsPermissionManagerBuilder] and [PermissionStateRepo] for [NotificationsPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param notificationsPermissionManagerBuilderBuilder method for creating a [BaseNotificationsPermissionManagerBuilder] from a [PermissionContext]
+ * @param notificationsPermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [NotificationsPermission] given a [BaseNotificationsPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseNotificationsPermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseNotificationsPermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerNotificationsPermission(
     notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
     notificationsPermissionStateRepoBuilder: (NotificationsPermission, BaseNotificationsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<NotificationsPermission>
@@ -52,6 +69,14 @@ fun PermissionsBuilder.registerNotificationsPermission(
     }
 }
 
+/**
+ * Gets the [BaseNotificationsPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseNotificationsPermissionManagerBuilder] and [PermissionStateRepo] for [NotificationsPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param notificationsPermissionManagerBuilderBuilder method for creating a [BaseNotificationsPermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseNotificationsPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
     notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -61,6 +86,13 @@ fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
         NotificationsPermissionStateRepo(permission, builder, monitoringInterval, settings, coroutineContext)
     }
 
+/**
+ * Gets the [BaseNotificationsPermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseNotificationsPermissionManagerBuilder] and [PermissionStateRepo] for [NotificationsPermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param notificationsPermissionManagerBuilderBuilder method for creating a [BaseNotificationsPermissionManagerBuilder] from a [PermissionContext]
+ * @param notificationsPermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [NotificationsPermission] given a [BaseNotificationsPermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseNotificationsPermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerNotificationsPermissionIfNotRegistered(
     notificationsPermissionManagerBuilderBuilder: (PermissionContext) -> BaseNotificationsPermissionManagerBuilder = ::NotificationsPermissionManagerBuilder,
     notificationsPermissionStateRepoBuilder: (NotificationsPermission, BaseNotificationsPermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<NotificationsPermission>
diff --git a/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt b/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
index 72d711ab8..68b3ca007 100644
--- a/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
+++ b/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.permissions.notifications
 
 import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.CurrentAuthorizationStatusProvider
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.IOSPermissionsHelper
@@ -39,8 +40,18 @@ import platform.UserNotifications.UNAuthorizationStatusProvisional
 import platform.UserNotifications.UNUserNotificationCenter
 import kotlin.time.Duration
 
+/**
+ * Options for configuring a [NotificationsPermission]
+ * @property options the [UNAuthorizationOptions] of the notification permission
+ */
 actual data class NotificationOptions(val options: UNAuthorizationOptions)
 
+/**
+ * The [BasePermissionManager] to use as a default for [NotificationsPermission]
+ * @param notificationsPermission the [NotificationsPermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultNotificationsPermissionManager(
     notificationsPermission: NotificationsPermission,
     settings: Settings,
@@ -97,6 +108,10 @@ actual class DefaultNotificationsPermissionManager(
     }
 }
 
+/**
+ * A [BaseNotificationsPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class NotificationsPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseNotificationsPermissionManagerBuilder {
 
     override fun create(notificationsPermission: NotificationsPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): NotificationsPermissionManager {
diff --git a/notifications-permissions/src/jsMain/kotlin/NotificationsPermissionManager.kt b/notifications-permissions/src/jsMain/kotlin/NotificationsPermissionManager.kt
index d1eb18999..492b8a10c 100644
--- a/notifications-permissions/src/jsMain/kotlin/NotificationsPermissionManager.kt
+++ b/notifications-permissions/src/jsMain/kotlin/NotificationsPermissionManager.kt
@@ -18,13 +18,23 @@
 package com.splendo.kaluga.permissions.notifications
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * Options for configuring a [NotificationsPermission]
+ */
 actual class NotificationOptions
 
+/**
+ * The [BasePermissionManager] to use as a default for [NotificationsPermission]
+ * @param notificationsPermission the [NotificationsPermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultNotificationsPermissionManager(notificationsPermission: NotificationsPermission, settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<NotificationsPermission>(notificationsPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -40,6 +50,10 @@ actual class DefaultNotificationsPermissionManager(notificationsPermission: Noti
     }
 }
 
+/**
+ * A [BaseNotificationsPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class NotificationsPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseNotificationsPermissionManagerBuilder {
 
     override fun create(notificationsPermission: NotificationsPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<NotificationsPermission> {
diff --git a/notifications-permissions/src/jvmMain/kotlin/NotificationsPermissionManager.kt b/notifications-permissions/src/jvmMain/kotlin/NotificationsPermissionManager.kt
index d1eb18999..492b8a10c 100644
--- a/notifications-permissions/src/jvmMain/kotlin/NotificationsPermissionManager.kt
+++ b/notifications-permissions/src/jvmMain/kotlin/NotificationsPermissionManager.kt
@@ -18,13 +18,23 @@
 package com.splendo.kaluga.permissions.notifications
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * Options for configuring a [NotificationsPermission]
+ */
 actual class NotificationOptions
 
+/**
+ * The [BasePermissionManager] to use as a default for [NotificationsPermission]
+ * @param notificationsPermission the [NotificationsPermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultNotificationsPermissionManager(notificationsPermission: NotificationsPermission, settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<NotificationsPermission>(notificationsPermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -40,6 +50,10 @@ actual class DefaultNotificationsPermissionManager(notificationsPermission: Noti
     }
 }
 
+/**
+ * A [BaseNotificationsPermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class NotificationsPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseNotificationsPermissionManagerBuilder {
 
     override fun create(notificationsPermission: NotificationsPermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<NotificationsPermission> {
diff --git a/storage-permissions/src/androidLibMain/kotlin/StoragePermissionManager.kt b/storage-permissions/src/androidLibMain/kotlin/StoragePermissionManager.kt
index d3ecc2327..972a44118 100644
--- a/storage-permissions/src/androidLibMain/kotlin/StoragePermissionManager.kt
+++ b/storage-permissions/src/androidLibMain/kotlin/StoragePermissionManager.kt
@@ -21,11 +21,19 @@ import android.Manifest
 import android.content.Context
 import com.splendo.kaluga.permissions.base.AndroidPermissionsManager
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.DefaultAndroidPermissionStateHandler
 import com.splendo.kaluga.permissions.base.PermissionContext
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [StoragePermission]
+ * @param context the [Context] the [StoragePermission] is to be granted in
+ * @param storagePermission the [StoragePermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultStoragePermissionManager(
     context: Context,
     storagePermission: StoragePermission,
@@ -59,6 +67,10 @@ actual class DefaultStoragePermissionManager(
     }
 }
 
+/**
+ * A [BaseStoragePermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class StoragePermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseStoragePermissionManagerBuilder {
 
     override fun create(storagePermission: StoragePermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): StoragePermissionManager {
diff --git a/storage-permissions/src/commonMain/kotlin/Permission.kt b/storage-permissions/src/commonMain/kotlin/Permission.kt
index 2a7abdd3a..37526e0ba 100644
--- a/storage-permissions/src/commonMain/kotlin/Permission.kt
+++ b/storage-permissions/src/commonMain/kotlin/Permission.kt
@@ -26,7 +26,7 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 
 /**
- * Permission to access the users device storage.
+ * [Permission] to access the users device storage.
  * On iOS this corresponds to the Photos permission
  * @param allowWrite If `true` writing to the storage is permitted
  */
@@ -34,6 +34,15 @@ data class StoragePermission(val allowWrite: Boolean = false) : Permission() {
     override val name: String = "Storage - ${if (allowWrite) "ReadWrite" else "ReadOnly"}"
 }
 
+/**
+ * Registers a [BaseStoragePermissionManagerBuilder] and [PermissionStateRepo] for [StoragePermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param storagePermissionManagerBuilderBuilder method for creating a [BaseStoragePermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseStoragePermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseStoragePermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerStoragePermission(
     storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -49,6 +58,14 @@ fun PermissionsBuilder.registerStoragePermission(
         )
     }
 
+/**
+ * Registers a [BaseStoragePermissionManagerBuilder] and [PermissionStateRepo] for [StoragePermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * Only one builder can be registered.
+ * @param storagePermissionManagerBuilderBuilder method for creating a [BaseStoragePermissionManagerBuilder] from a [PermissionContext]
+ * @param storagePermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [StoragePermission] given a [BaseStoragePermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseStoragePermissionManagerBuilder] registered
+ * @throws [com.splendo.kaluga.permissions.base.PermissionsBuilderError] if either the [BaseStoragePermissionManagerBuilder] or [PermissionStateRepo] have already been registered
+ */
 fun PermissionsBuilder.registerStoragePermission(
     storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
     storagePermissionStateRepoBuilder: (StoragePermission, BaseStoragePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<StoragePermission>
@@ -59,6 +76,14 @@ fun PermissionsBuilder.registerStoragePermission(
     }
 }
 
+/**
+ * Gets the [BaseStoragePermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseStoragePermissionManagerBuilder] and [PermissionStateRepo] for [StoragePermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param storagePermissionManagerBuilderBuilder method for creating a [BaseStoragePermissionManagerBuilder] from a [PermissionContext]
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] to apply to any [BasePermissionManager] created using the registered builders.
+ * @return the [BaseStoragePermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerStoragePermissionIfNotRegistered(
     storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
     monitoringInterval: Duration = PermissionStateRepo.defaultMonitoringInterval,
@@ -74,6 +99,13 @@ fun PermissionsBuilder.registerStoragePermissionIfNotRegistered(
         )
     }
 
+/**
+ * Gets the [BaseStoragePermissionManagerBuilder] registered
+ * If not yet registered, this will register a [BaseStoragePermissionManagerBuilder] and [PermissionStateRepo] for [StoragePermission] to the [PermissionsBuilder.register] and [PermissionsBuilder.registerPermissionStateRepoBuilder] respectively
+ * @param storagePermissionManagerBuilderBuilder method for creating a [BaseStoragePermissionManagerBuilder] from a [PermissionContext]
+ * @param storagePermissionStateRepoBuilder method for creating a [PermissionStateRepo] for [StoragePermission] given a [BaseStoragePermissionManagerBuilder] and [CoroutineContext]
+ * @return the [BaseStoragePermissionManagerBuilder] registered
+ */
 fun PermissionsBuilder.registerStoragePermissionIfNotRegistered(
     storagePermissionManagerBuilderBuilder: (PermissionContext) -> BaseStoragePermissionManagerBuilder = ::StoragePermissionManagerBuilder,
     storagePermissionStateRepoBuilder: (StoragePermission, BaseStoragePermissionManagerBuilder, CoroutineContext) -> PermissionStateRepo<StoragePermission>
diff --git a/storage-permissions/src/commonMain/kotlin/StoragePermission.kt b/storage-permissions/src/commonMain/kotlin/StoragePermission.kt
index 3a095505a..f0e2c3c41 100644
--- a/storage-permissions/src/commonMain/kotlin/StoragePermission.kt
+++ b/storage-permissions/src/commonMain/kotlin/StoragePermission.kt
@@ -31,6 +31,10 @@ import kotlin.time.Duration
  * A [PermissionManager] for managing [StoragePermission]
  */
 typealias StoragePermissionManager = PermissionManager<StoragePermission>
+
+/**
+ * The [BasePermissionManager] to use as a default for [StoragePermission]
+ */
 expect class DefaultStoragePermissionManager : BasePermissionManager<StoragePermission>
 
 /**
@@ -38,18 +42,23 @@ expect class DefaultStoragePermissionManager : BasePermissionManager<StoragePerm
  */
 typealias PhotosPermissionManager = StoragePermissionManager
 
+/**
+ * A [BasePermissionsBuilder] for [StoragePermission]
+ */
 interface BaseStoragePermissionManagerBuilder : BasePermissionsBuilder<StoragePermission> {
     /**
      * Creates a [StoragePermissionManager]
-     * @param notificationsPermission The [StoragePermission] for the PermissionManager to be created
-     * @param settings [BasePermissionManager.Settings] to configure the manager
+     * @param storagePermission the [StoragePermission] to manage
+     * @param settings [BasePermissionManager.Settings] to apply to the manager
      * @param coroutineScope The [CoroutineScope] the manager runs on
+     * @return a [StoragePermissionManager]
      */
     fun create(storagePermission: StoragePermission, settings: BasePermissionManager.Settings = BasePermissionManager.Settings(), coroutineScope: CoroutineScope): StoragePermissionManager
 }
 
 /**
- * A builder for creating a [StoragePermissionManager]
+ * A [BaseStoragePermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
  */
 expect class StoragePermissionManagerBuilder(context: PermissionContext = defaultPermissionContext) : BaseStoragePermissionManagerBuilder
 
@@ -60,7 +69,10 @@ typealias PhotosPermissionManagerBuilder = StoragePermissionManagerBuilder
 
 /**
  * A [PermissionStateRepo] for [StoragePermission]
+ * @param storagePermission the [StoragePermission] to manage
  * @param builder The [StoragePermissionManagerBuilder] for creating the [StoragePermissionManager] associated with the permission
+ * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
+ * @param settings the [BasePermissionManager.Settings] used by the [StoragePermissionManager] created by the builder
  * @param coroutineContext The [CoroutineContext] to run the state machine on.
  */
 class StoragePermissionStateRepo(
diff --git a/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt b/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt
index ab07b9f85..3928ecf1f 100644
--- a/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt
+++ b/storage-permissions/src/iosMain/kotlin/StoragePermissionManager.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.permissions.storage
 import com.splendo.kaluga.logging.error
 import com.splendo.kaluga.permissions.base.DefaultAuthorizationStatusHandler
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.CurrentAuthorizationStatusProvider
 import com.splendo.kaluga.permissions.base.IOSPermissionsHelper
 import com.splendo.kaluga.permissions.base.PermissionContext
@@ -38,6 +39,13 @@ import kotlin.time.Duration
 
 const val NSPhotoLibraryUsageDescription = "NSPhotoLibraryUsageDescription"
 
+/**
+ * The [BasePermissionManager] to use as a default for [StoragePermission]
+ * @param bundle the [NSBundle] the [StoragePermission] is to be granted in
+ * @param storagePermission the [StoragePermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultStoragePermissionManager(
     private val bundle: NSBundle,
     storagePermission: StoragePermission,
@@ -79,6 +87,10 @@ actual class DefaultStoragePermissionManager(
     }
 }
 
+/**
+ * A [BaseStoragePermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class StoragePermissionManagerBuilder actual constructor(private val context: PermissionContext) : BaseStoragePermissionManagerBuilder {
 
     override fun create(storagePermission: StoragePermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): StoragePermissionManager {
diff --git a/storage-permissions/src/jsMain/kotlin/StoragePermissionManager.kt b/storage-permissions/src/jsMain/kotlin/StoragePermissionManager.kt
index 5e6fe2392..db5b08018 100644
--- a/storage-permissions/src/jsMain/kotlin/StoragePermissionManager.kt
+++ b/storage-permissions/src/jsMain/kotlin/StoragePermissionManager.kt
@@ -18,11 +18,18 @@
 package com.splendo.kaluga.permissions.storage
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [StoragePermission]
+ * @param storagePermission the [StoragePermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultStoragePermissionManager(storagePermission: StoragePermission, settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<StoragePermission>(storagePermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +45,10 @@ actual class DefaultStoragePermissionManager(storagePermission: StoragePermissio
     }
 }
 
+/**
+ * A [BaseStoragePermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class StoragePermissionManagerBuilder actual constructor(context: PermissionContext) : BaseStoragePermissionManagerBuilder {
 
     override fun create(storagePermission: StoragePermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<StoragePermission> {
diff --git a/storage-permissions/src/jvmMain/kotlin/StoragePermissionManager.kt b/storage-permissions/src/jvmMain/kotlin/StoragePermissionManager.kt
index 5e6fe2392..db5b08018 100644
--- a/storage-permissions/src/jvmMain/kotlin/StoragePermissionManager.kt
+++ b/storage-permissions/src/jvmMain/kotlin/StoragePermissionManager.kt
@@ -18,11 +18,18 @@
 package com.splendo.kaluga.permissions.storage
 
 import com.splendo.kaluga.permissions.base.BasePermissionManager
+import com.splendo.kaluga.permissions.base.BasePermissionManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.PermissionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
+/**
+ * The [BasePermissionManager] to use as a default for [StoragePermission]
+ * @param storagePermission the [StoragePermission] to manage
+ * @param settings the [Settings] to apply to this manager.
+ * @param coroutineScope the [CoroutineScope] of this manager.
+ */
 actual class DefaultStoragePermissionManager(storagePermission: StoragePermission, settings: Settings, coroutineScope: CoroutineScope) : BasePermissionManager<StoragePermission>(storagePermission, settings, coroutineScope) {
 
     override fun requestPermissionDidStart() {
@@ -38,6 +45,10 @@ actual class DefaultStoragePermissionManager(storagePermission: StoragePermissio
     }
 }
 
+/**
+ * A [BaseStoragePermissionManagerBuilder]
+ * @param context the [PermissionContext] this permissions manager builder runs on
+ */
 actual class StoragePermissionManagerBuilder actual constructor(context: PermissionContext) : BaseStoragePermissionManagerBuilder {
 
     override fun create(storagePermission: StoragePermission, settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): PermissionManager<StoragePermission> {

From d9c9edfc786650a2229ca5ac379d6bfe8ac8c094 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 13 Feb 2023 11:42:28 +0100
Subject: [PATCH 166/227] PR remarks

---
 .../kotlin/location/GoogleLocationProvider.kt | 31 +++++++++++-----
 .../kotlin/location/LocationManager.kt        |  7 ++--
 .../kotlin/location/LocationManager.kt        |  2 -
 .../kotlin/location/LocationState.kt          | 37 ++++++++-----------
 4 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
index 5b3b50569..9c41505a5 100644
--- a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
@@ -35,35 +35,46 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.ZERO
 import kotlin.time.Duration.Companion.milliseconds
 
 /**
  * A [LocationProvider] using the Google Location Services
  * @param context The [Context] to run this [LocationProvider] in.
  * @param settings The [GoogleLocationProvider.Settings] to use to configure this location provider.
+ * @param minUpdateDistanceMeters The min distance traversed for a location update to be reported.
  */
-class GoogleLocationProvider(private val context: Context, private val settings: Settings) : LocationProvider {
+class GoogleLocationProvider(
+    private val context: Context,
+    private val settings: Settings,
+    private val minUpdateDistanceMeters: Float
+) : LocationProvider {
 
     /**
      * Settings for a [GoogleLocationProvider]
      * @param interval The desired interval of location updates. (Best effort)
-     * @param minUpdateDistanceMeters The min distance traversed for a location update to be reported.
+     * @param maxUpdateDelay The longest a location update may be delayed.
+     * @param minUpdateInterval The fastest allowed interval of location updates.
      */
     data class Settings(
-        val interval: Duration,
-        val minUpdateDistanceMeters: Float
+        val interval: Duration = 100.milliseconds,
+        val maxUpdateDelay: Duration = ZERO,
+        val minUpdateInterval: Duration = interval
     )
 
     internal sealed class FusedLocationProviderClientType(
         permission: LocationPermission,
         context: Context,
-        settings: Settings
+        settings: Settings,
+        minUpdateDistanceMeters: Float
     ) {
         protected val fusedLocationProviderClient =
             LocationServices.getFusedLocationProviderClient(context)
         protected val locationRequest =
             LocationRequest.Builder(settings.interval.inWholeMilliseconds)
-                .setMinUpdateDistanceMeters(settings.minUpdateDistanceMeters)
+                .setMaxUpdateDelayMillis(settings.maxUpdateDelay.inWholeMilliseconds)
+                .setMinUpdateIntervalMillis(settings.minUpdateInterval.inWholeMilliseconds)
+                .setMinUpdateDistanceMeters(minUpdateDistanceMeters)
                 .setPriority(
                     if (permission.precise) Priority.PRIORITY_HIGH_ACCURACY
                     else Priority.PRIORITY_BALANCED_POWER_ACCURACY
@@ -76,7 +87,7 @@ class GoogleLocationProvider(private val context: Context, private val settings:
         abstract fun startRequestingUpdates()
         abstract fun stopRequestingUpdates()
 
-        class Foreground(permission: LocationPermission, context: Context, settings: Settings) : FusedLocationProviderClientType(permission, context, settings) {
+        class Foreground(permission: LocationPermission, context: Context, settings: Settings, minUpdateDistanceMeters: Float) : FusedLocationProviderClientType(permission, context, settings, minUpdateDistanceMeters) {
 
             private val locationCallback = object : LocationCallback() {
 
@@ -97,7 +108,7 @@ class GoogleLocationProvider(private val context: Context, private val settings:
             }
         }
 
-        class Background(permission: LocationPermission, context: Context, settings: Settings) : FusedLocationProviderClientType(permission, context, settings) {
+        class Background(permission: LocationPermission, context: Context, settings: Settings, minUpdateDistanceMeters: Float) : FusedLocationProviderClientType(permission, context, settings, minUpdateDistanceMeters) {
 
             private val identifier = hashCode().toString()
 
@@ -141,9 +152,9 @@ class GoogleLocationProvider(private val context: Context, private val settings:
     private fun getLocationProviderForPermission(permission: LocationPermission): FusedLocationProviderClientType {
         return fusedLocationProviderClients.value[permission] ?: run {
             val fusedLocationProviderClient = if (permission.background) {
-                FusedLocationProviderClientType.Background(permission, context, settings)
+                FusedLocationProviderClientType.Background(permission, context, settings, minUpdateDistanceMeters)
             } else {
-                FusedLocationProviderClientType.Foreground(permission, context, settings)
+                FusedLocationProviderClientType.Foreground(permission, context, settings, minUpdateDistanceMeters)
             }
 
             fusedLocationProviderClients.value = fusedLocationProviderClients.value.toMutableMap().apply {
diff --git a/location/src/androidLibMain/kotlin/location/LocationManager.kt b/location/src/androidLibMain/kotlin/location/LocationManager.kt
index 50380bd8e..f7ba8a081 100644
--- a/location/src/androidLibMain/kotlin/location/LocationManager.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationManager.kt
@@ -47,6 +47,7 @@ actual class DefaultLocationManager(
         private val locationManager: android.location.LocationManager? = context.getSystemService(
             Context.LOCATION_SERVICE
         ) as? android.location.LocationManager,
+        private val googleLocationProviderSettings: GoogleLocationProvider.Settings = GoogleLocationProvider.Settings()
     ) : BaseLocationManager.Builder {
 
         override fun create(
@@ -55,10 +56,8 @@ actual class DefaultLocationManager(
         ): BaseLocationManager {
             val locationProvider: LocationProvider = GoogleLocationProvider(
                 context,
-                GoogleLocationProvider.Settings(
-                    interval = settings.updateIntervalMillis,
-                    minUpdateDistanceMeters = settings.minUpdateDistanceMeters
-                )
+                googleLocationProviderSettings,
+                settings.minUpdateDistanceMeters
             )
             return DefaultLocationManager(
                 context,
diff --git a/location/src/commonMain/kotlin/location/LocationManager.kt b/location/src/commonMain/kotlin/location/LocationManager.kt
index aa32c5b3a..5e172d4ce 100644
--- a/location/src/commonMain/kotlin/location/LocationManager.kt
+++ b/location/src/commonMain/kotlin/location/LocationManager.kt
@@ -79,7 +79,6 @@ abstract class BaseLocationManager(
      * @param autoRequestPermission Set to true to request permissions right away
      * @param autoEnableLocations Set to true to enable location if disabled right away
      * @param locationBufferCapacity Max location that can be buffered, if exceed oldest is dropped
-     * @param updateIntervalMillis Controls Android only emission rate, iOS does not expose this but makes it depend on set accuracy and [minUpdateDistanceMeters]
      * @param minUpdateDistanceMeters Min update distance for a location update to trigger
      * @param logger Pass your own [RestrictedLogger] to enable logging while debugging
      */
@@ -89,7 +88,6 @@ abstract class BaseLocationManager(
         val autoRequestPermission: Boolean = true,
         val autoEnableLocations: Boolean = true,
         val locationBufferCapacity: Int = 16,
-        val updateIntervalMillis: Duration = 100.milliseconds,
         val minUpdateDistanceMeters: Float = 0f,
         val logger: Logger = RestrictedLogger(RestrictedLogLevel.None)
     )
diff --git a/location/src/commonMain/kotlin/location/LocationState.kt b/location/src/commonMain/kotlin/location/LocationState.kt
index 4f126c312..71a9ac059 100644
--- a/location/src/commonMain/kotlin/location/LocationState.kt
+++ b/location/src/commonMain/kotlin/location/LocationState.kt
@@ -29,7 +29,10 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.flow.transformLatest
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.ZERO
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 /**
@@ -255,26 +258,18 @@ fun Flow<LocationState>.location(): Flow<Location> {
  * @param maxAge Controls both the max age of a location by filtering out locations that are older and
  * is used to set a timeout for the last emission that will emit null when triggered
  */
-fun Flow<Location>.known(maxAge: Duration = 0.seconds): Flow<Location.KnownLocation?> {
-    fun filterExpired(location: Location.KnownLocation): Location.KnownLocation? {
-        val hasExpired = location.time <= DefaultKalugaDate.now(-maxAge.inWholeMilliseconds)
-        return if (hasExpired) null
-        else location
-    }
-
-    val knownLocation = mapNotNull { location -> location.known }
-    if (maxAge.inWholeMilliseconds == 0L || maxAge.isNegative())
-        return knownLocation
-    return knownLocation.flatMapLatest { location ->
-        flow {
-            emit(filterExpired(location))
-            val locationTimeMillis = location.known?.time?.millisecondSinceEpoch
-                ?: DefaultKalugaDate.now(-maxAge.inWholeMilliseconds).millisecondSinceEpoch
-            val dateDiffMillis =
-                (DefaultKalugaDate.now().millisecondSinceEpoch - locationTimeMillis)
-            val delayMillis = maxAge.inWholeMilliseconds - dateDiffMillis
-            delay(delayMillis)
-            emit(null)
+fun Flow<Location>.known(maxAge: Duration = 0.seconds): Flow<Location.KnownLocation?> = transformLatest { location ->
+    location.known?.let { knownLocation ->
+        val expirationTime = knownLocation.time.millisecondSinceEpoch.milliseconds + maxAge
+        val now = DefaultKalugaDate.now().millisecondSinceEpoch.milliseconds
+        when {
+            maxAge <= ZERO -> emit(knownLocation)
+            expirationTime <= now -> emit(null)
+            else -> {
+                emit(knownLocation)
+                delay(expirationTime - now)
+                emit(null)
+            }
         }
-    }
+    } ?: emit(null)
 }

From 77d6ed099883d6be08fd8ca9d74a04c1a3812718 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 13 Feb 2023 12:48:40 +0100
Subject: [PATCH 167/227] Tests & api

---
 location/api/androidLib/location.api          | 67 ++++++-------------
 location/api/jvm/location.api                 | 54 +++++----------
 .../kotlin/location/LocationManager.kt        |  2 -
 .../kotlin/location/LocationState.kt          | 10 +--
 .../kotlin/location/KnownLocationTest.kt      | 63 +++++++++++++++++
 .../kotlin/location/LocationStateTest.kt      |  2 +-
 6 files changed, 103 insertions(+), 95 deletions(-)
 create mode 100644 location/src/commonTest/kotlin/location/KnownLocationTest.kt

diff --git a/location/api/androidLib/location.api b/location/api/androidLib/location.api
index 04d367eb7..c1ee83e1b 100644
--- a/location/api/androidLib/location.api
+++ b/location/api/androidLib/location.api
@@ -24,22 +24,24 @@ public final class com/splendo/kaluga/location/BaseLocationManager$Companion {
 }
 
 public final class com/splendo/kaluga/location/BaseLocationManager$Settings {
-	public fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZILcom/splendo/kaluga/logging/Logger;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZILcom/splendo/kaluga/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZIFLcom/splendo/kaluga/logging/Logger;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZIFLcom/splendo/kaluga/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Lcom/splendo/kaluga/permissions/location/LocationPermission;
 	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/Permissions;
 	public final fun component3 ()Z
 	public final fun component4 ()Z
 	public final fun component5 ()I
-	public final fun component6 ()Lcom/splendo/kaluga/logging/Logger;
-	public final fun copy (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZILcom/splendo/kaluga/logging/Logger;)Lcom/splendo/kaluga/location/BaseLocationManager$Settings;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZILcom/splendo/kaluga/logging/Logger;ILjava/lang/Object;)Lcom/splendo/kaluga/location/BaseLocationManager$Settings;
+	public final fun component6 ()F
+	public final fun component7 ()Lcom/splendo/kaluga/logging/Logger;
+	public final fun copy (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZIFLcom/splendo/kaluga/logging/Logger;)Lcom/splendo/kaluga/location/BaseLocationManager$Settings;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZIFLcom/splendo/kaluga/logging/Logger;ILjava/lang/Object;)Lcom/splendo/kaluga/location/BaseLocationManager$Settings;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAutoEnableLocations ()Z
 	public final fun getAutoRequestPermission ()Z
 	public final fun getLocationBufferCapacity ()I
 	public final fun getLocationPermission ()Lcom/splendo/kaluga/permissions/location/LocationPermission;
 	public final fun getLogger ()Lcom/splendo/kaluga/logging/Logger;
+	public final fun getMinUpdateDistanceMeters ()F
 	public final fun getPermissions ()Lcom/splendo/kaluga/permissions/base/Permissions;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -98,8 +100,8 @@ public final class com/splendo/kaluga/location/DefaultLocationManager : com/sple
 
 public final class com/splendo/kaluga/location/DefaultLocationManager$Builder : com/splendo/kaluga/location/BaseLocationManager$Builder {
 	public fun <init> ()V
-	public fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lcom/splendo/kaluga/location/LocationProvider;)V
-	public synthetic fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lcom/splendo/kaluga/location/LocationProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;)V
+	public synthetic fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/location/BaseLocationManager;
 }
 
@@ -111,15 +113,14 @@ public final class com/splendo/kaluga/location/DefaultLocationMonitor : com/sple
 }
 
 public final class com/splendo/kaluga/location/GoogleLocationProvider : com/splendo/kaluga/location/LocationProvider {
-	public fun <init> (Landroid/content/Context;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;)V
-	public synthetic fun <init> (Landroid/content/Context;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/content/Context;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;F)V
 	public fun location (Lcom/splendo/kaluga/permissions/location/LocationPermission;)Lkotlinx/coroutines/flow/Flow;
 	public fun startMonitoringLocation (Lcom/splendo/kaluga/permissions/location/LocationPermission;)V
 	public fun stopMonitoringLocation (Lcom/splendo/kaluga/permissions/location/LocationPermission;)V
 }
 
 public final class com/splendo/kaluga/location/GoogleLocationProvider$Settings {
-	public static final field Companion Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings$Companion;
+	public synthetic fun <init> (JJJILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JJJLkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1-UwyO8pc ()J
 	public final fun component2-UwyO8pc ()J
@@ -134,10 +135,6 @@ public final class com/splendo/kaluga/location/GoogleLocationProvider$Settings {
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/location/GoogleLocationProvider$Settings$Companion {
-	public final fun getDefault ()Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;
-}
-
 public final class com/splendo/kaluga/location/GoogleLocationUpdatesBroadcastReceiver : android/content/BroadcastReceiver {
 	public static final field Companion Lcom/splendo/kaluga/location/GoogleLocationUpdatesBroadcastReceiver$Companion;
 	public fun <init> ()V
@@ -152,8 +149,8 @@ public abstract class com/splendo/kaluga/location/Location {
 }
 
 public final class com/splendo/kaluga/location/Location$KnownLocation : com/splendo/kaluga/location/Location {
-	public fun <init> (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/location/Location$Time;)V
-	public synthetic fun <init> (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/location/Location$Time;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/base/utils/KalugaDate;)V
+	public synthetic fun <init> (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/base/utils/KalugaDate;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()D
 	public final fun component2 ()D
 	public final fun component3 ()Ljava/lang/Double;
@@ -161,9 +158,9 @@ public final class com/splendo/kaluga/location/Location$KnownLocation : com/sple
 	public final fun component5 ()Ljava/lang/Double;
 	public final fun component6 ()Ljava/lang/Double;
 	public final fun component7 ()Ljava/lang/Double;
-	public final fun component8 ()Lcom/splendo/kaluga/location/Location$Time;
-	public final fun copy (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/location/Location$Time;)Lcom/splendo/kaluga/location/Location$KnownLocation;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$KnownLocation;DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/location/Location$Time;ILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$KnownLocation;
+	public final fun component8 ()Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun copy (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/location/Location$KnownLocation;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$KnownLocation;DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$KnownLocation;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAltitude ()Ljava/lang/Double;
 	public final fun getCourse ()Ljava/lang/Double;
@@ -173,39 +170,12 @@ public final class com/splendo/kaluga/location/Location$KnownLocation : com/sple
 	public final fun getLongitude ()D
 	public final fun getLongitudeDMS ()Lcom/splendo/kaluga/location/DMSCoordinate;
 	public final fun getSpeed ()Ljava/lang/Double;
-	public final fun getTime ()Lcom/splendo/kaluga/location/Location$Time;
+	public final fun getTime ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public final fun getVerticalAccuracy ()Ljava/lang/Double;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/location/Location$Time {
-	public synthetic fun <init> (JLkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getMs ()J
-}
-
-public final class com/splendo/kaluga/location/Location$Time$GuessedTime : com/splendo/kaluga/location/Location$Time {
-	public fun <init> (J)V
-	public final fun component1 ()J
-	public final fun copy (J)Lcom/splendo/kaluga/location/Location$Time$GuessedTime;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$Time$GuessedTime;JILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$Time$GuessedTime;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMs ()J
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/location/Location$Time$MeasuredTime : com/splendo/kaluga/location/Location$Time {
-	public fun <init> (J)V
-	public final fun component1 ()J
-	public final fun copy (J)Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;JILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMs ()J
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public abstract class com/splendo/kaluga/location/Location$UnknownLocation : com/splendo/kaluga/location/Location {
 	public synthetic fun <init> (Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getReason ()Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;
@@ -446,7 +416,8 @@ public class com/splendo/kaluga/location/LocationStateImplRepo : com/splendo/kal
 }
 
 public final class com/splendo/kaluga/location/LocationStateKt {
-	public static final fun known (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+	public static final fun known-HG0u8IE (Lkotlinx/coroutines/flow/Flow;J)Lkotlinx/coroutines/flow/Flow;
+	public static synthetic fun known-HG0u8IE$default (Lkotlinx/coroutines/flow/Flow;JILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
 	public static final fun location (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
 }
 
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index 5c9315021..f98de0f7c 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -24,22 +24,24 @@ public final class com/splendo/kaluga/location/BaseLocationManager$Companion {
 }
 
 public final class com/splendo/kaluga/location/BaseLocationManager$Settings {
-	public fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZILcom/splendo/kaluga/logging/Logger;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZILcom/splendo/kaluga/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZIFLcom/splendo/kaluga/logging/Logger;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZIFLcom/splendo/kaluga/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Lcom/splendo/kaluga/permissions/location/LocationPermission;
 	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/Permissions;
 	public final fun component3 ()Z
 	public final fun component4 ()Z
 	public final fun component5 ()I
-	public final fun component6 ()Lcom/splendo/kaluga/logging/Logger;
-	public final fun copy (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZILcom/splendo/kaluga/logging/Logger;)Lcom/splendo/kaluga/location/BaseLocationManager$Settings;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZILcom/splendo/kaluga/logging/Logger;ILjava/lang/Object;)Lcom/splendo/kaluga/location/BaseLocationManager$Settings;
+	public final fun component6 ()F
+	public final fun component7 ()Lcom/splendo/kaluga/logging/Logger;
+	public final fun copy (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZIFLcom/splendo/kaluga/logging/Logger;)Lcom/splendo/kaluga/location/BaseLocationManager$Settings;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lcom/splendo/kaluga/permissions/location/LocationPermission;Lcom/splendo/kaluga/permissions/base/Permissions;ZZIFLcom/splendo/kaluga/logging/Logger;ILjava/lang/Object;)Lcom/splendo/kaluga/location/BaseLocationManager$Settings;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAutoEnableLocations ()Z
 	public final fun getAutoRequestPermission ()Z
 	public final fun getLocationBufferCapacity ()I
 	public final fun getLocationPermission ()Lcom/splendo/kaluga/permissions/location/LocationPermission;
 	public final fun getLogger ()Lcom/splendo/kaluga/logging/Logger;
+	public final fun getMinUpdateDistanceMeters ()F
 	public final fun getPermissions ()Lcom/splendo/kaluga/permissions/base/Permissions;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -115,8 +117,8 @@ public abstract class com/splendo/kaluga/location/Location {
 }
 
 public final class com/splendo/kaluga/location/Location$KnownLocation : com/splendo/kaluga/location/Location {
-	public fun <init> (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/location/Location$Time;)V
-	public synthetic fun <init> (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/location/Location$Time;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/base/utils/KalugaDate;)V
+	public synthetic fun <init> (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/base/utils/KalugaDate;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()D
 	public final fun component2 ()D
 	public final fun component3 ()Ljava/lang/Double;
@@ -124,9 +126,9 @@ public final class com/splendo/kaluga/location/Location$KnownLocation : com/sple
 	public final fun component5 ()Ljava/lang/Double;
 	public final fun component6 ()Ljava/lang/Double;
 	public final fun component7 ()Ljava/lang/Double;
-	public final fun component8 ()Lcom/splendo/kaluga/location/Location$Time;
-	public final fun copy (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/location/Location$Time;)Lcom/splendo/kaluga/location/Location$KnownLocation;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$KnownLocation;DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/location/Location$Time;ILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$KnownLocation;
+	public final fun component8 ()Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun copy (DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/location/Location$KnownLocation;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$KnownLocation;DDLjava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Double;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$KnownLocation;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAltitude ()Ljava/lang/Double;
 	public final fun getCourse ()Ljava/lang/Double;
@@ -136,39 +138,12 @@ public final class com/splendo/kaluga/location/Location$KnownLocation : com/sple
 	public final fun getLongitude ()D
 	public final fun getLongitudeDMS ()Lcom/splendo/kaluga/location/DMSCoordinate;
 	public final fun getSpeed ()Ljava/lang/Double;
-	public final fun getTime ()Lcom/splendo/kaluga/location/Location$Time;
+	public final fun getTime ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public final fun getVerticalAccuracy ()Ljava/lang/Double;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/location/Location$Time {
-	public synthetic fun <init> (JLkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getMs ()J
-}
-
-public final class com/splendo/kaluga/location/Location$Time$GuessedTime : com/splendo/kaluga/location/Location$Time {
-	public fun <init> (J)V
-	public final fun component1 ()J
-	public final fun copy (J)Lcom/splendo/kaluga/location/Location$Time$GuessedTime;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$Time$GuessedTime;JILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$Time$GuessedTime;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMs ()J
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/location/Location$Time$MeasuredTime : com/splendo/kaluga/location/Location$Time {
-	public fun <init> (J)V
-	public final fun component1 ()J
-	public final fun copy (J)Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;JILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMs ()J
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public abstract class com/splendo/kaluga/location/Location$UnknownLocation : com/splendo/kaluga/location/Location {
 	public synthetic fun <init> (Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getReason ()Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;
@@ -450,7 +425,8 @@ public class com/splendo/kaluga/location/LocationStateImplRepo : com/splendo/kal
 }
 
 public final class com/splendo/kaluga/location/LocationStateKt {
-	public static final fun known (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+	public static final fun known-HG0u8IE (Lkotlinx/coroutines/flow/Flow;J)Lkotlinx/coroutines/flow/Flow;
+	public static synthetic fun known-HG0u8IE$default (Lkotlinx/coroutines/flow/Flow;JILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
 	public static final fun location (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
 }
 
diff --git a/location/src/commonMain/kotlin/location/LocationManager.kt b/location/src/commonMain/kotlin/location/LocationManager.kt
index 5e172d4ce..e3deb7ee5 100644
--- a/location/src/commonMain/kotlin/location/LocationManager.kt
+++ b/location/src/commonMain/kotlin/location/LocationManager.kt
@@ -38,8 +38,6 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
 
 interface LocationManager {
 
diff --git a/location/src/commonMain/kotlin/location/LocationState.kt b/location/src/commonMain/kotlin/location/LocationState.kt
index 71a9ac059..93c4a2b33 100644
--- a/location/src/commonMain/kotlin/location/LocationState.kt
+++ b/location/src/commonMain/kotlin/location/LocationState.kt
@@ -23,12 +23,10 @@ import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
 import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
 import com.splendo.kaluga.base.state.KalugaState
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
+import com.splendo.kaluga.base.utils.KalugaDate
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.transformLatest
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.ZERO
@@ -258,10 +256,12 @@ fun Flow<LocationState>.location(): Flow<Location> {
  * @param maxAge Controls both the max age of a location by filtering out locations that are older and
  * is used to set a timeout for the last emission that will emit null when triggered
  */
-fun Flow<Location>.known(maxAge: Duration = 0.seconds): Flow<Location.KnownLocation?> = transformLatest { location ->
+fun Flow<Location>.known(maxAge: Duration = 0.seconds) = known(maxAge) { DefaultKalugaDate.now() }
+
+internal fun Flow<Location>.known(maxAge: Duration, nowProvider: () -> KalugaDate): Flow<Location.KnownLocation?> = transformLatest { location ->
     location.known?.let { knownLocation ->
         val expirationTime = knownLocation.time.millisecondSinceEpoch.milliseconds + maxAge
-        val now = DefaultKalugaDate.now().millisecondSinceEpoch.milliseconds
+        val now = nowProvider().millisecondSinceEpoch.milliseconds
         when {
             maxAge <= ZERO -> emit(knownLocation)
             expirationTime <= now -> emit(null)
diff --git a/location/src/commonTest/kotlin/location/KnownLocationTest.kt b/location/src/commonTest/kotlin/location/KnownLocationTest.kt
new file mode 100644
index 000000000..7d06eb831
--- /dev/null
+++ b/location/src/commonTest/kotlin/location/KnownLocationTest.kt
@@ -0,0 +1,63 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.location
+
+import com.splendo.kaluga.base.runBlocking
+import com.splendo.kaluga.base.utils.DefaultKalugaDate
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.toCollection
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+import kotlin.time.Duration.Companion.seconds
+
+class KnownLocationTest {
+
+    @Test
+    fun testKnownLocation() = runBlocking {
+        val now = DefaultKalugaDate.now()
+        val knownLocation = Location.KnownLocation(1.0, 1.0, time = now)
+        val locationFlow = flowOf(
+            Location.UnknownLocation.WithoutLastLocation(Location.UnknownLocation.Reason.NOT_CLEAR),
+            knownLocation,
+            Location.UnknownLocation.WithLastLocation(knownLocation, Location.UnknownLocation.Reason.NOT_CLEAR)
+        ).known()
+        val collectedLocations = mutableListOf<Location.KnownLocation?>()
+        locationFlow.toCollection(collectedLocations)
+        assertEquals(3, collectedLocations.size)
+        assertNull(collectedLocations[0])
+        assertEquals(knownLocation, collectedLocations[1])
+        assertEquals(knownLocation, collectedLocations[2])
+    }
+
+    @Test
+    fun testExpiredKnownLocation() = runBlocking {
+        val now = DefaultKalugaDate.epoch(10000)
+        val knownLocation = Location.KnownLocation(1.0, 1.0, time = now)
+        val locationFlow = flowOf(
+            knownLocation.copy(time = DefaultKalugaDate.epoch()),
+            knownLocation
+        ).known(maxAge = 5.seconds) { now }
+        val collectedLocations = mutableListOf<Location.KnownLocation?>()
+        locationFlow.toCollection(collectedLocations)
+        assertEquals(3, collectedLocations.size)
+        assertNull(collectedLocations[0])
+        assertEquals(knownLocation, collectedLocations[1])
+        assertNull(collectedLocations[2])
+    }
+}
diff --git a/location/src/commonTest/kotlin/location/LocationStateTest.kt b/location/src/commonTest/kotlin/location/LocationStateTest.kt
index 5f5c9efc6..6a0cca909 100644
--- a/location/src/commonTest/kotlin/location/LocationStateTest.kt
+++ b/location/src/commonTest/kotlin/location/LocationStateTest.kt
@@ -52,7 +52,7 @@ class LocationStateTest :
         private val location2 = Location.KnownLocation(
             latitude = 52.079,
             longitude = 4.3413,
-            time =  DefaultKalugaDate.now(),
+            time = DefaultKalugaDate.now(),
             horizontalAccuracy = 2.0,
             verticalAccuracy = 2.0,
             altitude = 2.0,

From df5f0e3e1d2d32a7274874eb4b713e818de3f8fa Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 13 Feb 2023 22:43:13 +0100
Subject: [PATCH 168/227] Bluetooth common KDoc

---
 .../src/commonMain/kotlin/PermissionState.kt  |   7 +-
 .../device/DefaultDeviceConnectionManager.kt  |  15 +-
 bluetooth/src/commonMain/kotlin/Attribute.kt  |  34 +-
 bluetooth/src/commonMain/kotlin/Bluetooth.kt  | 141 ++++++++-
 .../src/commonMain/kotlin/BluetoothMonitor.kt |  11 +
 .../src/commonMain/kotlin/Characteristic.kt   |  82 +++++
 bluetooth/src/commonMain/kotlin/Descriptor.kt |  19 ++
 bluetooth/src/commonMain/kotlin/Service.kt    |  26 ++
 bluetooth/src/commonMain/kotlin/UUID.kt       |  25 ++
 bluetooth/src/commonMain/kotlin/Value.kt      |   6 +
 .../kotlin/device/AdvertisementData.kt        |  33 ++
 .../kotlin/device/ConnectionSettings.kt       |  18 ++
 .../device/DefaultDeviceConnectionManager.kt  | 208 ++++++++++--
 .../src/commonMain/kotlin/device/Device.kt    |  83 ++++-
 .../commonMain/kotlin/device/DeviceInfo.kt    |  72 +++++
 .../commonMain/kotlin/device/DeviceState.kt   | 297 +++++++++++++++++-
 .../src/commonMain/kotlin/scanner/Scanner.kt  | 141 ++++++++-
 .../kotlin/scanner/ScanningState.kt           | 258 ++++++++++++++-
 .../kotlin/scanner/ScanningStateRepo.kt       |  29 +-
 ...BluetoothCharacteristicNotificationTest.kt |   8 +-
 .../device/DefaultDeviceConnectionManager.kt  |  10 +-
 .../device/DefaultDeviceConnectionManager.kt  |   6 +-
 .../device/DefaultDeviceConnectionManager.kt  |   6 +-
 .../kotlin/location/LocationExtensions.kt     |   3 +-
 .../src/commonMain/kotlin/ServiceMonitor.kt   |   4 +-
 .../device/MockDeviceConnectionManager.kt     |  39 ++-
 .../commonMain/kotlin/scanner/MockScanner.kt  |   3 -
 27 files changed, 1502 insertions(+), 82 deletions(-)

diff --git a/base-permissions/src/commonMain/kotlin/PermissionState.kt b/base-permissions/src/commonMain/kotlin/PermissionState.kt
index 10626fc7e..f33ba44b9 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionState.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionState.kt
@@ -76,7 +76,7 @@ sealed interface PermissionState<P : Permission> : KalugaState {
     }
 
     /**
-     * A [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
+     * An [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
      * @param P the type of [Permission] associated with the state
      */
     interface Initializing<P : Permission> : Active<P>, SpecialFlowValue.NotImportant {
@@ -85,12 +85,13 @@ sealed interface PermissionState<P : Permission> : KalugaState {
          * Transitions into an [Initialized] state
          * @param allowed if `true` the permission is currently granted
          * @param locked if `true` and [allowed] is `false`, this indicates the permission can not be requested.
+         * @return the method for transitioning into an [Initialized] State
          */
         fun initialize(allowed: Boolean, locked: Boolean): suspend () -> Initialized<P>
     }
 
     /**
-     * A [Active] State indicating observation has started and initialization has completed
+     * An [Active] State indicating observation has started and initialization has completed
      * @param P the type of [Permission] associated with the state
      */
     sealed interface Initialized<P : Permission> : Active<P>
@@ -104,6 +105,7 @@ sealed interface PermissionState<P : Permission> : KalugaState {
         /**
          * Transitions into a [Denied] State
          * @param locked if `true` this indicates the permission can not be requested again
+         * @return the method for transitioning into a [Denied] State
          */
         fun deny(locked: Boolean): suspend () -> Denied<P>
     }
@@ -173,6 +175,7 @@ sealed class PermissionStateImpl<P : Permission> {
          * Transitions into a [Initializing] state
          * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
          * @param permissionManager the [PermissionManager] managing the [P] if this State
+         * @return method for transitioning into an [Initializing] State
          */
         fun initialize(monitoringInterval: Duration, permissionManager: PermissionManager<P>): suspend () -> Initializing<P> = { Initializing(monitoringInterval, permissionManager) }
     }
diff --git a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 93d8e4996..c442ea986 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -213,8 +213,7 @@ internal actual class DefaultDeviceConnectionManager(
         return gatt.await().requestMtu(mtu)
     }
 
-    override suspend fun performAction(action: DeviceAction) {
-        super.performAction(action)
+    override suspend fun didStartPerformingAction(action: DeviceAction) {
         currentAction = action
         val succeeded = when (action) {
             is DeviceAction.Read.Characteristic -> gatt.await().readCharacteristic(action.characteristic.wrapper)
@@ -232,16 +231,16 @@ internal actual class DefaultDeviceConnectionManager(
     }
 
     @SuppressLint("MissingPermission")
-    override suspend fun unpair() {
-        if (device.bondState != BluetoothDevice.BOND_NONE) {
-            deviceWrapper.removeBond()
+    override suspend fun didStartPairing() {
+        if (device.bondState == BluetoothDevice.BOND_NONE) {
+            deviceWrapper.createBond()
         }
     }
 
     @SuppressLint("MissingPermission")
-    override suspend fun pair() {
-        if (device.bondState == BluetoothDevice.BOND_NONE) {
-            deviceWrapper.createBond()
+    override suspend fun didStartUnpairing() {
+        if (device.bondState != BluetoothDevice.BOND_NONE) {
+            deviceWrapper.removeBond()
         }
     }
 
diff --git a/bluetooth/src/commonMain/kotlin/Attribute.kt b/bluetooth/src/commonMain/kotlin/Attribute.kt
index 68842eab6..21262620a 100644
--- a/bluetooth/src/commonMain/kotlin/Attribute.kt
+++ b/bluetooth/src/commonMain/kotlin/Attribute.kt
@@ -27,7 +27,16 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.MutableSharedFlow
 
-abstract class Attribute<R : DeviceAction.Read, W : DeviceAction.Write>(
+/**
+ * A bluetooth attribute conforming to the Attribute Protocol in Bluetooth Low Energy
+ * @param ReadAction the [DeviceAction.Read] associated with the attribute
+ * @param WriteAction the [DeviceAction.Write] associated with the attribute
+ * @param initialValue the initial [ByteArray] value of the attribute
+ * @param emitNewAction method to call when a new [DeviceConnectionManager.Event.AddAction] event should take place
+ * @param parentLogTag the log tag used to modify the log tag of this attribute
+ * @param logger the [Logger] to use for logging.
+ */
+abstract class Attribute<ReadAction : DeviceAction.Read, WriteAction : DeviceAction.Write>(
     initialValue: ByteArray? = null,
     private val emitNewAction: (DeviceConnectionManager.Event.AddAction) -> Unit,
     private val parentLogTag: String,
@@ -36,6 +45,9 @@ abstract class Attribute<R : DeviceAction.Read, W : DeviceAction.Write>(
 
     protected val logTag: String get() = "$parentLogTag-${uuid.uuidString}"
 
+    /**
+     * The [UUID] of the attribute
+     */
     abstract val uuid: UUID
 
     override suspend fun collect(collector: FlowCollector<ByteArray?>) =
@@ -44,22 +56,34 @@ abstract class Attribute<R : DeviceAction.Read, W : DeviceAction.Write>(
     // TODO make configurable
     private val sharedFlow = MutableSharedFlow<ByteArray?>(0, 256, BufferOverflow.DROP_OLDEST).also { it.tryEmit(initialValue) }
 
-    fun readValue(): DeviceAction {
+    /**
+     * Creates and emits a [ReadAction]
+     * @return the [ReadAction] created
+     */
+    fun readValue(): ReadAction {
         val action = createReadAction()
         addAction(action)
         return action
     }
 
-    internal abstract fun createReadAction(): R
+    internal abstract fun createReadAction(): ReadAction
 
-    fun writeValue(newValue: ByteArray): DeviceAction {
+    /**
+     * Creates and emits a [WriteAction] to write a given [ByteArray]
+     * @param newValue the [ByteArray] to write to the attribute
+     * @return the [WriteAction] created
+     */
+    fun writeValue(newValue: ByteArray): WriteAction {
         val action = createWriteAction(newValue)
         addAction(action)
         return action
     }
 
-    internal abstract fun createWriteAction(newValue: ByteArray): W
+    internal abstract fun createWriteAction(newValue: ByteArray): WriteAction
 
+    /**
+     * Notifies the attribute that a new value may be available
+     */
     open fun updateValue() {
         val nextValue = getUpdatedValue()
         logger.debug(logTag) { "Updated value to $nextValue" }
diff --git a/bluetooth/src/commonMain/kotlin/Bluetooth.kt b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
index f8fea6e34..bb6a82dc5 100644
--- a/bluetooth/src/commonMain/kotlin/Bluetooth.kt
+++ b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
@@ -58,15 +58,53 @@ private val defaultBluetoothDispatcher by lazy {
     singleThreadDispatcher("Bluetooth")
 }
 
+/**
+ * A service for managing Bluetooth [Device]
+ */
 interface BluetoothService {
+
+    /**
+     * Starts scanning for [Device].
+     * To receive the devices, use [devices]
+     * @param filter if not empty, only [Device] that have at least one [Service] matching one of the [UUID] will be scanned.
+     */
     fun startScanning(filter: Set<UUID> = emptySet())
+
+    /**
+     * Stops scanning for [Device]
+     */
     fun stopScanning()
+
+    /**
+     * Gets a [Flow] of the list of [Device] that have been paired to the system
+     * @param filter filters the list to only return the [Device] that at least one [Service] matching one of the provided [UUID]
+     */
     fun pairedDevices(filter: Set<UUID>): Flow<List<Device>>
+
+    /**
+     * Gets a [Flow] containing a list of [Device] scanned by the service.
+     * Requires that [startScanning] has been called, otherwise no devices will be found
+     */
     fun devices(): Flow<List<Device>>
+
+    /**
+     * Gets a [Flow] that indicates whether the service is actively scanning for [Device]
+     */
     suspend fun isScanning(): Flow<Boolean>
+
+    /**
+     * A [Flow] that indicates whether Bluetooth is currently enabled. When `false`, Bluetooth might be unavailable or permissions may be missing.
+     */
     val isEnabled: Flow<Boolean>
 }
 
+/**
+ * A [BluetoothService] that builds a [BaseScanner] for scanning.
+ * @param scannerSettingsBuilder a method for getting the [BaseScanner.Settings] to be used while scanning from a [CoroutineContext]
+ * @param connectionSettings the [ConnectionSettings] to apply to [Device] scanned
+ * @param scannerBuilder the [BaseScanner.Builder] to use to create a [BaseScanner] responsible for scanning.
+ * @param coroutineContext the [CoroutineContext] in which Bluetooth runs
+ */
 class Bluetooth internal constructor(
     scannerSettingsBuilder: suspend (CoroutineContext) -> BaseScanner.Settings,
     connectionSettings: ConnectionSettings,
@@ -94,7 +132,7 @@ class Bluetooth internal constructor(
         coroutineContext + CoroutineName("Scanning State Repo")
     )
 
-    sealed class ScanMode {
+    private sealed class ScanMode {
         object Stopped : ScanMode()
         class Scan(val filter: Set<UUID>) : ScanMode()
     }
@@ -179,27 +217,55 @@ class Bluetooth internal constructor(
         .mapLatest { it is ScanningState.Enabled }
 }
 
+/**
+ * Builder class for creating a [Bluetooth] object.
+ */
 interface BaseBluetoothBuilder {
+
+    /**
+     * Creates a [Bluetooth] object
+     * @param scannerSettingsBuilder a method for getting the [BaseScanner.Settings] to be used while scanning from a [CoroutineContext]
+     * @param connectionSettings the [ConnectionSettings] to apply to [Device] scanned by the [Bluetooth] service.
+     * @param coroutineContext the [CoroutineContext] in which Bluetooth runs
+     */
     fun create(
         scannerSettingsBuilder: (Permissions) -> BaseScanner.Settings = { BaseScanner.Settings(it) },
         connectionSettings: ConnectionSettings = ConnectionSettings(),
         coroutineContext: CoroutineContext = defaultBluetoothDispatcher,
     ): Bluetooth
 }
+
+/**
+ * A default implementation of [BaseBluetoothBuilder]
+ */
 expect class BluetoothBuilder : BaseBluetoothBuilder
 
+/**
+ * Gets a ([Flow] of) [Device] with a given [Identifier] from a [Flow] of a list of [Device].
+ * @param identifier the [Identifier] of the [Device] to get.
+ * @return the [Flow] of [Device] matching the [identifier]
+ */
 operator fun Flow<List<Device>>.get(identifier: Identifier): Flow<Device?> {
     return this.map { devices ->
         devices.firstOrNull { it.identifier == identifier }
     }
 }
 
+/**
+ * Gets a ([Flow] of) [DeviceState] from a [Flow] or [Device]
+ * @return the [Flow] of [DeviceState] associated with the [Device] in the given [Flow]
+ */
 fun Flow<Device?>.state(): Flow<DeviceState> {
     return this.flatMapLatest { device ->
         device?.state ?: emptyFlow()
     }
 }
 
+/**
+ * Gets a ([Flow] of) the list of [Service] associated with the [Device] in a [Flow]
+ * This will automatically discover services if the device is in a [ConnectableDeviceState.Connected.NoServices] state.
+ * @return the [Flow] of the list of [Service] associated with the [Device] in the given [Flow]
+ */
 fun Flow<Device?>.services(): Flow<List<Service>> {
     return state().transformLatest { deviceState ->
         emit(
@@ -221,6 +287,10 @@ fun Flow<Device?>.services(): Flow<List<Service>> {
     }.distinctUntilChanged()
 }
 
+/**
+ * Attempts to connect to the [Device] from a [Flow] of [Device]
+ * When this method completes, the devices should be in a [ConnectableDeviceState.Connected] state
+ */
 suspend fun Flow<Device?>.connect() {
     transformLatest { device ->
         device?.let {
@@ -229,6 +299,10 @@ suspend fun Flow<Device?>.connect() {
     }.first()
 }
 
+/**
+ * Attempts to disconnect to the [Device] from a [Flow] of [Device]
+ * When this method completes, the devices should be in a [ConnectableDeviceState.Disconnected] state
+ */
 suspend fun Flow<Device?>.disconnect() {
     transformLatest { device ->
         device?.let {
@@ -238,14 +312,30 @@ suspend fun Flow<Device?>.disconnect() {
     }.first()
 }
 
+/**
+ * Gets the ([Flow] of) [DeviceInfo] from a [Flow] of [Device]
+ * @return the [Flow] of [DeviceInfo] associated with the [Device] in the given [Flow]
+ */
 fun Flow<Device?>.info(): Flow<DeviceInfo> = flatMapLatest { device ->
     device?.info ?: emptyFlow()
 }
 
+/**
+ * Gets the ([Flow] of) [BaseAdvertisementData] from a [Flow] of [Device]
+ * @return the [Flow] of [BaseAdvertisementData] associated with the [Device] in the given [Flow]
+ */
 fun Flow<Device?>.advertisement(): Flow<BaseAdvertisementData> = info().map { it.advertisementData }.distinctUntilChanged()
 
+/**
+ * Gets the ([Flow] of) the RSSI value from a [Flow] of [Device]
+ * @return the [Flow] of the RSSI value associated with the [Device] in the given [Flow]
+ */
 fun Flow<Device?>.rssi(): Flow<Int> = info().map { it.rssi }.distinctUntilChanged()
 
+/**
+ * Gets the ([Flow] of) the Maximum Transmission Unit (MTU) from a [Flow] of [Device]
+ * @return the [Flow] of MTU associated with the [Device] in the given [Flow]
+ */
 fun Flow<Device?>.mtu() = state().map { state ->
     if (state is ConnectableDeviceState.Connected) {
         state.mtu
@@ -254,6 +344,13 @@ fun Flow<Device?>.mtu() = state().map { state ->
     }
 }.distinctUntilChanged()
 
+/**
+ * Gets the ([Flow] of) the distance in meters between the scanner and a [Flow] of [Device].
+ * To get a more stable result, this method will average the distance over the last [averageOver] results.
+ * @param environmentalFactor the constant to account for environmental interference. Should usually range between 2.0 and 4.0
+ * @param averageOver averages the calculated distance over this amount of scan results. Always uses the last results.
+ * @return the [Flow] of distance in meters between the scanner and the [Device] in the given [Flow]
+ */
 fun Flow<Device?>.distance(environmentalFactor: Double = 2.0, averageOver: Int = 5): Flow<Double> {
     val lastNResults = mutableListOf<Double>()
     return this.info().map { deviceInfo ->
@@ -270,6 +367,10 @@ fun Flow<Device?>.distance(environmentalFactor: Double = 2.0, averageOver: Int =
     }
 }
 
+/**
+ * Attempts to request an update to the RSSI of the [Device] from a [Flow] of [Device]
+ * When this method completes, the devices should have had [ConnectableDeviceState.Connected.readRssi] called
+ */
 suspend fun Flow<Device?>.updateRssi() {
     state().transformLatest { deviceState ->
         when (deviceState) {
@@ -282,6 +383,12 @@ suspend fun Flow<Device?>.updateRssi() {
     }.first()
 }
 
+/**
+ * Attempts to request a Maximum Transmission Unit (MTU) size for the [Device] from a [Flow] of [Device]
+ * When this method completes, the devices should have had [ConnectableDeviceState.Connected.requestMtu] called
+ * @param mtu the MTU size to request
+ * @return if `true` the new MTU value has been requested successfully
+ */
 suspend fun Flow<Device?>.requestMtu(mtu: Int): Boolean {
     return state().transformLatest { deviceState ->
         when (deviceState) {
@@ -293,6 +400,11 @@ suspend fun Flow<Device?>.requestMtu(mtu: Int): Boolean {
     }.first()
 }
 
+/**
+ * Gets a ([Flow] of) [Service] of a given [UUID] from a [Flow] of a list of [Service]
+ * @param uuid the [UUID] of the [Service] to get
+ * @return the [Flow] of the [Service] with [uuid] in the list of [Service] in the given [Flow]
+ */
 @JvmName("getService")
 operator fun Flow<List<Service>>.get(uuid: UUID): Flow<Service?> {
     return this.map { services ->
@@ -302,16 +414,32 @@ operator fun Flow<List<Service>>.get(uuid: UUID): Flow<Service?> {
     }
 }
 
+/**
+ * Gets a ([Flow] of) the list [Characteristic] associated with the [Service] in a [Flow]
+ * @return the [Flow] of the list of [Characteristic] associated with the [Service] in the given [Flow]
+ */
 fun Flow<Service?>.characteristics(): Flow<List<Characteristic>> {
     return this.mapLatest { service -> service?.characteristics ?: emptyList() }.distinctUntilChanged()
 }
 
+/**
+ * Gets a ([Flow] of) the list [Descriptor] associated with the [Characteristic] in a [Flow]
+ * @return the [Flow] of the list of [Descriptor] associated with the [Characteristic] in the given [Flow]
+ */
 fun Flow<Characteristic?>.descriptors(): Flow<List<Descriptor>> {
     return this.mapLatest { characteristic -> characteristic?.descriptors ?: emptyList() }.distinctUntilChanged()
 }
 
+/**
+ * Gets a ([Flow] of) [AttributeType] of a given [UUID] from a [Flow] of a list of [AttributeType]
+ * @param AttributeType the type of [Attribute] to get
+ * @param ReadAction the [DeviceAction.Read] associated with [AttributeType]
+ * @param WriteAction the [DeviceAction.Write] associated with [AttributeType]
+ * @param uuid the [UUID] of the [AttributeType] to get
+ * @return the [Flow] of the [AttributeType] with [uuid] in the list of [AttributeType] in the given [Flow]
+ */
 @JvmName("getAttribute")
-operator fun <T : Attribute<R, W>, R : DeviceAction.Read, W : DeviceAction.Write> Flow<List<T>>.get(uuid: UUID): Flow<T?> {
+operator fun <AttributeType : Attribute<ReadAction, WriteAction>, ReadAction : DeviceAction.Read, WriteAction : DeviceAction.Write> Flow<List<AttributeType>>.get(uuid: UUID): Flow<AttributeType?> {
     return this.map { attribute ->
         attribute.firstOrNull {
             it.uuid.uuidString == uuid.uuidString
@@ -319,7 +447,14 @@ operator fun <T : Attribute<R, W>, R : DeviceAction.Read, W : DeviceAction.Write
     }
 }
 
-fun <T : Attribute<R, W>, R : DeviceAction.Read, W : DeviceAction.Write> Flow<T?>.value(): Flow<ByteArray?> {
+/**
+ * Gets a ([Flow] of) the [ByteArray] value from a [Flow] of a [AttributeType]
+ * @param AttributeType the type of [Attribute] to get the value from
+ * @param ReadAction the [DeviceAction.Read] associated with [AttributeType]
+ * @param WriteAction the [DeviceAction.Write] associated with [AttributeType]
+ * @return the [Flow] of the [ByteArray] value of the [AttributeType] in the given [Flow]
+ */
+fun <AttributeType : Attribute<ReadAction, WriteAction>, ReadAction : DeviceAction.Read, WriteAction : DeviceAction.Write> Flow<AttributeType?>.value(): Flow<ByteArray?> {
     return this.flatMapLatest { attribute ->
         attribute ?: flowOf(null)
     } // TODO: we probably want to read duplicate values so this is for now disabled: .distinctUntilChanged()
diff --git a/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt
index 0f875bb2a..12edc944c 100644
--- a/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/commonMain/kotlin/BluetoothMonitor.kt
@@ -19,9 +19,20 @@ package com.splendo.kaluga.bluetooth
 
 import com.splendo.kaluga.service.ServiceMonitor
 
+/**
+ * A [ServiceMonitor] that monitors whether Bluetooth is enabled
+ */
 expect interface BluetoothMonitor : ServiceMonitor {
 
+    /**
+     * Builder for creating a [BluetoothMonitor]
+     */
     class Builder {
+
+        /**
+         * Creates the [BluetoothMonitor]
+         * @return the [BluetoothMonitor] created
+         */
         fun create(): BluetoothMonitor
     }
 }
diff --git a/bluetooth/src/commonMain/kotlin/Characteristic.kt b/bluetooth/src/commonMain/kotlin/Characteristic.kt
index 1ed08ab4f..b29f64993 100644
--- a/bluetooth/src/commonMain/kotlin/Characteristic.kt
+++ b/bluetooth/src/commonMain/kotlin/Characteristic.kt
@@ -24,6 +24,14 @@ import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.first
 
+/**
+ * An [Attribute] of a Bluetooth Characteristic
+ * @property wrapper the [CharacteristicWrapper] to access the platform characteristic
+ * @param initialValue the initial [ByteArray] value of the characteristic
+ * @param emitNewAction method to call when a new [DeviceConnectionManager.Event.AddAction] event should take place
+ * @param parentLogTag the log tag used to modify the log tag of this characteristic
+ * @param logger the [Logger] to use for logging.
+ */
 open class Characteristic(
     val wrapper: CharacteristicWrapper,
     initialValue: ByteArray? = null,
@@ -39,6 +47,10 @@ open class Characteristic(
 
     private val isBusy = MutableStateFlow(false)
     private val _isNotifying = atomic(false)
+
+    /**
+     * If `true` this characteristic has been set to automatically provide updates to its value
+     */
     var isNotifying: Boolean
         get() = _isNotifying.value
         set(value) { _isNotifying.value = value }
@@ -103,6 +115,9 @@ open class Characteristic(
 
     override val uuid = wrapper.uuid
 
+    /**
+     * The list of [Descriptor] associated with the characteristic
+     */
     val descriptors: List<Descriptor> = wrapper.descriptors.map { Descriptor(it, emitNewAction = emitNewAction, parentLogTag = logTag, logger = logger) }
 
     override fun createReadAction(): DeviceAction.Read.Characteristic {
@@ -122,32 +137,99 @@ open class Characteristic(
         return wrapper.value?.asBytes
     }
 
+    /**
+     * Checks if the characteristic has a given [CharacteristicProperties]
+     */
     fun hasProperty(property: CharacteristicProperties) = hasProperties(listOf(property))
 
     private fun hasProperties(properties: List<CharacteristicProperties>) = wrapper
         .containsAnyOf(*properties.map(CharacteristicProperties::rawValue).toIntArray())
 }
 
+/**
+ * Accessor to the platform level Bluetooth characteristic
+ */
 expect interface CharacteristicWrapper {
+    /**
+     * The [UUID] of the characteristic
+     */
     val uuid: UUID
+
+    /**
+     * The list of [DescriptorWrapper] of associated with the characteristic
+     */
     val descriptors: List<DescriptorWrapper>
+
+    /**
+     * The current [Value] of the characteristic
+     */
     val value: Value?
+
+    /**
+     * The integer representing all [CharacteristicProperties] of the characteristic
+     */
     val properties: Int
 }
 
+/**
+ * Checks whether [CharacteristicWrapper.properties] contains any properties in [property]
+ * @param property the list of properties to check
+ * @return `tre` if [CharacteristicWrapper.properties] contains at least one of [property]
+ */
 fun CharacteristicWrapper.containsAnyOf(vararg property: Int) = if (property.isNotEmpty()) {
     properties and property.reduce { acc, i -> acc.or(i) } != 0
 } else { false }
 
+/**
+ * The properties associated with a Bluetooth Characteristic
+ * @param rawValue the raw value associated with the property
+ */
 sealed class CharacteristicProperties(val rawValue: Int) {
+
+    /**
+     * Characteristic is broadcastable
+     */
     object Broadcast : CharacteristicProperties(0x01)
+
+    /**
+     * Characteristic is readable
+     */
     object Read : CharacteristicProperties(0x02)
+
+    /**
+     * Characteristic can be written without response
+     */
     object WriteWithoutResponse : CharacteristicProperties(0x04)
+
+    /**
+     * Characteristic can be written
+     */
     object Write : CharacteristicProperties(0x08)
+
+    /**
+     * Characteristic supports notification
+     */
     object Notify : CharacteristicProperties(0x10)
+
+    /**
+     * Characteristic supports indication
+     */
     object Indicate : CharacteristicProperties(0x20)
+
+    /**
+     * Characteristic supports write with signature
+     */
     object SignedWrite : CharacteristicProperties(0x40)
+
+    /**
+     * Characteristic has extended properties
+     */
     object ExtendedProperties : CharacteristicProperties(0x80)
 
+    /**
+     * Gets a [CharacteristicProperties] by combining two [CharacteristicProperties]
+     * @param other the [CharacteristicProperties] to combine with
+     * @return the combined [CharacteristicProperties]
+     */
     infix fun or(other: CharacteristicProperties) = rawValue or other.rawValue
 }
diff --git a/bluetooth/src/commonMain/kotlin/Descriptor.kt b/bluetooth/src/commonMain/kotlin/Descriptor.kt
index a012366e0..948b9c2bb 100644
--- a/bluetooth/src/commonMain/kotlin/Descriptor.kt
+++ b/bluetooth/src/commonMain/kotlin/Descriptor.kt
@@ -21,6 +21,14 @@ import com.splendo.kaluga.bluetooth.device.DeviceAction
 import com.splendo.kaluga.bluetooth.device.DeviceConnectionManager
 import com.splendo.kaluga.logging.Logger
 
+/**
+ * An [Attribute] of a Bluetooth Descriptor
+ * @property wrapper the [DescriptorWrapper] to access the platform descriptor
+ * @param initialValue the initial [ByteArray] value of the descriptor
+ * @param emitNewAction method to call when a new [DeviceConnectionManager.Event.AddAction] event should take place
+ * @param parentLogTag the log tag used to modify the log tag of this descriptor
+ * @param logger the [Logger] to use for logging.
+ */
 open class Descriptor(
     val wrapper: DescriptorWrapper,
     initialValue: ByteArray? = null,
@@ -49,7 +57,18 @@ open class Descriptor(
     }
 }
 
+/**
+ * Accessor the the platform level Bluetooth Descriptor
+ */
 expect interface DescriptorWrapper {
+
+    /**
+     * The [UUID] of the descriptor
+     */
     val uuid: UUID
+
+    /**
+     * The current [Value] of the descriptor
+     */
     val value: Value?
 }
diff --git a/bluetooth/src/commonMain/kotlin/Service.kt b/bluetooth/src/commonMain/kotlin/Service.kt
index 87bf218dc..464b691b6 100644
--- a/bluetooth/src/commonMain/kotlin/Service.kt
+++ b/bluetooth/src/commonMain/kotlin/Service.kt
@@ -20,13 +20,28 @@ package com.splendo.kaluga.bluetooth
 import com.splendo.kaluga.bluetooth.device.DeviceConnectionManager
 import com.splendo.kaluga.logging.Logger
 
+/**
+ * A Bluetooth Service
+ * @param service the [ServiceWrapper] to access the platform service
+ * @param emitNewAction method to call when a new [DeviceConnectionManager.Event.AddAction] event should take place
+ * @param parentLogTag the log tag used to modify the log tag of this service
+ * @param logger the [Logger] to use for logging.
+ */
 class Service(
     service: ServiceWrapper,
     emitNewAction: (DeviceConnectionManager.Event.AddAction) -> Unit,
     parentLogTag: String,
     logger: Logger
 ) {
+
+    /**
+     * The [UUID] of the service
+     */
     val uuid = service.uuid
+
+    /**
+     * The list of [Characteristic] associated with the service
+     */
     val characteristics = service.characteristics.map {
         Characteristic(
             it,
@@ -37,7 +52,18 @@ class Service(
     }
 }
 
+/**
+ * Accessor to the platform level Bluetooth service
+ */
 expect interface ServiceWrapper {
+
+    /**
+     * The list of [CharacteristicWrapper] associated with the service
+     */
     val characteristics: List<CharacteristicWrapper>
+
+    /**
+     * The [UUID] of the service
+     */
     val uuid: UUID
 }
diff --git a/bluetooth/src/commonMain/kotlin/UUID.kt b/bluetooth/src/commonMain/kotlin/UUID.kt
index b4ee56490..85369c4c8 100644
--- a/bluetooth/src/commonMain/kotlin/UUID.kt
+++ b/bluetooth/src/commonMain/kotlin/UUID.kt
@@ -31,20 +31,45 @@ private object Constants {
     const val baseBluetoothUUID = "0000%s-0000-1000-8000-00805f9b34fb"
 }
 
+/**
+ * An [Exception] dealing with issues to the Unique identifier
+ * @param message the message of the exception
+ */
 sealed class UUIDException(message: String?) : Exception(message) {
+
+    /**
+     * A [UUIDException] thrown when [uuidFrom] cannot convert a string to a [UUID]
+     * @param uuidString the string that could not be converted to a [UUID]
+     */
     class InvalidFormat(uuidString: String) :
         UUIDException("String '$uuidString' does not represent a valid UUID")
 }
 
+/**
+ * The Unique Identifier of a Bluetooth property
+ */
 expect class UUID
 
+/**
+ * The string representation of a [UUID]
+ */
 expect val UUID.uuidString: String
 
+/**
+ * Gets the [UUID] from a given string
+ * @param uuidString the string to converter to a [UUID]
+ * @return the [UUID] associated with the string
+ * @throws [UUIDException] if [uuidString] is not a valid [UUID]
+ */
 @Throws(UUIDException::class)
 fun uuidFrom(uuidString: String): UUID =
     if (uuidString.isValidUUIDString()) unsafeUUIDFrom(uuidString)
     else throw UUIDException.InvalidFormat(uuidString)
 
+/**
+ * Gets a random [UUID]
+ * @return a random [UUID]
+ */
 expect fun randomUUID(): UUID
 
 /**
diff --git a/bluetooth/src/commonMain/kotlin/Value.kt b/bluetooth/src/commonMain/kotlin/Value.kt
index f9893c06f..e11b7b1c1 100644
--- a/bluetooth/src/commonMain/kotlin/Value.kt
+++ b/bluetooth/src/commonMain/kotlin/Value.kt
@@ -17,6 +17,12 @@
 
 package com.splendo.kaluga.bluetooth
 
+/**
+ * The value of a platform specific bluetooth attribute
+ */
 expect class Value
 
+/**
+ * Gets the [ByteArray] value of a [Value]
+ */
 expect val Value.asBytes: ByteArray
diff --git a/bluetooth/src/commonMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/commonMain/kotlin/device/AdvertisementData.kt
index 0ca6949e4..2b569df1d 100644
--- a/bluetooth/src/commonMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/commonMain/kotlin/device/AdvertisementData.kt
@@ -20,16 +20,49 @@ package com.splendo.kaluga.bluetooth.device
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.uuidString
 
+/**
+ * Data advertised by a Bluetooth [Device]
+ */
 interface BaseAdvertisementData {
+    /**
+     * The name of the Bluetooth device.
+     */
     val name: String?
+
+    /**
+     * The identifier of the manufacturer of the Bluetooth device
+     */
     val manufacturerId: Int?
+
+    /**
+     * The manufacturer specific data of the Bluetooth device
+     */
     val manufacturerData: ByteArray?
+
+    /**
+     * The list of [UUID] of services advertised by the Bluetooth device
+     */
     val serviceUUIDs: List<UUID>
+
+    /**
+     * A map of all the data of the services as advertised by the Bluetooth device
+     */
     val serviceData: Map<UUID, ByteArray?>
+
+    /**
+     * The transmission power level of the packet in dBm
+     */
     val txPowerLevel: Int
+
+    /**
+     * If `true` the [Device] can be connected to
+     */
     val isConnectable: Boolean
 }
 
+/**
+ * Platform specific implementation of [BaseAdvertisementData]
+ */
 expect class AdvertisementData : BaseAdvertisementData
 
 val BaseAdvertisementData.description: String get() = listOfNotNull(
diff --git a/bluetooth/src/commonMain/kotlin/device/ConnectionSettings.kt b/bluetooth/src/commonMain/kotlin/device/ConnectionSettings.kt
index d33b8a48c..f2c178647 100644
--- a/bluetooth/src/commonMain/kotlin/device/ConnectionSettings.kt
+++ b/bluetooth/src/commonMain/kotlin/device/ConnectionSettings.kt
@@ -21,14 +21,32 @@ import com.splendo.kaluga.logging.Logger
 import com.splendo.kaluga.logging.RestrictedLogLevel
 import com.splendo.kaluga.logging.RestrictedLogger
 
+/**
+ * Settings to apply to a [Device] when connecting
+ * @property reconnectionSettings the [ReconnectionSettings] to apply when reconnecting
+ * @property logger the [Logger] to use for logging
+ */
 data class ConnectionSettings(
     val reconnectionSettings: ReconnectionSettings = ReconnectionSettings.Always,
     val logger: Logger = RestrictedLogger(RestrictedLogLevel.None)
 ) {
 
+    /**
+     * Behaviour to apply when a [Device] disconnects unexpectedly
+     */
     sealed class ReconnectionSettings {
+        /**
+         * Should always try to reconnect when an unexpected disconnect occurs
+         */
         object Always : ReconnectionSettings()
+        /**
+         * Should never try to reconnect when an unexpected disconnect occurs
+         */
         object Never : ReconnectionSettings()
+        /**
+         * Should try to reconnect a given amount of times when an unexpected disconnect occurs
+         * @param attempts the number of reconnection attempts that should take place before giving up
+         */
         data class Limited(val attempts: Int) : ReconnectionSettings()
     }
 }
diff --git a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 754b92d00..9d0b35326 100644
--- a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -37,55 +37,211 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlin.jvm.JvmName
 
+/**
+ * A manager for connecting a [Device]
+ */
 interface DeviceConnectionManager {
+
+    /**
+     * The state of a [DeviceConnectionManager]
+     */
     enum class State {
+        /**
+         * Device is disconnected
+         */
         DISCONNECTED,
+        /**
+         * Device is disconnecting
+         */
         DISCONNECTING,
+        /**
+         * Device is connected
+         */
         CONNECTED,
+        /**
+         * Device is connecting
+         */
         CONNECTING
     }
 
+    /**
+     * Events detected by a [DeviceConnectionManager]
+     */
     sealed class Event {
+
+        /**
+         * [Event] indicating the device started connecting
+         */
         object Connecting : Event()
+
+        /**
+         * [Event] indicating the device cancelled connecting
+         */
         object CancelledConnecting : Event()
+
+        /**
+         * [Event] indicating the device did connect
+         */
         object Connected : Event()
+
+        /**
+         * [Event] indicating the device started disconnecting
+         */
         object Disconnecting : Event()
+
+        /**
+         * [Event] indicating the device did disconnect
+         * @property onDisconnect the action to execute once the event has been handled
+         */
         data class Disconnected(val onDisconnect: suspend () -> Unit) : Event()
+
+        /**
+         * [Event] indicating the device started discovering services
+         */
         object Discovering : Event()
+
+        /**
+         * [Event] indicating the device has discovered a list of [Service]
+         * @property services the list of [Service] discovered
+         */
         data class DiscoveredServices(val services: List<Service>) : Event()
+
+        /**
+         * [Event] indicating a [DeviceAction] should be scheduled
+         * @property action the [DeviceAction] to schedule
+         */
         data class AddAction(val action: DeviceAction) : Event()
+
+        /**
+         * [Event] indicating the device completed executing a [DeviceAction]
+         * @property action the [DeviceAction] that was executed
+         * @property succeeded if `true`, [action] completed successfully
+         */
         data class CompletedAction(val action: DeviceAction?, val succeeded: Boolean) : Event()
+
+        /**
+         * [Event] indicating the device has updated its Maximum Transmission Unit (MTU) size
+         */
         data class MtuUpdated(val newMtu: Int) : Event()
     }
 
+    /**
+     * A [Flow] of all the [Event] detected by the connection manager
+     */
     val events: Flow<Event>
+
+    /**
+     * A [Flow] of the RSSI value of the device
+     */
     val rssi: Flow<Int>
 
+    /**
+     * Gets the current [State] of the device
+     */
     fun getCurrentState(): State
+
+    /**
+     * Starts connecting to the device
+     */
     suspend fun connect()
+
+    /**
+     * Starts discovering [Service] for the device
+     */
     suspend fun discoverServices()
+
+    /**
+     * Starts disconnecting from the device
+     */
     suspend fun disconnect()
+
+    /**
+     * Starts reading the latest RSSI value of the device
+     */
     suspend fun readRssi()
+
+    /**
+     * Requests an update to the Maximum Transmission Unit (MTU) size of the device
+     * @param mtu the size of the MTU to request
+     * @return `true` if the request was successful
+     */
     suspend fun requestMtu(mtu: Int): Boolean
+
+    /**
+     * Starts performing a [DeviceAction]
+     * @param action the [DeviceAction] to perform
+     */
     suspend fun performAction(action: DeviceAction)
+
+    /**
+     * Fires a [Event.Connecting]
+     */
     fun startConnecting()
+
+    /**
+     * Fires a [Event.CancelledConnecting]
+     */
     fun cancelConnecting()
+
+    /**
+     * Fires a [Event.Connected]
+     */
     fun handleConnect()
+
+    /**
+     * Fires a [Event.Discovering]
+     */
     fun startDiscovering()
+
+    /**
+     * Fires a [Event.Disconnecting]
+     */
     fun startDisconnecting()
+
+    /**
+     * Fires a [Event.Disconnected]
+     */
     fun handleDisconnect(onDisconnect: (suspend () -> Unit)? = null)
+
+    /**
+     * Resets all actions and disconnects the device
+     */
     suspend fun reset()
-    suspend fun unpair()
+
+    /**
+     * Pairs the device
+     */
     suspend fun pair()
+
+    /**
+     * Unpairs from the device
+     */
+    suspend fun unpair()
 }
 
+/**
+ * A [DeviceConnectionManager] using a [DeviceWrapper]
+ * @param deviceWrapper the [DeviceWrapper] wrapping the [Device]
+ * @param settings the [ConnectionSettings] to apply for connecting
+ * @param coroutineScope the [CoroutineScope] on which the device should be managed
+ */
 abstract class BaseDeviceConnectionManager(
-    val deviceWrapper: DeviceWrapper,
+    protected val deviceWrapper: DeviceWrapper,
     settings: ConnectionSettings,
     private val coroutineScope: CoroutineScope
 ) : DeviceConnectionManager, CoroutineScope by coroutineScope {
 
+    /**
+     * Builder for creating a [BaseDeviceConnectionManager]
+     */
     interface Builder {
+
+        /**
+         * Creates a [BaseDeviceConnectionManager]
+         * @param deviceWrapper the [DeviceWrapper] wrapping the [Device]
+         * @param settings the [ConnectionSettings] to apply for connecting
+         * @param coroutineScope the [CoroutineScope] on which the device should be managed
+         */
         fun create(
             deviceWrapper: DeviceWrapper,
             settings: ConnectionSettings,
@@ -110,46 +266,60 @@ abstract class BaseDeviceConnectionManager(
         // TODO call into abstract function?
     }
 
-    fun handleNewRssi(rssi: Int) {
+    protected open fun handleNewRssi(rssi: Int) {
         logger.debug(logTag) { "Updated Rssi $rssi" }
         sharedRssi.tryEmit(rssi)
     }
 
-    fun handleNewMtu(mtu: Int) {
+    protected fun handleNewMtu(mtu: Int) {
         logger.debug(logTag) { "Updated Mtu $mtu" }
         emitEvent(DeviceConnectionManager.Event.MtuUpdated(mtu))
     }
 
-    override fun startConnecting() {
+    final override fun startConnecting() {
         logger.info(logTag) { "Start Connecting" }
         emitEvent(DeviceConnectionManager.Event.Connecting)
     }
 
-    override fun cancelConnecting() {
+    final override fun cancelConnecting() {
         logger.info(logTag) { "Cancel Connecting" }
         emitEvent(DeviceConnectionManager.Event.CancelledConnecting)
     }
 
-    override fun handleConnect() {
+    final override fun handleConnect() {
         logger.info(logTag) { "Did Connect" }
         emitEvent(DeviceConnectionManager.Event.Connected)
     }
 
-    override fun startDisconnecting() {
+    final override fun startDisconnecting() {
         logger.info(logTag) { "Start Disconnecting" }
         emitEvent(DeviceConnectionManager.Event.Disconnecting)
     }
 
-    override suspend fun performAction(action: DeviceAction) {
+    final override suspend fun performAction(action: DeviceAction) {
         logger.info(logTag) { "Perform action $action" }
-        // TODO call into abstract function?
+        didStartPerformingAction(action)
+    }
+
+    protected abstract suspend fun didStartPerformingAction(action: DeviceAction)
+
+    final override suspend fun pair() {
+        logger.info(logTag) { "Pair" }
+        didStartPairing()
+    }
+
+    protected abstract suspend fun didStartPairing()
+
+    final override suspend fun unpair() {
+        logger.info(logTag) { "Unpair" }
+        didStartUnpairing()
     }
 
-    // TODO add logging for pairing
+    protected abstract suspend fun didStartUnpairing()
 
-    fun createService(wrapper: ServiceWrapper): Service = Service(wrapper, ::emitEvent, logTag, logger)
+    protected open fun createService(wrapper: ServiceWrapper): Service = Service(wrapper, ::emitEvent, logTag, logger)
 
-    override fun handleDisconnect(onDisconnect: (suspend () -> Unit)?) {
+    final override fun handleDisconnect(onDisconnect: (suspend () -> Unit)?) {
         val currentAction = this.currentAction
         currentAction?.completedSuccessfully?.cancel()
         val notifyingCharacteristics = this.notifyingCharacteristics
@@ -163,20 +333,20 @@ abstract class BaseDeviceConnectionManager(
         emitEvent(DeviceConnectionManager.Event.Disconnected(clean))
     }
 
-    override fun startDiscovering() {
+    final override fun startDiscovering() {
         logger.info(logTag) { "Start Discovering Services" }
         emitEvent(DeviceConnectionManager.Event.Discovering)
     }
 
     @JvmName("handleDiscoverWrappersCompleted")
-    fun handleDiscoverCompleted(serviceWrappers: List<ServiceWrapper>) = handleDiscoverCompleted(serviceWrappers.map { createService(it) })
+    internal fun handleDiscoverCompleted(serviceWrappers: List<ServiceWrapper>) = handleDiscoverCompleted(serviceWrappers.map { createService(it) })
 
-    fun handleDiscoverCompleted(services: List<Service>) {
+    protected open fun handleDiscoverCompleted(services: List<Service>) {
         logger.info(logTag) { "Discovered services: ${services.map { it.uuid.uuidString }}" }
         emitEvent(DeviceConnectionManager.Event.DiscoveredServices(services))
     }
 
-    open fun handleCurrentActionCompleted(succeeded: Boolean) {
+    protected open fun handleCurrentActionCompleted(succeeded: Boolean) {
         val currentAction = this.currentAction
         this.currentAction = null
         if (currentAction != null) {
@@ -188,7 +358,7 @@ abstract class BaseDeviceConnectionManager(
         emitEvent(DeviceConnectionManager.Event.CompletedAction(currentAction, succeeded))
     }
 
-    fun handleUpdatedCharacteristic(uuid: UUID, succeeded: Boolean, onUpdate: ((Characteristic) -> Unit)? = null) {
+    protected open fun handleUpdatedCharacteristic(uuid: UUID, succeeded: Boolean, onUpdate: ((Characteristic) -> Unit)? = null) {
         notifyingCharacteristics[uuid.uuidString]?.let {
             onUpdate?.invoke(it)
             it.updateValue()
@@ -214,7 +384,7 @@ abstract class BaseDeviceConnectionManager(
         }
     }
 
-    fun handleUpdatedDescriptor(uuid: UUID, succeeded: Boolean, onUpdate: ((Descriptor) -> Unit)? = null) {
+    protected open fun handleUpdatedDescriptor(uuid: UUID, succeeded: Boolean, onUpdate: ((Descriptor) -> Unit)? = null) {
         val descriptorToUpdate = when (val action = currentAction) {
             is DeviceAction.Read.Descriptor -> {
                 if (action.descriptor.uuid.uuidString == uuid.uuidString) {
diff --git a/bluetooth/src/commonMain/kotlin/device/Device.kt b/bluetooth/src/commonMain/kotlin/device/Device.kt
index 33fc3ecb5..0ab4fd763 100644
--- a/bluetooth/src/commonMain/kotlin/device/Device.kt
+++ b/bluetooth/src/commonMain/kotlin/device/Device.kt
@@ -38,21 +38,74 @@ import kotlinx.coroutines.flow.updateAndGet
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A Mutable [StateRepo] of [ConnectableDeviceState]
+ */
 typealias ConnectableDeviceStateFlowRepo = StateRepo<ConnectableDeviceState, MutableStateFlow<ConnectableDeviceState>>
 
+/**
+ * A Bluetooth device that can be connected to
+ */
 interface Device {
+
+    /**
+     * The [Identifier] of the device
+     */
     val identifier: Identifier
+
+    /**
+     * A [Flow] of the latest [DeviceInfo] of the device
+     */
     val info: Flow<DeviceInfo>
+
+    /**
+     * A [Flow] of the latest [DeviceState] of the device
+     */
     val state: Flow<DeviceState>
 
+    /**
+     * Attempts to connect to the device
+     * @return `true` if connection was successful.
+     */
     suspend fun connect(): Boolean
+
+    /**
+     * Notifies the device that is has connected
+     */
     fun handleConnected()
+
+    /**
+     * Attempts to disconnect from the device
+     */
     suspend fun disconnect()
-    suspend fun handleDisconnected()
+
+    /**
+     * Notifies the device that is has disconnected
+     */
+    fun handleDisconnected()
+
+    /**
+     * Notifies the device that the RSSI has updated
+     * @param rssi the new RSSI value
+     */
     fun rssiDidUpdate(rssi: Int)
+
+    /**
+     * Notifies the device that the [BaseAdvertisementData] has updated
+     * @param advertisementData the new [BaseAdvertisementData]
+     */
     fun advertisementDataDidUpdate(advertisementData: BaseAdvertisementData)
 }
 
+/**
+ * Implementation of [Device]
+ * @param identifier The [Identifier] of the device
+ * @param initialDeviceInfo the initial [DeviceInfoImpl] known about the device
+ * @param connectionSettings the [ConnectionSettings] to apply to the [DeviceConnectionManager] associated with this device
+ * @param connectionManagerBuilder creates a [DeviceConnectionManager] to manage connecting this device
+ * @param coroutineScope the [CoroutineScope] this device is running on]
+ * @param createDeviceStateFlow creates a [ConnectableDeviceStateFlowRepo] to manage the device connection state
+ */
 class DeviceImpl(
     override val identifier: Identifier,
     initialDeviceInfo: DeviceInfoImpl,
@@ -127,15 +180,13 @@ class DeviceImpl(
         }
     }
 
-    override suspend fun connect(): Boolean = createDeviceStateRepoIfNotCreated()?.let { repo ->
-        repo.transformLatest { deviceState ->
-            when (deviceState) {
-                is ConnectableDeviceState.Disconnected -> deviceState.startConnecting()
-                is ConnectableDeviceState.Connected -> emit(true)
-                is ConnectableDeviceState.Connecting, is ConnectableDeviceState.Reconnecting, is ConnectableDeviceState.Disconnecting -> {}
-            }
-        }.first()
-    } ?: false
+    override suspend fun connect(): Boolean = createDeviceStateRepoIfNotCreated()?.transformLatest { deviceState ->
+        when (deviceState) {
+            is ConnectableDeviceState.Disconnected -> deviceState.startConnecting()
+            is ConnectableDeviceState.Connected -> emit(true)
+            is ConnectableDeviceState.Connecting, is ConnectableDeviceState.Reconnecting, is ConnectableDeviceState.Disconnecting -> {}
+        }
+    }?.first() ?: false
 
     override fun handleConnected() = createConnectionManagerIfNotCreated().handleConnect()
 
@@ -151,7 +202,7 @@ class DeviceImpl(
         }?.first()
     }
 
-    override suspend fun handleDisconnected() = createConnectionManagerIfNotCreated().handleDisconnect()
+    override fun handleDisconnected() = createConnectionManagerIfNotCreated().handleDisconnect()
 
     override fun rssiDidUpdate(rssi: Int) {
         sharedInfo.value = sharedInfo.value.copy(rssi = rssi)
@@ -296,6 +347,11 @@ class DeviceImpl(
         }
 }
 
+/**
+ * A [HotStateFlowRepo] to manage the [ConnectableDeviceState] of a [Device]
+ * @param initialState gets the initial [ConnectableDeviceState] when observation starts
+ * @param coroutineContext the [CoroutineContext] of this repo
+ */
 abstract class BaseConnectableDeviceStateRepo(
     initialState: () -> ConnectableDeviceState,
     coroutineContext: CoroutineContext
@@ -304,6 +360,11 @@ abstract class BaseConnectableDeviceStateRepo(
     initialState = { initialState() }
 )
 
+/**
+ * A [BaseConnectableDeviceStateRepo] managed by a [DeviceConnectionManager]
+ * @param connectionManager the [DeviceConnectionManager] to manage the [ConnectableDeviceState]
+ * @param coroutineContext the [CoroutineContext] of this repo
+ */
 class ConnectableDeviceStateImplRepo(
     connectionManager: DeviceConnectionManager,
     coroutineContext: CoroutineContext
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
index 1bc054965..9a419be91 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
@@ -28,19 +28,43 @@ import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlin.math.pow
 
+/**
+ * Unique identifier of a Bluetooth [Device]
+ */
 expect class Identifier
 
+/**
+ * Gets a random [Identifier]
+ * @return a random [Identifier]
+ */
 expect fun randomIdentifier(): Identifier
 
+/**
+ * Gets a [Identifier] from a string value
+ * @param stringValue the string value to get the [Identifier] from
+ * @return an [Identifier] matching the string value or `null` if it could not be generated
+ */
 expect fun identifierFromString(stringValue: String): Identifier?
 
+/**
+ * Gets a string representation of an [Identifier]
+ */
 expect val Identifier.stringValue: String
 
+/**
+ * A [Identifier] that can be serialized
+ */
 @Serializable(with = IdentifierSerializer::class)
 data class SerializableIdentifier(val identifier: Identifier)
 
+/**
+ * Converts an [Identifier] into a [SerializableIdentifier]
+ */
 val Identifier.serializable get() = SerializableIdentifier(this)
 
+/**
+ * [KSerializer] for an [SerializableIdentifier]
+ */
 open class IdentifierSerializer :
     KSerializer<SerializableIdentifier> {
     override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("IdentifierString", PrimitiveKind.STRING)
@@ -56,20 +80,62 @@ open class IdentifierSerializer :
     }
 }
 
+/**
+ * Accessor to the platform level Bluetooth device
+ */
 expect interface DeviceWrapper {
+    /**
+     * Name of the Bluetooth device
+     */
     val name: String?
+
+    /**
+     * [Identifier] of the Bluetooth device
+     */
     val identifier: Identifier
 }
 
+/**
+ * Properties of a Bluetooth Device
+ */
 interface DeviceInfo {
+
+    /**
+     * Name of the Bluetooth device
+     */
     val name: String?
+
+    /**
+     * [Identifier] of the Bluetooth device
+     */
     val identifier: Identifier
+
+    /**
+     * RSSI value of the Bluetooth device
+     */
     val rssi: Int
+
+    /**
+     * Current [BaseAdvertisementData] of the Bluetooth device
+     */
     val advertisementData: BaseAdvertisementData
+
+    /**
+     * The [KalugaDate] at which the device last advertised an update
+     */
     val updatedAt: KalugaDate
+
+    /**
+     * Calculates the distance to the device in meters
+     * @param environmentalFactor the constant to account for environmental interference. Should usually range between 2.0 and 4.0
+     * @return the distance to the device in meters
+     */
     fun distance(environmentalFactor: Double = 2.0): Double
 }
 
+/**
+ * An implementation of [DeviceInfo]
+ */
 data class DeviceInfoImpl(
     override val name: String?,
     override val identifier: Identifier,
@@ -77,6 +143,12 @@ data class DeviceInfoImpl(
     override val advertisementData: BaseAdvertisementData
 ) : DeviceInfo {
 
+    /**
+     * Constructor
+     * @param wrapper the [DeviceWrapper] to the device
+     * @param rssi the current RSSI value
+     * @param advertisementData the [BaseAdvertisementData] last received
+     */
     constructor(
         wrapper: DeviceWrapper,
         rssi: Int,
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
index f2376ae16..596387259 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
@@ -17,93 +17,284 @@
 
 package com.splendo.kaluga.bluetooth.device
 
-import com.splendo.kaluga.bluetooth.Service
 import com.splendo.kaluga.base.state.HandleAfterOldStateIsRemoved
 import com.splendo.kaluga.base.state.KalugaState
+import com.splendo.kaluga.bluetooth.Service
+import com.splendo.kaluga.bluetooth.device.ConnectableDeviceState.Disconnected
+import com.splendo.kaluga.bluetooth.device.ConnectableDeviceState.Reconnecting
 import kotlinx.coroutines.CompletableDeferred
 
+/**
+ * An action a [Device] can execute on one of its [com.splendo.kaluga.bluetooth.Attribute]
+ */
 sealed class DeviceAction {
 
     /**
      * A Deferred that will be completed with
-     * `true` if `DeviceAction` was succeeded, or
-     * `false` if `DeviceAction` was failed
+     * `true` if [DeviceAction] was completed successfully, or
+     * `false` if [DeviceAction] failed
      * */
     val completedSuccessfully = CompletableDeferred<Boolean>()
 
+    /**
+     * A [DeviceAction] that attempts to read an [com.splendo.kaluga.bluetooth.Attribute]
+     */
     sealed class Read : DeviceAction() {
+        /**
+         * A [DeviceAction.Read] on a [com.splendo.kaluga.bluetooth.Characteristic]
+         * @property characteristic the [com.splendo.kaluga.bluetooth.Characteristic] to read the value of
+         */
         class Characteristic(val characteristic: com.splendo.kaluga.bluetooth.Characteristic) : Read()
+
+        /**
+         * A [DeviceAction.Read] on a [com.splendo.kaluga.bluetooth.Descriptor]
+         * @property descriptor the [com.splendo.kaluga.bluetooth.Descriptor] to read the value of
+         */
         class Descriptor(val descriptor: com.splendo.kaluga.bluetooth.Descriptor) : Read()
     }
 
+    /**
+     * A [DeviceAction] that attempts to write a value to an [com.splendo.kaluga.bluetooth.Attribute]
+     * @property newValue the [ByteArray] to write
+     */
     sealed class Write(val newValue: ByteArray) : DeviceAction() {
+
+        /**
+         * A [DeviceAction.Write] on a [com.splendo.kaluga.bluetooth.Characteristic]
+         * @param newValue the [ByteArray] to write
+         * @property characteristic the [com.splendo.kaluga.bluetooth.Characteristic] to read the value of
+         */
         class Characteristic(newValue: ByteArray, val characteristic: com.splendo.kaluga.bluetooth.Characteristic) : Write(newValue)
+
+        /**
+         * A [DeviceAction.Write] on a [com.splendo.kaluga.bluetooth.Descriptor]
+         * @param newValue the [ByteArray] to write
+         * @property descriptor the [com.splendo.kaluga.bluetooth.Descriptor] to read the value of
+         */
         class Descriptor(newValue: ByteArray, val descriptor: com.splendo.kaluga.bluetooth.Descriptor) : Write(newValue)
     }
 
+    /**
+     * A [DeviceAction] that updates that notifying status of a [com.splendo.kaluga.bluetooth.Characteristic]
+     * @property characteristic the [com.splendo.kaluga.bluetooth.Characteristic] to notify
+     */
     sealed class Notification(val characteristic: com.splendo.kaluga.bluetooth.Characteristic) : DeviceAction() {
+
+        /**
+         * A [Notification] that starts notifying
+         * @param characteristic the [com.splendo.kaluga.bluetooth.Characteristic] to notify
+         */
         class Enable(characteristic: com.splendo.kaluga.bluetooth.Characteristic) : Notification(characteristic)
+
+        /**
+         * A [Notification] that stops notifying
+         * @param characteristic the [com.splendo.kaluga.bluetooth.Characteristic] to no longer notify
+         */
         class Disable(characteristic: com.splendo.kaluga.bluetooth.Characteristic) : Notification(characteristic)
     }
 }
 
+/**
+ * The state of a [Device]
+ */
 sealed interface DeviceState
 
+/**
+ * A [DeviceState] indicating the [Device] cannot be connected to
+ */
 interface NotConnectableDeviceState : DeviceState
 
+/**
+ * A [DeviceState] for a [Device] that can be connected to
+ */
 sealed interface ConnectableDeviceState : DeviceState, KalugaState {
+
+    /**
+     * A [ConnectableDeviceState] where the [Device] is connected
+     */
     sealed interface Connected : ConnectableDeviceState {
+
+        /**
+         * A [Connected] State where no [Service] has been discovered yet
+         */
         interface NoServices : Connected {
+
+            /**
+             * Attempts to start discovering the list of [Service] of the [Device]
+             */
             fun startDiscovering()
+
+            /**
+             * Transitions into a [Discovering] State
+             */
             val discoverServices: suspend () -> Discovering
         }
 
+        /**
+         * A [Connected] State where the device is discovering the list of [Service]
+         */
         interface Discovering : Connected {
+
+            /**
+             * Discovers a list of [Service] to transition into [Idle]
+             * @param services the list of [Service] discovered
+             * @return a transition into a [Idle] State
+             */
             fun didDiscoverServices(services: List<Service>): suspend () -> Idle
         }
 
+        /**
+         * A [Connected] State indicating all [Service] have been discovered
+         */
         sealed interface DiscoveredServices : Connected {
+            /**
+             * The list of [Service] hat where discovered
+             */
             val services: List<Service>
         }
 
+        /**
+         * A [DiscoveredServices] State where no [DeviceAction] is currently being executed
+         */
         interface Idle : DiscoveredServices {
+
+            /**
+             * Starts handling a [DeviceAction]
+             * @param action the [DeviceAction] to execute
+             * @return a transition into a [HandlingAction] state
+             */
             fun handleAction(action: DeviceAction): suspend () -> HandlingAction
         }
 
+        /**
+         * A [DiscoveredServices] State where a [DeviceAction] is being executed
+         */
         interface HandlingAction : DiscoveredServices {
+
+            /**
+             * The [DeviceAction] currently being executed
+             */
             val action: DeviceAction
+
+            /**
+             * The list of [DeviceAction] to be executed when [action] has been handled
+             */
             val nextActions: List<DeviceAction>
+
+            /**
+             * Adds an additional [DeviceAction] to the [nextActions]
+             * @param newAction the [DeviceAction] to add to the queue
+             * @return a transition into [HandlingAction] with [newAction] added to [nextActions]
+             */
             fun addAction(newAction: DeviceAction): suspend () -> HandlingAction
+
+            /**
+             * Transitions into [DiscoveredServices] when [action] has completed
+             */
             val actionCompleted: suspend () -> DiscoveredServices
         }
 
+        /**
+         * The current Maximum Transmission Unit (MTU) size of the device
+         */
         val mtu: Int?
 
+        /**
+         * Starts transitioning to a [Disconnected] State
+         */
         fun startDisconnected()
 
+        /**
+         * Transitions into a [Reconnecting] State
+         */
         val reconnect: suspend () -> Reconnecting
+
+        /**
+         * Updates the Maximum Transmission Unit (MTU) size of the device
+         * @param mtu the new MTU value
+         * @return a transition into a [Connected] State with the new MTU
+         */
         fun didUpdateMtu(mtu: Int): suspend () -> Connected
 
+        /**
+         * Reads the RSSI
+         */
         suspend fun readRssi()
+
+        /**
+         * Requests an update to the Maximum Transmission Unit (MTU) size of the device
+         * @param mtu the new MTU size to request
+         * @return `true` if the MTU update has been requested successfully
+         */
         suspend fun requestMtu(mtu: Int): Boolean
+
+        /**
+         * Attempts to pair this device
+         */
         suspend fun pair()
     }
 
+    /**
+     * A [ConnectableDeviceState] where the [Device] is connecting
+     */
     interface Connecting : ConnectableDeviceState {
+
+        /**
+         * Transitions into a [Disconnecting] State
+         */
         val cancelConnection: suspend () -> Disconnecting
+
+        /**
+         * Transitions into a [Connected.NoServices] State
+         */
         val didConnect: suspend () -> Connected.NoServices
+
+        /**
+         * Starts cancelling the connection
+         */
         fun handleCancel()
     }
 
+    /**
+     * A [ConnectableDeviceState] where the [Device] is reconnecting after the connection was dropped
+     */
     interface Reconnecting : ConnectableDeviceState {
+
+        /**
+         * The number of attempts to reconnect that have been made since the disconnect occurred
+         */
         val attempt: Int
+
+        /**
+         * The list of [Service] discovered
+         */
         val services: List<Service>?
 
+        /**
+         * Fail this attempt and transition into a new [Reconnecting] State
+         */
         val raiseAttempt: suspend () -> Reconnecting
+
+        /**
+         * Transition into a [Connected] State
+         */
         val didConnect: suspend () -> Connected
+
+        /**
+         * Transition into a [Disconnecting] State
+         */
         val cancelConnection: suspend () -> Disconnecting
 
+        /**
+         * Starts cancelling the reconnection
+         */
         fun handleCancel()
+
+        /**
+         * Retries according to [ConnectionSettings.ReconnectionSettings] and transitions into a new [ConnectableDeviceState]
+         * @param reconnectionSettings the [ConnectionSettings.ReconnectionSettings] to use for reconnecting
+         * @return a transition into the next [ConnectableDeviceState]. Can be either [Disconnected] or [Reconnecting].
+         */
         fun retry(reconnectionSettings: ConnectionSettings.ReconnectionSettings): suspend () -> ConnectableDeviceState = when (reconnectionSettings) {
             is ConnectionSettings.ReconnectionSettings.Always -> raiseAttempt
             is ConnectionSettings.ReconnectionSettings.Never -> didDisconnect
@@ -117,28 +308,65 @@ sealed interface ConnectableDeviceState : DeviceState, KalugaState {
         }
     }
 
+    /**
+     * A [ConnectableDeviceState] where the [Device] is disconnected
+     */
     interface Disconnected : ConnectableDeviceState {
+
+        /**
+         * Transitions into a [Connecting] State
+         */
         val connect: suspend () -> Connecting
 
+        /**
+         * Starts connecting the device
+         */
         fun startConnecting()
     }
 
+    /**
+     * A [ConnectableDeviceState] where the [Device] is disconnecting
+     */
     interface Disconnecting : ConnectableDeviceState
 
+    /**
+     * Transitions into a [Disconnected] State
+     */
     val didDisconnect: suspend () -> Disconnected
+
+    /**
+     * Transitions into a [Disconnecting] State
+     */
     val disconnecting: suspend () -> Disconnecting
 
+    /**
+     * Attempts to unpair the Device
+     */
     suspend fun unpair()
 }
 
+/**
+ * Implementation of [NotConnectableDeviceState]
+ */
 object NotConnectableDeviceStateImpl : NotConnectableDeviceState
 
+/**
+ * Connection State of a [Device] closely matching [ConnectableDeviceState]
+ */
 sealed class ConnectableDeviceStateImpl {
 
     protected abstract val deviceConnectionManager: DeviceConnectionManager
 
+    /**
+     * A [ConnectableDeviceStateImpl] where the [Device] is connected
+     */
     sealed class Connected : ConnectableDeviceStateImpl() {
 
+        /**
+         * A [Connected] State where no [Service] have been discovered yet
+         * @param mtu The current Maximum Transmission Unit (MTU) size of the device
+         * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
+         */
         data class NoServices constructor(
             override val mtu: Int?,
             override val deviceConnectionManager: DeviceConnectionManager
@@ -155,6 +383,11 @@ sealed class ConnectableDeviceStateImpl {
             override fun didUpdateMtu(mtu: Int) = suspend { copy(mtu = mtu) }
         }
 
+        /**
+         * A [Connected] State where [Service] are being discovered
+         * @param mtu The current Maximum Transmission Unit (MTU) size of the device
+         * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
+         */
         data class Discovering constructor(
             override val mtu: Int?,
             override val deviceConnectionManager: DeviceConnectionManager
@@ -173,6 +406,12 @@ sealed class ConnectableDeviceStateImpl {
             }
         }
 
+        /**
+         * A [Connected] State where all [Service] have been discovered and no [DeviceAction] is being executed
+         * @param mtu The current Maximum Transmission Unit (MTU) size of the device
+         * @param services The list of [Service] hat where discovered
+         * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
+         */
         data class Idle constructor(
             override val mtu: Int?,
             override val services: List<Service>,
@@ -183,6 +422,14 @@ sealed class ConnectableDeviceStateImpl {
             override fun didUpdateMtu(mtu: Int) = suspend { copy(mtu = mtu) }
         }
 
+        /**
+         * A [Connected] State where all [Service] have been discovered and a [DeviceAction] is being executed
+         * @param action The [DeviceAction] currently being executed
+         * @param nextActions The list of [DeviceAction] to be executed when [action] has been handled
+         * @param mtu The current Maximum Transmission Unit (MTU) size of the device
+         * @param services The list of [Service] hat where discovered
+         * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
+         */
         data class HandlingAction constructor(
             override val action: DeviceAction,
             override val nextActions: List<DeviceAction>,
@@ -219,24 +466,45 @@ sealed class ConnectableDeviceStateImpl {
             }
         }
 
+        /**
+         * Starts transitioning to a [Disconnected] State
+         */
         fun startDisconnected() = deviceConnectionManager.startDisconnecting()
 
+        /**
+         * Transitions into a [Reconnecting] State
+         */
         val reconnect = suspend {
             // All services, characteristics and descriptors become invalidated after it disconnects
             Reconnecting(0, null, deviceConnectionManager)
         }
 
+        /**
+         * Reads the RSSI
+         */
         suspend fun readRssi() {
             deviceConnectionManager.readRssi()
         }
 
+        /**
+         * Requests an update to the Maximum Transmission Unit (MTU) size of the device
+         * @param mtu the new MTU size to request
+         * @return `true` if the MTU update has been requested successfully
+         */
         suspend fun requestMtu(mtu: Int): Boolean {
             return deviceConnectionManager.requestMtu(mtu)
         }
 
+        /**
+         * Attempts to pair this device
+         */
         suspend fun pair() = deviceConnectionManager.pair()
     }
 
+    /**
+     * A [ConnectableDeviceStateImpl] where the device is connecting
+     * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
+     */
     data class Connecting constructor(
         override val deviceConnectionManager: DeviceConnectionManager
     ) : ConnectableDeviceStateImpl(), ConnectableDeviceState.Connecting, HandleAfterOldStateIsRemoved<ConnectableDeviceState> {
@@ -259,6 +527,12 @@ sealed class ConnectableDeviceStateImpl {
         }
     }
 
+    /**
+     * A [ConnectableDeviceStateImpl] where the [Device] is reconnecting
+     * @param attempt The number of attempts to reconnect that have been made since the disconnect occurred
+     * @param services The list of [Service] discovered
+     * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
+     */
     data class Reconnecting constructor(
         override val attempt: Int,
         override val services: List<Service>?,
@@ -282,6 +556,10 @@ sealed class ConnectableDeviceStateImpl {
         }
     }
 
+    /**
+     * A [ConnectableDeviceStateImpl] where the [Device] is disconnected
+     * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
+     */
     data class Disconnected constructor(
         override val deviceConnectionManager: DeviceConnectionManager
     ) : ConnectableDeviceStateImpl(), ConnectableDeviceState.Disconnected {
@@ -291,6 +569,10 @@ sealed class ConnectableDeviceStateImpl {
         override val connect = suspend { Connecting(deviceConnectionManager) }
     }
 
+    /**
+     * A [ConnectableDeviceStateImpl] where the [Device] is disconnecting
+     * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
+     */
     data class Disconnecting constructor(
         override val deviceConnectionManager: DeviceConnectionManager
     ) : ConnectableDeviceStateImpl(), ConnectableDeviceState.Disconnecting, HandleAfterOldStateIsRemoved<ConnectableDeviceState> {
@@ -303,13 +585,22 @@ sealed class ConnectableDeviceStateImpl {
         }
     }
 
+    /**
+     * Transitions into a [Disconnected] State
+     */
     val didDisconnect = suspend {
         Disconnected(deviceConnectionManager)
     }
 
+    /**
+     * Transitions into a [Disconnecting] State
+     */
     val disconnecting = suspend {
         Disconnecting(deviceConnectionManager)
     }
 
+    /**
+     * Attempts to unpair the [Device]
+     */
     suspend fun unpair() = deviceConnectionManager.unpair()
 }
diff --git a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
index ce9449694..52031a06d 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
@@ -19,10 +19,12 @@ package com.splendo.kaluga.bluetooth.scanner
 
 import com.splendo.kaluga.base.flow.filterOnlyImportant
 import com.splendo.kaluga.bluetooth.BluetoothMonitor
+import com.splendo.kaluga.bluetooth.Service
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.device.AdvertisementData
 import com.splendo.kaluga.bluetooth.device.BaseAdvertisementData
 import com.splendo.kaluga.bluetooth.device.BaseDeviceConnectionManager
+import com.splendo.kaluga.bluetooth.device.Device
 import com.splendo.kaluga.bluetooth.device.DeviceWrapper
 import com.splendo.kaluga.bluetooth.device.Identifier
 import com.splendo.kaluga.bluetooth.device.description
@@ -50,46 +52,158 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
 typealias EnableSensorAction = suspend () -> Boolean
+
+/**
+ * Creates a [DeviceWrapper] and [BaseDeviceConnectionManager.Builder] for a discovered device
+ */
 typealias DeviceCreator = () -> Pair<DeviceWrapper, BaseDeviceConnectionManager.Builder>
 
+/**
+ * Scans for Bluetooth [com.splendo.kaluga.bluetooth.device.Device]
+ */
 interface Scanner {
 
+    /**
+     * Events detected by a [Scanner]
+     */
     sealed class Event {
+
+        /**
+         * An [Event] indicating permissions have changed
+         * @property hasPermission if `true` the permissions required for Bluetooth have been granted
+         */
         data class PermissionChanged(val hasPermission: Boolean) : Event()
+
+        /**
+         * An [Event] indicating the Bluetooth service has become enabled
+         */
         object BluetoothEnabled : Event()
+
+        /**
+         * An [Event] indicating the Bluetooth service has become disabled
+         */
         object BluetoothDisabled : Event()
+
+        /**
+         * An [Event] indicating the Scanner failed to start scanning
+         */
         object FailedScanning : Event()
+
+        /**
+         * An [Event] indicating a [com.splendo.kaluga.bluetooth.device.Device] was discovered
+         * @property identifier the [Identifier] of the device discovered
+         * @property rssi the RSSI value of the device discovered
+         * @property advertisementData the [BaseAdvertisementData] of the device discovered
+         * @property deviceCreator method for creating a device if it had not yet been discovered.
+         */
         data class DeviceDiscovered(
             val identifier: Identifier,
             val rssi: Int,
             val advertisementData: BaseAdvertisementData,
             val deviceCreator: DeviceCreator
         ) : Event()
+
+        /**
+         * An [Event] indicating a list of [DeviceDiscovered] events are paired to the system
+         * @property filter the set of [UUID] applied to filter for the paired devices
+         * @property devices the list of [DeviceDiscovered] paired to the system
+         */
         data class PairedDevicesRetrieved(
             val filter: Filter,
             val devices: List<DeviceDiscovered>
         ) : Event() {
+
+            /**
+             * The list of [Identifier] discovered
+             */
             val identifiers = devices.map(DeviceDiscovered::identifier)
+
+            /**
+             * The list of [DeviceCreator] to create devices that have not yet been discovered
+             */
             val deviceCreators = devices.map(DeviceDiscovered::deviceCreator)
         }
+
+        /**
+         * An [Event] indicating a [com.splendo.kaluga.bluetooth.device.Device] has changed to a connected state.
+         * @property identifier the [Identifier] of the device connected
+         */
         data class DeviceConnected(val identifier: Identifier) : Event()
+
+        /**
+         * An [Event] indicating a [com.splendo.kaluga.bluetooth.device.Device] has changed to a disconnected state.
+         * @property identifier the [Identifier] of the device disconnected
+         */
         data class DeviceDisconnected(val identifier: Identifier) : Event()
     }
 
+    /**
+     * Indicates whether the system supports Bluetooth scanning
+     */
     val isSupported: Boolean
+
+    /**
+     * The [Flow] of all the [Event] detected by the scanner
+     */
     val events: Flow<Event>
+
+    /**
+     * Starts scanning for changes to permissions related to Bluetooth.
+     * This will result in [Event.PermissionChanged] on the [events] flow.
+     */
     suspend fun startMonitoringPermissions()
+
+    /**
+     * Stops scanning for changes to permissions related to Bluetooth.
+     */
     suspend fun stopMonitoringPermissions()
+
+    /**
+     * Starts scanning for devices.
+     * This will result in [Event.DeviceDiscovered] or [Event.FailedScanning]
+     * @param filter if not empty, only [Device] that have at least one [Service] matching one of the [UUID] will be scanned.
+     */
     suspend fun scanForDevices(filter: Set<UUID>)
+
+    /**
+     * Stops scanning for devices
+     */
     suspend fun stopScanning()
+
+    /**
+     * Starts scanning for changes to the Bluetooth service being enabled
+     * This will result in [Event.BluetoothEnabled] or [Event.BluetoothDisabled] on the [events] flow
+     */
     suspend fun startMonitoringHardwareEnabled()
+
+    /**
+     * Stops scanning for changes to the Bluetooth service being enabled
+     */
     suspend fun stopMonitoringHardwareEnabled()
+
+    /**
+     * Checks whether the Bluetooth service  is currently enabled
+     */
     suspend fun isHardwareEnabled(): Boolean
+
+    /**
+     * Attempts to request the user to enable Bluetooth
+     */
     suspend fun requestEnableHardware()
-    fun generateEnableSensorsActions(): List<EnableSensorAction>
+
+    /**
+     * Retrieves the list of paired [Device]
+     * This will result in [Event.PairedDevicesRetrieved] on the [events] flow
+     * @param withServices filters the list to only return the [Device] that at least one [Service] matching one of the provided [UUID]
+     */
     suspend fun retrievePairedDevices(withServices: Set<UUID>)
 }
 
+/**
+ * An abstract implementation for [Scanner]
+ * @param settings the [Settings] to configure this scanner
+ * @param coroutineScope the [CoroutineScope] this scanner runs on
+ */
 abstract class BaseScanner constructor(
     settings: Settings,
     private val coroutineScope: CoroutineScope
@@ -99,16 +213,32 @@ abstract class BaseScanner constructor(
         private const val LOG_TAG = "Bluetooth Scanner"
     }
 
+    /**
+     * Settings to apply to a [BaseScanner]
+     * @property permissions the [Permissions] to manage the bluetooth related permissions
+     * @property autoRequestPermission if `true` the scanner should automatically request permissions if not granted
+     * @property autoEnableSensors if `true` the scanner should automatically enable the Bluetooth service if disabled
+     * @property discoverBondedDevices If `true` scanned results will include devices bonded to the system.
+     * @property logger the [Logger] to log to
+     */
     data class Settings(
         val permissions: Permissions,
         val autoRequestPermission: Boolean = true,
         val autoEnableSensors: Boolean = true,
-        val logger: Logger = RestrictedLogger(RestrictedLogLevel.None),
-        /** If set, will include bonded devices in discovered result list on Android */
         val discoverBondedDevices: Boolean = true,
+        val logger: Logger = RestrictedLogger(RestrictedLogLevel.None)
     )
 
+    /**
+     * Builder for creating a [BaseScanner]
+     */
     interface Builder {
+
+        /**
+         * Creates a [BaseScanner]
+         * @param settings the [BaseScanner.Settings] to configure the scanner with
+         * @param coroutineScope the [CoroutineScope] the scanner will run in
+         */
         fun create(
             settings: Settings,
             coroutineScope: CoroutineScope
@@ -220,6 +350,8 @@ abstract class BaseScanner constructor(
         }
     }
 
+    protected abstract fun generateEnableSensorsActions(): List<EnableSensorAction>
+
     internal fun handleDeviceDiscovered(
         identifier: Identifier,
         rssi: Int,
@@ -269,4 +401,7 @@ abstract class BaseScanner constructor(
     }
 }
 
+/**
+ * A default implementation of [BaseScanner]
+ */
 expect class DefaultScanner : BaseScanner
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
index 04912efd0..ce003f7b6 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
@@ -27,67 +27,198 @@ import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
 import com.splendo.kaluga.base.state.HandleAfterOldStateIsRemoved
 import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
 import com.splendo.kaluga.base.state.KalugaState
+import com.splendo.kaluga.bluetooth.Service
+import com.splendo.kaluga.bluetooth.scanner.ScanningState.Deinitialized
+import com.splendo.kaluga.bluetooth.scanner.ScanningState.Devices
 
+/**
+ * A set of [UUID] to apply to a scan result
+ * If not empty, only [Device] that have at least one [Service] matching one of the [UUID] will be scanned.
+ */
 typealias Filter = Set<UUID>
 
+/**
+ * The [KalugaState] of scanning for Bluetooth devices
+ */
 sealed interface ScanningState : KalugaState {
 
-    // Discovered or Paired devices
+    /**
+     * The [Device] found during scanning
+     */
     interface Devices {
+        /**
+         * The list of [Device] found
+         */
         val devices: List<Device>
+
+        /**
+         * The [Filter] applied during scanning
+         */
         val filter: Filter
 
+        /**
+         * Creates a new [Devices] instance that adds [device] to [devices]
+         * @param device the [Device] to add
+         * @return the new instance of [Devices] containing [device]
+         */
         fun copyAndAdd(device: Device): Devices
+
+        /**
+         * Creates a [Devices] for a given [Filter]
+         * If [filter] is the same as [Devices.filter], this instance will be returned
+         * Otherwise a new [Devices] will be created.
+         * @param filter the [Filter] to apply
+         * @return the new [Devices]
+         */
         fun foundForFilter(filter: Filter): Devices
 
+        /**
+         * The list of [Identifier] found
+         */
         fun identifiers() = devices.map(Device::identifier).toSet()
     }
 
+    /**
+     * A [ScanningState] indicating observation is not active
+     */
     sealed interface Inactive : ScanningState, SpecialFlowValue.NotImportant
+
+    /**
+     * An [Inactive] State indicating observation has not started yet
+     */
     interface NotInitialized : Inactive
 
+    /**
+     * A [ScanningState] indicating observation has stopped after being started
+     */
     interface Deinitialized : Inactive {
+        /**
+         * The [Devices] discovered before deinitalizing
+         */
         val previouslyDiscovered: Devices
+
+        /**
+         * The [Devices] paired before deinitializing
+         */
         val previouslyPaired: Devices
+
+        /**
+         * Transitions into an [Initializing] State
+         */
         val reinitialize: suspend () -> Initializing
     }
 
+    /**
+     * A [ScanningState] indicating observation has started
+     */
     sealed interface Active : ScanningState {
 
+        /**
+         * The [Devices] discovered
+         */
         val discovered: Devices
+
+        /**
+         * The [Devices] paired
+         */
         val paired: Devices
+
+        /**
+         * Transitions into a [Deinitialized] State
+         */
         val deinitialize: suspend () -> Deinitialized
     }
 
+    /**
+     * An [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
+     */
     interface Initializing : Active, SpecialFlowValue.NotImportant {
+        /**
+         * Transitions into an [Initialized] State
+         * @param hasPermission if `true` all permissions related to Bluetooth have been granted
+         * @param enabled if `true` the Bluetooth service is enabled
+         */
         fun initialized(hasPermission: Boolean, enabled: Boolean): suspend () -> Initialized
     }
+
+    /**
+     * An [Active] State indicating observation has started and initialization has completed
+     */
     sealed interface Initialized : Active
+
+    /**
+     * An [Initialized] State indicating all permissions related to Bluetooth have been granted
+     */
     sealed interface Permitted : Initialized {
+
+        /**
+         * Transitions into a [NoBluetooth.MissingPermissions] State
+         */
         val revokePermission: suspend () -> NoBluetooth.MissingPermissions
     }
 
+    /**
+     * A [Permitted] State indicating the Bluetooth service is enabled
+     */
     sealed interface Enabled : Permitted {
 
+        /**
+         * Starts to retrieve the list of paired [Device]
+         * @param filter the [Filter] to apply to the paired devices
+         */
         suspend fun retrievePairedDevices(filter: Filter)
 
+        /**
+         * Transitions into an [Enabled] state where a set of devices is paired
+         * @param filter the [Filter] applied to finding the paired devices
+         * @param identifiers the set of [Identifier] of all devices paired
+         * @param deviceCreators A list of methods for creating [Device] if [filter] has changed
+         * @return a method for transitioning into [Enabled] with the new list of paired [Device]
+         */
         fun pairedDevices(
             filter: Filter,
             identifiers: Set<Identifier>,
             deviceCreators: List<() -> Device>
         ): suspend () -> Enabled
 
+        /**
+         * Transitions into a [NoBluetooth.Disabled] State
+         */
         val disable: suspend () -> NoBluetooth.Disabled
 
+        /**
+         * An [Enabled] State indicating no active scanning is taking place
+         */
         interface Idle : Enabled {
 
+            /**
+             * Transitions into a [Scanning] State for a given filter
+             * @param filter the [Filter] to apply for scanning
+             * @return the method for transitioning into a [Scanning] state
+             */
             fun startScanning(filter: Filter = discovered.filter): suspend () -> Scanning
 
+            /**
+             * Transitions into an [Idle] State with a new [Filter]
+             * @param filter the new [Filter] to apply
+             * @return the method for transitioning into a new [Idle] state
+             */
             fun refresh(filter: Filter = discovered.filter): suspend () -> Idle
         }
 
+        /**
+         * An [Enabled] State indicating scanning is taking place
+         */
         interface Scanning : Enabled {
 
+            /**
+             * Transitions into a [Scanning] state where a [Device] is added or updated
+             * @param identifier the [Identifier] of the [Device] discovered
+             * @param rssi the RSSI value of the [Device] discovered
+             * @param advertisementData the [BaseAdvertisementData] of the [Device] discovered
+             * @param deviceCreator Method for creating a [Device] if it had not been scanned previously.
+             * @return method for transitioning into a [Scanning] state where the [Device] is discovered
+             */
             suspend fun discoverDevice(
                 identifier: Identifier,
                 rssi: Int,
@@ -95,34 +226,75 @@ sealed interface ScanningState : KalugaState {
                 deviceCreator: () -> Device
             ): suspend () -> Scanning
 
+            /**
+             * Transitions into an [Idle] State
+             */
             val stopScanning: suspend () -> Idle
         }
     }
 
+    /**
+     * An [Initialized] State indicating Bluetooth is not available
+     */
     sealed interface NoBluetooth : Initialized {
 
+        /**
+         * A [NoBluetooth] State indicating Bluetooth is not available because the service has been disabled.
+         */
         interface Disabled : NoBluetooth, Permitted {
+
+            /**
+             * Transitions into an [Enabled] State
+             */
             val enable: suspend () -> Enabled
         }
 
+        /**
+         * A [NoBluetooth] State indicating Bluetooth is not available due to missing permissions
+         */
         interface MissingPermissions : NoBluetooth {
+
+            /**
+             * Transitions into a [ScanningState] after Bluetooth permissions have been granted
+             * @param enabled if `true` the Bluetooth service is enabled
+             * @return a method for transitioning into the new [ScanningState]
+             */
             fun permit(enabled: Boolean): suspend () -> ScanningState
         }
     }
 
+    /**
+     * A [ScanningState] indicating the system does not support Bluetooth
+     */
     interface NoHardware : ScanningState
 }
 
+/**
+ * State of a scanner closely matching [ScanningState]
+ */
 sealed class ScanningStateImpl {
 
     companion object {
+        /**
+         * An empty [Devices]
+         */
         val nothingFound = Devices(filter = emptySet())
     }
 
+    /**
+     * A [ScanningState.Devices] implementation
+     * @param devices The list of [Device] found
+     * @param filter The [Filter] applied during scanning
+     */
     data class Devices(
         override val devices: List<Device>,
         override val filter: Filter,
     ) : ScanningState.Devices {
+
+        /**
+         * Constructor
+         * @param filter the [Filter] to apply
+         */
         constructor(filter: Filter) : this(emptyList(), filter)
 
         override fun copyAndAdd(device: Device): Devices =
@@ -135,8 +307,16 @@ sealed class ScanningStateImpl {
                 Devices(filter)
     }
 
+    /**
+     * A [ScanningStateImpl] indicating observation has not started yet
+     */
     object NotInitialized : ScanningStateImpl(), ScanningState.NotInitialized {
 
+        /**
+         * Transitions into a [Initializing] State
+         * @param scanner the [Scanner] to use for scanning
+         * @return method for transitioning to a [Initializing] or [NoHardware] State
+         */
         fun startInitializing(
             scanner: Scanner
         ): suspend () -> ScanningState {
@@ -148,6 +328,12 @@ sealed class ScanningStateImpl {
         }
     }
 
+    /**
+     * A [ScanningStateImpl] indicating observation has stopped after being started
+     * @param previouslyDiscovered The [Devices] discovered before deinitalizing
+     * @param previouslyPaired The [Devices] paired before deinitalizing
+     * @property scanner the [Scanner] used for scanning
+     */
     data class Deinitialized(
         override val previouslyDiscovered: ScanningState.Devices,
         override val previouslyPaired: ScanningState.Devices,
@@ -157,6 +343,9 @@ sealed class ScanningStateImpl {
         override val reinitialize = suspend { Initializing(previouslyDiscovered, previouslyPaired, scanner) }
     }
 
+    /**
+     * A [ScanningStateImpl] indicating observation has started
+     */
     sealed class Active :
         ScanningStateImpl(),
         HandleBeforeOldStateIsRemoved<ScanningState>,
@@ -179,17 +368,37 @@ sealed class ScanningStateImpl {
                 is ScanningState.Active, is ScanningState.NoHardware -> {}
             }
         }
+
+        /**
+         * The [Scanner] used for scanning
+         */
         abstract val scanner: Scanner
+
+        /**
+         * The [Devices] discovered
+         */
         abstract val discovered: ScanningState.Devices
+
+        /**
+         * The [Devices] paired
+         */
         abstract val paired: ScanningState.Devices
+
+        /**
+         * Transitions into a [Deinitialized] State
+         */
         val deinitialize: suspend () -> Deinitialized = { Deinitialized(discovered, paired, scanner) }
     }
 
+    /**
+     * Handles changes to Bluetooth permissions
+     * @property scanner the [Scanner] to respond to changes to permissions
+     */
     class PermittedHandler(val scanner: Scanner) {
 
-        val revokePermission = suspend { NoBluetooth.MissingPermissions(scanner) }
+        internal val revokePermission = suspend { NoBluetooth.MissingPermissions(scanner) }
 
-        suspend fun afterNewStateIsSet(newState: ScanningState) {
+        internal suspend fun afterNewStateIsSet(newState: ScanningState) {
             when (newState) {
                 is ScanningState.Inactive,
                 is ScanningState.Initializing,
@@ -199,7 +408,7 @@ sealed class ScanningStateImpl {
             }
         }
 
-        suspend fun beforeOldStateIsRemoved(oldState: ScanningState) {
+        internal suspend fun beforeOldStateIsRemoved(oldState: ScanningState) {
             when (oldState) {
                 is ScanningState.Inactive,
                 is ScanningState.Initializing,
@@ -210,6 +419,12 @@ sealed class ScanningStateImpl {
         }
     }
 
+    /**
+     * An [Active] State indicating the state is transitioning for an inactive state to an initialized state
+     * @param discovered The [Devices] discovered
+     * @param paired The [Devices] paired
+     * @param scanner The [Scanner] used for scanning
+     */
     data class Initializing(
         override val discovered: ScanningState.Devices,
         override val paired: ScanningState.Devices,
@@ -226,14 +441,23 @@ sealed class ScanningStateImpl {
             }
     }
 
+    /**
+     * An [Active] State indicating the Bluetooth service is enabled
+     */
     sealed class Enabled : Active() {
 
         protected abstract val permittedHandler: PermittedHandler
 
+        /**
+         * Transitions into a [NoBluetooth.Disabled] State
+         */
         val disable = suspend {
             NoBluetooth.Disabled(scanner)
         }
 
+        /**
+         * Transitions into a [NoBluetooth.MissingPermissions] State
+         */
         val revokePermission: suspend () -> NoBluetooth.MissingPermissions get() = permittedHandler.revokePermission
 
         override suspend fun afterNewStateIsSet(newState: ScanningState) {
@@ -246,6 +470,12 @@ sealed class ScanningStateImpl {
             permittedHandler.beforeOldStateIsRemoved(oldState)
         }
 
+        /**
+         * An [Enabled] State indicating no active scanning is taking place
+         * @param discovered The [Devices] discovered
+         * @param paired The [Devices] paired
+         * @param scanner The [Scanner] used for scanning
+         */
         class Idle internal constructor(
             override val discovered: ScanningState.Devices,
             override val paired: ScanningState.Devices,
@@ -289,6 +519,12 @@ sealed class ScanningStateImpl {
             }
         }
 
+        /**
+         * An [Enabled] State indicating scanning is taking place
+         * @param discovered The [Devices] discovered
+         * @param paired The [Devices] paired
+         * @param scanner The [Scanner] used for scanning
+         */
         class Scanning internal constructor(
             override val discovered: ScanningState.Devices,
             override val paired: ScanningState.Devices,
@@ -347,11 +583,18 @@ sealed class ScanningStateImpl {
         }
     }
 
+    /**
+     * An [Active] State indicating Bluetooth is not available
+     */
     sealed class NoBluetooth : Active() {
 
         override val discovered: Devices = nothingFound
         override val paired: Devices = nothingFound
 
+        /**
+         * A [NoBluetooth] State indicating the Bluetooth service is disabled
+         * @param scanner The [Scanner] used for scanning
+         */
         class Disabled internal constructor(
             override val scanner: Scanner
         ) : NoBluetooth(), ScanningState.NoBluetooth.Disabled {
@@ -375,6 +618,10 @@ sealed class ScanningStateImpl {
             }
         }
 
+        /**
+         * A [NoBluetooth] State indicating Bluetooth is not available due to missing permissions
+         * @param scanner The [Scanner] used for scanning
+         */
         class MissingPermissions internal constructor(
             override val scanner: Scanner
         ) : NoBluetooth(), ScanningState.NoBluetooth.MissingPermissions {
@@ -386,5 +633,8 @@ sealed class ScanningStateImpl {
         }
     }
 
+    /**
+     * A [ScanningStateImpl] indicating the system does not support Bluetooth
+     */
     object NoHardware : ScanningStateImpl(), ScanningState.NoHardware
 }
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
index 27bf2bb54..1838d1478 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
@@ -16,13 +16,15 @@
 
 package com.splendo.kaluga.bluetooth.scanner
 
+import com.splendo.kaluga.base.state.ColdStateFlowRepo
+import com.splendo.kaluga.base.state.StateRepo
 import com.splendo.kaluga.bluetooth.device.BaseDeviceConnectionManager
 import com.splendo.kaluga.bluetooth.device.Device
 import com.splendo.kaluga.bluetooth.device.DeviceInfoImpl
 import com.splendo.kaluga.bluetooth.device.DeviceWrapper
 import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.base.state.ColdStateFlowRepo
-import com.splendo.kaluga.base.state.StateRepo
+import com.splendo.kaluga.permissions.base.Permission
+import com.splendo.kaluga.permissions.base.PermissionState
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -32,8 +34,18 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A [StateRepo]/[MutableStateFlow] of [ScanningState]
+ */
 typealias ScanningStateFlowRepo = StateRepo<ScanningState, MutableStateFlow<ScanningState>>
 
+/**
+ * An abstract [ColdStateFlowRepo] for managing [ScanningState]
+ * @param createNotInitializedState method for creating the initial [ScanningState.NotInitialized] State
+ * @param createInitializingState method for transitioning from a [ScanningState.Inactive] into a [ScanningState.Initializing] given an implementation of this [ColdStateFlowRepo]
+ * @param createDeinitializingState method for transitioning from a [ScanningState.Active] into a [ScanningState.Deinitialized] given an implementation of this [ColdStateFlowRepo]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine.
+ */
 abstract class BaseScanningStateRepo(
     createNotInitializedState: () -> ScanningState.NotInitialized,
     createInitializingState: suspend ColdStateFlowRepo<ScanningState>.(ScanningState.Inactive) -> suspend () -> ScanningState,
@@ -58,6 +70,12 @@ abstract class BaseScanningStateRepo(
     firstState = createNotInitializedState
 )
 
+/**
+ * A [BaseScanningStateRepo] managed using a [Scanner]
+ * @param createScanner method for creating the [Scanner] to manage the [ScanningState]
+ * @param createDevice method for creating a [Device]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine.
+ */
 open class ScanningStateImplRepo(
     createScanner: suspend () -> Scanner,
     private val createDevice: (Identifier, DeviceInfoImpl, DeviceWrapper, BaseDeviceConnectionManager.Builder) -> Device,
@@ -159,6 +177,13 @@ open class ScanningStateImplRepo(
     }
 }
 
+/**
+ * A [ScanningStateImplRepo] using a [BaseScanner]
+ * @param settingsBuilder method for creating [BaseScanner.Settings]
+ * @param builder the [BaseScanner.Builder] for building a [BaseScanner]
+ * @param createDevice method for creating a [Device]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine
+ */
 class ScanningStateRepo(
     settingsBuilder: suspend (CoroutineContext) -> BaseScanner.Settings,
     builder: BaseScanner.Builder,
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicNotificationTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicNotificationTest.kt
index db1e5d3a3..1a7637cc9 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicNotificationTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothCharacteristicNotificationTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -88,7 +88,11 @@ class BluetoothCharacteristicNotificationTest : BluetoothFlowTest<BluetoothFlowT
     }
 
     @Test
-    fun testFailedToEnableNotification() = testWithFlowAndTestContext(Configuration.DeviceWithCharacteristic(willActionsSucceed = false)) {
+    fun testFailedToEnableNotification() = testWithFlowAndTestContext(
+        Configuration.DeviceWithCharacteristic(
+            willActionsSucceed = false
+        )
+    ) {
         connect()
         discover()
 
diff --git a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 8b69213f2..5db4c9e5c 100644
--- a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -164,7 +164,7 @@ internal actual class DefaultDeviceConnectionManager(
         return false
     }
 
-    override suspend fun performAction(action: DeviceAction) {
+    override suspend fun didStartPerformingAction(action: DeviceAction) {
         currentAction = action
         when (action) {
             is DeviceAction.Read.Characteristic -> action.characteristic.wrapper.readValue(peripheral)
@@ -188,12 +188,12 @@ internal actual class DefaultDeviceConnectionManager(
         }
     }
 
-    override suspend fun unpair() {
-        // There is no iOS API to unpair peripheral
+    override suspend fun didStartPairing() {
+        // There is no iOS API to pair peripheral
     }
 
-    override suspend fun pair() {
-        // There is no iOS API to pair peripheral
+    override suspend fun didStartUnpairing() {
+        // There is no iOS API to unpair peripheral
     }
 
     private fun updateCharacteristic(characteristic: CBCharacteristic, error: NSError?) {
diff --git a/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt
index bc1287c6c..ee2579b00 100644
--- a/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -48,9 +48,9 @@ internal actual class DefaultDeviceConnectionManager(
 
     override suspend fun requestMtu(mtu: Int) = false
 
-    override suspend fun performAction(action: DeviceAction) {}
+    override suspend fun didStartPerformingAction(action: DeviceAction) {}
 
-    override suspend fun unpair() {}
+    override suspend fun didStartPairing() {}
 
-    override suspend fun pair() {}
+    override suspend fun didStartUnpairing() {}
 }
diff --git a/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt
index bc1287c6c..ee2579b00 100644
--- a/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -48,9 +48,9 @@ internal actual class DefaultDeviceConnectionManager(
 
     override suspend fun requestMtu(mtu: Int) = false
 
-    override suspend fun performAction(action: DeviceAction) {}
+    override suspend fun didStartPerformingAction(action: DeviceAction) {}
 
-    override suspend fun unpair() {}
+    override suspend fun didStartPairing() {}
 
-    override suspend fun pair() {}
+    override suspend fun didStartUnpairing() {}
 }
diff --git a/location/src/androidLibMain/kotlin/location/LocationExtensions.kt b/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
index e7b43d041..acff1c1b8 100644
--- a/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
@@ -21,6 +21,7 @@ package com.splendo.kaluga.location
 import android.os.Build
 import com.google.android.gms.location.LocationResult
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
+import kotlin.time.Duration.Companion.milliseconds
 
 fun android.location.Location.toKnownLocation(): Location.KnownLocation {
     return Location.KnownLocation(
@@ -30,7 +31,7 @@ fun android.location.Location.toKnownLocation(): Location.KnownLocation {
         horizontalAccuracy = accuracy.toDouble(),
         verticalAccuracy = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) verticalAccuracyMeters.toDouble() else 0.0,
         speed = speed.toDouble(),
-        time = DefaultKalugaDate.epoch(time)
+        time = DefaultKalugaDate.epoch(time.milliseconds)
     )
 }
 
diff --git a/service/src/commonMain/kotlin/ServiceMonitor.kt b/service/src/commonMain/kotlin/ServiceMonitor.kt
index f8fcef8a2..ea2e6b4bf 100644
--- a/service/src/commonMain/kotlin/ServiceMonitor.kt
+++ b/service/src/commonMain/kotlin/ServiceMonitor.kt
@@ -67,7 +67,7 @@ abstract class DefaultServiceMonitor(protected val logger: Logger = RestrictedLo
         monitoringDidStart()
     }
 
-    abstract fun monitoringDidStart()
+    protected abstract fun monitoringDidStart()
 
     final override fun stopMonitoring() {
         logger.debug(TAG) { "Stop monitoring service state" }
@@ -75,7 +75,7 @@ abstract class DefaultServiceMonitor(protected val logger: Logger = RestrictedLo
         monitoringDidStop()
     }
 
-    abstract fun monitoringDidStop()
+    protected abstract fun monitoringDidStop()
 
     protected fun updateState() {
         logger.debug(TAG) { "updateState isLocationEnabled = $isServiceEnabled" }
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
index a3ffb9c7d..8e33c84df 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
@@ -19,6 +19,11 @@ package com.splendo.kaluga.test.bluetooth.device
 
 import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.base.utils.toHexString
+import com.splendo.kaluga.bluetooth.Characteristic
+import com.splendo.kaluga.bluetooth.Descriptor
+import com.splendo.kaluga.bluetooth.Service
+import com.splendo.kaluga.bluetooth.ServiceWrapper
+import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.asBytes
 import com.splendo.kaluga.bluetooth.device.BaseDeviceConnectionManager
 import com.splendo.kaluga.bluetooth.device.ConnectionSettings
@@ -156,6 +161,10 @@ class MockDeviceConnectionManager(
 
     override fun getCurrentState(): DeviceConnectionManager.State = getCurrentStateMock.call()
 
+    public override fun handleNewRssi(rssi: Int) {
+        super.handleNewRssi(rssi)
+    }
+
     override suspend fun connect(): Unit = connectMock.call()
 
     override suspend fun discoverServices(): Unit = discoverServicesMock.call()
@@ -166,11 +175,11 @@ class MockDeviceConnectionManager(
 
     override suspend fun requestMtu(mtu: Int): Boolean = requestMtuMock.call(mtu)
 
-    override suspend fun pair(): Unit = pairMock.call()
+    override suspend fun didStartPairing(): Unit = pairMock.call()
 
-    override suspend fun unpair(): Unit = unpairMock.call()
+    override suspend fun didStartUnpairing(): Unit = unpairMock.call()
 
-    override suspend fun performAction(action: DeviceAction): Unit = performActionMock.call(action)
+    override suspend fun didStartPerformingAction(action: DeviceAction): Unit = performActionMock.call(action)
 
     suspend fun handleCurrentAction() {
         currentAction?.let { action ->
@@ -202,10 +211,34 @@ class MockDeviceConnectionManager(
         }
     }
 
+    public override fun handleDiscoverCompleted(services: List<Service>) {
+        super.handleDiscoverCompleted(services)
+    }
+
+    public override fun createService(wrapper: ServiceWrapper): Service {
+        return super.createService(wrapper)
+    }
+
     override fun handleCurrentActionCompleted(succeeded: Boolean) {
         handleCurrentActionCompletedWithAction(succeeded, currentAction)
         return super.handleCurrentActionCompleted(succeeded)
     }
 
+    public override fun handleUpdatedCharacteristic(
+        uuid: UUID,
+        succeeded: Boolean,
+        onUpdate: ((Characteristic) -> Unit)?
+    ) {
+        super.handleUpdatedCharacteristic(uuid, succeeded, onUpdate)
+    }
+
+    public override fun handleUpdatedDescriptor(
+        uuid: UUID,
+        succeeded: Boolean,
+        onUpdate: ((Descriptor) -> Unit)?
+    ) {
+        super.handleUpdatedDescriptor(uuid, succeeded, onUpdate)
+    }
+
     private fun handleCurrentActionCompletedWithAction(succeeded: Boolean, deviceAction: DeviceAction?): Unit = handleCurrentActionCompletedMock.call(succeeded, deviceAction)
 }
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
index 7d0c782ac..d0e5b3cb0 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanner.kt
@@ -59,9 +59,6 @@ class MockScanner(
     val stopScanningMock = ::stopScanning.mock()
     override suspend fun stopScanning(): Unit = stopScanningMock.call()
 
-    val generateEnableSensorsActionsMock = ::generateEnableSensorsActions.mock()
-    override fun generateEnableSensorsActions(): List<EnableSensorAction> = generateEnableSensorsActionsMock.call()
-
     val retrievePairedDevicesMock = ::retrievePairedDevices.mock()
     override suspend fun retrievePairedDevices(withServices: Set<UUID>): Unit = retrievePairedDevicesMock.call(withServices)
 }

From cbab4d4b527aabdaa5eb5c679b8e79c525538b54 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 14 Feb 2023 11:55:53 +0100
Subject: [PATCH 169/227] Remaining Bluetooth documentation

---
 .../androidLibMain/kotlin/BluetoothBuilder.kt |  7 ++
 .../androidLibMain/kotlin/BluetoothMonitor.kt | 18 ++++
 .../androidLibMain/kotlin/Characteristic.kt   | 75 +++++++++++++-
 .../src/androidLibMain/kotlin/Descriptor.kt   | 27 +++++
 .../src/androidLibMain/kotlin/PairingUtils.kt |  6 +-
 .../src/androidLibMain/kotlin/Service.kt      | 69 ++++++++++++-
 bluetooth/src/androidLibMain/kotlin/UUID.kt   | 10 ++
 bluetooth/src/androidLibMain/kotlin/Value.kt  |  6 ++
 .../kotlin/device/AdvertisementData.kt        |  4 +
 .../kotlin/device/BluetoothGattWrapper.kt     | 68 ++++++++++++-
 .../kotlin/device/DeviceInfo.kt               | 15 +++
 .../kotlin/device/DeviceWrapper.kt            | 59 ++++++++++-
 .../androidLibMain/kotlin/scanner/Scanner.kt  | 19 ++++
 bluetooth/src/commonMain/kotlin/Descriptor.kt |  2 +-
 .../kotlin/scanner/ScanningStateRepo.kt       |  2 -
 .../src/iosMain/kotlin/BluetoothBuilder.kt    |  7 ++
 .../src/iosMain/kotlin/BluetoothMonitor.kt    | 17 ++++
 .../src/iosMain/kotlin/Characteristic.kt      | 39 ++++++++
 bluetooth/src/iosMain/kotlin/Descriptor.kt    | 25 +++++
 bluetooth/src/iosMain/kotlin/Service.kt       | 15 +++
 bluetooth/src/iosMain/kotlin/UUID.kt          | 10 ++
 bluetooth/src/iosMain/kotlin/Value.kt         |  6 ++
 .../kotlin/device/AdvertisementData.kt        |  4 +
 .../src/iosMain/kotlin/device/DeviceInfo.kt   | 15 +++
 .../iosMain/kotlin/device/DeviceWrapper.kt    | 14 +++
 .../src/iosMain/kotlin/scanner/Scanner.kt     | 99 ++++++++++++-------
 .../src/jsMain/kotlin/BluetoothBuilder.kt     |  5 +
 .../src/jsMain/kotlin/BluetoothMonitor.kt     | 15 +++
 bluetooth/src/jsMain/kotlin/UUID.kt           | 11 +++
 bluetooth/src/jsMain/kotlin/Value.kt          |  6 ++
 .../jsMain/kotlin/device/AdvertisementData.kt |  3 +
 .../src/jsMain/kotlin/device/DeviceInfo.kt    | 15 +++
 .../src/jsMain/kotlin/device/DeviceWrapper.kt | 11 +++
 .../src/jsMain/kotlin/scanner/Scanner.kt      |  9 ++
 bluetooth/src/jsMain/kotlin/wrappers.kt       | 41 ++++++++
 .../src/jvmMain/kotlin/BluetoothBuilder.kt    |  5 +
 .../src/jvmMain/kotlin/BluetoothMonitor.kt    | 15 +++
 bluetooth/src/jvmMain/kotlin/UUID.kt          | 11 +++
 bluetooth/src/jvmMain/kotlin/Value.kt         |  6 ++
 .../kotlin/device/AdvertisementData.kt        |  3 +
 .../src/jvmMain/kotlin/device/DeviceInfo.kt   | 15 +++
 .../jvmMain/kotlin/device/DeviceWrapper.kt    | 11 +++
 .../src/jvmMain/kotlin/scanner/Scanner.kt     |  9 ++
 bluetooth/src/jvmMain/kotlin/wrappers.kt      | 41 ++++++++
 44 files changed, 819 insertions(+), 51 deletions(-)

diff --git a/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt
index 989c81af6..e52e02115 100644
--- a/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt
@@ -12,6 +12,13 @@ import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNot
 import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRegistered
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A default implementation of [BaseBluetoothBuilder]
+ * @param applicationContext the [Context] in which Bluetooth should run
+ * @param permissionsBuilder a method for creating the [Permissions] object to manage the Bluetooth permissions.
+ * Needs to have [com.splendo.kaluga.permissions.bluetooth.BluetoothPermission] and [com.splendo.kaluga.permissions.location.LocationPermission] registered.
+ * @param scannerBuilder the [BaseScanner.Builder] for creating the [BaseScanner] to handle scanning
+ */
 actual class BluetoothBuilder(
     private val applicationContext: Context = ApplicationHolder.applicationContext,
     private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
diff --git a/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt
index 3a092ba11..03fac9e25 100644
--- a/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/androidLibMain/kotlin/BluetoothMonitor.kt
@@ -26,12 +26,25 @@ import com.splendo.kaluga.base.ApplicationHolder
 import com.splendo.kaluga.service.DefaultServiceMonitor
 import com.splendo.kaluga.service.ServiceMonitor
 
+/**
+ * A [ServiceMonitor] that monitors whether Bluetooth is enabled
+ */
 actual interface BluetoothMonitor : ServiceMonitor {
 
+    /**
+     * Builder for creating a [BluetoothMonitor]
+     * @param context the [Context] in which Bluetooth should run
+     * @param adapter the [BluetoothAdapter] to use to access Bluetooth
+     */
     actual class Builder(
         private val context: Context = ApplicationHolder.applicationContext,
         private val adapter: BluetoothAdapter
     ) {
+
+        /**
+         * Creates the [BluetoothMonitor]
+         * @return the [BluetoothMonitor] created
+         */
         actual fun create(): BluetoothMonitor {
             return DefaultBluetoothMonitor(
                 applicationContext = context,
@@ -41,6 +54,11 @@ actual interface BluetoothMonitor : ServiceMonitor {
     }
 }
 
+/**
+ * A default implementation of [BluetoothMonitor]
+ * @param applicationContext the [Context] in which Bluetooth should run
+ * @param bluetoothAdapter the [BluetoothAdapter] to use to access Bluetooth
+ */
 class DefaultBluetoothMonitor internal constructor(
     private val applicationContext: Context,
     private val bluetoothAdapter: BluetoothAdapter
diff --git a/bluetooth/src/androidLibMain/kotlin/Characteristic.kt b/bluetooth/src/androidLibMain/kotlin/Characteristic.kt
index 69250c699..b386eb5e2 100644
--- a/bluetooth/src/androidLibMain/kotlin/Characteristic.kt
+++ b/bluetooth/src/androidLibMain/kotlin/Characteristic.kt
@@ -19,21 +19,84 @@ package com.splendo.kaluga.bluetooth
 
 import android.bluetooth.BluetoothGattCharacteristic
 
+/**
+ * Accessor to a [BluetoothGattCharacteristic]
+ */
 actual interface CharacteristicWrapper {
 
+    /**
+     * The write type of a characteristic
+     */
+    enum class WriteType(val rawValue: Int) {
+        /**
+         * Write characteristic, requesting acknowledgement by the remote device
+         */
+        DEFAULT(BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT),
+
+        /**
+         * Write characteristic without requiring a response by the remote device
+         */
+        NO_RESPONSE(BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE),
+
+        /**
+         * Write characteristic including authentication signature
+         */
+        SIGNED(BluetoothGattCharacteristic.WRITE_TYPE_SIGNED)
+    }
+
+    /**
+     * The [UUID] of the characteristic
+     */
     actual val uuid: java.util.UUID
+
+    /**
+     * The current [Value] of the characteristic
+     */
     actual val value: ByteArray?
+
+    /**
+     * Accessor for updating [CharacteristicWrapper.value]
+     * @param value the [ByteArray] to update [CharacteristicWrapper.value] with
+     */
     fun updateValue(value: ByteArray?)
 
+    /**
+     * The [ServiceWrapper] of the Service of the [BluetoothGattCharacteristic]
+     */
     val service: ServiceWrapper
+
+    /**
+     * The list of [DescriptorWrapper] of associated with the characteristic
+     */
     actual val descriptors: List<DescriptorWrapper>
+
+    /**
+     * The integer representing all permissions for the characteristic
+     */
     val permissions: Int
+
+    /**
+     * The integer representing all [CharacteristicProperties] of the characteristic
+     */
     actual val properties: Int
-    var writeType: Int
 
+    /**
+     * The [WriteType] of the characteristic
+     */
+    var writeType: WriteType
+
+    /**
+     * Gets the [DescriptorWrapper] for the descriptor with a given [java.util.UUID] if it belongs to the characteristic
+     * @param uuid the [java.util.UUID] of the descriptor to get
+     * @return the [DescriptorWrapper] belonging to [uuid] if it exists, or `null` otherwise
+     */
     fun getDescriptor(uuid: java.util.UUID): DescriptorWrapper?
 }
 
+/**
+ * Default implementation of [CharacteristicWrapper]
+ * @param gattCharacteristic the [BluetoothGattCharacteristic] to wrap
+ */
 class DefaultCharacteristicWrapper(private val gattCharacteristic: BluetoothGattCharacteristic) : CharacteristicWrapper {
 
     override val uuid: java.util.UUID
@@ -53,9 +116,13 @@ class DefaultCharacteristicWrapper(private val gattCharacteristic: BluetoothGatt
         get() { return gattCharacteristic.permissions }
     override val properties: Int
         get() { return gattCharacteristic.properties }
-    override var writeType: Int
-        get() { return gattCharacteristic.writeType }
-        set(value) { gattCharacteristic.writeType = value }
+    override var writeType: CharacteristicWrapper.WriteType
+        get() = when (gattCharacteristic.writeType) {
+            BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE -> CharacteristicWrapper.WriteType.NO_RESPONSE
+            BluetoothGattCharacteristic.WRITE_TYPE_SIGNED -> CharacteristicWrapper.WriteType.SIGNED
+            else -> CharacteristicWrapper.WriteType.DEFAULT
+        }
+        set(value) { gattCharacteristic.writeType = value.rawValue }
 
     override fun getDescriptor(uuid: java.util.UUID): DescriptorWrapper? {
         return gattCharacteristic.getDescriptor(uuid)?.let { DefaultDescriptorWrapper(it) }
diff --git a/bluetooth/src/androidLibMain/kotlin/Descriptor.kt b/bluetooth/src/androidLibMain/kotlin/Descriptor.kt
index 55770dc6f..496eeb777 100644
--- a/bluetooth/src/androidLibMain/kotlin/Descriptor.kt
+++ b/bluetooth/src/androidLibMain/kotlin/Descriptor.kt
@@ -19,15 +19,42 @@ package com.splendo.kaluga.bluetooth
 
 import android.bluetooth.BluetoothGattDescriptor
 
+/**
+ * Accessor to a [BluetoothGattDescriptor]
+ */
 actual interface DescriptorWrapper {
+
+    /**
+     * The [UUID] of the descriptor
+     */
     actual val uuid: java.util.UUID
+
+    /**
+     * The current [Value] of the descriptor
+     */
     actual val value: ByteArray?
+
+    /**
+     * Accessor for updating [DescriptorWrapper.value]
+     * @param value the [ByteArray] to update [DescriptorWrapper.value] with
+     */
     fun updateValue(value: ByteArray?)
 
+    /**
+     * The integer representing all permissions for the descriptor
+     */
     val permissions: Int
+
+    /**
+     * The [CharacteristicWrapper] of the Descriptor of the [BluetoothGattDescriptor]
+     */
     val characteristic: CharacteristicWrapper
 }
 
+/**
+ * Default implementation of [DescriptorWrapper]
+ * @param gattDescriptor the [BluetoothGattDescriptor] to wrap
+ */
 class DefaultDescriptorWrapper(private val gattDescriptor: BluetoothGattDescriptor) : DescriptorWrapper {
 
     override val uuid: java.util.UUID
diff --git a/bluetooth/src/androidLibMain/kotlin/PairingUtils.kt b/bluetooth/src/androidLibMain/kotlin/PairingUtils.kt
index 399a4989a..0e358f946 100644
--- a/bluetooth/src/androidLibMain/kotlin/PairingUtils.kt
+++ b/bluetooth/src/androidLibMain/kotlin/PairingUtils.kt
@@ -26,8 +26,7 @@ import kotlinx.coroutines.flow.transformLatest
 // TODO: consider moving this to commonMain
 
 /**
- * Unpairs Device by calling `removeBond`
- * if bond state != BluetoothDevice.BOND_NONE
+ * Pairs a ([Flow] of) [Device] by waiting for it to become connected and calling `[ConnectableDeviceState.Connected.pair]`
  */
 suspend fun Flow<Device?>.pair() {
     return state().transformLatest { deviceState ->
@@ -41,8 +40,7 @@ suspend fun Flow<Device?>.pair() {
 }
 
 /**
- * Pairs Device by calling `createBond`
- * if bond state == BluetoothDevice.BOND_NONE
+ * Pairs a ([Flow] of) [Device] by calling `[ConnectableDeviceState.unpair]` on the first [ConnectableDeviceState]
  */
 suspend fun Flow<Device?>.unpair() {
     return state().transformLatest { deviceState ->
diff --git a/bluetooth/src/androidLibMain/kotlin/Service.kt b/bluetooth/src/androidLibMain/kotlin/Service.kt
index 0f87ca68d..ab4bbfe8b 100644
--- a/bluetooth/src/androidLibMain/kotlin/Service.kt
+++ b/bluetooth/src/androidLibMain/kotlin/Service.kt
@@ -20,26 +20,89 @@ package com.splendo.kaluga.bluetooth
 import android.bluetooth.BluetoothGattCharacteristic
 import android.bluetooth.BluetoothGattService
 
+/**
+ * Accessor to a [BluetoothGattService]
+ */
 actual interface ServiceWrapper {
 
+    /**
+     * Service Type
+     */
+    enum class Type {
+
+        /**
+         * Primary service
+         */
+        PRIMARY,
+
+        /**
+         * Secondary service (included by primary services)
+         */
+        SECONDARY
+    }
+
+    /**
+     * The [UUID] of the service
+     */
     actual val uuid: java.util.UUID
-    val type: Int
+
+    /**
+     * The [Type] of this service (primary/secondary)
+     */
+    val type: Type
+
+    /**
+     * Returns the instance ID for this service.
+     * If a remote device offers multiple services with the same UUID (ex. multiple battery services for different batteries), the instance ID is used to distinguish services.
+     */
     val instanceId: Int
+
+    /**
+     * The list of [CharacteristicWrapper] associated with the service
+     */
     actual val characteristics: List<CharacteristicWrapper>
+
+    /**
+     * The list of [ServiceWrapper] included in this service
+     */
     val includedServices: List<ServiceWrapper>
 
+    /**
+     * Gets the [CharacteristicWrapper] for the characteristic with a given [java.util.UUID] if it belongs to the service
+     * @param uuid the [java.util.UUID] of the characteristic to get
+     * @return the [CharacteristicWrapper] belonging to [uuid] if it exists, or `null` otherwise
+     */
     fun getCharacteristic(uuid: java.util.UUID): CharacteristicWrapper?
+
+    /**
+     * Adds a [BluetoothGattCharacteristic] to the service
+     * @param characteristic the [BluetoothGattCharacteristic] to add
+     * @return `true` if the characteristic was added to [characteristics]
+     */
     fun addCharacteristic(characteristic: BluetoothGattCharacteristic): Boolean
+
+    /**
+     * Adds an included [BluetoothGattService] to the service
+     * @param service the [BluetoothGattService] to add
+     * @return `true` if the service was added to [includedServices]
+     */
     fun addService(service: BluetoothGattService): Boolean
 }
 
+/**
+ * Default implementation of [ServiceWrapper]
+ * @param gattService the [BluetoothGattService] to wrap
+ */
 class DefaultGattServiceWrapper(private val gattService: BluetoothGattService) :
     ServiceWrapper {
 
     override val uuid: java.util.UUID
         get() = gattService.uuid
-    override val type: Int
-        get() = gattService.type
+    override val type: ServiceWrapper.Type
+        get() = when (gattService.type) {
+            BluetoothGattService.SERVICE_TYPE_PRIMARY -> ServiceWrapper.Type.PRIMARY
+            else -> ServiceWrapper.Type.SECONDARY
+        }
     override val instanceId: Int
         get() = gattService.instanceId
     override val characteristics: List<CharacteristicWrapper>
diff --git a/bluetooth/src/androidLibMain/kotlin/UUID.kt b/bluetooth/src/androidLibMain/kotlin/UUID.kt
index 6cc99d02c..0344731e2 100644
--- a/bluetooth/src/androidLibMain/kotlin/UUID.kt
+++ b/bluetooth/src/androidLibMain/kotlin/UUID.kt
@@ -17,8 +17,14 @@
 
 package com.splendo.kaluga.bluetooth
 
+/**
+ * The Unique Identifier of a Bluetooth property
+ */
 actual typealias UUID = java.util.UUID
 
+/**
+ * The string representation of a [UUID]
+ */
 actual val UUID.uuidString: String
     get() = toString()
 
@@ -26,4 +32,8 @@ internal actual fun unsafeUUIDFrom(uuidString: String): UUID =
     if (uuidString.isShortUUID()) uuidFromShort(uuidString)
     else UUID.fromString(uuidString)
 
+/**
+ * Gets a random [UUID]
+ * @return a random [UUID]
+ */
 actual fun randomUUID(): UUID = UUID.randomUUID()
diff --git a/bluetooth/src/androidLibMain/kotlin/Value.kt b/bluetooth/src/androidLibMain/kotlin/Value.kt
index 194c95a27..1feee70ab 100644
--- a/bluetooth/src/androidLibMain/kotlin/Value.kt
+++ b/bluetooth/src/androidLibMain/kotlin/Value.kt
@@ -17,7 +17,13 @@
 
 package com.splendo.kaluga.bluetooth
 
+/**
+ * The value of a bluetooth attribute
+ */
 actual typealias Value = ByteArray
 
+/**
+ * Gets the [ByteArray] value of a [Value]
+ */
 actual val Value.asBytes: ByteArray
     get() = this
diff --git a/bluetooth/src/androidLibMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/androidLibMain/kotlin/device/AdvertisementData.kt
index 570acc757..63f6e8763 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/AdvertisementData.kt
@@ -22,6 +22,10 @@ import no.nordicsemi.android.support.v18.scanner.ScanResult
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 
+/**
+ * Android implementation of [BaseAdvertisementData]
+ * @param scanResult the [ScanResult] being advertised
+ */
 actual class AdvertisementData(private val scanResult: ScanResult?) : BaseAdvertisementData {
 
     private val scanRecord = scanResult?.scanRecord
diff --git a/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt b/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt
index 7758bd543..6a90db9bd 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt
@@ -25,23 +25,89 @@ import android.bluetooth.BluetoothStatusCodes
 import com.splendo.kaluga.bluetooth.CharacteristicWrapper
 import com.splendo.kaluga.bluetooth.DescriptorWrapper
 
+/**
+ * A wrapper to access a [BluetoothGatt]
+ */
 interface BluetoothGattWrapper {
+
+    /**
+     * Connect to the Bluetooth device
+     * @return `true` if the connection attempt was initiated successfully
+     */
     fun connect(): Boolean
+
+    /**
+     * Discovers services offered by a remote device as well as their characteristics and descriptors.
+     * @return `true` if the discovery attempt was initiated successfully
+     */
     fun discoverServices(): Boolean
+
+    /**
+     * Disconnects the current connection or cancels the current attempt if it is in progress
+     */
     fun disconnect()
+
+    /**
+     * Close connection to the Bluetooth Gatt server
+     */
     fun close()
+
+    /**
+     * Reads the RSSI value
+     * @return `true` if the RSSI value has been requested successfully
+     */
     fun readRemoteRssi(): Boolean
 
-    /** Request MTU, returns `true` if the new MTU value has been requested successfully */
+    /**
+     * Request an Maximum Transmission Unit (MTU) size
+     * @param mtu the MTU size
+     * @return `true` if the new MTU value has been requested successfully
+     */
     fun requestMtu(mtu: Int): Boolean
 
+    /**
+     * Reads the value of the [CharacteristicWrapper] from the device
+     * @param wrapper the [CharacteristicWrapper] to read from
+     * @return `true` if the read operation was initiated successfully
+     */
     fun readCharacteristic(wrapper: CharacteristicWrapper): Boolean
+
+    /**
+     * Reads the value of the [DeviceWrapper] from the device
+     * @param wrapper the [DeviceWrapper] to read from
+     * @return `true` if the read operation was initiated successfully
+     */
     fun readDescriptor(wrapper: DescriptorWrapper): Boolean
+
+    /**
+     * Writes a value to the [CharacteristicWrapper] from the device
+     * @param wrapper the [CharacteristicWrapper] to write to
+     * @param value the [ByteArray] to write
+     * @return `true` if the write operation was initiated successfully
+     */
     fun writeCharacteristic(wrapper: CharacteristicWrapper, value: ByteArray): Boolean
+
+    /**
+     * Writes a value to the [DescriptorWrapper] from the device
+     * @param wrapper the [DescriptorWrapper] to write to
+     * @param value the [ByteArray] to write
+     * @return `true` if the write operation was initiated successfully
+     */
     fun writeDescriptor(wrapper: DescriptorWrapper, value: ByteArray): Boolean
+
+    /**
+     * Enable or disable notifications for a given [CharacteristicWrapper]
+     * @param wrapper the [CharacteristicWrapper] to enable/disable notifications for
+     * @param enable if `true` notifications should be enabled
+     * @return `true` if the requested notification status was set successfully
+     */
     fun setCharacteristicNotification(wrapper: CharacteristicWrapper, enable: Boolean): Boolean
 }
 
+/**
+ * Default implementation of [BluetoothGattWrapper]
+ * @param gatt the [BluetoothGatt] being wrapped
+ */
 @SuppressLint("MissingPermission")
 class DefaultBluetoothGattWrapper(private val gatt: BluetoothGatt) : BluetoothGattWrapper {
 
diff --git a/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt
index c2e4cd326..6c371e927 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt
@@ -21,11 +21,26 @@ package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.bluetooth.randomUUIDString
 
+/**
+ * Unique identifier of a Bluetooth [Device]
+ */
 actual typealias Identifier = String
 
+/**
+ * Gets a random [Identifier]
+ * @return a random [Identifier]
+ */
 actual fun randomIdentifier() = randomUUIDString()
 
+/**
+ * Gets a [Identifier] from a string value
+ * @param stringValue the string value to get the [Identifier] from
+ * @return an [Identifier] matching the string value or `null` if it could not be generated
+ */
 actual fun identifierFromString(stringValue: String): Identifier? = stringValue
 
+/**
+ * Gets a string representation of an [Identifier]
+ */
 actual val Identifier.stringValue: String
     get() = this
diff --git a/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt b/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt
index d0ea730f4..5711a007c 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt
@@ -23,17 +23,66 @@ import android.bluetooth.BluetoothGattCallback
 import android.content.Context
 import android.os.Build
 
+/**
+ * Accessor to the [BluetoothDevice]
+ */
 actual interface DeviceWrapper {
     actual val name: String?
     actual val identifier: Identifier
-    val bondState: Int
+
+    /**
+     * Bond state of the Device
+     */
+    enum class BondState {
+        /**
+         * Indicates the device is not bonded
+         */
+        NONE,
+
+        /**
+         * Indicates the device is in the process of bonding
+         */
+        BONDING,
+
+        /**
+         * Indicates the device s bonded
+         */
+        BONDED
+    }
+
+    /**
+     * The [BondState] of the device
+     */
+    val bondState: BondState
+
+    /**
+     * Connects to the GATT Server hosted by the [BluetoothDevice]
+     * @param context the [Context] used for connecting to the GATT server
+     * @param autoConnect if `true` the device will connect as soon as it becomes available, otherwise connects directly
+     * @param callback the [BluetoothGattCallback] used to receive for asynchronous result
+     */
     fun connectGatt(context: Context, autoConnect: Boolean, callback: BluetoothGattCallback): BluetoothGattWrapper
+
+    /**
+     * Removes the bond from the device (unpair)
+     */
     fun removeBond()
+
+    /**
+     * Creates a bond with the device (pair)
+     */
     fun createBond()
 
+    /**
+     * The [BluetoothDevice] being wrapped
+     */
     val device: BluetoothDevice
 }
 
+/**
+ * Default implementation of [DeviceWrapper]
+ * @param device the [BluetoothDevice] being wrapped
+ */
 @SuppressLint("MissingPermission")
 class DefaultDeviceWrapper(override val device: BluetoothDevice) : DeviceWrapper {
 
@@ -41,8 +90,12 @@ class DefaultDeviceWrapper(override val device: BluetoothDevice) : DeviceWrapper
         get() = device.name
     override val identifier: Identifier
         get() = device.address
-    override val bondState: Int
-        get() = device.bondState
+    override val bondState: DeviceWrapper.BondState
+        get() = when (device.bondState) {
+            BluetoothDevice.BOND_BONDED -> DeviceWrapper.BondState.BONDED
+            BluetoothDevice.BOND_BONDING -> DeviceWrapper.BondState.BONDING
+            else -> DeviceWrapper.BondState.NONE
+        }
 
     override fun connectGatt(context: Context, autoConnect: Boolean, callback: BluetoothGattCallback): BluetoothGattWrapper {
         val gatt = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
diff --git a/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt b/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
index 249e8bca1..5f4163260 100644
--- a/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt
@@ -54,6 +54,15 @@ import no.nordicsemi.android.support.v18.scanner.ScanFilter
 import no.nordicsemi.android.support.v18.scanner.ScanResult
 import no.nordicsemi.android.support.v18.scanner.ScanSettings
 
+/**
+ * A default implementation of [BaseScanner]
+ * @param applicationContext the [Context] in which Bluetooth should run
+ * @param bluetoothScanner the [BluetoothLeScannerCompat] to use for scanning
+ * @param bluetoothAdapter the [BluetoothAdapter] to use to access Bluetooth
+ * @param scanSettings the [ScanSettings] to apply to the scanner
+ * @param settings the [BaseScanner.Settings] to configure this scanner
+ * @param coroutineScope the [CoroutineScope] this scanner runs on
+ */
 actual class DefaultScanner internal constructor(
     private val applicationContext: Context,
     private val bluetoothScanner: BluetoothLeScannerCompat,
@@ -63,6 +72,13 @@ actual class DefaultScanner internal constructor(
     coroutineScope: CoroutineScope,
 ) : BaseScanner(settings, coroutineScope) {
 
+    /**
+     * Builder for creating a [DefaultScanner]
+     * @param applicationContext the [Context] in which Bluetooth should run
+     * @param bluetoothScanner the [BluetoothLeScannerCompat] to use for scanning
+     * @param bluetoothAdapter the [BluetoothAdapter] to use to access Bluetooth
+     * @param scanSettings the [ScanSettings] to apply to the scanner
+     */
     class Builder(
         private val applicationContext: Context = ApplicationHolder.applicationContext,
         private val bluetoothScanner: BluetoothLeScannerCompat = BluetoothLeScannerCompat.getScanner(),
@@ -79,6 +95,9 @@ actual class DefaultScanner internal constructor(
     }
 
     companion object {
+        /**
+         * Default [ScanSettings]
+         */
         val defaultScanSettings = ScanSettings.Builder()
             .setScanMode(ScanSettings.SCAN_MODE_BALANCED)
             .setNumOfMatches(ScanSettings.MATCH_NUM_FEW_ADVERTISEMENT)
diff --git a/bluetooth/src/commonMain/kotlin/Descriptor.kt b/bluetooth/src/commonMain/kotlin/Descriptor.kt
index 948b9c2bb..64e496809 100644
--- a/bluetooth/src/commonMain/kotlin/Descriptor.kt
+++ b/bluetooth/src/commonMain/kotlin/Descriptor.kt
@@ -58,7 +58,7 @@ open class Descriptor(
 }
 
 /**
- * Accessor the the platform level Bluetooth Descriptor
+ * Accessor to the platform level Bluetooth Descriptor
  */
 expect interface DescriptorWrapper {
 
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
index 1838d1478..ed798c24c 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningStateRepo.kt
@@ -23,8 +23,6 @@ import com.splendo.kaluga.bluetooth.device.Device
 import com.splendo.kaluga.bluetooth.device.DeviceInfoImpl
 import com.splendo.kaluga.bluetooth.device.DeviceWrapper
 import com.splendo.kaluga.bluetooth.device.Identifier
-import com.splendo.kaluga.permissions.base.Permission
-import com.splendo.kaluga.permissions.base.PermissionState
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
diff --git a/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
index 71c3e9ee1..d72d2fe7c 100644
--- a/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/iosMain/kotlin/BluetoothBuilder.kt
@@ -9,6 +9,13 @@ import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNot
 import platform.Foundation.NSBundle
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A default implementation of [BaseBluetoothBuilder]
+ * @param bundle the [NSBundle] in which Bluetooth should run
+ * @param permissionsBuilder a method for creating the [Permissions] object to manage the Bluetooth permissions.
+ * Needs to have [com.splendo.kaluga.permissions.bluetooth.BluetoothPermission] registered.
+ * @param scannerBuilder the [BaseScanner.Builder] for creating the [BaseScanner] to handle scanning
+ */
 actual class BluetoothBuilder(
     private val bundle: NSBundle = NSBundle.mainBundle,
     private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
diff --git a/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
index 466026682..8b3df6aff 100644
--- a/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/iosMain/kotlin/BluetoothMonitor.kt
@@ -26,14 +26,31 @@ import platform.CoreBluetooth.CBCentralManagerDelegateProtocol
 import platform.CoreBluetooth.CBManagerStatePoweredOn
 import platform.darwin.NSObject
 
+/**
+ * A [ServiceMonitor] that monitors whether Bluetooth is enabled
+ */
 actual interface BluetoothMonitor : ServiceMonitor {
+
+    /**
+     * Builder for creating a [BluetoothMonitor]
+     * @param centralManagerBuilder a method cor creating a [CBCentralManager] to manage Bluetooth
+     */
     actual class Builder(
         private val centralManagerBuilder: () -> CBCentralManager = { CBCentralManager() }
     ) {
+
+        /**
+         * Creates the [BluetoothMonitor]
+         * @return the [BluetoothMonitor] created
+         */
         actual fun create(): BluetoothMonitor = DefaultBluetoothMonitor(centralManagerBuilder = centralManagerBuilder)
     }
 }
 
+/**
+ * A default implementation of [BluetoothMonitor]
+ * @param centralManagerBuilder a method cor creating a [CBCentralManager] to manage Bluetooth
+ */
 class DefaultBluetoothMonitor internal constructor(
     private val centralManagerBuilder: () -> CBCentralManager
 ) : DefaultServiceMonitor(), BluetoothMonitor {
diff --git a/bluetooth/src/iosMain/kotlin/Characteristic.kt b/bluetooth/src/iosMain/kotlin/Characteristic.kt
index 9dbf9de05..c8169d89d 100644
--- a/bluetooth/src/iosMain/kotlin/Characteristic.kt
+++ b/bluetooth/src/iosMain/kotlin/Characteristic.kt
@@ -25,17 +25,56 @@ import platform.CoreBluetooth.CBPeripheral
 import platform.CoreBluetooth.CBUUID
 import platform.Foundation.NSData
 
+/**
+ * Accessor to a [CBCharacteristic]
+ */
 actual interface CharacteristicWrapper {
+
+    /**
+     * The [UUID] of the characteristic
+     */
     actual val uuid: CBUUID
+
+    /**
+     * The list of [DescriptorWrapper] of associated with the characteristic
+     */
     actual val descriptors: List<DescriptorWrapper>
+
+    /**
+     * The current [Value] of the characteristic
+     */
     actual val value: NSData?
+
+    /**
+     * The integer representing all [CharacteristicProperties] of the characteristic
+     */
     actual val properties: Int
 
+    /**
+     * Request a [CBPeripheral] to read the characteristic
+     * @param peripheral the [CBPeripheral] to perform the read operation
+     */
     fun readValue(peripheral: CBPeripheral)
+
+    /**
+     * Request a [CBPeripheral] to write [value] to the characteristic
+     * @param value the [NSData] to write to the characteristic
+     * @param peripheral the [CBPeripheral] to perform the write operation
+     */
     fun writeValue(value: NSData, peripheral: CBPeripheral)
+
+    /**
+     * Request a [CBPeripheral] to update the notifying status of the characteristic
+     * @param enabled if `true` notification should be enabled
+     * @param peripheral the [CBPeripheral] to perform the notifying operation
+     */
     fun setNotificationValue(enabled: Boolean, peripheral: CBPeripheral)
 }
 
+/**
+ * Default implementation of [CharacteristicWrapper]
+ * @param characteristic the [CBCharacteristic] to wrap
+ */
 class DefaultCharacteristicWrapper(private val characteristic: CBCharacteristic) : CharacteristicWrapper {
 
     override val uuid: CBUUID get() { return characteristic.UUID }
diff --git a/bluetooth/src/iosMain/kotlin/Descriptor.kt b/bluetooth/src/iosMain/kotlin/Descriptor.kt
index bafab88e7..1a9deabbf 100644
--- a/bluetooth/src/iosMain/kotlin/Descriptor.kt
+++ b/bluetooth/src/iosMain/kotlin/Descriptor.kt
@@ -32,14 +32,39 @@ import platform.Foundation.NSString
 import platform.Foundation.NSUTF8StringEncoding
 import platform.Foundation.dataUsingEncoding
 
+/**
+ * Accessor to a [CBDescriptor]
+ */
 actual interface DescriptorWrapper {
+
+    /**
+     * The [UUID] of the descriptor
+     */
     actual val uuid: CBUUID
+
+    /**
+     * The current [Value] of the descriptor
+     */
     actual val value: NSData?
 
+    /**
+     * Request a [CBPeripheral] to read the descriptor
+     * @param peripheral the [CBPeripheral] to perform the read operation
+     */
     fun readValue(peripheral: CBPeripheral)
+
+    /**
+     * Request a [CBPeripheral] to write [value] to the descriptor
+     * @param value the [NSData] to write to the descriptor
+     * @param peripheral the [CBPeripheral] to perform the write operation
+     */
     fun writeValue(value: NSData, peripheral: CBPeripheral)
 }
 
+/**
+ * Default implementation of [DescriptorWrapper]
+ * @param descriptor the [CBDescriptor] to wrap
+ */
 class DefaultDescriptorWrapper(private val descriptor: CBDescriptor) : DescriptorWrapper {
 
     override val uuid: CBUUID get() { return descriptor.UUID }
diff --git a/bluetooth/src/iosMain/kotlin/Service.kt b/bluetooth/src/iosMain/kotlin/Service.kt
index cd9e119a6..04dc55c0c 100644
--- a/bluetooth/src/iosMain/kotlin/Service.kt
+++ b/bluetooth/src/iosMain/kotlin/Service.kt
@@ -22,11 +22,26 @@ import platform.CoreBluetooth.CBCharacteristic
 import platform.CoreBluetooth.CBService
 import platform.CoreBluetooth.CBUUID
 
+/**
+ * Accessor to a [CBService]
+ */
 actual interface ServiceWrapper {
+
+    /**
+     * The [UUID] of the service
+     */
     actual val uuid: CBUUID
+
+    /**
+     * The list of [CharacteristicWrapper] associated with the service
+     */
     actual val characteristics: List<CharacteristicWrapper>
 }
 
+/**
+ * Default implementation of [ServiceWrapper]
+ * @param service the [CBService] to wrap
+ */
 class DefaultServiceWrapper(service: CBService) : ServiceWrapper {
 
     override val uuid: CBUUID = service.UUID
diff --git a/bluetooth/src/iosMain/kotlin/UUID.kt b/bluetooth/src/iosMain/kotlin/UUID.kt
index 25a7847a3..e5dde0774 100644
--- a/bluetooth/src/iosMain/kotlin/UUID.kt
+++ b/bluetooth/src/iosMain/kotlin/UUID.kt
@@ -20,14 +20,24 @@ package com.splendo.kaluga.bluetooth
 import platform.CoreBluetooth.CBUUID
 import platform.Foundation.NSUUID
 
+/**
+ * The Unique Identifier of a Bluetooth property
+ */
 actual typealias UUID = CBUUID
 
+/**
+ * The string representation of a [UUID]
+ */
 actual val UUID.uuidString: String
     get() = UUIDString
 
 internal actual fun unsafeUUIDFrom(uuidString: String) =
     CBUUID.UUIDWithString(uuidString)
 
+/**
+ * Gets a random [UUID]
+ * @return a random [UUID]
+ */
 actual fun randomUUID(): UUID {
     return CBUUID.UUIDWithNSUUID(NSUUID.UUID())
 }
diff --git a/bluetooth/src/iosMain/kotlin/Value.kt b/bluetooth/src/iosMain/kotlin/Value.kt
index 7e7b2f8aa..3e5407728 100644
--- a/bluetooth/src/iosMain/kotlin/Value.kt
+++ b/bluetooth/src/iosMain/kotlin/Value.kt
@@ -20,8 +20,14 @@ package com.splendo.kaluga.bluetooth
 import com.splendo.kaluga.base.utils.toByteArray
 import platform.Foundation.NSData
 
+/**
+ * The value of a bluetooth attribute
+ */
 actual typealias Value = NSData
 
+/**
+ * Gets the [ByteArray] value of a [Value]
+ */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER") // not relevant from Common
 actual val Value.asBytes: ByteArray
     get() = this.toByteArray()
diff --git a/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
index 78aadd533..25997c4a9 100644
--- a/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
@@ -31,6 +31,10 @@ import platform.CoreBluetooth.CBUUID
 import platform.Foundation.NSData
 import platform.Foundation.NSNumber
 
+/**
+ * iOS implementation of [BaseAdvertisementData]
+ * @param advertisementData a map containing the data being advertised
+ */
 actual class AdvertisementData(private val advertisementData: Map<String, Any>) : BaseAdvertisementData {
 
     override val name: String?
diff --git a/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt
index b63fa7394..47d2236cf 100644
--- a/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt
@@ -19,11 +19,26 @@ package com.splendo.kaluga.bluetooth.device
 
 import platform.Foundation.NSUUID
 
+/**
+ * Unique identifier of a Bluetooth [Device]
+ */
 actual typealias Identifier = NSUUID
 
+/**
+ * Gets a random [Identifier]
+ * @return a random [Identifier]
+ */
 actual fun randomIdentifier() = Identifier.UUID()
 
+/**
+ * Gets a [Identifier] from a string value
+ * @param stringValue the string value to get the [Identifier] from
+ * @return an [Identifier] matching the string value or `null` if it could not be generated
+ */
 actual fun identifierFromString(stringValue: String): Identifier? = NSUUID(stringValue)
 
+/**
+ * Gets a string representation of an [Identifier]
+ */
 actual val Identifier.stringValue: String
     get() = UUIDString
diff --git a/bluetooth/src/iosMain/kotlin/device/DeviceWrapper.kt b/bluetooth/src/iosMain/kotlin/device/DeviceWrapper.kt
index 031a2a8e1..870094ca8 100644
--- a/bluetooth/src/iosMain/kotlin/device/DeviceWrapper.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DeviceWrapper.kt
@@ -20,12 +20,26 @@ package com.splendo.kaluga.bluetooth.device
 import platform.CoreBluetooth.CBPeripheral
 import platform.Foundation.NSUUID
 
+/**
+ * Accessor to the [CBPeripheral]
+ */
 actual interface DeviceWrapper {
 
+    /**
+     * Name of the Bluetooth device
+     */
     actual val name: String?
+
+    /**
+     * [Identifier] of the Bluetooth device
+     */
     actual val identifier: NSUUID
 }
 
+/**
+ * Default implementation of [DeviceWrapper]
+ * @param peripheral the [CBPeripheral] to wrap
+ */
 class DefaultCBPeripheralWrapper(private val peripheral: CBPeripheral) : DeviceWrapper {
 
     override val name: String? get() { return peripheral.name }
diff --git a/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt b/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt
index a009f5443..9fdeb9ee6 100644
--- a/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/iosMain/kotlin/scanner/Scanner.kt
@@ -44,13 +44,23 @@ import platform.Foundation.NSNumber
 import platform.darwin.NSObject
 import platform.darwin.dispatch_queue_create
 
+/**
+ * A default implementation of [BaseScanner]
+ * @param settings the [BaseScanner.Settings] to configure this scanner
+ * @param scanSettings the [ScanSettings] to configure this scanner
+ * @param coroutineScope the [CoroutineScope] this scanner runs on
+ */
 actual class DefaultScanner internal constructor(
     settings: Settings,
     private val scanSettings: ScanSettings,
     coroutineScope: CoroutineScope
 ) : BaseScanner(settings, coroutineScope) {
 
-    class Builder(private val scanSettings: ScanSettings = defaultScanOptions) : BaseScanner.Builder {
+    /**
+     * Builder for creating a [DefaultScanner]
+     * @param scanSettings the [ScanSettings] to configure the scanner
+     */
+    class Builder(private val scanSettings: ScanSettings = ScanSettings.defaultScanOptions) : BaseScanner.Builder {
 
         override fun create(
             settings: Settings,
@@ -60,8 +70,61 @@ actual class DefaultScanner internal constructor(
         }
     }
 
-    companion object {
-        private val defaultScanOptions = ScanSettings.Builder().build()
+    /**
+     * Settings to configure a [DefaultScanner]
+     * @param allowDuplicateKeys if `true` a new discovery event will be sent each time advertisement data is received. Otherwise multiple discoveries will be grouped into a single discovery event
+     * @param solicitedServiceUUIDsKey when not empty the scanner will also scan for peripherals soliciting any services matching the [UUID]
+     */
+    class ScanSettings private constructor(
+        private val allowDuplicateKeys: Boolean,
+        private val solicitedServiceUUIDsKey: List<UUID>?
+    ) {
+
+        companion object {
+            internal val defaultScanOptions = Builder().build()
+        }
+
+        internal fun parse(): Map<Any?, *> {
+            val result: MutableMap<String, Any> =
+                mutableMapOf(CBCentralManagerScanOptionAllowDuplicatesKey to allowDuplicateKeys)
+            solicitedServiceUUIDsKey?.let {
+                result[CBCentralManagerScanOptionSolicitedServiceUUIDsKey] = it
+            }
+            return result.toMap()
+        }
+
+        /**
+         * Builder for creating [ScanSettings]
+         */
+        class Builder {
+
+            // https://developer.apple.com/documentation/corebluetooth/cbcentralmanagerscanoptionallowduplicateskey
+            private var allowDuplicateKeys: Boolean = true
+            // https://developer.apple.com/documentation/corebluetooth/cbcentralmanagerscanoptionsolicitedserviceuuidskey
+            private var solicitedServiceUUIDsKey: List<UUID>? = null
+
+            /**
+             * Sets whether a new discovery event will be sent each time advertisement data is received.
+             * @param allow if `true` a new discovery event will be sent each time advertisement data is received. Otherwise multiple discoveries will be grouped into a single discovery event
+             * @return the [Builder]
+             */
+            fun allowDuplicateKeys(allow: Boolean) =
+                apply { allowDuplicateKeys = allow }
+
+            /**
+             * Sets the list of [UUID] corresponding with services the scanner will also scan for
+             * @param keys when not empty the scanner will also scan for peripherals soliciting any services matching the [UUID]
+             * @return the [Builder]
+             */
+            fun solicitedServiceUUIDsKey(keys: List<UUID>) =
+                apply { solicitedServiceUUIDsKey = keys }
+
+            /**
+             * Creates [ScanSettings]
+             * @return the created [ScanSettings]
+             */
+            fun build(): ScanSettings = ScanSettings(allowDuplicateKeys, solicitedServiceUUIDsKey)
+        }
     }
 
     @Suppress("CONFLICTING_OVERLOADS")
@@ -192,34 +255,4 @@ actual class DefaultScanner internal constructor(
             deviceWrapper to DefaultDeviceConnectionManager.Builder(central, peripheral)
         }
     }
-
-    class ScanSettings private constructor(
-        private val allowDuplicateKeys: Boolean,
-        private val solicitedServiceUUIDsKey: List<UUID>?
-    ) {
-
-        fun parse(): Map<Any?, *> {
-            val result: MutableMap<String, Any> =
-                mutableMapOf(CBCentralManagerScanOptionAllowDuplicatesKey to allowDuplicateKeys)
-            solicitedServiceUUIDsKey?.let {
-                result[CBCentralManagerScanOptionSolicitedServiceUUIDsKey] = it
-            }
-            return result.toMap()
-        }
-
-        data class Builder(
-            // https://developer.apple.com/documentation/corebluetooth/cbcentralmanagerscanoptionallowduplicateskey
-            var allowDuplicateKeys: Boolean = true,
-            // https://developer.apple.com/documentation/corebluetooth/cbcentralmanagerscanoptionsolicitedserviceuuidskey
-            var solicitedServiceUUIDsKey: List<UUID>? = null,
-        ) {
-            fun allowDuplicateKeys(allow: Boolean) =
-                apply { allowDuplicateKeys = allow }
-
-            fun solicitedServiceUUIDsKey(keys: List<UUID>) =
-                apply { solicitedServiceUUIDsKey = keys }
-
-            fun build(): ScanSettings = ScanSettings(allowDuplicateKeys, solicitedServiceUUIDsKey)
-        }
-    }
 }
diff --git a/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt
index 5514dbb68..ad4f5c00b 100644
--- a/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/jsMain/kotlin/BluetoothBuilder.kt
@@ -8,6 +8,11 @@ import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNotRegistered
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A default implementation of [BaseBluetoothBuilder]
+ * @param permissionsBuilder a method for creating the [Permissions] object to manage the Bluetooth permissions.
+ * Needs to have [com.splendo.kaluga.permissions.bluetooth.BluetoothPermission] registered.
+ */
 actual class BluetoothBuilder(
     private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
diff --git a/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt
index 13bf6cc89..fe0ca81ef 100644
--- a/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/jsMain/kotlin/BluetoothMonitor.kt
@@ -20,12 +20,27 @@ package com.splendo.kaluga.bluetooth
 import com.splendo.kaluga.service.DefaultServiceMonitor
 import com.splendo.kaluga.service.ServiceMonitor
 
+/**
+ * A [ServiceMonitor] that monitors whether Bluetooth is enabled
+ */
 actual interface BluetoothMonitor : ServiceMonitor {
+
+    /**
+     * Builder for creating a [BluetoothMonitor]
+     */
     actual class Builder {
+
+        /**
+         * Creates the [BluetoothMonitor]
+         * @return the [BluetoothMonitor] created
+         */
         actual fun create(): BluetoothMonitor = DefaultBluetoothMonitor()
     }
 }
 
+/**
+ * Default implementation of [BluetoothMonitor]
+ */
 class DefaultBluetoothMonitor : DefaultServiceMonitor(), BluetoothMonitor {
 
     override val isServiceEnabled: Boolean
diff --git a/bluetooth/src/jsMain/kotlin/UUID.kt b/bluetooth/src/jsMain/kotlin/UUID.kt
index 1abdd41e0..40c6c7ae3 100644
--- a/bluetooth/src/jsMain/kotlin/UUID.kt
+++ b/bluetooth/src/jsMain/kotlin/UUID.kt
@@ -19,11 +19,22 @@
 
 package com.splendo.kaluga.bluetooth
 
+/**
+ * The Unique Identifier of a Bluetooth property
+ * @property uuidString the String representation of the unique identifier
+ */
 actual data class UUID(val uuidString: String)
 
+/**
+ * The string representation of a [UUID]
+ */
 actual val UUID.uuidString: String
     get() = uuidString
 
 internal actual fun unsafeUUIDFrom(uuidString: String): UUID = UUID(uuidString = uuidString)
 
+/**
+ * Gets a random [UUID]
+ * @return a random [UUID]
+ */
 actual fun randomUUID(): UUID = UUID(randomUUIDString())
diff --git a/bluetooth/src/jsMain/kotlin/Value.kt b/bluetooth/src/jsMain/kotlin/Value.kt
index 194c95a27..a5300106f 100644
--- a/bluetooth/src/jsMain/kotlin/Value.kt
+++ b/bluetooth/src/jsMain/kotlin/Value.kt
@@ -17,7 +17,13 @@
 
 package com.splendo.kaluga.bluetooth
 
+/**
+ * The JavaScript value of a bluetooth attribute
+ */
 actual typealias Value = ByteArray
 
+/**
+ * Gets the [ByteArray] value of a [Value]
+ */
 actual val Value.asBytes: ByteArray
     get() = this
diff --git a/bluetooth/src/jsMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/jsMain/kotlin/device/AdvertisementData.kt
index 266b1a9cd..37863c9f1 100644
--- a/bluetooth/src/jsMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/jsMain/kotlin/device/AdvertisementData.kt
@@ -19,6 +19,9 @@ package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.bluetooth.UUID
 
+/**
+ * JavaScript implementation of [BaseAdvertisementData]. Not actually implemented
+ */
 actual class AdvertisementData : BaseAdvertisementData {
 
     override val name: String?
diff --git a/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt
index dbd17364e..376ecc906 100644
--- a/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt
@@ -21,11 +21,26 @@ import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.randomUUIDString
 import com.splendo.kaluga.bluetooth.unsafeUUIDFrom
 
+/**
+ * Unique identifier of a Bluetooth [Device]
+ */
 actual typealias Identifier = UUID
 
+/**
+ * Gets a random [Identifier]
+ * @return a random [Identifier]
+ */
 actual fun randomIdentifier() = Identifier(randomUUIDString())
 
+/**
+ * Gets a [Identifier] from a string value
+ * @param stringValue the string value to get the [Identifier] from
+ * @return an [Identifier] matching the string value or `null` if it could not be generated
+ */
 actual fun identifierFromString(stringValue: String): Identifier? = unsafeUUIDFrom(stringValue)
 
+/**
+ * Gets a string representation of an [Identifier]
+ */
 actual val Identifier.stringValue: String
     get() = uuidString
diff --git a/bluetooth/src/jsMain/kotlin/device/DeviceWrapper.kt b/bluetooth/src/jsMain/kotlin/device/DeviceWrapper.kt
index 113003307..d798eb1b1 100644
--- a/bluetooth/src/jsMain/kotlin/device/DeviceWrapper.kt
+++ b/bluetooth/src/jsMain/kotlin/device/DeviceWrapper.kt
@@ -17,7 +17,18 @@
 
 package com.splendo.kaluga.bluetooth.device
 
+/**
+ * Accessor to the JavaScript Bluetooth device. Not Actually implemented
+ */
 actual interface DeviceWrapper {
+
+    /**
+     * Name of the Bluetooth device
+     */
     actual val name: String?
+
+    /**
+     * [Identifier] of the Bluetooth device
+     */
     actual val identifier: Identifier
 }
diff --git a/bluetooth/src/jsMain/kotlin/scanner/Scanner.kt b/bluetooth/src/jsMain/kotlin/scanner/Scanner.kt
index 43ed2df2b..9dee0d3c6 100644
--- a/bluetooth/src/jsMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/jsMain/kotlin/scanner/Scanner.kt
@@ -19,13 +19,22 @@ package com.splendo.kaluga.bluetooth.scanner
 
 import com.splendo.kaluga.bluetooth.BluetoothMonitor
 import com.splendo.kaluga.bluetooth.UUID
+import com.splendo.kaluga.bluetooth.scanner.BaseScanner.Settings
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * Default implementation of [BaseScanner]
+ * @param settings the [Settings] to configure this scanner
+ * @param coroutineScope the [CoroutineScope] this scanner runs on
+ */
 actual class DefaultScanner(
     settings: Settings,
     coroutineScope: CoroutineScope
 ) : BaseScanner(settings, coroutineScope) {
 
+    /**
+     * Builder for creating a [DefaultScanner]
+     */
     class Builder : BaseScanner.Builder {
 
         override fun create(
diff --git a/bluetooth/src/jsMain/kotlin/wrappers.kt b/bluetooth/src/jsMain/kotlin/wrappers.kt
index f625dbfa2..13749a221 100644
--- a/bluetooth/src/jsMain/kotlin/wrappers.kt
+++ b/bluetooth/src/jsMain/kotlin/wrappers.kt
@@ -17,19 +17,60 @@
 
 package com.splendo.kaluga.bluetooth
 
+/**
+ * JavaScript accessor to a Bluetooth characteristic. Not Actually implemented
+ */
 actual interface CharacteristicWrapper {
+
+    /**
+     * The [UUID] of the characteristic
+     */
     actual val uuid: UUID
+
+    /**
+     * The list of [DescriptorWrapper] of associated with the characteristic
+     */
     actual val descriptors: List<DescriptorWrapper>
+
+    /**
+     * The current [Value] of the characteristic
+     */
     actual val value: Value?
+
+    /**
+     * The integer representing all [CharacteristicProperties] of the characteristic
+     */
     actual val properties: Int
 }
 
+/**
+ * JavaScript accessor to a Bluetooth descriptor. Not Actually implemented
+ */
 actual interface DescriptorWrapper {
+
+    /**
+     * The [UUID] of the descriptor
+     */
     actual val uuid: UUID
+
+    /**
+     * The current [Value] of the descriptor
+     */
     actual val value: Value?
 }
 
+/**
+ * JavaScript accessor to a Bluetooth service. Not Actually implemented
+ */
 actual interface ServiceWrapper {
+
+    /**
+     * The list of [CharacteristicWrapper] associated with the service
+     */
     actual val characteristics: List<CharacteristicWrapper>
+
+    /**
+     * The [UUID] of the service
+     */
     actual val uuid: UUID
 }
diff --git a/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt b/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt
index 5514dbb68..ad4f5c00b 100644
--- a/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt
+++ b/bluetooth/src/jvmMain/kotlin/BluetoothBuilder.kt
@@ -8,6 +8,11 @@ import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.bluetooth.registerBluetoothPermissionIfNotRegistered
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A default implementation of [BaseBluetoothBuilder]
+ * @param permissionsBuilder a method for creating the [Permissions] object to manage the Bluetooth permissions.
+ * Needs to have [com.splendo.kaluga.permissions.bluetooth.BluetoothPermission] registered.
+ */
 actual class BluetoothBuilder(
     private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
diff --git a/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt b/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt
index 13bf6cc89..fe0ca81ef 100644
--- a/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt
+++ b/bluetooth/src/jvmMain/kotlin/BluetoothMonitor.kt
@@ -20,12 +20,27 @@ package com.splendo.kaluga.bluetooth
 import com.splendo.kaluga.service.DefaultServiceMonitor
 import com.splendo.kaluga.service.ServiceMonitor
 
+/**
+ * A [ServiceMonitor] that monitors whether Bluetooth is enabled
+ */
 actual interface BluetoothMonitor : ServiceMonitor {
+
+    /**
+     * Builder for creating a [BluetoothMonitor]
+     */
     actual class Builder {
+
+        /**
+         * Creates the [BluetoothMonitor]
+         * @return the [BluetoothMonitor] created
+         */
         actual fun create(): BluetoothMonitor = DefaultBluetoothMonitor()
     }
 }
 
+/**
+ * Default implementation of [BluetoothMonitor]
+ */
 class DefaultBluetoothMonitor : DefaultServiceMonitor(), BluetoothMonitor {
 
     override val isServiceEnabled: Boolean
diff --git a/bluetooth/src/jvmMain/kotlin/UUID.kt b/bluetooth/src/jvmMain/kotlin/UUID.kt
index 1abdd41e0..40c6c7ae3 100644
--- a/bluetooth/src/jvmMain/kotlin/UUID.kt
+++ b/bluetooth/src/jvmMain/kotlin/UUID.kt
@@ -19,11 +19,22 @@
 
 package com.splendo.kaluga.bluetooth
 
+/**
+ * The Unique Identifier of a Bluetooth property
+ * @property uuidString the String representation of the unique identifier
+ */
 actual data class UUID(val uuidString: String)
 
+/**
+ * The string representation of a [UUID]
+ */
 actual val UUID.uuidString: String
     get() = uuidString
 
 internal actual fun unsafeUUIDFrom(uuidString: String): UUID = UUID(uuidString = uuidString)
 
+/**
+ * Gets a random [UUID]
+ * @return a random [UUID]
+ */
 actual fun randomUUID(): UUID = UUID(randomUUIDString())
diff --git a/bluetooth/src/jvmMain/kotlin/Value.kt b/bluetooth/src/jvmMain/kotlin/Value.kt
index 194c95a27..1aaa1ac6a 100644
--- a/bluetooth/src/jvmMain/kotlin/Value.kt
+++ b/bluetooth/src/jvmMain/kotlin/Value.kt
@@ -17,7 +17,13 @@
 
 package com.splendo.kaluga.bluetooth
 
+/**
+ * The Java value of a bluetooth attribute
+ */
 actual typealias Value = ByteArray
 
+/**
+ * Gets the [ByteArray] value of a [Value]
+ */
 actual val Value.asBytes: ByteArray
     get() = this
diff --git a/bluetooth/src/jvmMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/jvmMain/kotlin/device/AdvertisementData.kt
index 266b1a9cd..65362de45 100644
--- a/bluetooth/src/jvmMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/jvmMain/kotlin/device/AdvertisementData.kt
@@ -19,6 +19,9 @@ package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.bluetooth.UUID
 
+/**
+ * Java implementation of [BaseAdvertisementData]. Not actually implemented
+ */
 actual class AdvertisementData : BaseAdvertisementData {
 
     override val name: String?
diff --git a/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt
index 572300133..adc5a4fa7 100644
--- a/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt
@@ -23,11 +23,26 @@ import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.randomUUIDString
 import com.splendo.kaluga.bluetooth.unsafeUUIDFrom
 
+/**
+ * Unique identifier of a Bluetooth [Device]
+ */
 actual typealias Identifier = UUID
 
+/**
+ * Gets a random [Identifier]
+ * @return a random [Identifier]
+ */
 actual fun randomIdentifier() = Identifier(randomUUIDString())
 
+/**
+ * Gets a [Identifier] from a string value
+ * @param stringValue the string value to get the [Identifier] from
+ * @return an [Identifier] matching the string value or `null` if it could not be generated
+ */
 actual fun identifierFromString(stringValue: String): Identifier? = unsafeUUIDFrom(stringValue)
 
+/**
+ * Gets a string representation of an [Identifier]
+ */
 actual val Identifier.stringValue: String
     get() = uuidString
diff --git a/bluetooth/src/jvmMain/kotlin/device/DeviceWrapper.kt b/bluetooth/src/jvmMain/kotlin/device/DeviceWrapper.kt
index 113003307..987a7cfe1 100644
--- a/bluetooth/src/jvmMain/kotlin/device/DeviceWrapper.kt
+++ b/bluetooth/src/jvmMain/kotlin/device/DeviceWrapper.kt
@@ -17,7 +17,18 @@
 
 package com.splendo.kaluga.bluetooth.device
 
+/**
+ * Accessor to the Java Bluetooth device. Not Actually implemented
+ */
 actual interface DeviceWrapper {
+
+    /**
+     * Name of the Bluetooth device
+     */
     actual val name: String?
+
+    /**
+     * [Identifier] of the Bluetooth device
+     */
     actual val identifier: Identifier
 }
diff --git a/bluetooth/src/jvmMain/kotlin/scanner/Scanner.kt b/bluetooth/src/jvmMain/kotlin/scanner/Scanner.kt
index 43ed2df2b..9dee0d3c6 100644
--- a/bluetooth/src/jvmMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/jvmMain/kotlin/scanner/Scanner.kt
@@ -19,13 +19,22 @@ package com.splendo.kaluga.bluetooth.scanner
 
 import com.splendo.kaluga.bluetooth.BluetoothMonitor
 import com.splendo.kaluga.bluetooth.UUID
+import com.splendo.kaluga.bluetooth.scanner.BaseScanner.Settings
 import kotlinx.coroutines.CoroutineScope
 
+/**
+ * Default implementation of [BaseScanner]
+ * @param settings the [Settings] to configure this scanner
+ * @param coroutineScope the [CoroutineScope] this scanner runs on
+ */
 actual class DefaultScanner(
     settings: Settings,
     coroutineScope: CoroutineScope
 ) : BaseScanner(settings, coroutineScope) {
 
+    /**
+     * Builder for creating a [DefaultScanner]
+     */
     class Builder : BaseScanner.Builder {
 
         override fun create(
diff --git a/bluetooth/src/jvmMain/kotlin/wrappers.kt b/bluetooth/src/jvmMain/kotlin/wrappers.kt
index f625dbfa2..062022386 100644
--- a/bluetooth/src/jvmMain/kotlin/wrappers.kt
+++ b/bluetooth/src/jvmMain/kotlin/wrappers.kt
@@ -17,19 +17,60 @@
 
 package com.splendo.kaluga.bluetooth
 
+/**
+ * Java accessor to a Bluetooth characteristic. Not Actually implemented
+ */
 actual interface CharacteristicWrapper {
+
+    /**
+     * The [UUID] of the characteristic
+     */
     actual val uuid: UUID
+
+    /**
+     * The list of [DescriptorWrapper] of associated with the characteristic
+     */
     actual val descriptors: List<DescriptorWrapper>
+
+    /**
+     * The current [Value] of the characteristic
+     */
     actual val value: Value?
+
+    /**
+     * The integer representing all [CharacteristicProperties] of the characteristic
+     */
     actual val properties: Int
 }
 
+/**
+ * Java accessor to a Bluetooth descriptor. Not Actually implemented
+ */
 actual interface DescriptorWrapper {
+
+    /**
+     * The [UUID] of the descriptor
+     */
     actual val uuid: UUID
+
+    /**
+     * The current [Value] of the descriptor
+     */
     actual val value: Value?
 }
 
+/**
+ * Java accessor to a Bluetooth service. Not Actually implemented
+ */
 actual interface ServiceWrapper {
+
+    /**
+     * The list of [CharacteristicWrapper] associated with the service
+     */
     actual val characteristics: List<CharacteristicWrapper>
+
+    /**
+     * The [UUID] of the service
+     */
     actual val uuid: UUID
 }

From 5f33f135af2758e32900d209b670067d3f888c3d Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 14 Feb 2023 14:24:30 +0100
Subject: [PATCH 170/227] Refactored Beacons and added documentation

---
 beacons/README.md                             |  37 ++++++
 beacons/api/androidLib/beacons.api            |  38 +++---
 beacons/api/jvm/beacons.api                   |  38 +++---
 beacons/src/commonMain/kotlin/BeaconInfo.kt   |  39 ++++--
 beacons/src/commonMain/kotlin/Beacons.kt      | 111 +++++++++++++----
 beacons/src/commonMain/kotlin/Eddystone.kt    |  20 ++-
 .../commonTest/kotlin/BeaconDiscoveredTest.kt |   4 +-
 .../src/commonTest/kotlin/BeaconFlowTest.kt   |  10 +-
 .../src/commonTest/kotlin/BeaconLostTest.kt   |   4 +-
 .../src/commonTest/kotlin/BeaconUpdateTest.kt |   2 +-
 .../src/commonTest/kotlin/BluetoothMock.kt    |  43 -------
 bluetooth/README.md                           |  18 ++-
 bluetooth/api/androidLib/bluetooth.api        | 116 ++++++++++--------
 bluetooth/api/jvm/bluetooth.api               |  76 +++++-------
 .../kotlin/device/AdvertisementData.kt        |   3 +-
 .../kotlin/device/BluetoothGattWrapper.kt     |   9 +-
 .../device/DefaultDeviceConnectionManager.kt  |   3 +-
 bluetooth/src/commonMain/kotlin/Bluetooth.kt  |  29 +++--
 .../kotlin/device/AdvertisementData.kt        |   5 +-
 .../device/DefaultDeviceConnectionManager.kt  |  21 ++--
 .../src/commonMain/kotlin/device/Device.kt    |   9 +-
 .../commonMain/kotlin/device/DeviceInfo.kt    |   9 +-
 .../commonMain/kotlin/device/DeviceState.kt   |  49 ++++----
 .../src/commonMain/kotlin/scanner/Scanner.kt  |   7 +-
 .../kotlin/scanner/ScanningState.kt           |   9 +-
 .../commonTest/kotlin/BluetoothFlowTest.kt    |  18 +--
 .../kotlin/device/AdvertisementData.kt        |   3 +-
 .../device/DefaultDeviceConnectionManager.kt  |   3 +-
 .../jsMain/kotlin/device/AdvertisementData.kt |   3 +-
 .../device/DefaultDeviceConnectionManager.kt  |   3 +-
 .../kotlin/device/AdvertisementData.kt        |   3 +-
 .../device/DefaultDeviceConnectionManager.kt  |   3 +-
 location/api/androidLib/location.api          |   2 -
 location/api/jvm/location.api                 |   2 -
 service/api/androidLib/service.api            |   4 +-
 service/api/jvm/service.api                   |   4 +-
 .../api/androidLib/test-utils-bluetooth.api   |  45 ++++---
 .../api/jvm/test-utils-bluetooth.api          |  32 +++--
 .../kotlin/MockCharacteristic.kt              |   3 +-
 .../kotlin/MockDeviceWrapper.kt               |   2 +-
 .../kotlin/MockServiceWrapper.kt              |   2 +-
 .../androidLibMain/kotlin/android_mocks.kt    |   3 +-
 .../commonMain/kotlin/MockBluetoothService.kt |  67 ++++++++++
 .../kotlin/MockDeviceInfoBuilder.kt           |   6 +-
 .../kotlin/device/MockAdvertisementData.kt    |   3 +-
 .../device/MockDeviceConnectionManager.kt     |   8 +-
 .../kotlin/scanner/MockScanningState.kt       |   3 +-
 47 files changed, 583 insertions(+), 348 deletions(-)
 create mode 100644 beacons/README.md
 delete mode 100644 beacons/src/commonTest/kotlin/BluetoothMock.kt
 create mode 100644 test-utils-bluetooth/src/commonMain/kotlin/MockBluetoothService.kt

diff --git a/beacons/README.md b/beacons/README.md
new file mode 100644
index 000000000..478bea2f4
--- /dev/null
+++ b/beacons/README.md
@@ -0,0 +1,37 @@
+## Beacons
+
+This library provide support for out-of-the-box access to Beacons.
+Currently only the [Eddystone protocol](https://github.com/google/eddystone/blob/master/protocol-specification.md) is supported
+
+## Installing
+This library is available on Maven Central. You can import Kaluga Base as follows:
+
+```kotlin
+repositories {
+    // ...
+    mavenCentral()
+}
+// ...
+dependencies {
+    // ...
+    implementation("com.splendo.kaluga:beacons:$kalugaVersion")
+}
+```
+
+### Usage
+Create a `DefaultBeacons` object. This gives you access to a `Flow` of [BeaconInfo]. To monitor for beacons simply call
+
+```kotlin
+val beacons = DefaultBeacons(
+    bluetooth = // Bluetooth
+    beaconLifetime = 10.seconds,
+    coroutineContext = // CoroutineContext
+)
+beacons.startMonitoring()
+launch {
+    beacons.beacons.collect {}
+}
+///
+beacons.stopMonitoring()
+```
+
diff --git a/beacons/api/androidLib/beacons.api b/beacons/api/androidLib/beacons.api
index 3d1af0c09..90547ef24 100644
--- a/beacons/api/androidLib/beacons.api
+++ b/beacons/api/androidLib/beacons.api
@@ -11,35 +11,39 @@ public final class com/splendo/kaluga/bluetooth/beacons/BeaconInfo {
 	public final fun getBeaconID ()Lcom/splendo/kaluga/bluetooth/beacons/Eddystone$UID;
 	public final fun getIdentifier ()Ljava/lang/String;
 	public final fun getLastSeen ()Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun getRSSI ()I
+	public final fun getRssi ()I
 	public final fun getTxPower ()I
 	public fun hashCode ()I
-	public final fun setBeaconID (Lcom/splendo/kaluga/bluetooth/beacons/Eddystone$UID;)V
-	public final fun setIdentifier (Ljava/lang/String;)V
-	public final fun setLastSeen (Lcom/splendo/kaluga/base/utils/KalugaDate;)V
-	public final fun setRSSI (I)V
-	public final fun setTxPower (I)V
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/BeaconInfoKt {
 	public static final fun fullID (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)Ljava/lang/String;
-	public static final fun seenMs (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
+	public static final fun seenMS (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
+	public static final fun timeSinceLastSeen (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
 }
 
-public final class com/splendo/kaluga/bluetooth/beacons/Beacons {
-	public static final field TAG Ljava/lang/String;
-	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JLkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getBeacons ()Lkotlinx/coroutines/flow/StateFlow;
-	public final fun isAnyInRange (Ljava/util/List;)Lkotlinx/coroutines/flow/Flow;
-	public final fun isMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun startMonitoring (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public abstract interface class com/splendo/kaluga/bluetooth/beacons/Beacons {
+	public abstract fun getBeacons ()Lkotlinx/coroutines/flow/StateFlow;
+	public abstract fun isMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/BeaconsKt {
 	public static final fun get (Lkotlinx/coroutines/flow/Flow;Ljava/lang/String;)Lkotlinx/coroutines/flow/Flow;
+	public static final fun isAnyInRange (Lcom/splendo/kaluga/bluetooth/beacons/Beacons;Ljava/util/List;)Lkotlinx/coroutines/flow/Flow;
+}
+
+public final class com/splendo/kaluga/bluetooth/beacons/DefaultBeacons : com/splendo/kaluga/bluetooth/beacons/Beacons, kotlinx/coroutines/CoroutineScope {
+	public static final field TAG Ljava/lang/String;
+	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JLcom/splendo/kaluga/logging/Logger;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JLcom/splendo/kaluga/logging/Logger;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getBeacons ()Lkotlinx/coroutines/flow/StateFlow;
+	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
+	public fun isMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/Eddystone {
@@ -48,8 +52,6 @@ public final class com/splendo/kaluga/bluetooth/beacons/Eddystone {
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/Eddystone$Companion {
-	public final fun getSERVICE_UUID ()Ljava/util/UUID;
-	public final fun unpack ([B)Lcom/splendo/kaluga/bluetooth/beacons/Eddystone$Frame;
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/Eddystone$Frame {
diff --git a/beacons/api/jvm/beacons.api b/beacons/api/jvm/beacons.api
index bcdbb8b3d..1bd1fbd06 100644
--- a/beacons/api/jvm/beacons.api
+++ b/beacons/api/jvm/beacons.api
@@ -11,35 +11,39 @@ public final class com/splendo/kaluga/bluetooth/beacons/BeaconInfo {
 	public final fun getBeaconID ()Lcom/splendo/kaluga/bluetooth/beacons/Eddystone$UID;
 	public final fun getIdentifier ()Lcom/splendo/kaluga/bluetooth/UUID;
 	public final fun getLastSeen ()Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun getRSSI ()I
+	public final fun getRssi ()I
 	public final fun getTxPower ()I
 	public fun hashCode ()I
-	public final fun setBeaconID (Lcom/splendo/kaluga/bluetooth/beacons/Eddystone$UID;)V
-	public final fun setIdentifier (Lcom/splendo/kaluga/bluetooth/UUID;)V
-	public final fun setLastSeen (Lcom/splendo/kaluga/base/utils/KalugaDate;)V
-	public final fun setRSSI (I)V
-	public final fun setTxPower (I)V
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/BeaconInfoKt {
 	public static final fun fullID (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)Ljava/lang/String;
-	public static final fun seenMs (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
+	public static final fun seenMS (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
+	public static final fun timeSinceLastSeen (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
 }
 
-public final class com/splendo/kaluga/bluetooth/beacons/Beacons {
-	public static final field TAG Ljava/lang/String;
-	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JLkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getBeacons ()Lkotlinx/coroutines/flow/StateFlow;
-	public final fun isAnyInRange (Ljava/util/List;)Lkotlinx/coroutines/flow/Flow;
-	public final fun isMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun startMonitoring (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public abstract interface class com/splendo/kaluga/bluetooth/beacons/Beacons {
+	public abstract fun getBeacons ()Lkotlinx/coroutines/flow/StateFlow;
+	public abstract fun isMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/BeaconsKt {
 	public static final fun get (Lkotlinx/coroutines/flow/Flow;Lcom/splendo/kaluga/bluetooth/UUID;)Lkotlinx/coroutines/flow/Flow;
+	public static final fun isAnyInRange (Lcom/splendo/kaluga/bluetooth/beacons/Beacons;Ljava/util/List;)Lkotlinx/coroutines/flow/Flow;
+}
+
+public final class com/splendo/kaluga/bluetooth/beacons/DefaultBeacons : com/splendo/kaluga/bluetooth/beacons/Beacons, kotlinx/coroutines/CoroutineScope {
+	public static final field TAG Ljava/lang/String;
+	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JLcom/splendo/kaluga/logging/Logger;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/bluetooth/BluetoothService;JLcom/splendo/kaluga/logging/Logger;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getBeacons ()Lkotlinx/coroutines/flow/StateFlow;
+	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
+	public fun isMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/Eddystone {
@@ -48,8 +52,6 @@ public final class com/splendo/kaluga/bluetooth/beacons/Eddystone {
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/Eddystone$Companion {
-	public final fun getSERVICE_UUID ()Lcom/splendo/kaluga/bluetooth/UUID;
-	public final fun unpack ([B)Lcom/splendo/kaluga/bluetooth/beacons/Eddystone$Frame;
 }
 
 public final class com/splendo/kaluga/bluetooth/beacons/Eddystone$Frame {
diff --git a/beacons/src/commonMain/kotlin/BeaconInfo.kt b/beacons/src/commonMain/kotlin/BeaconInfo.kt
index 56e0f261a..2fbc29c8f 100644
--- a/beacons/src/commonMain/kotlin/BeaconInfo.kt
+++ b/beacons/src/commonMain/kotlin/BeaconInfo.kt
@@ -19,23 +19,44 @@ package com.splendo.kaluga.bluetooth.beacons
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
+import com.splendo.kaluga.base.utils.minus
+import com.splendo.kaluga.bluetooth.RSSI
+import com.splendo.kaluga.bluetooth.TxPower
 import com.splendo.kaluga.bluetooth.device.Identifier
 
+/**
+ * Unique identifier of a Beacon
+ */
 typealias BeaconID = Eddystone.UID
-typealias TxPower = Int
-typealias RSSI = Int
 
+/**
+ * Info describing a Beacon
+ * @property identifier the [Identifier] of the beacon. Note this may not be unique when beacons are grouped
+ * @property beaconID the [BeaconID] of the beacon
+ * @property txPower the current [TxPower] of the beacon
+ * @property rssi the current [RSSI] of the beacon
+ * @property lastSeen the [KalugaDate] at which the beacon was last seen
+ */
 data class BeaconInfo(
-    var identifier: Identifier,
-    var beaconID: BeaconID,
-    var txPower: TxPower,
-    var RSSI: RSSI,
-    var lastSeen: KalugaDate
+    val identifier: Identifier,
+    val beaconID: BeaconID,
+    val txPower: TxPower,
+    val rssi: RSSI,
+    val lastSeen: KalugaDate
 )
 
 @Deprecated(
     message = "Replaced with beaconId.asString()",
     replaceWith = ReplaceWith(expression = "beaconID.asString()")
 )
-fun BeaconInfo.fullID() = this.beaconID.namespace + this.beaconID.instance
-fun BeaconInfo.seenMs() = DefaultKalugaDate.now().millisecondSinceEpoch - lastSeen.millisecondSinceEpoch
+fun BeaconInfo.fullID() = this.beaconID.asString()
+
+/**
+ * Returns the [kotlin.time.Duration] since the beacon was last seen
+ */
+fun BeaconInfo.timeSinceLastSeen() = DefaultKalugaDate.now() - lastSeen
+
+/**
+ * Returns the time in milliseconds since the beacon was last seen
+ */
+fun BeaconInfo.seenMS() = timeSinceLastSeen().inWholeMilliseconds
diff --git a/beacons/src/commonMain/kotlin/Beacons.kt b/beacons/src/commonMain/kotlin/Beacons.kt
index 7478eb14c..52794f7d9 100644
--- a/beacons/src/commonMain/kotlin/Beacons.kt
+++ b/beacons/src/commonMain/kotlin/Beacons.kt
@@ -18,13 +18,20 @@
 package com.splendo.kaluga.bluetooth.beacons
 
 import com.splendo.kaluga.base.collections.concurrentMutableMapOf
+import com.splendo.kaluga.base.singleThreadDispatcher
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
+import com.splendo.kaluga.base.utils.minus
+import com.splendo.kaluga.base.utils.plus
 import com.splendo.kaluga.bluetooth.BluetoothService
 import com.splendo.kaluga.bluetooth.device.Device
 import com.splendo.kaluga.bluetooth.device.Identifier
+import com.splendo.kaluga.logging.Logger
+import com.splendo.kaluga.logging.RestrictedLogLevel
+import com.splendo.kaluga.logging.RestrictedLogger
 import com.splendo.kaluga.logging.debug
+import com.splendo.kaluga.logging.info
+import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
@@ -38,15 +45,68 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
 private typealias BeaconJob = Pair<BeaconInfo, Job>
 
-class Beacons(
+/**
+ * Scans for [BeaconInfo].
+ * Only supports the [Eddystone] protocol
+ */
+interface Beacons {
+    /**
+     * [StateFlow] of the set of [BeaconInfo] currently scanned
+     */
+    val beacons: StateFlow<Set<BeaconInfo>>
+
+    /**
+     * Starts monitoring for changes to [BeaconInfo]
+     */
+    suspend fun startMonitoring()
+
+    /**
+     * Stops monitoring for changes to [BeaconInfo]
+     */
+    suspend fun stopMonitoring()
+
+    /**
+     * A [Flow] indicating whether [startMonitoring] has been called
+     * @return A [Flow] containing `true` if [startMonitoring] has been called
+     */
+    suspend fun isMonitoring(): Flow<Boolean>
+}
+
+/**
+ * Gets a [Flow] that indicates whether any [BeaconID] have been detected
+ * @param beaconIds the list of [BeaconID] to scan for
+ * @return A [Flow] containing `true` if any of the [BeaconID] have been scanned.
+ */
+fun Beacons.isAnyInRange(beaconIds: List<BeaconID>): Flow<Boolean> {
+    val lowerCasedIds = beaconIds.map { it.asString().lowercase() }
+    return beacons.map { list ->
+        list.any { lowerCasedIds.contains(it.beaconID.asString().lowercase()) }
+    }
+}
+
+private val defaultBeaconsDispatcher by lazy {
+    singleThreadDispatcher("Beacons")
+}
+
+/**
+ * Default implementation of [Beacons]
+ * @param bluetooth the [BluetoothService] managing bluetooth
+ * @param beaconLifetime the [Duration] during which [BeaconInfo] is valid
+ * @param logger the [Logger] to use for logging
+ * @param coroutineContext the [CoroutineContext] beacons are monitored on
+ */
+class DefaultBeacons(
     private val bluetooth: BluetoothService,
-    private val timeout: Duration = 10.seconds,
-) {
+    private val beaconLifetime: Duration = 10.seconds,
+    private val logger: Logger = RestrictedLogger(RestrictedLogLevel.None),
+    coroutineContext: CoroutineContext = defaultBeaconsDispatcher
+) : Beacons, CoroutineScope by CoroutineScope(coroutineContext + CoroutineName("Beacons")) {
 
     private companion object { const val TAG = "Beacons" }
 
@@ -54,54 +114,49 @@ class Beacons(
     private val updateLock = Mutex()
     private val cache = concurrentMutableMapOf<BeaconID, BeaconJob>()
     private val cacheJob = Job()
-    private val coroutineScope = CoroutineScope(Dispatchers.Default + cacheJob)
     private var monitoringJob: MutableStateFlow<Job?> = MutableStateFlow(null)
 
     private val _beacons = MutableStateFlow(emptySet<BeaconInfo>())
-    val beacons: StateFlow<Set<BeaconInfo>>
+    override val beacons: StateFlow<Set<BeaconInfo>>
         get() = _beacons.asStateFlow()
 
-    suspend fun startMonitoring(coroutineScope: CoroutineScope) = monitoringLock.withLock {
-        debug(TAG, "Start monitoring")
+    override suspend fun startMonitoring() = monitoringLock.withLock {
+        logger.info(TAG, "Start monitoring")
         _beacons.value = emptySet()
         bluetooth.startScanning()
-        monitoringJob.value = coroutineScope.launch {
+        monitoringJob.value = this@DefaultBeacons.launch {
             bluetooth.devices().collect { list ->
-                debug(TAG, "Total Bluetooth devices discovered: ${list.size}")
+                logger.debug(TAG, "Total Bluetooth devices discovered: ${list.size}")
                 updateBeacons(list.mapNotNull { createBeaconWith(it) })
             }
         }
     }
 
-    suspend fun stopMonitoring() = monitoringLock.withLock {
-        debug(TAG, "Stop monitoring")
+    override suspend fun stopMonitoring() = monitoringLock.withLock {
+        logger.info(TAG, "Stop monitoring")
         bluetooth.stopScanning()
         monitoringJob.value?.cancel()
         monitoringJob.value = null
         _beacons.value = emptySet()
     }
 
-    suspend fun isMonitoring() = combine(monitoringJob.map { it != null }, bluetooth.isScanning()) { isMonitoring, isScanning -> isMonitoring && isScanning }
-
-    fun isAnyInRange(beaconIds: List<String>) = beacons.map { list ->
-        list.any { beaconIds.containsLowerCased(it.beaconID.asString()) }
-    }
+    override suspend fun isMonitoring() = combine(monitoringJob.map { it != null }, bluetooth.isScanning()) { isMonitoring, isScanning -> isMonitoring && isScanning }
 
     private suspend fun updateBeacons(discovered: List<BeaconInfo>) = updateLock.withLock {
-        debug(TAG, "Total Beacons discovered: ${discovered.size}")
+        logger.info(TAG, "Total Beacons discovered: ${discovered.size}")
         discovered.forEach { beacon ->
             cache.synchronized {
                 if (containsKey(beacon.beaconID)) {
-                    debug(TAG, "[Found] $beacon")
+                    logger.debug(TAG, "[Found] $beacon")
                     remove(beacon.beaconID)?.second?.cancel()
-                    debug(TAG, "[Removed] $beacon")
+                    logger.debug(TAG, "[Removed] $beacon")
                 } else {
                     debug(TAG, "[New] $beacon")
                 }
-                this[beacon.beaconID] = beacon to coroutineScope.launch {
-                    debug(TAG, "[Added] $beacon")
-                    delay(beacon.lastSeen.durationSinceEpoch + timeout - DefaultKalugaDate.now().durationSinceEpoch)
-                    debug(TAG, "[Lost] $beacon")
+                this[beacon.beaconID] = beacon to this@DefaultBeacons.launch(cacheJob) {
+                    logger.debug(TAG, "[Added] $beacon")
+                    delay(beacon.lastSeen + beaconLifetime - DefaultKalugaDate.now())
+                    logger.debug(TAG, "[Lost] $beacon")
                     cache.remove(beacon.beaconID)
                     updateList()
                 }
@@ -114,9 +169,6 @@ class Beacons(
         cache.values.map(BeaconJob::first).toSet()
     }
 
-    private fun List<String>.containsLowerCased(element: String): Boolean =
-        this.map(String::lowercase).contains(element.lowercase())
-
     private suspend fun createBeaconWith(device: Device): BeaconInfo? {
         val serviceData = device.info.map { it.advertisementData.serviceData }.firstOrNull() ?: return null
         val data = serviceData[Eddystone.SERVICE_UUID] ?: return null
@@ -127,6 +179,11 @@ class Beacons(
     }
 }
 
+/**
+ * Gets a ([Flow] of) [BeaconInfo] from the [Flow] of a collection of [BeaconInfo]
+ * @param identifier the [Identifier] of the [BeaconInfo] to get
+ * @return a [Flow] containing the [BeaconInfo] matching [Identifier] if available
+ */
 operator fun Flow<Set<BeaconInfo>>.get(identifier: Identifier) = map { beacons ->
     beacons.firstOrNull { it.identifier == identifier }
 }
diff --git a/beacons/src/commonMain/kotlin/Eddystone.kt b/beacons/src/commonMain/kotlin/Eddystone.kt
index c099488a8..880d9b62c 100644
--- a/beacons/src/commonMain/kotlin/Eddystone.kt
+++ b/beacons/src/commonMain/kotlin/Eddystone.kt
@@ -18,21 +18,37 @@
 package com.splendo.kaluga.bluetooth.beacons
 
 import com.splendo.kaluga.base.utils.toHexString
+import com.splendo.kaluga.bluetooth.TxPower
 import com.splendo.kaluga.bluetooth.uuidFrom
 
 private fun List<Byte>.toHexString() = toByteArray().toHexString()
 
+/**
+ * The Eddystone protocol message to read from a Beacon
+ * https://github.com/google/eddystone/blob/master/protocol-specification.md
+ */
 class Eddystone {
 
+    /**
+     * The Eddystone-UID
+     * https://github.com/google/eddystone/tree/master/eddystone-uid
+     * @property namespace the namespace component of the UID. The namespace portion of the ID may be used to group a particular set of beacons
+     * @property instance the instance component of the UID, identifying individual devices in a group
+     */
     data class UID(val namespace: String, val instance: String) {
         fun asString() = namespace + instance
     }
 
+    /**
+     * The Eddystone-UID frame
+     * @property txPower the [TxPower] of the frame
+     * @property uid the [UID] of the frame
+     */
     data class Frame(val txPower: TxPower, val uid: UID)
 
     companion object {
 
-        val SERVICE_UUID = uuidFrom("0000FEAA-0000-1000-8000-00805F9B34FB")
+        internal val SERVICE_UUID = uuidFrom("0000FEAA-0000-1000-8000-00805F9B34FB")
 
         private const val VALID_FRAME_SIZE = 18
         private const val UID_FRAME_TYPE = 0x00
@@ -40,7 +56,7 @@ class Eddystone {
         private fun ByteArray.isValidUIDFrame() =
             this.size == VALID_FRAME_SIZE && this[0] == UID_FRAME_TYPE.toByte()
 
-        fun unpack(data: ByteArray) = if (data.isValidUIDFrame()) {
+        internal fun unpack(data: ByteArray) = if (data.isValidUIDFrame()) {
             val txPower = data[1]
             val namespace = data.slice(2..11)
             val instance = data.slice(12..17)
diff --git a/beacons/src/commonTest/kotlin/BeaconDiscoveredTest.kt b/beacons/src/commonTest/kotlin/BeaconDiscoveredTest.kt
index 9a7d74eed..8ba58fae0 100644
--- a/beacons/src/commonTest/kotlin/BeaconDiscoveredTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconDiscoveredTest.kt
@@ -32,7 +32,7 @@ class BeaconDiscoveredTest : BeaconFlowTest() {
         }
 
         action {
-            start(scope)
+            start()
             discoverDevices(
                 BeaconMock.mockGenericDevice("AXA", scope),
                 BeaconMock.mockBeaconDevice("f7826da6bc5b71e0893e4e4161460111", scope)
@@ -57,7 +57,7 @@ class BeaconDiscoveredTest : BeaconFlowTest() {
         }
 
         action {
-            start(scope)
+            start()
             discoverDevices(
                 BeaconMock.mockBeaconDevice("f7826da6bc5b71e0893e4e4161460111", scope)
             )
diff --git a/beacons/src/commonTest/kotlin/BeaconFlowTest.kt b/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
index 6d930a1de..bc3e431e8 100644
--- a/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconFlowTest.kt
@@ -19,7 +19,7 @@ package com.splendo.kaluga.bluetooth.beacons
 
 import com.splendo.kaluga.bluetooth.device.Device
 import com.splendo.kaluga.test.base.SimpleFlowTest
-import kotlinx.coroutines.CoroutineScope
+import com.splendo.kaluga.test.bluetooth.MockBluetoothService
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -27,12 +27,12 @@ abstract class BeaconFlowTest(
     timeout: Duration = 3.seconds
 ) : SimpleFlowTest<Set<BeaconInfo>>() {
 
-    private val bluetooth = BluetoothMock(scope)
-    private val beacons = Beacons(bluetooth, timeout = timeout)
+    private val bluetooth = MockBluetoothService()
+    private val beacons = DefaultBeacons(bluetooth, beaconLifetime = timeout, coroutineContext = scope.coroutineContext)
 
     override val flow = suspend { beacons.beacons }
 
-    suspend fun start(coroutineScope: CoroutineScope) = beacons.startMonitoring(coroutineScope)
+    suspend fun start() = beacons.startMonitoring()
     suspend fun stop() = beacons.stopMonitoring()
-    suspend fun discoverDevices(vararg devices: Device) = bluetooth.discoveredDevices.emit(devices.toList())
+    suspend fun discoverDevices(vararg devices: Device) = bluetooth.discoveredDevicesFlow.emit(devices.toList())
 }
diff --git a/beacons/src/commonTest/kotlin/BeaconLostTest.kt b/beacons/src/commonTest/kotlin/BeaconLostTest.kt
index 6e2f8ec5c..02abefa69 100644
--- a/beacons/src/commonTest/kotlin/BeaconLostTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconLostTest.kt
@@ -34,7 +34,7 @@ class BeaconLostTest : BeaconFlowTest(timeout = 2.seconds) {
         }
 
         action {
-            start(MainScope())
+            start()
             discoverDevices(
                 BeaconMock.mockBeaconDevice("f7826da6bc5b71e0893e4e4161460111", scope)
             )
@@ -63,7 +63,7 @@ class BeaconLostTest : BeaconFlowTest(timeout = 2.seconds) {
         }
 
         action {
-            start(scope)
+            start()
             discoverDevices(
                 BeaconMock.mockBeaconDevice("f7826da6bc5b71e0893e4e4161460111", scope)
             )
diff --git a/beacons/src/commonTest/kotlin/BeaconUpdateTest.kt b/beacons/src/commonTest/kotlin/BeaconUpdateTest.kt
index a7ead5986..8cf49660b 100644
--- a/beacons/src/commonTest/kotlin/BeaconUpdateTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconUpdateTest.kt
@@ -32,7 +32,7 @@ class BeaconUpdateTest : BeaconFlowTest() {
         }
 
         action {
-            start(scope)
+            start()
             discoverDevices(
                 BeaconMock.mockBeaconDevice("f7826da6bc5b71e0893e4e4161460111", scope)
             )
diff --git a/beacons/src/commonTest/kotlin/BluetoothMock.kt b/beacons/src/commonTest/kotlin/BluetoothMock.kt
deleted file mode 100644
index 69eae960d..000000000
--- a/beacons/src/commonTest/kotlin/BluetoothMock.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.bluetooth.beacons
-
-import com.splendo.kaluga.bluetooth.BluetoothService
-import com.splendo.kaluga.bluetooth.UUID
-import com.splendo.kaluga.bluetooth.device.Device
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.stateIn
-
-class BluetoothMock(
-    private val coroutineScope: CoroutineScope
-) : BluetoothService {
-
-    val pairedDevices = MutableStateFlow(emptyList<Device>())
-    val discoveredDevices = MutableStateFlow(emptyList<Device>())
-
-    override val isEnabled = flowOf(true)
-
-    override fun startScanning(filter: Set<UUID>) = Unit
-    override fun stopScanning() = Unit
-    override fun pairedDevices(filter: Set<UUID>) = pairedDevices.asStateFlow()
-    override fun devices() = discoveredDevices.asStateFlow()
-    override suspend fun isScanning() = flowOf(true).stateIn(coroutineScope)
-}
diff --git a/bluetooth/README.md b/bluetooth/README.md
index 6c87e723e..910f2989d 100644
--- a/bluetooth/README.md
+++ b/bluetooth/README.md
@@ -1,7 +1,21 @@
-## Permissions
+## Bluetooth
 
 This library provide support for out-of-the-box access to Bluetooth.
 
+## Installing
+This library is available on Maven Central. You can import Kaluga Base as follows:
+
+```kotlin
+repositories {
+    // ...
+    mavenCentral()
+}
+// ...
+dependencies {
+    // ...
+    implementation("com.splendo.kaluga:bluetooth:$kalugaVersion")
+}
+```
 
 ### Usage
 Create a `Bluetooth` object through the `BluetoothBuilder`. This gives you access to a `Flow` of Bluetooth devices. To scan for devices simply call
@@ -41,7 +55,7 @@ bluetooth.devices()[someUUID].disconnect()
 ```
 
 ### Android
-You may notice that when you ask for kaluga's `Permission.Bluetooth` the android request alert will prompt `Location` permission. This behaviour is encountered because Android system requires Location to access the hardware identifiers of nearby external devices via Bluetooth.
+You may notice that when you ask for Kaluga's `Permission.Bluetooth` the android request alert will prompt `Location` permission. This behaviour is encountered because Android system requires Location to access the hardware identifiers of nearby external devices via Bluetooth.
 
 ### Setup
 In order to setup a bluetooth repo you need to do the following:
diff --git a/bluetooth/api/androidLib/bluetooth.api b/bluetooth/api/androidLib/bluetooth.api
index 67dcfc296..302daca9c 100644
--- a/bluetooth/api/androidLib/bluetooth.api
+++ b/bluetooth/api/androidLib/bluetooth.api
@@ -5,9 +5,9 @@ public abstract class com/splendo/kaluga/bluetooth/Attribute : kotlinx/coroutine
 	public fun collect (Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected final fun getLogTag ()Ljava/lang/String;
 	public abstract fun getUuid ()Ljava/util/UUID;
-	public final fun readValue ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
+	public final fun readValue ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction$Read;
 	public fun updateValue ()V
-	public final fun writeValue ([B)Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
+	public final fun writeValue ([B)Lcom/splendo/kaluga/bluetooth/device/DeviceAction$Write;
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/BaseBluetoothBuilder {
@@ -25,18 +25,6 @@ public final class com/splendo/kaluga/bluetooth/Bluetooth : com/splendo/kaluga/b
 	public fun stopScanning ()V
 }
 
-public abstract class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode {
-}
-
-public final class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Scan : com/splendo/kaluga/bluetooth/Bluetooth$ScanMode {
-	public fun <init> (Ljava/util/Set;)V
-	public final fun getFilter ()Ljava/util/Set;
-}
-
-public final class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Stopped : com/splendo/kaluga/bluetooth/Bluetooth$ScanMode {
-	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Stopped;
-}
-
 public final class com/splendo/kaluga/bluetooth/BluetoothBuilder : com/splendo/kaluga/bluetooth/BaseBluetoothBuilder {
 	public fun <init> ()V
 	public fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Builder;)V
@@ -149,19 +137,26 @@ public abstract interface class com/splendo/kaluga/bluetooth/CharacteristicWrapp
 	public abstract fun getService ()Lcom/splendo/kaluga/bluetooth/ServiceWrapper;
 	public abstract fun getUuid ()Ljava/util/UUID;
 	public abstract fun getValue ()[B
-	public abstract fun getWriteType ()I
-	public abstract fun setWriteType (I)V
+	public abstract fun getWriteType ()Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;
+	public abstract fun setWriteType (Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;)V
 	public abstract fun updateValue ([B)V
 }
 
+public final class com/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType : java/lang/Enum {
+	public static final field DEFAULT Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;
+	public static final field NO_RESPONSE Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;
+	public static final field SIGNED Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;
+	public final fun getRawValue ()I
+	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;
+	public static fun values ()[Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;
+}
+
 public final class com/splendo/kaluga/bluetooth/CommonUUID {
 	public static final fun uuidFrom (Ljava/lang/String;)Ljava/util/UUID;
 }
 
 public final class com/splendo/kaluga/bluetooth/DefaultBluetoothMonitor : com/splendo/kaluga/service/DefaultServiceMonitor, com/splendo/kaluga/bluetooth/BluetoothMonitor {
 	public fun isServiceEnabled ()Z
-	public fun monitoringDidStart ()V
-	public fun monitoringDidStop ()V
 }
 
 public final class com/splendo/kaluga/bluetooth/DefaultCharacteristicWrapper : com/splendo/kaluga/bluetooth/CharacteristicWrapper {
@@ -173,8 +168,8 @@ public final class com/splendo/kaluga/bluetooth/DefaultCharacteristicWrapper : c
 	public fun getService ()Lcom/splendo/kaluga/bluetooth/ServiceWrapper;
 	public fun getUuid ()Ljava/util/UUID;
 	public fun getValue ()[B
-	public fun getWriteType ()I
-	public fun setWriteType (I)V
+	public fun getWriteType ()Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;
+	public fun setWriteType (Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;)V
 	public fun updateValue ([B)V
 }
 
@@ -195,7 +190,7 @@ public final class com/splendo/kaluga/bluetooth/DefaultGattServiceWrapper : com/
 	public fun getCharacteristics ()Ljava/util/List;
 	public fun getIncludedServices ()Ljava/util/List;
 	public fun getInstanceId ()I
-	public fun getType ()I
+	public fun getType ()Lcom/splendo/kaluga/bluetooth/ServiceWrapper$Type;
 	public fun getUuid ()Ljava/util/UUID;
 }
 
@@ -234,10 +229,17 @@ public abstract interface class com/splendo/kaluga/bluetooth/ServiceWrapper {
 	public abstract fun getCharacteristics ()Ljava/util/List;
 	public abstract fun getIncludedServices ()Ljava/util/List;
 	public abstract fun getInstanceId ()I
-	public abstract fun getType ()I
+	public abstract fun getType ()Lcom/splendo/kaluga/bluetooth/ServiceWrapper$Type;
 	public abstract fun getUuid ()Ljava/util/UUID;
 }
 
+public final class com/splendo/kaluga/bluetooth/ServiceWrapper$Type : java/lang/Enum {
+	public static final field PRIMARY Lcom/splendo/kaluga/bluetooth/ServiceWrapper$Type;
+	public static final field SECONDARY Lcom/splendo/kaluga/bluetooth/ServiceWrapper$Type;
+	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/bluetooth/ServiceWrapper$Type;
+	public static fun values ()[Lcom/splendo/kaluga/bluetooth/ServiceWrapper$Type;
+}
+
 public abstract class com/splendo/kaluga/bluetooth/UUIDException : java/lang/Exception {
 	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
@@ -286,33 +288,37 @@ public abstract class com/splendo/kaluga/bluetooth/device/BaseConnectableDeviceS
 
 public abstract class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager : com/splendo/kaluga/bluetooth/device/DeviceConnectionManager, kotlinx/coroutines/CoroutineScope {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;)V
-	public fun cancelConnecting ()V
-	public final fun createService (Lcom/splendo/kaluga/bluetooth/ServiceWrapper;)Lcom/splendo/kaluga/bluetooth/Service;
+	public final fun cancelConnecting ()V
+	protected fun createService (Lcom/splendo/kaluga/bluetooth/ServiceWrapper;)Lcom/splendo/kaluga/bluetooth/Service;
+	protected abstract fun didStartPairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun didStartPerformingAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun didStartUnpairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	protected final fun getCurrentAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
-	public final fun getDeviceWrapper ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
+	protected final fun getDeviceWrapper ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
 	public fun getEvents ()Lkotlinx/coroutines/flow/Flow;
 	protected final fun getNotifyingCharacteristics ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
 	public synthetic fun getRssi ()Lkotlinx/coroutines/flow/Flow;
 	public fun getRssi ()Lkotlinx/coroutines/flow/SharedFlow;
-	public fun handleConnect ()V
-	public fun handleCurrentActionCompleted (Z)V
-	public fun handleDisconnect (Lkotlin/jvm/functions/Function1;)V
-	public final fun handleDiscoverCompleted (Ljava/util/List;)V
-	public final fun handleDiscoverWrappersCompleted (Ljava/util/List;)V
-	public final fun handleNewMtu (I)V
-	public final fun handleNewRssi (I)V
-	public final fun handleUpdatedCharacteristic (Ljava/util/UUID;ZLkotlin/jvm/functions/Function1;)V
+	public final fun handleConnect ()V
+	protected fun handleCurrentActionCompleted (Z)V
+	public final fun handleDisconnect (Lkotlin/jvm/functions/Function1;)V
+	protected fun handleDiscoverCompleted (Ljava/util/List;)V
+	protected final fun handleNewMtu (I)V
+	protected fun handleNewRssi (I)V
+	protected fun handleUpdatedCharacteristic (Ljava/util/UUID;ZLkotlin/jvm/functions/Function1;)V
 	public static synthetic fun handleUpdatedCharacteristic$default (Lcom/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager;Ljava/util/UUID;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public final fun handleUpdatedDescriptor (Ljava/util/UUID;ZLkotlin/jvm/functions/Function1;)V
+	protected fun handleUpdatedDescriptor (Ljava/util/UUID;ZLkotlin/jvm/functions/Function1;)V
 	public static synthetic fun handleUpdatedDescriptor$default (Lcom/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager;Ljava/util/UUID;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public fun performAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun pair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun performAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun readRssi (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun reset (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected final fun setCurrentAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)V
-	public fun startConnecting ()V
-	public fun startDisconnecting ()V
-	public fun startDiscovering ()V
+	public final fun startConnecting ()V
+	public final fun startDisconnecting ()V
+	public final fun startDiscovering ()V
+	public final fun unpair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager$Builder {
@@ -593,7 +599,7 @@ public final class com/splendo/kaluga/bluetooth/device/DefaultDeviceWrapper : co
 	public fun <init> (Landroid/bluetooth/BluetoothDevice;)V
 	public fun connectGatt (Landroid/content/Context;ZLandroid/bluetooth/BluetoothGattCallback;)Lcom/splendo/kaluga/bluetooth/device/BluetoothGattWrapper;
 	public fun createBond ()V
-	public fun getBondState ()I
+	public fun getBondState ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState;
 	public fun getDevice ()Landroid/bluetooth/BluetoothDevice;
 	public fun getIdentifier ()Ljava/lang/String;
 	public fun getName ()Ljava/lang/String;
@@ -608,7 +614,7 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/Device {
 	public abstract fun getInfo ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun getState ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun handleConnected ()V
-	public abstract fun handleDisconnected (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun handleDisconnected ()V
 	public abstract fun rssiDidUpdate (I)V
 }
 
@@ -781,7 +787,7 @@ public final class com/splendo/kaluga/bluetooth/device/DeviceImpl : com/splendo/
 	public fun getInfo ()Lkotlinx/coroutines/flow/Flow;
 	public fun getState ()Lkotlinx/coroutines/flow/Flow;
 	public fun handleConnected ()V
-	public fun handleDisconnected (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun handleDisconnected ()V
 	public fun rssiDidUpdate (I)V
 }
 
@@ -834,13 +840,21 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/DeviceState
 public abstract interface class com/splendo/kaluga/bluetooth/device/DeviceWrapper {
 	public abstract fun connectGatt (Landroid/content/Context;ZLandroid/bluetooth/BluetoothGattCallback;)Lcom/splendo/kaluga/bluetooth/device/BluetoothGattWrapper;
 	public abstract fun createBond ()V
-	public abstract fun getBondState ()I
+	public abstract fun getBondState ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState;
 	public abstract fun getDevice ()Landroid/bluetooth/BluetoothDevice;
 	public abstract fun getIdentifier ()Ljava/lang/String;
 	public abstract fun getName ()Ljava/lang/String;
 	public abstract fun removeBond ()V
 }
 
+public final class com/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState : java/lang/Enum {
+	public static final field BONDED Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState;
+	public static final field BONDING Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState;
+	public static final field NONE Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState;
+	public static fun valueOf (Ljava/lang/String;)Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState;
+	public static fun values ()[Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState;
+}
+
 public class com/splendo/kaluga/bluetooth/device/IdentifierSerializer : kotlinx/serialization/KSerializer {
 	public fun <init> ()V
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier;
@@ -878,6 +892,7 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanner : com/spl
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;)V
 	protected abstract fun didStartScanning (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected abstract fun didStopScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun generateEnableSensorsActions ()Ljava/util/List;
 	protected abstract fun getBluetoothEnabledMonitor ()Lcom/splendo/kaluga/bluetooth/BluetoothMonitor;
 	protected final fun getBluetoothPermissionRepo ()Lcom/splendo/kaluga/base/state/StateRepo;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
@@ -903,15 +918,15 @@ public final class com/splendo/kaluga/bluetooth/scanner/BaseScanner$Companion {
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings {
-	public fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;ZZLcom/splendo/kaluga/logging/Logger;Z)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;ZZLcom/splendo/kaluga/logging/Logger;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;ZZZLcom/splendo/kaluga/logging/Logger;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;ZZZLcom/splendo/kaluga/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Lcom/splendo/kaluga/permissions/base/Permissions;
 	public final fun component2 ()Z
 	public final fun component3 ()Z
-	public final fun component4 ()Lcom/splendo/kaluga/logging/Logger;
-	public final fun component5 ()Z
-	public final fun copy (Lcom/splendo/kaluga/permissions/base/Permissions;ZZLcom/splendo/kaluga/logging/Logger;Z)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lcom/splendo/kaluga/permissions/base/Permissions;ZZLcom/splendo/kaluga/logging/Logger;ZILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;
+	public final fun component4 ()Z
+	public final fun component5 ()Lcom/splendo/kaluga/logging/Logger;
+	public final fun copy (Lcom/splendo/kaluga/permissions/base/Permissions;ZZZLcom/splendo/kaluga/logging/Logger;)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lcom/splendo/kaluga/permissions/base/Permissions;ZZZLcom/splendo/kaluga/logging/Logger;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAutoEnableSensors ()Z
 	public final fun getAutoRequestPermission ()Z
@@ -928,7 +943,6 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanningStateRepo
 
 public final class com/splendo/kaluga/bluetooth/scanner/DefaultScanner : com/splendo/kaluga/bluetooth/scanner/BaseScanner {
 	public static final field Companion Lcom/splendo/kaluga/bluetooth/scanner/DefaultScanner$Companion;
-	public fun generateEnableSensorsActions ()Ljava/util/List;
 	public fun isHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun isSupported ()Z
 	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -948,7 +962,6 @@ public final class com/splendo/kaluga/bluetooth/scanner/DefaultScanner$Companion
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/scanner/Scanner {
-	public abstract fun generateEnableSensorsActions ()Ljava/util/List;
 	public abstract fun getEvents ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun isHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun isSupported ()Z
@@ -1250,9 +1263,6 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotIni
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$PermittedHandler {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)V
-	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 }
 
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index e9c095113..f49a11645 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -5,9 +5,9 @@ public abstract class com/splendo/kaluga/bluetooth/Attribute : kotlinx/coroutine
 	public fun collect (Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected final fun getLogTag ()Ljava/lang/String;
 	public abstract fun getUuid ()Lcom/splendo/kaluga/bluetooth/UUID;
-	public final fun readValue ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
+	public final fun readValue ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction$Read;
 	public fun updateValue ()V
-	public final fun writeValue ([B)Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
+	public final fun writeValue ([B)Lcom/splendo/kaluga/bluetooth/device/DeviceAction$Write;
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/BaseBluetoothBuilder {
@@ -28,18 +28,6 @@ public final class com/splendo/kaluga/bluetooth/Bluetooth : com/splendo/kaluga/b
 	public fun stopScanning ()V
 }
 
-public abstract class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode {
-}
-
-public final class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Scan : com/splendo/kaluga/bluetooth/Bluetooth$ScanMode {
-	public fun <init> (Ljava/util/Set;)V
-	public final fun getFilter ()Ljava/util/Set;
-}
-
-public final class com/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Stopped : com/splendo/kaluga/bluetooth/Bluetooth$ScanMode {
-	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/Bluetooth$ScanMode$Stopped;
-}
-
 public final class com/splendo/kaluga/bluetooth/BluetoothBuilder : com/splendo/kaluga/bluetooth/BaseBluetoothBuilder {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/jvm/functions/Function2;)V
@@ -160,8 +148,6 @@ public final class com/splendo/kaluga/bluetooth/CommonUUID {
 public final class com/splendo/kaluga/bluetooth/DefaultBluetoothMonitor : com/splendo/kaluga/service/DefaultServiceMonitor, com/splendo/kaluga/bluetooth/BluetoothMonitor {
 	public fun <init> ()V
 	public fun isServiceEnabled ()Z
-	public fun monitoringDidStart ()V
-	public fun monitoringDidStop ()V
 }
 
 public class com/splendo/kaluga/bluetooth/Descriptor : com/splendo/kaluga/bluetooth/Attribute {
@@ -248,33 +234,37 @@ public abstract class com/splendo/kaluga/bluetooth/device/BaseConnectableDeviceS
 
 public abstract class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager : com/splendo/kaluga/bluetooth/device/DeviceConnectionManager, kotlinx/coroutines/CoroutineScope {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;)V
-	public fun cancelConnecting ()V
-	public final fun createService (Lcom/splendo/kaluga/bluetooth/ServiceWrapper;)Lcom/splendo/kaluga/bluetooth/Service;
+	public final fun cancelConnecting ()V
+	protected fun createService (Lcom/splendo/kaluga/bluetooth/ServiceWrapper;)Lcom/splendo/kaluga/bluetooth/Service;
+	protected abstract fun didStartPairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun didStartPerformingAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun didStartUnpairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	protected final fun getCurrentAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
-	public final fun getDeviceWrapper ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
+	protected final fun getDeviceWrapper ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
 	public fun getEvents ()Lkotlinx/coroutines/flow/Flow;
 	protected final fun getNotifyingCharacteristics ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableMap;
 	public synthetic fun getRssi ()Lkotlinx/coroutines/flow/Flow;
 	public fun getRssi ()Lkotlinx/coroutines/flow/SharedFlow;
-	public fun handleConnect ()V
-	public fun handleCurrentActionCompleted (Z)V
-	public fun handleDisconnect (Lkotlin/jvm/functions/Function1;)V
-	public final fun handleDiscoverCompleted (Ljava/util/List;)V
-	public final fun handleDiscoverWrappersCompleted (Ljava/util/List;)V
-	public final fun handleNewMtu (I)V
-	public final fun handleNewRssi (I)V
-	public final fun handleUpdatedCharacteristic (Lcom/splendo/kaluga/bluetooth/UUID;ZLkotlin/jvm/functions/Function1;)V
+	public final fun handleConnect ()V
+	protected fun handleCurrentActionCompleted (Z)V
+	public final fun handleDisconnect (Lkotlin/jvm/functions/Function1;)V
+	protected fun handleDiscoverCompleted (Ljava/util/List;)V
+	protected final fun handleNewMtu (I)V
+	protected fun handleNewRssi (I)V
+	protected fun handleUpdatedCharacteristic (Lcom/splendo/kaluga/bluetooth/UUID;ZLkotlin/jvm/functions/Function1;)V
 	public static synthetic fun handleUpdatedCharacteristic$default (Lcom/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager;Lcom/splendo/kaluga/bluetooth/UUID;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public final fun handleUpdatedDescriptor (Lcom/splendo/kaluga/bluetooth/UUID;ZLkotlin/jvm/functions/Function1;)V
+	protected fun handleUpdatedDescriptor (Lcom/splendo/kaluga/bluetooth/UUID;ZLkotlin/jvm/functions/Function1;)V
 	public static synthetic fun handleUpdatedDescriptor$default (Lcom/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager;Lcom/splendo/kaluga/bluetooth/UUID;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public fun performAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun pair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun performAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun readRssi (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun reset (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected final fun setCurrentAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)V
-	public fun startConnecting ()V
-	public fun startDisconnecting ()V
-	public fun startDiscovering ()V
+	public final fun startConnecting ()V
+	public final fun startDisconnecting ()V
+	public final fun startDiscovering ()V
+	public final fun unpair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager$Builder {
@@ -584,7 +574,7 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/Device {
 	public abstract fun getInfo ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun getState ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun handleConnected ()V
-	public abstract fun handleDisconnected (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun handleDisconnected ()V
 	public abstract fun rssiDidUpdate (I)V
 }
 
@@ -760,7 +750,7 @@ public final class com/splendo/kaluga/bluetooth/device/DeviceImpl : com/splendo/
 	public fun getInfo ()Lkotlinx/coroutines/flow/Flow;
 	public fun getState ()Lkotlinx/coroutines/flow/Flow;
 	public fun handleConnected ()V
-	public fun handleDisconnected (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun handleDisconnected ()V
 	public fun rssiDidUpdate (I)V
 }
 
@@ -855,6 +845,7 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanner : com/spl
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;)V
 	protected abstract fun didStartScanning (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected abstract fun didStopScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun generateEnableSensorsActions ()Ljava/util/List;
 	protected abstract fun getBluetoothEnabledMonitor ()Lcom/splendo/kaluga/bluetooth/BluetoothMonitor;
 	protected final fun getBluetoothPermissionRepo ()Lcom/splendo/kaluga/base/state/StateRepo;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
@@ -880,15 +871,15 @@ public final class com/splendo/kaluga/bluetooth/scanner/BaseScanner$Companion {
 }
 
 public final class com/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings {
-	public fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;ZZLcom/splendo/kaluga/logging/Logger;Z)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;ZZLcom/splendo/kaluga/logging/Logger;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;ZZZLcom/splendo/kaluga/logging/Logger;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/permissions/base/Permissions;ZZZLcom/splendo/kaluga/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Lcom/splendo/kaluga/permissions/base/Permissions;
 	public final fun component2 ()Z
 	public final fun component3 ()Z
-	public final fun component4 ()Lcom/splendo/kaluga/logging/Logger;
-	public final fun component5 ()Z
-	public final fun copy (Lcom/splendo/kaluga/permissions/base/Permissions;ZZLcom/splendo/kaluga/logging/Logger;Z)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lcom/splendo/kaluga/permissions/base/Permissions;ZZLcom/splendo/kaluga/logging/Logger;ZILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;
+	public final fun component4 ()Z
+	public final fun component5 ()Lcom/splendo/kaluga/logging/Logger;
+	public final fun copy (Lcom/splendo/kaluga/permissions/base/Permissions;ZZZLcom/splendo/kaluga/logging/Logger;)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lcom/splendo/kaluga/permissions/base/Permissions;ZZZLcom/splendo/kaluga/logging/Logger;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAutoEnableSensors ()Z
 	public final fun getAutoRequestPermission ()Z
@@ -905,7 +896,6 @@ public abstract class com/splendo/kaluga/bluetooth/scanner/BaseScanningStateRepo
 
 public final class com/splendo/kaluga/bluetooth/scanner/DefaultScanner : com/splendo/kaluga/bluetooth/scanner/BaseScanner {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;)V
-	public fun generateEnableSensorsActions ()Ljava/util/List;
 	public fun isSupported ()Z
 	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
@@ -916,7 +906,6 @@ public final class com/splendo/kaluga/bluetooth/scanner/DefaultScanner$Builder :
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/scanner/Scanner {
-	public abstract fun generateEnableSensorsActions ()Ljava/util/List;
 	public abstract fun getEvents ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun isHardwareEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun isSupported ()Z
@@ -1291,9 +1280,6 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotIni
 
 public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$PermittedHandler {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)V
-	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
 }
 
diff --git a/bluetooth/src/androidLibMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/androidLibMain/kotlin/device/AdvertisementData.kt
index 63f6e8763..0f648ea6e 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/AdvertisementData.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.device
 
+import com.splendo.kaluga.bluetooth.TxPower
 import com.splendo.kaluga.bluetooth.UUID
 import no.nordicsemi.android.support.v18.scanner.ScanResult
 import java.nio.ByteBuffer
@@ -45,7 +46,7 @@ actual class AdvertisementData(private val scanResult: ScanResult?) : BaseAdvert
         get() = scanRecord?.serviceUuids?.map { it.uuid } ?: emptyList()
     override val serviceData: Map<UUID, ByteArray?>
         get() = scanRecord?.serviceData?.mapKeys { it.key.uuid } ?: emptyMap()
-    override val txPowerLevel: Int
+    override val txPowerLevel: TxPower
         get() = scanRecord?.txPowerLevel ?: Int.MIN_VALUE
     override val isConnectable: Boolean
         get() = scanResult?.isConnectable == true
diff --git a/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt b/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt
index 6a90db9bd..00d1d2339 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt
@@ -24,6 +24,7 @@ import android.bluetooth.BluetoothGattDescriptor
 import android.bluetooth.BluetoothStatusCodes
 import com.splendo.kaluga.bluetooth.CharacteristicWrapper
 import com.splendo.kaluga.bluetooth.DescriptorWrapper
+import com.splendo.kaluga.bluetooth.MTU
 
 /**
  * A wrapper to access a [BluetoothGatt]
@@ -59,11 +60,11 @@ interface BluetoothGattWrapper {
     fun readRemoteRssi(): Boolean
 
     /**
-     * Request an Maximum Transmission Unit (MTU) size
-     * @param mtu the MTU size
+     * Request a [MTU] size
+     * @param mtu the [MTU] size
      * @return `true` if the new MTU value has been requested successfully
      */
-    fun requestMtu(mtu: Int): Boolean
+    fun requestMtu(mtu: MTU): Boolean
 
     /**
      * Reads the value of the [CharacteristicWrapper] from the device
@@ -131,7 +132,7 @@ class DefaultBluetoothGattWrapper(private val gatt: BluetoothGatt) : BluetoothGa
         return gatt.readRemoteRssi()
     }
 
-    override fun requestMtu(mtu: Int): Boolean {
+    override fun requestMtu(mtu: MTU): Boolean {
         return gatt.requestMtu(mtu)
     }
 
diff --git a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
index c442ea986..45e96032b 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -32,6 +32,7 @@ import com.splendo.kaluga.base.ApplicationHolder
 import com.splendo.kaluga.bluetooth.Characteristic
 import com.splendo.kaluga.bluetooth.DefaultGattServiceWrapper
 import com.splendo.kaluga.bluetooth.Descriptor
+import com.splendo.kaluga.bluetooth.MTU
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.containsAnyOf
 import com.splendo.kaluga.bluetooth.uuidString
@@ -209,7 +210,7 @@ internal actual class DefaultDeviceConnectionManager(
         gatt.await().readRemoteRssi()
     }
 
-    override suspend fun requestMtu(mtu: Int): Boolean {
+    override suspend fun requestMtu(mtu: MTU): Boolean {
         return gatt.await().requestMtu(mtu)
     }
 
diff --git a/bluetooth/src/commonMain/kotlin/Bluetooth.kt b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
index bb6a82dc5..9f56456f2 100644
--- a/bluetooth/src/commonMain/kotlin/Bluetooth.kt
+++ b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
@@ -58,6 +58,21 @@ private val defaultBluetoothDispatcher by lazy {
     singleThreadDispatcher("Bluetooth")
 }
 
+/**
+ * The transmission power level in dBm
+ */
+typealias TxPower = Int
+
+/**
+ * The Received signal strength indication (RSSI)
+ */
+typealias RSSI = Int
+
+/**
+ * The Maximum Transmission Unit (MTU)
+ */
+typealias MTU = Int
+
 /**
  * A service for managing Bluetooth [Device]
  */
@@ -327,14 +342,14 @@ fun Flow<Device?>.info(): Flow<DeviceInfo> = flatMapLatest { device ->
 fun Flow<Device?>.advertisement(): Flow<BaseAdvertisementData> = info().map { it.advertisementData }.distinctUntilChanged()
 
 /**
- * Gets the ([Flow] of) the RSSI value from a [Flow] of [Device]
+ * Gets the ([Flow] of) the [RSSI] value from a [Flow] of [Device]
  * @return the [Flow] of the RSSI value associated with the [Device] in the given [Flow]
  */
-fun Flow<Device?>.rssi(): Flow<Int> = info().map { it.rssi }.distinctUntilChanged()
+fun Flow<Device?>.rssi(): Flow<RSSI> = info().map { it.rssi }.distinctUntilChanged()
 
 /**
- * Gets the ([Flow] of) the Maximum Transmission Unit (MTU) from a [Flow] of [Device]
- * @return the [Flow] of MTU associated with the [Device] in the given [Flow]
+ * Gets the ([Flow] of) the [MTU] from a [Flow] of [Device]
+ * @return the [Flow] of [MTU] associated with the [Device] in the given [Flow]
  */
 fun Flow<Device?>.mtu() = state().map { state ->
     if (state is ConnectableDeviceState.Connected) {
@@ -384,12 +399,12 @@ suspend fun Flow<Device?>.updateRssi() {
 }
 
 /**
- * Attempts to request a Maximum Transmission Unit (MTU) size for the [Device] from a [Flow] of [Device]
+ * Attempts to request a [MTU] size for the [Device] from a [Flow] of [Device]
  * When this method completes, the devices should have had [ConnectableDeviceState.Connected.requestMtu] called
- * @param mtu the MTU size to request
+ * @param mtu the [MTU] size to request
  * @return if `true` the new MTU value has been requested successfully
  */
-suspend fun Flow<Device?>.requestMtu(mtu: Int): Boolean {
+suspend fun Flow<Device?>.requestMtu(mtu: MTU): Boolean {
     return state().transformLatest { deviceState ->
         when (deviceState) {
             is ConnectableDeviceState.Connected -> {
diff --git a/bluetooth/src/commonMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/commonMain/kotlin/device/AdvertisementData.kt
index 2b569df1d..19fdd2706 100644
--- a/bluetooth/src/commonMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/commonMain/kotlin/device/AdvertisementData.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.device
 
+import com.splendo.kaluga.bluetooth.TxPower
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.uuidString
 
@@ -50,9 +51,9 @@ interface BaseAdvertisementData {
     val serviceData: Map<UUID, ByteArray?>
 
     /**
-     * The transmission power level of the packet in dBm
+     * The [TxPower] of the packet
      */
-    val txPowerLevel: Int
+    val txPowerLevel: TxPower
 
     /**
      * If `true` the [Device] can be connected to
diff --git a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 9d0b35326..e46ed08ac 100644
--- a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -20,6 +20,8 @@ package com.splendo.kaluga.bluetooth.device
 import com.splendo.kaluga.base.collections.concurrentMutableMapOf
 import com.splendo.kaluga.bluetooth.Characteristic
 import com.splendo.kaluga.bluetooth.Descriptor
+import com.splendo.kaluga.bluetooth.MTU
+import com.splendo.kaluga.bluetooth.RSSI
 import com.splendo.kaluga.bluetooth.Service
 import com.splendo.kaluga.bluetooth.ServiceWrapper
 import com.splendo.kaluga.bluetooth.UUID
@@ -120,9 +122,10 @@ interface DeviceConnectionManager {
         data class CompletedAction(val action: DeviceAction?, val succeeded: Boolean) : Event()
 
         /**
-         * [Event] indicating the device has updated its Maximum Transmission Unit (MTU) size
+         * [Event] indicating the device has updated its [MTU] size
+         * @property newMtu the new [MTU] size
          */
-        data class MtuUpdated(val newMtu: Int) : Event()
+        data class MtuUpdated(val newMtu: MTU) : Event()
     }
 
     /**
@@ -133,7 +136,7 @@ interface DeviceConnectionManager {
     /**
      * A [Flow] of the RSSI value of the device
      */
-    val rssi: Flow<Int>
+    val rssi: Flow<RSSI>
 
     /**
      * Gets the current [State] of the device
@@ -161,11 +164,11 @@ interface DeviceConnectionManager {
     suspend fun readRssi()
 
     /**
-     * Requests an update to the Maximum Transmission Unit (MTU) size of the device
-     * @param mtu the size of the MTU to request
+     * Requests an update to the [MTU] size of the device
+     * @param mtu the size of the [MTU] to request
      * @return `true` if the request was successful
      */
-    suspend fun requestMtu(mtu: Int): Boolean
+    suspend fun requestMtu(mtu: MTU): Boolean
 
     /**
      * Starts performing a [DeviceAction]
@@ -258,7 +261,7 @@ abstract class BaseDeviceConnectionManager(
     private val eventChannel = Channel<DeviceConnectionManager.Event>(UNLIMITED)
     override val events: Flow<DeviceConnectionManager.Event> = eventChannel.receiveAsFlow()
 
-    private val sharedRssi = MutableSharedFlow<Int>(0, 1, BufferOverflow.DROP_OLDEST)
+    private val sharedRssi = MutableSharedFlow<RSSI>(0, 1, BufferOverflow.DROP_OLDEST)
     override val rssi = sharedRssi.asSharedFlow()
 
     override suspend fun readRssi() {
@@ -266,12 +269,12 @@ abstract class BaseDeviceConnectionManager(
         // TODO call into abstract function?
     }
 
-    protected open fun handleNewRssi(rssi: Int) {
+    protected open fun handleNewRssi(rssi: RSSI) {
         logger.debug(logTag) { "Updated Rssi $rssi" }
         sharedRssi.tryEmit(rssi)
     }
 
-    protected fun handleNewMtu(mtu: Int) {
+    protected fun handleNewMtu(mtu: MTU) {
         logger.debug(logTag) { "Updated Mtu $mtu" }
         emitEvent(DeviceConnectionManager.Event.MtuUpdated(mtu))
     }
diff --git a/bluetooth/src/commonMain/kotlin/device/Device.kt b/bluetooth/src/commonMain/kotlin/device/Device.kt
index 0ab4fd763..dcb289216 100644
--- a/bluetooth/src/commonMain/kotlin/device/Device.kt
+++ b/bluetooth/src/commonMain/kotlin/device/Device.kt
@@ -20,6 +20,7 @@ import com.splendo.kaluga.base.utils.getCompletedOrNull
 import com.splendo.kaluga.logging.debug
 import com.splendo.kaluga.base.state.HotStateFlowRepo
 import com.splendo.kaluga.base.state.StateRepo
+import com.splendo.kaluga.bluetooth.RSSI
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -85,10 +86,10 @@ interface Device {
     fun handleDisconnected()
 
     /**
-     * Notifies the device that the RSSI has updated
-     * @param rssi the new RSSI value
+     * Notifies the device that the [RSSI] has updated
+     * @param rssi the new [RSSI] value
      */
-    fun rssiDidUpdate(rssi: Int)
+    fun rssiDidUpdate(rssi: RSSI)
 
     /**
      * Notifies the device that the [BaseAdvertisementData] has updated
@@ -204,7 +205,7 @@ class DeviceImpl(
 
     override fun handleDisconnected() = createConnectionManagerIfNotCreated().handleDisconnect()
 
-    override fun rssiDidUpdate(rssi: Int) {
+    override fun rssiDidUpdate(rssi: RSSI) {
         sharedInfo.value = sharedInfo.value.copy(rssi = rssi)
     }
 
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
index 9a419be91..c648395c8 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
+import com.splendo.kaluga.bluetooth.RSSI
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.descriptors.PrimitiveKind
@@ -111,9 +112,9 @@ interface DeviceInfo {
     val identifier: Identifier
 
     /**
-     * RSSI value of the Bluetooth device
+     * [RSSI] value of the Bluetooth device
      */
-    val rssi: Int
+    val rssi: RSSI
 
     /**
      * Current [BaseAdvertisementData] of the Bluetooth device
@@ -139,7 +140,7 @@ interface DeviceInfo {
 data class DeviceInfoImpl(
     override val name: String?,
     override val identifier: Identifier,
-    override val rssi: Int,
+    override val rssi: RSSI,
     override val advertisementData: BaseAdvertisementData
 ) : DeviceInfo {
 
@@ -151,7 +152,7 @@ data class DeviceInfoImpl(
      */
     constructor(
         wrapper: DeviceWrapper,
-        rssi: Int,
+        rssi: RSSI,
         advertisementData: BaseAdvertisementData
     ) : this(
         name = wrapper.name,
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
index 596387259..20f5b6c7c 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
@@ -19,9 +19,8 @@ package com.splendo.kaluga.bluetooth.device
 
 import com.splendo.kaluga.base.state.HandleAfterOldStateIsRemoved
 import com.splendo.kaluga.base.state.KalugaState
+import com.splendo.kaluga.bluetooth.MTU
 import com.splendo.kaluga.bluetooth.Service
-import com.splendo.kaluga.bluetooth.device.ConnectableDeviceState.Disconnected
-import com.splendo.kaluga.bluetooth.device.ConnectableDeviceState.Reconnecting
 import kotlinx.coroutines.CompletableDeferred
 
 /**
@@ -195,9 +194,9 @@ sealed interface ConnectableDeviceState : DeviceState, KalugaState {
         }
 
         /**
-         * The current Maximum Transmission Unit (MTU) size of the device
+         * The current [MTU] size of the device
          */
-        val mtu: Int?
+        val mtu: MTU?
 
         /**
          * Starts transitioning to a [Disconnected] State
@@ -210,11 +209,11 @@ sealed interface ConnectableDeviceState : DeviceState, KalugaState {
         val reconnect: suspend () -> Reconnecting
 
         /**
-         * Updates the Maximum Transmission Unit (MTU) size of the device
-         * @param mtu the new MTU value
+         * Updates the [MTU] size of the device
+         * @param mtu the new [MTU] value
          * @return a transition into a [Connected] State with the new MTU
          */
-        fun didUpdateMtu(mtu: Int): suspend () -> Connected
+        fun didUpdateMtu(mtu: MTU): suspend () -> Connected
 
         /**
          * Reads the RSSI
@@ -222,11 +221,11 @@ sealed interface ConnectableDeviceState : DeviceState, KalugaState {
         suspend fun readRssi()
 
         /**
-         * Requests an update to the Maximum Transmission Unit (MTU) size of the device
-         * @param mtu the new MTU size to request
+         * Requests an update to the [MTU] size of the device
+         * @param mtu the new [MTU] size to request
          * @return `true` if the MTU update has been requested successfully
          */
-        suspend fun requestMtu(mtu: Int): Boolean
+        suspend fun requestMtu(mtu: MTU): Boolean
 
         /**
          * Attempts to pair this device
@@ -364,11 +363,11 @@ sealed class ConnectableDeviceStateImpl {
 
         /**
          * A [Connected] State where no [Service] have been discovered yet
-         * @param mtu The current Maximum Transmission Unit (MTU) size of the device
+         * @param mtu The current [MTU] size of the device
          * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
          */
         data class NoServices constructor(
-            override val mtu: Int?,
+            override val mtu: MTU?,
             override val deviceConnectionManager: DeviceConnectionManager
         ) : Connected(), ConnectableDeviceState.Connected.NoServices {
 
@@ -380,16 +379,16 @@ sealed class ConnectableDeviceStateImpl {
                 Discovering(mtu, deviceConnectionManager)
             }
 
-            override fun didUpdateMtu(mtu: Int) = suspend { copy(mtu = mtu) }
+            override fun didUpdateMtu(mtu: MTU) = suspend { copy(mtu = mtu) }
         }
 
         /**
          * A [Connected] State where [Service] are being discovered
-         * @param mtu The current Maximum Transmission Unit (MTU) size of the device
+         * @param mtu The current [MTU] size of the device
          * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
          */
         data class Discovering constructor(
-            override val mtu: Int?,
+            override val mtu: MTU?,
             override val deviceConnectionManager: DeviceConnectionManager
         ) : Connected(),
             ConnectableDeviceState.Connected.Discovering,
@@ -399,7 +398,7 @@ sealed class ConnectableDeviceStateImpl {
                 return { Idle(mtu, services, deviceConnectionManager) }
             }
 
-            override fun didUpdateMtu(mtu: Int) = suspend { copy(mtu = mtu) }
+            override fun didUpdateMtu(mtu: MTU) = suspend { copy(mtu = mtu) }
 
             override suspend fun afterOldStateIsRemoved(oldState: ConnectableDeviceState) {
                 deviceConnectionManager.discoverServices()
@@ -408,38 +407,38 @@ sealed class ConnectableDeviceStateImpl {
 
         /**
          * A [Connected] State where all [Service] have been discovered and no [DeviceAction] is being executed
-         * @param mtu The current Maximum Transmission Unit (MTU) size of the device
+         * @param mtu The current [MTU] size of the device
          * @param services The list of [Service] hat where discovered
          * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
          */
         data class Idle constructor(
-            override val mtu: Int?,
+            override val mtu: MTU?,
             override val services: List<Service>,
             override val deviceConnectionManager: DeviceConnectionManager
         ) : Connected(), ConnectableDeviceState.Connected.Idle {
 
             override fun handleAction(action: DeviceAction) = suspend { HandlingAction(action, emptyList(), mtu, services, deviceConnectionManager) }
-            override fun didUpdateMtu(mtu: Int) = suspend { copy(mtu = mtu) }
+            override fun didUpdateMtu(mtu: MTU) = suspend { copy(mtu = mtu) }
         }
 
         /**
          * A [Connected] State where all [Service] have been discovered and a [DeviceAction] is being executed
          * @param action The [DeviceAction] currently being executed
          * @param nextActions The list of [DeviceAction] to be executed when [action] has been handled
-         * @param mtu The current Maximum Transmission Unit (MTU) size of the device
+         * @param mtu The current [MTU] size of the device
          * @param services The list of [Service] hat where discovered
          * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
          */
         data class HandlingAction constructor(
             override val action: DeviceAction,
             override val nextActions: List<DeviceAction>,
-            override val mtu: Int?,
+            override val mtu: MTU?,
             override val services: List<Service>,
             override val deviceConnectionManager: DeviceConnectionManager
         ) : Connected(), ConnectableDeviceState.Connected.HandlingAction, HandleAfterOldStateIsRemoved<ConnectableDeviceState> {
 
             override fun addAction(newAction: DeviceAction) = suspend { HandlingAction(action, listOf(*nextActions.toTypedArray(), newAction), mtu, services, deviceConnectionManager) }
-            override fun didUpdateMtu(mtu: Int) = suspend { copy(mtu = mtu) }
+            override fun didUpdateMtu(mtu: MTU) = suspend { copy(mtu = mtu) }
 
             override val actionCompleted: suspend () -> ConnectableDeviceState.Connected.DiscoveredServices = suspend {
                 when (action) {
@@ -487,11 +486,11 @@ sealed class ConnectableDeviceStateImpl {
         }
 
         /**
-         * Requests an update to the Maximum Transmission Unit (MTU) size of the device
-         * @param mtu the new MTU size to request
+         * Requests an update to the [MTU] size of the device
+         * @param mtu the new [MTU] size to request
          * @return `true` if the MTU update has been requested successfully
          */
-        suspend fun requestMtu(mtu: Int): Boolean {
+        suspend fun requestMtu(mtu: MTU): Boolean {
             return deviceConnectionManager.requestMtu(mtu)
         }
 
diff --git a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
index 52031a06d..3e29625fc 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
@@ -19,6 +19,7 @@ package com.splendo.kaluga.bluetooth.scanner
 
 import com.splendo.kaluga.base.flow.filterOnlyImportant
 import com.splendo.kaluga.bluetooth.BluetoothMonitor
+import com.splendo.kaluga.bluetooth.RSSI
 import com.splendo.kaluga.bluetooth.Service
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.device.AdvertisementData
@@ -92,13 +93,13 @@ interface Scanner {
         /**
          * An [Event] indicating a [com.splendo.kaluga.bluetooth.device.Device] was discovered
          * @property identifier the [Identifier] of the device discovered
-         * @property rssi the RSSI value of the device discovered
+         * @property rssi the [RSSI] value of the device discovered
          * @property advertisementData the [BaseAdvertisementData] of the device discovered
          * @property deviceCreator method for creating a device if it had not yet been discovered.
          */
         data class DeviceDiscovered(
             val identifier: Identifier,
-            val rssi: Int,
+            val rssi: RSSI,
             val advertisementData: BaseAdvertisementData,
             val deviceCreator: DeviceCreator
         ) : Event()
@@ -354,7 +355,7 @@ abstract class BaseScanner constructor(
 
     internal fun handleDeviceDiscovered(
         identifier: Identifier,
-        rssi: Int,
+        rssi: RSSI,
         advertisementData: AdvertisementData,
         deviceCreator: DeviceCreator
     ) {
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
index ce003f7b6..b07476ac7 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
@@ -27,9 +27,8 @@ import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
 import com.splendo.kaluga.base.state.HandleAfterOldStateIsRemoved
 import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
 import com.splendo.kaluga.base.state.KalugaState
+import com.splendo.kaluga.bluetooth.RSSI
 import com.splendo.kaluga.bluetooth.Service
-import com.splendo.kaluga.bluetooth.scanner.ScanningState.Deinitialized
-import com.splendo.kaluga.bluetooth.scanner.ScanningState.Devices
 
 /**
  * A set of [UUID] to apply to a scan result
@@ -214,14 +213,14 @@ sealed interface ScanningState : KalugaState {
             /**
              * Transitions into a [Scanning] state where a [Device] is added or updated
              * @param identifier the [Identifier] of the [Device] discovered
-             * @param rssi the RSSI value of the [Device] discovered
+             * @param rssi the [RSSI] value of the [Device] discovered
              * @param advertisementData the [BaseAdvertisementData] of the [Device] discovered
              * @param deviceCreator Method for creating a [Device] if it had not been scanned previously.
              * @return method for transitioning into a [Scanning] state where the [Device] is discovered
              */
             suspend fun discoverDevice(
                 identifier: Identifier,
-                rssi: Int,
+                rssi: RSSI,
                 advertisementData: BaseAdvertisementData,
                 deviceCreator: () -> Device
             ): suspend () -> Scanning
@@ -556,7 +555,7 @@ sealed class ScanningStateImpl {
 
             override suspend fun discoverDevice(
                 identifier: Identifier,
-                rssi: Int,
+                rssi: RSSI,
                 advertisementData: BaseAdvertisementData,
                 deviceCreator: () -> Device
             ): suspend () -> ScanningState.Enabled.Scanning {
diff --git a/bluetooth/src/commonTest/kotlin/BluetoothFlowTest.kt b/bluetooth/src/commonTest/kotlin/BluetoothFlowTest.kt
index a229196a7..0ba2c9c64 100644
--- a/bluetooth/src/commonTest/kotlin/BluetoothFlowTest.kt
+++ b/bluetooth/src/commonTest/kotlin/BluetoothFlowTest.kt
@@ -85,7 +85,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
         sealed class Device : Configuration() {
             abstract val connectionSettings: ConnectionSettings
             abstract val willActionsSucceed: Boolean
-            abstract val rssi: Int
+            abstract val rssi: RSSI
             abstract val advertisementData: BaseAdvertisementData
         }
 
@@ -99,7 +99,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
             override val autoEnableBluetooth: Boolean = true,
             override val isEnabled: Boolean = true,
             override val initialPermissionState: MockPermissionState.ActiveState = MockPermissionState.ActiveState.ALLOWED,
-            override val rssi: Int = -100,
+            override val rssi: RSSI = -100,
             override val advertisementData: BaseAdvertisementData = MockAdvertisementData(name = "Name"),
             override val serviceWrapperBuilder: ServiceWrapperBuilder.() -> Unit = defaultService()
         ) : Device()
@@ -111,7 +111,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
             override val autoEnableBluetooth: Boolean = true,
             override val isEnabled: Boolean = true,
             override val initialPermissionState: MockPermissionState.ActiveState = MockPermissionState.ActiveState.ALLOWED,
-            override val rssi: Int = -100,
+            override val rssi: RSSI = -100,
             override val advertisementData: BaseAdvertisementData = MockAdvertisementData(name = "Name"),
             override val serviceWrapperBuilder: ServiceWrapperBuilder.() -> Unit = defaultService()
         ) : Device(), Service
@@ -123,7 +123,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
             override val autoEnableBluetooth: Boolean = true,
             override val isEnabled: Boolean = true,
             override val initialPermissionState: MockPermissionState.ActiveState = MockPermissionState.ActiveState.ALLOWED,
-            override val rssi: Int = -100,
+            override val rssi: RSSI = -100,
             override val advertisementData: BaseAdvertisementData = MockAdvertisementData(name = "Name"),
             override val serviceWrapperBuilder: ServiceWrapperBuilder.() -> Unit = defaultService()
         ) : Device(), Characteristic
@@ -135,7 +135,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
             override val autoEnableBluetooth: Boolean = true,
             override val isEnabled: Boolean = true,
             override val initialPermissionState: MockPermissionState.ActiveState = MockPermissionState.ActiveState.ALLOWED,
-            override val rssi: Int = -100,
+            override val rssi: RSSI = -100,
             override val advertisementData: BaseAdvertisementData = MockAdvertisementData(name = "Name"),
             override val serviceWrapperBuilder: ServiceWrapperBuilder.() -> Unit = defaultService()
         ) : Device(), Descriptor
@@ -183,7 +183,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
         fun createDevice(
             connectionSettings: ConnectionSettings,
             deviceWrapper: DeviceWrapper,
-            rssi: Int,
+            rssi: RSSI,
             advertisementData: BaseAdvertisementData,
             deviceConnectionManagerBuilder: (ConnectionSettings) -> BaseDeviceConnectionManager
         ): Device {
@@ -200,7 +200,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
         private suspend fun awaitScanDevice(
             device: Device,
             deviceWrapper: DeviceWrapper,
-            rssi: Int,
+            rssi: RSSI,
             advertisementData: BaseAdvertisementData
         ) {
             bluetooth.scanningStateRepo.firstInstance<ScanningState.Enabled.Scanning>()
@@ -228,7 +228,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
         fun scanDevice(
             device: Device,
             deviceWrapper: DeviceWrapper,
-            rssi: Int,
+            rssi: RSSI,
             advertisementData: BaseAdvertisementData
         ) {
             coroutineScope.launch {
@@ -282,7 +282,7 @@ abstract class BluetoothFlowTest<C : BluetoothFlowTest.Configuration, TC : Bluet
         ) = createDevice(configuration.connectionSettings, deviceWrapper, configuration.rssi, configuration.advertisementData) { deviceConnectionManagerBuilder.create(deviceWrapper, ConnectionSettings(), coroutineScope) }
 
         fun scanDevice(
-            rssi: Int = configuration.rssi,
+            rssi: RSSI = configuration.rssi,
             advertisementData: BaseAdvertisementData = configuration.advertisementData
         ) = super.scanDevice(device, deviceWrapper, rssi, advertisementData)
         suspend fun connectDevice() = connectDevice(device, connectionManager)
diff --git a/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
index 25997c4a9..79db524d8 100644
--- a/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.bluetooth.device
 import com.splendo.kaluga.base.utils.toByteArray
 import com.splendo.kaluga.base.utils.typedList
 import com.splendo.kaluga.base.utils.typedMap
+import com.splendo.kaluga.bluetooth.TxPower
 import com.splendo.kaluga.bluetooth.UUID
 import platform.CoreBluetooth.CBAdvertisementDataIsConnectable
 import platform.CoreBluetooth.CBAdvertisementDataLocalNameKey
@@ -51,7 +52,7 @@ actual class AdvertisementData(private val advertisementData: Map<String, Any>)
         ?.typedMap<CBUUID, NSData>()
         ?.mapNotNull { Pair(it.key, it.value.toByteArray()) }
         ?.toMap() ?: emptyMap()
-    override val txPowerLevel: Int get() = (advertisementData[CBAdvertisementDataTxPowerLevelKey] as? NSNumber)?.intValue ?: Int.MIN_VALUE
+    override val txPowerLevel: TxPower get() = (advertisementData[CBAdvertisementDataTxPowerLevelKey] as? NSNumber)?.intValue ?: Int.MIN_VALUE
 
     override val isConnectable: Boolean get() = ((advertisementData[CBAdvertisementDataIsConnectable] as? NSNumber)?.boolValue ?: false)
 }
diff --git a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 5db4c9e5c..0c60491a6 100644
--- a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -20,6 +20,7 @@ package com.splendo.kaluga.bluetooth.device
 import com.splendo.kaluga.base.utils.toNSData
 import com.splendo.kaluga.base.utils.typedList
 import com.splendo.kaluga.bluetooth.DefaultServiceWrapper
+import com.splendo.kaluga.bluetooth.MTU
 import com.splendo.kaluga.bluetooth.uuidString
 import com.splendo.kaluga.logging.debug
 import kotlinx.coroutines.CoroutineScope
@@ -153,7 +154,7 @@ internal actual class DefaultDeviceConnectionManager(
         peripheral.readRSSI()
     }
 
-    override suspend fun requestMtu(mtu: Int): Boolean {
+    override suspend fun requestMtu(mtu: MTU): Boolean {
         val max = peripheral.maximumWriteValueLengthForType(CBCharacteristicWriteWithResponse)
         debug(TAG) {
             "maximumWriteValueLengthForType(CBCharacteristicWriteWithResponse) = $max"
diff --git a/bluetooth/src/jsMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/jsMain/kotlin/device/AdvertisementData.kt
index 37863c9f1..67b007e56 100644
--- a/bluetooth/src/jsMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/jsMain/kotlin/device/AdvertisementData.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.device
 
+import com.splendo.kaluga.bluetooth.TxPower
 import com.splendo.kaluga.bluetooth.UUID
 
 /**
@@ -34,7 +35,7 @@ actual class AdvertisementData : BaseAdvertisementData {
         get() = emptyList()
     override val serviceData: Map<UUID, ByteArray?>
         get() = emptyMap()
-    override val txPowerLevel: Int
+    override val txPowerLevel: TxPower
         get() = Int.MIN_VALUE
     override val isConnectable: Boolean
         get() = false
diff --git a/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt
index ee2579b00..4cae44a0b 100644
--- a/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.device
 
+import com.splendo.kaluga.bluetooth.MTU
 import kotlinx.coroutines.CoroutineScope
 
 internal actual class DefaultDeviceConnectionManager(
@@ -46,7 +47,7 @@ internal actual class DefaultDeviceConnectionManager(
 
     override suspend fun readRssi() {}
 
-    override suspend fun requestMtu(mtu: Int) = false
+    override suspend fun requestMtu(mtu: MTU) = false
 
     override suspend fun didStartPerformingAction(action: DeviceAction) {}
 
diff --git a/bluetooth/src/jvmMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/jvmMain/kotlin/device/AdvertisementData.kt
index 65362de45..241abaf67 100644
--- a/bluetooth/src/jvmMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/jvmMain/kotlin/device/AdvertisementData.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.device
 
+import com.splendo.kaluga.bluetooth.TxPower
 import com.splendo.kaluga.bluetooth.UUID
 
 /**
@@ -34,7 +35,7 @@ actual class AdvertisementData : BaseAdvertisementData {
         get() = emptyList()
     override val serviceData: Map<UUID, ByteArray?>
         get() = emptyMap()
-    override val txPowerLevel: Int
+    override val txPowerLevel: TxPower
         get() = Int.MIN_VALUE
     override val isConnectable: Boolean
         get() = false
diff --git a/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt
index ee2579b00..4cae44a0b 100644
--- a/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.bluetooth.device
 
+import com.splendo.kaluga.bluetooth.MTU
 import kotlinx.coroutines.CoroutineScope
 
 internal actual class DefaultDeviceConnectionManager(
@@ -46,7 +47,7 @@ internal actual class DefaultDeviceConnectionManager(
 
     override suspend fun readRssi() {}
 
-    override suspend fun requestMtu(mtu: Int) = false
+    override suspend fun requestMtu(mtu: MTU) = false
 
     override suspend fun didStartPerformingAction(action: DeviceAction) {}
 
diff --git a/location/api/androidLib/location.api b/location/api/androidLib/location.api
index c1ee83e1b..f391d5cfd 100644
--- a/location/api/androidLib/location.api
+++ b/location/api/androidLib/location.api
@@ -108,8 +108,6 @@ public final class com/splendo/kaluga/location/DefaultLocationManager$Builder :
 public final class com/splendo/kaluga/location/DefaultLocationMonitor : com/splendo/kaluga/service/DefaultServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
 	public fun <init> (Landroid/content/Context;Landroid/location/LocationManager;)V
 	public fun isServiceEnabled ()Z
-	public fun monitoringDidStart ()V
-	public fun monitoringDidStop ()V
 }
 
 public final class com/splendo/kaluga/location/GoogleLocationProvider : com/splendo/kaluga/location/LocationProvider {
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index f98de0f7c..2c71b5190 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -109,8 +109,6 @@ public final class com/splendo/kaluga/location/DefaultLocationManager$Builder :
 public final class com/splendo/kaluga/location/DefaultLocationMonitor : com/splendo/kaluga/service/DefaultServiceMonitor, com/splendo/kaluga/location/LocationMonitor {
 	public fun <init> ()V
 	public fun isServiceEnabled ()Z
-	public fun monitoringDidStart ()V
-	public fun monitoringDidStop ()V
 }
 
 public abstract class com/splendo/kaluga/location/Location {
diff --git a/service/api/androidLib/service.api b/service/api/androidLib/service.api
index db7a0f0a6..307ff8973 100644
--- a/service/api/androidLib/service.api
+++ b/service/api/androidLib/service.api
@@ -5,8 +5,8 @@ public abstract class com/splendo/kaluga/service/DefaultServiceMonitor : com/spl
 	protected final fun getLogger ()Lcom/splendo/kaluga/logging/Logger;
 	protected fun getTAG ()Ljava/lang/String;
 	public fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
-	public abstract fun monitoringDidStart ()V
-	public abstract fun monitoringDidStop ()V
+	protected abstract fun monitoringDidStart ()V
+	protected abstract fun monitoringDidStop ()V
 	public final fun startMonitoring ()V
 	public final fun stopMonitoring ()V
 	protected final fun updateState ()V
diff --git a/service/api/jvm/service.api b/service/api/jvm/service.api
index 16dc51160..0b2a24eb5 100644
--- a/service/api/jvm/service.api
+++ b/service/api/jvm/service.api
@@ -5,8 +5,8 @@ public abstract class com/splendo/kaluga/service/DefaultServiceMonitor : com/spl
 	protected final fun getLogger ()Lcom/splendo/kaluga/logging/Logger;
 	protected fun getTAG ()Ljava/lang/String;
 	public fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
-	public abstract fun monitoringDidStart ()V
-	public abstract fun monitoringDidStop ()V
+	protected abstract fun monitoringDidStart ()V
+	protected abstract fun monitoringDidStop ()V
 	public final fun startMonitoring ()V
 	public final fun stopMonitoring ()V
 	protected final fun updateState ()V
diff --git a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
index 4ece99794..32bef7c51 100644
--- a/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/androidLib/test-utils-bluetooth.api
@@ -8,9 +8,9 @@ public final class com/splendo/kaluga/test/bluetooth/AndroidMockCharacteristicWr
 	public fun getService ()Lcom/splendo/kaluga/bluetooth/ServiceWrapper;
 	public fun getUuid ()Ljava/util/UUID;
 	public fun getValue ()[B
-	public fun getWriteType ()I
+	public fun getWriteType ()Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;
 	public fun setValue ([B)V
-	public fun setWriteType (I)V
+	public fun setWriteType (Lcom/splendo/kaluga/bluetooth/CharacteristicWrapper$WriteType;)V
 	public fun updateMockValue ([B)V
 	public fun updateValue ([B)V
 }
@@ -28,7 +28,6 @@ public final class com/splendo/kaluga/test/bluetooth/AndroidMockDescriptorWrappe
 }
 
 public final class com/splendo/kaluga/test/bluetooth/Android_mocksKt {
-	public static final field bondState I
 	public static final fun build (Lcom/splendo/kaluga/test/bluetooth/ServiceWrapperBuilder;)Lcom/splendo/kaluga/bluetooth/ServiceWrapper;
 	public static final fun createDeviceWrapper (Ljava/lang/String;Ljava/lang/String;)Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
 	public static synthetic fun createDeviceWrapper$default (Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
@@ -80,6 +79,26 @@ public final class com/splendo/kaluga/test/bluetooth/MockBluetoothMonitor : com/
 	public fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
 }
 
+public final class com/splendo/kaluga/test/bluetooth/MockBluetoothService : com/splendo/kaluga/bluetooth/BluetoothService {
+	public fun <init> ()V
+	public fun <init> (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/flow/MutableStateFlow;Z)V
+	public synthetic fun <init> (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/flow/MutableStateFlow;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun devices ()Lkotlinx/coroutines/flow/Flow;
+	public final fun getDevicesMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getDiscoveredDevicesFlow ()Lkotlinx/coroutines/flow/MutableStateFlow;
+	public final fun getPairedDevicesFlow ()Lkotlinx/coroutines/flow/MutableStateFlow;
+	public final fun getPairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStartScanningMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStopScanningMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public synthetic fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
+	public fun isEnabled ()Lkotlinx/coroutines/flow/MutableStateFlow;
+	public fun isScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun isScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public fun pairedDevices (Ljava/util/Set;)Lkotlinx/coroutines/flow/Flow;
+	public fun startScanning (Ljava/util/Set;)V
+	public fun stopScanning ()V
+}
+
 public abstract interface annotation class com/splendo/kaluga/test/bluetooth/MockBuilderDsl : java/lang/annotation/Annotation {
 }
 
@@ -130,11 +149,11 @@ public final class com/splendo/kaluga/test/bluetooth/MockDeviceInfoBuilderKt {
 }
 
 public final class com/splendo/kaluga/test/bluetooth/MockDeviceWrapper : com/splendo/kaluga/bluetooth/device/DeviceWrapper {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;IZ)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState;Z)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun connectGatt (Landroid/content/Context;ZLandroid/bluetooth/BluetoothGattCallback;)Lcom/splendo/kaluga/bluetooth/device/BluetoothGattWrapper;
 	public fun createBond ()V
-	public fun getBondState ()I
+	public fun getBondState ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper$BondState;
 	public final fun getConnectGattMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getCreateBondMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public fun getDevice ()Landroid/bluetooth/BluetoothDevice;
@@ -156,7 +175,7 @@ public final class com/splendo/kaluga/test/bluetooth/MockServiceWrapper : com/sp
 	public fun getCharacteristics ()Ljava/util/List;
 	public fun getIncludedServices ()Ljava/util/List;
 	public fun getInstanceId ()I
-	public fun getType ()I
+	public fun getType ()Lcom/splendo/kaluga/bluetooth/ServiceWrapper$Type;
 	public fun getUuid ()Ljava/util/UUID;
 }
 
@@ -248,6 +267,7 @@ public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnection
 	public fun <init> (ZLcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;Z)V
 	public synthetic fun <init> (ZLcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun connect (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun createService (Lcom/splendo/kaluga/bluetooth/ServiceWrapper;)Lcom/splendo/kaluga/bluetooth/Service;
 	public fun disconnect (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun discoverServices (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getConnectMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
@@ -263,13 +283,13 @@ public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnection
 	public final fun getUnpairMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getWillActionSucceed ()Z
 	public final fun handleCurrentAction (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun handleCurrentActionCompleted (Z)V
-	public fun pair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun performAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun handleDiscoverCompleted (Ljava/util/List;)V
+	public fun handleNewRssi (I)V
+	public fun handleUpdatedCharacteristic (Ljava/util/UUID;ZLkotlin/jvm/functions/Function1;)V
+	public fun handleUpdatedDescriptor (Ljava/util/UUID;ZLkotlin/jvm/functions/Function1;)V
 	public fun readRssi (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun requestMtu (ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun setWillActionSucceed (Z)V
-	public fun unpair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnectionManager$Builder : com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager$Builder {
@@ -284,7 +304,6 @@ public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnection
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner : com/splendo/kaluga/bluetooth/scanner/BaseScanner {
 	public fun <init> (ZLcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;Z)V
 	public synthetic fun <init> (ZLcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun generateEnableSensorsActions ()Ljava/util/List;
 	public synthetic fun getBluetoothEnabledMonitor ()Lcom/splendo/kaluga/bluetooth/BluetoothMonitor;
 	public fun getBluetoothEnabledMonitor ()Lcom/splendo/kaluga/test/bluetooth/MockBluetoothMonitor;
 	public final fun getDidStartScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
@@ -314,10 +333,8 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner$Bui
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanner : com/splendo/kaluga/bluetooth/scanner/Scanner {
 	public fun <init> (ZLkotlinx/coroutines/flow/MutableSharedFlow;)V
-	public fun generateEnableSensorsActions ()Ljava/util/List;
 	public synthetic fun getEvents ()Lkotlinx/coroutines/flow/Flow;
 	public fun getEvents ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-	public final fun getGenerateEnableSensorsActionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getRequestEnableHardwareMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getRetrievePairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getScanForDevicesMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
diff --git a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
index 8ebc95f05..30c87db7b 100644
--- a/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
+++ b/test-utils-bluetooth/api/jvm/test-utils-bluetooth.api
@@ -15,6 +15,26 @@ public final class com/splendo/kaluga/test/bluetooth/MockBluetoothMonitor : com/
 	public fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
 }
 
+public final class com/splendo/kaluga/test/bluetooth/MockBluetoothService : com/splendo/kaluga/bluetooth/BluetoothService {
+	public fun <init> ()V
+	public fun <init> (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/flow/MutableStateFlow;Z)V
+	public synthetic fun <init> (Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/flow/MutableStateFlow;Lkotlinx/coroutines/flow/MutableStateFlow;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun devices ()Lkotlinx/coroutines/flow/Flow;
+	public final fun getDevicesMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getDiscoveredDevicesFlow ()Lkotlinx/coroutines/flow/MutableStateFlow;
+	public final fun getPairedDevicesFlow ()Lkotlinx/coroutines/flow/MutableStateFlow;
+	public final fun getPairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStartScanningMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public final fun getStopScanningMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
+	public synthetic fun isEnabled ()Lkotlinx/coroutines/flow/Flow;
+	public fun isEnabled ()Lkotlinx/coroutines/flow/MutableStateFlow;
+	public fun isScanning (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun isScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public fun pairedDevices (Ljava/util/Set;)Lkotlinx/coroutines/flow/Flow;
+	public fun startScanning (Ljava/util/Set;)V
+	public fun stopScanning ()V
+}
+
 public abstract interface annotation class com/splendo/kaluga/test/bluetooth/MockBuilderDsl : java/lang/annotation/Annotation {
 }
 
@@ -158,6 +178,7 @@ public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnection
 	public fun <init> (ZLcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;Z)V
 	public synthetic fun <init> (ZLcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun connect (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun createService (Lcom/splendo/kaluga/bluetooth/ServiceWrapper;)Lcom/splendo/kaluga/bluetooth/Service;
 	public fun disconnect (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun discoverServices (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getConnectMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
@@ -173,13 +194,13 @@ public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnection
 	public final fun getUnpairMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getWillActionSucceed ()Z
 	public final fun handleCurrentAction (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun handleCurrentActionCompleted (Z)V
-	public fun pair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun performAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun handleDiscoverCompleted (Ljava/util/List;)V
+	public fun handleNewRssi (I)V
+	public fun handleUpdatedCharacteristic (Lcom/splendo/kaluga/bluetooth/UUID;ZLkotlin/jvm/functions/Function1;)V
+	public fun handleUpdatedDescriptor (Lcom/splendo/kaluga/bluetooth/UUID;ZLkotlin/jvm/functions/Function1;)V
 	public fun readRssi (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun requestMtu (ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun setWillActionSucceed (Z)V
-	public fun unpair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnectionManager$Builder : com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionManager$Builder {
@@ -194,7 +215,6 @@ public final class com/splendo/kaluga/test/bluetooth/device/MockDeviceConnection
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner : com/splendo/kaluga/bluetooth/scanner/BaseScanner {
 	public fun <init> (ZLcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;Z)V
 	public synthetic fun <init> (ZLcom/splendo/kaluga/bluetooth/scanner/BaseScanner$Settings;Lkotlinx/coroutines/CoroutineScope;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun generateEnableSensorsActions ()Ljava/util/List;
 	public synthetic fun getBluetoothEnabledMonitor ()Lcom/splendo/kaluga/bluetooth/BluetoothMonitor;
 	public fun getBluetoothEnabledMonitor ()Lcom/splendo/kaluga/test/bluetooth/MockBluetoothMonitor;
 	public final fun getDidStartScanningMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
@@ -224,10 +244,8 @@ public final class com/splendo/kaluga/test/bluetooth/scanner/MockBaseScanner$Bui
 
 public final class com/splendo/kaluga/test/bluetooth/scanner/MockScanner : com/splendo/kaluga/bluetooth/scanner/Scanner {
 	public fun <init> (ZLkotlinx/coroutines/flow/MutableSharedFlow;)V
-	public fun generateEnableSensorsActions ()Ljava/util/List;
 	public synthetic fun getEvents ()Lkotlinx/coroutines/flow/Flow;
 	public fun getEvents ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-	public final fun getGenerateEnableSensorsActionsMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getRequestEnableHardwareMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getRetrievePairedDevicesMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getScanForDevicesMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
diff --git a/test-utils-bluetooth/src/androidLibMain/kotlin/MockCharacteristic.kt b/test-utils-bluetooth/src/androidLibMain/kotlin/MockCharacteristic.kt
index f263e23ae..75c40bf8d 100644
--- a/test-utils-bluetooth/src/androidLibMain/kotlin/MockCharacteristic.kt
+++ b/test-utils-bluetooth/src/androidLibMain/kotlin/MockCharacteristic.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.bluetooth
 
+import com.splendo.kaluga.bluetooth.CharacteristicWrapper
 import com.splendo.kaluga.bluetooth.DescriptorWrapper
 import com.splendo.kaluga.bluetooth.ServiceWrapper
 import java.util.UUID
@@ -41,7 +42,7 @@ class AndroidMockCharacteristicWrapper(
     }
     override val permissions: Int
         get() = 0
-    override var writeType = 0
+    override var writeType = CharacteristicWrapper.WriteType.DEFAULT
 
     override fun getDescriptor(uuid: UUID): DescriptorWrapper? {
         return descriptors.firstOrNull { it.uuid == uuid }
diff --git a/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt b/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt
index 107372887..1c3383737 100644
--- a/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt
+++ b/test-utils-bluetooth/src/androidLibMain/kotlin/MockDeviceWrapper.kt
@@ -31,7 +31,7 @@ import com.splendo.kaluga.test.base.mock.parameters.mock
 class MockDeviceWrapper(
     override val name: String?,
     override val identifier: Identifier,
-    override val bondState: Int,
+    override val bondState: DeviceWrapper.BondState,
     setupMocks: Boolean = true
 ) : DeviceWrapper {
 
diff --git a/test-utils-bluetooth/src/androidLibMain/kotlin/MockServiceWrapper.kt b/test-utils-bluetooth/src/androidLibMain/kotlin/MockServiceWrapper.kt
index 53c2058c0..f72a5a5a8 100644
--- a/test-utils-bluetooth/src/androidLibMain/kotlin/MockServiceWrapper.kt
+++ b/test-utils-bluetooth/src/androidLibMain/kotlin/MockServiceWrapper.kt
@@ -36,7 +36,7 @@ class MockServiceWrapper(
         builder.characteristics
     )
 
-    override val type: Int = 0
+    override val type: ServiceWrapper.Type = ServiceWrapper.Type.PRIMARY
     override val instanceId: Int = 0
     private val mutableCharacteristics = concurrentMutableListOf<CharacteristicWrapper>(
         *initialCharacteristics.map {
diff --git a/test-utils-bluetooth/src/androidLibMain/kotlin/android_mocks.kt b/test-utils-bluetooth/src/androidLibMain/kotlin/android_mocks.kt
index 205a90628..e3db5b0a1 100644
--- a/test-utils-bluetooth/src/androidLibMain/kotlin/android_mocks.kt
+++ b/test-utils-bluetooth/src/androidLibMain/kotlin/android_mocks.kt
@@ -17,14 +17,13 @@
 
 package com.splendo.kaluga.test.bluetooth
 
-import android.bluetooth.BluetoothDevice
 import com.splendo.kaluga.bluetooth.ServiceWrapper
 import com.splendo.kaluga.bluetooth.device.DeviceWrapper
 import com.splendo.kaluga.bluetooth.device.Identifier
 import com.splendo.kaluga.bluetooth.randomUUID
 import com.splendo.kaluga.bluetooth.uuidString
 
-const val bondState = BluetoothDevice.BOND_NONE
+private val bondState = DeviceWrapper.BondState.NONE
 
 actual fun randomIdentifier(): Identifier = randomUUID().uuidString
 
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/MockBluetoothService.kt b/test-utils-bluetooth/src/commonMain/kotlin/MockBluetoothService.kt
new file mode 100644
index 000000000..7eff5f875
--- /dev/null
+++ b/test-utils-bluetooth/src/commonMain/kotlin/MockBluetoothService.kt
@@ -0,0 +1,67 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.test.bluetooth
+
+import com.splendo.kaluga.bluetooth.BluetoothService
+import com.splendo.kaluga.bluetooth.UUID
+import com.splendo.kaluga.bluetooth.device.Device
+import com.splendo.kaluga.test.base.mock.call
+import com.splendo.kaluga.test.base.mock.on
+import com.splendo.kaluga.test.base.mock.parameters.mock
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
+
+class MockBluetoothService(
+    val discoveredDevicesFlow: MutableStateFlow<List<Device>> = MutableStateFlow(emptyList()),
+    val pairedDevicesFlow: MutableStateFlow<Map<Set<UUID>, List<Device>>> = MutableStateFlow(emptyMap()),
+    override val isEnabled: MutableStateFlow<Boolean> = MutableStateFlow(true),
+    setupMocks: Boolean = true
+) : BluetoothService {
+
+    private val isScanningState = MutableStateFlow(false)
+
+    val startScanningMock = this::startScanning.mock()
+    val stopScanningMock = this::stopScanning.mock()
+    val isScanningMock = this::isScanning.mock()
+
+    val devicesMock = this::devices.mock()
+    val pairedDevicesMock = this::pairedDevices.mock()
+
+    init {
+        if (setupMocks) {
+            startScanningMock.on().doExecute {
+                isScanningState.value = true
+            }
+            stopScanningMock.on().doExecute {
+                isScanningState.value = false
+            }
+            pairedDevicesMock.on().doExecute { (uuids) ->
+                pairedDevicesFlow.map { it[uuids] ?: emptyList() }
+            }
+            devicesMock.on().doReturn(discoveredDevicesFlow)
+            isScanningMock.on().doReturn(isScanningState)
+        }
+    }
+
+    override fun startScanning(filter: Set<UUID>): Unit = startScanningMock.call(filter)
+    override fun stopScanning(): Unit = stopScanningMock.call()
+    override fun pairedDevices(filter: Set<UUID>): Flow<List<Device>> = pairedDevicesMock.call(filter)
+    override fun devices(): Flow<List<Device>> = devicesMock.call()
+    override suspend fun isScanning(): Flow<Boolean> = isScanningMock.call()
+}
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/MockDeviceInfoBuilder.kt b/test-utils-bluetooth/src/commonMain/kotlin/MockDeviceInfoBuilder.kt
index d26b0517d..bdfc540c3 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/MockDeviceInfoBuilder.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/MockDeviceInfoBuilder.kt
@@ -17,6 +17,8 @@
 
 package com.splendo.kaluga.test.bluetooth
 
+import com.splendo.kaluga.bluetooth.RSSI
+import com.splendo.kaluga.bluetooth.TxPower
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.device.ConnectableDeviceStateFlowRepo
 import com.splendo.kaluga.bluetooth.device.ConnectableDeviceStateImplRepo
@@ -42,13 +44,13 @@ class MockDeviceInfoBuilder {
 
     var deviceName: String? = null
     var identifier: Identifier = randomIdentifier()
-    var rssi: Int = 0
+    var rssi: RSSI = 0
     var manufacturerId: Int? = null
     var manufacturerData: ByteArray? = null
     private val _serviceUUIDs = ArrayList<UUID>()
     private val serviceUUIDs get() = _serviceUUIDs.toList()
     var serviceData: Map<UUID, ByteArray?> = emptyMap()
-    var txPowerLevel: Int = Int.MIN_VALUE
+    var txPowerLevel: TxPower = Int.MIN_VALUE
 
     fun services(builder: ServiceUUIDsList.() -> Unit) = builder(_serviceUUIDs)
 
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/device/MockAdvertisementData.kt b/test-utils-bluetooth/src/commonMain/kotlin/device/MockAdvertisementData.kt
index 767fec6d8..5a16183d7 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/device/MockAdvertisementData.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/device/MockAdvertisementData.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.test.bluetooth.device
 
+import com.splendo.kaluga.bluetooth.TxPower
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.device.BaseAdvertisementData
 
@@ -29,6 +30,6 @@ data class MockAdvertisementData(
     override val manufacturerData: ByteArray? = null,
     override val serviceUUIDs: List<UUID> = emptyList(),
     override val serviceData: Map<UUID, ByteArray?> = emptyMap(),
-    override val txPowerLevel: Int = Int.MIN_VALUE,
+    override val txPowerLevel: TxPower = Int.MIN_VALUE,
     override val isConnectable: Boolean = true
 ) : BaseAdvertisementData
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
index 8e33c84df..be733ef94 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
@@ -21,6 +21,8 @@ import com.splendo.kaluga.base.collections.concurrentMutableListOf
 import com.splendo.kaluga.base.utils.toHexString
 import com.splendo.kaluga.bluetooth.Characteristic
 import com.splendo.kaluga.bluetooth.Descriptor
+import com.splendo.kaluga.bluetooth.MTU
+import com.splendo.kaluga.bluetooth.RSSI
 import com.splendo.kaluga.bluetooth.Service
 import com.splendo.kaluga.bluetooth.ServiceWrapper
 import com.splendo.kaluga.bluetooth.UUID
@@ -42,7 +44,7 @@ import kotlinx.coroutines.CoroutineScope
  * Mock implementation of [BaseDeviceConnectionManager]
  * @param initialWillActionSucceed Sets the initial status of whether actions will succeed
  * @param deviceWrapper The [DeviceWrapper] to connect to
- * @param bufferCapacity The capacity of the buffer for state transitions
+ * @param connectionSettings The [ConnectionSettings] to apply for connecting
  * @param coroutineScope The [CoroutineScope] of the [BaseDeviceConnectionManager]
  * @param setupMocks If `true` this will automatically configure the mocks to handle connecting
  */
@@ -161,7 +163,7 @@ class MockDeviceConnectionManager(
 
     override fun getCurrentState(): DeviceConnectionManager.State = getCurrentStateMock.call()
 
-    public override fun handleNewRssi(rssi: Int) {
+    public override fun handleNewRssi(rssi: RSSI) {
         super.handleNewRssi(rssi)
     }
 
@@ -173,7 +175,7 @@ class MockDeviceConnectionManager(
 
     override suspend fun readRssi(): Unit = readRssiMock.call()
 
-    override suspend fun requestMtu(mtu: Int): Boolean = requestMtuMock.call(mtu)
+    override suspend fun requestMtu(mtu: MTU): Boolean = requestMtuMock.call(mtu)
 
     override suspend fun didStartPairing(): Unit = pairMock.call()
 
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt
index 252af528c..0acaf52f5 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt
@@ -16,6 +16,7 @@
 
 package com.splendo.kaluga.test.bluetooth.scanner
 
+import com.splendo.kaluga.bluetooth.RSSI
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.device.BaseAdvertisementData
 import com.splendo.kaluga.bluetooth.device.Device
@@ -166,7 +167,7 @@ sealed class MockScanningState {
 
             override suspend fun discoverDevice(
                 identifier: Identifier,
-                rssi: Int,
+                rssi: RSSI,
                 advertisementData: BaseAdvertisementData,
                 deviceCreator: () -> Device
             ): suspend () -> ScanningState.Enabled.Scanning {

From 12719769efa903d3f7e02e7d73c935d8e83d629d Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 14 Feb 2023 14:28:19 +0100
Subject: [PATCH 171/227] Small API correction

---
 beacons/api/androidLib/beacons.api          | 4 ++--
 beacons/api/jvm/beacons.api                 | 4 ++--
 beacons/src/commonMain/kotlin/BeaconInfo.kt | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/beacons/api/androidLib/beacons.api b/beacons/api/androidLib/beacons.api
index 90547ef24..392a4a2f6 100644
--- a/beacons/api/androidLib/beacons.api
+++ b/beacons/api/androidLib/beacons.api
@@ -19,8 +19,8 @@ public final class com/splendo/kaluga/bluetooth/beacons/BeaconInfo {
 
 public final class com/splendo/kaluga/bluetooth/beacons/BeaconInfoKt {
 	public static final fun fullID (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)Ljava/lang/String;
-	public static final fun seenMS (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
-	public static final fun timeSinceLastSeen (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
+	public static final fun getTimeSinceLastSeen (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
+	public static final fun seenMs (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/beacons/Beacons {
diff --git a/beacons/api/jvm/beacons.api b/beacons/api/jvm/beacons.api
index 1bd1fbd06..3c6a7b13e 100644
--- a/beacons/api/jvm/beacons.api
+++ b/beacons/api/jvm/beacons.api
@@ -19,8 +19,8 @@ public final class com/splendo/kaluga/bluetooth/beacons/BeaconInfo {
 
 public final class com/splendo/kaluga/bluetooth/beacons/BeaconInfoKt {
 	public static final fun fullID (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)Ljava/lang/String;
-	public static final fun seenMS (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
-	public static final fun timeSinceLastSeen (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
+	public static final fun getTimeSinceLastSeen (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
+	public static final fun seenMs (Lcom/splendo/kaluga/bluetooth/beacons/BeaconInfo;)J
 }
 
 public abstract interface class com/splendo/kaluga/bluetooth/beacons/Beacons {
diff --git a/beacons/src/commonMain/kotlin/BeaconInfo.kt b/beacons/src/commonMain/kotlin/BeaconInfo.kt
index 2fbc29c8f..22c879b89 100644
--- a/beacons/src/commonMain/kotlin/BeaconInfo.kt
+++ b/beacons/src/commonMain/kotlin/BeaconInfo.kt
@@ -54,9 +54,10 @@ fun BeaconInfo.fullID() = this.beaconID.asString()
 /**
  * Returns the [kotlin.time.Duration] since the beacon was last seen
  */
-fun BeaconInfo.timeSinceLastSeen() = DefaultKalugaDate.now() - lastSeen
+val BeaconInfo.timeSinceLastSeen get() = DefaultKalugaDate.now() - lastSeen
 
 /**
  * Returns the time in milliseconds since the beacon was last seen
  */
-fun BeaconInfo.seenMS() = timeSinceLastSeen().inWholeMilliseconds
+@Deprecated("Use timeSinceLastSeen", ReplaceWith("BeaconInfo.timeSinceLastSeen"))
+fun BeaconInfo.seenMs() = timeSinceLastSeen.inWholeMilliseconds

From 93824e93e8daa3be5766c0a65c89c719103e786e Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 14 Feb 2023 22:30:18 +0100
Subject: [PATCH 172/227] Location documentation

---
 .../androidLibMain/kotlin/AlertPresenter.kt   |   8 +
 alerts/src/iosMain/kotlin/AlertPresenter.kt   |   8 +
 alerts/src/jsMain/kotlin/AlertPresenter.kt    |   7 +
 alerts/src/jvmMain/kotlin/AlertPresenter.kt   |   7 +
 .../api/architecture-compose.api              |   2 +
 .../navigation/result/NavHostResultHandler.kt | 153 ++++++++--------
 .../kotlin/navigation/NavigationBundleTest.kt |   7 +-
 .../src/commonMain/kotlin/Permission.kt       |   1 +
 .../kotlin/text/DateFormatterTest.kt          |   5 +-
 base/src/commonTest/kotlin/utils/DateTest.kt  |   3 +-
 .../kotlin/PairingUtilsTests.kt               |   2 +-
 bluetooth/src/commonMain/kotlin/Bluetooth.kt  |   1 +
 .../src/commonMain/kotlin/scanner/Scanner.kt  |   3 +-
 .../kotlin/scanner/ScanningState.kt           |   1 +
 .../api/androidLib/date-time-picker.api       |   2 +-
 date-time-picker/api/jvm/date-time-picker.api |   2 +-
 .../src/commonMain/kotlin/DateTimePicker.kt   |   2 +-
 .../example/shared/di/DependencyInjection.kt  |  11 +-
 .../example/shared/di/DependencyInjection.kt  |   4 +-
 .../viewmodel/beacons/BeaconsListViewModel.kt |   2 +-
 .../commonMain/kotlin/BaseKeyboardManager.kt  |   2 +-
 location/api/androidLib/location.api          |  26 ++-
 location/api/jvm/location.api                 |  14 +-
 .../kotlin/location/GoogleLocationProvider.kt |  13 +-
 .../kotlin/location/LocationExtensions.kt     |   9 +
 .../kotlin/location/LocationManager.kt        | 103 +++++++++--
 .../kotlin/location/LocationMonitor.kt        |  18 ++
 .../kotlin/location/LocationProvider.kt       |  21 ++-
 .../commonMain/kotlin/location/Location.kt    |  58 +++++--
 .../kotlin/location/LocationManager.kt        | 103 +++++++++--
 .../kotlin/location/LocationMonitor.kt        |  12 ++
 .../kotlin/location/LocationState.kt          | 163 +++++++++++++++---
 .../kotlin/location/LocationStateRepo.kt      |  55 ++++--
 .../kotlin/location/CLLocationExtensions.kt   |   3 +
 .../kotlin/location/LocationManager.kt        |  41 ++++-
 .../kotlin/location/LocationMonitor.kt        |  16 ++
 location/src/jsMain/kotlin/LocationManager.kt |  14 ++
 location/src/jsMain/kotlin/LocationMonitor.kt |  14 ++
 .../src/jvmMain/kotlin/LocationManager.kt     |  14 ++
 .../src/jvmMain/kotlin/LocationMonitor.kt     |  14 ++
 .../androidLibMain/kotlin/ReviewManager.kt    |   1 +
 review/src/commonMain/kotlin/ReviewManager.kt |   1 +
 review/src/iosMain/kotlin/ReviewManager.kt    |   1 +
 review/src/jsMain/kotlin/ReviewManager.kt     |   1 +
 review/src/jvmMain/kotlin/ReviewManager.kt    |   1 +
 .../test-utils-date-time-picker.api           |   1 +
 .../api/jvm/test-utils-date-time-picker.api   |   1 +
 .../kotlin/MockDateTimePickerPresenter.kt     |   2 +-
 .../kotlin/MockDateTimePickerPresenterTest.kt |   3 +-
 .../api/androidLib/test-utils-location.api    |   3 +-
 .../api/jvm/test-utils-location.api           |   3 +-
 .../commonMain/kotlin/MockLocationManager.kt  |   8 +
 52 files changed, 757 insertions(+), 213 deletions(-)

diff --git a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
index 1a6871aeb..972634225 100644
--- a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
@@ -53,6 +53,14 @@ actual class AlertPresenter(
     actual class Builder(
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
     ) : BaseAlertPresenter.Builder(), ActivityLifecycleSubscribable by lifecycleManagerObserver {
+
+        /**
+         * Creates an [AlertPresenter]
+         *
+         * @param alert The [Alert] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [AlertPresenter]
+         */
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope) =
             AlertPresenter(alert, lifecycleManagerObserver, coroutineScope)
     }
diff --git a/alerts/src/iosMain/kotlin/AlertPresenter.kt b/alerts/src/iosMain/kotlin/AlertPresenter.kt
index 9d4d104eb..a0768420e 100644
--- a/alerts/src/iosMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/iosMain/kotlin/AlertPresenter.kt
@@ -84,6 +84,14 @@ actual class AlertPresenter(
      * @param viewController The [UIViewController] to present any [AlertPresenter] built using this builder.
      */
     actual class Builder(private val viewController: UIViewController) : BaseAlertPresenter.Builder() {
+
+        /**
+         * Creates an [AlertPresenter]
+         *
+         * @param alert The [Alert] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [AlertPresenter]
+         */
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope) = AlertPresenter(alert, viewController)
     }
 
diff --git a/alerts/src/jsMain/kotlin/AlertPresenter.kt b/alerts/src/jsMain/kotlin/AlertPresenter.kt
index 6135478f4..804313751 100644
--- a/alerts/src/jsMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/jsMain/kotlin/AlertPresenter.kt
@@ -36,6 +36,13 @@ actual class AlertPresenter(
      */
     actual class Builder : BaseAlertPresenter.Builder() {
 
+        /**
+         * Creates an [AlertPresenter]
+         *
+         * @param alert The [Alert] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [AlertPresenter]
+         */
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope): AlertPresenter {
             return AlertPresenter(alert)
         }
diff --git a/alerts/src/jvmMain/kotlin/AlertPresenter.kt b/alerts/src/jvmMain/kotlin/AlertPresenter.kt
index f769908aa..d284b8cbd 100644
--- a/alerts/src/jvmMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/jvmMain/kotlin/AlertPresenter.kt
@@ -36,6 +36,13 @@ actual class AlertPresenter(
      */
     actual class Builder : BaseAlertPresenter.Builder() {
 
+        /**
+         * Creates an [AlertPresenter]
+         *
+         * @param alert The [Alert] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [AlertPresenter]
+         */
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope): AlertPresenter {
             return AlertPresenter(alert)
         }
diff --git a/architecture-compose/api/architecture-compose.api b/architecture-compose/api/architecture-compose.api
index be19b3b08..adb6d532f 100644
--- a/architecture-compose/api/architecture-compose.api
+++ b/architecture-compose/api/architecture-compose.api
@@ -46,6 +46,7 @@ public abstract class com/splendo/kaluga/architecture/compose/navigation/BottomS
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	protected final fun SetupNavigationAction (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/compose/runtime/Composer;I)V
 	protected abstract fun getContentModifier ()Lkotlin/jvm/functions/Function4;
+	public synthetic fun getModifier ()Lkotlin/jvm/functions/Function2;
 	public final fun getModifier ()Lkotlin/jvm/functions/Function4;
 	protected abstract fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;
 	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
@@ -217,6 +218,7 @@ public abstract class com/splendo/kaluga/architecture/compose/navigation/Composa
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	protected final fun SetupNavigationAction (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/compose/runtime/Composer;I)V
 	protected abstract fun getContentModifier ()Lkotlin/jvm/functions/Function4;
+	public synthetic fun getModifier ()Lkotlin/jvm/functions/Function2;
 	public final fun getModifier ()Lkotlin/jvm/functions/Function4;
 	protected abstract fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
 	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
index bbafc22c1..105187b0e 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
@@ -60,13 +60,14 @@ class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, Result>(
  * @param Row the type of [NavigationBundleSpecRow] associated with this [NavigationBundleSpec]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel, Row : NavigationBundleSpecRow<*>> NavigationBundleSpec<Row>.NavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(NavigationBundle<Row>) -> Unit
-) {
+): NavHostResultHandler<ViewModel, NavigationBundle<Row>> {
     val spec = this
-    NavHostResultHandler(ViewModel::class, { HandleResult(spec, retain, it) },  onResult)
+    return NavHostResultHandler(ViewModel::class, { HandleResult(spec, retain, it) },  onResult)
 }
 
 /**
@@ -76,13 +77,14 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, Row : NavigationBundleSp
  * @param T the type of result to expect
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel, T> NavigationBundleSpecType<T>.NavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(T) -> Unit
-) {
+): NavHostResultHandler<ViewModel, T> {
     val spec = this
-    NavHostResultHandler(ViewModel::class, { HandleResult(spec, retain, it) }, onResult)
+    return NavHostResultHandler(ViewModel::class, { HandleResult(spec, retain, it) }, onResult)
 }
 
 /**
@@ -92,6 +94,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, T> NavigationBundleSpecT
  * @param T the type of result to expect
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel, T : Any> NavigationBundleSpecType<T>.NavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -105,6 +108,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, T : Any> NavigationBundl
  * @param T the type of result to expect
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result
+ * @return the [NavHostResultHandler]
  */
 @JvmName("NavHostNullableResultOrNullHandler")
 inline fun <reified ViewModel : BaseLifecycleViewModel, T> NavigationBundleSpecType<T>.NavHostResultOrNullHandler(
@@ -118,13 +122,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, T> NavigationBundleSpecT
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received Boolean
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Boolean) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleBooleanResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleBooleanResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of Boolean or `null`
@@ -132,6 +135,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanNavHostResultHand
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received Boolean or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -144,13 +148,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanNavHostResultOrNu
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [BooleanArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(BooleanArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleBooleanArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleBooleanArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [BooleanArray] or `null`
@@ -158,6 +161,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanArrayNavHostResul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [BooleanArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -170,13 +174,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanArrayNavHostResul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Byte]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ByteNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Byte) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleByteResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleByteResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Byte] or `null`
@@ -184,6 +187,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ByteNavHostResultHandler
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Byte] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ByteNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -196,13 +200,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ByteNavHostResultOrNullH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [ByteArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ByteArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(ByteArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleByteArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleByteArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [ByteArray] or `null`
@@ -210,6 +213,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ByteArrayNavHostResultHa
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [ByteArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ByteArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -222,13 +226,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ByteArrayNavHostResultOr
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Char]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Char) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleCharResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleCharResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Char] or `null`
@@ -236,6 +239,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharNavHostResultHandler
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Char] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -248,13 +252,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharNavHostResultOrNullH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [CharArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(CharArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleCharArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleCharArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [CharArray] or `null`
@@ -262,6 +265,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharArrayNavHostResultHa
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [CharArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -275,13 +279,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharArrayNavHostResultOr
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [CharSequence]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharSequenceNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(CharSequence) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleCharSequenceResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleCharSequenceResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [CharSequence] or `null`
@@ -289,6 +292,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharSequenceNavHostResul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [CharSequence] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharSequenceNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -301,13 +305,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharSequenceNavHostResul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [KalugaDate]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DateNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(KalugaDate) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleDateResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleDateResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [KalugaDate] or `null`
@@ -315,6 +318,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DateNavHostResultHandler
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [KalugaDate] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DateNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -327,13 +331,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DateNavHostResultOrNullH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received list of [KalugaDate]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DateArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(List<KalugaDate>) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleDateArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleDateArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of a List of [KalugaDate] or `null`
@@ -341,6 +344,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DateArrayNavHostResultHa
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received list of [KalugaDate] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DateArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -353,13 +357,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DateArrayNavHostResultOr
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Double]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Double) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleDoubleResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleDoubleResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Double] or `null`
@@ -367,6 +370,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleNavHostResultHandl
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Double] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -379,13 +383,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleNavHostResultOrNul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [DoubleArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(DoubleArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleDoubleArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleDoubleArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [DoubleArray] or `null`
@@ -393,6 +396,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleArrayNavHostResult
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [DoubleArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -405,13 +409,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleArrayNavHostResult
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Float]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> FloatNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Float) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleFloatResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleFloatResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Float] or `null`
@@ -419,6 +422,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> FloatNavHostResultHandle
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Float] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> FloatNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -431,13 +435,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> FloatNavHostResultOrNull
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [FloatArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> FloatArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(FloatArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleFloatArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleFloatArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [FloatArray] or `null`
@@ -445,6 +448,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> FloatArrayNavHostResultH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [FloatArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> FloatArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -457,13 +461,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> FloatArrayNavHostResultO
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Int]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> IntNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Int) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleIntResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleIntResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Int] or `null`
@@ -471,6 +474,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> IntNavHostResultHandler(
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Int] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> IntNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -483,13 +487,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> IntNavHostResultOrNullHa
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [IntArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> IntArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(IntArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleIntArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleIntArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [IntArray] or `null`
@@ -497,6 +500,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> IntArrayNavHostResultHan
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [IntArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> IntArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -509,13 +513,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> IntArrayNavHostResultOrN
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Long]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> LongNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Long) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleLongResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleLongResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Long] or `null`
@@ -523,6 +526,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> LongNavHostResultHandler
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Long] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> LongNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -535,13 +539,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> LongNavHostResultOrNullH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [LongArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> LongArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(LongArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleLongArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleLongArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [LongArray] or `null`
@@ -549,6 +552,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> LongArrayNavHostResultHa
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [LongArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> LongArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -561,13 +565,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> LongArrayNavHostResultOr
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Short]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ShortNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Short) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleShortResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleShortResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Short] or `null`
@@ -575,6 +578,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ShortNavHostResultHandle
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Short] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ShortNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -587,13 +591,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ShortNavHostResultOrNull
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [ShortArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ShortArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(ShortArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleShortArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleShortArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [ShortArray] or `null`
@@ -601,6 +604,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ShortArrayNavHostResultH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [ShortArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ShortArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -613,13 +617,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ShortArrayNavHostResultO
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [String]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> StringNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(String) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleStringResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleStringResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [String] or `null`
@@ -627,6 +630,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> StringNavHostResultHandl
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [String] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> StringNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -639,13 +643,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> StringNavHostResultOrNul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received list of [String]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> StringListNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(List<String>) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleStringListResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleStringListResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of a list of [String] or `null`
@@ -653,6 +656,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> StringListNavHostResultH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received list of [String] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> StringListNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -666,13 +670,14 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> StringListNavHostResultO
  * @param T the type of serialized property stored in the result
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [T]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel, T> KSerializer<T>.NavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(T) -> Unit
-) {
+): NavHostResultHandler<ViewModel, T> {
     val serializer = this
-    NavHostResultHandler(ViewModel::class, { HandleResultOfType(serializer, retain, it) }, onResult)
+    return NavHostResultHandler(ViewModel::class, { HandleResultOfType(serializer, retain, it) }, onResult)
 }
 
 /**
@@ -682,13 +687,14 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, T> KSerializer<T>.NavHos
  * @param T the type of serialized property stored in the result
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [T] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel, T : Any> KSerializer<T>.NavHostResultOrNullHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(T?) -> Unit
-) {
+): NavHostResultHandler<ViewModel, T?> {
     val serializer = this
-    NavHostResultHandler(ViewModel::class, { HandleResultOfTypeOrNull(serializer, retain, it) }, onResult)
+    return NavHostResultHandler(ViewModel::class, { HandleResultOfTypeOrNull(serializer, retain, it) }, onResult)
 }
 
 /**
@@ -698,12 +704,13 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, T : Any> KSerializer<T>.
  * @param T the type of serialized property stored in the result
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [T] or `null`
+ * @return the [NavHostResultHandler]
  */
 @JvmName("NavHostNullableResultOrNullHandler")
 inline fun <reified ViewModel : BaseLifecycleViewModel, T> KSerializer<T>.NavHostResultOrNullHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(T?) -> Unit
-) {
+): NavHostResultHandler<ViewModel, T?> {
     val serializer = this
-    NavHostResultHandler(ViewModel::class, { HandleResultOfTypeOrNull(serializer, retain, it) }, onResult)
+    return NavHostResultHandler(ViewModel::class, { HandleResultOfTypeOrNull(serializer, retain, it) }, onResult)
 }
diff --git a/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt b/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt
index 9fc0e2dd5..0edae94a5 100644
--- a/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt
+++ b/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.test.base.BaseTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
+import kotlin.time.Duration.Companion.milliseconds
 
 class NavigationBundleTest : BaseTest() {
 
@@ -38,10 +39,10 @@ class NavigationBundleTest : BaseTest() {
         }
         val optionalString: String? = "Some String"
         val optionalFloat: Float? = null
-        val dateValue = DefaultKalugaDate.epoch(offsetInMilliseconds = 1606204800000)
+        val dateValue = DefaultKalugaDate.epoch(1606204800000.milliseconds)
         val dateArray = listOf(
-            DefaultKalugaDate.epoch(offsetInMilliseconds = 1606204800001),
-            DefaultKalugaDate.epoch(offsetInMilliseconds = 1606204800002)
+            DefaultKalugaDate.epoch(1606204800001.milliseconds),
+            DefaultKalugaDate.epoch(1606204800002.milliseconds)
         )
 
         val mockSpec = MockSpec()
diff --git a/base-permissions/src/commonMain/kotlin/Permission.kt b/base-permissions/src/commonMain/kotlin/Permission.kt
index 72a20b987..fb699564c 100644
--- a/base-permissions/src/commonMain/kotlin/Permission.kt
+++ b/base-permissions/src/commonMain/kotlin/Permission.kt
@@ -56,6 +56,7 @@ interface PermissionStateRepoBuilder<P : Permission> {
      * Creates a [BasePermissionStateRepo] associated with [permission]
      * @param permission the [P] the resulting [BasePermissionStateRepo] should manage.
      * @param coroutineContext the [CoroutineContext] to manage the [BasePermissionStateRepo]
+     * @return the created [BasePermissionStateRepo]
      */
     fun create(permission: P, coroutineContext: CoroutineContext): BasePermissionStateRepo<P>
 }
diff --git a/base/src/commonTest/kotlin/text/DateFormatterTest.kt b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
index 748628579..1904cb2b5 100644
--- a/base/src/commonTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
@@ -29,6 +29,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
+import kotlin.time.Duration.Companion.milliseconds
 
 class DateFormatterTest {
 
@@ -37,8 +38,8 @@ class DateFormatterTest {
         private val FranceLocale = createLocale("fr", "FR")
         private val PSTTimeZone = TimeZone.get("America/Los_Angeles")!!
 
-        private val January81988 = DefaultKalugaDate.epoch(568627200000)
-        private val March181988 = DefaultKalugaDate.epoch(574695462750)
+        private val January81988 = DefaultKalugaDate.epoch(568627200000.milliseconds)
+        private val March181988 = DefaultKalugaDate.epoch(574695462750.milliseconds)
     }
 
     @Test
diff --git a/base/src/commonTest/kotlin/utils/DateTest.kt b/base/src/commonTest/kotlin/utils/DateTest.kt
index 438dd6f05..776d1245c 100644
--- a/base/src/commonTest/kotlin/utils/DateTest.kt
+++ b/base/src/commonTest/kotlin/utils/DateTest.kt
@@ -29,6 +29,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 class DateTest {
 
@@ -40,7 +41,7 @@ class DateTest {
         val nearEpoch = DefaultKalugaDate.epoch(1001.milliseconds)
         assertEquals(DefaultKalugaDate.epoch(1001.milliseconds), nearEpoch, "equally created dates should be equal")
 
-        assertEquals(DefaultKalugaDate.epoch(1002.milliseconds), nearEpoch + 1.milliseconds, "Date from addition should be equal")
+        assertEquals(DefaultKalugaDate.epoch(10.seconds).millisecondSinceEpoch, (DefaultKalugaDate.epoch(9.seconds) + 1.seconds).millisecondSinceEpoch, "Date from addition should be equal")
     }
 
     @Test
diff --git a/bluetooth/src/androidLibUnitTest/kotlin/PairingUtilsTests.kt b/bluetooth/src/androidLibUnitTest/kotlin/PairingUtilsTests.kt
index 775940be9..ceb91eb72 100644
--- a/bluetooth/src/androidLibUnitTest/kotlin/PairingUtilsTests.kt
+++ b/bluetooth/src/androidLibUnitTest/kotlin/PairingUtilsTests.kt
@@ -72,7 +72,7 @@ class PairingUtilsTests : BaseTest() {
                 MockAdvertisementData(NAME)
             ),
             ConnectionSettings(),
-            { manager.create(MockDeviceWrapper(NAME, NAME, 0, true), ConnectionSettings(), coroutineScope) },
+            { manager.create(MockDeviceWrapper(NAME, NAME, DeviceWrapper.BondState.NONE, true), ConnectionSettings(), coroutineScope) },
             coroutineScope
         )
     }
diff --git a/bluetooth/src/commonMain/kotlin/Bluetooth.kt b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
index 9f56456f2..62dc9eecd 100644
--- a/bluetooth/src/commonMain/kotlin/Bluetooth.kt
+++ b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
@@ -242,6 +242,7 @@ interface BaseBluetoothBuilder {
      * @param scannerSettingsBuilder a method for getting the [BaseScanner.Settings] to be used while scanning from a [CoroutineContext]
      * @param connectionSettings the [ConnectionSettings] to apply to [Device] scanned by the [Bluetooth] service.
      * @param coroutineContext the [CoroutineContext] in which Bluetooth runs
+     * @return the created [Bluetooth]
      */
     fun create(
         scannerSettingsBuilder: (Permissions) -> BaseScanner.Settings = { BaseScanner.Settings(it) },
diff --git a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
index 3e29625fc..a1beef8fe 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
@@ -215,7 +215,7 @@ abstract class BaseScanner constructor(
     }
 
     /**
-     * Settings to apply to a [BaseScanner]
+     * Settings to configure a [BaseScanner]
      * @property permissions the [Permissions] to manage the bluetooth related permissions
      * @property autoRequestPermission if `true` the scanner should automatically request permissions if not granted
      * @property autoEnableSensors if `true` the scanner should automatically enable the Bluetooth service if disabled
@@ -239,6 +239,7 @@ abstract class BaseScanner constructor(
          * Creates a [BaseScanner]
          * @param settings the [BaseScanner.Settings] to configure the scanner with
          * @param coroutineScope the [CoroutineScope] the scanner will run in
+         * @return the [BaseScanner] created
          */
         fun create(
             settings: Settings,
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
index b07476ac7..19385794d 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
@@ -136,6 +136,7 @@ sealed interface ScanningState : KalugaState {
          * Transitions into an [Initialized] State
          * @param hasPermission if `true` all permissions related to Bluetooth have been granted
          * @param enabled if `true` the Bluetooth service is enabled
+         * @return method for transitioning into an [Initialized] State
          */
         fun initialized(hasPermission: Boolean, enabled: Boolean): suspend () -> Initialized
     }
diff --git a/date-time-picker/api/androidLib/date-time-picker.api b/date-time-picker/api/androidLib/date-time-picker.api
index 123ae6e12..551c77443 100644
--- a/date-time-picker/api/androidLib/date-time-picker.api
+++ b/date-time-picker/api/androidLib/date-time-picker.api
@@ -3,7 +3,7 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 	public fun dismiss (Z)V
 	protected abstract fun dismissDateTimePicker (Z)V
 	public static synthetic fun dismissDateTimePicker$default (Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;ZILjava/lang/Object;)V
-	protected final fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	protected fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public fun show (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun showAsync (ZLkotlin/jvm/functions/Function1;)V
 	protected abstract fun showDateTimePicker (ZLkotlin/jvm/functions/Function1;)V
diff --git a/date-time-picker/api/jvm/date-time-picker.api b/date-time-picker/api/jvm/date-time-picker.api
index 454cb2d00..233b6fc39 100644
--- a/date-time-picker/api/jvm/date-time-picker.api
+++ b/date-time-picker/api/jvm/date-time-picker.api
@@ -3,7 +3,7 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 	public fun dismiss (Z)V
 	protected abstract fun dismissDateTimePicker (Z)V
 	public static synthetic fun dismissDateTimePicker$default (Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;ZILjava/lang/Object;)V
-	protected final fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	protected fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public fun show (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun showAsync (ZLkotlin/jvm/functions/Function1;)V
 	protected abstract fun showDateTimePicker (ZLkotlin/jvm/functions/Function1;)V
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 769933efe..3ef0eb302 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -194,7 +194,7 @@ interface DateTimePickerActions {
  *
  * @param dateTimePicker The [DateTimePicker] to present (and dismiss if needed)
  */
-abstract class BaseDateTimePickerPresenter(protected val dateTimePicker: DateTimePicker) : DateTimePickerActions {
+abstract class BaseDateTimePickerPresenter(protected open val dateTimePicker: DateTimePicker) : DateTimePickerActions {
 
     /**
      * Abstract alert builder class, used to create an [BaseDateTimePickerPresenter].
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index b56876769..da2e6180e 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -72,6 +72,8 @@ import com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewMod
 import com.splendo.kaluga.hud.HUD
 import com.splendo.kaluga.links.LinksBuilder
 import com.splendo.kaluga.location.LocationStateRepoBuilder
+import com.splendo.kaluga.location.DefaultLocationManager
+import com.splendo.kaluga.location.GoogleLocationProvider
 import com.splendo.kaluga.permissions.base.Permission
 import com.splendo.kaluga.permissions.location.LocationPermission
 import com.splendo.kaluga.resources.StyledStringBuilder
@@ -210,7 +212,14 @@ internal val androidModule = module {
 
 fun initKoin(customModules: List<Module> = emptyList()) = initKoin(
     androidModule,
-    { LocationStateRepoBuilder(permissionsBuilder = it) },
+    {
+        LocationStateRepoBuilder(
+            locationManagerBuilder = DefaultLocationManager.Builder(
+                googleLocationProviderSettings = GoogleLocationProvider.Settings()
+            ),
+            permissionsBuilder = it,
+        )
+    },
     { BluetoothBuilder(permissionsBuilder = it) },
     customModules
 )
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index eb42b05d7..2e6863657 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -19,7 +19,7 @@ package com.splendo.kaluga.example.shared.di
 
 import com.splendo.kaluga.bluetooth.Bluetooth
 import com.splendo.kaluga.bluetooth.BluetoothBuilder
-import com.splendo.kaluga.bluetooth.beacons.Beacons
+import com.splendo.kaluga.bluetooth.beacons.DefaultBeacons
 import com.splendo.kaluga.bluetooth.device.ConnectionSettings
 import com.splendo.kaluga.bluetooth.scanner.BaseScanner
 import com.splendo.kaluga.location.LocationStateRepoBuilder
@@ -68,7 +68,7 @@ private fun sharedModule(
             connectionSettings = ConnectionSettings(logger = get())
         )
     }
-    single { Beacons(get<Bluetooth>(), timeout = 1.minutes) }
+    single { DefaultBeacons(get<Bluetooth>(), beaconLifetime = 1.minutes, logger = get()) }
 }
 
 internal fun initKoin(
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
index a2551c4ef..d59f4b767 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/beacons/BeaconsListViewModel.kt
@@ -66,7 +66,7 @@ class BeaconsListViewModel : BaseLifecycleViewModel(), KoinComponent {
             if (_isScanning.value) {
                 service.stopMonitoring()
             } else {
-                service.startMonitoring(coroutineScope)
+                service.startMonitoring()
             }
         }
     }
diff --git a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
index 74451d503..72f30c694 100644
--- a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
+++ b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
@@ -43,7 +43,7 @@ interface BaseKeyboardManager<FH : FocusHandler> {
          * Creates KeyboardManager object
          *
          * @param coroutineScope The [CoroutineScope] managing the keyboard lifecycle.
-         * @return The KeyboardManager object
+         * @return The created [BaseKeyboardManager]
          */
         fun create(coroutineScope: CoroutineScope): BaseKeyboardManager<FH>
     }
diff --git a/location/api/androidLib/location.api b/location/api/androidLib/location.api
index f391d5cfd..7e464d498 100644
--- a/location/api/androidLib/location.api
+++ b/location/api/androidLib/location.api
@@ -3,12 +3,12 @@ public abstract class com/splendo/kaluga/location/BaseLocationManager : com/sple
 	public fun <init> (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)V
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	public fun getEvents ()Lkotlinx/coroutines/flow/Flow;
-	public abstract fun getLocationMonitor ()Lcom/splendo/kaluga/location/LocationMonitor;
+	protected abstract fun getLocationMonitor ()Lcom/splendo/kaluga/location/LocationMonitor;
 	public fun getLocationPermission ()Lcom/splendo/kaluga/permissions/location/LocationPermission;
 	public fun getLocations ()Lkotlinx/coroutines/flow/Flow;
 	protected final fun getSharedLocations ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-	public final fun handleLocationChanged (Lcom/splendo/kaluga/location/Location$KnownLocation;)V
-	public final fun handleLocationChanged (Ljava/util/List;)V
+	protected fun handleLocationChanged (Lcom/splendo/kaluga/location/Location$KnownLocation;)V
+	protected fun handleLocationChanged (Ljava/util/List;)V
 	public fun isLocationEnabled ()Z
 	public fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -49,7 +49,6 @@ public final class com/splendo/kaluga/location/BaseLocationManager$Settings {
 
 public abstract class com/splendo/kaluga/location/BaseLocationStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract interface class com/splendo/kaluga/location/BaseLocationStateRepoBuilder {
@@ -92,16 +91,16 @@ public final class com/splendo/kaluga/location/DMSCoordinate$WindDirection : jav
 
 public final class com/splendo/kaluga/location/DefaultLocationManager : com/splendo/kaluga/location/BaseLocationManager {
 	public fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lcom/splendo/kaluga/location/LocationProvider;Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)V
-	public fun getLocationMonitor ()Lcom/splendo/kaluga/location/LocationMonitor;
 	public fun requestEnableLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/location/DefaultLocationManager$Builder : com/splendo/kaluga/location/BaseLocationManager$Builder {
-	public fun <init> ()V
 	public fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;)V
 	public synthetic fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)Lcom/splendo/kaluga/location/BaseLocationManager;
 }
 
@@ -140,7 +139,6 @@ public final class com/splendo/kaluga/location/GoogleLocationUpdatesBroadcastRec
 }
 
 public final class com/splendo/kaluga/location/GoogleLocationUpdatesBroadcastReceiver$Companion {
-	public final fun intent (Landroid/content/Context;Ljava/lang/String;)Landroid/app/PendingIntent;
 }
 
 public abstract class com/splendo/kaluga/location/Location {
@@ -219,7 +217,7 @@ public final class com/splendo/kaluga/location/LocationExtensionsKt {
 public final class com/splendo/kaluga/location/LocationKt {
 	public static final fun getKnown (Lcom/splendo/kaluga/location/Location;)Lcom/splendo/kaluga/location/Location$KnownLocation;
 	public static final fun getOrUnknown (Lcom/splendo/kaluga/location/Location$KnownLocation;)Lcom/splendo/kaluga/location/Location;
-	public static final fun unknownLocationOf (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;)Lcom/splendo/kaluga/location/Location;
+	public static final fun unknownLocationOf (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;)Lcom/splendo/kaluga/location/Location$UnknownLocation;
 }
 
 public abstract interface class com/splendo/kaluga/location/LocationManager {
@@ -402,15 +400,11 @@ public final class com/splendo/kaluga/location/LocationStateImpl$NotInitialized
 
 public final class com/splendo/kaluga/location/LocationStateImpl$PermittedHandler {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 }
 
 public class com/splendo/kaluga/location/LocationStateImplRepo : com/splendo/kaluga/location/BaseLocationStateRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public final class com/splendo/kaluga/location/LocationStateKt {
@@ -424,9 +418,11 @@ public final class com/splendo/kaluga/location/LocationStateRepo : com/splendo/k
 }
 
 public final class com/splendo/kaluga/location/LocationStateRepoBuilder : com/splendo/kaluga/location/BaseLocationStateRepoBuilder {
-	public fun <init> ()V
-	public fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;)V
-	public synthetic fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;)V
+	public synthetic fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lcom/splendo/kaluga/location/GoogleLocationProvider$Settings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Landroid/content/Context;Landroid/location/LocationManager;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/location/BaseLocationManager$Builder;Lkotlin/jvm/functions/Function2;)V
 	public fun create (Lcom/splendo/kaluga/permissions/location/LocationPermission;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/location/LocationStateRepo;
 }
 
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index 2c71b5190..e262d4c94 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -3,12 +3,12 @@ public abstract class com/splendo/kaluga/location/BaseLocationManager : com/sple
 	public fun <init> (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)V
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	public fun getEvents ()Lkotlinx/coroutines/flow/Flow;
-	public abstract fun getLocationMonitor ()Lcom/splendo/kaluga/location/LocationMonitor;
+	protected abstract fun getLocationMonitor ()Lcom/splendo/kaluga/location/LocationMonitor;
 	public fun getLocationPermission ()Lcom/splendo/kaluga/permissions/location/LocationPermission;
 	public fun getLocations ()Lkotlinx/coroutines/flow/Flow;
 	protected final fun getSharedLocations ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-	public final fun handleLocationChanged (Lcom/splendo/kaluga/location/Location$KnownLocation;)V
-	public final fun handleLocationChanged (Ljava/util/List;)V
+	protected fun handleLocationChanged (Lcom/splendo/kaluga/location/Location$KnownLocation;)V
+	protected fun handleLocationChanged (Ljava/util/List;)V
 	public fun isLocationEnabled ()Z
 	public fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringPermissions (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -49,7 +49,6 @@ public final class com/splendo/kaluga/location/BaseLocationManager$Settings {
 
 public abstract class com/splendo/kaluga/location/BaseLocationStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public abstract interface class com/splendo/kaluga/location/BaseLocationStateRepoBuilder {
@@ -95,7 +94,6 @@ public final class com/splendo/kaluga/location/DMSCoordinate$WindDirection : jav
 
 public final class com/splendo/kaluga/location/DefaultLocationManager : com/splendo/kaluga/location/BaseLocationManager {
 	public fun <init> (Lcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)V
-	public fun getLocationMonitor ()Lcom/splendo/kaluga/location/LocationMonitor;
 	public fun requestEnableLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -182,7 +180,7 @@ public final class com/splendo/kaluga/location/Location$UnknownLocation$WithoutL
 public final class com/splendo/kaluga/location/LocationKt {
 	public static final fun getKnown (Lcom/splendo/kaluga/location/Location;)Lcom/splendo/kaluga/location/Location$KnownLocation;
 	public static final fun getOrUnknown (Lcom/splendo/kaluga/location/Location$KnownLocation;)Lcom/splendo/kaluga/location/Location;
-	public static final fun unknownLocationOf (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;)Lcom/splendo/kaluga/location/Location;
+	public static final fun unknownLocationOf (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;)Lcom/splendo/kaluga/location/Location$UnknownLocation;
 }
 
 public abstract interface class com/splendo/kaluga/location/LocationManager {
@@ -411,15 +409,11 @@ public final class com/splendo/kaluga/location/LocationStateImpl$NotInitialized
 
 public final class com/splendo/kaluga/location/LocationStateImpl$PermittedHandler {
 	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public final fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 }
 
 public class com/splendo/kaluga/location/LocationStateImplRepo : com/splendo/kaluga/location/BaseLocationStateRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
 public final class com/splendo/kaluga/location/LocationStateKt {
diff --git a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
index ffc9cb86e..d90bdd94e 100644
--- a/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/GoogleLocationProvider.kt
@@ -42,7 +42,7 @@ import kotlin.time.Duration.Companion.milliseconds
  * A [LocationProvider] using the Google Location Services
  * @param context The [Context] to run this [LocationProvider] in.
  * @param settings The [GoogleLocationProvider.Settings] to use to configure this location provider.
- * @param minUpdateDistanceMeters The min distance traversed for a location update to be reported.
+ * @param minUpdateDistanceMeters The minimum distance in meters traversed for a location update to be reported.
  */
 class GoogleLocationProvider(
     private val context: Context,
@@ -144,9 +144,9 @@ class GoogleLocationProvider(
         fusedLocationProviderClient.startRequestingUpdates()
     }
 
-    override fun stopMonitoringLocation(permissions: LocationPermission) {
-        fusedLocationProviderClients.value[permissions]?.startRequestingUpdates()
-        fusedLocationProviderClients.value = fusedLocationProviderClients.value.toMutableMap().apply { remove(permissions) }
+    override fun stopMonitoringLocation(permission: LocationPermission) {
+        fusedLocationProviderClients.value[permission]?.stopRequestingUpdates()
+        fusedLocationProviderClients.value = fusedLocationProviderClients.value.toMutableMap().apply { remove(permission) }
     }
 
     private fun getLocationProviderForPermission(permission: LocationPermission): FusedLocationProviderClientType {
@@ -165,12 +165,15 @@ class GoogleLocationProvider(
     }
 }
 
+/**
+ * A [BroadcastReceiver] for receiving updates to a Google Location from the background
+ */
 class GoogleLocationUpdatesBroadcastReceiver : BroadcastReceiver() {
 
     companion object {
         private const val ACTION_NAME = "com.splendo.kaluga.location.locationupdates.action"
 
-        fun intent(context: Context, locationManagerId: String): PendingIntent {
+        internal fun intent(context: Context, locationManagerId: String): PendingIntent {
             val intent = Intent(context, GoogleLocationUpdatesBroadcastReceiver::class.java).apply {
                 action = ACTION_NAME
                 addCategory(locationManagerId)
diff --git a/location/src/androidLibMain/kotlin/location/LocationExtensions.kt b/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
index acff1c1b8..801a03004 100644
--- a/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
@@ -23,6 +23,10 @@ import com.google.android.gms.location.LocationResult
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import kotlin.time.Duration.Companion.milliseconds
 
+/**
+ * Converts a [android.location.Location] into a [Location.KnownLocation]
+ * @return the [Location.KnownLocation] matching the location
+ */
 fun android.location.Location.toKnownLocation(): Location.KnownLocation {
     return Location.KnownLocation(
         latitude = latitude,
@@ -31,10 +35,15 @@ fun android.location.Location.toKnownLocation(): Location.KnownLocation {
         horizontalAccuracy = accuracy.toDouble(),
         verticalAccuracy = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) verticalAccuracyMeters.toDouble() else 0.0,
         speed = speed.toDouble(),
+        course = bearing.toDouble(),
         time = DefaultKalugaDate.epoch(time.milliseconds)
     )
 }
 
+/**
+ * Converts a [LocationResult] to a list of [Location.KnownLocation]
+ * @return the list of [Location.KnownLocation] in the [LocationResult]
+ */
 fun LocationResult.toKnownLocations(): List<Location.KnownLocation> {
     return locations.mapNotNull {
         it.toKnownLocation()
diff --git a/location/src/androidLibMain/kotlin/location/LocationManager.kt b/location/src/androidLibMain/kotlin/location/LocationManager.kt
index f7ba8a081..dbad67911 100644
--- a/location/src/androidLibMain/kotlin/location/LocationManager.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationManager.kt
@@ -21,6 +21,7 @@ import android.content.Context
 import android.content.Intent
 import android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS
 import com.splendo.kaluga.base.ApplicationHolder
+import com.splendo.kaluga.location.BaseLocationManager.Settings
 import com.splendo.kaluga.permissions.base.PermissionContext
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
@@ -34,6 +35,14 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A default implementation of [BaseLocationManager]
+ * @param context the [Context] in which to manage the location
+ * @param locationManager the [android.location.LocationManager] to manage the location
+ * @param locationProvider the [LocationProvider] to provide the location
+ * @param settings the [Settings] to configure this location manager
+ * @param coroutineScope the [CoroutineScope] this location manager runs on
+ */
 actual class DefaultLocationManager(
     private val context: Context,
     locationManager: android.location.LocationManager?,
@@ -42,27 +51,48 @@ actual class DefaultLocationManager(
     coroutineScope: CoroutineScope
 ) : BaseLocationManager(settings, coroutineScope) {
 
+    /**
+     * Builder for creating a [DefaultLocationManager]
+     * @param context the [Context] in which to manage the location
+     * @param locationManager the [android.location.LocationManager] to manage the location
+     * @param createLocationProvider method for creating a [LocationProvider] from [BaseLocationManager.Settings]
+     */
     class Builder(
         private val context: Context = ApplicationHolder.applicationContext,
         private val locationManager: android.location.LocationManager? = context.getSystemService(
             Context.LOCATION_SERVICE
         ) as? android.location.LocationManager,
-        private val googleLocationProviderSettings: GoogleLocationProvider.Settings = GoogleLocationProvider.Settings()
+        private val createLocationProvider: (Settings) -> LocationProvider
     ) : BaseLocationManager.Builder {
 
+        /**
+         * Constructor that uses a [GoogleLocationProvider]
+         * @param context the [Context] in which to manage the location
+         * @param locationManager the [android.location.LocationManager] to manage the location
+         * @param googleLocationProviderSettings the [GoogleLocationProvider.Settings] to use to create a [GoogleLocationProvider]
+         */
+        constructor(
+            context: Context = ApplicationHolder.applicationContext,
+            locationManager: android.location.LocationManager? = context.getSystemService(
+                Context.LOCATION_SERVICE
+            ) as? android.location.LocationManager,
+            googleLocationProviderSettings: GoogleLocationProvider.Settings
+        ) : this(
+            context,
+            locationManager,
+            { settings ->
+                GoogleLocationProvider(context, googleLocationProviderSettings, settings.minUpdateDistanceMeters)
+            }
+        )
+
         override fun create(
             settings: Settings,
             coroutineScope: CoroutineScope
         ): BaseLocationManager {
-            val locationProvider: LocationProvider = GoogleLocationProvider(
-                context,
-                googleLocationProviderSettings,
-                settings.minUpdateDistanceMeters
-            )
             return DefaultLocationManager(
                 context,
                 locationManager,
-                locationProvider,
+                createLocationProvider(settings),
                 settings,
                 coroutineScope
             )
@@ -103,21 +133,64 @@ actual class DefaultLocationManager(
     }
 }
 
+/**
+ * Default [BaseLocationStateRepoBuilder]
+ * @param locationManagerBuilder a [BaseLocationManager.Builder] to create the [BaseLocationManager] to use
+ * @param permissionsBuilder a method for creating the [Permissions] object to manage the Location permissions.
+ * Needs to have [com.splendo.kaluga.permissions.location.LocationPermission] registered.
+ */
 actual class LocationStateRepoBuilder(
-    private val context: Context = ApplicationHolder.applicationContext,
-    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { coroutineContext ->
-        Permissions(
-            PermissionsBuilder(PermissionContext(context)).apply { registerLocationPermissionIfNotRegistered() },
-            coroutineContext
-        )
-    }
+    private val locationManagerBuilder: BaseLocationManager.Builder,
+    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions
 ) : BaseLocationStateRepoBuilder {
 
+    /**
+     * Constructor
+     * @param context the [Context] in which to manage the location state
+     * @param locationManager the [android.location.LocationManager] to manage the location
+     * @param createLocationProvider method for creating a [LocationProvider] from [BaseLocationManager.Settings]
+     */
+    constructor(
+        context: Context = ApplicationHolder.applicationContext,
+        locationManager: android.location.LocationManager? = context.getSystemService(
+            Context.LOCATION_SERVICE
+        ) as? android.location.LocationManager,
+        createLocationProvider: (Settings) -> LocationProvider
+    ) : this(
+        DefaultLocationManager.Builder(context, locationManager, createLocationProvider),
+        { coroutineContext ->
+            Permissions(
+                PermissionsBuilder(PermissionContext(context)).apply { registerLocationPermissionIfNotRegistered() },
+                coroutineContext
+            )
+        }
+    )
+
+    /**
+     * Constructor that uses a [GoogleLocationProvider]
+     * @param context the [Context] in which to manage the location state
+     * @param locationManager the [android.location.LocationManager] to manage the location
+     * @param googleLocationProviderSettings the [GoogleLocationProvider.Settings] to use to create a [GoogleLocationProvider]
+     */
+    constructor(
+        context: Context = ApplicationHolder.applicationContext,
+        locationManager: android.location.LocationManager? = context.getSystemService(
+            Context.LOCATION_SERVICE
+        ) as? android.location.LocationManager,
+        googleLocationProviderSettings: GoogleLocationProvider.Settings
+    ) : this(
+        context,
+        locationManager,
+        { settings ->
+            GoogleLocationProvider(context, googleLocationProviderSettings, settings.minUpdateDistanceMeters)
+        }
+    )
+
     override fun create(
         locationPermission: LocationPermission,
         settingsBuilder: (LocationPermission, Permissions) -> BaseLocationManager.Settings,
         coroutineContext: CoroutineContext
     ): LocationStateRepo {
-        return LocationStateRepo({ settingsBuilder(locationPermission, permissionsBuilder(it)) }, DefaultLocationManager.Builder(context), coroutineContext)
+        return LocationStateRepo({ settingsBuilder(locationPermission, permissionsBuilder(it)) }, locationManagerBuilder, coroutineContext)
     }
 }
diff --git a/location/src/androidLibMain/kotlin/location/LocationMonitor.kt b/location/src/androidLibMain/kotlin/location/LocationMonitor.kt
index 2b9294702..cff24d30d 100644
--- a/location/src/androidLibMain/kotlin/location/LocationMonitor.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationMonitor.kt
@@ -27,12 +27,25 @@ import com.splendo.kaluga.base.ApplicationHolder
 import com.splendo.kaluga.service.DefaultServiceMonitor
 import com.splendo.kaluga.service.ServiceMonitor
 
+/**
+ * A [ServiceMonitor] that monitors whether the location service is enabled
+ */
 actual interface LocationMonitor : ServiceMonitor {
 
+    /**
+     * Builder for creating a [LocationMonitor]
+     * @param applicationContext the [Context] in which to monitor the location
+     * @param locationManager the [LocationManager] to use for monitoring the location
+     */
     actual class Builder(
         private val applicationContext: Context = ApplicationHolder.applicationContext,
         private val locationManager: LocationManager? = applicationContext.getSystemService(Context.LOCATION_SERVICE) as? LocationManager
     ) {
+
+        /**
+         * Creates the [LocationMonitor]
+         * @return the created [LocationMonitor]
+         */
         actual fun create(): LocationMonitor = DefaultLocationMonitor(
             applicationContext = applicationContext,
             locationManager = locationManager
@@ -40,6 +53,11 @@ actual interface LocationMonitor : ServiceMonitor {
     }
 }
 
+/**
+ * Default implementation of [LocationMonitor]
+ * @param applicationContext the [Context] in which to monitor the location
+ * @param locationManager the [LocationManager] to use for monitoring the location
+ */
 class DefaultLocationMonitor(
     private val applicationContext: Context,
     private val locationManager: LocationManager?
diff --git a/location/src/androidLibMain/kotlin/location/LocationProvider.kt b/location/src/androidLibMain/kotlin/location/LocationProvider.kt
index 4130c1116..00d670474 100644
--- a/location/src/androidLibMain/kotlin/location/LocationProvider.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationProvider.kt
@@ -20,8 +20,27 @@ package com.splendo.kaluga.location
 import com.splendo.kaluga.permissions.location.LocationPermission
 import kotlinx.coroutines.flow.Flow
 
+/**
+ * A provider of [Location.KnownLocation]
+ */
 interface LocationProvider {
+
+    /**
+     * Gets a [Flow] providing updates to the [Location.KnownLocation]
+     * @param permission the [LocationPermission] to use for getting the [Location.KnownLocation]
+     * @return a [Flow] containing the latest [Location.KnownLocation] batched in a List
+     */
     fun location(permission: LocationPermission): Flow<List<Location.KnownLocation>>
+
+    /**
+     * Starts monitoring for [Location.KnownLocation] with a given [LocationPermission]
+     * @param permission the [LocationPermission] to use for monitoring the [Location.KnownLocation]
+     */
     fun startMonitoringLocation(permission: LocationPermission)
-    fun stopMonitoringLocation(permissions: LocationPermission)
+
+    /**
+     * Stops monitoring for [Location.KnownLocation] with a given [LocationPermission]
+     * @param permission the [LocationPermission] to that was used for monitoring the [Location.KnownLocation]
+     */
+    fun stopMonitoringLocation(permission: LocationPermission)
 }
diff --git a/location/src/commonMain/kotlin/location/Location.kt b/location/src/commonMain/kotlin/location/Location.kt
index 64116bf4c..3728430cf 100644
--- a/location/src/commonMain/kotlin/location/Location.kt
+++ b/location/src/commonMain/kotlin/location/Location.kt
@@ -21,10 +21,21 @@ package com.splendo.kaluga.location
 import com.splendo.kaluga.base.utils.KalugaDate
 import kotlin.math.absoluteValue
 
+/**
+ * A Geolocation of the system
+ */
 sealed class Location {
 
     /**
-     * A known location, [latitude], [longitude] and [time] are always available, the rest are optional
+     * A [Location] where the current coordinates are known
+     * @property latitude the latitude of the location
+     * @property longitude the longitude of the location
+     * @property altitude the altitude above mean sea level associated with a location, measured in meters.
+     * @property horizontalAccuracy the estimated horizontal accuracy radius in meters of this location
+     * @property verticalAccuracy the estimated altitude accuracy in meters of this location
+     * @property speed the velocity (measured in meters per second) at which the device is moving
+     * @property course the azimuth that is measured in degrees relative to true north
+     * @property time the [KalugaDate] at which the location was detected
      */
     data class KnownLocation(
         val latitude: Double,
@@ -49,26 +60,37 @@ sealed class Location {
     }
 
     /**
-     * An unknown location.
-     * @param reason The [Reason] the location is unknown.
+     * An [location] where the current coordinates are unknown.
+     * @property reason The [Reason] the location is unknown.
      */
     sealed class UnknownLocation(open val reason: Reason) : Location() {
 
         enum class Reason {
+            /**
+             * Location is unknown because location permissions have not been granted
+             */
             PERMISSION_DENIED,
+
+            /**
+             * Location is unknown because GPS is disabled
+             */
             NO_GPS,
+
+            /**
+             * Location is unknown for an unknown reason
+             */
             NOT_CLEAR
         }
 
         /**
-         * The current location is unknown, and there is no last known location
+         * An [UnknownLocation] where there is no last known location
          * @param reason The [Reason] the location is unknown.
          */
         data class WithoutLastLocation(override val reason: Reason) : UnknownLocation(reason)
 
         /**
-         * The current location is unknown, but there is a last known location
-         * @param lastKnownLocation The [KnownLocation] last received before the location became unknown.
+         * A [UnknownLocation], but there is a last known location
+         * @property lastKnownLocation The [KnownLocation] last received before the location became unknown.
          * @param reason The [Reason] the location is unknown.
          */
         data class WithLastLocation(val lastKnownLocation: KnownLocation, override val reason: Reason) : UnknownLocation(reason)
@@ -77,10 +99,10 @@ sealed class Location {
 
 /**
  * A Location coordinate defined by degrees, minutes and seconds.
- * @param degrees The degrees of the coordinate
- * @param minutes The minutes of the coordinate
- * @param seconds The seconds of the coordinate
- * @param windDirection The [WindDirection] of the coordinate
+ * @property degrees The degrees of the coordinate
+ * @property minutes The minutes of the coordinate
+ * @property seconds The seconds of the coordinate
+ * @property windDirection The [WindDirection] of the coordinate
  */
 data class DMSCoordinate(val degrees: Int, val minutes: Int, val seconds: Double, val windDirection: WindDirection) {
 
@@ -119,7 +141,7 @@ data class DMSCoordinate(val degrees: Int, val minutes: Int, val seconds: Double
     }
 
     /**
-     * Decimal representation of this coordinate
+     * Double representation of this coordinate
      */
     val decimalDegrees: Double get() {
         val sign = when (windDirection) {
@@ -134,7 +156,13 @@ data class DMSCoordinate(val degrees: Int, val minutes: Int, val seconds: Double
     }
 }
 
-fun Location.unknownLocationOf(reason: Location.UnknownLocation.Reason): Location {
+/**
+ * Converts a [Location] into an [Location.UnknownLocation] given a [Location.UnknownLocation.Reason]
+ * @param reason the [Location.UnknownLocation.Reason] became unknown
+ * @return the [Location.UnknownLocation] with [reason].
+ * If the [Location] this method had a [Location.KnownLocation], this will return [Location.UnknownLocation.WithLastLocation], otherwise [Location.UnknownLocation.WithoutLastLocation]
+ */
+fun Location.unknownLocationOf(reason: Location.UnknownLocation.Reason): Location.UnknownLocation {
     return when (this) {
         is Location.KnownLocation -> Location.UnknownLocation.WithLastLocation(this, reason)
         is Location.UnknownLocation.WithLastLocation -> Location.UnknownLocation.WithLastLocation(this.lastKnownLocation, reason)
@@ -142,10 +170,16 @@ fun Location.unknownLocationOf(reason: Location.UnknownLocation.Reason): Locatio
     }
 }
 
+/**
+ * Gets the [Location.KnownLocation] from a [Location] if it exists. Otherwise `null` is returned
+ */
 val Location.known: Location.KnownLocation? get() = when (this) {
     is Location.KnownLocation -> this
     is Location.UnknownLocation.WithLastLocation -> lastKnownLocation
     is Location.UnknownLocation.WithoutLastLocation -> null
 }
 
+/**
+ * Converts a Nullable [Location.KnownLocation] into a [Location], where [Location.UnknownLocation.WithoutLastLocation] is returned if the location was `null`.
+ */
 val Location.KnownLocation?.orUnknown: Location get() = this ?: Location.UnknownLocation.WithoutLastLocation(Location.UnknownLocation.Reason.NOT_CLEAR)
diff --git a/location/src/commonMain/kotlin/location/LocationManager.kt b/location/src/commonMain/kotlin/location/LocationManager.kt
index e3deb7ee5..6854c0b84 100644
--- a/location/src/commonMain/kotlin/location/LocationManager.kt
+++ b/location/src/commonMain/kotlin/location/LocationManager.kt
@@ -39,29 +39,98 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
+/**
+ * Manages monitoring for [Location]
+ */
 interface LocationManager {
 
+    /**
+     * Events detected by [LocationManager]
+     */
     sealed class Event {
+
+        /**
+         * An [Event] indicating permissions have changed
+         * @property hasPermission if `true` the permissions required for Location have been granted
+         */
         data class PermissionChanged(val hasPermission: Boolean) : Event()
+
+        /**
+         * An [Event] indicating the location service has become enabled
+         */
         object LocationEnabled : Event()
+
+        /**
+         * An [Event] indicating the location service has become disabled
+         */
         object LocationDisabled : Event()
     }
 
+    /**
+     * A [Flow] of all the [Event] detected by the location manager
+     */
     val events: Flow<Event>
+
+    /**
+     * A [Flow] of the [Location.KnownLocation] detected by the location manager
+     */
     val locations: Flow<Location.KnownLocation>
 
+    /**
+     * The [LocationPermission] used for managing this location.
+     * If [LocationPermission.precise] this will scan location at high accuracy
+     * If [LocationPermission.background] this will monitor location from the background
+     */
     val locationPermission: LocationPermission
 
+    /**
+     * Starts monitoring for changes to permissions related to [locationPermission]
+     * This will result in [Event.PermissionChanged] on the [events] flow
+     */
     suspend fun startMonitoringPermissions()
+
+    /**
+     * Stops monitoring for changes to permissions related to [locationPermission]
+     */
     suspend fun stopMonitoringPermissions()
+
+    /**
+     * Starts monitoring for changes related to the location service being enabled
+     * This will result in [Event.LocationEnabled] and [Event.LocationDisabled] on the [events] flow
+     */
     suspend fun startMonitoringLocationEnabled()
+
+    /**
+     * Stops monitoring for changes related to the location service being enabled
+     */
     suspend fun stopMonitoringLocationEnabled()
+
+    /**
+     * If `true` the location service is currently enabled
+     */
     fun isLocationEnabled(): Boolean
+
+    /**
+     * Attempts to request the user to enable the location service
+     */
     suspend fun requestEnableLocation()
+
+    /**
+     * Starts monitoring for new [Location.KnownLocation] that will be emitted on the [locations] flow
+     */
     suspend fun startMonitoringLocation()
+
+    /**
+     * Stops monitoring for new [Location.KnownLocation]
+     */
     suspend fun stopMonitoringLocation()
 }
 
+/**
+ * An abstract implementation for [LocationManager]
+ * @param settings the [Settings] to configure this location manager
+ * @param coroutineScope the [CoroutineScope] this location manager runs on
+ */
 abstract class BaseLocationManager(
     private val settings: Settings,
     private val coroutineScope: CoroutineScope
@@ -72,13 +141,16 @@ abstract class BaseLocationManager(
     }
 
     /**
-     * @param locationPermission If passing your own settings pass LocationPermission returned from settingsBuilder when you call [BaseLocationStateRepoBuilder.create]
-     * @param permissions If passing your own settings pass permissions returned from settingsBuilder when you call [BaseLocationStateRepoBuilder.create]
-     * @param autoRequestPermission Set to true to request permissions right away
-     * @param autoEnableLocations Set to true to enable location if disabled right away
-     * @param locationBufferCapacity Max location that can be buffered, if exceed oldest is dropped
-     * @param minUpdateDistanceMeters Min update distance for a location update to trigger
-     * @param logger Pass your own [RestrictedLogger] to enable logging while debugging
+     * Settings to configure a [BaseLocationManager]
+     * @property locationPermission The [LocationPermission] to use for monitoring location changes.
+     * If passing your own settings pass LocationPermission returned from settingsBuilder when you call [BaseLocationStateRepoBuilder.create]
+     * @property permissions The [Permissions] managing the location permission.
+     * If passing your own settings pass permissions returned from settingsBuilder when you call [BaseLocationStateRepoBuilder.create]
+     * @property autoRequestPermission if `true` the location manager should automatically request permissions if not granted
+     * @property autoEnableLocations if `true` the location manager should automatically enable the location service if disabled
+     * @param locationBufferCapacity the maximum number of location that can be buffered, if exceed oldest is dropped
+     * @param minUpdateDistanceMeters the minimum distance in meters that a location needs to change compared to the last result for a location update to trigger
+     * @param logger the [Logger] to use for logging
      */
     data class Settings(
         val locationPermission: LocationPermission,
@@ -90,7 +162,16 @@ abstract class BaseLocationManager(
         val logger: Logger = RestrictedLogger(RestrictedLogLevel.None)
     )
 
+    /**
+     * Builder for creating a [BaseLocationManager]
+     */
     interface Builder {
+
+        /**
+         * Creates a [BaseLocationManager]
+         * @param settings the [Settings] to configure the location manager
+         * @param coroutineScope the [CoroutineScope] the location manager runs on
+         */
         fun create(
             settings: Settings,
             coroutineScope: CoroutineScope
@@ -109,7 +190,7 @@ abstract class BaseLocationManager(
     protected val sharedLocations = MutableSharedFlow<Location.KnownLocation>(replay = 0, extraBufferCapacity = settings.locationBufferCapacity, onBufferOverflow = BufferOverflow.DROP_OLDEST)
     override val locations: Flow<Location.KnownLocation> = sharedLocations.asSharedFlow()
 
-    abstract val locationMonitor: LocationMonitor
+    protected abstract val locationMonitor: LocationMonitor
 
     private val permissionsLock = Mutex()
     private var monitoringPermissionsJob: Job? = null
@@ -187,8 +268,8 @@ abstract class BaseLocationManager(
         }
     }
 
-    fun handleLocationChanged(location: Location.KnownLocation) = handleLocationChanged(listOf(location))
-    fun handleLocationChanged(locations: List<Location.KnownLocation>) {
+    protected open fun handleLocationChanged(location: Location.KnownLocation) = handleLocationChanged(listOf(location))
+    protected open fun handleLocationChanged(locations: List<Location.KnownLocation>) {
         locations.forEach { location ->
             logger.info(LOG_TAG) { "Location changed to $location" }
             sharedLocations.tryEmit(location) // buffer is DROP_OLDEST so this will always return `true`
@@ -202,6 +283,6 @@ abstract class BaseLocationManager(
 }
 
 /**
- * A manager for tracking the user's [Location]
+ * A default implementation of [BaseLocationManager]
  */
 expect class DefaultLocationManager : BaseLocationManager
diff --git a/location/src/commonMain/kotlin/location/LocationMonitor.kt b/location/src/commonMain/kotlin/location/LocationMonitor.kt
index 6b853284a..a9e1c8b87 100644
--- a/location/src/commonMain/kotlin/location/LocationMonitor.kt
+++ b/location/src/commonMain/kotlin/location/LocationMonitor.kt
@@ -19,8 +19,20 @@ package com.splendo.kaluga.location
 
 import com.splendo.kaluga.service.ServiceMonitor
 
+/**
+ * A [ServiceMonitor] that monitors whether the location service is enabled
+ */
 expect interface LocationMonitor : ServiceMonitor {
+
+    /**
+     * Builder for creating a [LocationMonitor]
+     */
     class Builder {
+
+        /**
+         * Creates the [LocationMonitor]
+         * @return the created [LocationMonitor]
+         */
         fun create(): LocationMonitor
     }
 }
diff --git a/location/src/commonMain/kotlin/location/LocationState.kt b/location/src/commonMain/kotlin/location/LocationState.kt
index 4724a808e..6867c568d 100644
--- a/location/src/commonMain/kotlin/location/LocationState.kt
+++ b/location/src/commonMain/kotlin/location/LocationState.kt
@@ -26,6 +26,8 @@ import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
 import com.splendo.kaluga.base.utils.minus
 import com.splendo.kaluga.base.utils.plus
+import com.splendo.kaluga.permissions.base.PermissionState.Inactive
+import com.splendo.kaluga.permissions.base.PermissionState.Initialized
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -35,55 +37,155 @@ import kotlin.time.Duration.Companion.ZERO
 import kotlin.time.Duration.Companion.seconds
 
 /**
- * State of a [LocationStateRepo]
+ * A [KalugaState] of a [Location]
  */
 sealed interface LocationState : KalugaState {
+
+    /**
+     * The [Location] during this state
+     */
     val location: Location
 
+    /**
+     * A [LocationState] indicating observation is not active
+     */
     sealed interface Inactive : LocationState, SpecialFlowValue.NotImportant
+
+    /**
+     * An [Inactive] State indicating observation has not started yet
+     */
     interface NotInitialized : Inactive
+
+    /**
+     * An [Inactive] State indicating observation has stopped after being started
+     */
     interface Deinitialized : Inactive {
+
+        /**
+         * Transitions into an [Initializing] State
+         */
         val reinitialize: suspend () -> Initializing
     }
 
+    /**
+     * A [LocationState] indicating observation has started
+     */
     sealed interface Active : LocationState {
+
+        /**
+         * Transitions into a [Deinitialized] State
+         */
         val deinitialized: suspend () -> Deinitialized
     }
 
+    /**
+     * An [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
+     */
     interface Initializing : Active, SpecialFlowValue.NotImportant {
+
+        /**
+         * Transitions into an [Initialized] State
+         * @param hasPermission if `true` the [com.splendo.kaluga.permissions.location.LocationPermission] has been granted
+         * @param enabled if `true` the location service is enabled
+         * @return method for transitioning into an [Initialized] State
+         */
         fun initialize(hasPermission: Boolean, enabled: Boolean): suspend () -> Initialized
     }
 
+    /**
+     * An [Active] State indicating observation has started and initialization has completed
+     */
     sealed interface Initialized : Active
+
+    /**
+     * An [Initialized] State indicating the [com.splendo.kaluga.permissions.location.LocationPermission] has been granted
+     */
     sealed interface Permitted : Initialized {
+
+        /**
+         * Transitions into a [Disabled.NotPermitted] State
+         */
         val revokePermission: suspend () -> Disabled.NotPermitted
     }
 
+    /**
+     * An [Initialized] State indicating that location is not being collected
+     */
     sealed interface Disabled : Initialized {
+
+        /**
+         * A [Disabled] State indicating the Location service is disabled
+         */
         interface NoGPS : Disabled, Permitted {
+
+            /**
+             * Transitions into an [Enabled] State
+             */
             val enable: suspend () -> Enabled
         }
 
+        /**
+         * A [Disabled] State indicating the [com.splendo.kaluga.permissions.location.LocationPermission] has not been granted
+         */
         interface NotPermitted : Disabled {
+
+            /**
+             * Transitions into a [Permitted] State
+             * @param enabled if `true` the Location service is enabled
+             * @return method for transition into a [Permitted] State
+             */
             fun permit(enabled: Boolean): suspend () -> Permitted
         }
     }
 
+    /**
+     * A [Permitted] State indicating location is being collected
+     */
     interface Enabled : Permitted {
+
+        /**
+         * Transitions into a [Disabled.NoGPS] State
+         */
         val disable: suspend () -> Disabled.NoGPS
+
+        /**
+         * Transitions into an [Enabled] State with a new [Location.KnownLocation]
+         * @param location the new [Location.KnownLocation]
+         * @return method for transitioning into an [Enabled] State with the new [location]
+         */
         fun updateWithLocation(location: Location.KnownLocation): suspend () -> Enabled
     }
 }
 
+/**
+ * State of a [Location] closely matching [LocationState]
+ */
 sealed class LocationStateImpl {
 
+    /**
+     * The [Location] during this state
+     */
     abstract val location: Location
 
+    /**
+     * A [LocationStateImpl] State indicating observation has not started yet
+     */
     object NotInitialized : LocationStateImpl(), LocationState.NotInitialized {
         override val location: Location = Location.UnknownLocation.WithoutLastLocation(Location.UnknownLocation.Reason.NOT_CLEAR)
-        fun startInitializing(locationManager: LocationManager): suspend () -> LocationState.Initializing = { Initializing(location, locationManager) }
+
+        /**
+         * Transitions into an [Initializing] State
+         * @param locationManager the [LocationManager] to manage the [Location]
+         * @return method for transitioning into an [Initializing] State
+         */
+        fun startInitializing(locationManager: LocationManager): suspend () -> Initializing = { Initializing(location, locationManager) }
     }
 
+    /**
+     * An [LocationStateImpl] State indicating observation has stopped after being started
+     * @param location the [Location] during this state
+     * @param locationManager the [LocationManager] managing the [Location]
+     */
     data class Deinitialized(
         override val location: Location,
         internal val locationManager: LocationManager
@@ -91,11 +193,17 @@ sealed class LocationStateImpl {
         override val reinitialize: suspend () -> LocationState.Initializing = { Initializing(location, locationManager) }
     }
 
+    /**
+     * An [LocationStateImpl] State indicating observation has started
+     */
     sealed class Active : LocationStateImpl(), HandleBeforeOldStateIsRemoved<LocationState>, HandleAfterNewStateIsSet<LocationState> {
 
         protected abstract val locationManager: LocationManager
 
-        val deinitialized: suspend () -> LocationState.Deinitialized = { Deinitialized(location, locationManager) }
+        /**
+         * Transitions into a [Deinitialized] State
+         */
+        val deinitialized: suspend () -> Deinitialized = { Deinitialized(location, locationManager) }
 
         override suspend fun beforeOldStateIsRemoved(oldState: LocationState) {
             when (oldState) {
@@ -112,13 +220,18 @@ sealed class LocationStateImpl {
         }
     }
 
+    /**
+     * Handles changes to [com.splendo.kaluga.permissions.location.LocationPermission]
+     * @param location the [Location] during this state
+     * @param locationManager the [LocationManager] managing the [Location]
+     */
     class PermittedHandler(val location: Location, private val locationManager: LocationManager) {
 
-        val revokePermission: suspend () -> Disabled.NotPermitted = {
+        internal val revokePermission: suspend () -> Disabled.NotPermitted = {
             Disabled.NotPermitted(location, locationManager)
         }
 
-        suspend fun afterNewStateIsSet(newState: LocationState) {
+        internal suspend fun afterNewStateIsSet(newState: LocationState) {
             when (newState) {
                 is LocationState.Inactive,
                 is LocationState.Initializing,
@@ -127,7 +240,7 @@ sealed class LocationStateImpl {
             }
         }
 
-        suspend fun beforeOldStateIsRemoved(oldState: LocationState) {
+        internal suspend fun beforeOldStateIsRemoved(oldState: LocationState) {
             when (oldState) {
                 is LocationState.Inactive,
                 is LocationState.Initializing,
@@ -137,6 +250,11 @@ sealed class LocationStateImpl {
         }
     }
 
+    /**
+     * An [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
+     * @param location the [Location] during this state
+     * @param locationManager the [LocationManager] managing the [Location]
+     */
     data class Initializing(override val location: Location, override val locationManager: LocationManager) : Active(), LocationState.Initializing {
 
         override fun initialize(hasPermission: Boolean, enabled: Boolean): suspend () -> LocationState.Initialized = suspend {
@@ -149,42 +267,36 @@ sealed class LocationStateImpl {
     }
 
     /**
-     * A [LocationState] that is not actively fetching new [Location]s.
+     * An [Active] State indicating that location is not being collected
      */
     sealed class Disabled : Active() {
 
         /**
-         * A [LocationState.Disabled] that was disabled due to missing permissions.
+         * A [Disabled] State indicating the [com.splendo.kaluga.permissions.location.LocationPermission] has not been granted
+         * @param lastKnownLocation the previous [Location]
+         * @param locationManager the [LocationManager] managing the [Location]
          */
         class NotPermitted(lastKnownLocation: Location, override val locationManager: LocationManager) : Disabled(), LocationState.Disabled.NotPermitted {
 
             override val location: Location = lastKnownLocation.unknownLocationOf(Location.UnknownLocation.Reason.PERMISSION_DENIED)
 
-            /**
-             * Transforms this state into [LocationState] that has sufficient permissions
-             * @param enabled `true` if GPS is turned on, `false` otherwise.
-             */
             override fun permit(enabled: Boolean): suspend () -> LocationState.Permitted = {
                 if (enabled) Enabled(location.known.orUnknown, locationManager) else NoGPS(location, locationManager)
             }
         }
 
         /**
-         * A [LocationState.Disabled] that was disabled due to GPS being turned off.
+         * A [Disabled] State indicating the Location service is disabled
+         * @param lastKnownLocation the previous [Location]
+         * @param locationManager the [LocationManager] managing the [Location]
          */
         class NoGPS(lastKnownLocation: Location, override val locationManager: LocationManager) : Disabled(), LocationState.Disabled.NoGPS {
 
             override val location: Location = lastKnownLocation.unknownLocationOf(Location.UnknownLocation.Reason.NO_GPS)
             private val permittedHandler = PermittedHandler(location, locationManager)
 
-            /**
-             * Transforms this state into a [LocationState.Disabled.NotPermitted] state.
-             */
             override val revokePermission: suspend () -> NotPermitted = permittedHandler.revokePermission
 
-            /**
-             * Transforms this state into a [LocationState.Enabled] state.
-             */
             override val enable: suspend () -> Enabled = {
                 Enabled(location.known.orUnknown, locationManager)
             }
@@ -202,20 +314,15 @@ sealed class LocationStateImpl {
     }
 
     /**
-     * A [LocationState] that is actively updating its [Location].
+     * An [Active] State indicating location is being collected
+     * @param location the [Location] during this state
+     * @param locationManager the [LocationManager] managing the [Location]
      */
     data class Enabled(override val location: Location, override val locationManager: LocationManager) : Active(), LocationState.Enabled {
 
         private val permittedHandler = PermittedHandler(location, locationManager)
 
-        /**
-         * Transforms this state into a [LocationState.Disabled.NotPermitted] state.
-         */
         override val revokePermission: suspend () -> Disabled.NotPermitted = permittedHandler.revokePermission
-
-        /**
-         * Transforms this state into a [LocationState.Disabled.NoGPS] state.
-         */
         override val disable: suspend () -> Disabled.NoGPS = {
             Disabled.NoGPS(location, locationManager)
         }
@@ -246,6 +353,7 @@ sealed class LocationStateImpl {
 
 /**
  * Transforms a [Flow] of [LocationState] into a flow of its associated [Location]
+ * @return the [Flow] of [Location] associated with the [LocationState]
  */
 fun Flow<LocationState>.location(): Flow<Location> {
     return this.filterOnlyImportant().map { it.location }
@@ -256,6 +364,7 @@ fun Flow<LocationState>.location(): Flow<Location> {
  *
  * @param maxAge Controls both the max age of a location by filtering out locations that are older and
  * is used to set a timeout for the last emission that will emit null when triggered
+ * @return a [Flow] of the [Location.KnownLocation] associated with the [LocationState], emitting `null` if the [maxAge] is reached.
  */
 fun Flow<Location>.known(maxAge: Duration = 0.seconds) = known(maxAge) { DefaultKalugaDate.now() }
 
diff --git a/location/src/commonMain/kotlin/location/LocationStateRepo.kt b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
index cac6e6154..709b8d008 100644
--- a/location/src/commonMain/kotlin/location/LocationStateRepo.kt
+++ b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
@@ -18,14 +18,12 @@
 package com.splendo.kaluga.location
 
 import com.splendo.kaluga.base.singleThreadDispatcher
-import com.splendo.kaluga.permissions.base.Permissions
-import com.splendo.kaluga.permissions.location.LocationPermission
 import com.splendo.kaluga.base.state.ColdStateFlowRepo
-import com.splendo.kaluga.base.state.ColdStateRepo
 import com.splendo.kaluga.base.state.StateRepo
+import com.splendo.kaluga.permissions.base.Permissions
+import com.splendo.kaluga.permissions.location.LocationPermission
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
@@ -33,17 +31,27 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A [StateRepo]/[MutableStateFlow] of [LocationState]
+ */
 typealias LocationStateFlowRepo = StateRepo<LocationState, MutableStateFlow<LocationState>>
 
 private val defaultLocationDispatcher by lazy {
     singleThreadDispatcher("Location")
 }
 
+/**
+ * An abstract [ColdStateFlowRepo] for managing [LocationState]
+ * @param createNotInitializedState method for creating the initial [LocationState.NotInitialized] State
+ * @param createInitializingState method for transitioning from a [LocationState.Inactive] into a [LocationState.Initializing] given an implementation of this [ColdStateFlowRepo]
+ * @param createDeinitializingState method for transitioning from a [LocationState.Active] into a [LocationState.Deinitialized] given an implementation of this [ColdStateFlowRepo]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine.
+ */
 abstract class BaseLocationStateRepo(
     createNotInitializedState: () -> LocationState.NotInitialized,
-    createInitializingState: suspend ColdStateFlowRepo<LocationState>.(LocationState.Inactive) -> suspend () -> LocationState,
+    createInitializingState: suspend ColdStateFlowRepo<LocationState>.(LocationState.Inactive) -> suspend () -> LocationState.Initializing,
     createDeinitializingState: suspend ColdStateFlowRepo<LocationState>.(LocationState.Active) -> suspend () -> LocationState.Deinitialized,
-    coroutineContext: CoroutineContext = Dispatchers.Main.immediate
+    coroutineContext: CoroutineContext
 ) : ColdStateFlowRepo<LocationState>(
     coroutineContext = coroutineContext,
     initChangeStateWithRepo = { state, repo ->
@@ -63,9 +71,14 @@ abstract class BaseLocationStateRepo(
     firstState = createNotInitializedState
 )
 
+/**
+ * A [BaseLocationStateRepo] managed using a [LocationManager]
+ * @param createLocationManager method for creating the [LocationManager] to manage the [LocationState]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine.
+ */
 open class LocationStateImplRepo(
     createLocationManager: suspend () -> LocationManager,
-    coroutineContext: CoroutineContext = Dispatchers.Main.immediate
+    coroutineContext: CoroutineContext
 ) : BaseLocationStateRepo(
     createNotInitializedState = { LocationStateImpl.NotInitialized },
     createInitializingState = { state ->
@@ -85,7 +98,8 @@ open class LocationStateImplRepo(
     createDeinitializingState = { state ->
         (this as LocationStateImplRepo).superVisorJob.cancelChildren()
         state.deinitialized
-    }
+    },
+    coroutineContext = coroutineContext
 ) {
 
     private val superVisorJob = SupervisorJob(coroutineContext[Job])
@@ -126,13 +140,10 @@ open class LocationStateImplRepo(
 }
 
 /**
- * A [ColdStateRepo] that tracks the [LocationState] of the user.
- * Since this is a coldStateRepo location changes will only be requested when there is at least one observer.
- * @param settingsBuilder A function that creates the [BaseLocationManager.Settings] used for this Location State Repo.
- * @param builder
- * @param autoRequestPermission If 'true` the user will automatically receive a request to provide permissions when missing. Set this to `false` if manual permission requests are required.
- * @param autoEnableLocations If `true` the user will automatically receive a request to enable GPS if it is disabled. Set this to `false` if manual gps enabling is required.
- * @param locationManagerBuilder The [BaseLocationManager.Builder] to create the [LocationManager] managing the location state.
+ * A [LocationStateImplRepo] using a [BaseLocationManager]
+ * @param settingsBuilder method for creating [BaseLocationManager.Settings]
+ * @param builder the [BaseLocationManager.Builder] for building a [BaseLocationManager]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine
  */
 class LocationStateRepo(
     settingsBuilder: suspend (CoroutineContext) -> BaseLocationManager.Settings,
@@ -148,11 +159,25 @@ class LocationStateRepo(
     coroutineContext = coroutineContext,
 )
 
+/**
+ * Builder for creating a [LocationStateRepo]
+ */
 interface BaseLocationStateRepoBuilder {
+
+    /**
+     * Creates the [LocationStateRepo]
+     * @param locationPermission the [LocationPermission] to use while monitoring the location
+     * @param settingsBuilder method for creating [BaseLocationManager.Settings] using a [LocationPermission] and [Permissions]
+     * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine
+     */
     fun create(
         locationPermission: LocationPermission,
         settingsBuilder: (LocationPermission, Permissions) -> BaseLocationManager.Settings = { permission, permissions -> BaseLocationManager.Settings(permission, permissions) },
         coroutineContext: CoroutineContext = defaultLocationDispatcher
     ): LocationStateRepo
 }
+
+/**
+ * Default [BaseLocationStateRepoBuilder]
+ */
 expect class LocationStateRepoBuilder : BaseLocationStateRepoBuilder
diff --git a/location/src/iosMain/kotlin/location/CLLocationExtensions.kt b/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
index 553881d3e..39cfa3272 100644
--- a/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
+++ b/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
@@ -24,6 +24,9 @@ import platform.CoreLocation.CLLocation
 import platform.Foundation.timeIntervalSince1970
 import kotlin.time.Duration.Companion.seconds
 
+/**
+ * The [Location.KnownLocation] of a [CLLocation]
+ */
 val CLLocation.knownLocation
     get() = coordinate.useContents {
         Location.KnownLocation(
diff --git a/location/src/iosMain/kotlin/location/LocationManager.kt b/location/src/iosMain/kotlin/location/LocationManager.kt
index ffb10df30..ebef8f4e2 100644
--- a/location/src/iosMain/kotlin/location/LocationManager.kt
+++ b/location/src/iosMain/kotlin/location/LocationManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.location
 
+import com.splendo.kaluga.location.BaseLocationManager.Settings
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.location.LocationPermission
@@ -35,11 +36,19 @@ import platform.Foundation.NSError
 import platform.darwin.NSObject
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A default implementation of [BaseLocationManager]
+ * @param settings the [Settings] to configure this location manager
+ * @param coroutineScope the [CoroutineScope] this location manager runs on
+ */
 actual class DefaultLocationManager(
     settings: Settings,
     coroutineScope: CoroutineScope
 ) : BaseLocationManager(settings, coroutineScope) {
 
+    /**
+     * Builder for creating a [DefaultLocationManager]
+     */
     class Builder : BaseLocationManager.Builder {
 
         override fun create(
@@ -109,18 +118,32 @@ actual class DefaultLocationManager(
     }
 }
 
+/**
+ * Default [BaseLocationStateRepoBuilder]
+ * @param permissionsBuilder a method for creating the [Permissions] object to manage the Location permissions.
+ * Needs to have [com.splendo.kaluga.permissions.location.LocationPermission] registered.
+ */
 actual class LocationStateRepoBuilder(
-    private val bundle: NSBundle = NSBundle.mainBundle,
-    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
-        Permissions(
-            PermissionsBuilder(bundle).apply {
-                registerLocationPermissionIfNotRegistered()
-            },
-            context
-        )
-    }
+    private val permissionsBuilder: suspend (CoroutineContext) -> Permissions
 ) : BaseLocationStateRepoBuilder {
 
+    /**
+     * Constructor
+     * @param bundle the [NSBundle]
+     */
+    constructor(
+        bundle: NSBundle = NSBundle.mainBundle
+    ) : this(
+        { context ->
+            Permissions(
+                PermissionsBuilder(bundle).apply {
+                    registerLocationPermissionIfNotRegistered()
+                },
+                context
+            )
+        }
+    )
+
     override fun create(
         locationPermission: LocationPermission,
         settingsBuilder: (LocationPermission, Permissions) -> BaseLocationManager.Settings,
diff --git a/location/src/iosMain/kotlin/location/LocationMonitor.kt b/location/src/iosMain/kotlin/location/LocationMonitor.kt
index 2caeeeaad..3cd0195e2 100644
--- a/location/src/iosMain/kotlin/location/LocationMonitor.kt
+++ b/location/src/iosMain/kotlin/location/LocationMonitor.kt
@@ -23,16 +23,32 @@ import platform.CoreLocation.CLLocationManager
 import platform.CoreLocation.CLLocationManagerDelegateProtocol
 import platform.darwin.NSObject
 
+/**
+ * A [ServiceMonitor] that monitors whether the location service is enabled
+ */
 actual interface LocationMonitor : ServiceMonitor {
+
+    /**
+     * Builder for creating a [LocationMonitor]
+     */
     actual class Builder(
         val locationManager: CLLocationManager = CLLocationManager()
     ) {
+
+        /**
+         * Creates the [LocationMonitor]
+         * @return the created [LocationMonitor]
+         */
         actual fun create(): LocationMonitor = DefaultLocationMonitor(
             locationManager = locationManager
         )
     }
 }
 
+/**
+ * Default implementation of [LocationMonitor]
+ * @param locationManager the [CLLocationManager] to manage the location
+ */
 class DefaultLocationMonitor(private val locationManager: CLLocationManager) : DefaultServiceMonitor(), LocationMonitor {
 
     internal class LocationManagerDelegate(
diff --git a/location/src/jsMain/kotlin/LocationManager.kt b/location/src/jsMain/kotlin/LocationManager.kt
index 98f5a71f8..b3ec8c49b 100644
--- a/location/src/jsMain/kotlin/LocationManager.kt
+++ b/location/src/jsMain/kotlin/LocationManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.location
 
+import com.splendo.kaluga.location.BaseLocationManager.Settings
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.location.LocationPermission
@@ -24,11 +25,19 @@ import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRe
 import kotlinx.coroutines.CoroutineScope
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A default implementation of [BaseLocationManager]
+ * @param settings the [Settings] to configure this location manager
+ * @param coroutineScope the [CoroutineScope] this location manager runs on
+ */
 actual class DefaultLocationManager(
     settings: Settings,
     coroutineScope: CoroutineScope
 ) : BaseLocationManager(settings, coroutineScope) {
 
+    /**
+     * Builder for creating a [DefaultLocationManager]
+     */
     class Builder : BaseLocationManager.Builder {
         override fun create(
             settings: Settings,
@@ -53,6 +62,11 @@ actual class DefaultLocationManager(
     }
 }
 
+/**
+ * Default [BaseLocationStateRepoBuilder]
+ * @param permissionsBuilder a method for creating the [Permissions] object to manage the Location permissions.
+ * Needs to have [com.splendo.kaluga.permissions.location.LocationPermission] registered.
+ */
 actual class LocationStateRepoBuilder(
     private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
diff --git a/location/src/jsMain/kotlin/LocationMonitor.kt b/location/src/jsMain/kotlin/LocationMonitor.kt
index 651e4365d..f31d19aec 100644
--- a/location/src/jsMain/kotlin/LocationMonitor.kt
+++ b/location/src/jsMain/kotlin/LocationMonitor.kt
@@ -20,13 +20,27 @@ package com.splendo.kaluga.location
 import com.splendo.kaluga.service.DefaultServiceMonitor
 import com.splendo.kaluga.service.ServiceMonitor
 
+/**
+ * A [ServiceMonitor] that monitors whether the location service is enabled
+ */
 actual interface LocationMonitor : ServiceMonitor {
 
+    /**
+     * Builder for creating a [LocationMonitor]
+     */
     actual class Builder {
+
+        /**
+         * Creates the [LocationMonitor]
+         * @return the created [LocationMonitor]
+         */
         actual fun create(): LocationMonitor = DefaultLocationMonitor()
     }
 }
 
+/**
+ * Default implementation of [LocationMonitor]
+ */
 class DefaultLocationMonitor : DefaultServiceMonitor(), LocationMonitor {
     override val isServiceEnabled: Boolean
         get() = TODO("Not yet implemented")
diff --git a/location/src/jvmMain/kotlin/LocationManager.kt b/location/src/jvmMain/kotlin/LocationManager.kt
index 98f5a71f8..b3ec8c49b 100644
--- a/location/src/jvmMain/kotlin/LocationManager.kt
+++ b/location/src/jvmMain/kotlin/LocationManager.kt
@@ -17,6 +17,7 @@
 
 package com.splendo.kaluga.location
 
+import com.splendo.kaluga.location.BaseLocationManager.Settings
 import com.splendo.kaluga.permissions.base.Permissions
 import com.splendo.kaluga.permissions.base.PermissionsBuilder
 import com.splendo.kaluga.permissions.location.LocationPermission
@@ -24,11 +25,19 @@ import com.splendo.kaluga.permissions.location.registerLocationPermissionIfNotRe
 import kotlinx.coroutines.CoroutineScope
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A default implementation of [BaseLocationManager]
+ * @param settings the [Settings] to configure this location manager
+ * @param coroutineScope the [CoroutineScope] this location manager runs on
+ */
 actual class DefaultLocationManager(
     settings: Settings,
     coroutineScope: CoroutineScope
 ) : BaseLocationManager(settings, coroutineScope) {
 
+    /**
+     * Builder for creating a [DefaultLocationManager]
+     */
     class Builder : BaseLocationManager.Builder {
         override fun create(
             settings: Settings,
@@ -53,6 +62,11 @@ actual class DefaultLocationManager(
     }
 }
 
+/**
+ * Default [BaseLocationStateRepoBuilder]
+ * @param permissionsBuilder a method for creating the [Permissions] object to manage the Location permissions.
+ * Needs to have [com.splendo.kaluga.permissions.location.LocationPermission] registered.
+ */
 actual class LocationStateRepoBuilder(
     private val permissionsBuilder: suspend (CoroutineContext) -> Permissions = { context ->
         Permissions(
diff --git a/location/src/jvmMain/kotlin/LocationMonitor.kt b/location/src/jvmMain/kotlin/LocationMonitor.kt
index 651e4365d..f31d19aec 100644
--- a/location/src/jvmMain/kotlin/LocationMonitor.kt
+++ b/location/src/jvmMain/kotlin/LocationMonitor.kt
@@ -20,13 +20,27 @@ package com.splendo.kaluga.location
 import com.splendo.kaluga.service.DefaultServiceMonitor
 import com.splendo.kaluga.service.ServiceMonitor
 
+/**
+ * A [ServiceMonitor] that monitors whether the location service is enabled
+ */
 actual interface LocationMonitor : ServiceMonitor {
 
+    /**
+     * Builder for creating a [LocationMonitor]
+     */
     actual class Builder {
+
+        /**
+         * Creates the [LocationMonitor]
+         * @return the created [LocationMonitor]
+         */
         actual fun create(): LocationMonitor = DefaultLocationMonitor()
     }
 }
 
+/**
+ * Default implementation of [LocationMonitor]
+ */
 class DefaultLocationMonitor : DefaultServiceMonitor(), LocationMonitor {
     override val isServiceEnabled: Boolean
         get() = TODO("Not yet implemented")
diff --git a/review/src/androidLibMain/kotlin/ReviewManager.kt b/review/src/androidLibMain/kotlin/ReviewManager.kt
index f0457dab8..6b36176ab 100644
--- a/review/src/androidLibMain/kotlin/ReviewManager.kt
+++ b/review/src/androidLibMain/kotlin/ReviewManager.kt
@@ -72,6 +72,7 @@ actual class ReviewManager(
 
         /**
          * Creates a [ReviewManager]
+         * @return the created [ReviewManager]
          */
         actual fun create(): ReviewManager = ReviewManager(type.reviewManager(context), lifecycleManagerObserver)
     }
diff --git a/review/src/commonMain/kotlin/ReviewManager.kt b/review/src/commonMain/kotlin/ReviewManager.kt
index ed337e008..decf7412b 100644
--- a/review/src/commonMain/kotlin/ReviewManager.kt
+++ b/review/src/commonMain/kotlin/ReviewManager.kt
@@ -32,6 +32,7 @@ expect class ReviewManager {
 
         /**
          * Creates a [ReviewManager]
+         * @return the created [ReviewManager]
          */
         fun create(): ReviewManager
     }
diff --git a/review/src/iosMain/kotlin/ReviewManager.kt b/review/src/iosMain/kotlin/ReviewManager.kt
index ce0b77415..a83b0b7a0 100644
--- a/review/src/iosMain/kotlin/ReviewManager.kt
+++ b/review/src/iosMain/kotlin/ReviewManager.kt
@@ -33,6 +33,7 @@ actual class ReviewManager {
 
         /**
          * Creates a [ReviewManager]
+         * @return the created [ReviewManager]
          */
         actual fun create() = ReviewManager()
     }
diff --git a/review/src/jsMain/kotlin/ReviewManager.kt b/review/src/jsMain/kotlin/ReviewManager.kt
index 58ded7cdd..d2f9a9bdb 100644
--- a/review/src/jsMain/kotlin/ReviewManager.kt
+++ b/review/src/jsMain/kotlin/ReviewManager.kt
@@ -32,6 +32,7 @@ actual class ReviewManager {
 
         /**
          * Creates a [ReviewManager]
+         * @return the created [ReviewManager]
          */
         actual fun create() = ReviewManager()
     }
diff --git a/review/src/jvmMain/kotlin/ReviewManager.kt b/review/src/jvmMain/kotlin/ReviewManager.kt
index 57c833aa6..20b695a71 100644
--- a/review/src/jvmMain/kotlin/ReviewManager.kt
+++ b/review/src/jvmMain/kotlin/ReviewManager.kt
@@ -31,6 +31,7 @@ actual class ReviewManager {
 
         /**
          * Creates a [ReviewManager]
+         * @return the created [ReviewManager]
          */
         actual fun create() = ReviewManager()
     }
diff --git a/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api b/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
index 1f2fe0888..92f1a647e 100644
--- a/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
+++ b/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
@@ -15,6 +15,7 @@ public final class com/splendo/kaluga/test/datetimepicker/MockDateTimePickerPres
 	public synthetic fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun closeWithDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)V
 	public fun dismiss (Z)V
+	public fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public final fun getDismissMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getShowAsyncMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun isPresented ()Z
diff --git a/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api b/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
index 761e795cc..0a76a3a2c 100644
--- a/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
+++ b/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
@@ -3,6 +3,7 @@ public final class com/splendo/kaluga/test/datetimepicker/MockDateTimePickerPres
 	public synthetic fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun closeWithDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)V
 	public fun dismiss (Z)V
+	public fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public final fun getDismissMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getShowAsyncMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun isPresented ()Z
diff --git a/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt b/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
index b047bb282..5601b175a 100644
--- a/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
+++ b/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
@@ -30,7 +30,7 @@ import kotlinx.coroutines.CoroutineScope
  * Mock implementation of [BaseKeyboardManager]
  * @param setupMocks If `true` configure mocks to display the keyboard
  */
-class MockDateTimePickerPresenter(dateTimePicker: DateTimePicker, setupMocks: Boolean = true) : BaseDateTimePickerPresenter(dateTimePicker) {
+class MockDateTimePickerPresenter(public override val dateTimePicker: DateTimePicker, setupMocks: Boolean = true) : BaseDateTimePickerPresenter(dateTimePicker) {
 
     /**
      * Mock implementation of [BaseKeyboardManager.Builder]
diff --git a/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt b/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
index 60eef1c75..d6c29d6cd 100644
--- a/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
+++ b/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
@@ -33,6 +33,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.withTimeout
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 class MockDateTimePickerPresenterTest : UIThreadViewModelTest<MockDateTimePickerPresenterTest.TestContext, MockDateTimePickerPresenterTest.ViewModel>() {
@@ -50,7 +51,7 @@ class MockDateTimePickerPresenterTest : UIThreadViewModelTest<MockDateTimePicker
     fun testMockDateTimePickerPresenter() = testOnUIThread {
         val earliest = DefaultKalugaDate.epoch()
         val latest = DefaultKalugaDate.now()
-        val selected = DefaultKalugaDate.epoch(offsetInMilliseconds = 568623600000)
+        val selected = DefaultKalugaDate.epoch(568623600000.milliseconds)
 
         val done = CompletableDeferred<KalugaDate?>()
         withTimeout(2.seconds) {
diff --git a/test-utils-location/api/androidLib/test-utils-location.api b/test-utils-location/api/androidLib/test-utils-location.api
index 3f45ad9fd..991758b5b 100644
--- a/test-utils-location/api/androidLib/test-utils-location.api
+++ b/test-utils-location/api/androidLib/test-utils-location.api
@@ -9,7 +9,6 @@ public final class com/splendo/kaluga/test/location/MockBaseLocationManager : co
 	public fun <init> (ZLcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)V
 	public final fun getLocationEnabled ()Lkotlinx/coroutines/flow/MutableStateFlow;
 	public synthetic fun getLocationMonitor ()Lcom/splendo/kaluga/location/LocationMonitor;
-	public fun getLocationMonitor ()Lcom/splendo/kaluga/test/location/MockLocationMonitor;
 	public final fun getRequestEnableLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
@@ -17,6 +16,8 @@ public final class com/splendo/kaluga/test/location/MockBaseLocationManager : co
 	public final fun getStopMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public fun handleLocationChanged (Lcom/splendo/kaluga/location/Location$KnownLocation;)V
+	public fun handleLocationChanged (Ljava/util/List;)V
 	public fun requestEnableLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/test-utils-location/api/jvm/test-utils-location.api b/test-utils-location/api/jvm/test-utils-location.api
index 3a3580b57..bf769c931 100644
--- a/test-utils-location/api/jvm/test-utils-location.api
+++ b/test-utils-location/api/jvm/test-utils-location.api
@@ -2,7 +2,6 @@ public final class com/splendo/kaluga/test/location/MockBaseLocationManager : co
 	public fun <init> (ZLcom/splendo/kaluga/location/BaseLocationManager$Settings;Lkotlinx/coroutines/CoroutineScope;)V
 	public final fun getLocationEnabled ()Lkotlinx/coroutines/flow/MutableStateFlow;
 	public synthetic fun getLocationMonitor ()Lcom/splendo/kaluga/location/LocationMonitor;
-	public fun getLocationMonitor ()Lcom/splendo/kaluga/test/location/MockLocationMonitor;
 	public final fun getRequestEnableLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStartMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
@@ -10,6 +9,8 @@ public final class com/splendo/kaluga/test/location/MockBaseLocationManager : co
 	public final fun getStopMonitoringLocationEnabledMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringLocationMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
 	public final fun getStopMonitoringPermissionsMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
+	public fun handleLocationChanged (Lcom/splendo/kaluga/location/Location$KnownLocation;)V
+	public fun handleLocationChanged (Ljava/util/List;)V
 	public fun requestEnableLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocation (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun startMonitoringLocationEnabled (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt b/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
index d1b33a21b..7852af35d 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationManager.kt
@@ -175,4 +175,12 @@ class MockBaseLocationManager(
     override suspend fun stopMonitoringLocation() {
         stopMonitoringLocationMock.call()
     }
+
+    public override fun handleLocationChanged(location: Location.KnownLocation) {
+        super.handleLocationChanged(location)
+    }
+
+    public override fun handleLocationChanged(locations: List<Location.KnownLocation>) {
+        super.handleLocationChanged(locations)
+    }
 }

From eea02f36de1b435b7b9437cd72bef219c5f62527 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 14 Feb 2023 22:39:27 +0100
Subject: [PATCH 173/227] Fixed return types

---
 .../navigation/result/NavHostResultHandler.kt | 153 +++++++++---------
 1 file changed, 80 insertions(+), 73 deletions(-)

diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
index bbafc22c1..105187b0e 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/NavHostResultHandler.kt
@@ -60,13 +60,14 @@ class NavHostResultHandler<ViewModel : BaseLifecycleViewModel, Result>(
  * @param Row the type of [NavigationBundleSpecRow] associated with this [NavigationBundleSpec]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel, Row : NavigationBundleSpecRow<*>> NavigationBundleSpec<Row>.NavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(NavigationBundle<Row>) -> Unit
-) {
+): NavHostResultHandler<ViewModel, NavigationBundle<Row>> {
     val spec = this
-    NavHostResultHandler(ViewModel::class, { HandleResult(spec, retain, it) },  onResult)
+    return NavHostResultHandler(ViewModel::class, { HandleResult(spec, retain, it) },  onResult)
 }
 
 /**
@@ -76,13 +77,14 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, Row : NavigationBundleSp
  * @param T the type of result to expect
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel, T> NavigationBundleSpecType<T>.NavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(T) -> Unit
-) {
+): NavHostResultHandler<ViewModel, T> {
     val spec = this
-    NavHostResultHandler(ViewModel::class, { HandleResult(spec, retain, it) }, onResult)
+    return NavHostResultHandler(ViewModel::class, { HandleResult(spec, retain, it) }, onResult)
 }
 
 /**
@@ -92,6 +94,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, T> NavigationBundleSpecT
  * @param T the type of result to expect
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel, T : Any> NavigationBundleSpecType<T>.NavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -105,6 +108,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, T : Any> NavigationBundl
  * @param T the type of result to expect
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result
+ * @return the [NavHostResultHandler]
  */
 @JvmName("NavHostNullableResultOrNullHandler")
 inline fun <reified ViewModel : BaseLifecycleViewModel, T> NavigationBundleSpecType<T>.NavHostResultOrNullHandler(
@@ -118,13 +122,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, T> NavigationBundleSpecT
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received Boolean
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Boolean) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleBooleanResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleBooleanResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of Boolean or `null`
@@ -132,6 +135,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanNavHostResultHand
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received Boolean or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -144,13 +148,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanNavHostResultOrNu
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [BooleanArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(BooleanArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleBooleanArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleBooleanArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [BooleanArray] or `null`
@@ -158,6 +161,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanArrayNavHostResul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [BooleanArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -170,13 +174,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> BooleanArrayNavHostResul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Byte]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ByteNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Byte) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleByteResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleByteResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Byte] or `null`
@@ -184,6 +187,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ByteNavHostResultHandler
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Byte] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ByteNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -196,13 +200,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ByteNavHostResultOrNullH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [ByteArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ByteArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(ByteArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleByteArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleByteArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [ByteArray] or `null`
@@ -210,6 +213,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ByteArrayNavHostResultHa
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [ByteArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ByteArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -222,13 +226,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ByteArrayNavHostResultOr
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Char]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Char) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleCharResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleCharResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Char] or `null`
@@ -236,6 +239,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharNavHostResultHandler
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Char] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -248,13 +252,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharNavHostResultOrNullH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [CharArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(CharArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleCharArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleCharArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [CharArray] or `null`
@@ -262,6 +265,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharArrayNavHostResultHa
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [CharArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -275,13 +279,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharArrayNavHostResultOr
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [CharSequence]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharSequenceNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(CharSequence) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleCharSequenceResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleCharSequenceResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [CharSequence] or `null`
@@ -289,6 +292,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharSequenceNavHostResul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [CharSequence] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> CharSequenceNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -301,13 +305,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> CharSequenceNavHostResul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [KalugaDate]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DateNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(KalugaDate) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleDateResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleDateResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [KalugaDate] or `null`
@@ -315,6 +318,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DateNavHostResultHandler
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [KalugaDate] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DateNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -327,13 +331,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DateNavHostResultOrNullH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received list of [KalugaDate]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DateArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(List<KalugaDate>) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleDateArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleDateArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of a List of [KalugaDate] or `null`
@@ -341,6 +344,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DateArrayNavHostResultHa
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received list of [KalugaDate] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DateArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -353,13 +357,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DateArrayNavHostResultOr
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Double]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Double) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleDoubleResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleDoubleResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Double] or `null`
@@ -367,6 +370,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleNavHostResultHandl
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Double] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -379,13 +383,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleNavHostResultOrNul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [DoubleArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(DoubleArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleDoubleArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleDoubleArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [DoubleArray] or `null`
@@ -393,6 +396,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleArrayNavHostResult
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [DoubleArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -405,13 +409,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> DoubleArrayNavHostResult
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Float]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> FloatNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Float) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleFloatResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleFloatResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Float] or `null`
@@ -419,6 +422,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> FloatNavHostResultHandle
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Float] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> FloatNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -431,13 +435,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> FloatNavHostResultOrNull
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [FloatArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> FloatArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(FloatArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleFloatArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleFloatArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [FloatArray] or `null`
@@ -445,6 +448,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> FloatArrayNavHostResultH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [FloatArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> FloatArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -457,13 +461,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> FloatArrayNavHostResultO
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Int]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> IntNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Int) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleIntResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleIntResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Int] or `null`
@@ -471,6 +474,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> IntNavHostResultHandler(
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Int] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> IntNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -483,13 +487,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> IntNavHostResultOrNullHa
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [IntArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> IntArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(IntArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleIntArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleIntArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [IntArray] or `null`
@@ -497,6 +500,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> IntArrayNavHostResultHan
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [IntArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> IntArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -509,13 +513,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> IntArrayNavHostResultOrN
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Long]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> LongNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Long) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleLongResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleLongResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Long] or `null`
@@ -523,6 +526,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> LongNavHostResultHandler
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Long] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> LongNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -535,13 +539,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> LongNavHostResultOrNullH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [LongArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> LongArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(LongArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleLongArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleLongArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [LongArray] or `null`
@@ -549,6 +552,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> LongArrayNavHostResultHa
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [LongArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> LongArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -561,13 +565,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> LongArrayNavHostResultOr
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Short]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ShortNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(Short) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleShortResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleShortResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [Short] or `null`
@@ -575,6 +578,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ShortNavHostResultHandle
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [Short] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ShortNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -587,13 +591,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ShortNavHostResultOrNull
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [ShortArray]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ShortArrayNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(ShortArray) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleShortArrayResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleShortArrayResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [ShortArray] or `null`
@@ -601,6 +604,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ShortArrayNavHostResultH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [ShortArray] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> ShortArrayNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -613,13 +617,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> ShortArrayNavHostResultO
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [String]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> StringNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(String) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleStringResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleStringResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of [String] or `null`
@@ -627,6 +630,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> StringNavHostResultHandl
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [String] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> StringNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -639,13 +643,12 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> StringNavHostResultOrNul
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received list of [String]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> StringListNavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(List<String>) -> Unit
-) {
-    NavHostResultHandler(ViewModel::class, { HandleStringListResult(retain, it) }, onResult)
-}
+) = NavHostResultHandler(ViewModel::class, { HandleStringListResult(retain, it) }, onResult)
 
 /**
  * Creates a [NavHostResultHandler] of a list of [String] or `null`
@@ -653,6 +656,7 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> StringListNavHostResultH
  * @param ViewModel the type of [BaseLifecycleViewModel] associated with the [NavHostResultHandler]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received list of [String] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel> StringListNavHostResultOrNullHandler(
     retain: Boolean = false,
@@ -666,13 +670,14 @@ inline fun <reified ViewModel : BaseLifecycleViewModel> StringListNavHostResultO
  * @param T the type of serialized property stored in the result
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [T]
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel, T> KSerializer<T>.NavHostResultHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(T) -> Unit
-) {
+): NavHostResultHandler<ViewModel, T> {
     val serializer = this
-    NavHostResultHandler(ViewModel::class, { HandleResultOfType(serializer, retain, it) }, onResult)
+    return NavHostResultHandler(ViewModel::class, { HandleResultOfType(serializer, retain, it) }, onResult)
 }
 
 /**
@@ -682,13 +687,14 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, T> KSerializer<T>.NavHos
  * @param T the type of serialized property stored in the result
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [T] or `null`
+ * @return the [NavHostResultHandler]
  */
 inline fun <reified ViewModel : BaseLifecycleViewModel, T : Any> KSerializer<T>.NavHostResultOrNullHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(T?) -> Unit
-) {
+): NavHostResultHandler<ViewModel, T?> {
     val serializer = this
-    NavHostResultHandler(ViewModel::class, { HandleResultOfTypeOrNull(serializer, retain, it) }, onResult)
+    return NavHostResultHandler(ViewModel::class, { HandleResultOfTypeOrNull(serializer, retain, it) }, onResult)
 }
 
 /**
@@ -698,12 +704,13 @@ inline fun <reified ViewModel : BaseLifecycleViewModel, T : Any> KSerializer<T>.
  * @param T the type of serialized property stored in the result
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received [T] or `null`
+ * @return the [NavHostResultHandler]
  */
 @JvmName("NavHostNullableResultOrNullHandler")
 inline fun <reified ViewModel : BaseLifecycleViewModel, T> KSerializer<T>.NavHostResultOrNullHandler(
     retain: Boolean = false,
     noinline onResult: ViewModel.(T?) -> Unit
-) {
+): NavHostResultHandler<ViewModel, T?> {
     val serializer = this
-    NavHostResultHandler(ViewModel::class, { HandleResultOfTypeOrNull(serializer, retain, it) }, onResult)
+    return NavHostResultHandler(ViewModel::class, { HandleResultOfTypeOrNull(serializer, retain, it) }, onResult)
 }

From 2cb42b07be5f541316358c715af78be296a5152b Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 14 Feb 2023 22:54:26 +0100
Subject: [PATCH 174/227] Fixes for tests

---
 .../androidLibMain/kotlin/AlertPresenter.kt   |  8 ++++++
 alerts/src/iosMain/kotlin/AlertPresenter.kt   |  8 ++++++
 alerts/src/jsMain/kotlin/AlertPresenter.kt    |  7 +++++
 alerts/src/jvmMain/kotlin/AlertPresenter.kt   |  7 +++++
 .../kotlin/navigation/NavigationBundleTest.kt |  7 ++---
 .../kotlin/text/DateFormatterTest.kt          |  5 ++--
 base/src/commonTest/kotlin/utils/DateTest.kt  |  3 ++-
 .../api/androidLib/date-time-picker.api       |  2 +-
 date-time-picker/api/jvm/date-time-picker.api |  2 +-
 .../src/commonMain/kotlin/DateTimePicker.kt   |  2 +-
 .../commonMain/kotlin/BaseKeyboardManager.kt  |  2 +-
 location/api/jvm/location.api                 | 27 +++++++++++++++++++
 .../kotlin/location/LocationExtensions.kt     |  3 ++-
 .../androidLibMain/kotlin/ReviewManager.kt    |  1 +
 review/src/commonMain/kotlin/ReviewManager.kt |  1 +
 review/src/iosMain/kotlin/ReviewManager.kt    |  1 +
 review/src/jsMain/kotlin/ReviewManager.kt     |  1 +
 review/src/jvmMain/kotlin/ReviewManager.kt    |  1 +
 .../test-utils-date-time-picker.api           |  1 +
 .../api/jvm/test-utils-date-time-picker.api   |  1 +
 .../kotlin/MockDateTimePickerPresenter.kt     |  2 +-
 .../kotlin/MockDateTimePickerPresenterTest.kt |  3 ++-
 22 files changed, 82 insertions(+), 13 deletions(-)

diff --git a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
index 1a6871aeb..972634225 100644
--- a/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/androidLibMain/kotlin/AlertPresenter.kt
@@ -53,6 +53,14 @@ actual class AlertPresenter(
     actual class Builder(
         private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver()
     ) : BaseAlertPresenter.Builder(), ActivityLifecycleSubscribable by lifecycleManagerObserver {
+
+        /**
+         * Creates an [AlertPresenter]
+         *
+         * @param alert The [Alert] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [AlertPresenter]
+         */
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope) =
             AlertPresenter(alert, lifecycleManagerObserver, coroutineScope)
     }
diff --git a/alerts/src/iosMain/kotlin/AlertPresenter.kt b/alerts/src/iosMain/kotlin/AlertPresenter.kt
index 9d4d104eb..a0768420e 100644
--- a/alerts/src/iosMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/iosMain/kotlin/AlertPresenter.kt
@@ -84,6 +84,14 @@ actual class AlertPresenter(
      * @param viewController The [UIViewController] to present any [AlertPresenter] built using this builder.
      */
     actual class Builder(private val viewController: UIViewController) : BaseAlertPresenter.Builder() {
+
+        /**
+         * Creates an [AlertPresenter]
+         *
+         * @param alert The [Alert] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [AlertPresenter]
+         */
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope) = AlertPresenter(alert, viewController)
     }
 
diff --git a/alerts/src/jsMain/kotlin/AlertPresenter.kt b/alerts/src/jsMain/kotlin/AlertPresenter.kt
index 6135478f4..804313751 100644
--- a/alerts/src/jsMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/jsMain/kotlin/AlertPresenter.kt
@@ -36,6 +36,13 @@ actual class AlertPresenter(
      */
     actual class Builder : BaseAlertPresenter.Builder() {
 
+        /**
+         * Creates an [AlertPresenter]
+         *
+         * @param alert The [Alert] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [AlertPresenter]
+         */
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope): AlertPresenter {
             return AlertPresenter(alert)
         }
diff --git a/alerts/src/jvmMain/kotlin/AlertPresenter.kt b/alerts/src/jvmMain/kotlin/AlertPresenter.kt
index f769908aa..d284b8cbd 100644
--- a/alerts/src/jvmMain/kotlin/AlertPresenter.kt
+++ b/alerts/src/jvmMain/kotlin/AlertPresenter.kt
@@ -36,6 +36,13 @@ actual class AlertPresenter(
      */
     actual class Builder : BaseAlertPresenter.Builder() {
 
+        /**
+         * Creates an [AlertPresenter]
+         *
+         * @param alert The [Alert] to be presented with the built presenter.
+         * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
+         * @return The created [AlertPresenter]
+         */
         actual override fun create(alert: Alert, coroutineScope: CoroutineScope): AlertPresenter {
             return AlertPresenter(alert)
         }
diff --git a/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt b/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt
index 9fc0e2dd5..0edae94a5 100644
--- a/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt
+++ b/architecture/src/commonTest/kotlin/navigation/NavigationBundleTest.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.test.base.BaseTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
+import kotlin.time.Duration.Companion.milliseconds
 
 class NavigationBundleTest : BaseTest() {
 
@@ -38,10 +39,10 @@ class NavigationBundleTest : BaseTest() {
         }
         val optionalString: String? = "Some String"
         val optionalFloat: Float? = null
-        val dateValue = DefaultKalugaDate.epoch(offsetInMilliseconds = 1606204800000)
+        val dateValue = DefaultKalugaDate.epoch(1606204800000.milliseconds)
         val dateArray = listOf(
-            DefaultKalugaDate.epoch(offsetInMilliseconds = 1606204800001),
-            DefaultKalugaDate.epoch(offsetInMilliseconds = 1606204800002)
+            DefaultKalugaDate.epoch(1606204800001.milliseconds),
+            DefaultKalugaDate.epoch(1606204800002.milliseconds)
         )
 
         val mockSpec = MockSpec()
diff --git a/base/src/commonTest/kotlin/text/DateFormatterTest.kt b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
index 748628579..1904cb2b5 100644
--- a/base/src/commonTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
@@ -29,6 +29,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
+import kotlin.time.Duration.Companion.milliseconds
 
 class DateFormatterTest {
 
@@ -37,8 +38,8 @@ class DateFormatterTest {
         private val FranceLocale = createLocale("fr", "FR")
         private val PSTTimeZone = TimeZone.get("America/Los_Angeles")!!
 
-        private val January81988 = DefaultKalugaDate.epoch(568627200000)
-        private val March181988 = DefaultKalugaDate.epoch(574695462750)
+        private val January81988 = DefaultKalugaDate.epoch(568627200000.milliseconds)
+        private val March181988 = DefaultKalugaDate.epoch(574695462750.milliseconds)
     }
 
     @Test
diff --git a/base/src/commonTest/kotlin/utils/DateTest.kt b/base/src/commonTest/kotlin/utils/DateTest.kt
index 438dd6f05..2f8958d11 100644
--- a/base/src/commonTest/kotlin/utils/DateTest.kt
+++ b/base/src/commonTest/kotlin/utils/DateTest.kt
@@ -29,6 +29,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 class DateTest {
 
@@ -40,7 +41,7 @@ class DateTest {
         val nearEpoch = DefaultKalugaDate.epoch(1001.milliseconds)
         assertEquals(DefaultKalugaDate.epoch(1001.milliseconds), nearEpoch, "equally created dates should be equal")
 
-        assertEquals(DefaultKalugaDate.epoch(1002.milliseconds), nearEpoch + 1.milliseconds, "Date from addition should be equal")
+        assertEquals(DefaultKalugaDate.epoch(10.seconds), (DefaultKalugaDate.epoch(9.seconds) + 1.seconds), "Date from addition should be equal")
     }
 
     @Test
diff --git a/date-time-picker/api/androidLib/date-time-picker.api b/date-time-picker/api/androidLib/date-time-picker.api
index 123ae6e12..551c77443 100644
--- a/date-time-picker/api/androidLib/date-time-picker.api
+++ b/date-time-picker/api/androidLib/date-time-picker.api
@@ -3,7 +3,7 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 	public fun dismiss (Z)V
 	protected abstract fun dismissDateTimePicker (Z)V
 	public static synthetic fun dismissDateTimePicker$default (Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;ZILjava/lang/Object;)V
-	protected final fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	protected fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public fun show (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun showAsync (ZLkotlin/jvm/functions/Function1;)V
 	protected abstract fun showDateTimePicker (ZLkotlin/jvm/functions/Function1;)V
diff --git a/date-time-picker/api/jvm/date-time-picker.api b/date-time-picker/api/jvm/date-time-picker.api
index 454cb2d00..233b6fc39 100644
--- a/date-time-picker/api/jvm/date-time-picker.api
+++ b/date-time-picker/api/jvm/date-time-picker.api
@@ -3,7 +3,7 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 	public fun dismiss (Z)V
 	protected abstract fun dismissDateTimePicker (Z)V
 	public static synthetic fun dismissDateTimePicker$default (Lcom/splendo/kaluga/datetimepicker/BaseDateTimePickerPresenter;ZILjava/lang/Object;)V
-	protected final fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	protected fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public fun show (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun showAsync (ZLkotlin/jvm/functions/Function1;)V
 	protected abstract fun showDateTimePicker (ZLkotlin/jvm/functions/Function1;)V
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 769933efe..3ef0eb302 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -194,7 +194,7 @@ interface DateTimePickerActions {
  *
  * @param dateTimePicker The [DateTimePicker] to present (and dismiss if needed)
  */
-abstract class BaseDateTimePickerPresenter(protected val dateTimePicker: DateTimePicker) : DateTimePickerActions {
+abstract class BaseDateTimePickerPresenter(protected open val dateTimePicker: DateTimePicker) : DateTimePickerActions {
 
     /**
      * Abstract alert builder class, used to create an [BaseDateTimePickerPresenter].
diff --git a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
index 74451d503..72f30c694 100644
--- a/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
+++ b/keyboard/src/commonMain/kotlin/BaseKeyboardManager.kt
@@ -43,7 +43,7 @@ interface BaseKeyboardManager<FH : FocusHandler> {
          * Creates KeyboardManager object
          *
          * @param coroutineScope The [CoroutineScope] managing the keyboard lifecycle.
-         * @return The KeyboardManager object
+         * @return The created [BaseKeyboardManager]
          */
         fun create(coroutineScope: CoroutineScope): BaseKeyboardManager<FH>
     }
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index f98de0f7c..3c96835c3 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -144,6 +144,33 @@ public final class com/splendo/kaluga/location/Location$KnownLocation : com/sple
 	public fun toString ()Ljava/lang/String;
 }
 
+public abstract class com/splendo/kaluga/location/Location$Time {
+	public synthetic fun <init> (JLkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getMs ()J
+}
+
+public final class com/splendo/kaluga/location/Location$Time$GuessedTime : com/splendo/kaluga/location/Location$Time {
+	public fun <init> (J)V
+	public final fun component1 ()J
+	public final fun copy (J)Lcom/splendo/kaluga/location/Location$Time$GuessedTime;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$Time$GuessedTime;JILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$Time$GuessedTime;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getMs ()J
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/location/Location$Time$MeasuredTime : com/splendo/kaluga/location/Location$Time {
+	public fun <init> (J)V
+	public final fun component1 ()J
+	public final fun copy (J)Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;JILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getMs ()J
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public abstract class com/splendo/kaluga/location/Location$UnknownLocation : com/splendo/kaluga/location/Location {
 	public synthetic fun <init> (Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getReason ()Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;
diff --git a/location/src/androidLibMain/kotlin/location/LocationExtensions.kt b/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
index e7b43d041..acff1c1b8 100644
--- a/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
+++ b/location/src/androidLibMain/kotlin/location/LocationExtensions.kt
@@ -21,6 +21,7 @@ package com.splendo.kaluga.location
 import android.os.Build
 import com.google.android.gms.location.LocationResult
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
+import kotlin.time.Duration.Companion.milliseconds
 
 fun android.location.Location.toKnownLocation(): Location.KnownLocation {
     return Location.KnownLocation(
@@ -30,7 +31,7 @@ fun android.location.Location.toKnownLocation(): Location.KnownLocation {
         horizontalAccuracy = accuracy.toDouble(),
         verticalAccuracy = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) verticalAccuracyMeters.toDouble() else 0.0,
         speed = speed.toDouble(),
-        time = DefaultKalugaDate.epoch(time)
+        time = DefaultKalugaDate.epoch(time.milliseconds)
     )
 }
 
diff --git a/review/src/androidLibMain/kotlin/ReviewManager.kt b/review/src/androidLibMain/kotlin/ReviewManager.kt
index f0457dab8..6b36176ab 100644
--- a/review/src/androidLibMain/kotlin/ReviewManager.kt
+++ b/review/src/androidLibMain/kotlin/ReviewManager.kt
@@ -72,6 +72,7 @@ actual class ReviewManager(
 
         /**
          * Creates a [ReviewManager]
+         * @return the created [ReviewManager]
          */
         actual fun create(): ReviewManager = ReviewManager(type.reviewManager(context), lifecycleManagerObserver)
     }
diff --git a/review/src/commonMain/kotlin/ReviewManager.kt b/review/src/commonMain/kotlin/ReviewManager.kt
index ed337e008..decf7412b 100644
--- a/review/src/commonMain/kotlin/ReviewManager.kt
+++ b/review/src/commonMain/kotlin/ReviewManager.kt
@@ -32,6 +32,7 @@ expect class ReviewManager {
 
         /**
          * Creates a [ReviewManager]
+         * @return the created [ReviewManager]
          */
         fun create(): ReviewManager
     }
diff --git a/review/src/iosMain/kotlin/ReviewManager.kt b/review/src/iosMain/kotlin/ReviewManager.kt
index ce0b77415..a83b0b7a0 100644
--- a/review/src/iosMain/kotlin/ReviewManager.kt
+++ b/review/src/iosMain/kotlin/ReviewManager.kt
@@ -33,6 +33,7 @@ actual class ReviewManager {
 
         /**
          * Creates a [ReviewManager]
+         * @return the created [ReviewManager]
          */
         actual fun create() = ReviewManager()
     }
diff --git a/review/src/jsMain/kotlin/ReviewManager.kt b/review/src/jsMain/kotlin/ReviewManager.kt
index 58ded7cdd..d2f9a9bdb 100644
--- a/review/src/jsMain/kotlin/ReviewManager.kt
+++ b/review/src/jsMain/kotlin/ReviewManager.kt
@@ -32,6 +32,7 @@ actual class ReviewManager {
 
         /**
          * Creates a [ReviewManager]
+         * @return the created [ReviewManager]
          */
         actual fun create() = ReviewManager()
     }
diff --git a/review/src/jvmMain/kotlin/ReviewManager.kt b/review/src/jvmMain/kotlin/ReviewManager.kt
index 57c833aa6..20b695a71 100644
--- a/review/src/jvmMain/kotlin/ReviewManager.kt
+++ b/review/src/jvmMain/kotlin/ReviewManager.kt
@@ -31,6 +31,7 @@ actual class ReviewManager {
 
         /**
          * Creates a [ReviewManager]
+         * @return the created [ReviewManager]
          */
         actual fun create() = ReviewManager()
     }
diff --git a/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api b/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
index 1f2fe0888..92f1a647e 100644
--- a/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
+++ b/test-utils-date-time-picker/api/androidLib/test-utils-date-time-picker.api
@@ -15,6 +15,7 @@ public final class com/splendo/kaluga/test/datetimepicker/MockDateTimePickerPres
 	public synthetic fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun closeWithDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)V
 	public fun dismiss (Z)V
+	public fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public final fun getDismissMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getShowAsyncMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun isPresented ()Z
diff --git a/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api b/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
index 761e795cc..0a76a3a2c 100644
--- a/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
+++ b/test-utils-date-time-picker/api/jvm/test-utils-date-time-picker.api
@@ -3,6 +3,7 @@ public final class com/splendo/kaluga/test/datetimepicker/MockDateTimePickerPres
 	public synthetic fun <init> (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun closeWithDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)V
 	public fun dismiss (Z)V
+	public fun getDateTimePicker ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public final fun getDismissMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun getShowAsyncMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 	public final fun isPresented ()Z
diff --git a/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt b/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
index b047bb282..5601b175a 100644
--- a/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
+++ b/test-utils-date-time-picker/src/commonMain/kotlin/MockDateTimePickerPresenter.kt
@@ -30,7 +30,7 @@ import kotlinx.coroutines.CoroutineScope
  * Mock implementation of [BaseKeyboardManager]
  * @param setupMocks If `true` configure mocks to display the keyboard
  */
-class MockDateTimePickerPresenter(dateTimePicker: DateTimePicker, setupMocks: Boolean = true) : BaseDateTimePickerPresenter(dateTimePicker) {
+class MockDateTimePickerPresenter(public override val dateTimePicker: DateTimePicker, setupMocks: Boolean = true) : BaseDateTimePickerPresenter(dateTimePicker) {
 
     /**
      * Mock implementation of [BaseKeyboardManager.Builder]
diff --git a/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt b/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
index 60eef1c75..d6c29d6cd 100644
--- a/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
+++ b/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
@@ -33,6 +33,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.withTimeout
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 class MockDateTimePickerPresenterTest : UIThreadViewModelTest<MockDateTimePickerPresenterTest.TestContext, MockDateTimePickerPresenterTest.ViewModel>() {
@@ -50,7 +51,7 @@ class MockDateTimePickerPresenterTest : UIThreadViewModelTest<MockDateTimePicker
     fun testMockDateTimePickerPresenter() = testOnUIThread {
         val earliest = DefaultKalugaDate.epoch()
         val latest = DefaultKalugaDate.now()
-        val selected = DefaultKalugaDate.epoch(offsetInMilliseconds = 568623600000)
+        val selected = DefaultKalugaDate.epoch(568623600000.milliseconds)
 
         val done = CompletableDeferred<KalugaDate?>()
         withTimeout(2.seconds) {

From 6e5355700559070cb4033738674fa85e8ad043d0 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 14 Feb 2023 23:04:05 +0100
Subject: [PATCH 175/227] Minor doc fixes

---
 base-permissions/src/commonMain/kotlin/Permission.kt      | 1 +
 base-permissions/src/commonMain/kotlin/PermissionState.kt | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/base-permissions/src/commonMain/kotlin/Permission.kt b/base-permissions/src/commonMain/kotlin/Permission.kt
index 72a20b987..fb699564c 100644
--- a/base-permissions/src/commonMain/kotlin/Permission.kt
+++ b/base-permissions/src/commonMain/kotlin/Permission.kt
@@ -56,6 +56,7 @@ interface PermissionStateRepoBuilder<P : Permission> {
      * Creates a [BasePermissionStateRepo] associated with [permission]
      * @param permission the [P] the resulting [BasePermissionStateRepo] should manage.
      * @param coroutineContext the [CoroutineContext] to manage the [BasePermissionStateRepo]
+     * @return the created [BasePermissionStateRepo]
      */
     fun create(permission: P, coroutineContext: CoroutineContext): BasePermissionStateRepo<P>
 }
diff --git a/base-permissions/src/commonMain/kotlin/PermissionState.kt b/base-permissions/src/commonMain/kotlin/PermissionState.kt
index 10626fc7e..f33ba44b9 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionState.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionState.kt
@@ -76,7 +76,7 @@ sealed interface PermissionState<P : Permission> : KalugaState {
     }
 
     /**
-     * A [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
+     * An [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
      * @param P the type of [Permission] associated with the state
      */
     interface Initializing<P : Permission> : Active<P>, SpecialFlowValue.NotImportant {
@@ -85,12 +85,13 @@ sealed interface PermissionState<P : Permission> : KalugaState {
          * Transitions into an [Initialized] state
          * @param allowed if `true` the permission is currently granted
          * @param locked if `true` and [allowed] is `false`, this indicates the permission can not be requested.
+         * @return the method for transitioning into an [Initialized] State
          */
         fun initialize(allowed: Boolean, locked: Boolean): suspend () -> Initialized<P>
     }
 
     /**
-     * A [Active] State indicating observation has started and initialization has completed
+     * An [Active] State indicating observation has started and initialization has completed
      * @param P the type of [Permission] associated with the state
      */
     sealed interface Initialized<P : Permission> : Active<P>
@@ -104,6 +105,7 @@ sealed interface PermissionState<P : Permission> : KalugaState {
         /**
          * Transitions into a [Denied] State
          * @param locked if `true` this indicates the permission can not be requested again
+         * @return the method for transitioning into a [Denied] State
          */
         fun deny(locked: Boolean): suspend () -> Denied<P>
     }
@@ -173,6 +175,7 @@ sealed class PermissionStateImpl<P : Permission> {
          * Transitions into a [Initializing] state
          * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
          * @param permissionManager the [PermissionManager] managing the [P] if this State
+         * @return method for transitioning into an [Initializing] State
          */
         fun initialize(monitoringInterval: Duration, permissionManager: PermissionManager<P>): suspend () -> Initializing<P> = { Initializing(monitoringInterval, permissionManager) }
     }

From 6456a8f3f3931a4324f825f8a3ae80c0e84849eb Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 15 Feb 2023 10:53:17 +0100
Subject: [PATCH 176/227] Hid some implementation details

---
 .../api/architecture-compose.api              |   2 -
 .../api/androidLib/base-permissions.api       |  96 ------
 base-permissions/api/jvm/base-permissions.api | 102 ------
 .../src/commonMain/kotlin/PermissionState.kt  |   2 +-
 bluetooth/api/androidLib/bluetooth.api        | 279 ----------------
 bluetooth/api/jvm/bluetooth.api               | 297 ------------------
 .../commonMain/kotlin/device/DeviceState.kt   |  81 +----
 .../kotlin/scanner/ScanningState.kt           |  93 +-----
 location/api/androidLib/location.api          |  86 -----
 location/api/jvm/location.api                 |  92 ------
 .../kotlin/location/LocationState.kt          |  55 +---
 11 files changed, 5 insertions(+), 1180 deletions(-)

diff --git a/architecture-compose/api/architecture-compose.api b/architecture-compose/api/architecture-compose.api
index adb6d532f..be19b3b08 100644
--- a/architecture-compose/api/architecture-compose.api
+++ b/architecture-compose/api/architecture-compose.api
@@ -46,7 +46,6 @@ public abstract class com/splendo/kaluga/architecture/compose/navigation/BottomS
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	protected final fun SetupNavigationAction (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/compose/runtime/Composer;I)V
 	protected abstract fun getContentModifier ()Lkotlin/jvm/functions/Function4;
-	public synthetic fun getModifier ()Lkotlin/jvm/functions/Function2;
 	public final fun getModifier ()Lkotlin/jvm/functions/Function4;
 	protected abstract fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/BottomSheetRouteController;
 	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
@@ -218,7 +217,6 @@ public abstract class com/splendo/kaluga/architecture/compose/navigation/Composa
 	public synthetic fun <init> (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	protected final fun SetupNavigationAction (Lcom/splendo/kaluga/architecture/viewmodel/BaseLifecycleViewModel;Landroidx/compose/runtime/Composer;I)V
 	protected abstract fun getContentModifier ()Lkotlin/jvm/functions/Function4;
-	public synthetic fun getModifier ()Lkotlin/jvm/functions/Function2;
 	public final fun getModifier ()Lkotlin/jvm/functions/Function4;
 	protected abstract fun getRouteController ()Lcom/splendo/kaluga/architecture/compose/navigation/RouteController;
 	public fun navigate (Lcom/splendo/kaluga/architecture/navigation/NavigationAction;)V
diff --git a/base-permissions/api/androidLib/base-permissions.api b/base-permissions/api/androidLib/base-permissions.api
index 58b48310a..e07dc0f94 100644
--- a/base-permissions/api/androidLib/base-permissions.api
+++ b/base-permissions/api/androidLib/base-permissions.api
@@ -156,102 +156,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 public abstract interface class com/splendo/kaluga/permissions/base/PermissionState$Uninitialized : com/splendo/kaluga/permissions/base/PermissionState$Inactive {
 }
 
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl {
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Active : com/splendo/kaluga/permissions/base/PermissionStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
-	public abstract fun getMonitoringInterval-UwyO8pc ()J
-	public abstract fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active, com/splendo/kaluga/permissions/base/PermissionState$Allowed {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;
-	public fun deny (Z)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized : com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive, com/splendo/kaluga/permissions/base/PermissionState$Deinitialized {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMonitoringInterval-UwyO8pc ()J
-	public final fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active {
-	public final fun getAllow ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked : com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied, com/splendo/kaluga/permissions/base/PermissionState$Denied$Locked {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun getUnlock ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable : com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied, com/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getLock ()Lkotlin/jvm/functions/Function1;
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun request ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive : com/splendo/kaluga/permissions/base/PermissionStateImpl {
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active, com/splendo/kaluga/permissions/base/PermissionState$Initializing {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Uninitialized : com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive, com/splendo/kaluga/permissions/base/PermissionState$Uninitialized {
-	public fun <init> ()V
-	public final fun initialize-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lkotlin/jvm/functions/Function1;
-}
-
 public final class com/splendo/kaluga/permissions/base/PermissionStateKt {
 	public static final fun request (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
diff --git a/base-permissions/api/jvm/base-permissions.api b/base-permissions/api/jvm/base-permissions.api
index 520547a57..e638120bc 100644
--- a/base-permissions/api/jvm/base-permissions.api
+++ b/base-permissions/api/jvm/base-permissions.api
@@ -160,108 +160,6 @@ public final class com/splendo/kaluga/permissions/base/PermissionState$Uninitial
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Uninitialized;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl {
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Active : com/splendo/kaluga/permissions/base/PermissionStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
-	public abstract fun getMonitoringInterval-UwyO8pc ()J
-	public abstract fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active, com/splendo/kaluga/permissions/base/PermissionState$Allowed {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;
-	public fun deny (Z)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized : com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive, com/splendo/kaluga/permissions/base/PermissionState$Deinitialized {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMonitoringInterval-UwyO8pc ()J
-	public final fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active {
-	public final fun getAllow ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked : com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied, com/splendo/kaluga/permissions/base/PermissionState$Denied$Locked {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun getUnlock ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable : com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied, com/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getLock ()Lkotlin/jvm/functions/Function1;
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun request ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive : com/splendo/kaluga/permissions/base/PermissionStateImpl {
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active, com/splendo/kaluga/permissions/base/PermissionState$Initializing {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Uninitialized : com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive, com/splendo/kaluga/permissions/base/PermissionState$Uninitialized {
-	public fun <init> ()V
-	public final fun initialize-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
 public final class com/splendo/kaluga/permissions/base/PermissionStateKt {
 	public static final fun request (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
diff --git a/base-permissions/src/commonMain/kotlin/PermissionState.kt b/base-permissions/src/commonMain/kotlin/PermissionState.kt
index f33ba44b9..6fd5d4db6 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionState.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionState.kt
@@ -157,7 +157,7 @@ sealed interface PermissionState<P : Permission> : KalugaState {
  * State of a [Permission] closely matching [PermissionState]
  * @param P the type of [Permission] associated with the state
  */
-sealed class PermissionStateImpl<P : Permission> {
+internal sealed class PermissionStateImpl<P : Permission> {
 
     /**
      * A [PermissionStateImpl] indicating observation is not active
diff --git a/bluetooth/api/androidLib/bluetooth.api b/bluetooth/api/androidLib/bluetooth.api
index 302daca9c..27bdb9644 100644
--- a/bluetooth/api/androidLib/bluetooth.api
+++ b/bluetooth/api/androidLib/bluetooth.api
@@ -403,142 +403,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/device/ConnectableD
 	public fun retry (Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings$ReconnectionSettings;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl {
-	protected abstract fun getDeviceConnectionManager ()Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;
-	public final fun getDidDisconnect ()Lkotlin/jvm/functions/Function1;
-	public final fun getDisconnecting ()Lkotlin/jvm/functions/Function1;
-	public final fun unpair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl {
-	public final fun getReconnect ()Lkotlin/jvm/functions/Function1;
-	public final fun pair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun readRssi (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun requestMtu (ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun startDisconnected ()V
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering {
-	public fun <init> (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;
-	public fun didDiscoverServices (Ljava/util/List;)Lkotlin/jvm/functions/Function1;
-	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMtu ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public fun addAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)Lkotlin/jvm/functions/Function1;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun component1 ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
-	public final fun component2 ()Ljava/util/List;
-	public final fun component3 ()Ljava/lang/Integer;
-	public final fun component4 ()Ljava/util/List;
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction;Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction;
-	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
-	public fun getActionCompleted ()Lkotlin/jvm/functions/Function1;
-	public fun getMtu ()Ljava/lang/Integer;
-	public fun getNextActions ()Ljava/util/List;
-	public fun getServices ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Idle {
-	public fun <init> (Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle;
-	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMtu ()Ljava/lang/Integer;
-	public fun getServices ()Ljava/util/List;
-	public fun handleAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$NoServices {
-	public fun <init> (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices;Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices;
-	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDiscoverServices ()Lkotlin/jvm/functions/Function1;
-	public fun getMtu ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun startDiscovering ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getCancelConnection ()Lkotlin/jvm/functions/Function1;
-	public fun getDidConnect ()Lkotlin/jvm/functions/Function1;
-	public fun handleCancel ()V
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnected {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getConnect ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun startConnecting ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting {
-	public fun <init> (ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun component1 ()I
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getAttempt ()I
-	public fun getCancelConnection ()Lkotlin/jvm/functions/Function1;
-	public fun getDidConnect ()Lkotlin/jvm/functions/Function1;
-	public fun getRaiseAttempt ()Lkotlin/jvm/functions/Function1;
-	public fun getServices ()Ljava/util/List;
-	public fun handleCancel ()V
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImplRepo : com/splendo/kaluga/bluetooth/device/BaseConnectableDeviceStateRepo {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;Lkotlin/coroutines/CoroutineContext;)V
 }
@@ -867,10 +731,6 @@ public class com/splendo/kaluga/bluetooth/device/IdentifierSerializer : kotlinx/
 public abstract interface class com/splendo/kaluga/bluetooth/device/NotConnectableDeviceState : com/splendo/kaluga/bluetooth/device/DeviceState {
 }
 
-public final class com/splendo/kaluga/bluetooth/device/NotConnectableDeviceStateImpl : com/splendo/kaluga/bluetooth/device/NotConnectableDeviceState {
-	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/device/NotConnectableDeviceStateImpl;
-}
-
 public final class com/splendo/kaluga/bluetooth/device/SerializableIdentifier {
 	public static final field Companion Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier$Companion;
 	public fun <init> (Ljava/lang/String;)V
@@ -1127,145 +987,6 @@ public abstract interface class com/splendo/kaluga/bluetooth/scanner/ScanningSta
 	public abstract fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl {
-	public static final field Companion Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Companion;
-}
-
-public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
-	public abstract fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public abstract fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public abstract fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Companion {
-	public final fun getNothingFound ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/bluetooth/scanner/ScanningState$Deinitialized {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)V
-	public final fun component1 ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public final fun component2 ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public final fun component3 ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getPreviouslyDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getPreviouslyPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices : com/splendo/kaluga/bluetooth/scanner/ScanningState$Devices {
-	public fun <init> (Ljava/util/List;Ljava/util/Set;)V
-	public fun <init> (Ljava/util/Set;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun component2 ()Ljava/util/Set;
-	public final fun copy (Ljava/util/List;Ljava/util/Set;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;Ljava/util/List;Ljava/util/Set;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-	public synthetic fun copyAndAdd (Lcom/splendo/kaluga/bluetooth/device/Device;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun copyAndAdd (Lcom/splendo/kaluga/bluetooth/device/Device;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-	public fun equals (Ljava/lang/Object;)Z
-	public synthetic fun foundForFilter (Ljava/util/Set;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun foundForFilter (Ljava/util/Set;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-	public fun getDevices ()Ljava/util/List;
-	public fun getFilter ()Ljava/util/Set;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDisable ()Lkotlin/jvm/functions/Function1;
-	protected abstract fun getPermittedHandler ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$PermittedHandler;
-	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Idle : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun pairedDevices (Ljava/util/Set;Ljava/util/Set;Ljava/util/List;)Lkotlin/jvm/functions/Function1;
-	public fun refresh (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
-	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startScanning (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Scanning : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/base/state/HandleAfterCreating, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning {
-	public synthetic fun afterCreatingNewState (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterCreatingNewState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun discoverDevice (Ljava/lang/String;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun getStopScanning ()Lkotlin/jvm/functions/Function1;
-	public fun pairedDevices (Ljava/util/Set;Ljava/util/Set;Ljava/util/List;)Lkotlin/jvm/functions/Function1;
-	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active, com/splendo/kaluga/bluetooth/scanner/ScanningState$Initializing {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)V
-	public final fun component1 ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public final fun component2 ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public final fun component3 ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun hashCode ()I
-	public fun initialized (ZZ)Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active {
-	public synthetic fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-	public synthetic fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth$Disabled : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getEnable ()Lkotlin/jvm/functions/Function1;
-	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth$MissingPermissions : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions {
-	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun permit (Z)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoHardware : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware {
-	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoHardware;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotInitialized : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized {
-	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotInitialized;
-	public final fun startInitializing (Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$PermittedHandler {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)V
-	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-}
-
 public class com/splendo/kaluga/bluetooth/scanner/ScanningStateImplRepo : com/splendo/kaluga/bluetooth/scanner/BaseScanningStateRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/coroutines/CoroutineContext;)V
 }
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index f49a11645..6298f8d79 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -380,151 +380,6 @@ public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Re
 	public static fun retry (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings$ReconnectionSettings;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl {
-	protected abstract fun getDeviceConnectionManager ()Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;
-	public final fun getDidDisconnect ()Lkotlin/jvm/functions/Function1;
-	public final fun getDisconnecting ()Lkotlin/jvm/functions/Function1;
-	public final fun unpair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl {
-	public final fun getReconnect ()Lkotlin/jvm/functions/Function1;
-	public final fun pair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun readRssi (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun requestMtu (ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun startDisconnected ()V
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Discovering {
-	public fun <init> (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Discovering;
-	public fun didDiscoverServices (Ljava/util/List;)Lkotlin/jvm/functions/Function1;
-	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMtu ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$HandlingAction {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public fun addAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)Lkotlin/jvm/functions/Function1;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun component1 ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
-	public final fun component2 ()Ljava/util/List;
-	public final fun component3 ()Ljava/lang/Integer;
-	public final fun component4 ()Ljava/util/List;
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction;Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$HandlingAction;
-	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
-	public fun getActionCompleted ()Lkotlin/jvm/functions/Function1;
-	public fun getMtu ()Ljava/lang/Integer;
-	public fun getNextActions ()Ljava/util/List;
-	public fun getServices ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$Idle {
-	public fun <init> (Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle;Ljava/lang/Integer;Ljava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$Idle;
-	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMtu ()Ljava/lang/Integer;
-	public fun getServices ()Ljava/util/List;
-	public fun handleAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connected$NoServices {
-	public fun <init> (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public final fun component1 ()Ljava/lang/Integer;
-	public final fun copy (Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices;Ljava/lang/Integer;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connected$NoServices;
-	public fun didUpdateMtu (I)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDiscoverServices ()Lkotlin/jvm/functions/Function1;
-	public fun getMtu ()Ljava/lang/Integer;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun startDiscovering ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Connecting {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Connecting;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getCancelConnection ()Lkotlin/jvm/functions/Function1;
-	public fun getDidConnect ()Lkotlin/jvm/functions/Function1;
-	public fun handleCancel ()V
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnected {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnected;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getConnect ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun startConnecting ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Disconnecting {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Disconnecting;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting : com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/device/ConnectableDeviceState$Reconnecting {
-	public fun <init> (ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)V
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun component1 ()I
-	public final fun component2 ()Ljava/util/List;
-	public final fun copy (ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;ILjava/util/List;Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImpl$Reconnecting;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getAttempt ()I
-	public fun getCancelConnection ()Lkotlin/jvm/functions/Function1;
-	public fun getDidConnect ()Lkotlin/jvm/functions/Function1;
-	public fun getRaiseAttempt ()Lkotlin/jvm/functions/Function1;
-	public fun getServices ()Ljava/util/List;
-	public fun handleCancel ()V
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun retry (Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings$ReconnectionSettings;)Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class com/splendo/kaluga/bluetooth/device/ConnectableDeviceStateImplRepo : com/splendo/kaluga/bluetooth/device/BaseConnectableDeviceStateRepo {
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceConnectionManager;Lkotlin/coroutines/CoroutineContext;)V
 }
@@ -820,10 +675,6 @@ public class com/splendo/kaluga/bluetooth/device/IdentifierSerializer : kotlinx/
 public abstract interface class com/splendo/kaluga/bluetooth/device/NotConnectableDeviceState : com/splendo/kaluga/bluetooth/device/DeviceState {
 }
 
-public final class com/splendo/kaluga/bluetooth/device/NotConnectableDeviceStateImpl : com/splendo/kaluga/bluetooth/device/NotConnectableDeviceState {
-	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/device/NotConnectableDeviceStateImpl;
-}
-
 public final class com/splendo/kaluga/bluetooth/device/SerializableIdentifier {
 	public static final field Companion Lcom/splendo/kaluga/bluetooth/device/SerializableIdentifier$Companion;
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/UUID;)V
@@ -1135,154 +986,6 @@ public final class com/splendo/kaluga/bluetooth/scanner/ScanningState$Permitted$
 	public static fun remain (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Permitted;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl {
-	public static final field Companion Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Companion;
-}
-
-public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
-	public abstract fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public abstract fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public abstract fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Companion {
-	public final fun getNothingFound ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/bluetooth/scanner/ScanningState$Deinitialized {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)V
-	public final fun component1 ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public final fun component2 ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public final fun component3 ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Deinitialized;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getPreviouslyDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getPreviouslyPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices : com/splendo/kaluga/bluetooth/scanner/ScanningState$Devices {
-	public fun <init> (Ljava/util/List;Ljava/util/Set;)V
-	public fun <init> (Ljava/util/Set;)V
-	public final fun component1 ()Ljava/util/List;
-	public final fun component2 ()Ljava/util/Set;
-	public final fun copy (Ljava/util/List;Ljava/util/Set;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;Ljava/util/List;Ljava/util/Set;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-	public synthetic fun copyAndAdd (Lcom/splendo/kaluga/bluetooth/device/Device;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun copyAndAdd (Lcom/splendo/kaluga/bluetooth/device/Device;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-	public fun equals (Ljava/lang/Object;)Z
-	public synthetic fun foundForFilter (Ljava/util/Set;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun foundForFilter (Ljava/util/Set;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-	public fun getDevices ()Ljava/util/List;
-	public fun getFilter ()Ljava/util/Set;
-	public fun hashCode ()I
-	public fun identifiers ()Ljava/util/Set;
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDisable ()Lkotlin/jvm/functions/Function1;
-	protected abstract fun getPermittedHandler ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$PermittedHandler;
-	public final fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Idle : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Idle {
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun pairedDevices (Ljava/util/Set;Ljava/util/Set;Ljava/util/List;)Lkotlin/jvm/functions/Function1;
-	public fun refresh (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun startScanning (Ljava/util/Set;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled$Scanning : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Enabled, com/splendo/kaluga/base/state/HandleAfterCreating, com/splendo/kaluga/base/state/HandleAfterOldStateIsRemoved, com/splendo/kaluga/bluetooth/scanner/ScanningState$Enabled$Scanning {
-	public synthetic fun afterCreatingNewState (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterCreatingNewState (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun afterOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun discoverDevice (Lcom/splendo/kaluga/bluetooth/UUID;ILcom/splendo/kaluga/bluetooth/device/BaseAdvertisementData;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun getStopScanning ()Lkotlin/jvm/functions/Function1;
-	public fun pairedDevices (Ljava/util/Set;Ljava/util/Set;Ljava/util/List;)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun retrievePairedDevices (Ljava/util/Set;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active, com/splendo/kaluga/bluetooth/scanner/ScanningState$Initializing {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)V
-	public final fun component1 ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public final fun component2 ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public final fun component3 ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public final fun copy (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;Lcom/splendo/kaluga/bluetooth/scanner/Scanner;ILjava/lang/Object;)Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Initializing;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun hashCode ()I
-	public fun initialized (ZZ)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Active {
-	public synthetic fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getDiscovered ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-	public synthetic fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningState$Devices;
-	public fun getPaired ()Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$Devices;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth$Disabled : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$Disabled {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/bluetooth/scanner/ScanningState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getEnable ()Lkotlin/jvm/functions/Function1;
-	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth$MissingPermissions : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoBluetooth, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoBluetooth$MissingPermissions {
-	public fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-	public fun permit (Z)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoHardware : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/bluetooth/scanner/ScanningState$NoHardware {
-	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NoHardware;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotInitialized : com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl, com/splendo/kaluga/bluetooth/scanner/ScanningState$NotInitialized {
-	public static final field INSTANCE Lcom/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$NotInitialized;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public final fun startInitializing (Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/bluetooth/scanner/ScanningStateImpl$PermittedHandler {
-	public fun <init> (Lcom/splendo/kaluga/bluetooth/scanner/Scanner;)V
-	public final fun getScanner ()Lcom/splendo/kaluga/bluetooth/scanner/Scanner;
-}
-
 public class com/splendo/kaluga/bluetooth/scanner/ScanningStateImplRepo : com/splendo/kaluga/bluetooth/scanner/BaseScanningStateRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/coroutines/CoroutineContext;)V
 }
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
index 20f5b6c7c..b1a37ee3b 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
@@ -344,28 +344,14 @@ sealed interface ConnectableDeviceState : DeviceState, KalugaState {
     suspend fun unpair()
 }
 
-/**
- * Implementation of [NotConnectableDeviceState]
- */
-object NotConnectableDeviceStateImpl : NotConnectableDeviceState
+internal object NotConnectableDeviceStateImpl : NotConnectableDeviceState
 
-/**
- * Connection State of a [Device] closely matching [ConnectableDeviceState]
- */
-sealed class ConnectableDeviceStateImpl {
+internal sealed class ConnectableDeviceStateImpl {
 
     protected abstract val deviceConnectionManager: DeviceConnectionManager
 
-    /**
-     * A [ConnectableDeviceStateImpl] where the [Device] is connected
-     */
     sealed class Connected : ConnectableDeviceStateImpl() {
 
-        /**
-         * A [Connected] State where no [Service] have been discovered yet
-         * @param mtu The current [MTU] size of the device
-         * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
-         */
         data class NoServices constructor(
             override val mtu: MTU?,
             override val deviceConnectionManager: DeviceConnectionManager
@@ -382,11 +368,6 @@ sealed class ConnectableDeviceStateImpl {
             override fun didUpdateMtu(mtu: MTU) = suspend { copy(mtu = mtu) }
         }
 
-        /**
-         * A [Connected] State where [Service] are being discovered
-         * @param mtu The current [MTU] size of the device
-         * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
-         */
         data class Discovering constructor(
             override val mtu: MTU?,
             override val deviceConnectionManager: DeviceConnectionManager
@@ -405,12 +386,6 @@ sealed class ConnectableDeviceStateImpl {
             }
         }
 
-        /**
-         * A [Connected] State where all [Service] have been discovered and no [DeviceAction] is being executed
-         * @param mtu The current [MTU] size of the device
-         * @param services The list of [Service] hat where discovered
-         * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
-         */
         data class Idle constructor(
             override val mtu: MTU?,
             override val services: List<Service>,
@@ -421,14 +396,6 @@ sealed class ConnectableDeviceStateImpl {
             override fun didUpdateMtu(mtu: MTU) = suspend { copy(mtu = mtu) }
         }
 
-        /**
-         * A [Connected] State where all [Service] have been discovered and a [DeviceAction] is being executed
-         * @param action The [DeviceAction] currently being executed
-         * @param nextActions The list of [DeviceAction] to be executed when [action] has been handled
-         * @param mtu The current [MTU] size of the device
-         * @param services The list of [Service] hat where discovered
-         * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
-         */
         data class HandlingAction constructor(
             override val action: DeviceAction,
             override val nextActions: List<DeviceAction>,
@@ -465,45 +432,24 @@ sealed class ConnectableDeviceStateImpl {
             }
         }
 
-        /**
-         * Starts transitioning to a [Disconnected] State
-         */
         fun startDisconnected() = deviceConnectionManager.startDisconnecting()
 
-        /**
-         * Transitions into a [Reconnecting] State
-         */
         val reconnect = suspend {
             // All services, characteristics and descriptors become invalidated after it disconnects
             Reconnecting(0, null, deviceConnectionManager)
         }
 
-        /**
-         * Reads the RSSI
-         */
         suspend fun readRssi() {
             deviceConnectionManager.readRssi()
         }
 
-        /**
-         * Requests an update to the [MTU] size of the device
-         * @param mtu the new [MTU] size to request
-         * @return `true` if the MTU update has been requested successfully
-         */
         suspend fun requestMtu(mtu: MTU): Boolean {
             return deviceConnectionManager.requestMtu(mtu)
         }
 
-        /**
-         * Attempts to pair this device
-         */
         suspend fun pair() = deviceConnectionManager.pair()
     }
 
-    /**
-     * A [ConnectableDeviceStateImpl] where the device is connecting
-     * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
-     */
     data class Connecting constructor(
         override val deviceConnectionManager: DeviceConnectionManager
     ) : ConnectableDeviceStateImpl(), ConnectableDeviceState.Connecting, HandleAfterOldStateIsRemoved<ConnectableDeviceState> {
@@ -526,12 +472,6 @@ sealed class ConnectableDeviceStateImpl {
         }
     }
 
-    /**
-     * A [ConnectableDeviceStateImpl] where the [Device] is reconnecting
-     * @param attempt The number of attempts to reconnect that have been made since the disconnect occurred
-     * @param services The list of [Service] discovered
-     * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
-     */
     data class Reconnecting constructor(
         override val attempt: Int,
         override val services: List<Service>?,
@@ -555,10 +495,6 @@ sealed class ConnectableDeviceStateImpl {
         }
     }
 
-    /**
-     * A [ConnectableDeviceStateImpl] where the [Device] is disconnected
-     * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
-     */
     data class Disconnected constructor(
         override val deviceConnectionManager: DeviceConnectionManager
     ) : ConnectableDeviceStateImpl(), ConnectableDeviceState.Disconnected {
@@ -568,10 +504,6 @@ sealed class ConnectableDeviceStateImpl {
         override val connect = suspend { Connecting(deviceConnectionManager) }
     }
 
-    /**
-     * A [ConnectableDeviceStateImpl] where the [Device] is disconnecting
-     * @param deviceConnectionManager the [DeviceConnectionManager] to manage the connection
-     */
     data class Disconnecting constructor(
         override val deviceConnectionManager: DeviceConnectionManager
     ) : ConnectableDeviceStateImpl(), ConnectableDeviceState.Disconnecting, HandleAfterOldStateIsRemoved<ConnectableDeviceState> {
@@ -584,22 +516,13 @@ sealed class ConnectableDeviceStateImpl {
         }
     }
 
-    /**
-     * Transitions into a [Disconnected] State
-     */
     val didDisconnect = suspend {
         Disconnected(deviceConnectionManager)
     }
 
-    /**
-     * Transitions into a [Disconnecting] State
-     */
     val disconnecting = suspend {
         Disconnecting(deviceConnectionManager)
     }
 
-    /**
-     * Attempts to unpair the [Device]
-     */
     suspend fun unpair() = deviceConnectionManager.unpair()
 }
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
index 19385794d..8b5b5e7e3 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
@@ -269,32 +269,17 @@ sealed interface ScanningState : KalugaState {
     interface NoHardware : ScanningState
 }
 
-/**
- * State of a scanner closely matching [ScanningState]
- */
-sealed class ScanningStateImpl {
+internal sealed class ScanningStateImpl {
 
     companion object {
-        /**
-         * An empty [Devices]
-         */
         val nothingFound = Devices(filter = emptySet())
     }
 
-    /**
-     * A [ScanningState.Devices] implementation
-     * @param devices The list of [Device] found
-     * @param filter The [Filter] applied during scanning
-     */
     data class Devices(
         override val devices: List<Device>,
         override val filter: Filter,
     ) : ScanningState.Devices {
 
-        /**
-         * Constructor
-         * @param filter the [Filter] to apply
-         */
         constructor(filter: Filter) : this(emptyList(), filter)
 
         override fun copyAndAdd(device: Device): Devices =
@@ -307,16 +292,8 @@ sealed class ScanningStateImpl {
                 Devices(filter)
     }
 
-    /**
-     * A [ScanningStateImpl] indicating observation has not started yet
-     */
     object NotInitialized : ScanningStateImpl(), ScanningState.NotInitialized {
 
-        /**
-         * Transitions into a [Initializing] State
-         * @param scanner the [Scanner] to use for scanning
-         * @return method for transitioning to a [Initializing] or [NoHardware] State
-         */
         fun startInitializing(
             scanner: Scanner
         ): suspend () -> ScanningState {
@@ -328,12 +305,6 @@ sealed class ScanningStateImpl {
         }
     }
 
-    /**
-     * A [ScanningStateImpl] indicating observation has stopped after being started
-     * @param previouslyDiscovered The [Devices] discovered before deinitalizing
-     * @param previouslyPaired The [Devices] paired before deinitalizing
-     * @property scanner the [Scanner] used for scanning
-     */
     data class Deinitialized(
         override val previouslyDiscovered: ScanningState.Devices,
         override val previouslyPaired: ScanningState.Devices,
@@ -343,9 +314,6 @@ sealed class ScanningStateImpl {
         override val reinitialize = suspend { Initializing(previouslyDiscovered, previouslyPaired, scanner) }
     }
 
-    /**
-     * A [ScanningStateImpl] indicating observation has started
-     */
     sealed class Active :
         ScanningStateImpl(),
         HandleBeforeOldStateIsRemoved<ScanningState>,
@@ -369,31 +337,13 @@ sealed class ScanningStateImpl {
             }
         }
 
-        /**
-         * The [Scanner] used for scanning
-         */
         abstract val scanner: Scanner
-
-        /**
-         * The [Devices] discovered
-         */
         abstract val discovered: ScanningState.Devices
-
-        /**
-         * The [Devices] paired
-         */
         abstract val paired: ScanningState.Devices
 
-        /**
-         * Transitions into a [Deinitialized] State
-         */
         val deinitialize: suspend () -> Deinitialized = { Deinitialized(discovered, paired, scanner) }
     }
 
-    /**
-     * Handles changes to Bluetooth permissions
-     * @property scanner the [Scanner] to respond to changes to permissions
-     */
     class PermittedHandler(val scanner: Scanner) {
 
         internal val revokePermission = suspend { NoBluetooth.MissingPermissions(scanner) }
@@ -419,12 +369,6 @@ sealed class ScanningStateImpl {
         }
     }
 
-    /**
-     * An [Active] State indicating the state is transitioning for an inactive state to an initialized state
-     * @param discovered The [Devices] discovered
-     * @param paired The [Devices] paired
-     * @param scanner The [Scanner] used for scanning
-     */
     data class Initializing(
         override val discovered: ScanningState.Devices,
         override val paired: ScanningState.Devices,
@@ -441,23 +385,14 @@ sealed class ScanningStateImpl {
             }
     }
 
-    /**
-     * An [Active] State indicating the Bluetooth service is enabled
-     */
     sealed class Enabled : Active() {
 
         protected abstract val permittedHandler: PermittedHandler
 
-        /**
-         * Transitions into a [NoBluetooth.Disabled] State
-         */
         val disable = suspend {
             NoBluetooth.Disabled(scanner)
         }
 
-        /**
-         * Transitions into a [NoBluetooth.MissingPermissions] State
-         */
         val revokePermission: suspend () -> NoBluetooth.MissingPermissions get() = permittedHandler.revokePermission
 
         override suspend fun afterNewStateIsSet(newState: ScanningState) {
@@ -470,12 +405,6 @@ sealed class ScanningStateImpl {
             permittedHandler.beforeOldStateIsRemoved(oldState)
         }
 
-        /**
-         * An [Enabled] State indicating no active scanning is taking place
-         * @param discovered The [Devices] discovered
-         * @param paired The [Devices] paired
-         * @param scanner The [Scanner] used for scanning
-         */
         class Idle internal constructor(
             override val discovered: ScanningState.Devices,
             override val paired: ScanningState.Devices,
@@ -519,12 +448,6 @@ sealed class ScanningStateImpl {
             }
         }
 
-        /**
-         * An [Enabled] State indicating scanning is taking place
-         * @param discovered The [Devices] discovered
-         * @param paired The [Devices] paired
-         * @param scanner The [Scanner] used for scanning
-         */
         class Scanning internal constructor(
             override val discovered: ScanningState.Devices,
             override val paired: ScanningState.Devices,
@@ -583,18 +506,11 @@ sealed class ScanningStateImpl {
         }
     }
 
-    /**
-     * An [Active] State indicating Bluetooth is not available
-     */
     sealed class NoBluetooth : Active() {
 
         override val discovered: Devices = nothingFound
         override val paired: Devices = nothingFound
 
-        /**
-         * A [NoBluetooth] State indicating the Bluetooth service is disabled
-         * @param scanner The [Scanner] used for scanning
-         */
         class Disabled internal constructor(
             override val scanner: Scanner
         ) : NoBluetooth(), ScanningState.NoBluetooth.Disabled {
@@ -618,10 +534,6 @@ sealed class ScanningStateImpl {
             }
         }
 
-        /**
-         * A [NoBluetooth] State indicating Bluetooth is not available due to missing permissions
-         * @param scanner The [Scanner] used for scanning
-         */
         class MissingPermissions internal constructor(
             override val scanner: Scanner
         ) : NoBluetooth(), ScanningState.NoBluetooth.MissingPermissions {
@@ -633,8 +545,5 @@ sealed class ScanningStateImpl {
         }
     }
 
-    /**
-     * A [ScanningStateImpl] indicating the system does not support Bluetooth
-     */
     object NoHardware : ScanningStateImpl(), ScanningState.NoHardware
 }
diff --git a/location/api/androidLib/location.api b/location/api/androidLib/location.api
index 7e464d498..c1ab4251d 100644
--- a/location/api/androidLib/location.api
+++ b/location/api/androidLib/location.api
@@ -317,92 +317,6 @@ public abstract interface class com/splendo/kaluga/location/LocationState$Permit
 	public abstract fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class com/splendo/kaluga/location/LocationStateImpl {
-	public abstract fun getLocation ()Lcom/splendo/kaluga/location/Location;
-}
-
-public abstract class com/splendo/kaluga/location/LocationStateImpl$Active : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitialized ()Lkotlin/jvm/functions/Function1;
-	protected abstract fun getLocationManager ()Lcom/splendo/kaluga/location/LocationManager;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$Deinitialized : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/location/LocationState$Deinitialized {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/location/Location;
-	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/location/LocationStateImpl$Disabled : com/splendo/kaluga/location/LocationStateImpl$Active {
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NoGPS : com/splendo/kaluga/location/LocationStateImpl$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NoGPS {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getEnable ()Lkotlin/jvm/functions/Function1;
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NotPermitted : com/splendo/kaluga/location/LocationStateImpl$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NotPermitted {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun permit (Z)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$Enabled : com/splendo/kaluga/location/LocationStateImpl$Active, com/splendo/kaluga/location/LocationState$Enabled {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun component1 ()Lcom/splendo/kaluga/location/Location;
-	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDisable ()Lkotlin/jvm/functions/Function1;
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-	public fun updateWithLocation (Lcom/splendo/kaluga/location/Location$KnownLocation;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$Initializing : com/splendo/kaluga/location/LocationStateImpl$Active, com/splendo/kaluga/location/LocationState$Initializing {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/location/Location;
-	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun hashCode ()I
-	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$NotInitialized : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/location/LocationState$NotInitialized {
-	public static final field INSTANCE Lcom/splendo/kaluga/location/LocationStateImpl$NotInitialized;
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public final fun startInitializing (Lcom/splendo/kaluga/location/LocationManager;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$PermittedHandler {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public final fun getLocation ()Lcom/splendo/kaluga/location/Location;
-}
-
 public class com/splendo/kaluga/location/LocationStateImplRepo : com/splendo/kaluga/location/BaseLocationStateRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
 }
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index ffd6a023c..ce440b24c 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -347,98 +347,6 @@ public final class com/splendo/kaluga/location/LocationState$Permitted$DefaultIm
 	public static fun remain (Lcom/splendo/kaluga/location/LocationState$Permitted;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class com/splendo/kaluga/location/LocationStateImpl {
-	public abstract fun getLocation ()Lcom/splendo/kaluga/location/Location;
-}
-
-public abstract class com/splendo/kaluga/location/LocationStateImpl$Active : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitialized ()Lkotlin/jvm/functions/Function1;
-	protected abstract fun getLocationManager ()Lcom/splendo/kaluga/location/LocationManager;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$Deinitialized : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/location/LocationState$Deinitialized {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/location/Location;
-	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Deinitialized;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/location/LocationStateImpl$Disabled : com/splendo/kaluga/location/LocationStateImpl$Active {
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NoGPS : com/splendo/kaluga/location/LocationStateImpl$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NoGPS {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun getEnable ()Lkotlin/jvm/functions/Function1;
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$Disabled$NotPermitted : com/splendo/kaluga/location/LocationStateImpl$Disabled, com/splendo/kaluga/location/LocationState$Disabled$NotPermitted {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun permit (Z)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$Enabled : com/splendo/kaluga/location/LocationStateImpl$Active, com/splendo/kaluga/location/LocationState$Enabled {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/location/LocationState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun component1 ()Lcom/splendo/kaluga/location/Location;
-	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Enabled;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDisable ()Lkotlin/jvm/functions/Function1;
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun getRevokePermission ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-	public fun updateWithLocation (Lcom/splendo/kaluga/location/Location$KnownLocation;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$Initializing : com/splendo/kaluga/location/LocationStateImpl$Active, com/splendo/kaluga/location/LocationState$Initializing {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/location/Location;
-	public final fun copy (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;ILjava/lang/Object;)Lcom/splendo/kaluga/location/LocationStateImpl$Initializing;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun hashCode ()I
-	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$NotInitialized : com/splendo/kaluga/location/LocationStateImpl, com/splendo/kaluga/location/LocationState$NotInitialized {
-	public static final field INSTANCE Lcom/splendo/kaluga/location/LocationStateImpl$NotInitialized;
-	public fun getLocation ()Lcom/splendo/kaluga/location/Location;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public final fun startInitializing (Lcom/splendo/kaluga/location/LocationManager;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/location/LocationStateImpl$PermittedHandler {
-	public fun <init> (Lcom/splendo/kaluga/location/Location;Lcom/splendo/kaluga/location/LocationManager;)V
-	public final fun getLocation ()Lcom/splendo/kaluga/location/Location;
-}
-
 public class com/splendo/kaluga/location/LocationStateImplRepo : com/splendo/kaluga/location/BaseLocationStateRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
 }
diff --git a/location/src/commonMain/kotlin/location/LocationState.kt b/location/src/commonMain/kotlin/location/LocationState.kt
index 6867c568d..ef8223ca8 100644
--- a/location/src/commonMain/kotlin/location/LocationState.kt
+++ b/location/src/commonMain/kotlin/location/LocationState.kt
@@ -157,35 +157,16 @@ sealed interface LocationState : KalugaState {
     }
 }
 
-/**
- * State of a [Location] closely matching [LocationState]
- */
-sealed class LocationStateImpl {
+internal sealed class LocationStateImpl {
 
-    /**
-     * The [Location] during this state
-     */
     abstract val location: Location
 
-    /**
-     * A [LocationStateImpl] State indicating observation has not started yet
-     */
     object NotInitialized : LocationStateImpl(), LocationState.NotInitialized {
         override val location: Location = Location.UnknownLocation.WithoutLastLocation(Location.UnknownLocation.Reason.NOT_CLEAR)
 
-        /**
-         * Transitions into an [Initializing] State
-         * @param locationManager the [LocationManager] to manage the [Location]
-         * @return method for transitioning into an [Initializing] State
-         */
         fun startInitializing(locationManager: LocationManager): suspend () -> Initializing = { Initializing(location, locationManager) }
     }
 
-    /**
-     * An [LocationStateImpl] State indicating observation has stopped after being started
-     * @param location the [Location] during this state
-     * @param locationManager the [LocationManager] managing the [Location]
-     */
     data class Deinitialized(
         override val location: Location,
         internal val locationManager: LocationManager
@@ -193,16 +174,10 @@ sealed class LocationStateImpl {
         override val reinitialize: suspend () -> LocationState.Initializing = { Initializing(location, locationManager) }
     }
 
-    /**
-     * An [LocationStateImpl] State indicating observation has started
-     */
     sealed class Active : LocationStateImpl(), HandleBeforeOldStateIsRemoved<LocationState>, HandleAfterNewStateIsSet<LocationState> {
 
         protected abstract val locationManager: LocationManager
 
-        /**
-         * Transitions into a [Deinitialized] State
-         */
         val deinitialized: suspend () -> Deinitialized = { Deinitialized(location, locationManager) }
 
         override suspend fun beforeOldStateIsRemoved(oldState: LocationState) {
@@ -220,11 +195,6 @@ sealed class LocationStateImpl {
         }
     }
 
-    /**
-     * Handles changes to [com.splendo.kaluga.permissions.location.LocationPermission]
-     * @param location the [Location] during this state
-     * @param locationManager the [LocationManager] managing the [Location]
-     */
     class PermittedHandler(val location: Location, private val locationManager: LocationManager) {
 
         internal val revokePermission: suspend () -> Disabled.NotPermitted = {
@@ -250,11 +220,6 @@ sealed class LocationStateImpl {
         }
     }
 
-    /**
-     * An [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
-     * @param location the [Location] during this state
-     * @param locationManager the [LocationManager] managing the [Location]
-     */
     data class Initializing(override val location: Location, override val locationManager: LocationManager) : Active(), LocationState.Initializing {
 
         override fun initialize(hasPermission: Boolean, enabled: Boolean): suspend () -> LocationState.Initialized = suspend {
@@ -266,16 +231,8 @@ sealed class LocationStateImpl {
         }
     }
 
-    /**
-     * An [Active] State indicating that location is not being collected
-     */
     sealed class Disabled : Active() {
 
-        /**
-         * A [Disabled] State indicating the [com.splendo.kaluga.permissions.location.LocationPermission] has not been granted
-         * @param lastKnownLocation the previous [Location]
-         * @param locationManager the [LocationManager] managing the [Location]
-         */
         class NotPermitted(lastKnownLocation: Location, override val locationManager: LocationManager) : Disabled(), LocationState.Disabled.NotPermitted {
 
             override val location: Location = lastKnownLocation.unknownLocationOf(Location.UnknownLocation.Reason.PERMISSION_DENIED)
@@ -285,11 +242,6 @@ sealed class LocationStateImpl {
             }
         }
 
-        /**
-         * A [Disabled] State indicating the Location service is disabled
-         * @param lastKnownLocation the previous [Location]
-         * @param locationManager the [LocationManager] managing the [Location]
-         */
         class NoGPS(lastKnownLocation: Location, override val locationManager: LocationManager) : Disabled(), LocationState.Disabled.NoGPS {
 
             override val location: Location = lastKnownLocation.unknownLocationOf(Location.UnknownLocation.Reason.NO_GPS)
@@ -313,11 +265,6 @@ sealed class LocationStateImpl {
         }
     }
 
-    /**
-     * An [Active] State indicating location is being collected
-     * @param location the [Location] during this state
-     * @param locationManager the [LocationManager] managing the [Location]
-     */
     data class Enabled(override val location: Location, override val locationManager: LocationManager) : Active(), LocationState.Enabled {
 
         private val permittedHandler = PermittedHandler(location, locationManager)

From 2ddb51ebe0676fb8e76dd424668ec43a90401298 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 15 Feb 2023 10:55:17 +0100
Subject: [PATCH 177/227] Hid implementation detail

---
 .../api/androidLib/base-permissions.api       |  96 -----------------
 base-permissions/api/jvm/base-permissions.api | 102 ------------------
 .../src/commonMain/kotlin/PermissionState.kt  |  72 +------------
 3 files changed, 1 insertion(+), 269 deletions(-)

diff --git a/base-permissions/api/androidLib/base-permissions.api b/base-permissions/api/androidLib/base-permissions.api
index 58b48310a..e07dc0f94 100644
--- a/base-permissions/api/androidLib/base-permissions.api
+++ b/base-permissions/api/androidLib/base-permissions.api
@@ -156,102 +156,6 @@ public abstract interface class com/splendo/kaluga/permissions/base/PermissionSt
 public abstract interface class com/splendo/kaluga/permissions/base/PermissionState$Uninitialized : com/splendo/kaluga/permissions/base/PermissionState$Inactive {
 }
 
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl {
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Active : com/splendo/kaluga/permissions/base/PermissionStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
-	public abstract fun getMonitoringInterval-UwyO8pc ()J
-	public abstract fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active, com/splendo/kaluga/permissions/base/PermissionState$Allowed {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;
-	public fun deny (Z)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized : com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive, com/splendo/kaluga/permissions/base/PermissionState$Deinitialized {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMonitoringInterval-UwyO8pc ()J
-	public final fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active {
-	public final fun getAllow ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked : com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied, com/splendo/kaluga/permissions/base/PermissionState$Denied$Locked {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun getUnlock ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable : com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied, com/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getLock ()Lkotlin/jvm/functions/Function1;
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun request ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive : com/splendo/kaluga/permissions/base/PermissionStateImpl {
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active, com/splendo/kaluga/permissions/base/PermissionState$Initializing {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Uninitialized : com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive, com/splendo/kaluga/permissions/base/PermissionState$Uninitialized {
-	public fun <init> ()V
-	public final fun initialize-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lkotlin/jvm/functions/Function1;
-}
-
 public final class com/splendo/kaluga/permissions/base/PermissionStateKt {
 	public static final fun request (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
diff --git a/base-permissions/api/jvm/base-permissions.api b/base-permissions/api/jvm/base-permissions.api
index 520547a57..e638120bc 100644
--- a/base-permissions/api/jvm/base-permissions.api
+++ b/base-permissions/api/jvm/base-permissions.api
@@ -160,108 +160,6 @@ public final class com/splendo/kaluga/permissions/base/PermissionState$Uninitial
 	public static fun remain (Lcom/splendo/kaluga/permissions/base/PermissionState$Uninitialized;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl {
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Active : com/splendo/kaluga/permissions/base/PermissionStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/permissions/base/PermissionState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
-	public abstract fun getMonitoringInterval-UwyO8pc ()J
-	public abstract fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active, com/splendo/kaluga/permissions/base/PermissionState$Allowed {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Allowed;
-	public fun deny (Z)Lkotlin/jvm/functions/Function1;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized : com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive, com/splendo/kaluga/permissions/base/PermissionState$Deinitialized {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Deinitialized;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMonitoringInterval-UwyO8pc ()J
-	public final fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active {
-	public final fun getAllow ()Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked : com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied, com/splendo/kaluga/permissions/base/PermissionState$Denied$Locked {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Locked;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun getUnlock ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable : com/splendo/kaluga/permissions/base/PermissionStateImpl$Denied, com/splendo/kaluga/permissions/base/PermissionState$Denied$Requestable {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Denied$Requestable;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getLock ()Lkotlin/jvm/functions/Function1;
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun request ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive : com/splendo/kaluga/permissions/base/PermissionStateImpl {
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing : com/splendo/kaluga/permissions/base/PermissionStateImpl$Active, com/splendo/kaluga/permissions/base/PermissionState$Initializing {
-	public synthetic fun <init> (JLcom/splendo/kaluga/permissions/base/PermissionManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1-UwyO8pc ()J
-	public final fun component2 ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public final fun copy-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
-	public static synthetic fun copy-VtjQ1oo$default (Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;JLcom/splendo/kaluga/permissions/base/PermissionManager;ILjava/lang/Object;)Lcom/splendo/kaluga/permissions/base/PermissionStateImpl$Initializing;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMonitoringInterval-UwyO8pc ()J
-	public fun getPermissionManager ()Lcom/splendo/kaluga/permissions/base/PermissionManager;
-	public fun hashCode ()I
-	public fun initialize (ZZ)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/permissions/base/PermissionStateImpl$Uninitialized : com/splendo/kaluga/permissions/base/PermissionStateImpl$Inactive, com/splendo/kaluga/permissions/base/PermissionState$Uninitialized {
-	public fun <init> ()V
-	public final fun initialize-VtjQ1oo (JLcom/splendo/kaluga/permissions/base/PermissionManager;)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-}
-
 public final class com/splendo/kaluga/permissions/base/PermissionStateKt {
 	public static final fun request (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
diff --git a/base-permissions/src/commonMain/kotlin/PermissionState.kt b/base-permissions/src/commonMain/kotlin/PermissionState.kt
index f33ba44b9..d99a01f05 100644
--- a/base-permissions/src/commonMain/kotlin/PermissionState.kt
+++ b/base-permissions/src/commonMain/kotlin/PermissionState.kt
@@ -153,39 +153,15 @@ sealed interface PermissionState<P : Permission> : KalugaState {
     }
 }
 
-/**
- * State of a [Permission] closely matching [PermissionState]
- * @param P the type of [Permission] associated with the state
- */
-sealed class PermissionStateImpl<P : Permission> {
+internal sealed class PermissionStateImpl<P : Permission> {
 
-    /**
-     * A [PermissionStateImpl] indicating observation is not active
-     * @param P the type of [Permission] associated with the state
-     */
     sealed class Inactive<P : Permission> : PermissionStateImpl<P>()
 
-    /**
-     * A [Inactive] State indicating observation has not started yet
-     * @param P the type of [Permission] associated with the state
-     */
     class Uninitialized<P : Permission> : Inactive<P>(), PermissionState.Uninitialized<P> {
 
-        /**
-         * Transitions into a [Initializing] state
-         * @param monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
-         * @param permissionManager the [PermissionManager] managing the [P] if this State
-         * @return method for transitioning into an [Initializing] State
-         */
         fun initialize(monitoringInterval: Duration, permissionManager: PermissionManager<P>): suspend () -> Initializing<P> = { Initializing(monitoringInterval, permissionManager) }
     }
 
-    /**
-     * A [Inactive] State indicating observation has stopped after being started
-     * @param P the type of [Permission] associated with the state
-     * @property monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
-     * @property permissionManager the [PermissionManager] managing the [P] if this State
-     */
     data class Deinitialized<P : Permission>(
         val monitoringInterval: Duration,
         val permissionManager: PermissionManager<P>
@@ -193,25 +169,11 @@ sealed class PermissionStateImpl<P : Permission> {
         override val reinitialize: suspend () -> Initializing<P> = { Initializing(monitoringInterval, permissionManager) }
     }
 
-    /**
-     * A [PermissionState] indicating observation has started
-     * @param P the type of [Permission] associated with the state
-     */
     sealed class Active<P : Permission> : PermissionStateImpl<P>(), HandleBeforeOldStateIsRemoved<PermissionState<P>>, HandleAfterNewStateIsSet<PermissionState<P>> {
 
-        /**
-         * The [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
-         */
         abstract val monitoringInterval: Duration
-
-        /**
-         * The [PermissionManager] managing the [P] if this State
-         */
         abstract val permissionManager: PermissionManager<P>
 
-        /**
-         * Transitions into a [Deinitialized] State
-         */
         val deinitialize: suspend () -> Deinitialized<P> = { Deinitialized(monitoringInterval, permissionManager) }
 
         override suspend fun afterNewStateIsSet(newState: PermissionState<P>) {
@@ -229,12 +191,6 @@ sealed class PermissionStateImpl<P : Permission> {
         }
     }
 
-    /**
-     * A [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
-     * @param P the type of [Permission] associated with the state
-     * @property monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
-     * @property permissionManager the [PermissionManager] managing the [P] if this State
-     */
     data class Initializing<P : Permission>(
         override val monitoringInterval: Duration,
         override val permissionManager: PermissionManager<P>
@@ -248,12 +204,6 @@ sealed class PermissionStateImpl<P : Permission> {
         }
     }
 
-    /**
-     * A [Active] State indicating the permission has been granted
-     * @param P the type of [Permission] associated with the state
-     * @property monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
-     * @property permissionManager the [PermissionManager] managing the [P] if this State
-     */
     data class Allowed<P : Permission>(
         override val monitoringInterval: Duration,
         override val permissionManager: PermissionManager<P>
@@ -264,25 +214,12 @@ sealed class PermissionStateImpl<P : Permission> {
         }
     }
 
-    /**
-     * A [Active] State indicating the permission has been denied.
-     * @param P the type of [Permission] associated with the state
-     */
     sealed class Denied<P : Permission> : Active<P>() {
 
-        /**
-         * Transitions into an [Allowed] State
-         */
         val allow: suspend () -> Allowed<P> = {
             Allowed(monitoringInterval, permissionManager)
         }
 
-        /**
-         * A [Denied] State indicating the permission cannot be granted
-         * @param P the type of [Permission] associated with the state
-         * @property monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
-         * @property permissionManager the [PermissionManager] managing the [P] if this State
-         */
         data class Locked<P : Permission>(
             override val monitoringInterval: Duration,
             override val permissionManager: PermissionManager<P>
@@ -293,13 +230,6 @@ sealed class PermissionStateImpl<P : Permission> {
             }
         }
 
-        /**
-         * A [Denied] State indicating the permission can be granted
-         * Use [request] to request the permission.
-         * @param P the type of [Permission] associated with the state
-         * @property monitoringInterval the [Duration] after which the system should poll for changes to the permission if automatic detection is impossible.
-         * @property permissionManager the [PermissionManager] managing the [P] if this State
-         */
         data class Requestable<P : Permission>(
             override val monitoringInterval: Duration,
             override val permissionManager: PermissionManager<P>

From 1f733bbccfdca4613122c4fb5e6c81dfbc3f744b Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 15 Feb 2023 11:26:11 +0100
Subject: [PATCH 178/227] Make system use same filestructure as other modules

---
 system/src/androidLibMain/kotlin/README.md    |  1 -
 .../system => }/network/NetworkManager.kt     |  2 +-
 .../network/state/NetworkStateRepoBuilder.kt  |  0
 system/src/commonMain/kotlin/README.md        |  1 -
 .../network/NetworkConnectionType.kt          | 11 +++++---
 .../system => }/network/NetworkManager.kt     |  2 +-
 .../system => }/network/state/NetworkState.kt |  6 +++--
 .../network/state/NetworkStateRepo.kt         |  0
 .../network/state/NetworkStateRepoBuilder.kt  |  0
 system/src/commonTest/kotlin/README.md        |  1 -
 .../network/BaseNetworkStateTest.kt           |  2 +-
 .../system => }/network/NetworkStateTest.kt   | 20 +++++++++++---
 .../kaluga/system => }/network/OnlineTest.kt  | 27 ++++++++++---------
 .../system => }/network/NetworkManager.kt     |  6 ++---
 .../network/state/NetworkStateRepoBuilder.kt  |  0
 system/src/iosTest/kotlin/README.md           |  1 -
 system/src/jsMain/kotlin/README.md            |  1 -
 .../system => }/network/NetworkManager.kt     |  2 +-
 .../network/state/NetworkStateRepoBuilder.kt  |  0
 system/src/jvmMain/kotlin/README.md           |  1 -
 .../system => }/network/NetworkManager.kt     |  2 +-
 .../network/state/NetworkStateRepoBuilder.kt  |  0
 .../kotlin/network/MockNetworkState.kt        |  6 +++--
 23 files changed, 54 insertions(+), 38 deletions(-)
 delete mode 100644 system/src/androidLibMain/kotlin/README.md
 rename system/src/androidLibMain/kotlin/{com/splendo/kaluga/system => }/network/NetworkManager.kt (99%)
 rename system/src/androidLibMain/kotlin/{com/splendo/kaluga/system => }/network/state/NetworkStateRepoBuilder.kt (100%)
 delete mode 100644 system/src/commonMain/kotlin/README.md
 rename system/src/commonMain/kotlin/{com/splendo/kaluga/system => }/network/NetworkConnectionType.kt (89%)
 rename system/src/commonMain/kotlin/{com/splendo/kaluga/system => }/network/NetworkManager.kt (94%)
 rename system/src/commonMain/kotlin/{com/splendo/kaluga/system => }/network/state/NetworkState.kt (96%)
 rename system/src/commonMain/kotlin/{com/splendo/kaluga/system => }/network/state/NetworkStateRepo.kt (100%)
 rename system/src/commonMain/kotlin/{com/splendo/kaluga/system => }/network/state/NetworkStateRepoBuilder.kt (100%)
 delete mode 100644 system/src/commonTest/kotlin/README.md
 rename system/src/commonTest/kotlin/{com/splendo/kaluga/system => }/network/BaseNetworkStateTest.kt (97%)
 rename system/src/commonTest/kotlin/{com/splendo/kaluga/system => }/network/NetworkStateTest.kt (89%)
 rename system/src/commonTest/kotlin/{com/splendo/kaluga/system => }/network/OnlineTest.kt (58%)
 rename system/src/iosMain/kotlin/{com.splendo.kaluga/system => }/network/NetworkManager.kt (98%)
 rename system/src/iosMain/kotlin/{com.splendo.kaluga/system => }/network/state/NetworkStateRepoBuilder.kt (100%)
 delete mode 100644 system/src/iosTest/kotlin/README.md
 delete mode 100644 system/src/jsMain/kotlin/README.md
 rename system/src/jsMain/kotlin/{com/splendo/kaluga/system => }/network/NetworkManager.kt (95%)
 rename system/src/jsMain/kotlin/{com/splendo/kaluga/system => }/network/state/NetworkStateRepoBuilder.kt (100%)
 delete mode 100644 system/src/jvmMain/kotlin/README.md
 rename system/src/jvmMain/kotlin/{com/splendo/kaluga/system => }/network/NetworkManager.kt (95%)
 rename system/src/jvmMain/kotlin/{com/splendo/kaluga/system => }/network/state/NetworkStateRepoBuilder.kt (100%)

diff --git a/system/src/androidLibMain/kotlin/README.md b/system/src/androidLibMain/kotlin/README.md
deleted file mode 100644
index d24bee8f5..000000000
--- a/system/src/androidLibMain/kotlin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-## Please check [Documentation](../../../../README.md#androidLibMain-sources)
diff --git a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt b/system/src/androidLibMain/kotlin/network/NetworkManager.kt
similarity index 99%
rename from system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
rename to system/src/androidLibMain/kotlin/network/NetworkManager.kt
index 355c36115..26fa9de94 100644
--- a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
+++ b/system/src/androidLibMain/kotlin/network/NetworkManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/androidLibMain/kotlin/network/state/NetworkStateRepoBuilder.kt
similarity index 100%
rename from system/src/androidLibMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
rename to system/src/androidLibMain/kotlin/network/state/NetworkStateRepoBuilder.kt
diff --git a/system/src/commonMain/kotlin/README.md b/system/src/commonMain/kotlin/README.md
deleted file mode 100644
index 52482b52a..000000000
--- a/system/src/commonMain/kotlin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-## Please check [Documentation](../../../../README.md#commonMain-sources)
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkConnectionType.kt b/system/src/commonMain/kotlin/network/NetworkConnectionType.kt
similarity index 89%
rename from system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkConnectionType.kt
rename to system/src/commonMain/kotlin/network/NetworkConnectionType.kt
index bbf7ed383..3f44b0f5b 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkConnectionType.kt
+++ b/system/src/commonMain/kotlin/network/NetworkConnectionType.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -44,6 +44,11 @@ sealed class NetworkConnectionType {
 
 fun NetworkConnectionType.unknown(reason: NetworkConnectionType.Unknown.Reason) = when (this) {
     is NetworkConnectionType.Known -> NetworkConnectionType.Unknown.WithLastNetwork(this, reason)
-    is NetworkConnectionType.Unknown.WithLastNetwork -> NetworkConnectionType.Unknown.WithLastNetwork(this.lastKnown, reason)
-    is NetworkConnectionType.Unknown.WithoutLastNetwork -> NetworkConnectionType.Unknown.WithoutLastNetwork(reason)
+    is NetworkConnectionType.Unknown.WithLastNetwork -> NetworkConnectionType.Unknown.WithLastNetwork(
+        this.lastKnown,
+        reason
+    )
+    is NetworkConnectionType.Unknown.WithoutLastNetwork -> NetworkConnectionType.Unknown.WithoutLastNetwork(
+        reason
+    )
 }
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt b/system/src/commonMain/kotlin/network/NetworkManager.kt
similarity index 94%
rename from system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
rename to system/src/commonMain/kotlin/network/NetworkManager.kt
index fc602367a..60aa14053 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
+++ b/system/src/commonMain/kotlin/network/NetworkManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt b/system/src/commonMain/kotlin/network/state/NetworkState.kt
similarity index 96%
rename from system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
rename to system/src/commonMain/kotlin/network/state/NetworkState.kt
index b2f6d61d7..e488e67ba 100644
--- a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkState.kt
+++ b/system/src/commonMain/kotlin/network/state/NetworkState.kt
@@ -73,7 +73,8 @@ sealed class NetworkStateImpl {
     abstract val networkConnectionType: NetworkConnectionType
 
     object NotInitialized : NetworkStateImpl(), NetworkState.NotInitialized {
-        override val networkConnectionType: NetworkConnectionType = NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+        override val networkConnectionType: NetworkConnectionType = NetworkConnectionType.Unknown.WithoutLastNetwork(
+            NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
         fun startInitializing(networkManager: NetworkManager): suspend () -> NetworkState.Initializing = {
             Initializing(networkConnectionType, networkManager)
         }
@@ -81,7 +82,8 @@ sealed class NetworkStateImpl {
 
     data class Deinitialized(override val previousNetworkConnectionType: NetworkConnectionType, val networkManager: NetworkManager) : NetworkStateImpl(), NetworkState.Deinitialized {
         override val reinitialize: suspend () -> NetworkState.Initializing = { Initializing(previousNetworkConnectionType, networkManager) }
-        override val networkConnectionType: NetworkConnectionType = previousNetworkConnectionType.unknown(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+        override val networkConnectionType: NetworkConnectionType = previousNetworkConnectionType.unknown(
+            NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
     }
 
     sealed class Active : NetworkStateImpl(), HandleBeforeOldStateIsRemoved<NetworkState>, HandleAfterNewStateIsSet<NetworkState> {
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt b/system/src/commonMain/kotlin/network/state/NetworkStateRepo.kt
similarity index 100%
rename from system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepo.kt
rename to system/src/commonMain/kotlin/network/state/NetworkStateRepo.kt
diff --git a/system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/commonMain/kotlin/network/state/NetworkStateRepoBuilder.kt
similarity index 100%
rename from system/src/commonMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
rename to system/src/commonMain/kotlin/network/state/NetworkStateRepoBuilder.kt
diff --git a/system/src/commonTest/kotlin/README.md b/system/src/commonTest/kotlin/README.md
deleted file mode 100644
index 51e412b74..000000000
--- a/system/src/commonTest/kotlin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-## Please check [Documentation](../../../../README.md#commonTests)
\ No newline at end of file
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/BaseNetworkStateTest.kt b/system/src/commonTest/kotlin/network/BaseNetworkStateTest.kt
similarity index 97%
rename from system/src/commonTest/kotlin/com/splendo/kaluga/system/network/BaseNetworkStateTest.kt
rename to system/src/commonTest/kotlin/network/BaseNetworkStateTest.kt
index eab4ad48c..7939301ed 100644
--- a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/BaseNetworkStateTest.kt
+++ b/system/src/commonTest/kotlin/network/BaseNetworkStateTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt b/system/src/commonTest/kotlin/network/NetworkStateTest.kt
similarity index 89%
rename from system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt
rename to system/src/commonTest/kotlin/network/NetworkStateTest.kt
index 0e0171920..9bfd58009 100644
--- a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/NetworkStateTest.kt
+++ b/system/src/commonTest/kotlin/network/NetworkStateTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -35,7 +35,11 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
     override val filter: (Flow<NetworkState>) -> Flow<NetworkState> = { it.filterOnlyImportant() }
 
     @Test
-    fun testInitialValueUnknown() = testNetworkState(NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)) {
+    fun testInitialValueUnknown() = testNetworkState(
+        NetworkConnectionType.Unknown.WithoutLastNetwork(
+            NetworkConnectionType.Unknown.Reason.NOT_CLEAR
+        )
+    ) {
         assertInitialValue()
 
         action {
@@ -88,7 +92,11 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
         }
 
         test {
-            assertEquals(NetworkConnectionType.Unknown.WithLastNetwork(NetworkConnectionType.Known.Wifi(), NetworkConnectionType.Unknown.Reason.LOSING), it.networkConnectionType)
+            assertEquals(
+                NetworkConnectionType.Unknown.WithLastNetwork(
+                    NetworkConnectionType.Known.Wifi(),
+                    NetworkConnectionType.Unknown.Reason.LOSING
+                ), it.networkConnectionType)
         }
 
         mainAction {
@@ -138,7 +146,11 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
     }
 
     @Test
-    fun testUnknownTransition() = testNetworkState(NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)) {
+    fun testUnknownTransition() = testNetworkState(
+        NetworkConnectionType.Unknown.WithoutLastNetwork(
+            NetworkConnectionType.Unknown.Reason.NOT_CLEAR
+        )
+    ) {
         test {
             assertIs<NetworkState.Unknown>(it)
             assertEquals(NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR), it.networkConnectionType)
diff --git a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/OnlineTest.kt b/system/src/commonTest/kotlin/network/OnlineTest.kt
similarity index 58%
rename from system/src/commonTest/kotlin/com/splendo/kaluga/system/network/OnlineTest.kt
rename to system/src/commonTest/kotlin/network/OnlineTest.kt
index ff4e12368..63fd16063 100644
--- a/system/src/commonTest/kotlin/com/splendo/kaluga/system/network/OnlineTest.kt
+++ b/system/src/commonTest/kotlin/network/OnlineTest.kt
@@ -1,17 +1,18 @@
 /*
- * Copyright 2022 Splendo Consulting B.V. The Netherlands
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
  */
 
 package com.splendo.kaluga.system.network
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt b/system/src/iosMain/kotlin/network/NetworkManager.kt
similarity index 98%
rename from system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
rename to system/src/iosMain/kotlin/network/NetworkManager.kt
index c34a5f09b..e87471925 100644
--- a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/NetworkManager.kt
+++ b/system/src/iosMain/kotlin/network/NetworkManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -70,9 +70,9 @@ actual class DefaultNetworkManager internal constructor(
     class Builder : BaseNetworkManager.Builder {
         override fun create(): BaseNetworkManager {
             val appleNetworkManager = if (IOSVersion.systemVersion >= IOSVersion(12)) {
-                DefaultNetworkManager.NWPathNetworkManager()
+                NWPathNetworkManager()
             } else {
-                DefaultNetworkManager.SCNetworkManager()
+                SCNetworkManager()
             }
             return DefaultNetworkManager(appleNetworkManager)
         }
diff --git a/system/src/iosMain/kotlin/com.splendo.kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/iosMain/kotlin/network/state/NetworkStateRepoBuilder.kt
similarity index 100%
rename from system/src/iosMain/kotlin/com.splendo.kaluga/system/network/state/NetworkStateRepoBuilder.kt
rename to system/src/iosMain/kotlin/network/state/NetworkStateRepoBuilder.kt
diff --git a/system/src/iosTest/kotlin/README.md b/system/src/iosTest/kotlin/README.md
deleted file mode 100644
index 489c1d840..000000000
--- a/system/src/iosTest/kotlin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-## Please check [Documentation](../../../../README.md#iosTests)
\ No newline at end of file
diff --git a/system/src/jsMain/kotlin/README.md b/system/src/jsMain/kotlin/README.md
deleted file mode 100644
index a58e13c14..000000000
--- a/system/src/jsMain/kotlin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-## Please check [Documentation](../../../../README.md#iosMain-sources)
diff --git a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt b/system/src/jsMain/kotlin/network/NetworkManager.kt
similarity index 95%
rename from system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
rename to system/src/jsMain/kotlin/network/NetworkManager.kt
index 41ee08199..c8172e213 100644
--- a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
+++ b/system/src/jsMain/kotlin/network/NetworkManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/jsMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/jsMain/kotlin/network/state/NetworkStateRepoBuilder.kt
similarity index 100%
rename from system/src/jsMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
rename to system/src/jsMain/kotlin/network/state/NetworkStateRepoBuilder.kt
diff --git a/system/src/jvmMain/kotlin/README.md b/system/src/jvmMain/kotlin/README.md
deleted file mode 100644
index a58e13c14..000000000
--- a/system/src/jvmMain/kotlin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-## Please check [Documentation](../../../../README.md#iosMain-sources)
diff --git a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt b/system/src/jvmMain/kotlin/network/NetworkManager.kt
similarity index 95%
rename from system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
rename to system/src/jvmMain/kotlin/network/NetworkManager.kt
index 41ee08199..c8172e213 100644
--- a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/NetworkManager.kt
+++ b/system/src/jvmMain/kotlin/network/NetworkManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt b/system/src/jvmMain/kotlin/network/state/NetworkStateRepoBuilder.kt
similarity index 100%
rename from system/src/jvmMain/kotlin/com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder.kt
rename to system/src/jvmMain/kotlin/network/state/NetworkStateRepoBuilder.kt
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
index 82d0a77d8..893194a56 100644
--- a/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
@@ -26,11 +26,13 @@ sealed class MockNetworkState {
 
     sealed class Inactive : MockNetworkState()
     object NotInitialized : Inactive(), NetworkState.NotInitialized {
-        override val networkConnectionType: NetworkConnectionType = NetworkConnectionType.Unknown.WithoutLastNetwork(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+        override val networkConnectionType: NetworkConnectionType = NetworkConnectionType.Unknown.WithoutLastNetwork(
+            NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
     }
 
     data class Deinitialized(override val previousNetworkConnectionType: NetworkConnectionType) : MockNetworkState(), NetworkState.Deinitialized {
-        override val networkConnectionType: NetworkConnectionType = previousNetworkConnectionType.unknown(NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+        override val networkConnectionType: NetworkConnectionType = previousNetworkConnectionType.unknown(
+            NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
         override val reinitialize: suspend () -> NetworkState.Initializing = { Initializing(networkConnectionType) }
     }
 

From d984012c3c4839d0e879810680af65da44e17fbd Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 15 Feb 2023 13:00:16 +0100
Subject: [PATCH 179/227] Documentaton & cleanup for system module

---
 .../commonMain/kotlin/location/Location.kt    |   2 +-
 system/api/androidLib/system.api              | 149 ++---------------
 system/api/jvm/system.api                     | 155 ++----------------
 .../kotlin/network/NetworkManager.kt          |  31 ++--
 .../network/state/NetworkStateRepoBuilder.kt  |   3 +
 .../kotlin/network/NetworkConnectionType.kt   |  77 ++++++++-
 .../kotlin/network/NetworkManager.kt          |  37 ++++-
 .../kotlin/network/state/NetworkState.kt      |  98 ++++++++++-
 .../kotlin/network/state/NetworkStateRepo.kt  |  39 +++--
 .../network/state/NetworkStateRepoBuilder.kt  |  14 +-
 .../kotlin/network/BaseNetworkStateTest.kt    |   6 +-
 .../kotlin/network/NetworkStateTest.kt        |  16 +-
 .../commonTest/kotlin/network/OnlineTest.kt   |   4 +-
 .../iosMain/kotlin/network/NetworkManager.kt  |  10 +-
 .../network/state/NetworkStateRepoBuilder.kt  |   3 +
 .../jsMain/kotlin/network/NetworkManager.kt   |  12 +-
 .../network/state/NetworkStateRepoBuilder.kt  |   3 +
 .../jvmMain/kotlin/network/NetworkManager.kt  |  12 +-
 .../network/state/NetworkStateRepoBuilder.kt  |   3 +
 .../api/androidLib/test-utils-system.api      |  25 +--
 .../api/jvm/test-utils-system.api             |  25 +--
 .../kotlin/network/MockNetworkManager.kt      |  29 +---
 .../kotlin/network/MockNetworkState.kt        |   2 +-
 .../network/MockNetworkStateRepoBuilder.kt    |   6 +-
 24 files changed, 359 insertions(+), 402 deletions(-)

diff --git a/location/src/commonMain/kotlin/location/Location.kt b/location/src/commonMain/kotlin/location/Location.kt
index 3728430cf..3969c1af5 100644
--- a/location/src/commonMain/kotlin/location/Location.kt
+++ b/location/src/commonMain/kotlin/location/Location.kt
@@ -158,7 +158,7 @@ data class DMSCoordinate(val degrees: Int, val minutes: Int, val seconds: Double
 
 /**
  * Converts a [Location] into an [Location.UnknownLocation] given a [Location.UnknownLocation.Reason]
- * @param reason the [Location.UnknownLocation.Reason] became unknown
+ * @param reason the [Location.UnknownLocation.Reason] the [Location] became unknown
  * @return the [Location.UnknownLocation] with [reason].
  * If the [Location] this method had a [Location.KnownLocation], this will return [Location.UnknownLocation.WithLastLocation], otherwise [Location.UnknownLocation.WithoutLastLocation]
  */
diff --git a/system/api/androidLib/system.api b/system/api/androidLib/system.api
index 93fb096bd..976fd68f3 100644
--- a/system/api/androidLib/system.api
+++ b/system/api/androidLib/system.api
@@ -1,20 +1,12 @@
-public abstract class com/splendo/kaluga/system/network/BaseNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
-	public fun <init> ()V
-}
-
-public abstract interface class com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
-	public abstract fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
-}
-
-public final class com/splendo/kaluga/system/network/DefaultNetworkManager : com/splendo/kaluga/system/network/BaseNetworkManager {
+public final class com/splendo/kaluga/system/network/DefaultNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
 	public fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
 	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/system/network/DefaultNetworkManager$Builder : com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
+public final class com/splendo/kaluga/system/network/DefaultNetworkManager$Builder : com/splendo/kaluga/system/network/NetworkManager$Builder {
 	public fun <init> (Landroid/content/Context;)V
-	public fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+	public fun create ()Lcom/splendo/kaluga/system/network/NetworkManager;
 }
 
 public abstract class com/splendo/kaluga/system/network/NetworkConnectionType {
@@ -27,20 +19,13 @@ public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known
 	public static final field INSTANCE Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
 }
 
-public abstract class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available : com/splendo/kaluga/system/network/NetworkConnectionType$Known, com/splendo/kaluga/system/network/ReachableNetworkConnection {
+public abstract class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available : com/splendo/kaluga/system/network/NetworkConnectionType$Known {
+	public abstract fun isExpensive ()Z
 }
 
 public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular : com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available {
-	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Z
-	public final fun copy (Z)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;ZILjava/lang/Object;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
+	public static final field INSTANCE Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;
 	public fun isExpensive ()Z
-	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Wifi : com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available {
@@ -103,8 +88,8 @@ public abstract interface class com/splendo/kaluga/system/network/NetworkManager
 	public abstract fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public abstract interface class com/splendo/kaluga/system/network/ReachableNetworkConnection {
-	public abstract fun isExpensive ()Z
+public abstract interface class com/splendo/kaluga/system/network/NetworkManager$Builder {
+	public abstract fun create ()Lcom/splendo/kaluga/system/network/NetworkManager;
 }
 
 public abstract class com/splendo/kaluga/system/network/state/BaseNetworkStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
@@ -112,8 +97,8 @@ public abstract class com/splendo/kaluga/system/network/state/BaseNetworkStateRe
 }
 
 public abstract interface class com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
-	public abstract fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
-	public static synthetic fun create$default (Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+	public abstract fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepo;
+	public static synthetic fun create$default (Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepo;
 }
 
 public abstract interface class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/base/state/KalugaState {
@@ -130,7 +115,6 @@ public abstract interface class com/splendo/kaluga/system/network/state/NetworkS
 }
 
 public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Deinitialized : com/splendo/kaluga/system/network/state/NetworkState$Inactive {
-	public abstract fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 	public abstract fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 }
 
@@ -162,121 +146,24 @@ public abstract interface class com/splendo/kaluga/system/network/state/NetworkS
 	public abstract fun getUnavailable ()Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl {
-	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-}
-
-public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Active : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
-	public abstract fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Available : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Available {
-	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
-	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
-	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
-	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/system/network/state/NetworkState$Deinitialized {
-	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public final fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized : com/splendo/kaluga/system/network/state/NetworkStateImpl$Active {
-	public final fun available (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)Lkotlin/jvm/functions/Function1;
-	public final fun unknown (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing : com/splendo/kaluga/system/network/state/NetworkStateImpl$Active, com/splendo/kaluga/system/network/state/NetworkState$Initializing {
-	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public fun hashCode ()I
-	public fun initialized (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$NotInitialized : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/system/network/state/NetworkState$NotInitialized {
-	public static final field INSTANCE Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$NotInitialized;
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public final fun startInitializing (Lcom/splendo/kaluga/system/network/NetworkManager;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unavailable {
-	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
-	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
-	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unknown {
-	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
-	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
-	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public class com/splendo/kaluga/system/network/state/NetworkStateImplRepo : com/splendo/kaluga/system/network/state/BaseNetworkStateRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
 }
 
-public class com/splendo/kaluga/system/network/state/NetworkStateRepo : com/splendo/kaluga/system/network/state/NetworkStateImplRepo {
-	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
+public final class com/splendo/kaluga/system/network/state/NetworkStateKt {
+	public static final fun network (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+	public static final fun online (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkStateRepo : com/splendo/kaluga/system/network/state/NetworkStateImplRepo {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
 }
 
 public final class com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder : com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
 	public fun <init> ()V
 	public fun <init> (Landroid/content/Context;)V
 	public synthetic fun <init> (Landroid/content/Context;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepo;
 	public fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
 }
 
-public final class com/splendo/kaluga/system/network/state/NetworkStateRepoKt {
-	public static final fun network (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
-	public static final fun online (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
-}
-
diff --git a/system/api/jvm/system.api b/system/api/jvm/system.api
index 3a5a5ffb0..31c2b9760 100644
--- a/system/api/jvm/system.api
+++ b/system/api/jvm/system.api
@@ -1,21 +1,13 @@
-public abstract class com/splendo/kaluga/system/network/BaseNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
-	public fun <init> ()V
-}
-
-public abstract interface class com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
-	public abstract fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
-}
-
-public final class com/splendo/kaluga/system/network/DefaultNetworkManager : com/splendo/kaluga/system/network/BaseNetworkManager {
+public final class com/splendo/kaluga/system/network/DefaultNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
 	public fun <init> ()V
 	public fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
 	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/system/network/DefaultNetworkManager$Builder : com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
+public final class com/splendo/kaluga/system/network/DefaultNetworkManager$Builder : com/splendo/kaluga/system/network/NetworkManager$Builder {
 	public fun <init> ()V
-	public fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+	public fun create ()Lcom/splendo/kaluga/system/network/NetworkManager;
 }
 
 public abstract class com/splendo/kaluga/system/network/NetworkConnectionType {
@@ -28,20 +20,13 @@ public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known
 	public static final field INSTANCE Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
 }
 
-public abstract class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available : com/splendo/kaluga/system/network/NetworkConnectionType$Known, com/splendo/kaluga/system/network/ReachableNetworkConnection {
+public abstract class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available : com/splendo/kaluga/system/network/NetworkConnectionType$Known {
+	public abstract fun isExpensive ()Z
 }
 
 public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular : com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available {
-	public fun <init> ()V
-	public fun <init> (Z)V
-	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Z
-	public final fun copy (Z)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;ZILjava/lang/Object;)Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
+	public static final field INSTANCE Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Cellular;
 	public fun isExpensive ()Z
-	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/system/network/NetworkConnectionType$Known$Wifi : com/splendo/kaluga/system/network/NetworkConnectionType$Known$Available {
@@ -104,8 +89,8 @@ public abstract interface class com/splendo/kaluga/system/network/NetworkManager
 	public abstract fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public abstract interface class com/splendo/kaluga/system/network/ReachableNetworkConnection {
-	public abstract fun isExpensive ()Z
+public abstract interface class com/splendo/kaluga/system/network/NetworkManager$Builder {
+	public abstract fun create ()Lcom/splendo/kaluga/system/network/NetworkManager;
 }
 
 public abstract class com/splendo/kaluga/system/network/state/BaseNetworkStateRepo : com/splendo/kaluga/base/state/ColdStateFlowRepo {
@@ -113,11 +98,11 @@ public abstract class com/splendo/kaluga/system/network/state/BaseNetworkStateRe
 }
 
 public abstract interface class com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
-	public abstract fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+	public abstract fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepo;
 }
 
 public final class com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder$DefaultImpls {
-	public static synthetic fun create$default (Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
+	public static synthetic fun create$default (Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepo;
 }
 
 public abstract interface class com/splendo/kaluga/system/network/state/NetworkState : com/splendo/kaluga/base/state/KalugaState {
@@ -146,7 +131,6 @@ public final class com/splendo/kaluga/system/network/state/NetworkState$DefaultI
 }
 
 public abstract interface class com/splendo/kaluga/system/network/state/NetworkState$Deinitialized : com/splendo/kaluga/system/network/state/NetworkState$Inactive {
-	public abstract fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 	public abstract fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 }
 
@@ -210,125 +194,22 @@ public final class com/splendo/kaluga/system/network/state/NetworkState$Unknown$
 	public static fun remain (Lcom/splendo/kaluga/system/network/state/NetworkState$Unknown;)Lkotlin/jvm/functions/Function1;
 }
 
-public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl {
-	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-}
-
-public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Active : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/base/state/HandleAfterNewStateIsSet, com/splendo/kaluga/base/state/HandleBeforeOldStateIsRemoved {
-	public synthetic fun afterNewStateIsSet (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun afterNewStateIsSet (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public synthetic fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/base/state/KalugaState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun beforeOldStateIsRemoved (Lcom/splendo/kaluga/system/network/state/NetworkState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getDeinitialize ()Lkotlin/jvm/functions/Function1;
-	public abstract fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Available : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Available {
-	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
-	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Available;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;
-	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
-	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/system/network/state/NetworkState$Deinitialized {
-	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Deinitialized;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public final fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public abstract class com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized : com/splendo/kaluga/system/network/state/NetworkStateImpl$Active {
-	public final fun available (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Available;)Lkotlin/jvm/functions/Function1;
-	public final fun unknown (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown$Reason;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing : com/splendo/kaluga/system/network/state/NetworkStateImpl$Active, com/splendo/kaluga/system/network/state/NetworkState$Initializing {
-	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;Lcom/splendo/kaluga/system/network/NetworkConnectionType;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Initializing;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public fun hashCode ()I
-	public fun initialized (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lkotlin/jvm/functions/Function1;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$NotInitialized : com/splendo/kaluga/system/network/state/NetworkStateImpl, com/splendo/kaluga/system/network/state/NetworkState$NotInitialized {
-	public static final field INSTANCE Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$NotInitialized;
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public final fun startInitializing (Lcom/splendo/kaluga/system/network/NetworkManager;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unavailable {
-	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unavailable;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known$Absent;
-	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Known;
-	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown : com/splendo/kaluga/system/network/state/NetworkStateImpl$Initialized, com/splendo/kaluga/system/network/state/NetworkState$Unknown {
-	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
-	public final fun component2 ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;Lcom/splendo/kaluga/system/network/NetworkManager;ILjava/lang/Object;)Lcom/splendo/kaluga/system/network/state/NetworkStateImpl$Unknown;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType$Unknown;
-	public synthetic fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getNetworkManager ()Lcom/splendo/kaluga/system/network/NetworkManager;
-	public fun getUnavailable ()Lkotlin/jvm/functions/Function1;
-	public fun hashCode ()I
-	public fun remain ()Lkotlin/jvm/functions/Function1;
-	public fun toString ()Ljava/lang/String;
-}
-
 public class com/splendo/kaluga/system/network/state/NetworkStateImplRepo : com/splendo/kaluga/system/network/state/BaseNetworkStateRepo {
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
 }
 
-public class com/splendo/kaluga/system/network/state/NetworkStateRepo : com/splendo/kaluga/system/network/state/NetworkStateImplRepo {
-	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
+public final class com/splendo/kaluga/system/network/state/NetworkStateKt {
+	public static final fun network (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+	public static final fun online (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+}
+
+public final class com/splendo/kaluga/system/network/state/NetworkStateRepo : com/splendo/kaluga/system/network/state/NetworkStateImplRepo {
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkManager$Builder;Lkotlin/coroutines/CoroutineContext;)V
 }
 
 public final class com/splendo/kaluga/system/network/state/NetworkStateRepoBuilder : com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
 	public fun <init> ()V
+	public synthetic fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepo;
 	public fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
 }
 
-public final class com/splendo/kaluga/system/network/state/NetworkStateRepoKt {
-	public static final fun network (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
-	public static final fun online (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
-}
-
diff --git a/system/src/androidLibMain/kotlin/network/NetworkManager.kt b/system/src/androidLibMain/kotlin/network/NetworkManager.kt
index 26fa9de94..6364c84e5 100644
--- a/system/src/androidLibMain/kotlin/network/NetworkManager.kt
+++ b/system/src/androidLibMain/kotlin/network/NetworkManager.kt
@@ -29,16 +29,23 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.receiveAsFlow
 
+/**
+ * Default implementation of [NetworkManager]
+ */
 actual class DefaultNetworkManager internal constructor(
     private val androidNetworkManager: AndroidNetworkManager
-) : BaseNetworkManager() {
+) : NetworkManager {
 
     override val network: Flow<NetworkConnectionType> get() = androidNetworkManager.network
     override suspend fun startMonitoring() = androidNetworkManager.startMonitoring()
     override suspend fun stopMonitoring() = androidNetworkManager.stopMonitoring()
 
-    class Builder(private val context: Context) : BaseNetworkManager.Builder {
-        override fun create(): BaseNetworkManager {
+    /**
+     * Builder for creating a [DefaultNetworkManager]
+     * @param context the [Context] in which to monitor the network
+     */
+    class Builder(private val context: Context) : NetworkManager.Builder {
+        override fun create(): NetworkManager {
             val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
             val androidNetworkManager = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 AndroidConnectivityCallbackManager(
@@ -103,19 +110,11 @@ actual class DefaultNetworkManager internal constructor(
 
         private fun determineNetworkType(): NetworkConnectionType {
             val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
-            val isCellularDataEnabled = capabilities?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ?: false
-            val isWifiEnabled = capabilities?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ?: false
-
             return when {
-                isWifiEnabled -> {
-                    NetworkConnectionType.Known.Wifi()
-                }
-                isCellularDataEnabled -> {
-                    NetworkConnectionType.Known.Cellular()
-                }
-                else -> {
-                    NetworkConnectionType.Known.Absent
-                }
+                capabilities == null -> NetworkConnectionType.Known.Absent
+                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> NetworkConnectionType.Known.Wifi(!capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED))
+                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> NetworkConnectionType.Known.Cellular
+                else -> NetworkConnectionType.Known.Absent
             }
         }
     }
@@ -149,7 +148,7 @@ actual class DefaultNetworkManager internal constructor(
             return when {
                 connectivityManager.activeNetworkInfo?.isConnectedOrConnecting != true -> NetworkConnectionType.Known.Absent
                 (!isMetered && connectivityManager.isDefaultNetworkActive) -> NetworkConnectionType.Known.Wifi()
-                isMetered -> NetworkConnectionType.Known.Cellular()
+                isMetered -> NetworkConnectionType.Known.Cellular
                 else -> NetworkConnectionType.Known.Absent
             }
         }
diff --git a/system/src/androidLibMain/kotlin/network/state/NetworkStateRepoBuilder.kt b/system/src/androidLibMain/kotlin/network/state/NetworkStateRepoBuilder.kt
index 36f1ef382..543abba59 100644
--- a/system/src/androidLibMain/kotlin/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/androidLibMain/kotlin/network/state/NetworkStateRepoBuilder.kt
@@ -22,6 +22,9 @@ import com.splendo.kaluga.base.ApplicationHolder
 import com.splendo.kaluga.system.network.DefaultNetworkManager
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * Default implementation of [BaseNetworkStateRepoBuilder]
+ */
 actual class NetworkStateRepoBuilder(
     private val context: Context = ApplicationHolder.applicationContext,
 ) : BaseNetworkStateRepoBuilder {
diff --git a/system/src/commonMain/kotlin/network/NetworkConnectionType.kt b/system/src/commonMain/kotlin/network/NetworkConnectionType.kt
index 3f44b0f5b..9f076dafb 100644
--- a/system/src/commonMain/kotlin/network/NetworkConnectionType.kt
+++ b/system/src/commonMain/kotlin/network/NetworkConnectionType.kt
@@ -17,31 +17,96 @@
 
 package com.splendo.kaluga.system.network
 
-interface ReachableNetworkConnection {
-    val isExpensive: Boolean
-}
-
+/**
+ * The type of connection to a network
+ */
 sealed class NetworkConnectionType {
+
+    /**
+     * A [NetworkConnectionType] where it is unknown what th current connection state is
+     * @property reason the [Reason] the network type is unknown.
+     */
     sealed class Unknown(open val reason: Reason) : NetworkConnectionType() {
+
+        /**
+         * A reason why an [Unknown] network type may occur
+         */
         enum class Reason {
+
+            /**
+             * The system is in the process of connecting to a network
+             */
             CONNECTING,
+
+            /**
+             * The system is in the process of disconnecting from a network
+             */
             LOSING,
+
+            /**
+             * There is no clear reason why the network state is unknown
+             */
             NOT_CLEAR
         }
+
+        /**
+         * An [Unknown] reason where no previously [Known] network state is available
+         * @param reason the [Reason] the network type is unknown.
+         */
         data class WithoutLastNetwork(override val reason: Reason) : Unknown(reason)
+
+        /**
+         * An [Unknown] reason where a previously [Known] network state is available
+         * @property lastKnown the last [Known] network state available before the network became [Unknown]
+         * @param reason the [Reason] the network type is unknown.
+         */
         data class WithLastNetwork(
             val lastKnown: Known,
             override val reason: Reason
         ) : Unknown(reason)
     }
+
+    /**
+     * A [NetworkConnectionType] where the current connection state is known
+     */
     sealed class Known : NetworkConnectionType() {
-        sealed class Available : Known(), ReachableNetworkConnection
-        data class Cellular(override val isExpensive: Boolean = true) : Available()
+        /**
+         * A [Known] network type where the network is available
+         */
+        sealed class Available : Known() {
+
+            /**
+             * If `true` using the network may result in some costs
+             */
+            abstract val isExpensive: Boolean
+        }
+
+        /**
+         * An [Available] network connected to the cellular network
+         */
+        object Cellular : Available() {
+            override val isExpensive: Boolean = true
+        }
+
+        /**
+         * An [Available] network connected to WIFI.
+         * @property isExpensive If `true` using the network may result in some costs
+         */
         data class Wifi(override val isExpensive: Boolean = false) : Available()
+
+        /**
+         * A [Known] network type where no network is available
+         */
         object Absent : Known()
     }
 }
 
+/**
+ * Converts a [NetworkConnectionType] into an [NetworkConnectionType.Unknown] given a [NetworkConnectionType.Unknown.Reason]
+ * @param reason the [NetworkConnectionType.Unknown.Reason] the [NetworkConnectionType] became unknown
+ * @return the [NetworkConnectionType.Unknown] with [reason].
+ * If the [NetworkConnectionType] this method had a [NetworkConnectionType.Known], this will return [NetworkConnectionType.Unknown.WithLastNetwork], otherwise [NetworkConnectionType.Unknown.WithoutLastNetwork]
+ */
 fun NetworkConnectionType.unknown(reason: NetworkConnectionType.Unknown.Reason) = when (this) {
     is NetworkConnectionType.Known -> NetworkConnectionType.Unknown.WithLastNetwork(this, reason)
     is NetworkConnectionType.Unknown.WithLastNetwork -> NetworkConnectionType.Unknown.WithLastNetwork(
diff --git a/system/src/commonMain/kotlin/network/NetworkManager.kt b/system/src/commonMain/kotlin/network/NetworkManager.kt
index 60aa14053..30e8ca58f 100644
--- a/system/src/commonMain/kotlin/network/NetworkManager.kt
+++ b/system/src/commonMain/kotlin/network/NetworkManager.kt
@@ -19,16 +19,39 @@ package com.splendo.kaluga.system.network
 
 import kotlinx.coroutines.flow.Flow
 
+/**
+ * Manages monitoring for [NetworkConnectionType]
+ */
 interface NetworkManager {
-    val network: Flow<NetworkConnectionType>
-    suspend fun startMonitoring()
-    suspend fun stopMonitoring()
-}
 
-abstract class BaseNetworkManager : NetworkManager {
+    /**
+     * Builder for creating a [NetworkManager]
+     */
     interface Builder {
-        fun create(): BaseNetworkManager
+
+        /**
+         * Creates the [NetworkManager]
+         */
+        fun create(): NetworkManager
     }
+
+    /**
+     * A [Flow] pf the [NetworkConnectionType] detected by the network manager
+     */
+    val network: Flow<NetworkConnectionType>
+
+    /**
+     * Starts monitoring for changes to [NetworkConnectionType] that will be emitted on the [network] flow
+     */
+    suspend fun startMonitoring()
+
+    /**
+     * Stops monitoring for changes to [NetworkConnectionType]
+     */
+    suspend fun stopMonitoring()
 }
 
-expect class DefaultNetworkManager : BaseNetworkManager
+/**
+ * Default implementation of [NetworkManager]
+ */
+expect class DefaultNetworkManager : NetworkManager
diff --git a/system/src/commonMain/kotlin/network/state/NetworkState.kt b/system/src/commonMain/kotlin/network/state/NetworkState.kt
index e488e67ba..78e9b92de 100644
--- a/system/src/commonMain/kotlin/network/state/NetworkState.kt
+++ b/system/src/commonMain/kotlin/network/state/NetworkState.kt
@@ -18,58 +18,132 @@
 package com.splendo.kaluga.system.network.state
 
 import com.splendo.kaluga.base.flow.SpecialFlowValue
+import com.splendo.kaluga.base.flow.filterOnlyImportant
 import com.splendo.kaluga.base.state.HandleAfterNewStateIsSet
 import com.splendo.kaluga.base.state.HandleBeforeOldStateIsRemoved
 import com.splendo.kaluga.base.state.KalugaState
 import com.splendo.kaluga.system.network.NetworkConnectionType
 import com.splendo.kaluga.system.network.NetworkManager
 import com.splendo.kaluga.system.network.unknown
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
 
+/**
+ * A [KalugaState] of a [NetworkConnectionType]
+ */
 sealed interface NetworkState : KalugaState {
 
+    /**
+     * The [NetworkConnectionType] during this state
+     */
     val networkConnectionType: NetworkConnectionType
 
+    /**
+     * A [NetworkState] indicating observation is not active
+     */
     sealed interface Inactive : NetworkState, SpecialFlowValue.NotImportant
+
+    /**
+     * An [Inactive] State indicating observation has not started yet
+     */
     interface NotInitialized : Inactive
 
+    /**
+     * An [Inactive] State indicating observation has stopped after being started
+     */
     interface Deinitialized : Inactive {
-        val previousNetworkConnectionType: NetworkConnectionType
+
+        /**
+         * Transitions into an [Initializing] State
+         */
         val reinitialize: suspend () -> Initializing
     }
 
+    /**
+     * A [NetworkState] indicating observation has started
+     */
     sealed interface Active : NetworkState {
+
+        /**
+         * Transitions into a [Deinitialized] State
+         */
         val deinitialize: suspend () -> Deinitialized
     }
 
+    /**
+     * An [Active] State indicating the state is transitioning from [Inactive] to [Initialized]
+     */
     interface Initializing : Active, SpecialFlowValue.NotImportant {
+
+        /**
+         * Transitions into an [Initialized] State
+         * @param networkType the [NetworkConnectionType] to initialize with
+         * @return method for transitioning into an [Initialized] State
+         */
         fun initialized(networkType: NetworkConnectionType): suspend () -> Initialized
     }
 
+    /**
+     * An [Active] State indicating observation has started and initialization has completed
+     */
     sealed interface Initialized : Active {
+
+        /**
+         * Transitions into an [Available] State
+         * @param available the [NetworkConnectionType.Known.Available] of the [Available] State to transition to
+         * @return method for transitioning into an [Available] State
+         */
         fun available(available: NetworkConnectionType.Known.Available): suspend () -> Available
+
+        /**
+         * Transitions into an [Unknown] State
+         * @param reason the [NetworkConnectionType.Unknown.Reason] of the [Unknown] State to transition to
+         * @return method for transitioning into an [Unknown] State
+         */
         fun unknown(reason: NetworkConnectionType.Unknown.Reason): suspend () -> Unknown
     }
 
+    /**
+     * An [Initialized] State indicating the [NetworkConnectionType] is [NetworkConnectionType.Unknown]
+     */
     interface Unknown : Initialized {
         override val networkConnectionType: NetworkConnectionType.Unknown
+
+        /**
+         * Transitions into an [Unavailable] State
+         */
         val unavailable: suspend () -> Unavailable
     }
 
+    /**
+     * An [Initialized] State indicating the [NetworkConnectionType] is [NetworkConnectionType.Known]
+     */
     sealed interface Known : Initialized {
         override val networkConnectionType: NetworkConnectionType.Known
     }
 
+    /**
+     * A [Known] State indicating the [NetworkConnectionType] is [NetworkConnectionType.Known.Available]
+     */
     interface Available : Known {
         override val networkConnectionType: NetworkConnectionType.Known.Available
+
+        /**
+         * Transitions into an [Unavailable] State
+         */
         val unavailable: suspend () -> Unavailable
     }
 
+    /**
+     * A [Known] State indicating the [NetworkConnectionType] is [NetworkConnectionType.Known.Absent]
+     */
     interface Unavailable : Known {
         override val networkConnectionType: NetworkConnectionType.Known.Absent
     }
 }
 
-sealed class NetworkStateImpl {
+internal sealed class NetworkStateImpl {
     abstract val networkConnectionType: NetworkConnectionType
 
     object NotInitialized : NetworkStateImpl(), NetworkState.NotInitialized {
@@ -80,7 +154,7 @@ sealed class NetworkStateImpl {
         }
     }
 
-    data class Deinitialized(override val previousNetworkConnectionType: NetworkConnectionType, val networkManager: NetworkManager) : NetworkStateImpl(), NetworkState.Deinitialized {
+    data class Deinitialized(private val previousNetworkConnectionType: NetworkConnectionType, val networkManager: NetworkManager) : NetworkStateImpl(), NetworkState.Deinitialized {
         override val reinitialize: suspend () -> NetworkState.Initializing = { Initializing(previousNetworkConnectionType, networkManager) }
         override val networkConnectionType: NetworkConnectionType = previousNetworkConnectionType.unknown(
             NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
@@ -140,3 +214,21 @@ sealed class NetworkStateImpl {
         override val networkConnectionType: NetworkConnectionType.Known.Absent = NetworkConnectionType.Known.Absent
     }
 }
+
+/**
+ * Transforms a [Flow] of [NetworkState] into a flow of its associated [NetworkConnectionType]
+ * @return the [Flow] of [NetworkConnectionType] associated with the [NetworkState]
+ */
+fun Flow<NetworkState>.network(): Flow<NetworkConnectionType> {
+    return filterOnlyImportant().map { it.networkConnectionType }.distinctUntilChanged()
+}
+
+/**
+ * Transforms a [Flow] of [NetworkState] into a flow indicating the network is considered to be available.
+ * @return the [Flow] containing `true` if the network is considered available
+ */
+fun Flow<NetworkState>.online(): Flow<Boolean> {
+    return network().map {
+        it is NetworkConnectionType.Known.Available
+    }
+}
diff --git a/system/src/commonMain/kotlin/network/state/NetworkStateRepo.kt b/system/src/commonMain/kotlin/network/state/NetworkStateRepo.kt
index 5bd3134ca..2eba65788 100644
--- a/system/src/commonMain/kotlin/network/state/NetworkStateRepo.kt
+++ b/system/src/commonMain/kotlin/network/state/NetworkStateRepo.kt
@@ -17,25 +17,30 @@
 
 package com.splendo.kaluga.system.network.state
 
-import com.splendo.kaluga.base.flow.filterOnlyImportant
 import com.splendo.kaluga.base.state.ColdStateFlowRepo
 import com.splendo.kaluga.base.state.StateRepo
-import com.splendo.kaluga.system.network.BaseNetworkManager
 import com.splendo.kaluga.system.network.NetworkConnectionType
 import com.splendo.kaluga.system.network.NetworkManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * A [StateRepo]/[MutableStateFlow] of [NetworkState]
+ */
 typealias NetworkStateFlowRepo = StateRepo<NetworkState, MutableStateFlow<NetworkState>>
 
+/**
+ * An abstract [ColdStateFlowRepo] for managing [NetworkState]
+ * @param createNotInitializedState method for creating the initial [NetworkState.NotInitialized] State
+ * @param createInitializingState method for transitioning from a [NetworkState.Inactive] into a [NetworkState.Initializing] given an implementation of this [ColdStateFlowRepo]
+ * @param createDeinitializingState method for transitioning from a [NetworkState.Active] into a [NetworkState.Deinitialized] given an implementation of this [ColdStateFlowRepo]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine.
+ */
 abstract class BaseNetworkStateRepo(
     createNotInitializedState: () -> NetworkState.NotInitialized,
     createInitializingState: suspend ColdStateFlowRepo<NetworkState>.(NetworkState.Inactive) -> suspend () -> NetworkState,
@@ -60,6 +65,11 @@ abstract class BaseNetworkStateRepo(
     firstState = createNotInitializedState
 )
 
+/**
+ * A [BaseNetworkStateRepo] managed using a [NetworkManager]
+ * @param createNetworkManager method for creating the [NetworkManager] to manage the [NetworkState]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine.
+ */
 open class NetworkStateImplRepo(
     createNetworkManager: suspend () -> NetworkManager,
     coroutineContext: CoroutineContext
@@ -115,8 +125,13 @@ open class NetworkStateImplRepo(
     }
 }
 
-open class NetworkStateRepo(
-    private val networkManagerBuilder: BaseNetworkManager.Builder,
+/**
+ * A [NetworkStateImplRepo] using a [NetworkManager]
+ * @param networkManagerBuilder the [NetworkManager.Builder] for building a [NetworkManager]
+ * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine
+ */
+class NetworkStateRepo(
+    private val networkManagerBuilder: NetworkManager.Builder,
     coroutineContext: CoroutineContext,
 ) : NetworkStateImplRepo(
     createNetworkManager = {
@@ -124,13 +139,3 @@ open class NetworkStateRepo(
     },
     coroutineContext
 )
-
-fun Flow<NetworkState>.network(): Flow<NetworkConnectionType> {
-    return filterOnlyImportant().map { it.networkConnectionType }.distinctUntilChanged()
-}
-
-fun Flow<NetworkState>.online(): Flow<Boolean> {
-    return network().map {
-        it is NetworkConnectionType.Known.Wifi || it is NetworkConnectionType.Known.Cellular
-    }
-}
diff --git a/system/src/commonMain/kotlin/network/state/NetworkStateRepoBuilder.kt b/system/src/commonMain/kotlin/network/state/NetworkStateRepoBuilder.kt
index d80cf1331..a075cb08b 100644
--- a/system/src/commonMain/kotlin/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/commonMain/kotlin/network/state/NetworkStateRepoBuilder.kt
@@ -24,8 +24,20 @@ private val defaultNetworkDispatcher by lazy {
     singleThreadDispatcher("Location")
 }
 
+/**
+ * Builder for creating a [BaseNetworkStateRepo]
+ */
 interface BaseNetworkStateRepoBuilder {
-    fun create(coroutineContext: CoroutineContext = defaultNetworkDispatcher): NetworkStateRepo
+
+    /**
+     * Creates the [BaseNetworkStateRepo]
+     * @param coroutineContext the [CoroutineContext] the [CoroutineContext] used to create a coroutine scope for this state machine.
+     * @return the created [BaseNetworkStateRepo]
+     */
+    fun create(coroutineContext: CoroutineContext = defaultNetworkDispatcher): BaseNetworkStateRepo
 }
 
+/**
+ * Default implementation of [BaseNetworkStateRepoBuilder]
+ */
 expect class NetworkStateRepoBuilder : BaseNetworkStateRepoBuilder
diff --git a/system/src/commonTest/kotlin/network/BaseNetworkStateTest.kt b/system/src/commonTest/kotlin/network/BaseNetworkStateTest.kt
index 7939301ed..52ba2eaec 100644
--- a/system/src/commonTest/kotlin/network/BaseNetworkStateTest.kt
+++ b/system/src/commonTest/kotlin/network/BaseNetworkStateTest.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.system.network
 
 import com.splendo.kaluga.test.base.BaseFlowTest
-import com.splendo.kaluga.test.system.network.MockBaseNetworkManager
+import com.splendo.kaluga.test.system.network.MockNetworkManager
 import com.splendo.kaluga.test.system.network.MockNetworkStateRepoBuilder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -30,10 +30,10 @@ abstract class BaseNetworkStateTest<T, F : Flow<T>> : BaseFlowTest<BaseNetworkSt
     )
 
     class Context(configuration: Configuration, coroutineScope: CoroutineScope) : TestContext {
-        val networkManagerBuilder = MockBaseNetworkManager.Builder(configuration.initialNetworkConnectionType)
+        val networkManagerBuilder = MockNetworkManager.Builder(configuration.initialNetworkConnectionType)
         val networkStateRepoBuilder = MockNetworkStateRepoBuilder(networkManagerBuilder)
         val networkStateRepo = networkStateRepoBuilder.create(coroutineScope.coroutineContext)
-        val networkManager get() = networkManagerBuilder.builtNetworkManagers.first() as MockBaseNetworkManager
+        val networkManager get() = networkManagerBuilder.builtNetworkManagers.first()
     }
 
     override val createTestContextWithConfiguration: suspend (configuration: Configuration, scope: CoroutineScope) -> Context =
diff --git a/system/src/commonTest/kotlin/network/NetworkStateTest.kt b/system/src/commonTest/kotlin/network/NetworkStateTest.kt
index 9bfd58009..58fabe181 100644
--- a/system/src/commonTest/kotlin/network/NetworkStateTest.kt
+++ b/system/src/commonTest/kotlin/network/NetworkStateTest.kt
@@ -68,12 +68,12 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
         }
 
         mainAction {
-            networkManager.network.value = NetworkConnectionType.Known.Cellular()
+            networkManager.network.value = NetworkConnectionType.Known.Cellular
         }
 
         test {
             assertIs<NetworkState.Available>(it)
-            assertEquals(NetworkConnectionType.Known.Cellular(), it.networkConnectionType)
+            assertEquals(NetworkConnectionType.Known.Cellular, it.networkConnectionType)
         }
     }
 
@@ -102,12 +102,12 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
         mainAction {
             networkManager.network.value = NetworkConnectionType.Known.Wifi()
             yield()
-            networkManager.network.value = NetworkConnectionType.Known.Cellular()
+            networkManager.network.value = NetworkConnectionType.Known.Cellular
         }
 
         test(1) {
             assertIs<NetworkState.Available>(it)
-            assertEquals(NetworkConnectionType.Known.Cellular(), it.networkConnectionType)
+            assertEquals(NetworkConnectionType.Known.Cellular, it.networkConnectionType)
         }
 
         mainAction {
@@ -126,11 +126,11 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
         }
 
         mainAction {
-            networkManager.network.value = NetworkConnectionType.Known.Cellular()
+            networkManager.network.value = NetworkConnectionType.Known.Cellular
         }
 
         test {
-            assertEquals(NetworkConnectionType.Known.Cellular(), it.networkConnectionType)
+            assertEquals(NetworkConnectionType.Known.Cellular, it.networkConnectionType)
         }
 
         mainAction {
@@ -157,11 +157,11 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
         }
 
         mainAction {
-            networkManager.network.value = NetworkConnectionType.Known.Cellular()
+            networkManager.network.value = NetworkConnectionType.Known.Cellular
         }
 
         test {
-            assertEquals(NetworkConnectionType.Known.Cellular(), it.networkConnectionType)
+            assertEquals(NetworkConnectionType.Known.Cellular, it.networkConnectionType)
         }
 
         action {
diff --git a/system/src/commonTest/kotlin/network/OnlineTest.kt b/system/src/commonTest/kotlin/network/OnlineTest.kt
index 63fd16063..f393c7a92 100644
--- a/system/src/commonTest/kotlin/network/OnlineTest.kt
+++ b/system/src/commonTest/kotlin/network/OnlineTest.kt
@@ -28,7 +28,7 @@ class OnlineTest : BaseNetworkStateTest<Boolean, Flow<Boolean>>() {
     override val flowFromTestContext: suspend Context.() -> Flow<Boolean> = { networkStateRepo.online() }
 
     @Test
-    fun testIsOnOrOffline() = testNetworkState(NetworkConnectionType.Known.Wifi()) { networkStateRepo ->
+    fun testIsOnOrOffline() = testNetworkState(NetworkConnectionType.Known.Wifi()) {
         test {
             assertTrue(it)
         }
@@ -42,7 +42,7 @@ class OnlineTest : BaseNetworkStateTest<Boolean, Flow<Boolean>>() {
         }
 
         mainAction {
-            networkManager.network.value = NetworkConnectionType.Known.Cellular()
+            networkManager.network.value = NetworkConnectionType.Known.Cellular
         }
         test {
             assertTrue(it)
diff --git a/system/src/iosMain/kotlin/network/NetworkManager.kt b/system/src/iosMain/kotlin/network/NetworkManager.kt
index e87471925..545c5a3a2 100644
--- a/system/src/iosMain/kotlin/network/NetworkManager.kt
+++ b/system/src/iosMain/kotlin/network/NetworkManager.kt
@@ -63,11 +63,17 @@ import platform.darwin.dispatch_queue_attr_make_with_qos_class
 import platform.darwin.dispatch_queue_create
 import platform.posix.QOS_CLASS_UTILITY
 
+/**
+ * Default implementation of [NetworkManager]
+ */
 actual class DefaultNetworkManager internal constructor(
     private val appleNetworkManager: AppleNetworkManager
-) : BaseNetworkManager() {
+) : NetworkManager {
 
-    class Builder : BaseNetworkManager.Builder {
+    /**
+     * Builder for creating a [DefaultNetworkManager]
+     */
+    class Builder : NetworkManager.Builder {
         override fun create(): BaseNetworkManager {
             val appleNetworkManager = if (IOSVersion.systemVersion >= IOSVersion(12)) {
                 NWPathNetworkManager()
diff --git a/system/src/iosMain/kotlin/network/state/NetworkStateRepoBuilder.kt b/system/src/iosMain/kotlin/network/state/NetworkStateRepoBuilder.kt
index 80f963562..25604a240 100644
--- a/system/src/iosMain/kotlin/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/iosMain/kotlin/network/state/NetworkStateRepoBuilder.kt
@@ -20,6 +20,9 @@ package com.splendo.kaluga.system.network.state
 import com.splendo.kaluga.system.network.DefaultNetworkManager
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * Default implementation of [BaseNetworkStateRepoBuilder]
+ */
 actual class NetworkStateRepoBuilder : BaseNetworkStateRepoBuilder {
     override fun create(coroutineContext: CoroutineContext): NetworkStateRepo =
         NetworkStateRepo(DefaultNetworkManager.Builder(), coroutineContext)
diff --git a/system/src/jsMain/kotlin/network/NetworkManager.kt b/system/src/jsMain/kotlin/network/NetworkManager.kt
index c8172e213..ab4a571a2 100644
--- a/system/src/jsMain/kotlin/network/NetworkManager.kt
+++ b/system/src/jsMain/kotlin/network/NetworkManager.kt
@@ -20,10 +20,16 @@ package com.splendo.kaluga.system.network
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
-actual class DefaultNetworkManager : BaseNetworkManager() {
+/**
+ * Default implementation of [NetworkManager]
+ */
+actual class DefaultNetworkManager : NetworkManager {
 
-    class Builder : BaseNetworkManager.Builder {
-        override fun create(): BaseNetworkManager = DefaultNetworkManager()
+    /**
+     * Builder for creating a [DefaultNetworkManager]
+     */
+    class Builder : NetworkManager.Builder {
+        override fun create(): NetworkManager = DefaultNetworkManager()
     }
 
     override val network: Flow<NetworkConnectionType> = flowOf(NetworkConnectionType.Known.Absent)
diff --git a/system/src/jsMain/kotlin/network/state/NetworkStateRepoBuilder.kt b/system/src/jsMain/kotlin/network/state/NetworkStateRepoBuilder.kt
index 781efe759..e1fab82c3 100644
--- a/system/src/jsMain/kotlin/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/jsMain/kotlin/network/state/NetworkStateRepoBuilder.kt
@@ -20,6 +20,9 @@ package com.splendo.kaluga.system.network.state
 import com.splendo.kaluga.system.network.DefaultNetworkManager
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * Default implementation of [BaseNetworkStateRepoBuilder]
+ */
 actual class NetworkStateRepoBuilder : BaseNetworkStateRepoBuilder {
     override fun create(coroutineContext: CoroutineContext): NetworkStateRepo = NetworkStateRepo(DefaultNetworkManager.Builder(), coroutineContext)
 }
diff --git a/system/src/jvmMain/kotlin/network/NetworkManager.kt b/system/src/jvmMain/kotlin/network/NetworkManager.kt
index c8172e213..ab4a571a2 100644
--- a/system/src/jvmMain/kotlin/network/NetworkManager.kt
+++ b/system/src/jvmMain/kotlin/network/NetworkManager.kt
@@ -20,10 +20,16 @@ package com.splendo.kaluga.system.network
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
-actual class DefaultNetworkManager : BaseNetworkManager() {
+/**
+ * Default implementation of [NetworkManager]
+ */
+actual class DefaultNetworkManager : NetworkManager {
 
-    class Builder : BaseNetworkManager.Builder {
-        override fun create(): BaseNetworkManager = DefaultNetworkManager()
+    /**
+     * Builder for creating a [DefaultNetworkManager]
+     */
+    class Builder : NetworkManager.Builder {
+        override fun create(): NetworkManager = DefaultNetworkManager()
     }
 
     override val network: Flow<NetworkConnectionType> = flowOf(NetworkConnectionType.Known.Absent)
diff --git a/system/src/jvmMain/kotlin/network/state/NetworkStateRepoBuilder.kt b/system/src/jvmMain/kotlin/network/state/NetworkStateRepoBuilder.kt
index 781efe759..e1fab82c3 100644
--- a/system/src/jvmMain/kotlin/network/state/NetworkStateRepoBuilder.kt
+++ b/system/src/jvmMain/kotlin/network/state/NetworkStateRepoBuilder.kt
@@ -20,6 +20,9 @@ package com.splendo.kaluga.system.network.state
 import com.splendo.kaluga.system.network.DefaultNetworkManager
 import kotlin.coroutines.CoroutineContext
 
+/**
+ * Default implementation of [BaseNetworkStateRepoBuilder]
+ */
 actual class NetworkStateRepoBuilder : BaseNetworkStateRepoBuilder {
     override fun create(coroutineContext: CoroutineContext): NetworkStateRepo = NetworkStateRepo(DefaultNetworkManager.Builder(), coroutineContext)
 }
diff --git a/test-utils-system/api/androidLib/test-utils-system.api b/test-utils-system/api/androidLib/test-utils-system.api
index 7c3a3ac7a..75eec4359 100644
--- a/test-utils-system/api/androidLib/test-utils-system.api
+++ b/test-utils-system/api/androidLib/test-utils-system.api
@@ -5,7 +5,7 @@ public final class com/splendo/kaluga/test/system/BuildConfig {
 	public fun <init> ()V
 }
 
-public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager : com/splendo/kaluga/system/network/BaseNetworkManager {
+public final class com/splendo/kaluga/test/system/network/MockNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
 	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)V
 	public synthetic fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
 	public fun getNetwork ()Lkotlinx/coroutines/flow/MutableStateFlow;
@@ -15,24 +15,14 @@ public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager
 	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager$Builder : com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
+public final class com/splendo/kaluga/test/system/network/MockNetworkManager$Builder : com/splendo/kaluga/system/network/NetworkManager$Builder {
 	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Z)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+	public fun create ()Lcom/splendo/kaluga/system/network/NetworkManager;
 	public final fun getBuiltNetworkManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
-public final class com/splendo/kaluga/test/system/network/MockNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
-	public fun <init> (Lkotlinx/coroutines/flow/MutableSharedFlow;)V
-	public synthetic fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
-	public fun getNetwork ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-	public final fun getStartMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStopMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public abstract class com/splendo/kaluga/test/system/network/MockNetworkState {
 	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 }
@@ -57,12 +47,10 @@ public final class com/splendo/kaluga/test/system/network/MockNetworkState$Avail
 
 public final class com/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized : com/splendo/kaluga/test/system/network/MockNetworkState, com/splendo/kaluga/system/network/state/NetworkState$Deinitialized {
 	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;Lcom/splendo/kaluga/system/network/NetworkConnectionType;ILjava/lang/Object;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -114,11 +102,12 @@ public final class com/splendo/kaluga/test/system/network/MockNetworkState$Unkno
 }
 
 public final class com/splendo/kaluga/test/system/network/MockNetworkStateRepoBuilder : com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
-	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;Z)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkManager$Builder;Z)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/NetworkManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepo;
 	public fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
 	public final fun getBuiltNetworkStateRepo ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getNetworkManagerBuilder ()Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;
+	public final fun getNetworkManagerBuilder ()Lcom/splendo/kaluga/system/network/NetworkManager$Builder;
 }
 
diff --git a/test-utils-system/api/jvm/test-utils-system.api b/test-utils-system/api/jvm/test-utils-system.api
index be22fb324..9202851c1 100644
--- a/test-utils-system/api/jvm/test-utils-system.api
+++ b/test-utils-system/api/jvm/test-utils-system.api
@@ -1,4 +1,4 @@
-public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager : com/splendo/kaluga/system/network/BaseNetworkManager {
+public final class com/splendo/kaluga/test/system/network/MockNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
 	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)V
 	public synthetic fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
 	public fun getNetwork ()Lkotlinx/coroutines/flow/MutableStateFlow;
@@ -8,24 +8,14 @@ public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager
 	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class com/splendo/kaluga/test/system/network/MockBaseNetworkManager$Builder : com/splendo/kaluga/system/network/BaseNetworkManager$Builder {
+public final class com/splendo/kaluga/test/system/network/MockNetworkManager$Builder : com/splendo/kaluga/system/network/NetworkManager$Builder {
 	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;Z)V
 	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun create ()Lcom/splendo/kaluga/system/network/BaseNetworkManager;
+	public fun create ()Lcom/splendo/kaluga/system/network/NetworkManager;
 	public final fun getBuiltNetworkManagers ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
 }
 
-public final class com/splendo/kaluga/test/system/network/MockNetworkManager : com/splendo/kaluga/system/network/NetworkManager {
-	public fun <init> (Lkotlinx/coroutines/flow/MutableSharedFlow;)V
-	public synthetic fun getNetwork ()Lkotlinx/coroutines/flow/Flow;
-	public fun getNetwork ()Lkotlinx/coroutines/flow/MutableSharedFlow;
-	public final fun getStartMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public final fun getStopMonitoringMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public fun startMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun stopMonitoring (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public abstract class com/splendo/kaluga/test/system/network/MockNetworkState {
 	public abstract fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 }
@@ -51,12 +41,10 @@ public final class com/splendo/kaluga/test/system/network/MockNetworkState$Avail
 
 public final class com/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized : com/splendo/kaluga/test/system/network/MockNetworkState, com/splendo/kaluga/system/network/state/NetworkState$Deinitialized {
 	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)V
-	public final fun component1 ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 	public final fun copy (Lcom/splendo/kaluga/system/network/NetworkConnectionType;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;Lcom/splendo/kaluga/system/network/NetworkConnectionType;ILjava/lang/Object;)Lcom/splendo/kaluga/test/system/network/MockNetworkState$Deinitialized;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
-	public fun getPreviousNetworkConnectionType ()Lcom/splendo/kaluga/system/network/NetworkConnectionType;
 	public fun getReinitialize ()Lkotlin/jvm/functions/Function1;
 	public fun hashCode ()I
 	public fun remain ()Lkotlin/jvm/functions/Function1;
@@ -113,11 +101,12 @@ public final class com/splendo/kaluga/test/system/network/MockNetworkState$Unkno
 }
 
 public final class com/splendo/kaluga/test/system/network/MockNetworkStateRepoBuilder : com/splendo/kaluga/system/network/state/BaseNetworkStateRepoBuilder {
-	public fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;Z)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/system/network/NetworkManager$Builder;Z)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/system/network/NetworkManager$Builder;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/BaseNetworkStateRepo;
 	public fun create (Lkotlin/coroutines/CoroutineContext;)Lcom/splendo/kaluga/system/network/state/NetworkStateRepo;
 	public final fun getBuiltNetworkStateRepo ()Lcom/splendo/kaluga/base/collections/ConcurrentMutableList;
 	public final fun getCreateMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public final fun getNetworkManagerBuilder ()Lcom/splendo/kaluga/system/network/BaseNetworkManager$Builder;
+	public final fun getNetworkManagerBuilder ()Lcom/splendo/kaluga/system/network/NetworkManager$Builder;
 }
 
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
index 3d77bd31b..922d0b8de 100644
--- a/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkManager.kt
@@ -17,41 +17,26 @@
 package com.splendo.kaluga.test.system.network
 
 import com.splendo.kaluga.base.collections.concurrentMutableListOf
-import com.splendo.kaluga.system.network.BaseNetworkManager
 import com.splendo.kaluga.system.network.NetworkConnectionType
 import com.splendo.kaluga.system.network.NetworkManager
 import com.splendo.kaluga.test.base.mock.call
 import com.splendo.kaluga.test.base.mock.on
 import com.splendo.kaluga.test.base.mock.parameters.mock
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 
 /**
  * Mock implementation of [NetworkManager]
- *
- */
-class MockNetworkManager(override val network: MutableSharedFlow<NetworkConnectionType>) : NetworkManager {
-
-    val startMonitoringMock = ::startMonitoring.mock()
-    override suspend fun startMonitoring(): Unit = startMonitoringMock.call()
-
-    val stopMonitoringMock = ::stopMonitoring.mock()
-    override suspend fun stopMonitoring(): Unit = stopMonitoringMock.call()
-}
-
-/**
- * Mock implementation of [BaseNetworkManager]
  * @param initialNetworkConnectionType Sets the initial [NetworkConnectionType]
- * @param setupMocks If `true` sets up [createMock] to build [MockBaseNetworkManager]
+ * @param setupMocks If `true` sets up [createMock] to build [MockNetworkManager]
  */
-class MockBaseNetworkManager(initialNetworkConnectionType: NetworkConnectionType) : BaseNetworkManager() {
+class MockNetworkManager(initialNetworkConnectionType: NetworkConnectionType) : NetworkManager {
 
-    class Builder(initialNetworkConnectionType: NetworkConnectionType, setupMocks: Boolean = true) : BaseNetworkManager.Builder {
+    class Builder(initialNetworkConnectionType: NetworkConnectionType, setupMocks: Boolean = true) : NetworkManager.Builder {
 
         /**
-         * List of built [BaseNetworkManager]
+         * List of built [MockNetworkManager]
          */
-        val builtNetworkManagers = concurrentMutableListOf<BaseNetworkManager>()
+        val builtNetworkManagers = concurrentMutableListOf<MockNetworkManager>()
 
         /**
          * [com.splendo.kaluga.test.base.mock.BaseMethodMock] for [create]
@@ -62,14 +47,14 @@ class MockBaseNetworkManager(initialNetworkConnectionType: NetworkConnectionType
             if (setupMocks) {
                 createMock.on()
                     .doExecute {
-                        MockBaseNetworkManager(initialNetworkConnectionType).also {
+                        MockNetworkManager(initialNetworkConnectionType).also {
                             builtNetworkManagers.add(it)
                         }
                     }
             }
         }
 
-        override fun create(): BaseNetworkManager = createMock.call()
+        override fun create(): NetworkManager = createMock.call()
     }
 
     override val network = MutableStateFlow(initialNetworkConnectionType)
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
index 893194a56..3272830ba 100644
--- a/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
@@ -30,7 +30,7 @@ sealed class MockNetworkState {
             NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
     }
 
-    data class Deinitialized(override val previousNetworkConnectionType: NetworkConnectionType) : MockNetworkState(), NetworkState.Deinitialized {
+    data class Deinitialized(private val previousNetworkConnectionType: NetworkConnectionType) : MockNetworkState(), NetworkState.Deinitialized {
         override val networkConnectionType: NetworkConnectionType = previousNetworkConnectionType.unknown(
             NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
         override val reinitialize: suspend () -> NetworkState.Initializing = { Initializing(networkConnectionType) }
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt
index b5b3a5c3b..7b0259fa6 100644
--- a/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkStateRepoBuilder.kt
@@ -17,7 +17,7 @@
 package com.splendo.kaluga.test.system.network
 
 import com.splendo.kaluga.base.collections.concurrentMutableListOf
-import com.splendo.kaluga.system.network.BaseNetworkManager
+import com.splendo.kaluga.system.network.NetworkManager
 import com.splendo.kaluga.system.network.state.BaseNetworkStateRepoBuilder
 import com.splendo.kaluga.system.network.state.NetworkStateRepo
 import com.splendo.kaluga.test.base.mock.call
@@ -27,10 +27,10 @@ import kotlin.coroutines.CoroutineContext
 
 /**
  * Mock implementation of [BaseNetworkStateRepoBuilder]
- * @param networkManagerBuilder The [BaseNetworkManager.Builder] for building the network manager
+ * @param networkManagerBuilder The [NetworkManager.Builder] for building the network manager
  * @param setupMocks If `true` sets up [createMock] to automatically create a [NetworkStateRepo]
  */
-class MockNetworkStateRepoBuilder<NMB : BaseNetworkManager.Builder>(
+class MockNetworkStateRepoBuilder<NMB : NetworkManager.Builder>(
     val networkManagerBuilder: NMB,
     setupMocks: Boolean = true
 ) : BaseNetworkStateRepoBuilder {

From e652fa04fd42dadbc0173c61125ff4bb3617da34 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 15 Feb 2023 13:05:08 +0100
Subject: [PATCH 180/227] Lint fixes

---
 beacons/src/commonTest/kotlin/BeaconLostTest.kt             | 1 -
 system/src/commonMain/kotlin/network/state/NetworkState.kt  | 6 ++++--
 system/src/commonTest/kotlin/network/NetworkStateTest.kt    | 4 +++-
 .../src/commonMain/kotlin/network/MockNetworkState.kt       | 6 ++++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/beacons/src/commonTest/kotlin/BeaconLostTest.kt b/beacons/src/commonTest/kotlin/BeaconLostTest.kt
index 02abefa69..f7fd301d7 100644
--- a/beacons/src/commonTest/kotlin/BeaconLostTest.kt
+++ b/beacons/src/commonTest/kotlin/BeaconLostTest.kt
@@ -17,7 +17,6 @@
 
 package com.splendo.kaluga.bluetooth.beacons
 
-import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/system/src/commonMain/kotlin/network/state/NetworkState.kt b/system/src/commonMain/kotlin/network/state/NetworkState.kt
index 78e9b92de..061facd58 100644
--- a/system/src/commonMain/kotlin/network/state/NetworkState.kt
+++ b/system/src/commonMain/kotlin/network/state/NetworkState.kt
@@ -148,7 +148,8 @@ internal sealed class NetworkStateImpl {
 
     object NotInitialized : NetworkStateImpl(), NetworkState.NotInitialized {
         override val networkConnectionType: NetworkConnectionType = NetworkConnectionType.Unknown.WithoutLastNetwork(
-            NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+            NetworkConnectionType.Unknown.Reason.NOT_CLEAR
+        )
         fun startInitializing(networkManager: NetworkManager): suspend () -> NetworkState.Initializing = {
             Initializing(networkConnectionType, networkManager)
         }
@@ -157,7 +158,8 @@ internal sealed class NetworkStateImpl {
     data class Deinitialized(private val previousNetworkConnectionType: NetworkConnectionType, val networkManager: NetworkManager) : NetworkStateImpl(), NetworkState.Deinitialized {
         override val reinitialize: suspend () -> NetworkState.Initializing = { Initializing(previousNetworkConnectionType, networkManager) }
         override val networkConnectionType: NetworkConnectionType = previousNetworkConnectionType.unknown(
-            NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+            NetworkConnectionType.Unknown.Reason.NOT_CLEAR
+        )
     }
 
     sealed class Active : NetworkStateImpl(), HandleBeforeOldStateIsRemoved<NetworkState>, HandleAfterNewStateIsSet<NetworkState> {
diff --git a/system/src/commonTest/kotlin/network/NetworkStateTest.kt b/system/src/commonTest/kotlin/network/NetworkStateTest.kt
index 58fabe181..2fe846327 100644
--- a/system/src/commonTest/kotlin/network/NetworkStateTest.kt
+++ b/system/src/commonTest/kotlin/network/NetworkStateTest.kt
@@ -96,7 +96,9 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
                 NetworkConnectionType.Unknown.WithLastNetwork(
                     NetworkConnectionType.Known.Wifi(),
                     NetworkConnectionType.Unknown.Reason.LOSING
-                ), it.networkConnectionType)
+                ),
+                it.networkConnectionType
+            )
         }
 
         mainAction {
diff --git a/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt b/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
index 3272830ba..12d4f30c1 100644
--- a/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
+++ b/test-utils-system/src/commonMain/kotlin/network/MockNetworkState.kt
@@ -27,12 +27,14 @@ sealed class MockNetworkState {
     sealed class Inactive : MockNetworkState()
     object NotInitialized : Inactive(), NetworkState.NotInitialized {
         override val networkConnectionType: NetworkConnectionType = NetworkConnectionType.Unknown.WithoutLastNetwork(
-            NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+            NetworkConnectionType.Unknown.Reason.NOT_CLEAR
+        )
     }
 
     data class Deinitialized(private val previousNetworkConnectionType: NetworkConnectionType) : MockNetworkState(), NetworkState.Deinitialized {
         override val networkConnectionType: NetworkConnectionType = previousNetworkConnectionType.unknown(
-            NetworkConnectionType.Unknown.Reason.NOT_CLEAR)
+            NetworkConnectionType.Unknown.Reason.NOT_CLEAR
+        )
         override val reinitialize: suspend () -> NetworkState.Initializing = { Initializing(networkConnectionType) }
     }
 

From 137352553e71c2aa8509d17254d3e09164763240 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 15 Feb 2023 14:30:45 +0100
Subject: [PATCH 181/227] Added missing Readme

---
 architecture-compose/README.md |  4 ++--
 keyboard-compose/README.md     | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 keyboard-compose/README.md

diff --git a/architecture-compose/README.md b/architecture-compose/README.md
index b2297ba0a..8346d378e 100644
--- a/architecture-compose/README.md
+++ b/architecture-compose/README.md
@@ -1,8 +1,8 @@
 ## Architecture-compose
-This Android library contains composable functions to work with Kaluga states and androidx navigation.
+This Android library contains composable functions to work with Kaluga architecture and androidx navigation.
 
 ## Installing
-This library is available on Maven Central. You can import Kaluga Base as follows:
+This library is available on Maven Central. You can import Kaluga Architecture Compose as follows:
 
 ```kotlin
 repositories {
diff --git a/keyboard-compose/README.md b/keyboard-compose/README.md
new file mode 100644
index 000000000..98b6a31f1
--- /dev/null
+++ b/keyboard-compose/README.md
@@ -0,0 +1,30 @@
+## Keyboard-compose
+This Android library contains composable functions to work with Kaluga keyboard.
+
+## Installing
+This library is available on Maven Central. You can import Kaluga Keyboard Compose as follows:
+
+```kotlin
+repositories {
+    // ...
+    mavenCentral()
+}
+// ...
+dependencies {
+    // ...
+    implementation("com.splendo.kaluga.keyboard-compose:$kalugaVersion")
+}
+```
+
+## Usage
+
+Create a `ComposeKeyboardManager.Builder` and add it to the `LifecycleSubscribables` of a `BaseLifecycleViewModel`.
+Bind the ViewModel to your composable view using `ViewModelComposable`.
+
+To show the keyboard, add a `FocusRequester` to a view using
+```kotlin
+modifier = Modifier
+    .focusRequester(focusRequester),
+```
+
+And focus on it using `ComposeFocusHandler(focusRequester)`

From 09ff31daefb3fd6a841a3bc0af20ed1178e47f63 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 15 Feb 2023 16:25:35 +0100
Subject: [PATCH 182/227] Make decimal support Infinity/NaN

---
 base/api/androidLib/base.api                  |   61 +-
 base/api/jvm/base.api                         |   57 +-
 .../androidLibMain/kotlin/utils/Decimal.kt    |  193 +-
 base/src/commonMain/kotlin/utils/Decimal.kt   |  238 +-
 .../commonTest/kotlin/utils/DecimalTest.kt    |   17 +-
 base/src/iosMain/kotlin/utils/Decimal.kt      |  226 +-
 base/src/jsMain/kotlin/utils/Decimal.kt       |  223 +-
 base/src/jvmMain/kotlin/utils/Decimal.kt      |  195 +-
 scientific/api/androidLib/scientific.api      | 2706 ++++++++--------
 scientific/api/jvm/scientific.api             | 2718 ++++++++---------
 .../src/commonMain/kotlin/ScientificValue.kt  |   25 +-
 .../converter/ScientificConverterException.kt |   20 -
 .../commonTest/kotlin/ScientificValueTest.kt  |    9 +-
 .../kotlin/unit/ScientificUnitTest.kt         |   10 +
 14 files changed, 3246 insertions(+), 3452 deletions(-)
 delete mode 100644 scientific/src/commonMain/kotlin/converter/ScientificConverterException.kt

diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index d1a5f036a..64f863d7b 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -901,6 +901,32 @@ public final class com/splendo/kaluga/base/utils/ContainsAnyKt {
 	public static final fun containsAny (Ljava/lang/Iterable;Ljava/lang/Iterable;)Z
 }
 
+public abstract class com/splendo/kaluga/base/utils/Decimal : java/lang/Comparable {
+	public fun compareTo (Lcom/splendo/kaluga/base/utils/Decimal;)I
+	public synthetic fun compareTo (Ljava/lang/Object;)I
+}
+
+public final class com/splendo/kaluga/base/utils/Decimal$Finite : com/splendo/kaluga/base/utils/Decimal {
+	public fun <init> (Ljava/math/BigDecimal;)V
+	public final fun copy (Ljava/math/BigDecimal;)Lcom/splendo/kaluga/base/utils/Decimal$Finite;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/base/utils/Decimal$Finite;Ljava/math/BigDecimal;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal$Finite;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/base/utils/Decimal$NaN : com/splendo/kaluga/base/utils/Decimal {
+	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/Decimal$NaN;
+}
+
+public final class com/splendo/kaluga/base/utils/Decimal$NegativeInfinity : com/splendo/kaluga/base/utils/Decimal {
+	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/Decimal$NegativeInfinity;
+}
+
+public final class com/splendo/kaluga/base/utils/Decimal$PositiveInfinity : com/splendo/kaluga/base/utils/Decimal {
+	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/Decimal$PositiveInfinity;
+}
+
 public final class com/splendo/kaluga/base/utils/DecimalAndroid {
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;
@@ -924,18 +950,38 @@ public final class com/splendo/kaluga/base/utils/DecimalAndroid {
 	public static final fun times (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;
 	public static final fun times (Ljava/math/BigDecimal;Ljava/math/BigDecimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/BigDecimal;
 	public static synthetic fun times$default (Ljava/math/BigDecimal;Ljava/math/BigDecimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Ljava/math/BigDecimal;
-	public static final fun toDecimal (Ljava/lang/Number;)Ljava/math/BigDecimal;
-	public static final fun toDecimal (Ljava/lang/String;)Ljava/math/BigDecimal;
 	public static final fun toDouble (Ljava/math/BigDecimal;)D
+	public static final fun toFiniteDecimal (Ljava/lang/Number;)Ljava/math/BigDecimal;
+	public static final fun toFiniteDecimal (Ljava/lang/String;)Ljava/math/BigDecimal;
 	public static final fun toInt (Ljava/math/BigDecimal;)I
 	public static final fun toString (Ljava/math/BigDecimal;)Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/base/utils/DecimalException : java/lang/ArithmeticException {
-	public fun <init> (Ljava/lang/String;)V
-}
-
 public final class com/splendo/kaluga/base/utils/DecimalKt {
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;I)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun div$default (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;I)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun minus$default (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;I)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun plus$default (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun pow (Lcom/splendo/kaluga/base/utils/Decimal;I)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun pow (Lcom/splendo/kaluga/base/utils/Decimal;II)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun pow (Lcom/splendo/kaluga/base/utils/Decimal;IILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun pow$default (Lcom/splendo/kaluga/base/utils/Decimal;IILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun round (Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun round$default (Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;I)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun times$default (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun toDecimal (Ljava/lang/Number;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun toDecimal (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun toDecimalList (Ljava/util/Collection;)Ljava/util/List;
 	public static final fun toDecimalList ([B)Ljava/util/List;
 	public static final fun toDecimalList ([D)Ljava/util/List;
@@ -943,8 +989,11 @@ public final class com/splendo/kaluga/base/utils/DecimalKt {
 	public static final fun toDecimalList ([I)Ljava/util/List;
 	public static final fun toDecimalList ([J)Ljava/util/List;
 	public static final fun toDecimalList ([S)Ljava/util/List;
+	public static final fun toDouble (Lcom/splendo/kaluga/base/utils/Decimal;)D
 	public static final fun toDoubleArray (Ljava/util/Collection;)[D
+	public static final fun toInt (Lcom/splendo/kaluga/base/utils/Decimal;)I
 	public static final fun toIntArray (Ljava/util/Collection;)[I
+	public static final fun toString (Lcom/splendo/kaluga/base/utils/Decimal;)Ljava/lang/String;
 	public static final fun toStringList (Ljava/util/Collection;)Ljava/util/List;
 }
 
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index f71c3c33b..73ada5a3a 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -892,8 +892,30 @@ public final class com/splendo/kaluga/base/utils/ContainsAnyKt {
 	public static final fun containsAny (Ljava/lang/Iterable;Ljava/lang/Iterable;)Z
 }
 
-public final class com/splendo/kaluga/base/utils/DecimalException : java/lang/ArithmeticException {
-	public fun <init> (Ljava/lang/String;)V
+public abstract class com/splendo/kaluga/base/utils/Decimal : java/lang/Comparable {
+	public fun compareTo (Lcom/splendo/kaluga/base/utils/Decimal;)I
+	public synthetic fun compareTo (Ljava/lang/Object;)I
+}
+
+public final class com/splendo/kaluga/base/utils/Decimal$Finite : com/splendo/kaluga/base/utils/Decimal {
+	public fun <init> (Ljava/math/BigDecimal;)V
+	public final fun copy (Ljava/math/BigDecimal;)Lcom/splendo/kaluga/base/utils/Decimal$Finite;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/base/utils/Decimal$Finite;Ljava/math/BigDecimal;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal$Finite;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/base/utils/Decimal$NaN : com/splendo/kaluga/base/utils/Decimal {
+	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/Decimal$NaN;
+}
+
+public final class com/splendo/kaluga/base/utils/Decimal$NegativeInfinity : com/splendo/kaluga/base/utils/Decimal {
+	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/Decimal$NegativeInfinity;
+}
+
+public final class com/splendo/kaluga/base/utils/Decimal$PositiveInfinity : com/splendo/kaluga/base/utils/Decimal {
+	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/Decimal$PositiveInfinity;
 }
 
 public final class com/splendo/kaluga/base/utils/DecimalJVM {
@@ -919,14 +941,38 @@ public final class com/splendo/kaluga/base/utils/DecimalJVM {
 	public static final fun times (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;
 	public static final fun times (Ljava/math/BigDecimal;Ljava/math/BigDecimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/BigDecimal;
 	public static synthetic fun times$default (Ljava/math/BigDecimal;Ljava/math/BigDecimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Ljava/math/BigDecimal;
-	public static final fun toDecimal (Ljava/lang/Number;)Ljava/math/BigDecimal;
-	public static final fun toDecimal (Ljava/lang/String;)Ljava/math/BigDecimal;
 	public static final fun toDouble (Ljava/math/BigDecimal;)D
+	public static final fun toFiniteDecimal (Ljava/lang/Number;)Ljava/math/BigDecimal;
+	public static final fun toFiniteDecimal (Ljava/lang/String;)Ljava/math/BigDecimal;
 	public static final fun toInt (Ljava/math/BigDecimal;)I
 	public static final fun toString (Ljava/math/BigDecimal;)Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/utils/DecimalKt {
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;I)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun div$default (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;I)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun minus$default (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;I)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun plus$default (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun pow (Lcom/splendo/kaluga/base/utils/Decimal;I)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun pow (Lcom/splendo/kaluga/base/utils/Decimal;II)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun pow (Lcom/splendo/kaluga/base/utils/Decimal;IILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun pow$default (Lcom/splendo/kaluga/base/utils/Decimal;IILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun round (Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun round$default (Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;I)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun times$default (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/base/utils/Decimal;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun toDecimal (Ljava/lang/Number;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun toDecimal (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun toDecimalList (Ljava/util/Collection;)Ljava/util/List;
 	public static final fun toDecimalList ([B)Ljava/util/List;
 	public static final fun toDecimalList ([D)Ljava/util/List;
@@ -934,8 +980,11 @@ public final class com/splendo/kaluga/base/utils/DecimalKt {
 	public static final fun toDecimalList ([I)Ljava/util/List;
 	public static final fun toDecimalList ([J)Ljava/util/List;
 	public static final fun toDecimalList ([S)Ljava/util/List;
+	public static final fun toDouble (Lcom/splendo/kaluga/base/utils/Decimal;)D
 	public static final fun toDoubleArray (Ljava/util/Collection;)[D
+	public static final fun toInt (Lcom/splendo/kaluga/base/utils/Decimal;)I
 	public static final fun toIntArray (Ljava/util/Collection;)[I
+	public static final fun toString (Lcom/splendo/kaluga/base/utils/Decimal;)Ljava/lang/String;
 	public static final fun toStringList (Ljava/util/Collection;)Ljava/util/List;
 }
 
diff --git a/base/src/androidLibMain/kotlin/utils/Decimal.kt b/base/src/androidLibMain/kotlin/utils/Decimal.kt
index 9699da384..a7549c218 100644
--- a/base/src/androidLibMain/kotlin/utils/Decimal.kt
+++ b/base/src/androidLibMain/kotlin/utils/Decimal.kt
@@ -26,130 +26,57 @@ import java.math.BigDecimal
 import java.math.MathContext
 import java.math.RoundingMode as NativeRoundingMode
 
-actual typealias Decimal = BigDecimal
-
 /**
- * Adds two [Decimal] together.
- * @param value the [Decimal] to add
- * @return the [Decimal] that is the total of the two provided decimals.
+ * Platform specific representation of a finite immutable, arbitrary-precision signed decimal number
  */
-actual operator fun Decimal.plus(value: Decimal) = this.add(value)
+actual typealias FiniteDecimal = BigDecimal
 
-/**
- * Adds two [Decimal] together scaled to a given precision.
- * @param value the [Decimal] to add
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the total of the two provided decimals.
- */
-actual fun Decimal.plus(value: Decimal, scale: Int) =
+actual operator fun FiniteDecimal.plus(value: FiniteDecimal) = this.add(value)
+
+actual fun FiniteDecimal.plus(value: FiniteDecimal, scale: Int) =
     this.add(value).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
-/**
- * Adds two [Decimal] together scaled to a given precision.
- * @param value the [Decimal] to add
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the total of the two provided decimals.
- */
-actual fun Decimal.plus(
-    value: Decimal,
+actual fun FiniteDecimal.plus(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
 ) = this.add(value).setScale(scale, roundingMode.android)
 
-/**
- * Subtracts two [Decimal].
- * @param value the [Decimal] to subtract
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual operator fun Decimal.minus(value: Decimal) = this.subtract(value)
+actual operator fun FiniteDecimal.minus(value: FiniteDecimal) = this.subtract(value)
 
-/**
- * Subtracts two [Decimal] to a given precision.
- * @param value the [Decimal] to subtract
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual fun Decimal.minus(value: Decimal, scale: Int) =
+actual fun FiniteDecimal.minus(value: FiniteDecimal, scale: Int) =
     this.subtract(value).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
-/**
- * Subtracts two [Decimal] to a given precision.
- * @param value the [Decimal] to subtract
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual fun Decimal.minus(
-    value: Decimal,
+actual fun FiniteDecimal.minus(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.android)
 
-/**
- * Divides two [Decimal].
- * @param value the [Decimal] to divide
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual operator fun Decimal.div(value: Decimal) = if ((value.compareTo(Decimal.ZERO)) != 0) this.divide(value, MathContext.DECIMAL128) else throw DecimalException("Divide by zero")
+actual operator fun FiniteDecimal.div(value: FiniteDecimal) = this.divide(value, MathContext.DECIMAL128)
 
-/**
- * Divides two [Decimal] to a given precision.
- * @param value the [Decimal] to divide
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual fun Decimal.div(value: Decimal, scale: Int) = if ((value.compareTo(Decimal.ZERO)) != 0)
-    this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
-else throw DecimalException("Divide by zero")
+actual fun FiniteDecimal.div(value: FiniteDecimal, scale: Int) = this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
-/**
- * Divides two [Decimal] to a given precision.
- * @param value the [Decimal] to divide
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual fun Decimal.div(
-    value: Decimal,
+actual fun FiniteDecimal.div(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
-) = if ((value.compareTo(Decimal.ZERO)) != 0)
-    this.divide(
-        value,
-        MathContext(
-            MathContext.DECIMAL128.precision,
-            roundingMode.android
-        )
-    ).setScale(scale, roundingMode.android)
-else throw DecimalException("Divide by zero")
+) = this.divide(
+    value,
+    MathContext(
+        MathContext.DECIMAL128.precision,
+        roundingMode.android
+    )
+).setScale(scale, roundingMode.android)
 
-/**
- * Multiplies two [Decimal].
- * @param value the [Decimal] to multiply
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual operator fun Decimal.times(value: Decimal) =
+actual operator fun FiniteDecimal.times(value: FiniteDecimal) =
     this.multiply(value, MathContext.DECIMAL128)
 
-/**
- * Multiplies two [Decimal] to a given precision.
- * @param value the [Decimal] to multiply
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual fun Decimal.times(value: Decimal, scale: Int) =
+actual fun FiniteDecimal.times(value: FiniteDecimal, scale: Int) =
     this.multiply(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
-/**
- * Multiplies two [Decimal] to a given precision.
- * @param value the [Decimal] to multiply
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual fun Decimal.times(
-    value: Decimal,
+actual fun FiniteDecimal.times(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
 ) = this.multiply(
@@ -160,45 +87,19 @@ actual fun Decimal.times(
     )
 ).setScale(scale, roundingMode.android)
 
-/**
- * Rounds a [Decimal] to a [scale].
- * @param scale The number of digits the rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return A [Decimal] rounded to [scale] digits after the decimal point.
- */
-actual fun Decimal.round(scale: Int, roundingMode: RoundingMode) =
+actual fun FiniteDecimal.round(scale: Int, roundingMode: RoundingMode) =
     this.setScale(
         scale,
         roundingMode.android
     )
 
-/**
- * Raises two [Decimal].
- * @param n the [Decimal] to raise to
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual infix fun Decimal.pow(n: Int): Decimal = this.pow(n, MathContext.DECIMAL128)
-
-/**
- * Raises two [Decimal] to a given precision.
- * @param n the [Decimal] to raise to
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual fun Decimal.pow(n: Int, scale: Int): Decimal = this.pow(n, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
-
-/**
- * Raises two [Decimal] to a given precision.
- * @param n the [Decimal] to raise to
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual fun Decimal.pow(
+actual infix fun FiniteDecimal.pow(n: Int): FiniteDecimal = this.pow(n, MathContext.DECIMAL128)
+actual fun FiniteDecimal.pow(n: Int, scale: Int): FiniteDecimal = this.pow(n, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
+actual fun FiniteDecimal.pow(
     n: Int,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = this.pow(
+): FiniteDecimal = this.pow(
     n,
     MathContext(
         MathContext.DECIMAL128.precision,
@@ -206,30 +107,16 @@ actual fun Decimal.pow(
     )
 ).setScale(scale, roundingMode.android)
 
-/**
- * Converts a [Number] to a [Decimal]
- */
-actual fun Number.toDecimal() = BigDecimal(toString())
+actual fun Number.toFiniteDecimal() = BigDecimal(toString())
+actual fun String.toFiniteDecimal() = try {
+    BigDecimal(this)
+} catch (e: NumberFormatException) {
+    null
+}
 
-/**
- * Converts a String to a [Decimal]
- */
-actual fun String.toDecimal() = BigDecimal(this)
-
-/**
- * Gets the double value of a [Decimal]
- */
-actual fun Decimal.toDouble() = this.toDouble()
-
-/**
- * Gets the integer value of a [Decimal]
- */
-actual fun Decimal.toInt() = this.toInt()
-
-/**
- * Gets the string value of a [Decimal]
- */
-actual fun Decimal.toString() = this.stripTrailingZeros().toString()
+actual fun FiniteDecimal.toDouble() = this.toDouble()
+actual fun FiniteDecimal.toInt() = this.toInt()
+actual fun FiniteDecimal.toString() = this.stripTrailingZeros().toString()
 
 private val RoundingMode.android
     get() = when (this) {
diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index 00578ce2d..686077cac 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -19,19 +19,55 @@
 
 package com.splendo.kaluga.base.utils
 
-class DecimalException(message: String?) : ArithmeticException(message)
+import kotlin.math.pow
 
 /**
  * Immutable, arbitrary-precision signed decimal numbers.
  */
-expect class Decimal : Comparable<Decimal>
+sealed class Decimal : Comparable<Decimal> {
+
+    /**
+     * [Decimal] representing Not A Number
+     */
+    object NaN : Decimal()
+
+    /**
+     * [Decimal] representing Positive Infinity
+     */
+    object PositiveInfinity : Decimal()
+
+    /**
+     * [Decimal] representing Negative Infinity
+     */
+    object NegativeInfinity : Decimal()
+
+    /**
+     * [Decimal] representing a finite number
+     * @param finiteDecimal the [FiniteDecimal] describing the finite number
+     */
+    data class Finite(internal val finiteDecimal: FiniteDecimal) : Decimal()
+
+    override fun compareTo(other: Decimal): Int = if (this is Finite && other is Finite)
+        finiteDecimal.compareTo(other.finiteDecimal)
+    else
+        toDouble().compareTo(other.toDouble())
+}
+
+/**
+ * Platform specific representation of a finite immutable, arbitrary-precision signed decimal number
+ */
+expect class FiniteDecimal : Comparable<FiniteDecimal>
 
 /**
  * Adds two [Decimal] together.
  * @param value the [Decimal] to add
  * @return the [Decimal] that is the total of the two provided decimals.
  */
-expect operator fun Decimal.plus(value: Decimal): Decimal
+operator fun Decimal.plus(value: Decimal): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal + value.finiteDecimal)
+} else {
+    (this.toDouble() + value.toDouble()).toDecimal()
+}
 
 /**
  * Adds two [Decimal] together scaled to a given precision.
@@ -39,7 +75,11 @@ expect operator fun Decimal.plus(value: Decimal): Decimal
  * @param scale The number of digits a rounded value should have after its decimal point.
  * @return the [Decimal] that is the total of the two provided decimals.
  */
-expect fun Decimal.plus(value: Decimal, scale: Int): Decimal
+fun Decimal.plus(value: Decimal, scale: Int): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal.plus(value.finiteDecimal, scale))
+} else {
+    (this.toDouble() + value.toDouble()).toDecimal()
+}
 
 /**
  * Adds two [Decimal] together scaled to a given precision.
@@ -48,18 +88,34 @@ expect fun Decimal.plus(value: Decimal, scale: Int): Decimal
  * @param roundingMode The [RoundingMode] to apply when scaling.
  * @return the [Decimal] that is the total of the two provided decimals.
  */
-expect fun Decimal.plus(
+fun Decimal.plus(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
-): Decimal
+): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal.plus(value.finiteDecimal, scale, roundingMode))
+} else {
+    (this.toDouble() + value.toDouble()).toDecimal()
+}
+
+internal expect operator fun FiniteDecimal.plus(value: FiniteDecimal): FiniteDecimal
+internal expect fun FiniteDecimal.plus(value: FiniteDecimal, scale: Int): FiniteDecimal
+internal expect fun FiniteDecimal.plus(
+    value: FiniteDecimal,
+    scale: Int,
+    roundingMode: RoundingMode = RoundingMode.RoundHalfEven
+): FiniteDecimal
 
 /**
  * Subtracts two [Decimal].
  * @param value the [Decimal] to subtract
  * @return the [Decimal] that is the subtraction of the two provided decimals.
  */
-expect operator fun Decimal.minus(value: Decimal): Decimal
+operator fun Decimal.minus(value: Decimal): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal - value.finiteDecimal)
+} else {
+    (this.toDouble() - value.toDouble()).toDecimal()
+}
 
 /**
  * Subtracts two [Decimal] to a given precision.
@@ -67,7 +123,11 @@ expect operator fun Decimal.minus(value: Decimal): Decimal
  * @param scale The number of digits a rounded value should have after its decimal point.
  * @return the [Decimal] that is the subtraction of the two provided decimals.
  */
-expect fun Decimal.minus(value: Decimal, scale: Int): Decimal
+fun Decimal.minus(value: Decimal, scale: Int): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal.minus(value.finiteDecimal, scale))
+} else {
+    (this.toDouble() - value.toDouble()).toDecimal()
+}
 
 /**
  * Subtracts two [Decimal] to a given precision.
@@ -76,18 +136,38 @@ expect fun Decimal.minus(value: Decimal, scale: Int): Decimal
  * @param roundingMode The [RoundingMode] to apply when scaling.
  * @return the [Decimal] that is the subtraction of the two provided decimals.
  */
-expect fun Decimal.minus(
+fun Decimal.minus(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
-): Decimal
+): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal.minus(value.finiteDecimal, scale, roundingMode))
+} else {
+    (this.toDouble() - value.toDouble()).toDecimal()
+}
+
+internal expect operator fun FiniteDecimal.minus(value: FiniteDecimal): FiniteDecimal
+internal expect fun FiniteDecimal.minus(value: FiniteDecimal, scale: Int): FiniteDecimal
+internal expect fun FiniteDecimal.minus(
+    value: FiniteDecimal,
+    scale: Int,
+    roundingMode: RoundingMode = RoundingMode.RoundHalfEven
+): FiniteDecimal
 
 /**
  * Divides two [Decimal].
  * @param value the [Decimal] to divide
  * @return the [Decimal] that is the division of the two provided decimals.
  */
-expect operator fun Decimal.div(value: Decimal): Decimal
+operator fun Decimal.div(value: Decimal): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    if (value.toDouble() == 0.0) {
+        (toDouble() / value.toDouble()).toDecimal()
+    } else {
+        Decimal.Finite(finiteDecimal / value.finiteDecimal)
+    }
+} else {
+    (this.toDouble() / value.toDouble()).toDecimal()
+}
 
 /**
  * Divides two [Decimal] to a given precision.
@@ -95,7 +175,15 @@ expect operator fun Decimal.div(value: Decimal): Decimal
  * @param scale The number of digits a rounded value should have after its decimal point.
  * @return the [Decimal] that is the division of the two provided decimals.
  */
-expect fun Decimal.div(value: Decimal, scale: Int): Decimal
+fun Decimal.div(value: Decimal, scale: Int): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    if (value.toDouble() == 0.0) {
+        (toDouble() / value.toDouble()).toDecimal()
+    } else {
+        Decimal.Finite(finiteDecimal.div(value.finiteDecimal, scale))
+    }
+} else {
+    (this.toDouble() / value.toDouble()).toDecimal()
+}
 
 /**
  * Divides two [Decimal] to a given precision.
@@ -104,18 +192,38 @@ expect fun Decimal.div(value: Decimal, scale: Int): Decimal
  * @param roundingMode The [RoundingMode] to apply when scaling.
  * @return the [Decimal] that is the division of the two provided decimals.
  */
-expect fun Decimal.div(
+fun Decimal.div(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
-): Decimal
+): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    if (value.toDouble() == 0.0) {
+        (toDouble() / value.toDouble()).toDecimal()
+    } else {
+        Decimal.Finite(finiteDecimal.div(value.finiteDecimal, scale, roundingMode))
+    }
+} else {
+    (this.toDouble() / value.toDouble()).toDecimal()
+}
+
+internal expect operator fun FiniteDecimal.div(value: FiniteDecimal): FiniteDecimal
+internal expect fun FiniteDecimal.div(value: FiniteDecimal, scale: Int): FiniteDecimal
+internal expect fun FiniteDecimal.div(
+    value: FiniteDecimal,
+    scale: Int,
+    roundingMode: RoundingMode = RoundingMode.RoundHalfEven
+): FiniteDecimal
 
 /**
  * Multiplies two [Decimal].
  * @param value the [Decimal] to multiply
  * @return the [Decimal] that is the multiplication of the two provided decimals.
  */
-expect operator fun Decimal.times(value: Decimal): Decimal
+operator fun Decimal.times(value: Decimal): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal * value.finiteDecimal)
+} else {
+    (this.toDouble() * value.toDouble()).toDecimal()
+}
 
 /**
  * Multiplies two [Decimal] to a given precision.
@@ -123,7 +231,11 @@ expect operator fun Decimal.times(value: Decimal): Decimal
  * @param scale The number of digits a rounded value should have after its decimal point.
  * @return the [Decimal] that is the multiplication of the two provided decimals.
  */
-expect fun Decimal.times(value: Decimal, scale: Int): Decimal
+fun Decimal.times(value: Decimal, scale: Int): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal.times(value.finiteDecimal, scale))
+} else {
+    (this.toDouble() * value.toDouble()).toDecimal()
+}
 
 /**
  * Multiplies two [Decimal] to a given precision.
@@ -132,18 +244,34 @@ expect fun Decimal.times(value: Decimal, scale: Int): Decimal
  * @param roundingMode The [RoundingMode] to apply when scaling.
  * @return the [Decimal] that is the multiplication of the two provided decimals.
  */
-expect fun Decimal.times(
+fun Decimal.times(
     value: Decimal,
     scale: Int,
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
-): Decimal
+): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal.times(value.finiteDecimal, scale, roundingMode))
+} else {
+    (this.toDouble() * value.toDouble()).toDecimal()
+}
+
+internal expect operator fun FiniteDecimal.times(value: FiniteDecimal): FiniteDecimal
+internal expect fun FiniteDecimal.times(value: FiniteDecimal, scale: Int): FiniteDecimal
+internal expect fun FiniteDecimal.times(
+    value: FiniteDecimal,
+    scale: Int,
+    roundingMode: RoundingMode = RoundingMode.RoundHalfEven
+): FiniteDecimal
 
 /**
  * Raises two [Decimal].
  * @param n the [Decimal] to raise to
  * @return the [Decimal] that is the exponent of the two provided decimals.
  */
-expect infix fun Decimal.pow(n: Int): Decimal
+infix fun Decimal.pow(n: Int): Decimal = if (this is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal.pow(n))
+} else {
+    (this.toDouble().pow(n)).toDecimal()
+}
 
 /**
  * Raises two [Decimal] to a given precision.
@@ -151,7 +279,11 @@ expect infix fun Decimal.pow(n: Int): Decimal
  * @param scale The number of digits a rounded value should have after its decimal point.
  * @return the [Decimal] that is the exponent of the two provided decimals.
  */
-expect fun Decimal.pow(n: Int, scale: Int): Decimal
+fun Decimal.pow(n: Int, scale: Int): Decimal = if (this is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal.pow(n, scale))
+} else {
+    (this.toDouble().pow(n)).toDecimal()
+}
 
 /**
  * Raises two [Decimal] to a given precision.
@@ -160,11 +292,23 @@ expect fun Decimal.pow(n: Int, scale: Int): Decimal
  * @param roundingMode The [RoundingMode] to apply when scaling.
  * @return the [Decimal] that is the exponent of the two provided decimals.
  */
-expect fun Decimal.pow(
+fun Decimal.pow(
     n: Int,
     scale: Int,
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
-): Decimal
+): Decimal = if (this is Decimal.Finite) {
+    Decimal.Finite(finiteDecimal.pow(n, scale, roundingMode))
+} else {
+    (this.toDouble().pow(n)).toDecimal()
+}
+
+internal expect infix fun FiniteDecimal.pow(n: Int): FiniteDecimal
+internal expect fun FiniteDecimal.pow(n: Int, scale: Int): FiniteDecimal
+internal expect fun FiniteDecimal.pow(
+    n: Int,
+    scale: Int,
+    roundingMode: RoundingMode = RoundingMode.RoundHalfEven
+): FiniteDecimal
 
 /**
  * Rounding Mode for rounding a [Decimal]
@@ -192,17 +336,36 @@ sealed class RoundingMode {
  * @param roundingMode The [RoundingMode] to apply when scaling.
  * @return A [Decimal] rounded to [scale] digits after the decimal point.
  */
-expect fun Decimal.round(scale: Int, roundingMode: RoundingMode = RoundingMode.RoundHalfEven): Decimal
+fun Decimal.round(scale: Int, roundingMode: RoundingMode = RoundingMode.RoundHalfEven): Decimal = when (this) {
+    is Decimal.Finite -> Decimal.Finite(finiteDecimal.round(scale, roundingMode))
+    else -> this
+}
+internal expect fun FiniteDecimal.round(scale: Int, roundingMode: RoundingMode = RoundingMode.RoundHalfEven): FiniteDecimal
 
 /**
  * Converts a [Number] to a [Decimal]
  */
-expect fun Number.toDecimal(): Decimal
+fun Number.toDecimal(): Decimal = when {
+    toDouble().isFinite() -> Decimal.Finite(toFiniteDecimal())
+    toDouble().isNaN() -> Decimal.NaN
+    toDouble() == Double.POSITIVE_INFINITY -> Decimal.PositiveInfinity
+    else -> Decimal.NegativeInfinity
+}
 
 /**
  * Converts a String to a [Decimal]
  */
-expect fun String.toDecimal(): Decimal
+fun String.toDecimal(): Decimal = when (this) {
+    Double.NaN.toString() -> Decimal.NaN
+    Double.POSITIVE_INFINITY.toString(),
+    '\u221E'.toString() -> Decimal.PositiveInfinity
+    Double.NEGATIVE_INFINITY.toString(),
+    "-${'\u221E'}" -> Decimal.NegativeInfinity
+    else -> toFiniteDecimal()?.let { Decimal.Finite(it) } ?: Decimal.NaN
+}
+
+internal expect fun Number.toFiniteDecimal(): FiniteDecimal
+internal expect fun String.toFiniteDecimal(): FiniteDecimal?
 
 /**
  * Converts a [ByteArray] to a list of [Decimal]
@@ -243,17 +406,36 @@ fun <NumberType : Number> Collection<NumberType>.toDecimalList(): List<Decimal>
 /**
  * Gets the double value of a [Decimal]
  */
-expect fun Decimal.toDouble(): Double
+fun Decimal.toDouble(): Double = when (this) {
+    is Decimal.Finite -> finiteDecimal.toDouble()
+    is Decimal.NaN -> Double.NaN
+    is Decimal.NegativeInfinity -> Double.NEGATIVE_INFINITY
+    is Decimal.PositiveInfinity -> Double.POSITIVE_INFINITY
+}
 
 /**
  * Gets the string value of a [Decimal]
  */
-expect fun Decimal.toString(): String
+fun Decimal.toString(): String = when (this) {
+    is Decimal.Finite -> finiteDecimal.toString()
+    is Decimal.NaN -> Double.NaN.toString()
+    is Decimal.NegativeInfinity -> Double.NEGATIVE_INFINITY.toString()
+    is Decimal.PositiveInfinity -> Double.POSITIVE_INFINITY.toString()
+}
 
 /**
  * Gets the integer value of a [Decimal]
  */
-expect fun Decimal.toInt(): Int
+fun Decimal.toInt(): Int = when (this) {
+    is Decimal.Finite -> finiteDecimal.toInt()
+    is Decimal.NaN -> 0
+    is Decimal.NegativeInfinity -> Int.MIN_VALUE
+    is Decimal.PositiveInfinity -> Int.MAX_VALUE
+}
+
+internal expect fun FiniteDecimal.toDouble(): Double
+internal expect fun FiniteDecimal.toString(): String
+internal expect fun FiniteDecimal.toInt(): Int
 
 /**
  * Converts a collection of [Decimal] to a [DoubleArray]
diff --git a/base/src/commonTest/kotlin/utils/DecimalTest.kt b/base/src/commonTest/kotlin/utils/DecimalTest.kt
index 8b5317288..bf2dfe8b7 100644
--- a/base/src/commonTest/kotlin/utils/DecimalTest.kt
+++ b/base/src/commonTest/kotlin/utils/DecimalTest.kt
@@ -19,7 +19,6 @@ package com.splendo.kaluga.base.utils
 
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -45,9 +44,19 @@ class DecimalTest {
         assertEquals(0.333, 1.toDecimal().div(3.toDecimal(), 3, RoundingMode.RoundDown).toDouble())
         assertEquals(0.334, 1.toDecimal().div(3.toDecimal(), 3, RoundingMode.RoundUp).toDouble())
 
-        assertFailsWith(DecimalException::class) { 1.0.toDecimal() / 0.0.toDecimal() }
-        assertFailsWith(DecimalException::class) { 1.0.toDecimal().div(0.0.toDecimal(), 3) }
-        assertFailsWith(DecimalException::class) { 1.0.toDecimal().div(0.0.toDecimal(), 3, RoundingMode.RoundDown) }
+        assertEquals(Decimal.PositiveInfinity, 1.0.toDecimal() / 0.0.toDecimal())
+        assertEquals(Decimal.PositiveInfinity, 1.0.toDecimal().div(0.0.toDecimal(), 3))
+        assertEquals(Decimal.PositiveInfinity, 1.0.toDecimal().div(0.0.toDecimal(), 3, RoundingMode.RoundDown))
+
+        assertEquals(Decimal.NegativeInfinity, (-1.0).toDecimal() / 0.0.toDecimal())
+        assertEquals(Decimal.NegativeInfinity, (-1.0).toDecimal().div(0.0.toDecimal(), 3))
+        assertEquals(Decimal.NegativeInfinity, (-1.0).toDecimal().div(0.0.toDecimal(), 3, RoundingMode.RoundDown))
+
+        assertEquals(Decimal.NaN, 0.0.toDecimal() / 0.0.toDecimal())
+        assertEquals(Decimal.NaN, 0.0.toDecimal().div(0.0.toDecimal(), 3))
+        assertEquals(Decimal.NaN, 0.0.toDecimal().div(0.0.toDecimal(), 3, RoundingMode.RoundDown))
+
+        assertEquals(Decimal.NaN, "Test".toDecimal())
     }
 
     @Test
diff --git a/base/src/iosMain/kotlin/utils/Decimal.kt b/base/src/iosMain/kotlin/utils/Decimal.kt
index c01c79119..8d43ee677 100644
--- a/base/src/iosMain/kotlin/utils/Decimal.kt
+++ b/base/src/iosMain/kotlin/utils/Decimal.kt
@@ -23,31 +23,20 @@ import platform.Foundation.NSRoundingMode
 import kotlin.math.absoluteValue
 
 /**
- * Immutable, arbitrary-precision signed decimal numbers.
- * @param nsDecimal the internal [NSDecimalNumber] corresponding to this decimal
+ * Platform specific representation of a finite immutable, arbitrary-precision signed decimal number
+ * @property nsDecimal the [NSDecimalNumber] representing the finite decimal number
  */
-actual data class Decimal(val nsDecimal: NSDecimalNumber) : Comparable<Decimal> {
-    override fun compareTo(other: Decimal): Int = nsDecimal.compare(other.nsDecimal).toInt()
-    override fun equals(other: Any?): Boolean = (other as? Decimal)?.let { nsDecimal.isEqualToNumber(it.nsDecimal) } ?: false
+actual data class FiniteDecimal(val nsDecimal: NSDecimalNumber) : Comparable<FiniteDecimal> {
+    override fun compareTo(other: FiniteDecimal): Int = nsDecimal.compare(other.nsDecimal).toInt()
+    override fun equals(other: Any?): Boolean = (other as? FiniteDecimal)?.let { nsDecimal.isEqualToNumber(it.nsDecimal) } ?: false
     override fun hashCode(): Int {
         return nsDecimal.hashCode()
     }
 }
 
-/**
- * Adds two [Decimal] together.
- * @param value the [Decimal] to add
- * @return the [Decimal] that is the total of the two provided decimals.
- */
-actual operator fun Decimal.plus(value: Decimal) = copy(nsDecimal = nsDecimal.decimalNumberByAdding(value.nsDecimal))
+actual operator fun FiniteDecimal.plus(value: FiniteDecimal) = copy(nsDecimal = nsDecimal.decimalNumberByAdding(value.nsDecimal))
 
-/**
- * Adds two [Decimal] together scaled to a given precision.
- * @param value the [Decimal] to add
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the total of the two provided decimals.
- */
-actual fun Decimal.plus(value: Decimal, scale: Int) = copy(
+actual fun FiniteDecimal.plus(value: FiniteDecimal, scale: Int) = copy(
     nsDecimal = nsDecimal.decimalNumberByAdding(
         decimalNumber = value.nsDecimal,
         withBehavior = NSDecimalNumberHandler(
@@ -61,14 +50,7 @@ actual fun Decimal.plus(value: Decimal, scale: Int) = copy(
     )
 )
 
-/**
- * Adds two [Decimal] together scaled to a given precision.
- * @param value the [Decimal] to add
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the total of the two provided decimals.
- */
-actual fun Decimal.plus(value: Decimal, scale: Int, roundingMode: RoundingMode) = copy(
+actual fun FiniteDecimal.plus(value: FiniteDecimal, scale: Int, roundingMode: RoundingMode) = copy(
     nsDecimal = nsDecimal.decimalNumberByAdding(
         decimalNumber = value.nsDecimal,
         withBehavior = NSDecimalNumberHandler(
@@ -82,20 +64,9 @@ actual fun Decimal.plus(value: Decimal, scale: Int, roundingMode: RoundingMode)
     )
 )
 
-/**
- * Subtracts two [Decimal].
- * @param value the [Decimal] to subtract
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual operator fun Decimal.minus(value: Decimal) = copy(nsDecimal = nsDecimal.decimalNumberBySubtracting(value.nsDecimal))
+actual operator fun FiniteDecimal.minus(value: FiniteDecimal) = copy(nsDecimal = nsDecimal.decimalNumberBySubtracting(value.nsDecimal))
 
-/**
- * Subtracts two [Decimal] to a given precision.
- * @param value the [Decimal] to subtract
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual fun Decimal.minus(value: Decimal, scale: Int) = copy(
+actual fun FiniteDecimal.minus(value: FiniteDecimal, scale: Int) = copy(
     nsDecimal = nsDecimal.decimalNumberBySubtracting(
         decimalNumber = value.nsDecimal,
         withBehavior = NSDecimalNumberHandler(
@@ -109,14 +80,7 @@ actual fun Decimal.minus(value: Decimal, scale: Int) = copy(
     )
 )
 
-/**
- * Subtracts two [Decimal] to a given precision.
- * @param value the [Decimal] to subtract
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual fun Decimal.minus(value: Decimal, scale: Int, roundingMode: RoundingMode) = copy(
+actual fun FiniteDecimal.minus(value: FiniteDecimal, scale: Int, roundingMode: RoundingMode) = copy(
     nsDecimal = nsDecimal.decimalNumberBySubtracting(
         decimalNumber = value.nsDecimal,
         withBehavior = NSDecimalNumberHandler(
@@ -130,72 +94,39 @@ actual fun Decimal.minus(value: Decimal, scale: Int, roundingMode: RoundingMode)
     )
 )
 
-/**
- * Divides two [Decimal].
- * @param value the [Decimal] to divide
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual operator fun Decimal.div(value: Decimal) = if (value.nsDecimal != NSDecimalNumber.zero) copy(nsDecimal = nsDecimal.decimalNumberByDividingBy(value.nsDecimal)) else throw DecimalException("Divide by zero")
+actual operator fun FiniteDecimal.div(value: FiniteDecimal) = copy(nsDecimal = nsDecimal.decimalNumberByDividingBy(value.nsDecimal))
 
-/**
- * Divides two [Decimal] to a given precision.
- * @param value the [Decimal] to divide
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual fun Decimal.div(value: Decimal, scale: Int) = if (value.nsDecimal != NSDecimalNumber.zero)
-    copy(
-        nsDecimal = nsDecimal.decimalNumberByDividingBy(
-            decimalNumber = value.nsDecimal,
-            withBehavior = NSDecimalNumberHandler(
-                NSRoundingMode.NSRoundBankers,
-                scale.toShort(),
-                raiseOnExactness = true,
-                raiseOnOverflow = true,
-                raiseOnUnderflow = true,
-                raiseOnDivideByZero = true
-            )
+actual fun FiniteDecimal.div(value: FiniteDecimal, scale: Int) = copy(
+    nsDecimal = nsDecimal.decimalNumberByDividingBy(
+        decimalNumber = value.nsDecimal,
+        withBehavior = NSDecimalNumberHandler(
+            NSRoundingMode.NSRoundBankers,
+            scale.toShort(),
+            raiseOnExactness = true,
+            raiseOnOverflow = true,
+            raiseOnUnderflow = true,
+            raiseOnDivideByZero = true
         )
     )
-else throw DecimalException("Divide by zero")
+)
 
-/**
- * Divides two [Decimal] to a given precision.
- * @param value the [Decimal] to divide
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual fun Decimal.div(value: Decimal, scale: Int, roundingMode: RoundingMode) = if (value.nsDecimal != NSDecimalNumber.zero)
-    copy(
-        nsDecimal = nsDecimal.decimalNumberByDividingBy(
-            decimalNumber = value.nsDecimal,
-            withBehavior = NSDecimalNumberHandler(
-                roundingMode = roundingMode.nsRoundingMode,
-                scale = scale.toShort(),
-                raiseOnExactness = false,
-                raiseOnOverflow = false,
-                raiseOnUnderflow = false,
-                raiseOnDivideByZero = true
-            )
+actual fun FiniteDecimal.div(value: FiniteDecimal, scale: Int, roundingMode: RoundingMode) = copy(
+    nsDecimal = nsDecimal.decimalNumberByDividingBy(
+        decimalNumber = value.nsDecimal,
+        withBehavior = NSDecimalNumberHandler(
+            roundingMode = roundingMode.nsRoundingMode,
+            scale = scale.toShort(),
+            raiseOnExactness = false,
+            raiseOnOverflow = false,
+            raiseOnUnderflow = false,
+            raiseOnDivideByZero = true
         )
     )
-else throw DecimalException("Divide by zero")
+)
 
-/**
- * Multiplies two [Decimal].
- * @param value the [Decimal] to multiply
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual operator fun Decimal.times(value: Decimal) = copy(nsDecimal = nsDecimal.decimalNumberByMultiplyingBy(value.nsDecimal))
+actual operator fun FiniteDecimal.times(value: FiniteDecimal) = copy(nsDecimal = nsDecimal.decimalNumberByMultiplyingBy(value.nsDecimal))
 
-/**
- * Multiplies two [Decimal] to a given precision.
- * @param value the [Decimal] to multiply
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual fun Decimal.times(value: Decimal, scale: Int) = copy(
+actual fun FiniteDecimal.times(value: FiniteDecimal, scale: Int) = copy(
     nsDecimal = nsDecimal.decimalNumberByMultiplyingBy(
         decimalNumber = value.nsDecimal,
         NSDecimalNumberHandler(
@@ -209,14 +140,7 @@ actual fun Decimal.times(value: Decimal, scale: Int) = copy(
     )
 )
 
-/**
- * Multiplies two [Decimal] to a given precision.
- * @param value the [Decimal] to multiply
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual fun Decimal.times(value: Decimal, scale: Int, roundingMode: RoundingMode) = copy(
+actual fun FiniteDecimal.times(value: FiniteDecimal, scale: Int, roundingMode: RoundingMode) = copy(
     nsDecimal = nsDecimal.decimalNumberByMultiplyingBy(
         decimalNumber = value.nsDecimal,
         withBehavior = NSDecimalNumberHandler(
@@ -230,24 +154,13 @@ actual fun Decimal.times(value: Decimal, scale: Int, roundingMode: RoundingMode)
     )
 )
 
-/**
- * Raises two [Decimal].
- * @param n the [Decimal] to raise to
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual infix fun Decimal.pow(n: Int): Decimal = if (n < 0)
-    1.toDecimal() / pow(n.absoluteValue)
+actual infix fun FiniteDecimal.pow(n: Int): FiniteDecimal = if (n < 0)
+    1.toFiniteDecimal() / pow(n.absoluteValue)
 else
     copy(nsDecimal = nsDecimal.decimalNumberByRaisingToPower(n.toULong()))
 
-/**
- * Raises two [Decimal] to a given precision.
- * @param n the [Decimal] to raise to
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual fun Decimal.pow(n: Int, scale: Int): Decimal = if (n < 0)
-    1.toDecimal() / pow(n.absoluteValue, scale)
+actual fun FiniteDecimal.pow(n: Int, scale: Int): FiniteDecimal = if (n < 0)
+    1.toFiniteDecimal() / pow(n.absoluteValue, scale)
 else
     copy(
         nsDecimal = nsDecimal.decimalNumberByRaisingToPower(
@@ -262,20 +175,12 @@ else
             )
         )
     )
-
-/**
- * Raises two [Decimal] to a given precision.
- * @param n the [Decimal] to raise to
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual fun Decimal.pow(
+actual fun FiniteDecimal.pow(
     n: Int,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = if (n < 0)
-    1.toDecimal() / pow(n.absoluteValue, scale, roundingMode)
+): FiniteDecimal = if (n < 0)
+    1.toFiniteDecimal() / pow(n.absoluteValue, scale, roundingMode)
 else
     copy(
         nsDecimal = nsDecimal.decimalNumberByRaisingToPower(
@@ -291,39 +196,22 @@ else
         )
     )
 
-/**
- * Converts a [Number] to a [Decimal]
- */
-actual fun Number.toDecimal() = Decimal(NSDecimalNumber(this.toString()))
-
-/**
- * Converts a String to a [Decimal]
- */
-actual fun String.toDecimal() = Decimal(NSDecimalNumber(this))
-
-/**
- * Gets the double value of a [Decimal]
- */
-actual fun Decimal.toDouble() = nsDecimal.toString().toDouble()
-
-/**
- * Gets the integer value of a [Decimal]
- */
-actual fun Decimal.toInt() = nsDecimal.intValue
+actual fun Number.toFiniteDecimal() = FiniteDecimal(NSDecimalNumber(this.toString()))
+actual fun String.toFiniteDecimal(): FiniteDecimal? {
+    val decimal = NSDecimalNumber(this)
+    return if (decimal == NSDecimalNumber.notANumber) {
+        null
+    } else {
+        FiniteDecimal(decimal)
+    }
+}
 
-/**
- * Gets the string value of a [Decimal]
- */
+actual fun FiniteDecimal.toDouble() = nsDecimal.toString().toDouble()
+actual fun FiniteDecimal.toInt() = nsDecimal.intValue
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-actual fun Decimal.toString() = nsDecimal.stringValue
+actual fun FiniteDecimal.toString() = nsDecimal.stringValue
 
-/**
- * Rounds a [Decimal] to a [scale].
- * @param scale The number of digits the rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return A [Decimal] rounded to [scale] digits after the decimal point.
- */
-actual fun Decimal.round(scale: Int, roundingMode: RoundingMode) = copy(
+actual fun FiniteDecimal.round(scale: Int, roundingMode: RoundingMode) = copy(
     nsDecimal = nsDecimal.decimalNumberByRoundingAccordingToBehavior(
         NSDecimalNumberHandler(
             roundingMode = roundingMode.nsRoundingMode,
diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index c8c09e97a..e22ee917a 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -47,12 +47,12 @@ data class Rounding(
 )
 
 /**
- * Immutable, arbitrary-precision signed decimal numbers.
- * @param bd the internal [BigDecimal] corresponding to this decimal
+ * Platform specific representation of a finite immutable, arbitrary-precision signed decimal number
+ * @property bd the [BigDecimal] representing the finite decimal number
  */
-actual data class Decimal(val bd: BigDecimal) : Comparable<Decimal> {
-    override fun compareTo(other: Decimal): Int = BigDecimal.compare(bd, other.bd)
-    override fun equals(other: Any?): Boolean = (other as? Decimal)?.let { BigDecimal.equal(bd, it.bd) } ?: false
+actual data class FiniteDecimal(val bd: BigDecimal) : Comparable<FiniteDecimal> {
+    override fun compareTo(other: FiniteDecimal): Int = BigDecimal.compare(bd, other.bd)
+    override fun equals(other: Any?): Boolean = (other as? FiniteDecimal)?.let { BigDecimal.equal(bd, it.bd) } ?: false
     override fun hashCode(): Int {
         return bd.hashCode()
     }
@@ -64,7 +64,7 @@ private fun round(
     a: BigDecimal,
     roundingMode: RoundingMode,
     maximumFractionDigits: Int? = null
-): Decimal {
+): FiniteDecimal {
     val mode = if (BigDecimal.lessThan(a, ZERO)) {
         when (roundingMode) {
             RoundDown -> CEIL
@@ -78,200 +78,85 @@ private fun round(
             RoundUp -> CEIL
         }
     }
-    return Decimal(BigDecimal.round(a, Rounding(maximumFractionDigits, mode)))
+    return FiniteDecimal(BigDecimal.round(a, Rounding(maximumFractionDigits, mode)))
 }
 
-/**
- * Adds two [Decimal] together.
- * @param value the [Decimal] to add
- * @return the [Decimal] that is the total of the two provided decimals.
- */
-actual operator fun Decimal.plus(value: Decimal): Decimal = Decimal(BigDecimal.add(bd, value.bd))
+actual operator fun FiniteDecimal.plus(value: FiniteDecimal): FiniteDecimal = FiniteDecimal(BigDecimal.add(bd, value.bd))
 
-/**
- * Adds two [Decimal] together scaled to a given precision.
- * @param value the [Decimal] to add
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the total of the two provided decimals.
- */
-actual fun Decimal.plus(
-    value: Decimal,
+actual fun FiniteDecimal.plus(
+    value: FiniteDecimal,
     scale: Int
-): Decimal = Decimal(BigDecimal.add(bd, value.bd, Rounding(scale)))
+): FiniteDecimal = FiniteDecimal(BigDecimal.add(bd, value.bd, Rounding(scale)))
 
-/**
- * Adds two [Decimal] together scaled to a given precision.
- * @param value the [Decimal] to add
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the total of the two provided decimals.
- */
-actual fun Decimal.plus(
-    value: Decimal,
+actual fun FiniteDecimal.plus(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = round(BigDecimal.add(bd, value.bd), roundingMode, scale)
+): FiniteDecimal = round(BigDecimal.add(bd, value.bd), roundingMode, scale)
 
-/**
- * Subtracts two [Decimal].
- * @param value the [Decimal] to subtract
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual operator fun Decimal.minus(value: Decimal): Decimal = Decimal(BigDecimal.subtract(bd, value.bd))
+actual operator fun FiniteDecimal.minus(value: FiniteDecimal): FiniteDecimal = FiniteDecimal(BigDecimal.subtract(bd, value.bd))
 
-/**
- * Subtracts two [Decimal] to a given precision.
- * @param value the [Decimal] to subtract
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual fun Decimal.minus(
-    value: Decimal,
+actual fun FiniteDecimal.minus(
+    value: FiniteDecimal,
     scale: Int
-): Decimal = Decimal(BigDecimal.subtract(bd, value.bd, Rounding(scale)))
+): FiniteDecimal = FiniteDecimal(BigDecimal.subtract(bd, value.bd, Rounding(scale)))
 
-/**
- * Subtracts two [Decimal] to a given precision.
- * @param value the [Decimal] to subtract
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual fun Decimal.minus(
-    value: Decimal,
+actual fun FiniteDecimal.minus(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = round(BigDecimal.subtract(bd, value.bd), roundingMode, scale)
+): FiniteDecimal = round(BigDecimal.subtract(bd, value.bd), roundingMode, scale)
 
-/**
- * Divides two [Decimal].
- * @param value the [Decimal] to divide
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual operator fun Decimal.div(
-    value: Decimal
-): Decimal = if (!BigDecimal.equal(value.bd, ZERO)) Decimal(BigDecimal.divide(bd, value.bd, Rounding())) else throw DecimalException("Divide by zero")
+actual operator fun FiniteDecimal.div(
+    value: FiniteDecimal
+): FiniteDecimal = FiniteDecimal(BigDecimal.divide(bd, value.bd, Rounding()))
 
-/**
- * Divides two [Decimal] to a given precision.
- * @param value the [Decimal] to divide
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual fun Decimal.div(
-    value: Decimal,
+actual fun FiniteDecimal.div(
+    value: FiniteDecimal,
     scale: Int
-): Decimal = if (!BigDecimal.equal(value.bd, ZERO)) Decimal(BigDecimal.divide(bd, value.bd, Rounding(scale))) else throw DecimalException("Divide by zero")
+): FiniteDecimal = FiniteDecimal(BigDecimal.divide(bd, value.bd, Rounding(scale)))
 
-/**
- * Divides two [Decimal] to a given precision.
- * @param value the [Decimal] to divide
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual fun Decimal.div(
-    value: Decimal,
+actual fun FiniteDecimal.div(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = if (!BigDecimal.equal(value.bd, ZERO))
-    round(BigDecimal.divide(bd, value.bd, Rounding(scale + 1, ROUNDING_MODE, DIV_DECIMAL_128_SIGNIFICANT_DIGITS)), roundingMode, scale)
-else
-    throw DecimalException("Divide by zero")
+): FiniteDecimal = round(BigDecimal.divide(bd, value.bd, Rounding(scale + 1, ROUNDING_MODE, DIV_DECIMAL_128_SIGNIFICANT_DIGITS)), roundingMode, scale)
 
-/**
- * Multiplies two [Decimal].
- * @param value the [Decimal] to multiply
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual operator fun Decimal.times(
-    value: Decimal
-): Decimal = Decimal(BigDecimal.multiply(bd, value.bd, Rounding()))
+actual operator fun FiniteDecimal.times(
+    value: FiniteDecimal
+): FiniteDecimal = FiniteDecimal(BigDecimal.multiply(bd, value.bd, Rounding()))
 
-/**
- * Multiplies two [Decimal] to a given precision.
- * @param value the [Decimal] to multiply
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual fun Decimal.times(
-    value: Decimal,
+actual fun FiniteDecimal.times(
+    value: FiniteDecimal,
     scale: Int
-): Decimal = Decimal(BigDecimal.multiply(bd, value.bd, Rounding(scale)))
+): FiniteDecimal = FiniteDecimal(BigDecimal.multiply(bd, value.bd, Rounding(scale)))
 
-/**
- * Multiplies two [Decimal] to a given precision.
- * @param value the [Decimal] to multiply
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual fun Decimal.times(
-    value: Decimal,
+actual fun FiniteDecimal.times(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = round(BigDecimal.multiply(bd, value.bd), roundingMode, scale)
+): FiniteDecimal = round(BigDecimal.multiply(bd, value.bd), roundingMode, scale)
 
-/**
- * Raises two [Decimal].
- * @param n the [Decimal] to raise to
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual infix fun Decimal.pow(n: Int): Decimal = Decimal(BigDecimal.BigDecimal(toDouble().pow(n)))
-
-/**
- * Raises two [Decimal] to a given precision.
- * @param n the [Decimal] to raise to
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual fun Decimal.pow(n: Int, scale: Int): Decimal = Decimal(BigDecimal.round((this pow n).bd, Rounding(scale)))
-
-/**
- * Raises two [Decimal] to a given precision.
- * @param n the [Decimal] to raise to
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual fun Decimal.pow(
+actual infix fun FiniteDecimal.pow(n: Int): FiniteDecimal = FiniteDecimal(BigDecimal.BigDecimal(toDouble().pow(n)))
+actual fun FiniteDecimal.pow(n: Int, scale: Int): FiniteDecimal = FiniteDecimal(BigDecimal.round((this pow n).bd, Rounding(scale)))
+actual fun FiniteDecimal.pow(
     n: Int,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = this pow n
+): FiniteDecimal = this pow n
 
-/**
- * Rounds a [Decimal] to a [scale].
- * @param scale The number of digits the rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return A [Decimal] rounded to [scale] digits after the decimal point.
- */
-actual fun Decimal.round(
+actual fun FiniteDecimal.round(
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = round(bd, roundingMode, scale)
-
-/**
- * Converts a [Number] to a [Decimal]
- */
-actual fun Number.toDecimal(): Decimal = this.toString().toDecimal()
-
-/**
- * Converts a String to a [Decimal]
- */
-actual fun String.toDecimal(): Decimal = Decimal(BigDecimal.BigDecimal(this))
-
-/**
- * Gets the double value of a [Decimal]
- */
-actual fun Decimal.toDouble(): Double = bd.toString().toDouble()
+): FiniteDecimal = round(bd, roundingMode, scale)
 
-/**
- * Gets the integer value of a [Decimal]
- */
-actual fun Decimal.toInt(): Int = bd.toFixed(0).toInt()
+actual fun Number.toFiniteDecimal(): FiniteDecimal = this.toString().toFiniteDecimal()!!
+actual fun String.toFiniteDecimal(): FiniteDecimal? = try {
+    FiniteDecimal(BigDecimal.BigDecimal(this))
+} catch (e : dynamic) {
+    null
+}
 
-/**
- * Gets the string value of a [Decimal]
- */
-actual fun Decimal.toString(): String = bd.toString()
+actual fun FiniteDecimal.toDouble(): Double = bd.toString().toDouble()
+actual fun FiniteDecimal.toInt(): Int = bd.toFixed(0).toInt()
+actual fun FiniteDecimal.toString(): String = bd.toString()
diff --git a/base/src/jvmMain/kotlin/utils/Decimal.kt b/base/src/jvmMain/kotlin/utils/Decimal.kt
index d58ea05f8..7ea58f4b6 100644
--- a/base/src/jvmMain/kotlin/utils/Decimal.kt
+++ b/base/src/jvmMain/kotlin/utils/Decimal.kt
@@ -27,132 +27,57 @@ import java.math.BigDecimal
 import java.math.MathContext
 import java.math.RoundingMode as NativeRoundingMode
 
-actual typealias Decimal = BigDecimal
-
 /**
- * Adds two [Decimal] together.
- * @param value the [Decimal] to add
- * @return the [Decimal] that is the total of the two provided decimals.
+ * Platform specific representation of a finite immutable, arbitrary-precision signed decimal number
  */
-actual operator fun Decimal.plus(value: Decimal) = this.add(value)
+actual typealias FiniteDecimal = BigDecimal
 
-/**
- * Adds two [Decimal] together scaled to a given precision.
- * @param value the [Decimal] to add
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the total of the two provided decimals.
- */
-actual fun Decimal.plus(value: Decimal, scale: Int) =
+actual operator fun FiniteDecimal.plus(value: FiniteDecimal) = this.add(value)
+
+actual fun FiniteDecimal.plus(value: FiniteDecimal, scale: Int) =
     this.add(value).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
-/**
- * Adds two [Decimal] together scaled to a given precision.
- * @param value the [Decimal] to add
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the total of the two provided decimals.
- */
-actual fun Decimal.plus(
-    value: Decimal,
+actual fun FiniteDecimal.plus(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
 ) = this.add(value).setScale(scale, roundingMode.java)
 
-/**
- * Subtracts two [Decimal].
- * @param value the [Decimal] to subtract
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual operator fun Decimal.minus(value: Decimal) = this.subtract(value)
+actual operator fun FiniteDecimal.minus(value: FiniteDecimal) = this.subtract(value)
 
-/**
- * Subtracts two [Decimal] to a given precision.
- * @param value the [Decimal] to subtract
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual fun Decimal.minus(value: Decimal, scale: Int) =
+actual fun FiniteDecimal.minus(value: FiniteDecimal, scale: Int) =
     this.subtract(value).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
-/**
- * Subtracts two [Decimal] to a given precision.
- * @param value the [Decimal] to subtract
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the subtraction of the two provided decimals.
- */
-actual fun Decimal.minus(
-    value: Decimal,
+actual fun FiniteDecimal.minus(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
 ) = this.subtract(value).setScale(scale, roundingMode.java)
 
-/**
- * Divides two [Decimal].
- * @param value the [Decimal] to divide
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual operator fun Decimal.div(value: Decimal) = if ((value.compareTo(Decimal.ZERO)) != 0)
-    this.divide(value, MathContext.DECIMAL128)
-else throw DecimalException("Divide by zero")
+actual operator fun FiniteDecimal.div(value: FiniteDecimal) = this.divide(value, MathContext.DECIMAL128)
 
-/**
- * Divides two [Decimal] to a given precision.
- * @param value the [Decimal] to divide
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual fun Decimal.div(value: Decimal, scale: Int) = if ((value.compareTo(Decimal.ZERO)) != 0)
-    this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
-else throw DecimalException("Divide by zero")
+actual fun FiniteDecimal.div(value: FiniteDecimal, scale: Int) = this.divide(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
-/**
- * Divides two [Decimal] to a given precision.
- * @param value the [Decimal] to divide
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the division of the two provided decimals.
- */
-actual fun Decimal.div(
-    value: Decimal,
+actual fun FiniteDecimal.div(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
-) = if ((value.compareTo(Decimal.ZERO)) != 0)
-    this.divide(
-        value,
-        MathContext(
-            MathContext.DECIMAL128.precision,
-            roundingMode.java
-        )
-    ).setScale(scale, roundingMode.java)
-else throw DecimalException("Divide by zero")
+) = this.divide(
+    value,
+    MathContext(
+        MathContext.DECIMAL128.precision,
+        roundingMode.java
+    )
+).setScale(scale, roundingMode.java)
 
-/**
- * Multiplies two [Decimal].
- * @param value the [Decimal] to multiply
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual operator fun Decimal.times(value: Decimal) =
+actual operator fun FiniteDecimal.times(value: FiniteDecimal) =
     this.multiply(value, MathContext.DECIMAL128)
 
-/**
- * Multiplies two [Decimal] to a given precision.
- * @param value the [Decimal] to multiply
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual fun Decimal.times(value: Decimal, scale: Int) =
+actual fun FiniteDecimal.times(value: FiniteDecimal, scale: Int) =
     this.multiply(value, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
 
-/**
- * Multiplies two [Decimal] to a given precision.
- * @param value the [Decimal] to multiply
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the multiplication of the two provided decimals.
- */
-actual fun Decimal.times(
-    value: Decimal,
+actual fun FiniteDecimal.times(
+    value: FiniteDecimal,
     scale: Int,
     roundingMode: RoundingMode
 ) = this.multiply(
@@ -163,45 +88,19 @@ actual fun Decimal.times(
     )
 ).setScale(scale, roundingMode.java)
 
-/**
- * Rounds a [Decimal] to a [scale].
- * @param scale The number of digits the rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return A [Decimal] rounded to [scale] digits after the decimal point.
- */
-actual fun Decimal.round(scale: Int, roundingMode: RoundingMode) =
+actual fun FiniteDecimal.round(scale: Int, roundingMode: RoundingMode) =
     this.setScale(
         scale,
         roundingMode.java
     )
 
-/**
- * Raises two [Decimal].
- * @param n the [Decimal] to raise to
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual infix fun Decimal.pow(n: Int): Decimal = this.pow(n, MathContext.DECIMAL128)
-
-/**
- * Raises two [Decimal] to a given precision.
- * @param n the [Decimal] to raise to
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual fun Decimal.pow(n: Int, scale: Int): Decimal = this.pow(n, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
-
-/**
- * Raises two [Decimal] to a given precision.
- * @param n the [Decimal] to raise to
- * @param scale The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
- * @return the [Decimal] that is the exponent of the two provided decimals.
- */
-actual fun Decimal.pow(
+actual infix fun FiniteDecimal.pow(n: Int): FiniteDecimal = this.pow(n, MathContext.DECIMAL128)
+actual fun FiniteDecimal.pow(n: Int, scale: Int): FiniteDecimal = this.pow(n, MathContext.DECIMAL128).setScale(scale, NativeRoundingMode.HALF_EVEN)
+actual fun FiniteDecimal.pow(
     n: Int,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = this.pow(
+): FiniteDecimal = this.pow(
     n,
     MathContext(
         MathContext.DECIMAL128.precision,
@@ -209,30 +108,16 @@ actual fun Decimal.pow(
     )
 ).setScale(scale, roundingMode.java)
 
-/**
- * Converts a [Number] to a [Decimal]
- */
-actual fun Number.toDecimal() = BigDecimal(toString())
+actual fun Number.toFiniteDecimal() = BigDecimal(toString())
+actual fun String.toFiniteDecimal() = try {
+    BigDecimal(this)
+} catch (e: NumberFormatException) {
+    null
+}
 
-/**
- * Converts a String to a [Decimal]
- */
-actual fun String.toDecimal() = BigDecimal(this)
-
-/**
- * Gets the double value of a [Decimal]
- */
-actual fun Decimal.toDouble() = this.toDouble()
-
-/**
- * Gets the integer value of a [Decimal]
- */
-actual fun Decimal.toInt() = this.toInt()
-
-/**
- * Gets the string value of a [Decimal]
- */
-actual fun Decimal.toString() = this.stripTrailingZeros().toString()
+actual fun FiniteDecimal.toDouble() = this.toDouble()
+actual fun FiniteDecimal.toInt() = this.toInt()
+actual fun FiniteDecimal.toString() = this.stripTrailingZeros().toString()
 
 private val RoundingMode.java
     get() = when (this) {
diff --git a/scientific/api/androidLib/scientific.api b/scientific/api/androidLib/scientific.api
index 0eaf18f83..02ec64644 100644
--- a/scientific/api/androidLib/scientific.api
+++ b/scientific/api/androidLib/scientific.api
@@ -42,7 +42,7 @@ public final class com/splendo/kaluga/scientific/DefaultScientificValue : com/sp
 	public static final field Companion Lcom/splendo/kaluga/scientific/DefaultScientificValue$Companion;
 	public fun <init> (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
 	public synthetic fun <init> (IDLcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun <init> (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
+	public fun <init> (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
 	public final fun component1 ()D
 	public final fun component2 ()Lcom/splendo/kaluga/scientific/unit/ScientificUnit;
 	public final fun copy (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -460,7 +460,7 @@ public final class com/splendo/kaluga/scientific/ScientificArrayKt {
 public abstract interface class com/splendo/kaluga/scientific/ScientificValue : java/io/Serializable, java/lang/Comparable {
 	public fun compareTo (Lcom/splendo/kaluga/scientific/ScientificValue;)I
 	public synthetic fun compareTo (Ljava/lang/Object;)I
-	public fun getDecimalValue ()Ljava/math/BigDecimal;
+	public fun getDecimalValue ()Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getUnit ()Lcom/splendo/kaluga/scientific/unit/ScientificUnit;
 	public abstract fun getValue ()Ljava/lang/Number;
 }
@@ -472,41 +472,41 @@ public final class com/splendo/kaluga/scientific/ScientificValueKt {
 	public static final fun convert (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static synthetic fun convert$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static synthetic fun convert$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Ljava/math/BigDecimal;
-	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/BigDecimal;
-	public static synthetic fun convertValue$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Ljava/math/BigDecimal;
+	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun convertValue$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/lang/Number;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun div (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun invoke (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun invoke (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun invoke (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun invoke (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/lang/Number;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun minus (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun minus (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun minus (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun minus (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/lang/Number;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun plus (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/lang/Number;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun times (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun times (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public abstract interface class com/splendo/kaluga/scientific/ShortScientificArray : com/splendo/kaluga/scientific/ScientificArray {
@@ -517,12 +517,6 @@ public abstract interface class com/splendo/kaluga/scientific/ShortScientificArr
 	public fun iterator ()Ljava/util/Iterator;
 }
 
-public final class com/splendo/kaluga/scientific/converter/ScientificConverterException : java/lang/ArithmeticException {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
 public final class com/splendo/kaluga/scientific/converter/acceleration/ConvertFromForceAndMassKt {
 	public static final fun accelerationFromForceAndMass (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun accelerationFromForceAndMassDefault (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1010,26 +1004,26 @@ public final class com/splendo/kaluga/scientific/converter/catalysticActivity/Co
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertFromDimensionlessKt {
-	public static final fun div (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Ljava/math/BigDecimal;
-	public static final fun times (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Ljava/math/BigDecimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertToFrequencyKt {
-	public static final fun decimalDivMinute (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun decimalDivTime (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivMinute (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivTime (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivMinute (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivTime (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertToRadioactivityKt {
-	public static final fun decimalDivTime (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivTime (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivTime (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertToTimeKt {
-	public static final fun decimalDivBPM (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun decimalDivFrequency (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun decimalDivRadioactivity (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivBPM (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivFrequency (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivRadioactivity (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivBPM (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivFrequency (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivRadioactivity (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
@@ -1158,10 +1152,10 @@ public final class com/splendo/kaluga/scientific/converter/dimensionless/Convert
 }
 
 public final class com/splendo/kaluga/scientific/converter/dimensionless/ConvertToDecimalKt {
-	public static final fun convertToOneByDividing (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
-	public static final fun convertToOneByMultiplying (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
-	public static final fun div (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
+	public static final fun convertToOneByDividing (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
+	public static final fun convertToOneByMultiplying (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
+	public static final fun div (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertFromKinematicViscosityAndDensityKt {
@@ -2006,14 +2000,14 @@ public final class com/splendo/kaluga/scientific/converter/frequency/ConvertFrom
 }
 
 public final class com/splendo/kaluga/scientific/converter/frequency/ConvertFromTimeKt {
-	public static final fun frequency (Lcom/splendo/kaluga/scientific/unit/Frequency;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun frequency (Lcom/splendo/kaluga/scientific/unit/Frequency;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun frequency (Lcom/splendo/kaluga/scientific/unit/Frequency;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun frequency (Lcom/splendo/kaluga/scientific/unit/Frequency;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun frequencyFromInvertedTime (Lcom/splendo/kaluga/scientific/unit/Frequency;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun frequencyFromInvertedTimeDefault (Lcom/splendo/kaluga/scientific/unit/Frequency;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/frequency/ConvertToDecimalKt {
-	public static final fun frequencyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Ljava/math/BigDecimal;
+	public static final fun frequencyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/converter/frequency/ConvertToElectricConductanceKt {
@@ -3295,14 +3289,14 @@ public final class com/splendo/kaluga/scientific/converter/radioactivity/Convert
 }
 
 public final class com/splendo/kaluga/scientific/converter/radioactivity/ConvertFromTimeKt {
-	public static final fun radioactivity (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun radioactivity (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun radioactivity (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun radioactivity (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun radioactivityFromInvertedTime (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun radioactivityFromInvertedTimeDefault (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/radioactivity/ConvertToDecimalKt {
-	public static final fun radioactivityTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Ljava/math/BigDecimal;
+	public static final fun radioactivityTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/converter/solidAngle/ConvertFromIlluminanceAndLuminanceKt {
@@ -3767,8 +3761,8 @@ public final class com/splendo/kaluga/scientific/converter/time/ConvertFromForce
 }
 
 public final class com/splendo/kaluga/scientific/converter/time/ConvertFromFrequencyKt {
-	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeFromInvertedFrequency (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeFromInvertedFrequencyDefault (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
@@ -3804,8 +3798,8 @@ public final class com/splendo/kaluga/scientific/converter/time/ConvertFromMagne
 }
 
 public final class com/splendo/kaluga/scientific/converter/time/ConvertFromRadioactivityKt {
-	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeFromInvertedRadioactivity (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeFromInvertedRadioactivityDefault (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
@@ -3852,8 +3846,8 @@ public final class com/splendo/kaluga/scientific/converter/time/ConvertToAreaKt
 }
 
 public final class com/splendo/kaluga/scientific/converter/time/ConvertToDecimalKt {
-	public static final fun timeTimesFrequency (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Ljava/math/BigDecimal;
-	public static final fun timeTimesRadioactivity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Ljava/math/BigDecimal;
+	public static final fun timeTimesFrequency (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun timeTimesRadioactivity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/converter/time/ConvertToDynamicViscosityKt {
@@ -4567,74 +4561,74 @@ public final class com/splendo/kaluga/scientific/formatter/ScientificValueFormat
 
 public final class com/splendo/kaluga/scientific/unit/Abampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Abcoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abcoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Abfarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abfarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Abhenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abhenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Abohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Absiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Absiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/AbstractScientificUnit : com/splendo/kaluga/scientific/unit/ScientificUnit {
@@ -4649,26 +4643,26 @@ public final class com/splendo/kaluga/scientific/unit/AbstractScientificUnit$Com
 
 public final class com/splendo/kaluga/scientific/unit/Abvolt : com/splendo/kaluga/scientific/unit/Voltage {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Acceleration : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Acceleration$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Acceleration;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Acceleration;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public abstract fun getSpeed ()Lcom/splendo/kaluga/scientific/unit/Speed;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -4688,7 +4682,7 @@ public final class com/splendo/kaluga/scientific/unit/AccelerationUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Acre : com/splendo/kaluga/scientific/unit/ImperialArea {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Acre;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getACRES_IN_SQUARE_MILE ()D
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -4696,35 +4690,35 @@ public final class com/splendo/kaluga/scientific/unit/Acre : com/splendo/kaluga/
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/AcreFoot : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/AcreFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/AcreInch : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/AcreInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Action : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Action$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Action;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getEnergy ()Lcom/splendo/kaluga/scientific/unit/Energy;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Action;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getTime ()Lcom/splendo/kaluga/scientific/unit/Time;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Action;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -4754,19 +4748,19 @@ public final class com/splendo/kaluga/scientific/unit/AmountOfSubstance$Companio
 
 public final class com/splendo/kaluga/scientific/unit/AmountOfSubstanceUnitKt {
 	public static final fun getAmountOfSubstanceUnits ()Ljava/util/Set;
-	public static final fun getAvogadroConstant ()Ljava/math/BigDecimal;
+	public static final fun getAvogadroConstant ()Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Ampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Ampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/AmpereMultiple : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -4802,7 +4796,7 @@ public final class com/splendo/kaluga/scientific/unit/AngularAcceleration : com/
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/AngularVelocity;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/AngularAcceleration;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/AngularAcceleration;Lcom/splendo/kaluga/scientific/unit/AngularVelocity;Lcom/splendo/kaluga/scientific/unit/Time;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/AngularAcceleration;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getAngularVelocity ()Lcom/splendo/kaluga/scientific/unit/AngularVelocity;
 	public final fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AngularAcceleration;
@@ -4811,7 +4805,7 @@ public final class com/splendo/kaluga/scientific/unit/AngularAcceleration : com/
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/AngularAcceleration;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -4845,7 +4839,7 @@ public final class com/splendo/kaluga/scientific/unit/AngularVelocity : com/sple
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/Angle;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/AngularVelocity;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/AngularVelocity;Lcom/splendo/kaluga/scientific/unit/Angle;Lcom/splendo/kaluga/scientific/unit/Time;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/AngularVelocity;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getAngle ()Lcom/splendo/kaluga/scientific/unit/Angle;
 	public final fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AngularVelocity;
@@ -4854,7 +4848,7 @@ public final class com/splendo/kaluga/scientific/unit/AngularVelocity : com/sple
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/AngularVelocity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -4881,38 +4875,38 @@ public final class com/splendo/kaluga/scientific/unit/AngularVelocityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Apostilb : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Apostilb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ArcMinute : com/splendo/kaluga/scientific/unit/Angle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ArcMinute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ArcSecond : com/splendo/kaluga/scientific/unit/Angle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ArcSecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Area : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
@@ -4928,13 +4922,13 @@ public final class com/splendo/kaluga/scientific/unit/Area$Companion {
 public abstract class com/splendo/kaluga/scientific/unit/AreaDensity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/AreaDensity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$AreaDensity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Area;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AreaDensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/AreaDensity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -4962,26 +4956,26 @@ public final class com/splendo/kaluga/scientific/unit/AreaUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Atmosphere : com/splendo/kaluga/scientific/unit/MetricPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Atmosphere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Bar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Bar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/BarMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -4996,14 +4990,14 @@ public final class com/splendo/kaluga/scientific/unit/BarMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Barye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Barye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/BaryeMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5018,26 +5012,26 @@ public final class com/splendo/kaluga/scientific/unit/BaryeMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/BeatsPerMinute : com/splendo/kaluga/scientific/unit/Frequency {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BeatsPerMinute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Becquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Becquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/BecquerelMultiple : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5052,110 +5046,110 @@ public final class com/splendo/kaluga/scientific/unit/BecquerelMultiple$Companio
 
 public final class com/splendo/kaluga/scientific/unit/Biot : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Biot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Bril : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Bril;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/BritishThermalUnit : com/splendo/kaluga/scientific/unit/ImperialEnergy, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BritishThermalUnit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/BritishThermalUnit$Thermal : com/splendo/kaluga/scientific/unit/ImperialEnergy, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BritishThermalUnit$Thermal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/BritishThermalUnitPerHour : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BritishThermalUnitPerHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/BritishThermalUnitPerMinute : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BritishThermalUnitPerMinute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/BritishThermalUnitPerSecond : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BritishThermalUnitPerSecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Calorie : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/CalorieUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Calorie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Calorie$IT : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/CalorieUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Calorie$IT;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/CalorieMultiple : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5183,14 +5177,14 @@ public abstract interface class com/splendo/kaluga/scientific/unit/CalorieUnit :
 
 public final class com/splendo/kaluga/scientific/unit/Candela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Candela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/CandelaMultiple : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5219,548 +5213,548 @@ public final class com/splendo/kaluga/scientific/unit/CatalysticActivityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Celsius : com/splendo/kaluga/scientific/unit/MetricAndUKImperialTemperature {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Celsius;
-	public fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun deltaToSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun deltaFromSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun deltaToSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centi : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centidalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centidyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centielectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centierg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centifarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centigram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centigram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centigray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centigray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centihenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centihertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centijoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centikatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centilumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centilux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CentimeterOfWater : com/splendo/kaluga/scientific/unit/MetricPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CentimeterOfWater;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centimole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centinewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centinit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centipascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centirad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisteradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centitesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centitorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiturn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centivolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiwatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CentiwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CentiwattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Coulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Coulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/CoulombMultiple : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5775,204 +5769,204 @@ public final class com/splendo/kaluga/scientific/unit/CoulombMultiple$Companion
 
 public final class com/splendo/kaluga/scientific/unit/Cubic : com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/SystemScientificUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicCentimeter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicCentimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicDecameter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicDecameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicDecimeter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicDecimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicFoot : com/splendo/kaluga/scientific/unit/ImperialVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicGigameter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicGigameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicHectometer : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicHectometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicInch : com/splendo/kaluga/scientific/unit/ImperialVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicKilometer : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicKilometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicMegameter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicMegameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicMeter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicMeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicMicrometer : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicMicrometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicMile : com/splendo/kaluga/scientific/unit/ImperialVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicMile;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicMillimeter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicMillimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicNanometer : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicNanometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicYard : com/splendo/kaluga/scientific/unit/ImperialVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicYard;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Curie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Curie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/CurieMultiple : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5987,14 +5981,14 @@ public final class com/splendo/kaluga/scientific/unit/CurieMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Dalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Dalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/DaltonMultiple : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -6009,987 +6003,987 @@ public final class com/splendo/kaluga/scientific/unit/DaltonMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Deca : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decadalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decadyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decafarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decagram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decagray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decahenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decahertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decajoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decakatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decalumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decalux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decamole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decanewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decanewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decanit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decanit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decapascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decasiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decasievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decatesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decatorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decavolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decawatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DecawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DecawattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deci : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decidalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decidyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decielectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decierg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decifarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decigram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decigram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decigray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decigray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decihenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decihertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decijoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decikatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decilumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decilux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decimole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decinewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decinit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decipascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decirad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisteradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decitesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decitorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciturn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decivolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciwatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DeciwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DeciwattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue : com/splendo/kaluga/scientific/unit/DimensionlessScientificValue {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue$Companion;
 	public fun <init> (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
 	public synthetic fun <init> (IDLcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun <init> (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
+	public fun <init> (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
 	public final fun component1 ()D
 	public final fun component2 ()Lcom/splendo/kaluga/scientific/unit/ScientificUnit;
 	public final fun copy (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
@@ -7020,26 +7014,26 @@ public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScient
 
 public final class com/splendo/kaluga/scientific/unit/Degree : com/splendo/kaluga/scientific/unit/Angle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Degree;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Density : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Density$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Density;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Volume;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Density;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Density;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -7070,13 +7064,13 @@ public abstract class com/splendo/kaluga/scientific/unit/Dimensionless : com/spl
 }
 
 public final class com/splendo/kaluga/scientific/unit/Dimensionless$Companion {
+	public final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 	public final fun invoke (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public final fun invoke (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
 public abstract interface class com/splendo/kaluga/scientific/unit/DimensionlessScientificValue : com/splendo/kaluga/scientific/ScientificValue {
-	public fun getDecimalFraction ()Ljava/math/BigDecimal;
+	public fun getDecimalFraction ()Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DimensionlessUnitKt {
@@ -7086,21 +7080,21 @@ public final class com/splendo/kaluga/scientific/unit/DimensionlessUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Dram : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Dram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/DynamicViscosity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/DynamicViscosity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$DynamicViscosity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPressure ()Lcom/splendo/kaluga/scientific/unit/Pressure;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$DynamicViscosity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getTime ()Lcom/splendo/kaluga/scientific/unit/Time;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -7122,14 +7116,14 @@ public final class com/splendo/kaluga/scientific/unit/DynamicViscosityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Dyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Dyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/DyneMultiple : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -7229,14 +7223,14 @@ public final class com/splendo/kaluga/scientific/unit/ElectricResistanceUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Electronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Electronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ElectronvoltMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -7271,14 +7265,14 @@ public final class com/splendo/kaluga/scientific/unit/EnergyUnitKt {
 public final class com/splendo/kaluga/scientific/unit/Erg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field ERG_IN_JOULE I
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Erg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ErgMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -7293,35 +7287,35 @@ public final class com/splendo/kaluga/scientific/unit/ErgMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/ErgPerSecond : com/splendo/kaluga/scientific/unit/MetricPower, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ErgPerSecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Fahrenheit : com/splendo/kaluga/scientific/unit/USCustomaryTemperature {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Fahrenheit;
-	public fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun deltaToSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun deltaFromSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun deltaToSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Farad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Farad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/FaradMultiple : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -7336,89 +7330,89 @@ public final class com/splendo/kaluga/scientific/unit/FaradMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Foot : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Foot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootCandle : com/splendo/kaluga/scientific/unit/ImperialIlluminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootCandle;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootLambert : com/splendo/kaluga/scientific/unit/ImperialLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootLambert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootOfWater : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootOfWater;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootPoundForce : com/splendo/kaluga/scientific/unit/ImperialEnergy {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootPoundForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootPoundForcePerMinute : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootPoundForcePerMinute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootPoundForcePerSecond : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootPoundForcePerSecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootPoundal : com/splendo/kaluga/scientific/unit/ImperialEnergy {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootPoundal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Force : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
@@ -7457,530 +7451,530 @@ public final class com/splendo/kaluga/scientific/unit/FrequencyUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Gauss : com/splendo/kaluga/scientific/unit/MagneticInduction {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gauss;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Giga : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigadalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigadyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigafarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigagram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigagray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigahenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigahertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigajoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigakatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigalumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigalux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigamole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Giganewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Giganewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Giganit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Giganit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigapascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigasiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigasievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigatesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigatorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigavolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigawatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/GigawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GigawattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gradian : com/splendo/kaluga/scientific/unit/Angle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Grain : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Grain;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/GrainForce : com/splendo/kaluga/scientific/unit/ImperialForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GrainForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/GramForce : com/splendo/kaluga/scientific/unit/MetricForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GramForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/GramMultiple : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -7995,14 +7989,14 @@ public final class com/splendo/kaluga/scientific/unit/GramMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Gray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/GrayMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -8018,13 +8012,13 @@ public final class com/splendo/kaluga/scientific/unit/GrayMultiple$Companion {
 public abstract class com/splendo/kaluga/scientific/unit/HeatCapacity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/HeatCapacity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$HeatCapacity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getEnergy ()Lcom/splendo/kaluga/scientific/unit/Energy;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Temperature;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$HeatCapacity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/HeatCapacity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -8047,491 +8041,491 @@ public final class com/splendo/kaluga/scientific/unit/HeatCapacityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Hectare : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectare;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hecto : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/HectoDalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoDalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/HectoOhm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoOhm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectoampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectodyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectoelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectoerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectofarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectogram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectogray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectohenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectohertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectojoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectokatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectoliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectolumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectolux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectomole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectonewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectonit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectopascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectophot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectorad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectosiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectosievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectotesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectotorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectovolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectovolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectowatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/HectowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectowattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectoweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Henry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Henry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/HenryMultiple : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -8546,13 +8540,13 @@ public final class com/splendo/kaluga/scientific/unit/HenryMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Hertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/HertzMultiple : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -8567,38 +8561,38 @@ public final class com/splendo/kaluga/scientific/unit/HertzMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Horsepower : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Horsepower;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/HorsepowerHour : com/splendo/kaluga/scientific/unit/ImperialEnergy {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HorsepowerHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hour : com/splendo/kaluga/scientific/unit/Time {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Illuminance : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
@@ -8817,18 +8811,18 @@ public final class com/splendo/kaluga/scientific/unit/ImperialEnergy$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/ImperialFluidDram : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialFluidDram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ImperialFluidOunce : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialFluidOunce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialForce : com/splendo/kaluga/scientific/unit/Force, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
@@ -8847,10 +8841,10 @@ public final class com/splendo/kaluga/scientific/unit/ImperialForce$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/ImperialGallon : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialGallon;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialIlluminance : com/splendo/kaluga/scientific/unit/Illuminance, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
@@ -9072,7 +9066,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialE
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper;Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getMetricAndImperialEnergy ()Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -9080,7 +9074,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialE
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -9108,7 +9102,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialP
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper;Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getMetricAndImperialPower ()Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -9116,7 +9110,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialP
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -9353,10 +9347,10 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMomentum$Companion
 
 public final class com/splendo/kaluga/scientific/unit/ImperialPint : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialPint;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialPower : com/splendo/kaluga/scientific/unit/Power, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
@@ -9385,10 +9379,10 @@ public final class com/splendo/kaluga/scientific/unit/ImperialPressure$Companion
 
 public final class com/splendo/kaluga/scientific/unit/ImperialQuart : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialQuart;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract interface class com/splendo/kaluga/scientific/unit/ImperialScientificUnit : com/splendo/kaluga/scientific/unit/MeasurementUsage$UsedInImperial, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
@@ -9541,33 +9535,33 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSurfaceTension$Com
 
 public final class com/splendo/kaluga/scientific/unit/ImperialTon : com/splendo/kaluga/scientific/unit/UKImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialTon;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ImperialTonForce : com/splendo/kaluga/scientific/unit/UKImperialForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialTonForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ImperialTonSquareFoot : com/splendo/kaluga/scientific/unit/UKImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialTonSquareFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ImperialTonSquareInch : com/splendo/kaluga/scientific/unit/UKImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialTonSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialVolume : com/splendo/kaluga/scientific/unit/Volume, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
@@ -9707,73 +9701,73 @@ public final class com/splendo/kaluga/scientific/unit/ImperialYank$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Inch : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Inch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchOfMercury : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchOfMercury;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchOfWater : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchOfWater;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchOunceForce : com/splendo/kaluga/scientific/unit/ImperialEnergy {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchOunceForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchPoundForce : com/splendo/kaluga/scientific/unit/ImperialEnergy {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchPoundForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchPoundForcePerMinute : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchPoundForcePerMinute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchPoundForcePerSecond : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchPoundForcePerSecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
@@ -9807,13 +9801,13 @@ public final class com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalen
 public abstract class com/splendo/kaluga/scientific/unit/Jolt : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Jolt$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Jolt;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getAcceleration ()Lcom/splendo/kaluga/scientific/unit/Acceleration;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Jolt;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Jolt;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -9832,14 +9826,14 @@ public final class com/splendo/kaluga/scientific/unit/JoltUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Joule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Joule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/JouleMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -9854,14 +9848,14 @@ public final class com/splendo/kaluga/scientific/unit/JouleMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Katal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Katal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/KatalMultiple : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -9876,532 +9870,532 @@ public final class com/splendo/kaluga/scientific/unit/KatalMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Kelvin : com/splendo/kaluga/scientific/unit/MetricAndUKImperialTemperature {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kelvin;
-	public fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun deltaToSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun deltaFromSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun deltaToSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilo : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KiloPoundSquareInch : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KiloPoundSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilocalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocalorie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilocalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocalorie$IT;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilodalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilodalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilodyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilofarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilogram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KilogramForce : com/splendo/kaluga/scientific/unit/MetricForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KilogramForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilogray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilohenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilohertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilojoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilokatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilolumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilolux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilomole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilonewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilonit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilopascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilophot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilorad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilosiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilosievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilotesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilotorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilovolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilovolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilowatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KilowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KilowattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/KinematicViscosity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/KinematicViscosity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$KinematicViscosity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getArea ()Lcom/splendo/kaluga/scientific/unit/Area;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$KinematicViscosity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getTime ()Lcom/splendo/kaluga/scientific/unit/Time;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -10420,38 +10414,38 @@ public final class com/splendo/kaluga/scientific/unit/KinematicViscosityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Kip : com/splendo/kaluga/scientific/unit/USCustomaryForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kip;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KipSquareFoot : com/splendo/kaluga/scientific/unit/USCustomaryPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KipSquareFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KipSquareInch : com/splendo/kaluga/scientific/unit/USCustomaryPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KipSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Lambert : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Lambert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Length : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
@@ -10473,13 +10467,13 @@ public final class com/splendo/kaluga/scientific/unit/LengthUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/LinearMassDensity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/LinearMassDensity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$LinearMassDensity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Length;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LinearMassDensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LinearMassDensity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -10501,14 +10495,14 @@ public final class com/splendo/kaluga/scientific/unit/LinearMassDensityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Liter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Liter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/LiterMultiple : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -10523,14 +10517,14 @@ public final class com/splendo/kaluga/scientific/unit/LiterMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Lumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Lumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/LumenMultiple : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -10568,7 +10562,7 @@ public final class com/splendo/kaluga/scientific/unit/LuminousEnergy : com/splen
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/LuminousFlux;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/LuminousEnergy;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/LuminousEnergy;Lcom/splendo/kaluga/scientific/unit/LuminousFlux;Lcom/splendo/kaluga/scientific/unit/Time;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/LuminousEnergy;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getLuminousFlux ()Lcom/splendo/kaluga/scientific/unit/LuminousFlux;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousEnergy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -10577,7 +10571,7 @@ public final class com/splendo/kaluga/scientific/unit/LuminousEnergy : com/splen
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun getTime ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LuminousEnergy;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -10606,13 +10600,13 @@ public abstract class com/splendo/kaluga/scientific/unit/LuminousExposure : com/
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/LuminousExposure$Companion;
 	public fun <init> ()V
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousExposure;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getIlluminance ()Lcom/splendo/kaluga/scientific/unit/Illuminance;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousExposure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getTime ()Lcom/splendo/kaluga/scientific/unit/Time;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LuminousExposure;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -10658,14 +10652,14 @@ public final class com/splendo/kaluga/scientific/unit/LuminousIntensityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Lux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Lux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/LuxMultiple : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -10709,13 +10703,13 @@ public final class com/splendo/kaluga/scientific/unit/MagneticInductionUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/MassFlowRate : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MassFlowRate$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$MassFlowRate;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MassFlowRate;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MassFlowRate;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -10737,14 +10731,14 @@ public final class com/splendo/kaluga/scientific/unit/MassFlowRateUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Maxwell : com/splendo/kaluga/scientific/unit/MagneticFlux {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Maxwell;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/MeasurementSystem : com/splendo/kaluga/scientific/unit/MeasurementUsage, java/io/Serializable {
@@ -10810,503 +10804,503 @@ public abstract interface class com/splendo/kaluga/scientific/unit/MeasurementUs
 
 public final class com/splendo/kaluga/scientific/unit/Mega : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megacalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacalorie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megacalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacalorie$IT;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megadalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megadyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megafarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megagram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megagray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megahenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megahertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megajoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megakatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megalumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megalux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megamole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Meganewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Meganewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Meganit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Meganit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megapascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megasiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megasievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megatesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megatorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megavolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megawatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MegawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MegawattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Meter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Meter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/MeterMultiple : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -11624,10 +11618,10 @@ public abstract interface class com/splendo/kaluga/scientific/unit/MetricBaseUni
 
 public final class com/splendo/kaluga/scientific/unit/MetricCup : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricCup;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MetricDensity : com/splendo/kaluga/scientific/unit/Density, com/splendo/kaluga/scientific/unit/MetricScientificUnit {
@@ -11756,14 +11750,14 @@ public final class com/splendo/kaluga/scientific/unit/MetricHeatCapacity$Compani
 
 public final class com/splendo/kaluga/scientific/unit/MetricHorsepower : com/splendo/kaluga/scientific/unit/MetricPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricHorsepower;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/MetricIlluminance : com/splendo/kaluga/scientific/unit/Illuminance, com/splendo/kaluga/scientific/unit/MetricScientificUnit {
@@ -11975,7 +11969,7 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialEne
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper;Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getMetricAndImperialEnergy ()Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -11983,7 +11977,7 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialEne
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -12011,7 +12005,7 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialPow
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper;Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getMetricAndImperialPower ()Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -12019,7 +12013,7 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialPow
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -12604,1119 +12598,1119 @@ public final class com/splendo/kaluga/scientific/unit/MetricYank$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Micro : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microbar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microbarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microbecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microcandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microcoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microcurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microdalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microdalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microdyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microdyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microfarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microfarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microgram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microgram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microgray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microgray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microhenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microhenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microhertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microhertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microjoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microjoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microkatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microkatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microlumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microlumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microlux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microlux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Micrometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micrometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Micromole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micromole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Micronewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micronewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Micronit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micronit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Micropascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micropascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microrad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microrad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microsecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microsiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microsievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microsteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsteradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microtesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microtesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microtorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microtorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microturn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microvolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microwatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MicrowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MicrowattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Mile : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Mile;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milli : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millicalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicalorie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millicalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicalorie$IT;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millidalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millidyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millielectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millierg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millifarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milligram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milligram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MilligramForce : com/splendo/kaluga/scientific/unit/MetricForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MilligramForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milligray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milligray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millihenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millihertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millijoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millikatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millilumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millilux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MillimeterOfMercury : com/splendo/kaluga/scientific/unit/MetricPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MillimeterOfMercury;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MillimeterOfWater : com/splendo/kaluga/scientific/unit/MetricPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MillimeterOfWater;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millimole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millinewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millinit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millipascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millirad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisteradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millitesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millitorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliturn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millivolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliwatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MilliwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MilliwattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Minute : com/splendo/kaluga/scientific/unit/Time {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Minute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Molality : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Molality$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Molality;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getAmountOfSubstance ()Lcom/splendo/kaluga/scientific/unit/AmountOfSubstance;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Weight;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Molality;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Molality;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13739,13 +13733,13 @@ public final class com/splendo/kaluga/scientific/unit/MolalityUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/MolarEnergy : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MolarEnergy$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$MolarEnergy;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getEnergy ()Lcom/splendo/kaluga/scientific/unit/Energy;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/AmountOfSubstance;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MolarEnergy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MolarEnergy;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13766,13 +13760,13 @@ public final class com/splendo/kaluga/scientific/unit/MolarEnergyUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/MolarMass : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MolarMass$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$MolarMass;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/AmountOfSubstance;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MolarMass;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MolarMass;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13795,13 +13789,13 @@ public final class com/splendo/kaluga/scientific/unit/MolarMassUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/MolarVolume : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MolarVolume$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$MolarVolume;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/AmountOfSubstance;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MolarVolume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getVolume ()Lcom/splendo/kaluga/scientific/unit/Volume;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MolarVolume;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13824,13 +13818,13 @@ public final class com/splendo/kaluga/scientific/unit/MolarVolumeUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/Molarity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Molarity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Molarity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getAmountOfSubstance ()Lcom/splendo/kaluga/scientific/unit/AmountOfSubstance;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Volume;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Molarity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Molarity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13852,14 +13846,14 @@ public final class com/splendo/kaluga/scientific/unit/MolarityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Mole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Mole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/MoleMultiple : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -13875,13 +13869,13 @@ public final class com/splendo/kaluga/scientific/unit/MoleMultiple$Companion {
 public abstract class com/splendo/kaluga/scientific/unit/Momentum : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Momentum$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Momentum;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getMass ()Lcom/splendo/kaluga/scientific/unit/Weight;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Momentum;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public abstract fun getSpeed ()Lcom/splendo/kaluga/scientific/unit/Speed;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Momentum;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13903,539 +13897,539 @@ public final class com/splendo/kaluga/scientific/unit/MomentumUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Nano : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanodalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanodalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanodyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanofarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanogram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanogray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanohenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanohertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanojoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanokatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanolumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanolux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanomole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanonewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanonit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanopascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanophot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanorad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanosecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanosteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosteradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanotesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanotorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoturn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanovolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanovolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanowatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/NanowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/NanowattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/NauticalMile : com/splendo/kaluga/scientific/unit/MetricLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/NauticalMile;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Newton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Newton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/NewtonMultiple : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14450,14 +14444,14 @@ public final class com/splendo/kaluga/scientific/unit/NewtonMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Nit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/NitMultiple : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14472,14 +14466,14 @@ public final class com/splendo/kaluga/scientific/unit/NitMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Ohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Ohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/OhmMultiple : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14495,49 +14489,49 @@ public final class com/splendo/kaluga/scientific/unit/OhmMultiple$Companion {
 public final class com/splendo/kaluga/scientific/unit/One : com/splendo/kaluga/scientific/unit/Dimensionless {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/One;
 	public static final field UNIT_VALUE D
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Dimensionless;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Ounce : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Ounce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/OunceForce : com/splendo/kaluga/scientific/unit/ImperialForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/OunceForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/OunceSquareInch : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/OunceSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Pascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Pascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/PascalMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14553,39 +14547,39 @@ public final class com/splendo/kaluga/scientific/unit/PascalMultiple$Companion {
 public final class com/splendo/kaluga/scientific/unit/Percent : com/splendo/kaluga/scientific/unit/Dimensionless {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Percent;
 	public static final field PARTS_PER_HUNDRED D
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Dimensionless;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Permill : com/splendo/kaluga/scientific/unit/Dimensionless {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Permill;
 	public static final field PARTS_PER_THOUSAND D
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Dimensionless;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Phot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Phot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/PhotMultiple : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14600,41 +14594,41 @@ public final class com/splendo/kaluga/scientific/unit/PhotMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Pound : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Pound;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/PoundForce : com/splendo/kaluga/scientific/unit/ImperialForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/PoundForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/PoundSquareFoot : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/PoundSquareFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/PoundSquareInch : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/PoundSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Poundal : com/splendo/kaluga/scientific/unit/ImperialForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Poundal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Power : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
@@ -14679,14 +14673,14 @@ public final class com/splendo/kaluga/scientific/unit/PressureUnitKt {
 public final class com/splendo/kaluga/scientific/unit/Rad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field GRAY_IN_RAD D
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Rad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/RadMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14701,14 +14695,14 @@ public final class com/splendo/kaluga/scientific/unit/RadMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Radian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Radian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/RadianMultiple : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14737,24 +14731,24 @@ public final class com/splendo/kaluga/scientific/unit/RadioactivityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Rankine : com/splendo/kaluga/scientific/unit/USCustomaryTemperature {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Rankine;
-	public fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun deltaToSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun deltaFromSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun deltaToSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/RoentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/RoentgenEquivalentMan;
 	public static final field SIEVERT_IN_REM D
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14769,44 +14763,44 @@ public final class com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMulti
 
 public final class com/splendo/kaluga/scientific/unit/Rutherford : com/splendo/kaluga/scientific/unit/Radioactivity {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Rutherford;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract interface class com/splendo/kaluga/scientific/unit/ScientificUnit : com/splendo/kaluga/scientific/unit/MeasurementUsage, java/io/Serializable {
-	public abstract fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public abstract fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public abstract fun getSymbol ()Ljava/lang/String;
 	public abstract fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public abstract fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public abstract fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ScientificUnitKt {
+	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)D
 	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)D
-	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Ljava/math/BigDecimal;
-	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/BigDecimal;
+	public static synthetic fun convert$default (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static synthetic fun convert$default (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)D
-	public static synthetic fun convert$default (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Ljava/math/BigDecimal;
 	public static final fun getUnits ()Ljava/util/Set;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Second : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Second;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SecondMultiple : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14821,14 +14815,14 @@ public final class com/splendo/kaluga/scientific/unit/SecondMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Siemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Siemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SiemensMultiple : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14843,14 +14837,14 @@ public final class com/splendo/kaluga/scientific/unit/SiemensMultiple$Companion
 
 public final class com/splendo/kaluga/scientific/unit/Sievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Sievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SievertMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14865,21 +14859,21 @@ public final class com/splendo/kaluga/scientific/unit/SievertMultiple$Companion
 
 public final class com/splendo/kaluga/scientific/unit/Skot : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Skot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Slug : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Slug;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SolidAngle : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
@@ -14898,26 +14892,26 @@ public final class com/splendo/kaluga/scientific/unit/SolidAngleUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Spat : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Spat;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SpecificEnergy : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SpecificEnergy$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificEnergy;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getEnergy ()Lcom/splendo/kaluga/scientific/unit/Energy;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Weight;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificEnergy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -14944,13 +14938,13 @@ public final class com/splendo/kaluga/scientific/unit/SpecificEnergyUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/SpecificHeatCapacity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SpecificHeatCapacity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificHeatCapacity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getHeatCapacity ()Lcom/splendo/kaluga/scientific/unit/HeatCapacity;
 	public abstract fun getPerWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificHeatCapacity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SpecificHeatCapacity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -14981,13 +14975,13 @@ public final class com/splendo/kaluga/scientific/unit/SpecificHeatCapacityUnitKt
 public abstract class com/splendo/kaluga/scientific/unit/SpecificVolume : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SpecificVolume$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificVolume;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Weight;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificVolume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getVolume ()Lcom/splendo/kaluga/scientific/unit/Volume;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SpecificVolume;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -15014,13 +15008,13 @@ public final class com/splendo/kaluga/scientific/unit/SpecificVolumeUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/Speed : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Speed$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Speed;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getDistance ()Lcom/splendo/kaluga/scientific/unit/Length;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Speed;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Speed;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -15040,216 +15034,216 @@ public final class com/splendo/kaluga/scientific/unit/SpeedUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Square : com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/SystemScientificUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareCentimeter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareCentimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareDecameter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareDecameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareDecimeter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareDecimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareDegree : com/splendo/kaluga/scientific/unit/SolidAngle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareDegree;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareFoot : com/splendo/kaluga/scientific/unit/ImperialArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareGigameter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareGigameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareHectometer : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareHectometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareInch : com/splendo/kaluga/scientific/unit/ImperialArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareKilometer : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareKilometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareMegameter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareMegameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareMeter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareMeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareMicrometer : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareMicrometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareMile : com/splendo/kaluga/scientific/unit/ImperialArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareMile;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareMillimeter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareMillimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareNanometer : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareNanometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareYard : com/splendo/kaluga/scientific/unit/ImperialArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareYard;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Steradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Steradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SteradianMultiple : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -15264,33 +15258,33 @@ public final class com/splendo/kaluga/scientific/unit/SteradianMultiple$Companio
 
 public final class com/splendo/kaluga/scientific/unit/Stilb : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Stilb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Stone : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Stone;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SurfaceTension : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SurfaceTension$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$SurfaceTension;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getForce ()Lcom/splendo/kaluga/scientific/unit/Force;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Length;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SurfaceTension;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SurfaceTension;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -15317,8 +15311,8 @@ public abstract interface class com/splendo/kaluga/scientific/unit/SystemScienti
 public abstract class com/splendo/kaluga/scientific/unit/Temperature : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Temperature$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Temperature;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public abstract fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public abstract fun deltaToSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public abstract fun deltaFromSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public abstract fun deltaToSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Temperature;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Temperature;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
@@ -15329,9 +15323,9 @@ public final class com/splendo/kaluga/scientific/unit/Temperature$Companion {
 }
 
 public final class com/splendo/kaluga/scientific/unit/TemperatureUnitKt {
+	public static final fun convertDelta (Lcom/splendo/kaluga/scientific/unit/Temperature;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/Temperature;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun convertDelta (Lcom/splendo/kaluga/scientific/unit/Temperature;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/Temperature;)D
 	public static final fun convertDelta (Lcom/splendo/kaluga/scientific/unit/Temperature;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/Temperature;ILcom/splendo/kaluga/base/utils/RoundingMode;)D
-	public static final fun convertDelta (Lcom/splendo/kaluga/scientific/unit/Temperature;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/Temperature;)Ljava/math/BigDecimal;
 	public static synthetic fun convertDelta$default (Lcom/splendo/kaluga/scientific/unit/Temperature;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/Temperature;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)D
 	public static final fun getMetricAndUkImperialTemperatureUnits ()Ljava/util/Set;
 	public static final fun getTemperatureUnits ()Ljava/util/Set;
@@ -15340,14 +15334,14 @@ public final class com/splendo/kaluga/scientific/unit/TemperatureUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Tesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Tesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/TeslaMultiple : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -15363,13 +15357,13 @@ public final class com/splendo/kaluga/scientific/unit/TeslaMultiple$Companion {
 public abstract class com/splendo/kaluga/scientific/unit/ThermalResistance : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ThermalResistance$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$ThermalResistance;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Power;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ThermalResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getTemperature ()Lcom/splendo/kaluga/scientific/unit/Temperature;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ThermalResistance;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -15406,38 +15400,38 @@ public final class com/splendo/kaluga/scientific/unit/TimeUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Tonne : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Tonne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/TonneForce : com/splendo/kaluga/scientific/unit/MetricForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/TonneForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Torr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Torr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/TorrMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -15452,14 +15446,14 @@ public final class com/splendo/kaluga/scientific/unit/TorrMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Turn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Turn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/TurnMultiple : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -15633,11 +15627,11 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialForceWra
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialForce;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialForce;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialForce;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -15665,11 +15659,11 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWr
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialVolume;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialVolume;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialVolume;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -15697,10 +15691,10 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialWeightWr
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -15982,11 +15976,11 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialPressureWrapper
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialPressure;)Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialPressure;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialPressure;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -16478,11 +16472,11 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialForceWr
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialForce;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialForce;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialForce;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -16510,11 +16504,11 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialPressur
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialPressure;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialPressure;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialPressure;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -16542,11 +16536,11 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeW
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialVolume;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialVolume;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialVolume;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -16574,10 +16568,10 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialWeightW
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -17178,101 +17172,101 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryYank$Companion
 
 public final class com/splendo/kaluga/scientific/unit/USTonSquareFoot : com/splendo/kaluga/scientific/unit/USCustomaryPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USTonSquareFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/USTonSquareInch : com/splendo/kaluga/scientific/unit/USCustomaryPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USTonSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsCustomaryCup : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsCustomaryCup;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsFluidDram : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsFluidDram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsFluidOunce : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsFluidOunce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsLegalCup : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsLegalCup;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsLiquidGallon : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsLiquidGallon;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsLiquidPint : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsLiquidPint;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsLiquidQuart : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsLiquidQuart;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsTon : com/splendo/kaluga/scientific/unit/USCustomaryWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsTon;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsTonForce : com/splendo/kaluga/scientific/unit/USCustomaryForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsTonForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Volt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Volt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/VoltMultiple : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -17322,13 +17316,13 @@ public final class com/splendo/kaluga/scientific/unit/VolumeUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/VolumetricFlow : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/VolumetricFlow$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$VolumetricFlow;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$VolumetricFlow;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getVolume ()Lcom/splendo/kaluga/scientific/unit/Volume;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/VolumetricFlow;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -17351,13 +17345,13 @@ public final class com/splendo/kaluga/scientific/unit/VolumetricFlowUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/VolumetricFlux : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/VolumetricFlux$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$VolumetricFlux;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Area;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$VolumetricFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getVolumetricFlow ()Lcom/splendo/kaluga/scientific/unit/VolumetricFlow;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/VolumetricFlux;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -17379,26 +17373,26 @@ public final class com/splendo/kaluga/scientific/unit/VolumetricFluxUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Watt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Watt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/WattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/WattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/WattHourMultiple : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -17423,14 +17417,14 @@ public final class com/splendo/kaluga/scientific/unit/WattMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Weber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Weber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/WeberMultiple : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -17466,13 +17460,13 @@ public final class com/splendo/kaluga/scientific/unit/WeightUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/Yank : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Yank$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Yank;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getForce ()Lcom/splendo/kaluga/scientific/unit/Force;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Yank;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Yank;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -17494,8 +17488,8 @@ public final class com/splendo/kaluga/scientific/unit/YankUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Yard : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Yard;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
diff --git a/scientific/api/jvm/scientific.api b/scientific/api/jvm/scientific.api
index 0acd1b732..894465e4c 100644
--- a/scientific/api/jvm/scientific.api
+++ b/scientific/api/jvm/scientific.api
@@ -53,7 +53,7 @@ public final class com/splendo/kaluga/scientific/DefaultScientificValue : com/sp
 	public static final field Companion Lcom/splendo/kaluga/scientific/DefaultScientificValue$Companion;
 	public fun <init> (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
 	public synthetic fun <init> (IDLcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun <init> (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
+	public fun <init> (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
 	public fun compareTo (Lcom/splendo/kaluga/scientific/ScientificValue;)I
 	public synthetic fun compareTo (Ljava/lang/Object;)I
 	public final fun component1 ()D
@@ -61,7 +61,7 @@ public final class com/splendo/kaluga/scientific/DefaultScientificValue : com/sp
 	public final fun copy (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/DefaultScientificValue;DLcom/splendo/kaluga/scientific/unit/ScientificUnit;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getDecimalValue ()Ljava/math/BigDecimal;
+	public fun getDecimalValue ()Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getUnit ()Lcom/splendo/kaluga/scientific/unit/ScientificUnit;
 	public fun getValue ()Ljava/lang/Double;
 	public synthetic fun getValue ()Ljava/lang/Number;
@@ -501,14 +501,14 @@ public final class com/splendo/kaluga/scientific/ScientificArrayKt {
 
 public abstract interface class com/splendo/kaluga/scientific/ScientificValue : java/io/Serializable, java/lang/Comparable {
 	public abstract fun compareTo (Lcom/splendo/kaluga/scientific/ScientificValue;)I
-	public abstract fun getDecimalValue ()Ljava/math/BigDecimal;
+	public abstract fun getDecimalValue ()Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getUnit ()Lcom/splendo/kaluga/scientific/unit/ScientificUnit;
 	public abstract fun getValue ()Ljava/lang/Number;
 }
 
 public final class com/splendo/kaluga/scientific/ScientificValue$DefaultImpls {
 	public static fun compareTo (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)I
-	public static fun getDecimalValue (Lcom/splendo/kaluga/scientific/ScientificValue;)Ljava/math/BigDecimal;
+	public static fun getDecimalValue (Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/ScientificValueKt {
@@ -518,41 +518,41 @@ public final class com/splendo/kaluga/scientific/ScientificValueKt {
 	public static final fun convert (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static synthetic fun convert$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static synthetic fun convert$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Ljava/math/BigDecimal;
-	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/BigDecimal;
-	public static synthetic fun convertValue$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Ljava/math/BigDecimal;
+	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static synthetic fun convertValue$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/lang/Number;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun div (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun invoke (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun invoke (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun invoke (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun invoke (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/lang/Number;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun minus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun minus (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun minus (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun minus (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun minus (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/lang/Number;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun plus (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/lang/Number;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun times (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun times (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public abstract interface class com/splendo/kaluga/scientific/ShortScientificArray : com/splendo/kaluga/scientific/ScientificArray {
@@ -569,12 +569,6 @@ public final class com/splendo/kaluga/scientific/ShortScientificArray$DefaultImp
 	public static fun iterator (Lcom/splendo/kaluga/scientific/ShortScientificArray;)Ljava/util/Iterator;
 }
 
-public final class com/splendo/kaluga/scientific/converter/ScientificConverterException : java/lang/ArithmeticException {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
 public final class com/splendo/kaluga/scientific/converter/acceleration/ConvertFromForceAndMassKt {
 	public static final fun accelerationFromForceAndMass (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun accelerationFromForceAndMassDefault (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1062,26 +1056,26 @@ public final class com/splendo/kaluga/scientific/converter/catalysticActivity/Co
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertFromDimensionlessKt {
-	public static final fun div (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Ljava/math/BigDecimal;
-	public static final fun times (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Ljava/math/BigDecimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertToFrequencyKt {
-	public static final fun decimalDivMinute (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun decimalDivTime (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivMinute (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivTime (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivMinute (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivTime (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertToRadioactivityKt {
-	public static final fun decimalDivTime (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivTime (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivTime (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertToTimeKt {
-	public static final fun decimalDivBPM (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun decimalDivFrequency (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun decimalDivRadioactivity (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivBPM (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivFrequency (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun decimalDivRadioactivity (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivBPM (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivFrequency (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun numberDivRadioactivity (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/ScientificValue;
@@ -1210,10 +1204,10 @@ public final class com/splendo/kaluga/scientific/converter/dimensionless/Convert
 }
 
 public final class com/splendo/kaluga/scientific/converter/dimensionless/ConvertToDecimalKt {
-	public static final fun convertToOneByDividing (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
-	public static final fun convertToOneByMultiplying (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Ljava/math/BigDecimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
-	public static final fun div (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Ljava/math/BigDecimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
+	public static final fun convertToOneByDividing (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
+	public static final fun convertToOneByMultiplying (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
+	public static final fun div (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertFromKinematicViscosityAndDensityKt {
@@ -2058,14 +2052,14 @@ public final class com/splendo/kaluga/scientific/converter/frequency/ConvertFrom
 }
 
 public final class com/splendo/kaluga/scientific/converter/frequency/ConvertFromTimeKt {
-	public static final fun frequency (Lcom/splendo/kaluga/scientific/unit/Frequency;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun frequency (Lcom/splendo/kaluga/scientific/unit/Frequency;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun frequency (Lcom/splendo/kaluga/scientific/unit/Frequency;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun frequency (Lcom/splendo/kaluga/scientific/unit/Frequency;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun frequencyFromInvertedTime (Lcom/splendo/kaluga/scientific/unit/Frequency;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun frequencyFromInvertedTimeDefault (Lcom/splendo/kaluga/scientific/unit/Frequency;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/frequency/ConvertToDecimalKt {
-	public static final fun frequencyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Ljava/math/BigDecimal;
+	public static final fun frequencyTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/converter/frequency/ConvertToElectricConductanceKt {
@@ -3347,14 +3341,14 @@ public final class com/splendo/kaluga/scientific/converter/radioactivity/Convert
 }
 
 public final class com/splendo/kaluga/scientific/converter/radioactivity/ConvertFromTimeKt {
-	public static final fun radioactivity (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun radioactivity (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun radioactivity (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun radioactivity (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun radioactivityFromInvertedTime (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun radioactivityFromInvertedTimeDefault (Lcom/splendo/kaluga/scientific/unit/Radioactivity;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/radioactivity/ConvertToDecimalKt {
-	public static final fun radioactivityTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Ljava/math/BigDecimal;
+	public static final fun radioactivityTimesTime (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/converter/solidAngle/ConvertFromIlluminanceAndLuminanceKt {
@@ -3819,8 +3813,8 @@ public final class com/splendo/kaluga/scientific/converter/time/ConvertFromForce
 }
 
 public final class com/splendo/kaluga/scientific/converter/time/ConvertFromFrequencyKt {
-	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeFromInvertedFrequency (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeFromInvertedFrequencyDefault (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
@@ -3856,8 +3850,8 @@ public final class com/splendo/kaluga/scientific/converter/time/ConvertFromMagne
 }
 
 public final class com/splendo/kaluga/scientific/converter/time/ConvertFromRadioactivityKt {
-	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun time (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeFromInvertedRadioactivity (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun timeFromInvertedRadioactivityDefault (Lcom/splendo/kaluga/scientific/unit/Time;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
@@ -3904,8 +3898,8 @@ public final class com/splendo/kaluga/scientific/converter/time/ConvertToAreaKt
 }
 
 public final class com/splendo/kaluga/scientific/converter/time/ConvertToDecimalKt {
-	public static final fun timeTimesFrequency (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Ljava/math/BigDecimal;
-	public static final fun timeTimesRadioactivity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Ljava/math/BigDecimal;
+	public static final fun timeTimesFrequency (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun timeTimesRadioactivity (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/converter/time/ConvertToDynamicViscosityKt {
@@ -4619,74 +4613,74 @@ public final class com/splendo/kaluga/scientific/formatter/ScientificValueFormat
 
 public final class com/splendo/kaluga/scientific/unit/Abampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Abcoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abcoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Abfarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abfarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Abhenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abhenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Abohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Absiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Absiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/AbstractScientificUnit : com/splendo/kaluga/scientific/unit/ScientificUnit {
@@ -4701,26 +4695,26 @@ public final class com/splendo/kaluga/scientific/unit/AbstractScientificUnit$Com
 
 public final class com/splendo/kaluga/scientific/unit/Abvolt : com/splendo/kaluga/scientific/unit/Voltage {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Abvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Acceleration : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Acceleration$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Acceleration;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Acceleration;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public abstract fun getSpeed ()Lcom/splendo/kaluga/scientific/unit/Speed;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -4740,7 +4734,7 @@ public final class com/splendo/kaluga/scientific/unit/AccelerationUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Acre : com/splendo/kaluga/scientific/unit/ImperialArea {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Acre;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getACRES_IN_SQUARE_MILE ()D
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -4748,35 +4742,35 @@ public final class com/splendo/kaluga/scientific/unit/Acre : com/splendo/kaluga/
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/AcreFoot : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/AcreFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/AcreInch : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/AcreInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Action : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Action$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Action;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getEnergy ()Lcom/splendo/kaluga/scientific/unit/Energy;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Action;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getTime ()Lcom/splendo/kaluga/scientific/unit/Time;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Action;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -4806,19 +4800,19 @@ public final class com/splendo/kaluga/scientific/unit/AmountOfSubstance$Companio
 
 public final class com/splendo/kaluga/scientific/unit/AmountOfSubstanceUnitKt {
 	public static final fun getAmountOfSubstanceUnits ()Ljava/util/Set;
-	public static final fun getAvogadroConstant ()Ljava/math/BigDecimal;
+	public static final fun getAvogadroConstant ()Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Ampere : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Ampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/AmpereMultiple : com/splendo/kaluga/scientific/unit/ElectricCurrent, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -4854,7 +4848,7 @@ public final class com/splendo/kaluga/scientific/unit/AngularAcceleration : com/
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/AngularVelocity;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/AngularAcceleration;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/AngularAcceleration;Lcom/splendo/kaluga/scientific/unit/AngularVelocity;Lcom/splendo/kaluga/scientific/unit/Time;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/AngularAcceleration;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getAngularVelocity ()Lcom/splendo/kaluga/scientific/unit/AngularVelocity;
 	public final fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AngularAcceleration;
@@ -4863,7 +4857,7 @@ public final class com/splendo/kaluga/scientific/unit/AngularAcceleration : com/
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/AngularAcceleration;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -4897,7 +4891,7 @@ public final class com/splendo/kaluga/scientific/unit/AngularVelocity : com/sple
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/Angle;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/AngularVelocity;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/AngularVelocity;Lcom/splendo/kaluga/scientific/unit/Angle;Lcom/splendo/kaluga/scientific/unit/Time;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/AngularVelocity;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getAngle ()Lcom/splendo/kaluga/scientific/unit/Angle;
 	public final fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AngularVelocity;
@@ -4906,7 +4900,7 @@ public final class com/splendo/kaluga/scientific/unit/AngularVelocity : com/sple
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/AngularVelocity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -4933,38 +4927,38 @@ public final class com/splendo/kaluga/scientific/unit/AngularVelocityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Apostilb : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Apostilb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ArcMinute : com/splendo/kaluga/scientific/unit/Angle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ArcMinute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ArcSecond : com/splendo/kaluga/scientific/unit/Angle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ArcSecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Area : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
@@ -4980,13 +4974,13 @@ public final class com/splendo/kaluga/scientific/unit/Area$Companion {
 public abstract class com/splendo/kaluga/scientific/unit/AreaDensity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/AreaDensity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$AreaDensity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Area;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AreaDensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/AreaDensity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -5014,26 +5008,26 @@ public final class com/splendo/kaluga/scientific/unit/AreaUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Atmosphere : com/splendo/kaluga/scientific/unit/MetricPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Atmosphere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Bar : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Bar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/BarMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5048,14 +5042,14 @@ public final class com/splendo/kaluga/scientific/unit/BarMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Barye : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Barye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/BaryeMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5070,26 +5064,26 @@ public final class com/splendo/kaluga/scientific/unit/BaryeMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/BeatsPerMinute : com/splendo/kaluga/scientific/unit/Frequency {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BeatsPerMinute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Becquerel : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Becquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/BecquerelMultiple : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5104,110 +5098,110 @@ public final class com/splendo/kaluga/scientific/unit/BecquerelMultiple$Companio
 
 public final class com/splendo/kaluga/scientific/unit/Biot : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Biot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Bril : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Bril;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/BritishThermalUnit : com/splendo/kaluga/scientific/unit/ImperialEnergy, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BritishThermalUnit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/BritishThermalUnit$Thermal : com/splendo/kaluga/scientific/unit/ImperialEnergy, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BritishThermalUnit$Thermal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/BritishThermalUnitPerHour : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BritishThermalUnitPerHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/BritishThermalUnitPerMinute : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BritishThermalUnitPerMinute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/BritishThermalUnitPerSecond : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/BritishThermalUnitPerSecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Calorie : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/CalorieUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Calorie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Calorie$IT : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/CalorieUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Calorie$IT;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/CalorieMultiple : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5235,14 +5229,14 @@ public abstract interface class com/splendo/kaluga/scientific/unit/CalorieUnit :
 
 public final class com/splendo/kaluga/scientific/unit/Candela : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Candela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/CandelaMultiple : com/splendo/kaluga/scientific/unit/LuminousIntensity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5271,548 +5265,548 @@ public final class com/splendo/kaluga/scientific/unit/CatalysticActivityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Celsius : com/splendo/kaluga/scientific/unit/MetricAndUKImperialTemperature {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Celsius;
-	public fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun deltaToSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun deltaFromSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun deltaToSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centi : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centibecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centicurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centidalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centidyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centielectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centierg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centifarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centigram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centigram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centigray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centigray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centihenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centihertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centijoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centikatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centilumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centilux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CentimeterOfWater : com/splendo/kaluga/scientific/unit/MetricPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CentimeterOfWater;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centimole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centinewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centinit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centipascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centirad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CentiroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centisteradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centitesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centitorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiturn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centivolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiwatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CentiwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CentiwattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Centiweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Centiweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Coulomb : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Coulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/CoulombMultiple : com/splendo/kaluga/scientific/unit/ElectricCharge, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -5827,204 +5821,204 @@ public final class com/splendo/kaluga/scientific/unit/CoulombMultiple$Companion
 
 public final class com/splendo/kaluga/scientific/unit/Cubic : com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/SystemScientificUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicCentimeter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicCentimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicDecameter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicDecameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicDecimeter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicDecimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicFoot : com/splendo/kaluga/scientific/unit/ImperialVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicGigameter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicGigameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicHectometer : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicHectometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicInch : com/splendo/kaluga/scientific/unit/ImperialVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicKilometer : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicKilometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicMegameter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicMegameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicMeter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicMeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicMicrometer : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicMicrometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicMile : com/splendo/kaluga/scientific/unit/ImperialVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicMile;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicMillimeter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicMillimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicNanometer : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicNanometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/CubicYard : com/splendo/kaluga/scientific/unit/ImperialVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicYard;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Curie : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Curie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/CurieMultiple : com/splendo/kaluga/scientific/unit/Radioactivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -6039,14 +6033,14 @@ public final class com/splendo/kaluga/scientific/unit/CurieMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Dalton : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Dalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/DaltonMultiple : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -6061,987 +6055,987 @@ public final class com/splendo/kaluga/scientific/unit/DaltonMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Deca : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decabecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decacurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decadalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decadyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decafarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decagram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decagray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decahenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decahertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decajoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decakatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decalumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decalux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decamole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decanewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decanewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decanit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decanit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decapascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DecaroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decasiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decasievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decatesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decatorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decavolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decawatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DecawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DecawattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decaweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deci : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decibecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decicurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decidalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decidyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decielectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decierg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decifarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decigram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decigram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decigray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decigray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decihenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decihertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decijoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decikatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decilumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decilux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decimole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decinewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decinit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decipascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decirad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DeciroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decisteradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decitesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decitorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciturn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Decivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Decivolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciwatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DeciwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/DeciwattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Deciweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Deciweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue : com/splendo/kaluga/scientific/unit/DimensionlessScientificValue {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue$Companion;
 	public fun <init> (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
 	public synthetic fun <init> (IDLcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun <init> (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
+	public fun <init> (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
 	public fun compareTo (Lcom/splendo/kaluga/scientific/ScientificValue;)I
 	public synthetic fun compareTo (Ljava/lang/Object;)I
 	public final fun component1 ()D
@@ -7049,8 +7043,8 @@ public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScient
 	public final fun copy (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;DLcom/splendo/kaluga/scientific/unit/ScientificUnit;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getDecimalFraction ()Ljava/math/BigDecimal;
-	public fun getDecimalValue ()Ljava/math/BigDecimal;
+	public fun getDecimalFraction ()Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getDecimalValue ()Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getUnit ()Lcom/splendo/kaluga/scientific/unit/ScientificUnit;
 	public fun getValue ()Ljava/lang/Double;
 	public synthetic fun getValue ()Ljava/lang/Number;
@@ -7076,26 +7070,26 @@ public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScient
 
 public final class com/splendo/kaluga/scientific/unit/Degree : com/splendo/kaluga/scientific/unit/Angle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Degree;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Density : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Density$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Density;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Volume;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Density;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Density;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -7126,19 +7120,19 @@ public abstract class com/splendo/kaluga/scientific/unit/Dimensionless : com/spl
 }
 
 public final class com/splendo/kaluga/scientific/unit/Dimensionless$Companion {
+	public final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 	public final fun invoke (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public final fun invoke (Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
 public abstract interface class com/splendo/kaluga/scientific/unit/DimensionlessScientificValue : com/splendo/kaluga/scientific/ScientificValue {
-	public abstract fun getDecimalFraction ()Ljava/math/BigDecimal;
+	public abstract fun getDecimalFraction ()Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DimensionlessScientificValue$DefaultImpls {
 	public static fun compareTo (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)I
-	public static fun getDecimalFraction (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Ljava/math/BigDecimal;
-	public static fun getDecimalValue (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Ljava/math/BigDecimal;
+	public static fun getDecimalFraction (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static fun getDecimalValue (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/DimensionlessUnitKt {
@@ -7148,21 +7142,21 @@ public final class com/splendo/kaluga/scientific/unit/DimensionlessUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Dram : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Dram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/DynamicViscosity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/DynamicViscosity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$DynamicViscosity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPressure ()Lcom/splendo/kaluga/scientific/unit/Pressure;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$DynamicViscosity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getTime ()Lcom/splendo/kaluga/scientific/unit/Time;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/DynamicViscosity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -7184,14 +7178,14 @@ public final class com/splendo/kaluga/scientific/unit/DynamicViscosityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Dyne : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Dyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/DyneMultiple : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -7291,14 +7285,14 @@ public final class com/splendo/kaluga/scientific/unit/ElectricResistanceUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Electronvolt : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Electronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ElectronvoltMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -7333,14 +7327,14 @@ public final class com/splendo/kaluga/scientific/unit/EnergyUnitKt {
 public final class com/splendo/kaluga/scientific/unit/Erg : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field ERG_IN_JOULE I
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Erg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ErgMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -7355,35 +7349,35 @@ public final class com/splendo/kaluga/scientific/unit/ErgMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/ErgPerSecond : com/splendo/kaluga/scientific/unit/MetricPower, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ErgPerSecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Fahrenheit : com/splendo/kaluga/scientific/unit/USCustomaryTemperature {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Fahrenheit;
-	public fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun deltaToSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun deltaFromSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun deltaToSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Farad : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Farad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/FaradMultiple : com/splendo/kaluga/scientific/unit/ElectricCapacitance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -7398,89 +7392,89 @@ public final class com/splendo/kaluga/scientific/unit/FaradMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Foot : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Foot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootCandle : com/splendo/kaluga/scientific/unit/ImperialIlluminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootCandle;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootLambert : com/splendo/kaluga/scientific/unit/ImperialLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootLambert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootOfWater : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootOfWater;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootPoundForce : com/splendo/kaluga/scientific/unit/ImperialEnergy {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootPoundForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootPoundForcePerMinute : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootPoundForcePerMinute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootPoundForcePerSecond : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootPoundForcePerSecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/FootPoundal : com/splendo/kaluga/scientific/unit/ImperialEnergy {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/FootPoundal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Force : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
@@ -7519,530 +7513,530 @@ public final class com/splendo/kaluga/scientific/unit/FrequencyUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Gauss : com/splendo/kaluga/scientific/unit/MagneticInduction {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gauss;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Giga : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigabecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigacurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigadalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigadyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigafarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigagram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigagray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigahenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigahertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigajoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigakatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigalumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigalux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigamole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Giganewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Giganewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Giganit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Giganit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigapascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GigaroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigasiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigasievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigatesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigatorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigavolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigawatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/GigawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GigawattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gigaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gigaweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gradian : com/splendo/kaluga/scientific/unit/Angle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Grain : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Grain;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/GrainForce : com/splendo/kaluga/scientific/unit/ImperialForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GrainForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Gram : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/GramForce : com/splendo/kaluga/scientific/unit/MetricForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/GramForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/GramMultiple : com/splendo/kaluga/scientific/unit/MetricWeight, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -8057,14 +8051,14 @@ public final class com/splendo/kaluga/scientific/unit/GramMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Gray : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Gray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/GrayMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -8080,13 +8074,13 @@ public final class com/splendo/kaluga/scientific/unit/GrayMultiple$Companion {
 public abstract class com/splendo/kaluga/scientific/unit/HeatCapacity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/HeatCapacity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$HeatCapacity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getEnergy ()Lcom/splendo/kaluga/scientific/unit/Energy;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Temperature;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$HeatCapacity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/HeatCapacity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -8109,491 +8103,491 @@ public final class com/splendo/kaluga/scientific/unit/HeatCapacityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Hectare : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectare;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hecto : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/HectoDalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoDalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/HectoOhm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoOhm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectoampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectobecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectocurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectodyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectoelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectoerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectofarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectogram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectogray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectohenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectohertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectojoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectokatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectoliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectolumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectolux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectomole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectonewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectonit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectopascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectophot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectorad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectoroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectosiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectosievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectotesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectotorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectovolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectovolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectowatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/HectowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HectowattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hectoweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hectoweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Henry : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Henry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/HenryMultiple : com/splendo/kaluga/scientific/unit/ElectricInductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -8608,13 +8602,13 @@ public final class com/splendo/kaluga/scientific/unit/HenryMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Hertz : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/HertzMultiple : com/splendo/kaluga/scientific/unit/Frequency, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -8629,38 +8623,38 @@ public final class com/splendo/kaluga/scientific/unit/HertzMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Horsepower : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Horsepower;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/HorsepowerHour : com/splendo/kaluga/scientific/unit/ImperialEnergy {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/HorsepowerHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Hour : com/splendo/kaluga/scientific/unit/Time {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Hour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Illuminance : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
@@ -8879,18 +8873,18 @@ public final class com/splendo/kaluga/scientific/unit/ImperialEnergy$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/ImperialFluidDram : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialFluidDram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ImperialFluidOunce : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialFluidOunce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialForce : com/splendo/kaluga/scientific/unit/Force, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
@@ -8909,10 +8903,10 @@ public final class com/splendo/kaluga/scientific/unit/ImperialForce$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/ImperialGallon : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialGallon;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialIlluminance : com/splendo/kaluga/scientific/unit/Illuminance, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
@@ -9134,7 +9128,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialE
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper;Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getMetricAndImperialEnergy ()Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -9142,7 +9136,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialE
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialEnergyWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -9170,7 +9164,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialP
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper;Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getMetricAndImperialPower ()Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -9178,7 +9172,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMetricAndImperialP
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ImperialMetricAndImperialPowerWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -9415,10 +9409,10 @@ public final class com/splendo/kaluga/scientific/unit/ImperialMomentum$Companion
 
 public final class com/splendo/kaluga/scientific/unit/ImperialPint : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialPint;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialPower : com/splendo/kaluga/scientific/unit/Power, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
@@ -9447,10 +9441,10 @@ public final class com/splendo/kaluga/scientific/unit/ImperialPressure$Companion
 
 public final class com/splendo/kaluga/scientific/unit/ImperialQuart : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialQuart;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract interface class com/splendo/kaluga/scientific/unit/ImperialScientificUnit : com/splendo/kaluga/scientific/unit/MeasurementUsage$UsedInImperial, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
@@ -9603,33 +9597,33 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSurfaceTension$Com
 
 public final class com/splendo/kaluga/scientific/unit/ImperialTon : com/splendo/kaluga/scientific/unit/UKImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialTon;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ImperialTonForce : com/splendo/kaluga/scientific/unit/UKImperialForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialTonForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ImperialTonSquareFoot : com/splendo/kaluga/scientific/unit/UKImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialTonSquareFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ImperialTonSquareInch : com/splendo/kaluga/scientific/unit/UKImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialTonSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialVolume : com/splendo/kaluga/scientific/unit/Volume, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
@@ -9769,73 +9763,73 @@ public final class com/splendo/kaluga/scientific/unit/ImperialYank$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Inch : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Inch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchOfMercury : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchOfMercury;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchOfWater : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchOfWater;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchOunceForce : com/splendo/kaluga/scientific/unit/ImperialEnergy {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchOunceForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchPoundForce : com/splendo/kaluga/scientific/unit/ImperialEnergy {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchPoundForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchPoundForcePerMinute : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchPoundForcePerMinute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/InchPoundForcePerSecond : com/splendo/kaluga/scientific/unit/ImperialPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/InchPoundForcePerSecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
@@ -9869,13 +9863,13 @@ public final class com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalen
 public abstract class com/splendo/kaluga/scientific/unit/Jolt : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Jolt$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Jolt;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getAcceleration ()Lcom/splendo/kaluga/scientific/unit/Acceleration;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Jolt;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Jolt;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -9894,14 +9888,14 @@ public final class com/splendo/kaluga/scientific/unit/JoltUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Joule : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Joule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/JouleMultiple : com/splendo/kaluga/scientific/unit/MetricEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -9916,14 +9910,14 @@ public final class com/splendo/kaluga/scientific/unit/JouleMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Katal : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Katal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/KatalMultiple : com/splendo/kaluga/scientific/unit/CatalysticActivity, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -9938,532 +9932,532 @@ public final class com/splendo/kaluga/scientific/unit/KatalMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Kelvin : com/splendo/kaluga/scientific/unit/MetricAndUKImperialTemperature {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kelvin;
-	public fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun deltaToSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun deltaFromSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun deltaToSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilo : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KiloPoundSquareInch : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KiloPoundSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilobecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilocalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocalorie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilocalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocalorie$IT;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilocurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilodalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilodalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilodyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilofarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilogram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KilogramForce : com/splendo/kaluga/scientific/unit/MetricForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KilogramForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilogray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilohenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilohertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilojoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilokatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilolumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilolux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilomole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilonewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilonit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilopascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilophot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilorad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KiloroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilosiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilosievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilotesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilotorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilovolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilovolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kilowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kilowatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KilowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KilowattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Kiloweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kiloweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/KinematicViscosity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/KinematicViscosity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$KinematicViscosity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getArea ()Lcom/splendo/kaluga/scientific/unit/Area;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$KinematicViscosity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getTime ()Lcom/splendo/kaluga/scientific/unit/Time;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -10482,38 +10476,38 @@ public final class com/splendo/kaluga/scientific/unit/KinematicViscosityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Kip : com/splendo/kaluga/scientific/unit/USCustomaryForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Kip;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KipSquareFoot : com/splendo/kaluga/scientific/unit/USCustomaryPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KipSquareFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/KipSquareInch : com/splendo/kaluga/scientific/unit/USCustomaryPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/KipSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Lambert : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Lambert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Length : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
@@ -10535,13 +10529,13 @@ public final class com/splendo/kaluga/scientific/unit/LengthUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/LinearMassDensity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/LinearMassDensity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$LinearMassDensity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Length;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LinearMassDensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LinearMassDensity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -10563,14 +10557,14 @@ public final class com/splendo/kaluga/scientific/unit/LinearMassDensityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Liter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Liter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/LiterMultiple : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -10585,14 +10579,14 @@ public final class com/splendo/kaluga/scientific/unit/LiterMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Lumen : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Lumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/LumenMultiple : com/splendo/kaluga/scientific/unit/LuminousFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -10630,7 +10624,7 @@ public final class com/splendo/kaluga/scientific/unit/LuminousEnergy : com/splen
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/LuminousFlux;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/LuminousEnergy;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/LuminousEnergy;Lcom/splendo/kaluga/scientific/unit/LuminousFlux;Lcom/splendo/kaluga/scientific/unit/Time;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/LuminousEnergy;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getLuminousFlux ()Lcom/splendo/kaluga/scientific/unit/LuminousFlux;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousEnergy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -10639,7 +10633,7 @@ public final class com/splendo/kaluga/scientific/unit/LuminousEnergy : com/splen
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun getTime ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LuminousEnergy;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -10668,13 +10662,13 @@ public abstract class com/splendo/kaluga/scientific/unit/LuminousExposure : com/
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/LuminousExposure$Companion;
 	public fun <init> ()V
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousExposure;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getIlluminance ()Lcom/splendo/kaluga/scientific/unit/Illuminance;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousExposure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getTime ()Lcom/splendo/kaluga/scientific/unit/Time;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/LuminousExposure;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -10720,14 +10714,14 @@ public final class com/splendo/kaluga/scientific/unit/LuminousIntensityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Lux : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Lux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/LuxMultiple : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -10771,13 +10765,13 @@ public final class com/splendo/kaluga/scientific/unit/MagneticInductionUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/MassFlowRate : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MassFlowRate$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$MassFlowRate;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MassFlowRate;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MassFlowRate;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -10799,14 +10793,14 @@ public final class com/splendo/kaluga/scientific/unit/MassFlowRateUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Maxwell : com/splendo/kaluga/scientific/unit/MagneticFlux {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Maxwell;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/MeasurementSystem : com/splendo/kaluga/scientific/unit/MeasurementUsage, java/io/Serializable {
@@ -10872,503 +10866,503 @@ public abstract interface class com/splendo/kaluga/scientific/unit/MeasurementUs
 
 public final class com/splendo/kaluga/scientific/unit/Mega : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megabar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megabarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megabecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megabecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megacalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacalorie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megacalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacalorie$IT;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megacandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megacoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megacurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megacurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megadalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megadalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megadyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megadyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megafarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megafarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megagram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megagram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megagray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megagray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megahenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megahenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megahertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megahertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megajoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megajoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megakatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megakatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megalumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megalumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megalux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megalux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megameter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megamole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megamole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Meganewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Meganewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Meganit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Meganit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megapascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megapascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megarad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MegaroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megasiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megasiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megasievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megasievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megatesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megatesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megatorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megatorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megavolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megavolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megawatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megawatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MegawattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MegawattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Megaweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Megaweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Meter : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Meter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/MeterMultiple : com/splendo/kaluga/scientific/unit/MetricLength, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -11686,10 +11680,10 @@ public abstract interface class com/splendo/kaluga/scientific/unit/MetricBaseUni
 
 public final class com/splendo/kaluga/scientific/unit/MetricCup : com/splendo/kaluga/scientific/unit/UKImperialVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricCup;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MetricDensity : com/splendo/kaluga/scientific/unit/Density, com/splendo/kaluga/scientific/unit/MetricScientificUnit {
@@ -11818,14 +11812,14 @@ public final class com/splendo/kaluga/scientific/unit/MetricHeatCapacity$Compani
 
 public final class com/splendo/kaluga/scientific/unit/MetricHorsepower : com/splendo/kaluga/scientific/unit/MetricPower {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MetricHorsepower;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/MetricIlluminance : com/splendo/kaluga/scientific/unit/Illuminance, com/splendo/kaluga/scientific/unit/MetricScientificUnit {
@@ -12037,7 +12031,7 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialEne
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper;Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getMetricAndImperialEnergy ()Lcom/splendo/kaluga/scientific/unit/MetricAndImperialEnergy;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -12045,7 +12039,7 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialEne
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialEnergyWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -12073,7 +12067,7 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialPow
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper;Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getMetricAndImperialPower ()Lcom/splendo/kaluga/scientific/unit/MetricAndImperialPower;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
@@ -12081,7 +12075,7 @@ public final class com/splendo/kaluga/scientific/unit/MetricMetricAndImperialPow
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MetricMetricAndImperialPowerWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -12666,1119 +12660,1119 @@ public final class com/splendo/kaluga/scientific/unit/MetricYank$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Micro : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microbar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microbarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microbecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microbecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microcandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microcoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microcurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microcurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microdalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microdalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microdyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microdyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microfarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microfarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microgram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microgram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microgray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microgray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microhenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microhenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microhertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microhertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microjoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microjoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microkatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microkatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microlumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microlumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microlux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microlux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Micrometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micrometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Micromole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micromole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Micronewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micronewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Micronit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micronit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Micropascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Micropascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microrad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microrad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MicroroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microsecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microsiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microsievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microsteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microsteradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microtesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microtesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microtorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microtorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microturn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microvolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microwatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MicrowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MicrowattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Microweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Microweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Mile : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Mile;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milli : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millibar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millibarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millibecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millibecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millicalorie : com/splendo/kaluga/scientific/unit/CalorieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicalorie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millicalorie$IT : com/splendo/kaluga/scientific/unit/CalorieMultiple$IT, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicalorie$IT;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millicandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millicoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millicurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millicurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millidalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millidalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millidyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millidyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millielectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millielectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millierg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millierg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millifarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millifarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milligram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milligram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MilligramForce : com/splendo/kaluga/scientific/unit/MetricForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MilligramForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milligray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milligray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millihenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millihenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millihertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millihertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millijoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millijoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millikatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millikatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millilumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millilumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millilux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millilux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millimeter : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MillimeterOfMercury : com/splendo/kaluga/scientific/unit/MetricPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MillimeterOfMercury;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MillimeterOfWater : com/splendo/kaluga/scientific/unit/MetricPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MillimeterOfWater;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millimole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millimole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millinewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millinewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millinit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millinit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millipascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millipascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliphot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliphot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millirad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millirad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MilliroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millisecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millisiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millisievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millisteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millisteradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millitesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millitesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millitorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millitorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliturn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Millivolt : com/splendo/kaluga/scientific/unit/VoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Millivolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliwatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliwatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/MilliwattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/MilliwattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Milliweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Milliweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Minute : com/splendo/kaluga/scientific/unit/Time {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Minute;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Molality : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Molality$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Molality;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getAmountOfSubstance ()Lcom/splendo/kaluga/scientific/unit/AmountOfSubstance;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Weight;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Molality;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Molality;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13801,13 +13795,13 @@ public final class com/splendo/kaluga/scientific/unit/MolalityUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/MolarEnergy : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MolarEnergy$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$MolarEnergy;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getEnergy ()Lcom/splendo/kaluga/scientific/unit/Energy;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/AmountOfSubstance;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MolarEnergy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MolarEnergy;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13828,13 +13822,13 @@ public final class com/splendo/kaluga/scientific/unit/MolarEnergyUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/MolarMass : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MolarMass$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$MolarMass;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/AmountOfSubstance;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MolarMass;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MolarMass;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13857,13 +13851,13 @@ public final class com/splendo/kaluga/scientific/unit/MolarMassUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/MolarVolume : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/MolarVolume$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$MolarVolume;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/AmountOfSubstance;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MolarVolume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getVolume ()Lcom/splendo/kaluga/scientific/unit/Volume;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/MolarVolume;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13886,13 +13880,13 @@ public final class com/splendo/kaluga/scientific/unit/MolarVolumeUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/Molarity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Molarity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Molarity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getAmountOfSubstance ()Lcom/splendo/kaluga/scientific/unit/AmountOfSubstance;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Volume;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Molarity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Molarity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13914,14 +13908,14 @@ public final class com/splendo/kaluga/scientific/unit/MolarityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Mole : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Mole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/MoleMultiple : com/splendo/kaluga/scientific/unit/AmountOfSubstance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -13937,13 +13931,13 @@ public final class com/splendo/kaluga/scientific/unit/MoleMultiple$Companion {
 public abstract class com/splendo/kaluga/scientific/unit/Momentum : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Momentum$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Momentum;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getMass ()Lcom/splendo/kaluga/scientific/unit/Weight;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Momentum;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public abstract fun getSpeed ()Lcom/splendo/kaluga/scientific/unit/Speed;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Momentum;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -13965,539 +13959,539 @@ public final class com/splendo/kaluga/scientific/unit/MomentumUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Nano : com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/MetricBaseUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoampere : com/splendo/kaluga/scientific/unit/AmpereMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoampere;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCurrent;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanobar : com/splendo/kaluga/scientific/unit/BarMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobar;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanobarye : com/splendo/kaluga/scientific/unit/BaryeMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobarye;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanobecquerel : com/splendo/kaluga/scientific/unit/BecquerelMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanobecquerel;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanocandela : com/splendo/kaluga/scientific/unit/CandelaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocandela;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousIntensity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanocoulomb : com/splendo/kaluga/scientific/unit/CoulombMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocoulomb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCharge;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanocurie : com/splendo/kaluga/scientific/unit/CurieMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanocurie;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanodalton : com/splendo/kaluga/scientific/unit/DaltonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanodalton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanodyne : com/splendo/kaluga/scientific/unit/DyneMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanodyne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoelectronvolt : com/splendo/kaluga/scientific/unit/ElectronvoltMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoelectronvolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoerg : com/splendo/kaluga/scientific/unit/ErgMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoerg;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanofarad : com/splendo/kaluga/scientific/unit/FaradMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanofarad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricCapacitance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanogram : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanogram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanogray : com/splendo/kaluga/scientific/unit/GrayMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanogray;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanohenry : com/splendo/kaluga/scientific/unit/HenryMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanohenry;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricInductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanohertz : com/splendo/kaluga/scientific/unit/HertzMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanohertz;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Frequency;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanojoule : com/splendo/kaluga/scientific/unit/JouleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanojoule;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanokatal : com/splendo/kaluga/scientific/unit/KatalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanokatal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$CatalysticActivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoliter : com/splendo/kaluga/scientific/unit/LiterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoliter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanolumen : com/splendo/kaluga/scientific/unit/LumenMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanolumen;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$LuminousFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanolux : com/splendo/kaluga/scientific/unit/LuxMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanolux;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanometer : com/splendo/kaluga/scientific/unit/MeterMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanomole : com/splendo/kaluga/scientific/unit/MoleMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanomole;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$AmountOfSubstance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanonewton : com/splendo/kaluga/scientific/unit/NewtonMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanonewton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanonit : com/splendo/kaluga/scientific/unit/NitMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanonit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoohm : com/splendo/kaluga/scientific/unit/OhmMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanopascal : com/splendo/kaluga/scientific/unit/PascalMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanopascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanophot : com/splendo/kaluga/scientific/unit/PhotMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanophot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanorad : com/splendo/kaluga/scientific/unit/RadMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanorad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoradian : com/splendo/kaluga/scientific/unit/RadianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan : com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/NanoroentgenEquivalentMan;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanosecond : com/splendo/kaluga/scientific/unit/SecondMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosecond;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanosiemens : com/splendo/kaluga/scientific/unit/SiemensMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosiemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanosievert : com/splendo/kaluga/scientific/unit/SievertMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanosteradian : com/splendo/kaluga/scientific/unit/SteradianMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanosteradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanotesla : com/splendo/kaluga/scientific/unit/TeslaMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanotesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanotorr : com/splendo/kaluga/scientific/unit/TorrMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanotorr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoturn : com/splendo/kaluga/scientific/unit/TurnMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoturn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanovolt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanovolt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanowatt : com/splendo/kaluga/scientific/unit/WattMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanowatt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/NanowattHour : com/splendo/kaluga/scientific/unit/WattHourMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/NanowattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Nanoweber : com/splendo/kaluga/scientific/unit/WeberMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nanoweber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/NauticalMile : com/splendo/kaluga/scientific/unit/MetricLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/NauticalMile;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Newton : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Newton;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/NewtonMultiple : com/splendo/kaluga/scientific/unit/MetricForce, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14512,14 +14506,14 @@ public final class com/splendo/kaluga/scientific/unit/NewtonMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Nit : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Nit;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/NitMultiple : com/splendo/kaluga/scientific/unit/MetricLuminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14534,14 +14528,14 @@ public final class com/splendo/kaluga/scientific/unit/NitMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Ohm : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Ohm;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/OhmMultiple : com/splendo/kaluga/scientific/unit/ElectricResistance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14557,49 +14551,49 @@ public final class com/splendo/kaluga/scientific/unit/OhmMultiple$Companion {
 public final class com/splendo/kaluga/scientific/unit/One : com/splendo/kaluga/scientific/unit/Dimensionless {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/One;
 	public static final field UNIT_VALUE D
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Dimensionless;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Ounce : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Ounce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/OunceForce : com/splendo/kaluga/scientific/unit/ImperialForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/OunceForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/OunceSquareInch : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/OunceSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Pascal : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Pascal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/PascalMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14615,39 +14609,39 @@ public final class com/splendo/kaluga/scientific/unit/PascalMultiple$Companion {
 public final class com/splendo/kaluga/scientific/unit/Percent : com/splendo/kaluga/scientific/unit/Dimensionless {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Percent;
 	public static final field PARTS_PER_HUNDRED D
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Dimensionless;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Permill : com/splendo/kaluga/scientific/unit/Dimensionless {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Permill;
 	public static final field PARTS_PER_THOUSAND D
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Dimensionless;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Phot : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Phot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Illuminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/PhotMultiple : com/splendo/kaluga/scientific/unit/MetricIlluminance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14662,41 +14656,41 @@ public final class com/splendo/kaluga/scientific/unit/PhotMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Pound : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Pound;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/PoundForce : com/splendo/kaluga/scientific/unit/ImperialForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/PoundForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/PoundSquareFoot : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/PoundSquareFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/PoundSquareInch : com/splendo/kaluga/scientific/unit/ImperialPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/PoundSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Poundal : com/splendo/kaluga/scientific/unit/ImperialForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Poundal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/Power : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
@@ -14741,14 +14735,14 @@ public final class com/splendo/kaluga/scientific/unit/PressureUnitKt {
 public final class com/splendo/kaluga/scientific/unit/Rad : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field GRAY_IN_RAD D
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Rad;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationAbsorbedDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/RadMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationAbsorbedDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14763,14 +14757,14 @@ public final class com/splendo/kaluga/scientific/unit/RadMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Radian : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Radian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/RadianMultiple : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14799,24 +14793,24 @@ public final class com/splendo/kaluga/scientific/unit/RadioactivityUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Rankine : com/splendo/kaluga/scientific/unit/USCustomaryTemperature {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Rankine;
-	public fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun deltaToSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun deltaFromSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun deltaToSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/RoentgenEquivalentMan : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/RoentgenEquivalentMan;
 	public static final field SIEVERT_IN_REM D
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14831,44 +14825,44 @@ public final class com/splendo/kaluga/scientific/unit/RoentgenEquivalentManMulti
 
 public final class com/splendo/kaluga/scientific/unit/Rutherford : com/splendo/kaluga/scientific/unit/Radioactivity {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Rutherford;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Radioactivity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract interface class com/splendo/kaluga/scientific/unit/ScientificUnit : com/splendo/kaluga/scientific/unit/MeasurementUsage, java/io/Serializable {
-	public abstract fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public abstract fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public abstract fun getSymbol ()Ljava/lang/String;
 	public abstract fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public abstract fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public abstract fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/ScientificUnitKt {
+	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)D
 	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)D
-	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Ljava/math/BigDecimal;
-	public static final fun convert (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)Ljava/math/BigDecimal;
+	public static synthetic fun convert$default (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static synthetic fun convert$default (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)D
-	public static synthetic fun convert$default (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Ljava/math/BigDecimal;
 	public static final fun getUnits ()Ljava/util/Set;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Second : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Second;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Time;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SecondMultiple : com/splendo/kaluga/scientific/unit/Time, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14883,14 +14877,14 @@ public final class com/splendo/kaluga/scientific/unit/SecondMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Siemens : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Siemens;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ElectricConductance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SiemensMultiple : com/splendo/kaluga/scientific/unit/ElectricConductance, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14905,14 +14899,14 @@ public final class com/splendo/kaluga/scientific/unit/SiemensMultiple$Companion
 
 public final class com/splendo/kaluga/scientific/unit/Sievert : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Sievert;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$IonizingRadiationEquivalentDose;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SievertMultiple : com/splendo/kaluga/scientific/unit/IonizingRadiationEquivalentDose, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -14927,21 +14921,21 @@ public final class com/splendo/kaluga/scientific/unit/SievertMultiple$Companion
 
 public final class com/splendo/kaluga/scientific/unit/Skot : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Skot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Slug : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Slug;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SolidAngle : com/splendo/kaluga/scientific/unit/AbstractScientificUnit, com/splendo/kaluga/scientific/unit/MetricAndImperialScientificUnit {
@@ -14960,26 +14954,26 @@ public final class com/splendo/kaluga/scientific/unit/SolidAngleUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Spat : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Spat;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SpecificEnergy : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SpecificEnergy$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificEnergy;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getEnergy ()Lcom/splendo/kaluga/scientific/unit/Energy;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Weight;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificEnergy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SpecificEnergy;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -15006,13 +15000,13 @@ public final class com/splendo/kaluga/scientific/unit/SpecificEnergyUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/SpecificHeatCapacity : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SpecificHeatCapacity$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificHeatCapacity;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getHeatCapacity ()Lcom/splendo/kaluga/scientific/unit/HeatCapacity;
 	public abstract fun getPerWeight ()Lcom/splendo/kaluga/scientific/unit/Weight;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificHeatCapacity;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SpecificHeatCapacity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -15043,13 +15037,13 @@ public final class com/splendo/kaluga/scientific/unit/SpecificHeatCapacityUnitKt
 public abstract class com/splendo/kaluga/scientific/unit/SpecificVolume : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SpecificVolume$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificVolume;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Weight;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SpecificVolume;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getVolume ()Lcom/splendo/kaluga/scientific/unit/Volume;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SpecificVolume;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -15076,13 +15070,13 @@ public final class com/splendo/kaluga/scientific/unit/SpecificVolumeUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/Speed : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Speed$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Speed;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getDistance ()Lcom/splendo/kaluga/scientific/unit/Length;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Speed;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Speed;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -15102,216 +15096,216 @@ public final class com/splendo/kaluga/scientific/unit/SpeedUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Square : com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/SystemScientificUnit;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareCentimeter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareCentimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareDecameter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareDecameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareDecimeter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareDecimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareDegree : com/splendo/kaluga/scientific/unit/SolidAngle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareDegree;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareFoot : com/splendo/kaluga/scientific/unit/ImperialArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareGigameter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareGigameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareHectometer : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareHectometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareInch : com/splendo/kaluga/scientific/unit/ImperialArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareKilometer : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareKilometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareMegameter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareMegameter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareMeter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareMeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareMicrometer : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareMicrometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareMile : com/splendo/kaluga/scientific/unit/ImperialArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareMile;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareMillimeter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareMillimeter;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareNanometer : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareNanometer;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/SquareYard : com/splendo/kaluga/scientific/unit/ImperialArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareYard;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Steradian : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Steradian;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SolidAngle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SteradianMultiple : com/splendo/kaluga/scientific/unit/SolidAngle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -15326,33 +15320,33 @@ public final class com/splendo/kaluga/scientific/unit/SteradianMultiple$Companio
 
 public final class com/splendo/kaluga/scientific/unit/Stilb : com/splendo/kaluga/scientific/unit/MetricLuminance {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Stilb;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Luminance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Stone : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Stone;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/SurfaceTension : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/SurfaceTension$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$SurfaceTension;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getForce ()Lcom/splendo/kaluga/scientific/unit/Force;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Length;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$SurfaceTension;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/SurfaceTension;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -15379,8 +15373,8 @@ public abstract interface class com/splendo/kaluga/scientific/unit/SystemScienti
 public abstract class com/splendo/kaluga/scientific/unit/Temperature : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Temperature$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Temperature;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public abstract fun deltaFromSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
-	public abstract fun deltaToSIUnitDelta (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public abstract fun deltaFromSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public abstract fun deltaToSIUnitDelta (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Temperature;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Temperature;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
@@ -15391,9 +15385,9 @@ public final class com/splendo/kaluga/scientific/unit/Temperature$Companion {
 }
 
 public final class com/splendo/kaluga/scientific/unit/TemperatureUnitKt {
+	public static final fun convertDelta (Lcom/splendo/kaluga/scientific/unit/Temperature;Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/Temperature;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun convertDelta (Lcom/splendo/kaluga/scientific/unit/Temperature;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/Temperature;)D
 	public static final fun convertDelta (Lcom/splendo/kaluga/scientific/unit/Temperature;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/Temperature;ILcom/splendo/kaluga/base/utils/RoundingMode;)D
-	public static final fun convertDelta (Lcom/splendo/kaluga/scientific/unit/Temperature;Ljava/math/BigDecimal;Lcom/splendo/kaluga/scientific/unit/Temperature;)Ljava/math/BigDecimal;
 	public static synthetic fun convertDelta$default (Lcom/splendo/kaluga/scientific/unit/Temperature;Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/Temperature;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)D
 	public static final fun getMetricAndUkImperialTemperatureUnits ()Ljava/util/Set;
 	public static final fun getTemperatureUnits ()Ljava/util/Set;
@@ -15402,14 +15396,14 @@ public final class com/splendo/kaluga/scientific/unit/TemperatureUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Tesla : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Tesla;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticInduction;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/TeslaMultiple : com/splendo/kaluga/scientific/unit/MagneticInduction, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -15425,13 +15419,13 @@ public final class com/splendo/kaluga/scientific/unit/TeslaMultiple$Companion {
 public abstract class com/splendo/kaluga/scientific/unit/ThermalResistance : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ThermalResistance$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$ThermalResistance;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Power;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$ThermalResistance;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getTemperature ()Lcom/splendo/kaluga/scientific/unit/Temperature;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ThermalResistance;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -15468,38 +15462,38 @@ public final class com/splendo/kaluga/scientific/unit/TimeUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Tonne : com/splendo/kaluga/scientific/unit/GramMultiple, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Tonne;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/TonneForce : com/splendo/kaluga/scientific/unit/MetricForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/TonneForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Force;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Torr : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Torr;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Pressure;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Metric;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/TorrMultiple : com/splendo/kaluga/scientific/unit/MetricPressure, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -15514,14 +15508,14 @@ public final class com/splendo/kaluga/scientific/unit/TorrMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Turn : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Turn;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Angle;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/TurnMultiple : com/splendo/kaluga/scientific/unit/Angle, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -15695,11 +15689,11 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialForceWra
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialForce;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialForce;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialForce;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialForceWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -15727,11 +15721,11 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWr
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialVolume;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialVolume;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialVolume;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -15759,10 +15753,10 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialWeightWr
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -16044,11 +16038,11 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialPressureWrapper
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialPressure;)Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialPressure;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialPressure;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/UKImperialPressureWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -16540,11 +16534,11 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialForceWr
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialForce;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialForce;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialForce;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialForceWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -16572,11 +16566,11 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialPressur
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialPressure;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialPressure;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialPressure;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialPressureWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -16604,11 +16598,11 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeW
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialVolume;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialVolume;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialVolume;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -16636,10 +16630,10 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialWeightW
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;
 	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
 	public fun hashCode ()I
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
@@ -17240,101 +17234,101 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryYank$Companion
 
 public final class com/splendo/kaluga/scientific/unit/USTonSquareFoot : com/splendo/kaluga/scientific/unit/USCustomaryPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USTonSquareFoot;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/USTonSquareInch : com/splendo/kaluga/scientific/unit/USCustomaryPressure {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/USTonSquareInch;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsCustomaryCup : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsCustomaryCup;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsFluidDram : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsFluidDram;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsFluidOunce : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsFluidOunce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsLegalCup : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsLegalCup;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsLiquidGallon : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsLiquidGallon;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsLiquidPint : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsLiquidPint;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsLiquidQuart : com/splendo/kaluga/scientific/unit/USCustomaryVolume {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsLiquidQuart;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsTon : com/splendo/kaluga/scientific/unit/USCustomaryWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsTon;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/UsTonForce : com/splendo/kaluga/scientific/unit/USCustomaryForce {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsTonForce;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Volt : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Volt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Voltage;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/VoltMultiple : com/splendo/kaluga/scientific/unit/Voltage, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -17384,13 +17378,13 @@ public final class com/splendo/kaluga/scientific/unit/VolumeUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/VolumetricFlow : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/VolumetricFlow$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$VolumetricFlow;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$VolumetricFlow;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getVolume ()Lcom/splendo/kaluga/scientific/unit/Volume;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/VolumetricFlow;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -17413,13 +17407,13 @@ public final class com/splendo/kaluga/scientific/unit/VolumetricFlowUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/VolumetricFlux : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/VolumetricFlux$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$VolumetricFlux;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Area;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$VolumetricFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public abstract fun getVolumetricFlow ()Lcom/splendo/kaluga/scientific/unit/VolumetricFlow;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/VolumetricFlux;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -17441,26 +17435,26 @@ public final class com/splendo/kaluga/scientific/unit/VolumetricFluxUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Watt : com/splendo/kaluga/scientific/unit/MetricAndImperialPower, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Watt;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Power;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/unit/WattHour : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/WattHour;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Energy;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/WattHourMultiple : com/splendo/kaluga/scientific/unit/MetricAndImperialEnergy, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -17485,14 +17479,14 @@ public final class com/splendo/kaluga/scientific/unit/WattMultiple$Companion {
 
 public final class com/splendo/kaluga/scientific/unit/Weber : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricBaseUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Weber;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$MagneticFlux;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$MetricAndImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public abstract class com/splendo/kaluga/scientific/unit/WeberMultiple : com/splendo/kaluga/scientific/unit/MagneticFlux, com/splendo/kaluga/scientific/unit/MetricMultipleUnit {
@@ -17528,13 +17522,13 @@ public final class com/splendo/kaluga/scientific/unit/WeightUnitKt {
 public abstract class com/splendo/kaluga/scientific/unit/Yank : com/splendo/kaluga/scientific/unit/AbstractScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/Yank$Companion;
 	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/PhysicalQuantity$Yank;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public abstract fun getForce ()Lcom/splendo/kaluga/scientific/unit/Force;
 	public abstract fun getPer ()Lcom/splendo/kaluga/scientific/unit/Time;
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Yank;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
 	public fun getSymbol ()Ljava/lang/String;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/Yank;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
@@ -17556,8 +17550,8 @@ public final class com/splendo/kaluga/scientific/unit/YankUnitKt {
 
 public final class com/splendo/kaluga/scientific/unit/Yard : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Yard;
-	public fun fromSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-	public fun toSIUnit (Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
diff --git a/scientific/src/commonMain/kotlin/ScientificValue.kt b/scientific/src/commonMain/kotlin/ScientificValue.kt
index 396d8550c..24b2d771f 100644
--- a/scientific/src/commonMain/kotlin/ScientificValue.kt
+++ b/scientific/src/commonMain/kotlin/ScientificValue.kt
@@ -25,7 +25,6 @@ import com.splendo.kaluga.base.utils.plus
 import com.splendo.kaluga.base.utils.times
 import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.base.utils.toDouble
-import com.splendo.kaluga.scientific.converter.ScientificConverterException
 import com.splendo.kaluga.scientific.unit.ScientificUnit
 import com.splendo.kaluga.scientific.unit.convert
 import kotlinx.serialization.Serializable
@@ -298,11 +297,7 @@ fun <
     > Decimal.div(
     factor: ScientificValue<Quantity, Unit>,
     factory: (Decimal, Unit) -> Value
-) = if (factor.value != 0.0) {
-    factory(this / factor.decimalValue, factor.unit)
-} else {
-    throw ScientificConverterException("Dividing by zero")
-}
+) = factory(this / factor.decimalValue, factor.unit)
 
 fun <
     Quantity : PhysicalQuantity,
@@ -311,11 +306,7 @@ fun <
     > ScientificValue<Quantity, Unit>.div(
     factor: Decimal,
     factory: (Decimal, Unit) -> Value
-) = if (factor.toDouble() != 0.0) {
-    factory(decimalValue / factor, unit)
-} else {
-    throw ScientificConverterException("Dividing by zero")
-}
+) = factory(decimalValue / factor, unit)
 
 infix operator fun <
     Quantity : PhysicalQuantity,
@@ -375,11 +366,7 @@ internal fun <
     nominator: ScientificValue<NominatorQuantity, NominatorUnit>,
     divider: ScientificValue<DividerQuantity, DividerUnit>,
     factory: (Decimal, Unit) -> Value
-) = if (divider.value != 0.0) {
-    fromSIUnit(nominator.unit.toSIUnit(nominator.decimalValue) / divider.unit.toSIUnit(divider.decimalValue))(this, factory)
-} else {
-    throw ScientificConverterException("Dividing by zero")
-}
+) = fromSIUnit(nominator.unit.toSIUnit(nominator.decimalValue) / divider.unit.toSIUnit(divider.decimalValue))(this, factory)
 
 internal fun <
     TargetQuantity : PhysicalQuantity,
@@ -404,8 +391,4 @@ internal fun <
     > Unit.byInverting(
     inverse: ScientificValue<InverseQuantity, InverseUnit>,
     factory: (Decimal, Unit) -> Value
-) = if (inverse.value != 0.0) {
-    fromSIUnit(1.0.toDecimal() / inverse.unit.toSIUnit(inverse.decimalValue))(this, factory)
-} else {
-    throw ScientificConverterException("Inverting by zero")
-}
+) = fromSIUnit(1.0.toDecimal() / inverse.unit.toSIUnit(inverse.decimalValue))(this, factory)
diff --git a/scientific/src/commonMain/kotlin/converter/ScientificConverterException.kt b/scientific/src/commonMain/kotlin/converter/ScientificConverterException.kt
deleted file mode 100644
index 1ccd564f5..000000000
--- a/scientific/src/commonMain/kotlin/converter/ScientificConverterException.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2023 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.scientific.converter
-
-class ScientificConverterException(message: String? = null) : ArithmeticException(message)
diff --git a/scientific/src/commonTest/kotlin/ScientificValueTest.kt b/scientific/src/commonTest/kotlin/ScientificValueTest.kt
index 0ba7ad59b..d435d3ba3 100644
--- a/scientific/src/commonTest/kotlin/ScientificValueTest.kt
+++ b/scientific/src/commonTest/kotlin/ScientificValueTest.kt
@@ -17,8 +17,8 @@
 
 package com.splendo.kaluga.scientific
 
+import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.base.utils.toDouble
-import com.splendo.kaluga.scientific.converter.ScientificConverterException
 import com.splendo.kaluga.scientific.converter.decimal.div
 import com.splendo.kaluga.scientific.converter.frequency.times
 import com.splendo.kaluga.scientific.converter.length.times
@@ -32,7 +32,6 @@ import com.splendo.kaluga.scientific.unit.Second
 import com.splendo.kaluga.scientific.unit.SquareMeter
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
 
 class ScientificValueTest {
 
@@ -56,8 +55,8 @@ class ScientificValueTest {
         assertEquals(3(Kilogram), 9(Kilogram) / 30(Hectogram))
         assertEquals(3(Kilogram), 9(Kilogram) / 3)
 
-        assertFailsWith<ScientificConverterException> { 1(Kilogram) / 0(Kilogram) }
-        assertFailsWith<ScientificConverterException> { 1(Kilogram) / 0 }
-        assertFailsWith<ScientificConverterException> { 0(Second).frequency() }
+        assertEquals(Decimal.PositiveInfinity(Kilogram), 1(Kilogram) / 0(Kilogram))
+        assertEquals(Decimal.PositiveInfinity(Kilogram), 1(Kilogram) / 0)
+        assertEquals(Decimal.PositiveInfinity(Hertz), 0(Second).frequency())
     }
 }
diff --git a/scientific/src/commonTest/kotlin/unit/ScientificUnitTest.kt b/scientific/src/commonTest/kotlin/unit/ScientificUnitTest.kt
index ebbfea1c3..6fcf2b144 100644
--- a/scientific/src/commonTest/kotlin/unit/ScientificUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/ScientificUnitTest.kt
@@ -16,7 +16,10 @@
  */
 package com.splendo.kaluga.scientific.unit
 
+import com.splendo.kaluga.scientific.convert
+import com.splendo.kaluga.scientific.invoke
 import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 
 class ScientificUnitTest {
@@ -25,4 +28,11 @@ class ScientificUnitTest {
     fun testUnits() {
         assertFalse(Units.isEmpty())
     }
+
+    @Test
+    fun testInvalidConverters() {
+        assertEquals(Double.NaN(Inch), Double.NaN(Meter).convert(Inch))
+        assertEquals(Double.POSITIVE_INFINITY(Inch), Double.POSITIVE_INFINITY(Meter).convert(Inch))
+        assertEquals(Double.NEGATIVE_INFINITY(Inch), Double.NEGATIVE_INFINITY(Meter).convert(Inch))
+    }
 }

From baa83b922bc5f02f1055b820d25fb31e15f1e77d Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 15 Feb 2023 16:49:16 +0100
Subject: [PATCH 183/227] Lint fix

---
 base/src/jsMain/kotlin/utils/Decimal.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index e22ee917a..483f5340c 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -153,7 +153,7 @@ actual fun FiniteDecimal.round(
 actual fun Number.toFiniteDecimal(): FiniteDecimal = this.toString().toFiniteDecimal()!!
 actual fun String.toFiniteDecimal(): FiniteDecimal? = try {
     FiniteDecimal(BigDecimal.BigDecimal(this))
-} catch (e : dynamic) {
+} catch (e: dynamic) {
     null
 }
 

From da0c47e760c273b789e41bdee3d2227317e6cbf2 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 15 Feb 2023 17:22:23 +0100
Subject: [PATCH 184/227] Rename TimeZone to KalugaTimeZone to account for
 platform conflicts

---
 .../kaluga/architecture/compose/RouteTests.kt |   4 +-
 base/api/androidLib/base.api                  | 110 +++++++++---------
 base/api/jvm/base.api                         | 110 +++++++++---------
 .../kotlin/text/KalugaDateFormatter.kt        |  24 ++--
 .../androidLibMain/kotlin/utils/KalugaDate.kt |  12 +-
 .../utils/{TimeZone.kt => KalugaTimeZone.kt}  |  26 ++---
 .../commonMain/kotlin/text/FormatSpecifier.kt |   6 +-
 .../kotlin/text/KalugaDateFormatter.kt        |  38 +++---
 .../src/commonMain/kotlin/utils/KalugaDate.kt |  32 ++---
 .../utils/{TimeZone.kt => KalugaTimeZone.kt}  |  49 ++++----
 .../kotlin/text/DateFormatterTest.kt          |  28 ++---
 .../kotlin/text/StringFormatterTest.kt        |   4 +-
 base/src/commonTest/kotlin/utils/DateTest.kt  |  12 +-
 .../kotlin/text/KalugaDateFormatter.kt        |  28 ++---
 base/src/iosMain/kotlin/utils/KalugaDate.kt   |  12 +-
 .../utils/{TimeZone.kt => KalugaTimeZone.kt}  |  24 ++--
 .../jsMain/kotlin/text/KalugaDateFormatter.kt |  22 ++--
 base/src/jsMain/kotlin/utils/KalugaDate.kt    |  12 +-
 .../utils/{TimeZone.kt => KalugaTimeZone.kt}  |  20 ++--
 .../kotlin/text/KalugaDateFormatter.kt        |  24 ++--
 base/src/jvmMain/kotlin/utils/KalugaDate.kt   |  12 +-
 .../utils/{TimeZone.kt => KalugaTimeZone.kt}  |  26 ++---
 22 files changed, 319 insertions(+), 316 deletions(-)
 rename base/src/androidLibMain/kotlin/utils/{TimeZone.kt => KalugaTimeZone.kt} (63%)
 rename base/src/commonMain/kotlin/utils/{TimeZone.kt => KalugaTimeZone.kt} (54%)
 rename base/src/iosMain/kotlin/utils/{TimeZone.kt => KalugaTimeZone.kt} (77%)
 rename base/src/jsMain/kotlin/utils/{TimeZone.kt => KalugaTimeZone.kt} (61%)
 rename base/src/jvmMain/kotlin/utils/{TimeZone.kt => KalugaTimeZone.kt} (63%)

diff --git a/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt b/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
index 04562e495..7c0c1f4bc 100644
--- a/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
+++ b/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
@@ -28,7 +28,7 @@ import com.splendo.kaluga.base.text.KalugaDateFormatter
 import com.splendo.kaluga.base.text.iso8601Pattern
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
-import com.splendo.kaluga.base.utils.TimeZone
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.utc
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.nullable
@@ -75,7 +75,7 @@ class RouteTests {
 
     @Test
     fun testRoute() {
-        val time = DefaultKalugaDate.epoch(timeZone = TimeZone.utc)
+        val time = DefaultKalugaDate.epoch(timeZone = KalugaTimeZone.utc)
         val bundle = MockSpec.toBundle { row ->
             when (row) {
                 is MockSpecRow.StringSpecRow -> row.convertValue("string")
diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index d1a5f036a..e1d7de44c 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -326,7 +326,7 @@ public abstract interface class com/splendo/kaluga/base/text/BaseDateFormatter {
 	public abstract fun getPmString ()Ljava/lang/String;
 	public abstract fun getShortMonths ()Ljava/util/List;
 	public abstract fun getShortWeekdays ()Ljava/util/List;
-	public abstract fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public abstract fun getTimeZone ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 	public abstract fun getWeekdays ()Ljava/util/List;
 	public abstract fun parse (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public abstract fun setAmString (Ljava/lang/String;)V
@@ -336,7 +336,7 @@ public abstract interface class com/splendo/kaluga/base/text/BaseDateFormatter {
 	public abstract fun setPmString (Ljava/lang/String;)V
 	public abstract fun setShortMonths (Ljava/util/List;)V
 	public abstract fun setShortWeekdays (Ljava/util/List;)V
-	public abstract fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public abstract fun setTimeZone (Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)V
 	public abstract fun setWeekdays (Ljava/util/List;)V
 }
 
@@ -434,7 +434,7 @@ public final class com/splendo/kaluga/base/text/KalugaDateFormatter : com/splend
 	public fun getPmString ()Ljava/lang/String;
 	public fun getShortMonths ()Ljava/util/List;
 	public fun getShortWeekdays ()Ljava/util/List;
-	public fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public fun getTimeZone ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 	public fun getWeekdays ()Ljava/util/List;
 	public fun parse (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public fun setAmString (Ljava/lang/String;)V
@@ -444,30 +444,30 @@ public final class com/splendo/kaluga/base/text/KalugaDateFormatter : com/splend
 	public fun setPmString (Ljava/lang/String;)V
 	public fun setShortMonths (Ljava/util/List;)V
 	public fun setShortWeekdays (Ljava/util/List;)V
-	public fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public fun setTimeZone (Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)V
 	public fun setWeekdays (Ljava/util/List;)V
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatter$Companion {
-	public final fun dateFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun patternFormat (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun patternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun timeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun timeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun dateFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun patternFormat (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun patternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun timeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun timeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatterKt {
-	public static final fun dateFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static final fun fixedPatternFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/TimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun fixedPatternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/TimeZone;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static final fun iso8601Pattern (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun iso8601Pattern$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun dateFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun fixedPatternFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun fixedPatternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun iso8601Pattern (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun iso8601Pattern$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 }
 
 public abstract class com/splendo/kaluga/base/text/NumberFormatStyle {
@@ -966,7 +966,7 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 	public fun getMinute ()I
 	public fun getMonth ()I
 	public fun getSecond ()I
-	public fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public fun getTimeZone ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 	public fun getWeekDay ()I
 	public fun getWeekOfMonth ()I
 	public fun getWeekOfYear ()I
@@ -982,7 +982,7 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 	public fun setMinute (I)V
 	public fun setMonth (I)V
 	public fun setSecond (I)V
-	public fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public fun setTimeZone (Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)V
 	public fun setWeekDay (I)V
 	public fun setWeekOfMonth (I)V
 	public fun setWeekOfYear (I)V
@@ -990,10 +990,10 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 }
 
 public final class com/splendo/kaluga/base/utils/DefaultKalugaDate$Companion {
-	public final fun epoch (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun now (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun epoch (JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun now (JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
 public final class com/splendo/kaluga/base/utils/Deferred_getCompletedOrNullKt {
@@ -1026,7 +1026,7 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public abstract fun getMinute ()I
 	public abstract fun getMonth ()I
 	public abstract fun getSecond ()I
-	public abstract fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public abstract fun getTimeZone ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 	public abstract fun getWeekDay ()I
 	public abstract fun getWeekOfMonth ()I
 	public abstract fun getWeekOfYear ()I
@@ -1042,7 +1042,7 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public abstract fun setMinute (I)V
 	public abstract fun setMonth (I)V
 	public abstract fun setSecond (I)V
-	public abstract fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public abstract fun setTimeZone (Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)V
 	public abstract fun setWeekDay (I)V
 	public abstract fun setWeekOfMonth (I)V
 	public abstract fun setWeekOfYear (I)V
@@ -1068,10 +1068,33 @@ public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
 	public static synthetic fun nowUtc$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun plus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun toStartOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun tomorrow (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun tomorrow (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaTimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
+	public static final field Companion Lcom/splendo/kaluga/base/utils/KalugaTimeZone$Companion;
+	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
+	public fun copy ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
+	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getDaylightSavingsOffsetInMilliseconds ()J
+	public fun getIdentifier ()Ljava/lang/String;
+	public fun getOffsetFromGMTInMilliseconds ()J
+	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaTimeZone$Companion {
+	public final fun current ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
+	public final fun get (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
+	public final fun getAvailableIdentifiers ()Ljava/util/List;
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaTimeZoneKt {
+	public static final fun getUtc (Lcom/splendo/kaluga/base/utils/KalugaTimeZone$Companion;)Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 }
 
 public final class com/splendo/kaluga/base/utils/Locale : com/splendo/kaluga/base/utils/BaseLocale {
@@ -1125,29 +1148,6 @@ public final class com/splendo/kaluga/base/utils/RoundingMode$RoundUp : com/sple
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/RoundingMode$RoundUp;
 }
 
-public final class com/splendo/kaluga/base/utils/TimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
-	public static final field Companion Lcom/splendo/kaluga/base/utils/TimeZone$Companion;
-	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDaylightSavingsOffsetInMilliseconds ()J
-	public fun getIdentifier ()Ljava/lang/String;
-	public fun getOffsetFromGMTInMilliseconds ()J
-	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-}
-
-public final class com/splendo/kaluga/base/utils/TimeZone$Companion {
-	public final fun current ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun get (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun getAvailableIdentifiers ()Ljava/util/List;
-}
-
-public final class com/splendo/kaluga/base/utils/TimeZoneKt {
-	public static final fun getUtc (Lcom/splendo/kaluga/base/utils/TimeZone$Companion;)Lcom/splendo/kaluga/base/utils/TimeZone;
-}
-
 public final class com/splendo/kaluga/base/utils/TimeZoneNameStyle : java/lang/Enum {
 	public static final field Long Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;
 	public static final field Short Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index f71c3c33b..e541acc91 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -317,7 +317,7 @@ public abstract interface class com/splendo/kaluga/base/text/BaseDateFormatter {
 	public abstract fun getPmString ()Ljava/lang/String;
 	public abstract fun getShortMonths ()Ljava/util/List;
 	public abstract fun getShortWeekdays ()Ljava/util/List;
-	public abstract fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public abstract fun getTimeZone ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 	public abstract fun getWeekdays ()Ljava/util/List;
 	public abstract fun parse (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public abstract fun setAmString (Ljava/lang/String;)V
@@ -327,7 +327,7 @@ public abstract interface class com/splendo/kaluga/base/text/BaseDateFormatter {
 	public abstract fun setPmString (Ljava/lang/String;)V
 	public abstract fun setShortMonths (Ljava/util/List;)V
 	public abstract fun setShortWeekdays (Ljava/util/List;)V
-	public abstract fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public abstract fun setTimeZone (Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)V
 	public abstract fun setWeekdays (Ljava/util/List;)V
 }
 
@@ -425,7 +425,7 @@ public final class com/splendo/kaluga/base/text/KalugaDateFormatter : com/splend
 	public fun getPmString ()Ljava/lang/String;
 	public fun getShortMonths ()Ljava/util/List;
 	public fun getShortWeekdays ()Ljava/util/List;
-	public fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public fun getTimeZone ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 	public fun getWeekdays ()Ljava/util/List;
 	public fun parse (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public fun setAmString (Ljava/lang/String;)V
@@ -435,30 +435,30 @@ public final class com/splendo/kaluga/base/text/KalugaDateFormatter : com/splend
 	public fun setPmString (Ljava/lang/String;)V
 	public fun setShortMonths (Ljava/util/List;)V
 	public fun setShortWeekdays (Ljava/util/List;)V
-	public fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public fun setTimeZone (Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)V
 	public fun setWeekdays (Ljava/util/List;)V
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatter$Companion {
-	public final fun dateFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun patternFormat (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun patternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun timeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun timeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun dateFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun patternFormat (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun patternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun timeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun timeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatterKt {
-	public static final fun dateFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static final fun fixedPatternFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/TimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun fixedPatternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/TimeZone;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static final fun iso8601Pattern (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun iso8601Pattern$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun dateFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun fixedPatternFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun fixedPatternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun iso8601Pattern (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun iso8601Pattern$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 }
 
 public abstract class com/splendo/kaluga/base/text/NumberFormatStyle {
@@ -957,7 +957,7 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 	public fun getMinute ()I
 	public fun getMonth ()I
 	public fun getSecond ()I
-	public fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public fun getTimeZone ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 	public fun getWeekDay ()I
 	public fun getWeekOfMonth ()I
 	public fun getWeekOfYear ()I
@@ -973,7 +973,7 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 	public fun setMinute (I)V
 	public fun setMonth (I)V
 	public fun setSecond (I)V
-	public fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public fun setTimeZone (Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)V
 	public fun setWeekDay (I)V
 	public fun setWeekOfMonth (I)V
 	public fun setWeekOfYear (I)V
@@ -981,10 +981,10 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 }
 
 public final class com/splendo/kaluga/base/utils/DefaultKalugaDate$Companion {
-	public final fun epoch (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun now (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun epoch (JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun now (JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
 public final class com/splendo/kaluga/base/utils/Deferred_getCompletedOrNullKt {
@@ -1017,7 +1017,7 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public abstract fun getMinute ()I
 	public abstract fun getMonth ()I
 	public abstract fun getSecond ()I
-	public abstract fun getTimeZone ()Lcom/splendo/kaluga/base/utils/TimeZone;
+	public abstract fun getTimeZone ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 	public abstract fun getWeekDay ()I
 	public abstract fun getWeekOfMonth ()I
 	public abstract fun getWeekOfYear ()I
@@ -1033,7 +1033,7 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public abstract fun setMinute (I)V
 	public abstract fun setMonth (I)V
 	public abstract fun setSecond (I)V
-	public abstract fun setTimeZone (Lcom/splendo/kaluga/base/utils/TimeZone;)V
+	public abstract fun setTimeZone (Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)V
 	public abstract fun setWeekDay (I)V
 	public abstract fun setWeekOfMonth (I)V
 	public abstract fun setWeekOfYear (I)V
@@ -1059,10 +1059,33 @@ public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
 	public static synthetic fun nowUtc$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun plus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun toStartOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun tomorrow (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun tomorrow (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaTimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
+	public static final field Companion Lcom/splendo/kaluga/base/utils/KalugaTimeZone$Companion;
+	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
+	public fun copy ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
+	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getDaylightSavingsOffsetInMilliseconds ()J
+	public fun getIdentifier ()Ljava/lang/String;
+	public fun getOffsetFromGMTInMilliseconds ()J
+	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaTimeZone$Companion {
+	public final fun current ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
+	public final fun get (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
+	public final fun getAvailableIdentifiers ()Ljava/util/List;
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaTimeZoneKt {
+	public static final fun getUtc (Lcom/splendo/kaluga/base/utils/KalugaTimeZone$Companion;)Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 }
 
 public final class com/splendo/kaluga/base/utils/Locale : com/splendo/kaluga/base/utils/BaseLocale {
@@ -1116,29 +1139,6 @@ public final class com/splendo/kaluga/base/utils/RoundingMode$RoundUp : com/sple
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/RoundingMode$RoundUp;
 }
 
-public final class com/splendo/kaluga/base/utils/TimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
-	public static final field Companion Lcom/splendo/kaluga/base/utils/TimeZone$Companion;
-	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDaylightSavingsOffsetInMilliseconds ()J
-	public fun getIdentifier ()Ljava/lang/String;
-	public fun getOffsetFromGMTInMilliseconds ()J
-	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-}
-
-public final class com/splendo/kaluga/base/utils/TimeZone$Companion {
-	public final fun current ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun get (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun getAvailableIdentifiers ()Ljava/util/List;
-}
-
-public final class com/splendo/kaluga/base/utils/TimeZoneKt {
-	public static final fun getUtc (Lcom/splendo/kaluga/base/utils/TimeZone$Companion;)Lcom/splendo/kaluga/base/utils/TimeZone;
-}
-
 public final class com/splendo/kaluga/base/utils/TimeZoneNameStyle : java/lang/Enum {
 	public static final field Long Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;
 	public static final field Short Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;
diff --git a/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt b/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
index 0f9f6e3c9..bb053e271 100644
--- a/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
@@ -21,7 +21,7 @@ package com.splendo.kaluga.base.text
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
 import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.TimeZone
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 import java.text.DateFormat
 import java.text.DateFormatSymbols
 import java.text.ParseException
@@ -38,24 +38,24 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
         /**
          * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun dateFormat(
             style: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun timeFormat(
             style: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getTimeInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
@@ -63,13 +63,13 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
          * Creates a [KalugaDateFormatter] that formats both date and time components of a [KalugaDate]
          * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateTimeInstance(dateStyle.javaStyle(), timeStyle.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
@@ -79,12 +79,12 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
          * To prevent this, ensure that the provided [locale] is of a `POSIX` type.
          * A convenience [fixedPatternFormat] method exists to default to this behaviour.
          * @param pattern The pattern to apply.
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
-        actual fun patternFormat(pattern: String, timeZone: TimeZone, locale: Locale): KalugaDateFormatter = createDateFormatter(SimpleDateFormat(pattern, locale.locale), timeZone)
+        actual fun patternFormat(pattern: String, timeZone: KalugaTimeZone, locale: Locale): KalugaDateFormatter = createDateFormatter(SimpleDateFormat(pattern, locale.locale), timeZone)
 
-        private fun createDateFormatter(simpleDateFormat: SimpleDateFormat, timeZone: TimeZone): KalugaDateFormatter {
+        private fun createDateFormatter(simpleDateFormat: SimpleDateFormat, timeZone: KalugaTimeZone): KalugaDateFormatter {
             return KalugaDateFormatter(simpleDateFormat).apply {
                 this.timeZone = timeZone
             }
@@ -97,8 +97,8 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
         get() = format.toPattern()
         set(value) = format.applyPattern(value)
 
-    override var timeZone: TimeZone
-        get() = TimeZone(format.timeZone)
+    override var timeZone: KalugaTimeZone
+        get() = KalugaTimeZone(format.timeZone)
         set(value) { format.timeZone = value.timeZone }
 
     override var eras: List<String>
diff --git a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
index 38357dddc..f155bccde 100644
--- a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
@@ -32,11 +32,11 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
         /**
          * Creates a [KalugaDate] relative to the current time
          * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
-         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun now(offsetInMilliseconds: Long, timeZone: KalugaTimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 add(Calendar.MILLISECOND, offsetInMilliseconds.toInt())
             }
@@ -45,19 +45,19 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
          * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
-         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun epoch(offsetInMilliseconds: Long, timeZone: KalugaTimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 timeInMillis = offsetInMilliseconds
             }
         )
     }
 
-    override var timeZone: TimeZone
-        get() = TimeZone(calendar.timeZone)
+    override var timeZone: KalugaTimeZone
+        get() = KalugaTimeZone(calendar.timeZone)
         set(value) { calendar.timeZone = value.timeZone }
 
     override var era: Int
diff --git a/base/src/androidLibMain/kotlin/utils/TimeZone.kt b/base/src/androidLibMain/kotlin/utils/KalugaTimeZone.kt
similarity index 63%
rename from base/src/androidLibMain/kotlin/utils/TimeZone.kt
rename to base/src/androidLibMain/kotlin/utils/KalugaTimeZone.kt
index 8c4ea0c42..6ef7a5102 100644
--- a/base/src/androidLibMain/kotlin/utils/TimeZone.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaTimeZone.kt
@@ -20,31 +20,31 @@ package com.splendo.kaluga.base.utils
 /**
  * A default implementation of [BaseTimeZone].
  */
-actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) : BaseTimeZone() {
+actual class KalugaTimeZone internal constructor(internal val timeZone: java.util.TimeZone) : BaseTimeZone() {
 
     actual companion object {
 
         /**
-         * Gets a [TimeZone] based on a given Identifier
-         * @param identifier The identifier to create a [TimeZone] for
-         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         * Gets a [KalugaTimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [KalugaTimeZone] for
+         * @return The [KalugaTimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
          */
-        actual fun get(identifier: String): TimeZone? {
+        actual fun get(identifier: String): KalugaTimeZone? {
             return java.util.TimeZone.getTimeZone(identifier)?.let {
-                TimeZone(it)
+                KalugaTimeZone(it)
             }
         }
 
         /**
-         * Gets the current [TimeZone] configured by the user
-         * @return The current [TimeZone] of the user
+         * Gets the current [KalugaTimeZone] configured by the user
+         * @return The current [KalugaTimeZone] of the user
          */
-        actual fun current(): TimeZone {
-            return TimeZone(java.util.TimeZone.getDefault())
+        actual fun current(): KalugaTimeZone {
+            return KalugaTimeZone(java.util.TimeZone.getDefault())
         }
 
         /**
-         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         * List of available identifiers associated with [KalugaTimeZone]s. All elements in this list can be used for creating a [KalugaTimeZone] using [KalugaTimeZone.get]
          */
         actual val availableIdentifiers get() = java.util.TimeZone.getAvailableIDs().asList()
     }
@@ -61,8 +61,8 @@ actual class TimeZone internal constructor(internal val timeZone: java.util.Time
     override val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
     override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
     override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
-    override fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
+    override fun copy(): KalugaTimeZone = KalugaTimeZone(timeZone.clone() as java.util.TimeZone)
     override fun equals(other: Any?): Boolean {
-        return (other as? TimeZone)?.let { timeZone == other.timeZone } ?: false
+        return (other as? KalugaTimeZone)?.let { timeZone == other.timeZone } ?: false
     }
 }
diff --git a/base/src/commonMain/kotlin/text/FormatSpecifier.kt b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
index a166b492d..b5d4e2dd1 100644
--- a/base/src/commonMain/kotlin/text/FormatSpecifier.kt
+++ b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
@@ -21,7 +21,7 @@ import com.splendo.kaluga.base.text.StringFormatter.Companion.getZero
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
 import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.TimeZone
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.TimeZoneNameStyle
 import com.splendo.kaluga.base.utils.toHexString
 import kotlin.math.abs
@@ -108,7 +108,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
             is Long,
             is Int,
             is Short -> {
-                DefaultKalugaDate.epoch((arg as Number).toLong(), TimeZone.current(), locale)
+                DefaultKalugaDate.epoch((arg as Number).toLong(), KalugaTimeZone.current(), locale)
             }
             is KalugaDate -> {
                 arg.copy()
@@ -398,7 +398,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
             DateTime.AM_PM -> {
                 // 'p' (am or pm)
                 val isAm = time.hour < 12
-                val dateFormat = KalugaDateFormatter.patternFormat("aa", TimeZone.current(), locale)
+                val dateFormat = KalugaDateFormatter.patternFormat("aa", KalugaTimeZone.current(), locale)
                 sb.append((if (isAm) dateFormat.amString else dateFormat.pmString).lowerCased(locale))
             }
             DateTime.SECONDS_SINCE_EPOCH -> {
diff --git a/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt b/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
index 3f2dfa0a9..7d17fb85b 100644
--- a/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.text
 import com.splendo.kaluga.base.utils.KalugaDate
 import com.splendo.kaluga.base.utils.Locale
 import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
-import com.splendo.kaluga.base.utils.TimeZone
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.enUsPosix
 
 /**
@@ -56,9 +56,9 @@ interface BaseDateFormatter {
     var pattern: String
 
     /**
-     * The [TimeZone] this [KalugaDateFormatter] formats its dates to.
+     * The [KalugaTimeZone] this [KalugaDateFormatter] formats its dates to.
      */
-    var timeZone: TimeZone
+    var timeZone: KalugaTimeZone
 
     /**
      * A list containing the names of all eras used by this date formatter.
@@ -118,24 +118,24 @@ expect class KalugaDateFormatter : BaseDateFormatter {
         /**
          * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         fun dateFormat(
             style: DateFormatStyle = DateFormatStyle.Medium,
-            timeZone: TimeZone = TimeZone.current(),
+            timeZone: KalugaTimeZone = KalugaTimeZone.current(),
             locale: Locale = defaultLocale
         ): KalugaDateFormatter
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         fun timeFormat(
             style: DateFormatStyle = DateFormatStyle.Medium,
-            timeZone: TimeZone = TimeZone.current(),
+            timeZone: KalugaTimeZone = KalugaTimeZone.current(),
             locale: Locale = defaultLocale
         ): KalugaDateFormatter
 
@@ -143,13 +143,13 @@ expect class KalugaDateFormatter : BaseDateFormatter {
          * Creates a [KalugaDateFormatter] that formats both date and time components of a [KalugaDate]
          * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         fun dateTimeFormat(
             dateStyle: DateFormatStyle = DateFormatStyle.Medium,
             timeStyle: DateFormatStyle = DateFormatStyle.Medium,
-            timeZone: TimeZone = TimeZone.current(),
+            timeZone: KalugaTimeZone = KalugaTimeZone.current(),
             locale: Locale = defaultLocale
         ): KalugaDateFormatter
 
@@ -159,12 +159,12 @@ expect class KalugaDateFormatter : BaseDateFormatter {
          * To prevent this, ensure that the provided [locale] is of a `POSIX` type.
          * A convenience [fixedPatternFormat] method exists to default to this behaviour.
          * @param pattern The pattern to apply.
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         fun patternFormat(
             pattern: String,
-            timeZone: TimeZone = TimeZone.current(),
+            timeZone: KalugaTimeZone = KalugaTimeZone.current(),
             locale: Locale = defaultLocale
         ): KalugaDateFormatter
     }
@@ -177,27 +177,27 @@ typealias DateFormatter = KalugaDateFormatter
  * Creates a fixed [KalugaDateFormatter] using a custom Date format pattern, localized by the [Locale.enUsPosix] [Locale].
  * Use this to ensure that displaying time in 12 or 24 hour format is not overridden by the user.
  * @param pattern The pattern to apply.
- * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+ * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
  */
-fun KalugaDateFormatter.Companion.fixedPatternFormat(pattern: String, timeZone: TimeZone = TimeZone.current()) = patternFormat(pattern, timeZone, Locale.enUsPosix)
+fun KalugaDateFormatter.Companion.fixedPatternFormat(pattern: String, timeZone: KalugaTimeZone = KalugaTimeZone.current()) = patternFormat(pattern, timeZone, Locale.enUsPosix)
 
 /**
  * Creates a [KalugaDateFormatter] that formats time according to the ISo 8601 format.
- * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+ * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
  */
-fun KalugaDateFormatter.Companion.iso8601Pattern(timeZone: TimeZone = TimeZone.current()) = fixedPatternFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", timeZone)
+fun KalugaDateFormatter.Companion.iso8601Pattern(timeZone: KalugaTimeZone = KalugaTimeZone.current()) = fixedPatternFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", timeZone)
 
 /**
  * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
  * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
  * @param excludeYear When [true] the year will not be part of the format.
- * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+ * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
  * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
  */
 fun KalugaDateFormatter.Companion.dateFormat(
     style: DateFormatStyle = DateFormatStyle.Medium,
     excludeYear: Boolean,
-    timeZone: TimeZone = TimeZone.current(),
+    timeZone: KalugaTimeZone = KalugaTimeZone.current(),
     locale: Locale = defaultLocale
 ): KalugaDateFormatter {
     val formatWithYear = dateFormat(style, timeZone, locale)
@@ -213,14 +213,14 @@ fun KalugaDateFormatter.Companion.dateFormat(
  * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
  * @param excludeYear When [true] the year will not be part of the format.
  * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
- * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+ * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
  * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
  */
 fun KalugaDateFormatter.Companion.dateTimeFormat(
     dateStyle: DateFormatStyle = DateFormatStyle.Medium,
     excludeYear: Boolean,
     timeStyle: DateFormatStyle = DateFormatStyle.Medium,
-    timeZone: TimeZone = TimeZone.current(),
+    timeZone: KalugaTimeZone = KalugaTimeZone.current(),
     locale: Locale = defaultLocale
 ): KalugaDateFormatter {
     val formatWithYear = dateTimeFormat(dateStyle, timeStyle, timeZone, locale)
diff --git a/base/src/commonMain/kotlin/utils/KalugaDate.kt b/base/src/commonMain/kotlin/utils/KalugaDate.kt
index 23f625ec4..521208878 100644
--- a/base/src/commonMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaDate.kt
@@ -30,13 +30,13 @@ expect class KalugaDateHolder
 
 /**
  * Class describing a point in time
- * Dates are localized according to a [Locale] and relative to a given [TimeZone]
+ * Dates are localized according to a [Locale] and relative to a given [KalugaTimeZone]
  */
 abstract class KalugaDate : Comparable<KalugaDate> {
     /**
-     * The [TimeZone] in which the Date is set
+     * The [KalugaTimeZone] in which the Date is set
      */
-    abstract var timeZone: TimeZone
+    abstract var timeZone: KalugaTimeZone
 
     /**
      * The number of the era, e.g., AD or BC in the Julian calendar
@@ -147,20 +147,20 @@ expect class DefaultKalugaDate : KalugaDate {
         /**
          * Creates a [KalugaDate] relative to the current time
          * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
-         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        fun now(offsetInMilliseconds: Long = 0L, timeZone: TimeZone = TimeZone.current(), locale: Locale = Locale.defaultLocale): KalugaDate
+        fun now(offsetInMilliseconds: Long = 0L, timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: Locale = Locale.defaultLocale): KalugaDate
 
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
          * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
-         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        fun epoch(offsetInMilliseconds: Long = 0L, timeZone: TimeZone = TimeZone.current(), locale: Locale = Locale.defaultLocale): KalugaDate
+        fun epoch(offsetInMilliseconds: Long = 0L, timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: Locale = Locale.defaultLocale): KalugaDate
     }
 }
 
@@ -168,9 +168,9 @@ expect class DefaultKalugaDate : KalugaDate {
 typealias Date = KalugaDate
 
 /**
- * Creates a [KalugaDate] with the same [Locale] and [TimeZone] as the left date, but earlier by the right date millisecondSinceEpoch
+ * Creates a [KalugaDate] with the same [Locale] and [KalugaTimeZone] as the left date, but earlier by the right date millisecondSinceEpoch
  * @param date The [KalugaDate] of which the millisecondSinceEpoch to subtract should be retrieved
- * @return A new [KalugaDate] with the same [Locale] and [TimeZone] as the left date, but earlier by the right date millisecondSinceEpoch
+ * @return A new [KalugaDate] with the same [Locale] and [KalugaTimeZone] as the left date, but earlier by the right date millisecondSinceEpoch
  */
 operator fun KalugaDate.minus(date: KalugaDate): KalugaDate {
     return copy().apply {
@@ -179,9 +179,9 @@ operator fun KalugaDate.minus(date: KalugaDate): KalugaDate {
 }
 
 /**
- * Creates a [KalugaDate] with the same [Locale] and [TimeZone] as the left date, but later by the right date millisecondSinceEpoch
+ * Creates a [KalugaDate] with the same [Locale] and [KalugaTimeZone] as the left date, but later by the right date millisecondSinceEpoch
  * @param date The [KalugaDate] of which the millisecondSinceEpoch to add should be retrieved
- * @return A new [KalugaDate] with the same [Locale] and [TimeZone] as the left date, but later by the right date millisecondSinceEpoch
+ * @return A new [KalugaDate] with the same [Locale] and [KalugaTimeZone] as the left date, but later by the right date millisecondSinceEpoch
  */
 operator fun KalugaDate.plus(date: KalugaDate): KalugaDate {
     return copy().apply {
@@ -196,7 +196,7 @@ operator fun KalugaDate.plus(date: KalugaDate): KalugaDate {
  * @return A [KalugaDate] relative to the current time, in the UTC timezone
  */
 fun DefaultKalugaDate.Companion.nowUtc(offsetInMilliseconds: Long = 0L, locale: Locale = defaultLocale): KalugaDate =
-    now(offsetInMilliseconds, TimeZone.utc, locale)
+    now(offsetInMilliseconds, KalugaTimeZone.utc, locale)
 
 /**
  * Gets a [KalugaDate] equal to midnight on the same day as this Date
@@ -211,19 +211,19 @@ fun KalugaDate.toStartOfDay() = this.copy().apply {
 
 /**
  * Gets a [KalugaDate] that is set at midnight on the same day as the current time.
- * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+ * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
  * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
  * @return A [KalugaDate] that is set at midnight on the same day as the current time.
  */
-fun DefaultKalugaDate.Companion.today(timeZone: TimeZone = TimeZone.current(), locale: Locale = defaultLocale) = now(timeZone = timeZone, locale = locale).toStartOfDay()
+fun DefaultKalugaDate.Companion.today(timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: Locale = defaultLocale) = now(timeZone = timeZone, locale = locale).toStartOfDay()
 
 /**
  * Gets a [KalugaDate] that is set at midnight on the day after the current time.
- * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+ * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
  * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
  * @return A [KalugaDate] that is set at midnight on the day after the current time.
  */
-fun DefaultKalugaDate.Companion.tomorrow(timeZone: TimeZone = TimeZone.current(), locale: Locale = defaultLocale) = today(timeZone = timeZone, locale = locale).apply { day += 1 }
+fun DefaultKalugaDate.Companion.tomorrow(timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: Locale = defaultLocale) = today(timeZone = timeZone, locale = locale).apply { day += 1 }
 
 /**
  * Checks whether a [KalugaDate] is on the same day as a given Date.
diff --git a/base/src/commonMain/kotlin/utils/TimeZone.kt b/base/src/commonMain/kotlin/utils/KalugaTimeZone.kt
similarity index 54%
rename from base/src/commonMain/kotlin/utils/TimeZone.kt
rename to base/src/commonMain/kotlin/utils/KalugaTimeZone.kt
index 753c9a465..bd456724b 100644
--- a/base/src/commonMain/kotlin/utils/TimeZone.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaTimeZone.kt
@@ -21,26 +21,26 @@ import com.splendo.kaluga.base.utils.DefaultKalugaDate.Companion.now
 import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
 
 /**
- * Style for writing the name of a [TimeZone]
+ * Style for writing the name of a [KalugaTimeZone]
  * Can be either [Short] or [Long]
  */
 enum class TimeZoneNameStyle {
 
     /**
-     * A style specifier for [TimeZone.displayName] indicating a short name, such as "CET"
+     * A style specifier for [KalugaTimeZone.displayName] indicating a short name, such as "CET"
      */
     Short,
 
     /**
-     * A style specifier for [TimeZone.displayName] indicating a long name, such as "Central European Time"
+     * A style specifier for [KalugaTimeZone.displayName] indicating a long name, such as "Central European Time"
      */
     Long
 }
 
 /**
- * Gets the UTC [TimeZone]
+ * Gets the UTC [KalugaTimeZone]
  */
-val TimeZone.Companion.utc: TimeZone by lazy { TimeZone.get("UTC")!! }
+val KalugaTimeZone.Companion.utc: KalugaTimeZone by lazy { KalugaTimeZone.get("UTC")!! }
 
 /**
  * A TimeZone represents a time zone. Accounts for Daylight Savings
@@ -48,15 +48,15 @@ val TimeZone.Companion.utc: TimeZone by lazy { TimeZone.get("UTC")!! }
 abstract class BaseTimeZone {
 
     /**
-     * The identifier of the [TimeZone]
+     * The identifier of the [KalugaTimeZone]
      */
     abstract val identifier: String
 
     /**
-     * Gets the display name for this [TimeZone] formatted for a given [Locale]
+     * Gets the display name for this [KalugaTimeZone] formatted for a given [Locale]
      * @param style The [TimeZoneNameStyle] of the name. Can be either [TimeZoneNameStyle.Short] or [TimeZoneNameStyle.Long]
-     * @param withDaylightSavings If `true` the name for the DaylightSavings version of the [TimeZone] will be used. Defaults to [TimeZone.usesDaylightSavingsTime]
-     * @param locale The [Locale] used for naming the [TimeZone]. Defaults to [Locale.defaultLocale]
+     * @param withDaylightSavings If `true` the name for the DaylightSavings version of the [KalugaTimeZone] will be used. Defaults to [KalugaTimeZone.usesDaylightSavingsTime]
+     * @param locale The [Locale] used for naming the [KalugaTimeZone]. Defaults to [Locale.defaultLocale]
      */
     abstract fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean = usesDaylightSavingsTime(), locale: Locale = defaultLocale): String
 
@@ -71,21 +71,21 @@ abstract class BaseTimeZone {
     abstract val daylightSavingsOffsetInMilliseconds: Long
 
     /**
-     * The number of milliseconds this [TimeZone] differs from GMT at a given [KalugaDate]
+     * The number of milliseconds this [KalugaTimeZone] differs from GMT at a given [KalugaDate]
      * @param date The [KalugaDate] for which to check the offset. Defaults to [DefaultKalugaDate.now]
-     * @return The number of milliseconds this [TimeZone] differs from GMT at [date]
+     * @return The number of milliseconds this [KalugaTimeZone] differs from GMT at [date]
      */
     abstract fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate = now()): Long
 
     /**
-     * Returns `true` if this [TimeZone] is observing daylight savings at a given [KalugaDate]
+     * Returns `true` if this [KalugaTimeZone] is observing daylight savings at a given [KalugaDate]
      * @param date The [KalugaDate] for which to check whether daylight savings is observed. Defaults to [KalugaDate.now]
-     * @return `true` if this [TimeZone] if observing daylight savings at [date]
+     * @return `true` if this [KalugaTimeZone] if observing daylight savings at [date]
      */
     abstract fun usesDaylightSavingsTime(date: KalugaDate = now()): Boolean
 
     /**
-     * Creates a copy of this [TimeZone]
+     * Creates a copy of this [KalugaTimeZone]
      */
     abstract fun copy(): BaseTimeZone
 
@@ -95,25 +95,28 @@ abstract class BaseTimeZone {
 /**
  * A default implementation of [BaseTimeZone].
  */
-expect class TimeZone : BaseTimeZone {
+expect class KalugaTimeZone : BaseTimeZone {
     companion object {
 
         /**
-         * Gets a [TimeZone] based on a given Identifier
-         * @param identifier The identifier to create a [TimeZone] for
-         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         * Gets a [KalugaTimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [KalugaTimeZone] for
+         * @return The [KalugaTimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
          */
-        fun get(identifier: String): TimeZone?
+        fun get(identifier: String): KalugaTimeZone?
 
         /**
-         * Gets the current [TimeZone] configured by the user
-         * @return The current [TimeZone] of the user
+         * Gets the current [KalugaTimeZone] configured by the user
+         * @return The current [KalugaTimeZone] of the user
          */
-        fun current(): TimeZone
+        fun current(): KalugaTimeZone
 
         /**
-         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         * List of available identifiers associated with [KalugaTimeZone]s. All elements in this list can be used for creating a [KalugaTimeZone] using [KalugaTimeZone.get]
          */
         val availableIdentifiers: List<String>
     }
 }
+
+@Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaTimeZone"))
+typealias TimeZone = KalugaTimeZone
diff --git a/base/src/commonTest/kotlin/text/DateFormatterTest.kt b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
index 748628579..b54ad0882 100644
--- a/base/src/commonTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.text
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.Locale
 import com.splendo.kaluga.base.utils.Locale.Companion.createLocale
-import com.splendo.kaluga.base.utils.TimeZone
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.enUsPosix
 import com.splendo.kaluga.base.utils.nowUtc
 import com.splendo.kaluga.base.utils.utc
@@ -35,7 +35,7 @@ class DateFormatterTest {
     companion object {
         private val UnitedStatesLocale = createLocale("en", "US")
         private val FranceLocale = createLocale("fr", "FR")
-        private val PSTTimeZone = TimeZone.get("America/Los_Angeles")!!
+        private val PSTTimeZone = KalugaTimeZone.get("America/Los_Angeles")!!
 
         private val January81988 = DefaultKalugaDate.epoch(568627200000)
         private val March181988 = DefaultKalugaDate.epoch(574695462750)
@@ -71,8 +71,8 @@ class DateFormatterTest {
 
     @Test
     fun testDateFormat() {
-        val usFormatter = KalugaDateFormatter.dateFormat(DateFormatStyle.Medium, TimeZone.utc, UnitedStatesLocale)
-        val frFormatter = KalugaDateFormatter.dateFormat(DateFormatStyle.Medium, TimeZone.utc, FranceLocale)
+        val usFormatter = KalugaDateFormatter.dateFormat(DateFormatStyle.Medium, KalugaTimeZone.utc, UnitedStatesLocale)
+        val frFormatter = KalugaDateFormatter.dateFormat(DateFormatStyle.Medium, KalugaTimeZone.utc, FranceLocale)
 
         assertEquals("Jan 8, 1988", usFormatter.format(January81988))
         assertEquals("8 janv. 1988", frFormatter.format(January81988))
@@ -80,8 +80,8 @@ class DateFormatterTest {
 
     @Test
     fun testDateFormatWithoutYear() {
-        val usFormatter = KalugaDateFormatter.dateFormat(DateFormatStyle.Medium, true, TimeZone.utc, UnitedStatesLocale)
-        val frFormatter = KalugaDateFormatter.dateFormat(DateFormatStyle.Medium, true, TimeZone.utc, FranceLocale)
+        val usFormatter = KalugaDateFormatter.dateFormat(DateFormatStyle.Medium, true, KalugaTimeZone.utc, UnitedStatesLocale)
+        val frFormatter = KalugaDateFormatter.dateFormat(DateFormatStyle.Medium, true, KalugaTimeZone.utc, FranceLocale)
 
         assertEquals("Jan 8", usFormatter.format(January81988))
         assertEquals("8 janv.", frFormatter.format(January81988))
@@ -90,8 +90,8 @@ class DateFormatterTest {
     @Test
     @Ignore // android emulator 23 does not correctly format the french locale
     fun testTimeFormat() {
-        val usFormatter = KalugaDateFormatter.timeFormat(DateFormatStyle.Medium, TimeZone.utc, UnitedStatesLocale)
-        val frFormatter = KalugaDateFormatter.timeFormat(DateFormatStyle.Medium, TimeZone.utc, FranceLocale)
+        val usFormatter = KalugaDateFormatter.timeFormat(DateFormatStyle.Medium, KalugaTimeZone.utc, UnitedStatesLocale)
+        val frFormatter = KalugaDateFormatter.timeFormat(DateFormatStyle.Medium, KalugaTimeZone.utc, FranceLocale)
 
         assertEquals("1:37:42 PM", usFormatter.format(March181988))
         assertEquals("13:37:42", frFormatter.format(March181988))
@@ -99,25 +99,25 @@ class DateFormatterTest {
 
     @Test
     fun testFormatFixedDate() {
-        val formatter = KalugaDateFormatter.iso8601Pattern(TimeZone.utc)
+        val formatter = KalugaDateFormatter.iso8601Pattern(KalugaTimeZone.utc)
         assertEquals("1988-03-18T13:37:42.750+0000", formatter.format(March181988))
     }
 
     @Test
     fun testFailToParseInvalidString() {
-        val formatter = KalugaDateFormatter.iso8601Pattern(TimeZone.utc)
+        val formatter = KalugaDateFormatter.iso8601Pattern(KalugaTimeZone.utc)
         assertNull(formatter.parse("invalid date"))
     }
 
     @Test
     fun testParseDateWithDifferentTimezone() {
-        val utcFormatter = KalugaDateFormatter.patternFormat("yyyy.MM.dd G 'at' HH:mm:ss z", TimeZone.utc, Locale.enUsPosix)
+        val utcFormatter = KalugaDateFormatter.patternFormat("yyyy.MM.dd G 'at' HH:mm:ss z", KalugaTimeZone.utc, Locale.enUsPosix)
         val pstFormatter = KalugaDateFormatter.patternFormat("yyyy.MM.dd G 'at' HH:mm:ss z", PSTTimeZone, Locale.enUsPosix)
 
-        val epochInUtc = DefaultKalugaDate.epoch(timeZone = TimeZone.utc, locale = Locale.enUsPosix)
+        val epochInUtc = DefaultKalugaDate.epoch(timeZone = KalugaTimeZone.utc, locale = Locale.enUsPosix)
         val epochInPst = DefaultKalugaDate.epoch(timeZone = PSTTimeZone, locale = Locale.enUsPosix)
-        assertEquals("1970.01.01 AD at 00:00:00 ${TimeZone.utc.identifier}", utcFormatter.format(epochInUtc))
-        assertEquals("1970.01.01 AD at 00:00:00 ${TimeZone.utc.identifier}", utcFormatter.format(epochInPst))
+        assertEquals("1970.01.01 AD at 00:00:00 ${KalugaTimeZone.utc.identifier}", utcFormatter.format(epochInUtc))
+        assertEquals("1970.01.01 AD at 00:00:00 ${KalugaTimeZone.utc.identifier}", utcFormatter.format(epochInPst))
         assertEquals("1969.12.31 AD at 16:00:00 PST", pstFormatter.format(epochInUtc))
         assertEquals("1969.12.31 AD at 16:00:00 PST", pstFormatter.format(epochInPst))
         assertEquals(epochInUtc, utcFormatter.parse(utcFormatter.format(epochInUtc)))
diff --git a/base/src/commonTest/kotlin/text/StringFormatterTest.kt b/base/src/commonTest/kotlin/text/StringFormatterTest.kt
index 649aa19e9..dadb38a36 100644
--- a/base/src/commonTest/kotlin/text/StringFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/StringFormatterTest.kt
@@ -19,7 +19,7 @@ package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.Locale.Companion.createLocale
-import com.splendo.kaluga.base.utils.TimeZone
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
@@ -443,7 +443,7 @@ class StringFormatterTest {
 
     @Test
     fun testFormatDate() {
-        val date = DefaultKalugaDate.now(timeZone = TimeZone.get("America/Los_Angeles")!!, locale = locale).apply {
+        val date = DefaultKalugaDate.now(timeZone = KalugaTimeZone.get("America/Los_Angeles")!!, locale = locale).apply {
             year = 2020
             month = 7
             day = 23
diff --git a/base/src/commonTest/kotlin/utils/DateTest.kt b/base/src/commonTest/kotlin/utils/DateTest.kt
index 9d6014cab..80438ef85 100644
--- a/base/src/commonTest/kotlin/utils/DateTest.kt
+++ b/base/src/commonTest/kotlin/utils/DateTest.kt
@@ -19,7 +19,7 @@ package com.splendo.kaluga.base.test.utils
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.TimeZone
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.enUsPosix
 import com.splendo.kaluga.base.utils.nowUtc
 import com.splendo.kaluga.base.utils.plus
@@ -46,7 +46,7 @@ class DateTest {
     fun testUTCDate() {
         val utcNow = DefaultKalugaDate.nowUtc(locale = Locale.enUsPosix)
         val epochNow = utcNow.millisecondSinceEpoch
-        val now = DefaultKalugaDate.epoch(epochNow, TimeZone.utc, locale = Locale.enUsPosix)
+        val now = DefaultKalugaDate.epoch(epochNow, KalugaTimeZone.utc, locale = Locale.enUsPosix)
         assertEquals(utcNow.millisecondSinceEpoch, now.millisecondSinceEpoch)
         assertEquals(utcNow, now)
     }
@@ -86,7 +86,7 @@ class DateTest {
 
     @Test
     fun testGet() {
-        val someDay = DefaultKalugaDate.epoch(574695462750, TimeZone.utc, locale = Locale.enUsPosix)
+        val someDay = DefaultKalugaDate.epoch(574695462750, KalugaTimeZone.utc, locale = Locale.enUsPosix)
 
         assertEquals(1, someDay.era)
         assertEquals(1988, someDay.year)
@@ -108,8 +108,8 @@ class DateTest {
         val france = Locale.createLocale("fr", "FR")
         val us = Locale.createLocale("en", "US")
 
-        val frenchNow = DefaultKalugaDate.now(0, TimeZone.utc, france)
-        val usNow = DefaultKalugaDate.now(0, TimeZone.utc, us)
+        val frenchNow = DefaultKalugaDate.now(0, KalugaTimeZone.utc, france)
+        val usNow = DefaultKalugaDate.now(0, KalugaTimeZone.utc, us)
 
         assertEquals(2, frenchNow.firstWeekDay)
         assertEquals(1, usNow.firstWeekDay)
@@ -117,7 +117,7 @@ class DateTest {
 
     @Test
     fun testDaylightSavings() {
-        val dayBeforeDLS = DefaultKalugaDate.epoch(1616828400000, locale = Locale.createLocale("nl", "NL"), timeZone = TimeZone.get("Europe/Amsterdam")!!)
+        val dayBeforeDLS = DefaultKalugaDate.epoch(1616828400000, locale = Locale.createLocale("nl", "NL"), timeZone = KalugaTimeZone.get("Europe/Amsterdam")!!)
         val startOfDayBeforeDLS = dayBeforeDLS.toStartOfDay()
         assertEquals(0, startOfDayBeforeDLS.hour)
         assertEquals(27, startOfDayBeforeDLS.day)
diff --git a/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt b/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
index 7145e1199..9d37f7025 100644
--- a/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.text
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
 import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.TimeZone
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.typedList
 import platform.Foundation.NSCalendar
 import platform.Foundation.NSDateFormatter
@@ -41,24 +41,24 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
         /**
          * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun dateFormat(
             style: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(style, null, timeZone, locale)
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun timeFormat(
             style: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(null, style, timeZone, locale)
 
@@ -66,13 +66,13 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
          * Creates a [KalugaDateFormatter] that formats both date and time components of a [KalugaDate]
          * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(dateStyle, timeStyle, timeZone, locale)
 
@@ -82,10 +82,10 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
          * To prevent this, ensure that the provided [locale] is of a `POSIX` type.
          * A convenience [fixedPatternFormat] method exists to default to this behaviour.
          * @param pattern The pattern to apply.
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
-        actual fun patternFormat(pattern: String, timeZone: TimeZone, locale: Locale): KalugaDateFormatter = KalugaDateFormatter(
+        actual fun patternFormat(pattern: String, timeZone: KalugaTimeZone, locale: Locale): KalugaDateFormatter = KalugaDateFormatter(
             NSDateFormatter().apply {
                 this.locale = locale.nsLocale
                 this.timeZone = timeZone.timeZone
@@ -97,7 +97,7 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
         fun createDateFormatter(
             dateStyle: DateFormatStyle?,
             timeStyle: DateFormatStyle?,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = KalugaDateFormatter(
             NSDateFormatter().apply {
@@ -111,7 +111,7 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
 
         // Due to a problem related to the commonizer we need to supply all the
         // default arguments expected from the method signature
-        private fun defaultDate(timeZone: TimeZone) =
+        private fun defaultDate(timeZone: KalugaTimeZone) =
             DefaultKalugaDate.now(
                 offsetInMilliseconds = 0L,
                 timeZone = timeZone,
@@ -122,7 +122,7 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
                 // TODO When moving Date and Date formatter to separate modules, this should be updated to use .utc
                 val epoch = DefaultKalugaDate.epoch(
                     offsetInMilliseconds = 0L,
-                    timeZone = TimeZone.get("UTC")!!,
+                    timeZone = KalugaTimeZone.get("UTC")!!,
                     locale = Locale.defaultLocale
                 )
                 this.era = epoch.era
@@ -139,8 +139,8 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
         get() = format.dateFormat
         set(value) { format.dateFormat = value }
 
-    override var timeZone: TimeZone
-        get() = TimeZone(format.timeZone)
+    override var timeZone: KalugaTimeZone
+        get() = KalugaTimeZone(format.timeZone)
         set(value) { format.timeZone = value.timeZone }
 
     override var eras: List<String>
diff --git a/base/src/iosMain/kotlin/utils/KalugaDate.kt b/base/src/iosMain/kotlin/utils/KalugaDate.kt
index 98a092c53..5ea7f84da 100644
--- a/base/src/iosMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaDate.kt
@@ -55,11 +55,11 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
         /**
          * Creates a [KalugaDate] relative to the current time
          * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
-         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate {
+        actual fun now(offsetInMilliseconds: Long, timeZone: KalugaTimeZone, locale: Locale): KalugaDate {
             val calendar = NSCalendar.currentCalendar.apply {
                 this.locale = locale.nsLocale
                 this.timeZone = timeZone.timeZone
@@ -71,11 +71,11 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
          * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
-         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate {
+        actual fun epoch(offsetInMilliseconds: Long, timeZone: KalugaTimeZone, locale: Locale): KalugaDate {
             val calendar = NSCalendar.currentCalendar.apply {
                 this.locale = locale.nsLocale
                 this.timeZone = timeZone.timeZone
@@ -87,8 +87,8 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
 
     override var date: NSDate = initialDate
 
-    override var timeZone: TimeZone
-        get() = TimeZone(calendar.timeZone)
+    override var timeZone: KalugaTimeZone
+        get() = KalugaTimeZone(calendar.timeZone)
         set(value) { calendar.timeZone = value.timeZone }
     override var era: Int
         get() = calendar.component(NSCalendarUnitEra, fromDate = date).toInt()
diff --git a/base/src/iosMain/kotlin/utils/TimeZone.kt b/base/src/iosMain/kotlin/utils/KalugaTimeZone.kt
similarity index 77%
rename from base/src/iosMain/kotlin/utils/TimeZone.kt
rename to base/src/iosMain/kotlin/utils/KalugaTimeZone.kt
index 129b7d701..197f6b0b7 100644
--- a/base/src/iosMain/kotlin/utils/TimeZone.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaTimeZone.kt
@@ -34,33 +34,33 @@ import platform.Foundation.timeZoneWithName
  * A default implementation of [BaseTimeZone].
  * @property timeZone the internal [NSTimeZone] tracking this timezone.
  */
-actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZone() {
+actual class KalugaTimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZone() {
 
     actual companion object {
 
         /**
-         * Gets a [TimeZone] based on a given Identifier
-         * @param identifier The identifier to create a [TimeZone] for
-         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         * Gets a [KalugaTimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [KalugaTimeZone] for
+         * @return The [KalugaTimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
          */
-        actual fun get(identifier: String): TimeZone? {
+        actual fun get(identifier: String): KalugaTimeZone? {
             return if (NSTimeZone.abbreviationDictionary.typedMap<String, String>().containsKey(identifier)) {
                 NSTimeZone.timeZoneWithAbbreviation(identifier)
             } else {
                 NSTimeZone.timeZoneWithName(identifier)
             }?.let {
-                TimeZone(it)
+                KalugaTimeZone(it)
             }
         }
 
         /**
-         * Gets the current [TimeZone] configured by the user
-         * @return The current [TimeZone] of the user
+         * Gets the current [KalugaTimeZone] configured by the user
+         * @return The current [KalugaTimeZone] of the user
          */
-        actual fun current(): TimeZone = TimeZone(NSTimeZone.defaultTimeZone)
+        actual fun current(): KalugaTimeZone = KalugaTimeZone(NSTimeZone.defaultTimeZone)
 
         /**
-         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         * List of available identifiers associated with [KalugaTimeZone]s. All elements in this list can be used for creating a [KalugaTimeZone] using [KalugaTimeZone.get]
          */
         actual val availableIdentifiers: List<String> = NSTimeZone.knownTimeZoneNames.typedList()
     }
@@ -94,8 +94,8 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZ
     }
     override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = (timeZone.secondsFromGMTForDate(date.date) * 1000L)
     override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.isDaylightSavingTimeForDate(date.date)
-    override fun copy(): TimeZone = TimeZone(timeZone.copy() as NSTimeZone)
+    override fun copy(): KalugaTimeZone = KalugaTimeZone(timeZone.copy() as NSTimeZone)
     override fun equals(other: Any?): Boolean {
-        return (other as? TimeZone)?.let { timeZone == other.timeZone } ?: false
+        return (other as? KalugaTimeZone)?.let { timeZone == other.timeZone } ?: false
     }
 }
diff --git a/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt b/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
index 30e26656e..2f98217da 100644
--- a/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
@@ -19,37 +19,37 @@ package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.KalugaDate
 import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.TimeZone
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 
 // TODO Implement with proper dateformatter solution for Java Script
 /**
  * Default implementation of [BaseDateFormatter]
  */
-actual class KalugaDateFormatter private constructor(initialTimeZone: TimeZone, private val formatter: (kotlin.js.Date) -> String) : BaseDateFormatter {
+actual class KalugaDateFormatter private constructor(initialTimeZone: KalugaTimeZone, private val formatter: (kotlin.js.Date) -> String) : BaseDateFormatter {
 
     actual companion object {
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun dateFormat(
             style: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleDateString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun timeFormat(
             style: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleTimeString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
 
@@ -57,13 +57,13 @@ actual class KalugaDateFormatter private constructor(initialTimeZone: TimeZone,
          * Creates a [KalugaDateFormatter] that formats both date and time components of a [KalugaDate]
          * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
 
@@ -73,15 +73,15 @@ actual class KalugaDateFormatter private constructor(initialTimeZone: TimeZone,
          * To prevent this, ensure that the provided [locale] is of a `POSIX` type.
          * A convenience [fixedPatternFormat] method exists to default to this behaviour.
          * @param pattern The pattern to apply.
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
-        actual fun patternFormat(pattern: String, timeZone: TimeZone, locale: Locale): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
+        actual fun patternFormat(pattern: String, timeZone: KalugaTimeZone, locale: Locale): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
     }
 
     override var pattern: String = ""
 
-    override var timeZone: TimeZone = initialTimeZone
+    override var timeZone: KalugaTimeZone = initialTimeZone
     override var eras: List<String> = emptyList()
 
     override var months: List<String> = emptyList()
diff --git a/base/src/jsMain/kotlin/utils/KalugaDate.kt b/base/src/jsMain/kotlin/utils/KalugaDate.kt
index be50d5614..7c944aa44 100644
--- a/base/src/jsMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaDate.kt
@@ -30,24 +30,24 @@ actual class DefaultKalugaDate internal constructor(override val date: KalugaDat
         /**
          * Creates a [KalugaDate] relative to the current time
          * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
-         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(kotlin.js.Date.now() + offsetInMilliseconds))
+        actual fun now(offsetInMilliseconds: Long, timeZone: KalugaTimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(kotlin.js.Date.now() + offsetInMilliseconds))
 
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
          * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
-         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(offsetInMilliseconds))
+        actual fun epoch(offsetInMilliseconds: Long, timeZone: KalugaTimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(offsetInMilliseconds))
     }
 
-    override var timeZone: TimeZone
-        get() = TimeZone()
+    override var timeZone: KalugaTimeZone
+        get() = KalugaTimeZone()
         set(_) { }
 
     override var era: Int
diff --git a/base/src/jsMain/kotlin/utils/TimeZone.kt b/base/src/jsMain/kotlin/utils/KalugaTimeZone.kt
similarity index 61%
rename from base/src/jsMain/kotlin/utils/TimeZone.kt
rename to base/src/jsMain/kotlin/utils/KalugaTimeZone.kt
index b455907e9..fe2823342 100644
--- a/base/src/jsMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaTimeZone.kt
@@ -21,25 +21,25 @@ package com.splendo.kaluga.base.utils
 /**
  * A default implementation of [BaseTimeZone].
  */
-actual class TimeZone internal constructor() : BaseTimeZone() {
+actual class KalugaTimeZone internal constructor() : BaseTimeZone() {
 
     actual companion object {
 
         /**
-         * Gets a [TimeZone] based on a given Identifier
-         * @param identifier The identifier to create a [TimeZone] for
-         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         * Gets a [KalugaTimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [KalugaTimeZone] for
+         * @return The [KalugaTimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
          */
-        actual fun get(identifier: String): TimeZone? = TimeZone()
+        actual fun get(identifier: String): KalugaTimeZone? = KalugaTimeZone()
 
         /**
-         * Gets the current [TimeZone] configured by the user
-         * @return The current [TimeZone] of the user
+         * Gets the current [KalugaTimeZone] configured by the user
+         * @return The current [KalugaTimeZone] of the user
          */
-        actual fun current(): TimeZone = TimeZone()
+        actual fun current(): KalugaTimeZone = KalugaTimeZone()
 
         /**
-         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         * List of available identifiers associated with [KalugaTimeZone]s. All elements in this list can be used for creating a [KalugaTimeZone] using [KalugaTimeZone.get]
          */
         actual val availableIdentifiers: List<String> = emptyList()
     }
@@ -50,5 +50,5 @@ actual class TimeZone internal constructor() : BaseTimeZone() {
     override val daylightSavingsOffsetInMilliseconds: Long = 0L
     override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = 0L
     override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = false
-    override fun copy(): TimeZone = TimeZone()
+    override fun copy(): KalugaTimeZone = KalugaTimeZone()
 }
diff --git a/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt b/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
index d68954108..99ceefe2d 100644
--- a/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
@@ -21,7 +21,7 @@ package com.splendo.kaluga.base.text
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
 import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.TimeZone
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 import java.text.DateFormat
 import java.text.DateFormatSymbols
 import java.text.ParseException
@@ -38,24 +38,24 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
         /**
          * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun dateFormat(
             style: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun timeFormat(
             style: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getTimeInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
@@ -63,13 +63,13 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
          * Creates a [KalugaDateFormatter] that formats both date and time components of a [KalugaDate]
          * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateTimeInstance(dateStyle.javaStyle(), timeStyle.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
@@ -79,16 +79,16 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
          * To prevent this, ensure that the provided [locale] is of a `POSIX` type.
          * A convenience [fixedPatternFormat] method exists to default to this behaviour.
          * @param pattern The pattern to apply.
-         * @param timeZone The [TimeZone] for which the date should be formatted. Defaults to [TimeZone.current].
+         * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
          * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
          */
         actual fun patternFormat(
             pattern: String,
-            timeZone: TimeZone,
+            timeZone: KalugaTimeZone,
             locale: Locale
         ): KalugaDateFormatter = createDateFormatter(SimpleDateFormat(pattern, locale.locale), timeZone)
 
-        private fun createDateFormatter(simpleDateFormat: SimpleDateFormat, timeZone: TimeZone): KalugaDateFormatter {
+        private fun createDateFormatter(simpleDateFormat: SimpleDateFormat, timeZone: KalugaTimeZone): KalugaDateFormatter {
             return KalugaDateFormatter(simpleDateFormat).apply {
                 this.timeZone = timeZone
             }
@@ -101,8 +101,8 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
         get() = format.toPattern()
         set(value) = format.applyPattern(value)
 
-    override var timeZone: TimeZone
-        get() = TimeZone(format.timeZone)
+    override var timeZone: KalugaTimeZone
+        get() = KalugaTimeZone(format.timeZone)
         set(value) { format.timeZone = value.timeZone }
 
     override var eras: List<String>
diff --git a/base/src/jvmMain/kotlin/utils/KalugaDate.kt b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
index 7bd6be088..28dbe1512 100644
--- a/base/src/jvmMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
@@ -32,11 +32,11 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
         /**
          * Creates a [KalugaDate] relative to the current time
          * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
-         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun now(offsetInMilliseconds: Long, timeZone: KalugaTimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 add(Calendar.MILLISECOND, offsetInMilliseconds.toInt())
             }
@@ -45,19 +45,19 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
          * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
-         * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
+         * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
          * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offsetInMilliseconds: Long, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun epoch(offsetInMilliseconds: Long, timeZone: KalugaTimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 timeInMillis = offsetInMilliseconds
             }
         )
     }
 
-    override var timeZone: TimeZone
-        get() = TimeZone(calendar.timeZone)
+    override var timeZone: KalugaTimeZone
+        get() = KalugaTimeZone(calendar.timeZone)
         set(value) { calendar.timeZone = value.timeZone }
 
     override var era: Int
diff --git a/base/src/jvmMain/kotlin/utils/TimeZone.kt b/base/src/jvmMain/kotlin/utils/KalugaTimeZone.kt
similarity index 63%
rename from base/src/jvmMain/kotlin/utils/TimeZone.kt
rename to base/src/jvmMain/kotlin/utils/KalugaTimeZone.kt
index 8c4ea0c42..6ef7a5102 100644
--- a/base/src/jvmMain/kotlin/utils/TimeZone.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaTimeZone.kt
@@ -20,31 +20,31 @@ package com.splendo.kaluga.base.utils
 /**
  * A default implementation of [BaseTimeZone].
  */
-actual class TimeZone internal constructor(internal val timeZone: java.util.TimeZone) : BaseTimeZone() {
+actual class KalugaTimeZone internal constructor(internal val timeZone: java.util.TimeZone) : BaseTimeZone() {
 
     actual companion object {
 
         /**
-         * Gets a [TimeZone] based on a given Identifier
-         * @param identifier The identifier to create a [TimeZone] for
-         * @return The [TimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
+         * Gets a [KalugaTimeZone] based on a given Identifier
+         * @param identifier The identifier to create a [KalugaTimeZone] for
+         * @return The [KalugaTimeZone] corresponding to the identifier, if it exists. Check [availableIdentifiers] for supported identifiers
          */
-        actual fun get(identifier: String): TimeZone? {
+        actual fun get(identifier: String): KalugaTimeZone? {
             return java.util.TimeZone.getTimeZone(identifier)?.let {
-                TimeZone(it)
+                KalugaTimeZone(it)
             }
         }
 
         /**
-         * Gets the current [TimeZone] configured by the user
-         * @return The current [TimeZone] of the user
+         * Gets the current [KalugaTimeZone] configured by the user
+         * @return The current [KalugaTimeZone] of the user
          */
-        actual fun current(): TimeZone {
-            return TimeZone(java.util.TimeZone.getDefault())
+        actual fun current(): KalugaTimeZone {
+            return KalugaTimeZone(java.util.TimeZone.getDefault())
         }
 
         /**
-         * List of available identifiers associated with [TimeZone]s. All elements in this list can be used for creating a [TimeZone] using [TimeZone.get]
+         * List of available identifiers associated with [KalugaTimeZone]s. All elements in this list can be used for creating a [KalugaTimeZone] using [KalugaTimeZone.get]
          */
         actual val availableIdentifiers get() = java.util.TimeZone.getAvailableIDs().asList()
     }
@@ -61,8 +61,8 @@ actual class TimeZone internal constructor(internal val timeZone: java.util.Time
     override val daylightSavingsOffsetInMilliseconds: Long = timeZone.dstSavings.toLong()
     override fun offsetFromGMTAtDateInMilliseconds(date: KalugaDate): Long = timeZone.getOffset(date.millisecondSinceEpoch).toLong()
     override fun usesDaylightSavingsTime(date: KalugaDate): Boolean = timeZone.inDaylightTime(date.date)
-    override fun copy(): TimeZone = TimeZone(timeZone.clone() as java.util.TimeZone)
+    override fun copy(): KalugaTimeZone = KalugaTimeZone(timeZone.clone() as java.util.TimeZone)
     override fun equals(other: Any?): Boolean {
-        return (other as? TimeZone)?.let { timeZone == other.timeZone } ?: false
+        return (other as? KalugaTimeZone)?.let { timeZone == other.timeZone } ?: false
     }
 }

From fabe6550243502c80b44e319f99a61ef074b2e60 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 17 Feb 2023 13:08:39 +0100
Subject: [PATCH 185/227] Documentation for Scientific Units

---
 .../src/commonMain/kotlin/PhysicalQuantity.kt | 246 ++++++++++++++++++
 .../src/commonMain/kotlin/ScientificValue.kt  |  12 +
 .../area/convertToKinematicViscosity.kt       |   3 +-
 .../decimal/convertFromDimensionless.kt       |   9 +-
 .../dimensionless/convertFromAnyUnit.kt       |  18 +-
 .../dimensionless/convertToAnyUnit.kt         |   5 +-
 .../dimensionless/convertToDecimal.kt         |  22 +-
 .../kotlin/unit/AccelerationUnit.kt           |  48 ++++
 .../src/commonMain/kotlin/unit/ActionUnit.kt  |  58 +++++
 .../kotlin/unit/AmountOfSubstanceUnit.kt      |  10 +
 .../src/commonMain/kotlin/unit/AngleUnit.kt   |   7 +
 .../kotlin/unit/AngularAcceleration.kt        |  14 +
 .../kotlin/unit/AngularVelocityUnit.kt        |  14 +
 .../commonMain/kotlin/unit/AreaDensityUnit.kt |  73 ++++++
 .../src/commonMain/kotlin/unit/AreaUnit.kt    |  22 +-
 .../kotlin/unit/CatalysticActivityUnit.kt     |   7 +
 .../src/commonMain/kotlin/unit/DensityUnit.kt |  97 +++++++
 .../kotlin/unit/DimensionlessUnit.kt          |  40 +--
 .../kotlin/unit/DynamicViscosityUnit.kt       |  81 ++++++
 .../kotlin/unit/ElectricCapacitanceUnit.kt    |   7 +
 .../kotlin/unit/ElectricChargeUnit.kt         |  10 +
 .../kotlin/unit/ElectricConductanceUnit.kt    |   7 +
 .../kotlin/unit/ElectricCurrentUnit.kt        |   7 +
 .../kotlin/unit/ElectricInductanceUnit.kt     |   7 +
 .../kotlin/unit/ElectricResistanceUnit.kt     |   7 +
 .../src/commonMain/kotlin/unit/EnergyUnit.kt  |  43 +++
 .../src/commonMain/kotlin/unit/ForceUnit.kt   |  47 ++++
 .../commonMain/kotlin/unit/FrequencyUnit.kt   |   7 +
 .../kotlin/unit/HeatCapacityUnit.kt           |  87 +++++++
 .../commonMain/kotlin/unit/IlluminanceUnit.kt |  20 ++
 .../unit/IonizingRadiationAbsorbedDoseUnit.kt |   7 +
 .../IonizingRadiationEquivalentDoseUnit.kt    |   7 +
 .../src/commonMain/kotlin/unit/JoltUnit.kt    |  38 ++-
 .../kotlin/unit/KinematicViscosityUnit.kt     |  47 +++-
 .../src/commonMain/kotlin/unit/LengthUnit.kt  |  33 ++-
 .../kotlin/unit/LinearMassDensityUnit.kt      |  81 ++++++
 .../commonMain/kotlin/unit/LuminanceUnit.kt   |  20 ++
 .../kotlin/unit/LuminousEnergyUnit.kt         |  14 +
 .../kotlin/unit/LuminousExposureUnits.kt      |  41 +++
 .../kotlin/unit/LuminousFluxUnit.kt           |   7 +
 .../kotlin/unit/LuminousIntensityUnit.kt      |   7 +
 .../kotlin/unit/MagneticFluxUnit.kt           |   7 +
 .../kotlin/unit/MagneticInductionUnit.kt      |   7 +
 .../kotlin/unit/MassFlowRateUnit.kt           |  80 ++++++
 .../kotlin/unit/MeasurementSystem.kt          |  66 +++++
 .../commonMain/kotlin/unit/MolalityUnit.kt    |  81 ++++++
 .../commonMain/kotlin/unit/MolarEnergyUnit.kt |  66 +++++
 .../commonMain/kotlin/unit/MolarMassUnit.kt   |  81 ++++++
 .../commonMain/kotlin/unit/MolarVolumeUnit.kt |  81 ++++++
 .../commonMain/kotlin/unit/MolarityUnit.kt    |  81 ++++++
 .../commonMain/kotlin/unit/MomentumUnit.kt    |  78 ++++++
 .../src/commonMain/kotlin/unit/PowerUnit.kt   |  45 ++++
 .../commonMain/kotlin/unit/PressureUnit.kt    |  47 ++++
 .../kotlin/unit/RadioactivityUnit.kt          |   7 +
 .../commonMain/kotlin/unit/ScientificUnit.kt  |  95 +++++++
 .../commonMain/kotlin/unit/SolidAngleUnit.kt  |   7 +
 .../kotlin/unit/SpecificEnergyUnit.kt         | 105 ++++++++
 .../kotlin/unit/SpecificHeatCapacityUnit.kt   | 117 +++++++++
 .../kotlin/unit/SpecificVolumeUnit.kt         | 105 ++++++++
 .../src/commonMain/kotlin/unit/SpeedUnit.kt   |  49 ++++
 .../kotlin/unit/SurfaceTensionUnit.kt         |  81 ++++++
 .../commonMain/kotlin/unit/TemperatureUnit.kt |  22 ++
 .../kotlin/unit/ThermalResistanceUnit.kt      |  87 +++++++
 .../src/commonMain/kotlin/unit/TimeUnit.kt    |   7 +
 .../src/commonMain/kotlin/unit/VoltageUnit.kt |   7 +
 .../src/commonMain/kotlin/unit/VolumeUnit.kt  |  52 +++-
 .../kotlin/unit/VolumetricFlowUnit.kt         |  81 ++++++
 .../kotlin/unit/VolumetricFluxUnit.kt         |  81 ++++++
 .../src/commonMain/kotlin/unit/WeightUnit.kt  |  85 +++++-
 .../src/commonMain/kotlin/unit/YankUnit.kt    |  81 ++++++
 .../kotlin/unit/DimensionlessUnitTest.kt      |   2 +-
 71 files changed, 3036 insertions(+), 92 deletions(-)

diff --git a/scientific/src/commonMain/kotlin/PhysicalQuantity.kt b/scientific/src/commonMain/kotlin/PhysicalQuantity.kt
index 6382267bb..8fb6cb32a 100644
--- a/scientific/src/commonMain/kotlin/PhysicalQuantity.kt
+++ b/scientific/src/commonMain/kotlin/PhysicalQuantity.kt
@@ -19,128 +19,374 @@ package com.splendo.kaluga.scientific
 
 import kotlinx.serialization.Serializable
 
+/**
+ * A physical property of a material or system that can be quantified by measurement
+ */
 @Serializable
 sealed class PhysicalQuantity : com.splendo.kaluga.base.utils.Serializable {
+    /**
+     * A [PhysicalQuantity] that has no specific dimension
+     */
     @Serializable
     object Dimensionless : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the rate of change of velocity per unit time
+     */
     @Serializable
     object Acceleration : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing momentum of particle multiplied by distance travelled
+     */
     @Serializable
     object Action : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the quantity proportional to the number of particles in a sample
+     */
     @Serializable
     object AmountOfSubstance : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the ratio of circular arc length to radius
+     */
     @Serializable
     object Angle : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing change in angular velocity per unit time
+     */
     @Serializable
     object AngularAcceleration : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the angle incremented in a plane by a segment connecting an object and a reference point per unit time
+     */
     @Serializable
     object AngularVelocity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the extent of a surface
+     */
     @Serializable
     object Area : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the mass per unit area
+     */
     @Serializable
     object AreaDensity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the amount of substance per time
+     */
     @Serializable
     object CatalysticActivity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the mass per unit of volume
+     */
     @Serializable
     object Density : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the resistance of an incompressible fluid to stress
+     */
     @Serializable
     object DynamicViscosity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the stored charge per unit electric potential
+     */
     @Serializable
     object ElectricCapacitance : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the force per unit electric field strength
+     */
     @Serializable
     object ElectricCharge : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing how easily current flows through a material
+     */
     @Serializable
     object ElectricConductance : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the rate of flow of electrical charge per unit time
+     */
     @Serializable
     object ElectricCurrent : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the magnetic flux generated per unit current through a circuit
+     */
     @Serializable
     object ElectricInductance : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the electric potential per unit electric current
+     */
     @Serializable
     object ElectricResistance : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing energy
+     */
     @Serializable
     object Energy : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the transfer of momentum per unit time
+     */
     @Serializable
     object Force : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the number of (periodic) occurrences per unit time
+     */
     @Serializable
     object Frequency : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing energy per unit temperature change
+     */
     @Serializable
     object HeatCapacity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing wavelength-weighted luminous flux per unit surface area
+     */
     @Serializable
     object Illuminance : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing ionizing radiation energy absorbed by biological tissue per unit mass
+     */
     @Serializable
     object IonizingRadiationAbsorbedDose : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the received radiation adjusted for the effect on biological tissue
+     */
     @Serializable
     object IonizingRadiationEquivalentDose : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing mass per unit of length
+     */
     @Serializable
     object LinearMassDensity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing change of acceleration per unit time
+     */
     @Serializable
     object Jolt : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing ratio of the dynamic viscosity over the density of the fluid
+     */
     @Serializable
     object KinematicViscosity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the one-dimensional extent of an object
+     */
     @Serializable
     object Length : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing luminous intensity per unit area of light
+     */
     @Serializable
     object Luminance : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the perceived energy of light
+     */
     @Serializable
     object LuminousEnergy : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the amount of light per unit area
+     */
     @Serializable
     object LuminousExposure : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the perceived power of a light source
+     */
     @Serializable
     object LuminousFlux : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the wavelength-weighted power of emitted light per unit solid angle
+     */
     @Serializable
     object LuminousIntensity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the mass of a substance which passes per unit of time
+     */
     @Serializable
     object MassFlowRate : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the measure of magnetism, taking account of the strength and the extent of a magnetic field
+     */
     @Serializable
     object MagneticFlux : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the production of an electromotive force across an electrical conductor in a changing magnetic field
+     */
     @Serializable
     object MagneticInduction : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the amount of substance per unit of mass
+     */
     @Serializable
     object Molality : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the amount of substance per unit of volume
+     */
     @Serializable
     object Molarity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the amount of energy present in a system per unit amount of substance
+     */
     @Serializable
     object MolarEnergy : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the ratio between the mass and the amount of substance
+     */
     @Serializable
     object MolarMass : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the ratio of the volume occupied by a substance to the amount of substance
+     */
     @Serializable
     object MolarVolume : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the product of an object's mass and velocity
+     */
     @Serializable
     object Momentum : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the rate of transfer of energy per unit time
+     */
     @Serializable
     object Power : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing force per unit area
+     */
     @Serializable
     object Pressure : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the number of particles decaying per unit time
+     */
     @Serializable
     object Radioactivity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the ratio of area on a sphere to its radius squared
+     */
     @Serializable
     object SolidAngle : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing energy density per unit mass
+     */
     @Serializable
     object SpecificEnergy : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing heat capacity per unit mass
+     */
     @Serializable
     object SpecificHeatCapacity : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing volume per unit mass
+     */
     @Serializable
     object SpecificVolume : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the moved distance per unit time
+     */
     @Serializable
     object Speed : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing energy change per unit change in surface area
+     */
     @Serializable
     object SurfaceTension : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the average kinetic energy per degree of freedom of a system
+     */
     @Serializable
     object Temperature : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the ease with which an object resists conduction of heat
+     */
     @Serializable
     object ThermalResistance : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the duration of an event
+     */
     @Serializable
     object Time : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the energy required to move a unit charge through an electric field from a reference point
+     */
     @Serializable
     object Voltage : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the three dimensional extent of an object
+     */
     @Serializable
     object Volume : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the rate of change of volume with respect to time
+     */
     @Serializable
     object VolumetricFlow : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the rate of volume flow across a unit area
+     */
     @Serializable
     object VolumetricFlux : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing a measure of resistance to acceleration
+     */
     @Serializable
     object Weight : PhysicalQuantity()
+
+    /**
+     * A [PhysicalQuantity] representing the rate of change of force per unit time
+     */
     @Serializable
     object Yank : PhysicalQuantity()
 }
diff --git a/scientific/src/commonMain/kotlin/ScientificValue.kt b/scientific/src/commonMain/kotlin/ScientificValue.kt
index 396d8550c..6b387956d 100644
--- a/scientific/src/commonMain/kotlin/ScientificValue.kt
+++ b/scientific/src/commonMain/kotlin/ScientificValue.kt
@@ -409,3 +409,15 @@ internal fun <
 } else {
     throw ScientificConverterException("Inverting by zero")
 }
+
+/**
+ * Returns the value of a [ScientificValue] with [PhysicalQuantity.Dimensionless] as a fraction. I.e.
+ * ```
+val percent = 12(Percent)
+print(percent.value) // 12
+print(percent.decimalFraction) // 0.12
+ * ```
+ * @param Unit the type of [ScientificUnit] with a [PhysicalQuantity.Dimensionless]
+ * @return the dimensionless [Decimal] value as a fraction
+ */
+val <Unit : ScientificUnit<PhysicalQuantity.Dimensionless>> ScientificValue<PhysicalQuantity.Dimensionless, Unit>.decimalFraction: Decimal get() = unit.toSIUnit(value.toDecimal())
diff --git a/scientific/src/commonMain/kotlin/converter/area/convertToKinematicViscosity.kt b/scientific/src/commonMain/kotlin/converter/area/convertToKinematicViscosity.kt
index b4195c969..3195b3497 100644
--- a/scientific/src/commonMain/kotlin/converter/area/convertToKinematicViscosity.kt
+++ b/scientific/src/commonMain/kotlin/converter/area/convertToKinematicViscosity.kt
@@ -23,6 +23,7 @@ import com.splendo.kaluga.scientific.converter.kinematicViscosity.kinematicVisco
 import com.splendo.kaluga.scientific.unit.Area
 import com.splendo.kaluga.scientific.unit.ImperialArea
 import com.splendo.kaluga.scientific.unit.MetricArea
+import com.splendo.kaluga.scientific.unit.SquareMeter
 import com.splendo.kaluga.scientific.unit.Time
 import com.splendo.kaluga.scientific.unit.per
 import kotlin.jvm.JvmName
@@ -40,4 +41,4 @@ infix operator fun <AreaUnit : ImperialArea> ScientificValue<PhysicalQuantity.Ar
 @JvmName("areaDivTime")
 infix operator fun <AreaUnit : Area> ScientificValue<PhysicalQuantity.Area, AreaUnit>.div(
     time: ScientificValue<PhysicalQuantity.Time, Time>
-) = (unit per time.unit).kinematicViscosity(this, time)
+) = (SquareMeter per time.unit).kinematicViscosity(this, time)
diff --git a/scientific/src/commonMain/kotlin/converter/decimal/convertFromDimensionless.kt b/scientific/src/commonMain/kotlin/converter/decimal/convertFromDimensionless.kt
index c140a46fc..bb9c3f70d 100644
--- a/scientific/src/commonMain/kotlin/converter/decimal/convertFromDimensionless.kt
+++ b/scientific/src/commonMain/kotlin/converter/decimal/convertFromDimensionless.kt
@@ -19,16 +19,17 @@ package com.splendo.kaluga.scientific.converter.decimal
 
 import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.base.utils.toDecimal
+import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.converter.dimensionless.div
 import com.splendo.kaluga.scientific.converter.dimensionless.times
-import com.splendo.kaluga.scientific.unit.Dimensionless.Companion.invoke
-import com.splendo.kaluga.scientific.unit.DimensionlessScientificValue
+import com.splendo.kaluga.scientific.invoke
 import com.splendo.kaluga.scientific.unit.One
 
 infix operator fun Decimal.div(
-    modifier: DimensionlessScientificValue<*>
+    modifier: ScientificValue<PhysicalQuantity.Dimensionless, *>
 ) = this.invoke(One).div(modifier).value.toDecimal()
 
 infix operator fun Decimal.times(
-    modifier: DimensionlessScientificValue<*>
+    modifier: ScientificValue<PhysicalQuantity.Dimensionless, *>
 ) = this.invoke(One).times(modifier).value.toDecimal()
diff --git a/scientific/src/commonMain/kotlin/converter/dimensionless/convertFromAnyUnit.kt b/scientific/src/commonMain/kotlin/converter/dimensionless/convertFromAnyUnit.kt
index 2e26058f7..12a3dc367 100644
--- a/scientific/src/commonMain/kotlin/converter/dimensionless/convertFromAnyUnit.kt
+++ b/scientific/src/commonMain/kotlin/converter/dimensionless/convertFromAnyUnit.kt
@@ -23,29 +23,27 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.byDividing
 import com.splendo.kaluga.scientific.byMultiplying
-import com.splendo.kaluga.scientific.unit.DefaultDimensionlessScientificValue
-import com.splendo.kaluga.scientific.unit.DimensionlessScientificValue
 import com.splendo.kaluga.scientific.unit.ScientificUnit
 
 infix operator fun <
     LeftUnit : ScientificUnit<PhysicalQuantity.Dimensionless>,
     RightUnit : ScientificUnit<PhysicalQuantity.Dimensionless>,
-    > DimensionlessScientificValue<LeftUnit>.times(
-    modifier: DimensionlessScientificValue<RightUnit>
-) = modify(modifier, ::DefaultDimensionlessScientificValue)
+    > ScientificValue<PhysicalQuantity.Dimensionless, LeftUnit>.times(
+    modifier: ScientificValue<PhysicalQuantity.Dimensionless, RightUnit>
+) = modify(modifier, ::DefaultScientificValue)
 
 infix operator fun <
     LeftUnit : ScientificUnit<PhysicalQuantity.Dimensionless>,
     RightUnit : ScientificUnit<PhysicalQuantity.Dimensionless>,
-    > DimensionlessScientificValue<LeftUnit>.div(
-    modifier: DimensionlessScientificValue<RightUnit>
-) = unit.byDividing(this, modifier, ::DefaultDimensionlessScientificValue)
+    > ScientificValue<PhysicalQuantity.Dimensionless, LeftUnit>.div(
+    modifier: ScientificValue<PhysicalQuantity.Dimensionless, RightUnit>
+) = unit.byDividing(this, modifier, ::DefaultScientificValue)
 
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
     Modifier : ScientificUnit<PhysicalQuantity.Dimensionless>
-    > DimensionlessScientificValue<Modifier>.times(
+    > ScientificValue<PhysicalQuantity.Dimensionless, Modifier>.times(
     value: ScientificValue<Quantity, Unit>
 ) = value.modify(this, ::DefaultScientificValue)
 
@@ -55,6 +53,6 @@ fun <
     Modifier : ScientificUnit<PhysicalQuantity.Dimensionless>,
     Value : ScientificValue<Quantity, Unit>
     > ScientificValue<Quantity, Unit>.modify(
-    modifier: DimensionlessScientificValue<Modifier>,
+    modifier: ScientificValue<PhysicalQuantity.Dimensionless, Modifier>,
     factory: (Decimal, Unit) -> Value
 ) = unit.byMultiplying(this, modifier, factory)
diff --git a/scientific/src/commonMain/kotlin/converter/dimensionless/convertToAnyUnit.kt b/scientific/src/commonMain/kotlin/converter/dimensionless/convertToAnyUnit.kt
index ea017d566..36d748cdb 100644
--- a/scientific/src/commonMain/kotlin/converter/dimensionless/convertToAnyUnit.kt
+++ b/scientific/src/commonMain/kotlin/converter/dimensionless/convertToAnyUnit.kt
@@ -22,7 +22,6 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.byDividing
 import com.splendo.kaluga.scientific.byMultiplying
-import com.splendo.kaluga.scientific.unit.DimensionlessScientificValue
 import com.splendo.kaluga.scientific.unit.ScientificUnit
 
 infix operator fun <
@@ -30,7 +29,7 @@ infix operator fun <
     Unit : ScientificUnit<Quantity>,
     Modifier : ScientificUnit<PhysicalQuantity.Dimensionless>
     > ScientificValue<Quantity, Unit>.times(
-    modifier: DimensionlessScientificValue<Modifier>
+    modifier: ScientificValue<PhysicalQuantity.Dimensionless, Modifier>
 ) = unit.byMultiplying(this, modifier, ::DefaultScientificValue)
 
 infix operator fun <
@@ -38,5 +37,5 @@ infix operator fun <
     Unit : ScientificUnit<Quantity>,
     Modifier : ScientificUnit<PhysicalQuantity.Dimensionless>
     > ScientificValue<Quantity, Unit>.div(
-    modifier: DimensionlessScientificValue<Modifier>
+    modifier: ScientificValue<PhysicalQuantity.Dimensionless, Modifier>
 ) = unit.byDividing(this, modifier, ::DefaultScientificValue)
diff --git a/scientific/src/commonMain/kotlin/converter/dimensionless/convertToDecimal.kt b/scientific/src/commonMain/kotlin/converter/dimensionless/convertToDecimal.kt
index 83c15966f..a48cc443e 100644
--- a/scientific/src/commonMain/kotlin/converter/dimensionless/convertToDecimal.kt
+++ b/scientific/src/commonMain/kotlin/converter/dimensionless/convertToDecimal.kt
@@ -18,39 +18,39 @@
 package com.splendo.kaluga.scientific.converter.dimensionless
 
 import com.splendo.kaluga.base.utils.Decimal
+import com.splendo.kaluga.scientific.DefaultScientificValue
 import com.splendo.kaluga.scientific.PhysicalQuantity
+import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.byDividing
 import com.splendo.kaluga.scientific.byMultiplying
-import com.splendo.kaluga.scientific.unit.DefaultDimensionlessScientificValue
-import com.splendo.kaluga.scientific.unit.Dimensionless.Companion.invoke
-import com.splendo.kaluga.scientific.unit.DimensionlessScientificValue
+import com.splendo.kaluga.scientific.invoke
 import com.splendo.kaluga.scientific.unit.One
 import com.splendo.kaluga.scientific.unit.ScientificUnit
 
 infix operator fun <
     Unit : ScientificUnit<PhysicalQuantity.Dimensionless>
-    > DimensionlessScientificValue<Unit>.times(
+    > ScientificValue<PhysicalQuantity.Dimensionless, Unit>.times(
     decimal: Decimal
-) = convertToOneByMultiplying(decimal, ::DefaultDimensionlessScientificValue)
+) = convertToOneByMultiplying(decimal, ::DefaultScientificValue)
 
 fun <
     Unit : ScientificUnit<PhysicalQuantity.Dimensionless>,
-    Value : DimensionlessScientificValue<One>
-    > DimensionlessScientificValue<Unit>.convertToOneByMultiplying(
+    Value : ScientificValue<PhysicalQuantity.Dimensionless, One>
+    > ScientificValue<PhysicalQuantity.Dimensionless, Unit>.convertToOneByMultiplying(
     decimal: Decimal,
     factory: (Decimal, One) -> Value
 ) = decimal.invoke(One).let { it.unit.byMultiplying(this, it, factory) }
 
 infix operator fun <
     Unit : ScientificUnit<PhysicalQuantity.Dimensionless>
-    > DimensionlessScientificValue<Unit>.div(
+    > ScientificValue<PhysicalQuantity.Dimensionless, Unit>.div(
     decimal: Decimal
-) = convertToOneByDividing(decimal, ::DefaultDimensionlessScientificValue)
+) = convertToOneByDividing(decimal, ::DefaultScientificValue)
 
 fun <
     Unit : ScientificUnit<PhysicalQuantity.Dimensionless>,
-    Value : DimensionlessScientificValue<One>
-    > DimensionlessScientificValue<Unit>.convertToOneByDividing(
+    Value : ScientificValue<PhysicalQuantity.Dimensionless, One>
+    > ScientificValue<PhysicalQuantity.Dimensionless, Unit>.convertToOneByDividing(
     decimal: Decimal,
     factory: (Decimal, One) -> Value
 ) = decimal.invoke(One).let { it.unit.byDividing(this, it, factory) }
diff --git a/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt b/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt
index 704eee3a9..624e6e18a 100644
--- a/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AccelerationUnit.kt
@@ -23,20 +23,41 @@ import com.splendo.kaluga.scientific.convert
 import com.splendo.kaluga.scientific.invoke
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricAcceleration]
+ */
 val MetricAccelerationUnits: Set<MetricAcceleration> get() = MetricSpeedUnits.flatMap { speed ->
     TimeUnits.map { speed per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialAcceleration]
+ */
 val ImperialAccelerationUnits: Set<ImperialAcceleration> get() = ImperialSpeedUnits.flatMap { speed ->
     TimeUnits.map { speed per it }
 }.toSet()
 
+/**
+ * Set of all [Acceleration]
+ */
 val AccelerationUnits: Set<Acceleration> get() = MetricAccelerationUnits +
     ImperialAccelerationUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Acceleration]
+ * SI unit is `Meter per Second per Second`
+ */
 @Serializable
 sealed class Acceleration : AbstractScientificUnit<PhysicalQuantity.Acceleration>() {
+
+    /**
+     * The [Speed] component
+     */
     abstract val speed: Speed
+
+    /**
+     * The [Time] component
+     */
     abstract val per: Time
     override val quantity = PhysicalQuantity.Acceleration
     override val symbol: String by lazy {
@@ -50,6 +71,11 @@ sealed class Acceleration : AbstractScientificUnit<PhysicalQuantity.Acceleration
     override fun toSIUnit(value: Decimal): Decimal = speed.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * An [Acceleration] for [MeasurementSystem.Metric]
+ * @param speed the [MetricSpeed] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class MetricAcceleration(
     override val speed: MetricSpeed,
@@ -58,6 +84,11 @@ data class MetricAcceleration(
     override val system = MeasurementSystem.Metric
 }
 
+/**
+ * An [Acceleration] for [MeasurementSystem.Imperial]
+ * @param speed the [ImperialSpeed] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class ImperialAcceleration(
     override val speed: ImperialSpeed,
@@ -66,8 +97,25 @@ data class ImperialAcceleration(
     override val system = MeasurementSystem.Imperial
 }
 
+/**
+ * Gets a [MetricAcceleration] from a [MetricSpeed] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricAcceleration] represented by the units
+ */
 infix fun MetricSpeed.per(time: Time) = MetricAcceleration(this, time)
+/**
+ * Gets an [ImperialAcceleration] from an [ImperialSpeed] and a [Time]
+ * @param time the [Time] component
+ * @return the [ImperialAcceleration] represented by the units
+ */
 infix fun ImperialSpeed.per(time: Time) = ImperialAcceleration(this, time)
 
+/**
+ * The standard [Acceleration] due to gravity in `Meter per Second per Second`
+ */
 val MetricStandardGravityAcceleration = 9.80665(Meter per Second per Second)
+
+/**
+ * The standard [Acceleration] due to gravity in `Foot per Second per Second`
+ */
 val ImperialStandardGravityAcceleration = MetricStandardGravityAcceleration.convert(Foot per Second per Second)
diff --git a/scientific/src/commonMain/kotlin/unit/ActionUnit.kt b/scientific/src/commonMain/kotlin/unit/ActionUnit.kt
index 84cc44fb4..cfd9b316d 100644
--- a/scientific/src/commonMain/kotlin/unit/ActionUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ActionUnit.kt
@@ -21,25 +21,49 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricAndImperialAction]
+ */
 val MetricAndImperialActionUnits: Set<MetricAndImperialAction> get() = MetricAndImperialEnergyUnits.flatMap { energy ->
     TimeUnits.map { energy x it }
 }.toSet()
 
+/**
+ * Set of all [MetricAction]
+ */
 val MetricActionUnits: Set<MetricAction> get() = MetricEnergyUnits.flatMap { energy ->
     TimeUnits.map { energy x it }
 }.toSet()
 
+/**
+ * Set of all [ImperialAction]
+ */
 val ImperialActionUnits: Set<ImperialAction> get() = ImperialEnergyUnits.flatMap { energy ->
     TimeUnits.map { energy x it }
 }.toSet()
 
+/**
+ * Set of all [Action]
+ */
 val ActionUnits: Set<Action> get() = MetricAndImperialActionUnits +
     MetricActionUnits.filter { it.energy !is MetricMetricAndImperialEnergyWrapper }.toSet() +
     ImperialActionUnits.filter { it.energy !is ImperialMetricAndImperialEnergyWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Acceleration]
+ * SI unit is `Joule x Second`
+ */
 @Serializable
 sealed class Action : AbstractScientificUnit<PhysicalQuantity.Action>() {
+
+    /**
+     * The [Energy] component
+     */
     abstract val energy: Energy
+
+    /**
+     * The [Time] component
+     */
     abstract val time: Time
     override val quantity = PhysicalQuantity.Action
     override val symbol: String by lazy { "${energy.symbol}⋅${time.symbol}" }
@@ -47,21 +71,55 @@ sealed class Action : AbstractScientificUnit<PhysicalQuantity.Action>() {
     override fun toSIUnit(value: Decimal): Decimal = energy.toSIUnit(time.toSIUnit(value))
 }
 
+/**
+ * An [Action] for [MeasurementSystem.MetricAndImperial]
+ * @param energy the [MetricAndImperialEnergy] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class MetricAndImperialAction(override val energy: MetricAndImperialEnergy, override val time: Time) : Action(), MetricAndImperialScientificUnit<PhysicalQuantity.Action> {
     override val system = MeasurementSystem.MetricAndImperial
     val metric get() = energy.metric x time
     val imperial get() = energy.imperial x time
 }
+
+/**
+ * An [Action] for [MeasurementSystem.Metric]
+ * @param energy the [MetricEnergy] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class MetricAction(override val energy: MetricEnergy, override val time: Time) : Action(), MetricScientificUnit<PhysicalQuantity.Action> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * An [Action] for [MeasurementSystem.Imperial]
+ * @param energy the [ImperialEnergy] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class ImperialAction(override val energy: ImperialEnergy, override val time: Time) : Action(), ImperialScientificUnit<PhysicalQuantity.Action> {
     override val system = MeasurementSystem.Imperial
 }
 
+/**
+ * Gets a [MetricAndImperialAction] from a [MetricAndImperialEnergy] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricAndImperialAction] represented by the units
+ */
 infix fun MetricAndImperialEnergy.x(time: Time) = MetricAndImperialAction(this, time)
+
+/**
+ * Gets a [MetricAction] from a [MetricEnergy] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricAction] represented by the units
+ */
 infix fun MetricEnergy.x(time: Time) = MetricAction(this, time)
+
+/**
+ * Gets a [ImperialAction] from a [ImperialEnergy] and a [Time]
+ * @param time the [Time] component
+ * @return the [ImperialAction] represented by the units
+ */
 infix fun ImperialEnergy.x(time: Time) = ImperialAction(this, time)
diff --git a/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt b/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
index b6dee9dae..b0ebc92ec 100644
--- a/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AmountOfSubstanceUnit.kt
@@ -22,6 +22,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [AmountOfSubstance]
+ */
 val AmountOfSubstanceUnits: Set<AmountOfSubstance> get() = setOf(
     Mole,
     Nanomole,
@@ -36,6 +39,10 @@ val AmountOfSubstanceUnits: Set<AmountOfSubstance> get() = setOf(
     Gigamole
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.AmountOfSubstance]
+ * SI unit is [Mole]
+ */
 @Serializable
 sealed class AmountOfSubstance : AbstractScientificUnit<PhysicalQuantity.AmountOfSubstance>(), MetricAndImperialScientificUnit<PhysicalQuantity.AmountOfSubstance>
 
@@ -72,4 +79,7 @@ object Megamole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAnd
 @Serializable
 object Gigamole : MoleMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.AmountOfSubstance, Mole> by Giga(Mole)
 
+/**
+ * The proportionality factor that relates the number of constituent particles (usually molecules, atoms or ions) in a sample with the amount of substance in that sample
+ */
 val AvogadroConstant = 6.02214076e23.toDecimal()
diff --git a/scientific/src/commonMain/kotlin/unit/AngleUnit.kt b/scientific/src/commonMain/kotlin/unit/AngleUnit.kt
index 2af82bb96..692fbf9da 100644
--- a/scientific/src/commonMain/kotlin/unit/AngleUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AngleUnit.kt
@@ -25,6 +25,9 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 import kotlin.math.PI
 
+/**
+ * Set of all [Angle]
+ */
 val AngleUnits: Set<Angle> get() = setOf(
     Radian,
     Nanoradian,
@@ -44,6 +47,10 @@ val AngleUnits: Set<Angle> get() = setOf(
     ArcSecond
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Angle]
+ * SI unit is [Radian]
+ */
 @Serializable
 sealed class Angle : AbstractScientificUnit<PhysicalQuantity.Angle>(), MetricAndImperialScientificUnit<PhysicalQuantity.Angle>
 
diff --git a/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt b/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt
index 887bf2b8b..3b99dab2d 100644
--- a/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt
@@ -21,10 +21,19 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [AngularAcceleration]
+ */
 val AngularAccelerationUnits: Set<AngularAcceleration> get() = AngularVelocityUnits.flatMap { angularVelocity ->
     TimeUnits.map { angularVelocity per it }
 }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.AngularAcceleration]
+ * SI unit is `Radian per Second per Second`
+ * @property angularVelocity the [AngularVelocity] component
+ * @property per the [Time] component
+ */
 @Serializable
 data class AngularAcceleration(val angularVelocity: AngularVelocity, val per: Time) : AbstractScientificUnit<PhysicalQuantity.AngularAcceleration>(), MetricAndImperialScientificUnit<PhysicalQuantity.AngularAcceleration> {
     override val quantity = PhysicalQuantity.AngularAcceleration
@@ -40,4 +49,9 @@ data class AngularAcceleration(val angularVelocity: AngularVelocity, val per: Ti
     override fun toSIUnit(value: Decimal): Decimal = angularVelocity.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * Gets a [AngularAcceleration] from a [AngularVelocity] and a [Time]
+ * @param time the [Time] component
+ * @return the [AngularAcceleration] represented by the units
+ */
 infix fun AngularVelocity.per(time: Time) = AngularAcceleration(this, time)
diff --git a/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt b/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt
index 27fe2f5d2..66d5c504c 100644
--- a/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt
@@ -21,10 +21,19 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [AngularVelocity]
+ */
 val AngularVelocityUnits: Set<AngularVelocity> get() = AngleUnits.flatMap { angle ->
     TimeUnits.map { angle per it }
 }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.AngularVelocity]
+ * SI unit is `Radian per Second`
+ * @property angle the [Angle] component
+ * @property per the [Time] component
+ */
 @Serializable
 data class AngularVelocity(val angle: Angle, val per: Time) : AbstractScientificUnit<PhysicalQuantity.AngularVelocity>(), MetricAndImperialScientificUnit<PhysicalQuantity.AngularVelocity> {
     override val quantity = PhysicalQuantity.AngularVelocity
@@ -34,4 +43,9 @@ data class AngularVelocity(val angle: Angle, val per: Time) : AbstractScientific
     override fun toSIUnit(value: Decimal): Decimal = angle.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * Gets a [AngularVelocity] from a [Angle] and a [Time]
+ * @param time the [Time] component
+ * @return the [Angle] represented by the units
+ */
 infix fun Angle.per(time: Time) = AngularVelocity(this, time)
diff --git a/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt b/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
index d5452217f..97fb8d604 100644
--- a/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+
+/**
+ * Set of all [MetricAreaDensity]
+ */
 val MetricAreaDensityUnits: Set<MetricAreaDensity> get() = MetricWeightUnits.flatMap { weight ->
     MetricAreaUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialAreaDensity]
+ */
 val ImperialAreaDensityUnits: Set<ImperialAreaDensity> get() = ImperialWeightUnits.flatMap { weight ->
     ImperialAreaUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialAreaDensity]
+ */
 val UKImperialAreaDensityUnits: Set<UKImperialAreaDensity> get() = UKImperialWeightUnits.flatMap { weight ->
     ImperialAreaUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryAreaDensity]
+ */
 val USCustomaryAreaDensityUnits: Set<USCustomaryAreaDensity> get() = USCustomaryWeightUnits.flatMap { weight ->
     ImperialAreaUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [AreaDensity]
+ */
 val AreaDensityUnits: Set<AreaDensity> get() = MetricAreaDensityUnits +
     ImperialAreaDensityUnits +
     UKImperialAreaDensityUnits.filter { it.weight !is UKImperialImperialWeightWrapper }.toSet() +
     USCustomaryAreaDensityUnits.filter { it.weight !is USCustomaryImperialWeightWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.AreaDensity]
+ * SI unit is `Kilogram per SquareMeter`
+ */
 @Serializable
 sealed class AreaDensity : AbstractScientificUnit<PhysicalQuantity.AreaDensity>() {
+    /**
+     * The [Weight] component
+     */
     abstract val weight: Weight
+
+    /**
+     * The [Area] component
+     */
     abstract val per: Area
     override val symbol: String by lazy { "${weight.symbol} / ${per.symbol}" }
     override val quantity = PhysicalQuantity.AreaDensity
@@ -52,26 +79,72 @@ sealed class AreaDensity : AbstractScientificUnit<PhysicalQuantity.AreaDensity>(
     override fun toSIUnit(value: Decimal): Decimal = weight.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * An [AreaDensity] for [MeasurementSystem.Metric]
+ * @param weight the [MetricWeight] component
+ * @param per the [MetricArea] component
+ */
 @Serializable
 data class MetricAreaDensity(override val weight: MetricWeight, override val per: MetricArea) : AreaDensity(), MetricScientificUnit<PhysicalQuantity.AreaDensity> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * An [AreaDensity] for [MeasurementSystem.Imperial]
+ * @param weight the [ImperialWeight] component
+ * @param per the [ImperialArea] component
+ */
 @Serializable
 data class ImperialAreaDensity(override val weight: ImperialWeight, override val per: ImperialArea) : AreaDensity(), ImperialScientificUnit<PhysicalQuantity.AreaDensity> {
     override val system = MeasurementSystem.Imperial
     val ukImperial get() = weight.ukImperial per per
     val usCustomary get() = weight.usCustomary per per
 }
+
+/**
+ * An [AreaDensity] for [MeasurementSystem.USCustomary]
+ * @param weight the [USCustomaryWeight] component
+ * @param per the [ImperialArea] component
+ */
 @Serializable
 data class USCustomaryAreaDensity(override val weight: USCustomaryWeight, override val per: ImperialArea) : AreaDensity(), USCustomaryScientificUnit<PhysicalQuantity.AreaDensity> {
     override val system = MeasurementSystem.USCustomary
 }
+
+/**
+ * An [AreaDensity] for [MeasurementSystem.UKImperial]
+ * @param weight the [UKImperialWeight] component
+ * @param per the [ImperialArea] component
+ */
 @Serializable
 data class UKImperialAreaDensity(override val weight: UKImperialWeight, override val per: ImperialArea) : AreaDensity(), UKImperialScientificUnit<PhysicalQuantity.AreaDensity> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * Gets a [MetricAreaDensity] from a [MetricWeight] and a [MetricArea]
+ * @param area the [MetricArea] component
+ * @return the [MetricAreaDensity] represented by the units
+ */
 infix fun MetricWeight.per(area: MetricArea) = MetricAreaDensity(this, area)
+
+/**
+ * Gets a [ImperialAreaDensity] from a [ImperialWeight] and a [ImperialArea]
+ * @param area the [ImperialArea] component
+ * @return the [ImperialAreaDensity] represented by the units
+ */
 infix fun ImperialWeight.per(area: ImperialArea) = ImperialAreaDensity(this, area)
+
+/**
+ * Gets a [USCustomaryAreaDensity] from a [USCustomaryWeight] and a [ImperialArea]
+ * @param area the [ImperialArea] component
+ * @return the [USCustomaryAreaDensity] represented by the units
+ */
 infix fun USCustomaryWeight.per(area: ImperialArea) = USCustomaryAreaDensity(this, area)
+
+/**
+ * Gets a [UKImperialAreaDensity] from a [UKImperialWeight] and a [ImperialArea]
+ * @param area the [ImperialArea] component
+ * @return the [UKImperialAreaDensity] represented by the units
+ */
 infix fun UKImperialWeight.per(area: ImperialArea) = UKImperialAreaDensity(this, area)
diff --git a/scientific/src/commonMain/kotlin/unit/AreaUnit.kt b/scientific/src/commonMain/kotlin/unit/AreaUnit.kt
index b49e6cb7e..a6c631a69 100644
--- a/scientific/src/commonMain/kotlin/unit/AreaUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AreaUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricArea]
+ */
 val MetricAreaUnits: Set<MetricArea> get() = setOf(
     SquareMeter,
     SquareNanometer,
@@ -37,6 +40,9 @@ val MetricAreaUnits: Set<MetricArea> get() = setOf(
     Hectare
 )
 
+/**
+ * Set of all [ImperialArea]
+ */
 val ImperialAreaUnits: Set<ImperialArea> get() = setOf(
     SquareInch,
     SquareFoot,
@@ -45,18 +51,30 @@ val ImperialAreaUnits: Set<ImperialArea> get() = setOf(
     Acre
 )
 
+/**
+ * Set of all [Area]
+ */
 val AreaUnits: Set<Area> get() = MetricAreaUnits + ImperialAreaUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Area]
+ * SI unit is `SquareMeter`
+ */
 @Serializable
 sealed class Area : AbstractScientificUnit<PhysicalQuantity.Area>()
-
+/**
+ * An [Area] for [MeasurementSystem.Metric]
+ */
 @Serializable
 sealed class MetricArea : Area(), MetricScientificUnit<PhysicalQuantity.Area>
 
+/**
+ * An [Area] for [MeasurementSystem.Imperial]
+ */
 @Serializable
 sealed class ImperialArea : Area(), ImperialScientificUnit<PhysicalQuantity.Area>
 
-class Square<S : MeasurementSystem, U : SystemScientificUnit<S, PhysicalQuantity.Length>>(private val unit: U) : SystemScientificUnit<S, PhysicalQuantity.Area> {
+internal class Square<S : MeasurementSystem, U : SystemScientificUnit<S, PhysicalQuantity.Length>>(private val unit: U) : SystemScientificUnit<S, PhysicalQuantity.Area> {
     override val symbol: String = "${unit.symbol}2"
     override val system: S = unit.system
     override val quantity = PhysicalQuantity.Area
diff --git a/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt b/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt
index 95d8498a5..fd5a2d378 100644
--- a/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/CatalysticActivityUnit.kt
@@ -21,6 +21,9 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [CatalysticActivity]
+ */
 val CatalysticActivityUnits: Set<CatalysticActivity> get() = setOf(
     Katal,
     Nanokatal,
@@ -35,6 +38,10 @@ val CatalysticActivityUnits: Set<CatalysticActivity> get() = setOf(
     Gigakatal
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.CatalysticActivity]
+ * SI unit is [Katal]
+ */
 @Serializable
 sealed class CatalysticActivity : AbstractScientificUnit<PhysicalQuantity.CatalysticActivity>(), MetricAndImperialScientificUnit<PhysicalQuantity.CatalysticActivity>
 
diff --git a/scientific/src/commonMain/kotlin/unit/DensityUnit.kt b/scientific/src/commonMain/kotlin/unit/DensityUnit.kt
index dd09d79a0..8cf260639 100644
--- a/scientific/src/commonMain/kotlin/unit/DensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/DensityUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricDensity]
+ */
 val MetricDensityUnits: Set<MetricDensity> get() = MetricWeightUnits.flatMap { weight ->
     MetricVolumeUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialDensity]
+ */
 val ImperialDensityUnits: Set<ImperialDensity> get() = ImperialWeightUnits.flatMap { weight ->
     ImperialVolumeUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialDensity]
+ */
 val UKImperialDensityUnits: Set<UKImperialDensity> get() = UKImperialWeightUnits.flatMap { weight ->
     UKImperialVolumeUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryDensity]
+ */
 val USCustomaryDensityUnits: Set<USCustomaryDensity> get() = USCustomaryWeightUnits.flatMap { weight ->
     USCustomaryVolumeUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [Density]
+ */
 val DensityUnits: Set<Density> get() = MetricDensityUnits +
     ImperialDensityUnits +
     UKImperialDensityUnits.filter { it.weight !is UKImperialImperialWeightWrapper || it.per !is UKImperialImperialVolumeWrapper }.toSet() +
     USCustomaryDensityUnits.filter { it.weight !is USCustomaryImperialWeightWrapper || it.per !is USCustomaryImperialVolumeWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Density]
+ * SI unit is `Kilogram per CubicMeter`
+ */
 @Serializable
 sealed class Density : AbstractScientificUnit<PhysicalQuantity.Density>() {
+
+    /**
+     * The [Weight] component
+     */
     abstract val weight: Weight
+
+    /**
+     * The [Volume] component
+     */
     abstract val per: Volume
     override val symbol: String by lazy { "${weight.symbol} / ${per.symbol}" }
     override val quantity = PhysicalQuantity.Density
@@ -52,30 +79,100 @@ sealed class Density : AbstractScientificUnit<PhysicalQuantity.Density>() {
     override fun toSIUnit(value: Decimal): Decimal = weight.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [Density] for [MeasurementSystem.Metric]
+ * @param weight the [MetricWeight] component
+ * @param per the [MetricVolume] component
+ */
 @Serializable
 data class MetricDensity(override val weight: MetricWeight, override val per: MetricVolume) : Density(), MetricScientificUnit<PhysicalQuantity.Density> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [Density] for [MeasurementSystem.Imperial]
+ * @param weight the [ImperialWeight] component
+ * @param per the [ImperialVolume] component
+ */
 @Serializable
 data class ImperialDensity(override val weight: ImperialWeight, override val per: ImperialVolume) : Density(), ImperialScientificUnit<PhysicalQuantity.Density> {
     override val system = MeasurementSystem.Imperial
     val ukImperial get() = weight.ukImperial per per.ukImperial
     val usCustomary get() = weight.usCustomary per per.usCustomary
 }
+
+/**
+ * A [Density] for [MeasurementSystem.USCustomary]
+ * @param weight the [USCustomaryWeight] component
+ * @param per the [USCustomaryVolume] component
+ */
 @Serializable
 data class USCustomaryDensity(override val weight: USCustomaryWeight, override val per: USCustomaryVolume) : Density(), USCustomaryScientificUnit<PhysicalQuantity.Density> {
     override val system = MeasurementSystem.USCustomary
 }
+
+/**
+ * A [Density] for [MeasurementSystem.UKImperial]
+ * @param weight the [UKImperialWeight] component
+ * @param per the [UKImperialVolume] component
+ */
 @Serializable
 data class UKImperialDensity(override val weight: UKImperialWeight, override val per: UKImperialVolume) : Density(), UKImperialScientificUnit<PhysicalQuantity.Density> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * Gets a [MetricDensity] from a [MetricWeight] and a [MetricVolume]
+ * @param volume the [MetricVolume] component
+ * @return the [MetricDensity] represented by the units
+ */
 infix fun MetricWeight.per(volume: MetricVolume) = MetricDensity(this, volume)
+
+/**
+ * Gets a [ImperialDensity] from a [ImperialWeight] and a [ImperialVolume]
+ * @param volume the [ImperialVolume] component
+ * @return the [MetricAreaDensity] represented by the units
+ */
 infix fun ImperialWeight.per(volume: ImperialVolume) = ImperialDensity(this, volume)
+
+/**
+ * Gets a [UKImperialDensity] from a [ImperialWeight] and a [UKImperialVolume]
+ * @param volume the [UKImperialVolume] component
+ * @return the [UKImperialDensity] represented by the units
+ */
 infix fun ImperialWeight.per(volume: UKImperialVolume) = UKImperialDensity(this.ukImperial, volume)
+
+/**
+ * Gets a [USCustomaryDensity] from a [ImperialWeight] and a [USCustomaryVolume]
+ * @param volume the [USCustomaryVolume] component
+ * @return the [USCustomaryDensity] represented by the units
+ */
 infix fun ImperialWeight.per(volume: USCustomaryVolume) = USCustomaryDensity(this.usCustomary, volume)
+
+/**
+ * Gets a [USCustomaryDensity] from a [USCustomaryWeight] and a [USCustomaryVolume]
+ * @param volume the [USCustomaryVolume] component
+ * @return the [USCustomaryDensity] represented by the units
+ */
 infix fun USCustomaryWeight.per(volume: USCustomaryVolume) = USCustomaryDensity(this, volume)
+
+/**
+ * Gets a [USCustomaryDensity] from a [USCustomaryWeight] and a [ImperialVolume]
+ * @param volume the [ImperialVolume] component
+ * @return the [USCustomaryDensity] represented by the units
+ */
 infix fun USCustomaryWeight.per(volume: ImperialVolume) = USCustomaryDensity(this, volume.usCustomary)
+
+/**
+ * Gets a [UKImperialDensity] from a [UKImperialWeight] and a [ImperialVolume]
+ * @param volume the [ImperialVolume] component
+ * @return the [UKImperialDensity] represented by the units
+ */
 infix fun UKImperialWeight.per(volume: ImperialVolume) = UKImperialDensity(this, volume.ukImperial)
+
+/**
+ * Gets a [UKImperialDensity] from a [UKImperialWeight] and a [UKImperialVolume]
+ * @param volume the [UKImperialVolume] component
+ * @return the [UKImperialDensity] represented by the units
+ */
 infix fun UKImperialWeight.per(volume: UKImperialVolume) = UKImperialDensity(this, volume)
diff --git a/scientific/src/commonMain/kotlin/unit/DimensionlessUnit.kt b/scientific/src/commonMain/kotlin/unit/DimensionlessUnit.kt
index 808eeecc3..cf90f44b4 100644
--- a/scientific/src/commonMain/kotlin/unit/DimensionlessUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/DimensionlessUnit.kt
@@ -28,6 +28,8 @@ import com.splendo.kaluga.scientific.invoke
 import kotlinx.serialization.Serializable
 
 /**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Dimensionless]
+ *
  * Dimensionless Quantity
  * is a quantity to which no physical dimension is assigned, also known as a bare, pure, or scalar quantity
  * or a quantity of dimension one,
@@ -71,18 +73,11 @@ import kotlinx.serialization.Serializable
  * Source:  "SI Brochure: The International System of Units, 9th Edition".
  */
 @Serializable
-sealed class Dimensionless : AbstractScientificUnit<PhysicalQuantity.Dimensionless>(), MetricBaseUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Dimensionless> {
-    companion object {
-        operator fun <
-            Unit : ScientificUnit<PhysicalQuantity.Dimensionless>
-            > Number.invoke(unit: Unit) = this.toDecimal()(unit, ::DefaultDimensionlessScientificValue)
-
-        operator fun <
-            Unit : ScientificUnit<PhysicalQuantity.Dimensionless>
-            > Decimal.invoke(unit: Unit) = this(unit, ::DefaultDimensionlessScientificValue)
-    }
-}
+sealed class Dimensionless : AbstractScientificUnit<PhysicalQuantity.Dimensionless>(), MetricBaseUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.Dimensionless>
 
+/**
+ * Set of all [Dimensionless]
+ */
 val DimensionlessUnits: Set<Dimensionless> get() = setOf(
     One,
     Percent,
@@ -99,7 +94,7 @@ object One : Dimensionless() {
     override fun toSIUnit(value: Decimal): Decimal = value
 }
 
-val One.constant get() = One.UNIT_VALUE.invoke(One, ::DefaultDimensionlessScientificValue)
+val One.constant get() = One.UNIT_VALUE.invoke(One)
 
 @Serializable
 object Percent : Dimensionless() {
@@ -120,24 +115,3 @@ object Permill : Dimensionless() {
     override fun fromSIUnit(value: Decimal): Decimal = value * PARTS_PER_THOUSAND.toDecimal()
     override fun toSIUnit(value: Decimal): Decimal = value / PARTS_PER_THOUSAND.toDecimal()
 }
-
-interface DimensionlessScientificValue<Unit : ScientificUnit<PhysicalQuantity.Dimensionless>> : ScientificValue<PhysicalQuantity.Dimensionless, Unit> {
-    /**
-     * Returns the value as a fraction. I.e.
-     * ```
-     val percent = 12(Percent)
-     print(percent.value) // 12
-     print(percent.decimalFraction) // 0.12
-     * ```
-     */
-    val decimalFraction: Decimal
-        get() = unit.toSIUnit(value.toDecimal())
-}
-
-@Serializable
-data class DefaultDimensionlessScientificValue<Unit : ScientificUnit<PhysicalQuantity.Dimensionless>>(
-    override val value: Double,
-    override val unit: Unit
-) : DimensionlessScientificValue<Unit> {
-    constructor(value: Decimal, unit: Unit) : this(value.toDouble(), unit)
-}
diff --git a/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt b/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt
index c20f7dc12..b680f906e 100644
--- a/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricDynamicViscosity]
+ */
 val MetricDynamicViscosityUnits: Set<MetricDynamicViscosity> get() = MetricPressureUnits.flatMap { pressure ->
     TimeUnits.map { pressure x it }
 }.toSet()
 
+/**
+ * Set of all [ImperialDynamicViscosity]
+ */
 val ImperialDynamicViscosityUnits: Set<ImperialDynamicViscosity> get() = ImperialPressureUnits.flatMap { pressure ->
     TimeUnits.map { pressure x it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialDynamicViscosity]
+ */
 val UKImperialDynamicViscosityUnits: Set<UKImperialDynamicViscosity> get() = UKImperialPressureUnits.flatMap { pressure ->
     TimeUnits.map { pressure x it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryDynamicViscosity]
+ */
 val USCustomaryDynamicViscosityUnits: Set<USCustomaryDynamicViscosity> get() = USCustomaryPressureUnits.flatMap { pressure ->
     TimeUnits.map { pressure x it }
 }.toSet()
 
+/**
+ * Set of all [DynamicViscosity]
+ */
 val DynamicViscosityUnits: Set<DynamicViscosity> get() = MetricDynamicViscosityUnits +
     ImperialDynamicViscosityUnits +
     UKImperialDynamicViscosityUnits.filter { it.pressure !is UKImperialPressureWrapper }.toSet() +
     USCustomaryDynamicViscosityUnits.filter { it.pressure !is USCustomaryImperialPressureWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.DynamicViscosity]
+ * SI unit is `Pascal per Second`
+ */
 @Serializable
 sealed class DynamicViscosity : AbstractScientificUnit<PhysicalQuantity.DynamicViscosity>() {
+
+    /**
+     * The [Pressure] component
+     */
     abstract val pressure: Pressure
+
+    /**
+     * The [Time] component
+     */
     abstract val time: Time
     override val quantity = PhysicalQuantity.DynamicViscosity
     override val symbol: String by lazy { "${pressure.symbol}⋅${time.symbol}" }
@@ -52,26 +79,80 @@ sealed class DynamicViscosity : AbstractScientificUnit<PhysicalQuantity.DynamicV
     override fun toSIUnit(value: Decimal): Decimal = pressure.toSIUnit(time.toSIUnit(value))
 }
 
+/**
+ * A [DynamicViscosity] for [MeasurementSystem.Metric]
+ * @param pressure the [MetricPressure] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class MetricDynamicViscosity(override val pressure: MetricPressure, override val time: Time) : DynamicViscosity(), MetricScientificUnit<PhysicalQuantity.DynamicViscosity> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [DynamicViscosity] for [MeasurementSystem.Imperial]
+ * @param pressure the [ImperialPressure] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class ImperialDynamicViscosity(override val pressure: ImperialPressure, override val time: Time) : DynamicViscosity(), ImperialScientificUnit<PhysicalQuantity.DynamicViscosity> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialDynamicViscosity] equivalent to this [ImperialDynamicViscosity]
+     */
     val ukImperial get() = pressure.ukImperial x time
+
+    /**
+     * The [USCustomaryDynamicViscosity] equivalent to this [ImperialDynamicViscosity]
+     */
     val usCustomary get() = pressure.usCustomary x time
 }
+
+/**
+ * A [DynamicViscosity] for [MeasurementSystem.UKImperial]
+ * @param pressure the [UKImperialPressure] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class UKImperialDynamicViscosity(override val pressure: UKImperialPressure, override val time: Time) : DynamicViscosity(), UKImperialScientificUnit<PhysicalQuantity.DynamicViscosity> {
     override val system = MeasurementSystem.UKImperial
 }
+
+/**
+ * A [DynamicViscosity] for [MeasurementSystem.USCustomary]
+ * @param pressure the [USCustomaryPressure] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class USCustomaryDynamicViscosity(override val pressure: USCustomaryPressure, override val time: Time) : DynamicViscosity(), USCustomaryScientificUnit<PhysicalQuantity.DynamicViscosity> {
     override val system = MeasurementSystem.USCustomary
 }
 
+/**
+ * Gets a [MetricDynamicViscosity] from a [MetricPressure] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricDynamicViscosity] represented by the units
+ */
 infix fun MetricPressure.x(time: Time) = MetricDynamicViscosity(this, time)
+
+/**
+ * Gets a [ImperialDynamicViscosity] from a [ImperialPressure] and a [Time]
+ * @param time the [Time] component
+ * @return the [ImperialDynamicViscosity] represented by the units
+ */
 infix fun ImperialPressure.x(time: Time) = ImperialDynamicViscosity(this, time)
+
+/**
+ * Gets a [UKImperialDynamicViscosity] from a [UKImperialPressure] and a [Time]
+ * @param time the [Time] component
+ * @return the [UKImperialDynamicViscosity] represented by the units
+ */
 infix fun UKImperialPressure.x(time: Time) = UKImperialDynamicViscosity(this, time)
+
+/**
+ * Gets a [USCustomaryDynamicViscosity] from a [USCustomaryPressure] and a [Time]
+ * @param time the [Time] component
+ * @return the [USCustomaryDynamicViscosity] represented by the units
+ */
 infix fun USCustomaryPressure.x(time: Time) = USCustomaryDynamicViscosity(this, time)
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt
index 96e35e883..4e0eeb269 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricCapacitanceUnit.kt
@@ -21,6 +21,9 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [ElectricCapacitance]
+ */
 val ElectricCapacitanceUnits: Set<ElectricCapacitance> get() = setOf(
     Farad,
     Nanofarad,
@@ -35,6 +38,10 @@ val ElectricCapacitanceUnits: Set<ElectricCapacitance> get() = setOf(
     Gigafarad
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.ElectricCapacitance]
+ * SI unit is [Farad]
+ */
 @Serializable
 sealed class ElectricCapacitance : AbstractScientificUnit<PhysicalQuantity.ElectricCapacitance>(), MetricAndImperialScientificUnit<PhysicalQuantity.ElectricCapacitance>
 
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
index d86d441c7..31bd2dd80 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricChargeUnit.kt
@@ -22,6 +22,9 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import com.splendo.kaluga.scientific.invoke
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [ElectricCharge]
+ */
 val ElectricChargeUnits: Set<ElectricCharge> get() = setOf(
     Coulomb,
     Nanocoulomb,
@@ -37,6 +40,10 @@ val ElectricChargeUnits: Set<ElectricCharge> get() = setOf(
     Abcoulomb
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.ElectricCharge]
+ * SI unit is [Coulomb]
+ */
 @Serializable
 sealed class ElectricCharge : AbstractScientificUnit<PhysicalQuantity.ElectricCharge>(), MetricAndImperialScientificUnit<PhysicalQuantity.ElectricCharge>
 
@@ -77,4 +84,7 @@ object Megacoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.Met
 @Serializable
 object Gigacoulomb : CoulombMultiple(), MetricMultipleUnit<MeasurementSystem.MetricAndImperial, PhysicalQuantity.ElectricCharge, Coulomb> by Giga(Coulomb)
 
+/**
+ * The [ElectricCharge] carried by a single proton
+ */
 val elementaryCharge = 1.602176634e-19(Coulomb)
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt
index 6089159ef..463176160 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricConductanceUnit.kt
@@ -21,6 +21,9 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [ElectricConductance]
+ */
 val ElectricConductanceUnits: Set<ElectricConductance> get() = setOf(
     Siemens,
     Nanosiemens,
@@ -36,6 +39,10 @@ val ElectricConductanceUnits: Set<ElectricConductance> get() = setOf(
     Absiemens
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.ElectricConductance]
+ * SI unit is [Siemens]
+ */
 @Serializable
 sealed class ElectricConductance : AbstractScientificUnit<PhysicalQuantity.ElectricConductance>(), MetricAndImperialScientificUnit<PhysicalQuantity.ElectricConductance>
 
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt
index 8270173ce..647dfe82a 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricCurrentUnit.kt
@@ -21,6 +21,9 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [ElectricCurrent]
+ */
 val ElectricCurrentUnits: Set<ElectricCurrent> get() = setOf(
     Ampere,
     Nanoampere,
@@ -37,6 +40,10 @@ val ElectricCurrentUnits: Set<ElectricCurrent> get() = setOf(
     Abampere
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.ElectricCurrent]
+ * SI unit is [Ampere]
+ */
 @Serializable
 sealed class ElectricCurrent : AbstractScientificUnit<PhysicalQuantity.ElectricCurrent>(), MetricAndImperialScientificUnit<PhysicalQuantity.ElectricCurrent>
 
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt
index 177134b37..af1fc06bb 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricInductanceUnit.kt
@@ -21,6 +21,9 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [ElectricInductance]
+ */
 val ElectricInductanceUnits: Set<ElectricInductance> get() = setOf(
     Henry,
     Nanohenry,
@@ -36,6 +39,10 @@ val ElectricInductanceUnits: Set<ElectricInductance> get() = setOf(
     Abhenry
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.ElectricInductance]
+ * SI unit is [Henry]
+ */
 @Serializable
 sealed class ElectricInductance : AbstractScientificUnit<PhysicalQuantity.ElectricInductance>(), MetricAndImperialScientificUnit<PhysicalQuantity.ElectricInductance>
 
diff --git a/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt
index d7752f882..71908e516 100644
--- a/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ElectricResistanceUnit.kt
@@ -21,6 +21,9 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [ElectricResistance]
+ */
 val ElectricResistanceUnits: Set<ElectricResistance> get() = setOf(
     Ohm,
     Nanoohm,
@@ -36,6 +39,10 @@ val ElectricResistanceUnits: Set<ElectricResistance> get() = setOf(
     Abohm
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.ElectricResistance]
+ * SI unit is [Ohm]
+ */
 @Serializable
 sealed class ElectricResistance : AbstractScientificUnit<PhysicalQuantity.ElectricResistance>(), MetricAndImperialScientificUnit<PhysicalQuantity.ElectricResistance>
 
diff --git a/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt
index 1072cafb8..6059f9c16 100644
--- a/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/EnergyUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricEnergy]
+ */
 val MetricEnergyUnits: Set<MetricEnergy> get() = setOf(
     Joule,
     Nanojoule,
@@ -60,6 +63,9 @@ val MetricEnergyUnits: Set<MetricEnergy> get() = setOf(
     Gigaelectronvolt
 ) + MetricAndImperialEnergyUnits.map { it.metric }.toSet()
 
+/**
+ * Set of all [MetricAndImperialEnergy]
+ */
 val MetricAndImperialEnergyUnits: Set<MetricAndImperialEnergy> get() = setOf(
     WattHour,
     NanowattHour,
@@ -82,6 +88,9 @@ val MetricAndImperialEnergyUnits: Set<MetricAndImperialEnergy> get() = setOf(
     Megacalorie.IT
 )
 
+/**
+ * Set of all [ImperialEnergy]
+ */
 val ImperialEnergyUnits: Set<ImperialEnergy> get() = setOf(
     FootPoundal,
     FootPoundForce,
@@ -92,15 +101,33 @@ val ImperialEnergyUnits: Set<ImperialEnergy> get() = setOf(
     BritishThermalUnit.Thermal
 ) + MetricAndImperialEnergyUnits.map { it.imperial }.toSet()
 
+/**
+ * Set of all [Energy]
+ */
 val EnergyUnits: Set<Energy> get() = MetricAndImperialEnergyUnits + MetricEnergyUnits.filter { it !is MetricMetricAndImperialEnergyWrapper }.toSet() + ImperialEnergyUnits.filter { it !is ImperialMetricAndImperialEnergyWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Energy]
+ * SI unit is [Joule]
+ */
 @Serializable
 sealed class Energy : AbstractScientificUnit<PhysicalQuantity.Energy>()
 
+/**
+ * An [Energy] for [MeasurementSystem.Metric]
+ */
 @Serializable
 sealed class MetricEnergy : Energy(), MetricScientificUnit<PhysicalQuantity.Energy>
+
+/**
+ * An [Energy] for [MeasurementSystem.Imperial]
+ */
 @Serializable
 sealed class ImperialEnergy : Energy(), ImperialScientificUnit<PhysicalQuantity.Energy>
+
+/**
+ * An [Energy] for [MeasurementSystem.MetricAndImperial]
+ */
 @Serializable
 sealed class MetricAndImperialEnergy : Energy(), MetricAndImperialScientificUnit<PhysicalQuantity.Energy>
 
@@ -330,6 +357,10 @@ object BritishThermalUnit : ImperialEnergy(), SystemScientificUnit<MeasurementSy
     object Thermal : ImperialEnergy(), SystemScientificUnit<MeasurementSystem.Imperial, PhysicalQuantity.Energy> by BritishThermalUnitBase(Calorie, "-th")
 }
 
+/**
+ * Wraps a [MetricAndImperialEnergy] unit to a [MetricEnergy] unit
+ * @param metricAndImperialEnergy the [MetricAndImperialEnergy] to wrap
+ */
 @Serializable
 data class MetricMetricAndImperialEnergyWrapper(val metricAndImperialEnergy: MetricAndImperialEnergy) : MetricEnergy() {
     override val system = MeasurementSystem.Metric
@@ -339,8 +370,16 @@ data class MetricMetricAndImperialEnergyWrapper(val metricAndImperialEnergy: Met
     override fun toSIUnit(value: Decimal): Decimal = metricAndImperialEnergy.toSIUnit(value)
 }
 
+/**
+ * Converts a [MetricAndImperialEnergy] unit to a [MetricMetricAndImperialEnergyWrapper] unit
+ * @param EnergyUnit the type of [MetricAndImperialEnergy] to convert
+ */
 val <EnergyUnit : MetricAndImperialEnergy> EnergyUnit.metric get() = MetricMetricAndImperialEnergyWrapper(this)
 
+/**
+ * Wraps a [MetricAndImperialEnergy] unit to an [ImperialEnergy] unit
+ * @param metricAndImperialEnergy the [MetricAndImperialEnergy] to wrap
+ */
 @Serializable
 data class ImperialMetricAndImperialEnergyWrapper(val metricAndImperialEnergy: MetricAndImperialEnergy) : ImperialEnergy() {
     override val system = MeasurementSystem.Imperial
@@ -350,4 +389,8 @@ data class ImperialMetricAndImperialEnergyWrapper(val metricAndImperialEnergy: M
     override fun toSIUnit(value: Decimal): Decimal = metricAndImperialEnergy.toSIUnit(value)
 }
 
+/**
+ * Converts a [MetricAndImperialEnergy] unit to an [ImperialMetricAndImperialEnergyWrapper] unit
+ * @param EnergyUnit the type of [MetricAndImperialEnergy] to convert
+ */
 val <EnergyUnit : MetricAndImperialEnergy> EnergyUnit.imperial get() = ImperialMetricAndImperialEnergyWrapper(this)
diff --git a/scientific/src/commonMain/kotlin/unit/ForceUnit.kt b/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
index 4e1a78d86..ec1c9944d 100644
--- a/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
@@ -26,6 +26,9 @@ import com.splendo.kaluga.scientific.convertValue
 import com.splendo.kaluga.scientific.invoke
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricForce]
+ */
 val MetricForceUnits: Set<MetricForce> get() = setOf(
     Newton,
     Nanonewton,
@@ -55,6 +58,9 @@ val MetricForceUnits: Set<MetricForce> get() = setOf(
     MilligramForce
 )
 
+/**
+ * Set of all [ImperialForce]
+ */
 val ImperialForceUnits: Set<ImperialForce> get() = setOf(
     Poundal,
     PoundForce,
@@ -62,35 +68,60 @@ val ImperialForceUnits: Set<ImperialForce> get() = setOf(
     GrainForce,
 )
 
+/**
+ * Set of all [USCustomaryForce]
+ */
 val USCustomaryForceUnits: Set<USCustomaryForce> get() = setOf(
     Kip,
     UsTonForce
 ) + ImperialForceUnits.map { it.usCustomary }
 
+/**
+ * Set of all [UKImperialForce]
+ */
 val UKImperialForceUnits: Set<UKImperialForce> get() = setOf(
     ImperialTonForce
 ) + ImperialForceUnits.map { it.ukImperial }
 
+/**
+ * Set of all [Force]
+ */
 val ForceUnits: Set<Force> get() = MetricForceUnits + ImperialForceUnits + UKImperialForceUnits.filter { it !is UKImperialImperialForceWrapper }.toSet() + USCustomaryForceUnits.filter { it !is USCustomaryImperialForceWrapper }
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Force]
+ * SI unit is [Newton]
+ */
 @Serializable
 sealed class Force : AbstractScientificUnit<PhysicalQuantity.Force>()
 
+/**
+ * A [Force] for [MeasurementSystem.Metric]
+ */
 @Serializable
 sealed class MetricForce : Force(), MetricScientificUnit<PhysicalQuantity.Force>
 
+/**
+ * A [Force] for [MeasurementSystem.Imperial]
+ */
 @Serializable
 sealed class ImperialForce : Force(), ImperialScientificUnit<PhysicalQuantity.Force> {
     override val system = MeasurementSystem.Imperial
     override val quantity = PhysicalQuantity.Force
 }
 
+/**
+ * A [Force] for [MeasurementSystem.USCustomary]
+ */
 @Serializable
 sealed class USCustomaryForce : Force(), USCustomaryScientificUnit<PhysicalQuantity.Force> {
     override val system = MeasurementSystem.USCustomary
     override val quantity = PhysicalQuantity.Force
 }
 
+/**
+ * A [Force] for [MeasurementSystem.UKImperial]
+ */
 @Serializable
 sealed class UKImperialForce : Force(), UKImperialScientificUnit<PhysicalQuantity.Force> {
     override val system = MeasurementSystem.UKImperial
@@ -240,6 +271,10 @@ object UsTonForce : USCustomaryForce() {
     override fun toSIUnit(value: Decimal): Decimal = UsTon.toSIUnit(value) * MetricStandardGravityAcceleration.decimalValue
 }
 
+/**
+ * Wraps an [ImperialForce] unit to an [USCustomaryForce] unit
+ * @param imperial the [ImperialForce] to wrap
+ */
 @Serializable
 data class USCustomaryImperialForceWrapper(val imperial: ImperialForce) : USCustomaryForce() {
     override val symbol: String = imperial.symbol
@@ -247,6 +282,10 @@ data class USCustomaryImperialForceWrapper(val imperial: ImperialForce) : USCust
     override fun toSIUnit(value: Decimal): Decimal = imperial.toSIUnit(value)
 }
 
+/**
+ * Converts an [ImperialForce] unit to an [USCustomaryImperialForceWrapper] unit
+ * @param ForceUnit the type of [ImperialForce] to convert
+ */
 val <ForceUnit : ImperialForce> ForceUnit.usCustomary get() = USCustomaryImperialForceWrapper(this)
 
 @Serializable
@@ -256,6 +295,10 @@ object ImperialTonForce : UKImperialForce() {
     override fun toSIUnit(value: Decimal): Decimal = ImperialTon.toSIUnit(value) * MetricStandardGravityAcceleration.decimalValue
 }
 
+/**
+ * Wraps an [ImperialForce] unit to an [UKImperialForce] unit
+ * @param imperial the [ImperialForce] to wrap
+ */
 @Serializable
 data class UKImperialImperialForceWrapper(val imperial: ImperialForce) : UKImperialForce() {
     override val symbol: String = imperial.symbol
@@ -263,4 +306,8 @@ data class UKImperialImperialForceWrapper(val imperial: ImperialForce) : UKImper
     override fun toSIUnit(value: Decimal): Decimal = imperial.toSIUnit(value)
 }
 
+/**
+ * Converts an [ImperialForce] unit to an [UKImperialImperialForceWrapper] unit
+ * @param ForceUnit the type of [ImperialForce] to convert
+ */
 val <ForceUnit : ImperialForce> ForceUnit.ukImperial get() = UKImperialImperialForceWrapper(this)
diff --git a/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt b/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt
index 28a208fa9..281b17101 100644
--- a/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/FrequencyUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [Frequency]
+ */
 val FrequencyUnits: Set<Frequency> get() = setOf(
     Hertz,
     Nanohertz,
@@ -39,6 +42,10 @@ val FrequencyUnits: Set<Frequency> get() = setOf(
     BeatsPerMinute
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Frequency]
+ * SI unit is [Hertz]
+ */
 @Serializable
 sealed class Frequency : ScientificUnit<PhysicalQuantity.Frequency>, MetricAndImperialScientificUnit<PhysicalQuantity.Frequency>
 
diff --git a/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt b/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
index 59cf15a6a..c4209d7cc 100644
--- a/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricAndUKImperialHeatCapacity]
+ */
 val MetricAndUKImperialHeatCapacityUnits: Set<MetricAndUKImperialHeatCapacity> get() = MetricAndImperialEnergyUnits.flatMap { energy ->
     MetricAndUkImperialTemperatureUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [MetricHeatCapacity]
+ */
 val MetricHeatCapacityUnits: Set<MetricHeatCapacity> get() = MetricEnergyUnits.flatMap { energy ->
     MetricAndUkImperialTemperatureUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialHeatCapacity]
+ */
 val UKImperialHeatCapacityUnits: Set<UKImperialHeatCapacity> get() = ImperialEnergyUnits.flatMap { energy ->
     MetricAndUkImperialTemperatureUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryHeatCapacity]
+ */
 val USCustomaryHeatCapacityUnits: Set<USCustomaryHeatCapacity> get() = ImperialEnergyUnits.flatMap { energy ->
     USCustomaryTemperatureUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [HeatCapacity]
+ */
 val HeatCapacityUnits: Set<HeatCapacity> get() = MetricAndUKImperialHeatCapacityUnits +
     MetricHeatCapacityUnits.filter { it.energy !is MetricMetricAndImperialEnergyWrapper }.toSet() +
     UKImperialHeatCapacityUnits.filter { it.energy !is ImperialMetricAndImperialEnergyWrapper }.toSet() +
     USCustomaryHeatCapacityUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.HeatCapacity]
+ * SI unit is `Joule per Kelvin`
+ */
 @Serializable
 sealed class HeatCapacity : AbstractScientificUnit<PhysicalQuantity.HeatCapacity>() {
+
+    /**
+     * The [Energy] component
+     */
     abstract val energy: Energy
+
+    /**
+     * The [Temperature] component
+     */
     abstract val per: Temperature
     override val quantity = PhysicalQuantity.HeatCapacity
     override val symbol: String by lazy { "${energy.symbol} / ${per.symbol}" }
@@ -52,27 +79,87 @@ sealed class HeatCapacity : AbstractScientificUnit<PhysicalQuantity.HeatCapacity
     override fun toSIUnit(value: Decimal): Decimal = energy.toSIUnit(per.deltaFromSIUnitDelta(value))
 }
 
+/**
+ * A [HeatCapacity] for [MeasurementSystem.MetricAndImperial]
+ * @param energy the [MetricAndImperialEnergy] component
+ * @param per the [MetricAndUKImperialTemperature] component
+ */
 @Serializable
 data class MetricAndUKImperialHeatCapacity(override val energy: MetricAndImperialEnergy, override val per: MetricAndUKImperialTemperature) : HeatCapacity(), MetricAndUKImperialScientificUnit<PhysicalQuantity.HeatCapacity> {
     override val system = MeasurementSystem.MetricAndUKImperial
+
+    /**
+     * The [MetricHeatCapacity] equivalent to this [MetricAndUKImperialHeatCapacity]
+     */
     val metric get() = energy.metric per per
+
+    /**
+     * The [UKImperialHeatCapacity] equivalent to this [MetricAndUKImperialHeatCapacity]
+     */
     val ukImperial get() = energy.imperial per per
 }
+
+/**
+ * A [HeatCapacity] for [MeasurementSystem.Metric]
+ * @param energy the [MetricEnergy] component
+ * @param per the [MetricAndUKImperialTemperature] component
+ */
 @Serializable
 data class MetricHeatCapacity(override val energy: MetricEnergy, override val per: MetricAndUKImperialTemperature) : HeatCapacity(), MetricScientificUnit<PhysicalQuantity.HeatCapacity> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [HeatCapacity] for [MeasurementSystem.UKImperial]
+ * @param energy the [ImperialEnergy] component
+ * @param per the [MetricAndUKImperialTemperature] component
+ */
 @Serializable
 data class UKImperialHeatCapacity(override val energy: ImperialEnergy, override val per: MetricAndUKImperialTemperature) : HeatCapacity(), UKImperialScientificUnit<PhysicalQuantity.HeatCapacity> {
     override val system = MeasurementSystem.UKImperial
 }
+
+/**
+ * A [HeatCapacity] for [MeasurementSystem.USCustomary]
+ * @param energy the [ImperialEnergy] component
+ * @param per the [USCustomaryTemperature] component
+ */
 @Serializable
 data class USCustomaryHeatCapacity(override val energy: ImperialEnergy, override val per: USCustomaryTemperature) : HeatCapacity(), USCustomaryScientificUnit<PhysicalQuantity.HeatCapacity> {
     override val system = MeasurementSystem.USCustomary
 }
 
+/**
+ * Gets a [MetricAndUKImperialHeatCapacity] from a [MetricAndImperialEnergy] and a [MetricAndUKImperialTemperature]
+ * @param temperature the [MetricAndUKImperialTemperature] component
+ * @return the [MetricAndUKImperialHeatCapacity] represented by the units
+ */
 infix fun MetricAndImperialEnergy.per(temperature: MetricAndUKImperialTemperature) = MetricAndUKImperialHeatCapacity(this, temperature)
+
+/**
+ * Gets a [MetricHeatCapacity] from a [MetricEnergy] and a [MetricAndUKImperialTemperature]
+ * @param temperature the [MetricAndUKImperialTemperature] component
+ * @return the [MetricHeatCapacity] represented by the units
+ */
 infix fun MetricEnergy.per(temperature: MetricAndUKImperialTemperature) = MetricHeatCapacity(this, temperature)
+
+/**
+ * Gets a [UKImperialHeatCapacity] from a [ImperialEnergy] and a [MetricAndUKImperialTemperature]
+ * @param temperature the [MetricAndUKImperialTemperature] component
+ * @return the [UKImperialHeatCapacity] represented by the units
+ */
 infix fun ImperialEnergy.per(temperature: MetricAndUKImperialTemperature) = UKImperialHeatCapacity(this, temperature)
+
+/**
+ * Gets a [USCustomaryHeatCapacity] from a [MetricAndImperialEnergy] and a [USCustomaryTemperature]
+ * @param temperature the [USCustomaryTemperature] component
+ * @return the [USCustomaryHeatCapacity] represented by the units
+ */
 infix fun MetricAndImperialEnergy.per(temperature: USCustomaryTemperature) = USCustomaryHeatCapacity(this.imperial, temperature)
+
+/**
+ * Gets a [USCustomaryHeatCapacity] from a [ImperialEnergy] and a [USCustomaryTemperature]
+ * @param temperature the [USCustomaryTemperature] component
+ * @return the [USCustomaryHeatCapacity] represented by the units
+ */
 infix fun ImperialEnergy.per(temperature: USCustomaryTemperature) = USCustomaryHeatCapacity(this, temperature)
diff --git a/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt b/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt
index 4f24db883..9d434f54b 100644
--- a/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/IlluminanceUnit.kt
@@ -21,6 +21,9 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricIlluminance]
+ */
 val MetricIlluminanceUnits: Set<MetricIlluminance> get() = setOf(
     Lux,
     Nanolux,
@@ -46,17 +49,34 @@ val MetricIlluminanceUnits: Set<MetricIlluminance> get() = setOf(
     Gigaphot
 )
 
+/**
+ * Set of all [ImperialIlluminance]
+ */
 val ImperialIlluminanceUnits: Set<ImperialIlluminance> get() = setOf(
     FootCandle
 )
 
+/**
+ * Set of all [Illuminance]
+ */
 val IlluminanceUnits: Set<Illuminance> get() = MetricIlluminanceUnits + ImperialIlluminanceUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Illuminance]
+ * SI unit is [Lux]
+ */
 @Serializable
 sealed class Illuminance : AbstractScientificUnit<PhysicalQuantity.Illuminance>()
 
+/**
+ * An [Illuminance] for [MeasurementSystem.Metric]
+ */
 @Serializable
 sealed class MetricIlluminance : Illuminance(), MetricScientificUnit<PhysicalQuantity.Illuminance>
+
+/**
+ * An [Illuminance] for [MeasurementSystem.Imperial]
+ */
 @Serializable
 sealed class ImperialIlluminance : Illuminance(), ImperialScientificUnit<PhysicalQuantity.Illuminance>
 
diff --git a/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt b/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt
index b19f58deb..342559366 100644
--- a/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/IonizingRadiationAbsorbedDoseUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [IonizingRadiationAbsorbedDose]
+ */
 val IonizingRadiationAbsorbedDoseUnits: Set<IonizingRadiationAbsorbedDose> get() = setOf(
     Gray,
     Nanogray,
@@ -49,6 +52,10 @@ val IonizingRadiationAbsorbedDoseUnits: Set<IonizingRadiationAbsorbedDose> get()
     Gigarad
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.IonizingRadiationAbsorbedDose]
+ * SI unit is [Gray]
+ */
 @Serializable
 sealed class IonizingRadiationAbsorbedDose : AbstractScientificUnit<PhysicalQuantity.IonizingRadiationAbsorbedDose>(), MetricAndImperialScientificUnit<PhysicalQuantity.IonizingRadiationAbsorbedDose>
 
diff --git a/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt b/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt
index 2cbf484d6..3ded71fcd 100644
--- a/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/IonizingRadiationEquivalentDoseUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [IonizingRadiationEquivalentDose]
+ */
 val IonizingRadiationEquivalentDoseUnits: Set<IonizingRadiationEquivalentDose> get() = setOf(
     Sievert,
     Nanosievert,
@@ -49,6 +52,10 @@ val IonizingRadiationEquivalentDoseUnits: Set<IonizingRadiationEquivalentDose> g
     GigaroentgenEquivalentMan
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.IonizingRadiationEquivalentDose]
+ * SI unit is [Sievert]
+ */
 @Serializable
 sealed class IonizingRadiationEquivalentDose : AbstractScientificUnit<PhysicalQuantity.IonizingRadiationEquivalentDose>(), MetricAndImperialScientificUnit<PhysicalQuantity.IonizingRadiationEquivalentDose>
 
diff --git a/scientific/src/commonMain/kotlin/unit/JoltUnit.kt b/scientific/src/commonMain/kotlin/unit/JoltUnit.kt
index 11dd6f9ed..28463dc15 100644
--- a/scientific/src/commonMain/kotlin/unit/JoltUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/JoltUnit.kt
@@ -21,17 +21,30 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricJolt]
+ */
 val MetricJoltUnits: Set<MetricJolt> get() = MetricAccelerationUnits.flatMap { acceleration ->
     TimeUnits.map { acceleration per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialJolt]
+ */
 val ImperialJoltUnits: Set<ImperialJolt> get() = ImperialAccelerationUnits.flatMap { acceleration ->
     TimeUnits.map { acceleration per it }
 }.toSet()
 
+/**
+ * Set of all [Jolt]
+ */
 val JoltUnits: Set<Jolt> get() = MetricJoltUnits +
     ImperialJoltUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Jolt]
+ * SI unit is `Meter per Second per Second per Second`
+ */
 @Serializable
 sealed class Jolt : AbstractScientificUnit<PhysicalQuantity.Jolt>() {
     abstract val acceleration: Acceleration
@@ -51,19 +64,36 @@ sealed class Jolt : AbstractScientificUnit<PhysicalQuantity.Jolt>() {
     override fun toSIUnit(value: Decimal): Decimal = acceleration.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [Jolt] for [MeasurementSystem.Metric]
+ * @param acceleration the [MetricAcceleration] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class MetricJolt(override val acceleration: MetricAcceleration, override val per: Time) : Jolt(), MetricScientificUnit<PhysicalQuantity.Jolt> {
     override val system = MeasurementSystem.Metric
 }
 
+/**
+ * A [Jolt] for [MeasurementSystem.Imperial]
+ * @param acceleration the [ImperialAcceleration] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class ImperialJolt(override val acceleration: ImperialAcceleration, override val per: Time) : Jolt(), ImperialScientificUnit<PhysicalQuantity.Jolt> {
     override val system = MeasurementSystem.Imperial
 }
 
+/**
+ * Gets a [MetricJolt] from a [MetricAcceleration] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricJolt] represented by the units
+ */
 infix fun MetricAcceleration.per(time: Time) = MetricJolt(this, time)
+
+/**
+ * Gets a [ImperialJolt] from a [ImperialAcceleration] and a [Time]
+ * @param time the [Time] component
+ * @return the [ImperialJolt] represented by the units
+ */
 infix fun ImperialAcceleration.per(time: Time) = ImperialJolt(this, time)
-infix fun Acceleration.per(time: Time): Jolt = when (this) {
-    is MetricAcceleration -> this per time
-    is ImperialAcceleration -> this per time
-}
diff --git a/scientific/src/commonMain/kotlin/unit/KinematicViscosityUnit.kt b/scientific/src/commonMain/kotlin/unit/KinematicViscosityUnit.kt
index 6492c3644..f09fcb665 100644
--- a/scientific/src/commonMain/kotlin/unit/KinematicViscosityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/KinematicViscosityUnit.kt
@@ -21,20 +21,41 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricKinematicViscosity]
+ */
 val MetricKinematicViscosityUnits: Set<MetricKinematicViscosity> get() = MetricAreaUnits.flatMap { area ->
     TimeUnits.map { area per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialKinematicViscosity]
+ */
 val ImperialKinematicViscosityUnits: Set<ImperialKinematicViscosity> get() = ImperialAreaUnits.flatMap { area ->
     TimeUnits.map { area per it }
 }.toSet()
 
+/**
+ * Set of all [KinematicViscosity]
+ */
 val KinematicViscosityUnits: Set<KinematicViscosity> get() = MetricKinematicViscosityUnits +
     ImperialKinematicViscosityUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.KinematicViscosity]
+ * SI unit is `SquareMeter per Second`
+ */
 @Serializable
 sealed class KinematicViscosity : AbstractScientificUnit<PhysicalQuantity.KinematicViscosity>() {
+
+    /**
+     * The [Area] component
+     */
     abstract val area: Area
+
+    /**
+     * The [Time] component
+     */
     abstract val time: Time
     override val quantity = PhysicalQuantity.KinematicViscosity
     override val symbol: String by lazy { "${area.symbol} / ${time.symbol}" }
@@ -42,18 +63,36 @@ sealed class KinematicViscosity : AbstractScientificUnit<PhysicalQuantity.Kinema
     override fun toSIUnit(value: Decimal): Decimal = area.toSIUnit(time.fromSIUnit(value))
 }
 
+/**
+ * A [KinematicViscosity] for [MeasurementSystem.Metric]
+ * @param area the [MetricArea] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class MetricKinematicViscosity(override val area: MetricArea, override val time: Time) : KinematicViscosity(), MetricScientificUnit<PhysicalQuantity.KinematicViscosity> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [KinematicViscosity] for [MeasurementSystem.Imperial]
+ * @param area the [ImperialArea] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class ImperialKinematicViscosity(override val area: ImperialArea, override val time: Time) : KinematicViscosity(), ImperialScientificUnit<PhysicalQuantity.KinematicViscosity> {
     override val system = MeasurementSystem.Imperial
 }
 
+/**
+ * Gets a [MetricKinematicViscosity] from a [MetricArea] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricKinematicViscosity] represented by the units
+ */
 infix fun MetricArea.per(time: Time) = MetricKinematicViscosity(this, time)
+
+/**
+ * Gets a [ImperialKinematicViscosity] from a [ImperialArea] and a [Time]
+ * @param time the [Time] component
+ * @return the [ImperialKinematicViscosity] represented by the units
+ */
 infix fun ImperialArea.per(time: Time) = ImperialKinematicViscosity(this, time)
-infix fun Area.per(time: Time): KinematicViscosity = when (this) {
-    is MetricArea -> this per time
-    is ImperialArea -> this per time
-}
diff --git a/scientific/src/commonMain/kotlin/unit/LengthUnit.kt b/scientific/src/commonMain/kotlin/unit/LengthUnit.kt
index 7a3ffa7f8..6662c148b 100644
--- a/scientific/src/commonMain/kotlin/unit/LengthUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LengthUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricLength]
+ */
 val MetricLengthUnits: Set<MetricLength> get() = setOf(
     Meter,
     Nanometer,
@@ -39,6 +42,9 @@ val MetricLengthUnits: Set<MetricLength> get() = setOf(
     NauticalMile
 )
 
+/**
+ * Set of all [ImperialLength]
+ */
 val ImperialLengthUnits: Set<ImperialLength> get() = setOf(
     Inch,
     Foot,
@@ -46,16 +52,29 @@ val ImperialLengthUnits: Set<ImperialLength> get() = setOf(
     Mile
 )
 
+/**
+ * Set of all [Length]
+ */
 val LengthUnits: Set<Length> get() = MetricLengthUnits + ImperialLengthUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Length]
+ * SI unit is [Meter]
+ */
 @Serializable
 sealed class Length : AbstractScientificUnit<PhysicalQuantity.Length>()
 
+/**
+ * A [Length] for [MeasurementSystem.Metric]
+ */
 @Serializable
 sealed class MetricLength : Length(), MetricScientificUnit<PhysicalQuantity.Length>
 
+/**
+ * A [Length] for [MeasurementSystem.Imperial]
+ */
 @Serializable
-sealed class ImperialLength(override val symbol: String) : Length(), ImperialScientificUnit<PhysicalQuantity.Length> {
+sealed class ImperialLength : Length(), ImperialScientificUnit<PhysicalQuantity.Length> {
     override val system = MeasurementSystem.Imperial
     override val quantity = PhysicalQuantity.Length
 }
@@ -115,29 +134,33 @@ object NauticalMile : MetricLength() {
 
 // Imperial Length
 @Serializable
-object Inch : ImperialLength("in") {
+object Inch : ImperialLength() {
     private const val INCHES_IN_FOOT = 12
+    override val symbol: String = "in"
     override fun toSIUnit(value: Decimal): Decimal = Foot.toSIUnit(value / INCHES_IN_FOOT.toDecimal())
     override fun fromSIUnit(value: Decimal): Decimal = Foot.fromSIUnit(value) * INCHES_IN_FOOT.toDecimal()
 }
 
 @Serializable
-object Foot : ImperialLength("ft") {
+object Foot : ImperialLength() {
     private const val METER_IN_FEET = 0.3048
+    override val symbol: String = "ft"
     override fun toSIUnit(value: Decimal): Decimal = value * METER_IN_FEET.toDecimal()
     override fun fromSIUnit(value: Decimal): Decimal = value / METER_IN_FEET.toDecimal()
 }
 
 @Serializable
-object Yard : ImperialLength("yd") {
+object Yard : ImperialLength() {
     private const val FOOT_IN_YARD = 3
+    override val symbol: String = "yd"
     override fun toSIUnit(value: Decimal): Decimal = Foot.toSIUnit(value * FOOT_IN_YARD.toDecimal())
     override fun fromSIUnit(value: Decimal): Decimal = Foot.fromSIUnit(value) / FOOT_IN_YARD.toDecimal()
 }
 
 @Serializable
-object Mile : ImperialLength("mi") {
+object Mile : ImperialLength() {
     private const val YARDS_IN_MILE = 1760
+    override val symbol: String = "mi"
     override fun toSIUnit(value: Decimal): Decimal = Yard.toSIUnit(value * YARDS_IN_MILE.toDecimal())
     override fun fromSIUnit(value: Decimal): Decimal = Yard.fromSIUnit(value) / YARDS_IN_MILE.toDecimal()
 }
diff --git a/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt b/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt
index c4533dad8..aed1c9b1f 100644
--- a/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricLinearMassDensity]
+ */
 val MetricLinearMassDensityUnits: Set<MetricLinearMassDensity> get() = MetricWeightUnits.flatMap { weight ->
     MetricLengthUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialLinearMassDensity]
+ */
 val ImperialLinearMassDensityUnits: Set<ImperialLinearMassDensity> get() = ImperialWeightUnits.flatMap { weight ->
     ImperialLengthUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialLinearMassDensity]
+ */
 val UKImperialLinearMassDensityUnits: Set<UKImperialLinearMassDensity> get() = UKImperialWeightUnits.flatMap { weight ->
     ImperialLengthUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryLinearMassDensity]
+ */
 val USCustomaryLinearMassDensityUnits: Set<USCustomaryLinearMassDensity> get() = USCustomaryWeightUnits.flatMap { weight ->
     ImperialLengthUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [LinearMassDensity]
+ */
 val LinearMassDensityUnits: Set<LinearMassDensity> get() = MetricLinearMassDensityUnits +
     ImperialLinearMassDensityUnits +
     UKImperialLinearMassDensityUnits.filter { it.weight !is UKImperialImperialWeightWrapper }.toSet() +
     USCustomaryLinearMassDensityUnits.filter { it.weight !is USCustomaryImperialWeightWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.LinearMassDensity]
+ * SI unit is `Kilogram per Meter`
+ */
 @Serializable
 sealed class LinearMassDensity : AbstractScientificUnit<PhysicalQuantity.LinearMassDensity>() {
+
+    /**
+     * The [Weight] component
+     */
     abstract val weight: Weight
+
+    /**
+     * The [Length] component
+     */
     abstract val per: Length
     override val symbol: String by lazy { "${weight.symbol} / ${per.symbol}" }
     override val quantity = PhysicalQuantity.LinearMassDensity
@@ -52,26 +79,80 @@ sealed class LinearMassDensity : AbstractScientificUnit<PhysicalQuantity.LinearM
     override fun toSIUnit(value: Decimal): Decimal = weight.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [LinearMassDensity] for [MeasurementSystem.Metric]
+ * @param weight the [MetricWeight] component
+ * @param per the [MetricLength] component
+ */
 @Serializable
 data class MetricLinearMassDensity(override val weight: MetricWeight, override val per: MetricLength) : LinearMassDensity(), MetricScientificUnit<PhysicalQuantity.LinearMassDensity> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [LinearMassDensity] for [MeasurementSystem.Imperial]
+ * @param weight the [ImperialWeight] component
+ * @param per the [ImperialLength] component
+ */
 @Serializable
 data class ImperialLinearMassDensity(override val weight: ImperialWeight, override val per: ImperialLength) : LinearMassDensity(), ImperialScientificUnit<PhysicalQuantity.LinearMassDensity> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialLinearMassDensity] equivalent to this [ImperialLinearMassDensity]
+     */
     val ukImperial get() = weight.ukImperial per per
+
+    /**
+     * The [USCustomaryLinearMassDensity] equivalent to this [ImperialLinearMassDensity]
+     */
     val usCustomary get() = weight.usCustomary per per
 }
+
+/**
+ * A [LinearMassDensity] for [MeasurementSystem.USCustomary]
+ * @param weight the [USCustomaryWeight] component
+ * @param per the [ImperialLength] component
+ */
 @Serializable
 data class USCustomaryLinearMassDensity(override val weight: USCustomaryWeight, override val per: ImperialLength) : LinearMassDensity(), USCustomaryScientificUnit<PhysicalQuantity.LinearMassDensity> {
     override val system = MeasurementSystem.USCustomary
 }
+
+/**
+ * A [LinearMassDensity] for [MeasurementSystem.UKImperial]
+ * @param weight the [UKImperialWeight] component
+ * @param per the [ImperialLength] component
+ */
 @Serializable
 data class UKImperialLinearMassDensity(override val weight: UKImperialWeight, override val per: ImperialLength) : LinearMassDensity(), UKImperialScientificUnit<PhysicalQuantity.LinearMassDensity> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * Gets a [MetricLinearMassDensity] from a [MetricWeight] and a [MetricLength]
+ * @param length the [MetricLength] component
+ * @return the [MetricLinearMassDensity] represented by the units
+ */
 infix fun MetricWeight.per(length: MetricLength) = MetricLinearMassDensity(this, length)
+
+/**
+ * Gets a [ImperialLinearMassDensity] from a [ImperialWeight] and a [ImperialLength]
+ * @param length the [ImperialLength] component
+ * @return the [ImperialLinearMassDensity] represented by the units
+ */
 infix fun ImperialWeight.per(length: ImperialLength) = ImperialLinearMassDensity(this, length)
+
+/**
+ * Gets a [USCustomaryLinearMassDensity] from a [USCustomaryWeight] and a [ImperialLength]
+ * @param length the [ImperialLength] component
+ * @return the [USCustomaryLinearMassDensity] represented by the units
+ */
 infix fun USCustomaryWeight.per(length: ImperialLength) = USCustomaryLinearMassDensity(this, length)
+
+/**
+ * Gets a [UKImperialLinearMassDensity] from a [UKImperialWeight] and a [ImperialLength]
+ * @param length the [ImperialLength] component
+ * @return the [UKImperialLinearMassDensity] represented by the units
+ */
 infix fun UKImperialWeight.per(length: ImperialLength) = UKImperialLinearMassDensity(this, length)
diff --git a/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt
index ab55bea2b..82f212775 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminanceUnit.kt
@@ -25,6 +25,9 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 import kotlin.math.PI
 
+/**
+ * Set of all [MetricLuminance]
+ */
 val MetricLuminanceUnits: Set<MetricLuminance> get() = setOf(
     Nit,
     Nanonit,
@@ -44,17 +47,34 @@ val MetricLuminanceUnits: Set<MetricLuminance> get() = setOf(
     Bril
 )
 
+/**
+ * Set of all [ImperialLuminance]
+ */
 val ImperialLuminanceUnits: Set<ImperialLuminance> get() = setOf(
     FootLambert
 )
 
+/**
+ * Set of all [Luminance]
+ */
 val LuminanceUnits: Set<Luminance> get() = MetricLuminanceUnits + ImperialLuminanceUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Luminance]
+ * SI unit is [Nit]
+ */
 @Serializable
 sealed class Luminance : AbstractScientificUnit<PhysicalQuantity.Luminance>()
 
+/**
+ * A [Luminance] for [MeasurementSystem.Metric]
+ */
 @Serializable
 sealed class MetricLuminance : Luminance(), MetricScientificUnit<PhysicalQuantity.Luminance>
+
+/**
+ * A [Luminance] for [MeasurementSystem.Imperial]
+ */
 @Serializable
 sealed class ImperialLuminance : Luminance(), ImperialScientificUnit<PhysicalQuantity.Luminance>
 
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousEnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminousEnergyUnit.kt
index fe2a051ba..7b547a75b 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousEnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousEnergyUnit.kt
@@ -21,10 +21,19 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [LuminousEnergy]
+ */
 val LuminousEnergyUnits: Set<LuminousEnergy> get() = LuminousFluxUnits.flatMap { flux ->
     TimeUnits.map { flux x it }
 }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.LuminousEnergy]
+ * SI unit is `Lumen x Second`
+ * @property luminousFlux the [LuminousFlux] component
+ * @property time the [Time] component
+ */
 @Serializable
 data class LuminousEnergy(val luminousFlux: LuminousFlux, val time: Time) : MetricAndImperialScientificUnit<PhysicalQuantity.LuminousEnergy> {
     override val symbol: String = "${luminousFlux.symbol}⋅${time.symbol}"
@@ -34,4 +43,9 @@ data class LuminousEnergy(val luminousFlux: LuminousFlux, val time: Time) : Metr
     override fun toSIUnit(value: Decimal): Decimal = time.toSIUnit(luminousFlux.toSIUnit(value))
 }
 
+/**
+ * Gets a [LuminousEnergy] from a [LuminousFlux] and a [Time]
+ * @param time the [Time] component
+ * @return the [LuminousEnergy] represented by the units
+ */
 infix fun LuminousFlux.x(time: Time) = LuminousEnergy(this, time)
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt b/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt
index b377b62a8..2a7e06670 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt
@@ -21,19 +21,39 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricLuminousExposure]
+ */
 val MetricLuminousExposureUnits: Set<MetricLuminousExposure> get() = MetricIlluminanceUnits.flatMap { illuminance ->
     TimeUnits.map { illuminance x it }
 }.toSet()
 
+/**
+ * Set of all [ImperialLuminousExposure]
+ */
 val ImperialLuminousExposureUnits: Set<ImperialLuminousExposure> get() = ImperialIlluminanceUnits.flatMap { illuminance ->
     TimeUnits.map { illuminance x it }
 }.toSet()
 
+/**
+ * Set of all [LuminousExposure]
+ */
 val LuminousExposureUnits: Set<LuminousExposure> get() = MetricLuminousExposureUnits + ImperialLuminousExposureUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.LuminousExposure]
+ * SI unit is `Lux x Second`
+ */
 @Serializable
 abstract class LuminousExposure : ScientificUnit<PhysicalQuantity.LuminousExposure> {
+    /**
+     * The [Illuminance] component
+     */
     abstract val illuminance: Illuminance
+
+    /**
+     * The [Time] component
+     */
     abstract val time: Time
     override val symbol: String get() = "${illuminance.symbol}⋅${time.symbol}"
     override val quantity = PhysicalQuantity.LuminousExposure
@@ -41,15 +61,36 @@ abstract class LuminousExposure : ScientificUnit<PhysicalQuantity.LuminousExposu
     override fun toSIUnit(value: Decimal): Decimal = time.toSIUnit(illuminance.toSIUnit(value))
 }
 
+/**
+ * A [LuminousExposure] for [MeasurementSystem.Metric]
+ * @param illuminance the [MetricIlluminance] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class MetricLuminousExposure(override val illuminance: MetricIlluminance, override val time: Time) : LuminousExposure(), MetricScientificUnit<PhysicalQuantity.LuminousExposure> {
     override val system = MeasurementSystem.Metric
 }
 
+/**
+ * A [LuminousExposure] for [MeasurementSystem.Imperial]
+ * @param illuminance the [ImperialIlluminance] component
+ * @param time the [Time] component
+ */
 @Serializable
 data class ImperialLuminousExposure(override val illuminance: ImperialIlluminance, override val time: Time) : LuminousExposure(), ImperialScientificUnit<PhysicalQuantity.LuminousExposure> {
     override val system = MeasurementSystem.Imperial
 }
 
+/**
+ * Gets a [MetricLuminousExposure] from a [MetricIlluminance] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricLuminousExposure] represented by the units
+ */
 infix fun MetricIlluminance.x(time: Time) = MetricLuminousExposure(this, time)
+
+/**
+ * Gets a [ImperialLuminousExposure] from a [ImperialIlluminance] and a [Time]
+ * @param time the [Time] component
+ * @return the [ImperialLuminousExposure] represented by the units
+ */
 infix fun ImperialIlluminance.x(time: Time) = ImperialLuminousExposure(this, time)
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt
index 13d8bd864..ccf3da923 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousFluxUnit.kt
@@ -21,6 +21,9 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [LuminousFlux]
+ */
 val LuminousFluxUnits: Set<LuminousFlux> get() = setOf(
     Lumen,
     Nanolumen,
@@ -35,6 +38,10 @@ val LuminousFluxUnits: Set<LuminousFlux> get() = setOf(
     Gigalumen
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.LuminousFlux]
+ * SI unit is [Lumen]
+ */
 @Serializable
 sealed class LuminousFlux : AbstractScientificUnit<PhysicalQuantity.LuminousFlux>(), MetricAndImperialScientificUnit<PhysicalQuantity.LuminousFlux>
 
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt b/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt
index 7540405c3..1cc622eb6 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousIntensityUnit.kt
@@ -21,6 +21,9 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [LuminousIntensity]
+ */
 val LuminousIntensityUnits: Set<LuminousIntensity> get() = setOf(
     Candela,
     Nanocandela,
@@ -35,6 +38,10 @@ val LuminousIntensityUnits: Set<LuminousIntensity> get() = setOf(
     Gigacandela
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.LuminousIntensity]
+ * SI unit is [Candela]
+ */
 @Serializable
 sealed class LuminousIntensity : AbstractScientificUnit<PhysicalQuantity.LuminousIntensity>(), MetricAndImperialScientificUnit<PhysicalQuantity.LuminousIntensity>
 
diff --git a/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt b/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt
index ae1e58bc1..73dc1f00f 100644
--- a/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MagneticFluxUnit.kt
@@ -21,6 +21,9 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MagneticFlux]
+ */
 val MagneticFluxUnits: Set<MagneticFlux> get() = setOf(
     Weber,
     Nanoweber,
@@ -36,6 +39,10 @@ val MagneticFluxUnits: Set<MagneticFlux> get() = setOf(
     Maxwell
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.MagneticFlux]
+ * SI unit is [Weber]
+ */
 @Serializable
 sealed class MagneticFlux : AbstractScientificUnit<PhysicalQuantity.MagneticFlux>(), MetricAndImperialScientificUnit<PhysicalQuantity.MagneticFlux>
 
diff --git a/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt b/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt
index 47b0ede7c..b0ec1ea23 100644
--- a/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MagneticInductionUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MagneticInduction]
+ */
 val MagneticInductionUnits: Set<MagneticInduction> get() = setOf(
     Tesla,
     Nanotesla,
@@ -39,6 +42,10 @@ val MagneticInductionUnits: Set<MagneticInduction> get() = setOf(
     Gauss
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.MagneticInduction]
+ * SI unit is [Tesla]
+ */
 @Serializable
 sealed class MagneticInduction : AbstractScientificUnit<PhysicalQuantity.MagneticInduction>(), MetricAndImperialScientificUnit<PhysicalQuantity.MagneticInduction>
 
diff --git a/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt b/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt
index a0830146f..799d63c5f 100644
--- a/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricMassFlowRate]
+ */
 val MetricMassFlowRateUnits: Set<MetricMassFlowRate> get() = MetricWeightUnits.flatMap { weight ->
     TimeUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialMassFlowRate]
+ */
 val ImperialMassFlowRateUnits: Set<ImperialMassFlowRate> get() = ImperialWeightUnits.flatMap { weight ->
     TimeUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialMassFlowRate]
+ */
 val UKImperialMassFlowRateUnits: Set<UKImperialMassFlowRate> get() = UKImperialWeightUnits.flatMap { weight ->
     TimeUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryMassFlowRate]
+ */
 val USCustomaryMassFlowRateUnits: Set<USCustomaryMassFlowRate> get() = USCustomaryWeightUnits.flatMap { weight ->
     TimeUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [MassFlowRate]
+ */
 val MassFlowRateUnits: Set<MassFlowRate> get() = MetricMassFlowRateUnits +
     ImperialMassFlowRateUnits +
     UKImperialMassFlowRateUnits.filter { it.weight !is UKImperialImperialWeightWrapper }.toSet() +
     USCustomaryMassFlowRateUnits.filter { it.weight !is USCustomaryImperialWeightWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.MassFlowRate]
+ * SI unit is `Kilogram per Second`
+ */
 @Serializable
 sealed class MassFlowRate : AbstractScientificUnit<PhysicalQuantity.MassFlowRate>() {
+
+    /**
+     * The [Weight] component
+     */
     abstract val weight: Weight
+
+    /**
+     * The [Time] component
+     */
     abstract val per: Time
     override val symbol: String by lazy { "${weight.symbol} / ${per.symbol}" }
     override val quantity = PhysicalQuantity.MassFlowRate
@@ -52,26 +79,79 @@ sealed class MassFlowRate : AbstractScientificUnit<PhysicalQuantity.MassFlowRate
     override fun toSIUnit(value: Decimal): Decimal = weight.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [MassFlowRate] for [MeasurementSystem.Metric]
+ * @param weight the [MetricWeight] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class MetricMassFlowRate(override val weight: MetricWeight, override val per: Time) : MassFlowRate(), MetricScientificUnit<PhysicalQuantity.MassFlowRate> {
     override val system = MeasurementSystem.Metric
 }
+/**
+ * A [MassFlowRate] for [MeasurementSystem.Imperial]
+ * @param weight the [ImperialWeight] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class ImperialMassFlowRate(override val weight: ImperialWeight, override val per: Time) : MassFlowRate(), ImperialScientificUnit<PhysicalQuantity.MassFlowRate> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialMassFlowRate] equivalent to this [ImperialMassFlowRate]
+     */
     val ukImperial get() = weight.ukImperial per per
+
+    /**
+     * The [USCustomaryMassFlowRate] equivalent to this [ImperialMassFlowRate]
+     */
     val usCustomary get() = weight.usCustomary per per
 }
+
+/**
+ * A [MassFlowRate] for [MeasurementSystem.USCustomary]
+ * @param weight the [USCustomaryWeight] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class USCustomaryMassFlowRate(override val weight: USCustomaryWeight, override val per: Time) : MassFlowRate(), USCustomaryScientificUnit<PhysicalQuantity.MassFlowRate> {
     override val system = MeasurementSystem.USCustomary
 }
+
+/**
+ * A [MassFlowRate] for [MeasurementSystem.UKImperial]
+ * @param weight the [UKImperialWeight] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class UKImperialMassFlowRate(override val weight: UKImperialWeight, override val per: Time) : MassFlowRate(), UKImperialScientificUnit<PhysicalQuantity.MassFlowRate> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * Gets a [MetricMassFlowRate] from a [MetricWeight] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricMassFlowRate] represented by the units
+ */
 infix fun MetricWeight.per(time: Time) = MetricMassFlowRate(this, time)
+
+/**
+ * Gets a [ImperialMassFlowRate] from a [ImperialWeight] and a [Time]
+ * @param time the [Time] component
+ * @return the [ImperialMassFlowRate] represented by the units
+ */
 infix fun ImperialWeight.per(time: Time) = ImperialMassFlowRate(this, time)
+
+/**
+ * Gets a [USCustomaryMassFlowRate] from a [USCustomaryWeight] and a [Time]
+ * @param time the [Time] component
+ * @return the [USCustomaryMassFlowRate] represented by the units
+ */
 infix fun USCustomaryWeight.per(time: Time) = USCustomaryMassFlowRate(this, time)
+
+/**
+ * Gets a [UKImperialMassFlowRate] from a [UKImperialWeight] and a [Time]
+ * @param time the [Time] component
+ * @return the [UKImperialMassFlowRate] represented by the units
+ */
 infix fun UKImperialWeight.per(time: Time) = UKImperialMassFlowRate(this, time)
diff --git a/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt b/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt
index 44dce8d19..ba08dd5f9 100644
--- a/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt
+++ b/scientific/src/commonMain/kotlin/unit/MeasurementSystem.kt
@@ -24,36 +24,102 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * The system in which measurement is used
+ */
 sealed interface MeasurementUsage {
+
+    /**
+     * A measurement that is used in the Metric system
+     */
     interface UsedInMetric
+
+    /**
+     * A measurement that is used in the UK Imperial system
+     */
     interface UsedInUKImperial
+
+    /**
+     * A measurement that is used in the US Customary system
+     */
     interface UsedInUSCustomary
+
+    /**
+     * A measurement that is used in both UK Imperial and US Customary systems
+     */
     interface UsedInImperial : UsedInUKImperial, UsedInUSCustomary
+
+    /**
+     * A measurement that is used in both Metric and UK Imperial systems
+     */
     interface UsedInMetricAndUKImperial : UsedInMetric, UsedInUKImperial
+
+    /**
+     * A measurement that is used in Metric, UK Imperial and US Customary systems
+     */
     interface UsedInMetricAndImperial : UsedInMetric, UsedInImperial
 }
 
+/**
+ * The system of measurement
+ */
 @Serializable
 sealed class MeasurementSystem : MeasurementUsage, com.splendo.kaluga.base.utils.Serializable {
 
+    /**
+     * The metric system
+     */
     @Serializable
     object Metric : MeasurementSystem(), MeasurementUsage.UsedInMetric
+
+    /**
+     * The Imperial system (both UK Imperial and US Customary)
+     */
     @Serializable
     object Imperial : MeasurementSystem(), MeasurementUsage.UsedInImperial
+
+    /**
+     * The US Customary system
+     */
     @Serializable
     object USCustomary : MeasurementSystem(), MeasurementUsage.UsedInUSCustomary
+
+    /**
+     * The UK Imperial system
+     */
     @Serializable
     object UKImperial : MeasurementSystem(), MeasurementUsage.UsedInUKImperial
+
+    /**
+     * System shared between Metric and UK Imperial
+     */
     @Serializable
     object MetricAndUKImperial : MeasurementSystem(), MeasurementUsage.UsedInMetricAndUKImperial
+
+    /**
+     * A global system
+     */
     @Serializable
     object MetricAndImperial : MeasurementSystem(), MeasurementUsage.UsedInMetricAndImperial
 }
 
+/**
+ * A base unit of a [PhysicalQuantity] used in a [MeasurementSystem] that has [MeasurementUsage.UsedInMetric]
+ * Base units can be multiplied using [MetricMultipleUnit] to get a derived unit (e.g. Meter to Kilometer)
+ * @param System the type of [MeasurementSystem] to use. Must have [MeasurementUsage.UsedInMetric]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ */
 interface MetricBaseUnit<System, Quantity : PhysicalQuantity> : SystemScientificUnit<System, Quantity> where System : MeasurementSystem, System : MeasurementUsage.UsedInMetric {
     override val quantity: Quantity
 }
 
+/**
+ * A multiplication of a [MetricBaseUnit].
+ * Example: Kilometer is a multiple of Meter
+ * @param System the type of [MeasurementSystem] to use. Must have [MeasurementUsage.UsedInMetric]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [MetricBaseUnit] to multiply with
+ */
 sealed interface MetricMultipleUnit<System, Quantity : PhysicalQuantity, Unit : MetricBaseUnit<System, Quantity>> : SystemScientificUnit<System, Quantity> where System : MeasurementSystem, System : MeasurementUsage.UsedInMetric
 
 class Giga<System, Quantity : PhysicalQuantity, Unit : MetricBaseUnit<System, Quantity>>(private val unit: Unit) : MetricMultipleUnit<System, Quantity, Unit> where System : MeasurementSystem, System : MeasurementUsage.UsedInMetric {
diff --git a/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt b/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt
index c95ae2866..b4d1e0a17 100644
--- a/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricMolality]
+ */
 val MetricMolalityUnits: Set<MetricMolality> get() = AmountOfSubstanceUnits.flatMap { amountOfSubstance ->
     MetricWeightUnits.map { amountOfSubstance per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialMolality]
+ */
 val ImperialMolalityUnits: Set<ImperialMolality> get() = AmountOfSubstanceUnits.flatMap { amountOfSubstance ->
     ImperialWeightUnits.map { amountOfSubstance per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialMolality]
+ */
 val UKImperialMolalityUnits: Set<UKImperialMolality> get() = AmountOfSubstanceUnits.flatMap { amountOfSubstance ->
     UKImperialWeightUnits.map { amountOfSubstance per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryMolality]
+ */
 val USCustomaryMolalityUnits: Set<USCustomaryMolality> get() = AmountOfSubstanceUnits.flatMap { amountOfSubstance ->
     USCustomaryWeightUnits.map { amountOfSubstance per it }
 }.toSet()
 
+/**
+ * Set of all [Molality]
+ */
 val MolalityUnits: Set<Molality> get() = MetricMolalityUnits +
     ImperialMolalityUnits +
     UKImperialMolalityUnits.filter { it.per !is UKImperialImperialWeightWrapper }.toSet() +
     USCustomaryMolalityUnits.filter { it.per !is USCustomaryImperialWeightWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Molality]
+ * SI unit is `Mole per Kilogram`
+ */
 @Serializable
 sealed class Molality : AbstractScientificUnit<PhysicalQuantity.Molality>() {
+
+    /**
+     * The [AmountOfSubstance] component
+     */
     abstract val amountOfSubstance: AmountOfSubstance
+
+    /**
+     * The [Weight] component
+     */
     abstract val per: Weight
     override val symbol: String by lazy { "${amountOfSubstance.symbol} / ${per.symbol}" }
     override val quantity = PhysicalQuantity.Molality
@@ -52,26 +79,80 @@ sealed class Molality : AbstractScientificUnit<PhysicalQuantity.Molality>() {
     override fun toSIUnit(value: Decimal): Decimal = amountOfSubstance.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [Molality] for [MeasurementSystem.Metric]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @param per the [MetricWeight] component
+ */
 @Serializable
 data class MetricMolality(override val amountOfSubstance: AmountOfSubstance, override val per: MetricWeight) : Molality(), MetricScientificUnit<PhysicalQuantity.Molality> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [Molality] for [MeasurementSystem.Imperial]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @param per the [ImperialWeight] component
+ */
 @Serializable
 data class ImperialMolality(override val amountOfSubstance: AmountOfSubstance, override val per: ImperialWeight) : Molality(), ImperialScientificUnit<PhysicalQuantity.Molality> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialMolality] equivalent to this [ImperialMolality]
+     */
     val ukImperial get() = amountOfSubstance per per.ukImperial
+
+    /**
+     * The [USCustomaryMolality] equivalent to this [ImperialMolality]
+     */
     val usCustomary get() = amountOfSubstance per per.usCustomary
 }
+
+/**
+ * A [Molality] for [MeasurementSystem.USCustomary]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @param per the [USCustomaryWeight] component
+ */
 @Serializable
 data class USCustomaryMolality(override val amountOfSubstance: AmountOfSubstance, override val per: USCustomaryWeight) : Molality(), USCustomaryScientificUnit<PhysicalQuantity.Molality> {
     override val system = MeasurementSystem.USCustomary
 }
+
+/**
+ * A [Molality] for [MeasurementSystem.UKImperial]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @param per the [UKImperialWeight] component
+ */
 @Serializable
 data class UKImperialMolality(override val amountOfSubstance: AmountOfSubstance, override val per: UKImperialWeight) : Molality(), UKImperialScientificUnit<PhysicalQuantity.Molality> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * Gets a [MetricMolality] from a [AmountOfSubstance] and a [MetricWeight]
+ * @param weight the [MetricWeight] component
+ * @return the [MetricMolality] represented by the units
+ */
 infix fun AmountOfSubstance.per(weight: MetricWeight) = MetricMolality(this, weight)
+
+/**
+ * Gets a [ImperialMolality] from a [AmountOfSubstance] and a [ImperialWeight]
+ * @param weight the [ImperialWeight] component
+ * @return the [ImperialMolality] represented by the units
+ */
 infix fun AmountOfSubstance.per(weight: ImperialWeight) = ImperialMolality(this, weight)
+
+/**
+ * Gets a [UKImperialMolality] from a [AmountOfSubstance] and a [UKImperialWeight]
+ * @param weight the [UKImperialWeight] component
+ * @return the [UKImperialMolality] represented by the units
+ */
 infix fun AmountOfSubstance.per(weight: UKImperialWeight) = UKImperialMolality(this, weight)
+
+/**
+ * Gets a [USCustomaryMolality] from a [AmountOfSubstance] and a [USCustomaryWeight]
+ * @param weight the [USCustomaryWeight] component
+ * @return the [USCustomaryMolality] represented by the units
+ */
 infix fun AmountOfSubstance.per(weight: USCustomaryWeight) = USCustomaryMolality(this, weight)
diff --git a/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
index 2db222d53..8ab97974a 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
@@ -21,25 +21,49 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricAndImperialMolarEnergy]
+ */
 val MetricAndImperialMolarEnergyUnits: Set<MetricAndImperialMolarEnergy> get() = MetricAndImperialEnergyUnits.flatMap { energy ->
     AmountOfSubstanceUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [MetricMolarEnergy]
+ */
 val MetricMolarEnergyUnits: Set<MetricMolarEnergy> get() = MetricEnergyUnits.flatMap { energy ->
     AmountOfSubstanceUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialMolarEnergy]
+ */
 val ImperialMolarEnergyUnits: Set<ImperialMolarEnergy> get() = ImperialEnergyUnits.flatMap { energy ->
     AmountOfSubstanceUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [MolarEnergy]
+ */
 val MolarEnergyUnits: Set<MolarEnergy> get() = MetricAndImperialMolarEnergyUnits +
     MetricMolarEnergyUnits.filter { it.energy !is MetricMetricAndImperialEnergyWrapper }.toSet() +
     ImperialMolarEnergyUnits.filter { it.energy !is ImperialMetricAndImperialEnergyWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.MolarEnergy]
+ * SI unit is `Joule per Mole`
+ */
 @Serializable
 sealed class MolarEnergy : AbstractScientificUnit<PhysicalQuantity.MolarEnergy>() {
+
+    /**
+     * The [Energy] component
+     */
     abstract val energy: Energy
+
+    /**
+     * The [AmountOfSubstance] component
+     */
     abstract val per: AmountOfSubstance
     override val quantity = PhysicalQuantity.MolarEnergy
     override val symbol: String by lazy { "${energy.symbol} / ${per.symbol}" }
@@ -47,21 +71,63 @@ sealed class MolarEnergy : AbstractScientificUnit<PhysicalQuantity.MolarEnergy>(
     override fun toSIUnit(value: Decimal): Decimal = energy.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [MolarEnergy] for [MeasurementSystem.MetricAndImperial]
+ * @param energy the [MetricAndImperialEnergy] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class MetricAndImperialMolarEnergy(override val energy: MetricAndImperialEnergy, override val per: AmountOfSubstance) : MolarEnergy(), MetricAndImperialScientificUnit<PhysicalQuantity.MolarEnergy> {
     override val system = MeasurementSystem.MetricAndImperial
+
+    /**
+     * The [MetricMolarEnergy] equivalent to this [MetricAndImperialMolarEnergy]
+     */
     val metric get() = energy.metric per per
+
+    /**
+     * The [ImperialMolarEnergy] equivalent to this [MetricAndImperialMolarEnergy]
+     */
     val imperial get() = energy.imperial per per
 }
+
+/**
+ * A [MolarEnergy] for [MeasurementSystem.Metric]
+ * @param energy the [MetricEnergy] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class MetricMolarEnergy(override val energy: MetricEnergy, override val per: AmountOfSubstance) : MolarEnergy(), MetricScientificUnit<PhysicalQuantity.MolarEnergy> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [MolarEnergy] for [MeasurementSystem.Imperial]
+ * @param energy the [ImperialEnergy] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class ImperialMolarEnergy(override val energy: ImperialEnergy, override val per: AmountOfSubstance) : MolarEnergy(), ImperialScientificUnit<PhysicalQuantity.MolarEnergy> {
     override val system = MeasurementSystem.Imperial
 }
 
+/**
+ * Gets a [MetricAndImperialMolarEnergy] from a [MetricAndImperialEnergy] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [MetricAndImperialMolarEnergy] represented by the units
+ */
 infix fun MetricAndImperialEnergy.per(amountOfSubstance: AmountOfSubstance) = MetricAndImperialMolarEnergy(this, amountOfSubstance)
+
+/**
+ * Gets a [MetricMolarEnergy] from a [MetricEnergy] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [MetricMolarEnergy] represented by the units
+ */
 infix fun MetricEnergy.per(amountOfSubstance: AmountOfSubstance) = MetricMolarEnergy(this, amountOfSubstance)
+
+/**
+ * Gets a [ImperialMolarEnergy] from a [ImperialEnergy] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [ImperialMolarEnergy] represented by the units
+ */
 infix fun ImperialEnergy.per(amountOfSubstance: AmountOfSubstance) = ImperialMolarEnergy(this, amountOfSubstance)
diff --git a/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt
index ac9b08bc6..85b8b1deb 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricMolarMass]
+ */
 val MetricMolarMassUnits: Set<MetricMolarMass> get() = MetricWeightUnits.flatMap { weight ->
     AmountOfSubstanceUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialMolarMass]
+ */
 val ImperialMolarMassUnits: Set<ImperialMolarMass> get() = ImperialWeightUnits.flatMap { weight ->
     AmountOfSubstanceUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialMolarMass]
+ */
 val UKImperialMolarMassUnits: Set<UKImperialMolarMass> get() = UKImperialWeightUnits.flatMap { weight ->
     AmountOfSubstanceUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryMolarMass]
+ */
 val USCustomaryMolarMassUnits: Set<USCustomaryMolarMass> get() = USCustomaryWeightUnits.flatMap { weight ->
     AmountOfSubstanceUnits.map { weight per it }
 }.toSet()
 
+/**
+ * Set of all [MolarMass]
+ */
 val MolarMassUnits: Set<MolarMass> get() = MetricMolarMassUnits +
     ImperialMolarMassUnits +
     UKImperialMolarMassUnits.filter { it.weight !is UKImperialImperialWeightWrapper }.toSet() +
     USCustomaryMolarMassUnits.filter { it.weight !is USCustomaryImperialWeightWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.MolarMass]
+ * SI unit is `Kilogram per Mole`
+ */
 @Serializable
 sealed class MolarMass : AbstractScientificUnit<PhysicalQuantity.MolarMass>() {
+
+    /**
+     * The [Weight] component
+     */
     abstract val weight: Weight
+
+    /**
+     * The [AmountOfSubstance] component
+     */
     abstract val per: AmountOfSubstance
     override val symbol: String by lazy { "${weight.symbol} / ${per.symbol}" }
     override val quantity = PhysicalQuantity.MolarMass
@@ -52,26 +79,80 @@ sealed class MolarMass : AbstractScientificUnit<PhysicalQuantity.MolarMass>() {
     override fun toSIUnit(value: Decimal): Decimal = weight.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [MolarMass] for [MeasurementSystem.Metric]
+ * @param weight the [MetricWeight] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class MetricMolarMass(override val weight: MetricWeight, override val per: AmountOfSubstance) : MolarMass(), MetricScientificUnit<PhysicalQuantity.MolarMass> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [MolarMass] for [MeasurementSystem.Imperial]
+ * @param weight the [ImperialWeight] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class ImperialMolarMass(override val weight: ImperialWeight, override val per: AmountOfSubstance) : MolarMass(), ImperialScientificUnit<PhysicalQuantity.MolarMass> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialMolarMass] equivalent to this [ImperialMolarMass]
+     */
     val ukImperial get() = weight.ukImperial per per
+
+    /**
+     * The [USCustomaryMolarMass] equivalent to this [ImperialMolarMass]
+     */
     val usCustomary get() = weight.usCustomary per per
 }
+
+/**
+ * A [MolarMass] for [MeasurementSystem.USCustomary]
+ * @param weight the [USCustomaryWeight] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class USCustomaryMolarMass(override val weight: USCustomaryWeight, override val per: AmountOfSubstance) : MolarMass(), USCustomaryScientificUnit<PhysicalQuantity.MolarMass> {
     override val system = MeasurementSystem.USCustomary
 }
+
+/**
+ * A [MolarMass] for [MeasurementSystem.UKImperial]
+ * @param weight the [UKImperialWeight] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class UKImperialMolarMass(override val weight: UKImperialWeight, override val per: AmountOfSubstance) : MolarMass(), UKImperialScientificUnit<PhysicalQuantity.MolarMass> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * Gets a [MetricMolarMass] from a [MetricWeight] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [MetricMolarMass] represented by the units
+ */
 infix fun MetricWeight.per(amountOfSubstance: AmountOfSubstance) = MetricMolarMass(this, amountOfSubstance)
+
+/**
+ * Gets a [ImperialMolarMass] from a [ImperialWeight] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [ImperialMolarMass] represented by the units
+ */
 infix fun ImperialWeight.per(amountOfSubstance: AmountOfSubstance) = ImperialMolarMass(this, amountOfSubstance)
+
+/**
+ * Gets a [USCustomaryMolarMass] from a [USCustomaryWeight] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [USCustomaryMolarMass] represented by the units
+ */
 infix fun USCustomaryWeight.per(amountOfSubstance: AmountOfSubstance) = USCustomaryMolarMass(this, amountOfSubstance)
+
+/**
+ * Gets a [UKImperialMolarMass] from a [UKImperialWeight] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [UKImperialMolarMass] represented by the units
+ */
 infix fun UKImperialWeight.per(amountOfSubstance: AmountOfSubstance) = UKImperialMolarMass(this, amountOfSubstance)
diff --git a/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt
index 887fcef51..01e2c9ff5 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricMolarVolume]
+ */
 val MetricMolarVolumeUnits: Set<MetricMolarVolume> get() = MetricVolumeUnits.flatMap { volume ->
     AmountOfSubstanceUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialMolarVolume]
+ */
 val ImperialMolarVolumeUnits: Set<ImperialMolarVolume> get() = ImperialVolumeUnits.flatMap { volume ->
     AmountOfSubstanceUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialMolarVolume]
+ */
 val UKImperialMolarVolumeUnits: Set<UKImperialMolarVolume> get() = UKImperialVolumeUnits.flatMap { volume ->
     AmountOfSubstanceUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryMolarVolume]
+ */
 val USCustomaryMolarVolumeUnits: Set<USCustomaryMolarVolume> get() = USCustomaryVolumeUnits.flatMap { volume ->
     AmountOfSubstanceUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [MolarVolume]
+ */
 val MolarVolumeUnits: Set<MolarVolume> get() = MetricMolarVolumeUnits +
     ImperialMolarVolumeUnits +
     UKImperialMolarVolumeUnits.filter { it.volume !is UKImperialImperialVolumeWrapper }.toSet() +
     USCustomaryMolarVolumeUnits.filter { it.volume !is USCustomaryImperialVolumeWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.MolarVolume]
+ * SI unit is `CubicMeter per Mole`
+ */
 @Serializable
 sealed class MolarVolume : AbstractScientificUnit<PhysicalQuantity.MolarVolume>() {
+
+    /**
+     * The [Volume] component
+     */
     abstract val volume: Volume
+
+    /**
+     * The [AmountOfSubstance] component
+     */
     abstract val per: AmountOfSubstance
     override val symbol: String by lazy { "${volume.symbol} / ${per.symbol}" }
     override val quantity = PhysicalQuantity.MolarVolume
@@ -52,26 +79,80 @@ sealed class MolarVolume : AbstractScientificUnit<PhysicalQuantity.MolarVolume>(
     override fun toSIUnit(value: Decimal): Decimal = volume.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [MolarVolume] for [MeasurementSystem.Metric]
+ * @param volume the [MetricVolume] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class MetricMolarVolume(override val volume: MetricVolume, override val per: AmountOfSubstance) : MolarVolume(), MetricScientificUnit<PhysicalQuantity.MolarVolume> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [MolarVolume] for [MeasurementSystem.Imperial]
+ * @param volume the [ImperialVolume] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class ImperialMolarVolume(override val volume: ImperialVolume, override val per: AmountOfSubstance) : MolarVolume(), ImperialScientificUnit<PhysicalQuantity.MolarVolume> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialMolarVolume] equivalent to this [ImperialMolarVolume]
+     */
     val ukImperial get() = volume.ukImperial per per
+
+    /**
+     * The [USCustomaryMolarVolume] equivalent to this [ImperialMolarVolume]
+     */
     val usCustomary get() = volume.usCustomary per per
 }
+
+/**
+ * A [MolarVolume] for [MeasurementSystem.USCustomary]
+ * @param volume the [USCustomaryVolume] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class USCustomaryMolarVolume(override val volume: USCustomaryVolume, override val per: AmountOfSubstance) : MolarVolume(), USCustomaryScientificUnit<PhysicalQuantity.MolarVolume> {
     override val system = MeasurementSystem.USCustomary
 }
+
+/**
+ * A [MolarVolume] for [MeasurementSystem.UKImperial]
+ * @param volume the [UKImperialVolume] component
+ * @param per the [AmountOfSubstance] component
+ */
 @Serializable
 data class UKImperialMolarVolume(override val volume: UKImperialVolume, override val per: AmountOfSubstance) : MolarVolume(), UKImperialScientificUnit<PhysicalQuantity.MolarVolume> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * Gets a [MetricMolarVolume] from a [MetricVolume] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [MetricMolarVolume] represented by the units
+ */
 infix fun MetricVolume.per(amountOfSubstance: AmountOfSubstance) = MetricMolarVolume(this, amountOfSubstance)
+
+/**
+ * Gets a [ImperialMolarVolume] from a [ImperialVolume] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [ImperialMolarVolume] represented by the units
+ */
 infix fun ImperialVolume.per(amountOfSubstance: AmountOfSubstance) = ImperialMolarVolume(this, amountOfSubstance)
+
+/**
+ * Gets a [USCustomaryMolarVolume] from a [USCustomaryVolume] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [USCustomaryMolarVolume] represented by the units
+ */
 infix fun USCustomaryVolume.per(amountOfSubstance: AmountOfSubstance) = USCustomaryMolarVolume(this, amountOfSubstance)
+
+/**
+ * Gets a [UKImperialMolarVolume] from a [UKImperialVolume] and a [AmountOfSubstance]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @return the [UKImperialMolarVolume] represented by the units
+ */
 infix fun UKImperialVolume.per(amountOfSubstance: AmountOfSubstance) = UKImperialMolarVolume(this, amountOfSubstance)
diff --git a/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt
index 723b2c7f4..00b9b4938 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricMolarity]
+ */
 val MetricMolarityUnits: Set<MetricMolarity> get() = AmountOfSubstanceUnits.flatMap { amountOfSubstance ->
     MetricVolumeUnits.map { amountOfSubstance per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialMolarity]
+ */
 val ImperialMolarityUnits: Set<ImperialMolarity> get() = AmountOfSubstanceUnits.flatMap { amountOfSubstance ->
     ImperialVolumeUnits.map { amountOfSubstance per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialMolarity]
+ */
 val UKImperialMolarityUnits: Set<UKImperialMolarity> get() = AmountOfSubstanceUnits.flatMap { amountOfSubstance ->
     UKImperialVolumeUnits.map { amountOfSubstance per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryMolarity]
+ */
 val USCustomaryMolarityUnits: Set<USCustomaryMolarity> get() = AmountOfSubstanceUnits.flatMap { amountOfSubstance ->
     USCustomaryVolumeUnits.map { amountOfSubstance per it }
 }.toSet()
 
+/**
+ * Set of all [Molarity]
+ */
 val MolarityUnits: Set<Molarity> get() = MetricMolarityUnits +
     ImperialMolarityUnits +
     UKImperialMolarityUnits.filter { it.per !is UKImperialImperialVolumeWrapper }.toSet() +
     USCustomaryMolarityUnits.filter { it.per !is USCustomaryImperialVolumeWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Molarity]
+ * SI unit is `Mole per CubicMeter`
+ */
 @Serializable
 sealed class Molarity : AbstractScientificUnit<PhysicalQuantity.Molarity>() {
+
+    /**
+     * The [AmountOfSubstance] component
+     */
     abstract val amountOfSubstance: AmountOfSubstance
+
+    /**
+     * The [Volume] component
+     */
     abstract val per: Volume
     override val symbol: String by lazy { "${amountOfSubstance.symbol} / ${per.symbol}" }
     override val quantity = PhysicalQuantity.Molarity
@@ -52,26 +79,80 @@ sealed class Molarity : AbstractScientificUnit<PhysicalQuantity.Molarity>() {
     override fun toSIUnit(value: Decimal): Decimal = amountOfSubstance.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [Molarity] for [MeasurementSystem.Metric]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @param per the [MetricVolume] component
+ */
 @Serializable
 data class MetricMolarity(override val amountOfSubstance: AmountOfSubstance, override val per: MetricVolume) : Molarity(), MetricScientificUnit<PhysicalQuantity.Molarity> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [Molarity] for [MeasurementSystem.Imperial]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @param per the [ImperialVolume] component
+ */
 @Serializable
 data class ImperialMolarity(override val amountOfSubstance: AmountOfSubstance, override val per: ImperialVolume) : Molarity(), ImperialScientificUnit<PhysicalQuantity.Molarity> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialMolarity] equivalent to this [ImperialMolarity]
+     */
     val ukImperial get() = amountOfSubstance per per.ukImperial
+
+    /**
+     * The [USCustomaryMolarity] equivalent to this [ImperialMolarity]
+     */
     val usCustomary get() = amountOfSubstance per per.usCustomary
 }
+
+/**
+ * A [Molarity] for [MeasurementSystem.USCustomary]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @param per the [USCustomaryVolume] component
+ */
 @Serializable
 data class USCustomaryMolarity(override val amountOfSubstance: AmountOfSubstance, override val per: USCustomaryVolume) : Molarity(), USCustomaryScientificUnit<PhysicalQuantity.Molarity> {
     override val system = MeasurementSystem.USCustomary
 }
+
+/**
+ * A [Molarity] for [MeasurementSystem.UKImperial]
+ * @param amountOfSubstance the [AmountOfSubstance] component
+ * @param per the [UKImperialVolume] component
+ */
 @Serializable
 data class UKImperialMolarity(override val amountOfSubstance: AmountOfSubstance, override val per: UKImperialVolume) : Molarity(), UKImperialScientificUnit<PhysicalQuantity.Molarity> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * Gets a [MetricMolarity] from a [AmountOfSubstance] and a [MetricVolume]
+ * @param volume the [MetricVolume] component
+ * @return the [MetricMolarity] represented by the units
+ */
 infix fun AmountOfSubstance.per(volume: MetricVolume) = MetricMolarity(this, volume)
+
+/**
+ * Gets a [ImperialMolarity] from a [AmountOfSubstance] and a [ImperialVolume]
+ * @param volume the [ImperialVolume] component
+ * @return the [ImperialMolarity] represented by the units
+ */
 infix fun AmountOfSubstance.per(volume: ImperialVolume) = ImperialMolarity(this, volume)
+
+/**
+ * Gets a [USCustomaryMolarity] from a [AmountOfSubstance] and a [USCustomaryVolume]
+ * @param volume the [USCustomaryVolume] component
+ * @return the [USCustomaryMolarity] represented by the units
+ */
 infix fun AmountOfSubstance.per(volume: USCustomaryVolume) = USCustomaryMolarity(this, volume)
+
+/**
+ * Gets a [UKImperialMolarity] from a [AmountOfSubstance] and a [UKImperialVolume]
+ * @param volume the [UKImperialVolume] component
+ * @return the [UKImperialMolarity] represented by the units
+ */
 infix fun AmountOfSubstance.per(volume: UKImperialVolume) = UKImperialMolarity(this, volume)
diff --git a/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt b/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt
index 5eb946382..edca534f2 100644
--- a/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt
@@ -21,38 +21,65 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricMomentum]
+ */
 val MetricMomentumUnits: Set<MetricMomentum> get() = MetricWeightUnits.flatMap { weight ->
     MetricSpeedUnits.map {
         MetricMomentum(weight, it)
     }
 }.toSet()
 
+/**
+ * Set of all [ImperialMomentum]
+ */
 val ImperialMomentumUnits: Set<ImperialMomentum> get() = ImperialWeightUnits.flatMap { weight ->
     ImperialSpeedUnits.map {
         ImperialMomentum(weight, it)
     }
 }.toSet()
 
+/**
+ * Set of all [UKImperialMomentum]
+ */
 val UKImperialMomentumUnits: Set<UKImperialMomentum> get() = UKImperialWeightUnits.flatMap { weight ->
     ImperialSpeedUnits.map {
         UKImperialMomentum(weight, it)
     }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryMomentum]
+ */
 val USCustomaryMomentumUnits: Set<USCustomaryMomentum> get() = USCustomaryWeightUnits.flatMap { weight ->
     ImperialSpeedUnits.map {
         USCustomaryMomentum(weight, it)
     }
 }.toSet()
 
+/**
+ * Set of all [Momentum]
+ */
 val MomentumUnits: Set<Momentum> get() = MetricMomentumUnits +
     ImperialMomentumUnits +
     UKImperialMomentumUnits.filter { it.mass !is UKImperialImperialWeightWrapper }.toSet() +
     USCustomaryMomentumUnits.filter { it.mass !is USCustomaryImperialWeightWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Momentum]
+ * SI unit is `Kilogram x Meter per Second`
+ */
 @Serializable
 sealed class Momentum : AbstractScientificUnit<PhysicalQuantity.Momentum>() {
+
+    /**
+     * The [Weight] component
+     */
     abstract val mass: Weight
+
+    /**
+     * The [Speed] component
+     */
     abstract val speed: Speed
     override val quantity = PhysicalQuantity.Momentum
     override val symbol: String by lazy { "${mass.symbol}⋅${speed.symbol}" }
@@ -60,29 +87,80 @@ sealed class Momentum : AbstractScientificUnit<PhysicalQuantity.Momentum>() {
     override fun toSIUnit(value: Decimal): Decimal = mass.toSIUnit(speed.toSIUnit(value))
 }
 
+/**
+ * A [Momentum] for [MeasurementSystem.Metric]
+ * @param mass the [MetricWeight] component
+ * @param speed the [MetricSpeed] component
+ */
 @Serializable
 data class MetricMomentum(override val mass: MetricWeight, override val speed: MetricSpeed) : Momentum(), MetricScientificUnit<PhysicalQuantity.Momentum> {
     override val system = MeasurementSystem.Metric
 }
 
+/**
+ * A [Momentum] for [MeasurementSystem.Imperial]
+ * @param mass the [ImperialWeight] component
+ * @param speed the [ImperialSpeed] component
+ */
 @Serializable
 data class ImperialMomentum(override val mass: ImperialWeight, override val speed: ImperialSpeed) : Momentum(), ImperialScientificUnit<PhysicalQuantity.Momentum> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialMomentum] equivalent to this [ImperialMomentum]
+     */
     val ukImperial get() = UKImperialMomentum(mass.ukImperial, speed)
+
+    /**
+     * The [USCustomaryMomentum] equivalent to this [ImperialMomentum]
+     */
     val usCustomary get() = USCustomaryMomentum(mass.usCustomary, speed)
 }
 
+/**
+ * A [Momentum] for [MeasurementSystem.UKImperial]
+ * @param mass the [UKImperialWeight] component
+ * @param speed the [ImperialSpeed] component
+ */
 @Serializable
 data class UKImperialMomentum(override val mass: UKImperialWeight, override val speed: ImperialSpeed) : Momentum(), UKImperialScientificUnit<PhysicalQuantity.Momentum> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * A [Momentum] for [MeasurementSystem.USCustomary]
+ * @param mass the [USCustomaryWeight] component
+ * @param speed the [ImperialSpeed] component
+ */
 @Serializable
 data class USCustomaryMomentum(override val mass: USCustomaryWeight, override val speed: ImperialSpeed) : Momentum(), USCustomaryScientificUnit<PhysicalQuantity.Momentum> {
     override val system = MeasurementSystem.USCustomary
 }
 
+/**
+ * Gets a [MetricMomentum] from a [MetricWeight] and a [MetricSpeed]
+ * @param speed the [MetricSpeed] component
+ * @return the [MetricMomentum] represented by the units
+ */
 infix fun MetricWeight.x(speed: MetricSpeed) = MetricMomentum(this, speed)
+
+/**
+ * Gets a [ImperialMomentum] from a [ImperialWeight] and a [ImperialSpeed]
+ * @param speed the [ImperialSpeed] component
+ * @return the [ImperialMomentum] represented by the units
+ */
 infix fun ImperialWeight.x(speed: ImperialSpeed) = ImperialMomentum(this, speed)
+
+/**
+ * Gets a [UKImperialMomentum] from a [UKImperialWeight] and a [ImperialSpeed]
+ * @param speed the [ImperialSpeed] component
+ * @return the [UKImperialMomentum] represented by the units
+ */
 infix fun UKImperialWeight.x(speed: ImperialSpeed) = UKImperialMomentum(this, speed)
+
+/**
+ * Gets a [USCustomaryMomentum] from a [USCustomaryWeight] and a [ImperialSpeed]
+ * @param speed the [ImperialSpeed] component
+ * @return the [USCustomaryMomentum] represented by the units
+ */
 infix fun USCustomaryWeight.x(speed: ImperialSpeed) = USCustomaryMomentum(this, speed)
diff --git a/scientific/src/commonMain/kotlin/unit/PowerUnit.kt b/scientific/src/commonMain/kotlin/unit/PowerUnit.kt
index 93e80c2fe..ab7086ba2 100644
--- a/scientific/src/commonMain/kotlin/unit/PowerUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/PowerUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricAndImperialPower]
+ */
 val MetricAndImperialPowerUnits: Set<MetricAndImperialPower> get() = setOf(
     Watt,
     Nanowatt,
@@ -38,11 +41,18 @@ val MetricAndImperialPowerUnits: Set<MetricAndImperialPower> get() = setOf(
     Gigawatt
 )
 
+/**
+ * Set of all [MetricPower]
+ */
 val MetricPowerUnits: Set<MetricPower> get() = MetricAndImperialPowerUnits.map { it.metric }.toSet() +
     setOf(
         ErgPerSecond,
         MetricHorsepower
     )
+
+/**
+ * Set of all [ImperialPower]
+ */
 val ImperialPowerUnits: Set<ImperialPower> get() = MetricAndImperialPowerUnits.map { it.imperial }.toSet() +
     setOf(
         FootPoundForcePerSecond,
@@ -55,17 +65,35 @@ val ImperialPowerUnits: Set<ImperialPower> get() = MetricAndImperialPowerUnits.m
         BritishThermalUnitPerHour
     )
 
+/**
+ * Set of all [Power]
+ */
 val PowerUnits: Set<Power> get() = MetricAndImperialPowerUnits +
     MetricPowerUnits.filter { it !is MetricMetricAndImperialPowerWrapper }.toSet() +
     ImperialPowerUnits.filter { it !is ImperialMetricAndImperialPowerWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Power]
+ * SI unit is [Watt]
+ */
 @Serializable
 sealed class Power : AbstractScientificUnit<PhysicalQuantity.Power>()
 
+/**
+ * A [Power] for [MeasurementSystem.MetricAndImperial]
+ */
 @Serializable
 sealed class MetricAndImperialPower : Power(), MetricAndImperialScientificUnit<PhysicalQuantity.Power>
+
+/**
+ * A [Power] for [MeasurementSystem.Metric]
+ */
 @Serializable
 sealed class MetricPower : Power(), MetricScientificUnit<PhysicalQuantity.Power>
+
+/**
+ * A [Power] for [MeasurementSystem.Imperial]
+ */
 @Serializable
 sealed class ImperialPower : Power(), ImperialScientificUnit<PhysicalQuantity.Power>
 
@@ -193,6 +221,11 @@ object BritishThermalUnitPerHour : ImperialPower() {
     override fun fromSIUnit(value: Decimal): Decimal = Hour.toSIUnit(BritishThermalUnit.fromSIUnit(value))
     override fun toSIUnit(value: Decimal): Decimal = BritishThermalUnit.toSIUnit(Hour.fromSIUnit(value))
 }
+
+/**
+ * Wraps a [MetricAndImperialPower] unit to a [MetricPower] unit
+ * @param metricAndImperialPower the [MetricAndImperialPower] to wrap
+ */
 @Serializable
 data class MetricMetricAndImperialPowerWrapper(val metricAndImperialPower: MetricAndImperialPower) : MetricPower() {
     override val system = MeasurementSystem.Metric
@@ -202,8 +235,16 @@ data class MetricMetricAndImperialPowerWrapper(val metricAndImperialPower: Metri
     override fun toSIUnit(value: Decimal): Decimal = metricAndImperialPower.toSIUnit(value)
 }
 
+/**
+ * Converts a [MetricAndImperialPower] unit to a [MetricMetricAndImperialPowerWrapper] unit
+ * @param PowerUnit the type of [MetricAndImperialPower] to convert
+ */
 val <PowerUnit : MetricAndImperialPower> PowerUnit.metric get() = MetricMetricAndImperialPowerWrapper(this)
 
+/**
+ * Wraps a [MetricAndImperialPower] unit to an [ImperialPower] unit
+ * @param metricAndImperialPower the [MetricAndImperialPower] to wrap
+ */
 @Serializable
 data class ImperialMetricAndImperialPowerWrapper(val metricAndImperialPower: MetricAndImperialPower) : ImperialPower() {
     override val system = MeasurementSystem.Imperial
@@ -213,4 +254,8 @@ data class ImperialMetricAndImperialPowerWrapper(val metricAndImperialPower: Met
     override fun toSIUnit(value: Decimal): Decimal = metricAndImperialPower.toSIUnit(value)
 }
 
+/**
+ * Converts a [MetricAndImperialPower] unit to an [ImperialMetricAndImperialPowerWrapper] unit
+ * @param PowerUnit the type of [MetricAndImperialPower] to convert
+ */
 val <PowerUnit : MetricAndImperialPower> PowerUnit.imperial get() = ImperialMetricAndImperialPowerWrapper(this)
diff --git a/scientific/src/commonMain/kotlin/unit/PressureUnit.kt b/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
index 2cc12a071..74dcc55e1 100644
--- a/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
@@ -26,6 +26,9 @@ import com.splendo.kaluga.scientific.convertValue
 import com.splendo.kaluga.scientific.invoke
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricPressure]
+ */
 val MetricPressureUnits: Set<MetricPressure> get() = setOf(
     Pascal,
     Nanopascal,
@@ -77,6 +80,9 @@ val MetricPressureUnits: Set<MetricPressure> get() = setOf(
     CentimeterOfWater
 )
 
+/**
+ * Set of all [ImperialPressure]
+ */
 val ImperialPressureUnits: Set<ImperialPressure> get() = setOf(
     PoundSquareInch,
     PoundSquareFoot,
@@ -87,6 +93,9 @@ val ImperialPressureUnits: Set<ImperialPressure> get() = setOf(
     FootOfWater
 )
 
+/**
+ * Set of all [USCustomaryPressure]
+ */
 val USCustomaryPressureUnits: Set<USCustomaryPressure> get() = setOf(
     KipSquareInch,
     KipSquareFoot,
@@ -94,34 +103,56 @@ val USCustomaryPressureUnits: Set<USCustomaryPressure> get() = setOf(
     USTonSquareFoot
 ) + ImperialPressureUnits.map { it.usCustomary }.toSet()
 
+/**
+ * Set of all [UKImperialPressure]
+ */
 val UKImperialPressureUnits: Set<UKImperialPressure> get() = setOf(
     ImperialTonSquareInch,
     ImperialTonSquareFoot
 ) + ImperialPressureUnits.map { it.ukImperial }.toSet()
 
+/**
+ * Set of all [Pressure]
+ */
 val PressureUnits: Set<Pressure> get() = MetricPressureUnits +
     ImperialPressureUnits +
     USCustomaryPressureUnits.filter { it !is USCustomaryImperialPressureWrapper }.toSet() +
     UKImperialPressureUnits.filter { it !is UKImperialPressureWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Pressure]
+ * SI unit is [Pascal]
+ */
 @Serializable
 sealed class Pressure : AbstractScientificUnit<PhysicalQuantity.Pressure>()
 
+/**
+ * A [Pressure] for [MeasurementSystem.Metric]
+ */
 @Serializable
 sealed class MetricPressure : Pressure(), MetricScientificUnit<PhysicalQuantity.Pressure>
 
+/**
+ * A [Pressure] for [MeasurementSystem.Imperial]
+ */
 @Serializable
 sealed class ImperialPressure : Pressure(), ImperialScientificUnit<PhysicalQuantity.Pressure> {
     override val system = MeasurementSystem.Imperial
     override val quantity = PhysicalQuantity.Pressure
 }
 
+/**
+ * A [Pressure] for [MeasurementSystem.UKImperial]
+ */
 @Serializable
 sealed class UKImperialPressure : Pressure(), UKImperialScientificUnit<PhysicalQuantity.Pressure> {
     override val system = MeasurementSystem.UKImperial
     override val quantity = PhysicalQuantity.Pressure
 }
 
+/**
+ * A [Pressure] for [MeasurementSystem.USCustomary]
+ */
 @Serializable
 sealed class USCustomaryPressure : Pressure(), USCustomaryScientificUnit<PhysicalQuantity.Pressure> {
     override val system = MeasurementSystem.USCustomary
@@ -371,6 +402,10 @@ object USTonSquareFoot : USCustomaryPressure() {
     override fun toSIUnit(value: Decimal): Decimal = UsTonForce.toSIUnit(value * SquareFoot.fromSIUnit(1.toDecimal()))
 }
 
+/**
+ * Wraps an [ImperialPressure] unit to an [USCustomaryPressure] unit
+ * @param imperial the [ImperialPressure] to wrap
+ */
 @Serializable
 data class USCustomaryImperialPressureWrapper(val imperial: ImperialPressure) : USCustomaryPressure() {
     override val symbol: String = imperial.symbol
@@ -378,6 +413,10 @@ data class USCustomaryImperialPressureWrapper(val imperial: ImperialPressure) :
     override fun toSIUnit(value: Decimal): Decimal = imperial.toSIUnit(value)
 }
 
+/**
+ * Converts an [ImperialPressure] unit to an [USCustomaryImperialPressureWrapper] unit
+ * @param PressureUnit the type of [ImperialPressure] to convert
+ */
 val <PressureUnit : ImperialPressure> PressureUnit.usCustomary get() = USCustomaryImperialPressureWrapper(this)
 
 @Serializable
@@ -394,6 +433,10 @@ object ImperialTonSquareFoot : UKImperialPressure() {
     override fun toSIUnit(value: Decimal): Decimal = ImperialTonForce.toSIUnit(value * SquareFoot.fromSIUnit(1.toDecimal()))
 }
 
+/**
+ * Wraps an [ImperialPressure] unit to an [UKImperialPressure] unit
+ * @param imperial the [ImperialPressure] to wrap
+ */
 @Serializable
 data class UKImperialPressureWrapper(val imperial: ImperialPressure) : UKImperialPressure() {
     override val symbol: String = imperial.symbol
@@ -401,4 +444,8 @@ data class UKImperialPressureWrapper(val imperial: ImperialPressure) : UKImperia
     override fun toSIUnit(value: Decimal): Decimal = imperial.toSIUnit(value)
 }
 
+/**
+ * Converts an [ImperialPressure] unit to an [UKImperialPressureWrapper] unit
+ * @param PressureUnit the type of [ImperialPressure] to convert
+ */
 val <PressureUnit : ImperialPressure> PressureUnit.ukImperial get() = UKImperialPressureWrapper(this)
diff --git a/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt b/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt
index 5b1ab6b4e..4960dd15d 100644
--- a/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/RadioactivityUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [Radioactivity]
+ */
 val RadioactivityUnits: Set<Radioactivity> get() = setOf(
     Becquerel,
     Nanobecquerel,
@@ -50,6 +53,10 @@ val RadioactivityUnits: Set<Radioactivity> get() = setOf(
     Gigacurie
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Radioactivity]
+ * SI unit is [Becquerel]
+ */
 @Serializable
 sealed class Radioactivity : AbstractScientificUnit<PhysicalQuantity.Radioactivity>(), MetricAndImperialScientificUnit<PhysicalQuantity.Radioactivity>
 
diff --git a/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt b/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt
index 9bb13d8da..71cdaff8e 100644
--- a/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt
@@ -24,33 +24,109 @@ import com.splendo.kaluga.base.utils.toDouble
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * A unit of measurement for a [PhysicalQuantity]
+ * @param Quantity the type of [PhysicalQuantity] to measure
+ */
 sealed interface ScientificUnit<Quantity : PhysicalQuantity> : MeasurementUsage, com.splendo.kaluga.base.utils.Serializable {
+
+    /**
+     * The symbol representing the unit
+     */
     val symbol: String
+
+    /**
+     * The [MeasurementSystem] the unit is used in
+     */
     val system: MeasurementSystem
+
+    /**
+     * The [Quantity] of the unit
+     */
     val quantity: Quantity
+
+    /**
+     * Converts a value of this unit into the value of the [ScientificUnit] of [Quantity] to be used according to the SI
+     * @param value the [Decimal] value to convert to the value in the equivalent SI Unit
+     * @return the [Decimal] value in the equivalent SI unit
+     */
     fun toSIUnit(value: Decimal): Decimal
+
+    /**
+     * Converts a value of the [ScientificUnit] of [Quantity] to be used according to the SI into a value of this unit
+     * @param value the [Decimal] value in the SI Unit to convert to the equivalent value in this unit
+     * @return the [Decimal] value in this unit
+     */
     fun fromSIUnit(value: Decimal): Decimal
 }
 
+/**
+ * A [ScientificUnit] used in a given [MeasurementSystem]
+ * @param System the type of [MeasurementSystem] the unit is used in
+ * @param Quantity the type of [PhysicalQuantity] to measure
+ */
 interface SystemScientificUnit<System : MeasurementSystem, Quantity : PhysicalQuantity> : ScientificUnit<Quantity> {
     override val system: System
 }
 
+/**
+ * A [SystemScientificUnit] for [MeasurementSystem.Metric]
+ */
 interface MetricScientificUnit<Quantity : PhysicalQuantity> : SystemScientificUnit<MeasurementSystem.Metric, Quantity>, MeasurementUsage.UsedInMetric
+
+/**
+ * A [SystemScientificUnit] for [MeasurementSystem.Imperial]
+ */
 interface ImperialScientificUnit<Quantity : PhysicalQuantity> : SystemScientificUnit<MeasurementSystem.Imperial, Quantity>, MeasurementUsage.UsedInImperial
+
+/**
+ * A [SystemScientificUnit] for [MeasurementSystem.USCustomary]
+ */
 interface USCustomaryScientificUnit<Quantity : PhysicalQuantity> : SystemScientificUnit<MeasurementSystem.USCustomary, Quantity>, MeasurementUsage.UsedInUSCustomary
+
+/**
+ * A [SystemScientificUnit] for [MeasurementSystem.UKImperial]
+ */
 interface UKImperialScientificUnit<Quantity : PhysicalQuantity> : SystemScientificUnit<MeasurementSystem.UKImperial, Quantity>, MeasurementUsage.UsedInUKImperial
+
+/**
+ * A [SystemScientificUnit] for [MeasurementSystem.MetricAndUKImperial]
+ */
 interface MetricAndUKImperialScientificUnit<Quantity : PhysicalQuantity> : SystemScientificUnit<MeasurementSystem.MetricAndUKImperial, Quantity>, MeasurementUsage.UsedInMetricAndUKImperial
+
+/**
+ * A [SystemScientificUnit] for [MeasurementSystem.MetricAndImperial]
+ */
 interface MetricAndImperialScientificUnit<Quantity : PhysicalQuantity> : SystemScientificUnit<MeasurementSystem.MetricAndImperial, Quantity>, MeasurementUsage.UsedInMetricAndImperial
 
+/**
+ * A class implementation of [ScientificUnit]
+ * @param Quantity the type of [PhysicalQuantity] to measure
+ */
 @Serializable
 sealed class AbstractScientificUnit<Quantity : PhysicalQuantity> : ScientificUnit<Quantity>
 
+/**
+ * Converts a value in a [ScientificUnit] to the value of another unit with the same [PhysicalQuantity]
+ * @param Quantity the type of [PhysicalQuantity] of both units
+ * @param value the [Number] value to convert
+ * @param to the [ScientificUnit] to convert the value into
+ * @return the [Double] value in [to] that is equivalent to [value] in this unit
+ */
 fun <Quantity : PhysicalQuantity> ScientificUnit<Quantity>.convert(
     value: Number,
     to: ScientificUnit<Quantity>
 ) = convert(value.toDecimal(), to).toDouble()
 
+/**
+ * Converts a value in a [ScientificUnit] to the value of another unit with the same [PhysicalQuantity] and rounds it
+ * @param Quantity the type of [PhysicalQuantity] of both units
+ * @param value the [Number] value to convert
+ * @param to the [ScientificUnit] to convert the value into
+ * @param round The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Double] value in [to] that is equivalent to [value] in this unit
+ */
 fun <Quantity : PhysicalQuantity> ScientificUnit<Quantity>.convert(
     value: Number,
     to: ScientificUnit<Quantity>,
@@ -58,6 +134,15 @@ fun <Quantity : PhysicalQuantity> ScientificUnit<Quantity>.convert(
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
 ) = convert(value.toDecimal(), to).round(round, roundingMode).toDouble()
 
+/**
+ * Converts a value in a [ScientificUnit] to the value of another unit with the same [PhysicalQuantity]
+ * @param Quantity the type of [PhysicalQuantity] of both units
+ * @param value the [Decimal] value to convert
+ * @param to the [ScientificUnit] to convert the value into
+ * @param round The number of digits a rounded value should have after its decimal point.
+ * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @return the [Decimal] value in [to] that is equivalent to [value] in this unit
+ */
 fun <Quantity : PhysicalQuantity> ScientificUnit<Quantity>.convert(
     value: Decimal,
     to: ScientificUnit<Quantity>,
@@ -65,11 +150,21 @@ fun <Quantity : PhysicalQuantity> ScientificUnit<Quantity>.convert(
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
 ) = convert(value, to).round(round, roundingMode)
 
+/**
+ * Converts a value in a [ScientificUnit] to the value of another unit with the same [PhysicalQuantity]
+ * @param Quantity the type of [PhysicalQuantity] of both units
+ * @param value the [Decimal] value to convert
+ * @param to the [ScientificUnit] to convert the value into
+ * @return the [Decimal] value in [to] that is equivalent to [value] in this unit
+ */
 fun <Quantity : PhysicalQuantity> ScientificUnit<Quantity>.convert(
     value: Decimal,
     to: ScientificUnit<Quantity>
 ) = if (this == to) value else to.fromSIUnit(toSIUnit(value))
 
+/**
+ * The set of all [ScientificUnit] supported by this library
+ */
 val Units: Set<ScientificUnit<*>> get() = AccelerationUnits +
     ActionUnits +
     AmountOfSubstanceUnits +
diff --git a/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt b/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt
index 63c1f6353..355332171 100644
--- a/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SolidAngleUnit.kt
@@ -25,6 +25,9 @@ import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 import kotlin.math.PI
 
+/**
+ * Set of all [SolidAngle]
+ */
 val SolidAngleUnits: Set<SolidAngle> get() = setOf(
     Steradian,
     Nanosteradian,
@@ -36,6 +39,10 @@ val SolidAngleUnits: Set<SolidAngle> get() = setOf(
     SquareDegree
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.SolidAngle]
+ * SI unit is [Steradian]
+ */
 @Serializable
 sealed class SolidAngle : AbstractScientificUnit<PhysicalQuantity.SolidAngle>(), MetricAndImperialScientificUnit<PhysicalQuantity.SolidAngle>
 
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
index 0d17f47fd..65525a463 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricSpecificEnergy]
+ */
 val MetricSpecificEnergyUnits: Set<MetricSpecificEnergy> get() = MetricEnergyUnits.flatMap { energy ->
     MetricWeightUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialSpecificEnergy]
+ */
 val ImperialSpecificEnergyUnits: Set<ImperialSpecificEnergy> get() = ImperialEnergyUnits.flatMap { energy ->
     ImperialWeightUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialSpecificEnergy]
+ */
 val UKImperialSpecificEnergyUnits: Set<UKImperialSpecificEnergy> get() = ImperialEnergyUnits.flatMap { energy ->
     UKImperialWeightUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomarySpecificEnergy]
+ */
 val USCustomarySpecificEnergyUnits: Set<USCustomarySpecificEnergy> get() = ImperialEnergyUnits.flatMap { energy ->
     USCustomaryWeightUnits.map { energy per it }
 }.toSet()
 
+/**
+ * Set of all [SpecificEnergy]
+ */
 val SpecificEnergyUnits: Set<SpecificEnergy> get() = MetricSpecificEnergyUnits +
     ImperialSpecificEnergyUnits +
     UKImperialSpecificEnergyUnits.filter { it.per !is UKImperialImperialWeightWrapper }.toSet() +
     USCustomarySpecificEnergyUnits.filter { it.per !is USCustomaryImperialWeightWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.SpecificEnergy]
+ * SI unit is `Joule per Kilogram`
+ */
 @Serializable
 sealed class SpecificEnergy : AbstractScientificUnit<PhysicalQuantity.SpecificEnergy>() {
+
+    /**
+     * The [Energy] component
+     */
     abstract val energy: Energy
+
+    /**
+     * The [Weight] component
+     */
     abstract val per: Weight
     override val quantity = PhysicalQuantity.SpecificEnergy
     override val symbol: String by lazy { "${energy.symbol} / ${per.symbol}" }
@@ -52,30 +79,108 @@ sealed class SpecificEnergy : AbstractScientificUnit<PhysicalQuantity.SpecificEn
     override fun toSIUnit(value: Decimal): Decimal = energy.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [SpecificEnergy] for [MeasurementSystem.Metric]
+ * @param energy the [MetricEnergy] component
+ * @param per the [MetricWeight] component
+ */
 @Serializable
 data class MetricSpecificEnergy(override val energy: MetricEnergy, override val per: MetricWeight) : SpecificEnergy(), MetricScientificUnit<PhysicalQuantity.SpecificEnergy> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [SpecificEnergy] for [MeasurementSystem.Imperial]
+ * @param energy the [ImperialEnergy] component
+ * @param per the [ImperialWeight] component
+ */
 @Serializable
 data class ImperialSpecificEnergy(override val energy: ImperialEnergy, override val per: ImperialWeight) : SpecificEnergy(), ImperialScientificUnit<PhysicalQuantity.SpecificEnergy> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialSpecificEnergy] equivalent to this [ImperialSpecificEnergy]
+     */
     val ukImperial get() = energy per per.ukImperial
+
+    /**
+     * The [USCustomarySpecificEnergy] equivalent to this [ImperialSpecificEnergy]
+     */
     val usCustomary get() = energy per per.usCustomary
 }
+
+/**
+ * A [SpecificEnergy] for [MeasurementSystem.UKImperial]
+ * @param energy the [ImperialEnergy] component
+ * @param per the [UKImperialWeight] component
+ */
 @Serializable
 data class UKImperialSpecificEnergy(override val energy: ImperialEnergy, override val per: UKImperialWeight) : SpecificEnergy(), UKImperialScientificUnit<PhysicalQuantity.SpecificEnergy> {
     override val system = MeasurementSystem.UKImperial
 }
+
+/**
+ * A [SpecificEnergy] for [MeasurementSystem.USCustomary]
+ * @param energy the [ImperialEnergy] component
+ * @param per the [USCustomaryWeight] component
+ */
 @Serializable
 data class USCustomarySpecificEnergy(override val energy: ImperialEnergy, override val per: USCustomaryWeight) : SpecificEnergy(), USCustomaryScientificUnit<PhysicalQuantity.SpecificEnergy> {
     override val system = MeasurementSystem.USCustomary
 }
 
+/**
+ * Gets a [MetricSpecificEnergy] from a [MetricAndImperialEnergy] and a [MetricWeight]
+ * @param weight the [MetricWeight] component
+ * @return the [MetricSpecificEnergy] represented by the units
+ */
 infix fun MetricAndImperialEnergy.per(weight: MetricWeight) = MetricSpecificEnergy(this.metric, weight)
+
+/**
+ * Gets a [ImperialSpecificEnergy] from a [MetricAndImperialEnergy] and a [ImperialWeight]
+ * @param weight the [ImperialWeight] component
+ * @return the [ImperialSpecificEnergy] represented by the units
+ */
 infix fun MetricAndImperialEnergy.per(weight: ImperialWeight) = ImperialSpecificEnergy(this.imperial, weight)
+
+/**
+ * Gets a [UKImperialSpecificEnergy] from a [MetricAndImperialEnergy] and a [UKImperialWeight]
+ * @param weight the [UKImperialWeight] component
+ * @return the [UKImperialSpecificEnergy] represented by the units
+ */
 infix fun MetricAndImperialEnergy.per(weight: UKImperialWeight) = UKImperialSpecificEnergy(this.imperial, weight)
+
+/**
+ * Gets a [USCustomarySpecificEnergy] from a [MetricAndImperialEnergy] and a [USCustomaryWeight]
+ * @param weight the [USCustomaryWeight] component
+ * @return the [USCustomarySpecificEnergy] represented by the units
+ */
 infix fun MetricAndImperialEnergy.per(weight: USCustomaryWeight) = USCustomarySpecificEnergy(this.imperial, weight)
+
+/**
+ * Gets a [MetricSpecificEnergy] from a [MetricEnergy] and a [MetricWeight]
+ * @param weight the [MetricWeight] component
+ * @return the [MetricSpecificEnergy] represented by the units
+ */
 infix fun MetricEnergy.per(weight: MetricWeight) = MetricSpecificEnergy(this, weight)
+
+/**
+ * Gets a [ImperialSpecificEnergy] from a [ImperialEnergy] and a [ImperialWeight]
+ * @param weight the [ImperialWeight] component
+ * @return the [ImperialSpecificEnergy] represented by the units
+ */
 infix fun ImperialEnergy.per(weight: ImperialWeight) = ImperialSpecificEnergy(this, weight)
+
+/**
+ * Gets a [UKImperialSpecificEnergy] from a [ImperialEnergy] and a [UKImperialWeight]
+ * @param weight the [UKImperialWeight] component
+ * @return the [UKImperialSpecificEnergy] represented by the units
+ */
 infix fun ImperialEnergy.per(weight: UKImperialWeight) = UKImperialSpecificEnergy(this, weight)
+
+/**
+ * Gets a [USCustomarySpecificEnergy] from a [ImperialEnergy] and a [USCustomaryWeight]
+ * @param weight the [USCustomaryWeight] component
+ * @return the [USCustomarySpecificEnergy] represented by the units
+ */
 infix fun ImperialEnergy.per(weight: USCustomaryWeight) = USCustomarySpecificEnergy(this, weight)
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
index 4aa747da4..dc2a4c89b 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
@@ -21,25 +21,49 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricSpecificHeatCapacity]
+ */
 val MetricSpecificHeatCapacityUnits: Set<MetricSpecificHeatCapacity> get() = MetricHeatCapacityUnits.flatMap { heatCapacity ->
     MetricWeightUnits.map { heatCapacity per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialSpecificHeatCapacity]
+ */
 val UKImperialSpecificHeatCapacityUnits: Set<UKImperialSpecificHeatCapacity> get() = UKImperialHeatCapacityUnits.flatMap { heatCapacity ->
     UKImperialWeightUnits.map { heatCapacity per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomarySpecificHeatCapacity]
+ */
 val USCustomarySpecificHeatCapacityUnits: Set<USCustomarySpecificHeatCapacity> get() = USCustomaryHeatCapacityUnits.flatMap { heatCapacity ->
     USCustomaryWeightUnits.map { heatCapacity per it }
 }.toSet()
 
+/**
+ * Set of all [SpecificHeatCapacity]
+ */
 val SpecificHeatCapacityUnits: Set<SpecificHeatCapacity> get() = MetricSpecificHeatCapacityUnits +
     UKImperialSpecificHeatCapacityUnits +
     USCustomarySpecificHeatCapacityUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.SpecificHeatCapacity]
+ * SI unit is `Joule per Kelvin per Kilogram`
+ */
 @Serializable
 sealed class SpecificHeatCapacity : AbstractScientificUnit<PhysicalQuantity.SpecificHeatCapacity>() {
+
+    /**
+     * The [HeatCapacity] component
+     */
     abstract val heatCapacity: HeatCapacity
+
+    /**
+     * The [Weight] component
+     */
     abstract val perWeight: Weight
     override val quantity = PhysicalQuantity.SpecificHeatCapacity
     override val symbol: String by lazy { "${heatCapacity.energy.symbol} / (${heatCapacity.per.symbol}⋅${perWeight.symbol})" }
@@ -47,30 +71,123 @@ sealed class SpecificHeatCapacity : AbstractScientificUnit<PhysicalQuantity.Spec
     override fun toSIUnit(value: Decimal): Decimal = heatCapacity.toSIUnit(perWeight.fromSIUnit(value))
 }
 
+/**
+ * A [SpecificHeatCapacity] for [MeasurementSystem.Metric]
+ * @param heatCapacity the [MetricHeatCapacity] component
+ * @param perWeight the [MetricWeight] component
+ */
 @Serializable
 data class MetricSpecificHeatCapacity(override val heatCapacity: MetricHeatCapacity, override val perWeight: MetricWeight) : SpecificHeatCapacity(), MetricScientificUnit<PhysicalQuantity.SpecificHeatCapacity> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [SpecificHeatCapacity] for [MeasurementSystem.UKImperial]
+ * @param heatCapacity the [UKImperialHeatCapacity] component
+ * @param perWeight the [UKImperialWeight] component
+ */
 @Serializable
 data class UKImperialSpecificHeatCapacity(override val heatCapacity: UKImperialHeatCapacity, override val perWeight: UKImperialWeight) : SpecificHeatCapacity(), UKImperialScientificUnit<PhysicalQuantity.SpecificHeatCapacity> {
     override val system = MeasurementSystem.UKImperial
 }
+
+/**
+ * A [SpecificHeatCapacity] for [MeasurementSystem.USCustomary]
+ * @param heatCapacity the [USCustomaryHeatCapacity] component
+ * @param perWeight the [USCustomaryWeight] component
+ */
 @Serializable
 data class USCustomarySpecificHeatCapacity(override val heatCapacity: USCustomaryHeatCapacity, override val perWeight: USCustomaryWeight) : SpecificHeatCapacity(), USCustomaryScientificUnit<PhysicalQuantity.SpecificHeatCapacity> {
     override val system = MeasurementSystem.USCustomary
 }
 
+/**
+ * Gets a [MetricSpecificHeatCapacity] from a [MetricAndUKImperialHeatCapacity] and a [MetricWeight]
+ * @param weight the [MetricWeight] component
+ * @return the [MetricSpecificHeatCapacity] represented by the units
+ */
 infix fun MetricAndUKImperialHeatCapacity.per(weight: MetricWeight) = MetricSpecificHeatCapacity(metric, weight)
+
+/**
+ * Gets a [UKImperialSpecificHeatCapacity] from a [MetricAndUKImperialHeatCapacity] and a [ImperialWeight]
+ * @param weight the [ImperialWeight] component
+ * @return the [UKImperialSpecificHeatCapacity] represented by the units
+ */
 infix fun MetricAndUKImperialHeatCapacity.per(weight: ImperialWeight) = UKImperialSpecificHeatCapacity(ukImperial, weight.ukImperial)
+
+/**
+ * Gets a [UKImperialSpecificHeatCapacity] from a [MetricAndUKImperialHeatCapacity] and a [UKImperialWeight]
+ * @param weight the [UKImperialWeight] component
+ * @return the [UKImperialSpecificHeatCapacity] represented by the units
+ */
 infix fun MetricAndUKImperialHeatCapacity.per(weight: UKImperialWeight) = UKImperialSpecificHeatCapacity(ukImperial, weight)
+
+/**
+ * Gets a [MetricSpecificHeatCapacity] from a [MetricHeatCapacity] and a [MetricWeight]
+ * @param weight the [MetricWeight] component
+ * @return the [MetricSpecificHeatCapacity] represented by the units
+ */
 infix fun MetricHeatCapacity.per(weight: MetricWeight) = MetricSpecificHeatCapacity(this, weight)
+
+/**
+ * Gets a [UKImperialSpecificHeatCapacity] from a [UKImperialHeatCapacity] and a [ImperialWeight]
+ * @param weight the [ImperialWeight] component
+ * @return the [UKImperialSpecificHeatCapacity] represented by the units
+ */
 infix fun UKImperialHeatCapacity.per(weight: ImperialWeight) = UKImperialSpecificHeatCapacity(this, weight.ukImperial)
+
+/**
+ * Gets a [UKImperialSpecificHeatCapacity] from a [UKImperialHeatCapacity] and a [UKImperialWeight]
+ * @param weight the [UKImperialWeight] component
+ * @return the [UKImperialSpecificHeatCapacity] represented by the units
+ */
 infix fun UKImperialHeatCapacity.per(weight: UKImperialWeight) = UKImperialSpecificHeatCapacity(this, weight)
+
+/**
+ * Gets a [USCustomarySpecificHeatCapacity] from a [USCustomaryHeatCapacity] and a [UKImperialWeight]
+ * @param weight the [ImperialWeight] component
+ * @return the [USCustomarySpecificHeatCapacity] represented by the units
+ */
 infix fun USCustomaryHeatCapacity.per(weight: ImperialWeight) = USCustomarySpecificHeatCapacity(this, weight.usCustomary)
+
+/**
+ * Gets a [USCustomarySpecificHeatCapacity] from a [USCustomaryHeatCapacity] and a [UKImperialWeight]
+ * @param weight the [USCustomaryWeight] component
+ * @return the [USCustomarySpecificHeatCapacity] represented by the units
+ */
 infix fun USCustomaryHeatCapacity.per(weight: USCustomaryWeight) = USCustomarySpecificHeatCapacity(this, weight)
 
+/**
+ * Gets a [MetricSpecificHeatCapacity] from a [MetricSpecificEnergy] and a [MetricAndUKImperialTemperature]
+ * @param temperature the [MetricAndUKImperialTemperature] component
+ * @return the [MetricSpecificHeatCapacity] represented by the units
+ */
 infix fun MetricSpecificEnergy.per(temperature: MetricAndUKImperialTemperature) = MetricSpecificHeatCapacity(energy per temperature, per)
+
+/**
+ * Gets a [UKImperialSpecificHeatCapacity] from a [ImperialSpecificEnergy] and a [MetricAndUKImperialTemperature]
+ * @param temperature the [MetricAndUKImperialTemperature] component
+ * @return the [UKImperialSpecificHeatCapacity] represented by the units
+ */
 infix fun ImperialSpecificEnergy.per(temperature: MetricAndUKImperialTemperature) = UKImperialSpecificHeatCapacity(energy per temperature, per.ukImperial)
+
+/**
+ * Gets a [USCustomarySpecificHeatCapacity] from a [ImperialSpecificEnergy] and a [USCustomaryTemperature]
+ * @param temperature the [USCustomaryTemperature] component
+ * @return the [USCustomarySpecificHeatCapacity] represented by the units
+ */
 infix fun ImperialSpecificEnergy.per(temperature: USCustomaryTemperature) = USCustomarySpecificHeatCapacity(energy per temperature, per.usCustomary)
+
+/**
+ * Gets a [UKImperialSpecificHeatCapacity] from a [UKImperialSpecificEnergy] and a [MetricAndUKImperialTemperature]
+ * @param temperature the [MetricAndUKImperialTemperature] component
+ * @return the [UKImperialSpecificHeatCapacity] represented by the units
+ */
 infix fun UKImperialSpecificEnergy.per(temperature: MetricAndUKImperialTemperature) = UKImperialSpecificHeatCapacity(energy per temperature, per)
+
+/**
+ * Gets a [USCustomarySpecificHeatCapacity] from a [USCustomarySpecificEnergy] and a [USCustomaryTemperature]
+ * @param temperature the [USCustomaryTemperature] component
+ * @return the [USCustomarySpecificHeatCapacity] represented by the units
+ */
 infix fun USCustomarySpecificEnergy.per(temperature: USCustomaryTemperature) = USCustomarySpecificHeatCapacity(energy per temperature, per)
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt
index 051ba9f52..c888eead5 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricSpecificVolume]
+ */
 val MetricSpecificVolumeUnits: Set<MetricSpecificVolume> get() = MetricVolumeUnits.flatMap { volume ->
     MetricWeightUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialSpecificVolume]
+ */
 val ImperialSpecificVolumeUnits: Set<ImperialSpecificVolume> get() = ImperialVolumeUnits.flatMap { volume ->
     ImperialWeightUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialSpecificVolume]
+ */
 val UKImperialSpecificVolumeUnits: Set<UKImperialSpecificVolume> get() = UKImperialVolumeUnits.flatMap { volume ->
     UKImperialWeightUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomarySpecificVolume]
+ */
 val USCustomarySpecificVolumeUnits: Set<USCustomarySpecificVolume> get() = USCustomaryVolumeUnits.flatMap { volume ->
     USCustomaryWeightUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [SpecificVolume]
+ */
 val SpecificVolumeUnits: Set<SpecificVolume> get() = MetricSpecificVolumeUnits +
     ImperialSpecificVolumeUnits +
     UKImperialSpecificVolumeUnits.filter { it.volume !is UKImperialImperialVolumeWrapper || it.per !is UKImperialImperialWeightWrapper }.toSet() +
     USCustomarySpecificVolumeUnits.filter { it.volume !is USCustomaryImperialVolumeWrapper || it.per !is USCustomaryImperialWeightWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.SpecificVolume]
+ * SI unit is `CubicMeter per Kilogram`
+ */
 @Serializable
 sealed class SpecificVolume : AbstractScientificUnit<PhysicalQuantity.SpecificVolume>() {
+
+    /**
+     * The [Volume] component
+     */
     abstract val volume: Volume
+
+    /**
+     * The [Weight] component
+     */
     abstract val per: Weight
     override val symbol: String by lazy { "${volume.symbol} / ${per.symbol}" }
     override val quantity = PhysicalQuantity.SpecificVolume
@@ -52,30 +79,108 @@ sealed class SpecificVolume : AbstractScientificUnit<PhysicalQuantity.SpecificVo
     override fun toSIUnit(value: Decimal): Decimal = volume.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [SpecificVolume] for [MeasurementSystem.Metric]
+ * @param volume the [MetricVolume] component
+ * @param per the [MetricWeight] component
+ */
 @Serializable
 data class MetricSpecificVolume(override val volume: MetricVolume, override val per: MetricWeight) : SpecificVolume(), MetricScientificUnit<PhysicalQuantity.SpecificVolume> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [SpecificVolume] for [MeasurementSystem.Imperial]
+ * @param volume the [ImperialVolume] component
+ * @param per the [ImperialWeight] component
+ */
 @Serializable
 data class ImperialSpecificVolume(override val volume: ImperialVolume, override val per: ImperialWeight) : SpecificVolume(), ImperialScientificUnit<PhysicalQuantity.SpecificVolume> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialSpecificVolume] equivalent to this [ImperialSpecificVolume]
+     */
     val ukImperial get() = volume.ukImperial per per.ukImperial
+
+    /**
+     * The [USCustomarySpecificVolume] equivalent to this [ImperialSpecificVolume]
+     */
     val usCustomary get() = volume.usCustomary per per.usCustomary
 }
+
+/**
+ * A [SpecificVolume] for [MeasurementSystem.USCustomary]
+ * @param volume the [USCustomaryVolume] component
+ * @param per the [USCustomaryWeight] component
+ */
 @Serializable
 data class USCustomarySpecificVolume(override val volume: USCustomaryVolume, override val per: USCustomaryWeight) : SpecificVolume(), USCustomaryScientificUnit<PhysicalQuantity.SpecificVolume> {
     override val system = MeasurementSystem.USCustomary
 }
+
+/**
+ * A [SpecificVolume] for [MeasurementSystem.UKImperial]
+ * @param volume the [UKImperialVolume] component
+ * @param per the [UKImperialWeight] component
+ */
 @Serializable
 data class UKImperialSpecificVolume(override val volume: UKImperialVolume, override val per: UKImperialWeight) : SpecificVolume(), UKImperialScientificUnit<PhysicalQuantity.SpecificVolume> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * Gets a [MetricSpecificVolume] from a [MetricVolume] and a [MetricWeight]
+ * @param weight the [MetricWeight] component
+ * @return the [MetricSpecificVolume] represented by the units
+ */
 infix fun MetricVolume.per(weight: MetricWeight) = MetricSpecificVolume(this, weight)
+
+/**
+ * Gets a [MetricSpecificVolume] from a [ImperialVolume] and a [ImperialWeight]
+ * @param weight the [ImperialWeight] component
+ * @return the [MetricSpecificVolume] represented by the units
+ */
 infix fun ImperialVolume.per(weight: ImperialWeight) = ImperialSpecificVolume(this, weight)
+
+/**
+ * Gets a [UKImperialSpecificVolume] from a [ImperialVolume] and a [UKImperialWeight]
+ * @param weight the [UKImperialWeight] component
+ * @return the [UKImperialSpecificVolume] represented by the units
+ */
 infix fun ImperialVolume.per(weight: UKImperialWeight) = UKImperialSpecificVolume(this.ukImperial, weight)
+
+/**
+ * Gets a [USCustomarySpecificVolume] from a [ImperialVolume] and a [USCustomaryWeight]
+ * @param weight the [USCustomaryWeight] component
+ * @return the [USCustomarySpecificVolume] represented by the units
+ */
 infix fun ImperialVolume.per(weight: USCustomaryWeight) = USCustomarySpecificVolume(this.usCustomary, weight)
+
+/**
+ * Gets a [USCustomarySpecificVolume] from a [USCustomaryVolume] and a [USCustomaryWeight]
+ * @param weight the [USCustomaryWeight] component
+ * @return the [USCustomarySpecificVolume] represented by the units
+ */
 infix fun USCustomaryVolume.per(weight: USCustomaryWeight) = USCustomarySpecificVolume(this, weight)
+
+/**
+ * Gets a [USCustomarySpecificVolume] from a [USCustomaryVolume] and a [ImperialWeight]
+ * @param weight the [ImperialWeight] component
+ * @return the [USCustomarySpecificVolume] represented by the units
+ */
 infix fun USCustomaryVolume.per(weight: ImperialWeight) = USCustomarySpecificVolume(this, weight.usCustomary)
+
+/**
+ * Gets a [UKImperialSpecificVolume] from a [UKImperialVolume] and a [ImperialWeight]
+ * @param weight the [ImperialWeight] component
+ * @return the [UKImperialSpecificVolume] represented by the units
+ */
 infix fun UKImperialVolume.per(weight: ImperialWeight) = UKImperialSpecificVolume(this, weight.ukImperial)
+
+/**
+ * Gets a [UKImperialSpecificVolume] from a [UKImperialVolume] and a [UKImperialWeight]
+ * @param weight the [UKImperialWeight] component
+ * @return the [UKImperialSpecificVolume] represented by the units
+ */
 infix fun UKImperialVolume.per(weight: UKImperialWeight) = UKImperialSpecificVolume(this, weight)
diff --git a/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt b/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
index 7aa0a6f21..eec296e7c 100644
--- a/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
@@ -23,19 +23,40 @@ import com.splendo.kaluga.scientific.convert
 import com.splendo.kaluga.scientific.invoke
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricSpeed]
+ */
 val MetricSpeedUnits: Set<MetricSpeed> get() = MetricLengthUnits.flatMap { length ->
     TimeUnits.map { MetricSpeed(length, it) }
 }.toSet()
 
+/**
+ * Set of all [ImperialSpeed]
+ */
 val ImperialSpeedUnits: Set<ImperialSpeed> get() = ImperialLengthUnits.flatMap { length ->
     TimeUnits.map { ImperialSpeed(length, it) }
 }.toSet()
 
+/**
+ * Set of all [Speed]
+ */
 val SpeedUnits: Set<Speed> get() = MetricSpeedUnits + ImperialSpeedUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Speed]
+ * SI unit is `Meter per Second`
+ */
 @Serializable
 sealed class Speed : AbstractScientificUnit<PhysicalQuantity.Speed>() {
+
+    /**
+     * The [Length] component
+     */
     abstract val distance: Length
+
+    /**
+     * The [Time] component
+     */
     abstract val per: Time
     override val quantity = PhysicalQuantity.Speed
     override val symbol: String by lazy { "${distance.symbol} / ${per.symbol}" }
@@ -43,18 +64,46 @@ sealed class Speed : AbstractScientificUnit<PhysicalQuantity.Speed>() {
     override fun toSIUnit(value: Decimal): Decimal = distance.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [Speed] for [MeasurementSystem.Metric]
+ * @param distance the [MetricLength] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class MetricSpeed(override val distance: MetricLength, override val per: Time) : Speed(), MetricScientificUnit<PhysicalQuantity.Speed> {
     override val system = MeasurementSystem.Metric
 }
 
+/**
+ * A [Speed] for [MeasurementSystem.Imperial]
+ * @param distance the [ImperialLength] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class ImperialSpeed(override val distance: ImperialLength, override val per: Time) : Speed(), ImperialScientificUnit<PhysicalQuantity.Speed> {
     override val system = MeasurementSystem.Imperial
 }
 
+/**
+ * Gets a [MetricSpeed] from a [MetricLength] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricSpeed] represented by the units
+ */
 infix fun MetricLength.per(time: Time) = MetricSpeed(this, time)
+
+/**
+ * Gets a [ImperialSpeed] from a [ImperialLength] and a [Time]
+ * @param time the [Time] component
+ * @return the [ImperialSpeed] represented by the units
+ */
 infix fun ImperialLength.per(time: Time) = ImperialSpeed(this, time)
 
+/**
+ * The [Speed] of light in `Meter per Second`
+ */
 val MetricSpeedOfLight = 299792458(Meter per Second)
+
+/**
+ * The [Speed] of light in `Foot per Second`
+ */
 val ImperialSpeedOfLight = MetricSpeedOfLight.convert(Foot per Second)
diff --git a/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt b/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt
index 2b1728e54..33da7cda9 100644
--- a/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricSurfaceTension]
+ */
 val MetricSurfaceTensionUnits: Set<MetricSurfaceTension> get() = MetricForceUnits.flatMap { force ->
     MetricLengthUnits.map { force per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialSurfaceTension]
+ */
 val ImperialSurfaceTensionUnits: Set<ImperialSurfaceTension> get() = ImperialForceUnits.flatMap { force ->
     ImperialLengthUnits.map { force per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialSurfaceTension]
+ */
 val UKImperialSurfaceTensionUnits: Set<UKImperialSurfaceTension> get() = UKImperialForceUnits.flatMap { force ->
     ImperialLengthUnits.map { force per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomarySurfaceTension]
+ */
 val USCustomarySurfaceTensionUnits: Set<USCustomarySurfaceTension> get() = USCustomaryForceUnits.flatMap { force ->
     ImperialLengthUnits.map { force per it }
 }.toSet()
 
+/**
+ * Set of all [SurfaceTension]
+ */
 val SurfaceTensionUnits: Set<SurfaceTension> get() = MetricSurfaceTensionUnits +
     ImperialSurfaceTensionUnits +
     UKImperialSurfaceTensionUnits.filter { it.force !is UKImperialImperialForceWrapper }.toSet() +
     USCustomarySurfaceTensionUnits.filter { it.force !is USCustomaryImperialForceWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.SurfaceTension]
+ * SI unit is `Newton per Meter`
+ */
 @Serializable
 sealed class SurfaceTension : AbstractScientificUnit<PhysicalQuantity.SurfaceTension>() {
+
+    /**
+     * The [Force] component
+     */
     abstract val force: Force
+
+    /**
+     * The [Length] component
+     */
     abstract val per: Length
     override val symbol: String by lazy { "${force.symbol} / ${per.symbol}" }
     override val quantity = PhysicalQuantity.SurfaceTension
@@ -52,26 +79,80 @@ sealed class SurfaceTension : AbstractScientificUnit<PhysicalQuantity.SurfaceTen
     override fun toSIUnit(value: Decimal): Decimal = force.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [SurfaceTension] for [MeasurementSystem.Metric]
+ * @param force the [MetricForce] component
+ * @param per the [MetricLength] component
+ */
 @Serializable
 data class MetricSurfaceTension(override val force: MetricForce, override val per: MetricLength) : SurfaceTension(), MetricScientificUnit<PhysicalQuantity.SurfaceTension> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [SurfaceTension] for [MeasurementSystem.Imperial]
+ * @param force the [ImperialForce] component
+ * @param per the [ImperialLength] component
+ */
 @Serializable
 data class ImperialSurfaceTension(override val force: ImperialForce, override val per: ImperialLength) : SurfaceTension(), ImperialScientificUnit<PhysicalQuantity.SurfaceTension> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialSurfaceTension] equivalent to this [ImperialSurfaceTension]
+     */
     val ukImperial get() = force.ukImperial per per
+
+    /**
+     * The [USCustomarySurfaceTension] equivalent to this [ImperialSurfaceTension]
+     */
     val usCustomary get() = force.usCustomary per per
 }
+
+/**
+ * A [SurfaceTension] for [MeasurementSystem.USCustomary]
+ * @param force the [USCustomaryForce] component
+ * @param per the [ImperialLength] component
+ */
 @Serializable
 data class USCustomarySurfaceTension(override val force: USCustomaryForce, override val per: ImperialLength) : SurfaceTension(), USCustomaryScientificUnit<PhysicalQuantity.SurfaceTension> {
     override val system = MeasurementSystem.USCustomary
 }
+
+/**
+ * A [SurfaceTension] for [MeasurementSystem.UKImperial]
+ * @param force the [UKImperialForce] component
+ * @param per the [ImperialLength] component
+ */
 @Serializable
 data class UKImperialSurfaceTension(override val force: UKImperialForce, override val per: ImperialLength) : SurfaceTension(), UKImperialScientificUnit<PhysicalQuantity.SurfaceTension> {
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * Gets a [MetricSurfaceTension] from a [MetricForce] and a [MetricLength]
+ * @param length the [MetricLength] component
+ * @return the [MetricSurfaceTension] represented by the units
+ */
 infix fun MetricForce.per(length: MetricLength) = MetricSurfaceTension(this, length)
+
+/**
+ * Gets a [ImperialSurfaceTension] from a [ImperialForce] and a [ImperialLength]
+ * @param length the [ImperialLength] component
+ * @return the [ImperialSurfaceTension] represented by the units
+ */
 infix fun ImperialForce.per(length: ImperialLength) = ImperialSurfaceTension(this, length)
+
+/**
+ * Gets a [USCustomarySurfaceTension] from a [USCustomaryForce] and a [ImperialLength]
+ * @param length the [ImperialLength] component
+ * @return the [USCustomarySurfaceTension] represented by the units
+ */
 infix fun USCustomaryForce.per(length: ImperialLength) = USCustomarySurfaceTension(this, length)
+
+/**
+ * Gets a [UKImperialSurfaceTension] from a [UKImperialForce] and a [ImperialLength]
+ * @param length the [ImperialLength] component
+ * @return the [UKImperialSurfaceTension] represented by the units
+ */
 infix fun UKImperialForce.per(length: ImperialLength) = UKImperialSurfaceTension(this, length)
diff --git a/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt b/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt
index 6a8727f2a..ee6d744d3 100644
--- a/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt
@@ -29,10 +29,25 @@ import com.splendo.kaluga.base.utils.toDouble
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricAndUKImperialTemperature]
+ */
 val MetricAndUkImperialTemperatureUnits: Set<MetricAndUKImperialTemperature> get() = setOf(Kelvin, Celsius)
+
+/**
+ * Set of all [USCustomaryTemperature]
+ */
 val USCustomaryTemperatureUnits: Set<USCustomaryTemperature> get() = setOf(Rankine, Fahrenheit)
+
+/**
+ * Set of all [Temperature]
+ */
 val TemperatureUnits: Set<Temperature> get() = MetricAndUkImperialTemperatureUnits + USCustomaryTemperatureUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Temperature]
+ * SI unit is [Kelvin]
+ */
 @Serializable
 sealed class Temperature : AbstractScientificUnit<PhysicalQuantity.Temperature>() {
     override val quantity = PhysicalQuantity.Temperature
@@ -40,11 +55,18 @@ sealed class Temperature : AbstractScientificUnit<PhysicalQuantity.Temperature>(
     abstract fun deltaFromSIUnitDelta(delta: Decimal): Decimal
 }
 
+/**
+ * A [Temperature] for [MeasurementSystem.MetricAndUKImperial]
+ */
 @Serializable
 sealed class MetricAndUKImperialTemperature(override val symbol: String) : Temperature(), MetricAndUKImperialScientificUnit<PhysicalQuantity.Temperature>, MeasurementUsage.UsedInUKImperial {
     override val system = MeasurementSystem.MetricAndUKImperial
 }
 
+
+/**
+ * A [Temperature] for [MeasurementSystem.USCustomary]
+ */
 @Serializable
 sealed class USCustomaryTemperature(override val symbol: String) : Temperature(), USCustomaryScientificUnit<PhysicalQuantity.Temperature> {
     override val system = MeasurementSystem.USCustomary
diff --git a/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
index 2022a4edc..48718747c 100644
--- a/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricAndUKImperialThermalResistance]
+ */
 val MetricAndUKImperialThermalResistanceUnits: Set<MetricAndUKImperialThermalResistance> get() = MetricAndUkImperialTemperatureUnits.flatMap { temperature ->
     MetricAndImperialPowerUnits.map { temperature per it }
 }.toSet()
 
+/**
+ * Set of all [MetricThermalResistance]
+ */
 val MetricThermalResistanceUnits: Set<MetricThermalResistance> get() = MetricAndUkImperialTemperatureUnits.flatMap { temperature ->
     MetricPowerUnits.map { temperature per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialThermalResistance]
+ */
 val UKImperialThermalResistanceUnits: Set<UKImperialThermalResistance> get() = MetricAndUkImperialTemperatureUnits.flatMap { temperature ->
     ImperialPowerUnits.map { temperature per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryThermalResistance]
+ */
 val USCustomaryThermalResistanceUnits: Set<USCustomaryThermalResistance> get() = USCustomaryTemperatureUnits.flatMap { temperature ->
     ImperialPowerUnits.map { temperature per it }
 }.toSet()
 
+/**
+ * Set of all [ThermalResistance]
+ */
 val ThermalResistanceUnits: Set<ThermalResistance> get() = MetricAndUKImperialThermalResistanceUnits +
     MetricThermalResistanceUnits.filter { it.per !is MetricMetricAndImperialPowerWrapper }.toSet() +
     UKImperialThermalResistanceUnits.filter { it.per !is ImperialMetricAndImperialPowerWrapper }.toSet() +
     USCustomaryThermalResistanceUnits
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.ThermalResistance]
+ * SI unit is `Kelvin per Watt`
+ */
 @Serializable
 sealed class ThermalResistance : AbstractScientificUnit<PhysicalQuantity.ThermalResistance>() {
+
+    /**
+     * The [Temperature] component
+     */
     abstract val temperature: Temperature
+
+    /**
+     * The [Power] component
+     */
     abstract val per: Power
     override val quantity = PhysicalQuantity.ThermalResistance
     override val symbol: String by lazy { "${temperature.symbol} / ${per.symbol}" }
@@ -52,27 +79,87 @@ sealed class ThermalResistance : AbstractScientificUnit<PhysicalQuantity.Thermal
     override fun toSIUnit(value: Decimal): Decimal = temperature.deltaToSIUnitDelta(per.fromSIUnit(value))
 }
 
+/**
+ * A [ThermalResistance] for [MeasurementSystem.MetricAndUKImperial]
+ * @param temperature the [MetricAndUKImperialTemperature] component
+ * @param per the [MetricAndImperialPower] component
+ */
 @Serializable
 data class MetricAndUKImperialThermalResistance(override val temperature: MetricAndUKImperialTemperature, override val per: MetricAndImperialPower) : ThermalResistance(), MetricAndUKImperialScientificUnit<PhysicalQuantity.ThermalResistance> {
     override val system = MeasurementSystem.MetricAndUKImperial
+
+    /**
+     * The [MetricThermalResistance] equivalent to this [MetricAndUKImperialThermalResistance]
+     */
     val metric get() = temperature per per.metric
+
+    /**
+     * The [UKImperialThermalResistance] equivalent to this [MetricAndUKImperialThermalResistance]
+     */
     val ukImperial get() = temperature per per.imperial
 }
+
+/**
+ * A [ThermalResistance] for [MeasurementSystem.Metric]
+ * @param temperature the [MetricAndUKImperialTemperature] component
+ * @param per the [MetricPower] component
+ */
 @Serializable
 data class MetricThermalResistance(override val temperature: MetricAndUKImperialTemperature, override val per: MetricPower) : ThermalResistance(), MetricScientificUnit<PhysicalQuantity.ThermalResistance> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [ThermalResistance] for [MeasurementSystem.UKImperial]
+ * @param temperature the [MetricAndUKImperialTemperature] component
+ * @param per the [ImperialPower] component
+ */
 @Serializable
 data class UKImperialThermalResistance(override val temperature: MetricAndUKImperialTemperature, override val per: ImperialPower) : ThermalResistance(), UKImperialScientificUnit<PhysicalQuantity.ThermalResistance> {
     override val system = MeasurementSystem.UKImperial
 }
+
+/**
+ * A [ThermalResistance] for [MeasurementSystem.USCustomary]
+ * @param temperature the [USCustomaryTemperature] component
+ * @param per the [ImperialPower] component
+ */
 @Serializable
 data class USCustomaryThermalResistance(override val temperature: USCustomaryTemperature, override val per: ImperialPower) : ThermalResistance(), USCustomaryScientificUnit<PhysicalQuantity.ThermalResistance> {
     override val system = MeasurementSystem.USCustomary
 }
 
+/**
+ * Gets a [MetricAndUKImperialThermalResistance] from a [MetricAndUKImperialTemperature] and a [MetricAndImperialPower]
+ * @param power the [MetricAndImperialPower] component
+ * @return the [MetricAndUKImperialThermalResistance] represented by the units
+ */
 infix fun MetricAndUKImperialTemperature.per(power: MetricAndImperialPower) = MetricAndUKImperialThermalResistance(this, power)
+
+/**
+ * Gets a [MetricThermalResistance] from a [MetricAndUKImperialTemperature] and a [MetricPower]
+ * @param power the [MetricPower] component
+ * @return the [MetricThermalResistance] represented by the units
+ */
 infix fun MetricAndUKImperialTemperature.per(power: MetricPower) = MetricThermalResistance(this, power)
+
+/**
+ * Gets a [UKImperialThermalResistance] from a [MetricAndUKImperialTemperature] and a [ImperialPower]
+ * @param power the [ImperialPower] component
+ * @return the [UKImperialThermalResistance] represented by the units
+ */
 infix fun MetricAndUKImperialTemperature.per(power: ImperialPower) = UKImperialThermalResistance(this, power)
+
+/**
+ * Gets a [USCustomaryThermalResistance] from a [USCustomaryTemperature] and a [MetricAndImperialPower]
+ * @param power the [MetricAndImperialPower] component
+ * @return the [USCustomaryThermalResistance] represented by the units
+ */
 infix fun USCustomaryTemperature.per(power: MetricAndImperialPower) = USCustomaryThermalResistance(this, power.imperial)
+
+/**
+ * Gets a [USCustomaryThermalResistance] from a [USCustomaryTemperature] and a [ImperialPower]
+ * @param power the [ImperialPower] component
+ * @return the [USCustomaryThermalResistance] represented by the units
+ */
 infix fun USCustomaryTemperature.per(power: ImperialPower) = USCustomaryThermalResistance(this, power)
diff --git a/scientific/src/commonMain/kotlin/unit/TimeUnit.kt b/scientific/src/commonMain/kotlin/unit/TimeUnit.kt
index a65d00567..2ed263d71 100644
--- a/scientific/src/commonMain/kotlin/unit/TimeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/TimeUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [Time]
+ */
 val TimeUnits: Set<Time> get() = setOf(
     Second,
     Nanosecond,
@@ -35,6 +38,10 @@ val TimeUnits: Set<Time> get() = setOf(
     Hour
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Time]
+ * SI unit is [Second]
+ */
 @Serializable
 sealed class Time : AbstractScientificUnit<PhysicalQuantity.Time>(), MetricAndImperialScientificUnit<PhysicalQuantity.Time>
 
diff --git a/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt b/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt
index 2f54fe7e9..5f514f613 100644
--- a/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VoltageUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [Voltage]
+ */
 val VoltageUnits: Set<Voltage> get() = setOf(
     Volt,
     Nanovolt,
@@ -39,6 +42,10 @@ val VoltageUnits: Set<Voltage> get() = setOf(
     Abvolt
 )
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Voltage]
+ * SI unit is [Volt]
+ */
 @Serializable
 sealed class Voltage : AbstractScientificUnit<PhysicalQuantity.Voltage>(), MetricAndImperialScientificUnit<PhysicalQuantity.Voltage>
 
diff --git a/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
index cae648c9f..c9a017464 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricVolume]
+ */
 val MetricVolumeUnits: Set<MetricVolume> get() = setOf(
     CubicMeter,
     CubicNanometer,
@@ -49,6 +52,9 @@ val MetricVolumeUnits: Set<MetricVolume> get() = setOf(
     Gigaliter
 )
 
+/**
+ * Set of all [ImperialVolume]
+ */
 val ImperialVolumeUnits: Set<ImperialVolume> get() = setOf(
     CubicInch,
     CubicFoot,
@@ -56,6 +62,9 @@ val ImperialVolumeUnits: Set<ImperialVolume> get() = setOf(
     CubicMile
 )
 
+/**
+ * Set of all [USCustomaryVolume]
+ */
 val USCustomaryVolumeUnits: Set<USCustomaryVolume> get() = ImperialVolumeUnits.map { it.usCustomary }.toSet() +
     setOf(
         AcreFoot,
@@ -69,6 +78,9 @@ val USCustomaryVolumeUnits: Set<USCustomaryVolume> get() = ImperialVolumeUnits.m
         UsLiquidGallon
     )
 
+/**
+ * Set of all [UKImperialVolume]
+ */
 val UKImperialVolumeUnits: Set<UKImperialVolume> get() = ImperialVolumeUnits.map { it.ukImperial }.toSet() +
     setOf(
         ImperialFluidDram,
@@ -79,33 +91,54 @@ val UKImperialVolumeUnits: Set<UKImperialVolume> get() = ImperialVolumeUnits.map
         ImperialGallon
     )
 
+/**
+ * Set of all [Volume]
+ */
 val VolumeUnits: Set<Volume> get() = MetricVolumeUnits +
     ImperialVolumeUnits +
     USCustomaryVolumeUnits.filter { it !is USCustomaryImperialVolumeWrapper }.toSet() +
     UKImperialVolumeUnits.filter { it !is UKImperialImperialVolumeWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Volume]
+ * SI unit is [CubicMeter]
+ */
 @Serializable
 sealed class Volume : AbstractScientificUnit<PhysicalQuantity.Volume>()
 
+/**
+ * A [Volume] for [MeasurementSystem.Metric]
+ */
 @Serializable
 sealed class MetricVolume : Volume(), MetricScientificUnit<PhysicalQuantity.Volume>
 
+
+/**
+ * A [Volume] for [MeasurementSystem.USCustomary]
+ */
 @Serializable
 sealed class USCustomaryVolume : Volume(), USCustomaryScientificUnit<PhysicalQuantity.Volume> {
     override val quantity = PhysicalQuantity.Volume
     override val system = MeasurementSystem.USCustomary
 }
 
+
+/**
+ * A [Volume] for [MeasurementSystem.UKImperial]
+ */
 @Serializable
 sealed class UKImperialVolume : Volume(), UKImperialScientificUnit<PhysicalQuantity.Volume> {
     override val quantity = PhysicalQuantity.Volume
     override val system = MeasurementSystem.UKImperial
 }
 
+/**
+ * A [Volume] for [MeasurementSystem.Imperial]
+ */
 @Serializable
 sealed class ImperialVolume : Volume(), ImperialScientificUnit<PhysicalQuantity.Volume>
 
-class Cubic<S : MeasurementSystem, U : SystemScientificUnit<S, PhysicalQuantity.Length>>(private val unit: U) : SystemScientificUnit<S, PhysicalQuantity.Volume> {
+internal class Cubic<S : MeasurementSystem, U : SystemScientificUnit<S, PhysicalQuantity.Length>>(private val unit: U) : SystemScientificUnit<S, PhysicalQuantity.Volume> {
     override val symbol: String = "${unit.symbol}3"
     override val system: S = unit.system
     override val quantity = PhysicalQuantity.Volume
@@ -215,6 +248,10 @@ object CubicMile : ImperialVolume(), SystemScientificUnit<MeasurementSystem.Impe
 
 // US Imperial
 
+/**
+ * Wraps an [ImperialVolume] unit to an [USCustomaryVolume] unit
+ * @param imperial the [ImperialVolume] to wrap
+ */
 @Serializable
 data class USCustomaryImperialVolumeWrapper(val imperial: ImperialVolume) : USCustomaryVolume() {
     override val symbol: String = imperial.symbol
@@ -222,6 +259,10 @@ data class USCustomaryImperialVolumeWrapper(val imperial: ImperialVolume) : USCu
     override fun toSIUnit(value: Decimal): Decimal = imperial.toSIUnit(value)
 }
 
+/**
+ * Converts an [ImperialVolume] unit to an [USCustomaryImperialVolumeWrapper] unit
+ * @param VolumeUnit the type of [ImperialForce] to convert
+ */
 val <VolumeUnit : ImperialVolume> VolumeUnit.usCustomary get() = USCustomaryImperialVolumeWrapper(this)
 
 @Serializable
@@ -295,6 +336,11 @@ object UsLiquidGallon : USCustomaryVolume() {
 }
 
 // UK Imperial
+
+/**
+ * Wraps an [ImperialVolume] unit to an [UKImperialVolume] unit
+ * @param imperial the [ImperialVolume] to wrap
+ */
 @Serializable
 data class UKImperialImperialVolumeWrapper(val imperial: ImperialVolume) : UKImperialVolume() {
     override val symbol: String = imperial.symbol
@@ -302,6 +348,10 @@ data class UKImperialImperialVolumeWrapper(val imperial: ImperialVolume) : UKImp
     override fun toSIUnit(value: Decimal): Decimal = imperial.toSIUnit(value)
 }
 
+/**
+ * Converts an [ImperialVolume] unit to an [UKImperialImperialVolumeWrapper] unit
+ * @param VolumeUnit the type of [ImperialForce] to convert
+ */
 val <VolumeUnit : ImperialVolume> VolumeUnit.ukImperial get() = UKImperialImperialVolumeWrapper(this)
 
 @Serializable
diff --git a/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt
index 73d58f4d2..2de3f7556 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricVolumetricFlow]
+ */
 val MetricVolumetricFlowUnits: Set<MetricVolumetricFlow> get() = MetricVolumeUnits.flatMap { volume ->
     TimeUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialVolumetricFlow]
+ */
 val ImperialVolumetricFlowUnits: Set<ImperialVolumetricFlow> get() = ImperialVolumeUnits.flatMap { volume ->
     TimeUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialVolumetricFlow]
+ */
 val UKImperialVolumetricFlowUnits: Set<UKImperialVolumetricFlow> get() = UKImperialVolumeUnits.flatMap { volume ->
     TimeUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryVolumetricFlow]
+ */
 val USCustomaryVolumetricFlowUnits: Set<USCustomaryVolumetricFlow> get() = USCustomaryVolumeUnits.flatMap { volume ->
     TimeUnits.map { volume per it }
 }.toSet()
 
+/**
+ * Set of all [VolumetricFlow]
+ */
 val VolumetricFlowUnits: Set<VolumetricFlow> get() = MetricVolumetricFlowUnits +
     ImperialVolumetricFlowUnits +
     UKImperialVolumetricFlowUnits.filter { it.volume !is UKImperialImperialVolumeWrapper }.toSet() +
     USCustomaryVolumetricFlowUnits.filter { it.volume !is USCustomaryImperialVolumeWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.VolumetricFlow]
+ * SI unit is `CubicMeter per Second`
+ */
 @Serializable
 sealed class VolumetricFlow : AbstractScientificUnit<PhysicalQuantity.VolumetricFlow>() {
+
+    /**
+     * The [Volume] component
+     */
     abstract val volume: Volume
+
+    /**
+     * The [Time] component
+     */
     abstract val per: Time
     override val quantity = PhysicalQuantity.VolumetricFlow
     override val symbol: String by lazy { "${volume.symbol} / ${per.symbol}" }
@@ -52,26 +79,80 @@ sealed class VolumetricFlow : AbstractScientificUnit<PhysicalQuantity.Volumetric
     override fun toSIUnit(value: Decimal): Decimal = volume.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [VolumetricFlow] for [MeasurementSystem.Metric]
+ * @param volume the [MetricVolume] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class MetricVolumetricFlow(override val volume: MetricVolume, override val per: Time) : VolumetricFlow(), MetricScientificUnit<PhysicalQuantity.VolumetricFlow> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [VolumetricFlow] for [MeasurementSystem.Imperial]
+ * @param volume the [ImperialVolume] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class ImperialVolumetricFlow(override val volume: ImperialVolume, override val per: Time) : VolumetricFlow(), ImperialScientificUnit<PhysicalQuantity.VolumetricFlow> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialVolumetricFlow] equivalent to this [ImperialVolumetricFlow]
+     */
     val ukImperial get() = UKImperialVolumetricFlow(volume.ukImperial, per)
+
+    /**
+     * The [USCustomaryVolumetricFlow] equivalent to this [ImperialVolumetricFlow]
+     */
     val usCustomary get() = USCustomaryVolumetricFlow(volume.usCustomary, per)
 }
+
+/**
+ * A [VolumetricFlow] for [MeasurementSystem.UKImperial]
+ * @param volume the [UKImperialVolume] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class UKImperialVolumetricFlow(override val volume: UKImperialVolume, override val per: Time) : VolumetricFlow(), UKImperialScientificUnit<PhysicalQuantity.VolumetricFlow> {
     override val system = MeasurementSystem.UKImperial
 }
+
+/**
+ * A [VolumetricFlow] for [MeasurementSystem.USCustomary]
+ * @param volume the [USCustomaryVolume] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class USCustomaryVolumetricFlow(override val volume: USCustomaryVolume, override val per: Time) : VolumetricFlow(), USCustomaryScientificUnit<PhysicalQuantity.VolumetricFlow> {
     override val system = MeasurementSystem.USCustomary
 }
 
+/**
+ * Gets a [MetricVolumetricFlow] from a [MetricVolume] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricVolumetricFlow] represented by the units
+ */
 infix fun MetricVolume.per(time: Time) = MetricVolumetricFlow(this, time)
+
+/**
+ * Gets a [ImperialVolumetricFlow] from a [ImperialVolume] and a [Time]
+ * @param time the [Time] component
+ * @return the [ImperialVolumetricFlow] represented by the units
+ */
 infix fun ImperialVolume.per(time: Time) = ImperialVolumetricFlow(this, time)
+
+/**
+ * Gets a [UKImperialVolumetricFlow] from a [UKImperialVolume] and a [Time]
+ * @param time the [Time] component
+ * @return the [UKImperialVolumetricFlow] represented by the units
+ */
 infix fun UKImperialVolume.per(time: Time) = UKImperialVolumetricFlow(this, time)
+
+/**
+ * Gets a [USCustomaryVolumetricFlow] from a [USCustomaryVolume] and a [Time]
+ * @param time the [Time] component
+ * @return the [USCustomaryVolumetricFlow] represented by the units
+ */
 infix fun USCustomaryVolume.per(time: Time) = USCustomaryVolumetricFlow(this, time)
diff --git a/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt
index 188541b7a..49dbed1bc 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricVolumetricFlux]
+ */
 val MetricVolumetricFluxUnits: Set<MetricVolumetricFlux> get() = MetricVolumetricFlowUnits.flatMap { volumetricFlow ->
     MetricAreaUnits.map { volumetricFlow per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialVolumetricFlux]
+ */
 val ImperialVolumetricFluxUnits: Set<ImperialVolumetricFlux> get() = ImperialVolumetricFlowUnits.flatMap { volumetricFlow ->
     ImperialAreaUnits.map { volumetricFlow per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialVolumetricFlux]
+ */
 val UKImperialVolumetricFluxUnits: Set<UKImperialVolumetricFlux> get() = UKImperialVolumetricFlowUnits.flatMap { volumetricFlow ->
     ImperialAreaUnits.map { volumetricFlow per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryVolumetricFlux]
+ */
 val USCustomaryVolumetricFluxUnits: Set<USCustomaryVolumetricFlux> get() = USCustomaryVolumetricFlowUnits.flatMap { volumetricFlow ->
     ImperialAreaUnits.map { volumetricFlow per it }
 }.toSet()
 
+/**
+ * Set of all [VolumetricFlux]
+ */
 val VolumetricFluxUnits: Set<VolumetricFlux> get() = MetricVolumetricFluxUnits +
     ImperialVolumetricFluxUnits +
     UKImperialVolumetricFluxUnits.filter { it.volumetricFlow.volume !is UKImperialImperialVolumeWrapper }.toSet() +
     USCustomaryVolumetricFluxUnits.filter { it.volumetricFlow.volume !is USCustomaryImperialVolumeWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.VolumetricFlux]
+ * SI unit is `CubicMeter per Second per SquareMeter`
+ */
 @Serializable
 sealed class VolumetricFlux : AbstractScientificUnit<PhysicalQuantity.VolumetricFlux>() {
+
+    /**
+     * The [VolumetricFlow] component
+     */
     abstract val volumetricFlow: VolumetricFlow
+
+    /**
+     * The [Area] component
+     */
     abstract val per: Area
     override val quantity = PhysicalQuantity.VolumetricFlux
     override val symbol: String by lazy { "${volumetricFlow.symbol}⋅${per.symbol}" }
@@ -52,26 +79,80 @@ sealed class VolumetricFlux : AbstractScientificUnit<PhysicalQuantity.Volumetric
     override fun toSIUnit(value: Decimal): Decimal = volumetricFlow.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [VolumetricFlux] for [MeasurementSystem.Metric]
+ * @param volumetricFlow the [MetricVolumetricFlow] component
+ * @param per the [MetricArea] component
+ */
 @Serializable
 data class MetricVolumetricFlux(override val volumetricFlow: MetricVolumetricFlow, override val per: MetricArea) : VolumetricFlux(), MetricScientificUnit<PhysicalQuantity.VolumetricFlux> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [VolumetricFlux] for [MeasurementSystem.Imperial]
+ * @param volumetricFlow the [ImperialVolumetricFlow] component
+ * @param per the [ImperialArea] component
+ */
 @Serializable
 data class ImperialVolumetricFlux(override val volumetricFlow: ImperialVolumetricFlow, override val per: ImperialArea) : VolumetricFlux(), ImperialScientificUnit<PhysicalQuantity.VolumetricFlux> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialVolumetricFlux] equivalent to this [ImperialVolumetricFlux]
+     */
     val ukImperial get() = volumetricFlow.ukImperial per per
+
+    /**
+     * The [USCustomaryVolumetricFlux] equivalent to this [ImperialVolumetricFlux]
+     */
     val usCustomary get() = volumetricFlow.usCustomary per per
 }
+
+/**
+ * A [VolumetricFlux] for [MeasurementSystem.UKImperial]
+ * @param volumetricFlow the [UKImperialVolumetricFlow] component
+ * @param per the [ImperialArea] component
+ */
 @Serializable
 data class UKImperialVolumetricFlux(override val volumetricFlow: UKImperialVolumetricFlow, override val per: ImperialArea) : VolumetricFlux(), UKImperialScientificUnit<PhysicalQuantity.VolumetricFlux> {
     override val system = MeasurementSystem.UKImperial
 }
+
+/**
+ * A [VolumetricFlux] for [MeasurementSystem.USCustomary]
+ * @param volumetricFlow the [USCustomaryVolumetricFlow] component
+ * @param per the [ImperialArea] component
+ */
 @Serializable
 data class USCustomaryVolumetricFlux(override val volumetricFlow: USCustomaryVolumetricFlow, override val per: ImperialArea) : VolumetricFlux(), USCustomaryScientificUnit<PhysicalQuantity.VolumetricFlux> {
     override val system = MeasurementSystem.USCustomary
 }
 
+/**
+ * Gets a [MetricVolumetricFlux] from a [MetricVolumetricFlow] and a [MetricArea]
+ * @param area the [MetricArea] component
+ * @return the [MetricVolumetricFlux] represented by the units
+ */
 infix fun MetricVolumetricFlow.per(area: MetricArea) = MetricVolumetricFlux(this, area)
+
+/**
+ * Gets a [ImperialVolumetricFlux] from a [MetricVolumetricFlow] and a [ImperialArea]
+ * @param area the [ImperialArea] component
+ * @return the [ImperialVolumetricFlux] represented by the units
+ */
 infix fun ImperialVolumetricFlow.per(area: ImperialArea) = ImperialVolumetricFlux(this, area)
+
+/**
+ * Gets a [UKImperialVolumetricFlux] from a [MetricVolumetricFlow] and a [ImperialArea]
+ * @param area the [ImperialArea] component
+ * @return the [UKImperialVolumetricFlux] represented by the units
+ */
 infix fun UKImperialVolumetricFlow.per(area: ImperialArea) = UKImperialVolumetricFlux(this, area)
+
+/**
+ * Gets a [USCustomaryVolumetricFlux] from a [MetricVolumetricFlow] and a [ImperialArea]
+ * @param area the [ImperialArea] component
+ * @return the [USCustomaryVolumetricFlux] represented by the units
+ */
 infix fun USCustomaryVolumetricFlow.per(area: ImperialArea) = USCustomaryVolumetricFlux(this, area)
diff --git a/scientific/src/commonMain/kotlin/unit/WeightUnit.kt b/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
index 7f6be531f..82d1ed585 100644
--- a/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
@@ -24,6 +24,9 @@ import com.splendo.kaluga.base.utils.toDecimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricWeight]
+ */
 val MetricWeightUnits: Set<MetricWeight> get() = setOf(
     Kilogram,
     Nanogram,
@@ -50,6 +53,9 @@ val MetricWeightUnits: Set<MetricWeight> get() = setOf(
     Gigadalton
 )
 
+/**
+ * Set of all [ImperialWeight]
+ */
 val ImperialWeightUnits: Set<ImperialWeight> get() = setOf(
     Grain,
     Ounce,
@@ -58,34 +64,60 @@ val ImperialWeightUnits: Set<ImperialWeight> get() = setOf(
     Slug
 )
 
+/**
+ * Set of all [UKImperialWeight]
+ */
 val UKImperialWeightUnits: Set<UKImperialWeight> get() = ImperialWeightUnits.map { it.ukImperial }.toSet() + setOf(ImperialTon)
+
+/**
+ * Set of all [USCustomaryWeight]
+ */
 val USCustomaryWeightUnits: Set<USCustomaryWeight> get() = ImperialWeightUnits.map { it.usCustomary }.toSet() + setOf(UsTon)
 
+/**
+ * Set of all [Weight]
+ */
 val WeightUnits: Set<Weight> get() = MetricWeightUnits +
     ImperialWeightUnits +
     UKImperialWeightUnits.filter { it !is UKImperialImperialWeightWrapper }.toSet() +
     USCustomaryWeightUnits.filter { it !is USCustomaryImperialWeightWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Weight]
+ * SI unit is [Kilogram]
+ */
 @Serializable
 sealed class Weight : AbstractScientificUnit<PhysicalQuantity.Weight>()
 
+/**
+ * A [Weight] for [MeasurementSystem.Metric]
+ */
 @Serializable
 sealed class MetricWeight : Weight(), MetricScientificUnit<PhysicalQuantity.Weight>
 
+/**
+ * A [Weight] for [MeasurementSystem.Imperial]
+ */
 @Serializable
-sealed class ImperialWeight(override val symbol: String) : Weight(), ImperialScientificUnit<PhysicalQuantity.Weight> {
+sealed class ImperialWeight : Weight(), ImperialScientificUnit<PhysicalQuantity.Weight> {
     override val system = MeasurementSystem.Imperial
     override val quantity = PhysicalQuantity.Weight
 }
 
+/**
+ * A [Weight] for [MeasurementSystem.USCustomary]
+ */
 @Serializable
-sealed class USCustomaryWeight(override val symbol: String) : Weight(), USCustomaryScientificUnit<PhysicalQuantity.Weight> {
+sealed class USCustomaryWeight : Weight(), USCustomaryScientificUnit<PhysicalQuantity.Weight> {
     override val system = MeasurementSystem.USCustomary
     override val quantity = PhysicalQuantity.Weight
 }
 
+/**
+ * A [Weight] for [MeasurementSystem.UKImperial]
+ */
 @Serializable
-sealed class UKImperialWeight(override val symbol: String) : Weight(), UKImperialScientificUnit<PhysicalQuantity.Weight> {
+sealed class UKImperialWeight : Weight(), UKImperialScientificUnit<PhysicalQuantity.Weight> {
     override val system = MeasurementSystem.UKImperial
     override val quantity = PhysicalQuantity.Weight
 }
@@ -166,74 +198,101 @@ object Gigadalton : DaltonMultiple(), MetricMultipleUnit<MeasurementSystem.Metri
 
 // Imperial Weight
 @Serializable
-object Grain : ImperialWeight("gr") {
+object Grain : ImperialWeight() {
     private const val GRAIN_IN_POUND = 7000
+    override val symbol: String = "gr"
     override fun toSIUnit(value: Decimal): Decimal = Pound.toSIUnit(value / GRAIN_IN_POUND.toDecimal())
     override fun fromSIUnit(value: Decimal): Decimal = Pound.fromSIUnit(value) * GRAIN_IN_POUND.toDecimal()
 }
 
 @Serializable
-object Dram : ImperialWeight("dr") {
+object Dram : ImperialWeight() {
     private const val DRAMS_IN_POUND = 256
+    override val symbol: String = "dr"
     override fun toSIUnit(value: Decimal): Decimal = Pound.toSIUnit(value / DRAMS_IN_POUND.toDecimal())
     override fun fromSIUnit(value: Decimal): Decimal = Pound.fromSIUnit(value) * DRAMS_IN_POUND.toDecimal()
 }
 
 @Serializable
-object Ounce : ImperialWeight("oz") {
+object Ounce : ImperialWeight() {
     private const val OUNCES_IN_POUND = 16
+    override val symbol: String = "oz"
     override fun toSIUnit(value: Decimal): Decimal = Pound.toSIUnit(value / OUNCES_IN_POUND.toDecimal())
     override fun fromSIUnit(value: Decimal): Decimal = Pound.fromSIUnit(value) * OUNCES_IN_POUND.toDecimal()
 }
 
 @Serializable
-object Pound : ImperialWeight("lb") {
+object Pound : ImperialWeight() {
     private const val KILOGRAM_IN_POUND = 0.45359237
+    override val symbol: String = "lb"
     override fun toSIUnit(value: Decimal): Decimal = value * KILOGRAM_IN_POUND.toDecimal()
     override fun fromSIUnit(value: Decimal): Decimal = value / KILOGRAM_IN_POUND.toDecimal()
 }
 
 @Serializable
-object Stone : ImperialWeight("st") {
+object Stone : ImperialWeight() {
     private const val STONES_IN_POUND = 14
+    override val symbol: String = "st"
     override fun toSIUnit(value: Decimal): Decimal = Pound.toSIUnit(value * STONES_IN_POUND.toDecimal())
     override fun fromSIUnit(value: Decimal): Decimal = Pound.fromSIUnit(value) / STONES_IN_POUND.toDecimal()
 }
 
 @Serializable
-object Slug : ImperialWeight("slug") {
+object Slug : ImperialWeight() {
+    override val symbol: String = "slug"
     override fun toSIUnit(value: Decimal): Decimal = PoundForce.toSIUnit((Foot per Second).fromSIUnit(value))
     override fun fromSIUnit(value: Decimal): Decimal = (Foot per Second).toSIUnit(PoundForce.fromSIUnit(value))
 }
 
 // also long ton
 @Serializable
-object ImperialTon : UKImperialWeight("ton") {
+object ImperialTon : UKImperialWeight() {
     private const val POUND_IN_LONG_TONES = 2240
+    override val symbol: String = "ton"
     override fun toSIUnit(value: Decimal): Decimal = Pound.toSIUnit(value * POUND_IN_LONG_TONES.toDecimal())
     override fun fromSIUnit(value: Decimal): Decimal = Pound.fromSIUnit(value) / POUND_IN_LONG_TONES.toDecimal()
 }
 
+/**
+ * Wraps an [ImperialWeight] unit to an [UKImperialWeight] unit
+ * @param imperial the [ImperialWeight] to wrap
+ */
 @Serializable
-data class UKImperialImperialWeightWrapper(val imperial: ImperialWeight) : UKImperialWeight(imperial.symbol) {
+data class UKImperialImperialWeightWrapper(val imperial: ImperialWeight) : UKImperialWeight() {
+    override val symbol: String = imperial.symbol
     override fun fromSIUnit(value: Decimal): Decimal = imperial.fromSIUnit(value)
     override fun toSIUnit(value: Decimal): Decimal = imperial.toSIUnit(value)
 }
 
+/**
+ * Converts an [ImperialWeight] unit to an [UKImperialImperialWeightWrapper] unit
+ * @param WeightUnit the type of [ImperialWeight] to convert
+ */
 val <WeightUnit : ImperialWeight> WeightUnit.ukImperial get() = UKImperialImperialWeightWrapper(this)
 
 // also short ton
 @Serializable
-object UsTon : USCustomaryWeight("ton") {
+object UsTon : USCustomaryWeight() {
     private const val POUND_IN_SHORT_TONES = 2000
+    override val symbol: String = "ton"
     override fun toSIUnit(value: Decimal): Decimal = Pound.toSIUnit(value * POUND_IN_SHORT_TONES.toDecimal())
     override fun fromSIUnit(value: Decimal): Decimal = Pound.fromSIUnit(value) / POUND_IN_SHORT_TONES.toDecimal()
 }
 
+
+/**
+ * Wraps an [ImperialWeight] unit to an [USCustomaryWeight] unit
+ * @param imperial the [ImperialWeight] to wrap
+ */
 @Serializable
-data class USCustomaryImperialWeightWrapper(val imperial: ImperialWeight) : USCustomaryWeight(imperial.symbol) {
+data class USCustomaryImperialWeightWrapper(val imperial: ImperialWeight) : USCustomaryWeight() {
+    override val symbol: String = imperial.symbol
     override fun fromSIUnit(value: Decimal): Decimal = imperial.fromSIUnit(value)
     override fun toSIUnit(value: Decimal): Decimal = imperial.toSIUnit(value)
 }
 
+/**
+ * Converts an [ImperialWeight] unit to an [USCustomaryImperialWeightWrapper] unit
+ * @param WeightUnit the type of [ImperialWeight] to convert
+ */
 val <WeightUnit : ImperialWeight> WeightUnit.usCustomary get() = USCustomaryImperialWeightWrapper(this)
diff --git a/scientific/src/commonMain/kotlin/unit/YankUnit.kt b/scientific/src/commonMain/kotlin/unit/YankUnit.kt
index c645ccc4a..5633ece0b 100644
--- a/scientific/src/commonMain/kotlin/unit/YankUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/YankUnit.kt
@@ -21,30 +21,57 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
+/**
+ * Set of all [MetricYank]
+ */
 val MetricYankUnits: Set<MetricYank> get() = MetricForceUnits.flatMap { force ->
     TimeUnits.map { force per it }
 }.toSet()
 
+/**
+ * Set of all [ImperialYank]
+ */
 val ImperialYankUnits: Set<ImperialYank> get() = ImperialForceUnits.flatMap { force ->
     TimeUnits.map { force per it }
 }.toSet()
 
+/**
+ * Set of all [UKImperialYank]
+ */
 val UKImperialYankUnits: Set<UKImperialYank> get() = UKImperialForceUnits.flatMap { force ->
     TimeUnits.map { force per it }
 }.toSet()
 
+/**
+ * Set of all [USCustomaryYank]
+ */
 val USCustomaryYankUnits: Set<USCustomaryYank> get() = USCustomaryForceUnits.flatMap { force ->
     TimeUnits.map { force per it }
 }.toSet()
 
+/**
+ * Set of all [Yank]
+ */
 val YankUnits: Set<Yank> get() = MetricYankUnits +
     ImperialYankUnits +
     UKImperialYankUnits.filter { it.force !is UKImperialImperialForceWrapper }.toSet() +
     USCustomaryYankUnits.filter { it.force !is USCustomaryImperialForceWrapper }.toSet()
 
+/**
+ * An [AbstractScientificUnit] for [PhysicalQuantity.Yank]
+ * SI unit is `Newton per Second`
+ */
 @Serializable
 sealed class Yank : AbstractScientificUnit<PhysicalQuantity.Yank>() {
+
+    /**
+     * The [Force] component
+     */
     abstract val force: Force
+
+    /**
+     * The [Time] component
+     */
     abstract val per: Time
     override val quantity = PhysicalQuantity.Yank
     override val symbol: String by lazy { "${force.symbol} / ${per.symbol}" }
@@ -52,26 +79,80 @@ sealed class Yank : AbstractScientificUnit<PhysicalQuantity.Yank>() {
     override fun toSIUnit(value: Decimal): Decimal = force.toSIUnit(per.fromSIUnit(value))
 }
 
+/**
+ * A [Yank] for [MeasurementSystem.Metric]
+ * @param force the [MetricForce] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class MetricYank(override val force: MetricForce, override val per: Time) : Yank(), MetricScientificUnit<PhysicalQuantity.Yank> {
     override val system = MeasurementSystem.Metric
 }
+
+/**
+ * A [Yank] for [MeasurementSystem.Imperial]
+ * @param force the [ImperialForce] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class ImperialYank(override val force: ImperialForce, override val per: Time) : Yank(), ImperialScientificUnit<PhysicalQuantity.Yank> {
     override val system = MeasurementSystem.Imperial
+
+    /**
+     * The [UKImperialYank] equivalent to this [ImperialYank]
+     */
     val ukImperial get() = UKImperialYank(force.ukImperial, per)
+
+    /**
+     * The [USCustomaryYank] equivalent to this [ImperialYank]
+     */
     val usCustomary get() = USCustomaryYank(force.usCustomary, per)
 }
+
+/**
+ * A [Yank] for [MeasurementSystem.UKImperial]
+ * @param force the [UKImperialForce] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class UKImperialYank(override val force: UKImperialForce, override val per: Time) : Yank(), UKImperialScientificUnit<PhysicalQuantity.Yank> {
     override val system = MeasurementSystem.UKImperial
 }
+
+/**
+ * A [Yank] for [MeasurementSystem.USCustomary]
+ * @param force the [USCustomaryForce] component
+ * @param per the [Time] component
+ */
 @Serializable
 data class USCustomaryYank(override val force: USCustomaryForce, override val per: Time) : Yank(), USCustomaryScientificUnit<PhysicalQuantity.Yank> {
     override val system = MeasurementSystem.USCustomary
 }
 
+/**
+ * Gets a [MetricYank] from a [MetricForce] and a [Time]
+ * @param time the [Time] component
+ * @return the [MetricYank] represented by the units
+ */
 infix fun MetricForce.per(time: Time) = MetricYank(this, time)
+
+/**
+ * Gets a [ImperialYank] from a [ImperialForce] and a [Time]
+ * @param time the [Time] component
+ * @return the [ImperialYank] represented by the units
+ */
 infix fun ImperialForce.per(time: Time) = ImperialYank(this, time)
+
+/**
+ * Gets a [UKImperialYank] from a [UKImperialForce] and a [Time]
+ * @param time the [Time] component
+ * @return the [UKImperialYank] represented by the units
+ */
 infix fun UKImperialForce.per(time: Time) = UKImperialYank(this, time)
+
+/**
+ * Gets a [USCustomaryYank] from a [USCustomaryForce] and a [Time]
+ * @param time the [Time] component
+ * @return the [USCustomaryYank] represented by the units
+ */
 infix fun USCustomaryForce.per(time: Time) = USCustomaryYank(this, time)
diff --git a/scientific/src/commonTest/kotlin/unit/DimensionlessUnitTest.kt b/scientific/src/commonTest/kotlin/unit/DimensionlessUnitTest.kt
index a4e8ecf0d..d3c907b31 100644
--- a/scientific/src/commonTest/kotlin/unit/DimensionlessUnitTest.kt
+++ b/scientific/src/commonTest/kotlin/unit/DimensionlessUnitTest.kt
@@ -22,8 +22,8 @@ import com.splendo.kaluga.scientific.converter.decimal.div
 import com.splendo.kaluga.scientific.converter.decimal.times
 import com.splendo.kaluga.scientific.converter.dimensionless.div
 import com.splendo.kaluga.scientific.converter.dimensionless.times
+import com.splendo.kaluga.scientific.decimalFraction
 import com.splendo.kaluga.scientific.invoke
-import com.splendo.kaluga.scientific.unit.Dimensionless.Companion.invoke
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails

From d9007259f1ba69a8962c6dc8c11537472bffa199 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 17 Feb 2023 15:49:07 +0100
Subject: [PATCH 186/227] PR remarks

---
 .../kotlin/navigation/NavigationSpec.kt       |  2 +-
 .../kotlin/navigation/NavigationBundle.kt     |  4 +-
 .../commonMain/kotlin/navigation/Navigator.kt |  3 +-
 .../kotlin/observable/FlowSubject.kt          | 20 ++++++--
 .../kotlin/observable/ObservableOptional.kt   |  5 +-
 .../kotlin/observable/Observation.kt          |  3 +-
 .../observable/ReadOnlyPropertyObservable.kt  |  5 +-
 .../observable/ReadWritePropertySubject.kt    |  5 +-
 .../kotlin/observable/ObservableBaseTest.kt   | 16 ++++---
 base/src/commonMain/kotlin/flow/flow.kt       |  3 +-
 .../commonMain/kotlin/state/KalugaState.kt    |  4 +-
 .../commonMain/kotlin/text/FormatSpecifier.kt | 46 ++++++++++++-------
 .../kotlin/utils/Enum+byOrdinalOrDefault.kt   |  5 +-
 .../kotlin/flow/SpecialFlowValueTest.kt       |  3 +-
 .../kotlin/state/ColdStateFlowRepoTest.kt     |  5 +-
 base/src/iosMain/kotlin/utils/Decimal.kt      | 15 +++---
 base/src/iosMain/kotlin/utils/KalugaDate.kt   |  5 +-
 base/src/iosMain/kotlin/utils/Locale.kt       |  6 +--
 base/src/iosMain/kotlin/utils/Serializable.kt |  2 +-
 base/src/iosMain/kotlin/utils/TimeZone.kt     |  5 +-
 .../kotlin/BluetoothPermissionManager.kt      | 12 +++--
 .../device/DefaultDeviceConnectionManager.kt  | 10 ++--
 bluetooth/src/commonMain/kotlin/Bluetooth.kt  |  9 ++--
 .../src/commonMain/kotlin/Characteristic.kt   |  3 +-
 bluetooth/src/commonMain/kotlin/UUID.kt       |  3 +-
 .../device/DefaultDeviceConnectionManager.kt  |  5 +-
 .../src/commonMain/kotlin/device/Device.kt    | 20 ++------
 .../commonMain/kotlin/device/DeviceInfo.kt    |  3 +-
 .../commonMain/kotlin/device/DeviceState.kt   |  3 +-
 .../src/commonMain/kotlin/scanner/Scanner.kt  |  4 +-
 .../kotlin/scanner/ScanningState.kt           |  6 ++-
 .../kotlin/device/AdvertisementData.kt        |  6 ++-
 .../kotlin/CalendarPermissionManager.kt       |  5 +-
 .../kotlin/CameraPermissionManager.kt         | 12 +++--
 .../kotlin/ContactsPermissionManager.kt       |  8 ++--
 .../kotlin/ContactsPermissionManager.kt       |  5 +-
 example/ios/DemoTests/DemoTests.swift         |  3 +-
 .../kaluga/example/shared/HelloShared.kt      | 22 +++++++++
 .../bluetooth/BluetoothListDeviceViewModel.kt | 10 +---
 gradle.properties                             |  2 +-
 gradle/jacoco.gradle                          |  3 +-
 hud/src/iosMain/kotlin/HUD.kt                 |  6 +--
 .../src/androidLibMain/kotlin/FocusHandler.kt |  3 +-
 .../kotlin/LocationPermissionManager.kt       | 10 +---
 .../src/commonMain/kotlin/Permission.kt       |  7 ++-
 .../kotlin/LocationPermissionManager.kt       |  5 +-
 .../kotlin/location/LocationManager.kt        |  7 ++-
 .../kotlin/location/LocationStateRepo.kt      |  5 +-
 logging/src/androidLibMain/kotlin/log.kt      |  5 +-
 .../kotlin/MicrophonePermissionManager.kt     |  8 ++--
 .../kotlin/NotificationsPermissionManager.kt  |  5 +-
 .../src/androidLibMain/kotlin/Resources.kt    | 12 +++--
 resources/src/commonMain/kotlin/Resources.kt  |  2 +-
 resources/src/iosMain/kotlin/DarkMode.kt      |  5 +-
 .../src/commonMain/kotlin/ScientificArray.kt  |  3 +-
 .../kotlin/StoragePermissionManager.kt        |  8 ++--
 .../src/commonMain/kotlin/mock/MockMethod.kt  |  7 ++-
 .../commonMain/kotlin/ui_thread_testing.kt    |  5 +-
 .../src/commonMain/kotlin/yieldMultiple.kt    |  5 +-
 .../kotlin/scanner/MockScanningState.kt       |  9 +---
 test-utils-date-time-picker/README.md         | 10 ++--
 .../commonMain/kotlin/MockLocationState.kt    |  3 +-
 .../kotlin/MockPermissionStateRepo.kt         | 10 ++--
 63 files changed, 248 insertions(+), 208 deletions(-)
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/HelloShared.kt

diff --git a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
index 3c86c00c2..59e2aafef 100644
--- a/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
+++ b/architecture/src/androidLibMain/kotlin/navigation/NavigationSpec.kt
@@ -236,7 +236,7 @@ sealed class NavigationSpec {
      * Shows the Camera
      * @param type The [Type] of media to capture
      * @param requestCode The request code added to the intent
-     * @param uri Optiona [Uri] indicating where the result should be stored
+     * @param uri Optional [Uri] indicating where the result should be stored
      */
     data class Camera(val type: Type, val requestCode: Int, val uri: Uri?) : NavigationSpec() {
 
diff --git a/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt b/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
index f247a230e..7021f86e2 100644
--- a/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
+++ b/architecture/src/commonMain/kotlin/navigation/NavigationBundle.kt
@@ -188,13 +188,13 @@ sealed class NavigationBundleValue<T> {
     }
 
     /**
-     * A [NonNullableNavigationBundleValue] containing a [Int]
+     * A [NonNullableNavigationBundleValue] containing an [Int]
      * @property value The [Int] value of this [NavigationBundleValue]
      */
     data class IntegerValue internal constructor(override val value: Int) : NonNullableNavigationBundleValue<Int>()
 
     /**
-     * A [NonNullableNavigationBundleValue] containing a [IntArray]
+     * A [NonNullableNavigationBundleValue] containing an [IntArray]
      * @property value The [IntArray] value of this [NavigationBundleValue]
      */
     data class IntegerArrayValue internal constructor(override val value: IntArray) : NonNullableNavigationBundleValue<IntArray>() {
diff --git a/architecture/src/commonMain/kotlin/navigation/Navigator.kt b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
index 5163be495..c2b9627a3 100644
--- a/architecture/src/commonMain/kotlin/navigation/Navigator.kt
+++ b/architecture/src/commonMain/kotlin/navigation/Navigator.kt
@@ -80,6 +80,7 @@ fun <Action : NavigationAction<*>> Navigator<Action>.navigateWithSuccess(action:
  * @param onFailure Closure for handling case when navigation failed.
  */
 fun <Action : NavigationAction<*>> Navigator<Action>.navigateOrElse(action: Action, onFailure: () -> Unit) {
-    if (!navigateWithSuccess(action))
+    if (!navigateWithSuccess(action)) {
         onFailure()
+    }
 }
diff --git a/architecture/src/commonMain/kotlin/observable/FlowSubject.kt b/architecture/src/commonMain/kotlin/observable/FlowSubject.kt
index f9b505649..f66fb9e48 100644
--- a/architecture/src/commonMain/kotlin/observable/FlowSubject.kt
+++ b/architecture/src/commonMain/kotlin/observable/FlowSubject.kt
@@ -70,7 +70,9 @@ open class StateFlowInitializedSubject<T>(
         observation
     ) {
     init {
-        if (autoBind) bind(coroutineScope, context)
+        if (autoBind) {
+            bind(coroutineScope, context)
+        }
     }
 }
 
@@ -105,7 +107,9 @@ open class StateFlowDefaultSubject<R : T?, T>(
         observation
     ) {
     init {
-        if (autoBind) bind(coroutineScope, context)
+        if (autoBind) {
+            bind(coroutineScope, context)
+        }
     }
 }
 
@@ -135,7 +139,9 @@ open class SharedFlowSubject<T>(
         observation = observation
     ) {
     init {
-        if (autoBind) bind(coroutineScope, context)
+        if (autoBind) {
+            bind(coroutineScope, context)
+        }
     }
 }
 
@@ -167,7 +173,9 @@ open class SharedFlowInitializedSubject<T>(
         observation = observation
     ) {
     init {
-        if (autoBind) bind(coroutineScope, context)
+        if (autoBind) {
+            bind(coroutineScope, context)
+        }
     }
 }
 
@@ -204,7 +212,9 @@ open class SharedFlowDefaultSubject<R : T?, T>(
         observation = observation
     ) {
     init {
-        if (autoBind) bind(coroutineScope, context)
+        if (autoBind) {
+            bind(coroutineScope, context)
+        }
     }
 }
 
diff --git a/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt b/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt
index d3ea5b37b..4ca7b8029 100644
--- a/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt
+++ b/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt
@@ -41,11 +41,12 @@ inline fun <reified R : T, T> ObservableOptional<T>.resultValueOrDefault(default
  */
 fun <R : T, T> ObservableOptional<T>.asResult(defaultValue: Value<R>?): ObservableOptional<R> =
     try {
-        if (this is Value<*> && (this.value != null || defaultValue == null))
+        if (this is Value<*> && (this.value != null || defaultValue == null)) {
             @Suppress("UNCHECKED_CAST")
             Value(this.value as R)
-        else
+        } else {
             defaultValue ?: Nothing()
+        }
     } catch (e: ClassCastException) {
         defaultValue ?: Nothing()
     }
diff --git a/architecture/src/commonMain/kotlin/observable/Observation.kt b/architecture/src/commonMain/kotlin/observable/Observation.kt
index 59295a03c..1787eac98 100644
--- a/architecture/src/commonMain/kotlin/observable/Observation.kt
+++ b/architecture/src/commonMain/kotlin/observable/Observation.kt
@@ -143,8 +143,9 @@ open class Observation<R : T, T, OO : ObservableOptional<R>>(
         // adding an observer often happens concurrently with initialization,
         // if we detect a change in the current observed value we re-send it to the added observer
         val newResult = currentObserved
-        if (newResult != lastResult)
+        if (newResult != lastResult) {
             onNext((newResult as? ObservableOptional.Value<*>)?.value as R)
+        }
         SimpleDisposable {
             handleOnMain {
                 removeObserver(this@Observation, onNext)
diff --git a/architecture/src/commonMain/kotlin/observable/ReadOnlyPropertyObservable.kt b/architecture/src/commonMain/kotlin/observable/ReadOnlyPropertyObservable.kt
index 4a1e8f355..6367ab592 100644
--- a/architecture/src/commonMain/kotlin/observable/ReadOnlyPropertyObservable.kt
+++ b/architecture/src/commonMain/kotlin/observable/ReadOnlyPropertyObservable.kt
@@ -26,11 +26,12 @@ private fun <R : T, T> readOnlyPropertyObservableHelper(readOnlyProperty: ReadOn
 
     observation.beforeObservedValueGet = { current ->
         @Suppress("UnnecessaryVariable") val new = readOnlyValue // variable actually needed due to delegation
-        if (new != current.valueOrNull)
+        if (new != current.valueOrNull) {
             ObservableOptional.Value(new)
-        else
+        } else {
             @Suppress("UNCHECKED_CAST")
             current as ObservableOptional<T>
+        }
     }
 }
 
diff --git a/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt b/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt
index 76d2c94c2..3ce529508 100644
--- a/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt
+++ b/architecture/src/commonMain/kotlin/observable/ReadWritePropertySubject.kt
@@ -35,11 +35,12 @@ private class ReadWritePropertyObservableHelper<R : T, T>(
     init {
         observation.beforeObservedValueGet = { current ->
             val new = readWriteValue
-            if (new != current.valueOrNull)
+            if (new != current.valueOrNull) {
                 Value(new)
-            else
+            } else {
                 @Suppress("UNCHECKED_CAST")
                 current as ObservableOptional<T>
+            }
         }
     }
 
diff --git a/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt b/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
index 772222ac8..c403df969 100644
--- a/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
+++ b/architecture/src/commonTest/kotlin/observable/ObservableBaseTest.kt
@@ -115,17 +115,21 @@ abstract class ObservableBaseTest : BaseTest() {
     )
 
     fun <O : BasicObservable<String, String?, Value<String>>> Pair<String?, String>.asNullableUpdate(useSetter: Boolean): (O) -> Value<String> = {
-        if (useSetter)
-            (it as? SuspendableSetter<String?>)?.let { runBlocking { it.set(this@asNullableUpdate.first) } } ?: throw Exception("Could not set value")
-        else
+        if (useSetter) {
+            (it as? SuspendableSetter<String?>)?.let { runBlocking { it.set(this@asNullableUpdate.first) } }
+                ?: throw Exception("Could not set value")
+        } else {
             (it as? Postable<String?>)?.post(this.first) ?: throw Exception("Could not post value")
+        }
         Value(this.second)
     }
 
     fun <V : String?, OO : ObservableOptional<V>, O : BasicObservable<V, V, OO>> Pair<V, V>.asUpdate(useSetter: Boolean): (O) -> Value<V> = {
-        if (useSetter)
-            (it as? SuspendableSetter<V>)?.let { runBlocking { it.set(this@asUpdate.first) } } ?: throw Exception("Could not set value")
-        else
+        if (useSetter) {
+            (it as? SuspendableSetter<V>)?.let {
+                runBlocking { it.set(this@asUpdate.first) }
+            } ?: throw Exception("Could not set value")
+        } else
             (it as? Postable<V>)?.post(this.first) ?: throw Exception("Could not post value")
 
         Value(this.second)
diff --git a/base/src/commonMain/kotlin/flow/flow.kt b/base/src/commonMain/kotlin/flow/flow.kt
index 0752450a8..134441439 100644
--- a/base/src/commonMain/kotlin/flow/flow.kt
+++ b/base/src/commonMain/kotlin/flow/flow.kt
@@ -88,8 +88,9 @@ sealed interface SpecialFlowValue {
  */
 fun <T> Flow<T>.takeUntilLast(includeLast: Boolean = true): Flow<T> = transformWhile {
     val notLast = it !is SpecialFlowValue.Last
-    if (notLast || includeLast)
+    if (notLast || includeLast) {
         emit(it)
+    }
     notLast
 }
 
diff --git a/base/src/commonMain/kotlin/state/KalugaState.kt b/base/src/commonMain/kotlin/state/KalugaState.kt
index 1d958b600..9debdf9a0 100644
--- a/base/src/commonMain/kotlin/state/KalugaState.kt
+++ b/base/src/commonMain/kotlin/state/KalugaState.kt
@@ -355,7 +355,7 @@ interface StateFlowRepo<State : KalugaState> {
 }
 
 /**
- * A Hot [StateRepo], using a MutableSharedFlow as it's backing implementation.
+ * A Hot [StateRepo], using a [MutableSharedFlow] as it's backing implementation.
  *
  * The repo will get initialized when the state is first read and remain initialized after.
  *
@@ -420,7 +420,7 @@ abstract class HotStateFlowRepo<State : KalugaState>(
 }
 
 /**
- * A Cold [StateRepo], using a MutableSharedFlow as it's backing implementation.
+ * A Cold [StateRepo], using a [MutableSharedFlow] as it's backing implementation.
  *
  * The repo will get initialized when the state is first read.
  *
diff --git a/base/src/commonMain/kotlin/text/FormatSpecifier.kt b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
index a166b492d..022e05360 100644
--- a/base/src/commonMain/kotlin/text/FormatSpecifier.kt
+++ b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
@@ -54,8 +54,9 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         val timeStart = matchResult.groupValues[5]
         val parsingCharacter = matchResult.groupValues[6][0]
         if (timeStart.isNotEmpty()) {
-            if (timeStart[0] == 'T')
+            if (timeStart[0] == 'T') {
                 flags.add(Flag.UPPERCASE)
+            }
             val dateTime = ParsingCharacter.DateTime(DateTime.parse(parsingCharacter))
             checkDateTime(dateTime)
             currentChar = dateTime
@@ -214,10 +215,12 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
 
                 val alternate = flags.contains(Flag.ALTERNATE)
                 val length = valueString.length + if (alternate) 1 else 0
-                if (alternate)
+                if (alternate) {
                     sb.append(getZero(locale))
-                if (flags.contains(Flag.ZERO_PAD))
+                }
+                if (flags.contains(Flag.ZERO_PAD)) {
                     trailingZeros(sb, width - length)
+                }
                 sb.append(valueString)
             }
             RegularFormatCharacter.HEXADECIMAL_INTEGER -> {
@@ -230,8 +233,9 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
                     val prefix = "${getZero(locale)}x"
                     sb.append(if (uppercase) prefix.upperCased(locale) else prefix)
                 }
-                if (flags.contains(Flag.ZERO_PAD))
+                if (flags.contains(Flag.ZERO_PAD)) {
                     trailingZeros(sb, width - length)
+                }
                 sb.append(if (uppercase) hexValue.upperCased(locale) else hexValue)
             }
             else -> throw StringFormatterException.UnexpectedChar(currentChar.char)
@@ -256,9 +260,9 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
             leadingSign(sb, neg)
 
             // the value
-            if (v.isFinite())
+            if (v.isFinite()) {
                 print(sb, v, locale, currentChar, precision, neg)
-            else {
+            } else {
                 val infinitySymbol = numberFormatter.infinitySymbol
                 sb.append(if (flags.contains(Flag.UPPERCASE)) infinitySymbol.upperCased(locale) else infinitySymbol)
             }
@@ -317,8 +321,9 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
                 val formatter = NumberFormatter(locale, NumberFormatStyle.Decimal(minFractionDigits = prec.toUInt(), maxFractionDigits = prec.toUInt())).apply {
                     usesGroupingSeparator = false
                 }
-                if (value >= 0.0 && value < 1.0)
+                if (value >= 0.0 && value < 1.0) {
                     number.append(formatter.zeroSymbol)
+                }
                 number.append(formatter.format(value))
                 addZeros(number, prec)
 
@@ -336,10 +341,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
                 print(decimalBuilder, value, locale, ParsingCharacter.RegularCharacter(RegularFormatCharacter.DECIMAL_FLOAT), precision, neg)
                 val scientific = scientificBuilder.toString()
                 val decimal = decimalBuilder.toString()
-                if (decimal.length <= scientific.length)
-                    sb.append(decimal)
-                else
-                    sb.append(scientific)
+                sb.append(if (decimal.length <= scientific.length) decimal else scientific)
             }
             RegularFormatCharacter.HEXADECIMAL_FLOAT -> {
                 // TODO Support Hexadecimal floats
@@ -708,8 +710,12 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
 
     private fun checkBadFlags(currentChar: ParsingCharacter, vararg badFlags: Flag) {
         for (badFlag in badFlags)
-            if (flags.contains(badFlag))
-                throw StringFormatterException.FormatFlagsConversionMismatchException(badFlag.toString(), currentChar.char)
+            if (flags.contains(badFlag)) {
+                throw StringFormatterException.FormatFlagsConversionMismatchException(
+                    badFlag.toString(),
+                    currentChar.char
+                )
+            }
     }
 
     private fun width(stringToMatch: String): Int {
@@ -754,8 +760,12 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
     }
 
     private fun checkGeneral(currentChar: ParsingCharacter.RegularCharacter) {
-        if ((currentChar.regular == RegularFormatCharacter.BOOLEAN || currentChar.regular == RegularFormatCharacter.HASHCODE) && flags.contains(Flag.ALTERNATE))
-            throw StringFormatterException.FormatFlagsConversionMismatchException(Flag.ALTERNATE.toString(), currentChar.char)
+        if ((currentChar.regular == RegularFormatCharacter.BOOLEAN || currentChar.regular == RegularFormatCharacter.HASHCODE) && flags.contains(Flag.ALTERNATE)) {
+            throw StringFormatterException.FormatFlagsConversionMismatchException(
+                Flag.ALTERNATE.toString(),
+                currentChar.char
+            )
+        }
 
         // '-' requires a width
         if (width == -1 && flags.contains(Flag.LEFT_JUSTIFY)) throw StringFormatterException.MissingFormatWidthException(toString())
@@ -829,8 +839,9 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         if (precision != -1 && precision < 0) throw StringFormatterException.IllegalFormatPrecisionException(precision)
 
         // '-' and '0' require a width
-        if (width == -1 && (flags.contains(Flag.LEFT_JUSTIFY) || flags.contains(Flag.ZERO_PAD)))
+        if (width == -1 && (flags.contains(Flag.LEFT_JUSTIFY) || flags.contains(Flag.ZERO_PAD))) {
             throw StringFormatterException.MissingFormatWidthException(toString())
+        }
 
         // bad combination
         if (flags.contains(Flag.PLUS) && flags.contains(Flag.LEADING_SPACE) || flags.contains(Flag.LEFT_JUSTIFY) && flags.contains(Flag.ZERO_PAD))
@@ -846,8 +857,9 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
                     1 -> {
                         if (!flags.contains(Flag.LEFT_JUSTIFY)) {
                             throw StringFormatterException.IllegalFormatFlagsException(flags.toString())
-                        } else if (width == -1)
+                        } else if (width == -1) {
                             throw StringFormatterException.MissingFormatWidthException(toString())
+                        }
                     }
                     else -> throw StringFormatterException.IllegalFormatFlagsException(flags.toString())
                 }
diff --git a/base/src/commonMain/kotlin/utils/Enum+byOrdinalOrDefault.kt b/base/src/commonMain/kotlin/utils/Enum+byOrdinalOrDefault.kt
index b3e10973a..98809e3ac 100644
--- a/base/src/commonMain/kotlin/utils/Enum+byOrdinalOrDefault.kt
+++ b/base/src/commonMain/kotlin/utils/Enum+byOrdinalOrDefault.kt
@@ -28,8 +28,5 @@ package com.splendo.kaluga.base.utils
  *
  */
 inline fun <reified T : Enum<T>> Enum.Companion.byOrdinalOrDefault(ordinal: Int, defaultValue: T): T {
-    return if (ordinal !in enumValues<T>().indices)
-        defaultValue
-    else
-        enumValues<T>()[ordinal]
+    return if (ordinal !in enumValues<T>().indices) defaultValue else enumValues<T>()[ordinal]
 }
diff --git a/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt b/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt
index a5e840044..bcdba094e 100644
--- a/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt
+++ b/base/src/commonTest/kotlin/flow/SpecialFlowValueTest.kt
@@ -76,11 +76,12 @@ class SpecialFlowValueTest : BaseTest() {
         launch {
             flow().collectImportant {
                 list.add(it)
-                if (it is More)
+                if (it is More) {
                     assertEquals(
                         expected = listOf(Normal, Last, More),
                         actual = list
                     )
+                }
                 cancel()
             }
         }.join()
diff --git a/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt b/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt
index f871e71e4..3d444006b 100644
--- a/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt
+++ b/base/src/commonTest/kotlin/state/ColdStateFlowRepoTest.kt
@@ -57,10 +57,11 @@ class ColdStateFlowRepoTest : BaseTest() {
         val secondCollect = CompletableDeferred<KalugaState>()
         val job = launch {
             repo.collect {
-                if (!firstCollect.isCompleted)
+                if (!firstCollect.isCompleted) {
                     firstCollect.complete(it)
-                else if (!secondCollect.isCompleted)
+                } else if (!secondCollect.isCompleted) {
                     secondCollect.complete(it) // further calls are ignored
+                }
             }
         }
 
diff --git a/base/src/iosMain/kotlin/utils/Decimal.kt b/base/src/iosMain/kotlin/utils/Decimal.kt
index c01c79119..3e16b55ff 100644
--- a/base/src/iosMain/kotlin/utils/Decimal.kt
+++ b/base/src/iosMain/kotlin/utils/Decimal.kt
@@ -235,10 +235,11 @@ actual fun Decimal.times(value: Decimal, scale: Int, roundingMode: RoundingMode)
  * @param n the [Decimal] to raise to
  * @return the [Decimal] that is the exponent of the two provided decimals.
  */
-actual infix fun Decimal.pow(n: Int): Decimal = if (n < 0)
+actual infix fun Decimal.pow(n: Int): Decimal = if (n < 0) {
     1.toDecimal() / pow(n.absoluteValue)
-else
+} else {
     copy(nsDecimal = nsDecimal.decimalNumberByRaisingToPower(n.toULong()))
+}
 
 /**
  * Raises two [Decimal] to a given precision.
@@ -246,9 +247,9 @@ else
  * @param scale The number of digits a rounded value should have after its decimal point.
  * @return the [Decimal] that is the exponent of the two provided decimals.
  */
-actual fun Decimal.pow(n: Int, scale: Int): Decimal = if (n < 0)
+actual fun Decimal.pow(n: Int, scale: Int): Decimal = if (n < 0) {
     1.toDecimal() / pow(n.absoluteValue, scale)
-else
+} else {
     copy(
         nsDecimal = nsDecimal.decimalNumberByRaisingToPower(
             n.toULong(),
@@ -262,6 +263,7 @@ else
             )
         )
     )
+}
 
 /**
  * Raises two [Decimal] to a given precision.
@@ -274,9 +276,9 @@ actual fun Decimal.pow(
     n: Int,
     scale: Int,
     roundingMode: RoundingMode
-): Decimal = if (n < 0)
+): Decimal = if (n < 0) {
     1.toDecimal() / pow(n.absoluteValue, scale, roundingMode)
-else
+} else {
     copy(
         nsDecimal = nsDecimal.decimalNumberByRaisingToPower(
             n.toULong(),
@@ -290,6 +292,7 @@ else
             )
         )
     )
+}
 
 /**
  * Converts a [Number] to a [Decimal]
diff --git a/base/src/iosMain/kotlin/utils/KalugaDate.kt b/base/src/iosMain/kotlin/utils/KalugaDate.kt
index 98a092c53..24af5cf10 100644
--- a/base/src/iosMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaDate.kt
@@ -178,10 +178,11 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
         }
         if (canSetComponent) {
             // If the new value is lower than the old one, make sure we go backwards as otherwise the next highest component will increase
-            val calendarOptions = if (value.toLong() < calendar.component(component, date))
+            val calendarOptions = if (value.toLong() < calendar.component(component, date)) {
                 NSCalendarMatchPreviousTimePreservingSmallerUnits or NSCalendarSearchBackwards
-            else
+            } else {
                 NSCalendarMatchNextTimePreservingSmallerUnits
+            }
             calendar.dateBySettingUnit(component, value.toLong(), date, calendarOptions)
         } else {
             val previousValue = calendar.component(component, this.date)
diff --git a/base/src/iosMain/kotlin/utils/Locale.kt b/base/src/iosMain/kotlin/utils/Locale.kt
index c8b053ced..5f38f510f 100644
--- a/base/src/iosMain/kotlin/utils/Locale.kt
+++ b/base/src/iosMain/kotlin/utils/Locale.kt
@@ -48,7 +48,7 @@ actual data class Locale internal constructor(val nsLocale: NSLocale) : BaseLoca
          * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
          * @return The [Locale] for the given [language]
          */
-        actual fun createLocale(language: String): Locale = Locale(NSLocale(language))
+        actual fun createLocale(language: String): Locale = createLocale(language, "")
 
         /**
          * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
@@ -56,7 +56,7 @@ actual data class Locale internal constructor(val nsLocale: NSLocale) : BaseLoca
          * @param country a ISO 3166 alpha-2 `country` code.
          * @return The [Locale] for the given [language] and [country]
          */
-        actual fun createLocale(language: String, country: String): Locale = Locale(NSLocale("${language}_$country"))
+        actual fun createLocale(language: String, country: String): Locale = createLocale(language, country, "")
 
         /**
          * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
@@ -65,7 +65,7 @@ actual data class Locale internal constructor(val nsLocale: NSLocale) : BaseLoca
          * @param variant Arbitrary value used to indicate a variation of a [Locale]
          * @return The [Locale] for the given [language], [country], and [variant]
          */
-        actual fun createLocale(language: String, country: String, variant: String): Locale = Locale(NSLocale("${language}_${country}_$variant"))
+        actual fun createLocale(language: String, country: String, variant: String): Locale = Locale(NSLocale(listOf(language, country, variant).filter { it.isNotEmpty() }.joinToString("_")))
 
         /**
          * The default [Locale] of the user
diff --git a/base/src/iosMain/kotlin/utils/Serializable.kt b/base/src/iosMain/kotlin/utils/Serializable.kt
index 9b69452dd..ac6a65f5a 100644
--- a/base/src/iosMain/kotlin/utils/Serializable.kt
+++ b/base/src/iosMain/kotlin/utils/Serializable.kt
@@ -18,6 +18,6 @@
 package com.splendo.kaluga.base.utils
 
 /**
- * Not supported on iOS
+ * NOT SUPPORTED ON iOS
  */
 actual interface Serializable
diff --git a/base/src/iosMain/kotlin/utils/TimeZone.kt b/base/src/iosMain/kotlin/utils/TimeZone.kt
index 129b7d701..f91dedd0c 100644
--- a/base/src/iosMain/kotlin/utils/TimeZone.kt
+++ b/base/src/iosMain/kotlin/utils/TimeZone.kt
@@ -74,10 +74,11 @@ actual class TimeZone internal constructor(val timeZone: NSTimeZone) : BaseTimeZ
         return timeZone.localizedName(nameStyle, locale.nsLocale) ?: ""
     }
     override val offsetFromGMTInMilliseconds: Long get() {
-        val rawOffset = if (timeZone.isDaylightSavingTime())
+        val rawOffset = if (timeZone.isDaylightSavingTime()) {
             timeZone.secondsFromGMT.toDouble() - timeZone.daylightSavingTimeOffset
-        else
+        } else {
             timeZone.secondsFromGMT.toDouble()
+        }
 
         return rawOffset.toLong() * 1000L
     }
diff --git a/bluetooth-permissions/src/androidLibMain/kotlin/BluetoothPermissionManager.kt b/bluetooth-permissions/src/androidLibMain/kotlin/BluetoothPermissionManager.kt
index cbb1cfc11..fb385dfc5 100644
--- a/bluetooth-permissions/src/androidLibMain/kotlin/BluetoothPermissionManager.kt
+++ b/bluetooth-permissions/src/androidLibMain/kotlin/BluetoothPermissionManager.kt
@@ -62,23 +62,25 @@ actual class DefaultBluetoothPermissionManager(
     private val supported: Boolean = bluetoothAdapter != null
 
     override fun requestPermissionDidStart() {
-        if (supported)
+        if (supported) {
             permissionsManager.requestPermissions()
-        else
+        } else {
             logger.error(logTag) { "Bluetooth Not Supported" }
+        }
     }
 
     override fun monitoringDidStart(interval: Duration) {
-        if (supported)
+        if (supported) {
             permissionsManager.startMonitoring(interval)
-        else {
+        } else {
             permissionHandler.status(AndroidPermissionState.DENIED_DO_NOT_ASK)
         }
     }
 
     override fun monitoringDidStop() {
-        if (supported)
+        if (supported) {
             permissionsManager.stopMonitoring()
+        }
     }
 }
 
diff --git a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 93d8e4996..bbd2e20bc 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -190,12 +190,13 @@ internal actual class DefaultDeviceConnectionManager(
     }
 
     override suspend fun disconnect() {
-        if (lastKnownState != BluetoothProfile.STATE_DISCONNECTED)
+        if (lastKnownState != BluetoothProfile.STATE_DISCONNECTED) {
             gatt.await().disconnect()
-        else
+        } else {
             handleDisconnect {
                 closeGatt()
             }
+        }
     }
 
     private fun closeGatt() {
@@ -256,10 +257,11 @@ internal actual class DefaultDeviceConnectionManager(
 
     private suspend fun setNotification(characteristic: Characteristic, enable: Boolean): Boolean {
         val uuid = characteristic.uuid.uuidString
-        if (enable)
+        if (enable) {
             notifyingCharacteristics[uuid] = characteristic
-        else
+        } else {
             notifyingCharacteristics.remove(uuid)
+        }
         if (!gatt.await().setCharacteristicNotification(characteristic.wrapper, enable)) {
             return false
         }
diff --git a/bluetooth/src/commonMain/kotlin/Bluetooth.kt b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
index f8fea6e34..508466b4c 100644
--- a/bluetooth/src/commonMain/kotlin/Bluetooth.kt
+++ b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
@@ -261,12 +261,11 @@ fun Flow<Device?>.distance(environmentalFactor: Double = 2.0, averageOver: Int =
             lastNResults.removeAt(0)
         }
         val distance = deviceInfo.distance(environmentalFactor)
-        if (!distance.isNaN())
+        if (!distance.isNaN()) {
             lastNResults.add(distance)
-        if (lastNResults.isNotEmpty())
-            lastNResults.average()
-        else
-            Double.NaN
+        }
+
+        if (lastNResults.isNotEmpty()) lastNResults.average() else Double.NaN
     }
 }
 
diff --git a/bluetooth/src/commonMain/kotlin/Characteristic.kt b/bluetooth/src/commonMain/kotlin/Characteristic.kt
index 1ed08ab4f..90d3fb10c 100644
--- a/bluetooth/src/commonMain/kotlin/Characteristic.kt
+++ b/bluetooth/src/commonMain/kotlin/Characteristic.kt
@@ -114,8 +114,7 @@ open class Characteristic(
     }
 
     private fun createNotificationAction(enabled: Boolean): DeviceAction.Notification {
-        return if (enabled) DeviceAction.Notification.Enable(this)
-        else DeviceAction.Notification.Disable(this)
+        return if (enabled) DeviceAction.Notification.Enable(this) else DeviceAction.Notification.Disable(this)
     }
 
     override fun getUpdatedValue(): ByteArray? {
diff --git a/bluetooth/src/commonMain/kotlin/UUID.kt b/bluetooth/src/commonMain/kotlin/UUID.kt
index b4ee56490..58102eb60 100644
--- a/bluetooth/src/commonMain/kotlin/UUID.kt
+++ b/bluetooth/src/commonMain/kotlin/UUID.kt
@@ -42,8 +42,7 @@ expect val UUID.uuidString: String
 
 @Throws(UUIDException::class)
 fun uuidFrom(uuidString: String): UUID =
-    if (uuidString.isValidUUIDString()) unsafeUUIDFrom(uuidString)
-    else throw UUIDException.InvalidFormat(uuidString)
+    if (uuidString.isValidUUIDString()) unsafeUUIDFrom(uuidString) else throw UUIDException.InvalidFormat(uuidString)
 
 expect fun randomUUID(): UUID
 
diff --git a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 754b92d00..dce51cd15 100644
--- a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -180,10 +180,11 @@ abstract class BaseDeviceConnectionManager(
         val currentAction = this.currentAction
         this.currentAction = null
         if (currentAction != null) {
-            if (succeeded)
+            if (succeeded) {
                 logger.info(logTag) { "Completed $currentAction successfully" }
-            else
+            } else {
                 logger.error(logTag) { "Failed to complete $currentAction" }
+            }
         }
         emitEvent(DeviceConnectionManager.Event.CompletedAction(currentAction, succeeded))
     }
diff --git a/bluetooth/src/commonMain/kotlin/device/Device.kt b/bluetooth/src/commonMain/kotlin/device/Device.kt
index 33fc3ecb5..d98efbe7a 100644
--- a/bluetooth/src/commonMain/kotlin/device/Device.kt
+++ b/bluetooth/src/commonMain/kotlin/device/Device.kt
@@ -194,10 +194,7 @@ class DeviceImpl(
         }
 
     private fun DeviceConnectionManager.Event.Connecting.stateTransition(state: ConnectableDeviceState) =
-        if (state is ConnectableDeviceState.Disconnected)
-            state.connect
-        else
-            state.remain()
+        if (state is ConnectableDeviceState.Disconnected) state.connect else state.remain()
 
     private fun DeviceConnectionManager.Event.CancelledConnecting.stateTransition(state: ConnectableDeviceState) =
         when (state) {
@@ -218,10 +215,7 @@ class DeviceImpl(
         }
 
     private fun DeviceConnectionManager.Event.Disconnecting.stateTransition(state: ConnectableDeviceState) =
-        if (state is ConnectableDeviceState.Connected)
-            state.disconnecting
-        else
-            state.remain()
+        if (state is ConnectableDeviceState.Connected) state.disconnecting else state.remain()
 
     private suspend fun DeviceConnectionManager.Event.Disconnected.stateTransition(state: ConnectableDeviceState) =
         when (state) {
@@ -249,16 +243,10 @@ class DeviceImpl(
         }
 
     private fun DeviceConnectionManager.Event.Discovering.stateTransition(state: ConnectableDeviceState) =
-        if (state is ConnectableDeviceState.Connected.NoServices)
-            state.discoverServices
-        else
-            state.remain()
+        if (state is ConnectableDeviceState.Connected.NoServices) state.discoverServices else state.remain()
 
     private fun DeviceConnectionManager.Event.DiscoveredServices.stateTransition(state: ConnectableDeviceState) =
-        if (state is ConnectableDeviceState.Connected.Discovering)
-            state.didDiscoverServices(services)
-        else
-            state.remain()
+        if (state is ConnectableDeviceState.Connected.Discovering) state.didDiscoverServices(services) else state.remain()
 
     private fun DeviceConnectionManager.Event.AddAction.stateTransition(state: ConnectableDeviceState) =
         when (state) {
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
index 1bc054965..325d907f8 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
@@ -90,8 +90,7 @@ data class DeviceInfoImpl(
     override val updatedAt = DefaultKalugaDate.now()
 
     override fun distance(environmentalFactor: Double): Double {
-        if (advertisementData.txPowerLevel == Int.MIN_VALUE || environmentalFactor.isNaN())
-            return Double.NaN
+        if (advertisementData.txPowerLevel == Int.MIN_VALUE || environmentalFactor.isNaN()) return Double.NaN
         val difference = advertisementData.txPowerLevel.toDouble() - rssi.toDouble()
         val factor = 10.0 * environmentalFactor
         return 10.0.pow(difference / factor)
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
index f2376ae16..84f259d21 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
@@ -213,8 +213,7 @@ sealed class ConnectableDeviceStateImpl {
             }
 
             override suspend fun afterOldStateIsRemoved(oldState: ConnectableDeviceState) {
-                if (oldState is HandlingAction && oldState.action == action)
-                    return
+                if (oldState is HandlingAction && oldState.action == action) return
                 deviceConnectionManager.performAction(action)
             }
         }
diff --git a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
index ce9449694..4ce68a2c9 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/Scanner.kt
@@ -252,9 +252,9 @@ abstract class BaseScanner constructor(
     internal open suspend fun checkHardwareEnabledChanged() {
         val isEnabled = isHardwareEnabled()
         logger.info(LOG_TAG) { "Bluetooth hardware now ${if (isEnabled) "enabled" else "disabled"}" }
-        if (isEnabled)
+        if (isEnabled) {
             emitEvent(Scanner.Event.BluetoothEnabled)
-        else {
+        } else {
             emitEvent(Scanner.Event.BluetoothDisabled)
             if (autoEnableSensors) {
                 logger.info(LOG_TAG) { "Bluetooth disabled. Attempt to automatically enable" }
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
index 04912efd0..f875eed60 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
@@ -336,13 +336,15 @@ sealed class ScanningStateImpl {
             override val stopScanning = suspend { Idle(discovered, paired, scanner) }
 
             override suspend fun afterOldStateIsRemoved(oldState: ScanningState) {
-                if (oldState !is Scanning)
+                if (oldState !is Scanning) {
                     scanner.scanForDevices(discovered.filter)
+                }
             }
 
             override suspend fun afterCreatingNewState(newState: ScanningState) {
-                if (newState !is Scanning)
+                if (newState !is Scanning) {
                     scanner.stopScanning()
+                }
             }
         }
     }
diff --git a/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt b/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
index 78aadd533..fe347a2ea 100644
--- a/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
+++ b/bluetooth/src/iosMain/kotlin/device/AdvertisementData.kt
@@ -37,9 +37,11 @@ actual class AdvertisementData(private val advertisementData: Map<String, Any>)
         get() = advertisementData[CBAdvertisementDataLocalNameKey] as? String
     override val manufacturerId: Int?
         get() = manufacturerData?.let { manufacturerDataArray ->
-            if (manufacturerDataArray.size >= 2)
+            if (manufacturerDataArray.size >= 2) {
                 (manufacturerDataArray[0].toUInt() + (manufacturerDataArray[1].toUInt() shl 8)).toInt()
-            else null
+            } else {
+                null
+            }
         }
     override val manufacturerData: ByteArray? get() = (advertisementData[CBAdvertisementDataManufacturerDataKey] as? NSData)?.toByteArray()
     override val serviceUUIDs: List<UUID> get() = (advertisementData[CBAdvertisementDataServiceUUIDsKey] as? List<*>)?.typedList() ?: emptyList()
diff --git a/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt b/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
index edfd4d7c0..61b18063f 100644
--- a/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
+++ b/calendar-permissions/src/iosMain/kotlin/CalendarPermissionManager.kt
@@ -68,10 +68,7 @@ actual class DefaultCalendarPermissionManager(
                 }
 
                 try {
-                    if (deferred.await())
-                        IOSPermissionsHelper.AuthorizationStatus.Authorized
-                    else
-                        IOSPermissionsHelper.AuthorizationStatus.Restricted
+                    if (deferred.await()) IOSPermissionsHelper.AuthorizationStatus.Authorized else IOSPermissionsHelper.AuthorizationStatus.Restricted
                 } catch (t: Throwable) {
                     IOSPermissionsHelper.AuthorizationStatus.Restricted
                 }
diff --git a/camera-permissions/src/androidLibMain/kotlin/CameraPermissionManager.kt b/camera-permissions/src/androidLibMain/kotlin/CameraPermissionManager.kt
index 7de5a6e7d..278165e0d 100644
--- a/camera-permissions/src/androidLibMain/kotlin/CameraPermissionManager.kt
+++ b/camera-permissions/src/androidLibMain/kotlin/CameraPermissionManager.kt
@@ -47,23 +47,25 @@ actual class DefaultCameraPermissionManager(
     private val supported = context.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY)
 
     override fun requestPermissionDidStart() {
-        if (supported)
+        if (supported) {
             permissionsManager.requestPermissions()
-        else
+        } else {
             logger.error(logTag) { "Camera not Supported" }
+        }
     }
 
     override fun monitoringDidStart(interval: Duration) {
-        if (supported)
+        if (supported) {
             permissionsManager.startMonitoring(interval)
-        else {
+        } else {
             permissionHandler.status(AndroidPermissionState.DENIED_DO_NOT_ASK)
         }
     }
 
     override fun monitoringDidStop() {
-        if (supported)
+        if (supported) {
             permissionsManager.stopMonitoring()
+        }
     }
 }
 
diff --git a/contacts-permissions/src/androidLibMain/kotlin/ContactsPermissionManager.kt b/contacts-permissions/src/androidLibMain/kotlin/ContactsPermissionManager.kt
index 1abc135c1..6babada74 100644
--- a/contacts-permissions/src/androidLibMain/kotlin/ContactsPermissionManager.kt
+++ b/contacts-permissions/src/androidLibMain/kotlin/ContactsPermissionManager.kt
@@ -36,10 +36,10 @@ actual class DefaultContactsPermissionManager(
     private val permissionHandler = DefaultAndroidPermissionStateHandler(eventChannel, logTag, logger)
     private val permissionsManager = AndroidPermissionsManager(
         context,
-        if (contactsPermission.allowWrite)
-            arrayOf(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)
-        else
-            arrayOf(Manifest.permission.READ_CONTACTS),
+        listOfNotNull(
+            Manifest.permission.READ_CONTACTS,
+            if (contactsPermission.allowWrite) Manifest.permission.WRITE_CONTACTS else null
+        ).toTypedArray(),
         coroutineScope,
         logTag,
         logger,
diff --git a/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt b/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
index b4e3c0785..f8c10dee7 100644
--- a/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
+++ b/contacts-permissions/src/iosMain/kotlin/ContactsPermissionManager.kt
@@ -68,10 +68,7 @@ actual class DefaultContactsPermissionManager(
                 }
 
                 try {
-                    if (deferred.await())
-                        IOSPermissionsHelper.AuthorizationStatus.Authorized
-                    else
-                        IOSPermissionsHelper.AuthorizationStatus.Restricted
+                    if (deferred.await()) IOSPermissionsHelper.AuthorizationStatus.Authorized else IOSPermissionsHelper.AuthorizationStatus.Restricted
                 } catch (t: Throwable) {
                     IOSPermissionsHelper.AuthorizationStatus.Restricted
                 }
diff --git a/example/ios/DemoTests/DemoTests.swift b/example/ios/DemoTests/DemoTests.swift
index 51c5a5878..9d36d12b2 100644
--- a/example/ios/DemoTests/DemoTests.swift
+++ b/example/ios/DemoTests/DemoTests.swift
@@ -31,8 +31,7 @@ class DemoTests: XCTestCase {
     }
 
     func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
+        assert(HelloSharedKt.helloCommon() == "Hello from the shared module common source")
     }
 
     func testPerformanceExample() {
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/HelloShared.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/HelloShared.kt
new file mode 100644
index 000000000..f1c3e63ea
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/HelloShared.kt
@@ -0,0 +1,22 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared
+
+fun helloCommon(): String {
+    return "Hello from the shared module common source"
+}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
index 6dc37ecdb..3962b7ca9 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/bluetooth/BluetoothListDeviceViewModel.kt
@@ -104,10 +104,7 @@ class BluetoothListDeviceViewModel(private val identifier: Identifier, bluetooth
 
     private fun parseServiceUUIDs(uuids: List<UUID>): String {
         val uuidString = uuids.fold("") { result, next ->
-            if (result.isEmpty())
-                next.toString()
-            else
-                "$result, $next"
+            if (result.isEmpty()) next.toString() else "$result, $next"
         }
         return "bluetooth_service_uuids".localized().format(uuidString)
     }
@@ -115,10 +112,7 @@ class BluetoothListDeviceViewModel(private val identifier: Identifier, bluetooth
     private fun parseServiceData(data: Map<UUID, ByteArray?>): String {
         val dataString = data.entries.fold("") { result, next ->
             val nextString = "${next.key}: ${next.value?.toHexString() ?: ""}"
-            if (result.isEmpty())
-                nextString
-            else
-                "$result\n$nextString"
+            if (result.isEmpty()) nextString else "$result\n$nextString"
         }
         return "bluetooth_service_data".localized().format(dataString)
     }
diff --git a/gradle.properties b/gradle.properties
index 2fb501e84..b99bacbfa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,6 @@ android.useAndroidX=true
 
 kaluga.androidGradlePluginVersion=7.4.0
 kaluga.kotlinVersion=1.8.0
-kaluga.dokkaVersion=1.7.20
 kaluga.googleServicesGradlePluginVersion=4.3.14
 kaluga.ktLintGradlePluginVersion=11.0.0
 kaluga.atomicFuGradlePluginVersion=0.19.0
@@ -23,4 +22,5 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 # below is not used by example and does not need to be kept in sync #
 
 kaluga.binaryCompatibilityValidatorVersion=0.11.0
+kaluga.dokkaVersion=1.7.20
 
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
index 7ef66d238..821c22072 100644
--- a/gradle/jacoco.gradle
+++ b/gradle/jacoco.gradle
@@ -91,8 +91,9 @@ project.afterEvaluate {
                         coverageFilePaths.add("$connectedTestCoverageDirectoryPath/$it")
                     }
 
-                if (!coverageFilePaths.isEmpty())
+                if (!coverageFilePaths.isEmpty()) {
                     executionData.setFrom(files(coverageFilePaths))
+                }
 
                 reports {
                     xml.enabled = true
diff --git a/hud/src/iosMain/kotlin/HUD.kt b/hud/src/iosMain/kotlin/HUD.kt
index b30fcdd85..0cc70c02d 100644
--- a/hud/src/iosMain/kotlin/HUD.kt
+++ b/hud/src/iosMain/kotlin/HUD.kt
@@ -85,16 +85,14 @@ actual class HUD private constructor(private val containerView: ContainerView, p
             get() = when (hudConfig.style) {
                 HUDStyle.CUSTOM -> UIColor.colorNamed("li_colorBackground") ?: UIColor.lightGrayColor
                 HUDStyle.SYSTEM ->
-                    if (traitCollection.userInterfaceStyle == UIUserInterfaceStyle.UIUserInterfaceStyleDark)
-                        UIColor.blackColor else UIColor.whiteColor
+                    if (traitCollection.userInterfaceStyle == UIUserInterfaceStyle.UIUserInterfaceStyleDark) UIColor.blackColor else UIColor.whiteColor
             }
 
         private val foregroundColor: UIColor
             get() = when (hudConfig.style) {
                 HUDStyle.CUSTOM -> UIColor.colorNamed("li_colorAccent") ?: UIColor.darkGrayColor
                 HUDStyle.SYSTEM ->
-                    if (traitCollection.userInterfaceStyle == UIUserInterfaceStyle.UIUserInterfaceStyleDark)
-                        UIColor.whiteColor else UIColor.blackColor
+                    if (traitCollection.userInterfaceStyle == UIUserInterfaceStyle.UIUserInterfaceStyleDark) UIColor.whiteColor else UIColor.blackColor
             }
 
         // NOTES: Cast to CGFloat is needed for Arm32
diff --git a/keyboard/src/androidLibMain/kotlin/FocusHandler.kt b/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
index c9ce25cc7..b9bf9b68c 100644
--- a/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
+++ b/keyboard/src/androidLibMain/kotlin/FocusHandler.kt
@@ -28,8 +28,7 @@ class ViewFocusHandler(
     @IdRes private val id: Int
 ) : FocusHandler {
     fun requestFocus(activity: Activity?) {
-        if (activity == null)
-            return
+        if (activity == null) return
         val view = activity.findViewById<View>(id) ?: return
         view.requestFocus()
         val inputManager = activity.getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager
diff --git a/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt b/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt
index 613b4de67..96ab91adf 100644
--- a/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt
+++ b/location-permissions/src/androidLibMain/kotlin/LocationPermissionManager.kt
@@ -35,14 +35,8 @@ actual class DefaultLocationPermissionManager(
 
     private val permissions: Array<String> get() = listOfNotNull(
         Manifest.permission.ACCESS_COARSE_LOCATION,
-        if (permission.precise)
-            Manifest.permission.ACCESS_FINE_LOCATION
-        else
-            null,
-        if (permission.background && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q)
-            Manifest.permission.ACCESS_BACKGROUND_LOCATION
-        else
-            null
+        if (permission.precise) Manifest.permission.ACCESS_FINE_LOCATION else null,
+        if (permission.background && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else null
     ).toTypedArray()
 
     private val permissionHandler = DefaultAndroidPermissionStateHandler(eventChannel, logTag, logger)
diff --git a/location-permissions/src/commonMain/kotlin/Permission.kt b/location-permissions/src/commonMain/kotlin/Permission.kt
index 86ede8435..f4212d795 100644
--- a/location-permissions/src/commonMain/kotlin/Permission.kt
+++ b/location-permissions/src/commonMain/kotlin/Permission.kt
@@ -32,7 +32,12 @@ import kotlin.time.Duration
  */
 data class LocationPermission(val background: Boolean = false, val precise: Boolean = false) :
     Permission() {
-    override val name: String = listOfNotNull(if (background) "Background" else null, "Location", "-", if (precise) "Precise" else "Coarse").joinToString(" ")
+    override val name: String = listOfNotNull(
+        if (background) "Background" else null,
+        "Location",
+        "-",
+        if (precise) "Precise" else "Coarse"
+    ).joinToString(" ")
 }
 
 fun PermissionsBuilder.registerLocationPermission(
diff --git a/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt b/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt
index a42200efd..9802dd373 100644
--- a/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt
+++ b/location-permissions/src/iosMain/kotlin/LocationPermissionManager.kt
@@ -76,10 +76,11 @@ actual class DefaultLocationPermissionManager(
         if (IOSPermissionsHelper.missingDeclarationsInPList(bundle, *locationDeclarations.toTypedArray()).isEmpty()) {
             launch {
                 locationManager.updateLocationManager {
-                    if (permission.background)
+                    if (permission.background) {
                         requestAlwaysAuthorization()
-                    else
+                    } else {
                         requestWhenInUseAuthorization()
+                    }
                 }
             }
         } else {
diff --git a/location/src/commonMain/kotlin/location/LocationManager.kt b/location/src/commonMain/kotlin/location/LocationManager.kt
index e3deb7ee5..89ccb0238 100644
--- a/location/src/commonMain/kotlin/location/LocationManager.kt
+++ b/location/src/commonMain/kotlin/location/LocationManager.kt
@@ -154,8 +154,7 @@ abstract class BaseLocationManager(
 
     override suspend fun startMonitoringLocationEnabled() = enabledLock.withLock {
         locationMonitor.startMonitoring()
-        if (monitoringLocationEnabledJob != null)
-            return
+        if (monitoringLocationEnabledJob != null) return
         monitoringLocationEnabledJob = coroutineScope.launch {
             locationMonitor.isEnabled.collect {
                 handleLocationEnabledChanged()
@@ -174,9 +173,9 @@ abstract class BaseLocationManager(
     private fun handleLocationEnabledChanged() {
         val isEnabled = isLocationEnabled()
         logger.info(LOG_TAG) { "Location Service now ${if (isEnabled) "enabled" else "disabled"}" }
-        if (isEnabled)
+        if (isEnabled) {
             emitEvent(LocationManager.Event.LocationEnabled)
-        else {
+        } else {
             emitEvent(LocationManager.Event.LocationDisabled)
             if (autoEnableLocations) {
                 launch {
diff --git a/location/src/commonMain/kotlin/location/LocationStateRepo.kt b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
index cac6e6154..d1639cfec 100644
--- a/location/src/commonMain/kotlin/location/LocationStateRepo.kt
+++ b/location/src/commonMain/kotlin/location/LocationStateRepo.kt
@@ -114,10 +114,7 @@ open class LocationStateImplRepo(
                 state.initialize(event.hasPermission, locationManager.isLocationEnabled())
             }
             is LocationState.Permitted -> {
-                if (event.hasPermission)
-                    state.remain()
-                else
-                    state.revokePermission
+                if (event.hasPermission) state.remain() else state.revokePermission
             }
             is LocationState.Disabled.NotPermitted -> if (event.hasPermission) state.permit(locationManager.isLocationEnabled()) else state.remain()
             else -> { state.remain() }
diff --git a/logging/src/androidLibMain/kotlin/log.kt b/logging/src/androidLibMain/kotlin/log.kt
index e5d5f3b6d..7e098a4bc 100644
--- a/logging/src/androidLibMain/kotlin/log.kt
+++ b/logging/src/androidLibMain/kotlin/log.kt
@@ -23,7 +23,7 @@ import io.github.aakira.napier.DebugAntilog
 import java.lang.Integer.min
 
 actual val defaultLogger: Logger =
-    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M)
+    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
         TransformLogger(
             NapierLogger(DebugAntilog()),
             transformTag = { tag ->
@@ -37,7 +37,8 @@ actual val defaultLogger: Logger =
                 }
             }
         )
-    else
+    } else {
         NapierLogger(DebugAntilog())
+    }
 
 actual var logger: Logger = defaultLogger
diff --git a/microphone-permissions/src/androidLibMain/kotlin/MicrophonePermissionManager.kt b/microphone-permissions/src/androidLibMain/kotlin/MicrophonePermissionManager.kt
index 964e02151..bbabca015 100644
--- a/microphone-permissions/src/androidLibMain/kotlin/MicrophonePermissionManager.kt
+++ b/microphone-permissions/src/androidLibMain/kotlin/MicrophonePermissionManager.kt
@@ -39,17 +39,17 @@ actual class DefaultMicrophonePermissionManager(
     private val supported = context.packageManager.hasSystemFeature(PackageManager.FEATURE_MICROPHONE)
 
     override fun requestPermissionDidStart() {
-        if (supported)
+        if (supported) {
             permissionsManager.requestPermissions()
-        else {
+        } else {
             permissionHandler.status(AndroidPermissionState.DENIED_DO_NOT_ASK)
         }
     }
 
     override fun monitoringDidStart(interval: Duration) {
-        if (supported)
+        if (supported) {
             permissionsManager.startMonitoring(interval)
-        else {
+        } else {
             permissionHandler.status(AndroidPermissionState.DENIED_DO_NOT_ASK)
         }
     }
diff --git a/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt b/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
index 72d711ab8..5c1ef9b47 100644
--- a/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
+++ b/notifications-permissions/src/iosMain/kotlin/NotificationsPermissionManager.kt
@@ -78,10 +78,11 @@ actual class DefaultNotificationsPermissionManager(
             }
 
             try {
-                if (deferred.await())
+                if (deferred.await()) {
                     IOSPermissionsHelper.AuthorizationStatus.Authorized
-                else
+                } else {
                     IOSPermissionsHelper.AuthorizationStatus.Restricted
+                }
             } catch (t: Throwable) {
                 IOSPermissionsHelper.AuthorizationStatus.Restricted
             }
diff --git a/resources/src/androidLibMain/kotlin/Resources.kt b/resources/src/androidLibMain/kotlin/Resources.kt
index 0b4c33f47..838939304 100644
--- a/resources/src/androidLibMain/kotlin/Resources.kt
+++ b/resources/src/androidLibMain/kotlin/Resources.kt
@@ -40,8 +40,9 @@ actual class DefaultStringLoader(private val context: Context?) : StringLoader {
         }
     }
     override fun loadQuantityString(identifier: String, quantity: Int, defaultValue: String): String {
-        if (context == null)
+        if (context == null) {
             return defaultValue
+        }
         val id = context.resources.getIdentifier(identifier, "plurals", context.packageName)
         return try {
             context.resources.getQuantityString(id, quantity, quantity)
@@ -54,8 +55,9 @@ actual class DefaultStringLoader(private val context: Context?) : StringLoader {
 actual class DefaultColorLoader(private val context: Context?) : KalugaColorLoader {
     actual constructor() : this(if (application != null) applicationContext else null)
     override fun loadColor(identifier: String, defaultValue: KalugaColor?): KalugaColor? {
-        if (context == null)
+        if (context == null) {
             return defaultValue
+        }
         val id = context.resources.getIdentifier(identifier, "color", context.packageName)
         return try {
             ContextCompat.getColor(context, id)
@@ -68,8 +70,9 @@ actual class DefaultColorLoader(private val context: Context?) : KalugaColorLoad
 actual class DefaultImageLoader(private val context: Context?) : ImageLoader {
     actual constructor() : this(if (application != null) applicationContext else null)
     override fun loadImage(identifier: String, defaultValue: Image?): Image? {
-        if (context == null)
+        if (context == null) {
             return defaultValue
+        }
         val id = context.resources.getIdentifier(identifier, "drawable", context.packageName)
         return try {
             ContextCompat.getDrawable(context, id)?.let { Image(it) }
@@ -82,8 +85,9 @@ actual class DefaultImageLoader(private val context: Context?) : ImageLoader {
 actual class DefaultFontLoader(private val context: Context?, private val handler: Handler?) : FontLoader {
     actual constructor() : this(if (application != null) applicationContext else null, null)
     override suspend fun loadFont(identifier: String, defaultValue: Font?): Font? {
-        if (context == null)
+        if (context == null) {
             return defaultValue
+        }
         val id = context.resources.getIdentifier(identifier, "font", context.packageName)
         return try {
             val deferredFont = CompletableDeferred<Typeface?>()
diff --git a/resources/src/commonMain/kotlin/Resources.kt b/resources/src/commonMain/kotlin/Resources.kt
index 82dfb5362..f689c1840 100644
--- a/resources/src/commonMain/kotlin/Resources.kt
+++ b/resources/src/commonMain/kotlin/Resources.kt
@@ -72,7 +72,7 @@ interface ImageLoader {
     fun loadImage(identifier: String, defaultValue: Image?): Image?
 }
 
-/** Default implementation of a [ImageLoader]. */
+/** Default implementation of an [ImageLoader]. */
 expect class DefaultImageLoader() : ImageLoader
 
 /**
diff --git a/resources/src/iosMain/kotlin/DarkMode.kt b/resources/src/iosMain/kotlin/DarkMode.kt
index 5d314b467..278d1efb9 100644
--- a/resources/src/iosMain/kotlin/DarkMode.kt
+++ b/resources/src/iosMain/kotlin/DarkMode.kt
@@ -23,8 +23,5 @@ import platform.UIKit.UIUserInterfaceStyle
 import platform.UIKit.currentTraitCollection
 
 actual val isInDarkMode: Boolean get() {
-    return if (IOSVersion.systemVersion >= IOSVersion(12))
-        UITraitCollection.currentTraitCollection.userInterfaceStyle == UIUserInterfaceStyle.UIUserInterfaceStyleDark
-    else
-        false
+    return IOSVersion.systemVersion >= IOSVersion(12) && UITraitCollection.currentTraitCollection.userInterfaceStyle == UIUserInterfaceStyle.UIUserInterfaceStyleDark
 }
diff --git a/scientific/src/commonMain/kotlin/ScientificArray.kt b/scientific/src/commonMain/kotlin/ScientificArray.kt
index cbd34b19e..dcd58eea3 100644
--- a/scientific/src/commonMain/kotlin/ScientificArray.kt
+++ b/scientific/src/commonMain/kotlin/ScientificArray.kt
@@ -376,8 +376,9 @@ fun <
     factory: (List<Decimal>, TargetUnit) -> TargetArray,
     transform: ScientificValue<LeftQuantity, LeftUnit>.(ScientificValue<RightQuantity, RightUnit>) -> ScientificValue<TargetQuantity, TargetUnit>
 ): TargetArray {
-    if (size != right.size)
+    if (size != right.size) {
         throw IndexOutOfBoundsException("Cannot combine Scientific Array of unequal size. Left: $size Right: ${right.size}")
+    }
     val newValues = mutableListOf<Decimal>()
     iterator().withIndex().forEach {
         newValues.add(it.value(unit).transform(right[it.index](right.unit)).decimalValue)
diff --git a/storage-permissions/src/androidLibMain/kotlin/StoragePermissionManager.kt b/storage-permissions/src/androidLibMain/kotlin/StoragePermissionManager.kt
index d3ecc2327..3e2398c42 100644
--- a/storage-permissions/src/androidLibMain/kotlin/StoragePermissionManager.kt
+++ b/storage-permissions/src/androidLibMain/kotlin/StoragePermissionManager.kt
@@ -36,10 +36,10 @@ actual class DefaultStoragePermissionManager(
     private val permissionHandler = DefaultAndroidPermissionStateHandler(eventChannel, logTag, logger)
     private val permissionsManager = AndroidPermissionsManager(
         context,
-        if (storagePermission.allowWrite)
-            arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-        else
-            arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE),
+        listOfNotNull(
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            if (storagePermission.allowWrite) Manifest.permission.WRITE_EXTERNAL_STORAGE else null
+        ).toTypedArray(),
         coroutineScope,
         logTag,
         logger,
diff --git a/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt b/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
index b28af25be..2a99839b9 100644
--- a/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
+++ b/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
@@ -105,8 +105,11 @@ sealed class BaseMethodMock<
         val matchingStubs = stubs.synchronized {
             keys.mapNotNull { matchers ->
                 val stub = this[matchers]
-                if (ParametersSpec.run { matchers.matches(values) } && stub != null) matchers.asList()
-                    .sorted() to stub else null
+                if (ParametersSpec.run { matchers.matches(values) } && stub != null) {
+                    matchers.asList().sorted() to stub
+                } else {
+                    null
+                }
             }
         }
         // Ensure there is at least one stub. Otherwise fail
diff --git a/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt b/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
index aacd6f916..359290fa1 100644
--- a/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
+++ b/test-utils-base/src/commonMain/kotlin/ui_thread_testing.kt
@@ -138,10 +138,11 @@ abstract class BaseUIThreadTest<Configuration, Context : BaseUIThreadTest.TestCo
                 }
             }
 
-            if (cancelScopeAfterTest)
+            if (cancelScopeAfterTest) {
                 testBlockingAndCancelScope(Dispatchers.Main) { test(this) }
-            else
+            } else {
                 runBlocking(Dispatchers.Main) { test(this) }
+            }
         } catch (c: CancellationException) {
             if (!cancelScopeAfterTest || c !== cancellationException)
                 throw c
diff --git a/test-utils-base/src/commonMain/kotlin/yieldMultiple.kt b/test-utils-base/src/commonMain/kotlin/yieldMultiple.kt
index 358fefea0..c751c502f 100644
--- a/test-utils-base/src/commonMain/kotlin/yieldMultiple.kt
+++ b/test-utils-base/src/commonMain/kotlin/yieldMultiple.kt
@@ -48,9 +48,10 @@ suspend fun yieldUntil(
 ) = withTimeout(timeout) {
     while (!constraint()) {
         yieldMultiple(times = timesPerTurn)
-        if (!constraint())
+        if (!constraint()) {
             delay(delayPerTurn)
-        else
+        } else {
             return@withTimeout // fast exit to avoid extra constraint check
+        }
     }
 }
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt
index 252af528c..9ecbb9188 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/scanner/MockScanningState.kt
@@ -38,11 +38,7 @@ sealed class MockScanningState {
         override fun copyAndAdd(device: Device): Devices =
             Devices(listOf(*devices.toTypedArray(), device), filter)
 
-        override fun foundForFilter(filter: Filter) =
-            if (this.filter == filter)
-                this
-            else
-                Devices(filter)
+        override fun foundForFilter(filter: Filter) = if (this.filter == filter) this else Devices(filter)
     }
 
     sealed class Inactive : MockScanningState()
@@ -202,8 +198,7 @@ sealed class MockScanningState {
         class MissingPermissions : NoBluetooth(), ScanningState.NoBluetooth.MissingPermissions {
 
             override fun permit(enabled: Boolean): suspend () -> ScanningState = {
-                if (enabled) Enabled.Idle(nothingFound, nothingFound)
-                else Disabled()
+                if (enabled) Enabled.Idle(nothingFound, nothingFound) else Disabled()
             }
         }
     }
diff --git a/test-utils-date-time-picker/README.md b/test-utils-date-time-picker/README.md
index 0e616851b..f758a45c5 100644
--- a/test-utils-date-time-picker/README.md
+++ b/test-utils-date-time-picker/README.md
@@ -1,9 +1,9 @@
-# Test Utils Keyboard
+# Test Utils Date Time Picker
 
-This library adds support for testing the [`keyboard` module](../keyboard) to [`test-utils`](../test-utils-base)
+This library adds support for testing the [`date-time-picker` module](../date-time-picker) to [`test-utils`](../test-utils-base)
 
 ## Installing
-This library is available on Maven Central. You can import Kaluga Test Utils Keyboard as follows:
+This library is available on Maven Central. You can import Kaluga Test Utils Date Time Picker as follows:
 
 ```kotlin
 repositories {
@@ -13,9 +13,9 @@ repositories {
 // ...
 dependencies {
     // ...
-    implementation("com.splendo.kaluga:test-utils-keyboard:$kalugaVersion")
+    implementation("com.splendo.kaluga:test-utils-date-time-picker:$kalugaVersion")
 }
 ```
 
 ## Mocks
-This library contains mock classes for `KeyboardManager`, `KeyboardManager.Builder`, and `FocusHandler`.
+This library contains mock classes for `BaseDateTimePickerPresenter` and `BaseDateTimePickerPresenter.Builder`.
diff --git a/test-utils-location/src/commonMain/kotlin/MockLocationState.kt b/test-utils-location/src/commonMain/kotlin/MockLocationState.kt
index 83c5d2279..4a4ce6dab 100644
--- a/test-utils-location/src/commonMain/kotlin/MockLocationState.kt
+++ b/test-utils-location/src/commonMain/kotlin/MockLocationState.kt
@@ -94,8 +94,7 @@ sealed class MockLocationState {
             override val location: Location = lastKnownLocation.unknownLocationOf(Location.UnknownLocation.Reason.PERMISSION_DENIED)
 
             override fun permit(enabled: Boolean): suspend () -> LocationState.Permitted = {
-                if (enabled) Enabled(location.known.orUnknown)
-                else NoGPS(location.unknownLocationOf(Location.UnknownLocation.Reason.NO_GPS))
+                if (enabled) Enabled(location.known.orUnknown) else NoGPS(location.unknownLocationOf(Location.UnknownLocation.Reason.NO_GPS))
             }
         }
     }
diff --git a/test-utils-permissions/src/commonMain/kotlin/MockPermissionStateRepo.kt b/test-utils-permissions/src/commonMain/kotlin/MockPermissionStateRepo.kt
index f4aa003e4..ca36bae28 100644
--- a/test-utils-permissions/src/commonMain/kotlin/MockPermissionStateRepo.kt
+++ b/test-utils-permissions/src/commonMain/kotlin/MockPermissionStateRepo.kt
@@ -64,10 +64,14 @@ class MockBasePermissionStateRepo<P : Permission>(
         if (setupMocks) {
             didInitializeMock.on().doExecute { (mockState) ->
                 launchTakeAndChangeState { state ->
-                    if (state is PermissionState.Initializing)
-                        state.initialize(mockState.activeState == MockPermissionState.ActiveState.ALLOWED, mockState.activeState == MockPermissionState.ActiveState.LOCKED)
-                    else
+                    if (state is PermissionState.Initializing) {
+                        state.initialize(
+                            mockState.activeState == MockPermissionState.ActiveState.ALLOWED,
+                            mockState.activeState == MockPermissionState.ActiveState.LOCKED
+                        )
+                    } else {
                         state.remain()
+                    }
                 }
             }
         }

From 52fec1cce4887f59f10ed9d45f9792ea46c40f04 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 17 Feb 2023 15:59:31 +0100
Subject: [PATCH 187/227] PR remarks

---
 .../architecture/compose/navigation/result/HandleResult.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
index a05811fdf..29edc849a 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/result/HandleResult.kt
@@ -29,7 +29,7 @@ import kotlinx.serialization.KSerializer
 
 /**
  * Handles a [Route.Result.Data] matching a given [NavigationBundleSpec]
- * @param Row the type of [NavigationBundleSpecRow] to .
+ * @param Row the type of [NavigationBundleSpecRow] to.
  * @param spec The [NavigationBundleSpec] used to create the [Route.Result]
  * @param retain If `true` the result will be retained in the [NavBackStackEntry]. It will be deleted otherwise.
  * @param onResult Method for handling the received result

From 316acedf1e2ecb48653f5e0110f0e2863edc0131 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 17 Feb 2023 16:10:53 +0100
Subject: [PATCH 188/227] PR remarks

---
 alerts/src/commonMain/kotlin/Alerts.kt                   | 4 ++--
 date-time-picker/src/commonMain/kotlin/DateTimePicker.kt | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/alerts/src/commonMain/kotlin/Alerts.kt b/alerts/src/commonMain/kotlin/Alerts.kt
index bc7eac16c..a61be22da 100644
--- a/alerts/src/commonMain/kotlin/Alerts.kt
+++ b/alerts/src/commonMain/kotlin/Alerts.kt
@@ -275,8 +275,8 @@ interface AlertActions {
      * Presents an [Alert] and suspends until completion
      *
      * @param animated Pass `true` to animate the presentation
-     * @return The [Alert.Action] that was performed by button click
-     *         or `null` if the alert was cancelled by the user.
+     * @return The [Alert.Action] that was performed by button click or `null` if the alert was cancelled by the user.
+     * Note that some platforms, such as iOS, may not allow the user to cancel the alert.
      */
     suspend fun show(animated: Boolean = true): Alert.Action?
 
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 3ef0eb302..bb08d2129 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -56,8 +56,8 @@ data class DateTimePicker(
          * Selects a Date
          * A range can be provided to limit the dates selectable
          *
-         * @property earliestDate if provided, no date kan be picked that is before this [KalugaDate]
-         * @property latestDate if provided, no date kan be picked that is after this [KalugaDate]
+         * @property earliestDate if provided, no date can be picked that is before this [KalugaDate]
+         * @property latestDate if provided, no date can be picked that is after this [KalugaDate]
          */
         data class DateType(
             val earliestDate: KalugaDate? = null,
@@ -262,8 +262,8 @@ expect class DateTimePickerPresenter : BaseDateTimePickerPresenter {
  * Builds a date picker using DSL syntax (thread safe)
  *
  * @param coroutineScope The [CoroutineScope] managing the alert lifecycle.
- * @property earliestDate if provided, no date kan be picked that is before this [KalugaDate]
- * @property latestDate if provided, no date kan be picked that is after this [KalugaDate]
+ * @property earliestDate if provided, no date can be picked that is before this [KalugaDate]
+ * @property latestDate if provided, no date can be picked that is after this [KalugaDate]
  * @param initialize The block to construct a [DateTimePicker] with type [DateTimePicker.Type.DateType]
  * @return The built alert interface object
  */

From c206a69086e251292ed31bc695ee5a47e1c5ef0e Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 17 Feb 2023 16:15:27 +0100
Subject: [PATCH 189/227] PR remarks

---
 .../src/iosMain/kotlin/MainCLLocationManagerAccessor.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt b/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt
index ab9678a8d..708e89ab1 100644
--- a/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt
+++ b/location-permissions/src/iosMain/kotlin/MainCLLocationManagerAccessor.kt
@@ -24,7 +24,7 @@ import platform.CoreLocation.CLLocationManager
 /**
  * Accessor to ensure a [CLLocationManager] is only managed from the Main Thread.
  * Use [updateLocationManager] to gain access to the LocationManager
- * @param onInit callback to modify a the [CLLocationManager] after it is initialized
+ * @param onInit callback to modify the [CLLocationManager] after it is initialized
  */
 class MainCLLocationManagerAccessor(private val onInit: CLLocationManager.() -> Unit) {
 

From cab40218c27ab7286d2e1f418f8cade38a7add99 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 17 Feb 2023 16:39:27 +0100
Subject: [PATCH 190/227] Also renamed Locale

---
 .../kotlin/text/KalugaDateFormatter.kt        | 18 ++---
 .../kotlin/text/NumberFormatter.kt            |  6 +-
 .../androidLibMain/kotlin/text/StringUtils.kt | 14 ++--
 .../androidLibMain/kotlin/utils/KalugaDate.kt |  8 +-
 .../utils/{Locale.kt => KalugaLocale.kt}      | 40 ++++-----
 .../kotlin/utils/KalugaTimeZone.kt            |  2 +-
 .../src/commonMain/kotlin/text/FixedString.kt |  4 +-
 .../commonMain/kotlin/text/FormatSpecifier.kt | 44 +++++-----
 .../commonMain/kotlin/text/FormatString.kt    |  4 +-
 .../kotlin/text/KalugaDateFormatter.kt        | 32 ++++----
 .../commonMain/kotlin/text/NumberFormatter.kt | 12 +--
 .../commonMain/kotlin/text/StringFormatter.kt | 24 +++---
 .../src/commonMain/kotlin/text/StringUtils.kt | 14 ++--
 .../src/commonMain/kotlin/utils/KalugaDate.kt | 42 +++++-----
 .../utils/{Locale.kt => KalugaLocale.kt}      | 81 ++++++++++---------
 .../commonMain/kotlin/utils/KalugaTimeZone.kt | 12 +--
 .../kotlin/text/DateFormatterTest.kt          | 12 +--
 .../kotlin/text/NumberFormatterTest.kt        |  2 +-
 .../kotlin/text/StringFormatterTest.kt        |  2 +-
 base/src/commonTest/kotlin/utils/DateTest.kt  | 30 +++----
 .../src/commonTest/kotlin/utils/LocaleTest.kt |  6 +-
 .../kotlin/text/KalugaDateFormatter.kt        | 24 +++---
 .../iosMain/kotlin/text/NumberFormatter.kt    |  6 +-
 base/src/iosMain/kotlin/text/StringUtils.kt   | 14 ++--
 base/src/iosMain/kotlin/utils/KalugaDate.kt   |  8 +-
 .../utils/{Locale.kt => KalugaLocale.kt}      | 40 ++++-----
 .../iosMain/kotlin/utils/KalugaTimeZone.kt    |  2 +-
 .../jsMain/kotlin/text/KalugaDateFormatter.kt | 18 ++---
 .../src/jsMain/kotlin/text/NumberFormatter.kt |  6 +-
 base/src/jsMain/kotlin/text/StringUtils.kt    | 14 ++--
 base/src/jsMain/kotlin/utils/KalugaDate.kt    |  8 +-
 .../utils/{Locale.kt => KalugaLocale.kt}      | 40 ++++-----
 .../src/jsMain/kotlin/utils/KalugaTimeZone.kt |  2 +-
 .../kotlin/text/KalugaDateFormatter.kt        | 18 ++---
 .../jvmMain/kotlin/text/NumberFormatter.kt    |  6 +-
 base/src/jvmMain/kotlin/text/StringUtils.kt   | 14 ++--
 base/src/jvmMain/kotlin/utils/KalugaDate.kt   |  8 +-
 .../utils/{Locale.kt => KalugaLocale.kt}      | 40 ++++-----
 .../jvmMain/kotlin/utils/KalugaTimeZone.kt    |  2 +-
 .../src/commonMain/kotlin/DateTimePicker.kt   | 16 ++--
 example/ios/Kaluga-SwiftUI                    |  2 +-
 .../kotlin/MockDateTimePickerPresenterTest.kt |  6 +-
 42 files changed, 353 insertions(+), 350 deletions(-)
 rename base/src/androidLibMain/kotlin/utils/{Locale.kt => KalugaLocale.kt} (64%)
 rename base/src/commonMain/kotlin/utils/{Locale.kt => KalugaLocale.kt} (54%)
 rename base/src/iosMain/kotlin/utils/{Locale.kt => KalugaLocale.kt} (61%)
 rename base/src/jsMain/kotlin/utils/{Locale.kt => KalugaLocale.kt} (55%)
 rename base/src/jvmMain/kotlin/utils/{Locale.kt => KalugaLocale.kt} (52%)

diff --git a/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt b/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
index bb053e271..f5bdbc799 100644
--- a/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/androidLibMain/kotlin/text/KalugaDateFormatter.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import com.splendo.kaluga.base.utils.KalugaTimeZone
 import java.text.DateFormat
 import java.text.DateFormatSymbols
@@ -39,24 +39,24 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
          * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun dateFormat(
             style: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun timeFormat(
             style: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getTimeInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
         /**
@@ -64,13 +64,13 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
          * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateTimeInstance(dateStyle.javaStyle(), timeStyle.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
         /**
@@ -80,9 +80,9 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
          * A convenience [fixedPatternFormat] method exists to default to this behaviour.
          * @param pattern The pattern to apply.
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
-        actual fun patternFormat(pattern: String, timeZone: KalugaTimeZone, locale: Locale): KalugaDateFormatter = createDateFormatter(SimpleDateFormat(pattern, locale.locale), timeZone)
+        actual fun patternFormat(pattern: String, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDateFormatter = createDateFormatter(SimpleDateFormat(pattern, locale.locale), timeZone)
 
         private fun createDateFormatter(simpleDateFormat: SimpleDateFormat, timeZone: KalugaTimeZone): KalugaDateFormatter {
             return KalugaDateFormatter(simpleDateFormat).apply {
diff --git a/base/src/androidLibMain/kotlin/text/NumberFormatter.kt b/base/src/androidLibMain/kotlin/text/NumberFormatter.kt
index 972656e12..e7633550b 100644
--- a/base/src/androidLibMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/androidLibMain/kotlin/text/NumberFormatter.kt
@@ -16,7 +16,7 @@
  */
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.text.ParseException
@@ -25,10 +25,10 @@ import java.util.Currency
 @ExperimentalUnsignedTypes
 /**
  * Default implementation of [BaseNumberFormatter]
- * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
+ * @param locale The [KalugaLocale] used for parsing. Defaults to [KalugaLocale.defaultLocale].
  * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
  */
-actual class NumberFormatter actual constructor(override val locale: Locale, style: NumberFormatStyle) : BaseNumberFormatter {
+actual class NumberFormatter actual constructor(override val locale: KalugaLocale, style: NumberFormatStyle) : BaseNumberFormatter {
 
     private val format: DecimalFormat = when (style) {
         is NumberFormatStyle.Integer -> DecimalFormat.getInstance(locale.locale).apply {
diff --git a/base/src/androidLibMain/kotlin/text/StringUtils.kt b/base/src/androidLibMain/kotlin/text/StringUtils.kt
index daa6a96d0..356f586a6 100644
--- a/base/src/androidLibMain/kotlin/text/StringUtils.kt
+++ b/base/src/androidLibMain/kotlin/text/StringUtils.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 
 /**
  * The String that serves as a line separator.
@@ -25,13 +25,13 @@ import com.splendo.kaluga.base.utils.Locale
 actual val lineSeparator = System.lineSeparator()
 
 /**
- * Converts a String to its lower cased variant based on a given [Locale]
- * @param locale The [Locale] to use for transforming to lower case.
+ * Converts a String to its lower cased variant based on a given [KalugaLocale]
+ * @param locale The [KalugaLocale] to use for transforming to lower case.
  */
-actual fun String.lowerCased(locale: Locale): String = this.lowercase(locale.locale)
+actual fun String.lowerCased(locale: KalugaLocale): String = this.lowercase(locale.locale)
 
 /**
- * Converts a String to its upper cased variant based on a given [Locale]
- * @param locale The [Locale] to use for transforming to upper case.
+ * Converts a String to its upper cased variant based on a given [KalugaLocale]
+ * @param locale The [KalugaLocale] to use for transforming to upper case.
  */
-actual fun String.upperCased(locale: Locale): String = this.uppercase(locale.locale)
+actual fun String.upperCased(locale: KalugaLocale): String = this.uppercase(locale.locale)
diff --git a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
index 8fc6c4a47..b2a945ae8 100644
--- a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
@@ -35,10 +35,10 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
          * Creates a [KalugaDate] relative to the current time
          * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
          * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
-         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun now(offset: Duration, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 add(Calendar.MILLISECOND, offset.inWholeMilliseconds.toInt())
             }
@@ -48,10 +48,10 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
          * @param offset The [Duration] from the epoch time. Defaults to 0 milliseconds
          * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
-         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun epoch(offset: Duration, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 timeInMillis = offset.inWholeMilliseconds
             }
diff --git a/base/src/androidLibMain/kotlin/utils/Locale.kt b/base/src/androidLibMain/kotlin/utils/KalugaLocale.kt
similarity index 64%
rename from base/src/androidLibMain/kotlin/utils/Locale.kt
rename to base/src/androidLibMain/kotlin/utils/KalugaLocale.kt
index fbbf57087..7df0ba6c3 100644
--- a/base/src/androidLibMain/kotlin/utils/Locale.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaLocale.kt
@@ -25,42 +25,42 @@ import com.splendo.kaluga.base.text.upperCased
 /**
  * Default implementation of [BaseLocale]
  */
-actual data class Locale internal constructor(internal val locale: java.util.Locale) : BaseLocale() {
+actual data class KalugaLocale internal constructor(internal val locale: java.util.Locale) : BaseLocale() {
     actual companion object {
 
         /**
-         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
+         * Creates a [KalugaLocale] based on a `language` ISO 639 alpha-2 or alpha-3 code
          * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
-         * @return The [Locale] for the given [language]
+         * @return The [KalugaLocale] for the given [language]
          */
-        actual fun createLocale(language: String): Locale = Locale(java.util.Locale(language))
+        actual fun createLocale(language: String): KalugaLocale = KalugaLocale(java.util.Locale(language))
 
         /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
+         * Creates a [KalugaLocale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
          * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
          * @param country a ISO 3166 alpha-2 `country` code.
-         * @return The [Locale] for the given [language] and [country]
+         * @return The [KalugaLocale] for the given [language] and [country]
          */
-        actual fun createLocale(language: String, country: String): Locale = Locale(java.util.Locale(language, country))
+        actual fun createLocale(language: String, country: String): KalugaLocale = KalugaLocale(java.util.Locale(language, country))
 
         /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
+         * Creates a [KalugaLocale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
          * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
          * @param country a ISO 3166 alpha-2 `country` code.
-         * @param variant Arbitrary value used to indicate a variation of a [Locale]
-         * @return The [Locale] for the given [language], [country], and [variant]
+         * @param variant Arbitrary value used to indicate a variation of a [KalugaLocale]
+         * @return The [KalugaLocale] for the given [language], [country], and [variant]
          */
-        actual fun createLocale(language: String, country: String, variant: String): Locale = Locale(java.util.Locale(language, country, variant))
+        actual fun createLocale(language: String, country: String, variant: String): KalugaLocale = KalugaLocale(java.util.Locale(language, country, variant))
 
         /**
-         * The default [Locale] of the user
+         * The default [KalugaLocale] of the user
          */
-        actual val defaultLocale: Locale get() = Locale(java.util.Locale.getDefault())
+        actual val defaultLocale: KalugaLocale get() = KalugaLocale(java.util.Locale.getDefault())
 
         /**
-         * A list of [Locale] available to the user.
+         * A list of [KalugaLocale] available to the user.
          */
-        actual val availableLocales: List<Locale> = java.util.Locale.getAvailableLocales().asList().map { Locale(it) }
+        actual val availableLocales: List<KalugaLocale> = java.util.Locale.getAvailableLocales().asList().map { KalugaLocale(it) }
     }
 
     override val countryCode: String
@@ -82,11 +82,11 @@ actual data class Locale internal constructor(internal val locale: java.util.Loc
             UnitSystem.withCountryCode(countryCode.upperCased(this))
         }
 
-    override fun name(forLocale: Locale): String = locale.getDisplayName(forLocale.locale)
-    override fun countryName(forLocale: Locale): String = locale.getDisplayCountry(forLocale.locale)
-    override fun languageName(forLocale: Locale): String = locale.getDisplayLanguage(forLocale.locale)
-    override fun variantName(forLocale: Locale): String = locale.getDisplayVariant(forLocale.locale)
-    override fun scriptName(forLocale: Locale): String = locale.getDisplayScript(forLocale.locale)
+    override fun name(forLocale: KalugaLocale): String = locale.getDisplayName(forLocale.locale)
+    override fun countryName(forLocale: KalugaLocale): String = locale.getDisplayCountry(forLocale.locale)
+    override fun languageName(forLocale: KalugaLocale): String = locale.getDisplayLanguage(forLocale.locale)
+    override fun variantName(forLocale: KalugaLocale): String = locale.getDisplayVariant(forLocale.locale)
+    override fun scriptName(forLocale: KalugaLocale): String = locale.getDisplayScript(forLocale.locale)
 
     override val quotationStart: String
         get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
diff --git a/base/src/androidLibMain/kotlin/utils/KalugaTimeZone.kt b/base/src/androidLibMain/kotlin/utils/KalugaTimeZone.kt
index 971523239..e268559d8 100644
--- a/base/src/androidLibMain/kotlin/utils/KalugaTimeZone.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaTimeZone.kt
@@ -53,7 +53,7 @@ actual class KalugaTimeZone internal constructor(internal val timeZone: java.uti
     }
 
     override val identifier: String = timeZone.id
-    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
+    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: KalugaLocale): String {
         val styleJava = when (style) {
             TimeZoneNameStyle.Short -> java.util.TimeZone.SHORT
             TimeZoneNameStyle.Long -> java.util.TimeZone.LONG
diff --git a/base/src/commonMain/kotlin/text/FixedString.kt b/base/src/commonMain/kotlin/text/FixedString.kt
index a9473c098..d0844083c 100644
--- a/base/src/commonMain/kotlin/text/FixedString.kt
+++ b/base/src/commonMain/kotlin/text/FixedString.kt
@@ -17,13 +17,13 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 
 internal class FixedString internal constructor(private val out: StringBuilder, private val s: String, private val start: Int, private val end: Int) :
     FormatString {
     override val index: Int = -2
 
-    override fun print(arg: Any?, locale: Locale) {
+    override fun print(arg: Any?, locale: KalugaLocale) {
         out.append(s, start, end)
     }
 
diff --git a/base/src/commonMain/kotlin/text/FormatSpecifier.kt b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
index 3e003984d..052b73045 100644
--- a/base/src/commonMain/kotlin/text/FormatSpecifier.kt
+++ b/base/src/commonMain/kotlin/text/FormatSpecifier.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.text
 import com.splendo.kaluga.base.text.StringFormatter.Companion.getZero
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.TimeZoneNameStyle
 import com.splendo.kaluga.base.utils.toHexString
@@ -74,7 +74,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         }
     }
 
-    override fun print(arg: Any?, locale: Locale) {
+    override fun print(arg: Any?, locale: KalugaLocale) {
         when (val currentChar = currentChar) {
             is ParsingCharacter.DateTime -> printDateTime(arg, currentChar, locale)
             is ParsingCharacter.RegularCharacter -> {
@@ -101,7 +101,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         }
     }
 
-    private fun printDateTime(arg: Any?, currentChar: ParsingCharacter.DateTime, locale: Locale) {
+    private fun printDateTime(arg: Any?, currentChar: ParsingCharacter.DateTime, locale: KalugaLocale) {
         val date = when (arg) {
             null -> {
                 print("null", locale)
@@ -110,7 +110,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
             is Long,
             is Int,
             is Short -> {
-                DefaultKalugaDate.epoch((arg as Number).toLong().milliseconds, TimeZone.current(), locale)
+                DefaultKalugaDate.epoch((arg as Number).toLong().milliseconds, KalugaTimeZone.current(), locale)
             }
             is KalugaDate -> {
                 arg.copy()
@@ -120,7 +120,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         print(date, currentChar, locale)
     }
 
-    private fun printInteger(arg: Any?, currentChar: ParsingCharacter.RegularCharacter, locale: Locale) {
+    private fun printInteger(arg: Any?, currentChar: ParsingCharacter.RegularCharacter, locale: KalugaLocale) {
         when (arg) {
             null -> print("null", locale)
             is Int -> print(arg, currentChar, locale)
@@ -131,7 +131,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         }
     }
 
-    private fun printFloat(arg: Any?, currentChar: ParsingCharacter.RegularCharacter, locale: Locale) {
+    private fun printFloat(arg: Any?, currentChar: ParsingCharacter.RegularCharacter, locale: KalugaLocale) {
         when (arg) {
             null -> print("null", locale)
             is Float -> print(arg, currentChar, locale)
@@ -140,7 +140,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         }
     }
 
-    private fun printCharacter(arg: Any?, currentChar: ParsingCharacter.RegularCharacter, locale: Locale) {
+    private fun printCharacter(arg: Any?, currentChar: ParsingCharacter.RegularCharacter, locale: KalugaLocale) {
         val stringToPrint = when (arg) {
             null -> "null"
             is Char -> arg.toString()
@@ -152,7 +152,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         print(stringToPrint, locale)
     }
 
-    private fun printString(arg: Any?, locale: Locale) {
+    private fun printString(arg: Any?, locale: KalugaLocale) {
         (arg as? Formattable)?.let {
             out.append(it.formatFor(locale, flags, width, precision))
         } ?: run {
@@ -163,11 +163,11 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         }
     }
 
-    private fun printHashCode(arg: Any?, locale: Locale) {
+    private fun printHashCode(arg: Any?, locale: KalugaLocale) {
         print(arg?.hashCode()?.toByte()?.let { byteArrayOf(it) }?.toHexString() ?: "null", locale)
     }
 
-    private fun printBoolean(arg: Any?, locale: Locale) {
+    private fun printBoolean(arg: Any?, locale: KalugaLocale) {
         print(
             (
                 arg?.let {
@@ -178,24 +178,24 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         )
     }
 
-    private fun print(s: String, locale: Locale) {
+    private fun print(s: String, locale: KalugaLocale) {
         val string = if (precision != -1 && precision < s.length) s.substring(0, precision) else s
         appendJustified(out, if (flags.contains(Flag.UPPERCASE)) string.upperCased(locale) else string)
     }
 
-    private fun print(value: Byte, currentChar: ParsingCharacter.RegularCharacter, locale: Locale) {
+    private fun print(value: Byte, currentChar: ParsingCharacter.RegularCharacter, locale: KalugaLocale) {
         print(value.toLong(), currentChar, locale)
     }
 
-    private fun print(value: Short, currentChar: ParsingCharacter.RegularCharacter, locale: Locale) {
+    private fun print(value: Short, currentChar: ParsingCharacter.RegularCharacter, locale: KalugaLocale) {
         print(value.toLong(), currentChar, locale)
     }
 
-    private fun print(value: Int, currentChar: ParsingCharacter.RegularCharacter, locale: Locale) {
+    private fun print(value: Int, currentChar: ParsingCharacter.RegularCharacter, locale: KalugaLocale) {
         print(value.toLong(), currentChar, locale)
     }
 
-    private fun print(value: Long, currentChar: ParsingCharacter.RegularCharacter, locale: Locale) {
+    private fun print(value: Long, currentChar: ParsingCharacter.RegularCharacter, locale: KalugaLocale) {
         val sb = StringBuilder()
         when (currentChar.regular) {
             RegularFormatCharacter.DECIMAL_INTEGER -> {
@@ -246,11 +246,11 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         appendJustified(out, sb)
     }
 
-    private fun print(value: Float, currentChar: ParsingCharacter.RegularCharacter, locale: Locale) {
+    private fun print(value: Float, currentChar: ParsingCharacter.RegularCharacter, locale: KalugaLocale) {
         print(value.toDouble(), currentChar, locale)
     }
 
-    private fun print(value: Double, currentChar: ParsingCharacter.RegularCharacter, locale: Locale) {
+    private fun print(value: Double, currentChar: ParsingCharacter.RegularCharacter, locale: KalugaLocale) {
         val sb = StringBuilder()
         val neg = value < 0.0
         val numberFormatter = NumberFormatter(locale)
@@ -283,7 +283,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
     private fun print(
         sb: StringBuilder,
         value: Double,
-        locale: Locale,
+        locale: KalugaLocale,
         c: ParsingCharacter.RegularCharacter,
         precision: Int,
         neg: Boolean
@@ -351,7 +351,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         }
     }
 
-    private fun print(time: KalugaDate, currentChar: ParsingCharacter.DateTime, locale: Locale) {
+    private fun print(time: KalugaDate, currentChar: ParsingCharacter.DateTime, locale: KalugaLocale) {
         val sb = StringBuilder()
         print(sb, time, currentChar, locale)
 
@@ -363,7 +363,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         }
     }
 
-    private fun print(sb: StringBuilder, time: KalugaDate, currentChar: ParsingCharacter.DateTime, locale: Locale): StringBuilder {
+    private fun print(sb: StringBuilder, time: KalugaDate, currentChar: ParsingCharacter.DateTime, locale: KalugaLocale): StringBuilder {
         when (currentChar.dateTime) {
             DateTime.HOUR_OF_DAY_0, DateTime.HOUR_0, DateTime.HOUR_OF_DAY, DateTime.HOUR -> {
                 // 'l' (1 - 12) -- like I
@@ -603,7 +603,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         value: Int,
         flags: Set<Flag>,
         width: Int,
-        locale: Locale
+        locale: KalugaLocale
     ): StringBuilder {
         return localizedMagnitude(sb, value.toString(10), 0, flags, width, locale)
     }
@@ -614,7 +614,7 @@ internal class FormatSpecifier(private val out: StringBuilder, matchResult: Matc
         offset: Int,
         flags: Set<Flag>,
         width: Int,
-        locale: Locale
+        locale: KalugaLocale
     ): StringBuilder {
         val begin: Int = sb.length
         val zero: Char = getZero(locale)
diff --git a/base/src/commonMain/kotlin/text/FormatString.kt b/base/src/commonMain/kotlin/text/FormatString.kt
index b063d0c6f..b7a961098 100644
--- a/base/src/commonMain/kotlin/text/FormatString.kt
+++ b/base/src/commonMain/kotlin/text/FormatString.kt
@@ -17,9 +17,9 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 
 internal interface FormatString {
     val index: Int
-    fun print(arg: Any?, locale: Locale)
+    fun print(arg: Any?, locale: KalugaLocale)
 }
diff --git a/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt b/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
index 7d17fb85b..f6e1e874b 100644
--- a/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/commonMain/kotlin/text/KalugaDateFormatter.kt
@@ -18,8 +18,8 @@
 package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.KalugaDate
-import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
+import com.splendo.kaluga.base.utils.KalugaLocale
+import com.splendo.kaluga.base.utils.KalugaLocale.Companion.defaultLocale
 import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.enUsPosix
 
@@ -119,24 +119,24 @@ expect class KalugaDateFormatter : BaseDateFormatter {
          * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         fun dateFormat(
             style: DateFormatStyle = DateFormatStyle.Medium,
             timeZone: KalugaTimeZone = KalugaTimeZone.current(),
-            locale: Locale = defaultLocale
+            locale: KalugaLocale = defaultLocale
         ): KalugaDateFormatter
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         fun timeFormat(
             style: DateFormatStyle = DateFormatStyle.Medium,
             timeZone: KalugaTimeZone = KalugaTimeZone.current(),
-            locale: Locale = defaultLocale
+            locale: KalugaLocale = defaultLocale
         ): KalugaDateFormatter
 
         /**
@@ -144,13 +144,13 @@ expect class KalugaDateFormatter : BaseDateFormatter {
          * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         fun dateTimeFormat(
             dateStyle: DateFormatStyle = DateFormatStyle.Medium,
             timeStyle: DateFormatStyle = DateFormatStyle.Medium,
             timeZone: KalugaTimeZone = KalugaTimeZone.current(),
-            locale: Locale = defaultLocale
+            locale: KalugaLocale = defaultLocale
         ): KalugaDateFormatter
 
         /**
@@ -160,12 +160,12 @@ expect class KalugaDateFormatter : BaseDateFormatter {
          * A convenience [fixedPatternFormat] method exists to default to this behaviour.
          * @param pattern The pattern to apply.
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         fun patternFormat(
             pattern: String,
             timeZone: KalugaTimeZone = KalugaTimeZone.current(),
-            locale: Locale = defaultLocale
+            locale: KalugaLocale = defaultLocale
         ): KalugaDateFormatter
     }
 }
@@ -174,12 +174,12 @@ expect class KalugaDateFormatter : BaseDateFormatter {
 typealias DateFormatter = KalugaDateFormatter
 
 /**
- * Creates a fixed [KalugaDateFormatter] using a custom Date format pattern, localized by the [Locale.enUsPosix] [Locale].
+ * Creates a fixed [KalugaDateFormatter] using a custom Date format pattern, localized by the [KalugaLocale.enUsPosix] [KalugaLocale].
  * Use this to ensure that displaying time in 12 or 24 hour format is not overridden by the user.
  * @param pattern The pattern to apply.
  * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
  */
-fun KalugaDateFormatter.Companion.fixedPatternFormat(pattern: String, timeZone: KalugaTimeZone = KalugaTimeZone.current()) = patternFormat(pattern, timeZone, Locale.enUsPosix)
+fun KalugaDateFormatter.Companion.fixedPatternFormat(pattern: String, timeZone: KalugaTimeZone = KalugaTimeZone.current()) = patternFormat(pattern, timeZone, KalugaLocale.enUsPosix)
 
 /**
  * Creates a [KalugaDateFormatter] that formats time according to the ISo 8601 format.
@@ -192,13 +192,13 @@ fun KalugaDateFormatter.Companion.iso8601Pattern(timeZone: KalugaTimeZone = Kalu
  * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
  * @param excludeYear When [true] the year will not be part of the format.
  * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
- * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+ * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
  */
 fun KalugaDateFormatter.Companion.dateFormat(
     style: DateFormatStyle = DateFormatStyle.Medium,
     excludeYear: Boolean,
     timeZone: KalugaTimeZone = KalugaTimeZone.current(),
-    locale: Locale = defaultLocale
+    locale: KalugaLocale = defaultLocale
 ): KalugaDateFormatter {
     val formatWithYear = dateFormat(style, timeZone, locale)
     return if (excludeYear) {
@@ -214,14 +214,14 @@ fun KalugaDateFormatter.Companion.dateFormat(
  * @param excludeYear When [true] the year will not be part of the format.
  * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
  * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
- * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+ * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
  */
 fun KalugaDateFormatter.Companion.dateTimeFormat(
     dateStyle: DateFormatStyle = DateFormatStyle.Medium,
     excludeYear: Boolean,
     timeStyle: DateFormatStyle = DateFormatStyle.Medium,
     timeZone: KalugaTimeZone = KalugaTimeZone.current(),
-    locale: Locale = defaultLocale
+    locale: KalugaLocale = defaultLocale
 ): KalugaDateFormatter {
     val formatWithYear = dateTimeFormat(dateStyle, timeStyle, timeZone, locale)
     return if (excludeYear) {
diff --git a/base/src/commonMain/kotlin/text/NumberFormatter.kt b/base/src/commonMain/kotlin/text/NumberFormatter.kt
index 34537c568..f1a650e6c 100644
--- a/base/src/commonMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/commonMain/kotlin/text/NumberFormatter.kt
@@ -17,8 +17,8 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
+import com.splendo.kaluga.base.utils.KalugaLocale
+import com.splendo.kaluga.base.utils.KalugaLocale.Companion.defaultLocale
 import kotlin.math.max
 
 /**
@@ -193,9 +193,9 @@ sealed class NumberFormatStyle(open val roundingMode: RoundingMode) {
  */
 interface BaseNumberFormatter {
     /**
-     * [Locale] used for formatting.
+     * [KalugaLocale] used for formatting.
      */
-    val locale: Locale
+    val locale: KalugaLocale
 
     /**
      * The symbol used to represent a percent sign.
@@ -311,7 +311,7 @@ interface BaseNumberFormatter {
 
 /**
  * Default implementation of [BaseNumberFormatter]
- * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
+ * @param locale The [KalugaLocale] used for parsing. Defaults to [KalugaLocale.defaultLocale].
  * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
  */
-expect class NumberFormatter constructor(locale: Locale = defaultLocale, style: NumberFormatStyle = NumberFormatStyle.Decimal()) : BaseNumberFormatter
+expect class NumberFormatter constructor(locale: KalugaLocale = defaultLocale, style: NumberFormatStyle = NumberFormatStyle.Decimal()) : BaseNumberFormatter
diff --git a/base/src/commonMain/kotlin/text/StringFormatter.kt b/base/src/commonMain/kotlin/text/StringFormatter.kt
index 50102bd31..3f1caac7e 100644
--- a/base/src/commonMain/kotlin/text/StringFormatter.kt
+++ b/base/src/commonMain/kotlin/text/StringFormatter.kt
@@ -18,32 +18,32 @@
 package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.text.FormatSpecifier.Companion.formatSpecifier
-import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
+import com.splendo.kaluga.base.utils.KalugaLocale
+import com.splendo.kaluga.base.utils.KalugaLocale.Companion.defaultLocale
 
 /**
  * Formats this [String] as a printf-style format String using a variable number of arguments.
  * @param args The list of arguments used for formatting the string.
- * @param locale The [Locale] used for formatting the arguments. This is relevant for number and date formatting, as well as capitalization.
+ * @param locale The [KalugaLocale] used for formatting the arguments. This is relevant for number and date formatting, as well as capitalization.
  * @return The formatted [String]
  * @throws [StringFormatterException] if the string could not be formatted using [args].
  */
-fun String.format(vararg args: Any?, locale: Locale = defaultLocale) = StringFormatter(locale = locale).format(this, *args).toString()
+fun String.format(vararg args: Any?, locale: KalugaLocale = defaultLocale) = StringFormatter(locale = locale).format(this, *args).toString()
 
 /**
  * Interface that adds support for an object to be formatted by [StringFormatter].
  */
 interface Formattable {
     /**
-     * Formats this object to a [String] using a [Locale], [Flags], width, and precision
-     * @param locale The [Locale] used for formatting.
+     * Formats this object to a [String] using a [KalugaLocale], [Flags], width, and precision
+     * @param locale The [KalugaLocale] used for formatting.
      * @param flags A [Set] of [Flag] used for formattting.
      * @param width The expected width of the result.
      * @param precision The precision applied when formatting.
      * @return The formatted [String] representing this [Formattable].
      * @throws [StringFormatterException] when an issue with the formatting occurs.
      */
-    fun formatFor(locale: Locale, flags: Set<Flag>, width: Int, precision: Int): String
+    fun formatFor(locale: KalugaLocale, flags: Set<Flag>, width: Int, precision: Int): String
 }
 
 /**
@@ -51,15 +51,15 @@ interface Formattable {
  * Supports formats for [Number], [String], [Char], [Boolean], and [com.splendo.kaluga.base.utils.KalugaDate].
  * Custom formatting is supported by implementing [Formattable].
  * Flags, precision and width are supported by this formatter as well.
- * Formatting will adjust for a provided [Locale].
+ * Formatting will adjust for a provided [KalugaLocale].
  * May throw an [StringFormatterException] if the incorrect format is applied.
  * @param out he [StringBuilder] used for outputting the result.
- * @param locale The [Locale] used for formatting. This is relevant for number and date formatting, as well as capitalization.
+ * @param locale The [KalugaLocale] used for formatting. This is relevant for number and date formatting, as well as capitalization.
  */
-class StringFormatter(private val out: StringBuilder = StringBuilder(), private val locale: Locale = defaultLocale) {
+class StringFormatter(private val out: StringBuilder = StringBuilder(), private val locale: KalugaLocale = defaultLocale) {
 
     companion object {
-        internal fun getZero(locale: Locale): Char = NumberFormatter(locale).zeroSymbol
+        internal fun getZero(locale: KalugaLocale): Char = NumberFormatter(locale).zeroSymbol
         internal fun checkText(s: String, start: Int, end: Int) {
             val index = s.substring(start, end).indexOf('%')
             if (index >= 0) {
@@ -80,7 +80,7 @@ class StringFormatter(private val out: StringBuilder = StringBuilder(), private
         return out
     }
 
-    private fun format(locale: Locale, format: String, vararg args: Any?): StringFormatter {
+    private fun format(locale: KalugaLocale, format: String, vararg args: Any?): StringFormatter {
         var last = -1
         var lastOrdinaryIndex = -1
         val formatStrings = parse(format)
diff --git a/base/src/commonMain/kotlin/text/StringUtils.kt b/base/src/commonMain/kotlin/text/StringUtils.kt
index 3aa06df5b..30cc9b1c3 100644
--- a/base/src/commonMain/kotlin/text/StringUtils.kt
+++ b/base/src/commonMain/kotlin/text/StringUtils.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 
 /**
  * The String that serves as a line separator.
@@ -25,13 +25,13 @@ import com.splendo.kaluga.base.utils.Locale
 expect val lineSeparator: String
 
 /**
- * Converts a String to its lower cased variant based on a given [Locale]
- * @param locale The [Locale] to use for transforming to lower case.
+ * Converts a String to its lower cased variant based on a given [KalugaLocale]
+ * @param locale The [KalugaLocale] to use for transforming to lower case.
  */
-expect fun String.lowerCased(locale: Locale): String
+expect fun String.lowerCased(locale: KalugaLocale): String
 
 /**
- * Converts a String to its upper cased variant based on a given [Locale]
- * @param locale The [Locale] to use for transforming to upper case.
+ * Converts a String to its upper cased variant based on a given [KalugaLocale]
+ * @param locale The [KalugaLocale] to use for transforming to upper case.
  */
-expect fun String.upperCased(locale: Locale): String
+expect fun String.upperCased(locale: KalugaLocale): String
diff --git a/base/src/commonMain/kotlin/utils/KalugaDate.kt b/base/src/commonMain/kotlin/utils/KalugaDate.kt
index 5594268a1..3845bc1d1 100644
--- a/base/src/commonMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaDate.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.base.text.KalugaDateFormatter
 import com.splendo.kaluga.base.text.iso8601Pattern
-import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
+import com.splendo.kaluga.base.utils.KalugaLocale.Companion.defaultLocale
 import kotlin.jvm.JvmName
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
@@ -32,7 +32,7 @@ expect class KalugaDateHolder
 
 /**
  * Class describing a point in time
- * Dates are localized according to a [Locale] and relative to a given [KalugaTimeZone]
+ * Dates are localized according to a [KalugaLocale] and relative to a given [KalugaTimeZone]
  */
 abstract class KalugaDate : Comparable<KalugaDate> {
     /**
@@ -159,39 +159,39 @@ expect class DefaultKalugaDate : KalugaDate {
          * Creates a [KalugaDate] relative to the current time
          * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
          * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
-         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        fun now(offset: Duration = 0.milliseconds, timeZone: TimeZone = TimeZone.current(), locale: Locale = defaultLocale): KalugaDate
+        fun now(offset: Duration = 0.milliseconds, timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: KalugaLocale = defaultLocale): KalugaDate
 
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
          * @param offset The [Duration] from the epoch time. Defaults to 0 milliseconds
          * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
-         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        fun epoch(offset: Duration = 0.milliseconds, timeZone: TimeZone = TimeZone.current(), locale: Locale = defaultLocale): KalugaDate
+        fun epoch(offset: Duration = 0.milliseconds, timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: KalugaLocale = defaultLocale): KalugaDate
     }
 }
 
 /**
  * Creates a [KalugaDate] relative to the current time
  * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
- * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
- * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+ * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
+ * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
  * @return A [KalugaDate] relative to the current time
  */
-fun DefaultKalugaDate.Companion.now(offsetInMilliseconds: Long, timeZone: TimeZone = TimeZone.current(), locale: Locale = defaultLocale): KalugaDate = now(offsetInMilliseconds.milliseconds, timeZone, locale)
+fun DefaultKalugaDate.Companion.now(offsetInMilliseconds: Long, timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: KalugaLocale = defaultLocale): KalugaDate = now(offsetInMilliseconds.milliseconds, timeZone, locale)
 
 /**
  * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
  * @param offsetInMilliseconds The offset in milliseconds from the epoch time. Defaults to 0
- * @param timeZone The [TimeZone] in which the Date is set. Defaults to [TimeZone.current]
- * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+ * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
+ * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
  * @return A [KalugaDate] relative to the current time
  */
-fun DefaultKalugaDate.Companion.epoch(offsetInMilliseconds: Long, timeZone: TimeZone = TimeZone.current(), locale: Locale = defaultLocale): KalugaDate = epoch(offsetInMilliseconds.milliseconds, timeZone, locale)
+fun DefaultKalugaDate.Companion.epoch(offsetInMilliseconds: Long, timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: KalugaLocale = defaultLocale): KalugaDate = epoch(offsetInMilliseconds.milliseconds, timeZone, locale)
 
 @Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaDate"))
 typealias Date = KalugaDate
@@ -222,19 +222,19 @@ infix operator fun KalugaDate.minus(duration: Duration) = this + (-duration)
 /**
  * Creates a [KalugaDate] relative to the current time, in the UTC timezone
  * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
- * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+ * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
  * @return A [KalugaDate] relative to the current time, in the UTC timezone
  */
-fun DefaultKalugaDate.Companion.nowUtc(offset: Duration = 0.milliseconds, locale: Locale = defaultLocale): KalugaDate =
-    now(offset, TimeZone.utc, locale)
+fun DefaultKalugaDate.Companion.nowUtc(offset: Duration = 0.milliseconds, locale: KalugaLocale = defaultLocale): KalugaDate =
+    now(offset, KalugaTimeZone.utc, locale)
 
 /**
  * Creates a [KalugaDate] relative to the current time, in the UTC timezone
  * @param offsetInMilliseconds The offset in milliseconds from the current time. Defaults to 0
- * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+ * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
  * @return A [KalugaDate] relative to the current time, in the UTC timezone
  */
-fun DefaultKalugaDate.Companion.nowUtc(offsetInMilliseconds: Long, locale: Locale = defaultLocale): KalugaDate = nowUtc(offsetInMilliseconds.milliseconds, locale)
+fun DefaultKalugaDate.Companion.nowUtc(offsetInMilliseconds: Long, locale: KalugaLocale = defaultLocale): KalugaDate = nowUtc(offsetInMilliseconds.milliseconds, locale)
 
 /**
  * Gets a [KalugaDate] equal to midnight on the same day as this Date
@@ -261,18 +261,18 @@ fun KalugaDate.toEndOfDay() = this.copy().apply {
 /**
  * Gets a [KalugaDate] that is set at midnight on the same day as the current time.
  * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
- * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+ * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
  * @return A [KalugaDate] that is set at midnight on the same day as the current time.
  */
-fun DefaultKalugaDate.Companion.today(timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: Locale = defaultLocale) = now(timeZone = timeZone, locale = locale).toStartOfDay()
+fun DefaultKalugaDate.Companion.today(timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: KalugaLocale = defaultLocale) = now(timeZone = timeZone, locale = locale).toStartOfDay()
 
 /**
  * Gets a [KalugaDate] that is set at midnight on the day after the current time.
  * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
- * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+ * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
  * @return A [KalugaDate] that is set at midnight on the day after the current time.
  */
-fun DefaultKalugaDate.Companion.tomorrow(timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: Locale = defaultLocale) = today(timeZone = timeZone, locale = locale).apply { day += 1 }
+fun DefaultKalugaDate.Companion.tomorrow(timeZone: KalugaTimeZone = KalugaTimeZone.current(), locale: KalugaLocale = defaultLocale) = today(timeZone = timeZone, locale = locale).apply { day += 1 }
 
 /**
  * Checks whether a [KalugaDate] is on the same day as a given Date.
diff --git a/base/src/commonMain/kotlin/utils/Locale.kt b/base/src/commonMain/kotlin/utils/KalugaLocale.kt
similarity index 54%
rename from base/src/commonMain/kotlin/utils/Locale.kt
rename to base/src/commonMain/kotlin/utils/KalugaLocale.kt
index 68cfcb4d4..f69e8ef37 100644
--- a/base/src/commonMain/kotlin/utils/Locale.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaLocale.kt
@@ -46,7 +46,7 @@ abstract class BaseLocale {
     abstract val scriptCode: String
 
     /**
-     * Any arbitrary value used to indicate a variation of a [Locale].
+     * Any arbitrary value used to indicate a variation of a [KalugaLocale].
      * Where there are two or more variant values each indicating its own semantics, these values should be ordered by importance, with most important first, separated by underscore('_').
      *
      * Example: "polyton" (Polytonic Greek), "POSIX"
@@ -54,44 +54,44 @@ abstract class BaseLocale {
     abstract val variantCode: String
 
     /**
-     * Returns [UnitSystem] for the [Locale].
+     * Returns [UnitSystem] for the [KalugaLocale].
      */
     abstract val unitSystem: UnitSystem
 
     /**
-     * Gets the name of the [Locale], localized according to a given [Locale]
-     * @param forLocale The [Locale] for which the name should be localized
-     * @return The name of this [Locale]
+     * Gets the name of the [KalugaLocale], localized according to a given [KalugaLocale]
+     * @param forLocale The [KalugaLocale] for which the name should be localized
+     * @return The name of this [KalugaLocale]
      */
-    abstract fun name(forLocale: Locale): String
+    abstract fun name(forLocale: KalugaLocale): String
 
     /**
-     * Gets the county name of the [Locale], localized according to a given [Locale]
-     * @param forLocale The [Locale] for which the country name should be localized
-     * @return The country name of this [Locale]
+     * Gets the county name of the [KalugaLocale], localized according to a given [KalugaLocale]
+     * @param forLocale The [KalugaLocale] for which the country name should be localized
+     * @return The country name of this [KalugaLocale]
      */
-    abstract fun countryName(forLocale: Locale): String
+    abstract fun countryName(forLocale: KalugaLocale): String
 
     /**
-     * Gets the language name of the [Locale], localized according to a given [Locale]
-     * @param forLocale The [Locale] for which the language name should be localized
-     * @return The language name of this [Locale]
+     * Gets the language name of the [KalugaLocale], localized according to a given [KalugaLocale]
+     * @param forLocale The [KalugaLocale] for which the language name should be localized
+     * @return The language name of this [KalugaLocale]
      */
-    abstract fun languageName(forLocale: Locale): String
+    abstract fun languageName(forLocale: KalugaLocale): String
 
     /**
-     * Gets the variant name of the [Locale], localized according to a given [Locale]
-     * @param forLocale The [Locale] for which the variant name should be localized
-     * @return The variant name of this [Locale]
+     * Gets the variant name of the [KalugaLocale], localized according to a given [KalugaLocale]
+     * @param forLocale The [KalugaLocale] for which the variant name should be localized
+     * @return The variant name of this [KalugaLocale]
      */
-    abstract fun variantName(forLocale: Locale): String
+    abstract fun variantName(forLocale: KalugaLocale): String
 
     /**
-     * Gets the script name of the [Locale], localized according to a given [Locale]
-     * @param forLocale The [Locale] for which the script name should be localized
-     * @return The script name of this [Locale]
+     * Gets the script name of the [KalugaLocale], localized according to a given [KalugaLocale]
+     * @param forLocale The [KalugaLocale] for which the script name should be localized
+     * @return The script name of this [KalugaLocale]
      */
-    abstract fun scriptName(forLocale: Locale): String
+    abstract fun scriptName(forLocale: KalugaLocale): String
 
     /**
      * The Character(s) used for indicating the start of a quote
@@ -118,55 +118,58 @@ abstract class BaseLocale {
 /**
  * Default implementation of [BaseLocale]
  */
-expect class Locale : BaseLocale {
+expect class KalugaLocale : BaseLocale {
     companion object {
 
         /**
-         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
+         * Creates a [KalugaLocale] based on a `language` ISO 639 alpha-2 or alpha-3 code
          * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
-         * @return The [Locale] for the given [language]
+         * @return The [KalugaLocale] for the given [language]
          */
-        fun createLocale(language: String): Locale
+        fun createLocale(language: String): KalugaLocale
 
         /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
+         * Creates a [KalugaLocale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
          * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
          * @param country a ISO 3166 alpha-2 `country` code.
-         * @return The [Locale] for the given [language] and [country]
+         * @return The [KalugaLocale] for the given [language] and [country]
          */
-        fun createLocale(language: String, country: String): Locale
+        fun createLocale(language: String, country: String): KalugaLocale
 
         /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
+         * Creates a [KalugaLocale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
          * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
          * @param country a ISO 3166 alpha-2 `country` code.
-         * @param variant Arbitrary value used to indicate a variation of a [Locale]
-         * @return The [Locale] for the given [language], [country], and [variant]
+         * @param variant Arbitrary value used to indicate a variation of a [KalugaLocale]
+         * @return The [KalugaLocale] for the given [language], [country], and [variant]
          */
-        fun createLocale(language: String, country: String, variant: String): Locale
+        fun createLocale(language: String, country: String, variant: String): KalugaLocale
 
         /**
-         * The default [Locale] of the user
+         * The default [KalugaLocale] of the user
          */
-        val defaultLocale: Locale
+        val defaultLocale: KalugaLocale
 
         /**
-         * A list of [Locale] available to the user.
+         * A list of [KalugaLocale] available to the user.
          */
-        val availableLocales: List<Locale>
+        val availableLocales: List<KalugaLocale>
     }
 }
 
 /**
  * Locale for English/US in a POSIX format. Useful shortcut when dealing with fixed locale formats.
  */
-val Locale.Companion.enUsPosix get() = createLocale("en", "US", "POSIX")
+val KalugaLocale.Companion.enUsPosix get() = createLocale("en", "US", "POSIX")
 
 /**
  * Indicates whether this locale use a 24 hour clock cycle.
  */
-val Locale.uses24HourClock: Boolean get() {
+val KalugaLocale.uses24HourClock: Boolean get() {
     val formatter = KalugaDateFormatter.timeFormat(DateFormatStyle.Medium, locale = this)
     val formattedDate = formatter.format(DefaultKalugaDate.now())
     return !formattedDate.contains(formatter.amString) && !formattedDate.contains(formatter.pmString)
 }
+
+@Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaLocale"))
+typealias Locale = KalugaLocale
diff --git a/base/src/commonMain/kotlin/utils/KalugaTimeZone.kt b/base/src/commonMain/kotlin/utils/KalugaTimeZone.kt
index 94808d7a2..333fd0a72 100644
--- a/base/src/commonMain/kotlin/utils/KalugaTimeZone.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaTimeZone.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate.Companion.now
-import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
+import com.splendo.kaluga.base.utils.KalugaLocale.Companion.defaultLocale
 import kotlin.time.Duration
 
 /**
@@ -54,12 +54,12 @@ abstract class BaseTimeZone {
     abstract val identifier: String
 
     /**
-     * Gets the display name for this [KalugaTimeZone] formatted for a given [Locale]
+     * Gets the display name for this [KalugaTimeZone] formatted for a given [KalugaLocale]
      * @param style The [TimeZoneNameStyle] of the name. Can be either [TimeZoneNameStyle.Short] or [TimeZoneNameStyle.Long]
      * @param withDaylightSavings If `true` the name for the DaylightSavings version of the [KalugaTimeZone] will be used. Defaults to [KalugaTimeZone.usesDaylightSavingsTime]
-     * @param locale The [Locale] used for naming the [KalugaTimeZone]. Defaults to [Locale.defaultLocale]
+     * @param locale The [KalugaLocale] used for naming the [KalugaTimeZone]. Defaults to [KalugaLocale.defaultLocale]
      */
-    abstract fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean = usesDaylightSavingsTime(), locale: Locale = defaultLocale): String
+    abstract fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean = usesDaylightSavingsTime(), locale: KalugaLocale = defaultLocale): String
 
     /**
      * The [Duration] this timezone differs from GMT when daylight savings time is not active
@@ -82,9 +82,9 @@ abstract class BaseTimeZone {
     val daylightSavingsOffsetInMilliseconds: Long get() = daylightSavingsOffset.inWholeMilliseconds
 
     /**
-     * The [Duration] this [TimeZone] differs from GMT at a given [KalugaDate]
+     * The [Duration] this [KalugaTimeZone] differs from GMT at a given [KalugaDate]
      * @param date The [KalugaDate] for which to check the offset. Defaults to [DefaultKalugaDate.now]
-     * @return The number of milliseconds this [TimeZone] differs from GMT at [date]
+     * @return The number of milliseconds this [KalugaTimeZone] differs from GMT at [date]
      */
     abstract fun offsetFromGMTAtDate(date: KalugaDate = now()): Duration
 
diff --git a/base/src/commonTest/kotlin/text/DateFormatterTest.kt b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
index 4fe4df33e..beab5e4c5 100644
--- a/base/src/commonTest/kotlin/text/DateFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/DateFormatterTest.kt
@@ -18,8 +18,8 @@
 package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
-import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.Locale.Companion.createLocale
+import com.splendo.kaluga.base.utils.KalugaLocale
+import com.splendo.kaluga.base.utils.KalugaLocale.Companion.createLocale
 import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.enUsPosix
 import com.splendo.kaluga.base.utils.nowUtc
@@ -112,11 +112,11 @@ class DateFormatterTest {
 
     @Test
     fun testParseDateWithDifferentTimezone() {
-        val utcFormatter = KalugaDateFormatter.patternFormat("yyyy.MM.dd G 'at' HH:mm:ss z", KalugaTimeZone.utc, Locale.enUsPosix)
-        val pstFormatter = KalugaDateFormatter.patternFormat("yyyy.MM.dd G 'at' HH:mm:ss z", PSTTimeZone, Locale.enUsPosix)
+        val utcFormatter = KalugaDateFormatter.patternFormat("yyyy.MM.dd G 'at' HH:mm:ss z", KalugaTimeZone.utc, KalugaLocale.enUsPosix)
+        val pstFormatter = KalugaDateFormatter.patternFormat("yyyy.MM.dd G 'at' HH:mm:ss z", PSTTimeZone, KalugaLocale.enUsPosix)
 
-        val epochInUtc = DefaultKalugaDate.epoch(timeZone = KalugaTimeZone.utc, locale = Locale.enUsPosix)
-        val epochInPst = DefaultKalugaDate.epoch(timeZone = PSTTimeZone, locale = Locale.enUsPosix)
+        val epochInUtc = DefaultKalugaDate.epoch(timeZone = KalugaTimeZone.utc, locale = KalugaLocale.enUsPosix)
+        val epochInPst = DefaultKalugaDate.epoch(timeZone = PSTTimeZone, locale = KalugaLocale.enUsPosix)
         assertEquals("1970.01.01 AD at 00:00:00 ${KalugaTimeZone.utc.identifier}", utcFormatter.format(epochInUtc))
         assertEquals("1970.01.01 AD at 00:00:00 ${KalugaTimeZone.utc.identifier}", utcFormatter.format(epochInPst))
         assertEquals("1969.12.31 AD at 16:00:00 PST", pstFormatter.format(epochInUtc))
diff --git a/base/src/commonTest/kotlin/text/NumberFormatterTest.kt b/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
index fbdafbfba..1ebcd0ff3 100644
--- a/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/NumberFormatterTest.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale.Companion.createLocale
+import com.splendo.kaluga.base.utils.KalugaLocale.Companion.createLocale
 import com.splendo.kaluga.test.base.BaseTest
 import kotlin.test.Ignore
 import kotlin.test.Test
diff --git a/base/src/commonTest/kotlin/text/StringFormatterTest.kt b/base/src/commonTest/kotlin/text/StringFormatterTest.kt
index dadb38a36..c02315343 100644
--- a/base/src/commonTest/kotlin/text/StringFormatterTest.kt
+++ b/base/src/commonTest/kotlin/text/StringFormatterTest.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
-import com.splendo.kaluga.base.utils.Locale.Companion.createLocale
+import com.splendo.kaluga.base.utils.KalugaLocale.Companion.createLocale
 import com.splendo.kaluga.base.utils.KalugaTimeZone
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/base/src/commonTest/kotlin/utils/DateTest.kt b/base/src/commonTest/kotlin/utils/DateTest.kt
index 1a6024962..6bc053d5d 100644
--- a/base/src/commonTest/kotlin/utils/DateTest.kt
+++ b/base/src/commonTest/kotlin/utils/DateTest.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.base.test.utils
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.enUsPosix
 import com.splendo.kaluga.base.utils.nowUtc
@@ -35,7 +35,7 @@ class DateTest {
 
     @Test
     fun testEquality() {
-        val now = DefaultKalugaDate.now(locale = Locale.enUsPosix)
+        val now = DefaultKalugaDate.now(locale = KalugaLocale.enUsPosix)
         assertEquals(now, now.copy(), "copied Date should be equal")
 
         val nearEpoch = DefaultKalugaDate.epoch(1001.milliseconds)
@@ -46,38 +46,38 @@ class DateTest {
 
     @Test
     fun testUTCDate() {
-        val utcNow = DefaultKalugaDate.nowUtc(locale = Locale.enUsPosix)
+        val utcNow = DefaultKalugaDate.nowUtc(locale = KalugaLocale.enUsPosix)
         val epochNow = utcNow.durationSinceEpoch
-        val now = DefaultKalugaDate.epoch(epochNow, KalugaTimeZone.utc, locale = Locale.enUsPosix)
+        val now = DefaultKalugaDate.epoch(epochNow, KalugaTimeZone.utc, locale = KalugaLocale.enUsPosix)
         assertEquals(utcNow.durationSinceEpoch, now.durationSinceEpoch)
         assertEquals(utcNow, now)
     }
 
     @Test
     fun testCreateEpochDate() {
-        val someDay = DefaultKalugaDate.epoch(locale = Locale.enUsPosix).apply {
+        val someDay = DefaultKalugaDate.epoch(locale = KalugaLocale.enUsPosix).apply {
             year = 2020
             month = 5
             day = 12
             hour = 8
             minute = 45
         }
-        val epoch = DefaultKalugaDate.epoch(locale = Locale.enUsPosix)
+        val epoch = DefaultKalugaDate.epoch(locale = KalugaLocale.enUsPosix)
 
         assertTrue(epoch < someDay)
     }
 
     @Test
     fun testCreateNowDate() {
-        val now = DefaultKalugaDate.now(locale = Locale.enUsPosix)
-        val epoch = DefaultKalugaDate.epoch(locale = Locale.enUsPosix)
+        val now = DefaultKalugaDate.now(locale = KalugaLocale.enUsPosix)
+        val epoch = DefaultKalugaDate.epoch(locale = KalugaLocale.enUsPosix)
 
         assertTrue(now > epoch)
     }
 
     @Test
     fun testUpdateDate() {
-        val epoch = DefaultKalugaDate.epoch(locale = Locale.enUsPosix)
+        val epoch = DefaultKalugaDate.epoch(locale = KalugaLocale.enUsPosix)
         val isEarlierThanGMT = epoch.timeZone.offsetFromGMTAtDate(epoch).isNegative()
         assertEquals(if (isEarlierThanGMT) 1969 else 1970, epoch.year)
         assertEquals(if (isEarlierThanGMT) 12 else 1, epoch.month)
@@ -88,7 +88,7 @@ class DateTest {
 
     @Test
     fun testGet() {
-        val someDay = DefaultKalugaDate.epoch(574695462750.milliseconds, TimeZone.utc, locale = Locale.enUsPosix)
+        val someDay = DefaultKalugaDate.epoch(574695462750.milliseconds, KalugaTimeZone.utc, locale = KalugaLocale.enUsPosix)
 
         assertEquals(1, someDay.era)
         assertEquals(1988, someDay.year)
@@ -107,11 +107,11 @@ class DateTest {
 
     @Test
     fun testStartOfWeek() {
-        val france = Locale.createLocale("fr", "FR")
-        val us = Locale.createLocale("en", "US")
+        val france = KalugaLocale.createLocale("fr", "FR")
+        val us = KalugaLocale.createLocale("en", "US")
 
-        val frenchNow = DefaultKalugaDate.now(0.milliseconds, TimeZone.utc, france)
-        val usNow = DefaultKalugaDate.now(0.milliseconds, TimeZone.utc, us)
+        val frenchNow = DefaultKalugaDate.now(0.milliseconds, KalugaTimeZone.utc, france)
+        val usNow = DefaultKalugaDate.now(0.milliseconds, KalugaTimeZone.utc, us)
 
         assertEquals(2, frenchNow.firstWeekDay)
         assertEquals(1, usNow.firstWeekDay)
@@ -119,7 +119,7 @@ class DateTest {
 
     @Test
     fun testDaylightSavings() {
-        val dayBeforeDLS = DefaultKalugaDate.epoch(1616828400000.milliseconds, locale = Locale.createLocale("nl", "NL"), timeZone = TimeZone.get("Europe/Amsterdam")!!)
+        val dayBeforeDLS = DefaultKalugaDate.epoch(1616828400000.milliseconds, locale = KalugaLocale.createLocale("nl", "NL"), timeZone = KalugaTimeZone.get("Europe/Amsterdam")!!)
         val startOfDayBeforeDLS = dayBeforeDLS.toStartOfDay()
         assertEquals(0, startOfDayBeforeDLS.hour)
         assertEquals(27, startOfDayBeforeDLS.day)
diff --git a/base/src/commonTest/kotlin/utils/LocaleTest.kt b/base/src/commonTest/kotlin/utils/LocaleTest.kt
index 9e96389c3..b5790a82d 100644
--- a/base/src/commonTest/kotlin/utils/LocaleTest.kt
+++ b/base/src/commonTest/kotlin/utils/LocaleTest.kt
@@ -24,11 +24,11 @@ class LocaleTest {
 
     @Test
     fun testLocaleUnitSystem() {
-        val usLocale = Locale.createLocale("en", "US")
+        val usLocale = KalugaLocale.createLocale("en", "US")
         assertEquals(UnitSystem.IMPERIAL, usLocale.unitSystem)
-        val ukLocale = Locale.createLocale("en", "GB")
+        val ukLocale = KalugaLocale.createLocale("en", "GB")
         assertEquals(UnitSystem.MIXED, ukLocale.unitSystem)
-        val ruLocale = Locale.createLocale("ru", "RU")
+        val ruLocale = KalugaLocale.createLocale("ru", "RU")
         assertEquals(UnitSystem.METRIC, ruLocale.unitSystem)
     }
 }
diff --git a/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt b/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
index dcd59a019..12b566acf 100644
--- a/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/iosMain/kotlin/text/KalugaDateFormatter.kt
@@ -19,7 +19,7 @@ package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import com.splendo.kaluga.base.utils.KalugaTimeZone
 import com.splendo.kaluga.base.utils.typedList
 import platform.Foundation.NSCalendar
@@ -43,24 +43,24 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
          * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun dateFormat(
             style: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = createDateFormatter(style, null, timeZone, locale)
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun timeFormat(
             style: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = createDateFormatter(null, style, timeZone, locale)
 
         /**
@@ -68,13 +68,13 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
          * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = createDateFormatter(dateStyle, timeStyle, timeZone, locale)
 
         /**
@@ -84,9 +84,9 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
          * A convenience [fixedPatternFormat] method exists to default to this behaviour.
          * @param pattern The pattern to apply.
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
-        actual fun patternFormat(pattern: String, timeZone: KalugaTimeZone, locale: Locale): KalugaDateFormatter = KalugaDateFormatter(
+        actual fun patternFormat(pattern: String, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDateFormatter = KalugaDateFormatter(
             NSDateFormatter().apply {
                 this.locale = locale.nsLocale
                 this.timeZone = timeZone.timeZone
@@ -99,7 +99,7 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
             dateStyle: DateFormatStyle?,
             timeStyle: DateFormatStyle?,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = KalugaDateFormatter(
             NSDateFormatter().apply {
                 this.locale = locale.nsLocale
@@ -116,7 +116,7 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
             DefaultKalugaDate.now(
                 offset = Duration.ZERO,
                 timeZone = timeZone,
-                locale = Locale.defaultLocale
+                locale = KalugaLocale.defaultLocale
             ).apply {
                 // Cannot use .utc since it may not be available when this method is called
                 // This is likely caused by https://youtrack.jetbrains.com/issue/KT-38181
@@ -124,7 +124,7 @@ actual class KalugaDateFormatter private constructor(private val format: NSDateF
                 val epoch = DefaultKalugaDate.epoch(
                     offset = Duration.ZERO,
                     timeZone = KalugaTimeZone.get("UTC")!!,
-                    locale = Locale.defaultLocale
+                    locale = KalugaLocale.defaultLocale
                 )
                 this.era = epoch.era
                 this.year = epoch.year
diff --git a/base/src/iosMain/kotlin/text/NumberFormatter.kt b/base/src/iosMain/kotlin/text/NumberFormatter.kt
index b0f3cedf2..c53818c03 100644
--- a/base/src/iosMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/iosMain/kotlin/text/NumberFormatter.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import platform.Foundation.NSNumber
 import platform.Foundation.NSNumberFormatter
 import platform.Foundation.NSNumberFormatterCurrencyStyle
@@ -34,10 +34,10 @@ import platform.Foundation.numberWithInt
 
 /**
  * Default implementation of [BaseNumberFormatter]
- * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
+ * @param locale The [KalugaLocale] used for parsing. Defaults to [KalugaLocale.defaultLocale].
  * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
  */
-actual class NumberFormatter actual constructor(override val locale: Locale, style: NumberFormatStyle) : BaseNumberFormatter {
+actual class NumberFormatter actual constructor(override val locale: KalugaLocale, style: NumberFormatStyle) : BaseNumberFormatter {
 
     @ExperimentalUnsignedTypes
     private val formatter = NSNumberFormatter().apply {
diff --git a/base/src/iosMain/kotlin/text/StringUtils.kt b/base/src/iosMain/kotlin/text/StringUtils.kt
index 17b531300..315921e9a 100644
--- a/base/src/iosMain/kotlin/text/StringUtils.kt
+++ b/base/src/iosMain/kotlin/text/StringUtils.kt
@@ -19,7 +19,7 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import platform.Foundation.NSString
 import platform.Foundation.lowercaseStringWithLocale
 import platform.Foundation.uppercaseStringWithLocale
@@ -30,13 +30,13 @@ import platform.Foundation.uppercaseStringWithLocale
 actual val lineSeparator = "\n"
 
 /**
- * Converts a String to its lower cased variant based on a given [Locale]
- * @param locale The [Locale] to use for transforming to lower case.
+ * Converts a String to its lower cased variant based on a given [KalugaLocale]
+ * @param locale The [KalugaLocale] to use for transforming to lower case.
  */
-actual fun String.lowerCased(locale: Locale): String = (this as NSString).lowercaseStringWithLocale(locale.nsLocale)
+actual fun String.lowerCased(locale: KalugaLocale): String = (this as NSString).lowercaseStringWithLocale(locale.nsLocale)
 
 /**
- * Converts a String to its upper cased variant based on a given [Locale]
- * @param locale The [Locale] to use for transforming to upper case.
+ * Converts a String to its upper cased variant based on a given [KalugaLocale]
+ * @param locale The [KalugaLocale] to use for transforming to upper case.
  */
-actual fun String.upperCased(locale: Locale): String = (this as NSString).uppercaseStringWithLocale(locale.nsLocale)
+actual fun String.upperCased(locale: KalugaLocale): String = (this as NSString).uppercaseStringWithLocale(locale.nsLocale)
diff --git a/base/src/iosMain/kotlin/utils/KalugaDate.kt b/base/src/iosMain/kotlin/utils/KalugaDate.kt
index 63bfebb3c..3a1cf75fa 100644
--- a/base/src/iosMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaDate.kt
@@ -58,10 +58,10 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
          * Creates a [KalugaDate] relative to the current time
          * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
          * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
-         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate {
+        actual fun now(offset: Duration, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDate {
             val calendar = NSCalendar.currentCalendar.apply {
                 this.locale = locale.nsLocale
                 this.timeZone = timeZone.timeZone
@@ -74,10 +74,10 @@ actual class DefaultKalugaDate internal constructor(private val calendar: NSCale
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
          * @param offset The [Duration] from the epoch time. Defaults to 0 milliseconds
          * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
-         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate {
+        actual fun epoch(offset: Duration, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDate {
             val calendar = NSCalendar.currentCalendar.apply {
                 this.locale = locale.nsLocale
                 this.timeZone = timeZone.timeZone
diff --git a/base/src/iosMain/kotlin/utils/Locale.kt b/base/src/iosMain/kotlin/utils/KalugaLocale.kt
similarity index 61%
rename from base/src/iosMain/kotlin/utils/Locale.kt
rename to base/src/iosMain/kotlin/utils/KalugaLocale.kt
index 5f38f510f..781efccdf 100644
--- a/base/src/iosMain/kotlin/utils/Locale.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaLocale.kt
@@ -39,43 +39,43 @@ import platform.Foundation.variantCode
  * Default implementation of [BaseLocale]
  * @property nsLocale the internal [NSLocale] tracking this locale.
  */
-actual data class Locale internal constructor(val nsLocale: NSLocale) : BaseLocale() {
+actual data class KalugaLocale internal constructor(val nsLocale: NSLocale) : BaseLocale() {
 
     actual companion object {
 
         /**
-         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
+         * Creates a [KalugaLocale] based on a `language` ISO 639 alpha-2 or alpha-3 code
          * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
-         * @return The [Locale] for the given [language]
+         * @return The [KalugaLocale] for the given [language]
          */
-        actual fun createLocale(language: String): Locale = createLocale(language, "")
+        actual fun createLocale(language: String): KalugaLocale = createLocale(language, "")
 
         /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
+         * Creates a [KalugaLocale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
          * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
          * @param country a ISO 3166 alpha-2 `country` code.
-         * @return The [Locale] for the given [language] and [country]
+         * @return The [KalugaLocale] for the given [language] and [country]
          */
-        actual fun createLocale(language: String, country: String): Locale = createLocale(language, country, "")
+        actual fun createLocale(language: String, country: String): KalugaLocale = createLocale(language, country, "")
 
         /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
+         * Creates a [KalugaLocale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
          * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
          * @param country a ISO 3166 alpha-2 `country` code.
-         * @param variant Arbitrary value used to indicate a variation of a [Locale]
-         * @return The [Locale] for the given [language], [country], and [variant]
+         * @param variant Arbitrary value used to indicate a variation of a [KalugaLocale]
+         * @return The [KalugaLocale] for the given [language], [country], and [variant]
          */
-        actual fun createLocale(language: String, country: String, variant: String): Locale = Locale(NSLocale(listOf(language, country, variant).filter { it.isNotEmpty() }.joinToString("_")))
+        actual fun createLocale(language: String, country: String, variant: String): KalugaLocale = KalugaLocale(NSLocale(listOf(language, country, variant).filter { it.isNotEmpty() }.joinToString("_")))
 
         /**
-         * The default [Locale] of the user
+         * The default [KalugaLocale] of the user
          */
-        actual val defaultLocale: Locale get() = Locale(NSLocale.currentLocale)
+        actual val defaultLocale: KalugaLocale get() = KalugaLocale(NSLocale.currentLocale)
 
         /**
-         * A list of [Locale] available to the user.
+         * A list of [KalugaLocale] available to the user.
          */
-        actual val availableLocales: List<Locale> = NSLocale.availableLocaleIdentifiers.typedList<String>().map { Locale(NSLocale(it)) }
+        actual val availableLocales: List<KalugaLocale> = NSLocale.availableLocaleIdentifiers.typedList<String>().map { KalugaLocale(NSLocale(it)) }
     }
 
     override val countryCode: String
@@ -91,11 +91,11 @@ actual data class Locale internal constructor(val nsLocale: NSLocale) : BaseLoca
             UnitSystem.withRawValue(it)
         } ?: UnitSystem.METRIC
 
-    override fun name(forLocale: Locale): String = forLocale.nsLocale.localizedStringForLocaleIdentifier(nsLocale.localeIdentifier)
-    override fun countryName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForCountryCode(countryCode) ?: ""
-    override fun languageName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForLanguageCode(languageCode) ?: ""
-    override fun variantName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForVariantCode(variantCode) ?: ""
-    override fun scriptName(forLocale: Locale): String = forLocale.nsLocale.localizedStringForScriptCode(scriptCode) ?: ""
+    override fun name(forLocale: KalugaLocale): String = forLocale.nsLocale.localizedStringForLocaleIdentifier(nsLocale.localeIdentifier)
+    override fun countryName(forLocale: KalugaLocale): String = forLocale.nsLocale.localizedStringForCountryCode(countryCode) ?: ""
+    override fun languageName(forLocale: KalugaLocale): String = forLocale.nsLocale.localizedStringForLanguageCode(languageCode) ?: ""
+    override fun variantName(forLocale: KalugaLocale): String = forLocale.nsLocale.localizedStringForVariantCode(variantCode) ?: ""
+    override fun scriptName(forLocale: KalugaLocale): String = forLocale.nsLocale.localizedStringForScriptCode(scriptCode) ?: ""
 
     override val quotationStart: String = nsLocale.quotationBeginDelimiter
     override val quotationEnd: String = nsLocale.quotationEndDelimiter
diff --git a/base/src/iosMain/kotlin/utils/KalugaTimeZone.kt b/base/src/iosMain/kotlin/utils/KalugaTimeZone.kt
index 1dc6847a4..aef540465 100644
--- a/base/src/iosMain/kotlin/utils/KalugaTimeZone.kt
+++ b/base/src/iosMain/kotlin/utils/KalugaTimeZone.kt
@@ -68,7 +68,7 @@ actual class KalugaTimeZone internal constructor(val timeZone: NSTimeZone) : Bas
     }
 
     override val identifier: String = timeZone.name
-    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
+    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: KalugaLocale): String {
         val nameStyle = when (style) {
             TimeZoneNameStyle.Short -> if (withDaylightSavings) NSTimeZoneNameStyle.NSTimeZoneNameStyleShortDaylightSaving else NSTimeZoneNameStyle.NSTimeZoneNameStyleShortStandard
             TimeZoneNameStyle.Long -> if (withDaylightSavings) NSTimeZoneNameStyle.NSTimeZoneNameStyleDaylightSaving else NSTimeZoneNameStyle.NSTimeZoneNameStyleStandard
diff --git a/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt b/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
index 2f98217da..c61f8ee07 100644
--- a/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/jsMain/kotlin/text/KalugaDateFormatter.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.KalugaDate
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import com.splendo.kaluga.base.utils.KalugaTimeZone
 
 // TODO Implement with proper dateformatter solution for Java Script
@@ -33,24 +33,24 @@ actual class KalugaDateFormatter private constructor(initialTimeZone: KalugaTime
          * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun dateFormat(
             style: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleDateString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun timeFormat(
             style: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleTimeString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
 
         /**
@@ -58,13 +58,13 @@ actual class KalugaDateFormatter private constructor(initialTimeZone: KalugaTime
          * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
 
         /**
@@ -74,9 +74,9 @@ actual class KalugaDateFormatter private constructor(initialTimeZone: KalugaTime
          * A convenience [fixedPatternFormat] method exists to default to this behaviour.
          * @param pattern The pattern to apply.
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
-        actual fun patternFormat(pattern: String, timeZone: KalugaTimeZone, locale: Locale): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
+        actual fun patternFormat(pattern: String, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDateFormatter = KalugaDateFormatter(timeZone) { date -> date.toLocaleString(arrayOf("${locale.languageCode}-${locale.countryCode}")) }
     }
 
     override var pattern: String = ""
diff --git a/base/src/jsMain/kotlin/text/NumberFormatter.kt b/base/src/jsMain/kotlin/text/NumberFormatter.kt
index f83a21a86..48423ad08 100644
--- a/base/src/jsMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/jsMain/kotlin/text/NumberFormatter.kt
@@ -17,15 +17,15 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 
 // TODO Implement with proper number formatter solution for Java Script
 /**
  * Default implementation of [BaseNumberFormatter]
- * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
+ * @param locale The [KalugaLocale] used for parsing. Defaults to [KalugaLocale.defaultLocale].
  * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
  */
-actual class NumberFormatter actual constructor(override val locale: Locale, style: NumberFormatStyle) : BaseNumberFormatter {
+actual class NumberFormatter actual constructor(override val locale: KalugaLocale, style: NumberFormatStyle) : BaseNumberFormatter {
     override var percentSymbol: Char = '%'
     override var perMillSymbol: Char = '\u2030'
     override var minusSign: Char = '-'
diff --git a/base/src/jsMain/kotlin/text/StringUtils.kt b/base/src/jsMain/kotlin/text/StringUtils.kt
index e52fbc66f..fafd39a86 100644
--- a/base/src/jsMain/kotlin/text/StringUtils.kt
+++ b/base/src/jsMain/kotlin/text/StringUtils.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 
 /**
  * The String that serves as a line separator.
@@ -25,13 +25,13 @@ import com.splendo.kaluga.base.utils.Locale
 actual val lineSeparator = "\n"
 
 /**
- * Converts a String to its lower cased variant based on a given [Locale]
- * @param locale The [Locale] to use for transforming to lower case.
+ * Converts a String to its lower cased variant based on a given [KalugaLocale]
+ * @param locale The [KalugaLocale] to use for transforming to lower case.
  */
-actual fun String.lowerCased(locale: Locale): String = this.lowercase()
+actual fun String.lowerCased(locale: KalugaLocale): String = this.lowercase()
 
 /**
- * Converts a String to its upper cased variant based on a given [Locale]
- * @param locale The [Locale] to use for transforming to upper case.
+ * Converts a String to its upper cased variant based on a given [KalugaLocale]
+ * @param locale The [KalugaLocale] to use for transforming to upper case.
  */
-actual fun String.upperCased(locale: Locale): String = this.uppercase()
+actual fun String.upperCased(locale: KalugaLocale): String = this.uppercase()
diff --git a/base/src/jsMain/kotlin/utils/KalugaDate.kt b/base/src/jsMain/kotlin/utils/KalugaDate.kt
index 78bf749f6..b04e01ec6 100644
--- a/base/src/jsMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaDate.kt
@@ -34,19 +34,19 @@ actual class DefaultKalugaDate internal constructor(override val date: KalugaDat
          * Creates a [KalugaDate] relative to the current time
          * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
          * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
-         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(kotlin.js.Date.now() + offset.inWholeMilliseconds))
+        actual fun now(offset: Duration, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(kotlin.js.Date.now() + offset.inWholeMilliseconds))
 
         /**
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
          * @param offset The [Duration] from the epoch time. Defaults to 0 milliseconds
          * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
-         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(offset.inWholeMilliseconds))
+        actual fun epoch(offset: Duration, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDate = DefaultKalugaDate(kotlin.js.Date(offset.inWholeMilliseconds))
     }
 
     override var timeZone: KalugaTimeZone
diff --git a/base/src/jsMain/kotlin/utils/Locale.kt b/base/src/jsMain/kotlin/utils/KalugaLocale.kt
similarity index 55%
rename from base/src/jsMain/kotlin/utils/Locale.kt
rename to base/src/jsMain/kotlin/utils/KalugaLocale.kt
index 7ad0c99ca..8066d7bbb 100644
--- a/base/src/jsMain/kotlin/utils/Locale.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaLocale.kt
@@ -21,7 +21,7 @@ package com.splendo.kaluga.base.utils
 /**
  * Default implementation of [BaseLocale]
  */
-actual data class Locale internal constructor(
+actual data class KalugaLocale internal constructor(
     override val languageCode: String,
     override val countryCode: String = "",
     override val variantCode: String = "",
@@ -32,45 +32,45 @@ actual data class Locale internal constructor(
     actual companion object {
 
         /**
-         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
+         * Creates a [KalugaLocale] based on a `language` ISO 639 alpha-2 or alpha-3 code
          * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
-         * @return The [Locale] for the given [language]
+         * @return The [KalugaLocale] for the given [language]
          */
-        actual fun createLocale(language: String): Locale = Locale(language)
+        actual fun createLocale(language: String): KalugaLocale = KalugaLocale(language)
 
         /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
+         * Creates a [KalugaLocale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
          * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
          * @param country a ISO 3166 alpha-2 `country` code.
-         * @return The [Locale] for the given [language] and [country]
+         * @return The [KalugaLocale] for the given [language] and [country]
          */
-        actual fun createLocale(language: String, country: String): Locale = Locale(language, country)
+        actual fun createLocale(language: String, country: String): KalugaLocale = KalugaLocale(language, country)
 
         /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
+         * Creates a [KalugaLocale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
          * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
          * @param country a ISO 3166 alpha-2 `country` code.
-         * @param variant Arbitrary value used to indicate a variation of a [Locale]
-         * @return The [Locale] for the given [language], [country], and [variant]
+         * @param variant Arbitrary value used to indicate a variation of a [KalugaLocale]
+         * @return The [KalugaLocale] for the given [language], [country], and [variant]
          */
-        actual fun createLocale(language: String, country: String, variant: String): Locale = Locale(language, country, variant)
+        actual fun createLocale(language: String, country: String, variant: String): KalugaLocale = KalugaLocale(language, country, variant)
 
         /**
-         * The default [Locale] of the user
+         * The default [KalugaLocale] of the user
          */
-        actual val defaultLocale: Locale get() = Locale("en")
+        actual val defaultLocale: KalugaLocale get() = KalugaLocale("en")
 
         /**
-         * A list of [Locale] available to the user.
+         * A list of [KalugaLocale] available to the user.
          */
-        actual val availableLocales: List<Locale> = emptyList()
+        actual val availableLocales: List<KalugaLocale> = emptyList()
     }
 
-    override fun name(forLocale: Locale): String = "${languageCode}_${countryCode}_$variantCode"
-    override fun countryName(forLocale: Locale): String = countryCode
-    override fun languageName(forLocale: Locale): String = languageCode
-    override fun variantName(forLocale: Locale): String = variantCode
-    override fun scriptName(forLocale: Locale): String = scriptCode
+    override fun name(forLocale: KalugaLocale): String = "${languageCode}_${countryCode}_$variantCode"
+    override fun countryName(forLocale: KalugaLocale): String = countryCode
+    override fun languageName(forLocale: KalugaLocale): String = languageCode
+    override fun variantName(forLocale: KalugaLocale): String = variantCode
+    override fun scriptName(forLocale: KalugaLocale): String = scriptCode
 
     override val quotationStart: String = "\""
     override val quotationEnd: String = "\""
diff --git a/base/src/jsMain/kotlin/utils/KalugaTimeZone.kt b/base/src/jsMain/kotlin/utils/KalugaTimeZone.kt
index b12fb914b..7a5c1a657 100644
--- a/base/src/jsMain/kotlin/utils/KalugaTimeZone.kt
+++ b/base/src/jsMain/kotlin/utils/KalugaTimeZone.kt
@@ -48,7 +48,7 @@ actual class KalugaTimeZone internal constructor() : BaseTimeZone() {
     }
 
     override val identifier: String = ""
-    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String = ""
+    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: KalugaLocale): String = ""
     override val offsetFromGMT = 0.milliseconds
     override val daylightSavingsOffset = 0.milliseconds
     override fun offsetFromGMTAtDate(date: KalugaDate): Duration = 0.milliseconds
diff --git a/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt b/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
index 99ceefe2d..e33d9018a 100644
--- a/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
+++ b/base/src/jvmMain/kotlin/text/KalugaDateFormatter.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.base.text
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import com.splendo.kaluga.base.utils.KalugaTimeZone
 import java.text.DateFormat
 import java.text.DateFormatSymbols
@@ -39,24 +39,24 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
          * Creates a [KalugaDateFormatter] that only formats the date components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun dateFormat(
             style: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
         /**
          * Creates a [KalugaDateFormatter] that only formats the time components of a [KalugaDate]
          * @param style The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun timeFormat(
             style: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getTimeInstance(style.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
         /**
@@ -64,13 +64,13 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
          * @param dateStyle The [DateFormatStyle] used for formatting the date components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeStyle The [DateFormatStyle] used for formatting the time components of the [KalugaDate]. Defaults to [DateFormatStyle.Medium].
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun dateTimeFormat(
             dateStyle: DateFormatStyle,
             timeStyle: DateFormatStyle,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = createDateFormatter(DateFormat.getDateTimeInstance(dateStyle.javaStyle(), timeStyle.javaStyle(), locale.locale) as SimpleDateFormat, timeZone)
 
         /**
@@ -80,12 +80,12 @@ actual class KalugaDateFormatter private constructor(private val format: SimpleD
          * A convenience [fixedPatternFormat] method exists to default to this behaviour.
          * @param pattern The pattern to apply.
          * @param timeZone The [KalugaTimeZone] for which the date should be formatted. Defaults to [KalugaTimeZone.current].
-         * @param locale The [Locale] for which the date should be formatted. Defaults to [Locale.defaultLocale].
+         * @param locale The [KalugaLocale] for which the date should be formatted. Defaults to [KalugaLocale.defaultLocale].
          */
         actual fun patternFormat(
             pattern: String,
             timeZone: KalugaTimeZone,
-            locale: Locale
+            locale: KalugaLocale
         ): KalugaDateFormatter = createDateFormatter(SimpleDateFormat(pattern, locale.locale), timeZone)
 
         private fun createDateFormatter(simpleDateFormat: SimpleDateFormat, timeZone: KalugaTimeZone): KalugaDateFormatter {
diff --git a/base/src/jvmMain/kotlin/text/NumberFormatter.kt b/base/src/jvmMain/kotlin/text/NumberFormatter.kt
index d5fabedf0..db6ef1261 100644
--- a/base/src/jvmMain/kotlin/text/NumberFormatter.kt
+++ b/base/src/jvmMain/kotlin/text/NumberFormatter.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.text.ParseException
@@ -26,10 +26,10 @@ import java.util.Currency
 @ExperimentalUnsignedTypes
 /**
  * Default implementation of [BaseNumberFormatter]
- * @param locale The [Locale] used for parsing. Defaults to [Locale.defaultLocale].
+ * @param locale The [KalugaLocale] used for parsing. Defaults to [KalugaLocale.defaultLocale].
  * @param style The [NumberFormatStyle] to configure the format to use. Defaults to [NumberFormatStyle.Decimal].
  */
-actual class NumberFormatter actual constructor(override val locale: Locale, style: NumberFormatStyle) : BaseNumberFormatter {
+actual class NumberFormatter actual constructor(override val locale: KalugaLocale, style: NumberFormatStyle) : BaseNumberFormatter {
 
     private val format: DecimalFormat = when (style) {
         is NumberFormatStyle.Integer -> DecimalFormat.getInstance(locale.locale).apply {
diff --git a/base/src/jvmMain/kotlin/text/StringUtils.kt b/base/src/jvmMain/kotlin/text/StringUtils.kt
index daa6a96d0..356f586a6 100644
--- a/base/src/jvmMain/kotlin/text/StringUtils.kt
+++ b/base/src/jvmMain/kotlin/text/StringUtils.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.base.text
 
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 
 /**
  * The String that serves as a line separator.
@@ -25,13 +25,13 @@ import com.splendo.kaluga.base.utils.Locale
 actual val lineSeparator = System.lineSeparator()
 
 /**
- * Converts a String to its lower cased variant based on a given [Locale]
- * @param locale The [Locale] to use for transforming to lower case.
+ * Converts a String to its lower cased variant based on a given [KalugaLocale]
+ * @param locale The [KalugaLocale] to use for transforming to lower case.
  */
-actual fun String.lowerCased(locale: Locale): String = this.lowercase(locale.locale)
+actual fun String.lowerCased(locale: KalugaLocale): String = this.lowercase(locale.locale)
 
 /**
- * Converts a String to its upper cased variant based on a given [Locale]
- * @param locale The [Locale] to use for transforming to upper case.
+ * Converts a String to its upper cased variant based on a given [KalugaLocale]
+ * @param locale The [KalugaLocale] to use for transforming to upper case.
  */
-actual fun String.upperCased(locale: Locale): String = this.uppercase(locale.locale)
+actual fun String.upperCased(locale: KalugaLocale): String = this.uppercase(locale.locale)
diff --git a/base/src/jvmMain/kotlin/utils/KalugaDate.kt b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
index 85a8a1fbe..606dd1482 100644
--- a/base/src/jvmMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
@@ -35,10 +35,10 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
          * Creates a [KalugaDate] relative to the current time
          * @param offset The [Duration] from the current time. Defaults to 0 milliseconds
          * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
-         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun now(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun now(offset: Duration, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 add(Calendar.MILLISECOND, offset.inWholeMilliseconds.toInt())
             }
@@ -48,10 +48,10 @@ actual class DefaultKalugaDate internal constructor(internal val calendar: Calen
          * Creates a [KalugaDate] relative to January 1st 1970 00:00:00 GMT
          * @param offset The [Duration] from the epoch time. Defaults to 0 milliseconds
          * @param timeZone The [KalugaTimeZone] in which the Date is set. Defaults to [KalugaTimeZone.current]
-         * @param locale The [Locale] for which the Date is configured. Defaults to [Locale.defaultLocale]
+         * @param locale The [KalugaLocale] for which the Date is configured. Defaults to [KalugaLocale.defaultLocale]
          * @return A [KalugaDate] relative to the current time
          */
-        actual fun epoch(offset: Duration, timeZone: TimeZone, locale: Locale): KalugaDate = DefaultKalugaDate(
+        actual fun epoch(offset: Duration, timeZone: KalugaTimeZone, locale: KalugaLocale): KalugaDate = DefaultKalugaDate(
             Calendar.getInstance(timeZone.timeZone, locale.locale).apply {
                 timeInMillis = offset.inWholeMilliseconds
             }
diff --git a/base/src/jvmMain/kotlin/utils/Locale.kt b/base/src/jvmMain/kotlin/utils/KalugaLocale.kt
similarity index 52%
rename from base/src/jvmMain/kotlin/utils/Locale.kt
rename to base/src/jvmMain/kotlin/utils/KalugaLocale.kt
index 4aa2dca64..ecd427653 100644
--- a/base/src/jvmMain/kotlin/utils/Locale.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaLocale.kt
@@ -22,42 +22,42 @@ import com.splendo.kaluga.base.text.upperCased
 /**
  * Default implementation of [BaseLocale]
  */
-actual data class Locale internal constructor(internal val locale: java.util.Locale) : BaseLocale() {
+actual data class KalugaLocale internal constructor(internal val locale: java.util.Locale) : BaseLocale() {
     actual companion object {
 
         /**
-         * Creates a [Locale] based on a `language` ISO 639 alpha-2 or alpha-3 code
+         * Creates a [KalugaLocale] based on a `language` ISO 639 alpha-2 or alpha-3 code
          * @param language a `language` ISO 639 alpha-2 or alpha-3 code.
-         * @return The [Locale] for the given [language]
+         * @return The [KalugaLocale] for the given [language]
          */
-        actual fun createLocale(language: String): Locale = Locale(java.util.Locale(language))
+        actual fun createLocale(language: String): KalugaLocale = KalugaLocale(java.util.Locale(language))
 
         /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
+         * Creates a [KalugaLocale] based on a ISO 639 alpha-2 or alpha-3 `language` code and ISO 3166 alpha-2 `country` code.
          * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
          * @param country a ISO 3166 alpha-2 `country` code.
-         * @return The [Locale] for the given [language] and [country]
+         * @return The [KalugaLocale] for the given [language] and [country]
          */
-        actual fun createLocale(language: String, country: String): Locale = Locale(java.util.Locale(language, country))
+        actual fun createLocale(language: String, country: String): KalugaLocale = KalugaLocale(java.util.Locale(language, country))
 
         /**
-         * Creates a [Locale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
+         * Creates a [KalugaLocale] based on a ISO 639 alpha-2 or alpha-3 `language` code, ISO 3166 alpha-2 `country` code, and variant code.
          * @param language a ISO 639 alpha-2 or alpha-3 `language` code.
          * @param country a ISO 3166 alpha-2 `country` code.
-         * @param variant Arbitrary value used to indicate a variation of a [Locale]
-         * @return The [Locale] for the given [language], [country], and [variant]
+         * @param variant Arbitrary value used to indicate a variation of a [KalugaLocale]
+         * @return The [KalugaLocale] for the given [language], [country], and [variant]
          */
-        actual fun createLocale(language: String, country: String, variant: String): Locale = Locale(java.util.Locale(language, country, variant))
+        actual fun createLocale(language: String, country: String, variant: String): KalugaLocale = KalugaLocale(java.util.Locale(language, country, variant))
 
         /**
-         * The default [Locale] of the user
+         * The default [KalugaLocale] of the user
          */
-        actual val defaultLocale: Locale get() = Locale(java.util.Locale.getDefault())
+        actual val defaultLocale: KalugaLocale get() = KalugaLocale(java.util.Locale.getDefault())
 
         /**
-         * A list of [Locale] available to the user.
+         * A list of [KalugaLocale] available to the user.
          */
-        actual val availableLocales: List<Locale> = java.util.Locale.getAvailableLocales().asList().map { Locale(it) }
+        actual val availableLocales: List<KalugaLocale> = java.util.Locale.getAvailableLocales().asList().map { KalugaLocale(it) }
     }
 
     override val countryCode: String
@@ -71,11 +71,11 @@ actual data class Locale internal constructor(internal val locale: java.util.Loc
     override val unitSystem: UnitSystem
         get() = UnitSystem.withCountryCode(countryCode.upperCased(this))
 
-    override fun name(forLocale: Locale): String = locale.getDisplayName(forLocale.locale)
-    override fun countryName(forLocale: Locale): String = locale.getDisplayCountry(forLocale.locale)
-    override fun languageName(forLocale: Locale): String = locale.getDisplayLanguage(forLocale.locale)
-    override fun variantName(forLocale: Locale): String = locale.getDisplayVariant(forLocale.locale)
-    override fun scriptName(forLocale: Locale): String = locale.getDisplayScript(forLocale.locale)
+    override fun name(forLocale: KalugaLocale): String = locale.getDisplayName(forLocale.locale)
+    override fun countryName(forLocale: KalugaLocale): String = locale.getDisplayCountry(forLocale.locale)
+    override fun languageName(forLocale: KalugaLocale): String = locale.getDisplayLanguage(forLocale.locale)
+    override fun variantName(forLocale: KalugaLocale): String = locale.getDisplayVariant(forLocale.locale)
+    override fun scriptName(forLocale: KalugaLocale): String = locale.getDisplayScript(forLocale.locale)
 
     override val quotationStart: String = "\""
     override val quotationEnd: String = "\""
diff --git a/base/src/jvmMain/kotlin/utils/KalugaTimeZone.kt b/base/src/jvmMain/kotlin/utils/KalugaTimeZone.kt
index 971523239..e268559d8 100644
--- a/base/src/jvmMain/kotlin/utils/KalugaTimeZone.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaTimeZone.kt
@@ -53,7 +53,7 @@ actual class KalugaTimeZone internal constructor(internal val timeZone: java.uti
     }
 
     override val identifier: String = timeZone.id
-    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: Locale): String {
+    override fun displayName(style: TimeZoneNameStyle, withDaylightSavings: Boolean, locale: KalugaLocale): String {
         val styleJava = when (style) {
             TimeZoneNameStyle.Short -> java.util.TimeZone.SHORT
             TimeZoneNameStyle.Long -> java.util.TimeZone.LONG
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index bb08d2129..8cc68a988 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -21,8 +21,8 @@ package com.splendo.kaluga.datetimepicker
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
-import com.splendo.kaluga.base.utils.Locale
-import com.splendo.kaluga.base.utils.Locale.Companion.defaultLocale
+import com.splendo.kaluga.base.utils.KalugaLocale
+import com.splendo.kaluga.base.utils.KalugaLocale.Companion.defaultLocale
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
@@ -34,7 +34,7 @@ import kotlin.coroutines.resume
  * @property cancelButtonTitle the text to show in the button to cancel picking a date
  * @property confirmButtonTitle the text to show in the button to confirm picking a date
  * @property type the [Type] of date time picker
- * @property locale the [Locale] used for representing time in the date-time picker
+ * @property locale the [KalugaLocale] used for representing time in the date-time picker
  * @property selectedDate the [KalugaDate] that the date-time picker will use as a base for picking the date.
  * This will determine the initial time/day to be selected in the picker, depending on the [type].
  * Upon completion, a copy of this date modified with the selected date or time will be provided, keeping timezone and components not selected the same.
@@ -44,7 +44,7 @@ data class DateTimePicker(
     val cancelButtonTitle: String,
     val confirmButtonTitle: String,
     val type: Type,
-    val locale: Locale,
+    val locale: KalugaLocale,
     val selectedDate: KalugaDate
 ) {
 
@@ -85,7 +85,7 @@ data class DateTimePicker(
         private var message: String? = null
         private var cancelButtonTitle: String = ""
         private var confirmButtonTitle: String = ""
-        private var locale: Locale = defaultLocale
+        private var locale: KalugaLocale = defaultLocale
         private var selectedDate: KalugaDate = when (type) {
             is Type.DateType -> type.adjustDate(
                 DefaultKalugaDate.now().apply {
@@ -126,11 +126,11 @@ data class DateTimePicker(
         fun setConfirmButtonTitle(confirmButtonTitle: String) = apply { this.confirmButtonTitle = confirmButtonTitle }
 
         /**
-         * Sets the [Locale] for which a Date is selected
+         * Sets the [KalugaLocale] for which a Date is selected
          *
-         * @param locale the [Locale] for which the date is selected
+         * @param locale the [KalugaLocale] for which the date is selected
          */
-        fun setLocale(locale: Locale) = apply { this.locale = locale }
+        fun setLocale(locale: KalugaLocale) = apply { this.locale = locale }
 
         /**
          * Sets the [KalugaDate] that the date-time picker will use as a base for picking the date.
diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 93783021e..05c58cc25 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 93783021e2e6a0a0de0e9b82f1aa3c80f81ebf33
+Subproject commit 05c58cc25cd082090bff85ba872ee32baafbc296
diff --git a/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt b/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
index d6c29d6cd..40668cc0a 100644
--- a/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
+++ b/test-utils-date-time-picker/src/commonTest/kotlin/MockDateTimePickerPresenterTest.kt
@@ -20,7 +20,7 @@ package com.splendo.kaluga.test.keyboard
 import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import com.splendo.kaluga.base.utils.KalugaDate
-import com.splendo.kaluga.base.utils.Locale
+import com.splendo.kaluga.base.utils.KalugaLocale
 import com.splendo.kaluga.base.utils.enUsPosix
 import com.splendo.kaluga.datetimepicker.DateTimePicker
 import com.splendo.kaluga.datetimepicker.buildDatePicker
@@ -61,7 +61,7 @@ class MockDateTimePickerPresenterTest : UIThreadViewModelTest<MockDateTimePicker
                 setSelectedDate(selected)
                 setConfirmButtonTitle("OK")
                 setCancelButtonTitle("Cancel")
-                setLocale(Locale.enUsPosix)
+                setLocale(KalugaLocale.enUsPosix)
             }.showAsync {
                 done.complete(it)
             }
@@ -73,7 +73,7 @@ class MockDateTimePickerPresenterTest : UIThreadViewModelTest<MockDateTimePicker
             assertEquals("Hello world", captor.lastCaptured?.message)
             assertEquals("OK", captor.lastCaptured?.confirmButtonTitle)
             assertEquals("Cancel", captor.lastCaptured?.cancelButtonTitle)
-            assertEquals(Locale.enUsPosix, captor.lastCaptured?.locale)
+            assertEquals(KalugaLocale.enUsPosix, captor.lastCaptured?.locale)
 
             // **mock**AlertBuilder is available also from our context
             mockDateTimePickerPresenterBuilder.builtDateTimePickerPresenters.first().apply {

From aa8d304406fc6e83386d9d272b4a220776efac92 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 17 Feb 2023 16:52:36 +0100
Subject: [PATCH 191/227] PR remarks

---
 base-permissions/README.md                                | 2 +-
 beacons/README.md                                         | 6 +++---
 bluetooth/README.md                                       | 4 ++--
 .../kotlin/device/DefaultDeviceConnectionManager.kt       | 4 ++--
 .../kotlin/device/DefaultDeviceConnectionManager.kt       | 8 ++++----
 bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt  | 2 +-
 .../kotlin/device/DefaultDeviceConnectionManager.kt       | 4 ++--
 .../kotlin/device/DefaultDeviceConnectionManager.kt       | 4 ++--
 .../kotlin/device/DefaultDeviceConnectionManager.kt       | 4 ++--
 .../kotlin/device/MockDeviceConnectionManager.kt          | 4 ++--
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/base-permissions/README.md b/base-permissions/README.md
index e15f42543..de04566fd 100644
--- a/base-permissions/README.md
+++ b/base-permissions/README.md
@@ -1,6 +1,6 @@
 ## Permissions
 
-This library provide support for out-of-the-box access to device permissions.
+This library provides support for out-of-the-box access to device permissions.
 
 Supported device features:
  - [Bluetooth](../bluetooth-permissions)
diff --git a/beacons/README.md b/beacons/README.md
index 478bea2f4..1499cd104 100644
--- a/beacons/README.md
+++ b/beacons/README.md
@@ -1,10 +1,10 @@
 ## Beacons
 
-This library provide support for out-of-the-box access to Beacons.
+This library provides support for out-of-the-box access to Beacons.
 Currently only the [Eddystone protocol](https://github.com/google/eddystone/blob/master/protocol-specification.md) is supported
 
 ## Installing
-This library is available on Maven Central. You can import Kaluga Base as follows:
+This library is available on Maven Central. You can import Kaluga Beacons as follows:
 
 ```kotlin
 repositories {
@@ -19,7 +19,7 @@ dependencies {
 ```
 
 ### Usage
-Create a `DefaultBeacons` object. This gives you access to a `Flow` of [BeaconInfo]. To monitor for beacons simply call
+Create a `DefaultBeacons` object. This gives you access to a `Flow` of `Set<BeaconInfo>`. To monitor for beacons simply call:
 
 ```kotlin
 val beacons = DefaultBeacons(
diff --git a/bluetooth/README.md b/bluetooth/README.md
index 910f2989d..4cb111bc7 100644
--- a/bluetooth/README.md
+++ b/bluetooth/README.md
@@ -1,9 +1,9 @@
 ## Bluetooth
 
-This library provide support for out-of-the-box access to Bluetooth.
+This library provides support for out-of-the-box access to Bluetooth.
 
 ## Installing
-This library is available on Maven Central. You can import Kaluga Base as follows:
+This library is available on Maven Central. You can import Kaluga Bluetooth as follows:
 
 ```kotlin
 repositories {
diff --git a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
index f33e78f51..52b6ccadf 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -233,14 +233,14 @@ internal actual class DefaultDeviceConnectionManager(
     }
 
     @SuppressLint("MissingPermission")
-    override suspend fun didStartPairing() {
+    override suspend fun requestStartPairing() {
         if (device.bondState == BluetoothDevice.BOND_NONE) {
             deviceWrapper.createBond()
         }
     }
 
     @SuppressLint("MissingPermission")
-    override suspend fun didStartUnpairing() {
+    override suspend fun requestStartUnpairing() {
         if (device.bondState != BluetoothDevice.BOND_NONE) {
             deviceWrapper.removeBond()
         }
diff --git a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 95f1c7338..b24cc2a6b 100644
--- a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -308,17 +308,17 @@ abstract class BaseDeviceConnectionManager(
 
     final override suspend fun pair() {
         logger.info(logTag) { "Pair" }
-        didStartPairing()
+        requestStartPairing()
     }
 
-    protected abstract suspend fun didStartPairing()
+    protected abstract suspend fun requestStartPairing()
 
     final override suspend fun unpair() {
         logger.info(logTag) { "Unpair" }
-        didStartUnpairing()
+        requestStartUnpairing()
     }
 
-    protected abstract suspend fun didStartUnpairing()
+    protected abstract suspend fun requestStartUnpairing()
 
     protected open fun createService(wrapper: ServiceWrapper): Service = Service(wrapper, ::emitEvent, logTag, logger)
 
diff --git a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
index 9b617bd87..22c5646e2 100644
--- a/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
+++ b/bluetooth/src/commonMain/kotlin/scanner/ScanningState.kt
@@ -32,7 +32,7 @@ import com.splendo.kaluga.bluetooth.Service
 
 /**
  * A set of [UUID] to apply to a scan result
- * If not empty, only [Device] that have at least one [Service] matching one of the [UUID] will be scanned.
+ * If not empty, only [Device] that are advertising at least one [Service] matching one of the [UUID] will be scanned.
  */
 typealias Filter = Set<UUID>
 
diff --git a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 0c60491a6..c80f2f6cd 100644
--- a/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -189,11 +189,11 @@ internal actual class DefaultDeviceConnectionManager(
         }
     }
 
-    override suspend fun didStartPairing() {
+    override suspend fun requestStartPairing() {
         // There is no iOS API to pair peripheral
     }
 
-    override suspend fun didStartUnpairing() {
+    override suspend fun requestStartUnpairing() {
         // There is no iOS API to unpair peripheral
     }
 
diff --git a/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 4cae44a0b..3a90ff6d6 100644
--- a/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/jsMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -51,7 +51,7 @@ internal actual class DefaultDeviceConnectionManager(
 
     override suspend fun didStartPerformingAction(action: DeviceAction) {}
 
-    override suspend fun didStartPairing() {}
+    override suspend fun requestStartPairing() {}
 
-    override suspend fun didStartUnpairing() {}
+    override suspend fun requestStartUnpairing() {}
 }
diff --git a/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt
index 4cae44a0b..3a90ff6d6 100644
--- a/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/jvmMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -51,7 +51,7 @@ internal actual class DefaultDeviceConnectionManager(
 
     override suspend fun didStartPerformingAction(action: DeviceAction) {}
 
-    override suspend fun didStartPairing() {}
+    override suspend fun requestStartPairing() {}
 
-    override suspend fun didStartUnpairing() {}
+    override suspend fun requestStartUnpairing() {}
 }
diff --git a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
index be733ef94..5a251bd7c 100644
--- a/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
+++ b/test-utils-bluetooth/src/commonMain/kotlin/device/MockDeviceConnectionManager.kt
@@ -177,9 +177,9 @@ class MockDeviceConnectionManager(
 
     override suspend fun requestMtu(mtu: MTU): Boolean = requestMtuMock.call(mtu)
 
-    override suspend fun didStartPairing(): Unit = pairMock.call()
+    override suspend fun requestStartPairing(): Unit = pairMock.call()
 
-    override suspend fun didStartUnpairing(): Unit = unpairMock.call()
+    override suspend fun requestStartUnpairing(): Unit = unpairMock.call()
 
     override suspend fun didStartPerformingAction(action: DeviceAction): Unit = performActionMock.call(action)
 

From b60531ba4be4ad16ac57d0ad1bc8a0ab34ef6a1b Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 17 Feb 2023 17:29:36 +0100
Subject: [PATCH 192/227] Some PR remarks

---
 .../androidLibMain/kotlin/utils/Decimal.kt    |  1 +
 base/src/commonMain/kotlin/utils/Decimal.kt   | 67 ++++++++++++++-----
 base/src/iosMain/kotlin/utils/Decimal.kt      | 11 ++-
 base/src/jsMain/kotlin/utils/Decimal.kt       |  1 +
 base/src/jvmMain/kotlin/utils/Decimal.kt      |  1 +
 5 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/base/src/androidLibMain/kotlin/utils/Decimal.kt b/base/src/androidLibMain/kotlin/utils/Decimal.kt
index a7549c218..d23325436 100644
--- a/base/src/androidLibMain/kotlin/utils/Decimal.kt
+++ b/base/src/androidLibMain/kotlin/utils/Decimal.kt
@@ -116,6 +116,7 @@ actual fun String.toFiniteDecimal() = try {
 
 actual fun FiniteDecimal.toDouble() = this.toDouble()
 actual fun FiniteDecimal.toInt() = this.toInt()
+actual fun FiniteDecimal.toLong() = this.toLong()
 actual fun FiniteDecimal.toString() = this.stripTrailingZeros().toString()
 
 private val RoundingMode.android
diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index 686077cac..992c9f8d8 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -45,7 +45,15 @@ sealed class Decimal : Comparable<Decimal> {
      * [Decimal] representing a finite number
      * @param finiteDecimal the [FiniteDecimal] describing the finite number
      */
-    data class Finite(internal val finiteDecimal: FiniteDecimal) : Decimal()
+    data class Finite(internal val finiteDecimal: FiniteDecimal) : Decimal() {
+        override fun equals(other: Any?): Boolean = (other as? Finite)?.let {
+            finiteDecimal == it.finiteDecimal
+        } ?: false
+
+        override fun hashCode(): Int = finiteDecimal.hashCode()
+
+        override fun toString(): String = finiteDecimal.toString()
+    }
 
     override fun compareTo(other: Decimal): Int = if (this is Finite && other is Finite)
         finiteDecimal.compareTo(other.finiteDecimal)
@@ -66,7 +74,7 @@ expect class FiniteDecimal : Comparable<FiniteDecimal>
 operator fun Decimal.plus(value: Decimal): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
     Decimal.Finite(finiteDecimal + value.finiteDecimal)
 } else {
-    (this.toDouble() + value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::plus)
 }
 
 /**
@@ -78,7 +86,7 @@ operator fun Decimal.plus(value: Decimal): Decimal = if (this is Decimal.Finite
 fun Decimal.plus(value: Decimal, scale: Int): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
     Decimal.Finite(finiteDecimal.plus(value.finiteDecimal, scale))
 } else {
-    (this.toDouble() + value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::plus)
 }
 
 /**
@@ -95,7 +103,7 @@ fun Decimal.plus(
 ): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
     Decimal.Finite(finiteDecimal.plus(value.finiteDecimal, scale, roundingMode))
 } else {
-    (this.toDouble() + value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::plus)
 }
 
 internal expect operator fun FiniteDecimal.plus(value: FiniteDecimal): FiniteDecimal
@@ -114,7 +122,7 @@ internal expect fun FiniteDecimal.plus(
 operator fun Decimal.minus(value: Decimal): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
     Decimal.Finite(finiteDecimal - value.finiteDecimal)
 } else {
-    (this.toDouble() - value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::minus)
 }
 
 /**
@@ -126,7 +134,7 @@ operator fun Decimal.minus(value: Decimal): Decimal = if (this is Decimal.Finite
 fun Decimal.minus(value: Decimal, scale: Int): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
     Decimal.Finite(finiteDecimal.minus(value.finiteDecimal, scale))
 } else {
-    (this.toDouble() - value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::minus)
 }
 
 /**
@@ -143,7 +151,7 @@ fun Decimal.minus(
 ): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
     Decimal.Finite(finiteDecimal.minus(value.finiteDecimal, scale, roundingMode))
 } else {
-    (this.toDouble() - value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::minus)
 }
 
 internal expect operator fun FiniteDecimal.minus(value: FiniteDecimal): FiniteDecimal
@@ -166,7 +174,7 @@ operator fun Decimal.div(value: Decimal): Decimal = if (this is Decimal.Finite &
         Decimal.Finite(finiteDecimal / value.finiteDecimal)
     }
 } else {
-    (this.toDouble() / value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::div)
 }
 
 /**
@@ -182,7 +190,7 @@ fun Decimal.div(value: Decimal, scale: Int): Decimal = if (this is Decimal.Finit
         Decimal.Finite(finiteDecimal.div(value.finiteDecimal, scale))
     }
 } else {
-    (this.toDouble() / value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::div)
 }
 
 /**
@@ -203,7 +211,7 @@ fun Decimal.div(
         Decimal.Finite(finiteDecimal.div(value.finiteDecimal, scale, roundingMode))
     }
 } else {
-    (this.toDouble() / value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::div)
 }
 
 internal expect operator fun FiniteDecimal.div(value: FiniteDecimal): FiniteDecimal
@@ -222,7 +230,7 @@ internal expect fun FiniteDecimal.div(
 operator fun Decimal.times(value: Decimal): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
     Decimal.Finite(finiteDecimal * value.finiteDecimal)
 } else {
-    (this.toDouble() * value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::times)
 }
 
 /**
@@ -234,7 +242,7 @@ operator fun Decimal.times(value: Decimal): Decimal = if (this is Decimal.Finite
 fun Decimal.times(value: Decimal, scale: Int): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
     Decimal.Finite(finiteDecimal.times(value.finiteDecimal, scale))
 } else {
-    (this.toDouble() * value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::times)
 }
 
 /**
@@ -251,7 +259,7 @@ fun Decimal.times(
 ): Decimal = if (this is Decimal.Finite && value is Decimal.Finite) {
     Decimal.Finite(finiteDecimal.times(value.finiteDecimal, scale, roundingMode))
 } else {
-    (this.toDouble() * value.toDouble()).toDecimal()
+    calculateToDecimal(value, Double::times)
 }
 
 internal expect operator fun FiniteDecimal.times(value: FiniteDecimal): FiniteDecimal
@@ -345,11 +353,16 @@ internal expect fun FiniteDecimal.round(scale: Int, roundingMode: RoundingMode =
 /**
  * Converts a [Number] to a [Decimal]
  */
-fun Number.toDecimal(): Decimal = when {
-    toDouble().isFinite() -> Decimal.Finite(toFiniteDecimal())
-    toDouble().isNaN() -> Decimal.NaN
-    toDouble() == Double.POSITIVE_INFINITY -> Decimal.PositiveInfinity
-    else -> Decimal.NegativeInfinity
+fun Number.toDecimal(): Decimal = when (this) {
+    is Long -> Decimal.Finite(toFiniteDecimal())
+    is Int -> Decimal.Finite(toFiniteDecimal())
+    is Short -> Decimal.Finite(toFiniteDecimal())
+    else -> when {
+        toDouble().isFinite() -> Decimal.Finite(toFiniteDecimal())
+        toDouble().isNaN() -> Decimal.NaN
+        toDouble() == Double.POSITIVE_INFINITY -> Decimal.PositiveInfinity
+        else -> Decimal.NegativeInfinity
+    }
 }
 
 /**
@@ -433,9 +446,20 @@ fun Decimal.toInt(): Int = when (this) {
     is Decimal.PositiveInfinity -> Int.MAX_VALUE
 }
 
+/**
+ * Gets the long value of a [Decimal]
+ */
+fun Decimal.toLong(): Long = when (this) {
+    is Decimal.Finite -> finiteDecimal.toLong()
+    is Decimal.NaN -> 0L
+    is Decimal.NegativeInfinity -> Long.MIN_VALUE
+    is Decimal.PositiveInfinity -> Long.MAX_VALUE
+}
+
 internal expect fun FiniteDecimal.toDouble(): Double
 internal expect fun FiniteDecimal.toString(): String
 internal expect fun FiniteDecimal.toInt(): Int
+internal expect fun FiniteDecimal.toLong(): Long
 
 /**
  * Converts a collection of [Decimal] to a [DoubleArray]
@@ -451,3 +475,10 @@ fun Collection<Decimal>.toStringList(): List<String> = map { it.toString() }
  * Converts a collection of [Decimal] to an [IntArray]
  */
 fun Collection<Decimal>.toIntArray(): IntArray = map { it.toInt() }.toIntArray()
+
+/**
+ * Converts a collection of [Decimal] to an [LongArray]
+ */
+fun Collection<Decimal>.toLongArray(): LongArray = map { it.toLong() }.toLongArray()
+
+private fun Decimal.calculateToDecimal(other: Decimal, operator: Double.(Double) -> Double) = this.toDouble().operator(other.toDouble()).toDecimal()
diff --git a/base/src/iosMain/kotlin/utils/Decimal.kt b/base/src/iosMain/kotlin/utils/Decimal.kt
index 0a2b9fba5..3b9e1b3bb 100644
--- a/base/src/iosMain/kotlin/utils/Decimal.kt
+++ b/base/src/iosMain/kotlin/utils/Decimal.kt
@@ -201,17 +201,14 @@ actual fun FiniteDecimal.pow(
 }
 
 actual fun Number.toFiniteDecimal() = FiniteDecimal(NSDecimalNumber(this.toString()))
-actual fun String.toFiniteDecimal(): FiniteDecimal? {
-    val decimal = NSDecimalNumber(this)
-    return if (decimal == NSDecimalNumber.notANumber) {
-        null
-    } else {
-        FiniteDecimal(decimal)
-    }
+actual fun String.toFiniteDecimal(): FiniteDecimal? = when (val decimal = NSDecimalNumber(this)) {
+    NSDecimalNumber.notANumber -> null
+    else -> FiniteDecimal(decimal)
 }
 
 actual fun FiniteDecimal.toDouble() = nsDecimal.toString().toDouble()
 actual fun FiniteDecimal.toInt() = nsDecimal.intValue
+actual fun FiniteDecimal.toLong() = nsDecimal.longValue
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 actual fun FiniteDecimal.toString() = nsDecimal.stringValue
 
diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index 483f5340c..30e74005d 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -159,4 +159,5 @@ actual fun String.toFiniteDecimal(): FiniteDecimal? = try {
 
 actual fun FiniteDecimal.toDouble(): Double = bd.toString().toDouble()
 actual fun FiniteDecimal.toInt(): Int = bd.toFixed(0).toInt()
+actual fun FiniteDecimal.toLong() = bd.toFixed(0).toLong()
 actual fun FiniteDecimal.toString(): String = bd.toString()
diff --git a/base/src/jvmMain/kotlin/utils/Decimal.kt b/base/src/jvmMain/kotlin/utils/Decimal.kt
index 7ea58f4b6..cd1682d64 100644
--- a/base/src/jvmMain/kotlin/utils/Decimal.kt
+++ b/base/src/jvmMain/kotlin/utils/Decimal.kt
@@ -117,6 +117,7 @@ actual fun String.toFiniteDecimal() = try {
 
 actual fun FiniteDecimal.toDouble() = this.toDouble()
 actual fun FiniteDecimal.toInt() = this.toInt()
+actual fun FiniteDecimal.toLong() = this.toLong()
 actual fun FiniteDecimal.toString() = this.stripTrailingZeros().toString()
 
 private val RoundingMode.java

From 5bbbb7877d9895e571964626ba1511a5f9420747 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 17 Feb 2023 17:32:28 +0100
Subject: [PATCH 193/227] API dump

---
 base/api/androidLib/base.api                  | 195 ++++++++----------
 base/api/jvm/base.api                         | 159 +++++++-------
 .../api/androidLib/date-time-picker.api       |  12 +-
 date-time-picker/api/jvm/date-time-picker.api |  12 +-
 location/api/jvm/location.api                 |  27 ---
 5 files changed, 184 insertions(+), 221 deletions(-)

diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index bd8711ff4..1133ce6a2 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -351,7 +351,7 @@ public abstract interface class com/splendo/kaluga/base/text/BaseNumberFormatter
 	public abstract fun getGroupingSeparator ()C
 	public abstract fun getGroupingSize ()I
 	public abstract fun getInfinitySymbol ()Ljava/lang/String;
-	public abstract fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public abstract fun getLocale ()Lcom/splendo/kaluga/base/utils/KalugaLocale;
 	public abstract fun getMinusSign ()C
 	public abstract fun getMultiplier ()I
 	public abstract fun getNegativePrefix ()Ljava/lang/String;
@@ -420,7 +420,7 @@ public final class com/splendo/kaluga/base/text/FlagsKt {
 }
 
 public abstract interface class com/splendo/kaluga/base/text/Formattable {
-	public abstract fun formatFor (Lcom/splendo/kaluga/base/utils/Locale;Ljava/util/Set;II)Ljava/lang/String;
+	public abstract fun formatFor (Lcom/splendo/kaluga/base/utils/KalugaLocale;Ljava/util/Set;II)Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatter : com/splendo/kaluga/base/text/BaseDateFormatter {
@@ -449,21 +449,21 @@ public final class com/splendo/kaluga/base/text/KalugaDateFormatter : com/splend
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatter$Companion {
-	public final fun dateFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun patternFormat (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun patternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun timeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun timeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun dateFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun patternFormat (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun patternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun timeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun timeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatterKt {
-	public static final fun dateFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun dateFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 	public static final fun fixedPatternFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 	public static synthetic fun fixedPatternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 	public static final fun iso8601Pattern (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
@@ -614,8 +614,8 @@ public final class com/splendo/kaluga/base/text/NumberFormatStyle$Scientific : c
 
 public final class com/splendo/kaluga/base/text/NumberFormatter : com/splendo/kaluga/base/text/BaseNumberFormatter {
 	public fun <init> ()V
-	public fun <init> (Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/base/utils/KalugaLocale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/base/utils/KalugaLocale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun format (Ljava/lang/Number;)Ljava/lang/String;
 	public fun getAlwaysShowsDecimalSeparator ()Z
 	public fun getCurrencyCode ()Ljava/lang/String;
@@ -626,7 +626,7 @@ public final class com/splendo/kaluga/base/text/NumberFormatter : com/splendo/ka
 	public fun getGroupingSeparator ()C
 	public fun getGroupingSize ()I
 	public fun getInfinitySymbol ()Ljava/lang/String;
-	public fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public fun getLocale ()Lcom/splendo/kaluga/base/utils/KalugaLocale;
 	public fun getMinusSign ()C
 	public fun getMultiplier ()I
 	public fun getNegativePrefix ()Ljava/lang/String;
@@ -676,8 +676,8 @@ public final class com/splendo/kaluga/base/text/RoundingMode : java/lang/Enum {
 public final class com/splendo/kaluga/base/text/StringFormatter {
 	public static final field Companion Lcom/splendo/kaluga/base/text/StringFormatter$Companion;
 	public fun <init> ()V
-	public fun <init> (Ljava/lang/StringBuilder;Lcom/splendo/kaluga/base/utils/Locale;)V
-	public synthetic fun <init> (Ljava/lang/StringBuilder;Lcom/splendo/kaluga/base/utils/Locale;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/StringBuilder;Lcom/splendo/kaluga/base/utils/KalugaLocale;)V
+	public synthetic fun <init> (Ljava/lang/StringBuilder;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun format (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/StringBuilder;
 }
 
@@ -836,14 +836,14 @@ public final class com/splendo/kaluga/base/text/StringFormatterException$Unknown
 }
 
 public final class com/splendo/kaluga/base/text/StringFormatterKt {
-	public static final fun format (Ljava/lang/String;[Ljava/lang/Object;Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public static synthetic fun format$default (Ljava/lang/String;[Ljava/lang/Object;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
+	public static final fun format (Ljava/lang/String;[Ljava/lang/Object;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public static synthetic fun format$default (Ljava/lang/String;[Ljava/lang/Object;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/text/StringUtilsKt {
 	public static final fun getLineSeparator ()Ljava/lang/String;
-	public static final fun lowerCased (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public static final fun upperCased (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public static final fun lowerCased (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public static final fun upperCased (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/utils/ApplyIfKt {
@@ -852,7 +852,7 @@ public final class com/splendo/kaluga/base/utils/ApplyIfKt {
 
 public abstract class com/splendo/kaluga/base/utils/BaseLocale {
 	public fun <init> ()V
-	public abstract fun countryName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun countryName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 	public abstract fun getAlternateQuotationEnd ()Ljava/lang/String;
 	public abstract fun getAlternateQuotationStart ()Ljava/lang/String;
 	public abstract fun getCountryCode ()Ljava/lang/String;
@@ -862,18 +862,18 @@ public abstract class com/splendo/kaluga/base/utils/BaseLocale {
 	public abstract fun getScriptCode ()Ljava/lang/String;
 	public abstract fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
 	public abstract fun getVariantCode ()Ljava/lang/String;
-	public abstract fun languageName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public abstract fun name (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public abstract fun scriptName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun languageName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public abstract fun name (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public abstract fun scriptName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 	public fun toString ()Ljava/lang/String;
-	public abstract fun variantName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun variantName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 }
 
 public abstract class com/splendo/kaluga/base/utils/BaseTimeZone {
 	public fun <init> ()V
 	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public abstract fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
+	public abstract fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Ljava/lang/String;
 	public abstract fun getDaylightSavingsOffset-UwyO8pc ()J
 	public final fun getDaylightSavingsOffsetInMilliseconds ()J
 	public abstract fun getIdentifier ()Ljava/lang/String;
@@ -994,10 +994,10 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 }
 
 public final class com/splendo/kaluga/base/utils/DefaultKalugaDate$Companion {
-	public final fun epoch-KLykuaI (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun epoch-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun now-KLykuaI (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun now-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun epoch-KLykuaI (JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun now-KLykuaI (JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
 public final class com/splendo/kaluga/base/utils/Deferred_getCompletedOrNullKt {
@@ -1057,8 +1057,8 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 }
 
 public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
-	public static final fun epoch (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun epoch (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun isInSameYear (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isLastMonth (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isLastYear (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
@@ -1073,49 +1073,26 @@ public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
 	public static final fun isYesterday (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun minus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)J
 	public static final fun minus-HG0u8IE (Lcom/splendo/kaluga/base/utils/KalugaDate;J)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun now (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun nowUtc (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun nowUtc$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun nowUtc-8Mi8wO0 (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun nowUtc-8Mi8wO0$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun now (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun nowUtc (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun nowUtc$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun nowUtc-8Mi8wO0 (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun nowUtc-8Mi8wO0$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun plus-HG0u8IE (Lcom/splendo/kaluga/base/utils/KalugaDate;J)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun toEndOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun toStartOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun tomorrow (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun tomorrow (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
-public final class com/splendo/kaluga/base/utils/KalugaTimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
-	public static final field Companion Lcom/splendo/kaluga/base/utils/KalugaTimeZone$Companion;
-	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public fun copy ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
-	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDaylightSavingsOffsetInMilliseconds ()J
-	public fun getIdentifier ()Ljava/lang/String;
-	public fun getOffsetFromGMTInMilliseconds ()J
-	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-}
-
-public final class com/splendo/kaluga/base/utils/KalugaTimeZone$Companion {
-	public final fun current ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
-	public final fun get (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
-	public final fun getAvailableIdentifiers ()Ljava/util/List;
-}
-
-public final class com/splendo/kaluga/base/utils/KalugaTimeZoneKt {
-	public static final fun getUtc (Lcom/splendo/kaluga/base/utils/KalugaTimeZone$Companion;)Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
-}
-
-public final class com/splendo/kaluga/base/utils/Locale : com/splendo/kaluga/base/utils/BaseLocale {
-	public static final field Companion Lcom/splendo/kaluga/base/utils/Locale$Companion;
-	public final fun copy (Ljava/util/Locale;)Lcom/splendo/kaluga/base/utils/Locale;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/base/utils/Locale;Ljava/util/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Locale;
-	public fun countryName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+public final class com/splendo/kaluga/base/utils/KalugaLocale : com/splendo/kaluga/base/utils/BaseLocale {
+	public static final field Companion Lcom/splendo/kaluga/base/utils/KalugaLocale$Companion;
+	public final fun copy (Ljava/util/Locale;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/base/utils/KalugaLocale;Ljava/util/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public fun countryName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getAlternateQuotationEnd ()Ljava/lang/String;
 	public fun getAlternateQuotationStart ()Ljava/lang/String;
@@ -1127,24 +1104,47 @@ public final class com/splendo/kaluga/base/utils/Locale : com/splendo/kaluga/bas
 	public fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
 	public fun getVariantCode ()Ljava/lang/String;
 	public fun hashCode ()I
-	public fun languageName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun name (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun scriptName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun languageName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public fun name (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public fun scriptName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 	public fun toString ()Ljava/lang/String;
-	public fun variantName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun variantName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/base/utils/Locale$Companion {
-	public final fun createLocale (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/Locale;
-	public final fun createLocale (Ljava/lang/String;Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/Locale;
-	public final fun createLocale (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/Locale;
+public final class com/splendo/kaluga/base/utils/KalugaLocale$Companion {
+	public final fun createLocale (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public final fun createLocale (Ljava/lang/String;Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public final fun createLocale (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
 	public final fun getAvailableLocales ()Ljava/util/List;
-	public final fun getDefaultLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public final fun getDefaultLocale ()Lcom/splendo/kaluga/base/utils/KalugaLocale;
 }
 
-public final class com/splendo/kaluga/base/utils/LocaleKt {
-	public static final fun getEnUsPosix (Lcom/splendo/kaluga/base/utils/Locale$Companion;)Lcom/splendo/kaluga/base/utils/Locale;
-	public static final fun getUses24HourClock (Lcom/splendo/kaluga/base/utils/Locale;)Z
+public final class com/splendo/kaluga/base/utils/KalugaLocaleKt {
+	public static final fun getEnUsPosix (Lcom/splendo/kaluga/base/utils/KalugaLocale$Companion;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public static final fun getUses24HourClock (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Z
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaTimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
+	public static final field Companion Lcom/splendo/kaluga/base/utils/KalugaTimeZone$Companion;
+	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
+	public fun copy ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
+	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getDaylightSavingsOffset-UwyO8pc ()J
+	public fun getIdentifier ()Ljava/lang/String;
+	public fun getOffsetFromGMT-UwyO8pc ()J
+	public fun offsetFromGMTAtDate-5sfh64U (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaTimeZone$Companion {
+	public final fun current ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
+	public final fun get (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
+	public final fun getAvailableIdentifiers ()Ljava/util/List;
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaTimeZoneKt {
+	public static final fun getUtc (Lcom/splendo/kaluga/base/utils/KalugaTimeZone$Companion;)Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 }
 
 public abstract class com/splendo/kaluga/base/utils/RoundingMode {
@@ -1162,29 +1162,6 @@ public final class com/splendo/kaluga/base/utils/RoundingMode$RoundUp : com/sple
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/RoundingMode$RoundUp;
 }
 
-public final class com/splendo/kaluga/base/utils/TimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
-	public static final field Companion Lcom/splendo/kaluga/base/utils/TimeZone$Companion;
-	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDaylightSavingsOffset-UwyO8pc ()J
-	public fun getIdentifier ()Ljava/lang/String;
-	public fun getOffsetFromGMT-UwyO8pc ()J
-	public fun offsetFromGMTAtDate-5sfh64U (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-}
-
-public final class com/splendo/kaluga/base/utils/TimeZone$Companion {
-	public final fun current ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun get (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun getAvailableIdentifiers ()Ljava/util/List;
-}
-
-public final class com/splendo/kaluga/base/utils/TimeZoneKt {
-	public static final fun getUtc (Lcom/splendo/kaluga/base/utils/TimeZone$Companion;)Lcom/splendo/kaluga/base/utils/TimeZone;
-}
-
 public final class com/splendo/kaluga/base/utils/TimeZoneNameStyle : java/lang/Enum {
 	public static final field Long Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;
 	public static final field Short Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index 3811b3264..9dcfbd19f 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -342,7 +342,7 @@ public abstract interface class com/splendo/kaluga/base/text/BaseNumberFormatter
 	public abstract fun getGroupingSeparator ()C
 	public abstract fun getGroupingSize ()I
 	public abstract fun getInfinitySymbol ()Ljava/lang/String;
-	public abstract fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public abstract fun getLocale ()Lcom/splendo/kaluga/base/utils/KalugaLocale;
 	public abstract fun getMinusSign ()C
 	public abstract fun getMultiplier ()I
 	public abstract fun getNegativePrefix ()Ljava/lang/String;
@@ -411,7 +411,7 @@ public final class com/splendo/kaluga/base/text/FlagsKt {
 }
 
 public abstract interface class com/splendo/kaluga/base/text/Formattable {
-	public abstract fun formatFor (Lcom/splendo/kaluga/base/utils/Locale;Ljava/util/Set;II)Ljava/lang/String;
+	public abstract fun formatFor (Lcom/splendo/kaluga/base/utils/KalugaLocale;Ljava/util/Set;II)Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatter : com/splendo/kaluga/base/text/BaseDateFormatter {
@@ -440,21 +440,21 @@ public final class com/splendo/kaluga/base/text/KalugaDateFormatter : com/splend
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatter$Companion {
-	public final fun dateFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun patternFormat (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun patternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public final fun timeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun timeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun dateFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun patternFormat (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun patternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public final fun timeFormat (Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun timeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 }
 
 public final class com/splendo/kaluga/base/text/KalugaDateFormatterKt {
-	public static final fun dateFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
-	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun dateFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static final fun dateTimeFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
+	public static synthetic fun dateTimeFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/text/DateFormatStyle;ZLcom/splendo/kaluga/base/text/DateFormatStyle;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 	public static final fun fixedPatternFormat (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 	public static synthetic fun fixedPatternFormat$default (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;ILjava/lang/Object;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
 	public static final fun iso8601Pattern (Lcom/splendo/kaluga/base/text/KalugaDateFormatter$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;)Lcom/splendo/kaluga/base/text/KalugaDateFormatter;
@@ -605,8 +605,8 @@ public final class com/splendo/kaluga/base/text/NumberFormatStyle$Scientific : c
 
 public final class com/splendo/kaluga/base/text/NumberFormatter : com/splendo/kaluga/base/text/BaseNumberFormatter {
 	public fun <init> ()V
-	public fun <init> (Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/base/utils/KalugaLocale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/base/utils/KalugaLocale;Lcom/splendo/kaluga/base/text/NumberFormatStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun format (Ljava/lang/Number;)Ljava/lang/String;
 	public fun getAlwaysShowsDecimalSeparator ()Z
 	public fun getCurrencyCode ()Ljava/lang/String;
@@ -617,7 +617,7 @@ public final class com/splendo/kaluga/base/text/NumberFormatter : com/splendo/ka
 	public fun getGroupingSeparator ()C
 	public fun getGroupingSize ()I
 	public fun getInfinitySymbol ()Ljava/lang/String;
-	public fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public fun getLocale ()Lcom/splendo/kaluga/base/utils/KalugaLocale;
 	public fun getMinusSign ()C
 	public fun getMultiplier ()I
 	public fun getNegativePrefix ()Ljava/lang/String;
@@ -667,8 +667,8 @@ public final class com/splendo/kaluga/base/text/RoundingMode : java/lang/Enum {
 public final class com/splendo/kaluga/base/text/StringFormatter {
 	public static final field Companion Lcom/splendo/kaluga/base/text/StringFormatter$Companion;
 	public fun <init> ()V
-	public fun <init> (Ljava/lang/StringBuilder;Lcom/splendo/kaluga/base/utils/Locale;)V
-	public synthetic fun <init> (Ljava/lang/StringBuilder;Lcom/splendo/kaluga/base/utils/Locale;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/StringBuilder;Lcom/splendo/kaluga/base/utils/KalugaLocale;)V
+	public synthetic fun <init> (Ljava/lang/StringBuilder;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun format (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/StringBuilder;
 }
 
@@ -827,14 +827,14 @@ public final class com/splendo/kaluga/base/text/StringFormatterException$Unknown
 }
 
 public final class com/splendo/kaluga/base/text/StringFormatterKt {
-	public static final fun format (Ljava/lang/String;[Ljava/lang/Object;Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public static synthetic fun format$default (Ljava/lang/String;[Ljava/lang/Object;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
+	public static final fun format (Ljava/lang/String;[Ljava/lang/Object;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public static synthetic fun format$default (Ljava/lang/String;[Ljava/lang/Object;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/text/StringUtilsKt {
 	public static final fun getLineSeparator ()Ljava/lang/String;
-	public static final fun lowerCased (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public static final fun upperCased (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public static final fun lowerCased (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public static final fun upperCased (Ljava/lang/String;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/base/utils/ApplyIfKt {
@@ -843,7 +843,7 @@ public final class com/splendo/kaluga/base/utils/ApplyIfKt {
 
 public abstract class com/splendo/kaluga/base/utils/BaseLocale {
 	public fun <init> ()V
-	public abstract fun countryName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun countryName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 	public abstract fun getAlternateQuotationEnd ()Ljava/lang/String;
 	public abstract fun getAlternateQuotationStart ()Ljava/lang/String;
 	public abstract fun getCountryCode ()Ljava/lang/String;
@@ -853,18 +853,18 @@ public abstract class com/splendo/kaluga/base/utils/BaseLocale {
 	public abstract fun getScriptCode ()Ljava/lang/String;
 	public abstract fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
 	public abstract fun getVariantCode ()Ljava/lang/String;
-	public abstract fun languageName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public abstract fun name (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public abstract fun scriptName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun languageName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public abstract fun name (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public abstract fun scriptName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 	public fun toString ()Ljava/lang/String;
-	public abstract fun variantName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public abstract fun variantName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 }
 
 public abstract class com/splendo/kaluga/base/utils/BaseTimeZone {
 	public fun <init> ()V
 	public abstract fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public abstract fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Ljava/lang/String;
+	public abstract fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public static synthetic fun displayName$default (Lcom/splendo/kaluga/base/utils/BaseTimeZone;Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Ljava/lang/String;
 	public abstract fun getDaylightSavingsOffset-UwyO8pc ()J
 	public final fun getDaylightSavingsOffsetInMilliseconds ()J
 	public abstract fun getIdentifier ()Ljava/lang/String;
@@ -985,10 +985,10 @@ public final class com/splendo/kaluga/base/utils/DefaultKalugaDate : com/splendo
 }
 
 public final class com/splendo/kaluga/base/utils/DefaultKalugaDate$Companion {
-	public final fun epoch-KLykuaI (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun epoch-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun now-KLykuaI (JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun now-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun epoch-KLykuaI (JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public final fun now-KLykuaI (JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now-KLykuaI$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
 public final class com/splendo/kaluga/base/utils/Deferred_getCompletedOrNullKt {
@@ -1048,8 +1048,8 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 }
 
 public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
-	public static final fun epoch (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun epoch (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun isInSameYear (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isLastMonth (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun isLastYear (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
@@ -1064,31 +1064,67 @@ public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
 	public static final fun isYesterday (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 	public static final fun minus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)J
 	public static final fun minus-HG0u8IE (Lcom/splendo/kaluga/base/utils/KalugaDate;J)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun now (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/TimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun nowUtc (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun nowUtc$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun nowUtc-8Mi8wO0 (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun nowUtc-8Mi8wO0$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun now (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun nowUtc (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun nowUtc$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun nowUtc-8Mi8wO0 (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun nowUtc-8Mi8wO0$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun plus-HG0u8IE (Lcom/splendo/kaluga/base/utils/KalugaDate;J)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun toEndOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun toStartOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static final fun tomorrow (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun tomorrow (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaLocale : com/splendo/kaluga/base/utils/BaseLocale {
+	public static final field Companion Lcom/splendo/kaluga/base/utils/KalugaLocale$Companion;
+	public final fun copy (Ljava/util/Locale;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/base/utils/KalugaLocale;Ljava/util/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public fun countryName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getAlternateQuotationEnd ()Ljava/lang/String;
+	public fun getAlternateQuotationStart ()Ljava/lang/String;
+	public fun getCountryCode ()Ljava/lang/String;
+	public fun getLanguageCode ()Ljava/lang/String;
+	public fun getQuotationEnd ()Ljava/lang/String;
+	public fun getQuotationStart ()Ljava/lang/String;
+	public fun getScriptCode ()Ljava/lang/String;
+	public fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
+	public fun getVariantCode ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun languageName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public fun name (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public fun scriptName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+	public fun toString ()Ljava/lang/String;
+	public fun variantName (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaLocale$Companion {
+	public final fun createLocale (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public final fun createLocale (Ljava/lang/String;Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public final fun createLocale (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public final fun getAvailableLocales ()Ljava/util/List;
+	public final fun getDefaultLocale ()Lcom/splendo/kaluga/base/utils/KalugaLocale;
+}
+
+public final class com/splendo/kaluga/base/utils/KalugaLocaleKt {
+	public static final fun getEnUsPosix (Lcom/splendo/kaluga/base/utils/KalugaLocale$Companion;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
+	public static final fun getUses24HourClock (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Z
 }
 
 public final class com/splendo/kaluga/base/utils/KalugaTimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
 	public static final field Companion Lcom/splendo/kaluga/base/utils/KalugaTimeZone$Companion;
 	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
 	public fun copy ()Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
-	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
+	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/KalugaLocale;)Ljava/lang/String;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getDaylightSavingsOffsetInMilliseconds ()J
+	public fun getDaylightSavingsOffset-UwyO8pc ()J
 	public fun getIdentifier ()Ljava/lang/String;
-	public fun getOffsetFromGMTInMilliseconds ()J
-	public fun offsetFromGMTAtDateInMilliseconds (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public fun getOffsetFromGMT-UwyO8pc ()J
+	public fun offsetFromGMTAtDate-5sfh64U (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
 	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
 }
 
@@ -1153,29 +1189,6 @@ public final class com/splendo/kaluga/base/utils/RoundingMode$RoundUp : com/sple
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/RoundingMode$RoundUp;
 }
 
-public final class com/splendo/kaluga/base/utils/TimeZone : com/splendo/kaluga/base/utils/BaseTimeZone {
-	public static final field Companion Lcom/splendo/kaluga/base/utils/TimeZone$Companion;
-	public synthetic fun copy ()Lcom/splendo/kaluga/base/utils/BaseTimeZone;
-	public fun copy ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public fun displayName (Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;ZLcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDaylightSavingsOffset-UwyO8pc ()J
-	public fun getIdentifier ()Ljava/lang/String;
-	public fun getOffsetFromGMT-UwyO8pc ()J
-	public fun offsetFromGMTAtDate-5sfh64U (Lcom/splendo/kaluga/base/utils/KalugaDate;)J
-	public fun usesDaylightSavingsTime (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
-}
-
-public final class com/splendo/kaluga/base/utils/TimeZone$Companion {
-	public final fun current ()Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun get (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/TimeZone;
-	public final fun getAvailableIdentifiers ()Ljava/util/List;
-}
-
-public final class com/splendo/kaluga/base/utils/TimeZoneKt {
-	public static final fun getUtc (Lcom/splendo/kaluga/base/utils/TimeZone$Companion;)Lcom/splendo/kaluga/base/utils/TimeZone;
-}
-
 public final class com/splendo/kaluga/base/utils/TimeZoneNameStyle : java/lang/Enum {
 	public static final field Long Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;
 	public static final field Short Lcom/splendo/kaluga/base/utils/TimeZoneNameStyle;
diff --git a/date-time-picker/api/androidLib/date-time-picker.api b/date-time-picker/api/androidLib/date-time-picker.api
index 551c77443..905cf3d74 100644
--- a/date-time-picker/api/androidLib/date-time-picker.api
+++ b/date-time-picker/api/androidLib/date-time-picker.api
@@ -16,19 +16,19 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 }
 
 public final class com/splendo/kaluga/datetimepicker/DateTimePicker {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/utils/KalugaDate;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/KalugaLocale;Lcom/splendo/kaluga/base/utils/KalugaDate;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Ljava/lang/String;
 	public final fun component3 ()Ljava/lang/String;
 	public final fun component4 ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;
-	public final fun component5 ()Lcom/splendo/kaluga/base/utils/Locale;
+	public final fun component5 ()Lcom/splendo/kaluga/base/utils/KalugaLocale;
 	public final fun component6 ()Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/KalugaLocale;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/KalugaLocale;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getCancelButtonTitle ()Ljava/lang/String;
 	public final fun getConfirmButtonTitle ()Ljava/lang/String;
-	public final fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public final fun getLocale ()Lcom/splendo/kaluga/base/utils/KalugaLocale;
 	public final fun getMessage ()Ljava/lang/String;
 	public final fun getSelectedDate ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public final fun getType ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;
@@ -43,7 +43,7 @@ public final class com/splendo/kaluga/datetimepicker/DateTimePicker$Builder {
 	public final fun build ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public final fun setCancelButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
 	public final fun setConfirmButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
-	public final fun setLocale (Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+	public final fun setLocale (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
 	public final fun setMessage (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
 	public final fun setSelectedDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
 }
diff --git a/date-time-picker/api/jvm/date-time-picker.api b/date-time-picker/api/jvm/date-time-picker.api
index 233b6fc39..c49e68e9e 100644
--- a/date-time-picker/api/jvm/date-time-picker.api
+++ b/date-time-picker/api/jvm/date-time-picker.api
@@ -16,19 +16,19 @@ public abstract class com/splendo/kaluga/datetimepicker/BaseDateTimePickerPresen
 }
 
 public final class com/splendo/kaluga/datetimepicker/DateTimePicker {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/utils/KalugaDate;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/KalugaLocale;Lcom/splendo/kaluga/base/utils/KalugaDate;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Ljava/lang/String;
 	public final fun component3 ()Ljava/lang/String;
 	public final fun component4 ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;
-	public final fun component5 ()Lcom/splendo/kaluga/base/utils/Locale;
+	public final fun component5 ()Lcom/splendo/kaluga/base/utils/KalugaLocale;
 	public final fun component6 ()Lcom/splendo/kaluga/base/utils/KalugaDate;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/Locale;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/KalugaLocale;Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/datetimepicker/DateTimePicker;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;Lcom/splendo/kaluga/base/utils/KalugaLocale;Lcom/splendo/kaluga/base/utils/KalugaDate;ILjava/lang/Object;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getCancelButtonTitle ()Ljava/lang/String;
 	public final fun getConfirmButtonTitle ()Ljava/lang/String;
-	public final fun getLocale ()Lcom/splendo/kaluga/base/utils/Locale;
+	public final fun getLocale ()Lcom/splendo/kaluga/base/utils/KalugaLocale;
 	public final fun getMessage ()Ljava/lang/String;
 	public final fun getSelectedDate ()Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public final fun getType ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Type;
@@ -43,7 +43,7 @@ public final class com/splendo/kaluga/datetimepicker/DateTimePicker$Builder {
 	public final fun build ()Lcom/splendo/kaluga/datetimepicker/DateTimePicker;
 	public final fun setCancelButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
 	public final fun setConfirmButtonTitle (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
-	public final fun setLocale (Lcom/splendo/kaluga/base/utils/Locale;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
+	public final fun setLocale (Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
 	public final fun setMessage (Ljava/lang/String;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
 	public final fun setSelectedDate (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/datetimepicker/DateTimePicker$Builder;
 }
diff --git a/location/api/jvm/location.api b/location/api/jvm/location.api
index 3c96835c3..f98de0f7c 100644
--- a/location/api/jvm/location.api
+++ b/location/api/jvm/location.api
@@ -144,33 +144,6 @@ public final class com/splendo/kaluga/location/Location$KnownLocation : com/sple
 	public fun toString ()Ljava/lang/String;
 }
 
-public abstract class com/splendo/kaluga/location/Location$Time {
-	public synthetic fun <init> (JLkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getMs ()J
-}
-
-public final class com/splendo/kaluga/location/Location$Time$GuessedTime : com/splendo/kaluga/location/Location$Time {
-	public fun <init> (J)V
-	public final fun component1 ()J
-	public final fun copy (J)Lcom/splendo/kaluga/location/Location$Time$GuessedTime;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$Time$GuessedTime;JILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$Time$GuessedTime;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMs ()J
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/location/Location$Time$MeasuredTime : com/splendo/kaluga/location/Location$Time {
-	public fun <init> (J)V
-	public final fun component1 ()J
-	public final fun copy (J)Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;JILjava/lang/Object;)Lcom/splendo/kaluga/location/Location$Time$MeasuredTime;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getMs ()J
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public abstract class com/splendo/kaluga/location/Location$UnknownLocation : com/splendo/kaluga/location/Location {
 	public synthetic fun <init> (Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getReason ()Lcom/splendo/kaluga/location/Location$UnknownLocation$Reason;

From 00563bbceca57a3c6fb44fea4c3cd5d9a330a656 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 20 Feb 2023 23:47:25 +0100
Subject: [PATCH 194/227] Track KalugaswiftUI master

---
 base/api/jvm/base.api      | 36 ------------------------------------
 example/ios/Kaluga-SwiftUI |  2 +-
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index 9dcfbd19f..57540ada6 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -1138,42 +1138,6 @@ public final class com/splendo/kaluga/base/utils/KalugaTimeZoneKt {
 	public static final fun getUtc (Lcom/splendo/kaluga/base/utils/KalugaTimeZone$Companion;)Lcom/splendo/kaluga/base/utils/KalugaTimeZone;
 }
 
-public final class com/splendo/kaluga/base/utils/Locale : com/splendo/kaluga/base/utils/BaseLocale {
-	public static final field Companion Lcom/splendo/kaluga/base/utils/Locale$Companion;
-	public final fun copy (Ljava/util/Locale;)Lcom/splendo/kaluga/base/utils/Locale;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/base/utils/Locale;Ljava/util/Locale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Locale;
-	public fun countryName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getAlternateQuotationEnd ()Ljava/lang/String;
-	public fun getAlternateQuotationStart ()Ljava/lang/String;
-	public fun getCountryCode ()Ljava/lang/String;
-	public fun getLanguageCode ()Ljava/lang/String;
-	public fun getQuotationEnd ()Ljava/lang/String;
-	public fun getQuotationStart ()Ljava/lang/String;
-	public fun getScriptCode ()Ljava/lang/String;
-	public fun getUnitSystem ()Lcom/splendo/kaluga/base/utils/UnitSystem;
-	public fun getVariantCode ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun languageName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun name (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun scriptName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-	public fun toString ()Ljava/lang/String;
-	public fun variantName (Lcom/splendo/kaluga/base/utils/Locale;)Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/base/utils/Locale$Companion {
-	public final fun createLocale (Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/Locale;
-	public final fun createLocale (Ljava/lang/String;Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/Locale;
-	public final fun createLocale (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/splendo/kaluga/base/utils/Locale;
-	public final fun getAvailableLocales ()Ljava/util/List;
-	public final fun getDefaultLocale ()Lcom/splendo/kaluga/base/utils/Locale;
-}
-
-public final class com/splendo/kaluga/base/utils/LocaleKt {
-	public static final fun getEnUsPosix (Lcom/splendo/kaluga/base/utils/Locale$Companion;)Lcom/splendo/kaluga/base/utils/Locale;
-	public static final fun getUses24HourClock (Lcom/splendo/kaluga/base/utils/Locale;)Z
-}
-
 public abstract class com/splendo/kaluga/base/utils/RoundingMode {
 }
 
diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 05c58cc25..56d8146a6 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 05c58cc25cd082090bff85ba872ee32baafbc296
+Subproject commit 56d8146a6e582590f7c8543d2c815fb9ba545fe3

From 98fb4dca632712d2f4658ee55dd3a937df653b19 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 00:04:08 +0100
Subject: [PATCH 195/227] Fixes for compiling/API

---
 bluetooth/api/androidLib/bluetooth.api              | 4 ++--
 bluetooth/api/jvm/bluetooth.api                     | 4 ++--
 system/README.md                                    | 2 +-
 system/src/iosMain/kotlin/network/NetworkManager.kt | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bluetooth/api/androidLib/bluetooth.api b/bluetooth/api/androidLib/bluetooth.api
index 27bdb9644..ff6d5ced9 100644
--- a/bluetooth/api/androidLib/bluetooth.api
+++ b/bluetooth/api/androidLib/bluetooth.api
@@ -290,9 +290,7 @@ public abstract class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionMa
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;)V
 	public final fun cancelConnecting ()V
 	protected fun createService (Lcom/splendo/kaluga/bluetooth/ServiceWrapper;)Lcom/splendo/kaluga/bluetooth/Service;
-	protected abstract fun didStartPairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected abstract fun didStartPerformingAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	protected abstract fun didStartUnpairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	protected final fun getCurrentAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 	protected final fun getDeviceWrapper ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
@@ -313,6 +311,8 @@ public abstract class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionMa
 	public final fun pair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun performAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun readRssi (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun requestStartPairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun requestStartUnpairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun reset (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected final fun setCurrentAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)V
 	public final fun startConnecting ()V
diff --git a/bluetooth/api/jvm/bluetooth.api b/bluetooth/api/jvm/bluetooth.api
index 6298f8d79..73265998e 100644
--- a/bluetooth/api/jvm/bluetooth.api
+++ b/bluetooth/api/jvm/bluetooth.api
@@ -236,9 +236,7 @@ public abstract class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionMa
 	public fun <init> (Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;Lcom/splendo/kaluga/bluetooth/device/ConnectionSettings;Lkotlinx/coroutines/CoroutineScope;)V
 	public final fun cancelConnecting ()V
 	protected fun createService (Lcom/splendo/kaluga/bluetooth/ServiceWrapper;)Lcom/splendo/kaluga/bluetooth/Service;
-	protected abstract fun didStartPairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected abstract fun didStartPerformingAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	protected abstract fun didStartUnpairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
 	protected final fun getCurrentAction ()Lcom/splendo/kaluga/bluetooth/device/DeviceAction;
 	protected final fun getDeviceWrapper ()Lcom/splendo/kaluga/bluetooth/device/DeviceWrapper;
@@ -259,6 +257,8 @@ public abstract class com/splendo/kaluga/bluetooth/device/BaseDeviceConnectionMa
 	public final fun pair (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun performAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun readRssi (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun requestStartPairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun requestStartUnpairing (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun reset (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	protected final fun setCurrentAction (Lcom/splendo/kaluga/bluetooth/device/DeviceAction;)V
 	public final fun startConnecting ()V
diff --git a/system/README.md b/system/README.md
index 04b68e7a6..84cff8fe6 100644
--- a/system/README.md
+++ b/system/README.md
@@ -22,7 +22,7 @@ dependencies {
 ### Usage
 The `NetworkState` is available through a `NetworkStateRepo`.
 `NetworkState` is composed by 3 states and each state contains `Network` objects:
-    - `Available`: it can be of 2 types `Wifi` and `Cellular`. Both of them contains also a flag `isExpensive` that specify if the network is available via hotspot.
+    - `Available`: it can be of 2 types `Wifi` and `Cellular`. Both of them contains also a flag `isExpensive` that specify if the network is estimated to require additional costs.
     - `Unavailable`: the network will be of type `Absent`.
     - `Unknown`: in this case the network could be either `Unknown.WithLastKnownNetwork` or `Unknown.WithoutLastKnownNetwork`. The difference between them is that `WithLastKnownNetwork` contains both a reason and the last known network before the state was Unknown.
 
diff --git a/system/src/iosMain/kotlin/network/NetworkManager.kt b/system/src/iosMain/kotlin/network/NetworkManager.kt
index 545c5a3a2..8acbcf4fa 100644
--- a/system/src/iosMain/kotlin/network/NetworkManager.kt
+++ b/system/src/iosMain/kotlin/network/NetworkManager.kt
@@ -74,7 +74,7 @@ actual class DefaultNetworkManager internal constructor(
      * Builder for creating a [DefaultNetworkManager]
      */
     class Builder : NetworkManager.Builder {
-        override fun create(): BaseNetworkManager {
+        override fun create(): NetworkManager {
             val appleNetworkManager = if (IOSVersion.systemVersion >= IOSVersion(12)) {
                 NWPathNetworkManager()
             } else {
@@ -134,7 +134,7 @@ actual class DefaultNetworkManager internal constructor(
                             networkChannel.trySend(NetworkConnectionType.Known.Wifi())
                         }
                     } else if (nw_path_uses_interface_type(network, nw_interface_type_cellular)) {
-                        networkChannel.trySend(NetworkConnectionType.Known.Cellular())
+                        networkChannel.trySend(NetworkConnectionType.Known.Cellular)
                     }
                 }
                 nw_path_status_unsatisfied -> {
@@ -195,7 +195,7 @@ actual class DefaultNetworkManager internal constructor(
             when (flags) {
                 kSCNetworkReachabilityFlagsReachable -> {
                     if (flags == kSCNetworkReachabilityFlagsIsWWAN) {
-                        scNetworkManager.networkChannel.trySend(NetworkConnectionType.Known.Cellular())
+                        scNetworkManager.networkChannel.trySend(NetworkConnectionType.Known.Cellular)
                     } else {
                         scNetworkManager.networkChannel.trySend(NetworkConnectionType.Known.Wifi())
                     }

From f8a563d72c46bee50612232c82503c6e8e5b4925 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 00:12:47 +0100
Subject: [PATCH 196/227] API dump

---
 base/api/androidLib/base.api                | 3 +++
 base/api/jvm/base.api                       | 7 +++++++
 base/src/commonMain/kotlin/utils/Decimal.kt | 8 ++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index d09b94f8c..2d5424853 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -958,6 +958,7 @@ public final class com/splendo/kaluga/base/utils/DecimalAndroid {
 	public static final fun toFiniteDecimal (Ljava/lang/Number;)Ljava/math/BigDecimal;
 	public static final fun toFiniteDecimal (Ljava/lang/String;)Ljava/math/BigDecimal;
 	public static final fun toInt (Ljava/math/BigDecimal;)I
+	public static final fun toLong (Ljava/math/BigDecimal;)J
 	public static final fun toString (Ljava/math/BigDecimal;)Ljava/lang/String;
 }
 
@@ -997,6 +998,8 @@ public final class com/splendo/kaluga/base/utils/DecimalKt {
 	public static final fun toDoubleArray (Ljava/util/Collection;)[D
 	public static final fun toInt (Lcom/splendo/kaluga/base/utils/Decimal;)I
 	public static final fun toIntArray (Ljava/util/Collection;)[I
+	public static final fun toLong (Lcom/splendo/kaluga/base/utils/Decimal;)J
+	public static final fun toLongArray (Ljava/util/Collection;)[J
 	public static final fun toString (Lcom/splendo/kaluga/base/utils/Decimal;)Ljava/lang/String;
 	public static final fun toStringList (Ljava/util/Collection;)Ljava/util/List;
 }
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index dab5f0646..499ac53dc 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -922,6 +922,10 @@ public final class com/splendo/kaluga/base/utils/Decimal$PositiveInfinity : com/
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/Decimal$PositiveInfinity;
 }
 
+public final class com/splendo/kaluga/base/utils/DecimalException : java/lang/ArithmeticException {
+	public fun <init> (Ljava/lang/String;)V
+}
+
 public final class com/splendo/kaluga/base/utils/DecimalJVM {
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;
@@ -949,6 +953,7 @@ public final class com/splendo/kaluga/base/utils/DecimalJVM {
 	public static final fun toFiniteDecimal (Ljava/lang/Number;)Ljava/math/BigDecimal;
 	public static final fun toFiniteDecimal (Ljava/lang/String;)Ljava/math/BigDecimal;
 	public static final fun toInt (Ljava/math/BigDecimal;)I
+	public static final fun toLong (Ljava/math/BigDecimal;)J
 	public static final fun toString (Ljava/math/BigDecimal;)Ljava/lang/String;
 }
 
@@ -988,6 +993,8 @@ public final class com/splendo/kaluga/base/utils/DecimalKt {
 	public static final fun toDoubleArray (Ljava/util/Collection;)[D
 	public static final fun toInt (Lcom/splendo/kaluga/base/utils/Decimal;)I
 	public static final fun toIntArray (Ljava/util/Collection;)[I
+	public static final fun toLong (Lcom/splendo/kaluga/base/utils/Decimal;)J
+	public static final fun toLongArray (Ljava/util/Collection;)[J
 	public static final fun toString (Lcom/splendo/kaluga/base/utils/Decimal;)Ljava/lang/String;
 	public static final fun toStringList (Ljava/util/Collection;)Ljava/util/List;
 }
diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index 992c9f8d8..f5001f716 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -368,11 +368,11 @@ fun Number.toDecimal(): Decimal = when (this) {
 /**
  * Converts a String to a [Decimal]
  */
-fun String.toDecimal(): Decimal = when (this) {
-    Double.NaN.toString() -> Decimal.NaN
-    Double.POSITIVE_INFINITY.toString(),
+fun String.toDecimal(): Decimal = when (lowercase()) {
+    Double.NaN.toString().lowercase() -> Decimal.NaN
+    Double.POSITIVE_INFINITY.toString().lowercase(),
     '\u221E'.toString() -> Decimal.PositiveInfinity
-    Double.NEGATIVE_INFINITY.toString(),
+    Double.NEGATIVE_INFINITY.toString().lowercase(),
     "-${'\u221E'}" -> Decimal.NegativeInfinity
     else -> toFiniteDecimal()?.let { Decimal.Finite(it) } ?: Decimal.NaN
 }

From 7e11748287d0ee53caeb8c56c917f16a9653c3f4 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 00:19:40 +0100
Subject: [PATCH 197/227] Example fix

---
 .../scientific/ScientificConverterViewModel.kt      | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
index 9fe209912..ade553f36 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/scientific/ScientificConverterViewModel.kt
@@ -33,7 +33,6 @@ import com.splendo.kaluga.example.shared.model.scientific.quantityDetails
 import com.splendo.kaluga.example.shared.stylable.ButtonStyles
 import com.splendo.kaluga.resources.view.KalugaButton
 import com.splendo.kaluga.scientific.PhysicalQuantity
-import com.splendo.kaluga.scientific.converter.ScientificConverterException
 import com.splendo.kaluga.scientific.unit.ScientificUnit
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
@@ -83,22 +82,14 @@ class ScientificConverterViewModel internal constructor(
         _resultValue.value = when (converter) {
             is QuantityConverter.Single<*, *> -> {
                 if (left != null && leftUnit != null) {
-                    try {
-                        converter.convert(left, leftUnit)
-                    } catch (e: ScientificConverterException) {
-                        null
-                    }
+                    converter.convert(left, leftUnit)
                 } else {
                     null
                 }
             }
             is QuantityConverter.WithOperator<*, *, *> -> {
                 if (left != null && leftUnit != null && right != null && rightUnit != null) {
-                    try {
-                        converter.convert(left, leftUnit, right, rightUnit)
-                    } catch (e: ScientificConverterException) {
-                        null
-                    }
+                    converter.convert(left, leftUnit, right, rightUnit)
                 } else {
                     null
                 }

From 33dd6f12f81bd8de00a3bca1d7af1a2ddbf71db6 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 00:53:51 +0100
Subject: [PATCH 198/227] Improvements to account for iOS limits

---
 base/src/androidLibMain/kotlin/utils/Decimal.kt |  2 +-
 base/src/commonMain/kotlin/utils/Decimal.kt     | 11 ++++++-----
 base/src/iosMain/kotlin/utils/Decimal.kt        |  8 ++++----
 base/src/jsMain/kotlin/utils/Decimal.kt         |  2 +-
 base/src/jvmMain/kotlin/utils/Decimal.kt        |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/base/src/androidLibMain/kotlin/utils/Decimal.kt b/base/src/androidLibMain/kotlin/utils/Decimal.kt
index d23325436..c14d950d7 100644
--- a/base/src/androidLibMain/kotlin/utils/Decimal.kt
+++ b/base/src/androidLibMain/kotlin/utils/Decimal.kt
@@ -107,7 +107,7 @@ actual fun FiniteDecimal.pow(
     )
 ).setScale(scale, roundingMode.android)
 
-actual fun Number.toFiniteDecimal() = BigDecimal(toString())
+actual fun Number.toFiniteDecimal() = toString().toFiniteDecimal()
 actual fun String.toFiniteDecimal() = try {
     BigDecimal(this)
 } catch (e: NumberFormatException) {
diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index f5001f716..072432852 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -354,11 +354,11 @@ internal expect fun FiniteDecimal.round(scale: Int, roundingMode: RoundingMode =
  * Converts a [Number] to a [Decimal]
  */
 fun Number.toDecimal(): Decimal = when (this) {
-    is Long -> Decimal.Finite(toFiniteDecimal())
-    is Int -> Decimal.Finite(toFiniteDecimal())
-    is Short -> Decimal.Finite(toFiniteDecimal())
+    is Long -> toFiniteDecimalOrNaN()
+    is Int -> toFiniteDecimalOrNaN()
+    is Short -> toFiniteDecimalOrNaN()
     else -> when {
-        toDouble().isFinite() -> Decimal.Finite(toFiniteDecimal())
+        toDouble().isFinite() -> toFiniteDecimalOrNaN()
         toDouble().isNaN() -> Decimal.NaN
         toDouble() == Double.POSITIVE_INFINITY -> Decimal.PositiveInfinity
         else -> Decimal.NegativeInfinity
@@ -377,7 +377,8 @@ fun String.toDecimal(): Decimal = when (lowercase()) {
     else -> toFiniteDecimal()?.let { Decimal.Finite(it) } ?: Decimal.NaN
 }
 
-internal expect fun Number.toFiniteDecimal(): FiniteDecimal
+internal fun Number.toFiniteDecimalOrNaN() = toFiniteDecimal()?.let { Decimal.Finite(it) } ?: Decimal.NaN
+internal expect fun Number.toFiniteDecimal(): FiniteDecimal?
 internal expect fun String.toFiniteDecimal(): FiniteDecimal?
 
 /**
diff --git a/base/src/iosMain/kotlin/utils/Decimal.kt b/base/src/iosMain/kotlin/utils/Decimal.kt
index 3b9e1b3bb..a70c2b0f3 100644
--- a/base/src/iosMain/kotlin/utils/Decimal.kt
+++ b/base/src/iosMain/kotlin/utils/Decimal.kt
@@ -155,13 +155,13 @@ actual fun FiniteDecimal.times(value: FiniteDecimal, scale: Int, roundingMode: R
 )
 
 actual infix fun FiniteDecimal.pow(n: Int): FiniteDecimal = if (n < 0) {
-    1.toFiniteDecimal() / pow(n.absoluteValue)
+    1.toFiniteDecimal()!! / pow(n.absoluteValue)
 } else {
     copy(nsDecimal = nsDecimal.decimalNumberByRaisingToPower(n.toULong()))
 }
 
 actual fun FiniteDecimal.pow(n: Int, scale: Int): FiniteDecimal = if (n < 0) {
-    1.toFiniteDecimal() / pow(n.absoluteValue, scale)
+    1.toFiniteDecimal()!! / pow(n.absoluteValue, scale)
 } else {
     copy(
         nsDecimal = nsDecimal.decimalNumberByRaisingToPower(
@@ -183,7 +183,7 @@ actual fun FiniteDecimal.pow(
     scale: Int,
     roundingMode: RoundingMode
 ): FiniteDecimal = if (n < 0) {
-    1.toFiniteDecimal() / pow(n.absoluteValue, scale, roundingMode)
+    1.toFiniteDecimal()!! / pow(n.absoluteValue, scale, roundingMode)
 } else {
     copy(
         nsDecimal = nsDecimal.decimalNumberByRaisingToPower(
@@ -200,7 +200,7 @@ actual fun FiniteDecimal.pow(
     )
 }
 
-actual fun Number.toFiniteDecimal() = FiniteDecimal(NSDecimalNumber(this.toString()))
+actual fun Number.toFiniteDecimal() = toString().toFiniteDecimal()
 actual fun String.toFiniteDecimal(): FiniteDecimal? = when (val decimal = NSDecimalNumber(this)) {
     NSDecimalNumber.notANumber -> null
     else -> FiniteDecimal(decimal)
diff --git a/base/src/jsMain/kotlin/utils/Decimal.kt b/base/src/jsMain/kotlin/utils/Decimal.kt
index 30e74005d..f67cf6c62 100644
--- a/base/src/jsMain/kotlin/utils/Decimal.kt
+++ b/base/src/jsMain/kotlin/utils/Decimal.kt
@@ -150,7 +150,7 @@ actual fun FiniteDecimal.round(
     roundingMode: RoundingMode
 ): FiniteDecimal = round(bd, roundingMode, scale)
 
-actual fun Number.toFiniteDecimal(): FiniteDecimal = this.toString().toFiniteDecimal()!!
+actual fun Number.toFiniteDecimal(): FiniteDecimal? = this.toString().toFiniteDecimal()
 actual fun String.toFiniteDecimal(): FiniteDecimal? = try {
     FiniteDecimal(BigDecimal.BigDecimal(this))
 } catch (e: dynamic) {
diff --git a/base/src/jvmMain/kotlin/utils/Decimal.kt b/base/src/jvmMain/kotlin/utils/Decimal.kt
index cd1682d64..b5668b711 100644
--- a/base/src/jvmMain/kotlin/utils/Decimal.kt
+++ b/base/src/jvmMain/kotlin/utils/Decimal.kt
@@ -108,7 +108,7 @@ actual fun FiniteDecimal.pow(
     )
 ).setScale(scale, roundingMode.java)
 
-actual fun Number.toFiniteDecimal() = BigDecimal(toString())
+actual fun Number.toFiniteDecimal() = toString().toFiniteDecimal()
 actual fun String.toFiniteDecimal() = try {
     BigDecimal(this)
 } catch (e: NumberFormatException) {

From 83ff872dd666a59c67ec5b2f73f589b41e400308 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 13:55:59 +0100
Subject: [PATCH 199/227] Remaining Scientific Documentation

---
 base/api/jvm/base.api                         |   4 -
 scientific/api/androidLib/scientific.api      | 127 ++---
 scientific/api/jvm/scientific.api             | 137 ++----
 .../src/commonMain/kotlin/ScientificArray.kt  | 403 ++++++++++++++-
 .../src/commonMain/kotlin/ScientificValue.kt  | 463 ++++++++++++++++--
 .../dimensionless/convertFromAnyUnit.kt       |   4 +
 .../CommonScientificValueFormatter.kt         |  27 +-
 .../formatter/ScientificValueFormatter.kt     |  14 +
 .../commonMain/kotlin/unit/ScientificUnit.kt  |   8 +-
 .../src/commonMain/kotlin/unit/VolumeUnit.kt  |   2 -
 .../src/commonMain/kotlin/unit/WeightUnit.kt  |   1 -
 .../kotlin/network/NetworkManager.kt          |   2 +-
 12 files changed, 954 insertions(+), 238 deletions(-)

diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index 499ac53dc..53993bf86 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -922,10 +922,6 @@ public final class com/splendo/kaluga/base/utils/Decimal$PositiveInfinity : com/
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/Decimal$PositiveInfinity;
 }
 
-public final class com/splendo/kaluga/base/utils/DecimalException : java/lang/ArithmeticException {
-	public fun <init> (Ljava/lang/String;)V
-}
-
 public final class com/splendo/kaluga/base/utils/DecimalJVM {
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;
diff --git a/scientific/api/androidLib/scientific.api b/scientific/api/androidLib/scientific.api
index 02ec64644..ebe34249e 100644
--- a/scientific/api/androidLib/scientific.api
+++ b/scientific/api/androidLib/scientific.api
@@ -475,12 +475,15 @@ public final class com/splendo/kaluga/scientific/ScientificValueKt {
 	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static synthetic fun convertValue$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/lang/Number;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun div (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun getDecimalFraction (Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun invoke (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -494,6 +497,7 @@ public final class com/splendo/kaluga/scientific/ScientificValueKt {
 	public static final fun minus (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun minus (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -501,6 +505,7 @@ public final class com/splendo/kaluga/scientific/ScientificValueKt {
 	public static final fun plus (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1004,8 +1009,8 @@ public final class com/splendo/kaluga/scientific/converter/catalysticActivity/Co
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertFromDimensionlessKt {
-	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
-	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertToFrequencyKt {
@@ -1140,22 +1145,22 @@ public final class com/splendo/kaluga/scientific/converter/density/ConvertToWeig
 }
 
 public final class com/splendo/kaluga/scientific/converter/dimensionless/ConvertFromAnyUnitKt {
-	public static final fun div (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public static final fun modify (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
+	public static final fun dimensionlessDivDimensionlessDefault (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun dimensionlessTimesDimensionlessDefault (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun dimensionlessTimesValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun modify (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/dimensionless/ConvertToAnyUnitKt {
-	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/dimensionless/ConvertToDecimalKt {
-	public static final fun convertToOneByDividing (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
-	public static final fun convertToOneByMultiplying (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
-	public static final fun div (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
+	public static final fun convertToOneByDividing (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun convertToOneByMultiplying (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertFromKinematicViscosityAndDensityKt {
@@ -4538,7 +4543,6 @@ public abstract class com/splendo/kaluga/scientific/formatter/CommonScientificVa
 
 public final class com/splendo/kaluga/scientific/formatter/CommonScientificValueFormatter$Builder {
 	public static final field Companion Lcom/splendo/kaluga/scientific/formatter/CommonScientificValueFormatter$Builder$Companion;
-	public fun <init> ()V
 	public final fun useFormat (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function1;)V
 }
 
@@ -5767,16 +5771,6 @@ public final class com/splendo/kaluga/scientific/unit/CoulombMultiple$Companion
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Cubic : com/splendo/kaluga/scientific/unit/SystemScientificUnit {
-	public fun <init> (Lcom/splendo/kaluga/scientific/unit/SystemScientificUnit;)V
-	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
-	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
-	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
-	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
-}
-
 public final class com/splendo/kaluga/scientific/unit/CubicCentimeter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicCentimeter;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
@@ -6979,39 +6973,6 @@ public final class com/splendo/kaluga/scientific/unit/Deciweber : com/splendo/ka
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue : com/splendo/kaluga/scientific/unit/DimensionlessScientificValue {
-	public static final field Companion Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue$Companion;
-	public fun <init> (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
-	public synthetic fun <init> (IDLcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun <init> (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
-	public final fun component1 ()D
-	public final fun component2 ()Lcom/splendo/kaluga/scientific/unit/ScientificUnit;
-	public final fun copy (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;DLcom/splendo/kaluga/scientific/unit/ScientificUnit;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getUnit ()Lcom/splendo/kaluga/scientific/unit/ScientificUnit;
-	public fun getValue ()Ljava/lang/Double;
-	public synthetic fun getValue ()Ljava/lang/Number;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;Lkotlinx/serialization/KSerializer;)V
-}
-
-public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public synthetic fun <init> (Lkotlinx/serialization/KSerializer;)V
-	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue$Companion {
-	public final fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
-}
-
 public final class com/splendo/kaluga/scientific/unit/Degree : com/splendo/kaluga/scientific/unit/Angle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Degree;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
@@ -7064,23 +7025,18 @@ public abstract class com/splendo/kaluga/scientific/unit/Dimensionless : com/spl
 }
 
 public final class com/splendo/kaluga/scientific/unit/Dimensionless$Companion {
-	public final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public final fun invoke (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public abstract interface class com/splendo/kaluga/scientific/unit/DimensionlessScientificValue : com/splendo/kaluga/scientific/ScientificValue {
-	public fun getDecimalFraction ()Lcom/splendo/kaluga/base/utils/Decimal;
-}
-
 public final class com/splendo/kaluga/scientific/unit/DimensionlessUnitKt {
-	public static final fun getConstant (Lcom/splendo/kaluga/scientific/unit/One;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
+	public static final fun getConstant (Lcom/splendo/kaluga/scientific/unit/One;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun getDimensionlessUnits ()Ljava/util/Set;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Dram : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Dram;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -7331,6 +7287,7 @@ public final class com/splendo/kaluga/scientific/unit/FaradMultiple$Companion {
 public final class com/splendo/kaluga/scientific/unit/Foot : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Foot;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -7941,6 +7898,7 @@ public final class com/splendo/kaluga/scientific/unit/Gradian : com/splendo/kalu
 public final class com/splendo/kaluga/scientific/unit/Grain : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Grain;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -8927,11 +8885,9 @@ public final class com/splendo/kaluga/scientific/unit/ImperialKinematicViscosity
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialLength : com/splendo/kaluga/scientific/unit/Length, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ImperialLength$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ImperialLength;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
@@ -9536,6 +9492,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSurfaceTension$Com
 public final class com/splendo/kaluga/scientific/unit/ImperialTon : com/splendo/kaluga/scientific/unit/UKImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialTon;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -9649,11 +9606,9 @@ public final class com/splendo/kaluga/scientific/unit/ImperialVolumetricFlux$Com
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialWeight : com/splendo/kaluga/scientific/unit/Weight, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ImperialWeight$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
@@ -9702,6 +9657,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialYank$Companion {
 public final class com/splendo/kaluga/scientific/unit/Inch : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Inch;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -9819,7 +9775,6 @@ public final class com/splendo/kaluga/scientific/unit/JoltUnitKt {
 	public static final fun getImperialJoltUnits ()Ljava/util/Set;
 	public static final fun getJoltUnits ()Ljava/util/Set;
 	public static final fun getMetricJoltUnits ()Ljava/util/Set;
-	public static final fun per (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/Jolt;
 	public static final fun per (Lcom/splendo/kaluga/scientific/unit/ImperialAcceleration;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/ImperialJolt;
 	public static final fun per (Lcom/splendo/kaluga/scientific/unit/MetricAcceleration;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/MetricJolt;
 }
@@ -10407,7 +10362,6 @@ public final class com/splendo/kaluga/scientific/unit/KinematicViscosityUnitKt {
 	public static final fun getImperialKinematicViscosityUnits ()Ljava/util/Set;
 	public static final fun getKinematicViscosityUnits ()Ljava/util/Set;
 	public static final fun getMetricKinematicViscosityUnits ()Ljava/util/Set;
-	public static final fun per (Lcom/splendo/kaluga/scientific/unit/Area;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;
 	public static final fun per (Lcom/splendo/kaluga/scientific/unit/ImperialArea;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/ImperialKinematicViscosity;
 	public static final fun per (Lcom/splendo/kaluga/scientific/unit/MetricArea;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/MetricKinematicViscosity;
 }
@@ -13112,6 +13066,7 @@ public final class com/splendo/kaluga/scientific/unit/Microweber : com/splendo/k
 public final class com/splendo/kaluga/scientific/unit/Mile : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Mile;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -14502,6 +14457,7 @@ public final class com/splendo/kaluga/scientific/unit/One : com/splendo/kaluga/s
 public final class com/splendo/kaluga/scientific/unit/Ounce : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Ounce;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -14595,6 +14551,7 @@ public final class com/splendo/kaluga/scientific/unit/PhotMultiple$Companion {
 public final class com/splendo/kaluga/scientific/unit/Pound : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Pound;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -14872,6 +14829,7 @@ public final class com/splendo/kaluga/scientific/unit/Skot : com/splendo/kaluga/
 public final class com/splendo/kaluga/scientific/unit/Slug : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Slug;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -15032,16 +14990,6 @@ public final class com/splendo/kaluga/scientific/unit/SpeedUnitKt {
 	public static final fun per (Lcom/splendo/kaluga/scientific/unit/MetricLength;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/MetricSpeed;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Square : com/splendo/kaluga/scientific/unit/SystemScientificUnit {
-	public fun <init> (Lcom/splendo/kaluga/scientific/unit/SystemScientificUnit;)V
-	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
-	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
-	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
-	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
-}
-
 public final class com/splendo/kaluga/scientific/unit/SquareCentimeter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareCentimeter;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
@@ -15271,6 +15219,7 @@ public final class com/splendo/kaluga/scientific/unit/Stilb : com/splendo/kaluga
 public final class com/splendo/kaluga/scientific/unit/Stone : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Stone;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -15685,7 +15634,7 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWr
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper : com/splendo/kaluga/scientific/unit/UKImperialWeight {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)V
 	public final fun component1 ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;
@@ -15693,6 +15642,7 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialWeightWr
 	public fun equals (Ljava/lang/Object;)Z
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
+	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
@@ -16263,11 +16213,9 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialVolumetricFlux$C
 
 public abstract class com/splendo/kaluga/scientific/unit/UKImperialWeight : com/splendo/kaluga/scientific/unit/Weight, com/splendo/kaluga/scientific/unit/UKImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/UKImperialWeight$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/UKImperialWeight;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
@@ -16562,7 +16510,7 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeW
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper : com/splendo/kaluga/scientific/unit/USCustomaryWeight {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$USCustomary;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$USCustomary;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)V
 	public final fun component1 ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;
@@ -16570,6 +16518,7 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialWeightW
 	public fun equals (Ljava/lang/Object;)Z
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
+	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
@@ -17122,11 +17071,9 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlux$
 
 public abstract class com/splendo/kaluga/scientific/unit/USCustomaryWeight : com/splendo/kaluga/scientific/unit/Weight, com/splendo/kaluga/scientific/unit/USCustomaryScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/USCustomaryWeight$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$USCustomary;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$USCustomary;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$USCustomary;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/USCustomaryWeight;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
@@ -17245,6 +17192,7 @@ public final class com/splendo/kaluga/scientific/unit/UsLiquidQuart : com/splend
 public final class com/splendo/kaluga/scientific/unit/UsTon : com/splendo/kaluga/scientific/unit/USCustomaryWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsTon;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -17489,6 +17437,7 @@ public final class com/splendo/kaluga/scientific/unit/YankUnitKt {
 public final class com/splendo/kaluga/scientific/unit/Yard : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Yard;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
diff --git a/scientific/api/jvm/scientific.api b/scientific/api/jvm/scientific.api
index 894465e4c..bac70009f 100644
--- a/scientific/api/jvm/scientific.api
+++ b/scientific/api/jvm/scientific.api
@@ -521,12 +521,15 @@ public final class com/splendo/kaluga/scientific/ScientificValueKt {
 	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun convertValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static synthetic fun convertValue$default (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;ILcom/splendo/kaluga/base/utils/RoundingMode;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Ljava/lang/Number;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun div (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun div (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun getDecimalFraction (Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public static final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun invoke (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -540,6 +543,7 @@ public final class com/splendo/kaluga/scientific/ScientificValueKt {
 	public static final fun minus (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun minus (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun plus (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -547,6 +551,7 @@ public final class com/splendo/kaluga/scientific/ScientificValueKt {
 	public static final fun plus (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun plus (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
@@ -1056,8 +1061,8 @@ public final class com/splendo/kaluga/scientific/converter/catalysticActivity/Co
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertFromDimensionlessKt {
-	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
-	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun div (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public static final fun times (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
 public final class com/splendo/kaluga/scientific/converter/decimal/ConvertToFrequencyKt {
@@ -1192,22 +1197,22 @@ public final class com/splendo/kaluga/scientific/converter/density/ConvertToWeig
 }
 
 public final class com/splendo/kaluga/scientific/converter/dimensionless/ConvertFromAnyUnitKt {
-	public static final fun div (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public static final fun modify (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
+	public static final fun dimensionlessDivDimensionlessDefault (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun dimensionlessTimesDimensionlessDefault (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun dimensionlessTimesValue (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun modify (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/dimensionless/ConvertToAnyUnitKt {
-	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/dimensionless/ConvertToDecimalKt {
-	public static final fun convertToOneByDividing (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
-	public static final fun convertToOneByMultiplying (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;
-	public static final fun div (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public static final fun times (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
+	public static final fun convertToOneByDividing (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun convertToOneByMultiplying (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;Lkotlin/jvm/functions/Function2;)Lcom/splendo/kaluga/scientific/ScientificValue;
+	public static final fun div (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
+	public static final fun times (Lcom/splendo/kaluga/scientific/ScientificValue;Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 }
 
 public final class com/splendo/kaluga/scientific/converter/dynamicViscosity/ConvertFromKinematicViscosityAndDensityKt {
@@ -4590,7 +4595,6 @@ public abstract class com/splendo/kaluga/scientific/formatter/CommonScientificVa
 
 public final class com/splendo/kaluga/scientific/formatter/CommonScientificValueFormatter$Builder {
 	public static final field Companion Lcom/splendo/kaluga/scientific/formatter/CommonScientificValueFormatter$Builder$Companion;
-	public fun <init> ()V
 	public final fun useFormat (Lcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlin/jvm/functions/Function1;)V
 }
 
@@ -5819,16 +5823,6 @@ public final class com/splendo/kaluga/scientific/unit/CoulombMultiple$Companion
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Cubic : com/splendo/kaluga/scientific/unit/SystemScientificUnit {
-	public fun <init> (Lcom/splendo/kaluga/scientific/unit/SystemScientificUnit;)V
-	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
-	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Volume;
-	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
-	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
-}
-
 public final class com/splendo/kaluga/scientific/unit/CubicCentimeter : com/splendo/kaluga/scientific/unit/MetricVolume, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/CubicCentimeter;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
@@ -7031,43 +7025,6 @@ public final class com/splendo/kaluga/scientific/unit/Deciweber : com/splendo/ka
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
 
-public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue : com/splendo/kaluga/scientific/unit/DimensionlessScientificValue {
-	public static final field Companion Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue$Companion;
-	public fun <init> (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
-	public synthetic fun <init> (IDLcom/splendo/kaluga/scientific/unit/ScientificUnit;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public fun <init> (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)V
-	public fun compareTo (Lcom/splendo/kaluga/scientific/ScientificValue;)I
-	public synthetic fun compareTo (Ljava/lang/Object;)I
-	public final fun component1 ()D
-	public final fun component2 ()Lcom/splendo/kaluga/scientific/unit/ScientificUnit;
-	public final fun copy (DLcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;DLcom/splendo/kaluga/scientific/unit/ScientificUnit;ILjava/lang/Object;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getDecimalFraction ()Lcom/splendo/kaluga/base/utils/Decimal;
-	public fun getDecimalValue ()Lcom/splendo/kaluga/base/utils/Decimal;
-	public fun getUnit ()Lcom/splendo/kaluga/scientific/unit/ScientificUnit;
-	public fun getValue ()Ljava/lang/Double;
-	public synthetic fun getValue ()Ljava/lang/Number;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;Lkotlinx/serialization/KSerializer;)V
-}
-
-public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public synthetic fun <init> (Lkotlinx/serialization/KSerializer;)V
-	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue$Companion {
-	public final fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
-}
-
 public final class com/splendo/kaluga/scientific/unit/Degree : com/splendo/kaluga/scientific/unit/Angle {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Degree;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
@@ -7120,29 +7077,18 @@ public abstract class com/splendo/kaluga/scientific/unit/Dimensionless : com/spl
 }
 
 public final class com/splendo/kaluga/scientific/unit/Dimensionless$Companion {
-	public final fun invoke (Lcom/splendo/kaluga/base/utils/Decimal;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
-	public final fun invoke (Ljava/lang/Number;Lcom/splendo/kaluga/scientific/unit/ScientificUnit;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public abstract interface class com/splendo/kaluga/scientific/unit/DimensionlessScientificValue : com/splendo/kaluga/scientific/ScientificValue {
-	public abstract fun getDecimalFraction ()Lcom/splendo/kaluga/base/utils/Decimal;
-}
-
-public final class com/splendo/kaluga/scientific/unit/DimensionlessScientificValue$DefaultImpls {
-	public static fun compareTo (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;Lcom/splendo/kaluga/scientific/ScientificValue;)I
-	public static fun getDecimalFraction (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
-	public static fun getDecimalValue (Lcom/splendo/kaluga/scientific/unit/DimensionlessScientificValue;)Lcom/splendo/kaluga/base/utils/Decimal;
-}
-
 public final class com/splendo/kaluga/scientific/unit/DimensionlessUnitKt {
-	public static final fun getConstant (Lcom/splendo/kaluga/scientific/unit/One;)Lcom/splendo/kaluga/scientific/unit/DefaultDimensionlessScientificValue;
+	public static final fun getConstant (Lcom/splendo/kaluga/scientific/unit/One;)Lcom/splendo/kaluga/scientific/DefaultScientificValue;
 	public static final fun getDimensionlessUnits ()Ljava/util/Set;
 }
 
 public final class com/splendo/kaluga/scientific/unit/Dram : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Dram;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -7393,6 +7339,7 @@ public final class com/splendo/kaluga/scientific/unit/FaradMultiple$Companion {
 public final class com/splendo/kaluga/scientific/unit/Foot : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Foot;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -8003,6 +7950,7 @@ public final class com/splendo/kaluga/scientific/unit/Gradian : com/splendo/kalu
 public final class com/splendo/kaluga/scientific/unit/Grain : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Grain;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -8989,11 +8937,9 @@ public final class com/splendo/kaluga/scientific/unit/ImperialKinematicViscosity
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialLength : com/splendo/kaluga/scientific/unit/Length, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ImperialLength$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Length;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ImperialLength;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
@@ -9598,6 +9544,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialSurfaceTension$Com
 public final class com/splendo/kaluga/scientific/unit/ImperialTon : com/splendo/kaluga/scientific/unit/UKImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/ImperialTon;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -9711,11 +9658,9 @@ public final class com/splendo/kaluga/scientific/unit/ImperialVolumetricFlux$Com
 
 public abstract class com/splendo/kaluga/scientific/unit/ImperialWeight : com/splendo/kaluga/scientific/unit/Weight, com/splendo/kaluga/scientific/unit/ImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/ImperialWeight$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$Imperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
@@ -9764,6 +9709,7 @@ public final class com/splendo/kaluga/scientific/unit/ImperialYank$Companion {
 public final class com/splendo/kaluga/scientific/unit/Inch : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Inch;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -9881,7 +9827,6 @@ public final class com/splendo/kaluga/scientific/unit/JoltUnitKt {
 	public static final fun getImperialJoltUnits ()Ljava/util/Set;
 	public static final fun getJoltUnits ()Ljava/util/Set;
 	public static final fun getMetricJoltUnits ()Ljava/util/Set;
-	public static final fun per (Lcom/splendo/kaluga/scientific/unit/Acceleration;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/Jolt;
 	public static final fun per (Lcom/splendo/kaluga/scientific/unit/ImperialAcceleration;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/ImperialJolt;
 	public static final fun per (Lcom/splendo/kaluga/scientific/unit/MetricAcceleration;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/MetricJolt;
 }
@@ -10469,7 +10414,6 @@ public final class com/splendo/kaluga/scientific/unit/KinematicViscosityUnitKt {
 	public static final fun getImperialKinematicViscosityUnits ()Ljava/util/Set;
 	public static final fun getKinematicViscosityUnits ()Ljava/util/Set;
 	public static final fun getMetricKinematicViscosityUnits ()Ljava/util/Set;
-	public static final fun per (Lcom/splendo/kaluga/scientific/unit/Area;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/KinematicViscosity;
 	public static final fun per (Lcom/splendo/kaluga/scientific/unit/ImperialArea;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/ImperialKinematicViscosity;
 	public static final fun per (Lcom/splendo/kaluga/scientific/unit/MetricArea;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/MetricKinematicViscosity;
 }
@@ -13174,6 +13118,7 @@ public final class com/splendo/kaluga/scientific/unit/Microweber : com/splendo/k
 public final class com/splendo/kaluga/scientific/unit/Mile : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Mile;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -14564,6 +14509,7 @@ public final class com/splendo/kaluga/scientific/unit/One : com/splendo/kaluga/s
 public final class com/splendo/kaluga/scientific/unit/Ounce : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Ounce;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -14657,6 +14603,7 @@ public final class com/splendo/kaluga/scientific/unit/PhotMultiple$Companion {
 public final class com/splendo/kaluga/scientific/unit/Pound : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Pound;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -14934,6 +14881,7 @@ public final class com/splendo/kaluga/scientific/unit/Skot : com/splendo/kaluga/
 public final class com/splendo/kaluga/scientific/unit/Slug : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Slug;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -15094,16 +15042,6 @@ public final class com/splendo/kaluga/scientific/unit/SpeedUnitKt {
 	public static final fun per (Lcom/splendo/kaluga/scientific/unit/MetricLength;Lcom/splendo/kaluga/scientific/unit/Time;)Lcom/splendo/kaluga/scientific/unit/MetricSpeed;
 }
 
-public final class com/splendo/kaluga/scientific/unit/Square : com/splendo/kaluga/scientific/unit/SystemScientificUnit {
-	public fun <init> (Lcom/splendo/kaluga/scientific/unit/SystemScientificUnit;)V
-	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
-	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Area;
-	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
-	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
-	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
-}
-
 public final class com/splendo/kaluga/scientific/unit/SquareCentimeter : com/splendo/kaluga/scientific/unit/MetricArea, com/splendo/kaluga/scientific/unit/SystemScientificUnit {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/SquareCentimeter;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
@@ -15333,6 +15271,7 @@ public final class com/splendo/kaluga/scientific/unit/Stilb : com/splendo/kaluga
 public final class com/splendo/kaluga/scientific/unit/Stone : com/splendo/kaluga/scientific/unit/ImperialWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Stone;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -15747,7 +15686,7 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialVolumeWr
 
 public final class com/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper : com/splendo/kaluga/scientific/unit/UKImperialWeight {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)V
 	public final fun component1 ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)Lcom/splendo/kaluga/scientific/unit/UKImperialImperialWeightWrapper;
@@ -15755,6 +15694,7 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialImperialWeightWr
 	public fun equals (Ljava/lang/Object;)Z
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
+	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
@@ -16325,11 +16265,9 @@ public final class com/splendo/kaluga/scientific/unit/UKImperialVolumetricFlux$C
 
 public abstract class com/splendo/kaluga/scientific/unit/UKImperialWeight : com/splendo/kaluga/scientific/unit/Weight, com/splendo/kaluga/scientific/unit/UKImperialScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/UKImperialWeight$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$UKImperial;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/UKImperialWeight;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
@@ -16624,7 +16562,7 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialVolumeW
 
 public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper : com/splendo/kaluga/scientific/unit/USCustomaryWeight {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$USCustomary;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$USCustomary;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lcom/splendo/kaluga/scientific/unit/ImperialWeight;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)V
 	public final fun component1 ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
 	public final fun copy (Lcom/splendo/kaluga/scientific/unit/ImperialWeight;)Lcom/splendo/kaluga/scientific/unit/USCustomaryImperialWeightWrapper;
@@ -16632,6 +16570,7 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryImperialWeightW
 	public fun equals (Ljava/lang/Object;)Z
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public final fun getImperial ()Lcom/splendo/kaluga/scientific/unit/ImperialWeight;
+	public fun getSymbol ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 	public fun toString ()Ljava/lang/String;
@@ -17184,11 +17123,9 @@ public final class com/splendo/kaluga/scientific/unit/USCustomaryVolumetricFlux$
 
 public abstract class com/splendo/kaluga/scientific/unit/USCustomaryWeight : com/splendo/kaluga/scientific/unit/Weight, com/splendo/kaluga/scientific/unit/USCustomaryScientificUnit {
 	public static final field Companion Lcom/splendo/kaluga/scientific/unit/USCustomaryWeight$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$USCustomary;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (ILcom/splendo/kaluga/scientific/unit/MeasurementSystem$USCustomary;Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity$Weight;
 	public synthetic fun getQuantity ()Lcom/splendo/kaluga/scientific/PhysicalQuantity;
-	public fun getSymbol ()Ljava/lang/String;
 	public fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem$USCustomary;
 	public synthetic fun getSystem ()Lcom/splendo/kaluga/scientific/unit/MeasurementSystem;
 	public static final fun write$Self (Lcom/splendo/kaluga/scientific/unit/USCustomaryWeight;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
@@ -17307,6 +17244,7 @@ public final class com/splendo/kaluga/scientific/unit/UsLiquidQuart : com/splend
 public final class com/splendo/kaluga/scientific/unit/UsTon : com/splendo/kaluga/scientific/unit/USCustomaryWeight {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/UsTon;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
@@ -17551,6 +17489,7 @@ public final class com/splendo/kaluga/scientific/unit/YankUnitKt {
 public final class com/splendo/kaluga/scientific/unit/Yard : com/splendo/kaluga/scientific/unit/ImperialLength {
 	public static final field INSTANCE Lcom/splendo/kaluga/scientific/unit/Yard;
 	public fun fromSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
+	public fun getSymbol ()Ljava/lang/String;
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 	public fun toSIUnit (Lcom/splendo/kaluga/base/utils/Decimal;)Lcom/splendo/kaluga/base/utils/Decimal;
 }
diff --git a/scientific/src/commonMain/kotlin/ScientificArray.kt b/scientific/src/commonMain/kotlin/ScientificArray.kt
index dcd58eea3..e24391e9c 100644
--- a/scientific/src/commonMain/kotlin/ScientificArray.kt
+++ b/scientific/src/commonMain/kotlin/ScientificArray.kt
@@ -26,13 +26,40 @@ import com.splendo.kaluga.scientific.unit.convert
 import kotlinx.serialization.Serializable
 import kotlin.jvm.JvmName
 
+/**
+ * A collection of values in a given [ScientificUnit]
+ * @param NumberType the type of [Number] this value is stored in
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] this array represents
+ */
 interface ScientificArray<NumberType : Number, Quantity : PhysicalQuantity, Unit : ScientificUnit<Quantity>> : com.splendo.kaluga.base.utils.Serializable {
+
+    /**
+     * Gets the [NumberType] at the given index
+     * @param index the index of the [NumberType] to get from this collection
+     * @return the [NumberType] at the given index
+     * @throws [IndexOutOfBoundsException] if the index is out of bounds for this array
+     */
     operator fun get(index: Int): NumberType
+
+    /**
+     * The size of the array
+     */
     val size: Int
+
+    /**
+     * The [Unit] component
+     */
     val unit: Unit
 
+    /**
+     * Creates an iterator over the elements of the array
+     */
     operator fun iterator(): Iterator<NumberType>
 
+    /**
+     * The List of [Decimal] for all values in this array
+     */
     val decimalValues: List<Decimal> get() {
         val values = mutableListOf<Decimal>()
         iterator().forEach {
@@ -42,7 +69,16 @@ interface ScientificArray<NumberType : Number, Quantity : PhysicalQuantity, Unit
     }
 }
 
+/**
+ * A [ScientificArray] containing [Byte] values
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] this array represents
+ */
 interface ByteScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUnit<Quantity>> : ScientificArray<Byte, Quantity, Unit> {
+
+    /**
+     * The [ByteArray] containing the values
+     */
     val values: ByteArray
 
     override val size: Int
@@ -52,7 +88,16 @@ interface ByteScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUnit
     override fun iterator(): Iterator<Byte> = values.iterator()
 }
 
+/**
+ * A [ScientificArray] containing [Double] values
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] this array represents
+ */
 interface DoubleScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUnit<Quantity>> : ScientificArray<Double, Quantity, Unit> {
+
+    /**
+     * The [DoubleArray] containing the values
+     */
     val values: DoubleArray
 
     override val size: Int
@@ -62,7 +107,16 @@ interface DoubleScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUn
     override fun iterator(): Iterator<Double> = values.iterator()
 }
 
+/**
+ * A [ScientificArray] containing [Float] values
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] this array represents
+ */
 interface FloatScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUnit<Quantity>> : ScientificArray<Float, Quantity, Unit> {
+
+    /**
+     * The [FloatArray] containing the values
+     */
     val values: FloatArray
 
     override val size: Int
@@ -72,7 +126,16 @@ interface FloatScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUni
     override fun iterator(): Iterator<Float> = values.iterator()
 }
 
+/**
+ * A [ScientificArray] containing [Int] values
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] this array represents
+ */
 interface IntScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUnit<Quantity>> : ScientificArray<Int, Quantity, Unit> {
+
+    /**
+     * The [IntArray] containing the values
+     */
     val values: IntArray
 
     override val size: Int
@@ -82,7 +145,16 @@ interface IntScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUnit<
     override fun iterator(): Iterator<Int> = values.iterator()
 }
 
+/**
+ * A [ScientificArray] containing [Short] values
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] this array represents
+ */
 interface ShortScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUnit<Quantity>> : ScientificArray<Short, Quantity, Unit> {
+
+    /**
+     * The [ShortArray] containing the values
+     */
     val values: ShortArray
 
     override val size: Int
@@ -92,7 +164,16 @@ interface ShortScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUni
     override fun iterator(): Iterator<Short> = values.iterator()
 }
 
+/**
+ * A [ScientificArray] containing [Long] values
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] this array represents
+ */
 interface LongScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUnit<Quantity>> : ScientificArray<Long, Quantity, Unit> {
+
+    /**
+     * The [LongArray] containing the values
+     */
     val values: LongArray
 
     override val size: Int
@@ -102,6 +183,13 @@ interface LongScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUnit
     override fun iterator(): Iterator<Long> = values.iterator()
 }
 
+/**
+ * A class implementation of [DoubleScientificArray]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] this array represents
+ * @param values the [DoubleArray] containing the values
+ * @param unit the [Unit] component
+ */
 @Serializable
 data class DefaultScientificArray<Quantity : PhysicalQuantity, Unit : ScientificUnit<Quantity>>(
     override val values: DoubleArray,
@@ -129,12 +217,30 @@ data class DefaultScientificArray<Quantity : PhysicalQuantity, Unit : Scientific
 }
 
 // Creation
+
+/**
+ * Creates a [DefaultScientificArray] containing this list using a given [unit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] the array should represent
+ * @param unit the [Unit] of the [DefaultScientificArray] to be created
+ * @return the created [DefaultScientificArray]
+ */
 @JvmName("scientificArrayFromListOfNumberDefault")
 operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
     > List<Number>.invoke(unit: Unit) = this.toDecimalList()(unit)
 
+/**
+ * Creates an [Array] containing this list using a given [unit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] the array should represent
+ * @param NumberType the type of [Number] the values are is stored in
+ * @param Array the type of [ScientificArray] to create
+ * @param unit the [Unit] of the [Array] to be created
+ * @param factory method for creating [Array] using a list of [Decimal] and a [Unit]
+ * @return the created [Array]
+ */
 @JvmName("scientificArrayFromListOfNumber")
 operator fun <
     Quantity : PhysicalQuantity,
@@ -143,12 +249,29 @@ operator fun <
     Array : ScientificArray<NumberType, Quantity, Unit>
     > List<Number>.invoke(unit: Unit, factory: (List<Decimal>, Unit) -> Array) = this.toDecimalList()(unit, factory)
 
+/**
+ * Creates a [DefaultScientificArray] containing this list of [Decimal] using a given [unit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] the array should represent
+ * @param unit the [Unit] of the [DefaultScientificArray] to be created
+ * @return the created [DefaultScientificArray]
+ */
 @JvmName("scientificArrayFromListOfDecimalDefault")
 operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
     > List<Decimal>.invoke(unit: Unit) = this(unit, ::DefaultScientificArray)
 
+/**
+ * Creates an [Array] containing this list of [Decimal] using a given [unit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] the array should represent
+ * @param NumberType the type of [Number] the values are is stored in
+ * @param Array the type of [ScientificArray] to create
+ * @param unit the [Unit] of the [Array] to be created
+ * @param factory method for creating [Array] using a list of [Decimal] and a [Unit]
+ * @return the created [Array]
+ */
 @JvmName("scientificArrayFromListOfDecimal")
 operator fun <
     Quantity : PhysicalQuantity,
@@ -159,6 +282,14 @@ operator fun <
 
 // Group and Split
 
+/**
+ * Creates a [DefaultScientificArray] from a list of [ScientificValue]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] representing all elements in the list of [ScientificValue]
+ * @param TargetUnit the type of [ScientificUnit] the array should represent
+ * @param unit the [TargetUnit] to convert all values to
+ * @return A [DefaultScientificArray] containing all values of the list in [TargetUnit]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -167,6 +298,17 @@ fun <
     unit: TargetUnit,
 ) = toScientificArray(unit, ::DefaultScientificArray)
 
+/**
+ * Creates a [ArrayType] from a list of [ScientificValue]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] representing all elements in the list of [ScientificValue]
+ * @param TargetUnit the type of [ScientificUnit] the array should represent
+ * @param NumberType the type of [Number] the values are is stored in
+ * @param ArrayType the type of [ScientificArray] to create
+ * @param unit the [TargetUnit] to convert all values to
+ * @param factory method for creating an [ArrayType] from a list of [Decimal] and a [TargetUnit]
+ * @return A [ArrayType] containing all values of the list in [TargetUnit]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -178,12 +320,27 @@ fun <
     factory: (List<Decimal>, TargetUnit) -> ArrayType
 ) = factory(map { it.unit.convert(it.decimalValue, unit) }, unit)
 
+/**
+ * Splits a [ScientificArray] into a list of [DefaultScientificValue] of all the values in the array
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param NumberType the type of [Number] stored in the array
+ * @return a list of [DefaultScientificValue] in [Unit] for all values stored in the array
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
     NumberType : Number
     > ScientificArray<NumberType, Quantity, Unit>.split() = split(unit, ::DefaultScientificValue)
-
+/**
+ * Splits a [ScientificArray] into a list of [DefaultScientificValue] in [TargetUnit] of all the values in the array
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param NumberType the type of [Number] stored in the array
+ * @param TargetUnit the type of [ScientificUnit] the resulting [DefaultScientificValue] should be in
+ * @param targetUnit the [TargetUnit] the resulting [DefaultScientificValue] should be in
+ * @return a list of [DefaultScientificValue] in [TargetUnit] for all values stored in the array
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -193,6 +350,15 @@ fun <
     targetUnit: TargetUnit
 ) = split(targetUnit, ::DefaultScientificValue)
 
+/**
+ * Splits a [ScientificArray] into a list of [TargetValue] of all the values in the array
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param NumberType the type of [Number] stored in the array
+ * @param TargetValue the type of [ScientificValue] to return
+ * @param factory method for creating [TargetValue] from a [Decimal] and [Unit]
+ * @return a list of [TargetValue] for all values stored in the array
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -202,6 +368,17 @@ fun <
     factory: (Decimal, Unit) -> TargetValue
 ) = split(unit, factory)
 
+/**
+ * Splits a [ScientificArray] into a list of [TargetValue] of all the values in the array
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param NumberType the type of [Number] stored in the array
+ * @param TargetUnit the type of [ScientificUnit] the resulting [TargetValue] should be in
+ * @param TargetValue the type of [ScientificValue] to return
+ * @param targetUnit the [TargetUnit] the resulting [TargetValue] should be in
+ * @param factory method for creating [TargetValue] from a [Decimal] and [TargetUnit]
+ * @return a list of [TargetValue] for all values stored in the array
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -221,6 +398,15 @@ fun <
 
 // Conversion
 
+/**
+ * Creates a [DefaultScientificArray] that contains all values of a [ScientificArray] converted to [TargetUnit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in the array
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param TargetUnit the type of [ScientificUnit] the resulting [DefaultScientificArray] should be in
+ * @param target the [TargetUnit] the resulting [DefaultScientificArray] should be in
+ * @return a [DefaultScientificArray] containing all values of the [ScientificArray] converted to [TargetUnit]
+ */
 fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -230,6 +416,18 @@ fun <
     target: TargetUnit
 ) = convert(target, ::DefaultScientificArray)
 
+/**
+ * Creates a [TargetArray] that contains all values of a [ScientificArray] converted to [TargetUnit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in the array
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param TargetUnit the type of [ScientificUnit] the resulting [TargetArray] should be in
+ * @param TargetNumberType the type of [Number] stored in [TargetArray]
+ * @param TargetArray the type of [ScientificArray] to create
+ * @param target the [TargetUnit] the resulting [TargetArray] should be in
+ * @param factory method for creating [TargetArray] from a list of [Decimal] and [TargetUnit]
+ * @return a [TargetArray] containing all values of the [ScientificArray] converted to [TargetUnit]
+ */
 fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -244,6 +442,15 @@ fun <
     convert(target)
 }
 
+/**
+ * Converts the values of a [ScientificArray] into their [Decimal] values in a [TargetUnit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in the array
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param TargetUnit the type of [ScientificUnit] the resulting list of [Decimal] should be in
+ * @param target the [TargetUnit] the resulting list of [Decimal] should be in
+ * @return the list of [Decimal] of all values of the [ScientificArray] in [TargetUnit]
+ */
 fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -259,6 +466,16 @@ fun <
     return values
 }
 
+/**
+ * Maps all the values of a [ScientificArray] into a [DefaultScientificArray] using a transformation method
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in the array
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param TargetQuantity the type of [PhysicalQuantity] to convert the values into
+ * @param TargetUnit the type of [ScientificUnit] to convert the values into
+ * @param transform method for transforming a [ScientificValue] of [Unit] into a [ScientificValue] of [TargetUnit]
+ * @return a [DefaultScientificArray] containing all values transformed using the transform method
+ */
 fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -269,6 +486,19 @@ fun <
     transform: ScientificValue<Quantity, Unit>.() -> ScientificValue<TargetQuantity, TargetUnit>
 ) = map(1(unit).transform().unit, ::DefaultScientificArray, transform)
 
+/**
+ * Maps all the values of a [ScientificArray] into a [TargetArray] using a transformation method
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in the array
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param TargetQuantity the type of [PhysicalQuantity] to convert the values into
+ * @param TargetUnit the type of [ScientificUnit] to convert the values into
+ * @param TargetNumberType the type of [Number] stored in [TargetArray]
+ * @param TargetArray the type of [ScientificArray] to create
+ * @param factory method for creating a [TargetArray] from a list of [Decimal] and a [TargetUnit]
+ * @param transform method for transforming a [ScientificValue] of [Unit] into a [ScientificValue] of [TargetUnit]
+ * @return a [TargetArray] containing all values transformed using the transform method
+ */
 fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -282,6 +512,17 @@ fun <
     transform: ScientificValue<Quantity, Unit>.() -> ScientificValue<TargetQuantity, TargetUnit>
 ) = map(1(unit).transform().unit, factory, transform)
 
+/**
+ * Maps all the values of a [ScientificArray] into a [DefaultScientificArray] using a transformation method
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in the array
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param TargetQuantity the type of [PhysicalQuantity] to convert the values into
+ * @param TargetUnit the type of [ScientificUnit] to convert the values into
+ * @param targetUnit the [TargetUnit] to transform all values into
+ * @param transform method for transforming a [ScientificValue] of [Unit] into a [ScientificValue] of [TargetUnit]
+ * @return a [DefaultScientificArray] containing all values transformed using the transform method
+ */
 fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -289,10 +530,24 @@ fun <
     TargetQuantity : PhysicalQuantity,
     TargetUnit : ScientificUnit<TargetQuantity>
     > ScientificArray<NumberType, Quantity, Unit>.map(
-    unit: TargetUnit,
+    targetUnit: TargetUnit,
     transform: ScientificValue<Quantity, Unit>.() -> ScientificValue<TargetQuantity, TargetUnit>
-) = map(unit, ::DefaultScientificArray, transform)
-
+) = map(targetUnit, ::DefaultScientificArray, transform)
+
+/**
+ * Maps all the values of a [ScientificArray] into a [TargetArray] using a transformation method
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in the array
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param TargetQuantity the type of [PhysicalQuantity] to convert the values into
+ * @param TargetUnit the type of [ScientificUnit] to convert the values into
+ * @param TargetNumberType the type of [Number] stored in [TargetArray]
+ * @param TargetArray the type of [ScientificArray] to create
+ * @param targetUnit the [TargetUnit] to transform all values into
+ * @param factory method for creating a [TargetArray] from a list of [Decimal] and a [TargetUnit]
+ * @param transform method for transforming a [ScientificValue] of [Unit] into a [ScientificValue] of [TargetUnit]
+ * @return a [TargetArray] containing all values transformed using the transform method
+ */
 fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -313,6 +568,21 @@ fun <
     return factory(newValues, targetUnit)
 }
 
+/**
+ * Combines two [ScientificArray] into a [DefaultScientificArray] using a transformation method
+ * @param LeftQuantity the type of [PhysicalQuantity] of the unit
+ * @param LeftNumberType the type of [Number] stored in the array
+ * @param LeftUnit the type of [ScientificUnit] of the array
+ * @param RightQuantity the type of [PhysicalQuantity] of the [right] unit
+ * @param RightNumberType the type of [Number] stored in the [right] array
+ * @param RightUnit the type of [ScientificUnit] of [right]
+ * @param TargetQuantity the type of [PhysicalQuantity] to convert the values into
+ * @param TargetUnit the type of [ScientificUnit] to convert the values into
+ * @param right a [ScientificArray] of [RightUnit] to combine with
+ * @param transform method for converting a [ScientificValue] in [LeftUnit] and [ScientificValue] in [RightUnit] into A [ScientificValue] of [TargetUnit]
+ * @return A [DefaultScientificArray] that combines the values of both arrays using the [transform] method
+ * @throws [IndexOutOfBoundsException] if the size of both arrays does not match
+ */
 fun <
     LeftQuantity : PhysicalQuantity,
     LeftNumberType : Number,
@@ -327,6 +597,23 @@ fun <
     transform: ScientificValue<LeftQuantity, LeftUnit>.(ScientificValue<RightQuantity, RightUnit>) -> ScientificValue<TargetQuantity, TargetUnit>
 ) = combine(right, 1(unit).transform(1(right.unit)).unit, ::DefaultScientificArray, transform)
 
+/**
+ * Combines two [ScientificArray] into a [TargetArray] using a transformation method
+ * @param LeftQuantity the type of [PhysicalQuantity] of the unit
+ * @param LeftNumberType the type of [Number] stored in the array
+ * @param LeftUnit the type of [ScientificUnit] of the array
+ * @param RightQuantity the type of [PhysicalQuantity] of the [right] unit
+ * @param RightNumberType the type of [Number] stored in the [right] array
+ * @param RightUnit the type of [ScientificUnit] of [right]
+ * @param TargetQuantity the type of [PhysicalQuantity] to convert the values into
+ * @param TargetUnit the type of [ScientificUnit] to convert the values into
+ * @param TargetNumberType the type of [Number] stored in [TargetArray]
+ * @param TargetArray the type of [ScientificArray] to create
+ * @param right a [ScientificArray] of [RightUnit] to combine with
+ * @param transform method for converting a [ScientificValue] in [LeftUnit] and [ScientificValue] in [RightUnit] into A [ScientificValue] of [TargetUnit]
+ * @return A [TargetArray] that combines the values of both arrays using the [transform] method
+ * @throws [IndexOutOfBoundsException] if the size of both arrays does not match
+ */
 fun <
     LeftQuantity : PhysicalQuantity,
     LeftNumberType : Number,
@@ -344,6 +631,22 @@ fun <
     transform: ScientificValue<LeftQuantity, LeftUnit>.(ScientificValue<RightQuantity, RightUnit>) -> ScientificValue<TargetQuantity, TargetUnit>
 ) = combine(right, 1(unit).transform(1(right.unit)).unit, factory, transform)
 
+/**
+ * Combines two [ScientificArray] into a [DefaultScientificArray] using a transformation method
+ * @param LeftQuantity the type of [PhysicalQuantity] of the unit
+ * @param LeftNumberType the type of [Number] stored in the array
+ * @param LeftUnit the type of [ScientificUnit] of the array
+ * @param RightQuantity the type of [PhysicalQuantity] of the [right] unit
+ * @param RightNumberType the type of [Number] stored in the [right] array
+ * @param RightUnit the type of [ScientificUnit] of [right]
+ * @param TargetQuantity the type of [PhysicalQuantity] to convert the values into
+ * @param TargetUnit the type of [ScientificUnit] to convert the values into
+ * @param right a [ScientificArray] of [RightUnit] to combine with
+ * @param targetUnit the [TargetUnit] to convert to
+ * @param transform method for converting a [ScientificValue] in [LeftUnit] and [ScientificValue] in [RightUnit] into A [ScientificValue] of [TargetUnit]
+ * @return A [DefaultScientificArray] that combines the values of both arrays using the [transform] method
+ * @throws [IndexOutOfBoundsException] if the size of both arrays does not match
+ */
 fun <
     LeftQuantity : PhysicalQuantity,
     LeftNumberType : Number,
@@ -355,10 +658,28 @@ fun <
     TargetUnit : ScientificUnit<TargetQuantity>
     > ScientificArray<LeftNumberType, LeftQuantity, LeftUnit>.combine(
     right: ScientificArray<RightNumberType, RightQuantity, RightUnit>,
-    unit: TargetUnit,
+    targetUnit: TargetUnit,
     transform: ScientificValue<LeftQuantity, LeftUnit>.(ScientificValue<RightQuantity, RightUnit>) -> ScientificValue<TargetQuantity, TargetUnit>
-) = combine(right, unit, ::DefaultScientificArray, transform)
-
+) = combine(right, targetUnit, ::DefaultScientificArray, transform)
+
+/**
+ * Combines two [ScientificArray] into a [TargetArray] using a transformation method
+ * @param LeftQuantity the type of [PhysicalQuantity] of the unit
+ * @param LeftNumberType the type of [Number] stored in the array
+ * @param LeftUnit the type of [ScientificUnit] of the array
+ * @param RightQuantity the type of [PhysicalQuantity] of the [right] unit
+ * @param RightNumberType the type of [Number] stored in the [right] array
+ * @param RightUnit the type of [ScientificUnit] of [right]
+ * @param TargetQuantity the type of [PhysicalQuantity] to convert the values into
+ * @param TargetUnit the type of [ScientificUnit] to convert the values into
+ * @param TargetNumberType the type of [Number] stored in [TargetArray]
+ * @param TargetArray the type of [ScientificArray] to create
+ * @param right a [ScientificArray] of [RightUnit] to combine with
+ * @param targetUnit the [TargetUnit] to convert to
+ * @param transform method for converting a [ScientificValue] in [LeftUnit] and [ScientificValue] in [RightUnit] into A [ScientificValue] of [TargetUnit]
+ * @return A [TargetArray] that combines the values of both arrays using the [transform] method
+ * @throws [IndexOutOfBoundsException] if the size of both arrays does not match
+ */
 fun <
     LeftQuantity : PhysicalQuantity,
     LeftNumberType : Number,
@@ -386,6 +707,15 @@ fun <
     return factory(newValues, targetUnit)
 }
 
+/**
+ * Creates a [DefaultScientificArray] in [Unit] containing all values of two [ScientificArray]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in the array
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param RightUnit the type of [ScientificUnit] of [right]
+ * @param right the [ScientificArray] to add to this [ScientificArray]
+ * @return the [DefaultScientificArray] containing all values of both [ScientificArray]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -393,6 +723,15 @@ infix operator fun <
     RightUnit : ScientificUnit<Quantity>
     > ScientificArray<NumberType, Quantity, Unit>.plus(right: ScientificArray<NumberType, Quantity, RightUnit>) = concat(right)
 
+/**
+ * Creates a [DefaultScientificArray] in [Unit] by adding a [ScientificValue] to the [ScientificArray]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in the array
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param RightUnit the type of [ScientificUnit] of [right]
+ * @param right the [ScientificValue] to add to this [ScientificArray]
+ * @return the [DefaultScientificArray] containing all values of this [ScientificArray] as well as [right] in [Unit]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -400,6 +739,15 @@ infix operator fun <
     RightUnit : ScientificUnit<Quantity>
     > ScientificArray<NumberType, Quantity, Unit>.plus(right: ScientificValue<Quantity, RightUnit>) = concat(listOf(right).toScientificArray(right.unit))
 
+/**
+ * Creates a [DefaultScientificArray] in [Unit] by adding a [ScientificArray] to the [ScientificValue]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in [right]
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param RightUnit the type of [ScientificUnit] of [right]
+ * @param right the [ScientificArray] to add to this [ScientificValue]
+ * @return the [DefaultScientificArray] containing this [ScientificValue] and all values of this [right] in [Unit]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -407,6 +755,14 @@ infix operator fun <
     RightUnit : ScientificUnit<Quantity>
     > ScientificValue<Quantity, Unit>.plus(right: ScientificArray<NumberType, Quantity, RightUnit>) = listOf(this).toScientificArray(unit).concat(right)
 
+/**
+ * Creates a [DefaultScientificArray] in [Unit] containing all values of two [ScientificArray]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param RightUnit the type of [ScientificUnit] of [right]
+ * @param right the [ScientificArray] to add to this [ScientificArray]
+ * @return the [DefaultScientificArray] containing all values of both [ScientificArray]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -415,6 +771,16 @@ fun <
     right: ScientificArray<*, Quantity, RightUnit>
 ) = concat(right, unit)
 
+/**
+ * Creates a [Array] containing all values of two [ScientificArray]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param NumberType the type of [Number] stored in the array
+ * @param Unit the type of [ScientificUnit] of the array
+ * @param Array the type of [ScientificArray] to return
+ * @param right the [ScientificArray] to add to this [ScientificArray]
+ * @param factory method for creating [Array] from a list of [Decimal] and [Unit]
+ * @return the [Array] containing all values of both [ScientificArray]
+ */
 fun <
     Quantity : PhysicalQuantity,
     NumberType : Number,
@@ -425,6 +791,16 @@ fun <
     factory: (List<Decimal>, Unit) -> Array
 ) = concat(right, unit, factory)
 
+/**
+ * Creates a [DefaultScientificArray] in [TargetUnit] containing all values of two [ScientificArray]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param LeftUnit the type of [ScientificUnit] of the array
+ * @param RightUnit the type of [ScientificUnit] of [right]
+ * @param TargetUnit the type of [ScientificUnit] of the [DefaultScientificArray] to be returned
+ * @param right the [ScientificArray] to add to this [ScientificArray]
+ * @param targetUnit the [TargetUnit] of the [DefaultScientificArray] to be returned
+ * @return the [DefaultScientificArray] in [TargetUnit] containing all values of both [ScientificArray]
+ */
 fun <
     Quantity : PhysicalQuantity,
     LeftUnit : ScientificUnit<Quantity>,
@@ -435,6 +811,19 @@ fun <
     targetUnit: TargetUnit
 ) = concat(right, targetUnit, ::DefaultScientificArray)
 
+/**
+ * Creates a [TargetArray] containing all values of two [ScientificArray]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param LeftUnit the type of [ScientificUnit] of the array
+ * @param RightUnit the type of [ScientificUnit] of [right]
+ * @param TargetUnit the type of [ScientificUnit] of the [TargetArray] to be returned
+ * @param TargetNumberType the type of [Number] stored in [TargetArray]
+ * @param TargetArray the type of [ScientificArray] to create
+ * @param right the [ScientificArray] to add to this [ScientificArray]
+ * @param targetUnit the [TargetUnit] of the [TargetArray] to be returned
+ * @param factory method for creating [TargetArray] from a list of [Decimal] and [TargetUnit]
+ * @return the [TargetArray] containing all values of both [ScientificArray]
+ */
 fun <
     Quantity : PhysicalQuantity,
     LeftUnit : ScientificUnit<Quantity>,
diff --git a/scientific/src/commonMain/kotlin/ScientificValue.kt b/scientific/src/commonMain/kotlin/ScientificValue.kt
index 3f768cf29..253d947e7 100644
--- a/scientific/src/commonMain/kotlin/ScientificValue.kt
+++ b/scientific/src/commonMain/kotlin/ScientificValue.kt
@@ -29,15 +29,38 @@ import com.splendo.kaluga.scientific.unit.ScientificUnit
 import com.splendo.kaluga.scientific.unit.convert
 import kotlinx.serialization.Serializable
 
+/**
+ * A Value in a given [ScientificUnit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] this value represents
+ */
 interface ScientificValue<Quantity : PhysicalQuantity, Unit : ScientificUnit<Quantity>> : Comparable<ScientificValue<Quantity, *>>, com.splendo.kaluga.base.utils.Serializable {
+
+    /**
+     * The value component
+     */
     val value: Number
+
+    /**
+     * The [Unit] component
+     */
     val unit: Unit
 
     override fun compareTo(other: ScientificValue<Quantity, *>): Int = unit.toSIUnit(decimalValue).compareTo(other.unit.toSIUnit(other.decimalValue))
 
+    /**
+     * A [Decimal] representation of [value]
+     */
     val decimalValue: Decimal get() = value.toDecimal()
 }
 
+/**
+ * A class implementation of [ScientificValue]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] this value represents
+ * @param value the value component
+ * @param unit the [Unit] component
+ */
 @Serializable
 data class DefaultScientificValue<Quantity : PhysicalQuantity, Unit : ScientificUnit<Quantity>>(
     override val value: Double,
@@ -48,20 +71,54 @@ data class DefaultScientificValue<Quantity : PhysicalQuantity, Unit : Scientific
 
 // Creation
 
+/**
+ * Creates a [DefaultScientificValue] of this number using a given [unit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] the value should represents
+ * @param unit the [Unit] of the [DefaultScientificValue] to be created
+ * @return the created [DefaultScientificValue]
+ */
 operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
     > Number.invoke(unit: Unit) = this.toDecimal()(unit)
+
+/**
+ * Creates a [Value] of this number using a given [unit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] the value should represents
+ * @param Value the type of [ScientificValue] to return
+ * @param unit the [Unit] of the [DefaultScientificValue] to be created
+ * @param factory a method for creating a [Value] using a Decimal value and a [Unit]
+ * @return the created [Value]
+ */
 operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
     Value : ScientificValue<Quantity, Unit>
     > Number.invoke(unit: Unit, factory: (Decimal, Unit) -> Value) = this.toDecimal()(unit, factory)
 
+/**
+ * Creates a [DefaultScientificValue] of this [Decimal] using a given [unit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] the value should represents
+ * @param unit the [Unit] of the [DefaultScientificValue] to be created
+ * @return the created [DefaultScientificValue]
+ */
 operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
     > Decimal.invoke(unit: Unit) = this(unit, ::DefaultScientificValue)
+
+/**
+ * Creates a [Value] of this [Decimal] using a given [unit]
+ * @param Quantity the type of [PhysicalQuantity] of the unit
+ * @param Unit the type of [ScientificUnit] the value should represents
+ * @param Value the type of [ScientificValue] to return
+ * @param unit the [Unit] of the [DefaultScientificValue] to be created
+ * @param factory a method for creating a [Value] using a Decimal value and a [Unit]
+ * @return the created [Value]
+ */
 operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -70,6 +127,16 @@ operator fun <
 
 // Conversion
 
+/**
+ * Converts a [ScientificValue] into another [ScientificValue] with a [ScientificUnit] of the same [PhysicalQuantity]
+ * @param Quantity the type of [PhysicalQuantity] of the current [ScientificValue] as well as the [TargetValue]
+ * @param Unit the type of [ScientificUnit] of the current [ScientificValue]
+ * @param TargetUnit the type of [ScientificUnit] of the [TargetValue]
+ * @param TargetValue the type of [ScientificValue] to convert to
+ * @param target the [TargetUnit] to convert to
+ * @param factory method for creating the [TargetValue] given the [Decimal] value in [TargetUnit]
+ * @return an instance of [TargetValue] with its value equal to the value of this [ScientificUnit] in [TargetUnit]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -80,12 +147,28 @@ fun <
     factory: (Decimal, TargetUnit) -> TargetValue
 ): TargetValue = factory(convertValue(target), target)
 
+/**
+ * Converts a [ScientificValue] into a [DefaultScientificValue] with a [ScientificUnit] of the same [PhysicalQuantity]
+ * @param Quantity the type of [PhysicalQuantity] of the current [ScientificValue] as well as the [DefaultScientificValue] to be created
+ * @param Unit the type of [ScientificUnit] of the current [ScientificValue]
+ * @param TargetUnit the type of [ScientificUnit] of the [DefaultScientificValue]
+ * @param target the [TargetUnit] to convert to
+ * @return an instance of [DefaultScientificValue] with its value equal to the value of this [ScientificUnit] in [TargetUnit]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
     TargetUnit : ScientificUnit<Quantity>
     > ScientificValue<Quantity, Unit>.convert(target: TargetUnit) = convert(target, ::DefaultScientificValue)
 
+/**
+ * Converts [ScientificValue.value] into the equivalent [Decimal] in [TargetUnit]
+ * @param Quantity the type of [PhysicalQuantity] of the [Unit] and [TargetUnit]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param TargetUnit the type of [ScientificUnit] to convert to
+ * @param target the [TargetUnit] to convert to
+ * @return the [Decimal] value in [TargetUnit] equivalent to [ScientificValue.value]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -94,6 +177,18 @@ fun <
     return unit.convert(decimalValue, target)
 }
 
+/**
+ * Converts a [ScientificValue] into another [ScientificValue] with a [ScientificUnit] of the same [PhysicalQuantity]
+ * @param Quantity the type of [PhysicalQuantity] of the current [ScientificValue] as well as the [TargetValue]
+ * @param Unit the type of [ScientificUnit] of the current [ScientificValue]
+ * @param TargetUnit the type of [ScientificUnit] of the [TargetValue]
+ * @param TargetValue the type of [ScientificValue] to convert to
+ * @param target the [TargetUnit] to convert to
+ * @param round The number of digits a rounded value should have after its decimal point
+ * @param roundingMode The [RoundingMode] to apply when scaling
+ * @param factory method for creating the [TargetValue] given the [Decimal] value in [TargetUnit]
+ * @return an instance of [TargetValue] with its value equal to the value of this [ScientificUnit] in [TargetUnit]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -106,6 +201,16 @@ fun <
     factory: (Decimal, TargetUnit) -> TargetValue
 ): TargetValue = factory(convertValue(target, round, roundingMode), target)
 
+/**
+ * Converts a [ScientificValue] into a [DefaultScientificValue] with a [ScientificUnit] of the same [PhysicalQuantity]
+ * @param Quantity the type of [PhysicalQuantity] of the current [ScientificValue] as well as the [DefaultScientificValue] to be created
+ * @param Unit the type of [ScientificUnit] of the current [ScientificValue]
+ * @param TargetUnit the type of [ScientificUnit] of the [DefaultScientificValue]
+ * @param target the [TargetUnit] to convert to
+ * @param round The number of digits a rounded value should have after its decimal point
+ * @param roundingMode The [RoundingMode] to apply when scaling
+ * @return an instance of [DefaultScientificValue] with its value equal to the value of this [ScientificUnit] in [TargetUnit]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -116,6 +221,16 @@ fun <
     roundingMode: RoundingMode = RoundingMode.RoundHalfEven
 ) = convert(target, round, roundingMode, ::DefaultScientificValue)
 
+/**
+ * Converts [ScientificValue.value] into the equivalent [Decimal] in [TargetUnit]
+ * @param Quantity the type of [PhysicalQuantity] of the [Unit] and [TargetUnit]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param TargetUnit the type of [ScientificUnit] to convert to
+ * @param target the [TargetUnit] to convert to
+ * @param round The number of digits a rounded value should have after its decimal point
+ * @param roundingMode The [RoundingMode] to apply when scaling
+ * @return the [Decimal] value in [TargetUnit] equivalent to [ScientificValue.value]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
@@ -130,41 +245,116 @@ fun <
 
 // Calculation
 
+/**
+ * Creates a [DefaultScientificValue] equal to the [ScientificValue.value] increased by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the amount to add to the value
+ * @return the [DefaultScientificValue] where the [ScientificValue.value] is increased by [value]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > ScientificValue<Quantity, Unit>.plus(factor: Number) = this + factor.toDecimal()
+    > ScientificValue<Quantity, Unit>.plus(value: Number) = this + value.toDecimal()
 
+/**
+ * Creates a [DefaultScientificValue] equal to a [ScientificValue.value] increased by this [Number]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [ScientificValue] to add the value to
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] of [value] is increased by this number
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > Number.plus(unit: ScientificValue<Quantity, Unit>) = toDecimal() + unit
+    > Number.plus(value: ScientificValue<Quantity, Unit>) = toDecimal() + value
 
+/**
+ * Creates a [DefaultScientificValue] equal to the [ScientificValue.value] increased by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [Decimal] amount to add to the value
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] is increased by [value]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > ScientificValue<Quantity, Unit>.plus(factor: Decimal) = plus(factor, ::DefaultScientificValue)
+    > ScientificValue<Quantity, Unit>.plus(value: Decimal) = plus(value, ::DefaultScientificValue)
 
+/**
+ * Creates a [DefaultScientificValue] equal to a [ScientificValue.value] increased by this [Decimal]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [ScientificValue] to add the value to
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] of [value] is increased by this [Decimal]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > Decimal.plus(unit: ScientificValue<Quantity, Unit>) = unit.plus(this, ::DefaultScientificValue)
+    > Decimal.plus(value: ScientificValue<Quantity, Unit>) = plus(value, ::DefaultScientificValue)
 
+/**
+ * Creates a [Value] equal to the [ScientificValue.value] increased by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param Value the type of [ScientificValue] to store the result in
+ * @param value the [Decimal] amount to add to the value
+ * @param factory method for creating [Value] from a [Decimal] and [Unit]
+ * @return a [Value] where the [ScientificValue.value] is increased by [value]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
     Value : ScientificValue<Quantity, Unit>
     > ScientificValue<Quantity, Unit>.plus(
-    factor: Decimal,
+    value: Decimal,
     factory: (Decimal, Unit) -> Value
-) = factory(decimalValue + factor, unit)
+) = factory(decimalValue + value, unit)
 
+/**
+ * Creates a [Value] equal to a [ScientificValue.value] increased by this [Decimal]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param Value the type of [ScientificValue] to store the result in
+ * @param value the [ScientificValue] to add the value to
+ * @param factory method for creating [Value] from a [Decimal] and [Unit]
+ * @return a [Value] where the [ScientificValue.value] is increased by this [Decimal]
+ */
+fun <
+    Quantity : PhysicalQuantity,
+    Unit : ScientificUnit<Quantity>,
+    Value : ScientificValue<Quantity, Unit>
+    > Decimal.plus(
+    value: ScientificValue<Quantity, Unit>,
+    factory: (Decimal, Unit) -> Value
+) = factory(this + value.decimalValue, value.unit)
+
+/**
+ * Adds the [ScientificValue.value] of two [ScientificValue] into a [DefaultScientificValue] with [LeftUnit] as its unit
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param LeftUnit the type of [ScientificUnit] of the [ScientificValue] being added to
+ * @param RightUnit the type of [ScientificUnit] of the [ScientificValue] being added
+ * @param right the [ScientificValue] of [RightUnit] to add
+ * @return a [DefaultScientificValue] in [LeftUnit] where [right] is added to this value
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     LeftUnit : ScientificUnit<Quantity>,
     RightUnit : ScientificUnit<Quantity>
     > ScientificValue<Quantity, LeftUnit>.plus(right: ScientificValue<Quantity, RightUnit>) = unit.plus(this, right, ::DefaultScientificValue)
 
+/**
+ * Adds the [ScientificValue.value] of two [ScientificValue] into a [Value] with [TargetUnit] as its unit
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param LeftUnit the type of [ScientificUnit] of the [ScientificValue] being added to
+ * @param RightUnit the type of [ScientificUnit] of the [ScientificValue] being added
+ * @param TargetUnit the type of [ScientificUnit] the [Value] should be in
+ * @param Value the type of [ScientificValue] to return
+ * @param left the [ScientificValue] of [LeftUnit] to add to
+ * @param right the [ScientificValue] of [RightUnit] to add
+ * @param factory a method for creating [Value] from a [Decimal] and this unit
+ * @return a [Value] in [TargetUnit] where [left] and [right] are added to each other
+ */
 fun <
     Quantity : PhysicalQuantity,
     LeftUnit : ScientificUnit<Quantity>,
@@ -177,50 +367,116 @@ fun <
     factory: (Decimal, TargetUnit) -> Value
 ) = byAdding(left, right, factory)
 
+/**
+ * Creates a [DefaultScientificValue] equal to the [ScientificValue.value] decreased by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the amount to subtract from the value
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] is decreased by [value]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
     > ScientificValue<Quantity, Unit>.minus(value: Number) = this - value.toDecimal()
 
+/**
+ * Creates a [DefaultScientificValue] equal to a [ScientificValue.value] decreased from this [Number]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [ScientificValue] whose value should be subtracted from this [Number]
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] of [value] is subtracted from this number
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > Number.minus(unit: ScientificValue<Quantity, Unit>) = toDecimal() - unit
+    > Number.minus(value: ScientificValue<Quantity, Unit>) = toDecimal() - value
 
+/**
+ * Creates a [DefaultScientificValue] equal to the [ScientificValue.value] decreased by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [Decimal] to subtract from the value
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] is decreased by [value]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
     > ScientificValue<Quantity, Unit>.minus(value: Decimal) = minus(value, ::DefaultScientificValue)
 
+/**
+ * Creates a [DefaultScientificValue] equal to a [ScientificValue.value] decreased from this [Decimal]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [ScientificValue] whose value should be subtracted from this [Decimal]
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] of [value] is subtracted from this number
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > Decimal.minus(unit: ScientificValue<Quantity, Unit>) = minus(unit, ::DefaultScientificValue)
+    > Decimal.minus(value: ScientificValue<Quantity, Unit>) = minus(value, ::DefaultScientificValue)
 
+/**
+ * Creates a [Value] equal to the [ScientificValue.value] decreased by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param Value the type of [ScientificValue] to store the result in
+ * @param value the [Decimal] to subtract from the value
+ * @param factory method for creating [Value] from a [Decimal] and [Unit]
+ * @return a [Value] where the [ScientificValue.value] is subtracted by [value]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
     Value : ScientificValue<Quantity, Unit>
-    > Decimal.minus(
-    value: ScientificValue<Quantity, Unit>,
+    > ScientificValue<Quantity, Unit>.minus(
+    value: Decimal,
     factory: (Decimal, Unit) -> Value
-) = factory(this - value.decimalValue, value.unit)
+) = factory(decimalValue - value, unit)
 
+/**
+ * Creates a [Value] equal to a [ScientificValue.value] decreased from this [Decimal]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param Value the type of [ScientificValue] to store the result in
+ * @param value the [ScientificValue] whose value should be subtracted from this [Decimal]
+ * @param factory method for creating [Value] from a [Decimal] and [Unit]
+ * @return a [Value] where the [ScientificValue.value] of [value] is subtracted from this [Decimal]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
     Value : ScientificValue<Quantity, Unit>
-    > ScientificValue<Quantity, Unit>.minus(
-    value: Decimal,
+    > Decimal.minus(
+    value: ScientificValue<Quantity, Unit>,
     factory: (Decimal, Unit) -> Value
-) = factory(decimalValue - value, unit)
+) = factory(this - value.decimalValue, value.unit)
 
+/**
+ * Subtracts the [ScientificValue.value] of two [ScientificValue] into a [DefaultScientificValue] with [LeftUnit] as its unit
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param LeftUnit the type of [ScientificUnit] of the [ScientificValue] being subtracted from
+ * @param RightUnit the type of [ScientificUnit] of the [ScientificValue] being subtracted
+ * @param right the [ScientificValue] of [RightUnit] to subtract
+ * @return a [DefaultScientificValue] in [LeftUnit] where [right] is subtracted from this value
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     LeftUnit : ScientificUnit<Quantity>,
     RightUnit : ScientificUnit<Quantity>
     > ScientificValue<Quantity, LeftUnit>.minus(right: ScientificValue<Quantity, RightUnit>) = unit.minus(this, right, ::DefaultScientificValue)
 
+/**
+ * Subtracts the [ScientificValue.value] of two [ScientificValue] into a [Value] with [TargetUnit] as its unit
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param LeftUnit the type of [ScientificUnit] of the [ScientificValue] being subtracted from
+ * @param RightUnit the type of [ScientificUnit] of the [ScientificValue] being subtracted
+ * @param TargetUnit the type of [ScientificUnit] the [Value] should be in
+ * @param Value the type of [ScientificValue] to return
+ * @param left the [ScientificValue] of [LeftUnit] to subtract from
+ * @param right the [ScientificValue] of [RightUnit] to subtract
+ * @param factory a method for creating [Value] from a [Decimal] and this unit
+ * @return a [Value] in [TargetUnit] where [left] is subtracted by [right]
+ */
 fun <
     Quantity : PhysicalQuantity,
     LeftUnit : ScientificUnit<Quantity>,
@@ -233,41 +489,116 @@ fun <
     factory: (Decimal, TargetUnit) -> Value
 ) = bySubtracting(left, right, factory)
 
+/**
+ * Creates a [DefaultScientificValue] equal to the [ScientificValue.value] multiplied by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the amount to multiply the value with
+ * @return the [DefaultScientificValue] where the [ScientificValue.value] is multiplied by [value]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > ScientificValue<Quantity, Unit>.times(factor: Number) = this * factor.toDecimal()
+    > ScientificValue<Quantity, Unit>.times(value: Number) = this * value.toDecimal()
 
+/**
+ * Creates a [DefaultScientificValue] equal to a [ScientificValue.value] multiplied by this [Number]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [ScientificValue] to multiply the value with
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] of [value] is multiplied by this number
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > Number.times(unit: ScientificValue<Quantity, Unit>) = toDecimal() * unit
+    > Number.times(value: ScientificValue<Quantity, Unit>) = toDecimal() * value
 
+/**
+ * Creates a [DefaultScientificValue] equal to the [ScientificValue.value] multiplied by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [Decimal] to multiply the value with
+ * @return the [DefaultScientificValue] where the [ScientificValue.value] is multiplied by [value]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > ScientificValue<Quantity, Unit>.times(factor: Decimal) = times(factor, ::DefaultScientificValue)
+    > ScientificValue<Quantity, Unit>.times(value: Decimal) = times(value, ::DefaultScientificValue)
 
+/**
+ * Creates a [DefaultScientificValue] equal to a [ScientificValue.value] multiplied by this [Decimal]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [ScientificValue] to multiply the value with
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] of [value] is multiplied by this number
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > Decimal.times(unit: ScientificValue<Quantity, Unit>) = unit.times(this, ::DefaultScientificValue)
+    > Decimal.times(value: ScientificValue<Quantity, Unit>) = times(value, ::DefaultScientificValue)
 
+/**
+ * Creates a [Value] equal to the [ScientificValue.value] multiplied by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param Value the type of [ScientificValue] to store the result in
+ * @param value the [Decimal] amount to multiply the value with
+ * @param factory method for creating [Value] from a [Decimal] and [Unit]
+ * @return a [Value] where the [ScientificValue.value] is multiplied by [value]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
     Value : ScientificValue<Quantity, Unit>
     > ScientificValue<Quantity, Unit>.times(
-    factor: Decimal,
+    value: Decimal,
     factory: (Decimal, Unit) -> Value
-) = factory(decimalValue * factor, unit)
+) = factory(decimalValue * value, unit)
 
+/**
+ * Creates a [Value] equal to a [ScientificValue.value] multiplied by this [Decimal]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param Value the type of [ScientificValue] to store the result in
+ * @param value the [ScientificValue] to multiply the value with
+ * @param factory method for creating [Value] from a [Decimal] and [Unit]
+ * @return a [Value] where the [ScientificValue.value] is multiplied by this [Decimal]
+ */
+fun <
+    Quantity : PhysicalQuantity,
+    Unit : ScientificUnit<Quantity>,
+    Value : ScientificValue<Quantity, Unit>
+    > Decimal.times(
+    value: ScientificValue<Quantity, Unit>,
+    factory: (Decimal, Unit) -> Value
+) = factory(this * value.decimalValue, value.unit)
+
+/**
+ * Multiplies the [ScientificValue.value] of two [ScientificValue] into a [DefaultScientificValue] with [LeftUnit] as its unit
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param LeftUnit the type of [ScientificUnit] of the [ScientificValue] being multiplied
+ * @param RightUnit the type of [ScientificUnit] of the [ScientificValue] multiplying
+ * @param right the [ScientificValue] of [RightUnit] to multiply
+ * @return a [DefaultScientificValue] in [LeftUnit] where [right] is multiplied by this value
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     LeftUnit : ScientificUnit<Quantity>,
     RightUnit : ScientificUnit<Quantity>
     > ScientificValue<Quantity, LeftUnit>.times(right: ScientificValue<Quantity, RightUnit>) = unit.times(this, right, ::DefaultScientificValue)
 
+/**
+ * Multiplies the [ScientificValue.value] of two [ScientificValue] into a [Value] with [TargetUnit] as its unit
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param LeftUnit the type of [ScientificUnit] of the [ScientificValue] being multiplied
+ * @param RightUnit the type of [ScientificUnit] of the [ScientificValue] multiplying
+ * @param TargetUnit the type of [ScientificUnit] the [Value] should be in
+ * @param Value the type of [ScientificValue] to return
+ * @param left the [ScientificValue] of [LeftUnit] to multiply
+ * @param right the [ScientificValue] of [RightUnit] to multiply with
+ * @param factory a method for creating [Value] from a [Decimal] and this unit
+ * @return a [Value] in [TargetUnit] where [left] and [right] are multiplied with each other
+ */
 fun <
     Quantity : PhysicalQuantity,
     LeftUnit : ScientificUnit<Quantity>,
@@ -280,40 +611,116 @@ fun <
     factory: (Decimal, TargetUnit) -> Value
 ) = byMultiplying(left, right, factory)
 
+/**
+ * Creates a [DefaultScientificValue] equal to the [ScientificValue.value] divided by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the amount to divide from the value
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] is divided by [value]
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > ScientificValue<Quantity, Unit>.div(factor: Number) = this / factor.toDecimal()
+    > ScientificValue<Quantity, Unit>.div(value: Number) = this / value.toDecimal()
 
+/**
+ * Creates a [DefaultScientificValue] equal to a [ScientificValue.value] divided from this [Number]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [ScientificValue] whose value should be divided from this [Number]
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] of [unit] is divided from this number
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>
-    > ScientificValue<Quantity, Unit>.div(factor: Decimal) = div(factor, ::DefaultScientificValue)
+    > Number.div(value: ScientificValue<Quantity, Unit>) = toDecimal() / value
 
+/**
+ * Creates a [DefaultScientificValue] equal to the [ScientificValue.value] divided by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [Decimal] to divided from the value
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] is divided by [value]
+ */
+infix operator fun <
+    Quantity : PhysicalQuantity,
+    Unit : ScientificUnit<Quantity>
+    > ScientificValue<Quantity, Unit>.div(value: Decimal) = div(value, ::DefaultScientificValue)
+
+/**
+ * Creates a [DefaultScientificValue] equal to a [ScientificValue.value] divided from this [Decimal]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param value the [ScientificValue] whose value should be divided from this [Decimal]
+ * @return a [DefaultScientificValue] where the [ScientificValue.value] of [value] is divided from this number
+ */
+infix operator fun <
+    Quantity : PhysicalQuantity,
+    Unit : ScientificUnit<Quantity>
+    > Decimal.div(value: ScientificValue<Quantity, Unit>) = div(value, ::DefaultScientificValue)
+
+/**
+ * Creates a [Value] equal to the [ScientificValue.value] divided by [value]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param Value the type of [ScientificValue] to store the result in
+ * @param value the [Decimal] to divide from the value
+ * @param factory method for creating [Value] from a [Decimal] and [Unit]
+ * @return a [Value] where the [ScientificValue.value] is divided by [value]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
     Value : ScientificValue<Quantity, Unit>
-    > Decimal.div(
-    factor: ScientificValue<Quantity, Unit>,
+    > ScientificValue<Quantity, Unit>.div(
+    value: Decimal,
     factory: (Decimal, Unit) -> Value
-) = factory(this / factor.decimalValue, factor.unit)
+) = factory(decimalValue / value, unit)
 
+/**
+ * Creates a [Value] equal to a [ScientificValue.value] divided from this [Decimal]
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param Unit the type of [ScientificUnit] of the [ScientificValue]
+ * @param Value the type of [ScientificValue] to store the result in
+ * @param value the [ScientificValue] whose value should be divide from this [Decimal]
+ * @param factory method for creating [Value] from a [Decimal] and [Unit]
+ * @return a [Value] where the [ScientificValue.value] of [value] is divide from this [Decimal]
+ */
 fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
     Value : ScientificValue<Quantity, Unit>
-    > ScientificValue<Quantity, Unit>.div(
-    factor: Decimal,
+    > Decimal.div(
+    value: ScientificValue<Quantity, Unit>,
     factory: (Decimal, Unit) -> Value
-) = factory(decimalValue / factor, unit)
+) = factory(this / value.decimalValue, value.unit)
 
+/**
+ * Divides the [ScientificValue.value] of two [ScientificValue] into a [DefaultScientificValue] with [LeftUnit] as its unit
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param LeftUnit the type of [ScientificUnit] of the [ScientificValue] being divided from
+ * @param RightUnit the type of [ScientificUnit] of the [ScientificValue] being divided
+ * @param right the [ScientificValue] of [RightUnit] to divide with
+ * @return a [DefaultScientificValue] in [LeftUnit] where [right] is divided from this value
+ */
 infix operator fun <
     Quantity : PhysicalQuantity,
     LeftUnit : ScientificUnit<Quantity>,
     RightUnit : ScientificUnit<Quantity>
     > ScientificValue<Quantity, LeftUnit>.div(right: ScientificValue<Quantity, RightUnit>) = unit.div(this, right, ::DefaultScientificValue)
 
+/**
+ * Divides the [ScientificValue.value] of two [ScientificValue] into a [Value] with [TargetUnit] as its unit
+ * @param Quantity the type of [PhysicalQuantity] of the [ScientificValue]
+ * @param LeftUnit the type of [ScientificUnit] of the [ScientificValue] being divided from
+ * @param RightUnit the type of [ScientificUnit] of the [ScientificValue] being divided
+ * @param TargetUnit the type of [ScientificUnit] the [Value] should be in
+ * @param Value the type of [ScientificValue] to return
+ * @param left the [ScientificValue] of [LeftUnit] to divided from
+ * @param right the [ScientificValue] of [RightUnit] to divided
+ * @param factory a method for creating [Value] from a [Decimal] and this unit
+ * @return a [Value] in [TargetUnit] where [left] is divided by [right]
+ */
 fun <
     Quantity : PhysicalQuantity,
     LeftUnit : ScientificUnit<Quantity>,
diff --git a/scientific/src/commonMain/kotlin/converter/dimensionless/convertFromAnyUnit.kt b/scientific/src/commonMain/kotlin/converter/dimensionless/convertFromAnyUnit.kt
index 12a3dc367..97e030d61 100644
--- a/scientific/src/commonMain/kotlin/converter/dimensionless/convertFromAnyUnit.kt
+++ b/scientific/src/commonMain/kotlin/converter/dimensionless/convertFromAnyUnit.kt
@@ -24,7 +24,9 @@ import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.byDividing
 import com.splendo.kaluga.scientific.byMultiplying
 import com.splendo.kaluga.scientific.unit.ScientificUnit
+import kotlin.jvm.JvmName
 
+@JvmName("dimensionlessTimesDimensionlessDefault")
 infix operator fun <
     LeftUnit : ScientificUnit<PhysicalQuantity.Dimensionless>,
     RightUnit : ScientificUnit<PhysicalQuantity.Dimensionless>,
@@ -32,6 +34,7 @@ infix operator fun <
     modifier: ScientificValue<PhysicalQuantity.Dimensionless, RightUnit>
 ) = modify(modifier, ::DefaultScientificValue)
 
+@JvmName("dimensionlessDivDimensionlessDefault")
 infix operator fun <
     LeftUnit : ScientificUnit<PhysicalQuantity.Dimensionless>,
     RightUnit : ScientificUnit<PhysicalQuantity.Dimensionless>,
@@ -39,6 +42,7 @@ infix operator fun <
     modifier: ScientificValue<PhysicalQuantity.Dimensionless, RightUnit>
 ) = unit.byDividing(this, modifier, ::DefaultScientificValue)
 
+@JvmName("dimensionlessTimesValue")
 infix operator fun <
     Quantity : PhysicalQuantity,
     Unit : ScientificUnit<Quantity>,
diff --git a/scientific/src/commonMain/kotlin/formatter/CommonScientificValueFormatter.kt b/scientific/src/commonMain/kotlin/formatter/CommonScientificValueFormatter.kt
index 29e704e3b..a50647e4a 100644
--- a/scientific/src/commonMain/kotlin/formatter/CommonScientificValueFormatter.kt
+++ b/scientific/src/commonMain/kotlin/formatter/CommonScientificValueFormatter.kt
@@ -23,9 +23,23 @@ import kotlin.math.roundToLong
 
 private typealias CustomFormatHandler = (Number) -> String
 
-sealed class CommonScientificValueFormatter(builder: Builder) : ScientificValueFormatter {
-    class Builder {
+/**
+ * An implementation of [ScientificValueFormatter]
+ * Use [CommonScientificValueFormatter.Builder] to create an instance that can be customized per [ScientificUnit] type
+ */
+sealed class CommonScientificValueFormatter private constructor(builder: Builder) : ScientificValueFormatter {
+
+    /**
+     * Builder for creating a [CommonScientificValueFormatter]
+     */
+    class Builder internal constructor() {
         companion object {
+
+            /**
+             * Builds a [ScientificValueFormatter] using a [Builder]
+             * @param build method for configuring the [Builder]
+             * @return the built [ScientificValueFormatter]
+             */
             fun build(build: Builder.() -> Unit = {}): ScientificValueFormatter {
                 val builder = Builder()
                 build(builder)
@@ -34,6 +48,13 @@ sealed class CommonScientificValueFormatter(builder: Builder) : ScientificValueF
         }
 
         internal val customFormatters = mutableMapOf<ScientificUnit<*>, CustomFormatHandler>()
+
+        /**
+         * Sets a method for converting a [Number] in a given [ScientificUnit] into a String representation of its value
+         * If not set for a given [ScientificUnit] this will automatically format using [ScientificUnit.symbol]
+         * @param unit the [ScientificUnit] to apply the formatting to
+         * @param format method for formatting a value in the given [ScientificUnit]
+         */
         fun useFormat(unit: ScientificUnit<*>, format: CustomFormatHandler) {
             customFormatters[unit] = format
         }
@@ -56,7 +77,7 @@ sealed class CommonScientificValueFormatter(builder: Builder) : ScientificValueF
     private class Buildable(builder: Builder) : CommonScientificValueFormatter(builder)
 
     /**
-     *   Default formatter with no customisation applied
+     *   Default [CommonScientificValueFormatter] with no customisation applied
      */
     companion object Default : CommonScientificValueFormatter(Builder())
 }
diff --git a/scientific/src/commonMain/kotlin/formatter/ScientificValueFormatter.kt b/scientific/src/commonMain/kotlin/formatter/ScientificValueFormatter.kt
index d93228a7a..d86d78df3 100644
--- a/scientific/src/commonMain/kotlin/formatter/ScientificValueFormatter.kt
+++ b/scientific/src/commonMain/kotlin/formatter/ScientificValueFormatter.kt
@@ -19,9 +19,23 @@ package com.splendo.kaluga.scientific.formatter
 
 import com.splendo.kaluga.scientific.ScientificValue
 
+/**
+ * Interface for formatting a [ScientificValue] to a String
+ */
 interface ScientificValueFormatter {
+
+    /**
+     * Formats a [ScientificValue] into a String
+     * @param value the [ScientificValue] to format
+     * @return the formatted text
+     */
     fun format(value: ScientificValue<*, *>): String
 }
 
+/**
+ * Gets the String representation of a [ScientificValue] using a [ScientificValueFormatter]
+ * @param formatter the [ScientificValueFormatter] to use for formatting
+ * @return the String representation of the [ScientificValue]
+ */
 fun ScientificValue<*, *>.toString(formatter: ScientificValueFormatter = CommonScientificValueFormatter): String =
     formatter.format(this)
diff --git a/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt b/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt
index 71cdaff8e..34210c52a 100644
--- a/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ScientificUnit.kt
@@ -123,8 +123,8 @@ fun <Quantity : PhysicalQuantity> ScientificUnit<Quantity>.convert(
  * @param Quantity the type of [PhysicalQuantity] of both units
  * @param value the [Number] value to convert
  * @param to the [ScientificUnit] to convert the value into
- * @param round The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @param round The number of digits a rounded value should have after its decimal point
+ * @param roundingMode The [RoundingMode] to apply when scaling
  * @return the [Double] value in [to] that is equivalent to [value] in this unit
  */
 fun <Quantity : PhysicalQuantity> ScientificUnit<Quantity>.convert(
@@ -139,8 +139,8 @@ fun <Quantity : PhysicalQuantity> ScientificUnit<Quantity>.convert(
  * @param Quantity the type of [PhysicalQuantity] of both units
  * @param value the [Decimal] value to convert
  * @param to the [ScientificUnit] to convert the value into
- * @param round The number of digits a rounded value should have after its decimal point.
- * @param roundingMode The [RoundingMode] to apply when scaling.
+ * @param round The number of digits a rounded value should have after its decimal point
+ * @param roundingMode The [RoundingMode] to apply when scaling
  * @return the [Decimal] value in [to] that is equivalent to [value] in this unit
  */
 fun <Quantity : PhysicalQuantity> ScientificUnit<Quantity>.convert(
diff --git a/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
index c9a017464..47f2d7cf0 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
@@ -112,7 +112,6 @@ sealed class Volume : AbstractScientificUnit<PhysicalQuantity.Volume>()
 @Serializable
 sealed class MetricVolume : Volume(), MetricScientificUnit<PhysicalQuantity.Volume>
 
-
 /**
  * A [Volume] for [MeasurementSystem.USCustomary]
  */
@@ -122,7 +121,6 @@ sealed class USCustomaryVolume : Volume(), USCustomaryScientificUnit<PhysicalQua
     override val system = MeasurementSystem.USCustomary
 }
 
-
 /**
  * A [Volume] for [MeasurementSystem.UKImperial]
  */
diff --git a/scientific/src/commonMain/kotlin/unit/WeightUnit.kt b/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
index 82d1ed585..5a5fdc909 100644
--- a/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
@@ -279,7 +279,6 @@ object UsTon : USCustomaryWeight() {
     override fun fromSIUnit(value: Decimal): Decimal = Pound.fromSIUnit(value) / POUND_IN_SHORT_TONES.toDecimal()
 }
 
-
 /**
  * Wraps an [ImperialWeight] unit to an [USCustomaryWeight] unit
  * @param imperial the [ImperialWeight] to wrap
diff --git a/system/src/commonMain/kotlin/network/NetworkManager.kt b/system/src/commonMain/kotlin/network/NetworkManager.kt
index 30e8ca58f..b716c4426 100644
--- a/system/src/commonMain/kotlin/network/NetworkManager.kt
+++ b/system/src/commonMain/kotlin/network/NetworkManager.kt
@@ -36,7 +36,7 @@ interface NetworkManager {
     }
 
     /**
-     * A [Flow] pf the [NetworkConnectionType] detected by the network manager
+     * A [Flow] of the [NetworkConnectionType] detected by the network manager
      */
     val network: Flow<NetworkConnectionType>
 

From 16d96bb2e629d49f02a9d9e1155320355063bded Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 14:53:16 +0100
Subject: [PATCH 200/227] Minor api tracking fix

---
 base/api/jvm/base.api                                  | 4 ----
 system/src/commonMain/kotlin/network/NetworkManager.kt | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index 499ac53dc..53993bf86 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -922,10 +922,6 @@ public final class com/splendo/kaluga/base/utils/Decimal$PositiveInfinity : com/
 	public static final field INSTANCE Lcom/splendo/kaluga/base/utils/Decimal$PositiveInfinity;
 }
 
-public final class com/splendo/kaluga/base/utils/DecimalException : java/lang/ArithmeticException {
-	public fun <init> (Ljava/lang/String;)V
-}
-
 public final class com/splendo/kaluga/base/utils/DecimalJVM {
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 	public static final fun div (Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;
diff --git a/system/src/commonMain/kotlin/network/NetworkManager.kt b/system/src/commonMain/kotlin/network/NetworkManager.kt
index 30e8ca58f..b716c4426 100644
--- a/system/src/commonMain/kotlin/network/NetworkManager.kt
+++ b/system/src/commonMain/kotlin/network/NetworkManager.kt
@@ -36,7 +36,7 @@ interface NetworkManager {
     }
 
     /**
-     * A [Flow] pf the [NetworkConnectionType] detected by the network manager
+     * A [Flow] of the [NetworkConnectionType] detected by the network manager
      */
     val network: Flow<NetworkConnectionType>
 

From aaf9c4cea4bc40e623e8b70bcb30cd5afaa2c4eb Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 16:54:11 +0100
Subject: [PATCH 201/227] A/An consistency

---
 .../lifecycle/ActivityLifecycleSubscribable.kt       |  2 +-
 .../src/androidLibMain/kotlin/device/DeviceInfo.kt   |  2 +-
 bluetooth/src/commonMain/kotlin/Bluetooth.kt         |  2 +-
 .../kotlin/device/DefaultDeviceConnectionManager.kt  | 12 ++++++------
 bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt |  2 +-
 .../src/commonMain/kotlin/device/DeviceState.kt      |  2 +-
 bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt    |  2 +-
 bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt     |  2 +-
 bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt    |  2 +-
 scientific/src/commonMain/kotlin/ScientificArray.kt  |  4 ++--
 scientific/src/commonMain/kotlin/unit/ActionUnit.kt  |  2 +-
 .../commonMain/kotlin/unit/AngularAcceleration.kt    |  2 +-
 .../commonMain/kotlin/unit/AngularVelocityUnit.kt    |  2 +-
 .../src/commonMain/kotlin/unit/AreaDensityUnit.kt    |  6 +++---
 scientific/src/commonMain/kotlin/unit/DensityUnit.kt | 10 +++++-----
 .../commonMain/kotlin/unit/DynamicViscosityUnit.kt   |  2 +-
 scientific/src/commonMain/kotlin/unit/ForceUnit.kt   |  8 ++++----
 .../src/commonMain/kotlin/unit/HeatCapacityUnit.kt   |  4 ++--
 scientific/src/commonMain/kotlin/unit/JoltUnit.kt    |  2 +-
 .../commonMain/kotlin/unit/KinematicViscosityUnit.kt |  2 +-
 .../commonMain/kotlin/unit/LinearMassDensityUnit.kt  |  6 +++---
 .../commonMain/kotlin/unit/LuminousExposureUnits.kt  |  2 +-
 .../src/commonMain/kotlin/unit/MassFlowRateUnit.kt   |  2 +-
 .../src/commonMain/kotlin/unit/MolalityUnit.kt       |  8 ++++----
 .../src/commonMain/kotlin/unit/MolarEnergyUnit.kt    |  6 +++---
 .../src/commonMain/kotlin/unit/MolarMassUnit.kt      |  8 ++++----
 .../src/commonMain/kotlin/unit/MolarVolumeUnit.kt    |  8 ++++----
 .../src/commonMain/kotlin/unit/MolarityUnit.kt       |  8 ++++----
 .../src/commonMain/kotlin/unit/MomentumUnit.kt       |  6 +++---
 .../src/commonMain/kotlin/unit/PressureUnit.kt       |  8 ++++----
 .../src/commonMain/kotlin/unit/SpecificEnergyUnit.kt |  8 ++++----
 .../kotlin/unit/SpecificHeatCapacityUnit.kt          |  8 ++++----
 .../src/commonMain/kotlin/unit/SpecificVolumeUnit.kt | 10 +++++-----
 scientific/src/commonMain/kotlin/unit/SpeedUnit.kt   |  2 +-
 .../src/commonMain/kotlin/unit/SurfaceTensionUnit.kt |  6 +++---
 .../commonMain/kotlin/unit/ThermalResistanceUnit.kt  |  4 ++--
 scientific/src/commonMain/kotlin/unit/VolumeUnit.kt  |  8 ++++----
 .../src/commonMain/kotlin/unit/VolumetricFlowUnit.kt |  2 +-
 .../src/commonMain/kotlin/unit/VolumetricFluxUnit.kt |  6 +++---
 scientific/src/commonMain/kotlin/unit/WeightUnit.kt  |  8 ++++----
 scientific/src/commonMain/kotlin/unit/YankUnit.kt    |  2 +-
 41 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt b/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
index f1bac6ff0..3f94e75e8 100644
--- a/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
+++ b/architecture/src/androidLibMain/kotlin/lifecycle/ActivityLifecycleSubscribable.kt
@@ -32,7 +32,7 @@ import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
 actual interface LifecycleSubscribable
 
 /**
- * A [LifecycleSubscribable] bound to a [ActivityLifecycleSubscribable.LifecycleManager]
+ * A [LifecycleSubscribable] bound to an [ActivityLifecycleSubscribable.LifecycleManager]
  */
 interface ActivityLifecycleSubscribable : LifecycleSubscribable {
 
diff --git a/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt
index 6c371e927..ad72f5ab4 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DeviceInfo.kt
@@ -33,7 +33,7 @@ actual typealias Identifier = String
 actual fun randomIdentifier() = randomUUIDString()
 
 /**
- * Gets a [Identifier] from a string value
+ * Gets an [Identifier] from a string value
  * @param stringValue the string value to get the [Identifier] from
  * @return an [Identifier] matching the string value or `null` if it could not be generated
  */
diff --git a/bluetooth/src/commonMain/kotlin/Bluetooth.kt b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
index df64c06c6..abf20f139 100644
--- a/bluetooth/src/commonMain/kotlin/Bluetooth.kt
+++ b/bluetooth/src/commonMain/kotlin/Bluetooth.kt
@@ -463,7 +463,7 @@ operator fun <AttributeType : Attribute<ReadAction, WriteAction>, ReadAction : D
 }
 
 /**
- * Gets a ([Flow] of) the [ByteArray] value from a [Flow] of a [AttributeType]
+ * Gets a ([Flow] of) the [ByteArray] value from a [Flow] of an [AttributeType]
  * @param AttributeType the type of [Attribute] to get the value from
  * @param ReadAction the [DeviceAction.Read] associated with [AttributeType]
  * @param WriteAction the [DeviceAction.Write] associated with [AttributeType]
diff --git a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
index b24cc2a6b..c8544aa0b 100644
--- a/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DefaultDeviceConnectionManager.kt
@@ -177,32 +177,32 @@ interface DeviceConnectionManager {
     suspend fun performAction(action: DeviceAction)
 
     /**
-     * Fires a [Event.Connecting]
+     * Fires an [Event.Connecting]
      */
     fun startConnecting()
 
     /**
-     * Fires a [Event.CancelledConnecting]
+     * Fires an [Event.CancelledConnecting]
      */
     fun cancelConnecting()
 
     /**
-     * Fires a [Event.Connected]
+     * Fires an [Event.Connected]
      */
     fun handleConnect()
 
     /**
-     * Fires a [Event.Discovering]
+     * Fires an [Event.Discovering]
      */
     fun startDiscovering()
 
     /**
-     * Fires a [Event.Disconnecting]
+     * Fires an [Event.Disconnecting]
      */
     fun startDisconnecting()
 
     /**
-     * Fires a [Event.Disconnected]
+     * Fires an [Event.Disconnected]
      */
     fun handleDisconnect(onDisconnect: (suspend () -> Unit)? = null)
 
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
index aa66198b7..392803396 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
@@ -41,7 +41,7 @@ expect class Identifier
 expect fun randomIdentifier(): Identifier
 
 /**
- * Gets a [Identifier] from a string value
+ * Gets an [Identifier] from a string value
  * @param stringValue the string value to get the [Identifier] from
  * @return an [Identifier] matching the string value or `null` if it could not be generated
  */
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
index 0d6c837df..7d2af7203 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceState.kt
@@ -137,7 +137,7 @@ sealed interface ConnectableDeviceState : DeviceState, KalugaState {
             /**
              * Discovers a list of [Service] to transition into [Idle]
              * @param services the list of [Service] discovered
-             * @return a transition into a [Idle] State
+             * @return a transition into an [Idle] State
              */
             fun didDiscoverServices(services: List<Service>): suspend () -> Idle
         }
diff --git a/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt
index 47d2236cf..175aaa34b 100644
--- a/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/iosMain/kotlin/device/DeviceInfo.kt
@@ -31,7 +31,7 @@ actual typealias Identifier = NSUUID
 actual fun randomIdentifier() = Identifier.UUID()
 
 /**
- * Gets a [Identifier] from a string value
+ * Gets an [Identifier] from a string value
  * @param stringValue the string value to get the [Identifier] from
  * @return an [Identifier] matching the string value or `null` if it could not be generated
  */
diff --git a/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt
index 376ecc906..226f222d3 100644
--- a/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/jsMain/kotlin/device/DeviceInfo.kt
@@ -33,7 +33,7 @@ actual typealias Identifier = UUID
 actual fun randomIdentifier() = Identifier(randomUUIDString())
 
 /**
- * Gets a [Identifier] from a string value
+ * Gets an [Identifier] from a string value
  * @param stringValue the string value to get the [Identifier] from
  * @return an [Identifier] matching the string value or `null` if it could not be generated
  */
diff --git a/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt
index adc5a4fa7..edb191c8a 100644
--- a/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/jvmMain/kotlin/device/DeviceInfo.kt
@@ -35,7 +35,7 @@ actual typealias Identifier = UUID
 actual fun randomIdentifier() = Identifier(randomUUIDString())
 
 /**
- * Gets a [Identifier] from a string value
+ * Gets an [Identifier] from a string value
  * @param stringValue the string value to get the [Identifier] from
  * @return an [Identifier] matching the string value or `null` if it could not be generated
  */
diff --git a/scientific/src/commonMain/kotlin/ScientificArray.kt b/scientific/src/commonMain/kotlin/ScientificArray.kt
index e24391e9c..0deb1e378 100644
--- a/scientific/src/commonMain/kotlin/ScientificArray.kt
+++ b/scientific/src/commonMain/kotlin/ScientificArray.kt
@@ -299,7 +299,7 @@ fun <
 ) = toScientificArray(unit, ::DefaultScientificArray)
 
 /**
- * Creates a [ArrayType] from a list of [ScientificValue]
+ * Creates an [ArrayType] from a list of [ScientificValue]
  * @param Quantity the type of [PhysicalQuantity] of the unit
  * @param Unit the type of [ScientificUnit] representing all elements in the list of [ScientificValue]
  * @param TargetUnit the type of [ScientificUnit] the array should represent
@@ -772,7 +772,7 @@ fun <
 ) = concat(right, unit)
 
 /**
- * Creates a [Array] containing all values of two [ScientificArray]
+ * Creates an [Array] containing all values of two [ScientificArray]
  * @param Quantity the type of [PhysicalQuantity] of the unit
  * @param NumberType the type of [Number] stored in the array
  * @param Unit the type of [ScientificUnit] of the array
diff --git a/scientific/src/commonMain/kotlin/unit/ActionUnit.kt b/scientific/src/commonMain/kotlin/unit/ActionUnit.kt
index cfd9b316d..d015bb81a 100644
--- a/scientific/src/commonMain/kotlin/unit/ActionUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ActionUnit.kt
@@ -118,7 +118,7 @@ infix fun MetricAndImperialEnergy.x(time: Time) = MetricAndImperialAction(this,
 infix fun MetricEnergy.x(time: Time) = MetricAction(this, time)
 
 /**
- * Gets a [ImperialAction] from a [ImperialEnergy] and a [Time]
+ * Gets an [ImperialAction] from an [ImperialEnergy] and a [Time]
  * @param time the [Time] component
  * @return the [ImperialAction] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt b/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt
index 3b99dab2d..54eead6d5 100644
--- a/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt
+++ b/scientific/src/commonMain/kotlin/unit/AngularAcceleration.kt
@@ -50,7 +50,7 @@ data class AngularAcceleration(val angularVelocity: AngularVelocity, val per: Ti
 }
 
 /**
- * Gets a [AngularAcceleration] from a [AngularVelocity] and a [Time]
+ * Gets an [AngularAcceleration] from an [AngularVelocity] and a [Time]
  * @param time the [Time] component
  * @return the [AngularAcceleration] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt b/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt
index 66d5c504c..b7374d73d 100644
--- a/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AngularVelocityUnit.kt
@@ -44,7 +44,7 @@ data class AngularVelocity(val angle: Angle, val per: Time) : AbstractScientific
 }
 
 /**
- * Gets a [AngularVelocity] from a [Angle] and a [Time]
+ * Gets an [AngularVelocity] from an [Angle] and a [Time]
  * @param time the [Time] component
  * @return the [Angle] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt b/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
index 97fb8d604..19386e1a3 100644
--- a/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
@@ -129,21 +129,21 @@ data class UKImperialAreaDensity(override val weight: UKImperialWeight, override
 infix fun MetricWeight.per(area: MetricArea) = MetricAreaDensity(this, area)
 
 /**
- * Gets a [ImperialAreaDensity] from a [ImperialWeight] and a [ImperialArea]
+ * Gets an [ImperialAreaDensity] from an [ImperialWeight] and an [ImperialArea]
  * @param area the [ImperialArea] component
  * @return the [ImperialAreaDensity] represented by the units
  */
 infix fun ImperialWeight.per(area: ImperialArea) = ImperialAreaDensity(this, area)
 
 /**
- * Gets a [USCustomaryAreaDensity] from a [USCustomaryWeight] and a [ImperialArea]
+ * Gets a [USCustomaryAreaDensity] from a [USCustomaryWeight] and an [ImperialArea]
  * @param area the [ImperialArea] component
  * @return the [USCustomaryAreaDensity] represented by the units
  */
 infix fun USCustomaryWeight.per(area: ImperialArea) = USCustomaryAreaDensity(this, area)
 
 /**
- * Gets a [UKImperialAreaDensity] from a [UKImperialWeight] and a [ImperialArea]
+ * Gets a [UKImperialAreaDensity] from a [UKImperialWeight] and an [ImperialArea]
  * @param area the [ImperialArea] component
  * @return the [UKImperialAreaDensity] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/DensityUnit.kt b/scientific/src/commonMain/kotlin/unit/DensityUnit.kt
index 8cf260639..bdc6e3cfb 100644
--- a/scientific/src/commonMain/kotlin/unit/DensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/DensityUnit.kt
@@ -129,21 +129,21 @@ data class UKImperialDensity(override val weight: UKImperialWeight, override val
 infix fun MetricWeight.per(volume: MetricVolume) = MetricDensity(this, volume)
 
 /**
- * Gets a [ImperialDensity] from a [ImperialWeight] and a [ImperialVolume]
+ * Gets an [ImperialDensity] from an [ImperialWeight] and an [ImperialVolume]
  * @param volume the [ImperialVolume] component
  * @return the [MetricAreaDensity] represented by the units
  */
 infix fun ImperialWeight.per(volume: ImperialVolume) = ImperialDensity(this, volume)
 
 /**
- * Gets a [UKImperialDensity] from a [ImperialWeight] and a [UKImperialVolume]
+ * Gets a [UKImperialDensity] from an [ImperialWeight] and a [UKImperialVolume]
  * @param volume the [UKImperialVolume] component
  * @return the [UKImperialDensity] represented by the units
  */
 infix fun ImperialWeight.per(volume: UKImperialVolume) = UKImperialDensity(this.ukImperial, volume)
 
 /**
- * Gets a [USCustomaryDensity] from a [ImperialWeight] and a [USCustomaryVolume]
+ * Gets a [USCustomaryDensity] from an [ImperialWeight] and a [USCustomaryVolume]
  * @param volume the [USCustomaryVolume] component
  * @return the [USCustomaryDensity] represented by the units
  */
@@ -157,14 +157,14 @@ infix fun ImperialWeight.per(volume: USCustomaryVolume) = USCustomaryDensity(thi
 infix fun USCustomaryWeight.per(volume: USCustomaryVolume) = USCustomaryDensity(this, volume)
 
 /**
- * Gets a [USCustomaryDensity] from a [USCustomaryWeight] and a [ImperialVolume]
+ * Gets a [USCustomaryDensity] from a [USCustomaryWeight] and an [ImperialVolume]
  * @param volume the [ImperialVolume] component
  * @return the [USCustomaryDensity] represented by the units
  */
 infix fun USCustomaryWeight.per(volume: ImperialVolume) = USCustomaryDensity(this, volume.usCustomary)
 
 /**
- * Gets a [UKImperialDensity] from a [UKImperialWeight] and a [ImperialVolume]
+ * Gets a [UKImperialDensity] from a [UKImperialWeight] and an [ImperialVolume]
  * @param volume the [ImperialVolume] component
  * @return the [UKImperialDensity] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt b/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt
index b680f906e..b6e950b20 100644
--- a/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/DynamicViscosityUnit.kt
@@ -137,7 +137,7 @@ data class USCustomaryDynamicViscosity(override val pressure: USCustomaryPressur
 infix fun MetricPressure.x(time: Time) = MetricDynamicViscosity(this, time)
 
 /**
- * Gets a [ImperialDynamicViscosity] from a [ImperialPressure] and a [Time]
+ * Gets an [ImperialDynamicViscosity] from an [ImperialPressure] and a [Time]
  * @param time the [Time] component
  * @return the [ImperialDynamicViscosity] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/ForceUnit.kt b/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
index ec1c9944d..f3ef40386 100644
--- a/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ForceUnit.kt
@@ -272,7 +272,7 @@ object UsTonForce : USCustomaryForce() {
 }
 
 /**
- * Wraps an [ImperialForce] unit to an [USCustomaryForce] unit
+ * Wraps an [ImperialForce] unit to a [USCustomaryForce] unit
  * @param imperial the [ImperialForce] to wrap
  */
 @Serializable
@@ -283,7 +283,7 @@ data class USCustomaryImperialForceWrapper(val imperial: ImperialForce) : USCust
 }
 
 /**
- * Converts an [ImperialForce] unit to an [USCustomaryImperialForceWrapper] unit
+ * Converts an [ImperialForce] unit to a [USCustomaryImperialForceWrapper] unit
  * @param ForceUnit the type of [ImperialForce] to convert
  */
 val <ForceUnit : ImperialForce> ForceUnit.usCustomary get() = USCustomaryImperialForceWrapper(this)
@@ -296,7 +296,7 @@ object ImperialTonForce : UKImperialForce() {
 }
 
 /**
- * Wraps an [ImperialForce] unit to an [UKImperialForce] unit
+ * Wraps an [ImperialForce] unit to a [UKImperialForce] unit
  * @param imperial the [ImperialForce] to wrap
  */
 @Serializable
@@ -307,7 +307,7 @@ data class UKImperialImperialForceWrapper(val imperial: ImperialForce) : UKImper
 }
 
 /**
- * Converts an [ImperialForce] unit to an [UKImperialImperialForceWrapper] unit
+ * Converts an [ImperialForce] unit to a [UKImperialImperialForceWrapper] unit
  * @param ForceUnit the type of [ImperialForce] to convert
  */
 val <ForceUnit : ImperialForce> ForceUnit.ukImperial get() = UKImperialImperialForceWrapper(this)
diff --git a/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt b/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
index c4209d7cc..9ef76fb2b 100644
--- a/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/HeatCapacityUnit.kt
@@ -144,7 +144,7 @@ infix fun MetricAndImperialEnergy.per(temperature: MetricAndUKImperialTemperatur
 infix fun MetricEnergy.per(temperature: MetricAndUKImperialTemperature) = MetricHeatCapacity(this, temperature)
 
 /**
- * Gets a [UKImperialHeatCapacity] from a [ImperialEnergy] and a [MetricAndUKImperialTemperature]
+ * Gets a [UKImperialHeatCapacity] from an [ImperialEnergy] and a [MetricAndUKImperialTemperature]
  * @param temperature the [MetricAndUKImperialTemperature] component
  * @return the [UKImperialHeatCapacity] represented by the units
  */
@@ -158,7 +158,7 @@ infix fun ImperialEnergy.per(temperature: MetricAndUKImperialTemperature) = UKIm
 infix fun MetricAndImperialEnergy.per(temperature: USCustomaryTemperature) = USCustomaryHeatCapacity(this.imperial, temperature)
 
 /**
- * Gets a [USCustomaryHeatCapacity] from a [ImperialEnergy] and a [USCustomaryTemperature]
+ * Gets a [USCustomaryHeatCapacity] from an [ImperialEnergy] and a [USCustomaryTemperature]
  * @param temperature the [USCustomaryTemperature] component
  * @return the [USCustomaryHeatCapacity] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/JoltUnit.kt b/scientific/src/commonMain/kotlin/unit/JoltUnit.kt
index 28463dc15..2a8160442 100644
--- a/scientific/src/commonMain/kotlin/unit/JoltUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/JoltUnit.kt
@@ -92,7 +92,7 @@ data class ImperialJolt(override val acceleration: ImperialAcceleration, overrid
 infix fun MetricAcceleration.per(time: Time) = MetricJolt(this, time)
 
 /**
- * Gets a [ImperialJolt] from a [ImperialAcceleration] and a [Time]
+ * Gets an [ImperialJolt] from an [ImperialAcceleration] and a [Time]
  * @param time the [Time] component
  * @return the [ImperialJolt] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/KinematicViscosityUnit.kt b/scientific/src/commonMain/kotlin/unit/KinematicViscosityUnit.kt
index f09fcb665..cf8605e5e 100644
--- a/scientific/src/commonMain/kotlin/unit/KinematicViscosityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/KinematicViscosityUnit.kt
@@ -91,7 +91,7 @@ data class ImperialKinematicViscosity(override val area: ImperialArea, override
 infix fun MetricArea.per(time: Time) = MetricKinematicViscosity(this, time)
 
 /**
- * Gets a [ImperialKinematicViscosity] from a [ImperialArea] and a [Time]
+ * Gets an [ImperialKinematicViscosity] from an [ImperialArea] and a [Time]
  * @param time the [Time] component
  * @return the [ImperialKinematicViscosity] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt b/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt
index aed1c9b1f..9d1ccf1f2 100644
--- a/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/LinearMassDensityUnit.kt
@@ -137,21 +137,21 @@ data class UKImperialLinearMassDensity(override val weight: UKImperialWeight, ov
 infix fun MetricWeight.per(length: MetricLength) = MetricLinearMassDensity(this, length)
 
 /**
- * Gets a [ImperialLinearMassDensity] from a [ImperialWeight] and a [ImperialLength]
+ * Gets an [ImperialLinearMassDensity] from an [ImperialWeight] and an [ImperialLength]
  * @param length the [ImperialLength] component
  * @return the [ImperialLinearMassDensity] represented by the units
  */
 infix fun ImperialWeight.per(length: ImperialLength) = ImperialLinearMassDensity(this, length)
 
 /**
- * Gets a [USCustomaryLinearMassDensity] from a [USCustomaryWeight] and a [ImperialLength]
+ * Gets a [USCustomaryLinearMassDensity] from a [USCustomaryWeight] and an [ImperialLength]
  * @param length the [ImperialLength] component
  * @return the [USCustomaryLinearMassDensity] represented by the units
  */
 infix fun USCustomaryWeight.per(length: ImperialLength) = USCustomaryLinearMassDensity(this, length)
 
 /**
- * Gets a [UKImperialLinearMassDensity] from a [UKImperialWeight] and a [ImperialLength]
+ * Gets a [UKImperialLinearMassDensity] from a [UKImperialWeight] and an [ImperialLength]
  * @param length the [ImperialLength] component
  * @return the [UKImperialLinearMassDensity] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt b/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt
index 2a7e06670..ee1ccbd5c 100644
--- a/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt
+++ b/scientific/src/commonMain/kotlin/unit/LuminousExposureUnits.kt
@@ -89,7 +89,7 @@ data class ImperialLuminousExposure(override val illuminance: ImperialIlluminanc
 infix fun MetricIlluminance.x(time: Time) = MetricLuminousExposure(this, time)
 
 /**
- * Gets a [ImperialLuminousExposure] from a [ImperialIlluminance] and a [Time]
+ * Gets an [ImperialLuminousExposure] from an [ImperialIlluminance] and a [Time]
  * @param time the [Time] component
  * @return the [ImperialLuminousExposure] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt b/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt
index 799d63c5f..a29da6e43 100644
--- a/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MassFlowRateUnit.kt
@@ -136,7 +136,7 @@ data class UKImperialMassFlowRate(override val weight: UKImperialWeight, overrid
 infix fun MetricWeight.per(time: Time) = MetricMassFlowRate(this, time)
 
 /**
- * Gets a [ImperialMassFlowRate] from a [ImperialWeight] and a [Time]
+ * Gets an [ImperialMassFlowRate] from an [ImperialWeight] and a [Time]
  * @param time the [Time] component
  * @return the [ImperialMassFlowRate] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt b/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt
index b4d1e0a17..539171b2c 100644
--- a/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolalityUnit.kt
@@ -130,28 +130,28 @@ data class UKImperialMolality(override val amountOfSubstance: AmountOfSubstance,
 }
 
 /**
- * Gets a [MetricMolality] from a [AmountOfSubstance] and a [MetricWeight]
+ * Gets a [MetricMolality] from an [AmountOfSubstance] and a [MetricWeight]
  * @param weight the [MetricWeight] component
  * @return the [MetricMolality] represented by the units
  */
 infix fun AmountOfSubstance.per(weight: MetricWeight) = MetricMolality(this, weight)
 
 /**
- * Gets a [ImperialMolality] from a [AmountOfSubstance] and a [ImperialWeight]
+ * Gets an [ImperialMolality] from an [AmountOfSubstance] and an [ImperialWeight]
  * @param weight the [ImperialWeight] component
  * @return the [ImperialMolality] represented by the units
  */
 infix fun AmountOfSubstance.per(weight: ImperialWeight) = ImperialMolality(this, weight)
 
 /**
- * Gets a [UKImperialMolality] from a [AmountOfSubstance] and a [UKImperialWeight]
+ * Gets a [UKImperialMolality] from an [AmountOfSubstance] and a [UKImperialWeight]
  * @param weight the [UKImperialWeight] component
  * @return the [UKImperialMolality] represented by the units
  */
 infix fun AmountOfSubstance.per(weight: UKImperialWeight) = UKImperialMolality(this, weight)
 
 /**
- * Gets a [USCustomaryMolality] from a [AmountOfSubstance] and a [USCustomaryWeight]
+ * Gets a [USCustomaryMolality] from an [AmountOfSubstance] and a [USCustomaryWeight]
  * @param weight the [USCustomaryWeight] component
  * @return the [USCustomaryMolality] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
index 8ab97974a..f0d698be7 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarEnergyUnit.kt
@@ -112,21 +112,21 @@ data class ImperialMolarEnergy(override val energy: ImperialEnergy, override val
 }
 
 /**
- * Gets a [MetricAndImperialMolarEnergy] from a [MetricAndImperialEnergy] and a [AmountOfSubstance]
+ * Gets a [MetricAndImperialMolarEnergy] from a [MetricAndImperialEnergy] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [MetricAndImperialMolarEnergy] represented by the units
  */
 infix fun MetricAndImperialEnergy.per(amountOfSubstance: AmountOfSubstance) = MetricAndImperialMolarEnergy(this, amountOfSubstance)
 
 /**
- * Gets a [MetricMolarEnergy] from a [MetricEnergy] and a [AmountOfSubstance]
+ * Gets a [MetricMolarEnergy] from a [MetricEnergy] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [MetricMolarEnergy] represented by the units
  */
 infix fun MetricEnergy.per(amountOfSubstance: AmountOfSubstance) = MetricMolarEnergy(this, amountOfSubstance)
 
 /**
- * Gets a [ImperialMolarEnergy] from a [ImperialEnergy] and a [AmountOfSubstance]
+ * Gets an [ImperialMolarEnergy] from an [ImperialEnergy] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [ImperialMolarEnergy] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt
index 85b8b1deb..9e2b8e343 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarMassUnit.kt
@@ -130,28 +130,28 @@ data class UKImperialMolarMass(override val weight: UKImperialWeight, override v
 }
 
 /**
- * Gets a [MetricMolarMass] from a [MetricWeight] and a [AmountOfSubstance]
+ * Gets a [MetricMolarMass] from a [MetricWeight] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [MetricMolarMass] represented by the units
  */
 infix fun MetricWeight.per(amountOfSubstance: AmountOfSubstance) = MetricMolarMass(this, amountOfSubstance)
 
 /**
- * Gets a [ImperialMolarMass] from a [ImperialWeight] and a [AmountOfSubstance]
+ * Gets an [ImperialMolarMass] from an [ImperialWeight] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [ImperialMolarMass] represented by the units
  */
 infix fun ImperialWeight.per(amountOfSubstance: AmountOfSubstance) = ImperialMolarMass(this, amountOfSubstance)
 
 /**
- * Gets a [USCustomaryMolarMass] from a [USCustomaryWeight] and a [AmountOfSubstance]
+ * Gets a [USCustomaryMolarMass] from a [USCustomaryWeight] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [USCustomaryMolarMass] represented by the units
  */
 infix fun USCustomaryWeight.per(amountOfSubstance: AmountOfSubstance) = USCustomaryMolarMass(this, amountOfSubstance)
 
 /**
- * Gets a [UKImperialMolarMass] from a [UKImperialWeight] and a [AmountOfSubstance]
+ * Gets a [UKImperialMolarMass] from a [UKImperialWeight] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [UKImperialMolarMass] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt
index 01e2c9ff5..568be214a 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarVolumeUnit.kt
@@ -130,28 +130,28 @@ data class UKImperialMolarVolume(override val volume: UKImperialVolume, override
 }
 
 /**
- * Gets a [MetricMolarVolume] from a [MetricVolume] and a [AmountOfSubstance]
+ * Gets a [MetricMolarVolume] from a [MetricVolume] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [MetricMolarVolume] represented by the units
  */
 infix fun MetricVolume.per(amountOfSubstance: AmountOfSubstance) = MetricMolarVolume(this, amountOfSubstance)
 
 /**
- * Gets a [ImperialMolarVolume] from a [ImperialVolume] and a [AmountOfSubstance]
+ * Gets an [ImperialMolarVolume] from an [ImperialVolume] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [ImperialMolarVolume] represented by the units
  */
 infix fun ImperialVolume.per(amountOfSubstance: AmountOfSubstance) = ImperialMolarVolume(this, amountOfSubstance)
 
 /**
- * Gets a [USCustomaryMolarVolume] from a [USCustomaryVolume] and a [AmountOfSubstance]
+ * Gets a [USCustomaryMolarVolume] from a [USCustomaryVolume] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [USCustomaryMolarVolume] represented by the units
  */
 infix fun USCustomaryVolume.per(amountOfSubstance: AmountOfSubstance) = USCustomaryMolarVolume(this, amountOfSubstance)
 
 /**
- * Gets a [UKImperialMolarVolume] from a [UKImperialVolume] and a [AmountOfSubstance]
+ * Gets a [UKImperialMolarVolume] from a [UKImperialVolume] and an [AmountOfSubstance]
  * @param amountOfSubstance the [AmountOfSubstance] component
  * @return the [UKImperialMolarVolume] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt b/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt
index 00b9b4938..bc0eaa150 100644
--- a/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MolarityUnit.kt
@@ -130,28 +130,28 @@ data class UKImperialMolarity(override val amountOfSubstance: AmountOfSubstance,
 }
 
 /**
- * Gets a [MetricMolarity] from a [AmountOfSubstance] and a [MetricVolume]
+ * Gets a [MetricMolarity] from an [AmountOfSubstance] and a [MetricVolume]
  * @param volume the [MetricVolume] component
  * @return the [MetricMolarity] represented by the units
  */
 infix fun AmountOfSubstance.per(volume: MetricVolume) = MetricMolarity(this, volume)
 
 /**
- * Gets a [ImperialMolarity] from a [AmountOfSubstance] and a [ImperialVolume]
+ * Gets an [ImperialMolarity] from an [AmountOfSubstance] and an [ImperialVolume]
  * @param volume the [ImperialVolume] component
  * @return the [ImperialMolarity] represented by the units
  */
 infix fun AmountOfSubstance.per(volume: ImperialVolume) = ImperialMolarity(this, volume)
 
 /**
- * Gets a [USCustomaryMolarity] from a [AmountOfSubstance] and a [USCustomaryVolume]
+ * Gets a [USCustomaryMolarity] from an [AmountOfSubstance] and a [USCustomaryVolume]
  * @param volume the [USCustomaryVolume] component
  * @return the [USCustomaryMolarity] represented by the units
  */
 infix fun AmountOfSubstance.per(volume: USCustomaryVolume) = USCustomaryMolarity(this, volume)
 
 /**
- * Gets a [UKImperialMolarity] from a [AmountOfSubstance] and a [UKImperialVolume]
+ * Gets a [UKImperialMolarity] from an [AmountOfSubstance] and a [UKImperialVolume]
  * @param volume the [UKImperialVolume] component
  * @return the [UKImperialMolarity] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt b/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt
index edca534f2..57773ca2c 100644
--- a/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/MomentumUnit.kt
@@ -145,21 +145,21 @@ data class USCustomaryMomentum(override val mass: USCustomaryWeight, override va
 infix fun MetricWeight.x(speed: MetricSpeed) = MetricMomentum(this, speed)
 
 /**
- * Gets a [ImperialMomentum] from a [ImperialWeight] and a [ImperialSpeed]
+ * Gets an [ImperialMomentum] from an [ImperialWeight] and an [ImperialSpeed]
  * @param speed the [ImperialSpeed] component
  * @return the [ImperialMomentum] represented by the units
  */
 infix fun ImperialWeight.x(speed: ImperialSpeed) = ImperialMomentum(this, speed)
 
 /**
- * Gets a [UKImperialMomentum] from a [UKImperialWeight] and a [ImperialSpeed]
+ * Gets a [UKImperialMomentum] from a [UKImperialWeight] and an [ImperialSpeed]
  * @param speed the [ImperialSpeed] component
  * @return the [UKImperialMomentum] represented by the units
  */
 infix fun UKImperialWeight.x(speed: ImperialSpeed) = UKImperialMomentum(this, speed)
 
 /**
- * Gets a [USCustomaryMomentum] from a [USCustomaryWeight] and a [ImperialSpeed]
+ * Gets a [USCustomaryMomentum] from a [USCustomaryWeight] and an [ImperialSpeed]
  * @param speed the [ImperialSpeed] component
  * @return the [USCustomaryMomentum] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/PressureUnit.kt b/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
index 74dcc55e1..4c47304d7 100644
--- a/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/PressureUnit.kt
@@ -403,7 +403,7 @@ object USTonSquareFoot : USCustomaryPressure() {
 }
 
 /**
- * Wraps an [ImperialPressure] unit to an [USCustomaryPressure] unit
+ * Wraps an [ImperialPressure] unit to a [USCustomaryPressure] unit
  * @param imperial the [ImperialPressure] to wrap
  */
 @Serializable
@@ -414,7 +414,7 @@ data class USCustomaryImperialPressureWrapper(val imperial: ImperialPressure) :
 }
 
 /**
- * Converts an [ImperialPressure] unit to an [USCustomaryImperialPressureWrapper] unit
+ * Converts an [ImperialPressure] unit to a [USCustomaryImperialPressureWrapper] unit
  * @param PressureUnit the type of [ImperialPressure] to convert
  */
 val <PressureUnit : ImperialPressure> PressureUnit.usCustomary get() = USCustomaryImperialPressureWrapper(this)
@@ -434,7 +434,7 @@ object ImperialTonSquareFoot : UKImperialPressure() {
 }
 
 /**
- * Wraps an [ImperialPressure] unit to an [UKImperialPressure] unit
+ * Wraps an [ImperialPressure] unit to a [UKImperialPressure] unit
  * @param imperial the [ImperialPressure] to wrap
  */
 @Serializable
@@ -445,7 +445,7 @@ data class UKImperialPressureWrapper(val imperial: ImperialPressure) : UKImperia
 }
 
 /**
- * Converts an [ImperialPressure] unit to an [UKImperialPressureWrapper] unit
+ * Converts an [ImperialPressure] unit to a [UKImperialPressureWrapper] unit
  * @param PressureUnit the type of [ImperialPressure] to convert
  */
 val <PressureUnit : ImperialPressure> PressureUnit.ukImperial get() = UKImperialPressureWrapper(this)
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
index 65525a463..b26aaf977 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificEnergyUnit.kt
@@ -137,7 +137,7 @@ data class USCustomarySpecificEnergy(override val energy: ImperialEnergy, overri
 infix fun MetricAndImperialEnergy.per(weight: MetricWeight) = MetricSpecificEnergy(this.metric, weight)
 
 /**
- * Gets a [ImperialSpecificEnergy] from a [MetricAndImperialEnergy] and a [ImperialWeight]
+ * Gets an [ImperialSpecificEnergy] from a [MetricAndImperialEnergy] and an [ImperialWeight]
  * @param weight the [ImperialWeight] component
  * @return the [ImperialSpecificEnergy] represented by the units
  */
@@ -165,21 +165,21 @@ infix fun MetricAndImperialEnergy.per(weight: USCustomaryWeight) = USCustomarySp
 infix fun MetricEnergy.per(weight: MetricWeight) = MetricSpecificEnergy(this, weight)
 
 /**
- * Gets a [ImperialSpecificEnergy] from a [ImperialEnergy] and a [ImperialWeight]
+ * Gets an [ImperialSpecificEnergy] from an [ImperialEnergy] and an [ImperialWeight]
  * @param weight the [ImperialWeight] component
  * @return the [ImperialSpecificEnergy] represented by the units
  */
 infix fun ImperialEnergy.per(weight: ImperialWeight) = ImperialSpecificEnergy(this, weight)
 
 /**
- * Gets a [UKImperialSpecificEnergy] from a [ImperialEnergy] and a [UKImperialWeight]
+ * Gets a [UKImperialSpecificEnergy] from an [ImperialEnergy] and a [UKImperialWeight]
  * @param weight the [UKImperialWeight] component
  * @return the [UKImperialSpecificEnergy] represented by the units
  */
 infix fun ImperialEnergy.per(weight: UKImperialWeight) = UKImperialSpecificEnergy(this, weight)
 
 /**
- * Gets a [USCustomarySpecificEnergy] from a [ImperialEnergy] and a [USCustomaryWeight]
+ * Gets a [USCustomarySpecificEnergy] from an [ImperialEnergy] and a [USCustomaryWeight]
  * @param weight the [USCustomaryWeight] component
  * @return the [USCustomarySpecificEnergy] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
index dc2a4c89b..5acbc4197 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificHeatCapacityUnit.kt
@@ -109,7 +109,7 @@ data class USCustomarySpecificHeatCapacity(override val heatCapacity: USCustomar
 infix fun MetricAndUKImperialHeatCapacity.per(weight: MetricWeight) = MetricSpecificHeatCapacity(metric, weight)
 
 /**
- * Gets a [UKImperialSpecificHeatCapacity] from a [MetricAndUKImperialHeatCapacity] and a [ImperialWeight]
+ * Gets a [UKImperialSpecificHeatCapacity] from a [MetricAndUKImperialHeatCapacity] and an [ImperialWeight]
  * @param weight the [ImperialWeight] component
  * @return the [UKImperialSpecificHeatCapacity] represented by the units
  */
@@ -130,7 +130,7 @@ infix fun MetricAndUKImperialHeatCapacity.per(weight: UKImperialWeight) = UKImpe
 infix fun MetricHeatCapacity.per(weight: MetricWeight) = MetricSpecificHeatCapacity(this, weight)
 
 /**
- * Gets a [UKImperialSpecificHeatCapacity] from a [UKImperialHeatCapacity] and a [ImperialWeight]
+ * Gets a [UKImperialSpecificHeatCapacity] from a [UKImperialHeatCapacity] and an [ImperialWeight]
  * @param weight the [ImperialWeight] component
  * @return the [UKImperialSpecificHeatCapacity] represented by the units
  */
@@ -165,14 +165,14 @@ infix fun USCustomaryHeatCapacity.per(weight: USCustomaryWeight) = USCustomarySp
 infix fun MetricSpecificEnergy.per(temperature: MetricAndUKImperialTemperature) = MetricSpecificHeatCapacity(energy per temperature, per)
 
 /**
- * Gets a [UKImperialSpecificHeatCapacity] from a [ImperialSpecificEnergy] and a [MetricAndUKImperialTemperature]
+ * Gets a [UKImperialSpecificHeatCapacity] from an [ImperialSpecificEnergy] and a [MetricAndUKImperialTemperature]
  * @param temperature the [MetricAndUKImperialTemperature] component
  * @return the [UKImperialSpecificHeatCapacity] represented by the units
  */
 infix fun ImperialSpecificEnergy.per(temperature: MetricAndUKImperialTemperature) = UKImperialSpecificHeatCapacity(energy per temperature, per.ukImperial)
 
 /**
- * Gets a [USCustomarySpecificHeatCapacity] from a [ImperialSpecificEnergy] and a [USCustomaryTemperature]
+ * Gets a [USCustomarySpecificHeatCapacity] from an [ImperialSpecificEnergy] and a [USCustomaryTemperature]
  * @param temperature the [USCustomaryTemperature] component
  * @return the [USCustomarySpecificHeatCapacity] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt
index c888eead5..8d75c26c2 100644
--- a/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpecificVolumeUnit.kt
@@ -137,21 +137,21 @@ data class UKImperialSpecificVolume(override val volume: UKImperialVolume, overr
 infix fun MetricVolume.per(weight: MetricWeight) = MetricSpecificVolume(this, weight)
 
 /**
- * Gets a [MetricSpecificVolume] from a [ImperialVolume] and a [ImperialWeight]
+ * Gets a [MetricSpecificVolume] from an [ImperialVolume] and an [ImperialWeight]
  * @param weight the [ImperialWeight] component
  * @return the [MetricSpecificVolume] represented by the units
  */
 infix fun ImperialVolume.per(weight: ImperialWeight) = ImperialSpecificVolume(this, weight)
 
 /**
- * Gets a [UKImperialSpecificVolume] from a [ImperialVolume] and a [UKImperialWeight]
+ * Gets a [UKImperialSpecificVolume] from an [ImperialVolume] and a [UKImperialWeight]
  * @param weight the [UKImperialWeight] component
  * @return the [UKImperialSpecificVolume] represented by the units
  */
 infix fun ImperialVolume.per(weight: UKImperialWeight) = UKImperialSpecificVolume(this.ukImperial, weight)
 
 /**
- * Gets a [USCustomarySpecificVolume] from a [ImperialVolume] and a [USCustomaryWeight]
+ * Gets a [USCustomarySpecificVolume] from an [ImperialVolume] and a [USCustomaryWeight]
  * @param weight the [USCustomaryWeight] component
  * @return the [USCustomarySpecificVolume] represented by the units
  */
@@ -165,14 +165,14 @@ infix fun ImperialVolume.per(weight: USCustomaryWeight) = USCustomarySpecificVol
 infix fun USCustomaryVolume.per(weight: USCustomaryWeight) = USCustomarySpecificVolume(this, weight)
 
 /**
- * Gets a [USCustomarySpecificVolume] from a [USCustomaryVolume] and a [ImperialWeight]
+ * Gets a [USCustomarySpecificVolume] from a [USCustomaryVolume] and an [ImperialWeight]
  * @param weight the [ImperialWeight] component
  * @return the [USCustomarySpecificVolume] represented by the units
  */
 infix fun USCustomaryVolume.per(weight: ImperialWeight) = USCustomarySpecificVolume(this, weight.usCustomary)
 
 /**
- * Gets a [UKImperialSpecificVolume] from a [UKImperialVolume] and a [ImperialWeight]
+ * Gets a [UKImperialSpecificVolume] from a [UKImperialVolume] and an [ImperialWeight]
  * @param weight the [ImperialWeight] component
  * @return the [UKImperialSpecificVolume] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt b/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
index eec296e7c..7df5e8b94 100644
--- a/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SpeedUnit.kt
@@ -92,7 +92,7 @@ data class ImperialSpeed(override val distance: ImperialLength, override val per
 infix fun MetricLength.per(time: Time) = MetricSpeed(this, time)
 
 /**
- * Gets a [ImperialSpeed] from a [ImperialLength] and a [Time]
+ * Gets an [ImperialSpeed] from an [ImperialLength] and a [Time]
  * @param time the [Time] component
  * @return the [ImperialSpeed] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt b/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt
index 33da7cda9..53624e1a7 100644
--- a/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/SurfaceTensionUnit.kt
@@ -137,21 +137,21 @@ data class UKImperialSurfaceTension(override val force: UKImperialForce, overrid
 infix fun MetricForce.per(length: MetricLength) = MetricSurfaceTension(this, length)
 
 /**
- * Gets a [ImperialSurfaceTension] from a [ImperialForce] and a [ImperialLength]
+ * Gets an [ImperialSurfaceTension] from an [ImperialForce] and an [ImperialLength]
  * @param length the [ImperialLength] component
  * @return the [ImperialSurfaceTension] represented by the units
  */
 infix fun ImperialForce.per(length: ImperialLength) = ImperialSurfaceTension(this, length)
 
 /**
- * Gets a [USCustomarySurfaceTension] from a [USCustomaryForce] and a [ImperialLength]
+ * Gets a [USCustomarySurfaceTension] from a [USCustomaryForce] and an [ImperialLength]
  * @param length the [ImperialLength] component
  * @return the [USCustomarySurfaceTension] represented by the units
  */
 infix fun USCustomaryForce.per(length: ImperialLength) = USCustomarySurfaceTension(this, length)
 
 /**
- * Gets a [UKImperialSurfaceTension] from a [UKImperialForce] and a [ImperialLength]
+ * Gets a [UKImperialSurfaceTension] from a [UKImperialForce] and an [ImperialLength]
  * @param length the [ImperialLength] component
  * @return the [UKImperialSurfaceTension] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt b/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
index 48718747c..0d79748ab 100644
--- a/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/ThermalResistanceUnit.kt
@@ -144,7 +144,7 @@ infix fun MetricAndUKImperialTemperature.per(power: MetricAndImperialPower) = Me
 infix fun MetricAndUKImperialTemperature.per(power: MetricPower) = MetricThermalResistance(this, power)
 
 /**
- * Gets a [UKImperialThermalResistance] from a [MetricAndUKImperialTemperature] and a [ImperialPower]
+ * Gets a [UKImperialThermalResistance] from a [MetricAndUKImperialTemperature] and an [ImperialPower]
  * @param power the [ImperialPower] component
  * @return the [UKImperialThermalResistance] represented by the units
  */
@@ -158,7 +158,7 @@ infix fun MetricAndUKImperialTemperature.per(power: ImperialPower) = UKImperialT
 infix fun USCustomaryTemperature.per(power: MetricAndImperialPower) = USCustomaryThermalResistance(this, power.imperial)
 
 /**
- * Gets a [USCustomaryThermalResistance] from a [USCustomaryTemperature] and a [ImperialPower]
+ * Gets a [USCustomaryThermalResistance] from a [USCustomaryTemperature] and an [ImperialPower]
  * @param power the [ImperialPower] component
  * @return the [USCustomaryThermalResistance] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
index 47f2d7cf0..b99e1d8e9 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumeUnit.kt
@@ -247,7 +247,7 @@ object CubicMile : ImperialVolume(), SystemScientificUnit<MeasurementSystem.Impe
 // US Imperial
 
 /**
- * Wraps an [ImperialVolume] unit to an [USCustomaryVolume] unit
+ * Wraps an [ImperialVolume] unit to a [USCustomaryVolume] unit
  * @param imperial the [ImperialVolume] to wrap
  */
 @Serializable
@@ -258,7 +258,7 @@ data class USCustomaryImperialVolumeWrapper(val imperial: ImperialVolume) : USCu
 }
 
 /**
- * Converts an [ImperialVolume] unit to an [USCustomaryImperialVolumeWrapper] unit
+ * Converts an [ImperialVolume] unit to a [USCustomaryImperialVolumeWrapper] unit
  * @param VolumeUnit the type of [ImperialForce] to convert
  */
 val <VolumeUnit : ImperialVolume> VolumeUnit.usCustomary get() = USCustomaryImperialVolumeWrapper(this)
@@ -336,7 +336,7 @@ object UsLiquidGallon : USCustomaryVolume() {
 // UK Imperial
 
 /**
- * Wraps an [ImperialVolume] unit to an [UKImperialVolume] unit
+ * Wraps an [ImperialVolume] unit to a [UKImperialVolume] unit
  * @param imperial the [ImperialVolume] to wrap
  */
 @Serializable
@@ -347,7 +347,7 @@ data class UKImperialImperialVolumeWrapper(val imperial: ImperialVolume) : UKImp
 }
 
 /**
- * Converts an [ImperialVolume] unit to an [UKImperialImperialVolumeWrapper] unit
+ * Converts an [ImperialVolume] unit to a [UKImperialImperialVolumeWrapper] unit
  * @param VolumeUnit the type of [ImperialForce] to convert
  */
 val <VolumeUnit : ImperialVolume> VolumeUnit.ukImperial get() = UKImperialImperialVolumeWrapper(this)
diff --git a/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt
index 2de3f7556..69af6c9d2 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumetricFlowUnit.kt
@@ -137,7 +137,7 @@ data class USCustomaryVolumetricFlow(override val volume: USCustomaryVolume, ove
 infix fun MetricVolume.per(time: Time) = MetricVolumetricFlow(this, time)
 
 /**
- * Gets a [ImperialVolumetricFlow] from a [ImperialVolume] and a [Time]
+ * Gets an [ImperialVolumetricFlow] from an [ImperialVolume] and a [Time]
  * @param time the [Time] component
  * @return the [ImperialVolumetricFlow] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt b/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt
index 49dbed1bc..ec29c6328 100644
--- a/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/VolumetricFluxUnit.kt
@@ -137,21 +137,21 @@ data class USCustomaryVolumetricFlux(override val volumetricFlow: USCustomaryVol
 infix fun MetricVolumetricFlow.per(area: MetricArea) = MetricVolumetricFlux(this, area)
 
 /**
- * Gets a [ImperialVolumetricFlux] from a [MetricVolumetricFlow] and a [ImperialArea]
+ * Gets an [ImperialVolumetricFlux] from a [MetricVolumetricFlow] and an [ImperialArea]
  * @param area the [ImperialArea] component
  * @return the [ImperialVolumetricFlux] represented by the units
  */
 infix fun ImperialVolumetricFlow.per(area: ImperialArea) = ImperialVolumetricFlux(this, area)
 
 /**
- * Gets a [UKImperialVolumetricFlux] from a [MetricVolumetricFlow] and a [ImperialArea]
+ * Gets a [UKImperialVolumetricFlux] from a [MetricVolumetricFlow] and an [ImperialArea]
  * @param area the [ImperialArea] component
  * @return the [UKImperialVolumetricFlux] represented by the units
  */
 infix fun UKImperialVolumetricFlow.per(area: ImperialArea) = UKImperialVolumetricFlux(this, area)
 
 /**
- * Gets a [USCustomaryVolumetricFlux] from a [MetricVolumetricFlow] and a [ImperialArea]
+ * Gets a [USCustomaryVolumetricFlux] from a [MetricVolumetricFlow] and an [ImperialArea]
  * @param area the [ImperialArea] component
  * @return the [USCustomaryVolumetricFlux] represented by the units
  */
diff --git a/scientific/src/commonMain/kotlin/unit/WeightUnit.kt b/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
index 5a5fdc909..66ab86317 100644
--- a/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/WeightUnit.kt
@@ -254,7 +254,7 @@ object ImperialTon : UKImperialWeight() {
 }
 
 /**
- * Wraps an [ImperialWeight] unit to an [UKImperialWeight] unit
+ * Wraps an [ImperialWeight] unit to a [UKImperialWeight] unit
  * @param imperial the [ImperialWeight] to wrap
  */
 @Serializable
@@ -265,7 +265,7 @@ data class UKImperialImperialWeightWrapper(val imperial: ImperialWeight) : UKImp
 }
 
 /**
- * Converts an [ImperialWeight] unit to an [UKImperialImperialWeightWrapper] unit
+ * Converts an [ImperialWeight] unit to a [UKImperialImperialWeightWrapper] unit
  * @param WeightUnit the type of [ImperialWeight] to convert
  */
 val <WeightUnit : ImperialWeight> WeightUnit.ukImperial get() = UKImperialImperialWeightWrapper(this)
@@ -280,7 +280,7 @@ object UsTon : USCustomaryWeight() {
 }
 
 /**
- * Wraps an [ImperialWeight] unit to an [USCustomaryWeight] unit
+ * Wraps an [ImperialWeight] unit to a [USCustomaryWeight] unit
  * @param imperial the [ImperialWeight] to wrap
  */
 @Serializable
@@ -291,7 +291,7 @@ data class USCustomaryImperialWeightWrapper(val imperial: ImperialWeight) : USCu
 }
 
 /**
- * Converts an [ImperialWeight] unit to an [USCustomaryImperialWeightWrapper] unit
+ * Converts an [ImperialWeight] unit to a [USCustomaryImperialWeightWrapper] unit
  * @param WeightUnit the type of [ImperialWeight] to convert
  */
 val <WeightUnit : ImperialWeight> WeightUnit.usCustomary get() = USCustomaryImperialWeightWrapper(this)
diff --git a/scientific/src/commonMain/kotlin/unit/YankUnit.kt b/scientific/src/commonMain/kotlin/unit/YankUnit.kt
index 5633ece0b..0e3b5e897 100644
--- a/scientific/src/commonMain/kotlin/unit/YankUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/YankUnit.kt
@@ -137,7 +137,7 @@ data class USCustomaryYank(override val force: USCustomaryForce, override val pe
 infix fun MetricForce.per(time: Time) = MetricYank(this, time)
 
 /**
- * Gets a [ImperialYank] from a [ImperialForce] and a [Time]
+ * Gets an [ImperialYank] from an [ImperialForce] and a [Time]
  * @param time the [Time] component
  * @return the [ImperialYank] represented by the units
  */

From 75dcaeefd614571b8282114673c8ec999c75fc79 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 16:55:58 +0100
Subject: [PATCH 202/227] Fixed tracking Kaluga-swiftui

---
 example/ios/Kaluga-SwiftUI | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 93783021e..56d8146a6 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 93783021e2e6a0a0de0e9b82f1aa3c80f81ebf33
+Subproject commit 56d8146a6e582590f7c8543d2c815fb9ba545fe3

From df2c18f2c326a01746f45426c3793fd8af91c237 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 16:59:11 +0100
Subject: [PATCH 203/227] Lint fixes

---
 scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt   | 1 -
 scientific/src/commonMain/kotlin/unit/DimensionlessUnit.kt | 2 --
 scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt   | 1 -
 3 files changed, 4 deletions(-)

diff --git a/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt b/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
index 19386e1a3..fcce3e412 100644
--- a/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/AreaDensityUnit.kt
@@ -21,7 +21,6 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.scientific.PhysicalQuantity
 import kotlinx.serialization.Serializable
 
-
 /**
  * Set of all [MetricAreaDensity]
  */
diff --git a/scientific/src/commonMain/kotlin/unit/DimensionlessUnit.kt b/scientific/src/commonMain/kotlin/unit/DimensionlessUnit.kt
index cf90f44b4..6d5bcac45 100644
--- a/scientific/src/commonMain/kotlin/unit/DimensionlessUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/DimensionlessUnit.kt
@@ -21,9 +21,7 @@ import com.splendo.kaluga.base.utils.Decimal
 import com.splendo.kaluga.base.utils.div
 import com.splendo.kaluga.base.utils.times
 import com.splendo.kaluga.base.utils.toDecimal
-import com.splendo.kaluga.base.utils.toDouble
 import com.splendo.kaluga.scientific.PhysicalQuantity
-import com.splendo.kaluga.scientific.ScientificValue
 import com.splendo.kaluga.scientific.invoke
 import kotlinx.serialization.Serializable
 
diff --git a/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt b/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt
index ee6d744d3..981eabb87 100644
--- a/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt
+++ b/scientific/src/commonMain/kotlin/unit/TemperatureUnit.kt
@@ -63,7 +63,6 @@ sealed class MetricAndUKImperialTemperature(override val symbol: String) : Tempe
     override val system = MeasurementSystem.MetricAndUKImperial
 }
 
-
 /**
  * A [Temperature] for [MeasurementSystem.USCustomary]
  */

From 8d318c451a890dbd067df1d5c7ac7e342d4d5b87 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 16:48:01 +0100
Subject: [PATCH 204/227] Resources common

---
 .../src/main/kotlin/KalugaLabel.kt            |   2 +-
 .../src/main/kotlin/Binding.kt                |  28 +--
 .../kotlin/{Font.kt => KalugaFont.kt}         |  10 +-
 .../kotlin/{Image.kt => KalugaImage.kt}       |   6 +-
 .../src/androidLibMain/kotlin/Resources.kt    |   6 +-
 .../src/androidLibMain/kotlin/StyledString.kt |  11 +-
 .../androidLibMain/kotlin/view/TextView.kt    |   4 +-
 .../src/commonMain/kotlin/ColorBlending.kt    | 163 +++++++++++++++++-
 resources/src/commonMain/kotlin/HSLColor.kt   |  21 +++
 .../src/commonMain/kotlin/KalugaColor.kt      |  25 ++-
 .../kotlin/{Font.kt => KalugaFont.kt}         |  13 +-
 .../kotlin/{Image.kt => KalugaImage.kt}       |  11 +-
 resources/src/commonMain/kotlin/Resources.kt  |  48 +++---
 .../src/commonMain/kotlin/StyledString.kt     | 136 +++++++++++++--
 .../kotlin/stylable/GradientStyle.kt          | 128 +++++++++++++-
 .../kotlin/stylable/KalugaBackgroundStyle.kt  |  70 ++++++++
 .../kotlin/stylable/KalugaButtonStyle.kt      |  50 +++++-
 .../kotlin/stylable/KalugaTextAlignment.kt    |  23 +++
 .../{TextStyle.kt => KalugaTextStyle.kt}      |  13 +-
 .../commonMain/kotlin/view/KalugaButton.kt    |  30 ++++
 .../src/commonMain/kotlin/view/KalugaLabel.kt |  25 ++-
 .../iosMain/kotlin/{Font.kt => KalugaFont.kt} |  10 +-
 .../kotlin/{Image.kt => KalugaImage.kt}       |   4 +-
 resources/src/iosMain/kotlin/Resources.kt     |   4 +-
 resources/src/iosMain/kotlin/StyledString.kt  |  12 +-
 .../src/iosMain/kotlin/uikit/TextStyle.kt     |   8 +-
 .../jsMain/kotlin/{Font.kt => KalugaFont.kt}  |  10 +-
 .../Image.kt => jsMain/kotlin/KalugaImage.kt} |   4 +-
 resources/src/jsMain/kotlin/Resources.kt      |   8 +-
 resources/src/jsMain/kotlin/StyledString.kt   |  11 +-
 .../jvmMain/kotlin/{Font.kt => KalugaFont.kt} |  10 +-
 .../kotlin/KalugaImage.kt}                    |   4 +-
 resources/src/jvmMain/kotlin/Resources.kt     |   8 +-
 resources/src/jvmMain/kotlin/StyledString.kt  |  11 +-
 test-utils-base/README.md                     |   2 +-
 test-utils-koin/README.md                     |   2 +-
 .../androidLibMain/kotlin/MockResources.kt    |   8 +-
 .../src/commonMain/kotlin/MockResources.kt    |  16 +-
 .../src/iosMain/kotlin/MockResources.kt       |   8 +-
 .../src/jsMain/kotlin/MockResources.kt        |   8 +-
 .../src/jvmMain/kotlin/MockResources.kt       |   8 +-
 test-utils/README.md                          |   2 +-
 42 files changed, 812 insertions(+), 169 deletions(-)
 rename resources/src/androidLibMain/kotlin/{Font.kt => KalugaFont.kt} (68%)
 rename resources/src/androidLibMain/kotlin/{Image.kt => KalugaImage.kt} (86%)
 rename resources/src/commonMain/kotlin/{Font.kt => KalugaFont.kt} (62%)
 rename resources/src/commonMain/kotlin/{Image.kt => KalugaImage.kt} (61%)
 rename resources/src/commonMain/kotlin/stylable/{TextStyle.kt => KalugaTextStyle.kt} (68%)
 rename resources/src/iosMain/kotlin/{Font.kt => KalugaFont.kt} (62%)
 rename resources/src/iosMain/kotlin/{Image.kt => KalugaImage.kt} (78%)
 rename resources/src/jsMain/kotlin/{Font.kt => KalugaFont.kt} (71%)
 rename resources/src/{jvmMain/kotlin/Image.kt => jsMain/kotlin/KalugaImage.kt} (87%)
 rename resources/src/jvmMain/kotlin/{Font.kt => KalugaFont.kt} (72%)
 rename resources/src/{jsMain/kotlin/Image.kt => jvmMain/kotlin/KalugaImage.kt} (87%)

diff --git a/resources-compose/src/main/kotlin/KalugaLabel.kt b/resources-compose/src/main/kotlin/KalugaLabel.kt
index 19b80661d..faec4c91d 100644
--- a/resources-compose/src/main/kotlin/KalugaLabel.kt
+++ b/resources-compose/src/main/kotlin/KalugaLabel.kt
@@ -67,7 +67,7 @@ fun KalugaLabel.Composable(modifier: Modifier) {
 @Preview
 @Composable
 fun PreviewKalugaLabel() {
-    val textStyle = com.splendo.kaluga.resources.stylable.TextStyle(
+    val textStyle = com.splendo.kaluga.resources.stylable.KalugaTextStyle(
         defaultBoldFont,
         DefaultColors.darkRed,
         12.0f
diff --git a/resources-databinding/src/main/kotlin/Binding.kt b/resources-databinding/src/main/kotlin/Binding.kt
index 1d672ef0b..911700d1c 100644
--- a/resources-databinding/src/main/kotlin/Binding.kt
+++ b/resources-databinding/src/main/kotlin/Binding.kt
@@ -26,9 +26,9 @@ import android.widget.TextView
 import androidx.core.widget.TextViewCompat
 import androidx.databinding.BindingAdapter
 import com.google.android.material.textfield.TextInputLayout
-import com.splendo.kaluga.resources.Image
+import com.splendo.kaluga.resources.KalugaImage
 import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
-import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 import com.splendo.kaluga.resources.view.KalugaButton
 import com.splendo.kaluga.resources.view.KalugaLabel
 import com.splendo.kaluga.resources.view.alignment
@@ -53,11 +53,11 @@ object Binding {
     }
 
     /**
-     * Binds an [Image] to an [ImageView].
+     * Binds an [KalugaImage] to an [ImageView].
      */
     @BindingAdapter("image")
     @JvmStatic
-    fun bindImage(view: ImageView, image: Image?) {
+    fun bindImage(view: ImageView, image: KalugaImage?) {
         view.setImageDrawable(image?.drawable)
     }
 
@@ -84,22 +84,22 @@ object Binding {
     }
 
     /**
-     * Binds a [TextStyle] to a [TextView].
+     * Binds a [KalugaTextStyle] to a [TextView].
      */
     @BindingAdapter("textStyle")
     @JvmStatic
-    fun bindTextStyle(textView: TextView, textStyle: TextStyle?) {
+    fun bindTextStyle(textView: TextView, textStyle: KalugaTextStyle?) {
         textStyle?.let {
             textView.applyTextStyle(textStyle)
         }
     }
 
     /**
-     * Binds a [TextStyle] to a  [TextView] using [TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration]
+     * Binds a [KalugaTextStyle] to a  [TextView] using [TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration]
      */
     @BindingAdapter("autoTextStyle", "autoTextMinScalingFactor")
     @JvmStatic
-    fun bindAutoTextStyle(textView: TextView, autoTextStyle: TextStyle?, autoTextMinScalingFactor: Float) {
+    fun bindAutoTextStyle(textView: TextView, autoTextStyle: KalugaTextStyle?, autoTextMinScalingFactor: Float) {
         autoTextStyle?.let {
             textView.applyTextStyle(it)
             TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(textView, max(1, (it.size * autoTextMinScalingFactor).toInt()), it.size.toInt(), 1, TypedValue.COMPLEX_UNIT_SP)
@@ -108,33 +108,33 @@ object Binding {
     }
 
     /**
-     * Binds a [TextStyle] to the [TextInputLayout.getEditText] of a [TextInputLayout]
+     * Binds a [KalugaTextStyle] to the [TextInputLayout.getEditText] of a [TextInputLayout]
      */
     @BindingAdapter("textStyle")
     @JvmStatic
-    fun bindTextInputLayoutTextStyle(textView: TextInputLayout, textStyle: TextStyle?) {
+    fun bindTextInputLayoutTextStyle(textView: TextInputLayout, textStyle: KalugaTextStyle?) {
         textStyle?.let {
             textView.editText?.applyTextStyle(it)
         }
     }
 
     /**
-     * Binds a [TextStyle] to the [TextInputLayout.getPrefixTextView] of a [TextInputLayout]
+     * Binds a [KalugaTextStyle] to the [TextInputLayout.getPrefixTextView] of a [TextInputLayout]
      */
     @BindingAdapter("prefixTextStyle")
     @JvmStatic
-    fun bindPrefixTextStyle(textView: TextInputLayout, textStyle: TextStyle?) {
+    fun bindPrefixTextStyle(textView: TextInputLayout, textStyle: KalugaTextStyle?) {
         textStyle?.let {
             textView.prefixTextView.applyTextStyle(it)
         }
     }
 
     /**
-     * Binds a [TextStyle] to the [TextInputLayout.getSuffixTextView] of a [TextInputLayout]
+     * Binds a [KalugaTextStyle] to the [TextInputLayout.getSuffixTextView] of a [TextInputLayout]
      */
     @BindingAdapter("suffixTextStyle")
     @JvmStatic
-    fun bindSuffixTextStyle(textView: TextInputLayout, textStyle: TextStyle?) {
+    fun bindSuffixTextStyle(textView: TextInputLayout, textStyle: KalugaTextStyle?) {
         textStyle?.let {
             textView.suffixTextView.applyTextStyle(it)
         }
diff --git a/resources/src/androidLibMain/kotlin/Font.kt b/resources/src/androidLibMain/kotlin/KalugaFont.kt
similarity index 68%
rename from resources/src/androidLibMain/kotlin/Font.kt
rename to resources/src/androidLibMain/kotlin/KalugaFont.kt
index 52ccde9c7..21cffdc0b 100644
--- a/resources/src/androidLibMain/kotlin/Font.kt
+++ b/resources/src/androidLibMain/kotlin/KalugaFont.kt
@@ -20,9 +20,9 @@ package com.splendo.kaluga.resources
 
 import android.graphics.Typeface
 
-actual typealias Font = Typeface
+actual typealias KalugaFont = Typeface
 
-actual val defaultFont: Font get() = Typeface.DEFAULT
-actual val defaultBoldFont: Font get() = Typeface.DEFAULT_BOLD
-actual val defaultItalicFont: Font get() = Typeface.create(Typeface.DEFAULT, Typeface.ITALIC)
-actual val defaultMonospaceFont: Font get() = Typeface.MONOSPACE
+actual val defaultFont: KalugaFont get() = Typeface.DEFAULT
+actual val defaultBoldFont: KalugaFont get() = Typeface.DEFAULT_BOLD
+actual val defaultItalicFont: KalugaFont get() = Typeface.create(Typeface.DEFAULT, Typeface.ITALIC)
+actual val defaultMonospaceFont: KalugaFont get() = Typeface.MONOSPACE
diff --git a/resources/src/androidLibMain/kotlin/Image.kt b/resources/src/androidLibMain/kotlin/KalugaImage.kt
similarity index 86%
rename from resources/src/androidLibMain/kotlin/Image.kt
rename to resources/src/androidLibMain/kotlin/KalugaImage.kt
index fe43a00c0..25148b4a6 100644
--- a/resources/src/androidLibMain/kotlin/Image.kt
+++ b/resources/src/androidLibMain/kotlin/KalugaImage.kt
@@ -20,12 +20,12 @@ package com.splendo.kaluga.resources
 import android.graphics.drawable.Drawable
 import androidx.core.graphics.drawable.DrawableCompat
 
-actual data class Image(val drawable: Drawable)
+actual data class KalugaImage(val drawable: Drawable)
 
-actual fun Image.tinted(color: KalugaColor): Image? {
+actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? {
     return drawable.constantState?.newDrawable()?.mutate()?.let {
         val wrapped = DrawableCompat.wrap(it)
         DrawableCompat.setTint(wrapped, color)
-        Image(wrapped)
+        KalugaImage(wrapped)
     }
 }
diff --git a/resources/src/androidLibMain/kotlin/Resources.kt b/resources/src/androidLibMain/kotlin/Resources.kt
index 838939304..7323de61e 100644
--- a/resources/src/androidLibMain/kotlin/Resources.kt
+++ b/resources/src/androidLibMain/kotlin/Resources.kt
@@ -69,13 +69,13 @@ actual class DefaultColorLoader(private val context: Context?) : KalugaColorLoad
 
 actual class DefaultImageLoader(private val context: Context?) : ImageLoader {
     actual constructor() : this(if (application != null) applicationContext else null)
-    override fun loadImage(identifier: String, defaultValue: Image?): Image? {
+    override fun loadImage(identifier: String, defaultValue: KalugaImage?): KalugaImage? {
         if (context == null) {
             return defaultValue
         }
         val id = context.resources.getIdentifier(identifier, "drawable", context.packageName)
         return try {
-            ContextCompat.getDrawable(context, id)?.let { Image(it) }
+            ContextCompat.getDrawable(context, id)?.let { KalugaImage(it) }
         } catch (e: Resources.NotFoundException) {
             defaultValue
         }
@@ -84,7 +84,7 @@ actual class DefaultImageLoader(private val context: Context?) : ImageLoader {
 
 actual class DefaultFontLoader(private val context: Context?, private val handler: Handler?) : FontLoader {
     actual constructor() : this(if (application != null) applicationContext else null, null)
-    override suspend fun loadFont(identifier: String, defaultValue: Font?): Font? {
+    override suspend fun loadFont(identifier: String, defaultValue: KalugaFont?): KalugaFont? {
         if (context == null) {
             return defaultValue
         }
diff --git a/resources/src/androidLibMain/kotlin/StyledString.kt b/resources/src/androidLibMain/kotlin/StyledString.kt
index 5c60260fe..08494b55c 100644
--- a/resources/src/androidLibMain/kotlin/StyledString.kt
+++ b/resources/src/androidLibMain/kotlin/StyledString.kt
@@ -21,14 +21,14 @@ import android.text.style.SuperscriptSpan
 import android.text.style.URLSpan
 import android.text.style.UnderlineSpan
 import com.splendo.kaluga.base.ApplicationHolder
-import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 import com.splendo.kaluga.resources.view.alignment
 import kotlin.math.min
 import kotlin.math.roundToInt
 
 actual class StyledString(
     val spannable: Spannable,
-    actual val defaultTextStyle: TextStyle,
+    actual val defaultTextStyle: KalugaTextStyle,
     actual val linkStyle: LinkStyle?
 )
 
@@ -36,13 +36,13 @@ actual val StyledString.rawString: String get() = spannable.toString()
 
 actual class StyledStringBuilder constructor(
     string: String,
-    private val defaultTextStyle: TextStyle,
+    private val defaultTextStyle: KalugaTextStyle,
     private val linkStyle: LinkStyle?,
     private val context: Context
 ) {
 
     actual class Provider(private val context: Context = ApplicationHolder.applicationContext) {
-        actual fun provide(string: String, defaultTextStyle: TextStyle, linkStyle: LinkStyle?) =
+        actual fun provide(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) =
             StyledStringBuilder(string, defaultTextStyle, linkStyle, context)
     }
 
@@ -55,6 +55,9 @@ actual class StyledStringBuilder constructor(
     private val builder = SpannableString(string)
 
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
+        if (range.first < 0 || range.last >= builder.length) {
+            throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
+        }
         builder.setSpan(
             when (attribute) {
                 is StringStyleAttribute.CharacterStyleAttribute -> attribute.characterStyle(range)
diff --git a/resources/src/androidLibMain/kotlin/view/TextView.kt b/resources/src/androidLibMain/kotlin/view/TextView.kt
index ec9c13d55..c37bf079d 100644
--- a/resources/src/androidLibMain/kotlin/view/TextView.kt
+++ b/resources/src/androidLibMain/kotlin/view/TextView.kt
@@ -4,7 +4,7 @@ import android.content.res.ColorStateList
 import android.text.method.LinkMovementMethod
 import android.text.style.URLSpan
 import android.widget.TextView
-import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 
 fun TextView.bindLabel(label: KalugaLabel) {
     text = when (label) {
@@ -22,7 +22,7 @@ fun TextView.bindLabel(label: KalugaLabel) {
     applyTextStyle(label.style)
 }
 
-fun TextView.applyTextStyle(textStyle: TextStyle) {
+fun TextView.applyTextStyle(textStyle: KalugaTextStyle) {
     typeface = textStyle.font
     textSize = textStyle.size
     setTextColor(ColorStateList(arrayOf(intArrayOf()), intArrayOf(textStyle.color)))
diff --git a/resources/src/commonMain/kotlin/ColorBlending.kt b/resources/src/commonMain/kotlin/ColorBlending.kt
index b77ec5e21..b24f72cdf 100644
--- a/resources/src/commonMain/kotlin/ColorBlending.kt
+++ b/resources/src/commonMain/kotlin/ColorBlending.kt
@@ -23,12 +23,21 @@ import kotlin.math.min
 import kotlin.math.sqrt
 
 /**
- * Blend Modes as defined by https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdf_reference_archive/blend_modes.pdf
+ * Blend Modes as defined by https://helpx.adobe.com/photoshop/using/blending-modes.html
  */
 sealed class BlendMode {
 
+    /**
+     * Blends two [KalugaColor] into a new [KalugaColor] using this [BlendMode]
+     * @param backdrop the [KalugaColor] at the base layer
+     * @param source the [KalugaColor] at the top layer
+     * @return a [KalugaColor] that is the result of [backdrop] and [source] being blended using this Blend mode
+     */
     abstract fun blendColor(backdrop: KalugaColor, source: KalugaColor): KalugaColor
 
+    /**
+     * A [BlendMode] where each color channel can be blended independently
+     */
     sealed class SeparableBlendMode : BlendMode() {
         override fun blendColor(backdrop: KalugaColor, source: KalugaColor): KalugaColor = colorFrom(
             blendColorChannel(backdrop.red, source.red),
@@ -36,9 +45,18 @@ sealed class BlendMode {
             blendColorChannel(backdrop.blue, source.blue)
         )
 
+        /**
+         * Blends the color of a single channel
+         * @param backdrop the value for the color in the channel at the base layer
+         * @param source the value for the color in the channel at the top layer
+         * @return the value for the color in the channel blended using this Blend mode
+         */
         abstract fun blendColorChannel(backdrop: Double, source: Double): Double
     }
 
+    /**
+     * A [BlendMode] where the color channels cannot be blended by changing the Lumination and Saturation
+     */
     sealed class NonSeparableBlendMode : BlendMode() {
         protected data class UnboundColor(val red: Double, val blue: Double, val green: Double) {
             val lumination: Double get() = 0.3 * red + 0.59 * green + 0.11 * blue
@@ -101,34 +119,55 @@ sealed class BlendMode {
         }
     }
 
+    /**
+     * A [SeparableBlendMode] where only the top layer is used
+     */
     object Normal : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double = source
     }
 
+    /**
+     * A [SeparableBlendMode] where the top layer is multiplied with the base layer
+     */
     object Multiply : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double = backdrop * source
     }
 
+    /**
+     * A [SeparableBlendMode] where the colors are inverted, multiplied and then inverted again
+     */
     object Screen : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double =
             backdrop + source - backdrop * source
     }
 
+    /**
+     * A [SeparableBlendMode] where if the base layer is light, the top layer becomes lighter; where the base layer is dark, the top becomes darker
+     */
     object Overlay : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double =
             HardLight.blendColorChannel(source, backdrop)
     }
 
+    /**
+     * A [SeparableBlendMode] where for each channel the darkest of the base layer and top later is used
+     */
     object Darken : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double =
             min(backdrop, source)
     }
 
+    /**
+     * A [SeparableBlendMode] where for each channel the lightest of the base layer and top later is used
+     */
     object Lighten : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double =
             max(backdrop, source)
     }
 
+    /**
+     * A [SeparableBlendMode] where if the source color is lighter than 50% gray, the color is lightened, as if [Screen] was applied. If the source color is darker than 50% gray, the image is darkened, as if [Multiply] was applied
+     */
     object HardLight : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double {
             return if (source <= 0.5) {
@@ -139,6 +178,9 @@ sealed class BlendMode {
         }
     }
 
+    /**
+     * A [SeparableBlendMode] where if the source color is lighter than 50% gray, the color is lightened, as if [ColorDodge] was applied. If the source color is darker than 50% gray, the image is darkened, as if [ColorBurn] was applied
+     */
     object SoftLight : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double {
             return if (source <= 0.5) {
@@ -153,6 +195,9 @@ sealed class BlendMode {
         }
     }
 
+    /**
+     * A [SeparableBlendMode] where blending looks at the color information in each channel and brightens the base color to reflect the blend color by decreasing contrast between the two
+     */
     object ColorDodge : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double = when {
             backdrop == 0.0 -> 0.0
@@ -161,6 +206,9 @@ sealed class BlendMode {
         }
     }
 
+    /**
+     * A [SeparableBlendMode] where blending looks at the color information in each channel and darkens the base color to reflect the blend color by increasing the contrast between the two
+     */
     object ColorBurn : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double = when {
             backdrop == 1.0 -> 1.0
@@ -169,34 +217,52 @@ sealed class BlendMode {
         }
     }
 
+    /**
+     * A [SeparableBlendMode] where blending looks at the color information in each channel and subtracts either the source color from the base color or the base color from the source color, depending on which has the greater brightness value
+     */
     object Difference : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double =
             abs(backdrop - source)
     }
 
+    /**
+     * A [SeparableBlendMode] similar to [Difference] but lower in contrast
+     */
     object Exclusion : SeparableBlendMode() {
         override fun blendColorChannel(backdrop: Double, source: Double): Double {
             return backdrop + source - 2.0 * backdrop * source
         }
     }
 
+    /**
+     * A [NonSeparableBlendMode] that creates a result color with the luminance and saturation of the base color and the hue of the source color
+     */
     object Hue : NonSeparableBlendMode() {
         override fun blendColor(backdrop: KalugaColor, source: KalugaColor): KalugaColor = source
             .setSaturation(backdrop.saturation)
             .setLumination(backdrop.lumination)
     }
 
+    /**
+     * A [NonSeparableBlendMode] that creates a result color with the luminance and hue of the base color and the saturation of the source color
+     */
     object Saturation : NonSeparableBlendMode() {
         override fun blendColor(backdrop: KalugaColor, source: KalugaColor): KalugaColor = backdrop
             .setSaturation(source.saturation)
             .setLumination(backdrop.lumination)
     }
 
+    /**
+     * A [NonSeparableBlendMode] that creates a result color with the luminance of the base color and the hue and saturation of the source color
+     */
     object ColorBlend : NonSeparableBlendMode() {
         override fun blendColor(backdrop: KalugaColor, source: KalugaColor): KalugaColor =
             source.setLumination(backdrop.lumination)
     }
 
+    /**
+     * A [NonSeparableBlendMode] that creates a result color with the hue and saturation of the base color and the luminance of the source color
+     */
     object Luminosity : NonSeparableBlendMode() {
         override fun blendColor(backdrop: KalugaColor, source: KalugaColor): KalugaColor =
             backdrop.setLumination(source.lumination)
@@ -229,19 +295,114 @@ private fun KalugaColor.blend(source: KalugaColor, mode: BlendMode): KalugaColor
     )
 }
 
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Normal]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Normal] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.normal(source: KalugaColor) = blend(source, BlendMode.Normal)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Multiply]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Multiply] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.multiply(source: KalugaColor) = blend(source, BlendMode.Multiply)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Screen]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Screen] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.screen(source: KalugaColor) = blend(source, BlendMode.Screen)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Overlay]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Overlay] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.overlay(source: KalugaColor) = blend(source, BlendMode.Overlay)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Darken]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Darken] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.darken(source: KalugaColor) = blend(source, BlendMode.Darken)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Lighten]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Lighten] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.lighten(source: KalugaColor) = blend(source, BlendMode.Lighten)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.HardLight]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.HardLight] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.hardLight(source: KalugaColor) = blend(source, BlendMode.HardLight)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.SoftLight]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.SoftLight] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.softLight(source: KalugaColor) = blend(source, BlendMode.SoftLight)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.ColorDodge]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.ColorDodge] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.dodge(source: KalugaColor) = blend(source, BlendMode.ColorDodge)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.ColorBurn]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.ColorBurn] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.burn(source: KalugaColor) = blend(source, BlendMode.ColorBurn)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Difference]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Difference] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.difference(source: KalugaColor) = blend(source, BlendMode.Difference)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Exclusion]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Exclusion] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.exclude(source: KalugaColor) = blend(source, BlendMode.Exclusion)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Hue]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Hue] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.hue(source: KalugaColor) = blend(source, BlendMode.Hue)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Saturation]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Saturation] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.saturate(source: KalugaColor) = blend(source, BlendMode.Saturation)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.Luminosity]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.Luminosity] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.luminate(source: KalugaColor) = blend(source, BlendMode.Luminosity)
+
+/**
+ * Blends a [KalugaColor] with another color using [BlendMode.ColorBlend]
+ * @param source the [KalugaColor] that serves as the source color
+ * @return a [KalugaColor] that is the result of [BlendMode.ColorBlend] being applied with this [KalugaColor] as the base color and [source] as the source color
+ */
 infix fun KalugaColor.colorBlend(source: KalugaColor) = blend(source, BlendMode.ColorBlend)
diff --git a/resources/src/commonMain/kotlin/HSLColor.kt b/resources/src/commonMain/kotlin/HSLColor.kt
index 215a33f29..eea979f02 100644
--- a/resources/src/commonMain/kotlin/HSLColor.kt
+++ b/resources/src/commonMain/kotlin/HSLColor.kt
@@ -21,6 +21,13 @@ import kotlinx.serialization.Serializable
 import kotlin.math.max
 import kotlin.math.min
 
+/**
+ * A color using hue, saturation, and lightness color spaces
+ * @property hue the hue channel in a range between `0.0` and `1.0`
+ * @property saturation the saturation channel in a range between `0.0` and `1.0`
+ * @property lightness the lightness channel in a range between `0.0` and `1.0`
+ * @property alpha the alpha channel in a range between `0.0` and `1.0`
+ */
 @Serializable
 data class HSLColor(
     val hue: Double,
@@ -29,6 +36,9 @@ data class HSLColor(
     val alpha: Double = 1.0
 )
 
+/**
+ * Gets the [HSLColor] equivalent to this [KalugaColor]
+ */
 val KalugaColor.hsl: HSLColor get() {
     val max = max(red, max(green, blue))
     val min = min(red, min(green, blue))
@@ -56,6 +66,9 @@ val KalugaColor.hsl: HSLColor get() {
     }
 }
 
+/**
+ * Gets the [KalugaColor] equivalent to this [HSLColor]
+ */
 val HSLColor.color: KalugaColor get() {
     return if (saturation == 0.0) {
         colorFrom(lightness, lightness, lightness)
@@ -85,10 +98,18 @@ val HSLColor.color: KalugaColor get() {
     }
 }
 
+/**
+ * Increases the lightness of a [KalugaColor] by this factor.
+ * @param value the amount by which to increase the lightness. Should range between `0.0` and `1.0`
+ */
 fun KalugaColor.lightenBy(value: Double): KalugaColor = hsl.let {
     return it.copy(lightness = ((1.0 - it.lightness) * value) + it.lightness).color
 }
 
+/**
+ * Decreases the lightness of a [KalugaColor] by this factor.
+ * @param value the amount by which to decrease the lightness. Should range between `0.0` and `1.0`
+ */
 fun KalugaColor.darkenBy(value: Double): KalugaColor = hsl.let {
     return it.copy(lightness = (it.lightness - (it.lightness) * value)).color
 }
diff --git a/resources/src/commonMain/kotlin/KalugaColor.kt b/resources/src/commonMain/kotlin/KalugaColor.kt
index 1aff5349d..56ed225fb 100644
--- a/resources/src/commonMain/kotlin/KalugaColor.kt
+++ b/resources/src/commonMain/kotlin/KalugaColor.kt
@@ -35,9 +35,16 @@ expect class KalugaColor
 @Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaColor"))
 typealias Color = KalugaColor
 
+/**
+ * A wrapper for [KalugaColor] that allows it to be serialized
+ * @property color the [KalugaColor] to wrap
+ */
 @Serializable(with = ColorSerializer::class)
 data class SerializableColor(val color: KalugaColor)
 
+/**
+ * Gets a [SerializableColor] instance of this color
+ */
 val KalugaColor.serializable get() = SerializableColor(this)
 
 /**
@@ -85,10 +92,10 @@ expect fun colorFrom(red: Double, green: Double, blue: Double, alpha: Double = 1
 
 /**
  * Creates a [KalugaColor] using red, green, blue, and (optional) alpha, all ranging between `0` and `255`.
- * @param red The red color value ranging between `0` and `255`.
- * @param green The green color value ranging between `0` and `255`.
- * @param blue The blue color value ranging between `0` and `255`.
- * @param alpha The alpha color value ranging between `0` and `255`. Defaults to `255`
+ * @param redInt The red color value ranging between `0` and `255`.
+ * @param greenInt The green color value ranging between `0` and `255`.
+ * @param blueInt The blue color value ranging between `0` and `255`.
+ * @param alphaInt The alpha color value ranging between `0` and `255`. Defaults to `255`
  * @return The [KalugaColor] with the corresponding red, green, blue, and alpha values
  */
 expect fun colorFrom(redInt: Int, greenInt: Int, blueInt: Int, alphaInt: Int = 255): KalugaColor
@@ -123,7 +130,14 @@ fun colorFrom(hexString: String): KalugaColor? {
     }
 }
 
+/**
+ * The inverted [KalugaColor]
+ */
 val KalugaColor.inverted: KalugaColor get() = colorFrom(1.0 - red, 1.0 - green, 1.0 - blue, alpha)
+
+/**
+ * The hex string representing this color
+ */
 val KalugaColor.hexString: String
     get() {
         return "#${alphaInt.toHex(2)}${redInt.toHex(2)}${greenInt.toHex(2)}${blueInt.toHex(2)}"
@@ -135,6 +149,9 @@ private fun Int.toHex(minSize: Int): String {
     return listOf(*prefix.toTypedArray(), hexValue).joinToString("")
 }
 
+/**
+ * A [KSerializer] for [SerializableColor]
+ */
 open class ColorSerializer :
     KSerializer<SerializableColor> {
     override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("ColorString", PrimitiveKind.STRING)
diff --git a/resources/src/commonMain/kotlin/Font.kt b/resources/src/commonMain/kotlin/KalugaFont.kt
similarity index 62%
rename from resources/src/commonMain/kotlin/Font.kt
rename to resources/src/commonMain/kotlin/KalugaFont.kt
index 2a0ec490e..449aa83d0 100644
--- a/resources/src/commonMain/kotlin/Font.kt
+++ b/resources/src/commonMain/kotlin/KalugaFont.kt
@@ -20,9 +20,12 @@ package com.splendo.kaluga.resources
 /**
  * Class describing a font
  */
-expect class Font
+expect class KalugaFont
 
-expect val defaultFont: Font
-expect val defaultBoldFont: Font
-expect val defaultItalicFont: Font
-expect val defaultMonospaceFont: Font
+@Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaColor"))
+typealias Font = KalugaFont
+
+expect val defaultFont: KalugaFont
+expect val defaultBoldFont: KalugaFont
+expect val defaultItalicFont: KalugaFont
+expect val defaultMonospaceFont: KalugaFont
diff --git a/resources/src/commonMain/kotlin/Image.kt b/resources/src/commonMain/kotlin/KalugaImage.kt
similarity index 61%
rename from resources/src/commonMain/kotlin/Image.kt
rename to resources/src/commonMain/kotlin/KalugaImage.kt
index 35847b25a..0a3faadad 100644
--- a/resources/src/commonMain/kotlin/Image.kt
+++ b/resources/src/commonMain/kotlin/KalugaImage.kt
@@ -20,11 +20,14 @@ package com.splendo.kaluga.resources
 /**
  * Class describing an image.
  */
-expect class Image
+expect class KalugaImage
+
+@Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaColor"))
+typealias Image = KalugaImage
 
 /**
- * Attempts to create a new [Image] that is tinted in a given [KalugaColor]
+ * Attempts to create a new [KalugaImage] that is tinted in a given [KalugaColor]
  * @param color The [KalugaColor] to use for tinting.
- * @return The tinted [Image] or `null` if tinting could not be applied.
+ * @return The tinted [KalugaImage] or `null` if tinting could not be applied.
  */
-expect fun Image.tinted(color: KalugaColor): Image?
+expect fun KalugaImage.tinted(color: KalugaColor): KalugaImage?
diff --git a/resources/src/commonMain/kotlin/Resources.kt b/resources/src/commonMain/kotlin/Resources.kt
index f689c1840..82ae77f6c 100644
--- a/resources/src/commonMain/kotlin/Resources.kt
+++ b/resources/src/commonMain/kotlin/Resources.kt
@@ -60,32 +60,32 @@ interface KalugaColorLoader {
 expect class DefaultColorLoader() : KalugaColorLoader
 
 /**
- * Loads an [Image] based on a provided identifier.
+ * Loads an [KalugaImage] based on a provided identifier.
  */
 interface ImageLoader {
     /**
-     * Attempts to load the [Image] resource associated with a given identifier. If no match is found, the [defaultValue] will be returned.
-     * @param identifier The identifier to find the [Image] resource for.
-     * @param defaultValue The [Image] to return if no match was found for the identifier.
-     * @return The associated [Image] resources or [defaultValue] if no such resource was found.
+     * Attempts to load the [KalugaImage] resource associated with a given identifier. If no match is found, the [defaultValue] will be returned.
+     * @param identifier The identifier to find the [KalugaImage] resource for.
+     * @param defaultValue The [KalugaImage] to return if no match was found for the identifier.
+     * @return The associated [KalugaImage] resources or [defaultValue] if no such resource was found.
      */
-    fun loadImage(identifier: String, defaultValue: Image?): Image?
+    fun loadImage(identifier: String, defaultValue: KalugaImage?): KalugaImage?
 }
 
 /** Default implementation of an [ImageLoader]. */
 expect class DefaultImageLoader() : ImageLoader
 
 /**
- * Loads a [Font] based on a provided identifier.
+ * Loads a [KalugaFont] based on a provided identifier.
  */
 interface FontLoader {
     /**
-     * Attempts to load the [Font] resource associated with a given identifier. If no match is found, the [defaultValue] will be returned.
-     * @param identifier The identifier to find the [Font] resource for.
-     * @param defaultValue The [Font] to return if no match was found for the identifier.
-     * @return The associated [Font] resources or [defaultValue] if no such resource was found.
+     * Attempts to load the [KalugaFont] resource associated with a given identifier. If no match is found, the [defaultValue] will be returned.
+     * @param identifier The identifier to find the [KalugaFont] resource for.
+     * @param defaultValue The [KalugaFont] to return if no match was found for the identifier.
+     * @return The associated [KalugaFont] resources or [defaultValue] if no such resource was found.
      */
-    suspend fun loadFont(identifier: String, defaultValue: Font?): Font?
+    suspend fun loadFont(identifier: String, defaultValue: KalugaFont?): KalugaFont?
 }
 
 /** Default implementation of a [FontLoader]. */
@@ -128,23 +128,23 @@ fun String.asColor(
 ): KalugaColor? = colorLoader.loadColor(this, defaultValue)
 
 /**
- * Treats this string as a resource identifier for a [KalugaColor] and grabs the associated [Image]
- * @param imageLoader The [ImageLoader] used for loading the associated [Image] resource.
- * @param defaultValue The [Image] to return if no match was found for the identifier. Defaults to `null`.
- * @return The [Image] associated with the identifier represented by this String, or [defaultValue] if no such [Image] could be found.
+ * Treats this string as a resource identifier for a [KalugaColor] and grabs the associated [KalugaImage]
+ * @param imageLoader The [ImageLoader] used for loading the associated [KalugaImage] resource.
+ * @param defaultValue The [KalugaImage] to return if no match was found for the identifier. Defaults to `null`.
+ * @return The [KalugaImage] associated with the identifier represented by this String, or [defaultValue] if no such [KalugaImage] could be found.
  */
 fun String.asImage(
     imageLoader: ImageLoader = DefaultImageLoader(),
-    defaultValue: Image? = null
-): Image? = imageLoader.loadImage(this, defaultValue)
+    defaultValue: KalugaImage? = null
+): KalugaImage? = imageLoader.loadImage(this, defaultValue)
 
 /**
- * Treats this string as a resource identifier for a [Font] and grabs the associated [Font]
- * @param fontLoader The [FontLoader] used for loading the associated [Font] resource.
- * @param defaultValue The [Font] to return if no match was found for the identifier. Defaults to `null`.
- * @return The [Font] associated with the identifier represented by this String, or [defaultValue] if no such [Font] could be found.
+ * Treats this string as a resource identifier for a [KalugaFont] and grabs the associated [KalugaFont]
+ * @param fontLoader The [FontLoader] used for loading the associated [KalugaFont] resource.
+ * @param defaultValue The [KalugaFont] to return if no match was found for the identifier. Defaults to `null`.
+ * @return The [KalugaFont] associated with the identifier represented by this String, or [defaultValue] if no such [KalugaFont] could be found.
  */
 suspend fun String.asFont(
     fontLoader: FontLoader = DefaultFontLoader(),
-    defaultValue: Font? = null
-): Font? = fontLoader.loadFont(this, defaultValue)
+    defaultValue: KalugaFont? = null
+): KalugaFont? = fontLoader.loadFont(this, defaultValue)
diff --git a/resources/src/commonMain/kotlin/StyledString.kt b/resources/src/commonMain/kotlin/StyledString.kt
index 281474b33..f90a4886b 100644
--- a/resources/src/commonMain/kotlin/StyledString.kt
+++ b/resources/src/commonMain/kotlin/StyledString.kt
@@ -19,42 +19,113 @@
 package com.splendo.kaluga.resources
 
 import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
-import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 import kotlin.jvm.JvmName
 
+/**
+ * A style to apply to a [StyledString] when [StringStyleAttribute.Link] is applied
+ * @property color the [KalugaColor] of the text color of the link
+ * @property isUnderlined if `true` the link will be underlined
+ */
 data class LinkStyle(val color: KalugaColor, val isUnderlined: Boolean)
 
+/**
+ * A text configured with [StringStyleAttribute]
+ */
 expect class StyledString {
-    val defaultTextStyle: TextStyle
+
+    /**
+     * The [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range.
+     * This may be partially overwritten (e.g. [StringStyleAttribute.CharacterStyleAttribute.ForegroundColor] may overwrite [KalugaTextStyle.color])
+     */
+    val defaultTextStyle: KalugaTextStyle
+
+    /**
+     * The [LinkStyle] to apply when [StringStyleAttribute.Link] is applied.
+     * When `null` the platform default will be used
+     */
     val linkStyle: LinkStyle?
 }
 
+/**
+ * Builder for creating a [StyledString]
+ */
 expect class StyledStringBuilder {
+
+    /**
+     * Provider for a [StyledStringBuilder]
+     */
     class Provider {
-        fun provide(string: String, defaultTextStyle: TextStyle, linkStyle: LinkStyle? = null): StyledStringBuilder
+
+        /**
+         * Provides a [StyledStringBuilder] to build a [StyledString] for a given text
+         * @param string the text for which to build the [StyledString]
+         * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+         * @param linkStyle the [LinkStyle] to apply when [StringStyleAttribute.Link] is applied
+         * @return the [StyledStringBuilder] to build a [StyledString] for [string]
+         */
+        fun provide(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle? = null): StyledStringBuilder
     }
+
+    /**
+     * Adds a [StringStyleAttribute] for a given range
+     * @param attribute the [StringStyleAttribute] to apply
+     * @param range the [IntRange] at which to apply the style
+     * @throws [IndexOutOfBoundsException] if [range] is out of bounds for the text to span
+     */
     fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange)
+
+    /**
+     * Creates the [StyledString]
+     * @return the created [StyledString]
+     */
     fun create(): StyledString
 }
 
+/**
+ * Gets the plain string of a [StyledString]
+ */
 expect val StyledString.rawString: String
 
+/**
+ * Creates a [StyledString] from a [String]
+ * @param provider the [StyledStringBuilder.Provider] to provide the [StyledStringBuilder] used create a [StyledString]
+ * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+ * @param attributes a collection of [StringStyleAttribute] to apply to the entire string
+ * @return a [StyledString] styled with all [attributes]
+ */
 fun String.styled(
     provider: StyledStringBuilder.Provider,
-    defaultTextStyle: TextStyle,
+    defaultTextStyle: KalugaTextStyle,
     vararg attributes: StringStyleAttribute
 ) = styled(provider, defaultTextStyle, null, *attributes)
 
+/**
+ * Creates a [StyledString] from a [String]
+ * @param provider the [StyledStringBuilder.Provider] to provide the [StyledStringBuilder] used create a [StyledString]
+ * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+ * @param linkColor the [KalugaColor] to apply to the [LinkStyle] of the [StyledString]
+ * @param attributes a collection of [StringStyleAttribute] to apply to the entire string
+ * @return a [StyledString] styled with all [attributes]
+ */
 fun String.styled(
     provider: StyledStringBuilder.Provider,
-    defaultTextStyle: TextStyle,
+    defaultTextStyle: KalugaTextStyle,
     linkColor: KalugaColor,
     vararg attributes: StringStyleAttribute
 ) = styled(provider, defaultTextStyle, LinkStyle(linkColor, true), *attributes)
 
+/**
+ * Creates a [StyledString] from a [String]
+ * @param provider the [StyledStringBuilder.Provider] to provide the [StyledStringBuilder] used create a [StyledString]
+ * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+ * @param linkStyle the [LinkStyle] to apply to the [StyledString]
+ * @param attributes a collection of [StringStyleAttribute] to apply to the entire string
+ * @return a [StyledString] styled with all [attributes]
+ */
 fun String.styled(
     provider: StyledStringBuilder.Provider,
-    defaultTextStyle: TextStyle,
+    defaultTextStyle: KalugaTextStyle,
     linkStyle: LinkStyle?,
     vararg attributes: StringStyleAttribute
 ) = styled(
@@ -66,22 +137,48 @@ fun String.styled(
     }.toTypedArray()
 )
 
+/**
+ * Creates a [StyledString] from a [String]
+ * @param provider the [StyledStringBuilder.Provider] to provide the [StyledStringBuilder] used create a [StyledString]
+ * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+ * @param attributes a collection methods that create a [Pair] of [StringStyleAttribute] and the [IntRange] at which it should be applied
+ * @return a [StyledString] styled with all [attributes]
+ * @throws [IndexOutOfBoundsException] if [attributes] returns an [IntRange] out of bounds for the String
+ */
 fun String.styled(
     provider: StyledStringBuilder.Provider,
-    defaultTextStyle: TextStyle,
+    defaultTextStyle: KalugaTextStyle,
     vararg attributes: String.() -> Pair<StringStyleAttribute, IntRange>?
 ) = styled(provider, defaultTextStyle, null, *attributes)
 
+/**
+ * Creates a [StyledString] from a [String]
+ * @param provider the [StyledStringBuilder.Provider] to provide the [StyledStringBuilder] used create a [StyledString]
+ * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+ * @param linkColor the [KalugaColor] to apply to the [LinkStyle] of the [StyledString]
+ * @param attributes a collection methods that create a [Pair] of [StringStyleAttribute] and the [IntRange] at which it should be applied
+ * @return a [StyledString] styled with all [attributes]
+ * @throws [IndexOutOfBoundsException] if [attributes] returns an [IntRange] out of bounds for the String
+ */
 fun String.styled(
     provider: StyledStringBuilder.Provider,
-    defaultTextStyle: TextStyle,
+    defaultTextStyle: KalugaTextStyle,
     linkColor: KalugaColor,
     vararg attributes: String.() -> Pair<StringStyleAttribute, IntRange>?
 ) = styled(provider, defaultTextStyle, LinkStyle(linkColor, true), *attributes)
 
+/**
+ * Creates a [StyledString] from a [String]
+ * @param provider the [StyledStringBuilder.Provider] to provide the [StyledStringBuilder] used create a [StyledString]
+ * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+ * @param linkStyle the [LinkStyle] to apply to the [StyledString]
+ * @param attributes a collection methods that create a [Pair] of [StringStyleAttribute] and the [IntRange] at which it should be applied
+ * @return a [StyledString] styled with all [attributes]
+ * @throws [IndexOutOfBoundsException] if [attributes] returns an [IntRange] out of bounds for the String
+ */
 fun String.styled(
     provider: StyledStringBuilder.Provider,
-    defaultTextStyle: TextStyle,
+    defaultTextStyle: KalugaTextStyle,
     linkStyle: LinkStyle?,
     vararg attributes: String.() -> Pair<StringStyleAttribute, IntRange>?
 ) = provider.provide(this, defaultTextStyle, linkStyle).apply {
@@ -91,6 +188,16 @@ fun String.styled(
         }
     }
 }.create()
+
+/**
+ * Looks for a substring in the String and returns a [Pair] or [StringStyleAttribute] and [IntRange]
+ * that should be provided to [StyledStringBuilder] to apply the [StringStyleAttribute] to the first occurrence of the substring
+ * @param substring the substring to find in the String
+ * @param attribute the [StringStyleAttribute] to apply to [substring] if it is found
+ * @return the [Pair] of [attribute] and an [IntRange] to provide to [StyledStringBuilder]
+ * to apply the [StringStyleAttribute] to the first occurrence of the substring,
+ * or `null` if the substring does not occur in the String
+ */
 fun String.attributeSubstring(substring: String, attribute: StringStyleAttribute): Pair<StringStyleAttribute, IntRange>? {
     return indexOf(substring).let {
         if (it >= 0) {
@@ -102,12 +209,19 @@ fun String.attributeSubstring(substring: String, attribute: StringStyleAttribute
     }
 }
 
+/**
+ * A style attribute that can be applied to a [StyledString]
+ */
 sealed class StringStyleAttribute {
+
+    /**
+     * A [StringStyleAttribute] that is applied to individual characters
+     */
     sealed class CharacterStyleAttribute : StringStyleAttribute() {
         data class BackgroundColor(val color: KalugaColor) : CharacterStyleAttribute()
         data class ForegroundColor(val color: KalugaColor) : CharacterStyleAttribute()
-        data class TextStyle(val textStyle: com.splendo.kaluga.resources.stylable.TextStyle) : CharacterStyleAttribute()
-        data class Font(val font: com.splendo.kaluga.resources.Font, val size: Float) : CharacterStyleAttribute()
+        data class TextStyle(val textStyle: KalugaTextStyle) : CharacterStyleAttribute()
+        data class Font(val font: KalugaFont, val size: Float) : CharacterStyleAttribute()
         data class Stroke(val width: Float, val color: KalugaColor) : CharacterStyleAttribute()
         data class Shadow(val color: KalugaColor, val xOffset: Float, val yOffset: Float, val blurRadius: Float) : CharacterStyleAttribute()
         data class Kerning(val kern: Float) : CharacterStyleAttribute()
diff --git a/resources/src/commonMain/kotlin/stylable/GradientStyle.kt b/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
index 7588d04ee..3d3989ed5 100644
--- a/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
@@ -18,61 +18,183 @@
 package com.splendo.kaluga.resources.stylable
 
 import com.splendo.kaluga.resources.KalugaColor
+import com.splendo.kaluga.resources.stylable.GradientStyle.Linear.Orientation
 import kotlin.jvm.JvmName
 
+/**
+ * A style for applying to a Gradient color
+ * @property colorPoints the list of [ColorPoint] on the gradient
+ */
 sealed class GradientStyle(val colorPoints: List<ColorPoint>) {
+
+    /**
+     * A point on a [GradientStyle] at which a given [KalugaColor] should be visible
+     * @property color the [KalugaColor] at the point
+     * @property offset the offset from the start of the gradient at which the point is. Should range between `0.0` and `1.0`
+     */
     data class ColorPoint(val color: KalugaColor, val offset: Float)
+
+    /**
+     * A point on a [GradientStyle] at which the center of the gradient is located
+     * @property x the x coordinate of the center. Should range between `0.0` and `1.0`
+     * @property y the y coordinate of the center. Should range between `0.0` and `1.0`
+     */
     data class CenterPoint(val x: Float, val y: Float)
 
+    /**
+     * A [GradientStyle] that moves linearly in a given [Orientation]
+     * @property orientation the [Orientation] of the gradient
+     */
     class Linear private constructor(colorPoints: List<ColorPoint>, val orientation: Orientation) : GradientStyle(colorPoints) {
+
+        /**
+         * Direction in which the gradient moves
+         */
         enum class Orientation {
+            /**
+             * Gradient starts in the bottom-left corner and ends in the top-right corner
+             */
             BOTTOM_LEFT_TOP_RIGHT,
+
+            /**
+             * Gradient starts at the bottom and end at the top
+             */
             BOTTOM_TOP,
+
+            /**
+             * Gradient starts in the top-right corner and ends in the bottom-left corner
+             */
             TOP_RIGHT_BOTTOM_LEFT,
+
+            /**
+             * Gradient starts at the left side and end at the right side
+             */
             LEFT_RIGHT,
+
+            /**
+             * Gradient starts at the right side and end at the left side
+             */
             RIGHT_LEFT,
+
+            /**
+             * Gradient starts in the top-left corner and ends in the bottom-right corner
+             */
             TOP_LEFT_BOTTOM_RIGHT,
+
+            /**
+             * Gradient starts at the top and end at the bottom
+             */
             TOP_BOTTOM,
+
+            /**
+             * Gradient starts in the bottom-right corner and ends in the top-left corner
+             */
             BOTTOM_RIGHT_TOP_LEFT
         }
 
         companion object {
+
+            /**
+             * Creates a [Linear] gradient style using a list of [KalugaColor] and an [Orientation]
+             * @param colors the list of [KalugaColor] on the gradient. Will be spread evenly across the gradient
+             * @param orientation the [Orientation] of the gradient
+             * @return the [Linear] gradient
+             * @throws [ColorPointRangeError] if [colors] size is smaller than `2`
+             */
             @JvmName("fromColors")
             operator fun invoke(colors: List<KalugaColor>, orientation: Orientation = Orientation.LEFT_RIGHT) = Linear(colors.colorPoints, orientation)
+
+            /**
+             * Creates a [Linear] gradient style using a list of [ColorPoint] and an [Orientation]
+             * @param colorPoints the list of [ColorPoint] on the gradient
+             * @param orientation the [Orientation] of the gradient
+             * @return the [Linear] gradient
+             */
             @JvmName("fromColorPoints")
             operator fun invoke(colorPoints: List<ColorPoint>, orientation: Orientation = Orientation.LEFT_RIGHT) = Linear(colorPoints, orientation)
         }
     }
 
-    class Radial(
+    /**
+     * A [GradientStyle] that radiates out from a [CenterPoint]
+     * @property radius the radius in pixels at which the gradient stops
+     * @property centerPoint the [CenterPoint] from which the gradient radiates out
+     */
+    class Radial private constructor(
         colorPoints: List<ColorPoint>,
         val radius: Float,
         val centerPoint: CenterPoint = CenterPoint(0.5f, 0.5f)
     ) : GradientStyle(colorPoints) {
         companion object {
+
+            /**
+             * Creates a [Radial] gradient style using a list of [KalugaColor], a range, and a [CenterPoint]
+             * @param colors the list of [KalugaColor] on the gradient. Will be spread evenly across the gradient
+             * @param radius the radius in pixels at which the gradient stops
+             * @param centerPoint the [CenterPoint] from which the gradient radiates out
+             * @return the [Radial] gradient
+             * @throws [ColorPointRangeError] if [colors] size is smaller than `2`
+             */
             @JvmName("fromColors")
             operator fun invoke(colors: List<KalugaColor>, radius: Float, centerPoint: CenterPoint = CenterPoint(0.5f, 0.5f)) = Radial(colors.colorPoints, radius, centerPoint)
+
+            /**
+             * Creates a [Radial] gradient style using a list of [ColorPoint], a range, and a [CenterPoint]
+             * @param colorPoints the list of [ColorPoint] on the gradient
+             * @param radius the radius in pixels at which the gradient stops
+             * @param centerPoint the [CenterPoint] from which the gradient radiates out
+             * @return the [Radial] gradient
+             */
             @JvmName("fromColorPoints")
             operator fun invoke(colorPoints: List<ColorPoint>, radius: Float, centerPoint: CenterPoint = CenterPoint(0.5f, 0.5f)) = Radial(colorPoints, radius, centerPoint)
         }
     }
 
-    class Angular(
+
+    /**
+     * A [GradientStyle] that rotates around a [CenterPoint]
+     * @property centerPoint the [CenterPoint] from which the gradient radiates out
+     */
+    class Angular private constructor(
         colorPoints: List<ColorPoint>,
         val centerPoint: CenterPoint = CenterPoint(0.5f, 0.5f)
     ) : GradientStyle(colorPoints) {
         companion object {
+
+            /**
+             * Creates an [Angular] gradient style using a list of [KalugaColor] and a [CenterPoint]
+             * @param colors the list of [KalugaColor] on the gradient. Will be spread evenly across the gradient
+             * @param centerPoint the [CenterPoint] from which the gradient radiates out
+             * @return the [Angular] gradient
+             * @throws [ColorPointRangeError] if [colors] size is smaller than `2`
+             */
             @JvmName("fromColors")
             operator fun invoke(colors: List<KalugaColor>, centerPoint: CenterPoint = CenterPoint(0.5f, 0.5f)) = Angular(colors.colorPoints, centerPoint)
+
+            /**
+             * Creates an [Angular] gradient style using a list of [ColorPoint] and a [CenterPoint]
+             * @param colorPoints the list of [ColorPoint] on the gradient
+             * @param centerPoint the [CenterPoint] from which the gradient radiates out
+             * @return the [Angular] gradient
+             */
             @JvmName("fromColorPoints")
             operator fun invoke(colorPoints: List<ColorPoint>, centerPoint: CenterPoint = CenterPoint(0.5f, 0.5f)) = Angular(colorPoints, centerPoint)
         }
     }
 }
 
+/**
+ * An [Error] thrown if the size of a list of [GradientStyle.ColorPoint] is too small
+ */
+object ColorPointRangeError : Error("Gradient must have at least two colours")
+
+/**
+ * Converts a list of [KalugaColor] to a list of [GradientStyle.ColorPoint] spread evenly across the spectrum
+ * @throws [ColorPointRangeError] if the list size is smaller than `2`
+ */
 val List<KalugaColor>.colorPoints: List<GradientStyle.ColorPoint> get() {
     if (size < 2) {
-        throw Error("Gradient must have at least two colours")
+        throw ColorPointRangeError
     }
     val stepSize = 1.0f / (size.toFloat() - 1.0f)
     return mapIndexed { index, color -> GradientStyle.ColorPoint(color, index * stepSize) }
diff --git a/resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt b/resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt
index 449a8c01c..ed2eb9163 100644
--- a/resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt
@@ -19,38 +19,108 @@ package com.splendo.kaluga.resources.stylable
 
 import com.splendo.kaluga.resources.KalugaColor
 
+/**
+ * Style to apply to the background of a view
+ * @property fillStyle the [FillStyle] to apply to fill the body of the view
+ * @property strokeStyle the [StrokeStyle] to apply to the border of the view
+ * @property shape the [Shape] to apply to the view
+ */
 data class KalugaBackgroundStyle(
     val fillStyle: FillStyle,
     val strokeStyle: StrokeStyle = StrokeStyle.None,
     val shape: Shape = Shape.Rectangle()
 ) {
 
+    /**
+     * The style with which the background of a view will be filled
+     */
     sealed class FillStyle {
+
+        /**
+         * A [FillStyle] where a solid color is used
+         * @property color the [KalugaColor] filling the whole background
+         */
         data class Solid(val color: KalugaColor) : FillStyle()
+
+        /**
+         * A [FillStyle] where a gradient color is used
+         * @property gradientStyle the [GradientStyle] to use for the gradient filling the whole background
+         */
         data class Gradient(val gradientStyle: GradientStyle) : FillStyle()
     }
 
+    /**
+     * The shape applied to the [KalugaBackgroundStyle] of a view
+     */
     sealed class Shape {
+
+        /**
+         * A rectangular [Shape]
+         * @property cornerRadiusX the radius in pixels applied to the x-dimension of the corner
+         * @property cornerRadiusY the radius in pixels applied to the y-dimension of the corner
+         * @property roundedCorners the set of [Corner] that are rounded according to [cornerRadiusX] and [cornerRadiusY]
+         */
         data class Rectangle(
             val cornerRadiusX: Float,
             val cornerRadiusY: Float,
             val roundedCorners: Set<Corner> = Corner.values().toSet()
         ) : Shape() {
 
+            /**
+             * The corners of a [Rectangle] that can be rounded
+             */
             enum class Corner {
+
+                /**
+                 * The top-left corner
+                 */
                 TOP_LEFT,
+
+                /**
+                 * The top-right corner
+                 */
                 TOP_RIGHT,
+
+                /**
+                 * The bottom-left corner
+                 */
                 BOTTOM_LEFT,
+
+                /**
+                 * The bottom-right corner
+                 */
                 BOTTOM_RIGHT
             }
 
+            /**
+             * Constructor
+             * @param cornerRadius the radius in pixels to apply to the corners
+             * @param roundedCorners the set of [Corner] that are rounded according to [cornerRadius]
+             */
             constructor(cornerRadius: Float = 0.0f, roundedCorners: Set<Corner> = Corner.values().toSet()) : this(cornerRadius, cornerRadius, roundedCorners)
         }
+
+        /**
+         * An oval [Shape] matching the width and height of a background view
+         */
         object Oval : Shape()
     }
 
+    /**
+     * The style with which the border of the background of a view will be shown
+     */
     sealed class StrokeStyle {
+
+        /**
+         * A [StrokeStyle] where no stroke is applied
+         */
         object None : StrokeStyle()
+
+        /**
+         * A [StrokeStyle] with a solid color
+         * @param width the width of the stroke in pixels
+         * @param color the [KalugaColor] of the stroke
+         */
         data class Stroke(val width: Float, val color: KalugaColor) : StrokeStyle()
     }
 }
diff --git a/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt b/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt
index 6e7de2e0c..fc5694ac1 100644
--- a/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt
@@ -18,19 +18,38 @@
 package com.splendo.kaluga.resources.stylable
 
 import com.splendo.kaluga.resources.DefaultColors
-import com.splendo.kaluga.resources.Font
+import com.splendo.kaluga.resources.KalugaFont
 import com.splendo.kaluga.resources.KalugaColor
 
+/**
+ * The style to apply to a button
+ * @property font the [KalugaFont] of the button text
+ * @property textSize the size of the button text in Points
+ * @property textAlignment the [KalugaTextAlignment] of the text of the button
+ * @property defaultStyle the [ButtonStateStyle] when the button is not in a special state
+ * @property pressedStyle the [ButtonStateStyle] when the button is pressed
+ * @property disabledStyle the [ButtonStateStyle] when the button is disabled
+ */
 data class KalugaButtonStyle(
-    val font: Font,
+    val font: KalugaFont,
     val textSize: Float,
     val textAlignment: KalugaTextAlignment = KalugaTextAlignment.CENTER,
     val defaultStyle: ButtonStateStyle,
     val pressedStyle: ButtonStateStyle = defaultStyle,
     val disabledStyle: ButtonStateStyle = defaultStyle
 ) {
+
+    /**
+     * Constructor
+     * @param textStyle the [KalugaTextStyle] of the button text
+     * @param textAlignment the [KalugaTextAlignment] of the text of the button
+     * @param backgroundColor the [KalugaColor] of the background of the button when not in a special state
+     * @param pressedBackgroundColor the [KalugaColor] of the background of the button when pressed
+     * @param disabledBackgroundColor the [KalugaColor] of the background of the button when disabled
+     * @param shape the [KalugaBackgroundStyle.Shape] of the background of the button
+     */
     constructor(
-        textStyle: TextStyle,
+        textStyle: KalugaTextStyle,
         textAlignment: KalugaTextAlignment = KalugaTextAlignment.CENTER,
         backgroundColor: KalugaColor = DefaultColors.clear,
         pressedBackgroundColor: KalugaColor = backgroundColor,
@@ -57,9 +76,21 @@ data class KalugaButtonStyle(
         )
     )
 
+    /**
+     * Gets the [KalugaTextStyle] of the button depending on the state
+     * @param isEnabled if `true` the button is enabled
+     * @param isPressed if `true` the button is pressed
+     * @return the [KalugaTextStyle] to apply to the text of the button in the current state
+     */
     fun getStateTextStyle(isEnabled: Boolean, isPressed: Boolean) =
-        TextStyle(font, getStateStyle(isEnabled, isPressed).textColor, textSize, textAlignment)
+        KalugaTextStyle(font, getStateStyle(isEnabled, isPressed).textColor, textSize, textAlignment)
 
+    /**
+     * Gets the [ButtonStateStyle] of the button depending on the state
+     * @param isEnabled if `true` the button is enabled
+     * @param isPressed if `true` the button is pressed
+     * @return the [ButtonStateStyle] to apply to the text of the button in the current state
+     */
     fun getStateStyle(isEnabled: Boolean, isPressed: Boolean): ButtonStateStyle {
         return if (!isEnabled) {
             disabledStyle
@@ -71,11 +102,22 @@ data class KalugaButtonStyle(
     }
 }
 
+/**
+ * Style of a button for its current state
+ * @property textColor the [KalugaColor] to apply to the text of the button in this state
+ * @property backgroundStyle the [KalugaBackgroundStyle] to apply to the background of the button in this state
+ */
 data class ButtonStateStyle(
     val textColor: KalugaColor,
     val backgroundStyle: KalugaBackgroundStyle,
 ) {
 
+    /**
+     * Constructor
+     * @param textColor the [KalugaColor] to apply to the text of the button in this state
+     * @param backgroundColor the [KalugaColor] to apply to the background of the button in this state
+     * @param shape the [KalugaBackgroundStyle.Shape] to apply to the background of the button in this state
+     */
     constructor(textColor: KalugaColor, backgroundColor: KalugaColor = DefaultColors.clear, shape: KalugaBackgroundStyle.Shape = KalugaBackgroundStyle.Shape.Rectangle()) : this(
         textColor,
         KalugaBackgroundStyle(
diff --git a/resources/src/commonMain/kotlin/stylable/KalugaTextAlignment.kt b/resources/src/commonMain/kotlin/stylable/KalugaTextAlignment.kt
index bb5d4dfc6..1117ccbcc 100644
--- a/resources/src/commonMain/kotlin/stylable/KalugaTextAlignment.kt
+++ b/resources/src/commonMain/kotlin/stylable/KalugaTextAlignment.kt
@@ -17,10 +17,33 @@
 
 package com.splendo.kaluga.resources.stylable
 
+/**
+ * Alignment at which a text is located
+ */
 enum class KalugaTextAlignment {
+
+    /**
+     * Alignment at the left side of the view (independent of reading direction)
+     */
     LEFT,
+
+    /**
+     * Alignment at the right side of the view (independent of reading direction)
+     */
     RIGHT,
+
+    /**
+     * Alignment at the start side of the view according to reading direction
+     */
     END,
+
+    /**
+     * Alignment at the end side of the view according to reading direction
+     */
     START,
+
+    /**
+     * Alignment at the center of the view
+     */
     CENTER
 }
diff --git a/resources/src/commonMain/kotlin/stylable/TextStyle.kt b/resources/src/commonMain/kotlin/stylable/KalugaTextStyle.kt
similarity index 68%
rename from resources/src/commonMain/kotlin/stylable/TextStyle.kt
rename to resources/src/commonMain/kotlin/stylable/KalugaTextStyle.kt
index 6c03e4444..fa789fe6b 100644
--- a/resources/src/commonMain/kotlin/stylable/TextStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/KalugaTextStyle.kt
@@ -17,11 +17,18 @@
 
 package com.splendo.kaluga.resources.stylable
 
-import com.splendo.kaluga.resources.Font
+import com.splendo.kaluga.resources.KalugaFont
 import com.splendo.kaluga.resources.KalugaColor
 
-data class TextStyle(
-    val font: Font,
+/**
+ * The style to apply to a text
+ * @property font the [KalugaFont] with which to display the text
+ * @property color the [KalugaColor] with which to display the text
+ * @property size the size of the text in points
+ * @property alignment the [KalugaTextAlignment] of the text
+ */
+data class KalugaTextStyle(
+    val font: KalugaFont,
     val color: KalugaColor,
     val size: Float,
     val alignment: KalugaTextAlignment = KalugaTextAlignment.START
diff --git a/resources/src/commonMain/kotlin/view/KalugaButton.kt b/resources/src/commonMain/kotlin/view/KalugaButton.kt
index a5d5b1cd0..c1e5fba72 100644
--- a/resources/src/commonMain/kotlin/view/KalugaButton.kt
+++ b/resources/src/commonMain/kotlin/view/KalugaButton.kt
@@ -20,10 +20,33 @@ package com.splendo.kaluga.resources.view
 import com.splendo.kaluga.resources.StyledString
 import com.splendo.kaluga.resources.stylable.KalugaButtonStyle
 
+/**
+ * A button a [KalugaButtonStyle] applied
+ */
 sealed class KalugaButton {
+
+    /**
+     * The [KalugaButtonStyle] of the button
+     */
     abstract val style: KalugaButtonStyle
+
+    /**
+     * If `true` the button can be interacted with
+     */
     abstract val isEnabled: Boolean
+
+    /**
+     * Function to execute when the button is pressed
+     */
     abstract val action: () -> Unit
+
+    /**
+     * A [KalugaButton] that displays a regular text
+     * @property text the text to display on the button
+     * @param style the [KalugaButtonStyle] of the button
+     * @param isEnabled if `true` the button can be interacted with
+     * @param action function to execute when the button is pressed
+     */
     data class Plain(
         val text: String,
         override val style: KalugaButtonStyle,
@@ -31,6 +54,13 @@ sealed class KalugaButton {
         override val action: () -> Unit
     ) : KalugaButton()
 
+    /**
+     * A [KalugaButton] that displays a [StyledString]
+     * @property text the [StyledString] to display on the button
+     * @param style the [KalugaButtonStyle] of the button
+     * @param isEnabled if `true` the button can be interacted with
+     * @param action function to execute when the button is pressed
+     */
     data class Styled(
         val text: StyledString,
         override val style: KalugaButtonStyle,
diff --git a/resources/src/commonMain/kotlin/view/KalugaLabel.kt b/resources/src/commonMain/kotlin/view/KalugaLabel.kt
index e94afd96c..d7b75db59 100644
--- a/resources/src/commonMain/kotlin/view/KalugaLabel.kt
+++ b/resources/src/commonMain/kotlin/view/KalugaLabel.kt
@@ -18,18 +18,35 @@
 package com.splendo.kaluga.resources.view
 
 import com.splendo.kaluga.resources.StyledString
-import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 
+/**
+ * A label a [KalugaTextStyle] applied
+ */
 sealed class KalugaLabel {
-    abstract val style: TextStyle
 
+    /**
+     * The [KalugaTextStyle] of the label
+     */
+    abstract val style: KalugaTextStyle
+
+    /**
+     * A [KalugaLabel] that displays a regular text
+     * @property text the text to display on the label
+     * @param style the [KalugaTextStyle] of the label
+     */
     data class Plain(
         val text: String,
-        override val style: TextStyle
+        override val style: KalugaTextStyle
     ) : KalugaLabel()
 
+    /**
+     * A [KalugaLabel] that displays a [StyledString]
+     * @property text the [StyledString] to display on the label
+     * @param style the [KalugaTextStyle] of the label
+     */
     data class Styled(
         val text: StyledString,
-        override val style: TextStyle = text.defaultTextStyle
+        override val style: KalugaTextStyle = text.defaultTextStyle
     ) : KalugaLabel()
 }
diff --git a/resources/src/iosMain/kotlin/Font.kt b/resources/src/iosMain/kotlin/KalugaFont.kt
similarity index 62%
rename from resources/src/iosMain/kotlin/Font.kt
rename to resources/src/iosMain/kotlin/KalugaFont.kt
index 5cc9d1256..89569d2ee 100644
--- a/resources/src/iosMain/kotlin/Font.kt
+++ b/resources/src/iosMain/kotlin/KalugaFont.kt
@@ -21,9 +21,9 @@ import platform.UIKit.UIFont
 import platform.UIKit.UIFontWeightRegular
 import platform.UIKit.labelFontSize
 
-actual typealias Font = UIFont
+actual typealias KalugaFont = UIFont
 
-actual val defaultFont: Font get() = UIFont.systemFontOfSize(UIFont.labelFontSize)
-actual val defaultBoldFont: Font get() = UIFont.boldSystemFontOfSize(UIFont.labelFontSize)
-actual val defaultItalicFont: Font get() = UIFont.italicSystemFontOfSize(UIFont.labelFontSize)
-actual val defaultMonospaceFont: Font get() = UIFont.monospacedSystemFontOfSize(UIFont.labelFontSize, UIFontWeightRegular)
+actual val defaultFont: KalugaFont get() = UIFont.systemFontOfSize(UIFont.labelFontSize)
+actual val defaultBoldFont: KalugaFont get() = UIFont.boldSystemFontOfSize(UIFont.labelFontSize)
+actual val defaultItalicFont: KalugaFont get() = UIFont.italicSystemFontOfSize(UIFont.labelFontSize)
+actual val defaultMonospaceFont: KalugaFont get() = UIFont.monospacedSystemFontOfSize(UIFont.labelFontSize, UIFontWeightRegular)
diff --git a/resources/src/iosMain/kotlin/Image.kt b/resources/src/iosMain/kotlin/KalugaImage.kt
similarity index 78%
rename from resources/src/iosMain/kotlin/Image.kt
rename to resources/src/iosMain/kotlin/KalugaImage.kt
index 7f8965531..059d821ff 100644
--- a/resources/src/iosMain/kotlin/Image.kt
+++ b/resources/src/iosMain/kotlin/KalugaImage.kt
@@ -20,6 +20,6 @@ package com.splendo.kaluga.resources
 import platform.UIKit.UIImage
 import platform.UIKit.UIImageRenderingMode
 
-actual typealias Image = UIImage
+actual typealias KalugaImage = UIImage
 
-actual fun Image.tinted(color: KalugaColor): Image? = this.imageWithTintColor(color.uiColor, UIImageRenderingMode.UIImageRenderingModeAlwaysOriginal)
+actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? = this.imageWithTintColor(color.uiColor, UIImageRenderingMode.UIImageRenderingModeAlwaysOriginal)
diff --git a/resources/src/iosMain/kotlin/Resources.kt b/resources/src/iosMain/kotlin/Resources.kt
index 846ed08bf..57391cf60 100644
--- a/resources/src/iosMain/kotlin/Resources.kt
+++ b/resources/src/iosMain/kotlin/Resources.kt
@@ -47,9 +47,9 @@ actual class DefaultColorLoader(private val bundle: NSBundle, private val traitC
 
 actual class DefaultImageLoader(private val bundle: NSBundle, private val traitCollection: UITraitCollection?) : ImageLoader {
     actual constructor() : this(NSBundle.mainBundle, null)
-    override fun loadImage(identifier: String, defaultValue: Image?): Image? = UIImage.imageNamed(identifier, bundle, traitCollection) ?: defaultValue
+    override fun loadImage(identifier: String, defaultValue: KalugaImage?): KalugaImage? = UIImage.imageNamed(identifier, bundle, traitCollection) ?: defaultValue
 }
 
 actual class DefaultFontLoader actual constructor() : FontLoader {
-    override suspend fun loadFont(identifier: String, defaultValue: Font?): Font? = UIFont.fontWithName(identifier, UIFont.labelFontSize) ?: defaultValue
+    override suspend fun loadFont(identifier: String, defaultValue: KalugaFont?): KalugaFont? = UIFont.fontWithName(identifier, UIFont.labelFontSize) ?: defaultValue
 }
diff --git a/resources/src/iosMain/kotlin/StyledString.kt b/resources/src/iosMain/kotlin/StyledString.kt
index 78068189f..12f401a39 100644
--- a/resources/src/iosMain/kotlin/StyledString.kt
+++ b/resources/src/iosMain/kotlin/StyledString.kt
@@ -18,7 +18,7 @@
 package com.splendo.kaluga.resources
 
 import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
-import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 import com.splendo.kaluga.resources.uikit.nsTextAlignment
 import kotlinx.cinterop.CValue
 import kotlinx.cinterop.convert
@@ -39,20 +39,24 @@ import platform.UIKit.NSMutableParagraphStyle
 import platform.UIKit.NSParagraphStyle
 import platform.UIKit.NSShadow
 import platform.UIKit.NSUnderlineStyleSingle
+import platform.UIKit.size
 
-actual data class StyledString(val attributeString: NSAttributedString, actual val defaultTextStyle: TextStyle, actual val linkStyle: LinkStyle?)
+actual data class StyledString(val attributeString: NSAttributedString, actual val defaultTextStyle: KalugaTextStyle, actual val linkStyle: LinkStyle?)
 
 actual val StyledString.rawString: String get() = attributeString.string
 
-actual class StyledStringBuilder constructor(string: String, private val defaultTextStyle: TextStyle, private val linkStyle: LinkStyle?) {
+actual class StyledStringBuilder constructor(string: String, private val defaultTextStyle: KalugaTextStyle, private val linkStyle: LinkStyle?) {
 
     actual class Provider {
-        actual fun provide(string: String, defaultTextStyle: TextStyle, linkStyle: LinkStyle?) = StyledStringBuilder(string, defaultTextStyle, linkStyle)
+        actual fun provide(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) = StyledStringBuilder(string, defaultTextStyle, linkStyle)
     }
 
     private val attributedString = NSMutableAttributedString.Companion.create(string)
 
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
+        if (range.first < 0 || range.last.toULong() >= attributedString.length) {
+            throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
+        }
         val nsRange = range.nsRange
         when (attribute) {
             is StringStyleAttribute.CharacterStyleAttribute -> {
diff --git a/resources/src/iosMain/kotlin/uikit/TextStyle.kt b/resources/src/iosMain/kotlin/uikit/TextStyle.kt
index ab0cba3ed..0588930db 100644
--- a/resources/src/iosMain/kotlin/uikit/TextStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/TextStyle.kt
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.resources.uikit
 
-import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 import com.splendo.kaluga.resources.urlRanges
 import com.splendo.kaluga.resources.view.KalugaLabel
 import platform.Foundation.NSMutableAttributedString
@@ -89,20 +89,20 @@ fun UITextView.bindTextView(label: KalugaLabel) {
     applyTextStyle(label.style)
 }
 
-fun UILabel.applyTextStyle(textStyle: TextStyle) {
+fun UILabel.applyTextStyle(textStyle: KalugaTextStyle) {
     setFont(textStyle.font.fontWithSize(textStyle.size.toDouble()))
     textColor = textStyle.color.uiColor
     textAlignment = textStyle.alignment.nsTextAlignment
     numberOfLines = 0
 }
 
-fun UITextView.applyTextStyle(textStyle: TextStyle) {
+fun UITextView.applyTextStyle(textStyle: KalugaTextStyle) {
     setFont(textStyle.font.fontWithSize(textStyle.size.toDouble()))
     textColor = textStyle.color.uiColor
     textAlignment = textStyle.alignment.nsTextAlignment
 }
 
-fun UITextField.applyTextStyle(textStyle: TextStyle) {
+fun UITextField.applyTextStyle(textStyle: KalugaTextStyle) {
     setFont(textStyle.font.fontWithSize(textStyle.size.toDouble()))
     textColor = textStyle.color.uiColor
     textAlignment = textStyle.alignment.nsTextAlignment
diff --git a/resources/src/jsMain/kotlin/Font.kt b/resources/src/jsMain/kotlin/KalugaFont.kt
similarity index 71%
rename from resources/src/jsMain/kotlin/Font.kt
rename to resources/src/jsMain/kotlin/KalugaFont.kt
index c52e00c38..12ab40560 100644
--- a/resources/src/jsMain/kotlin/Font.kt
+++ b/resources/src/jsMain/kotlin/KalugaFont.kt
@@ -17,9 +17,9 @@
 
 package com.splendo.kaluga.resources
 
-actual class Font
+actual class KalugaFont
 
-actual val defaultFont: Font get() = Font()
-actual val defaultBoldFont: Font get() = Font()
-actual val defaultItalicFont: Font get() = Font()
-actual val defaultMonospaceFont: Font get() = Font()
+actual val defaultFont: KalugaFont get() = KalugaFont()
+actual val defaultBoldFont: KalugaFont get() = KalugaFont()
+actual val defaultItalicFont: KalugaFont get() = KalugaFont()
+actual val defaultMonospaceFont: KalugaFont get() = KalugaFont()
diff --git a/resources/src/jvmMain/kotlin/Image.kt b/resources/src/jsMain/kotlin/KalugaImage.kt
similarity index 87%
rename from resources/src/jvmMain/kotlin/Image.kt
rename to resources/src/jsMain/kotlin/KalugaImage.kt
index 0aade4664..f167a4554 100644
--- a/resources/src/jvmMain/kotlin/Image.kt
+++ b/resources/src/jsMain/kotlin/KalugaImage.kt
@@ -17,6 +17,6 @@
 
 package com.splendo.kaluga.resources
 
-actual class Image
+actual class KalugaImage
 
-actual fun Image.tinted(color: KalugaColor): Image? = null
+actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? = null
diff --git a/resources/src/jsMain/kotlin/Resources.kt b/resources/src/jsMain/kotlin/Resources.kt
index 90f1fc0a5..4fe633b43 100644
--- a/resources/src/jsMain/kotlin/Resources.kt
+++ b/resources/src/jsMain/kotlin/Resources.kt
@@ -42,16 +42,16 @@ actual class DefaultColorLoader(private val transformer: (String) -> KalugaColor
         transformer(identifier) ?: defaultValue
 }
 
-actual class DefaultImageLoader(private val transformer: (String) -> Image?) : ImageLoader {
+actual class DefaultImageLoader(private val transformer: (String) -> KalugaImage?) : ImageLoader {
     actual constructor() : this({ null })
 
-    override fun loadImage(identifier: String, defaultValue: Image?): Image? =
+    override fun loadImage(identifier: String, defaultValue: KalugaImage?): KalugaImage? =
         transformer(identifier) ?: defaultValue
 }
 
-actual class DefaultFontLoader(private val transformer: suspend (String) -> Font?) : FontLoader {
+actual class DefaultFontLoader(private val transformer: suspend (String) -> KalugaFont?) : FontLoader {
     actual constructor() : this({ null })
 
-    override suspend fun loadFont(identifier: String, defaultValue: Font?): Font? =
+    override suspend fun loadFont(identifier: String, defaultValue: KalugaFont?): KalugaFont? =
         transformer(identifier) ?: defaultValue
 }
diff --git a/resources/src/jsMain/kotlin/StyledString.kt b/resources/src/jsMain/kotlin/StyledString.kt
index 86509eb30..02a71a73f 100644
--- a/resources/src/jsMain/kotlin/StyledString.kt
+++ b/resources/src/jsMain/kotlin/StyledString.kt
@@ -17,23 +17,26 @@
 
 package com.splendo.kaluga.resources
 
-import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 
 actual data class StyledString(
     val string: String,
-    actual val defaultTextStyle: TextStyle,
+    actual val defaultTextStyle: KalugaTextStyle,
     actual val linkStyle: LinkStyle?,
     val attributed: List<Pair<StringStyleAttribute, IntRange>>
 )
 
-actual class StyledStringBuilder constructor(string: String, defaultTextStyle: TextStyle, linkStyle: LinkStyle?) {
+actual class StyledStringBuilder constructor(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) {
 
     actual class Provider {
-        actual fun provide(string: String, defaultTextStyle: TextStyle, linkStyle: LinkStyle?) = StyledStringBuilder(string, defaultTextStyle, linkStyle)
+        actual fun provide(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) = StyledStringBuilder(string, defaultTextStyle, linkStyle)
     }
 
     var styledString = StyledString(string, defaultTextStyle, linkStyle, emptyList())
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
+        if (range.first < 0 || range.last >= styledString.string.length) {
+            throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
+        }
         styledString = styledString.copy(
             attributed = styledString.attributed.toMutableList().apply {
                 add(Pair(attribute, range))
diff --git a/resources/src/jvmMain/kotlin/Font.kt b/resources/src/jvmMain/kotlin/KalugaFont.kt
similarity index 72%
rename from resources/src/jvmMain/kotlin/Font.kt
rename to resources/src/jvmMain/kotlin/KalugaFont.kt
index 57c77abd4..f1c39b22b 100644
--- a/resources/src/jvmMain/kotlin/Font.kt
+++ b/resources/src/jvmMain/kotlin/KalugaFont.kt
@@ -18,9 +18,9 @@
 @file:JvmName("JvmFont")
 package com.splendo.kaluga.resources
 
-actual class Font
+actual class KalugaFont
 
-actual val defaultFont: Font get() = Font()
-actual val defaultBoldFont: Font get() = Font()
-actual val defaultItalicFont: Font get() = Font()
-actual val defaultMonospaceFont: Font get() = Font()
+actual val defaultFont: KalugaFont get() = KalugaFont()
+actual val defaultBoldFont: KalugaFont get() = KalugaFont()
+actual val defaultItalicFont: KalugaFont get() = KalugaFont()
+actual val defaultMonospaceFont: KalugaFont get() = KalugaFont()
diff --git a/resources/src/jsMain/kotlin/Image.kt b/resources/src/jvmMain/kotlin/KalugaImage.kt
similarity index 87%
rename from resources/src/jsMain/kotlin/Image.kt
rename to resources/src/jvmMain/kotlin/KalugaImage.kt
index 0aade4664..f167a4554 100644
--- a/resources/src/jsMain/kotlin/Image.kt
+++ b/resources/src/jvmMain/kotlin/KalugaImage.kt
@@ -17,6 +17,6 @@
 
 package com.splendo.kaluga.resources
 
-actual class Image
+actual class KalugaImage
 
-actual fun Image.tinted(color: KalugaColor): Image? = null
+actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? = null
diff --git a/resources/src/jvmMain/kotlin/Resources.kt b/resources/src/jvmMain/kotlin/Resources.kt
index 90f1fc0a5..4fe633b43 100644
--- a/resources/src/jvmMain/kotlin/Resources.kt
+++ b/resources/src/jvmMain/kotlin/Resources.kt
@@ -42,16 +42,16 @@ actual class DefaultColorLoader(private val transformer: (String) -> KalugaColor
         transformer(identifier) ?: defaultValue
 }
 
-actual class DefaultImageLoader(private val transformer: (String) -> Image?) : ImageLoader {
+actual class DefaultImageLoader(private val transformer: (String) -> KalugaImage?) : ImageLoader {
     actual constructor() : this({ null })
 
-    override fun loadImage(identifier: String, defaultValue: Image?): Image? =
+    override fun loadImage(identifier: String, defaultValue: KalugaImage?): KalugaImage? =
         transformer(identifier) ?: defaultValue
 }
 
-actual class DefaultFontLoader(private val transformer: suspend (String) -> Font?) : FontLoader {
+actual class DefaultFontLoader(private val transformer: suspend (String) -> KalugaFont?) : FontLoader {
     actual constructor() : this({ null })
 
-    override suspend fun loadFont(identifier: String, defaultValue: Font?): Font? =
+    override suspend fun loadFont(identifier: String, defaultValue: KalugaFont?): KalugaFont? =
         transformer(identifier) ?: defaultValue
 }
diff --git a/resources/src/jvmMain/kotlin/StyledString.kt b/resources/src/jvmMain/kotlin/StyledString.kt
index 86509eb30..02a71a73f 100644
--- a/resources/src/jvmMain/kotlin/StyledString.kt
+++ b/resources/src/jvmMain/kotlin/StyledString.kt
@@ -17,23 +17,26 @@
 
 package com.splendo.kaluga.resources
 
-import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 
 actual data class StyledString(
     val string: String,
-    actual val defaultTextStyle: TextStyle,
+    actual val defaultTextStyle: KalugaTextStyle,
     actual val linkStyle: LinkStyle?,
     val attributed: List<Pair<StringStyleAttribute, IntRange>>
 )
 
-actual class StyledStringBuilder constructor(string: String, defaultTextStyle: TextStyle, linkStyle: LinkStyle?) {
+actual class StyledStringBuilder constructor(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) {
 
     actual class Provider {
-        actual fun provide(string: String, defaultTextStyle: TextStyle, linkStyle: LinkStyle?) = StyledStringBuilder(string, defaultTextStyle, linkStyle)
+        actual fun provide(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) = StyledStringBuilder(string, defaultTextStyle, linkStyle)
     }
 
     var styledString = StyledString(string, defaultTextStyle, linkStyle, emptyList())
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
+        if (range.first < 0 || range.last >= styledString.string.length) {
+            throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
+        }
         styledString = styledString.copy(
             attributed = styledString.attributed.toMutableList().apply {
                 add(Pair(attribute, range))
diff --git a/test-utils-base/README.md b/test-utils-base/README.md
index 9226df09a..1b274e70a 100644
--- a/test-utils-base/README.md
+++ b/test-utils-base/README.md
@@ -1,7 +1,7 @@
 # Test Utils Base
 
 ## Installing
-This library is available on Maven Central. You can import Kaluga Test Utils as follows:
+This library is available on Maven Central. You can import Kaluga Test Utils Base as follows:
 
 ```kotlin
 repositories {
diff --git a/test-utils-koin/README.md b/test-utils-koin/README.md
index b89d7b6e0..4dc6b5b46 100644
--- a/test-utils-koin/README.md
+++ b/test-utils-koin/README.md
@@ -3,7 +3,7 @@
 This library adds support for [Koin](https://insert-koin.io/) to the [`test-utils-base` module](../test-utils-base)
 
 ## Installing
-This library is available on Maven Central. You can import Kaluga Test Utils as follows:
+This library is available on Maven Central. You can import Kaluga Test Utils Koin as follows:
 
 ```kotlin
 repositories {
diff --git a/test-utils-resources/src/androidLibMain/kotlin/MockResources.kt b/test-utils-resources/src/androidLibMain/kotlin/MockResources.kt
index 66727641e..d7cc51ace 100644
--- a/test-utils-resources/src/androidLibMain/kotlin/MockResources.kt
+++ b/test-utils-resources/src/androidLibMain/kotlin/MockResources.kt
@@ -18,11 +18,11 @@
 package com.splendo.kaluga.test.resources
 
 import android.graphics.drawable.ColorDrawable
-import com.splendo.kaluga.resources.Font
-import com.splendo.kaluga.resources.Image
+import com.splendo.kaluga.resources.KalugaFont
+import com.splendo.kaluga.resources.KalugaImage
 import com.splendo.kaluga.resources.KalugaColor
 import org.mockito.Mockito
 
 actual fun mockColor(): KalugaColor = 0
-actual fun mockImage(): Image = Image(ColorDrawable(0))
-actual fun mockFont(): Font = Font.DEFAULT ?: Mockito.mock(Font::class.java)
+actual fun mockImage(): KalugaImage = KalugaImage(ColorDrawable(0))
+actual fun mockFont(): KalugaFont = KalugaFont.DEFAULT ?: Mockito.mock(KalugaFont::class.java)
diff --git a/test-utils-resources/src/commonMain/kotlin/MockResources.kt b/test-utils-resources/src/commonMain/kotlin/MockResources.kt
index 1b8fd8452..c6892a2e7 100644
--- a/test-utils-resources/src/commonMain/kotlin/MockResources.kt
+++ b/test-utils-resources/src/commonMain/kotlin/MockResources.kt
@@ -17,9 +17,9 @@
 
 package com.splendo.kaluga.test.resources
 
-import com.splendo.kaluga.resources.Font
+import com.splendo.kaluga.resources.KalugaFont
 import com.splendo.kaluga.resources.FontLoader
-import com.splendo.kaluga.resources.Image
+import com.splendo.kaluga.resources.KalugaImage
 import com.splendo.kaluga.resources.ImageLoader
 import com.splendo.kaluga.resources.KalugaColor
 import com.splendo.kaluga.resources.KalugaColorLoader
@@ -99,7 +99,7 @@ class MockImageLoader(private val returnMock: Boolean = false) : ImageLoader {
         }
     }
 
-    override fun loadImage(identifier: String, defaultValue: Image?): Image? = loadImageMock.call(identifier, defaultValue)
+    override fun loadImage(identifier: String, defaultValue: KalugaImage?): KalugaImage? = loadImageMock.call(identifier, defaultValue)
 }
 
 /**
@@ -119,7 +119,7 @@ class MockFontLoader(private val returnMock: Boolean = false) : FontLoader {
         }
     }
 
-    override suspend fun loadFont(identifier: String, defaultValue: Font?): Font? =
+    override suspend fun loadFont(identifier: String, defaultValue: KalugaFont?): KalugaFont? =
         loadFontMock.call(identifier, defaultValue)
 }
 
@@ -129,11 +129,11 @@ class MockFontLoader(private val returnMock: Boolean = false) : FontLoader {
 expect fun mockColor(): KalugaColor
 
 /**
- * Creates a mocked [Image]
+ * Creates a mocked [KalugaImage]
  */
-expect fun mockImage(): Image
+expect fun mockImage(): KalugaImage
 
 /**
- * Creates a mocked [Font]
+ * Creates a mocked [KalugaFont]
  */
-expect fun mockFont(): Font
+expect fun mockFont(): KalugaFont
diff --git a/test-utils-resources/src/iosMain/kotlin/MockResources.kt b/test-utils-resources/src/iosMain/kotlin/MockResources.kt
index 26513b679..1b443484d 100644
--- a/test-utils-resources/src/iosMain/kotlin/MockResources.kt
+++ b/test-utils-resources/src/iosMain/kotlin/MockResources.kt
@@ -17,11 +17,11 @@
 
 package com.splendo.kaluga.test.resources
 
-import com.splendo.kaluga.resources.Font
-import com.splendo.kaluga.resources.Image
+import com.splendo.kaluga.resources.KalugaFont
+import com.splendo.kaluga.resources.KalugaImage
 import com.splendo.kaluga.resources.KalugaColor
 import platform.UIKit.UIColor
 
 actual fun mockColor(): KalugaColor = KalugaColor(UIColor.blackColor())
-actual fun mockImage(): Image = Image()
-actual fun mockFont(): Font = Font()
+actual fun mockImage(): KalugaImage = KalugaImage()
+actual fun mockFont(): KalugaFont = KalugaFont()
diff --git a/test-utils-resources/src/jsMain/kotlin/MockResources.kt b/test-utils-resources/src/jsMain/kotlin/MockResources.kt
index 6c80e586e..0b6c3aa76 100644
--- a/test-utils-resources/src/jsMain/kotlin/MockResources.kt
+++ b/test-utils-resources/src/jsMain/kotlin/MockResources.kt
@@ -17,10 +17,10 @@
 
 package com.splendo.kaluga.test.resources
 
-import com.splendo.kaluga.resources.Font
-import com.splendo.kaluga.resources.Image
+import com.splendo.kaluga.resources.KalugaFont
+import com.splendo.kaluga.resources.KalugaImage
 import com.splendo.kaluga.resources.KalugaColor
 
 actual fun mockColor(): KalugaColor = 0
-actual fun mockImage(): Image = Image()
-actual fun mockFont(): Font = Font()
+actual fun mockImage(): KalugaImage = KalugaImage()
+actual fun mockFont(): KalugaFont = KalugaFont()
diff --git a/test-utils-resources/src/jvmMain/kotlin/MockResources.kt b/test-utils-resources/src/jvmMain/kotlin/MockResources.kt
index 6c80e586e..0b6c3aa76 100644
--- a/test-utils-resources/src/jvmMain/kotlin/MockResources.kt
+++ b/test-utils-resources/src/jvmMain/kotlin/MockResources.kt
@@ -17,10 +17,10 @@
 
 package com.splendo.kaluga.test.resources
 
-import com.splendo.kaluga.resources.Font
-import com.splendo.kaluga.resources.Image
+import com.splendo.kaluga.resources.KalugaFont
+import com.splendo.kaluga.resources.KalugaImage
 import com.splendo.kaluga.resources.KalugaColor
 
 actual fun mockColor(): KalugaColor = 0
-actual fun mockImage(): Image = Image()
-actual fun mockFont(): Font = Font()
+actual fun mockImage(): KalugaImage = KalugaImage()
+actual fun mockFont(): KalugaFont = KalugaFont()
diff --git a/test-utils/README.md b/test-utils/README.md
index a9c700109..fc5fa2e73 100644
--- a/test-utils/README.md
+++ b/test-utils/README.md
@@ -15,7 +15,7 @@ Modules:
  - [Resources](../test-utils-resources) provides support for mocking the [`resources` module](../resources)
 
 ## Installing
-This library is available on Maven Central. You can import Kaluga Test Utils Location as follows:
+This library is available on Maven Central. You can import Kaluga Test Utils as follows:
 
 ```kotlin
 repositories {

From e4e18c9e5792f602c000022c923c70c5b90b34bc Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 20:21:49 +0100
Subject: [PATCH 205/227] Fixed broken tracking of kaluga-swiftUI

---
 example/ios/Kaluga-SwiftUI | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 93783021e..56d8146a6 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 93783021e2e6a0a0de0e9b82f1aa3c80f81ebf33
+Subproject commit 56d8146a6e582590f7c8543d2c815fb9ba545fe3

From c2393aa7c95def2b73fd96942d31676376bff661 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 21 Feb 2023 23:56:47 +0100
Subject: [PATCH 206/227] Fix for ios publish to maven local failing

---
 location/src/iosMain/kotlin/location/CLLocationExtensions.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/location/src/iosMain/kotlin/location/CLLocationExtensions.kt b/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
index 39cfa3272..d711ce258 100644
--- a/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
+++ b/location/src/iosMain/kotlin/location/CLLocationExtensions.kt
@@ -19,6 +19,8 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 package com.splendo.kaluga.location
 
 import com.splendo.kaluga.base.utils.DefaultKalugaDate
+import com.splendo.kaluga.base.utils.KalugaLocale.Companion.defaultLocale
+import com.splendo.kaluga.base.utils.KalugaTimeZone
 import kotlinx.cinterop.useContents
 import platform.CoreLocation.CLLocation
 import platform.Foundation.timeIntervalSince1970
@@ -37,6 +39,6 @@ val CLLocation.knownLocation
             verticalAccuracy = verticalAccuracy,
             course = course,
             speed = speed,
-            time = DefaultKalugaDate.epoch(timestamp.timeIntervalSince1970.seconds)
+            time = DefaultKalugaDate.epoch(timestamp.timeIntervalSince1970.seconds, KalugaTimeZone.current(), defaultLocale)
         )
     }

From 0f8c9025bd6de270530c4ce0154b89bb88b2f78d Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 22 Feb 2023 11:56:38 +0100
Subject: [PATCH 207/227] Resources KDoc

---
 .../androidLibMain/kotlin/utils/KalugaDate.kt |  1 +
 .../src/commonMain/kotlin/utils/KalugaDate.kt |  2 -
 base/src/jvmMain/kotlin/utils/KalugaDate.kt   |  1 +
 .../ResourcesListViewController.swift         |  2 +-
 example/ios/Kaluga-SwiftUI                    |  2 +-
 .../example/shared/stylable/TextStyles.kt     | 18 ++--
 .../viewmodel/resources/LabelViewModel.kt     |  2 +-
 .../src/androidLibMain/kotlin/DarkMode.kt     |  3 +
 .../src/androidLibMain/kotlin/KalugaColor.kt  | 50 +++++++++++
 .../src/androidLibMain/kotlin/KalugaFont.kt   | 18 ++++
 .../src/androidLibMain/kotlin/KalugaImage.kt  | 10 +++
 .../src/androidLibMain/kotlin/PixelUtils.kt   | 11 +++
 .../src/androidLibMain/kotlin/Resources.kt    | 17 ++++
 .../src/androidLibMain/kotlin/StyledString.kt | 64 +++++++++++++-
 .../kotlin/view/BackgroundStyle.kt            |  9 ++
 .../src/androidLibMain/kotlin/view/Button.kt  | 31 +++++--
 .../kotlin/view/TextAlignment.kt              | 30 +++++++
 .../androidLibMain/kotlin/view/TextView.kt    | 25 ++++++
 .../src/commonMain/kotlin/KalugaColor.kt      |  7 ++
 resources/src/commonMain/kotlin/KalugaFont.kt | 15 ++++
 resources/src/commonMain/kotlin/Resources.kt  | 16 +++-
 .../src/commonMain/kotlin/StyledString.kt     | 83 ++++++++++++++++++-
 .../kotlin/stylable/GradientStyle.kt          |  7 +-
 .../kotlin/stylable/KalugaBackgroundStyle.kt  |  8 +-
 .../kotlin/stylable/KalugaButtonStyle.kt      |  2 +-
 resources/src/iosMain/kotlin/DarkMode.kt      |  3 +
 resources/src/iosMain/kotlin/KalugaColor.kt   | 52 ++++++++++++
 resources/src/iosMain/kotlin/KalugaFont.kt    | 18 ++++
 resources/src/iosMain/kotlin/KalugaImage.kt   |  8 ++
 resources/src/iosMain/kotlin/Resources.kt     | 20 +++++
 resources/src/iosMain/kotlin/StyledString.kt  | 58 +++++++++++--
 .../iosMain/kotlin/uikit/BackgroundStyle.kt   | 10 ++-
 .../src/iosMain/kotlin/uikit/ButtonStyle.kt   | 10 ++-
 .../src/iosMain/kotlin/uikit/TextAlignment.kt |  6 ++
 .../src/iosMain/kotlin/uikit/TextStyle.kt     | 23 ++++-
 .../iosMain/kotlin/uikit/UILinkTapGesture.kt  |  2 +-
 .../kotlin/uikit/UILinkTextViewDelegate.kt    |  2 +-
 resources/src/jsMain/kotlin/DarkMode.kt       |  3 +
 resources/src/jsMain/kotlin/KalugaColor.kt    | 50 +++++++++++
 resources/src/jsMain/kotlin/KalugaFont.kt     | 18 ++++
 resources/src/jsMain/kotlin/KalugaImage.kt    |  8 ++
 resources/src/jsMain/kotlin/Resources.kt      | 17 ++++
 resources/src/jsMain/kotlin/StyledString.kt   | 51 +++++++++++-
 resources/src/jvmMain/kotlin/DarkMode.kt      |  3 +
 resources/src/jvmMain/kotlin/KalugaColor.kt   | 50 +++++++++++
 resources/src/jvmMain/kotlin/KalugaFont.kt    | 18 ++++
 resources/src/jvmMain/kotlin/KalugaImage.kt   | 10 +++
 resources/src/jvmMain/kotlin/Resources.kt     | 17 ++++
 resources/src/jvmMain/kotlin/StyledString.kt  | 52 +++++++++++-
 49 files changed, 893 insertions(+), 50 deletions(-)

diff --git a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
index b2a945ae8..07ef5af66 100644
--- a/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/androidLibMain/kotlin/utils/KalugaDate.kt
@@ -15,6 +15,7 @@
 
  */
 
+@file:JvmName("KalugaDateAndroidKt")
 package com.splendo.kaluga.base.utils
 
 import java.util.Calendar
diff --git a/base/src/commonMain/kotlin/utils/KalugaDate.kt b/base/src/commonMain/kotlin/utils/KalugaDate.kt
index 3845bc1d1..9964c48e5 100644
--- a/base/src/commonMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/commonMain/kotlin/utils/KalugaDate.kt
@@ -14,14 +14,12 @@
     limitations under the License.
 
  */
-@file:JvmName("KalugaDateJvm")
 
 package com.splendo.kaluga.base.utils
 
 import com.splendo.kaluga.base.text.KalugaDateFormatter
 import com.splendo.kaluga.base.text.iso8601Pattern
 import com.splendo.kaluga.base.utils.KalugaLocale.Companion.defaultLocale
-import kotlin.jvm.JvmName
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
diff --git a/base/src/jvmMain/kotlin/utils/KalugaDate.kt b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
index 606dd1482..a88939bb5 100644
--- a/base/src/jvmMain/kotlin/utils/KalugaDate.kt
+++ b/base/src/jvmMain/kotlin/utils/KalugaDate.kt
@@ -15,6 +15,7 @@
 
  */
 
+@file:JvmName("KalugaDateJVMKt")
 package com.splendo.kaluga.base.utils
 
 import java.util.Calendar
diff --git a/example/ios/Demo/Resources/ResourcesListViewController.swift b/example/ios/Demo/Resources/ResourcesListViewController.swift
index dd17a9f0d..f6873d11d 100644
--- a/example/ios/Demo/Resources/ResourcesListViewController.swift
+++ b/example/ios/Demo/Resources/ResourcesListViewController.swift
@@ -36,7 +36,7 @@ class ResourcesListViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        title = "feature_resource".localized()
+        title = "feature_resources".localized()
 
         lifecycleManager = viewModel.addLifecycleManager(parent: self) { [weak self] in
             guard let viewModel = self?.viewModel else { return [] }
diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 93783021e..3a70019f1 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 93783021e2e6a0a0de0e9b82f1aa3c80f81ebf33
+Subproject commit 3a70019f1ea23f8364307c172f0548e03e1c0962
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
index 78d25b5e3..2f36de94d 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/stylable/TextStyles.kt
@@ -23,32 +23,32 @@ import com.splendo.kaluga.resources.defaultFont
 import com.splendo.kaluga.resources.defaultItalicFont
 import com.splendo.kaluga.resources.defaultMonospaceFont
 import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
-import com.splendo.kaluga.resources.stylable.TextStyle
+import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 
 object TextStyles {
 
     val defaultText by lazy {
-        TextStyle(defaultFont, DefaultColors.dimGray, 12.0f)
+        KalugaTextStyle(defaultFont, DefaultColors.dimGray, 12.0f)
     }
     val defaultTitle by lazy {
-        TextStyle(defaultFont, DefaultColors.dimGray, 16.0f)
+        KalugaTextStyle(defaultFont, DefaultColors.dimGray, 16.0f)
     }
     val defaultBoldText by lazy {
-        TextStyle(defaultBoldFont, DefaultColors.dimGray, 12.0f)
+        KalugaTextStyle(defaultBoldFont, DefaultColors.dimGray, 12.0f)
     }
     val defaultItalicText by lazy {
-        TextStyle(defaultItalicFont, DefaultColors.dimGray, 12.0f)
+        KalugaTextStyle(defaultItalicFont, DefaultColors.dimGray, 12.0f)
     }
     val defaultMonospaceText by lazy {
-        TextStyle(defaultMonospaceFont, DefaultColors.dimGray, 12.0f)
+        KalugaTextStyle(defaultMonospaceFont, DefaultColors.dimGray, 12.0f)
     }
     val whiteText by lazy {
-        TextStyle(defaultFont, DefaultColors.white, 12.0f)
+        KalugaTextStyle(defaultFont, DefaultColors.white, 12.0f)
     }
     val redText by lazy {
-        TextStyle(defaultFont, DefaultColors.red, 12.0f)
+        KalugaTextStyle(defaultFont, DefaultColors.red, 12.0f)
     }
     val oppositeText by lazy {
-        TextStyle(defaultFont, DefaultColors.dimGray, 12.0f, KalugaTextAlignment.END)
+        KalugaTextStyle(defaultFont, DefaultColors.dimGray, 12.0f, KalugaTextAlignment.END)
     }
 }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
index cae203dbe..b2773950c 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/LabelViewModel.kt
@@ -94,7 +94,7 @@ class LabelViewModel(styledStringBuilderProvider: StyledStringBuilder.Provider)
                 loremIpsum.styled(
                     styledStringBuilderProvider,
                     TextStyles.defaultText,
-                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.LeadingIndent(10.0f)) }
+                    { attributeSubstring(loremIpsumParagraph1, StringStyleAttribute.ParagraphStyleAttribute.LeadingIndent(10.0f, 15.0f)) }
                 ),
             ),
             KalugaLabel.Styled(
diff --git a/resources/src/androidLibMain/kotlin/DarkMode.kt b/resources/src/androidLibMain/kotlin/DarkMode.kt
index 3ef4ba3fb..afd9c24c1 100644
--- a/resources/src/androidLibMain/kotlin/DarkMode.kt
+++ b/resources/src/androidLibMain/kotlin/DarkMode.kt
@@ -20,6 +20,9 @@ package com.splendo.kaluga.resources
 import android.content.res.Configuration
 import com.splendo.kaluga.base.ApplicationHolder
 
+/**
+ * When `true` the application is in Dark Mode.
+ */
 actual val isInDarkMode: Boolean get() = when (ApplicationHolder.applicationContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
     Configuration.UI_MODE_NIGHT_YES -> true
     else -> false
diff --git a/resources/src/androidLibMain/kotlin/KalugaColor.kt b/resources/src/androidLibMain/kotlin/KalugaColor.kt
index c44cb10ce..f8a8f613f 100644
--- a/resources/src/androidLibMain/kotlin/KalugaColor.kt
+++ b/resources/src/androidLibMain/kotlin/KalugaColor.kt
@@ -19,19 +19,69 @@
 
 package com.splendo.kaluga.resources
 
+/**
+ * Class describing a color
+ */
 actual typealias KalugaColor = Int
 
+/**
+ * Gets the red value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.red: Double get() = redInt.toDouble() / 255.0
+
+/**
+ * Gets the red value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.redInt: Int get() = android.graphics.Color.red(this)
+
+/**
+ * Gets the green value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.green: Double get() = greenInt.toDouble() / 255.0
+
+/**
+ * Gets the green value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.greenInt: Int get() = android.graphics.Color.green(this)
+
+/**
+ * Gets the blue value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.blue: Double get() = blueInt.toDouble() / 255.0
+
+/**
+ * Gets the blue value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.blueInt: Int get() = android.graphics.Color.blue(this)
+
+/**
+ * Gets the alpha value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.alpha: Double get() = alphaInt.toDouble() / 255.0
+
+/**
+ * Gets the alpha value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.alphaInt: Int get() = android.graphics.Color.alpha(this)
 
+/**
+ * Creates a [KalugaColor] using red, green, blue, and (optional) alpha, all ranging between `0.0` and `1.0`.
+ * @param red The red color value ranging between `0.0` and `1.0`.
+ * @param green The green color value ranging between `0.0` and `1.0`.
+ * @param blue The blue color value ranging between `0.0` and `1.0`.
+ * @param alpha The alpha color value ranging between `0.0` and `1.0`. Defaults to `1.0`
+ * @return The [KalugaColor] with the corresponding red, green, blue, and alpha values
+ */
 actual fun colorFrom(red: Double, green: Double, blue: Double, alpha: Double): KalugaColor {
     return android.graphics.Color.argb((alpha * 255.0).toInt(), (red * 255.0).toInt(), (green * 255.0).toInt(), (blue * 255.0).toInt())
 }
 
+/**
+ * Creates a [KalugaColor] using red, green, blue, and (optional) alpha, all ranging between `0` and `255`.
+ * @param redInt The red color value ranging between `0` and `255`.
+ * @param greenInt The green color value ranging between `0` and `255`.
+ * @param blueInt The blue color value ranging between `0` and `255`.
+ * @param alphaInt The alpha color value ranging between `0` and `255`. Defaults to `255`
+ * @return The [KalugaColor] with the corresponding red, green, blue, and alpha values
+ */
 actual fun colorFrom(redInt: Int, greenInt: Int, blueInt: Int, alphaInt: Int): KalugaColor = android.graphics.Color.argb(alphaInt, redInt, greenInt, blueInt)
diff --git a/resources/src/androidLibMain/kotlin/KalugaFont.kt b/resources/src/androidLibMain/kotlin/KalugaFont.kt
index 21cffdc0b..0f28772ae 100644
--- a/resources/src/androidLibMain/kotlin/KalugaFont.kt
+++ b/resources/src/androidLibMain/kotlin/KalugaFont.kt
@@ -20,9 +20,27 @@ package com.splendo.kaluga.resources
 
 import android.graphics.Typeface
 
+/**
+ * Class describing a font
+ */
 actual typealias KalugaFont = Typeface
 
+/**
+ * The default system [KalugaFont]
+ */
 actual val defaultFont: KalugaFont get() = Typeface.DEFAULT
+
+/**
+ * The default bold system [KalugaFont]
+ */
 actual val defaultBoldFont: KalugaFont get() = Typeface.DEFAULT_BOLD
+
+/**
+ * The default italic system [KalugaFont]
+ */
 actual val defaultItalicFont: KalugaFont get() = Typeface.create(Typeface.DEFAULT, Typeface.ITALIC)
+
+/**
+ * The default monospace system [KalugaFont]
+ */
 actual val defaultMonospaceFont: KalugaFont get() = Typeface.MONOSPACE
diff --git a/resources/src/androidLibMain/kotlin/KalugaImage.kt b/resources/src/androidLibMain/kotlin/KalugaImage.kt
index 25148b4a6..7c8143ec9 100644
--- a/resources/src/androidLibMain/kotlin/KalugaImage.kt
+++ b/resources/src/androidLibMain/kotlin/KalugaImage.kt
@@ -14,14 +14,24 @@
     limitations under the License.
 
  */
+@file:JvmName("KalugaImageAndroidKt")
 
 package com.splendo.kaluga.resources
 
 import android.graphics.drawable.Drawable
 import androidx.core.graphics.drawable.DrawableCompat
 
+/**
+ * Class describing an image.
+ * @property drawable the [Drawable] representing the image
+ */
 actual data class KalugaImage(val drawable: Drawable)
 
+/**
+ * Attempts to create a new [KalugaImage] that is tinted in a given [KalugaColor]
+ * @param color The [KalugaColor] to use for tinting.
+ * @return The tinted [KalugaImage] or `null` if tinting could not be applied.
+ */
 actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? {
     return drawable.constantState?.newDrawable()?.mutate()?.let {
         val wrapped = DrawableCompat.wrap(it)
diff --git a/resources/src/androidLibMain/kotlin/PixelUtils.kt b/resources/src/androidLibMain/kotlin/PixelUtils.kt
index 16a7d3800..7a6c6c1c3 100644
--- a/resources/src/androidLibMain/kotlin/PixelUtils.kt
+++ b/resources/src/androidLibMain/kotlin/PixelUtils.kt
@@ -20,7 +20,18 @@ package com.splendo.kaluga.resources
 import android.content.Context
 import android.util.TypedValue
 
+/**
+ * Gets the `pixel` value for a [Float] in `Device Independent Pixels`
+ * @param context the [Context] of the window to render the pixels
+ * @return the number of pixels equal to this amount of `Device Independent Pixels` for this device
+ */
 fun Float.dpToPixel(context: Context): Float = toPixel(TypedValue.COMPLEX_UNIT_DIP, context)
+
+/**
+ * Gets the `pixel` value for a [Float] in `Scaled Pixels`
+ * @param context the [Context] of the window to render the pixels
+ * @return the number of pixels equal to this amount of `Scaled Pixels` for this device
+ */
 fun Float.spToPixel(context: Context): Float = toPixel(TypedValue.COMPLEX_UNIT_SP, context)
 
 private fun Float.toPixel(unit: Int, context: Context): Float = TypedValue.applyDimension(
diff --git a/resources/src/androidLibMain/kotlin/Resources.kt b/resources/src/androidLibMain/kotlin/Resources.kt
index 7323de61e..9bdb2a5d0 100644
--- a/resources/src/androidLibMain/kotlin/Resources.kt
+++ b/resources/src/androidLibMain/kotlin/Resources.kt
@@ -27,6 +27,10 @@ import com.splendo.kaluga.base.ApplicationHolder.Companion.application
 import com.splendo.kaluga.base.ApplicationHolder.Companion.applicationContext
 import kotlinx.coroutines.CompletableDeferred
 
+/**
+ * Default implementation of a [StringLoader].
+ * @param context the [Context] from which to load the string resources
+ */
 actual class DefaultStringLoader(private val context: Context?) : StringLoader {
     actual constructor() : this(if (application != null) applicationContext else null)
     override fun loadString(identifier: String, defaultValue: String): String {
@@ -52,6 +56,10 @@ actual class DefaultStringLoader(private val context: Context?) : StringLoader {
     }
 }
 
+/**
+ * Default implementation of a [KalugaColorLoader].
+ * @param context the [Context] from which to load the color resources
+ */
 actual class DefaultColorLoader(private val context: Context?) : KalugaColorLoader {
     actual constructor() : this(if (application != null) applicationContext else null)
     override fun loadColor(identifier: String, defaultValue: KalugaColor?): KalugaColor? {
@@ -67,6 +75,10 @@ actual class DefaultColorLoader(private val context: Context?) : KalugaColorLoad
     }
 }
 
+/**
+ * Default implementation of an [ImageLoader].
+ * @param context the [Context] from which to load the image resources
+ */
 actual class DefaultImageLoader(private val context: Context?) : ImageLoader {
     actual constructor() : this(if (application != null) applicationContext else null)
     override fun loadImage(identifier: String, defaultValue: KalugaImage?): KalugaImage? {
@@ -82,6 +94,11 @@ actual class DefaultImageLoader(private val context: Context?) : ImageLoader {
     }
 }
 
+/**
+ * Default implementation of a [FontLoader].
+ * @param context the [Context] from which to load the font resources
+ * @param handler a [Handler] for the thread the completion of loading the font should called on. If `null`, the UI thread will be used.
+ */
 actual class DefaultFontLoader(private val context: Context?, private val handler: Handler?) : FontLoader {
     actual constructor() : this(if (application != null) applicationContext else null, null)
     override suspend fun loadFont(identifier: String, defaultValue: KalugaFont?): KalugaFont? {
diff --git a/resources/src/androidLibMain/kotlin/StyledString.kt b/resources/src/androidLibMain/kotlin/StyledString.kt
index 08494b55c..cdeab0104 100644
--- a/resources/src/androidLibMain/kotlin/StyledString.kt
+++ b/resources/src/androidLibMain/kotlin/StyledString.kt
@@ -1,3 +1,21 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+@file:JvmName("StyledStringAndroidkt")
 package com.splendo.kaluga.resources
 
 import android.content.Context
@@ -26,14 +44,34 @@ import com.splendo.kaluga.resources.view.alignment
 import kotlin.math.min
 import kotlin.math.roundToInt
 
+/**
+ * A text configured with [StringStyleAttribute]
+ * @property spannable the [Spannable] styled according to some [StringStyleAttribute]
+ * @property defaultTextStyle The [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range.
+ * This may be partially overwritten (e.g. [StringStyleAttribute.CharacterStyleAttribute.ForegroundColor] may overwrite [KalugaTextStyle.color])
+ * @property linkStyle The [LinkStyle] to apply when [StringStyleAttribute.Link] is applied.
+ * When `null` the Theme default will be used
+ */
 actual class StyledString(
     val spannable: Spannable,
     actual val defaultTextStyle: KalugaTextStyle,
     actual val linkStyle: LinkStyle?
 )
 
+/**
+ * Gets the plain string of a [StyledString]
+ */
 actual val StyledString.rawString: String get() = spannable.toString()
 
+/**
+ * Builder for creating a [StyledString]
+ * @param string the String to style
+ * @param defaultTextStyle The [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range.
+ * This may be partially overwritten (e.g. [StringStyleAttribute.CharacterStyleAttribute.ForegroundColor] may overwrite [KalugaTextStyle.color])
+ * @param linkStyle The [LinkStyle] to apply when [StringStyleAttribute.Link] is applied.
+ * When `null` the Theme default will be used
+ * @param context the [Context] in which the [StyledString] will be displayed
+ */
 actual class StyledStringBuilder constructor(
     string: String,
     private val defaultTextStyle: KalugaTextStyle,
@@ -41,7 +79,19 @@ actual class StyledStringBuilder constructor(
     private val context: Context
 ) {
 
+    /**
+     * Provider for a [StyledStringBuilder]
+     * @param context the [Context] in which any build [StyledString] will be displayed
+     */
     actual class Provider(private val context: Context = ApplicationHolder.applicationContext) {
+
+        /**
+         * Provides a [StyledStringBuilder] to build a [StyledString] for a given text
+         * @param string the text for which to build the [StyledString]
+         * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+         * @param linkStyle the [LinkStyle] to apply when [StringStyleAttribute.Link] is applied
+         * @return the [StyledStringBuilder] to build a [StyledString] for [string]
+         */
         actual fun provide(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) =
             StyledStringBuilder(string, defaultTextStyle, linkStyle, context)
     }
@@ -54,6 +104,12 @@ actual class StyledStringBuilder constructor(
 
     private val builder = SpannableString(string)
 
+    /**
+     * Adds a [StringStyleAttribute] for a given range
+     * @param attribute the [StringStyleAttribute] to apply
+     * @param range the [IntRange] at which to apply the style
+     * @throws [IndexOutOfBoundsException] if [range] is out of bounds for the text to span
+     */
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
         if (range.first < 0 || range.last >= builder.length) {
             throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
@@ -161,8 +217,8 @@ actual class StyledStringBuilder constructor(
     private val StringStyleAttribute.ParagraphStyleAttribute.paragraphStyle: ParagraphStyle
         get() = when (this) {
             is StringStyleAttribute.ParagraphStyleAttribute.LeadingIndent -> LeadingMarginSpan.Standard(
-                firstLineIndent.toInt(),
-                indent.toInt()
+                firstLineIndent.spToPixel(context).toInt(),
+                indent.spToPixel(context).toInt()
             )
             is StringStyleAttribute.ParagraphStyleAttribute.LineSpacing -> object : LineHeightSpan {
                 override fun chooseHeight(
@@ -200,6 +256,10 @@ actual class StyledStringBuilder constructor(
             )
         }
 
+    /**
+     * Creates the [StyledString]
+     * @return the created [StyledString]
+     */
     actual fun create(): StyledString {
         return StyledString(builder, defaultTextStyle, linkStyle)
     }
diff --git a/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt b/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt
index 1573e622c..72d6c3bf4 100644
--- a/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt
+++ b/resources/src/androidLibMain/kotlin/view/BackgroundStyle.kt
@@ -27,6 +27,11 @@ import com.splendo.kaluga.resources.dpToPixel
 import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.GradientStyle
 
+/**
+ * Creates a [Drawable] for a [KalugaBackgroundStyle]
+ * @param context the [Context] of the [Drawable]
+ * @return the [Drawable] to display the [KalugaBackgroundStyle]
+ */
 fun KalugaBackgroundStyle.createDrawable(context: Context): Drawable {
     return GradientDrawable().apply {
         applyShape(this@createDrawable.shape, context)
@@ -113,6 +118,10 @@ private fun GradientDrawable.applyStrokeStyle(strokeStyle: KalugaBackgroundStyle
     }
 }
 
+/**
+ * Sets a [KalugaBackgroundStyle] to a [View.setBackground]
+ * @param backgroundStyle the [KalugaBackgroundStyle] to apply
+ */
 fun View.applyBackgroundStyle(backgroundStyle: KalugaBackgroundStyle) {
     background = backgroundStyle.createDrawable(context)
 }
diff --git a/resources/src/androidLibMain/kotlin/view/Button.kt b/resources/src/androidLibMain/kotlin/view/Button.kt
index a7eb23881..1946116d3 100644
--- a/resources/src/androidLibMain/kotlin/view/Button.kt
+++ b/resources/src/androidLibMain/kotlin/view/Button.kt
@@ -26,27 +26,48 @@ import com.splendo.kaluga.resources.KalugaColor
 import com.splendo.kaluga.resources.stylable.KalugaButtonStyle
 
 /**
- * Binds kaluga button
- *
- * @throws IllegalArgumentException in case a unknown button type
+ * Makes a [android.widget.Button] look and behave according to a [KalugaButton]
+ * @param button the [KalugaButton] that specifies the look and behaviour of the [android.widget.Button]
+ * @param rippleStyle a [RippleStyle] that is applied when the button is pressed
  */
-fun android.widget.Button.bindButton(button: KalugaButton) {
+fun android.widget.Button.bindButton(button: KalugaButton, rippleStyle: RippleStyle = RippleStyle.ForegroundRipple) {
     text = when (button) {
         is KalugaButton.Plain -> button.text
         is KalugaButton.Styled -> button.text.spannable
     }
-    applyButtonStyle(button.style)
+    applyButtonStyle(button.style, rippleStyle)
     isAllCaps = false
     isEnabled = button.isEnabled
     setOnClickListener { button.action() }
 }
 
+/**
+ * Style of Ripple effect to use when a [android.widget.Button] is configured with a [KalugaButtonStyle]
+ */
 sealed class RippleStyle {
+
+    /**
+     * A [RippleStyle] where no Ripple effect is applied
+     */
     object None : RippleStyle()
+
+    /**
+     * A [RippleStyle] where the ripple has the color of the [com.splendo.kaluga.resources.stylable.ButtonStateStyle.textColor] of the [KalugaButtonStyle.pressedStyle]
+     */
     object ForegroundRipple : RippleStyle()
+
+    /**
+     * A [RippleStyle] where the ripple has a custom [KalugaColor]
+     * @property color the [KalugaColor] of the Ripple effect
+     */
     data class CustomRipple(val color: KalugaColor) : RippleStyle()
 }
 
+/**
+ * Makes a [android.widget.Button] look as specified by a [KalugaButtonStyle]
+ * @param style the [KalugaButtonStyle] that specifies the look of the [android.widget.Button]
+ * @param rippleStyle the [RippleStyle] to apply when the button is pressed
+ */
 fun android.widget.Button.applyButtonStyle(style: KalugaButtonStyle, rippleStyle: RippleStyle = RippleStyle.ForegroundRipple) {
     typeface = style.font
     isAllCaps = false
diff --git a/resources/src/androidLibMain/kotlin/view/TextAlignment.kt b/resources/src/androidLibMain/kotlin/view/TextAlignment.kt
index dfa8a3de8..183e45568 100644
--- a/resources/src/androidLibMain/kotlin/view/TextAlignment.kt
+++ b/resources/src/androidLibMain/kotlin/view/TextAlignment.kt
@@ -1,3 +1,20 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
 package com.splendo.kaluga.resources.view
 
 import android.content.Context
@@ -8,6 +25,11 @@ import android.view.Gravity
 import android.view.View
 import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
 
+/**
+ * Gets the [Layout.Alignment] associated with a [KalugaTextAlignment]
+ * @param context the [Context] used to determine the reading direction
+ * @return the [Layout.Alignment] associated with this [KalugaTextAlignment]
+ */
 fun KalugaTextAlignment.alignment(context: Context): Layout.Alignment {
     val locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
         context.resources.configuration.locales.get(0)
@@ -32,12 +54,20 @@ fun KalugaTextAlignment.alignment(context: Context): Layout.Alignment {
     }
 }
 
+/**
+ * Gets the text alignment of a [Layout.Alignment]
+ * Can be either [View.TEXT_ALIGNMENT_TEXT_START], [View.TEXT_ALIGNMENT_TEXT_END], or [View.TEXT_ALIGNMENT_CENTER]
+ */
 val Layout.Alignment.viewAlignment: Int get() = when (this) {
     Layout.Alignment.ALIGN_NORMAL -> View.TEXT_ALIGNMENT_TEXT_START
     Layout.Alignment.ALIGN_OPPOSITE -> View.TEXT_ALIGNMENT_TEXT_END
     Layout.Alignment.ALIGN_CENTER -> View.TEXT_ALIGNMENT_CENTER
 }
 
+/**
+ * Gets the gravity of a [Layout.Alignment]
+ * Can be either [Gravity.START], [Gravity.END], or [Gravity.CENTER_HORIZONTAL]
+ */
 val Layout.Alignment.gravity: Int get() = when (this) {
     Layout.Alignment.ALIGN_NORMAL -> Gravity.START
     Layout.Alignment.ALIGN_OPPOSITE -> Gravity.END
diff --git a/resources/src/androidLibMain/kotlin/view/TextView.kt b/resources/src/androidLibMain/kotlin/view/TextView.kt
index c37bf079d..a28450f9b 100644
--- a/resources/src/androidLibMain/kotlin/view/TextView.kt
+++ b/resources/src/androidLibMain/kotlin/view/TextView.kt
@@ -1,3 +1,20 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
 package com.splendo.kaluga.resources.view
 
 import android.content.res.ColorStateList
@@ -6,6 +23,10 @@ import android.text.style.URLSpan
 import android.widget.TextView
 import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 
+/**
+ * Makes a [TextView] look according to a [KalugaLabel]
+ * @param label the [KalugaLabel] that specifies the look of the [TextView]
+ */
 fun TextView.bindLabel(label: KalugaLabel) {
     text = when (label) {
         is KalugaLabel.Plain -> label.text
@@ -22,6 +43,10 @@ fun TextView.bindLabel(label: KalugaLabel) {
     applyTextStyle(label.style)
 }
 
+/**
+ * Makes a [TextView] look as specified by a [KalugaTextStyle]
+ * @param textStyle the [KalugaTextStyle] that specifies the look of the [TextView]
+ */
 fun TextView.applyTextStyle(textStyle: KalugaTextStyle) {
     typeface = textStyle.font
     textSize = textStyle.size
diff --git a/resources/src/commonMain/kotlin/KalugaColor.kt b/resources/src/commonMain/kotlin/KalugaColor.kt
index 56ed225fb..380138906 100644
--- a/resources/src/commonMain/kotlin/KalugaColor.kt
+++ b/resources/src/commonMain/kotlin/KalugaColor.kt
@@ -51,30 +51,37 @@ val KalugaColor.serializable get() = SerializableColor(this)
  * Gets the red value of the color in a range between `0.0` and `1.0`
  */
 expect val KalugaColor.red: Double
+
 /**
  * Gets the red value of the color in a range between `0` and `255`
  */
 expect val KalugaColor.redInt: Int
+
 /**
  * Gets the green value of the color in a range between `0.0` and `1.0`
  */
 expect val KalugaColor.green: Double
+
 /**
  * Gets the green value of the color in a range between `0` and `255`
  */
 expect val KalugaColor.greenInt: Int
+
 /**
  * Gets the blue value of the color in a range between `0.0` and `1.0`
  */
 expect val KalugaColor.blue: Double
+
 /**
  * Gets the blue value of the color in a range between `0` and `255`
  */
 expect val KalugaColor.blueInt: Int
+
 /**
  * Gets the alpha value of the color in a range between `0.0` and `1.0`
  */
 expect val KalugaColor.alpha: Double
+
 /**
  * Gets the alpha value of the color in a range between `0` and `255`
  */
diff --git a/resources/src/commonMain/kotlin/KalugaFont.kt b/resources/src/commonMain/kotlin/KalugaFont.kt
index 449aa83d0..1c3819449 100644
--- a/resources/src/commonMain/kotlin/KalugaFont.kt
+++ b/resources/src/commonMain/kotlin/KalugaFont.kt
@@ -25,7 +25,22 @@ expect class KalugaFont
 @Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaColor"))
 typealias Font = KalugaFont
 
+/**
+ * The default system [KalugaFont]
+ */
 expect val defaultFont: KalugaFont
+
+/**
+ * The default bold system [KalugaFont]
+ */
 expect val defaultBoldFont: KalugaFont
+
+/**
+ * The default italic system [KalugaFont]
+ */
 expect val defaultItalicFont: KalugaFont
+
+/**
+ * The default monospace system [KalugaFont]
+ */
 expect val defaultMonospaceFont: KalugaFont
diff --git a/resources/src/commonMain/kotlin/Resources.kt b/resources/src/commonMain/kotlin/Resources.kt
index 82ae77f6c..52216c45b 100644
--- a/resources/src/commonMain/kotlin/Resources.kt
+++ b/resources/src/commonMain/kotlin/Resources.kt
@@ -40,7 +40,9 @@ interface StringLoader {
     fun loadQuantityString(identifier: String, quantity: Int, defaultValue: String): String
 }
 
-/** Default implementation of a [StringLoader]. */
+/**
+ * Default implementation of a [StringLoader].
+ */
 expect class DefaultStringLoader() : StringLoader
 
 /**
@@ -56,7 +58,9 @@ interface KalugaColorLoader {
     fun loadColor(identifier: String, defaultValue: KalugaColor?): KalugaColor?
 }
 
-/** Default implementation of a [KalugaColorLoader]. */
+/**
+ * Default implementation of a [KalugaColorLoader].
+ */
 expect class DefaultColorLoader() : KalugaColorLoader
 
 /**
@@ -72,7 +76,9 @@ interface ImageLoader {
     fun loadImage(identifier: String, defaultValue: KalugaImage?): KalugaImage?
 }
 
-/** Default implementation of an [ImageLoader]. */
+/**
+ * Default implementation of an [ImageLoader].
+ */
 expect class DefaultImageLoader() : ImageLoader
 
 /**
@@ -88,7 +94,9 @@ interface FontLoader {
     suspend fun loadFont(identifier: String, defaultValue: KalugaFont?): KalugaFont?
 }
 
-/** Default implementation of a [FontLoader]. */
+/**
+ * Default implementation of a [FontLoader].
+ */
 expect class DefaultFontLoader() : FontLoader
 
 /**
diff --git a/resources/src/commonMain/kotlin/StyledString.kt b/resources/src/commonMain/kotlin/StyledString.kt
index f90a4886b..3fd87d526 100644
--- a/resources/src/commonMain/kotlin/StyledString.kt
+++ b/resources/src/commonMain/kotlin/StyledString.kt
@@ -15,12 +15,10 @@
 
  */
 
-@file:JvmName("AndroidStyledString")
 package com.splendo.kaluga.resources
 
 import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
 import com.splendo.kaluga.resources.stylable.KalugaTextStyle
-import kotlin.jvm.JvmName
 
 /**
  * A style to apply to a [StyledString] when [StringStyleAttribute.Link] is applied
@@ -218,24 +216,105 @@ sealed class StringStyleAttribute {
      * A [StringStyleAttribute] that is applied to individual characters
      */
     sealed class CharacterStyleAttribute : StringStyleAttribute() {
+
+        /**
+         * A [CharacterStyleAttribute] that adds a background color to the character
+         * @property color the [KalugaColor] to show in the background
+         */
         data class BackgroundColor(val color: KalugaColor) : CharacterStyleAttribute()
+
+        /**
+         * A [CharacterStyleAttribute] that sets the text color of the character
+         * @property color the [KalugaColor] of the character
+         */
         data class ForegroundColor(val color: KalugaColor) : CharacterStyleAttribute()
+
+        /**
+         * A [CharacterStyleAttribute] that sets a [KalugaTextStyle] to the character
+         * @property textStyle the [KalugaTextStyle] of the character
+         */
         data class TextStyle(val textStyle: KalugaTextStyle) : CharacterStyleAttribute()
+
+        /**
+         * A [CharacterStyleAttribute] that sets a [KalugaFont] to the character
+         * @property font the [KalugaFont] to show the character in
+         * @property size the size of the font in `points`
+         */
         data class Font(val font: KalugaFont, val size: Float) : CharacterStyleAttribute()
+
+        /**
+         * A [CharacterStyleAttribute] that adds a stroke to the character
+         * @property width the width of the stroke as a percentage of the font size
+         * @property color the [KalugaColor] of the stroke
+         */
         data class Stroke(val width: Float, val color: KalugaColor) : CharacterStyleAttribute()
+
+        /**
+         * A [CharacterStyleAttribute] that adds a shadow to the character
+         * @property color the [KalugaColor] of the shadow
+         * @property xOffset the shadow offset along the x-axis in `points`
+         * @property yOffset the shadow offset along the y-axis in `points`
+         * @property blurRadius the radius at which the shadow is blurred in `points`
+         */
         data class Shadow(val color: KalugaColor, val xOffset: Float, val yOffset: Float, val blurRadius: Float) : CharacterStyleAttribute()
+
+        /**
+         * A [CharacterStyleAttribute] that adds kerning to the character
+         * @property kern the kerning size in `EM` units
+         */
         data class Kerning(val kern: Float) : CharacterStyleAttribute()
+
+        /**
+         * A [CharacterStyleAttribute] that adds a strike through to the character
+         */
         object Strikethrough : CharacterStyleAttribute()
+
+        /**
+         * A [CharacterStyleAttribute] that adds an underline to the character
+         */
         object Underline : CharacterStyleAttribute()
+
+        /**
+         * A [CharacterStyleAttribute] that makes the character appear in superscript
+         */
         object SuperScript : CharacterStyleAttribute()
+
+        /**
+         * A [CharacterStyleAttribute] that makes the character appear in subscript
+         */
         object SubScript : CharacterStyleAttribute()
     }
 
+    /**
+     * A [StringStyleAttribute] that is applied to an entire paragraph
+     */
     sealed class ParagraphStyleAttribute : StringStyleAttribute() {
+
+        /**
+         * A [ParagraphStyleAttribute] that adds an indent to the leading side of the paragraph according to the reading direction
+         * @property indent the indent in `points`
+         * @property firstLineIndent the indent to apply to the first line of the paragraph in `points`
+         */
         data class LeadingIndent(val indent: Float, val firstLineIndent: Float = indent) : ParagraphStyleAttribute()
+
+        /**
+         * A [ParagraphStyleAttribute] that adds spacing between the lines
+         * @property spacing the spacing in `points` between the lines of the paragraph
+         * @property paragraphSpacing the space between paragraphs in `points`. The space between paragraphs is determined by adding the previous paragraph’s [paragraphSpacing] and the current paragraph’s [paragraphSpacingBefore]
+         * @property paragraphSpacingBefore the space between the current and previous paragraph in `points`. The space between paragraphs is determined by adding the previous paragraph’s [paragraphSpacing] and the current paragraph’s [paragraphSpacingBefore].
+         */
         data class LineSpacing(val spacing: Float, val paragraphSpacing: Float = 0.0f, val paragraphSpacingBefore: Float = 0.0f) : ParagraphStyleAttribute()
+
+        /**
+         * A [ParagraphStyleAttribute] that aligns the paragraph according to a [KalugaTextAlignment]
+         * @param alignment the [KalugaTextAlignment] to align the paragraph with
+         */
         data class Alignment(val alignment: KalugaTextAlignment) : ParagraphStyleAttribute()
     }
 
+    /**
+     * A [StringStyleAttribute] that makes part of the text clickable to open a URL
+     * @property url the url string to open when the attribute is pressed
+     */
     data class Link(val url: String) : StringStyleAttribute()
 }
diff --git a/resources/src/commonMain/kotlin/stylable/GradientStyle.kt b/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
index 3d3989ed5..7776d55b6 100644
--- a/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/GradientStyle.kt
@@ -117,7 +117,7 @@ sealed class GradientStyle(val colorPoints: List<ColorPoint>) {
 
     /**
      * A [GradientStyle] that radiates out from a [CenterPoint]
-     * @property radius the radius in pixels at which the gradient stops
+     * @property radius the radius in `scalable pixels` at which the gradient stops
      * @property centerPoint the [CenterPoint] from which the gradient radiates out
      */
     class Radial private constructor(
@@ -130,7 +130,7 @@ sealed class GradientStyle(val colorPoints: List<ColorPoint>) {
             /**
              * Creates a [Radial] gradient style using a list of [KalugaColor], a range, and a [CenterPoint]
              * @param colors the list of [KalugaColor] on the gradient. Will be spread evenly across the gradient
-             * @param radius the radius in pixels at which the gradient stops
+             * @param radius the radius in `scalable pixels` at which the gradient stops
              * @param centerPoint the [CenterPoint] from which the gradient radiates out
              * @return the [Radial] gradient
              * @throws [ColorPointRangeError] if [colors] size is smaller than `2`
@@ -141,7 +141,7 @@ sealed class GradientStyle(val colorPoints: List<ColorPoint>) {
             /**
              * Creates a [Radial] gradient style using a list of [ColorPoint], a range, and a [CenterPoint]
              * @param colorPoints the list of [ColorPoint] on the gradient
-             * @param radius the radius in pixels at which the gradient stops
+             * @param radius the radius in `scalable pixels` at which the gradient stops
              * @param centerPoint the [CenterPoint] from which the gradient radiates out
              * @return the [Radial] gradient
              */
@@ -150,7 +150,6 @@ sealed class GradientStyle(val colorPoints: List<ColorPoint>) {
         }
     }
 
-
     /**
      * A [GradientStyle] that rotates around a [CenterPoint]
      * @property centerPoint the [CenterPoint] from which the gradient radiates out
diff --git a/resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt b/resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt
index ed2eb9163..6784e286f 100644
--- a/resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/KalugaBackgroundStyle.kt
@@ -56,8 +56,8 @@ data class KalugaBackgroundStyle(
 
         /**
          * A rectangular [Shape]
-         * @property cornerRadiusX the radius in pixels applied to the x-dimension of the corner
-         * @property cornerRadiusY the radius in pixels applied to the y-dimension of the corner
+         * @property cornerRadiusX the radius in `scalable pixels` applied to the x-dimension of the corner
+         * @property cornerRadiusY the radius in `scalable pixels` applied to the y-dimension of the corner
          * @property roundedCorners the set of [Corner] that are rounded according to [cornerRadiusX] and [cornerRadiusY]
          */
         data class Rectangle(
@@ -94,7 +94,7 @@ data class KalugaBackgroundStyle(
 
             /**
              * Constructor
-             * @param cornerRadius the radius in pixels to apply to the corners
+             * @param cornerRadius the radius in `scalable pixels` to apply to the corners
              * @param roundedCorners the set of [Corner] that are rounded according to [cornerRadius]
              */
             constructor(cornerRadius: Float = 0.0f, roundedCorners: Set<Corner> = Corner.values().toSet()) : this(cornerRadius, cornerRadius, roundedCorners)
@@ -118,7 +118,7 @@ data class KalugaBackgroundStyle(
 
         /**
          * A [StrokeStyle] with a solid color
-         * @param width the width of the stroke in pixels
+         * @param width the width of the stroke in `scalable pixels`
          * @param color the [KalugaColor] of the stroke
          */
         data class Stroke(val width: Float, val color: KalugaColor) : StrokeStyle()
diff --git a/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt b/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt
index fc5694ac1..981ab830a 100644
--- a/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt
+++ b/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt
@@ -24,7 +24,7 @@ import com.splendo.kaluga.resources.KalugaColor
 /**
  * The style to apply to a button
  * @property font the [KalugaFont] of the button text
- * @property textSize the size of the button text in Points
+ * @property textSize the size of the button text in `points`
  * @property textAlignment the [KalugaTextAlignment] of the text of the button
  * @property defaultStyle the [ButtonStateStyle] when the button is not in a special state
  * @property pressedStyle the [ButtonStateStyle] when the button is pressed
diff --git a/resources/src/iosMain/kotlin/DarkMode.kt b/resources/src/iosMain/kotlin/DarkMode.kt
index 278d1efb9..fbb6912e1 100644
--- a/resources/src/iosMain/kotlin/DarkMode.kt
+++ b/resources/src/iosMain/kotlin/DarkMode.kt
@@ -22,6 +22,9 @@ import platform.UIKit.UITraitCollection
 import platform.UIKit.UIUserInterfaceStyle
 import platform.UIKit.currentTraitCollection
 
+/**
+ * When `true` the application is in Dark Mode.
+ */
 actual val isInDarkMode: Boolean get() {
     return IOSVersion.systemVersion >= IOSVersion(12) && UITraitCollection.currentTraitCollection.userInterfaceStyle == UIUserInterfaceStyle.UIUserInterfaceStyleDark
 }
diff --git a/resources/src/iosMain/kotlin/KalugaColor.kt b/resources/src/iosMain/kotlin/KalugaColor.kt
index 6db6aa1b2..29d0a7895 100644
--- a/resources/src/iosMain/kotlin/KalugaColor.kt
+++ b/resources/src/iosMain/kotlin/KalugaColor.kt
@@ -22,18 +22,70 @@ import platform.CoreGraphics.CGColorGetAlpha
 import platform.CoreGraphics.CGColorGetComponents
 import platform.UIKit.UIColor
 
+/**
+ * Class describing a color
+ * @property uiColor the [UIColor] describing the color
+ */
 actual data class KalugaColor(val uiColor: UIColor)
 
+/**
+ * Gets the red value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.red: Double get() = CGColorGetComponents(uiColor.CGColor)?.get(0)?.toDouble() ?: 0.0
+
+/**
+ * Gets the red value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.redInt: Int get() = (red * 255.0).toInt()
+
+/**
+ * Gets the green value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.green: Double get() = CGColorGetComponents(uiColor.CGColor)?.get(1)?.toDouble() ?: 0.0
+
+/**
+ * Gets the green value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.blueInt: Int get() = (blue * 255.0).toInt()
+
+/**
+ * Gets the blue value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.blue: Double get() = CGColorGetComponents(uiColor.CGColor)?.get(2)?.toDouble() ?: 0.0
+
+/**
+ * Gets the blue value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.greenInt: Int get() = (green * 255.0).toInt()
+
+/**
+ * Gets the alpha value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.alpha: Double get() = CGColorGetAlpha(uiColor.CGColor).toDouble()
+
+/**
+ * Gets the alpha value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.alphaInt: Int get() = (alpha * 255.0).toInt()
 
+/**
+ * Creates a [KalugaColor] using red, green, blue, and (optional) alpha, all ranging between `0.0` and `1.0`.
+ * @param red The red color value ranging between `0.0` and `1.0`.
+ * @param green The green color value ranging between `0.0` and `1.0`.
+ * @param blue The blue color value ranging between `0.0` and `1.0`.
+ * @param alpha The alpha color value ranging between `0.0` and `1.0`. Defaults to `1.0`
+ * @return The [KalugaColor] with the corresponding red, green, blue, and alpha values
+ */
 actual fun colorFrom(red: Double, green: Double, blue: Double, alpha: Double): KalugaColor = KalugaColor(UIColor.colorWithRed(red, green, blue, alpha))
+
+/**
+ * Creates a [KalugaColor] using red, green, blue, and (optional) alpha, all ranging between `0` and `255`.
+ * @param redInt The red color value ranging between `0` and `255`.
+ * @param greenInt The green color value ranging between `0` and `255`.
+ * @param blueInt The blue color value ranging between `0` and `255`.
+ * @param alphaInt The alpha color value ranging between `0` and `255`. Defaults to `255`
+ * @return The [KalugaColor] with the corresponding red, green, blue, and alpha values
+ */
 actual fun colorFrom(redInt: Int, greenInt: Int, blueInt: Int, alphaInt: Int): KalugaColor {
     return colorFrom(redInt.toDouble() / 255.0, greenInt.toDouble() / 255.0, blueInt.toDouble() / 255.0, alphaInt.toDouble() / 255.0)
 }
diff --git a/resources/src/iosMain/kotlin/KalugaFont.kt b/resources/src/iosMain/kotlin/KalugaFont.kt
index 89569d2ee..c4fa124bf 100644
--- a/resources/src/iosMain/kotlin/KalugaFont.kt
+++ b/resources/src/iosMain/kotlin/KalugaFont.kt
@@ -21,9 +21,27 @@ import platform.UIKit.UIFont
 import platform.UIKit.UIFontWeightRegular
 import platform.UIKit.labelFontSize
 
+/**
+ * Class describing a font
+ */
 actual typealias KalugaFont = UIFont
 
+/**
+ * The default system [KalugaFont]
+ */
 actual val defaultFont: KalugaFont get() = UIFont.systemFontOfSize(UIFont.labelFontSize)
+
+/**
+ * The default bold system [KalugaFont]
+ */
 actual val defaultBoldFont: KalugaFont get() = UIFont.boldSystemFontOfSize(UIFont.labelFontSize)
+
+/**
+ * The default italic system [KalugaFont]
+ */
 actual val defaultItalicFont: KalugaFont get() = UIFont.italicSystemFontOfSize(UIFont.labelFontSize)
+
+/**
+ * The default monospace system [KalugaFont]
+ */
 actual val defaultMonospaceFont: KalugaFont get() = UIFont.monospacedSystemFontOfSize(UIFont.labelFontSize, UIFontWeightRegular)
diff --git a/resources/src/iosMain/kotlin/KalugaImage.kt b/resources/src/iosMain/kotlin/KalugaImage.kt
index 059d821ff..c19ae7384 100644
--- a/resources/src/iosMain/kotlin/KalugaImage.kt
+++ b/resources/src/iosMain/kotlin/KalugaImage.kt
@@ -20,6 +20,14 @@ package com.splendo.kaluga.resources
 import platform.UIKit.UIImage
 import platform.UIKit.UIImageRenderingMode
 
+/**
+ * Class describing an image.
+ */
 actual typealias KalugaImage = UIImage
 
+/**
+ * Attempts to create a new [KalugaImage] that is tinted in a given [KalugaColor]
+ * @param color The [KalugaColor] to use for tinting.
+ * @return The tinted [KalugaImage] or `null` if tinting could not be applied.
+ */
 actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? = this.imageWithTintColor(color.uiColor, UIImageRenderingMode.UIImageRenderingModeAlwaysOriginal)
diff --git a/resources/src/iosMain/kotlin/Resources.kt b/resources/src/iosMain/kotlin/Resources.kt
index 57391cf60..fc914bb54 100644
--- a/resources/src/iosMain/kotlin/Resources.kt
+++ b/resources/src/iosMain/kotlin/Resources.kt
@@ -27,6 +27,11 @@ import platform.UIKit.UITraitCollection
 import platform.UIKit.colorNamed
 import platform.UIKit.labelFontSize
 
+/**
+ * Default implementation of a [StringLoader].
+ * @param bundle the [NSBundle] from which to load the string resource
+ * @param table the string table to search in. If tableName is 'null` or is an empty string, the method attempts to use the table in `Localizable.strings`
+ */
 actual class DefaultStringLoader(private val bundle: NSBundle, private val table: String?) : StringLoader {
     actual constructor() : this(NSBundle.mainBundle, null)
     override fun loadString(identifier: String, defaultValue: String): String = bundle.localizedStringForKey(identifier, defaultValue, table)
@@ -40,16 +45,31 @@ actual class DefaultStringLoader(private val bundle: NSBundle, private val table
     }
 }
 
+/**
+ * Default implementation of a [KalugaColorLoader].
+ * @param bundle the [NSBundle] from which to load the color resource
+ * @param traitCollection The [UITraitCollection] that specifies the gamut to use when selecting the color.
+ */
 actual class DefaultColorLoader(private val bundle: NSBundle, private val traitCollection: UITraitCollection?) : KalugaColorLoader {
     actual constructor() : this(NSBundle.mainBundle, null)
     override fun loadColor(identifier: String, defaultValue: KalugaColor?): KalugaColor? = UIColor.colorNamed(identifier, bundle, traitCollection)?.let { KalugaColor(it) } ?: defaultValue
 }
 
+/**
+ * Default implementation of an [ImageLoader].
+ * @param bundle the [NSBundle] from which to load the image resource
+ * @param traitCollection The [UITraitCollection] associated with the intended environment for the image.
+ * Use this parameter to ensure that the system loads the correct variant of the image.
+ * If you specify `null`, this method uses the traits associated with the main screen.
+ */
 actual class DefaultImageLoader(private val bundle: NSBundle, private val traitCollection: UITraitCollection?) : ImageLoader {
     actual constructor() : this(NSBundle.mainBundle, null)
     override fun loadImage(identifier: String, defaultValue: KalugaImage?): KalugaImage? = UIImage.imageNamed(identifier, bundle, traitCollection) ?: defaultValue
 }
 
+/**
+ * Default implementation of a [FontLoader].
+ */
 actual class DefaultFontLoader actual constructor() : FontLoader {
     override suspend fun loadFont(identifier: String, defaultValue: KalugaFont?): KalugaFont? = UIFont.fontWithName(identifier, UIFont.labelFontSize) ?: defaultValue
 }
diff --git a/resources/src/iosMain/kotlin/StyledString.kt b/resources/src/iosMain/kotlin/StyledString.kt
index 12f401a39..50ffcd3dc 100644
--- a/resources/src/iosMain/kotlin/StyledString.kt
+++ b/resources/src/iosMain/kotlin/StyledString.kt
@@ -41,18 +41,62 @@ import platform.UIKit.NSShadow
 import platform.UIKit.NSUnderlineStyleSingle
 import platform.UIKit.size
 
-actual data class StyledString(val attributeString: NSAttributedString, actual val defaultTextStyle: KalugaTextStyle, actual val linkStyle: LinkStyle?)
-
+/**
+ * A text configured with [StringStyleAttribute]
+ * @property attributeString the [NSAttributedString] styled according to some [StringStyleAttribute]
+ * @property defaultTextStyle The [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range.
+ * This may be partially overwritten (e.g. [StringStyleAttribute.CharacterStyleAttribute.ForegroundColor] may overwrite [KalugaTextStyle.color])
+ * @property linkStyle The [LinkStyle] to apply when [StringStyleAttribute.Link] is applied.
+ * When `null` the Theme default will be used
+ */
+actual data class StyledString(
+    val attributeString: NSAttributedString,
+    actual val defaultTextStyle: KalugaTextStyle,
+    actual val linkStyle: LinkStyle?
+)
+
+/**
+ * Gets the plain string of a [StyledString]
+ */
 actual val StyledString.rawString: String get() = attributeString.string
 
-actual class StyledStringBuilder constructor(string: String, private val defaultTextStyle: KalugaTextStyle, private val linkStyle: LinkStyle?) {
-
+/**
+ * Builder for creating a [StyledString]
+ * @param string the String to style
+ * @param defaultTextStyle The [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range.
+ * This may be partially overwritten (e.g. [StringStyleAttribute.CharacterStyleAttribute.ForegroundColor] may overwrite [KalugaTextStyle.color])
+ * @param linkStyle The [LinkStyle] to apply when [StringStyleAttribute.Link] is applied.
+ * When `null` the Theme default will be used
+ */
+actual class StyledStringBuilder constructor(
+    string: String,
+    private val defaultTextStyle: KalugaTextStyle,
+    private val linkStyle: LinkStyle?
+) {
+
+    /**
+     * Provider for a [StyledStringBuilder]
+     */
     actual class Provider {
+
+        /**
+         * Provides a [StyledStringBuilder] to build a [StyledString] for a given text
+         * @param string the text for which to build the [StyledString]
+         * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+         * @param linkStyle the [LinkStyle] to apply when [StringStyleAttribute.Link] is applied
+         * @return the [StyledStringBuilder] to build a [StyledString] for [string]
+         */
         actual fun provide(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) = StyledStringBuilder(string, defaultTextStyle, linkStyle)
     }
 
     private val attributedString = NSMutableAttributedString.Companion.create(string)
 
+    /**
+     * Adds a [StringStyleAttribute] for a given range
+     * @param attribute the [StringStyleAttribute] to apply
+     * @param range the [IntRange] at which to apply the style
+     * @throws [IndexOutOfBoundsException] if [range] is out of bounds for the text to span
+     */
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
         if (range.first < 0 || range.last.toULong() >= attributedString.length) {
             throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
@@ -173,10 +217,14 @@ actual class StyledStringBuilder constructor(string: String, private val default
         }
     }
 
+    /**
+     * Creates the [StyledString]
+     * @return the created [StyledString]
+     */
     actual fun create(): StyledString = StyledString(attributedString, defaultTextStyle, linkStyle)
 }
 
-val NSAttributedString.urlRanges: List<Pair<CValue<NSRange>, NSURL>> get() {
+internal val NSAttributedString.urlRanges: List<Pair<CValue<NSRange>, NSURL>> get() {
     val result = mutableListOf<Pair<CValue<NSRange>, NSURL>>()
     enumerateAttribute("NSLink", IntRange(0, length.toInt() - 1).nsRange, 0) { match, matchedRange, _ ->
         if (match is NSURL) {
diff --git a/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt b/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
index 04c928fd0..164bd7f09 100644
--- a/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/BackgroundStyle.kt
@@ -42,8 +42,16 @@ import platform.UIKit.UIRectCornerTopLeft
 import platform.UIKit.UIRectCornerTopRight
 import platform.UIKit.UIView
 
+/**
+ * Sets a [KalugaBackgroundStyle] to a [UIView.layer]
+ * @param style the [KalugaBackgroundStyle] to apply
+ */
 fun UIView.applyBackgroundStyle(style: KalugaBackgroundStyle) = layer.applyBackgroundStyle(style, bounds)
 
+/**
+ * Sets a [KalugaBackgroundStyle] to a [CALayer]
+ * @param style the [KalugaBackgroundStyle] to apply
+ */
 fun CALayer.applyBackgroundStyle(style: KalugaBackgroundStyle, bounds: CValue<CGRect>) = apply {
     val maskPath = pathForShape(style.shape, bounds)
     mask = CAShapeLayer(this).apply {
@@ -99,7 +107,7 @@ private fun CALayer.applyFillStyle(fillStyle: KalugaBackgroundStyle.FillStyle, b
     )
 }
 
-fun List<CGColorRef>.mapToCGColor() = map {
+private fun List<CGColorRef>.mapToCGColor() = map {
     CFBridgingRelease(CFRetain(it))
 }
 
diff --git a/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt b/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
index f3d237994..95e4fdd14 100644
--- a/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/ButtonStyle.kt
@@ -41,7 +41,7 @@ import platform.UIKit.setFont
 import platform.darwin.NSObject
 import platform.objc.sel_registerName
 
-class UIControlClosure(private val action: () -> Unit) : NSObject() {
+internal class UIControlClosure(private val action: () -> Unit) : NSObject() {
 
     object Registry {
         val registeredUIControl = NSMapTable(NSPointerFunctionsWeakMemory, NSPointerFunctionsStrongMemory, 0)
@@ -53,6 +53,10 @@ class UIControlClosure(private val action: () -> Unit) : NSObject() {
     }
 }
 
+/**
+ * Makes a [UIButton] look and behave according to a [KalugaButton]
+ * @param button the [KalugaButton] that specifies the look and behaviour of the [UIButton]
+ */
 fun UIButton.bindButton(button: KalugaButton) {
     applyStyle(button.style)
     when (button) {
@@ -65,6 +69,10 @@ fun UIButton.bindButton(button: KalugaButton) {
     addTarget(wrappedAction, sel_registerName("invoke"), UIControlEventTouchUpInside)
 }
 
+/**
+ * Makes a [UIButton] look as specified by a [KalugaButtonStyle]
+ * @param buttonStyle the [KalugaButtonStyle] that specifies the look of the [UIButton]
+ */
 fun UIButton.applyStyle(buttonStyle: KalugaButtonStyle) {
     setFont(buttonStyle.font.fontWithSize(buttonStyle.textSize.toDouble()))
     setContentHorizontalAlignment(buttonStyle.textAlignment.contentHorizontalAlignment)
diff --git a/resources/src/iosMain/kotlin/uikit/TextAlignment.kt b/resources/src/iosMain/kotlin/uikit/TextAlignment.kt
index 932a09fa9..618f345b5 100644
--- a/resources/src/iosMain/kotlin/uikit/TextAlignment.kt
+++ b/resources/src/iosMain/kotlin/uikit/TextAlignment.kt
@@ -32,6 +32,9 @@ import platform.UIKit.UIControlContentHorizontalAlignmentRight
 import platform.UIKit.UIControlContentHorizontalAlignmentTrailing
 import platform.UIKit.UIUserInterfaceLayoutDirection
 
+/**
+ * Gets the [NSTextAlignment] of a [KalugaTextAlignment]
+ */
 val KalugaTextAlignment.nsTextAlignment: NSTextAlignment get() = when (this) {
     KalugaTextAlignment.LEFT -> NSTextAlignmentLeft
     KalugaTextAlignment.RIGHT -> NSTextAlignmentRight
@@ -44,6 +47,9 @@ val KalugaTextAlignment.nsTextAlignment: NSTextAlignment get() = when (this) {
     KalugaTextAlignment.START -> NSTextAlignmentNatural
 }
 
+/**
+ * Gets the [UIControlContentHorizontalAlignment] of a [KalugaTextAlignment]
+ */
 val KalugaTextAlignment.contentHorizontalAlignment: UIControlContentHorizontalAlignment get() = when (this) {
     KalugaTextAlignment.LEFT -> UIControlContentHorizontalAlignmentLeft
     KalugaTextAlignment.RIGHT -> UIControlContentHorizontalAlignmentRight
diff --git a/resources/src/iosMain/kotlin/uikit/TextStyle.kt b/resources/src/iosMain/kotlin/uikit/TextStyle.kt
index 0588930db..9c00c96ef 100644
--- a/resources/src/iosMain/kotlin/uikit/TextStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/TextStyle.kt
@@ -33,6 +33,10 @@ import platform.UIKit.UITextView
 import platform.UIKit.addGestureRecognizer
 import platform.darwin.sel_registerName
 
+/**
+ * Makes a [UILabel] look according to a [KalugaLabel]
+ * @param label the [KalugaLabel] that specifies the look of the [UILabel]
+ */
 fun UILabel.bindLabel(label: KalugaLabel) {
     applyTextStyle(label.style)
     when (label) {
@@ -68,7 +72,12 @@ fun UILabel.bindLabel(label: KalugaLabel) {
     }
 }
 
-fun UITextView.bindTextView(label: KalugaLabel) {
+/**
+ * Makes a [UITextView] look according to a [KalugaLabel]
+ * @param label the [KalugaLabel] that specifies the look of the [UITextView]
+ */
+
+fun UITextView.bindLabel(label: KalugaLabel) {
     when (label) {
         is KalugaLabel.Plain -> text = label.text
         is KalugaLabel.Styled -> {
@@ -89,6 +98,10 @@ fun UITextView.bindTextView(label: KalugaLabel) {
     applyTextStyle(label.style)
 }
 
+/**
+ * Makes a [UILabel] look as specified by a [KalugaTextStyle]
+ * @param textStyle the [KalugaTextStyle] that specifies the look of the [UILabel]
+ */
 fun UILabel.applyTextStyle(textStyle: KalugaTextStyle) {
     setFont(textStyle.font.fontWithSize(textStyle.size.toDouble()))
     textColor = textStyle.color.uiColor
@@ -96,12 +109,20 @@ fun UILabel.applyTextStyle(textStyle: KalugaTextStyle) {
     numberOfLines = 0
 }
 
+/**
+ * Makes a [UITextView] look as specified by a [KalugaTextStyle]
+ * @param textStyle the [KalugaTextStyle] that specifies the look of the [UITextView]
+ */
 fun UITextView.applyTextStyle(textStyle: KalugaTextStyle) {
     setFont(textStyle.font.fontWithSize(textStyle.size.toDouble()))
     textColor = textStyle.color.uiColor
     textAlignment = textStyle.alignment.nsTextAlignment
 }
 
+/**
+ * Makes a [UITextField] look as specified by a [KalugaTextStyle]
+ * @param textStyle the [KalugaTextStyle] that specifies the look of the [UITextField]
+ */
 fun UITextField.applyTextStyle(textStyle: KalugaTextStyle) {
     setFont(textStyle.font.fontWithSize(textStyle.size.toDouble()))
     textColor = textStyle.color.uiColor
diff --git a/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt b/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt
index 40a21c62a..faf5bb517 100644
--- a/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt
+++ b/resources/src/iosMain/kotlin/uikit/UILinkTapGesture.kt
@@ -50,7 +50,7 @@ import platform.darwin.NSUInteger
 import kotlin.math.max
 import kotlin.math.min
 
-class UILinkTapGesture(private val label: UILabel, private val urlRanges: List<Pair<CValue<NSRange>, NSURL>>) : NSObject() {
+internal class UILinkTapGesture(private val label: UILabel, private val urlRanges: List<Pair<CValue<NSRange>, NSURL>>) : NSObject() {
 
     object Registry {
         val registeredGestures = NSMapTable(NSPointerFunctionsWeakMemory, NSPointerFunctionsStrongMemory, 0)
diff --git a/resources/src/iosMain/kotlin/uikit/UILinkTextViewDelegate.kt b/resources/src/iosMain/kotlin/uikit/UILinkTextViewDelegate.kt
index 9050eebf5..42e2c9cfa 100644
--- a/resources/src/iosMain/kotlin/uikit/UILinkTextViewDelegate.kt
+++ b/resources/src/iosMain/kotlin/uikit/UILinkTextViewDelegate.kt
@@ -30,7 +30,7 @@ import platform.UIKit.UITextView
 import platform.UIKit.UITextViewDelegateProtocol
 import platform.darwin.NSObject
 
-class UILinkTextViewDelegate : NSObject(), UITextViewDelegateProtocol {
+internal class UILinkTextViewDelegate : NSObject(), UITextViewDelegateProtocol {
 
     object Registry {
         val registeredDelegates = NSMapTable(NSPointerFunctionsWeakMemory, NSPointerFunctionsStrongMemory, 0)
diff --git a/resources/src/jsMain/kotlin/DarkMode.kt b/resources/src/jsMain/kotlin/DarkMode.kt
index c929546ea..f39c4bd9a 100644
--- a/resources/src/jsMain/kotlin/DarkMode.kt
+++ b/resources/src/jsMain/kotlin/DarkMode.kt
@@ -17,4 +17,7 @@
 
 package com.splendo.kaluga.resources
 
+/**
+ * When `true` the application is in Dark Mode.
+ */
 actual val isInDarkMode: Boolean = false
diff --git a/resources/src/jsMain/kotlin/KalugaColor.kt b/resources/src/jsMain/kotlin/KalugaColor.kt
index d2c322d46..c97094ea5 100644
--- a/resources/src/jsMain/kotlin/KalugaColor.kt
+++ b/resources/src/jsMain/kotlin/KalugaColor.kt
@@ -17,19 +17,69 @@
 
 package com.splendo.kaluga.resources
 
+/**
+ * Class describing a color
+ */
 actual typealias KalugaColor = Int
 
+/**
+ * Gets the red value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.red: Double get() = redInt.toDouble() / 255.0
+
+/**
+ * Gets the red value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.redInt: Int get() = this shr 16 and 0xFF
+
+/**
+ * Gets the green value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.green: Double get() = greenInt.toDouble() / 255.0
+
+/**
+ * Gets the green value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.greenInt: Int get() = this shr 8 and 0xFF
+
+/**
+ * Gets the blue value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.blue: Double get() = blueInt.toDouble() / 255.0
+
+/**
+ * Gets the blue value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.blueInt: Int get() = this and 0xFF
+
+/**
+ * Gets the alpha value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.alpha: Double get() = alphaInt.toDouble() / 255.0
+
+/**
+ * Gets the alpha value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.alphaInt: Int get() = this ushr 24
 
+/**
+ * Creates a [KalugaColor] using red, green, blue, and (optional) alpha, all ranging between `0.0` and `1.0`.
+ * @param red The red color value ranging between `0.0` and `1.0`.
+ * @param green The green color value ranging between `0.0` and `1.0`.
+ * @param blue The blue color value ranging between `0.0` and `1.0`.
+ * @param alpha The alpha color value ranging between `0.0` and `1.0`. Defaults to `1.0`
+ * @return The [KalugaColor] with the corresponding red, green, blue, and alpha values
+ */
 actual fun colorFrom(red: Double, green: Double, blue: Double, alpha: Double): KalugaColor {
     return colorFrom((red * 255.0).toInt(), (green * 255.0).toInt(), (blue * 255.0).toInt(), (alpha * 255.0).toInt())
 }
 
+/**
+ * Creates a [KalugaColor] using red, green, blue, and (optional) alpha, all ranging between `0` and `255`.
+ * @param redInt The red color value ranging between `0` and `255`.
+ * @param greenInt The green color value ranging between `0` and `255`.
+ * @param blueInt The blue color value ranging between `0` and `255`.
+ * @param alphaInt The alpha color value ranging between `0` and `255`. Defaults to `255`
+ * @return The [KalugaColor] with the corresponding red, green, blue, and alpha values
+ */
 actual fun colorFrom(redInt: Int, greenInt: Int, blueInt: Int, alphaInt: Int): KalugaColor = alphaInt shl 24 or (redInt shl 16) or (greenInt shl 8) or blueInt
diff --git a/resources/src/jsMain/kotlin/KalugaFont.kt b/resources/src/jsMain/kotlin/KalugaFont.kt
index 12ab40560..3dc30e5cb 100644
--- a/resources/src/jsMain/kotlin/KalugaFont.kt
+++ b/resources/src/jsMain/kotlin/KalugaFont.kt
@@ -17,9 +17,27 @@
 
 package com.splendo.kaluga.resources
 
+/**
+ * Class describing a font
+ */
 actual class KalugaFont
 
+/**
+ * The default system [KalugaFont]
+ */
 actual val defaultFont: KalugaFont get() = KalugaFont()
+
+/**
+ * The default bold system [KalugaFont]
+ */
 actual val defaultBoldFont: KalugaFont get() = KalugaFont()
+
+/**
+ * The default italic system [KalugaFont]
+ */
 actual val defaultItalicFont: KalugaFont get() = KalugaFont()
+
+/**
+ * The default monospace system [KalugaFont]
+ */
 actual val defaultMonospaceFont: KalugaFont get() = KalugaFont()
diff --git a/resources/src/jsMain/kotlin/KalugaImage.kt b/resources/src/jsMain/kotlin/KalugaImage.kt
index f167a4554..959664d4a 100644
--- a/resources/src/jsMain/kotlin/KalugaImage.kt
+++ b/resources/src/jsMain/kotlin/KalugaImage.kt
@@ -17,6 +17,14 @@
 
 package com.splendo.kaluga.resources
 
+/**
+ * Class describing an image.
+ */
 actual class KalugaImage
 
+/**
+ * Attempts to create a new [KalugaImage] that is tinted in a given [KalugaColor]
+ * @param color The [KalugaColor] to use for tinting.
+ * @return The tinted [KalugaImage] or `null` if tinting could not be applied.
+ */
 actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? = null
diff --git a/resources/src/jsMain/kotlin/Resources.kt b/resources/src/jsMain/kotlin/Resources.kt
index 4fe633b43..839df5544 100644
--- a/resources/src/jsMain/kotlin/Resources.kt
+++ b/resources/src/jsMain/kotlin/Resources.kt
@@ -19,6 +19,11 @@ package com.splendo.kaluga.resources
 
 import com.splendo.kaluga.base.text.format
 
+/**
+ * Default implementation of a [StringLoader].
+ * @param transformer method for getting a String from a String identifier
+ * @param formatter method for formatting a String identifier given a quantity
+ */
 actual class DefaultStringLoader(
     private val transformer: (String) -> String?,
     private val formatter: (String, Int) -> String?
@@ -35,6 +40,10 @@ actual class DefaultStringLoader(
     ): String = formatter(identifier, quantity) ?: defaultValue
 }
 
+/**
+ * Default implementation of a [KalugaColorLoader].
+ * @param transformer method for getting a [KalugaColor] from a String identifier
+ */
 actual class DefaultColorLoader(private val transformer: (String) -> KalugaColor?) : KalugaColorLoader {
     actual constructor() : this({ null })
 
@@ -42,6 +51,10 @@ actual class DefaultColorLoader(private val transformer: (String) -> KalugaColor
         transformer(identifier) ?: defaultValue
 }
 
+/**
+ * Default implementation of a [ImageLoader].
+ * @param transformer method for getting a [KalugaImage] from a String identifier
+ */
 actual class DefaultImageLoader(private val transformer: (String) -> KalugaImage?) : ImageLoader {
     actual constructor() : this({ null })
 
@@ -49,6 +62,10 @@ actual class DefaultImageLoader(private val transformer: (String) -> KalugaImage
         transformer(identifier) ?: defaultValue
 }
 
+/**
+ * Default implementation of a [FontLoader].
+ * @param transformer method for getting a [KalugaFont] from a String identifier
+ */
 actual class DefaultFontLoader(private val transformer: suspend (String) -> KalugaFont?) : FontLoader {
     actual constructor() : this({ null })
 
diff --git a/resources/src/jsMain/kotlin/StyledString.kt b/resources/src/jsMain/kotlin/StyledString.kt
index 02a71a73f..46e6784ae 100644
--- a/resources/src/jsMain/kotlin/StyledString.kt
+++ b/resources/src/jsMain/kotlin/StyledString.kt
@@ -19,6 +19,15 @@ package com.splendo.kaluga.resources
 
 import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 
+/**
+ * A text configured with [StringStyleAttribute]
+ * @property string the String to style
+ * @property defaultTextStyle The [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range.
+ * This may be partially overwritten (e.g. [StringStyleAttribute.CharacterStyleAttribute.ForegroundColor] may overwrite [KalugaTextStyle.color])
+ * @property linkStyle The [LinkStyle] to apply when [StringStyleAttribute.Link] is applied.
+ * When `null` the Theme default will be used
+ * @property attributed a list containing all [StringStyleAttribute] and the [IntRange] they should be applied to
+ */
 actual data class StyledString(
     val string: String,
     actual val defaultTextStyle: KalugaTextStyle,
@@ -26,13 +35,43 @@ actual data class StyledString(
     val attributed: List<Pair<StringStyleAttribute, IntRange>>
 )
 
-actual class StyledStringBuilder constructor(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) {
+/**
+ * Builder for creating a [StyledString]
+ * @param string the String to style
+ * @param defaultTextStyle The [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range.
+ * This may be partially overwritten (e.g. [StringStyleAttribute.CharacterStyleAttribute.ForegroundColor] may overwrite [KalugaTextStyle.color])
+ * @param linkStyle The [LinkStyle] to apply when [StringStyleAttribute.Link] is applied.
+ * When `null` the Theme default will be used
+ */
+actual class StyledStringBuilder constructor(
+    string: String,
+    defaultTextStyle: KalugaTextStyle,
+    linkStyle: LinkStyle?
+) {
 
+    /**
+     * Provider for a [StyledStringBuilder]
+     */
     actual class Provider {
+
+        /**
+         * Provides a [StyledStringBuilder] to build a [StyledString] for a given text
+         * @param string the text for which to build the [StyledString]
+         * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+         * @param linkStyle the [LinkStyle] to apply when [StringStyleAttribute.Link] is applied
+         * @return the [StyledStringBuilder] to build a [StyledString] for [string]
+         */
         actual fun provide(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) = StyledStringBuilder(string, defaultTextStyle, linkStyle)
     }
 
-    var styledString = StyledString(string, defaultTextStyle, linkStyle, emptyList())
+    private var styledString = StyledString(string, defaultTextStyle, linkStyle, emptyList())
+
+    /**
+     * Adds a [StringStyleAttribute] for a given range
+     * @param attribute the [StringStyleAttribute] to apply
+     * @param range the [IntRange] at which to apply the style
+     * @throws [IndexOutOfBoundsException] if [range] is out of bounds for the text to span
+     */
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
         if (range.first < 0 || range.last >= styledString.string.length) {
             throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
@@ -43,7 +82,15 @@ actual class StyledStringBuilder constructor(string: String, defaultTextStyle: K
             }
         )
     }
+
+    /**
+     * Creates the [StyledString]
+     * @return the created [StyledString]
+     */
     actual fun create(): StyledString = styledString
 }
 
+/**
+ * Gets the plain string of a [StyledString]
+ */
 actual val StyledString.rawString: String get() = string
diff --git a/resources/src/jvmMain/kotlin/DarkMode.kt b/resources/src/jvmMain/kotlin/DarkMode.kt
index c929546ea..f39c4bd9a 100644
--- a/resources/src/jvmMain/kotlin/DarkMode.kt
+++ b/resources/src/jvmMain/kotlin/DarkMode.kt
@@ -17,4 +17,7 @@
 
 package com.splendo.kaluga.resources
 
+/**
+ * When `true` the application is in Dark Mode.
+ */
 actual val isInDarkMode: Boolean = false
diff --git a/resources/src/jvmMain/kotlin/KalugaColor.kt b/resources/src/jvmMain/kotlin/KalugaColor.kt
index 10a90d4b4..6519bf123 100644
--- a/resources/src/jvmMain/kotlin/KalugaColor.kt
+++ b/resources/src/jvmMain/kotlin/KalugaColor.kt
@@ -19,19 +19,69 @@
 
 package com.splendo.kaluga.resources
 
+/**
+ * Class describing a color
+ */
 actual typealias KalugaColor = Int
 
+/**
+ * Gets the red value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.red: Double get() = redInt.toDouble() / 255.0
+
+/**
+ * Gets the red value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.redInt: Int get() = this shr 16 and 0xFF
+
+/**
+ * Gets the green value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.green: Double get() = greenInt.toDouble() / 255.0
+
+/**
+ * Gets the green value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.greenInt: Int get() = this shr 8 and 0xFF
+
+/**
+ * Gets the blue value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.blue: Double get() = blueInt.toDouble() / 255.0
+
+/**
+ * Gets the blue value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.blueInt: Int get() = this and 0xFF
+
+/**
+ * Gets the alpha value of the color in a range between `0.0` and `1.0`
+ */
 actual val KalugaColor.alpha: Double get() = alphaInt.toDouble() / 255.0
+
+/**
+ * Gets the alpha value of the color in a range between `0` and `255`
+ */
 actual val KalugaColor.alphaInt: Int get() = this ushr 24
 
+/**
+ * Creates a [KalugaColor] using red, green, blue, and (optional) alpha, all ranging between `0.0` and `1.0`.
+ * @param red The red color value ranging between `0.0` and `1.0`.
+ * @param green The green color value ranging between `0.0` and `1.0`.
+ * @param blue The blue color value ranging between `0.0` and `1.0`.
+ * @param alpha The alpha color value ranging between `0.0` and `1.0`. Defaults to `1.0`
+ * @return The [KalugaColor] with the corresponding red, green, blue, and alpha values
+ */
 actual fun colorFrom(red: Double, green: Double, blue: Double, alpha: Double): KalugaColor {
     return colorFrom((red * 255.0).toInt(), (green * 255.0).toInt(), (blue * 255.0).toInt(), (alpha * 255.0).toInt())
 }
 
+/**
+ * Creates a [KalugaColor] using red, green, blue, and (optional) alpha, all ranging between `0` and `255`.
+ * @param redInt The red color value ranging between `0` and `255`.
+ * @param greenInt The green color value ranging between `0` and `255`.
+ * @param blueInt The blue color value ranging between `0` and `255`.
+ * @param alphaInt The alpha color value ranging between `0` and `255`. Defaults to `255`
+ * @return The [KalugaColor] with the corresponding red, green, blue, and alpha values
+ */
 actual fun colorFrom(redInt: Int, greenInt: Int, blueInt: Int, alphaInt: Int): KalugaColor = alphaInt shl 24 or (redInt shl 16) or (greenInt shl 8) or blueInt
diff --git a/resources/src/jvmMain/kotlin/KalugaFont.kt b/resources/src/jvmMain/kotlin/KalugaFont.kt
index f1c39b22b..897e478f6 100644
--- a/resources/src/jvmMain/kotlin/KalugaFont.kt
+++ b/resources/src/jvmMain/kotlin/KalugaFont.kt
@@ -18,9 +18,27 @@
 @file:JvmName("JvmFont")
 package com.splendo.kaluga.resources
 
+/**
+ * Class describing a font
+ */
 actual class KalugaFont
 
+/**
+ * The default system [KalugaFont]
+ */
 actual val defaultFont: KalugaFont get() = KalugaFont()
+
+/**
+ * The default bold system [KalugaFont]
+ */
 actual val defaultBoldFont: KalugaFont get() = KalugaFont()
+
+/**
+ * The default italic system [KalugaFont]
+ */
 actual val defaultItalicFont: KalugaFont get() = KalugaFont()
+
+/**
+ * The default monospace system [KalugaFont]
+ */
 actual val defaultMonospaceFont: KalugaFont get() = KalugaFont()
diff --git a/resources/src/jvmMain/kotlin/KalugaImage.kt b/resources/src/jvmMain/kotlin/KalugaImage.kt
index f167a4554..d16e76dc0 100644
--- a/resources/src/jvmMain/kotlin/KalugaImage.kt
+++ b/resources/src/jvmMain/kotlin/KalugaImage.kt
@@ -15,8 +15,18 @@
 
  */
 
+@file:JvmName("KalugaImageJVMKt")
+
 package com.splendo.kaluga.resources
 
+/**
+ * Class describing an image.
+ */
 actual class KalugaImage
 
+/**
+ * Attempts to create a new [KalugaImage] that is tinted in a given [KalugaColor]
+ * @param color The [KalugaColor] to use for tinting.
+ * @return The tinted [KalugaImage] or `null` if tinting could not be applied.
+ */
 actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? = null
diff --git a/resources/src/jvmMain/kotlin/Resources.kt b/resources/src/jvmMain/kotlin/Resources.kt
index 4fe633b43..839df5544 100644
--- a/resources/src/jvmMain/kotlin/Resources.kt
+++ b/resources/src/jvmMain/kotlin/Resources.kt
@@ -19,6 +19,11 @@ package com.splendo.kaluga.resources
 
 import com.splendo.kaluga.base.text.format
 
+/**
+ * Default implementation of a [StringLoader].
+ * @param transformer method for getting a String from a String identifier
+ * @param formatter method for formatting a String identifier given a quantity
+ */
 actual class DefaultStringLoader(
     private val transformer: (String) -> String?,
     private val formatter: (String, Int) -> String?
@@ -35,6 +40,10 @@ actual class DefaultStringLoader(
     ): String = formatter(identifier, quantity) ?: defaultValue
 }
 
+/**
+ * Default implementation of a [KalugaColorLoader].
+ * @param transformer method for getting a [KalugaColor] from a String identifier
+ */
 actual class DefaultColorLoader(private val transformer: (String) -> KalugaColor?) : KalugaColorLoader {
     actual constructor() : this({ null })
 
@@ -42,6 +51,10 @@ actual class DefaultColorLoader(private val transformer: (String) -> KalugaColor
         transformer(identifier) ?: defaultValue
 }
 
+/**
+ * Default implementation of a [ImageLoader].
+ * @param transformer method for getting a [KalugaImage] from a String identifier
+ */
 actual class DefaultImageLoader(private val transformer: (String) -> KalugaImage?) : ImageLoader {
     actual constructor() : this({ null })
 
@@ -49,6 +62,10 @@ actual class DefaultImageLoader(private val transformer: (String) -> KalugaImage
         transformer(identifier) ?: defaultValue
 }
 
+/**
+ * Default implementation of a [FontLoader].
+ * @param transformer method for getting a [KalugaFont] from a String identifier
+ */
 actual class DefaultFontLoader(private val transformer: suspend (String) -> KalugaFont?) : FontLoader {
     actual constructor() : this({ null })
 
diff --git a/resources/src/jvmMain/kotlin/StyledString.kt b/resources/src/jvmMain/kotlin/StyledString.kt
index 02a71a73f..857f512cf 100644
--- a/resources/src/jvmMain/kotlin/StyledString.kt
+++ b/resources/src/jvmMain/kotlin/StyledString.kt
@@ -15,10 +15,20 @@
 
  */
 
+@file:JvmName("StyledStringJVMkt")
 package com.splendo.kaluga.resources
 
 import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 
+/**
+ * A text configured with [StringStyleAttribute]
+ * @property string the String to style
+ * @property defaultTextStyle The [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range.
+ * This may be partially overwritten (e.g. [StringStyleAttribute.CharacterStyleAttribute.ForegroundColor] may overwrite [KalugaTextStyle.color])
+ * @property linkStyle The [LinkStyle] to apply when [StringStyleAttribute.Link] is applied.
+ * When `null` the Theme default will be used
+ * @property attributed a list containing all [StringStyleAttribute] and the [IntRange] they should be applied to
+ */
 actual data class StyledString(
     val string: String,
     actual val defaultTextStyle: KalugaTextStyle,
@@ -26,13 +36,43 @@ actual data class StyledString(
     val attributed: List<Pair<StringStyleAttribute, IntRange>>
 )
 
-actual class StyledStringBuilder constructor(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) {
+/**
+ * Builder for creating a [StyledString]
+ * @param string the String to style
+ * @param defaultTextStyle The [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range.
+ * This may be partially overwritten (e.g. [StringStyleAttribute.CharacterStyleAttribute.ForegroundColor] may overwrite [KalugaTextStyle.color])
+ * @param linkStyle The [LinkStyle] to apply when [StringStyleAttribute.Link] is applied.
+ * When `null` the Theme default will be used
+ */
+actual class StyledStringBuilder constructor(
+    string: String,
+    defaultTextStyle: KalugaTextStyle,
+    linkStyle: LinkStyle?
+) {
 
+    /**
+     * Provider for a [StyledStringBuilder]
+     */
     actual class Provider {
+
+        /**
+         * Provides a [StyledStringBuilder] to build a [StyledString] for a given text
+         * @param string the text for which to build the [StyledString]
+         * @param defaultTextStyle the [KalugaTextStyle] to apply when no [StringStyleAttribute] are set for a given range
+         * @param linkStyle the [LinkStyle] to apply when [StringStyleAttribute.Link] is applied
+         * @return the [StyledStringBuilder] to build a [StyledString] for [string]
+         */
         actual fun provide(string: String, defaultTextStyle: KalugaTextStyle, linkStyle: LinkStyle?) = StyledStringBuilder(string, defaultTextStyle, linkStyle)
     }
 
-    var styledString = StyledString(string, defaultTextStyle, linkStyle, emptyList())
+    private var styledString = StyledString(string, defaultTextStyle, linkStyle, emptyList())
+
+    /**
+     * Adds a [StringStyleAttribute] for a given range
+     * @param attribute the [StringStyleAttribute] to apply
+     * @param range the [IntRange] at which to apply the style
+     * @throws [IndexOutOfBoundsException] if [range] is out of bounds for the text to span
+     */
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
         if (range.first < 0 || range.last >= styledString.string.length) {
             throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
@@ -43,7 +83,15 @@ actual class StyledStringBuilder constructor(string: String, defaultTextStyle: K
             }
         )
     }
+
+    /**
+     * Creates the [StyledString]
+     * @return the created [StyledString]
+     */
     actual fun create(): StyledString = styledString
 }
 
+/**
+ * Gets the plain string of a [StyledString]
+ */
 actual val StyledString.rawString: String get() = string

From fc6206cd36955bf5e9551083a66128db245144ca Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 22 Feb 2023 14:13:16 +0100
Subject: [PATCH 208/227] Improve KalugaImage to make Tinting and compose work
 better

---
 .../kotlin/observable/ObservableOptional.kt   |   2 +-
 base/api/androidLib/base.api                  |   2 +-
 base/api/jvm/base.api                         |  32 +++
 .../commonMain/kotlin/text/StringFormatter.kt |   2 +-
 base/src/commonMain/kotlin/utils/Decimal.kt   |   2 +-
 .../commonMain/kotlin/device/DeviceInfo.kt    |   2 +-
 .../kotlin/DateTimePickerPresenter.kt         |   2 +-
 .../src/commonMain/kotlin/DateTimePicker.kt   |   2 +-
 example/android/src/main/AndroidManifest.xml  |   3 +
 .../example/resources/compose/ImagesLayout.kt |  69 +++++++
 .../resources/compose/ResourcesLayout.kt      |   2 +
 .../example/resources/xml/ImagesActivity.kt   | 116 +++++++++++
 .../resources/xml/XMLResourcesActivity.kt     |   1 +
 .../android/src/main/res/drawable/cancel.xml  |  27 +++
 .../android/src/main/res/drawable/check.xml   |  27 +++
 .../android/src/main/res/drawable/star.xml    |  27 +++
 .../res/layout/activity_resources_images.xml  |  48 +++++
 .../res/layout/view_resource_list_image.xml   |  22 +++
 .../view_resource_list_tinted_image.xml       |  23 +++
 .../android/src/main/res/values/strings.xml   |   1 +
 .../example/shared/di/DependencyInjection.kt  |   5 +
 .../viewmodel/resources/ImagesViewModel.kt    |  38 ++++
 .../resources/ResourcesListViewModel.kt       |   3 +
 .../src/main/kotlin/Dependencies.kt           |   1 +
 .../src/iosMain/kotlin/KeyboardManager.kt     |   2 +-
 .../commonMain/kotlin/location/Location.kt    |   2 +-
 resources-compose/api/resources-compose.api   |  44 +----
 resources-compose/build.gradle.kts            |   1 +
 .../src/main/kotlin/BackgroundStyle.kt        |  11 ++
 resources-compose/src/main/kotlin/Color.kt    |   6 +-
 .../src/main/kotlin/GradientStyle.kt          |   8 +-
 .../src/main/kotlin/KalugaButton.kt           |   8 +
 .../src/main/kotlin/KalugaImage.kt            |  64 ++++++
 .../src/main/kotlin/KalugaLabel.kt            |   8 +
 .../main/kotlin/RoundedCornerRadiusShape.kt   |   8 +-
 .../src/main/kotlin/TextAlignment.kt          |   3 +
 .../api/resources-databinding.api             |  13 +-
 .../src/main/kotlin/Binding.kt                |  13 +-
 resources/api/androidLib/resources.api        | 138 +++++++------
 resources/api/jvm/resources.api               | 187 ++++++++++--------
 .../src/androidLibMain/kotlin/KalugaImage.kt  |  12 +-
 .../androidLibMain/kotlin/view/TextView.kt    |   2 +-
 .../src/commonMain/kotlin/KalugaImage.kt      |  11 +-
 resources/src/commonMain/kotlin/Resources.kt  |   2 +-
 resources/src/iosMain/kotlin/KalugaImage.kt   |   6 +-
 .../src/iosMain/kotlin/uikit/TextStyle.kt     |   4 +-
 resources/src/jsMain/kotlin/KalugaImage.kt    |   7 -
 resources/src/jvmMain/kotlin/KalugaImage.kt   |   7 -
 .../src/commonMain/kotlin/mock/MockMethod.kt  |   2 +-
 .../api/androidLib/test-utils-resources.api   |   4 +-
 .../api/jvm/test-utils-resources.api          |   8 +-
 51 files changed, 793 insertions(+), 247 deletions(-)
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ImagesLayout.kt
 create mode 100644 example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ImagesActivity.kt
 create mode 100644 example/android/src/main/res/drawable/cancel.xml
 create mode 100644 example/android/src/main/res/drawable/check.xml
 create mode 100644 example/android/src/main/res/drawable/star.xml
 create mode 100644 example/android/src/main/res/layout/activity_resources_images.xml
 create mode 100644 example/android/src/main/res/layout/view_resource_list_image.xml
 create mode 100644 example/android/src/main/res/layout/view_resource_list_tinted_image.xml
 create mode 100644 example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ImagesViewModel.kt
 create mode 100644 resources-compose/src/main/kotlin/KalugaImage.kt

diff --git a/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt b/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt
index 4ca7b8029..2915e26c0 100644
--- a/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt
+++ b/architecture/src/commonMain/kotlin/observable/ObservableOptional.kt
@@ -52,7 +52,7 @@ fun <R : T, T> ObservableOptional<T>.asResult(defaultValue: Value<R>?): Observab
     }
 
 /**
- * Result type for an [BaseObservable]. Used to allow for the distinction between `null` and optional values.
+ * Result type for a [BaseObservable]. Used to allow for the distinction between `null` and optional values.
  * @param T the type this [ObservableOptional] represents. Can be a nullable.
  */
 sealed class ObservableOptional<T> : ReadOnlyProperty<Any?, T?> {
diff --git a/base/api/androidLib/base.api b/base/api/androidLib/base.api
index 2d5424853..8ec5ce65b 100644
--- a/base/api/androidLib/base.api
+++ b/base/api/androidLib/base.api
@@ -1108,7 +1108,7 @@ public abstract class com/splendo/kaluga/base/utils/KalugaDate : java/lang/Compa
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
+public final class com/splendo/kaluga/base/utils/KalugaDateKt {
 	public static final fun epoch (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 	public static final fun isInSameYear (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
diff --git a/base/api/jvm/base.api b/base/api/jvm/base.api
index 53993bf86..ef6c086a5 100644
--- a/base/api/jvm/base.api
+++ b/base/api/jvm/base.api
@@ -1131,6 +1131,38 @@ public final class com/splendo/kaluga/base/utils/KalugaDateJvm {
 	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
 }
 
+public final class com/splendo/kaluga/base/utils/KalugaDateKt {
+	public static final fun epoch (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun epoch$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun isInSameYear (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isLastMonth (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isLastYear (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isNextMonth (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isNextYear (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isOnSameDay (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isOnSameMonth (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isThisMonth (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isThisYear (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isToday (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isTomorrow (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun isYesterday (Lcom/splendo/kaluga/base/utils/KalugaDate;)Z
+	public static final fun minus (Lcom/splendo/kaluga/base/utils/KalugaDate;Lcom/splendo/kaluga/base/utils/KalugaDate;)J
+	public static final fun minus-HG0u8IE (Lcom/splendo/kaluga/base/utils/KalugaDate;J)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun now (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun now$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun nowUtc (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun nowUtc$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun nowUtc-8Mi8wO0 (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun nowUtc-8Mi8wO0$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;JLcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun plus-HG0u8IE (Lcom/splendo/kaluga/base/utils/KalugaDate;J)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun toEndOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun toStartOfDay (Lcom/splendo/kaluga/base/utils/KalugaDate;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun today (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun today$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static final fun tomorrow (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+	public static synthetic fun tomorrow$default (Lcom/splendo/kaluga/base/utils/DefaultKalugaDate$Companion;Lcom/splendo/kaluga/base/utils/KalugaTimeZone;Lcom/splendo/kaluga/base/utils/KalugaLocale;ILjava/lang/Object;)Lcom/splendo/kaluga/base/utils/KalugaDate;
+}
+
 public final class com/splendo/kaluga/base/utils/KalugaLocale : com/splendo/kaluga/base/utils/BaseLocale {
 	public static final field Companion Lcom/splendo/kaluga/base/utils/KalugaLocale$Companion;
 	public final fun copy (Ljava/util/Locale;)Lcom/splendo/kaluga/base/utils/KalugaLocale;
diff --git a/base/src/commonMain/kotlin/text/StringFormatter.kt b/base/src/commonMain/kotlin/text/StringFormatter.kt
index 3f1caac7e..a7ac11d99 100644
--- a/base/src/commonMain/kotlin/text/StringFormatter.kt
+++ b/base/src/commonMain/kotlin/text/StringFormatter.kt
@@ -52,7 +52,7 @@ interface Formattable {
  * Custom formatting is supported by implementing [Formattable].
  * Flags, precision and width are supported by this formatter as well.
  * Formatting will adjust for a provided [KalugaLocale].
- * May throw an [StringFormatterException] if the incorrect format is applied.
+ * May throw a [StringFormatterException] if the incorrect format is applied.
  * @param out he [StringBuilder] used for outputting the result.
  * @param locale The [KalugaLocale] used for formatting. This is relevant for number and date formatting, as well as capitalization.
  */
diff --git a/base/src/commonMain/kotlin/utils/Decimal.kt b/base/src/commonMain/kotlin/utils/Decimal.kt
index 072432852..f54502ba7 100644
--- a/base/src/commonMain/kotlin/utils/Decimal.kt
+++ b/base/src/commonMain/kotlin/utils/Decimal.kt
@@ -478,7 +478,7 @@ fun Collection<Decimal>.toStringList(): List<String> = map { it.toString() }
 fun Collection<Decimal>.toIntArray(): IntArray = map { it.toInt() }.toIntArray()
 
 /**
- * Converts a collection of [Decimal] to an [LongArray]
+ * Converts a collection of [Decimal] to a [LongArray]
  */
 fun Collection<Decimal>.toLongArray(): LongArray = map { it.toLong() }.toLongArray()
 
diff --git a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
index aa66198b7..185127aac 100644
--- a/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
+++ b/bluetooth/src/commonMain/kotlin/device/DeviceInfo.kt
@@ -64,7 +64,7 @@ data class SerializableIdentifier(val identifier: Identifier)
 val Identifier.serializable get() = SerializableIdentifier(this)
 
 /**
- * [KSerializer] for an [SerializableIdentifier]
+ * [KSerializer] for a [SerializableIdentifier]
  */
 open class IdentifierSerializer :
     KSerializer<SerializableIdentifier> {
diff --git a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
index 3e1f7d373..148388042 100644
--- a/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
+++ b/date-time-picker/src/androidLibMain/kotlin/DateTimePickerPresenter.kt
@@ -32,7 +32,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 
 /**
- * A [BaseDateTimePickerPresenter] for presenting an [DateTimePicker].
+ * A [BaseDateTimePickerPresenter] for presenting a [DateTimePicker].
  * @param dateTimePicker The [DateTimePicker] being presented.
  * @param themeResourceId the resource ID of the theme to apply to the date-time picker dialog
  * @param lifecycleManagerObserver The [LifecycleManagerObserver] to observe lifecycle changes
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 8cc68a988..196026e33 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -197,7 +197,7 @@ interface DateTimePickerActions {
 abstract class BaseDateTimePickerPresenter(protected open val dateTimePicker: DateTimePicker) : DateTimePickerActions {
 
     /**
-     * Abstract alert builder class, used to create an [BaseDateTimePickerPresenter].
+     * Abstract alert builder class, used to create a [BaseDateTimePickerPresenter].
      *
      * @see [DateTimePickerPresenter.Builder]
      */
diff --git a/example/android/src/main/AndroidManifest.xml b/example/android/src/main/AndroidManifest.xml
index 6d3d319b7..8b5a06e6f 100644
--- a/example/android/src/main/AndroidManifest.xml
+++ b/example/android/src/main/AndroidManifest.xml
@@ -155,6 +155,9 @@
         <activity android:name=".resources.xml.LabelActivity"
             android:label="@string/feature_resources_label"
             android:screenOrientation="fullSensor"/>
+        <activity android:name=".resources.xml.ImagesActivity"
+            android:label="@string/feature_resources_image"
+            android:screenOrientation="fullSensor"/>
         <activity android:name=".resources.xml.ButtonActivity"
             android:label="@string/feature_resources_button"
             android:screenOrientation="fullSensor"/>
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ImagesLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ImagesLayout.kt
new file mode 100644
index 000000000..a39bc87ed
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ImagesLayout.kt
@@ -0,0 +1,69 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.resources.compose
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
+import com.splendo.kaluga.example.compose.Constants
+import com.splendo.kaluga.example.shared.viewmodel.resources.ImagesViewModel
+import com.splendo.kaluga.resources.compose.Composable
+import org.koin.androidx.compose.koinViewModel
+
+@Composable
+fun ImagesLayout() {
+    val viewModel = koinViewModel<ImagesViewModel>()
+
+    ViewModelComposable(viewModel) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(Constants.Padding.default)
+                .verticalScroll(rememberScrollState()),
+            horizontalArrangement = Arrangement.spacedBy(Constants.Padding.default)
+        ) {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .weight(1f)
+            ) {
+                viewModel.images.forEach {
+                    it.Composable(contentDescription = null)
+                }
+            }
+            Column(
+                verticalArrangement = Arrangement.spacedBy(Constants.Padding.default),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .weight(1f)
+            ) {
+                viewModel.tintedImages.forEach {
+                    it.Composable(contentDescription = null)
+                }
+            }
+        }
+    }
+}
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
index d179c51e6..f639b6515 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/compose/ResourcesLayout.kt
@@ -72,12 +72,14 @@ fun ResourcesLayout() {
                         when (action) {
                             is ResourcesListNavigationAction.Button -> action.next
                             is ResourcesListNavigationAction.Color -> action.next
+                            is ResourcesListNavigationAction.Image -> action.next
                             is ResourcesListNavigationAction.Label -> action.next
                         }
                     }
                 ) {
                     composable(ResourcesListNavigationAction.Button.route()) { ButtonsLayout() }
                     composable(ResourcesListNavigationAction.Color.route()) { ColorsLayout() }
+                    composable(ResourcesListNavigationAction.Image.route()) { ImagesLayout() }
                     composable(ResourcesListNavigationAction.Label.route()) { LabelsLayout() }
                 }
             )
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ImagesActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ImagesActivity.kt
new file mode 100644
index 000000000..39c8863db
--- /dev/null
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/ImagesActivity.kt
@@ -0,0 +1,116 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.resources.xml
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.splendo.kaluga.architecture.viewmodel.KalugaViewModelActivity
+import com.splendo.kaluga.example.databinding.ActivityResourcesImagesBinding
+import com.splendo.kaluga.example.databinding.ViewResourceListImageBinding
+import com.splendo.kaluga.example.databinding.ViewResourceListTintedImageBinding
+import com.splendo.kaluga.example.shared.viewmodel.resources.ImagesViewModel
+import com.splendo.kaluga.resources.KalugaImage
+import com.splendo.kaluga.resources.TintedImage
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class ImagesActivity : KalugaViewModelActivity<ImagesViewModel>() {
+
+    override val viewModel: ImagesViewModel by viewModel()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ActivityResourcesImagesBinding.inflate(layoutInflater, null, false)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+
+        binding.imagesList.adapter = ImageAdapter()
+        binding.tintedImagesList.adapter = TintedImageAdapter()
+
+        setContentView(binding.root)
+    }
+}
+
+object ImagesBinding {
+    @BindingAdapter("images")
+    @JvmStatic
+    fun bindImages(view: RecyclerView, images: List<KalugaImage>?) {
+        val adapter = (view.adapter as? ImageAdapter) ?: return
+        adapter.images = images.orEmpty()
+    }
+}
+
+object TintedImagesBinding {
+
+    @BindingAdapter("tintedImages")
+    @JvmStatic
+    fun bindImages(view: RecyclerView, tintedImages: List<TintedImage>?) {
+        val adapter = (view.adapter as? TintedImageAdapter) ?: return
+        adapter.tintedImages = tintedImages.orEmpty()
+    }
+}
+
+class ImageAdapter : RecyclerView.Adapter<ImageAdapter.ImageViewHolder>() {
+
+    class ImageViewHolder(val binding: ViewResourceListImageBinding) : RecyclerView.ViewHolder(binding.root) {
+        val view = binding.root
+    }
+
+    var images: List<KalugaImage> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ImageViewHolder {
+        val binding = ViewResourceListImageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ImageViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = images.size
+
+    override fun onBindViewHolder(holder: ImageViewHolder, position: Int) {
+        holder.binding.image = images.getOrNull(position)
+    }
+}
+
+class TintedImageAdapter : RecyclerView.Adapter<TintedImageAdapter.ImageViewHolder>() {
+
+    class ImageViewHolder(val binding: ViewResourceListTintedImageBinding) : RecyclerView.ViewHolder(binding.root) {
+        val view = binding.root
+    }
+
+    var tintedImages: List<TintedImage> = emptyList()
+        set(newValue) {
+            field = newValue
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ImageViewHolder {
+        val binding = ViewResourceListTintedImageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ImageViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = tintedImages.size
+
+    override fun onBindViewHolder(holder: ImageViewHolder, position: Int) {
+        holder.binding.image = tintedImages.getOrNull(position)
+    }
+}
\ No newline at end of file
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt
index 7c9a03aa8..4e1dbb1fc 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/resources/xml/XMLResourcesActivity.kt
@@ -40,6 +40,7 @@ class XMLResourcesActivity : KalugaViewModelActivity<ResourcesListViewModel>() {
                 when (action) {
                     is ResourcesListNavigationAction.Label -> NavigationSpec.Activity<LabelActivity>()
                     is ResourcesListNavigationAction.Color -> NavigationSpec.Activity<ColorActivity>()
+                    is ResourcesListNavigationAction.Image -> NavigationSpec.Activity<ImagesActivity>()
                     is ResourcesListNavigationAction.Button -> NavigationSpec.Activity<ButtonActivity>()
                 }
             }
diff --git a/example/android/src/main/res/drawable/cancel.xml b/example/android/src/main/res/drawable/cancel.xml
new file mode 100644
index 000000000..5ca0cb0c9
--- /dev/null
+++ b/example/android/src/main/res/drawable/cancel.xml
@@ -0,0 +1,27 @@
+<!--
+  Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M330,672L480,522L630,672L672,630L522,480L672,330L630,288L480,438L330,288L288,330L438,480L288,630L330,672ZM480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 111.5,324Q143,251 197.5,197Q252,143 325,111.5Q398,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,562 848.5,635Q817,708 763,762.5Q709,817 636,848.5Q563,880 480,880ZM480,820Q622,820 721,720.5Q820,621 820,480Q820,338 721,239Q622,140 480,140Q339,140 239.5,239Q140,338 140,480Q140,621 239.5,720.5Q339,820 480,820ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/example/android/src/main/res/drawable/check.xml b/example/android/src/main/res/drawable/check.xml
new file mode 100644
index 000000000..f4ff4129f
--- /dev/null
+++ b/example/android/src/main/res/drawable/check.xml
@@ -0,0 +1,27 @@
+<!--
+  Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M378,714L154,490L197,447L378,628L762,244L805,287L378,714Z"/>
+</vector>
diff --git a/example/android/src/main/res/drawable/star.xml b/example/android/src/main/res/drawable/star.xml
new file mode 100644
index 000000000..a8ca9ef06
--- /dev/null
+++ b/example/android/src/main/res/drawable/star.xml
@@ -0,0 +1,27 @@
+<!--
+  Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M323,755L480,661L637,756L595,578L733,458L551,442L480,274L409,441L227,457L365,577L323,755ZM233,880L298,599L80,410L368,385L480,120L592,385L880,410L662,599L727,880L480,731L233,880ZM480,525L480,525L480,525L480,525L480,525L480,525L480,525L480,525L480,525L480,525L480,525Z"/>
+</vector>
diff --git a/example/android/src/main/res/layout/activity_resources_images.xml b/example/android/src/main/res/layout/activity_resources_images.xml
new file mode 100644
index 000000000..661117043
--- /dev/null
+++ b/example/android/src/main/res/layout/activity_resources_images.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.splendo.kaluga.example.shared.viewmodel.resources.ImagesViewModel" />
+    </data>
+
+    <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="10dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/images_list"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/tinted_images_list"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:images="@{viewModel.images}"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/view_resource_list_image"
+                tools:itemCount="4"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/tinted_images_list"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/images_list"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tintedImages="@{viewModel.tintedImages}"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/view_resource_list_tinted_image"
+                tools:itemCount="4"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/view_resource_list_image.xml b/example/android/src/main/res/layout/view_resource_list_image.xml
new file mode 100644
index 000000000..d1b0f0d4b
--- /dev/null
+++ b/example/android/src/main/res/layout/view_resource_list_image.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="image"
+            type="com.splendo.kaluga.resources.KalugaImage" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:image="@{image}"
+            tools:src="@drawable/check"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/layout/view_resource_list_tinted_image.xml b/example/android/src/main/res/layout/view_resource_list_tinted_image.xml
new file mode 100644
index 000000000..125213f16
--- /dev/null
+++ b/example/android/src/main/res/layout/view_resource_list_tinted_image.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="image"
+            type="com.splendo.kaluga.resources.TintedImage" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:tintedImage="@{image}"
+            tools:src="@drawable/check"
+            tools:tint="@color/colorPrimary"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/example/android/src/main/res/values/strings.xml b/example/android/src/main/res/values/strings.xml
index 7757242b8..ccaebd9b5 100644
--- a/example/android/src/main/res/values/strings.xml
+++ b/example/android/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="feature_resources_color">Color</string>
     <string name="feature_resources_button">Button</string>
     <string name="feature_resources_label">Label</string>
+    <string name="feature_resources_image">Image</string>
     <string name="feature_scientific">Scientific</string>
 
     <string name="show_alert">Show Alert</string>
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index da2e6180e..e5ed7ca23 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -57,6 +57,7 @@ import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListNa
 import com.splendo.kaluga.example.shared.viewmodel.permissions.PermissionsListViewModel
 import com.splendo.kaluga.example.shared.viewmodel.resources.ButtonViewModel
 import com.splendo.kaluga.example.shared.viewmodel.resources.ColorViewModel
+import com.splendo.kaluga.example.shared.viewmodel.resources.ImagesViewModel
 import com.splendo.kaluga.example.shared.viewmodel.resources.LabelViewModel
 import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.resources.ResourcesListViewModel
@@ -189,6 +190,10 @@ internal val androidModule = module {
         ColorViewModel(AlertPresenter.Builder())
     }
 
+    viewModel {
+        ImagesViewModel()
+    }
+
     viewModel {
         LabelViewModel(StyledStringBuilder.Provider())
     }
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ImagesViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ImagesViewModel.kt
new file mode 100644
index 000000000..60147345b
--- /dev/null
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ImagesViewModel.kt
@@ -0,0 +1,38 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.example.shared.viewmodel.resources
+
+import com.splendo.kaluga.architecture.viewmodel.BaseLifecycleViewModel
+import com.splendo.kaluga.resources.DefaultColors
+import com.splendo.kaluga.resources.asImage
+import com.splendo.kaluga.resources.tinted
+
+class ImagesViewModel : BaseLifecycleViewModel() {
+
+    val images = listOfNotNull(
+        "check".asImage(),
+        "star".asImage(),
+        "cancel".asImage()
+    )
+
+    val tintedImages = listOfNotNull(
+        "check".asImage()?.tinted(DefaultColors.green),
+        "star".asImage()?.tinted(DefaultColors.gold),
+        "cancel".asImage()?.tinted(DefaultColors.red)
+    )
+}
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt
index 7162feb76..c5510fcee 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/resources/ResourcesListViewModel.kt
@@ -10,12 +10,14 @@ sealed class ResourcesListNavigationAction : NavigationAction<Nothing>(null) {
 
     object Color : ResourcesListNavigationAction()
     object Button : ResourcesListNavigationAction()
+    object Image : ResourcesListNavigationAction()
     object Label : ResourcesListNavigationAction()
 }
 
 enum class Resource(private val titleKey: String) {
     COLOR("feature_resources_color"),
     BUTTON("feature_resources_button"),
+    IMAGE("feature_resources_image"),
     LABEL("feature_resources_label");
 
     val title: String get() = titleKey.localized()
@@ -30,6 +32,7 @@ class ResourcesListViewModel(navigator: Navigator<ResourcesListNavigationAction>
             when (resource) {
                 Resource.COLOR -> ResourcesListNavigationAction.Color
                 Resource.BUTTON -> ResourcesListNavigationAction.Button
+                Resource.IMAGE -> ResourcesListNavigationAction.Image
                 Resource.LABEL -> ResourcesListNavigationAction.Label
             }
         )
diff --git a/kaluga-library-components/src/main/kotlin/Dependencies.kt b/kaluga-library-components/src/main/kotlin/Dependencies.kt
index c3211f762..19d49e01f 100644
--- a/kaluga-library-components/src/main/kotlin/Dependencies.kt
+++ b/kaluga-library-components/src/main/kotlin/Dependencies.kt
@@ -104,6 +104,7 @@ object Dependencies {
         private const val groupBase = "com.google.accompanist"
         private const val version = "0.28.0"
 
+        val DrawablePainter = Dependency(groupBase, "accompanist-drawablepainter", version)
         val MaterialThemeAdapter = Dependency(groupBase, "accompanist-themeadapter-material", version)
     }
 
diff --git a/keyboard/src/iosMain/kotlin/KeyboardManager.kt b/keyboard/src/iosMain/kotlin/KeyboardManager.kt
index 9e4468c30..e41265d82 100644
--- a/keyboard/src/iosMain/kotlin/KeyboardManager.kt
+++ b/keyboard/src/iosMain/kotlin/KeyboardManager.kt
@@ -29,7 +29,7 @@ import platform.darwin.sel_registerName
 class UIKitKeyboardManager(private val application: UIApplication) : BaseKeyboardManager<UIKitFocusHandler> {
 
     /**
-     * Builder for an [UIKitKeyboardManager]
+     * Builder for a [UIKitKeyboardManager]
      * @param application The [UIApplication] that the keyboard is running in.
      */
     class Builder(private val application: UIApplication = UIApplication.sharedApplication) : BaseKeyboardManager.Builder<UIKitFocusHandler> {
diff --git a/location/src/commonMain/kotlin/location/Location.kt b/location/src/commonMain/kotlin/location/Location.kt
index 3969c1af5..47b441b01 100644
--- a/location/src/commonMain/kotlin/location/Location.kt
+++ b/location/src/commonMain/kotlin/location/Location.kt
@@ -157,7 +157,7 @@ data class DMSCoordinate(val degrees: Int, val minutes: Int, val seconds: Double
 }
 
 /**
- * Converts a [Location] into an [Location.UnknownLocation] given a [Location.UnknownLocation.Reason]
+ * Converts a [Location] into a [Location.UnknownLocation] given a [Location.UnknownLocation.Reason]
  * @param reason the [Location.UnknownLocation.Reason] the [Location] became unknown
  * @return the [Location.UnknownLocation] with [reason].
  * If the [Location] this method had a [Location.KnownLocation], this will return [Location.UnknownLocation.WithLastLocation], otherwise [Location.UnknownLocation.WithoutLastLocation]
diff --git a/resources-compose/api/resources-compose.api b/resources-compose/api/resources-compose.api
index d38514bbe..b569d2f70 100644
--- a/resources-compose/api/resources-compose.api
+++ b/resources-compose/api/resources-compose.api
@@ -10,11 +10,6 @@ public final class com/splendo/kaluga/resources/compose/ColorKt {
 	public static final fun getComposable (I)J
 }
 
-public abstract interface class com/splendo/kaluga/resources/compose/CornerRadiusSize {
-	public abstract fun xToPx-TmRCtEA (JLandroidx/compose/ui/unit/Density;)F
-	public abstract fun yToPx-TmRCtEA (JLandroidx/compose/ui/unit/Density;)F
-}
-
 public final class com/splendo/kaluga/resources/compose/GradientStyleKt {
 	public static final fun getBrush (Lcom/splendo/kaluga/resources/stylable/GradientStyle;)Landroidx/compose/ui/graphics/Brush;
 }
@@ -24,45 +19,16 @@ public final class com/splendo/kaluga/resources/compose/KalugaButtonKt {
 	public static final fun PreviewKalugaButton (Landroidx/compose/runtime/Composer;I)V
 }
 
+public final class com/splendo/kaluga/resources/compose/KalugaImageKt {
+	public static final fun Composable (Lcom/splendo/kaluga/resources/KalugaImage;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;FLandroidx/compose/ui/graphics/ColorFilter;Landroidx/compose/runtime/Composer;II)V
+	public static final fun Composable (Lcom/splendo/kaluga/resources/TintedImage;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;FLandroidx/compose/runtime/Composer;II)V
+}
+
 public final class com/splendo/kaluga/resources/compose/KalugaLabelKt {
 	public static final fun Composable (Lcom/splendo/kaluga/resources/view/KalugaLabel;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
 	public static final fun PreviewKalugaLabel (Landroidx/compose/runtime/Composer;I)V
 }
 
-public final class com/splendo/kaluga/resources/compose/RelativeRadialGradient : androidx/compose/ui/graphics/ShaderBrush {
-	public static final field $stable I
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;FI[Lkotlin/Pair;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;FI[Lkotlin/Pair;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun <init> (Ljava/util/List;Ljava/util/List;Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;FIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun createShader-uvyYCjk (J)Landroid/graphics/Shader;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/resources/compose/RelativeSweepGradient : androidx/compose/ui/graphics/ShaderBrush {
-	public static final field $stable I
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;[Lkotlin/Pair;)V
-	public fun createShader-uvyYCjk (J)Landroid/graphics/Shader;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/resources/compose/RoundedCornerRadiusShape : androidx/compose/ui/graphics/Shape {
-	public static final field $stable I
-	public fun <init> (Lcom/splendo/kaluga/resources/compose/CornerRadiusSize;Lcom/splendo/kaluga/resources/compose/CornerRadiusSize;Lcom/splendo/kaluga/resources/compose/CornerRadiusSize;Lcom/splendo/kaluga/resources/compose/CornerRadiusSize;)V
-	public final fun createOutline-Pq9zytI (JLandroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/Density;)Landroidx/compose/ui/graphics/Outline;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/resources/compose/RoundedCornerRadiusShapeKt {
-	public static final fun CornerRadiusSize-YgX7TsA (FF)Lcom/splendo/kaluga/resources/compose/CornerRadiusSize;
-	public static final fun isValid-12SF9DM (Lcom/splendo/kaluga/resources/compose/CornerRadiusSize;JLandroidx/compose/ui/unit/Density;)Z
-}
-
 public final class com/splendo/kaluga/resources/compose/TextAlignmentKt {
 	public static final fun getComposable (Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)I
 }
diff --git a/resources-compose/build.gradle.kts b/resources-compose/build.gradle.kts
index f97d0d91b..ff6a2da97 100644
--- a/resources-compose/build.gradle.kts
+++ b/resources-compose/build.gradle.kts
@@ -34,4 +34,5 @@ dependencies {
     implementationDependency(Dependencies.AndroidX.Compose.UI)
     implementationDependency(Dependencies.AndroidX.Compose.UITooling)
     implementationDependency(Dependencies.KotlinX.Coroutines.Core)
+    implementationDependency(Dependencies.Accompanist.DrawablePainter)
 }
diff --git a/resources-compose/src/main/kotlin/BackgroundStyle.kt b/resources-compose/src/main/kotlin/BackgroundStyle.kt
index 40b83e77e..2d597e822 100644
--- a/resources-compose/src/main/kotlin/BackgroundStyle.kt
+++ b/resources-compose/src/main/kotlin/BackgroundStyle.kt
@@ -34,16 +34,27 @@ import com.splendo.kaluga.resources.DefaultColors
 import com.splendo.kaluga.resources.stylable.GradientStyle
 import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 
+/**
+ * Creates a modifier for applying a [KalugaBackgroundStyle] to the background of a view
+ * @param backgroundStyle the [KalugaBackgroundStyle] to modify with
+ * @return a [Modifier] that adds a background according to the [KalugaBackgroundStyle]
+ */
 fun Modifier.backgroundStyle(backgroundStyle: KalugaBackgroundStyle) = background(
     backgroundStyle.fillStyle.brush,
     backgroundStyle.shape.shape
 ).border(backgroundStyle.strokeStyle.borderStroke, backgroundStyle.shape.shape)
 
+/**
+ * Gets the [Brush] of a [KalugaBackgroundStyle.FillStyle]
+ */
 val KalugaBackgroundStyle.FillStyle.brush: Brush get() = when (this) {
     is KalugaBackgroundStyle.FillStyle.Solid -> SolidColor(color.composable)
     is KalugaBackgroundStyle.FillStyle.Gradient -> gradientStyle.brush
 }
 
+/**
+ * Gets the [Shape] of a [KalugaBackgroundStyle.Shape]
+ */
 val KalugaBackgroundStyle.Shape.shape: Shape get() = when (this) {
     is KalugaBackgroundStyle.Shape.Rectangle -> RoundedCornerRadiusShape(
         if (roundedCorners.contains(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT)) CornerRadiusSize(cornerRadiusX.dp, cornerRadiusY.dp) else CornerRadiusSize(0.dp, 0.dp),
diff --git a/resources-compose/src/main/kotlin/Color.kt b/resources-compose/src/main/kotlin/Color.kt
index 91d6e46e8..6cc865b9a 100644
--- a/resources-compose/src/main/kotlin/Color.kt
+++ b/resources-compose/src/main/kotlin/Color.kt
@@ -18,5 +18,9 @@
 package com.splendo.kaluga.resources.compose
 
 import androidx.compose.ui.graphics.Color
+import com.splendo.kaluga.resources.KalugaColor
 
-val com.splendo.kaluga.resources.KalugaColor.composable get() = Color(this)
+/**
+ * Gets a [Color] from a [KalugaColor]
+ */
+val KalugaColor.composable get() = Color(this)
diff --git a/resources-compose/src/main/kotlin/GradientStyle.kt b/resources-compose/src/main/kotlin/GradientStyle.kt
index 8d2d4775c..d8ed5f78a 100644
--- a/resources-compose/src/main/kotlin/GradientStyle.kt
+++ b/resources-compose/src/main/kotlin/GradientStyle.kt
@@ -30,6 +30,9 @@ import androidx.compose.ui.graphics.SweepGradientShader
 import androidx.compose.ui.graphics.TileMode
 import com.splendo.kaluga.resources.stylable.GradientStyle
 
+/**
+ * Gets a [Brush] from a [GradientStyle]
+ */
 val GradientStyle.brush: Brush
     get() = when (this) {
         is GradientStyle.Linear -> Brush.linearGradient(
@@ -55,6 +58,7 @@ private val List<GradientStyle.ColorPoint>.colorStops: List<Pair<Float, Color>>
             it.color.composable
         )
     }
+
 private val GradientStyle.Linear.Orientation.offset: Pair<Offset, Offset>
     get() = when (this) {
         GradientStyle.Linear.Orientation.BOTTOM_LEFT_TOP_RIGHT -> Pair(
@@ -92,7 +96,7 @@ private val GradientStyle.Linear.Orientation.offset: Pair<Offset, Offset>
     }
 
 @Immutable
-class RelativeRadialGradient internal constructor(
+internal class RelativeRadialGradient internal constructor(
     private val colors: List<Color>,
     private val stops: List<Float>? = null,
     private val center: GradientStyle.CenterPoint,
@@ -163,7 +167,7 @@ class RelativeRadialGradient internal constructor(
  * Brush implementation used to apply a sweep gradient on a given [Paint]
  */
 @Immutable
-class RelativeSweepGradient internal constructor(
+internal class RelativeSweepGradient internal constructor(
     private val center: GradientStyle.CenterPoint,
     private val colors: List<Color>,
     private val stops: List<Float>? = null
diff --git a/resources-compose/src/main/kotlin/KalugaButton.kt b/resources-compose/src/main/kotlin/KalugaButton.kt
index 0ba7a1792..c36b9017e 100644
--- a/resources-compose/src/main/kotlin/KalugaButton.kt
+++ b/resources-compose/src/main/kotlin/KalugaButton.kt
@@ -47,6 +47,14 @@ import com.splendo.kaluga.resources.styled
 import com.splendo.kaluga.resources.view.KalugaButton
 import com.splendo.kaluga.resources.view.KalugaLabel
 
+/**
+ * Gets a [Button] that looks and behaves according to a [KalugaButton]
+ * @param modifier the [Modifier] to be applied to the button
+ * @param elevation the [ButtonElevation] used to resolve the elevation for this button in different states.
+ * This controls the size of the shadow below the button. Pass `null` here to disable elevation for this button.
+ * See [ButtonDefaults.elevation].
+ * @param contentPadding The spacing values to apply internally between the container and the content
+ */
 @Composable
 fun KalugaButton.Composable(
     modifier: Modifier,
diff --git a/resources-compose/src/main/kotlin/KalugaImage.kt b/resources-compose/src/main/kotlin/KalugaImage.kt
new file mode 100644
index 000000000..8b1a987af
--- /dev/null
+++ b/resources-compose/src/main/kotlin/KalugaImage.kt
@@ -0,0 +1,64 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.resources.compose
+
+import androidx.compose.foundation.Image
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.DefaultAlpha
+import androidx.compose.ui.layout.ContentScale
+import com.google.accompanist.drawablepainter.rememberDrawablePainter
+import com.splendo.kaluga.resources.KalugaImage
+import com.splendo.kaluga.resources.TintedImage
+
+@Composable
+fun KalugaImage.Composable(
+    contentDescription: String?,
+    modifier: Modifier = Modifier,
+    alignment: Alignment = Alignment.Center,
+    contentScale: ContentScale = ContentScale.Fit,
+    alpha: Float = DefaultAlpha,
+    colorFilter: ColorFilter? = null
+) = Image(
+    painter = rememberDrawablePainter(drawable = drawable),
+    contentDescription = contentDescription,
+    modifier = modifier,
+    alignment = alignment,
+    contentScale = contentScale,
+    alpha = alpha,
+    colorFilter = colorFilter
+)
+
+@Composable
+fun TintedImage.Composable(
+    contentDescription: String?,
+    modifier: Modifier = Modifier,
+    alignment: Alignment = Alignment.Center,
+    contentScale: ContentScale = ContentScale.Fit,
+    alpha: Float = DefaultAlpha,
+) = image.Composable(
+    contentDescription = contentDescription,
+    modifier = modifier,
+    alignment = alignment,
+    contentScale = contentScale,
+    alpha = alpha,
+    colorFilter = ColorFilter.tint(tint.composable)
+)
diff --git a/resources-compose/src/main/kotlin/KalugaLabel.kt b/resources-compose/src/main/kotlin/KalugaLabel.kt
index faec4c91d..1d750dfab 100644
--- a/resources-compose/src/main/kotlin/KalugaLabel.kt
+++ b/resources-compose/src/main/kotlin/KalugaLabel.kt
@@ -20,6 +20,9 @@ import android.widget.TextView
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.size
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.ButtonElevation
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -34,9 +37,14 @@ import com.splendo.kaluga.resources.StringStyleAttribute
 import com.splendo.kaluga.resources.StyledStringBuilder
 import com.splendo.kaluga.resources.defaultBoldFont
 import com.splendo.kaluga.resources.styled
+import com.splendo.kaluga.resources.view.KalugaButton
 import com.splendo.kaluga.resources.view.KalugaLabel
 import com.splendo.kaluga.resources.view.bindLabel
 
+/**
+ * Gets a [Text] that looks like the specification of a [KalugaLabel]
+ * @param modifier the [Modifier] to be applied to this layout node
+ */
 @Composable
 fun KalugaLabel.Composable(modifier: Modifier) {
     when (this) {
diff --git a/resources-compose/src/main/kotlin/RoundedCornerRadiusShape.kt b/resources-compose/src/main/kotlin/RoundedCornerRadiusShape.kt
index 48b4b1100..6702f872e 100644
--- a/resources-compose/src/main/kotlin/RoundedCornerRadiusShape.kt
+++ b/resources-compose/src/main/kotlin/RoundedCornerRadiusShape.kt
@@ -32,17 +32,17 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
 
 @Immutable
-interface CornerRadiusSize {
+internal interface CornerRadiusSize {
     fun xToPx(shapeSize: Size, density: Density): Float
     fun yToPx(shapeSize: Size, density: Density): Float
 }
 
-fun CornerRadiusSize.isValid(shapeSize: Size, density: Density): Boolean {
+internal fun CornerRadiusSize.isValid(shapeSize: Size, density: Density): Boolean {
     return xToPx(shapeSize, density) >= 0.0f && yToPx(shapeSize, density) >= 0.0f
 }
 
 @Stable
-fun CornerRadiusSize(x: Dp, y: Dp): CornerRadiusSize = DpCornerRadiusSize(x, y)
+internal fun CornerRadiusSize(x: Dp, y: Dp): CornerRadiusSize = DpCornerRadiusSize(x, y)
 
 private data class DpCornerRadiusSize(private val radiusSize: RadiusSize) : CornerRadiusSize, InspectableValue {
     constructor(x: Dp, y: Dp) : this (RadiusSize(x, y))
@@ -58,7 +58,7 @@ private data class DpCornerRadiusSize(private val radiusSize: RadiusSize) : Corn
         get() = radiusSize
 }
 
-class RoundedCornerRadiusShape(
+internal class RoundedCornerRadiusShape(
     private val topStart: CornerRadiusSize,
     private val topEnd: CornerRadiusSize,
     private val bottomEnd: CornerRadiusSize,
diff --git a/resources-compose/src/main/kotlin/TextAlignment.kt b/resources-compose/src/main/kotlin/TextAlignment.kt
index 65f1fb9fd..52b267071 100644
--- a/resources-compose/src/main/kotlin/TextAlignment.kt
+++ b/resources-compose/src/main/kotlin/TextAlignment.kt
@@ -20,6 +20,9 @@ package com.splendo.kaluga.resources.compose
 import androidx.compose.ui.text.style.TextAlign
 import com.splendo.kaluga.resources.stylable.KalugaTextAlignment
 
+/**
+ * Gets the [TextAlign] from a [KalugaTextAlignment]
+ */
 val KalugaTextAlignment.composable: TextAlign
     get() = when (this) {
         KalugaTextAlignment.CENTER -> TextAlign.Center
diff --git a/resources-databinding/api/resources-databinding.api b/resources-databinding/api/resources-databinding.api
index 69e319f6e..587d45583 100644
--- a/resources-databinding/api/resources-databinding.api
+++ b/resources-databinding/api/resources-databinding.api
@@ -13,15 +13,16 @@ public class com/splendo/kaluga/resources/databinding/BR {
 
 public final class com/splendo/kaluga/resources/databinding/Binding {
 	public static final field INSTANCE Lcom/splendo/kaluga/resources/databinding/Binding;
-	public static final fun bindAutoTextStyle (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/stylable/TextStyle;F)V
+	public static final fun bindAutoTextStyle (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;F)V
 	public static final fun bindBackground (Landroid/view/View;Lcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle;)V
-	public static final fun bindImage (Landroid/widget/ImageView;Lcom/splendo/kaluga/resources/Image;)V
+	public static final fun bindImage (Landroid/widget/ImageView;Lcom/splendo/kaluga/resources/KalugaImage;)V
+	public static final fun bindImage (Landroid/widget/ImageView;Lcom/splendo/kaluga/resources/TintedImage;)V
 	public static final fun bindKalugaButton (Landroid/widget/Button;Lcom/splendo/kaluga/resources/view/KalugaButton;)V
 	public static final fun bindKalugaLabel (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/view/KalugaLabel;)V
-	public static final fun bindPrefixTextStyle (Lcom/google/android/material/textfield/TextInputLayout;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
-	public static final fun bindSuffixTextStyle (Lcom/google/android/material/textfield/TextInputLayout;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
-	public static final fun bindTextInputLayoutTextStyle (Lcom/google/android/material/textfield/TextInputLayout;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
-	public static final fun bindTextStyle (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
+	public static final fun bindPrefixTextStyle (Lcom/google/android/material/textfield/TextInputLayout;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
+	public static final fun bindSuffixTextStyle (Lcom/google/android/material/textfield/TextInputLayout;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
+	public static final fun bindTextInputLayoutTextStyle (Lcom/google/android/material/textfield/TextInputLayout;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
+	public static final fun bindTextStyle (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
 }
 
 public class com/splendo/kaluga/resources/databinding/DataBinderMapperImpl : androidx/databinding/DataBinderMapper {
diff --git a/resources-databinding/src/main/kotlin/Binding.kt b/resources-databinding/src/main/kotlin/Binding.kt
index 911700d1c..6de4c98fc 100644
--- a/resources-databinding/src/main/kotlin/Binding.kt
+++ b/resources-databinding/src/main/kotlin/Binding.kt
@@ -27,6 +27,8 @@ import androidx.core.widget.TextViewCompat
 import androidx.databinding.BindingAdapter
 import com.google.android.material.textfield.TextInputLayout
 import com.splendo.kaluga.resources.KalugaImage
+import com.splendo.kaluga.resources.TintedImage
+import com.splendo.kaluga.resources.drawable
 import com.splendo.kaluga.resources.stylable.KalugaBackgroundStyle
 import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 import com.splendo.kaluga.resources.view.KalugaButton
@@ -53,7 +55,7 @@ object Binding {
     }
 
     /**
-     * Binds an [KalugaImage] to an [ImageView].
+     * Binds a [KalugaImage] to an [ImageView].
      */
     @BindingAdapter("image")
     @JvmStatic
@@ -61,6 +63,15 @@ object Binding {
         view.setImageDrawable(image?.drawable)
     }
 
+    /**
+     * Binds a [TintedImage] to an [ImageView].
+     */
+    @BindingAdapter("tintedImage")
+    @JvmStatic
+    fun bindImage(view: ImageView, image: TintedImage?) {
+        view.setImageDrawable(image?.drawable)
+    }
+
     /**
      * Binds a [KalugaButton] to a [Button].
      */
diff --git a/resources/api/androidLib/resources.api b/resources/api/androidLib/resources.api
index a4b5abf3d..6142dd98b 100644
--- a/resources/api/androidLib/resources.api
+++ b/resources/api/androidLib/resources.api
@@ -20,16 +20,6 @@ public final class com/splendo/kaluga/resources/AndroidKalugaColor {
 	public static final fun getRedInt (I)I
 }
 
-public final class com/splendo/kaluga/resources/AndroidStyledString {
-	public static final fun attributeSubstring (Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lkotlin/Pair;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;I[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;I[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
-}
-
 public abstract class com/splendo/kaluga/resources/BlendMode {
 	public abstract fun blendColor (II)I
 }
@@ -344,7 +334,7 @@ public final class com/splendo/kaluga/resources/DefaultFontLoader : com/splendo/
 public final class com/splendo/kaluga/resources/DefaultImageLoader : com/splendo/kaluga/resources/ImageLoader {
 	public fun <init> ()V
 	public fun <init> (Landroid/content/Context;)V
-	public fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/Image;)Lcom/splendo/kaluga/resources/Image;
+	public fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaImage;)Lcom/splendo/kaluga/resources/KalugaImage;
 }
 
 public final class com/splendo/kaluga/resources/DefaultStringLoader : com/splendo/kaluga/resources/StringLoader {
@@ -401,27 +391,31 @@ public final class com/splendo/kaluga/resources/HSLColorKt {
 	public static final fun lightenBy (ID)I
 }
 
-public final class com/splendo/kaluga/resources/Image {
+public abstract interface class com/splendo/kaluga/resources/ImageLoader {
+	public abstract fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaImage;)Lcom/splendo/kaluga/resources/KalugaImage;
+}
+
+public abstract interface class com/splendo/kaluga/resources/KalugaColorLoader {
+	public abstract fun loadColor (Ljava/lang/String;Ljava/lang/Integer;)Ljava/lang/Integer;
+}
+
+public final class com/splendo/kaluga/resources/KalugaImage {
 	public fun <init> (Landroid/graphics/drawable/Drawable;)V
 	public final fun component1 ()Landroid/graphics/drawable/Drawable;
-	public final fun copy (Landroid/graphics/drawable/Drawable;)Lcom/splendo/kaluga/resources/Image;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/Image;Landroid/graphics/drawable/Drawable;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/Image;
+	public final fun copy (Landroid/graphics/drawable/Drawable;)Lcom/splendo/kaluga/resources/KalugaImage;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/KalugaImage;Landroid/graphics/drawable/Drawable;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/KalugaImage;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getDrawable ()Landroid/graphics/drawable/Drawable;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/resources/ImageKt {
-	public static final fun tinted (Lcom/splendo/kaluga/resources/Image;I)Lcom/splendo/kaluga/resources/Image;
+public final class com/splendo/kaluga/resources/KalugaImageAndroidKt {
+	public static final fun getDrawable (Lcom/splendo/kaluga/resources/TintedImage;)Landroid/graphics/drawable/Drawable;
 }
 
-public abstract interface class com/splendo/kaluga/resources/ImageLoader {
-	public abstract fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/Image;)Lcom/splendo/kaluga/resources/Image;
-}
-
-public abstract interface class com/splendo/kaluga/resources/KalugaColorLoader {
-	public abstract fun loadColor (Ljava/lang/String;Ljava/lang/Integer;)Ljava/lang/Integer;
+public final class com/splendo/kaluga/resources/KalugaImageKt {
+	public static final fun tinted (Lcom/splendo/kaluga/resources/KalugaImage;I)Lcom/splendo/kaluga/resources/TintedImage;
 }
 
 public final class com/splendo/kaluga/resources/LinkStyle {
@@ -447,8 +441,8 @@ public final class com/splendo/kaluga/resources/ResourcesKt {
 	public static synthetic fun asColor$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaColorLoader;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/Integer;
 	public static final fun asFont (Ljava/lang/String;Lcom/splendo/kaluga/resources/FontLoader;Landroid/graphics/Typeface;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun asFont$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/FontLoader;Landroid/graphics/Typeface;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun asImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/ImageLoader;Lcom/splendo/kaluga/resources/Image;)Lcom/splendo/kaluga/resources/Image;
-	public static synthetic fun asImage$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/ImageLoader;Lcom/splendo/kaluga/resources/Image;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/Image;
+	public static final fun asImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/ImageLoader;Lcom/splendo/kaluga/resources/KalugaImage;)Lcom/splendo/kaluga/resources/KalugaImage;
+	public static synthetic fun asImage$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/ImageLoader;Lcom/splendo/kaluga/resources/KalugaImage;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/KalugaImage;
 	public static final fun localized (Ljava/lang/String;Lcom/splendo/kaluga/resources/StringLoader;Ljava/lang/String;)Ljava/lang/String;
 	public static synthetic fun localized$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/StringLoader;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
 	public static final fun quantity (Ljava/lang/String;ILcom/splendo/kaluga/resources/StringLoader;Ljava/lang/String;)Ljava/lang/String;
@@ -571,12 +565,12 @@ public final class com/splendo/kaluga/resources/StringStyleAttribute$CharacterSt
 }
 
 public final class com/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle : com/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute {
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public final fun copy (Lcom/splendo/kaluga/resources/stylable/TextStyle;)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;Lcom/splendo/kaluga/resources/stylable/TextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
+	public final fun copy (Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getTextStyle ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun getTextStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
@@ -641,14 +635,18 @@ public final class com/splendo/kaluga/resources/StringStyleAttribute$ParagraphSt
 }
 
 public final class com/splendo/kaluga/resources/StyledString {
-	public fun <init> (Landroid/text/Spannable;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;)V
-	public final fun getDefaultTextStyle ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public fun <init> (Landroid/text/Spannable;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;)V
+	public final fun getDefaultTextStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public final fun getLinkStyle ()Lcom/splendo/kaluga/resources/LinkStyle;
 	public final fun getSpannable ()Landroid/text/Spannable;
 }
 
+public final class com/splendo/kaluga/resources/StyledStringAndroidkt {
+	public static final fun getRawString (Lcom/splendo/kaluga/resources/StyledString;)Ljava/lang/String;
+}
+
 public final class com/splendo/kaluga/resources/StyledStringBuilder {
-	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;Landroid/content/Context;)V
+	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;Landroid/content/Context;)V
 	public final fun addStyleAttribute (Lcom/splendo/kaluga/resources/StringStyleAttribute;Lkotlin/ranges/IntRange;)V
 	public final fun create ()Lcom/splendo/kaluga/resources/StyledString;
 }
@@ -657,12 +655,31 @@ public final class com/splendo/kaluga/resources/StyledStringBuilder$Provider {
 	public fun <init> ()V
 	public fun <init> (Landroid/content/Context;)V
 	public synthetic fun <init> (Landroid/content/Context;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun provide (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;)Lcom/splendo/kaluga/resources/StyledStringBuilder;
-	public static synthetic fun provide$default (Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StyledStringBuilder;
+	public final fun provide (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;)Lcom/splendo/kaluga/resources/StyledStringBuilder;
+	public static synthetic fun provide$default (Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StyledStringBuilder;
 }
 
 public final class com/splendo/kaluga/resources/StyledStringKt {
-	public static final fun getRawString (Lcom/splendo/kaluga/resources/StyledString;)Ljava/lang/String;
+	public static final fun attributeSubstring (Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lkotlin/Pair;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;I[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;I[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
+}
+
+public final class com/splendo/kaluga/resources/TintedImage {
+	public fun <init> (Lcom/splendo/kaluga/resources/KalugaImage;I)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/KalugaImage;
+	public final fun component2 ()I
+	public final fun copy (Lcom/splendo/kaluga/resources/KalugaImage;I)Lcom/splendo/kaluga/resources/TintedImage;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/TintedImage;Lcom/splendo/kaluga/resources/KalugaImage;IILjava/lang/Object;)Lcom/splendo/kaluga/resources/TintedImage;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getImage ()Lcom/splendo/kaluga/resources/KalugaImage;
+	public final fun getTint ()I
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/resources/stylable/ButtonStateStyle {
@@ -680,6 +697,10 @@ public final class com/splendo/kaluga/resources/stylable/ButtonStateStyle {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/splendo/kaluga/resources/stylable/ColorPointRangeError : java/lang/Error {
+	public static final field INSTANCE Lcom/splendo/kaluga/resources/stylable/ColorPointRangeError;
+}
+
 public abstract class com/splendo/kaluga/resources/stylable/GradientStyle {
 	public synthetic fun <init> (Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getColorPoints ()Ljava/util/List;
@@ -687,8 +708,7 @@ public abstract class com/splendo/kaluga/resources/stylable/GradientStyle {
 
 public final class com/splendo/kaluga/resources/stylable/GradientStyle$Angular : com/splendo/kaluga/resources/stylable/GradientStyle {
 	public static final field Companion Lcom/splendo/kaluga/resources/stylable/GradientStyle$Angular$Companion;
-	public fun <init> (Ljava/util/List;Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;)V
-	public synthetic fun <init> (Ljava/util/List;Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Ljava/util/List;Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getCenterPoint ()Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;
 }
 
@@ -753,8 +773,7 @@ public final class com/splendo/kaluga/resources/stylable/GradientStyle$Linear$Or
 
 public final class com/splendo/kaluga/resources/stylable/GradientStyle$Radial : com/splendo/kaluga/resources/stylable/GradientStyle {
 	public static final field Companion Lcom/splendo/kaluga/resources/stylable/GradientStyle$Radial$Companion;
-	public fun <init> (Ljava/util/List;FLcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;)V
-	public synthetic fun <init> (Ljava/util/List;FLcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Ljava/util/List;FLcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getCenterPoint ()Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;
 	public final fun getRadius ()F
 }
@@ -868,8 +887,8 @@ public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$S
 public final class com/splendo/kaluga/resources/stylable/KalugaButtonStyle {
 	public fun <init> (Landroid/graphics/Typeface;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)V
 	public synthetic fun <init> (Landroid/graphics/Typeface;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Landroid/graphics/Typeface;
 	public final fun component2 ()F
 	public final fun component3 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
@@ -884,7 +903,7 @@ public final class com/splendo/kaluga/resources/stylable/KalugaButtonStyle {
 	public final fun getFont ()Landroid/graphics/Typeface;
 	public final fun getPressedStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
 	public final fun getStateStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getStateTextStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun getStateTextStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public final fun getTextAlignment ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 	public final fun getTextSize ()F
 	public fun hashCode ()I
@@ -901,15 +920,15 @@ public final class com/splendo/kaluga/resources/stylable/KalugaTextAlignment : j
 	public static fun values ()[Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 }
 
-public final class com/splendo/kaluga/resources/stylable/TextStyle {
+public final class com/splendo/kaluga/resources/stylable/KalugaTextStyle {
 	public fun <init> (Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)V
 	public synthetic fun <init> (Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Landroid/graphics/Typeface;
 	public final fun component2 ()I
 	public final fun component3 ()F
 	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
-	public final fun copy (Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/TextStyle;Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun copy (Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Landroid/graphics/Typeface;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAlignment ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 	public final fun getColor ()I
@@ -922,7 +941,8 @@ public final class com/splendo/kaluga/resources/stylable/TextStyle {
 public final class com/splendo/kaluga/resources/view/AndroidButton {
 	public static final fun applyButtonStyle (Landroid/widget/Button;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;Lcom/splendo/kaluga/resources/view/RippleStyle;)V
 	public static synthetic fun applyButtonStyle$default (Landroid/widget/Button;Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;Lcom/splendo/kaluga/resources/view/RippleStyle;ILjava/lang/Object;)V
-	public static final fun bindButton (Landroid/widget/Button;Lcom/splendo/kaluga/resources/view/KalugaButton;)V
+	public static final fun bindButton (Landroid/widget/Button;Lcom/splendo/kaluga/resources/view/KalugaButton;Lcom/splendo/kaluga/resources/view/RippleStyle;)V
+	public static synthetic fun bindButton$default (Landroid/widget/Button;Lcom/splendo/kaluga/resources/view/KalugaButton;Lcom/splendo/kaluga/resources/view/RippleStyle;ILjava/lang/Object;)V
 }
 
 public final class com/splendo/kaluga/resources/view/BackgroundStyleKt {
@@ -973,31 +993,31 @@ public final class com/splendo/kaluga/resources/view/KalugaButton$Styled : com/s
 }
 
 public abstract class com/splendo/kaluga/resources/view/KalugaLabel {
-	public abstract fun getStyle ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public abstract fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 }
 
 public final class com/splendo/kaluga/resources/view/KalugaLabel$Plain : com/splendo/kaluga/resources/view/KalugaLabel {
-	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
+	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public final fun copy (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
+	public final fun copy (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public final fun getText ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/resources/view/KalugaLabel$Styled : com/splendo/kaluga/resources/view/KalugaLabel {
-	public fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/TextStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Lcom/splendo/kaluga/resources/StyledString;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public final fun copy (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/TextStyle;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/TextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
+	public final fun copy (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public final fun getText ()Lcom/splendo/kaluga/resources/StyledString;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -1032,7 +1052,7 @@ public final class com/splendo/kaluga/resources/view/TextAlignmentKt {
 }
 
 public final class com/splendo/kaluga/resources/view/TextViewKt {
-	public static final fun applyTextStyle (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
+	public static final fun applyTextStyle (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
 	public static final fun bindLabel (Landroid/widget/TextView;Lcom/splendo/kaluga/resources/view/KalugaLabel;)V
 }
 
diff --git a/resources/api/jvm/resources.api b/resources/api/jvm/resources.api
index 3871063ce..5f58a6586 100644
--- a/resources/api/jvm/resources.api
+++ b/resources/api/jvm/resources.api
@@ -1,13 +1,3 @@
-public final class com/splendo/kaluga/resources/AndroidStyledString {
-	public static final fun attributeSubstring (Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lkotlin/Pair;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;I[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;I[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
-	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/TextStyle;[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
-}
-
 public abstract class com/splendo/kaluga/resources/BlendMode {
 	public abstract fun blendColor (II)I
 }
@@ -316,13 +306,13 @@ public final class com/splendo/kaluga/resources/DefaultColors {
 public final class com/splendo/kaluga/resources/DefaultFontLoader : com/splendo/kaluga/resources/FontLoader {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/jvm/functions/Function2;)V
-	public fun loadFont (Ljava/lang/String;Lcom/splendo/kaluga/resources/Font;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun loadFont (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaFont;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/resources/DefaultImageLoader : com/splendo/kaluga/resources/ImageLoader {
 	public fun <init> ()V
 	public fun <init> (Lkotlin/jvm/functions/Function1;)V
-	public fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/Image;)Lcom/splendo/kaluga/resources/Image;
+	public fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaImage;)Lcom/splendo/kaluga/resources/KalugaImage;
 }
 
 public final class com/splendo/kaluga/resources/DefaultStringLoader : com/splendo/kaluga/resources/StringLoader {
@@ -332,12 +322,8 @@ public final class com/splendo/kaluga/resources/DefaultStringLoader : com/splend
 	public fun loadString (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 }
 
-public final class com/splendo/kaluga/resources/Font {
-	public fun <init> ()V
-}
-
 public abstract interface class com/splendo/kaluga/resources/FontLoader {
-	public abstract fun loadFont (Ljava/lang/String;Lcom/splendo/kaluga/resources/Font;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun loadFont (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaFont;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/resources/HSLColor {
@@ -383,23 +369,15 @@ public final class com/splendo/kaluga/resources/HSLColorKt {
 	public static final fun lightenBy (ID)I
 }
 
-public final class com/splendo/kaluga/resources/Image {
-	public fun <init> ()V
-}
-
-public final class com/splendo/kaluga/resources/ImageKt {
-	public static final fun tinted (Lcom/splendo/kaluga/resources/Image;I)Lcom/splendo/kaluga/resources/Image;
-}
-
 public abstract interface class com/splendo/kaluga/resources/ImageLoader {
-	public abstract fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/Image;)Lcom/splendo/kaluga/resources/Image;
+	public abstract fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaImage;)Lcom/splendo/kaluga/resources/KalugaImage;
 }
 
 public final class com/splendo/kaluga/resources/JvmFont {
-	public static final fun getDefaultBoldFont ()Lcom/splendo/kaluga/resources/Font;
-	public static final fun getDefaultFont ()Lcom/splendo/kaluga/resources/Font;
-	public static final fun getDefaultItalicFont ()Lcom/splendo/kaluga/resources/Font;
-	public static final fun getDefaultMonospaceFont ()Lcom/splendo/kaluga/resources/Font;
+	public static final fun getDefaultBoldFont ()Lcom/splendo/kaluga/resources/KalugaFont;
+	public static final fun getDefaultFont ()Lcom/splendo/kaluga/resources/KalugaFont;
+	public static final fun getDefaultItalicFont ()Lcom/splendo/kaluga/resources/KalugaFont;
+	public static final fun getDefaultMonospaceFont ()Lcom/splendo/kaluga/resources/KalugaFont;
 }
 
 public final class com/splendo/kaluga/resources/JvmKalugaColor {
@@ -421,6 +399,18 @@ public abstract interface class com/splendo/kaluga/resources/KalugaColorLoader {
 	public abstract fun loadColor (Ljava/lang/String;Ljava/lang/Integer;)Ljava/lang/Integer;
 }
 
+public final class com/splendo/kaluga/resources/KalugaFont {
+	public fun <init> ()V
+}
+
+public final class com/splendo/kaluga/resources/KalugaImage {
+	public fun <init> ()V
+}
+
+public final class com/splendo/kaluga/resources/KalugaImageKt {
+	public static final fun tinted (Lcom/splendo/kaluga/resources/KalugaImage;I)Lcom/splendo/kaluga/resources/TintedImage;
+}
+
 public final class com/splendo/kaluga/resources/LinkStyle {
 	public fun <init> (IZ)V
 	public final fun component1 ()I
@@ -437,10 +427,10 @@ public final class com/splendo/kaluga/resources/LinkStyle {
 public final class com/splendo/kaluga/resources/ResourcesKt {
 	public static final fun asColor (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaColorLoader;Ljava/lang/Integer;)Ljava/lang/Integer;
 	public static synthetic fun asColor$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaColorLoader;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/Integer;
-	public static final fun asFont (Ljava/lang/String;Lcom/splendo/kaluga/resources/FontLoader;Lcom/splendo/kaluga/resources/Font;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun asFont$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/FontLoader;Lcom/splendo/kaluga/resources/Font;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun asImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/ImageLoader;Lcom/splendo/kaluga/resources/Image;)Lcom/splendo/kaluga/resources/Image;
-	public static synthetic fun asImage$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/ImageLoader;Lcom/splendo/kaluga/resources/Image;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/Image;
+	public static final fun asFont (Ljava/lang/String;Lcom/splendo/kaluga/resources/FontLoader;Lcom/splendo/kaluga/resources/KalugaFont;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun asFont$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/FontLoader;Lcom/splendo/kaluga/resources/KalugaFont;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun asImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/ImageLoader;Lcom/splendo/kaluga/resources/KalugaImage;)Lcom/splendo/kaluga/resources/KalugaImage;
+	public static synthetic fun asImage$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/ImageLoader;Lcom/splendo/kaluga/resources/KalugaImage;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/KalugaImage;
 	public static final fun localized (Ljava/lang/String;Lcom/splendo/kaluga/resources/StringLoader;Ljava/lang/String;)Ljava/lang/String;
 	public static synthetic fun localized$default (Ljava/lang/String;Lcom/splendo/kaluga/resources/StringLoader;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
 	public static final fun quantity (Ljava/lang/String;ILcom/splendo/kaluga/resources/StringLoader;Ljava/lang/String;)Ljava/lang/String;
@@ -486,13 +476,13 @@ public final class com/splendo/kaluga/resources/StringStyleAttribute$CharacterSt
 }
 
 public final class com/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$Font : com/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute {
-	public fun <init> (Lcom/splendo/kaluga/resources/Font;F)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/Font;
+	public fun <init> (Lcom/splendo/kaluga/resources/KalugaFont;F)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/KalugaFont;
 	public final fun component2 ()F
-	public final fun copy (Lcom/splendo/kaluga/resources/Font;F)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$Font;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$Font;Lcom/splendo/kaluga/resources/Font;FILjava/lang/Object;)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$Font;
+	public final fun copy (Lcom/splendo/kaluga/resources/KalugaFont;F)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$Font;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$Font;Lcom/splendo/kaluga/resources/KalugaFont;FILjava/lang/Object;)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$Font;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFont ()Lcom/splendo/kaluga/resources/Font;
+	public final fun getFont ()Lcom/splendo/kaluga/resources/KalugaFont;
 	public final fun getSize ()F
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -563,12 +553,12 @@ public final class com/splendo/kaluga/resources/StringStyleAttribute$CharacterSt
 }
 
 public final class com/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle : com/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute {
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public final fun copy (Lcom/splendo/kaluga/resources/stylable/TextStyle;)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;Lcom/splendo/kaluga/resources/stylable/TextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
+	public final fun copy (Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StringStyleAttribute$CharacterStyleAttribute$TextStyle;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getTextStyle ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun getTextStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
@@ -633,16 +623,16 @@ public final class com/splendo/kaluga/resources/StringStyleAttribute$ParagraphSt
 }
 
 public final class com/splendo/kaluga/resources/StyledString {
-	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;Ljava/util/List;)V
+	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;Ljava/util/List;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public final fun component3 ()Lcom/splendo/kaluga/resources/LinkStyle;
 	public final fun component4 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;Ljava/util/List;)Lcom/splendo/kaluga/resources/StyledString;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StyledString;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;Ljava/util/List;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StyledString;
+	public final fun copy (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;Ljava/util/List;)Lcom/splendo/kaluga/resources/StyledString;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/StyledString;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;Ljava/util/List;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StyledString;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAttributed ()Ljava/util/List;
-	public final fun getDefaultTextStyle ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun getDefaultTextStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public final fun getLinkStyle ()Lcom/splendo/kaluga/resources/LinkStyle;
 	public final fun getString ()Ljava/lang/String;
 	public fun hashCode ()I
@@ -650,23 +640,44 @@ public final class com/splendo/kaluga/resources/StyledString {
 }
 
 public final class com/splendo/kaluga/resources/StyledStringBuilder {
-	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;)V
+	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;)V
 	public final fun addStyleAttribute (Lcom/splendo/kaluga/resources/StringStyleAttribute;Lkotlin/ranges/IntRange;)V
 	public final fun create ()Lcom/splendo/kaluga/resources/StyledString;
-	public final fun getStyledString ()Lcom/splendo/kaluga/resources/StyledString;
-	public final fun setStyledString (Lcom/splendo/kaluga/resources/StyledString;)V
 }
 
 public final class com/splendo/kaluga/resources/StyledStringBuilder$Provider {
 	public fun <init> ()V
-	public final fun provide (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;)Lcom/splendo/kaluga/resources/StyledStringBuilder;
-	public static synthetic fun provide$default (Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/LinkStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StyledStringBuilder;
+	public final fun provide (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;)Lcom/splendo/kaluga/resources/StyledStringBuilder;
+	public static synthetic fun provide$default (Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/StyledStringBuilder;
 }
 
-public final class com/splendo/kaluga/resources/StyledStringKt {
+public final class com/splendo/kaluga/resources/StyledStringJVMkt {
 	public static final fun getRawString (Lcom/splendo/kaluga/resources/StyledString;)Ljava/lang/String;
 }
 
+public final class com/splendo/kaluga/resources/StyledStringKt {
+	public static final fun attributeSubstring (Ljava/lang/String;Ljava/lang/String;Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lkotlin/Pair;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;I[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;I[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/LinkStyle;[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;[Lcom/splendo/kaluga/resources/StringStyleAttribute;)Lcom/splendo/kaluga/resources/StyledString;
+	public static final fun styled (Ljava/lang/String;Lcom/splendo/kaluga/resources/StyledStringBuilder$Provider;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;[Lkotlin/jvm/functions/Function1;)Lcom/splendo/kaluga/resources/StyledString;
+}
+
+public final class com/splendo/kaluga/resources/TintedImage {
+	public fun <init> (Lcom/splendo/kaluga/resources/KalugaImage;I)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/KalugaImage;
+	public final fun component2 ()I
+	public final fun copy (Lcom/splendo/kaluga/resources/KalugaImage;I)Lcom/splendo/kaluga/resources/TintedImage;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/TintedImage;Lcom/splendo/kaluga/resources/KalugaImage;IILjava/lang/Object;)Lcom/splendo/kaluga/resources/TintedImage;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getImage ()Lcom/splendo/kaluga/resources/KalugaImage;
+	public final fun getTint ()I
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class com/splendo/kaluga/resources/stylable/ButtonStateStyle {
 	public fun <init> (IILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
 	public synthetic fun <init> (IILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -682,6 +693,10 @@ public final class com/splendo/kaluga/resources/stylable/ButtonStateStyle {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/splendo/kaluga/resources/stylable/ColorPointRangeError : java/lang/Error {
+	public static final field INSTANCE Lcom/splendo/kaluga/resources/stylable/ColorPointRangeError;
+}
+
 public abstract class com/splendo/kaluga/resources/stylable/GradientStyle {
 	public synthetic fun <init> (Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getColorPoints ()Ljava/util/List;
@@ -689,8 +704,7 @@ public abstract class com/splendo/kaluga/resources/stylable/GradientStyle {
 
 public final class com/splendo/kaluga/resources/stylable/GradientStyle$Angular : com/splendo/kaluga/resources/stylable/GradientStyle {
 	public static final field Companion Lcom/splendo/kaluga/resources/stylable/GradientStyle$Angular$Companion;
-	public fun <init> (Ljava/util/List;Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;)V
-	public synthetic fun <init> (Ljava/util/List;Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Ljava/util/List;Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getCenterPoint ()Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;
 }
 
@@ -755,8 +769,7 @@ public final class com/splendo/kaluga/resources/stylable/GradientStyle$Linear$Or
 
 public final class com/splendo/kaluga/resources/stylable/GradientStyle$Radial : com/splendo/kaluga/resources/stylable/GradientStyle {
 	public static final field Companion Lcom/splendo/kaluga/resources/stylable/GradientStyle$Radial$Companion;
-	public fun <init> (Ljava/util/List;FLcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;)V
-	public synthetic fun <init> (Ljava/util/List;FLcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Ljava/util/List;FLcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getCenterPoint ()Lcom/splendo/kaluga/resources/stylable/GradientStyle$CenterPoint;
 	public final fun getRadius ()F
 }
@@ -868,25 +881,25 @@ public final class com/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$S
 }
 
 public final class com/splendo/kaluga/resources/stylable/KalugaButtonStyle {
-	public fun <init> (Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/Font;
+	public fun <init> (Lcom/splendo/kaluga/resources/KalugaFont;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/KalugaFont;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;IIILcom/splendo/kaluga/resources/stylable/KalugaBackgroundStyle$Shape;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/KalugaFont;
 	public final fun component2 ()F
 	public final fun component3 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
 	public final fun component5 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
 	public final fun component6 ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun copy (Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;Lcom/splendo/kaluga/resources/Font;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
+	public final fun copy (Lcom/splendo/kaluga/resources/KalugaFont;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;)Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;Lcom/splendo/kaluga/resources/KalugaFont;FLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaButtonStyle;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getDefaultStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
 	public final fun getDisabledStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getFont ()Lcom/splendo/kaluga/resources/Font;
+	public final fun getFont ()Lcom/splendo/kaluga/resources/KalugaFont;
 	public final fun getPressedStyle ()Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
 	public final fun getStateStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/ButtonStateStyle;
-	public final fun getStateTextStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun getStateTextStyle (ZZ)Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public final fun getTextAlignment ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 	public final fun getTextSize ()F
 	public fun hashCode ()I
@@ -903,19 +916,19 @@ public final class com/splendo/kaluga/resources/stylable/KalugaTextAlignment : j
 	public static fun values ()[Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 }
 
-public final class com/splendo/kaluga/resources/stylable/TextStyle {
-	public fun <init> (Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Lcom/splendo/kaluga/resources/Font;
+public final class com/splendo/kaluga/resources/stylable/KalugaTextStyle {
+	public fun <init> (Lcom/splendo/kaluga/resources/KalugaFont;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/KalugaFont;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lcom/splendo/kaluga/resources/KalugaFont;
 	public final fun component2 ()I
 	public final fun component3 ()F
 	public final fun component4 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
-	public final fun copy (Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/TextStyle;Lcom/splendo/kaluga/resources/Font;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public final fun copy (Lcom/splendo/kaluga/resources/KalugaFont;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;)Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;Lcom/splendo/kaluga/resources/KalugaFont;IFLcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAlignment ()Lcom/splendo/kaluga/resources/stylable/KalugaTextAlignment;
 	public final fun getColor ()I
-	public final fun getFont ()Lcom/splendo/kaluga/resources/Font;
+	public final fun getFont ()Lcom/splendo/kaluga/resources/KalugaFont;
 	public final fun getSize ()F
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -964,31 +977,31 @@ public final class com/splendo/kaluga/resources/view/KalugaButton$Styled : com/s
 }
 
 public abstract class com/splendo/kaluga/resources/view/KalugaLabel {
-	public abstract fun getStyle ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public abstract fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 }
 
 public final class com/splendo/kaluga/resources/view/KalugaLabel$Plain : com/splendo/kaluga/resources/view/KalugaLabel {
-	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
+	public fun <init> (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public final fun copy (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/TextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
+	public final fun copy (Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;Ljava/lang/String;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Plain;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public final fun getText ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/splendo/kaluga/resources/view/KalugaLabel$Styled : com/splendo/kaluga/resources/view/KalugaLabel {
-	public fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/TextStyle;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/TextStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Lcom/splendo/kaluga/resources/StyledString;
-	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
-	public final fun copy (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/TextStyle;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;
-	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/TextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;
+	public final fun component2 ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
+	public final fun copy (Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;
+	public static synthetic fun copy$default (Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;Lcom/splendo/kaluga/resources/StyledString;Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;ILjava/lang/Object;)Lcom/splendo/kaluga/resources/view/KalugaLabel$Styled;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/TextStyle;
+	public fun getStyle ()Lcom/splendo/kaluga/resources/stylable/KalugaTextStyle;
 	public final fun getText ()Lcom/splendo/kaluga/resources/StyledString;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
diff --git a/resources/src/androidLibMain/kotlin/KalugaImage.kt b/resources/src/androidLibMain/kotlin/KalugaImage.kt
index 7c8143ec9..a204fa2e0 100644
--- a/resources/src/androidLibMain/kotlin/KalugaImage.kt
+++ b/resources/src/androidLibMain/kotlin/KalugaImage.kt
@@ -28,14 +28,10 @@ import androidx.core.graphics.drawable.DrawableCompat
 actual data class KalugaImage(val drawable: Drawable)
 
 /**
- * Attempts to create a new [KalugaImage] that is tinted in a given [KalugaColor]
- * @param color The [KalugaColor] to use for tinting.
- * @return The tinted [KalugaImage] or `null` if tinting could not be applied.
+ * Gets a [Drawable] of a [TintedImage] or `null` if the [TintedImage] cannot be made into a [Drawable]
  */
-actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? {
-    return drawable.constantState?.newDrawable()?.mutate()?.let {
-        val wrapped = DrawableCompat.wrap(it)
-        DrawableCompat.setTint(wrapped, color)
-        KalugaImage(wrapped)
+val TintedImage.drawable: Drawable?  get() = image.drawable.constantState?.newDrawable()?.mutate()?.let {
+    DrawableCompat.wrap(it).apply {
+        DrawableCompat.setTint(this, tint)
     }
 }
diff --git a/resources/src/androidLibMain/kotlin/view/TextView.kt b/resources/src/androidLibMain/kotlin/view/TextView.kt
index a28450f9b..8701a4717 100644
--- a/resources/src/androidLibMain/kotlin/view/TextView.kt
+++ b/resources/src/androidLibMain/kotlin/view/TextView.kt
@@ -24,7 +24,7 @@ import android.widget.TextView
 import com.splendo.kaluga.resources.stylable.KalugaTextStyle
 
 /**
- * Makes a [TextView] look according to a [KalugaLabel]
+ * Makes a [TextView] look like the specification of a [KalugaLabel]
  * @param label the [KalugaLabel] that specifies the look of the [TextView]
  */
 fun TextView.bindLabel(label: KalugaLabel) {
diff --git a/resources/src/commonMain/kotlin/KalugaImage.kt b/resources/src/commonMain/kotlin/KalugaImage.kt
index 0a3faadad..b2f7ec7fb 100644
--- a/resources/src/commonMain/kotlin/KalugaImage.kt
+++ b/resources/src/commonMain/kotlin/KalugaImage.kt
@@ -25,9 +25,16 @@ expect class KalugaImage
 @Deprecated("Due to name clashes with platform classes and API changes this class has been renamed and changed to an interface. It will be removed in a future release.", ReplaceWith("KalugaColor"))
 typealias Image = KalugaImage
 
+/**
+ * A [KalugaImage] tinted with a given [KalugaColor]
+ * @property image the [KalugaImage] to tint
+ * @property tint the [KalugaColor] to tint the image with
+ */
+data class TintedImage(val image: KalugaImage, val tint: KalugaColor)
+
 /**
  * Attempts to create a new [KalugaImage] that is tinted in a given [KalugaColor]
  * @param color The [KalugaColor] to use for tinting.
- * @return The tinted [KalugaImage] or `null` if tinting could not be applied.
+ * @return The [TintedImage]
  */
-expect fun KalugaImage.tinted(color: KalugaColor): KalugaImage?
+fun KalugaImage.tinted(color: KalugaColor) = TintedImage(this, color)
diff --git a/resources/src/commonMain/kotlin/Resources.kt b/resources/src/commonMain/kotlin/Resources.kt
index 52216c45b..53391f3d9 100644
--- a/resources/src/commonMain/kotlin/Resources.kt
+++ b/resources/src/commonMain/kotlin/Resources.kt
@@ -64,7 +64,7 @@ interface KalugaColorLoader {
 expect class DefaultColorLoader() : KalugaColorLoader
 
 /**
- * Loads an [KalugaImage] based on a provided identifier.
+ * Loads a [KalugaImage] based on a provided identifier.
  */
 interface ImageLoader {
     /**
diff --git a/resources/src/iosMain/kotlin/KalugaImage.kt b/resources/src/iosMain/kotlin/KalugaImage.kt
index c19ae7384..243218ff8 100644
--- a/resources/src/iosMain/kotlin/KalugaImage.kt
+++ b/resources/src/iosMain/kotlin/KalugaImage.kt
@@ -26,8 +26,6 @@ import platform.UIKit.UIImageRenderingMode
 actual typealias KalugaImage = UIImage
 
 /**
- * Attempts to create a new [KalugaImage] that is tinted in a given [KalugaColor]
- * @param color The [KalugaColor] to use for tinting.
- * @return The tinted [KalugaImage] or `null` if tinting could not be applied.
+ * Gets the tinted [UIImage] of a [TintedImage]
  */
-actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? = this.imageWithTintColor(color.uiColor, UIImageRenderingMode.UIImageRenderingModeAlwaysOriginal)
+val TintedImage.uiImage: UIImage get() = image.imageWithTintColor(tint.uiColor, UIImageRenderingMode.UIImageRenderingModeAlwaysOriginal)
diff --git a/resources/src/iosMain/kotlin/uikit/TextStyle.kt b/resources/src/iosMain/kotlin/uikit/TextStyle.kt
index 9c00c96ef..4ab39ecc2 100644
--- a/resources/src/iosMain/kotlin/uikit/TextStyle.kt
+++ b/resources/src/iosMain/kotlin/uikit/TextStyle.kt
@@ -34,7 +34,7 @@ import platform.UIKit.addGestureRecognizer
 import platform.darwin.sel_registerName
 
 /**
- * Makes a [UILabel] look according to a [KalugaLabel]
+ * Makes a [UILabel] look like the specification of a [KalugaLabel]
  * @param label the [KalugaLabel] that specifies the look of the [UILabel]
  */
 fun UILabel.bindLabel(label: KalugaLabel) {
@@ -73,7 +73,7 @@ fun UILabel.bindLabel(label: KalugaLabel) {
 }
 
 /**
- * Makes a [UITextView] look according to a [KalugaLabel]
+ * Makes a [UITextView] look like the specification of a [KalugaLabel]
  * @param label the [KalugaLabel] that specifies the look of the [UITextView]
  */
 
diff --git a/resources/src/jsMain/kotlin/KalugaImage.kt b/resources/src/jsMain/kotlin/KalugaImage.kt
index 959664d4a..8de16bf24 100644
--- a/resources/src/jsMain/kotlin/KalugaImage.kt
+++ b/resources/src/jsMain/kotlin/KalugaImage.kt
@@ -21,10 +21,3 @@ package com.splendo.kaluga.resources
  * Class describing an image.
  */
 actual class KalugaImage
-
-/**
- * Attempts to create a new [KalugaImage] that is tinted in a given [KalugaColor]
- * @param color The [KalugaColor] to use for tinting.
- * @return The tinted [KalugaImage] or `null` if tinting could not be applied.
- */
-actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? = null
diff --git a/resources/src/jvmMain/kotlin/KalugaImage.kt b/resources/src/jvmMain/kotlin/KalugaImage.kt
index d16e76dc0..89803f4fb 100644
--- a/resources/src/jvmMain/kotlin/KalugaImage.kt
+++ b/resources/src/jvmMain/kotlin/KalugaImage.kt
@@ -23,10 +23,3 @@ package com.splendo.kaluga.resources
  * Class describing an image.
  */
 actual class KalugaImage
-
-/**
- * Attempts to create a new [KalugaImage] that is tinted in a given [KalugaColor]
- * @param color The [KalugaColor] to use for tinting.
- * @return The tinted [KalugaImage] or `null` if tinting could not be applied.
- */
-actual fun KalugaImage.tinted(color: KalugaColor): KalugaImage? = null
diff --git a/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt b/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
index 2a99839b9..ba6ba71f7 100644
--- a/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
+++ b/test-utils-base/src/commonMain/kotlin/mock/MockMethod.kt
@@ -47,7 +47,7 @@ sealed class BaseMethodMock<
     > {
 
     /**
-     * A Stub is a class that provides an [BaseAnswer] [A] for a set of [ParametersSpec.Values] [V]
+     * A Stub is a class that provides a [BaseAnswer] [A] for a set of [ParametersSpec.Values] [V]
      */
     abstract class Stub<
         M : ParametersSpec.Matchers,
diff --git a/test-utils-resources/api/androidLib/test-utils-resources.api b/test-utils-resources/api/androidLib/test-utils-resources.api
index 61228fe24..dcbb676cd 100644
--- a/test-utils-resources/api/androidLib/test-utils-resources.api
+++ b/test-utils-resources/api/androidLib/test-utils-resources.api
@@ -26,13 +26,13 @@ public final class com/splendo/kaluga/test/resources/MockImageLoader : com/splen
 	public fun <init> (Z)V
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getLoadImageMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/Image;)Lcom/splendo/kaluga/resources/Image;
+	public fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaImage;)Lcom/splendo/kaluga/resources/KalugaImage;
 }
 
 public final class com/splendo/kaluga/test/resources/MockResourcesKt {
 	public static final fun mockColor ()I
 	public static final fun mockFont ()Landroid/graphics/Typeface;
-	public static final fun mockImage ()Lcom/splendo/kaluga/resources/Image;
+	public static final fun mockImage ()Lcom/splendo/kaluga/resources/KalugaImage;
 }
 
 public final class com/splendo/kaluga/test/resources/MockStringLoader : com/splendo/kaluga/resources/StringLoader {
diff --git a/test-utils-resources/api/jvm/test-utils-resources.api b/test-utils-resources/api/jvm/test-utils-resources.api
index ebe036658..d10b09581 100644
--- a/test-utils-resources/api/jvm/test-utils-resources.api
+++ b/test-utils-resources/api/jvm/test-utils-resources.api
@@ -11,7 +11,7 @@ public final class com/splendo/kaluga/test/resources/MockFontLoader : com/splend
 	public fun <init> (Z)V
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getLoadFontMock ()Lcom/splendo/kaluga/test/base/mock/SuspendMethodMock;
-	public fun loadFont (Ljava/lang/String;Lcom/splendo/kaluga/resources/Font;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun loadFont (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaFont;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class com/splendo/kaluga/test/resources/MockImageLoader : com/splendo/kaluga/resources/ImageLoader {
@@ -19,13 +19,13 @@ public final class com/splendo/kaluga/test/resources/MockImageLoader : com/splen
 	public fun <init> (Z)V
 	public synthetic fun <init> (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getLoadImageMock ()Lcom/splendo/kaluga/test/base/mock/MethodMock;
-	public fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/Image;)Lcom/splendo/kaluga/resources/Image;
+	public fun loadImage (Ljava/lang/String;Lcom/splendo/kaluga/resources/KalugaImage;)Lcom/splendo/kaluga/resources/KalugaImage;
 }
 
 public final class com/splendo/kaluga/test/resources/MockResourcesKt {
 	public static final fun mockColor ()I
-	public static final fun mockFont ()Lcom/splendo/kaluga/resources/Font;
-	public static final fun mockImage ()Lcom/splendo/kaluga/resources/Image;
+	public static final fun mockFont ()Lcom/splendo/kaluga/resources/KalugaFont;
+	public static final fun mockImage ()Lcom/splendo/kaluga/resources/KalugaImage;
 }
 
 public final class com/splendo/kaluga/test/resources/MockStringLoader : com/splendo/kaluga/resources/StringLoader {

From 5c02b13c183e23ff5e165f04e3894723d52444a9 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 22 Feb 2023 15:05:48 +0100
Subject: [PATCH 209/227] iOS Example fixes

---
 example/ios/Demo.xcodeproj/project.pbxproj    | 12 +++
 .../ios/Demo/Assets.xcassets/Contents.json    |  6 +-
 .../cancel.imageset/Contents.json             | 12 +++
 .../cancel.imageset/cancel.svg                |  1 +
 .../check.imageset/Contents.json              | 12 +++
 .../Assets.xcassets/check.imageset/check.svg  |  1 +
 .../star.imageset/Contents.json               | 12 +++
 .../Assets.xcassets/star.imageset/star.svg    |  1 +
 .../ios/Demo/Base.lproj/Localizable.strings   |  1 +
 example/ios/Demo/Base.lproj/Main.storyboard   | 89 +++++++++++++++----
 example/ios/Demo/Resources/ImagesView.swift   | 55 ++++++++++++
 .../Demo/Resources/ImagesViewController.swift | 71 +++++++++++++++
 .../Demo/Resources/ResourcesListView.swift    |  3 +
 .../ResourcesListViewController.swift         |  1 +
 example/ios/Kaluga-SwiftUI                    |  2 +-
 15 files changed, 257 insertions(+), 22 deletions(-)
 create mode 100644 example/ios/Demo/Assets.xcassets/cancel.imageset/Contents.json
 create mode 100644 example/ios/Demo/Assets.xcassets/cancel.imageset/cancel.svg
 create mode 100644 example/ios/Demo/Assets.xcassets/check.imageset/Contents.json
 create mode 100644 example/ios/Demo/Assets.xcassets/check.imageset/check.svg
 create mode 100644 example/ios/Demo/Assets.xcassets/star.imageset/Contents.json
 create mode 100644 example/ios/Demo/Assets.xcassets/star.imageset/star.svg
 create mode 100644 example/ios/Demo/Resources/ImagesView.swift
 create mode 100644 example/ios/Demo/Resources/ImagesViewController.swift

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
index f1e5d5ecb..719f11945 100644
--- a/example/ios/Demo.xcodeproj/project.pbxproj
+++ b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -26,6 +26,8 @@
 		205AF6562488F017001BD99E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 205AF6542488F017001BD99E /* Localizable.strings */; };
 		2073D0F0270303B3002CB856 /* ButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2073D0EF270303B3002CB856 /* ButtonViewController.swift */; };
 		2073D0F227032B5B002CB856 /* ColorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2073D0F127032B5B002CB856 /* ColorViewController.swift */; };
+		207537A929A64CEC00D273F2 /* ImagesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 207537A829A64CEC00D273F2 /* ImagesView.swift */; };
+		207537AB29A64D3000D273F2 /* ImagesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 207537AA29A64D3000D273F2 /* ImagesViewController.swift */; };
 		209471E124C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209471E024C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift */; };
 		209471E424C07EAD001426CD /* BluetoothViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209471E324C07EAD001426CD /* BluetoothViewController.swift */; };
 		209471E624C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */; };
@@ -92,6 +94,7 @@
 		D17DC9D74F0BD77D12813366 /* Observable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6681B8FDABE90D9625CA407A /* Observable.generated.swift */; };
 		D976FB8DC34A35578A995B2E /* KalugaButton+SwiftUI.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5304E64813F87A2C71BD40C2 /* KalugaButton+SwiftUI.generated.swift */; };
 		F62F6B35C805651F41B90380 /* KalugaStyledString+SwiftUI.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 382B35FA85A28992FE37B803 /* KalugaStyledString+SwiftUI.generated.swift */; };
+		FEA04DB9D0C154DAAC5F351C /* TintedImage+Image.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944D74BABB71F3B76E746EC8 /* TintedImage+Image.generated.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -143,6 +146,8 @@
 		205AF6552488F017001BD99E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Demo/Base.lproj/Localizable.strings; sourceTree = "<group>"; };
 		2073D0EF270303B3002CB856 /* ButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonViewController.swift; sourceTree = "<group>"; };
 		2073D0F127032B5B002CB856 /* ColorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorViewController.swift; sourceTree = "<group>"; };
+		207537A829A64CEC00D273F2 /* ImagesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagesView.swift; sourceTree = "<group>"; };
+		207537AA29A64D3000D273F2 /* ImagesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagesViewController.swift; sourceTree = "<group>"; };
 		209471E024C07DF4001426CD /* FittingWidthAutomaticHeightCollectionViewFlowLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FittingWidthAutomaticHeightCollectionViewFlowLayout.swift; sourceTree = "<group>"; };
 		209471E324C07EAD001426CD /* BluetoothViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothViewController.swift; sourceTree = "<group>"; };
 		209471E524C07ED9001426CD /* BluetoothDeviceDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothDeviceDetailsViewController.swift; sourceTree = "<group>"; };
@@ -209,6 +214,7 @@
 		896B16F89BA730B7FBF42625 /* RoutingState.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = RoutingState.generated.swift; sourceTree = "<group>"; };
 		89DAFF461D97215C4B63A0A1 /* PlatformMappers.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = PlatformMappers.generated.swift; sourceTree = "<group>"; };
 		93070CB7E1723F904DBEDD26 /* DefaultValues.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = DefaultValues.generated.swift; sourceTree = "<group>"; };
+		944D74BABB71F3B76E746EC8 /* TintedImage+Image.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; lastKnownFileType = sourcecode.swift; name = "TintedImage+Image.generated.swift"; path = "TintedImage+Image.generated.swift"; sourceTree = "<group>"; };
 		978348A6235DF586005B140B /* PermissionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionViewController.swift; sourceTree = "<group>"; };
 		A1AD210B87A46DBD057A7D28 /* Navigation.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Navigation.generated.swift; sourceTree = "<group>"; };
 		A8678F48E60D40E6AB06177C /* LifecycleViewModel.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = LifecycleViewModel.generated.swift; sourceTree = "<group>"; };
@@ -363,6 +369,8 @@
 				201EA22429390A7F00C562EC /* ButtonView.swift */,
 				201EA22629390CFE00C562EC /* LabelView.swift */,
 				201EA228293B8C6600C562EC /* ColorView.swift */,
+				207537A829A64CEC00D273F2 /* ImagesView.swift */,
+				207537AA29A64D3000D273F2 /* ImagesViewController.swift */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -536,6 +544,7 @@
 				744B1E9043B534F8B9BD501C /* UninitializedObservable.generated.swift */,
 				8165D122BD8D8848D7242385 /* UninitializedSubject.generated.swift */,
 				2F34DFA21F534655B6FD3D03 /* KeyboardManager.generated.swift */,
+				944D74BABB71F3B76E746EC8 /* TintedImage+Image.generated.swift */,
 			);
 			path = KalugaSwiftUI;
 			sourceTree = "<group>";
@@ -749,6 +758,7 @@
 				20CA2905293796C5007E4079 /* BottomSheetViewController.swift in Sources */,
 				20BB9E76296333BE0096E836 /* UITableView+Typed.swift in Sources */,
 				20BB9E652962ECA70096E836 /* KeyboardManagerView.swift in Sources */,
+				207537A929A64CEC00D273F2 /* ImagesView.swift in Sources */,
 				20C7D1D22469A3D600C9A63F /* FeaturesListViewController.swift in Sources */,
 				201EA2212938ECE700C562EC /* LoadingView.swift in Sources */,
 				20C7D1DA246A944A00C9A63F /* ArchitectureDetailsViewController.swift in Sources */,
@@ -772,6 +782,7 @@
 				201EA21D2938E89300C562EC /* DateTimePickerView.swift in Sources */,
 				7ECE3B4F9AD53DA93EF73B0E /* ContainerView.generated.swift in Sources */,
 				73DBBA374F2ED176BCF8E189 /* DefaultValues.generated.swift in Sources */,
+				207537AB29A64D3000D273F2 /* ImagesViewController.swift in Sources */,
 				42B12B5CFE87189A5F539B92 /* HasDefaultValue.generated.swift in Sources */,
 				D174F54A364898AC7E0962FC /* KalugaBackgroundStyle+SwiftUI.generated.swift in Sources */,
 				20FFB48C293EC3CB005CF1C8 /* ArchitectureDetailsView.swift in Sources */,
@@ -801,6 +812,7 @@
 				20D4E17C296D562D00A046D6 /* ScientificView.swift in Sources */,
 				1529FF0B35BD7AB3B6E838A9 /* UninitializedSubject.generated.swift in Sources */,
 				9481F22DC3CFE170CE894584 /* KeyboardManager.generated.swift in Sources */,
+				FEA04DB9D0C154DAAC5F351C /* TintedImage+Image.generated.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/example/ios/Demo/Assets.xcassets/Contents.json b/example/ios/Demo/Assets.xcassets/Contents.json
index da4a164c9..73c00596a 100644
--- a/example/ios/Demo/Assets.xcassets/Contents.json
+++ b/example/ios/Demo/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/example/ios/Demo/Assets.xcassets/cancel.imageset/Contents.json b/example/ios/Demo/Assets.xcassets/cancel.imageset/Contents.json
new file mode 100644
index 000000000..81deb03eb
--- /dev/null
+++ b/example/ios/Demo/Assets.xcassets/cancel.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "cancel.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/example/ios/Demo/Assets.xcassets/cancel.imageset/cancel.svg b/example/ios/Demo/Assets.xcassets/cancel.imageset/cancel.svg
new file mode 100644
index 000000000..574c23315
--- /dev/null
+++ b/example/ios/Demo/Assets.xcassets/cancel.imageset/cancel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="m330 768 150-150 150 150 42-42-150-150 150-150-42-42-150 150-150-150-42 42 150 150-150 150 42 42Zm150 208q-82 0-155-31.5t-127.5-86Q143 804 111.5 731T80 576q0-83 31.5-156t86-127Q252 239 325 207.5T480 176q83 0 156 31.5T763 293q54 54 85.5 127T880 576q0 82-31.5 155T763 858.5q-54 54.5-127 86T480 976Zm0-60q142 0 241-99.5T820 576q0-142-99-241t-241-99q-141 0-240.5 99T140 576q0 141 99.5 240.5T480 916Zm0-340Z"/></svg>
\ No newline at end of file
diff --git a/example/ios/Demo/Assets.xcassets/check.imageset/Contents.json b/example/ios/Demo/Assets.xcassets/check.imageset/Contents.json
new file mode 100644
index 000000000..b09981a23
--- /dev/null
+++ b/example/ios/Demo/Assets.xcassets/check.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "check.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/example/ios/Demo/Assets.xcassets/check.imageset/check.svg b/example/ios/Demo/Assets.xcassets/check.imageset/check.svg
new file mode 100644
index 000000000..19409ee3d
--- /dev/null
+++ b/example/ios/Demo/Assets.xcassets/check.imageset/check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M378 810 154 586l43-43 181 181 384-384 43 43-427 427Z"/></svg>
\ No newline at end of file
diff --git a/example/ios/Demo/Assets.xcassets/star.imageset/Contents.json b/example/ios/Demo/Assets.xcassets/star.imageset/Contents.json
new file mode 100644
index 000000000..fb87640df
--- /dev/null
+++ b/example/ios/Demo/Assets.xcassets/star.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "star.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/example/ios/Demo/Assets.xcassets/star.imageset/star.svg b/example/ios/Demo/Assets.xcassets/star.imageset/star.svg
new file mode 100644
index 000000000..b50fff782
--- /dev/null
+++ b/example/ios/Demo/Assets.xcassets/star.imageset/star.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="m323 851 157-94 157 95-42-178 138-120-182-16-71-168-71 167-182 16 138 120-42 178Zm-90 125 65-281L80 506l288-25 112-265 112 265 288 25-218 189 65 281-247-149-247 149Zm247-355Z"/></svg>
\ No newline at end of file
diff --git a/example/ios/Demo/Base.lproj/Localizable.strings b/example/ios/Demo/Base.lproj/Localizable.strings
index 985695a6c..a302edf3a 100644
--- a/example/ios/Demo/Base.lproj/Localizable.strings
+++ b/example/ios/Demo/Base.lproj/Localizable.strings
@@ -14,6 +14,7 @@
 "feature_resources" = "Resources";
 "feature_resources_color" = "Color";
 "feature_resources_button" = "Button";
+"feature_resources_image" = "Image";
 "feature_resources_label" = "Label";
 "feature_scientific" = "Scientific";
 
diff --git a/example/ios/Demo/Base.lproj/Main.storyboard b/example/ios/Demo/Base.lproj/Main.storyboard
index 5ee49e399..be3b25674 100644
--- a/example/ios/Demo/Base.lproj/Main.storyboard
+++ b/example/ios/Demo/Base.lproj/Main.storyboard
@@ -354,14 +354,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="FeaturesListCell" id="C4Y-IC-Pu4" customClass="FeaturesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="C4Y-IC-Pu4" id="XEB-aa-Byo">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xh8-DK-zfM">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21.5"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -995,14 +995,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SystemListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SystemListCell" id="a8b-dW-eKx" customClass="SystemListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="a8b-dW-eKx" id="pjk-M2-4TV">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pnV-0z-POK">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21.5"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1084,14 +1084,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="InfoButtonCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="InfoButtonCell" id="3eh-xF-TU3" customClass="InfoButtonCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="44"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="43"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3eh-xF-TU3" id="cyO-Cc-dq8">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odz-vr-fX0">
-                                            <rect key="frame" x="40" y="15" width="334" height="22"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1132,14 +1132,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PermissionsListCell" id="FrV-FL-GKa" customClass="PermissionsListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FrV-FL-GKa" id="wA3-QT-FyZ">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nXv-Uh-BJk">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21.5"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1281,14 +1281,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ResourcesListCell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ResourcesListCell" id="YH6-gF-Pq3" customClass="ResourcesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="37"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="37.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YH6-gF-Pq3" id="yfs-Dl-hfq">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="37"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="37.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="app-pb-mRq">
-                                            <rect key="frame" x="20" y="8" width="374" height="21"/>
+                                            <rect key="frame" x="20" y="8" width="374" height="21.5"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1316,6 +1316,7 @@
                         <segue destination="Shd-b8-Oui" kind="show" identifier="showLabel" id="XT2-bS-grd"/>
                         <segue destination="t7d-lb-B0c" kind="show" identifier="showColor" id="efK-Tc-RgZ"/>
                         <segue destination="vjD-in-IYI" kind="show" identifier="showButton" id="84U-QK-aOU"/>
+                        <segue destination="riA-9R-f8W" kind="show" identifier="showImage" id="rq1-ap-GZG"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="bWE-wJ-Red" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -1723,14 +1724,14 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="UITypesListCell" id="ZCQ-8B-OTT" customClass="UITypesListCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="50" width="414" height="51"/>
+                                <rect key="frame" x="0.0" y="50" width="414" height="51.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ZCQ-8B-OTT" id="nFY-1A-spl">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="51.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GMC-Yg-Klf">
-                                            <rect key="frame" x="40" y="15" width="334" height="21"/>
+                                            <rect key="frame" x="40" y="15" width="334" height="21.5"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
@@ -1762,6 +1763,58 @@
             </objects>
             <point key="canvasLocation" x="3264" y="337"/>
         </scene>
+        <!--Images View Controller-->
+        <scene sceneID="rOC-Ce-iie">
+            <objects>
+                <tableViewController id="riA-9R-f8W" customClass="ImagesViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="LQU-5Y-EV3">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ImageListCell" id="Ub3-gd-6u4" customClass="ImageListCell" customModule="Demo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="50" width="414" height="130"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Ub3-gd-6u4" id="lYJ-r1-NkL">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="130"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <stackView opaque="NO" contentMode="scaleToFill" distribution="equalCentering" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="hgX-Wn-7pS">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="130"/>
+                                            <subviews>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tPb-2A-JgB">
+                                                    <rect key="frame" x="0.0" y="0.5" width="207" height="129.5"/>
+                                                </imageView>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vnu-GG-WNS">
+                                                    <rect key="frame" x="207" y="0.5" width="207" height="129.5"/>
+                                                </imageView>
+                                            </subviews>
+                                        </stackView>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstAttribute="bottom" secondItem="hgX-Wn-7pS" secondAttribute="bottom" id="Bfp-jc-xWA"/>
+                                        <constraint firstItem="hgX-Wn-7pS" firstAttribute="top" secondItem="lYJ-r1-NkL" secondAttribute="top" id="JRp-F7-BKO"/>
+                                        <constraint firstItem="hgX-Wn-7pS" firstAttribute="leading" secondItem="lYJ-r1-NkL" secondAttribute="leading" id="RJF-Jl-PEJ"/>
+                                        <constraint firstAttribute="trailing" secondItem="hgX-Wn-7pS" secondAttribute="trailing" id="hrq-8p-buk"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="plainImage" destination="tPb-2A-JgB" id="uJP-Eh-Ul8"/>
+                                    <outlet property="tintedImage" destination="Vnu-GG-WNS" id="pxj-pc-ZWk"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="riA-9R-f8W" id="KLV-fh-xrR"/>
+                            <outlet property="delegate" destination="riA-9R-f8W" id="bnQ-x2-vkW"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="DMb-mH-ZE2"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="EPr-yL-Tgc" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="5259" y="2932"/>
+        </scene>
     </scenes>
     <resources>
         <image name="error_icon" width="14" height="14"/>
diff --git a/example/ios/Demo/Resources/ImagesView.swift b/example/ios/Demo/Resources/ImagesView.swift
new file mode 100644
index 000000000..fb249fcce
--- /dev/null
+++ b/example/ios/Demo/Resources/ImagesView.swift
@@ -0,0 +1,55 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import SwiftUI
+import KalugaExampleShared
+
+struct ImagesView: View {
+
+    let lifecycleViewModel: LifecycleViewModel<ImagesViewModel>
+
+    init() {
+        let viewModel = ImagesViewModel()
+        lifecycleViewModel = LifecycleViewModel(viewModel)
+    }
+
+    var body: some View {
+        lifecycleViewModel.lifecycleView { viewModel in
+            ScrollView {
+                HStack {
+                    VStack(spacing: 10.0) {
+                        ForEach(viewModel.images, id: \.self) { image in
+                            Image(uiImage: image)
+                        }
+                    }
+                    .frame(maxWidth: .infinity)
+                    VStack(spacing: 10.0) {
+                        ForEach(viewModel.tintedImages, id: \.self) { tintedImage in
+                            tintedImage.swiftUI
+                        }
+                    }
+                    .frame(maxWidth: .infinity)
+                }
+            }.navigationTitle("feature_resources_image".localized())
+        }
+    }
+}
+
+struct ImagesView_Previews: PreviewProvider {
+    static var previews: some View {
+        ImagesView()
+    }
+}
diff --git a/example/ios/Demo/Resources/ImagesViewController.swift b/example/ios/Demo/Resources/ImagesViewController.swift
new file mode 100644
index 000000000..f62356596
--- /dev/null
+++ b/example/ios/Demo/Resources/ImagesViewController.swift
@@ -0,0 +1,71 @@
+//
+//  Copyright 2023 Splendo Consulting B.V. The Netherlands
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+
+import UIKit
+import KalugaExampleShared
+
+class ImagesViewController: UITableViewController {
+
+    private var viewModel = ImagesViewModel()
+    private var lifecycleManager: LifecycleManager!
+    
+    deinit {
+        lifecycleManager.unbind()
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        title = "feature_resources_image".localized()
+        
+        tableView.allowsSelection = false
+        lifecycleManager = viewModel.addLifecycleManager(parent: self) { [] }
+    }
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return max(viewModel.images.count, viewModel.tintedImages.count)
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        return tableView.dequeueTypedReusableCell(withIdentifier: ImageListCell.Const.identifier, for: indexPath) { (cell: ImageListCell) in
+            let index = indexPath.row
+            if index < viewModel.images.count {
+                cell.plainImage.image = viewModel.images[index]
+            } else {
+                cell.plainImage.image = nil
+            }
+            if index < viewModel.tintedImages.count {
+                cell.tintedImage.image = viewModel.tintedImages[index].uiImage
+            } else {
+                cell.tintedImage.image = nil
+            }
+        }
+    }
+}
+
+class ImageListCell: UITableViewCell {
+    
+    enum Const {
+        static let identifier = "ImageListCell"
+    }
+    
+    @IBOutlet weak var plainImage: UIImageView!
+    @IBOutlet weak var tintedImage: UIImageView!
+}
diff --git a/example/ios/Demo/Resources/ResourcesListView.swift b/example/ios/Demo/Resources/ResourcesListView.swift
index 239c416e7..326329052 100644
--- a/example/ios/Demo/Resources/ResourcesListView.swift
+++ b/example/ios/Demo/Resources/ResourcesListView.swift
@@ -51,6 +51,7 @@ struct ResourcesListView: View {
                 switch navigationState.object {
                 case .buttons: ButtonView().equatable() // For lifecycle subviews it is recommended to use equatable
                 case .labels: LabelView()
+                case .images: ImagesView()
                 case .colors: ColorView().equatable()
                 default: EmptyView()
                 }
@@ -63,6 +64,7 @@ extension ResourcesListView {
     enum Route: Equatable {
         case buttons
         case labels
+        case images
         case colors
     }
 
@@ -80,6 +82,7 @@ extension ResourcesListNavigationAction {
         switch self {
         case is ResourcesListNavigationAction.Button: return .buttons
         case is ResourcesListNavigationAction.Color: return .colors
+        case is ResourcesListNavigationAction.Image: return .images
         case is ResourcesListNavigationAction.Label: return .labels
         default: fatalError("Unknown action \(self)")
         }
diff --git a/example/ios/Demo/Resources/ResourcesListViewController.swift b/example/ios/Demo/Resources/ResourcesListViewController.swift
index f6873d11d..2efa06779 100644
--- a/example/ios/Demo/Resources/ResourcesListViewController.swift
+++ b/example/ios/Demo/Resources/ResourcesListViewController.swift
@@ -89,6 +89,7 @@ private extension ResourcesListNavigationAction {
         switch self {
         case is ResourcesListNavigationAction.Button: return "showButton"
         case is ResourcesListNavigationAction.Color: return "showColor"
+        case is ResourcesListNavigationAction.Image: return "showImage"
         case is ResourcesListNavigationAction.Label: return "showLabel"
         default: return ""
         }
diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index 3a70019f1..f861dfdc0 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit 3a70019f1ea23f8364307c172f0548e03e1c0962
+Subproject commit f861dfdc00af4aeaac22727dc74f953d4d990e43

From 25db361eb649a688299f42b957d3883ed777ec62 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 22 Feb 2023 15:47:27 +0100
Subject: [PATCH 210/227] File restructuring links

---
 .../links => }/AndroidLinksHandlerTest.kt     |  6 +++---
 .../links => }/manager/LinksManagerTest.kt    |  0
 .../splendo/kaluga/links => }/LinksBuilder.kt |  2 +-
 .../manager/PlatformLinksHandler.kt           |  4 ++--
 .../{com/splendo/kaluga/links => }/Links.kt   |  1 +
 .../links => }/manager/DefaultLinksManager.kt |  4 +---
 .../kaluga/links => }/manager/LinksHandler.kt |  0
 .../kaluga/links => }/manager/LinksManager.kt |  0
 .../kotlin/manager/PlatformLinksHandler.kt}   |  4 ++--
 .../kaluga/links => }/utils/decoders.kt       |  6 +++---
 .../splendo/kaluga/links => }/LinksTest.kt    |  2 +-
 .../manager/DefaultLinksManagerTest.kt        |  0
 .../links => }/manager/MockLinksManager.kt    |  0
 .../links => }/utils/LinksDecoderTest.kt      |  0
 .../splendo/kaluga/links => }/LinksBuilder.kt |  4 ++--
 .../manager/PlatformLinksHandler.kt           |  4 ++--
 .../kaluga/links => }/IosLinksHandlerTest.kt  |  2 +-
 .../links => }/manager/LinksManagerTest.kt    |  2 +-
 .../links => jsMain/kotlin}/LinksBuilder.kt   |  4 ++--
 .../manager/PlatformLinksHandler.kt           |  4 ++--
 .../kaluga/links/PlatformLinksManagerTest.kt  | 20 -------------------
 .../links => jvmMain/kotlin}/LinksBuilder.kt  |  4 ++--
 .../manager/PlatformLinksHandler.kt           |  4 ++--
 .../kaluga/links/PlatformLinksManagerTest.kt  | 20 -------------------
 .../kaluga/links/manager/LinksManagerTest.kt  | 20 -------------------
 25 files changed, 28 insertions(+), 89 deletions(-)
 rename links/src/androidLibInstrumentedTest/kotlin/{com/splendo/kaluga/links => }/AndroidLinksHandlerTest.kt (90%)
 rename links/src/androidLibInstrumentedTest/kotlin/{com/splendo/kaluga/links => }/manager/LinksManagerTest.kt (100%)
 rename links/src/androidLibMain/kotlin/{com/splendo/kaluga/links => }/LinksBuilder.kt (99%)
 rename links/src/androidLibMain/kotlin/{com/splendo/kaluga/links => }/manager/PlatformLinksHandler.kt (94%)
 rename links/src/commonMain/kotlin/{com/splendo/kaluga/links => }/Links.kt (99%)
 rename links/src/commonMain/kotlin/{com/splendo/kaluga/links => }/manager/DefaultLinksManager.kt (91%)
 rename links/src/commonMain/kotlin/{com/splendo/kaluga/links => }/manager/LinksHandler.kt (100%)
 rename links/src/commonMain/kotlin/{com/splendo/kaluga/links => }/manager/LinksManager.kt (100%)
 rename links/src/{jsTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt => commonMain/kotlin/manager/PlatformLinksHandler.kt} (83%)
 rename links/src/commonMain/kotlin/{com/splendo/kaluga/links => }/utils/decoders.kt (95%)
 rename links/src/commonTest/kotlin/{com/splendo/kaluga/links => }/LinksTest.kt (96%)
 rename links/src/commonTest/kotlin/{com/splendo/kaluga/links => }/manager/DefaultLinksManagerTest.kt (100%)
 rename links/src/commonTest/kotlin/{com/splendo/kaluga/links => }/manager/MockLinksManager.kt (100%)
 rename links/src/commonTest/kotlin/{com/splendo/kaluga/links => }/utils/LinksDecoderTest.kt (100%)
 rename links/src/iosMain/kotlin/{com/splendo/kaluga/links => }/LinksBuilder.kt (93%)
 rename links/src/iosMain/kotlin/{com/splendo/kaluga/links => }/manager/PlatformLinksHandler.kt (95%)
 rename links/src/iosTest/kotlin/{com/splendo/kaluga/links => }/IosLinksHandlerTest.kt (96%)
 rename links/src/iosTest/kotlin/{com/splendo/kaluga/links => }/manager/LinksManagerTest.kt (96%)
 rename links/src/{jvmMain/kotlin/com/splendo/kaluga/links => jsMain/kotlin}/LinksBuilder.kt (92%)
 rename links/src/jsMain/kotlin/{com/splendo/kaluga/links => }/manager/PlatformLinksHandler.kt (93%)
 delete mode 100644 links/src/jsTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
 rename links/src/{jsMain/kotlin/com/splendo/kaluga/links => jvmMain/kotlin}/LinksBuilder.kt (92%)
 rename links/src/jvmMain/kotlin/{com/splendo/kaluga/links => }/manager/PlatformLinksHandler.kt (93%)
 delete mode 100644 links/src/jvmTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
 delete mode 100644 links/src/jvmTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt

diff --git a/links/src/androidLibInstrumentedTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt b/links/src/androidLibInstrumentedTest/kotlin/AndroidLinksHandlerTest.kt
similarity index 90%
rename from links/src/androidLibInstrumentedTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt
rename to links/src/androidLibInstrumentedTest/kotlin/AndroidLinksHandlerTest.kt
index 593f936db..f5257aa1a 100644
--- a/links/src/androidLibInstrumentedTest/kotlin/com/splendo/kaluga/links/AndroidLinksHandlerTest.kt
+++ b/links/src/androidLibInstrumentedTest/kotlin/AndroidLinksHandlerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 package com.splendo.kaluga.links
 
-import com.splendo.kaluga.links.manager.PlatformLinksHandler
+import manager.PlatformLinksHandler
 import com.splendo.kaluga.links.manager.TestConstants.INVALID_URLS
 import com.splendo.kaluga.links.manager.TestConstants.VALID_URLS
 import org.junit.Test
@@ -27,7 +27,7 @@ import kotlin.test.assertTrue
 
 class AndroidLinksHandlerTest {
 
-    private val linksValidator = PlatformLinksHandler()
+    private val linksValidator = manager.PlatformLinksHandler()
 
     @Test
     fun testLinksValidatorSucceed() {
diff --git a/links/src/androidLibInstrumentedTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt b/links/src/androidLibInstrumentedTest/kotlin/manager/LinksManagerTest.kt
similarity index 100%
rename from links/src/androidLibInstrumentedTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
rename to links/src/androidLibInstrumentedTest/kotlin/manager/LinksManagerTest.kt
diff --git a/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/androidLibMain/kotlin/LinksBuilder.kt
similarity index 99%
rename from links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
rename to links/src/androidLibMain/kotlin/LinksBuilder.kt
index e79f403e7..6ebf0722c 100644
--- a/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/androidLibMain/kotlin/LinksBuilder.kt
@@ -22,4 +22,4 @@ import com.splendo.kaluga.links.manager.LinksManagerBuilder
 actual class LinksBuilder : BaseLinksBuilder {
     override fun create(): Links =
         Links(LinksManagerBuilder())
-}
+}
\ No newline at end of file
diff --git a/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt b/links/src/androidLibMain/kotlin/manager/PlatformLinksHandler.kt
similarity index 94%
rename from links/src/androidLibMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
rename to links/src/androidLibMain/kotlin/manager/PlatformLinksHandler.kt
index f2bf4df02..6efa1da8a 100644
--- a/links/src/androidLibMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
+++ b/links/src/androidLibMain/kotlin/manager/PlatformLinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -31,4 +31,4 @@ actual class PlatformLinksHandler : LinksHandler {
         }
         return params.parameterList.map { it.mValue }
     }
-}
+}
\ No newline at end of file
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt b/links/src/commonMain/kotlin/Links.kt
similarity index 99%
rename from links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt
rename to links/src/commonMain/kotlin/Links.kt
index 8e20f6917..67e498bb6 100644
--- a/links/src/commonMain/kotlin/com/splendo/kaluga/links/Links.kt
+++ b/links/src/commonMain/kotlin/Links.kt
@@ -51,3 +51,4 @@ interface BaseLinksBuilder {
 }
 
 expect class LinksBuilder constructor() : BaseLinksBuilder
+
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManager.kt b/links/src/commonMain/kotlin/manager/DefaultLinksManager.kt
similarity index 91%
rename from links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManager.kt
rename to links/src/commonMain/kotlin/manager/DefaultLinksManager.kt
index ac46ff2be..0ce68bcd7 100644
--- a/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManager.kt
+++ b/links/src/commonMain/kotlin/manager/DefaultLinksManager.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -46,5 +46,3 @@ class LinksManagerBuilder : LinksManager.Builder {
     override fun create(): LinksManager =
         DefaultLinksManager(PlatformLinksHandler())
 }
-
-expect class PlatformLinksHandler constructor() : LinksHandler
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksHandler.kt b/links/src/commonMain/kotlin/manager/LinksHandler.kt
similarity index 100%
rename from links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksHandler.kt
rename to links/src/commonMain/kotlin/manager/LinksHandler.kt
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksManager.kt b/links/src/commonMain/kotlin/manager/LinksManager.kt
similarity index 100%
rename from links/src/commonMain/kotlin/com/splendo/kaluga/links/manager/LinksManager.kt
rename to links/src/commonMain/kotlin/manager/LinksManager.kt
diff --git a/links/src/jsTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt b/links/src/commonMain/kotlin/manager/PlatformLinksHandler.kt
similarity index 83%
rename from links/src/jsTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
rename to links/src/commonMain/kotlin/manager/PlatformLinksHandler.kt
index 71322576f..f3624627d 100644
--- a/links/src/jsTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
+++ b/links/src/commonMain/kotlin/manager/PlatformLinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,4 +17,4 @@
 
 package com.splendo.kaluga.links.manager
 
-class LinksManagerTestJs
+expect class PlatformLinksHandler constructor() : LinksHandler
diff --git a/links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt b/links/src/commonMain/kotlin/utils/decoders.kt
similarity index 95%
rename from links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt
rename to links/src/commonMain/kotlin/utils/decoders.kt
index 7ca8d45f7..79520accd 100644
--- a/links/src/commonMain/kotlin/com/splendo/kaluga/links/utils/decoders.kt
+++ b/links/src/commonMain/kotlin/utils/decoders.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ fun <T> decodeFromList(list: List<Any>, deserializer: DeserializationStrategy<T>
     return decoder.decodeSerializableValue(deserializer)
 }
 
-class LinksDecoder(
-    internal val list: ArrayDeque<Any>,
+internal class LinksDecoder(
+    private val list: ArrayDeque<Any>,
     var elementsCount: Int = 0
 ) : AbstractDecoder() {
     private var elementIndex = 0
diff --git a/links/src/commonTest/kotlin/com/splendo/kaluga/links/LinksTest.kt b/links/src/commonTest/kotlin/LinksTest.kt
similarity index 96%
rename from links/src/commonTest/kotlin/com/splendo/kaluga/links/LinksTest.kt
rename to links/src/commonTest/kotlin/LinksTest.kt
index c8f028510..64f8ebbe3 100644
--- a/links/src/commonTest/kotlin/com/splendo/kaluga/links/LinksTest.kt
+++ b/links/src/commonTest/kotlin/LinksTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManagerTest.kt b/links/src/commonTest/kotlin/manager/DefaultLinksManagerTest.kt
similarity index 100%
rename from links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/DefaultLinksManagerTest.kt
rename to links/src/commonTest/kotlin/manager/DefaultLinksManagerTest.kt
diff --git a/links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/MockLinksManager.kt b/links/src/commonTest/kotlin/manager/MockLinksManager.kt
similarity index 100%
rename from links/src/commonTest/kotlin/com/splendo/kaluga/links/manager/MockLinksManager.kt
rename to links/src/commonTest/kotlin/manager/MockLinksManager.kt
diff --git a/links/src/commonTest/kotlin/com/splendo/kaluga/links/utils/LinksDecoderTest.kt b/links/src/commonTest/kotlin/utils/LinksDecoderTest.kt
similarity index 100%
rename from links/src/commonTest/kotlin/com/splendo/kaluga/links/utils/LinksDecoderTest.kt
rename to links/src/commonTest/kotlin/utils/LinksDecoderTest.kt
diff --git a/links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/iosMain/kotlin/LinksBuilder.kt
similarity index 93%
rename from links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
rename to links/src/iosMain/kotlin/LinksBuilder.kt
index e79f403e7..7e5ab7e62 100644
--- a/links/src/iosMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/iosMain/kotlin/LinksBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -22,4 +22,4 @@ import com.splendo.kaluga.links.manager.LinksManagerBuilder
 actual class LinksBuilder : BaseLinksBuilder {
     override fun create(): Links =
         Links(LinksManagerBuilder())
-}
+}
\ No newline at end of file
diff --git a/links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt b/links/src/iosMain/kotlin/manager/PlatformLinksHandler.kt
similarity index 95%
rename from links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
rename to links/src/iosMain/kotlin/manager/PlatformLinksHandler.kt
index 29ca969f1..d1a01b704 100644
--- a/links/src/iosMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
+++ b/links/src/iosMain/kotlin/manager/PlatformLinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -33,4 +33,4 @@ actual class PlatformLinksHandler : LinksHandler {
         val components = NSURLComponents(url)
         return components.queryItems.orEmpty().mapNotNull { (it as? NSURLQueryItem)?.value }
     }
-}
+}
\ No newline at end of file
diff --git a/links/src/iosTest/kotlin/com/splendo/kaluga/links/IosLinksHandlerTest.kt b/links/src/iosTest/kotlin/IosLinksHandlerTest.kt
similarity index 96%
rename from links/src/iosTest/kotlin/com/splendo/kaluga/links/IosLinksHandlerTest.kt
rename to links/src/iosTest/kotlin/IosLinksHandlerTest.kt
index 3f876460f..4cb7783ba 100644
--- a/links/src/iosTest/kotlin/com/splendo/kaluga/links/IosLinksHandlerTest.kt
+++ b/links/src/iosTest/kotlin/IosLinksHandlerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/iosTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt b/links/src/iosTest/kotlin/manager/LinksManagerTest.kt
similarity index 96%
rename from links/src/iosTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
rename to links/src/iosTest/kotlin/manager/LinksManagerTest.kt
index 054c92bb4..b9771c2b2 100644
--- a/links/src/iosTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
+++ b/links/src/iosTest/kotlin/manager/LinksManagerTest.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/jsMain/kotlin/LinksBuilder.kt
similarity index 92%
rename from links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
rename to links/src/jsMain/kotlin/LinksBuilder.kt
index 7156687e9..cee1a72d2 100644
--- a/links/src/jvmMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/jsMain/kotlin/LinksBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@ actual class LinksBuilder : BaseLinksBuilder {
     override fun create(): Links {
         TODO("Not yet implemented")
     }
-}
+}
\ No newline at end of file
diff --git a/links/src/jsMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt b/links/src/jsMain/kotlin/manager/PlatformLinksHandler.kt
similarity index 93%
rename from links/src/jsMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
rename to links/src/jsMain/kotlin/manager/PlatformLinksHandler.kt
index 4820b07d9..d3e8b81ce 100644
--- a/links/src/jsMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
+++ b/links/src/jsMain/kotlin/manager/PlatformLinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -25,4 +25,4 @@ actual class PlatformLinksHandler : LinksHandler {
     override fun extractQueryAsList(url: String): List<Any> {
         TODO("Not yet implemented")
     }
-}
+}
\ No newline at end of file
diff --git a/links/src/jsTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt b/links/src/jsTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
deleted file mode 100644
index 129418bfe..000000000
--- a/links/src/jsTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links
-
-class PlatformLinksManagerTest
diff --git a/links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt b/links/src/jvmMain/kotlin/LinksBuilder.kt
similarity index 92%
rename from links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
rename to links/src/jvmMain/kotlin/LinksBuilder.kt
index 7156687e9..cee1a72d2 100644
--- a/links/src/jsMain/kotlin/com/splendo/kaluga/links/LinksBuilder.kt
+++ b/links/src/jvmMain/kotlin/LinksBuilder.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@ actual class LinksBuilder : BaseLinksBuilder {
     override fun create(): Links {
         TODO("Not yet implemented")
     }
-}
+}
\ No newline at end of file
diff --git a/links/src/jvmMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt b/links/src/jvmMain/kotlin/manager/PlatformLinksHandler.kt
similarity index 93%
rename from links/src/jvmMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
rename to links/src/jvmMain/kotlin/manager/PlatformLinksHandler.kt
index 4820b07d9..d3e8b81ce 100644
--- a/links/src/jvmMain/kotlin/com/splendo/kaluga/links/manager/PlatformLinksHandler.kt
+++ b/links/src/jvmMain/kotlin/manager/PlatformLinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -25,4 +25,4 @@ actual class PlatformLinksHandler : LinksHandler {
     override fun extractQueryAsList(url: String): List<Any> {
         TODO("Not yet implemented")
     }
-}
+}
\ No newline at end of file
diff --git a/links/src/jvmTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt b/links/src/jvmTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
deleted file mode 100644
index 129418bfe..000000000
--- a/links/src/jvmTest/kotlin/com/splendo/kaluga/links/PlatformLinksManagerTest.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links
-
-class PlatformLinksManagerTest
diff --git a/links/src/jvmTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt b/links/src/jvmTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
deleted file mode 100644
index 0c7ef5744..000000000
--- a/links/src/jvmTest/kotlin/com/splendo/kaluga/links/manager/LinksManagerTest.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links.manager
-
-class LinksManagerTestJvm

From ad6e26c4cc2ea9e86ce67028fb377eef8eb73063 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 22 Feb 2023 17:39:39 +0100
Subject: [PATCH 211/227] Large cleanup of Links

---
 .../ios/Demo/Links/LinksViewController.swift  |  2 +-
 example/shared/build.gradle.kts               |  2 +-
 .../example/shared/di/DependencyInjection.kt  |  4 +-
 .../shared/viewmodel/link/LinksViewModel.kt   |  6 +-
 links/README.md                               | 97 ++++++------------
 links/api/androidLib/links.api                | 74 ++++----------
 links/api/jvm/links.api                       | 67 +++----------
 links/build.gradle.kts                        |  2 -
 .../AndroidManifest.xml                       |  6 ++
 .../kotlin/AndroidLinksHandlerTest.kt         | 59 -----------
 .../kotlin/TestActivity.kt                    | 23 +++++
 .../handler/AndroidLinksHandlerTest.kt}       |  8 +-
 .../kotlin/manager/LinksManagerTest.kt        | 57 -----------
 .../src/androidLibMain/kotlin/LinksBuilder.kt | 25 -----
 .../src/androidLibMain/kotlin/LinksManager.kt | 58 +++++++++++
 .../PlatformLinksHandler.kt                   |  7 +-
 links/src/commonMain/kotlin/Links.kt          | 54 ----------
 links/src/commonMain/kotlin/LinksManager.kt   | 98 +++++++++++++++++++
 .../{manager => handler}/LinksHandler.kt      | 19 +++-
 .../PlatformLinksHandler.kt                   |  5 +-
 .../kotlin/manager/DefaultLinksManager.kt     | 48 ---------
 .../commonMain/kotlin/manager/LinksManager.kt | 30 ------
 links/src/commonMain/kotlin/utils/decoders.kt |  2 +-
 .../src/commonTest/kotlin/LinksManagerTest.kt | 98 +++++++++++++++++++
 links/src/commonTest/kotlin/LinksTest.kt      | 58 -----------
 .../handler/PlatformLinksHandlerTest.kt}      | 29 ++++--
 .../kotlin/manager/DefaultLinksManagerTest.kt | 42 --------
 .../kotlin/manager/MockLinksManager.kt        | 67 -------------
 links/src/iosMain/kotlin/LinksBuilder.kt      | 25 -----
 links/src/iosMain/kotlin/LinksManager.kt      | 39 ++++++++
 .../PlatformLinksHandler.kt                   |  7 +-
 .../kotlin/IOSLinksHandlerTest.kt}            |  8 +-
 .../kotlin/manager/LinksManagerTest.kt        | 57 -----------
 .../kotlin/handler}/PlatformLinksHandler.kt   |  8 +-
 .../kotlin/handler}/PlatformLinksHandler.kt   |  8 +-
 35 files changed, 462 insertions(+), 737 deletions(-)
 create mode 100644 links/src/androidLibInstrumentedTest/AndroidManifest.xml
 delete mode 100644 links/src/androidLibInstrumentedTest/kotlin/AndroidLinksHandlerTest.kt
 create mode 100644 links/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
 rename links/src/{jvmMain/kotlin/LinksBuilder.kt => androidLibInstrumentedTest/kotlin/handler/AndroidLinksHandlerTest.kt} (79%)
 delete mode 100644 links/src/androidLibInstrumentedTest/kotlin/manager/LinksManagerTest.kt
 delete mode 100644 links/src/androidLibMain/kotlin/LinksBuilder.kt
 create mode 100644 links/src/androidLibMain/kotlin/LinksManager.kt
 rename links/src/androidLibMain/kotlin/{manager => handler}/PlatformLinksHandler.kt (91%)
 delete mode 100644 links/src/commonMain/kotlin/Links.kt
 create mode 100644 links/src/commonMain/kotlin/LinksManager.kt
 rename links/src/commonMain/kotlin/{manager => handler}/LinksHandler.kt (56%)
 rename links/src/commonMain/kotlin/{manager => handler}/PlatformLinksHandler.kt (86%)
 delete mode 100644 links/src/commonMain/kotlin/manager/DefaultLinksManager.kt
 delete mode 100644 links/src/commonMain/kotlin/manager/LinksManager.kt
 create mode 100644 links/src/commonTest/kotlin/LinksManagerTest.kt
 delete mode 100644 links/src/commonTest/kotlin/LinksTest.kt
 rename links/src/{iosTest/kotlin/IosLinksHandlerTest.kt => commonTest/kotlin/handler/PlatformLinksHandlerTest.kt} (70%)
 delete mode 100644 links/src/commonTest/kotlin/manager/DefaultLinksManagerTest.kt
 delete mode 100644 links/src/commonTest/kotlin/manager/MockLinksManager.kt
 delete mode 100644 links/src/iosMain/kotlin/LinksBuilder.kt
 create mode 100644 links/src/iosMain/kotlin/LinksManager.kt
 rename links/src/iosMain/kotlin/{manager => handler}/PlatformLinksHandler.kt (93%)
 rename links/src/{jsMain/kotlin/LinksBuilder.kt => iosTest/kotlin/IOSLinksHandlerTest.kt} (79%)
 delete mode 100644 links/src/iosTest/kotlin/manager/LinksManagerTest.kt
 rename links/src/{jvmMain/kotlin/manager => jsMain/kotlin/handler}/PlatformLinksHandler.kt (88%)
 rename links/src/{jsMain/kotlin/manager => jvmMain/kotlin/handler}/PlatformLinksHandler.kt (88%)

diff --git a/example/ios/Demo/Links/LinksViewController.swift b/example/ios/Demo/Links/LinksViewController.swift
index 11b89d0f1..c807a909d 100644
--- a/example/ios/Demo/Links/LinksViewController.swift
+++ b/example/ios/Demo/Links/LinksViewController.swift
@@ -26,7 +26,7 @@ class LinksViewController: UIViewController {
 
     private lazy var navigator: ViewControllerNavigator<BrowserNavigationActions<AnyObject>> = BrowserNavigatorKt.BrowserNavigator(parent: self)
     private lazy var viewModel = LinksViewModel(
-        linkRepoBuilder: LinksLinksBuilder(),
+        linkManagerBuilder: DefaultLinksManager.Builder(),
         alertPresenterBuilder: AlertPresenter.Builder(viewController: self),
         navigator: navigator
     )
diff --git a/example/shared/build.gradle.kts b/example/shared/build.gradle.kts
index b6615d002..23f706b3f 100644
--- a/example/shared/build.gradle.kts
+++ b/example/shared/build.gradle.kts
@@ -17,7 +17,7 @@ val modules = listOf(
     "date-time-picker" to true,
     "hud" to true,
     "keyboard" to true,
-    "links" to false,
+    "links" to true,
     "location" to false,
     "logging" to false,
     "resources" to true,
diff --git a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
index da2e6180e..93e78819e 100644
--- a/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
+++ b/example/shared/src/androidLibMain/kotlin/com/splendo/kaluga/example/shared/di/DependencyInjection.kt
@@ -70,7 +70,7 @@ import com.splendo.kaluga.example.shared.viewmodel.system.SystemNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.system.SystemViewModel
 import com.splendo.kaluga.example.shared.viewmodel.system.network.NetworkViewModel
 import com.splendo.kaluga.hud.HUD
-import com.splendo.kaluga.links.LinksBuilder
+import com.splendo.kaluga.links.DefaultLinksManager
 import com.splendo.kaluga.location.LocationStateRepoBuilder
 import com.splendo.kaluga.location.DefaultLocationManager
 import com.splendo.kaluga.location.GoogleLocationProvider
@@ -153,7 +153,7 @@ internal val androidModule = module {
 
     viewModel { (navigator: Navigator<BrowserNavigationActions<*>>) ->
         LinksViewModel(
-            LinksBuilder(),
+            DefaultLinksManager.Builder(),
             AlertPresenter.Builder(),
             navigator
         )
diff --git a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
index 4e079443a..98ed0f9cc 100644
--- a/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
+++ b/example/shared/src/commonMain/kotlin/com/splendo/kaluga/example/shared/viewmodel/link/LinksViewModel.kt
@@ -25,7 +25,7 @@ import com.splendo.kaluga.architecture.navigation.Navigator
 import com.splendo.kaluga.architecture.navigation.SingleValueNavigationAction
 import com.splendo.kaluga.architecture.observable.observableOf
 import com.splendo.kaluga.architecture.viewmodel.NavigatingViewModel
-import com.splendo.kaluga.links.LinksBuilder
+import com.splendo.kaluga.links.LinksManager
 import com.splendo.kaluga.resources.localized
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
@@ -41,7 +41,7 @@ sealed class BrowserNavigationActions<T>(value: T, type: NavigationBundleSpecTyp
 }
 
 class LinksViewModel(
-    linkRepoBuilder: LinksBuilder,
+    linkManagerBuilder: LinksManager.Builder,
     private val alertPresenterBuilder: BaseAlertPresenter.Builder,
     navigator: Navigator<BrowserNavigationActions<*>>
 ) : NavigatingViewModel<BrowserNavigationActions<*>>(navigator, alertPresenterBuilder) {
@@ -49,7 +49,7 @@ class LinksViewModel(
     val browserButtonText = observableOf("browser_button_text".localized())
     val linksInstructions = observableOf("links_instructions".localized())
 
-    private val linksRepo = linkRepoBuilder.create()
+    private val linksRepo = linkManagerBuilder.create()
 
     fun showAlert(title: String, message: String, style: Alert.Action.Style) {
         coroutineScope.launch {
diff --git a/links/README.md b/links/README.md
index 8b50c33e1..d330249c7 100644
--- a/links/README.md
+++ b/links/README.md
@@ -1,83 +1,46 @@
 # Links
 
-Module used to decode an object from either an App Link, Universal Link or Deep Link's query. It also uses [kaluga-architecture](https://github.com/splendo/kaluga/tree/master/architecture) to open links in the Browser.
+Module used to decode an object from either an App Link, Universal Link or Deep Link's query.
 
-## Deserializer
-`LinksDecoder` is used to convert query values into an object and it takes a list of values and a serializer. **It is important that the values passed to `LinksDecoder` are ordered in the same way they are declared in the data class**.
-When `decodeFromList` is called, a `LinksDecoder` is created and it goes through the passed `List<Any>` one per one referring to the passed `serializer` in order to know the parameter's type and finally convert it.
-### Special usages
-- Query contains an array of values: In this case the query will have to contain a parameter (put just before the list of values) that identifies the size of that array. 
-``` kotlin
-@Serializable 
-data class Aliment(val name: String)
-
-@Serializable 
-data class Recipe(val name: String, val ingredients: List<Aliment>)
+## Installing
+This library is available on Maven Central. You can import Kaluga Links as follows:
 
-// Somewhere in the code
-val query = "name=Carbonara&size=3&ingredients=Spaghetti&ingredients=Bacon&ingredients=Egg"
+```kotlin
+repositories {
+    // ...
+    mavenCentral()
+}
+// ...
+dependencies {
+    // ...
+    implementation("com.splendo.kaluga.links:$kalugaVersion")
+}
 ```
-The list size's parameter name is not important and is not included in the data class parameters, but it is requested by the decoder.
-
-
-## Usage
-
-The entry point for universal links or dynamic links in Android or iOS are `MainActivity.kt` and `AppDelegate.swift`. 
-Said so `MainActivity.kt` will have to override `onNewIntent` and call `handleIncomingLink`, while on iOS you should override the `application` method that receives a `NSUserActivity`.
 
+### Usage
+This library can be used to process an incoming URL into an object. This is useful when handling an App Link, Universal Link or Deep Link
 
-``` kotlin
-// MainActivity.kt
-
-override fun onNewIntent(intent: Intent?) {
-    super.onNewIntent(intent)
-    val appLinkData: Uri? = intent?.data
-		appLinkData?.let {
-		    val url = URL(it.path)
-		    sharedViewModel.handleIncomingData(url, Person.serializer())
-		}	
+```kotlin
+val linksManager = DefaultLinksManager.Builder().create()
+val someClassOrNull = linksManager.validateLink(url)?.let {
+    linksManager.handleIncomingLink(it, SomeClass.serializer)
 }
 ```
 
-``` swift
-// AppDelegate.swift
-func application(_ application: NSApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([NSUserActivityRestoring]) -> Void) -> Bool {
-    // Get URL components from the incoming user activity.
-    guard userActivity.activityType == NSUserActivityTypeBrowsingWeb,
-        let incomingURL = userActivity.webpageURL else {
-        return false
-    }
-    
-    viewController.viewModel.handleIncomingData(incomingUrl, Person.Companion.serializer())
-}
-```
+The library parses the query parameters of a URL into a list of objects and decodes them into an object using a serializer.
+This means query parameters should be in the order at which the Serializer specifies them.
+When the object contains nested properties, they should be preceded by a numeric indicator of the amount of elements to expect:
 
+```kotlin
+@Serializable 
+data class Aliment(val name: String)
 
+@Serializable 
+data class Recipe(val name: String, val ingredients: List<Aliment>)
 
-``` kotlin
-// common data class
-@Serializable
-data class Person(val name: String, val surname: String)
+// Somewhere in the code
+val ur = "https://kaluga.splendo.com/?name=Carbonara&size=3&ingredients=Spaghetti&ingredients=Bacon&ingredients=Egg"
 
-// ExampleSharedViewModel
-class SharedViewModel(
-    linksBuilder: LinksBuilder,
-    navigator: Navigator<BrowserNavigationActions<BrowserSpecRow>>
-) : NavigatingViewModel<BrowserNavigationActions<BrowserSpecRow>>(navigator) {
-    private val links = linksBuilder.create()
-    
-    fun <T> handleIncomingData(url: String, serializer: KSerializer<T>) {
-        links.handleIncomingLink(url, serializer)
-    }
-    
-    fun handleOutgoingLink(url: String) {
-        links.validateLink(url)
-    }
-}
 ```
 
-### Android
-Android `PlatformLinksHandler` implementation uses `UrlQuerySanitizer` in order to extract the full query from a url. Keep in mind that `UrlQuerySanitizer`
-will convert space characters into underscore character. Instead use `+` character between 2 words if you want to represent a space.
-
-Follow [navigation](https://github.com/splendo/kaluga/tree/master/architecture#navigation) in order to create a `Navigator`.
\ No newline at end of file
+The names of the parameters are ignored when decoding.
diff --git a/links/api/androidLib/links.api b/links/api/androidLib/links.api
index fc20da307..8af770e90 100644
--- a/links/api/androidLib/links.api
+++ b/links/api/androidLib/links.api
@@ -1,72 +1,40 @@
-public abstract interface class com/splendo/kaluga/links/BaseLinksBuilder {
-	public abstract fun create ()Lcom/splendo/kaluga/links/Links;
-}
-
-public final class com/splendo/kaluga/links/Links {
-	public fun <init> (Lcom/splendo/kaluga/links/manager/LinksManager$Builder;)V
-	public final fun handleIncomingLink (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
-	public final fun validateLink (Ljava/lang/String;)Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/links/LinksBuilder : com/splendo/kaluga/links/BaseLinksBuilder {
-	public fun <init> ()V
-	public fun create ()Lcom/splendo/kaluga/links/Links;
-}
-
-public final class com/splendo/kaluga/links/manager/DefaultLinksManager : com/splendo/kaluga/links/manager/LinksManager {
-	public fun <init> (Lcom/splendo/kaluga/links/manager/LinksHandler;)V
+public final class com/splendo/kaluga/links/DefaultLinksManager : com/splendo/kaluga/links/LinksManager {
+	public fun <init> (Lcom/splendo/kaluga/links/handler/LinksHandler;)V
 	public fun handleIncomingLink (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public fun validateLink (Ljava/lang/String;)Ljava/lang/String;
 }
 
-public abstract interface class com/splendo/kaluga/links/manager/LinksHandler {
-	public abstract fun extractQueryAsList (Ljava/lang/String;)Ljava/util/List;
-	public abstract fun isValid (Ljava/lang/String;)Z
+public final class com/splendo/kaluga/links/DefaultLinksManager$Builder : com/splendo/kaluga/links/LinksManager$Builder {
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/links/handler/LinksHandler;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/links/handler/LinksHandler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun create ()Lcom/splendo/kaluga/links/LinksManager;
 }
 
-public abstract interface class com/splendo/kaluga/links/manager/LinksManager {
+public abstract interface class com/splendo/kaluga/links/LinksManager {
 	public abstract fun handleIncomingLink (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public abstract fun validateLink (Ljava/lang/String;)Ljava/lang/String;
 }
 
-public abstract interface class com/splendo/kaluga/links/manager/LinksManager$Builder {
-	public abstract fun create ()Lcom/splendo/kaluga/links/manager/LinksManager;
+public abstract interface class com/splendo/kaluga/links/LinksManager$Builder {
+	public abstract fun create ()Lcom/splendo/kaluga/links/LinksManager;
 }
 
-public final class com/splendo/kaluga/links/manager/LinksManagerBuilder : com/splendo/kaluga/links/manager/LinksManager$Builder {
-	public fun <init> ()V
-	public fun create ()Lcom/splendo/kaluga/links/manager/LinksManager;
+public final class com/splendo/kaluga/links/LinksManagerKt {
+	public static final fun handleIncomingLink (Lcom/splendo/kaluga/links/LinksManager;Landroid/net/Uri;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
+	public static final fun handleIncomingLink (Lcom/splendo/kaluga/links/LinksManager;Ljava/net/URL;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
+	public static final fun validateLink (Lcom/splendo/kaluga/links/LinksManager;Landroid/net/Uri;)Landroid/net/Uri;
+	public static final fun validateLink (Lcom/splendo/kaluga/links/LinksManager;Ljava/net/URL;)Ljava/net/URL;
+}
+
+public abstract interface class com/splendo/kaluga/links/handler/LinksHandler {
+	public abstract fun extractQueryAsList (Ljava/lang/String;)Ljava/util/List;
+	public abstract fun isValid (Ljava/lang/String;)Z
 }
 
-public final class com/splendo/kaluga/links/manager/PlatformLinksHandler : com/splendo/kaluga/links/manager/LinksHandler {
+public final class com/splendo/kaluga/links/handler/PlatformLinksHandler : com/splendo/kaluga/links/handler/LinksHandler {
 	public fun <init> ()V
 	public fun extractQueryAsList (Ljava/lang/String;)Ljava/util/List;
 	public fun isValid (Ljava/lang/String;)Z
 }
 
-public final class com/splendo/kaluga/links/utils/DecodersKt {
-	public static final fun decodeFromList (Ljava/util/List;Lkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;
-}
-
-public final class com/splendo/kaluga/links/utils/LinksDecoder : kotlinx/serialization/encoding/AbstractDecoder {
-	public fun <init> (Lkotlin/collections/ArrayDeque;I)V
-	public synthetic fun <init> (Lkotlin/collections/ArrayDeque;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun beginStructure (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeDecoder;
-	public fun decodeBoolean ()Z
-	public fun decodeByte ()B
-	public fun decodeChar ()C
-	public fun decodeCollectionSize (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
-	public fun decodeDouble ()D
-	public fun decodeElementIndex (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
-	public fun decodeEnum (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
-	public fun decodeFloat ()F
-	public fun decodeInt ()I
-	public fun decodeLong ()J
-	public fun decodeNotNullMark ()Z
-	public fun decodeSequentially ()Z
-	public fun decodeValue ()Ljava/lang/Object;
-	public final fun getElementsCount ()I
-	public fun getSerializersModule ()Lkotlinx/serialization/modules/SerializersModule;
-	public final fun setElementsCount (I)V
-}
-
diff --git a/links/api/jvm/links.api b/links/api/jvm/links.api
index fc20da307..c1ff51fb8 100644
--- a/links/api/jvm/links.api
+++ b/links/api/jvm/links.api
@@ -1,72 +1,33 @@
-public abstract interface class com/splendo/kaluga/links/BaseLinksBuilder {
-	public abstract fun create ()Lcom/splendo/kaluga/links/Links;
-}
-
-public final class com/splendo/kaluga/links/Links {
-	public fun <init> (Lcom/splendo/kaluga/links/manager/LinksManager$Builder;)V
-	public final fun handleIncomingLink (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
-	public final fun validateLink (Ljava/lang/String;)Ljava/lang/String;
-}
-
-public final class com/splendo/kaluga/links/LinksBuilder : com/splendo/kaluga/links/BaseLinksBuilder {
-	public fun <init> ()V
-	public fun create ()Lcom/splendo/kaluga/links/Links;
-}
-
-public final class com/splendo/kaluga/links/manager/DefaultLinksManager : com/splendo/kaluga/links/manager/LinksManager {
-	public fun <init> (Lcom/splendo/kaluga/links/manager/LinksHandler;)V
+public final class com/splendo/kaluga/links/DefaultLinksManager : com/splendo/kaluga/links/LinksManager {
+	public fun <init> (Lcom/splendo/kaluga/links/handler/LinksHandler;)V
 	public fun handleIncomingLink (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public fun validateLink (Ljava/lang/String;)Ljava/lang/String;
 }
 
-public abstract interface class com/splendo/kaluga/links/manager/LinksHandler {
-	public abstract fun extractQueryAsList (Ljava/lang/String;)Ljava/util/List;
-	public abstract fun isValid (Ljava/lang/String;)Z
+public final class com/splendo/kaluga/links/DefaultLinksManager$Builder : com/splendo/kaluga/links/LinksManager$Builder {
+	public fun <init> ()V
+	public fun <init> (Lcom/splendo/kaluga/links/handler/LinksHandler;)V
+	public synthetic fun <init> (Lcom/splendo/kaluga/links/handler/LinksHandler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun create ()Lcom/splendo/kaluga/links/LinksManager;
 }
 
-public abstract interface class com/splendo/kaluga/links/manager/LinksManager {
+public abstract interface class com/splendo/kaluga/links/LinksManager {
 	public abstract fun handleIncomingLink (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
 	public abstract fun validateLink (Ljava/lang/String;)Ljava/lang/String;
 }
 
-public abstract interface class com/splendo/kaluga/links/manager/LinksManager$Builder {
-	public abstract fun create ()Lcom/splendo/kaluga/links/manager/LinksManager;
+public abstract interface class com/splendo/kaluga/links/LinksManager$Builder {
+	public abstract fun create ()Lcom/splendo/kaluga/links/LinksManager;
 }
 
-public final class com/splendo/kaluga/links/manager/LinksManagerBuilder : com/splendo/kaluga/links/manager/LinksManager$Builder {
-	public fun <init> ()V
-	public fun create ()Lcom/splendo/kaluga/links/manager/LinksManager;
+public abstract interface class com/splendo/kaluga/links/handler/LinksHandler {
+	public abstract fun extractQueryAsList (Ljava/lang/String;)Ljava/util/List;
+	public abstract fun isValid (Ljava/lang/String;)Z
 }
 
-public final class com/splendo/kaluga/links/manager/PlatformLinksHandler : com/splendo/kaluga/links/manager/LinksHandler {
+public final class com/splendo/kaluga/links/handler/PlatformLinksHandler : com/splendo/kaluga/links/handler/LinksHandler {
 	public fun <init> ()V
 	public fun extractQueryAsList (Ljava/lang/String;)Ljava/util/List;
 	public fun isValid (Ljava/lang/String;)Z
 }
 
-public final class com/splendo/kaluga/links/utils/DecodersKt {
-	public static final fun decodeFromList (Ljava/util/List;Lkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;
-}
-
-public final class com/splendo/kaluga/links/utils/LinksDecoder : kotlinx/serialization/encoding/AbstractDecoder {
-	public fun <init> (Lkotlin/collections/ArrayDeque;I)V
-	public synthetic fun <init> (Lkotlin/collections/ArrayDeque;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun beginStructure (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeDecoder;
-	public fun decodeBoolean ()Z
-	public fun decodeByte ()B
-	public fun decodeChar ()C
-	public fun decodeCollectionSize (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
-	public fun decodeDouble ()D
-	public fun decodeElementIndex (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
-	public fun decodeEnum (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
-	public fun decodeFloat ()F
-	public fun decodeInt ()I
-	public fun decodeLong ()J
-	public fun decodeNotNullMark ()Z
-	public fun decodeSequentially ()Z
-	public fun decodeValue ()Ljava/lang/Object;
-	public final fun getElementsCount ()I
-	public fun getSerializersModule ()Lkotlinx/serialization/modules/SerializersModule;
-	public final fun setElementsCount (I)V
-}
-
diff --git a/links/build.gradle.kts b/links/build.gradle.kts
index 2be490c4c..bffd8ee3a 100644
--- a/links/build.gradle.kts
+++ b/links/build.gradle.kts
@@ -38,8 +38,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(project(":base", ""))
-                implementation(project(":logging", ""))
-                implementation(project(":architecture", ""))
                 apiDependency(Dependencies.KotlinX.Serialization.Core)
             }
         }
diff --git a/links/src/androidLibInstrumentedTest/AndroidManifest.xml b/links/src/androidLibInstrumentedTest/AndroidManifest.xml
new file mode 100644
index 000000000..f0a3ba6a3
--- /dev/null
+++ b/links/src/androidLibInstrumentedTest/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest package="com.splendo.kaluga.links"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:theme="@style/Theme.AppCompat">
+        <activity android:name=".TestActivity"/>
+    </application>
+</manifest>
diff --git a/links/src/androidLibInstrumentedTest/kotlin/AndroidLinksHandlerTest.kt b/links/src/androidLibInstrumentedTest/kotlin/AndroidLinksHandlerTest.kt
deleted file mode 100644
index f5257aa1a..000000000
--- a/links/src/androidLibInstrumentedTest/kotlin/AndroidLinksHandlerTest.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- Copyright 2023 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links
-
-import manager.PlatformLinksHandler
-import com.splendo.kaluga.links.manager.TestConstants.INVALID_URLS
-import com.splendo.kaluga.links.manager.TestConstants.VALID_URLS
-import org.junit.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
-
-class AndroidLinksHandlerTest {
-
-    private val linksValidator = manager.PlatformLinksHandler()
-
-    @Test
-    fun testLinksValidatorSucceed() {
-        VALID_URLS.forEach {
-            assertTrue { linksValidator.isValid(it) }
-        }
-    }
-
-    @Test
-    fun testLinksValidatorFailed() {
-        INVALID_URLS.forEach {
-            assertFalse { linksValidator.isValid(it) }
-        }
-    }
-
-    @Test
-    fun testQueryExtractorSucceed() {
-        val url = "https://test.io?list_1=first&list_2=second&list_3=third"
-
-        assertEquals(listOf("first", "second", "third"), linksValidator.extractQueryAsList(url))
-    }
-
-    @Test
-    fun testQueryExtractorEmptyQuery() {
-        val url = "https://test.io"
-
-        assertEquals(emptyList(), linksValidator.extractQueryAsList(url))
-    }
-}
diff --git a/links/src/androidLibInstrumentedTest/kotlin/TestActivity.kt b/links/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
new file mode 100644
index 000000000..a4ccd1ab8
--- /dev/null
+++ b/links/src/androidLibInstrumentedTest/kotlin/TestActivity.kt
@@ -0,0 +1,23 @@
+/*
+
+Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package com.splendo.kaluga.links
+
+import androidx.appcompat.app.AppCompatActivity
+
+class TestActivity : AppCompatActivity()
diff --git a/links/src/jvmMain/kotlin/LinksBuilder.kt b/links/src/androidLibInstrumentedTest/kotlin/handler/AndroidLinksHandlerTest.kt
similarity index 79%
rename from links/src/jvmMain/kotlin/LinksBuilder.kt
rename to links/src/androidLibInstrumentedTest/kotlin/handler/AndroidLinksHandlerTest.kt
index cee1a72d2..624dbccc5 100644
--- a/links/src/jvmMain/kotlin/LinksBuilder.kt
+++ b/links/src/androidLibInstrumentedTest/kotlin/handler/AndroidLinksHandlerTest.kt
@@ -15,10 +15,6 @@
 
  */
 
-package com.splendo.kaluga.links
+package com.splendo.kaluga.links.handler
 
-actual class LinksBuilder : BaseLinksBuilder {
-    override fun create(): Links {
-        TODO("Not yet implemented")
-    }
-}
\ No newline at end of file
+class AndroidLinksHandlerTest : PlatformLinksHandlerTest(PlatformLinksHandler())
diff --git a/links/src/androidLibInstrumentedTest/kotlin/manager/LinksManagerTest.kt b/links/src/androidLibInstrumentedTest/kotlin/manager/LinksManagerTest.kt
deleted file mode 100644
index 6d03bb404..000000000
--- a/links/src/androidLibInstrumentedTest/kotlin/manager/LinksManagerTest.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links.manager
-
-import org.junit.Test
-import kotlin.test.assertEquals
-
-class LinksManagerTestAndroid {
-
-    private val linksManager = LinksManagerBuilder().create()
-
-    @Test
-    fun testHandleIncomingLinkSucceed() {
-        val result = linksManager.handleIncomingLink(Person.dummyUrl, Person.serializer())
-
-        assertEquals(Person.dummyPerson, result)
-    }
-
-    @Test
-    fun testHandleIncomingLinkFailed() {
-        val query = ""
-
-        val result = linksManager.handleIncomingLink(query, Person.serializer())
-        assertEquals(null, result)
-    }
-
-    @Test
-    fun testHandleOutgoingLinkSucceed() {
-        val url = "https://valid-link?parameter=1"
-
-        val result = linksManager.validateLink(url)
-        assertEquals(url, result)
-    }
-
-    @Test
-    fun testHandleOutgoingLinkFailed() {
-        val url = "not valid"
-
-        val result = linksManager.validateLink(url)
-        assertEquals(null, result)
-    }
-}
diff --git a/links/src/androidLibMain/kotlin/LinksBuilder.kt b/links/src/androidLibMain/kotlin/LinksBuilder.kt
deleted file mode 100644
index 6ebf0722c..000000000
--- a/links/src/androidLibMain/kotlin/LinksBuilder.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links
-
-import com.splendo.kaluga.links.manager.LinksManagerBuilder
-
-actual class LinksBuilder : BaseLinksBuilder {
-    override fun create(): Links =
-        Links(LinksManagerBuilder())
-}
\ No newline at end of file
diff --git a/links/src/androidLibMain/kotlin/LinksManager.kt b/links/src/androidLibMain/kotlin/LinksManager.kt
new file mode 100644
index 000000000..1823389b2
--- /dev/null
+++ b/links/src/androidLibMain/kotlin/LinksManager.kt
@@ -0,0 +1,58 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.links
+
+import android.net.Uri
+import kotlinx.serialization.KSerializer
+import java.net.URL
+
+/**
+ * Convert an incoming [URL] query into [T] and return it.
+ * When the given url is invalid, it returns null.
+ *
+ * @param T the type of data to parse the url into
+ * @param url the [URL] containing the query with values.
+ * @param serializer serializer of type [T].
+ * @return the [T] described by the [url] or `null` if the object was not described by the [URL]
+ **/
+fun <T> LinksManager.handleIncomingLink(url: URL, serializer: KSerializer<T>): T? = handleIncomingLink(url.toString(), serializer)
+
+/**
+ * Convert an incoming [Uri] query into [T] and return it.
+ * When the given url is invalid, it returns null.
+ *
+ * @param T the type of data to parse the url into
+ * @param uri the [Uri] containing the query with values.
+ * @param serializer serializer of type [T].
+ * @return the [T] described by the [uri] or `null` if the object was not described by the [Uri]
+ **/
+fun <T> LinksManager.handleIncomingLink(uri: Uri, serializer: KSerializer<T>): T? = handleIncomingLink(uri.toString(), serializer)
+
+/**
+ * Check a [URL] and returns it if valid, otherwise it returns null.
+ * @param url [URL] to validate.
+ * @return the [url] if valid, `null` otherwise
+ **/
+fun LinksManager.validateLink(url: URL): URL? = validateLink(url.toString())?.let { url }
+
+/**
+ * Check a [Uri] and returns it if valid, otherwise it returns null.
+ * @param uri [Uri] to validate.
+ * @return the [uri] if valid, `null` otherwise
+ **/
+fun LinksManager.validateLink(uri: Uri): Uri? = validateLink(uri.toString())?.let { uri }
diff --git a/links/src/androidLibMain/kotlin/manager/PlatformLinksHandler.kt b/links/src/androidLibMain/kotlin/handler/PlatformLinksHandler.kt
similarity index 91%
rename from links/src/androidLibMain/kotlin/manager/PlatformLinksHandler.kt
rename to links/src/androidLibMain/kotlin/handler/PlatformLinksHandler.kt
index 6efa1da8a..e46ed672f 100644
--- a/links/src/androidLibMain/kotlin/manager/PlatformLinksHandler.kt
+++ b/links/src/androidLibMain/kotlin/handler/PlatformLinksHandler.kt
@@ -15,11 +15,14 @@
 
  */
 
-package com.splendo.kaluga.links.manager
+package com.splendo.kaluga.links.handler
 
 import android.net.UrlQuerySanitizer
 import android.webkit.URLUtil
 
+/**
+ * Android implementation of [LinksHandler]
+ */
 actual class PlatformLinksHandler : LinksHandler {
     override fun isValid(url: String): Boolean = URLUtil.isValidUrl(url)
 
@@ -31,4 +34,4 @@ actual class PlatformLinksHandler : LinksHandler {
         }
         return params.parameterList.map { it.mValue }
     }
-}
\ No newline at end of file
+}
diff --git a/links/src/commonMain/kotlin/Links.kt b/links/src/commonMain/kotlin/Links.kt
deleted file mode 100644
index 67e498bb6..000000000
--- a/links/src/commonMain/kotlin/Links.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links
-
-import com.splendo.kaluga.links.manager.LinksManager
-import kotlinx.serialization.KSerializer
-
-class Links(
-    linksManagerBuilder: LinksManager.Builder
-) {
-
-    internal var linksManager: LinksManager = linksManagerBuilder.create()
-
-    /**
-     * Convert an incoming url's query into [T] and return it.
-     * When the given url is invalid, it returns null.
-     *
-     * @param url the whole url containing the query with values.
-     * @param serializer serializer of type [T].
-     **/
-    fun <T> handleIncomingLink(url: String, serializer: KSerializer<T>): T? {
-        return linksManager.handleIncomingLink(url, serializer)
-    }
-
-    /**
-     * Check the url and returns it if valid, otherwise it returns null.
-     * @param url url to validate.
-     **/
-    fun validateLink(url: String): String? {
-        return linksManager.validateLink(url)
-    }
-}
-
-interface BaseLinksBuilder {
-    fun create(): Links
-}
-
-expect class LinksBuilder constructor() : BaseLinksBuilder
-
diff --git a/links/src/commonMain/kotlin/LinksManager.kt b/links/src/commonMain/kotlin/LinksManager.kt
new file mode 100644
index 000000000..6c7559bb9
--- /dev/null
+++ b/links/src/commonMain/kotlin/LinksManager.kt
@@ -0,0 +1,98 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.links
+
+import com.splendo.kaluga.links.handler.LinksHandler
+import com.splendo.kaluga.links.handler.PlatformLinksHandler
+import com.splendo.kaluga.links.utils.decodeFromList
+import kotlinx.serialization.KSerializer
+
+/**
+ * Manager for handling Links. Useful for handling deeplinks
+ */
+interface LinksManager {
+
+    /**
+     * Builder for creating a [LinksManager]
+     */
+    interface Builder {
+
+        /**
+         * Creates the [LinksManager]
+         */
+        fun create(): LinksManager
+    }
+
+    /**
+     * Convert the query parameters of a url into [T] and return it.
+     * When the given url is invalid, it returns null.
+     *
+     * @param T the type of data to parse the url into
+     * @param url the whole url containing the query with values.
+     * @param serializer serializer of type [T].
+     * @return the [T] described by the [url] or `null` if the object was not described by the url
+     **/
+    fun <T> handleIncomingLink(url: String, serializer: KSerializer<T>): T?
+
+    /**
+     * Check a url and returns it if valid, otherwise it returns null.
+     * @param url url to validate.
+     * @return the [url] if valid, `null` otherwise
+     **/
+    fun validateLink(url: String): String?
+}
+
+/**
+ * Default implementation of [LinksManager]
+ * @param linksHandler the [LinksHandler] to handle processing the link
+ */
+class DefaultLinksManager(
+    private val linksHandler: LinksHandler
+) : LinksManager {
+
+    /**
+     * Builder for creating a [DefaultLinksManager]
+     * @param handler the [LinksHandler] to handle processing the link
+     */
+    class Builder(
+        private val handler: LinksHandler
+    ) : LinksManager.Builder {
+        
+        constructor() : this(PlatformLinksHandler())
+
+        override fun create(): LinksManager =
+            DefaultLinksManager(handler)
+    }
+
+    override fun <T> handleIncomingLink(url: String, serializer: KSerializer<T>): T? {
+        val list = linksHandler.extractQueryAsList(url)
+        if (list.isEmpty()) {
+            return null
+        }
+
+        return decodeFromList(list, serializer)
+    }
+
+    override fun validateLink(url: String): String? {
+        return if (linksHandler.isValid(url)) {
+            url
+        } else {
+            null
+        }
+    }
+}
diff --git a/links/src/commonMain/kotlin/manager/LinksHandler.kt b/links/src/commonMain/kotlin/handler/LinksHandler.kt
similarity index 56%
rename from links/src/commonMain/kotlin/manager/LinksHandler.kt
rename to links/src/commonMain/kotlin/handler/LinksHandler.kt
index e6cdda6e1..4056b7079 100644
--- a/links/src/commonMain/kotlin/manager/LinksHandler.kt
+++ b/links/src/commonMain/kotlin/handler/LinksHandler.kt
@@ -1,5 +1,5 @@
 /*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,9 +15,24 @@
 
  */
 
-package com.splendo.kaluga.links.manager
+package com.splendo.kaluga.links.handler
 
+/**
+ * Handler for processing a link
+ */
 interface LinksHandler {
+
+    /**
+     * Checks if a url string is valid
+     * @param url the url string to validate
+     * @return `true` if the url is valid, false otherwise
+     */
     fun isValid(url: String): Boolean
+
+    /**
+     * Processes the query parameters of a url string into a list
+     * @param url the url string to extract the query parameters from
+     * @return a list containing the values of all query parameters of the [url]
+     */
     fun extractQueryAsList(url: String): List<Any>
 }
diff --git a/links/src/commonMain/kotlin/manager/PlatformLinksHandler.kt b/links/src/commonMain/kotlin/handler/PlatformLinksHandler.kt
similarity index 86%
rename from links/src/commonMain/kotlin/manager/PlatformLinksHandler.kt
rename to links/src/commonMain/kotlin/handler/PlatformLinksHandler.kt
index f3624627d..253f94b55 100644
--- a/links/src/commonMain/kotlin/manager/PlatformLinksHandler.kt
+++ b/links/src/commonMain/kotlin/handler/PlatformLinksHandler.kt
@@ -15,6 +15,9 @@
 
  */
 
-package com.splendo.kaluga.links.manager
+package com.splendo.kaluga.links.handler
 
+/**
+ * Platform specific implementation of [LinksHandler]
+ */
 expect class PlatformLinksHandler constructor() : LinksHandler
diff --git a/links/src/commonMain/kotlin/manager/DefaultLinksManager.kt b/links/src/commonMain/kotlin/manager/DefaultLinksManager.kt
deleted file mode 100644
index 0ce68bcd7..000000000
--- a/links/src/commonMain/kotlin/manager/DefaultLinksManager.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- Copyright 2023 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links.manager
-
-import com.splendo.kaluga.links.utils.decodeFromList
-import kotlinx.serialization.KSerializer
-
-class DefaultLinksManager(
-    private val linksHandler: LinksHandler
-) : LinksManager {
-
-    override fun <T> handleIncomingLink(url: String, serializer: KSerializer<T>): T? {
-        val list = linksHandler.extractQueryAsList(url)
-        if (list.isEmpty()) {
-            return null
-        }
-
-        return decodeFromList(list, serializer)
-    }
-
-    override fun validateLink(url: String): String? {
-        return if (linksHandler.isValid(url)) {
-            url
-        } else {
-            null
-        }
-    }
-}
-
-class LinksManagerBuilder : LinksManager.Builder {
-    override fun create(): LinksManager =
-        DefaultLinksManager(PlatformLinksHandler())
-}
diff --git a/links/src/commonMain/kotlin/manager/LinksManager.kt b/links/src/commonMain/kotlin/manager/LinksManager.kt
deleted file mode 100644
index 88fc5355b..000000000
--- a/links/src/commonMain/kotlin/manager/LinksManager.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links.manager
-
-import kotlinx.serialization.KSerializer
-
-interface LinksManager {
-
-    interface Builder {
-        fun create(): LinksManager
-    }
-
-    fun <T> handleIncomingLink(url: String, serializer: KSerializer<T>): T?
-    fun validateLink(url: String): String?
-}
diff --git a/links/src/commonMain/kotlin/utils/decoders.kt b/links/src/commonMain/kotlin/utils/decoders.kt
index 79520accd..5a1014be7 100644
--- a/links/src/commonMain/kotlin/utils/decoders.kt
+++ b/links/src/commonMain/kotlin/utils/decoders.kt
@@ -25,7 +25,7 @@ import kotlinx.serialization.encoding.CompositeDecoder
 import kotlinx.serialization.modules.EmptySerializersModule
 import kotlinx.serialization.modules.SerializersModule
 
-fun <T> decodeFromList(list: List<Any>, deserializer: DeserializationStrategy<T>): T {
+internal fun <T> decodeFromList(list: List<Any>, deserializer: DeserializationStrategy<T>): T {
     val decoder = LinksDecoder(ArrayDeque(list))
     return decoder.decodeSerializableValue(deserializer)
 }
diff --git a/links/src/commonTest/kotlin/LinksManagerTest.kt b/links/src/commonTest/kotlin/LinksManagerTest.kt
new file mode 100644
index 000000000..07152afd3
--- /dev/null
+++ b/links/src/commonTest/kotlin/LinksManagerTest.kt
@@ -0,0 +1,98 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.links
+
+import com.splendo.kaluga.links.handler.LinksHandler
+import com.splendo.kaluga.test.base.mock.call
+import com.splendo.kaluga.test.base.mock.matcher.ParameterMatcher.Companion.any
+import com.splendo.kaluga.test.base.mock.matcher.ParameterMatcher.Companion.eq
+import com.splendo.kaluga.test.base.mock.on
+import com.splendo.kaluga.test.base.mock.parameters.mock
+import kotlinx.serialization.Serializable
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class LinksManagerTest {
+
+    @Serializable
+    data class Person(
+        val name: String,
+        val surname: String,
+        val spokenLanguages: List<Languages> = emptyList()
+    ) {
+        companion object {
+            val dummyUrl = "http://url.com?name=Corrado&surname=Quattrocchi&spokenLanguageSize=3&spokenLanguages=ITALIAN&spokenLanguages=ENGLISH&spokenLanguages=DUTCH"
+            val dummyPerson = Person(
+                "Corrado",
+                "Quattrocchi",
+                listOf(Languages.ITALIAN, Languages.ENGLISH, Languages.DUTCH)
+            )
+        }
+    }
+
+    enum class Languages {
+        ITALIAN,
+        ENGLISH,
+        DUTCH,
+    }
+
+    private val handler = MockLinksHandler()
+    private val linksManager = DefaultLinksManager(handler)
+
+    @Test
+    fun testHandleIncomingLinkSucceed() {
+        handler.extractQueryAsListMock.on(eq(Person.dummyUrl)).doReturn(listOf(Person.dummyPerson.name, Person.dummyPerson.surname, Person.dummyPerson.spokenLanguages.size) + Person.dummyPerson.spokenLanguages.map { it.name })
+        val result = linksManager.handleIncomingLink(Person.dummyUrl, Person.serializer())
+
+        assertEquals(Person.dummyPerson, result)
+    }
+
+    @Test
+    fun testHandleIncomingLinkFailed() {
+        handler.extractQueryAsListMock.on(any()).doReturn(emptyList())
+        val query = ""
+
+        val result = linksManager.handleIncomingLink(query, Person.serializer())
+        assertEquals(null, result)
+    }
+
+    @Test
+    fun testHandleOutgoingLinkSucceed() {
+        val url = "https://valid-link?parameter=1"
+        handler.isValidMock.on(eq(url)).doReturn(true)
+        val result = linksManager.validateLink(url)
+        assertEquals(url, result)
+    }
+
+    @Test
+    fun testHandleOutgoingLinkFailed() {
+        val url = "not valid"
+        handler.isValidMock.on(eq(url)).doReturn(false)
+        val result = linksManager.validateLink(url)
+        assertEquals(null, result)
+    }
+}
+
+private class MockLinksHandler : LinksHandler {
+
+    val extractQueryAsListMock = this::extractQueryAsList.mock()
+    val isValidMock = this::isValid.mock()
+
+    override fun extractQueryAsList(url: String): List<Any> = extractQueryAsListMock.call(url)
+    override fun isValid(url: String): Boolean = isValidMock.call(url)
+}
diff --git a/links/src/commonTest/kotlin/LinksTest.kt b/links/src/commonTest/kotlin/LinksTest.kt
deleted file mode 100644
index 64f8ebbe3..000000000
--- a/links/src/commonTest/kotlin/LinksTest.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- Copyright 2023 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links
-
-import com.splendo.kaluga.links.manager.MockLinksBuilder
-import com.splendo.kaluga.links.manager.Person
-import com.splendo.kaluga.links.manager.TestConstants
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class LinksTest {
-
-    private val linksBuilder = MockLinksBuilder()
-    private val links: Links = linksBuilder.create()
-
-    @Test
-    fun testIncomingLinkErrorTransaction() {
-        val result = links.handleIncomingLink("http://invalid.com", Person.serializer())
-        assertEquals(null, result)
-    }
-
-    @Test
-    fun testIncomingTransaction() {
-        val result = links.handleIncomingLink(Person.dummyUrl, Person.serializer())
-        assertEquals(Person.dummyPerson, result)
-    }
-
-    @Test
-    fun testOutgoingTransaction() {
-        TestConstants.VALID_URLS.forEach {
-            val result = links.validateLink(it)
-            assertEquals(it, result)
-        }
-    }
-
-    @Test
-    fun testOutgoingTransactionError() {
-        TestConstants.INVALID_URLS.forEach {
-            val result = links.validateLink(it)
-            assertEquals(null, result)
-        }
-    }
-}
diff --git a/links/src/iosTest/kotlin/IosLinksHandlerTest.kt b/links/src/commonTest/kotlin/handler/PlatformLinksHandlerTest.kt
similarity index 70%
rename from links/src/iosTest/kotlin/IosLinksHandlerTest.kt
rename to links/src/commonTest/kotlin/handler/PlatformLinksHandlerTest.kt
index 4cb7783ba..8f52d992b 100644
--- a/links/src/iosTest/kotlin/IosLinksHandlerTest.kt
+++ b/links/src/commonTest/kotlin/handler/PlatformLinksHandlerTest.kt
@@ -15,30 +15,25 @@
 
  */
 
-package com.splendo.kaluga.links
+package com.splendo.kaluga.links.handler
 
-import com.splendo.kaluga.links.manager.PlatformLinksHandler
-import com.splendo.kaluga.links.manager.TestConstants.INVALID_URLS
-import com.splendo.kaluga.links.manager.TestConstants.VALID_URLS
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
-class IosLinksHandlerTest {
-
-    private val linksValidator = PlatformLinksHandler()
+abstract class PlatformLinksHandlerTest(private val linksValidator: PlatformLinksHandler) {
 
     @Test
     fun testLinksValidatorSucceed() {
-        VALID_URLS.forEach {
+        TestConstants.VALID_URLS.forEach {
             assertTrue { linksValidator.isValid(it) }
         }
     }
 
     @Test
     fun testLinksValidatorFailed() {
-        INVALID_URLS.forEach {
+        TestConstants.INVALID_URLS.forEach {
             assertFalse { linksValidator.isValid(it) }
         }
     }
@@ -57,3 +52,19 @@ class IosLinksHandlerTest {
         assertEquals(emptyList(), linksValidator.extractQueryAsList(url))
     }
 }
+
+object TestConstants {
+
+    val VALID_URLS = listOf(
+        "https://test.io",
+        "http://test.io",
+        "https://test.io?isValid=true",
+        "https://test.io?list_1=first&list_2=second&list_3=third"
+    )
+
+    val INVALID_URLS = listOf(
+        "notvalid.com",
+        "not valid",
+        "httpss://notvalid.com?/?isValid=false"
+    )
+}
diff --git a/links/src/commonTest/kotlin/manager/DefaultLinksManagerTest.kt b/links/src/commonTest/kotlin/manager/DefaultLinksManagerTest.kt
deleted file mode 100644
index 02c5258d9..000000000
--- a/links/src/commonTest/kotlin/manager/DefaultLinksManagerTest.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links.manager
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Person(
-    val name: String,
-    val surname: String,
-    val spokenLanguages: List<Languages> = emptyList()
-) {
-    companion object {
-        val dummyUrl = "http://url.com?name=Corrado&surname=Quattrocchi&spokenLanguageSize=3&spokenLanguages=ITALIAN&spokenLanguages=ENGLISH&spokenLanguages=DUTCH"
-        val dummyPerson = Person(
-            "Corrado",
-            "Quattrocchi",
-            listOf(Languages.ITALIAN, Languages.ENGLISH, Languages.DUTCH)
-        )
-    }
-}
-
-enum class Languages {
-    ITALIAN,
-    ENGLISH,
-    DUTCH,
-}
diff --git a/links/src/commonTest/kotlin/manager/MockLinksManager.kt b/links/src/commonTest/kotlin/manager/MockLinksManager.kt
deleted file mode 100644
index 90334ee18..000000000
--- a/links/src/commonTest/kotlin/manager/MockLinksManager.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- Copyright 2022 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links.manager
-
-import com.splendo.kaluga.links.BaseLinksBuilder
-import com.splendo.kaluga.links.Links
-import kotlinx.serialization.KSerializer
-
-class MockLinksManager : LinksManager {
-    override fun <T> handleIncomingLink(url: String, serializer: KSerializer<T>): T? {
-        return when (url) {
-            Person.dummyUrl -> Person.dummyPerson as T
-            else -> null
-        }
-    }
-
-    override fun validateLink(url: String): String? {
-        return if (TestConstants.VALID_URLS.contains(url)) {
-            url
-        } else {
-            null
-        }
-    }
-}
-
-class MockLinksManagerBuilder : LinksManager.Builder {
-    override fun create(): LinksManager {
-        return MockLinksManager()
-    }
-}
-
-class MockLinksBuilder : BaseLinksBuilder {
-    override fun create(): Links {
-        return Links(MockLinksManagerBuilder())
-    }
-}
-
-object TestConstants {
-
-    val VALID_URLS = listOf(
-        "https://test.io",
-        "http://test.io",
-        "https://test.io?isValid=true",
-        "https://test.io?list_1=first&list_2=second&list_3=third"
-    )
-
-    val INVALID_URLS = listOf(
-        "notvalid.com",
-        "not valid",
-        "httpss://notvalid.com?/?isValid=false"
-    )
-}
diff --git a/links/src/iosMain/kotlin/LinksBuilder.kt b/links/src/iosMain/kotlin/LinksBuilder.kt
deleted file mode 100644
index 7e5ab7e62..000000000
--- a/links/src/iosMain/kotlin/LinksBuilder.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Copyright 2023 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links
-
-import com.splendo.kaluga.links.manager.LinksManagerBuilder
-
-actual class LinksBuilder : BaseLinksBuilder {
-    override fun create(): Links =
-        Links(LinksManagerBuilder())
-}
\ No newline at end of file
diff --git a/links/src/iosMain/kotlin/LinksManager.kt b/links/src/iosMain/kotlin/LinksManager.kt
new file mode 100644
index 000000000..c85bff53f
--- /dev/null
+++ b/links/src/iosMain/kotlin/LinksManager.kt
@@ -0,0 +1,39 @@
+/*
+ Copyright 2023 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.links
+
+import kotlinx.serialization.KSerializer
+import platform.Foundation.NSURL
+
+/**
+ * Convert an incoming [NSURL] query into [T] and return it.
+ * When the given url is invalid, it returns null.
+ *
+ * @param T the type of data to parse the url into
+ * @param url the [NSURL] containing the query with values.
+ * @param serializer serializer of type [T].
+ * @return the [T] described by the [url] or `null` if the object was not described by the [NSURL]
+ **/
+fun <T> LinksManager.handleIncomingLink(url: NSURL, serializer: KSerializer<T>): T? = handleIncomingLink(url.absoluteString.orEmpty(), serializer)
+
+/**
+ * Check a [NSURL] and returns it if valid, otherwise it returns null.
+ * @param url [NSURL] to validate.
+ * @return the [url] if valid, `null` otherwise
+ **/
+fun LinksManager.validateLink(url: NSURL): NSURL? = validateLink(url.absoluteString.orEmpty())?.let { url }
diff --git a/links/src/iosMain/kotlin/manager/PlatformLinksHandler.kt b/links/src/iosMain/kotlin/handler/PlatformLinksHandler.kt
similarity index 93%
rename from links/src/iosMain/kotlin/manager/PlatformLinksHandler.kt
rename to links/src/iosMain/kotlin/handler/PlatformLinksHandler.kt
index d1a01b704..5e7e37007 100644
--- a/links/src/iosMain/kotlin/manager/PlatformLinksHandler.kt
+++ b/links/src/iosMain/kotlin/handler/PlatformLinksHandler.kt
@@ -15,7 +15,7 @@
 
  */
 
-package com.splendo.kaluga.links.manager
+package com.splendo.kaluga.links.handler
 
 import platform.Foundation.NSURL
 import platform.Foundation.NSURLComponents
@@ -23,6 +23,9 @@ import platform.Foundation.NSURLConnection
 import platform.Foundation.NSURLQueryItem
 import platform.Foundation.NSURLRequest
 
+/**
+ * iOS implementation of [LinksHandler]
+ */
 actual class PlatformLinksHandler : LinksHandler {
     override fun isValid(url: String): Boolean {
         val nsUrl = NSURL.URLWithString(url) ?: return false
@@ -33,4 +36,4 @@ actual class PlatformLinksHandler : LinksHandler {
         val components = NSURLComponents(url)
         return components.queryItems.orEmpty().mapNotNull { (it as? NSURLQueryItem)?.value }
     }
-}
\ No newline at end of file
+}
diff --git a/links/src/jsMain/kotlin/LinksBuilder.kt b/links/src/iosTest/kotlin/IOSLinksHandlerTest.kt
similarity index 79%
rename from links/src/jsMain/kotlin/LinksBuilder.kt
rename to links/src/iosTest/kotlin/IOSLinksHandlerTest.kt
index cee1a72d2..cad6d4aed 100644
--- a/links/src/jsMain/kotlin/LinksBuilder.kt
+++ b/links/src/iosTest/kotlin/IOSLinksHandlerTest.kt
@@ -15,10 +15,6 @@
 
  */
 
-package com.splendo.kaluga.links
+package com.splendo.kaluga.links.handler
 
-actual class LinksBuilder : BaseLinksBuilder {
-    override fun create(): Links {
-        TODO("Not yet implemented")
-    }
-}
\ No newline at end of file
+class IOSLinksHandlerTest : PlatformLinksHandlerTest(PlatformLinksHandler())
diff --git a/links/src/iosTest/kotlin/manager/LinksManagerTest.kt b/links/src/iosTest/kotlin/manager/LinksManagerTest.kt
deleted file mode 100644
index b9771c2b2..000000000
--- a/links/src/iosTest/kotlin/manager/LinksManagerTest.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- Copyright 2023 Splendo Consulting B.V. The Netherlands
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package com.splendo.kaluga.links.manager
-
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class LinksManagerTestIOS {
-
-    private val linksManager = LinksManagerBuilder().create()
-
-    @Test
-    fun testHandleIncomingLinkSucceed() {
-        val result = linksManager.handleIncomingLink(Person.dummyUrl, Person.serializer())
-
-        assertEquals(Person.dummyPerson, result)
-    }
-
-    @Test
-    fun testHandleIncomingLinkFailed() {
-        val query = ""
-
-        val result = linksManager.handleIncomingLink(query, Person.serializer())
-        assertEquals(null, result)
-    }
-
-    @Test
-    fun testHandleOutgoingLinkSucceed() {
-        val url = "https://valid-link?parameter=1"
-
-        val result = linksManager.validateLink(url)
-        assertEquals(url, result)
-    }
-
-    @Test
-    fun testHandleOutgoingLinkFailed() {
-        val url = "not valid"
-
-        val result = linksManager.validateLink(url)
-        assertEquals(null, result)
-    }
-}
diff --git a/links/src/jvmMain/kotlin/manager/PlatformLinksHandler.kt b/links/src/jsMain/kotlin/handler/PlatformLinksHandler.kt
similarity index 88%
rename from links/src/jvmMain/kotlin/manager/PlatformLinksHandler.kt
rename to links/src/jsMain/kotlin/handler/PlatformLinksHandler.kt
index d3e8b81ce..7c316289e 100644
--- a/links/src/jvmMain/kotlin/manager/PlatformLinksHandler.kt
+++ b/links/src/jsMain/kotlin/handler/PlatformLinksHandler.kt
@@ -15,8 +15,12 @@
 
  */
 
-package com.splendo.kaluga.links.manager
+package com.splendo.kaluga.links.handler
 
+/**
+ * JavaScript implementation of [LinksHandler].
+ * Not implemented
+ */
 actual class PlatformLinksHandler : LinksHandler {
     override fun isValid(url: String): Boolean {
         TODO("Not yet implemented")
@@ -25,4 +29,4 @@ actual class PlatformLinksHandler : LinksHandler {
     override fun extractQueryAsList(url: String): List<Any> {
         TODO("Not yet implemented")
     }
-}
\ No newline at end of file
+}
diff --git a/links/src/jsMain/kotlin/manager/PlatformLinksHandler.kt b/links/src/jvmMain/kotlin/handler/PlatformLinksHandler.kt
similarity index 88%
rename from links/src/jsMain/kotlin/manager/PlatformLinksHandler.kt
rename to links/src/jvmMain/kotlin/handler/PlatformLinksHandler.kt
index d3e8b81ce..00c65daec 100644
--- a/links/src/jsMain/kotlin/manager/PlatformLinksHandler.kt
+++ b/links/src/jvmMain/kotlin/handler/PlatformLinksHandler.kt
@@ -15,8 +15,12 @@
 
  */
 
-package com.splendo.kaluga.links.manager
+package com.splendo.kaluga.links.handler
 
+/**
+ * Java implementation of [LinksHandler]
+ * Not implemented
+ */
 actual class PlatformLinksHandler : LinksHandler {
     override fun isValid(url: String): Boolean {
         TODO("Not yet implemented")
@@ -25,4 +29,4 @@ actual class PlatformLinksHandler : LinksHandler {
     override fun extractQueryAsList(url: String): List<Any> {
         TODO("Not yet implemented")
     }
-}
\ No newline at end of file
+}

From 31451cc375f27113faae006f3c0fc796baf398a5 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 22 Feb 2023 17:57:04 +0100
Subject: [PATCH 212/227] Lint fix

---
 resources/src/androidLibMain/kotlin/KalugaImage.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/src/androidLibMain/kotlin/KalugaImage.kt b/resources/src/androidLibMain/kotlin/KalugaImage.kt
index a204fa2e0..68076f10b 100644
--- a/resources/src/androidLibMain/kotlin/KalugaImage.kt
+++ b/resources/src/androidLibMain/kotlin/KalugaImage.kt
@@ -30,7 +30,7 @@ actual data class KalugaImage(val drawable: Drawable)
 /**
  * Gets a [Drawable] of a [TintedImage] or `null` if the [TintedImage] cannot be made into a [Drawable]
  */
-val TintedImage.drawable: Drawable?  get() = image.drawable.constantState?.newDrawable()?.mutate()?.let {
+val TintedImage.drawable: Drawable? get() = image.drawable.constantState?.newDrawable()?.mutate()?.let {
     DrawableCompat.wrap(it).apply {
         DrawableCompat.setTint(this, tint)
     }

From b29fe58ac8d002e78a739dd1a5bf30fe5fecade8 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 22 Feb 2023 17:58:34 +0100
Subject: [PATCH 213/227] Lint fix

---
 links/src/commonMain/kotlin/LinksManager.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/links/src/commonMain/kotlin/LinksManager.kt b/links/src/commonMain/kotlin/LinksManager.kt
index 6c7559bb9..ce0f512d6 100644
--- a/links/src/commonMain/kotlin/LinksManager.kt
+++ b/links/src/commonMain/kotlin/LinksManager.kt
@@ -72,7 +72,7 @@ class DefaultLinksManager(
     class Builder(
         private val handler: LinksHandler
     ) : LinksManager.Builder {
-        
+
         constructor() : this(PlatformLinksHandler())
 
         override fun create(): LinksManager =

From e20955848a821e4b6186469b800ea571211117cc Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 22 Feb 2023 20:20:10 +0100
Subject: [PATCH 214/227] Fixed api

---
 links/api/androidLib/links.api | 1 -
 links/api/jvm/links.api        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/links/api/androidLib/links.api b/links/api/androidLib/links.api
index 8af770e90..942f2f6bf 100644
--- a/links/api/androidLib/links.api
+++ b/links/api/androidLib/links.api
@@ -7,7 +7,6 @@ public final class com/splendo/kaluga/links/DefaultLinksManager : com/splendo/ka
 public final class com/splendo/kaluga/links/DefaultLinksManager$Builder : com/splendo/kaluga/links/LinksManager$Builder {
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/links/handler/LinksHandler;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/links/handler/LinksHandler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create ()Lcom/splendo/kaluga/links/LinksManager;
 }
 
diff --git a/links/api/jvm/links.api b/links/api/jvm/links.api
index c1ff51fb8..55cac19ae 100644
--- a/links/api/jvm/links.api
+++ b/links/api/jvm/links.api
@@ -7,7 +7,6 @@ public final class com/splendo/kaluga/links/DefaultLinksManager : com/splendo/ka
 public final class com/splendo/kaluga/links/DefaultLinksManager$Builder : com/splendo/kaluga/links/LinksManager$Builder {
 	public fun <init> ()V
 	public fun <init> (Lcom/splendo/kaluga/links/handler/LinksHandler;)V
-	public synthetic fun <init> (Lcom/splendo/kaluga/links/handler/LinksHandler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create ()Lcom/splendo/kaluga/links/LinksManager;
 }
 

From 9af3ef0d6bd8181ba4ddda7285ebbb43ec375883 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 23 Feb 2023 10:53:29 +0100
Subject: [PATCH 215/227] PR remarks

---
 .../handler/PlatformLinksHandlerTest.kt       | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/links/src/commonTest/kotlin/handler/PlatformLinksHandlerTest.kt b/links/src/commonTest/kotlin/handler/PlatformLinksHandlerTest.kt
index 8f52d992b..6593050eb 100644
--- a/links/src/commonTest/kotlin/handler/PlatformLinksHandlerTest.kt
+++ b/links/src/commonTest/kotlin/handler/PlatformLinksHandlerTest.kt
@@ -24,17 +24,33 @@ import kotlin.test.assertTrue
 
 abstract class PlatformLinksHandlerTest(private val linksValidator: PlatformLinksHandler) {
 
+    companion object {
+
+        val VALID_URLS = listOf(
+            "https://test.io",
+            "http://test.io",
+            "https://test.io?isValid=true",
+            "https://test.io?list_1=first&list_2=second&list_3=third"
+        )
+
+        val INVALID_URLS = listOf(
+            "notvalid.com",
+            "not valid",
+            "httpss://notvalid.com?/?isValid=false"
+        )
+    }
+
     @Test
     fun testLinksValidatorSucceed() {
-        TestConstants.VALID_URLS.forEach {
-            assertTrue { linksValidator.isValid(it) }
+        VALID_URLS.forEach {
+            assertTrue("Cannot handle $it") { linksValidator.isValid(it) }
         }
     }
 
     @Test
     fun testLinksValidatorFailed() {
-        TestConstants.INVALID_URLS.forEach {
-            assertFalse { linksValidator.isValid(it) }
+        INVALID_URLS.forEach {
+            assertFalse("Can handle $it") { linksValidator.isValid(it) }
         }
     }
 
@@ -52,19 +68,3 @@ abstract class PlatformLinksHandlerTest(private val linksValidator: PlatformLink
         assertEquals(emptyList(), linksValidator.extractQueryAsList(url))
     }
 }
-
-object TestConstants {
-
-    val VALID_URLS = listOf(
-        "https://test.io",
-        "http://test.io",
-        "https://test.io?isValid=true",
-        "https://test.io?list_1=first&list_2=second&list_3=third"
-    )
-
-    val INVALID_URLS = listOf(
-        "notvalid.com",
-        "not valid",
-        "httpss://notvalid.com?/?isValid=false"
-    )
-}

From 2ee99c406b30b41837fddbb5b76d9be2f069fea2 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 23 Feb 2023 11:40:54 +0100
Subject: [PATCH 216/227] PR remarks

---
 resources/src/androidLibMain/kotlin/StyledString.kt | 2 +-
 resources/src/iosMain/kotlin/StyledString.kt        | 2 +-
 resources/src/jsMain/kotlin/StyledString.kt         | 2 +-
 resources/src/jvmMain/kotlin/StyledString.kt        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/src/androidLibMain/kotlin/StyledString.kt b/resources/src/androidLibMain/kotlin/StyledString.kt
index cdeab0104..277dcab3c 100644
--- a/resources/src/androidLibMain/kotlin/StyledString.kt
+++ b/resources/src/androidLibMain/kotlin/StyledString.kt
@@ -111,7 +111,7 @@ actual class StyledStringBuilder constructor(
      * @throws [IndexOutOfBoundsException] if [range] is out of bounds for the text to span
      */
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
-        if (range.first < 0 || range.last >= builder.length) {
+        if (range.any { it !in builder.indices }) {
             throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
         }
         builder.setSpan(
diff --git a/resources/src/iosMain/kotlin/StyledString.kt b/resources/src/iosMain/kotlin/StyledString.kt
index 50ffcd3dc..6430ae613 100644
--- a/resources/src/iosMain/kotlin/StyledString.kt
+++ b/resources/src/iosMain/kotlin/StyledString.kt
@@ -98,7 +98,7 @@ actual class StyledStringBuilder constructor(
      * @throws [IndexOutOfBoundsException] if [range] is out of bounds for the text to span
      */
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
-        if (range.first < 0 || range.last.toULong() >= attributedString.length) {
+        if (range.any { it !in attributedString.string.indices }) {
             throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
         }
         val nsRange = range.nsRange
diff --git a/resources/src/jsMain/kotlin/StyledString.kt b/resources/src/jsMain/kotlin/StyledString.kt
index 46e6784ae..6e1d06749 100644
--- a/resources/src/jsMain/kotlin/StyledString.kt
+++ b/resources/src/jsMain/kotlin/StyledString.kt
@@ -73,7 +73,7 @@ actual class StyledStringBuilder constructor(
      * @throws [IndexOutOfBoundsException] if [range] is out of bounds for the text to span
      */
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
-        if (range.first < 0 || range.last >= styledString.string.length) {
+        if (range.any { it !in styledString.string.indices }) {
             throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
         }
         styledString = styledString.copy(
diff --git a/resources/src/jvmMain/kotlin/StyledString.kt b/resources/src/jvmMain/kotlin/StyledString.kt
index 857f512cf..5eb3c7e29 100644
--- a/resources/src/jvmMain/kotlin/StyledString.kt
+++ b/resources/src/jvmMain/kotlin/StyledString.kt
@@ -74,8 +74,8 @@ actual class StyledStringBuilder constructor(
      * @throws [IndexOutOfBoundsException] if [range] is out of bounds for the text to span
      */
     actual fun addStyleAttribute(attribute: StringStyleAttribute, range: IntRange) {
-        if (range.first < 0 || range.last >= styledString.string.length) {
-            throw IndexOutOfBoundsException("Attribute cannot be applied to $range")
+        if (range.any { it !in styledString.string.indices }) {
+            throw IndexOutOfBoundsException("Attribute cannot be applied to $range with ${styledString.string.indices}")
         }
         styledString = styledString.copy(
             attributed = styledString.attributed.toMutableList().apply {

From 76c404817916703b7c7d50f34e9b14198f2bb52e Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Thu, 23 Feb 2023 16:20:23 +0100
Subject: [PATCH 217/227] Update/corrected all Readme.md files

---
 DEVELOP.md                          |   2 +-
 README.md                           | 103 ++++++++++++++--------------
 alerts/README.md                    |  91 ++++++++++++------------
 architecture-compose/README.md      |   2 +-
 architecture/README.md              |  48 +++++--------
 base-permissions/README.md          |  32 ++++-----
 base/README.md                      |  16 ++---
 beacons/README.md                   |   5 +-
 bluetooth-permissions/README.md     |   4 +-
 bluetooth/README.md                 |  66 +++++++++---------
 calendar-permissions/README.md      |   4 +-
 camera-permissions/README.md        |   6 +-
 contacts-permissions/README.md      |   6 +-
 date-time-picker/README.md          |  63 ++++++++++-------
 example/ios/Kaluga-SwiftUI          |   2 +-
 hud/README.md                       |  18 +++--
 keyboard-compose/README.md          |   8 ++-
 keyboard/README.md                  |  62 +++++++++++------
 links/README.md                     |   4 +-
 location-permissions/README.md      |   6 +-
 location/README.md                  |   9 ++-
 logging/README.md                   |  18 +++--
 microphone-permissions/README.md    |   6 +-
 notifications-permissions/README.md |   6 +-
 permissions/README.md               |  21 +++++-
 resources-compose/README.md         |  25 ++++++-
 resources-databinding/README.md     |  26 +++++--
 resources/README.md                 |  69 +++++++++++++------
 review/README.md                    |   6 +-
 scientific/README.md                |   3 +-
 service/README.md                   |   2 +-
 storage-permissions/README.md       |   6 +-
 system/README.md                    |   4 +-
 test-utils-architecture/README.md   |   3 +-
 test-utils-base/README.md           |   2 +
 test-utils-koin/README.md           |   1 -
 test-utils-resources/README.md      |   2 +-
 test-utils-service/README.md        |  21 ++++++
 test-utils-system/README.md         |  21 ++++++
 39 files changed, 476 insertions(+), 323 deletions(-)
 create mode 100644 test-utils-service/README.md
 create mode 100644 test-utils-system/README.md

diff --git a/DEVELOP.md b/DEVELOP.md
index 5bab0dd3e..51cd55fdb 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -39,7 +39,7 @@ Make sure you have the Simulator setup with a working target device. For now you
 
 The `ioTest` task supports the `--tests` flag like other Gradle tasks to filter which tests to run.
 
-Note that for kaluga iOS tests run on a background thread, in order to have a properly working Main dispatchers (and align better with Android). How this works is described in [`test-utils-base`](test-utils-base/)
+Note that for Kaluga iOS tests run on a background thread, in order to have a properly working Main dispatchers (and align better with Android). How this works is described in [`test-utils-base`](test-utils-base/)
 
 ## Architecture
 
diff --git a/README.md b/README.md
index 2374a4e4e..319c3675f 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ To reach this goal it uses Kotlin, specifically [Kotlin Multiplatform](https://k
 
 Where appropriate coroutines and `Flow` are used in the API. This enables developers to use [cold streams](https://medium.com/@elizarov/cold-flows-hot-channels-d74769805f9) for a modern and efficient design.
 
-While kaluga modules can be used individually, together they form a comprehensive approach to cross-platform development with [shared native code](https://kotlinlang.org/docs/mpp-share-on-platforms.html) and native UIs, including SwiftUI and Compose. 
+While Kaluga modules can be used individually, together they form a comprehensive approach to cross-platform development with [shared native code](https://kotlinlang.org/docs/mpp-share-on-platforms.html) and native UIs, including SwiftUI and Compose. 
 
 ### Short examples
 
@@ -49,7 +49,7 @@ builder.subscribe(activity) // this needs be done in the Android source-set to b
 builder.unsubscribe(activity) // when the Activity is stopped
 ```
 
-However kaluga's [architecture module](architecture/) offers a cross-platform [`ViewModel`](architecture/src/commonMain/kotlin/viewmodel/ViewModel.kt) class (which extends `androidx.lifecycle.ViewModel` on Android) that will automatically bind the builder to its lifecycle:
+However Kaluga's [architecture module](architecture/) offers a cross-platform [`LifecycleViewModel`](architecture/src/commonMain/kotlin/viewmodel/LifecycleViewModel.kt) class (which extends `androidx.lifecycle.ViewModel` on Android) that will automatically bind the builder to its lifecycle:
 
 ```kotlin
 // this can just be in the commonMain source
@@ -67,7 +67,7 @@ Kaluga contains [an example project](example/) that is used to test the develope
 
 ## Using Kaluga
 
-For starting a new project based on kaluga see the [kaluga-starter repo](https://github.com/splendo/kaluga-starter), which shows how to do this step by step.
+For starting a new project based on Kaluga see the [kaluga-starter repo](https://github.com/splendo/kaluga-starter), which shows how to do this step by step.
 
 Kaluga is available on Maven Central. For example the Kaluga Alerts can be imported like this:
 
@@ -76,7 +76,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    implementation("com.splendo.kaluga:alerts:0.5.0")
+    implementation("com.splendo.kaluga:alerts:1.0.0")
 }
 ```
 
@@ -87,60 +87,60 @@ repositories {
     maven("https://oss.sonatype.org/content/repositories/snapshots/")
 }
 dependencies {
-    implementation("com.splendo.kaluga:alerts:0.6.0-SNAPSHOT")
+    implementation("com.splendo.kaluga:alerts:1.0.0-SNAPSHOT")
 }
 ```
 
-**Please mind** that in order for kaluga to work properly on iOS it declares a [strict dependency](https://docs.gradle.org/7.0.2/userguide/rich_versions.html#sec:strict-version) on the [`native-mt` version of the `kotlinx.coroutines` library](https://github.com/Kotlin/kotlinx.coroutines/tree/287a931d3b8ce#native). If you want to use a different version make your own strict dependency declaration. This can be done simply by adding `!!`, for example: `implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt!!")`.
-
-
 To use kaluga with SwiftUI and/or Combine we have a [repo with Sourcery templates](https://github.com/splendo/kaluga-swiftui) to generate some Swift code to help get you started.
 
 ### Available Modules
 
-| Module                                                  | Usage                                                                              | Artifact Name                                |
-|---------------------------------------------------------|------------------------------------------------------------------------------------|----------------------------------------------|
-| [alerts](alerts/)                                       | Used for Showing Alert Dialogs                                                     | com.splendo.kaluga:alerts                    |
-| [architecture](architecture/)                           | MVVM architecture                                                                  | com.splendo.kaluga:architecture              |
-| [architecture-compose](architecture-compose/)           | Compose extensions for architecture                                                | com.splendo.kaluga:architecture-compose      |
-| [base](base/)                                           | Core components of Kaluga. Contains threading, flowables and localization features | com.splendo.kaluga:base                      |
-| [date-time](date-time/)                                 | Contains multiplatform classes to work with date and time                          | com.splendo.kaluga:date-time                 |
-| [date-timepicker](date-time-picker/)                    | Used for showing a Date or Time Picker                                             | com.splendo.kaluga:date-time-picker          |
-| [hud](hud/)                                             | Used for showing a Loading indicator HUD                                           | com.splendo.kaluga:hud                       |
-| [keyboard](keyboard/)                                   | Used for showing and hiding the keyboard                                           | com.splendo.kaluga:keyboard                  |
-| [keyboard-compose](keyboard-compose/)                   | Compose extensions for keyboard                                                    | com.splendo.kaluga:keyboard-compose          |
-| [links](links/)                                         | Used for decoding url into an object                                               | com.splendo.kaluga:links                     |
-| [location](location/)                                   | Provides the User' geolocation                                                     | com.splendo.kaluga:location                  |
-| [logging](logging/)                                     | Shared console logging                                                             | com.splendo.kaluga:logging                   |
-| [base-permissions](base-permissions/)                   | Managing permissions, used in conjunction with modules below                       | com.splendo.kaluga:base-permissions          |
-| [bluetooth-permissions](bluetooth-permissions/)         | Managing bluetooth permissions                                                     | com.splendo.kaluga:bluetooth-permissions     |
-| [calendar-permissions](calendar-permissions/)           | Managing calendar permissions                                                      | com.splendo.kaluga:calendar-permissions      |
-| [camera-permissions](camera-permissions/)               | Managing camera permissions                                                        | com.splendo.kaluga:camera-permissions        |
-| [contacts-permissions](contacts-permissions/)           | Managing contacts permissions                                                      | com.splendo.kaluga:contacts-permissions      |
-| [location-permissions](location-permissions/)           | Managing location permissions                                                      | com.splendo.kaluga:location-permissions      |
-| [microphone-permissions](microphone-permissions/)       | Managing microphone permissions                                                    | com.splendo.kaluga:microphone-permissions    |
-| [notifications-permissions](notifications-permissions/) | Managing notifications permissions                                                 | com.splendo.kaluga:notifications-permissions |
-| [storage-permissions](storage-permissions/)             | Managing storage permissions                                                       | com.splendo.kaluga:storage-permissions       |
-| [resources](resources/)                                 | Provides shared Strings, Images, Colors and Fonts                                  | com.splendo.kaluga:resources                 |
-| [resources-compose](resources-compose/)                 | Compose extensions for resources                                                   | com.splendo.kaluga:resources-compose         |
-| [resources-databinding](resources-databinding/)         | Databinding extensions for resources                                               | com.splendo.kaluga:resources-databinding     |
-| [review](review/)                                       | Used for requesting the user to review the app                                     | com.splendo.kaluga:review                    |
-| [scientific](scientific/)                               | Scientific units and conversions                                                   | com.splendo.kaluga:scientific                |
-| [service](service/)                                     | Used for adding services to Kaluga                                                 | com.splendo.kaluga:service                   |
-| [system](system/)                                       | System APIs such as network, audio, battery                                        | com.splendo.kaluga:system                    |
-| [test-utils](test-utils/)                               | Enables easier testing of Kaluga components                                        | com.splendo.kaluga:test-utils                |
-| [test-utils-base](test-utils-base/)                     | Enables easier testing of Kaluga components                                        | com.splendo.kaluga:test-utils-base           |
-| [test-utils-alerts](test-utils-alerts/)                 | Enables easier testing of Alerts module                                            | com.splendo.kaluga:test-utils-alerts         |
-| [test-utils-architecture](test-utils-architecture/)     | Enables easier testing of Architecture module                                      | com.splendo.kaluga:test-utils-architecture   |
-| [test-utils-bluetooth](test-utils-bluetooth/)           | Enables easier testing of Bluetooth module                                         | com.splendo.kaluga:test-utils-bluetooth      |
-| [test-utils-hud](test-utils-hud/)                       | Enables easier testing of HUD module                                               | com.splendo.kaluga:test-utils-hud            |
-| [test-utils-keyboard](test-utils-keyboard/)             | Enables easier testing of Keyboard module                                          | com.splendo.kaluga:test-utils-keyboard       |
-| [test-utils-koin](test-utils-koin/)                     | Enables easier testing with Koin                                                   | com.splendo:kaluga.test-utils-koin           |
-| [test-utils-location](test-utils-location/)             | Enables easier testing of Location module                                          | com.splendo.kaluga:test-utils-location       |
-| [test-utils-permissions](test-utils-permissions/)       | Enables easier testing of Permissions modules                                      | com.splendo.kaluga:test-utils-permissions    |
-| [test-utils-resources](test-utils-resources/)           | Enables easier testing of Resources module                                         | com.splendo.kaluga:test-utils-resources      |
-| [test-utils-service](test-utils-service/)               | Enables easier testing of Service module                                           | com.splendo.kaluga:test-utils-service        |
-| [test-utils-system](test-utils-system/)                 | Enables easier testing of System module                                            | com.splendo.kaluga:test-utils-system         |
+| Module                                                      | Usage                                                                              | Artifact Name                                  |
+|-------------------------------------------------------------|------------------------------------------------------------------------------------|------------------------------------------------|
+| [alerts](alerts/)                                           | Used for Showing Alert Dialogs                                                     | com.splendo.kaluga:alerts                      |
+| [architecture](architecture/)                               | MVVM architecture                                                                  | com.splendo.kaluga:architecture                |
+| [architecture-compose](architecture-compose/)               | Compose extensions for architecture                                                | com.splendo.kaluga:architecture-compose        |
+| [base](base/)                                               | Core components of Kaluga. Contains threading, flowables and localization features | com.splendo.kaluga:base                        |
+| [beacons](beacons/)                                         | Tracking the availability of Beacons using the Eddystone protocol                  | com.splendo.kaluga:beacons                     |
+| [bluetooth](bluetooth/)                                     | Scanning for and communicating with BLE devices                                    | com.splendo.kaluga:bluetooth                   |
+| [date-time](date-time/)                                     | Contains multiplatform classes to work with date and time                          | com.splendo.kaluga:date-time                   |
+| [date-timepicker](date-time-picker/)                        | Used for showing a Date or Time Picker                                             | com.splendo.kaluga:date-time-picker            |
+| [hud](hud/)                                                 | Used for showing a Loading indicator HUD                                           | com.splendo.kaluga:hud                         |
+| [keyboard](keyboard/)                                       | Used for showing and hiding the keyboard                                           | com.splendo.kaluga:keyboard                    |
+| [keyboard-compose](keyboard-compose/)                       | Compose extensions for keyboard                                                    | com.splendo.kaluga:keyboard-compose            |
+| [links](links/)                                             | Used for decoding url into an object                                               | com.splendo.kaluga:links                       |
+| [location](location/)                                       | Provides the User' geolocation                                                     | com.splendo.kaluga:location                    |
+| [logging](logging/)                                         | Shared console logging                                                             | com.splendo.kaluga:logging                     |
+| [base-permissions](base-permissions/)                       | Managing permissions, used in conjunction with modules below                       | com.splendo.kaluga:base-permissions            |
+| [bluetooth-permissions](bluetooth-permissions/)             | Managing bluetooth permissions                                                     | com.splendo.kaluga:bluetooth-permissions       |
+| [calendar-permissions](calendar-permissions/)               | Managing calendar permissions                                                      | com.splendo.kaluga:calendar-permissions        |
+| [camera-permissions](camera-permissions/)                   | Managing camera permissions                                                        | com.splendo.kaluga:camera-permissions          |
+| [contacts-permissions](contacts-permissions/)               | Managing contacts permissions                                                      | com.splendo.kaluga:contacts-permissions        |
+| [location-permissions](location-permissions/)               | Managing location permissions                                                      | com.splendo.kaluga:location-permissions        |
+| [microphone-permissions](microphone-permissions/)           | Managing microphone permissions                                                    | com.splendo.kaluga:microphone-permissions      |
+| [notifications-permissions](notifications-permissions/)     | Managing notifications permissions                                                 | com.splendo.kaluga:notifications-permissions   |
+| [storage-permissions](storage-permissions/)                 | Managing storage permissions                                                       | com.splendo.kaluga:storage-permissions         |
+| [resources](resources/)                                     | Provides shared Strings, Images, Colors and Fonts                                  | com.splendo.kaluga:resources                   |
+| [resources-compose](resources-compose/)                     | Compose extensions for resources                                                   | com.splendo.kaluga:resources-compose           |
+| [resources-databinding](resources-databinding/)             | Data Binding extensions for resources                                              | com.splendo.kaluga:resources-databinding       |
+| [review](review/)                                           | Used for requesting the user to review the app                                     | com.splendo.kaluga:review                      |
+| [scientific](scientific/)                                   | Scientific units and conversions                                                   | com.splendo.kaluga:scientific                  |
+| [service](service/)                                         | Used for adding services to Kaluga                                                 | com.splendo.kaluga:service                     |
+| [system](system/)                                           | System APIs such as network, audio, battery                                        | com.splendo.kaluga:system                      |
+| [test-utils](test-utils/)                                   | Enables easier testing of Kaluga components                                        | com.splendo.kaluga:test-utils                  |
+| [test-utils-base](test-utils-base/)                         | Enables easier testing of Kaluga components                                        | com.splendo.kaluga:test-utils-base             |
+| [test-utils-alerts](test-utils-alerts/)                     | Enables easier testing of Alerts module                                            | com.splendo.kaluga:test-utils-alerts           |
+| [test-utils-architecture](test-utils-architecture/)         | Enables easier testing of Architecture module                                      | com.splendo.kaluga:test-utils-architecture     |
+| [test-utils-bluetooth](test-utils-bluetooth/)               | Enables easier testing of Bluetooth module                                         | com.splendo.kaluga:test-utils-bluetooth        |
+| [test-utils-date-time-picker](test-utils-date-time-picker/) | Enables easier testing of Date Time Picker module                                  | com.splendo.kaluga:test-utils-date-time-picker |
+| [test-utils-hud](test-utils-hud/)                           | Enables easier testing of HUD module                                               | com.splendo.kaluga:test-utils-hud              |
+| [test-utils-keyboard](test-utils-keyboard/)                 | Enables easier testing of Keyboard module                                          | com.splendo.kaluga:test-utils-keyboard         |
+| [test-utils-koin](test-utils-koin/)                         | Enables easier testing with Koin                                                   | com.splendo:kaluga.test-utils-koin             |
+| [test-utils-location](test-utils-location/)                 | Enables easier testing of Location module                                          | com.splendo.kaluga:test-utils-location         |
+| [test-utils-permissions](test-utils-permissions/)           | Enables easier testing of Permissions modules                                      | com.splendo.kaluga:test-utils-permissions      |
+| [test-utils-resources](test-utils-resources/)               | Enables easier testing of Resources module                                         | com.splendo.kaluga:test-utils-resources        |
+| [test-utils-service](test-utils-service/)                   | Enables easier testing of Service module                                           | com.splendo.kaluga:test-utils-service          |
+| [test-utils-system](test-utils-system/)                     | Enables easier testing of System module                                            | com.splendo.kaluga:test-utils-system           |
 
 ### Friends of kaluga
 
@@ -157,7 +157,6 @@ Kaluga also uses some multiplatform libraries itself, so our thanks to:
 | Project                                        | Usage                     |
 |------------------------------------------------|---------------------------|
 | [Napier](https://github.com/AAkira/Napier)     | powers the logging module |
-| [stately](https://github.com/touchlab/Stately) | concurrency               |
 | [Koin](https://insert-koin.io/)                | dependency injection      |
 
 ## Developing Kaluga
diff --git a/alerts/README.md b/alerts/README.md
index 0dd636337..b9a2d33c6 100644
--- a/alerts/README.md
+++ b/alerts/README.md
@@ -1,4 +1,3 @@
-
 # Alerts  
   
 A library allows you to show native alerts.  
@@ -21,7 +20,7 @@ dependencies {
   
 ## Usage  
   
-Using Alerts is very simple. You can show an alert from shared code like this:  
+You can show an alert from shared code like this:  
   
 ```kotlin  
 // Shared code  
@@ -59,9 +58,26 @@ fun showAlert(builder: AlertPresenter.Builder, title: String) = MainScope().laun
             println("No pressed")
         }
     }
-    // Show alert.show()
+    // Show
+    alert.show()
 }
 ```  
+
+In order to dismiss alert you can use `dismiss()` function:
+
+```kotlin
+MainScope().launch {
+    // Build alert
+    val alert = builder.buildAlert(this) {
+        setTitle("Please wait...")
+        setPositiveButton("OK")
+    }
+    // Show
+    alert.showAsync()
+    // Dismiss
+    alert.dismiss()
+}
+```
   
 ## Builder  
   
@@ -69,11 +85,11 @@ The `AlertPresenter.Builder` class can be used to build Alerts.
   
 ### Build alert  
   
-- `buildAlert(coroutineScope: CoroutineScope, initialize: BaseAlertPresenter.Builder.() -> Unit): AlertPresenter` — builder to create `AlertPresenter`, thread-safe  
+- `buildAlert(coroutineScope: CoroutineScope, initialize: Alert.Builder.() -> Unit): BaseAlertPresenter` — builder to create `BaseAlertPresenter`, thread-safe  
   
 ### Build action sheet  
   
-- `buildActionSheet(coroutineScope: CoroutineScope, initialize: AlertPresenter.Builder.() -> Unit): AlertPresenter` — builder to create `AlertPresenter`, thread-safe  
+- `buildActionSheet(coroutineScope: CoroutineScope, initialize: Alert.Builder.() -> Unit): BaseAlertPresenter` — builder to create `BaseAlertPresenter`, thread-safe  
   
 ### Set title, style and message  
   
@@ -91,7 +107,23 @@ The `AlertPresenter.Builder` class can be used to build Alerts.
 ### Set actions for action sheet  
   
 - `addActions(actions: List<Alert.Action>)` or `addActions(vararg actions: Alert.Action)` — adds a list of actions for the alert  
-  
+
+You can also show action sheet using Actions with handlers:
+
+```kotlin  
+fun showList(builder: AlertPresenter.Builder) = MainScope().launch {
+     builder.buildActionSheet(this) {
+         setTitle("Select an option")
+         addActions(
+             Alert.Action("Option 1") { /* handle option #1 */ },
+             Alert.Action("Option 2") { /* handle option #2 */ },
+             Alert.Action("Option 3") { /* handle option #3 */ },
+             Alert.Action("Option 4") { /* handle option #4 */ }
+         )
+     }.show()
+}
+```
+
 > On iOS you can have only 1 button with type of Action.Style.Cancel / Negative  
   
 #### Action styles  
@@ -107,9 +139,14 @@ On Android the builder is an `ActivityLifecycleSubscribable` (see Architecture)
 For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
   
 ```kotlin  
-class AlertViewModel: LifecycleViewModel() {  
+class AlertViewModel: BaseLifecycleViewModel() {  
   
     val builder = AlertPresenter.Builder()
+    
+    init {
+        addLifecycleSubscribables(builder)
+    }
+    
     fun show() {
             coroutineScope.launch {
                 builder.build(this) {
@@ -133,7 +170,7 @@ class MyActivity: KalugaViewModelActivity<AlertViewModel>() {
  }
 ```
 
-For other usages, make sure to call `LifecycleSubscriber.subscribe` and `LifecycleSubscriber.unsubscribe` to manage the lifecycle manually.
+For other usages, make sure to call `ActivityLifecycleSubscribable.subscribe` and `ActivityLifecycleSubscribable.unsubscribe` to manage the lifecycle manually.
 
 ```kotlin
 // Android specific
@@ -145,8 +182,6 @@ MainScope().launch {
     }.show()
 }
 ```
-
-You can use the `AppCompatActivity.alertPresenterBuilder` convenience method to get a builder that is valid during the lifespan of the Activity it belongs to.
   
 ### iOS  
 On iOS this builder should be instantiated with `UIViewController`:  
@@ -154,40 +189,10 @@ On iOS this builder should be instantiated with `UIViewController`:
 ```swift
 // iOS specific
 let builder = AlertPresenter.Builder(viewController)
-```  
-  
-You can also show action sheet using Actions with handlers:  
-  
-```kotlin  
-fun showList(builder: AlertPresenter.Builder) = MainScope().launch {
-     builder.buildActionSheet(this) {
-         setTitle("Select an option")
-         addActions(
-             Alert.Action("Option 1") { /* handle option #1 */ },
-             Alert.Action("Option 2") { /* handle option #2 */ },
-             Alert.Action("Option 3") { /* handle option #3 */ },
-             Alert.Action("Option 4") { /* handle option #4 */ }
-         )
-     }.show()
-}
-```
-> Cancel action will be added automatically on iOS platform  
-  
-In order to dismiss alert you can use `dismiss()` function:  
-  
-```kotlin
-MainScope().launch {
-    // Build alert
-    val alert = builder.buildAlert(this) {
-        setTitle("Please wait...")
-        setPositiveButton("OK")
-    }
-    // Show
-    alert.showAsync()
-    // Dismiss
-    alert.dismiss()
-}
 ```
 
+Since a `UIViewController` is required, for SwiftUI the `View` displaying the Alert should have a `UIViewControllerRepresentable` wrapping the `UIViewController` associated with the `AlertPresenter.Builder` attached.
+The [Kaluga SwiftUI scripts](https://github.com/splendo/kaluga-swiftui) provide a `ContainerView` that offers this functionality out of the box (if the `includeAlerts` setting is set to `true`)
+
 ## Testing
 Use the [`test-utils-alerts` module](../test-utils-alerts) to get a mockable Alert Presenter.
diff --git a/architecture-compose/README.md b/architecture-compose/README.md
index 8346d378e..52f9d4b13 100644
--- a/architecture-compose/README.md
+++ b/architecture-compose/README.md
@@ -1,4 +1,4 @@
-## Architecture-compose
+## Architecture Compose
 This Android library contains composable functions to work with Kaluga architecture and androidx navigation.
 
 ## Installing
diff --git a/architecture/README.md b/architecture/README.md
index 49e150afa..b0d9dd91a 100644
--- a/architecture/README.md
+++ b/architecture/README.md
@@ -66,7 +66,7 @@ class SomeActivity : KalugaViewModelActivity<SomeViewModel> {
 
 The `KalugaViewModelLifecycleObserver` will automatically update the `ActivityLifecycleSubscribable.LifecycleManager` context of all `ActivityLifecycleSubscribable` added to `BaseLifecycleViewModel.activeLifecycleSubscribables` of the viewModel.
 Implement this interface if a viewModel has properties that should be lifecycle or context aware.
-It can be delegated using `LifecycleSubscriber`.
+It can be delegated using `LifecycleManagerObserver`.
 The `LifecycleManagerObserver` is a default implementation of `ActivityLifecycleSubscribable` that provides updates to the context as a `Flow`.
 
 ### iOS
@@ -95,7 +95,7 @@ class SomeViewController : UIViewController {
 }
 ```
 
-Automatic setup can be achieved by binding an `UIViewController` to the viewModel using `addLifecycleManager`.
+Automatic setup can be achieved by binding a `UIViewController` to the viewModel using `addLifecycleManager`.
 When bound the viewModel lifecycle is automatically matched with the viewControllers `viewDidAppear` and `viewDidDisappear` methods.
 The resulting `LifecycleManager` should be unbound using `unbind` when no longer required. Unbinding will also `clear` the bound viewModel.
 Automatic binding is achieved by adding an invisible child `UIViewController` to the bound viewController.
@@ -148,9 +148,9 @@ Using observables in viewmodels also has some common problems:
 - repeated updates with equal values.
 
 Kaluga observables deal with this by only allowing specific subtypes:
-- `UnintializedObservable`, these hold a `ObservableOptional` value, which is either an `ObservableOptional.Value` or `ObservableOptional.Nothing`. If the generic type an optional`?`, this means a Value can hold `null`, which is distinguishable from `Nothing`. 
+- `UnintializedObservable`, these hold an `ObservableOptional` value, which is either an `ObservableOptional.Value` or `ObservableOptional.Nothing`. If the generic type an optional`?`, this means a Value can hold `null`, which is distinguishable from `Nothing`. 
 - `IntializedObservable`, these can only hold an `ObservableOptional.Value`. 
-- `DefaultObservable`, a subtype of a `IntializedObservable` where all `null` values of the observed `ObservableOptional.Value` are replaced with a default value.
+- `DefaultObservable`, a subtype of an `IntializedObservable` where all `null` values of the observed `ObservableOptional.Value` are replaced with a default value.
 
 Equivalent subjects also exist.
 
@@ -163,7 +163,7 @@ The easiest way of creating an observable by calling the function `observableOf`
 ```kotlin
 val observable = observableOf(1)
 ```
-This will result in a `InitializedObservable<Int>`. Now it's possible to observe this value in several ways:
+This will result in an `InitializedObservable<Int>`. Now it's possible to observe this value in several ways:
 
 ```kotlin
 
@@ -235,24 +235,8 @@ DisposeBags can be emptied using `dispose()`. To post new data to the Subject th
 #### SwiftUI and Combine
 
 Since Kotlin Native does not have access to pure Swift libraries, no out of the box solution for `SwiftUI`/`Combine` is provided.
-Observables can be mapped to Combine `Published` classes directly from Swift however.
+Use the [Kaluga SwiftUI scripts](https://github.com/splendo/kaluga-swiftui) to add support to your project.
 
-```Swift
-let observable: InitializedObservable<Int>
-let subject: Subject<Int>
-
-let disposeBag = DisposeBag()
-
-init {
-    observable.observe(onNext: { (value) in
-        subject.post(value)
-    }).addTo(disposeBag)
-
-    // do Other stuff
-
-    disposeBag.dispose()
-}
-```
 #### Usage from ViewController
 
 When bound to a viewController, the `LifecycleManager` calls its `onLifeCycleChanged` callback automatically at the start of each cycle (`viewDidAppear`).
@@ -267,15 +251,19 @@ class SomeViewController : UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        lifecycleManager = viewModel.addLifecycleManager(parent: self, onLifecycle: { [weak self] in
-            guard let observable = self.viewModel.observable else {
-                return []
+        lifecycleManager = viewModel.addLifecycleManager(
+            parent: self,
+            onLifecycle: { [weak self] in
+                guard let observable = self.viewModel.observable else {
+                    return []
+                }
+                return [
+                    observable.observe(onNext: { (value) in
+                       // Handle value
+                   }
+                ]
             }
-            return [
-                observable.observe(onNext: { (value) in
-                   // Handle value
-               }
-            ] }
+        )
     }
 ```
 
diff --git a/base-permissions/README.md b/base-permissions/README.md
index de04566fd..49451fefd 100644
--- a/base-permissions/README.md
+++ b/base-permissions/README.md
@@ -1,4 +1,4 @@
-## Permissions
+# Permissions
 
 This library provides support for out-of-the-box access to device permissions.
 
@@ -12,25 +12,25 @@ Supported device features:
  - [Notifications](../notifications-permissions)
  - [Storage](../storage-permissions) (aka Photos on iOS)
 
- ## Installing
- This library is available on Maven Central. You can import Kaluga Permissions as follows:
+## Installing
+This library is available on Maven Central. You can import Kaluga Permissions as follows:
 
- ```kotlin
- repositories {
-     // ...
-     mavenCentral()
- }
+```kotlin
+repositories {
+ // ...
+ mavenCentral()
+}
+// ...
+dependencies {
  // ...
- dependencies {
-     // ...
-     implementation("com.splendo.kaluga:base-permissions:$kalugaVersion")
- }
- ```
+ implementation("com.splendo.kaluga:base-permissions:$kalugaVersion")
+}
+```
 
-### Usage
+## Usage
 Permissions can be requested through an instance of the `Permissions` class. This class is instantiated with a `PermissionsBuilder`, which defaults to requesting permissions for the Application Context (Android) or Main NSBundle (iOS).
 A custom `PermissionContext` can be provided.
-To be able to use builder, specific permission should be registered. Use `register<feature>Permission()` method of the `PermissionsBuilder`.
+To be able to use builder, specific permission should be registered. Use the `register<feature>Permission()` (single use only) or `register<feature>PermissionIfNotRegistered()` (multiple uses) method of the `PermissionsBuilder`.
 
 Permissions are modelled as a `Flow` of `State`, providing updates should the state change during observation. A permission can either be `Allowed` or `Denied`. A `Denied` permission can in turn be `Locked`, preventing the app from requesting it, or `Requestable`.
 
@@ -42,7 +42,7 @@ If a request fails, a new request with a more limited scope can then be made.
 
 ```kotlin
 val permissionBuilder = PermissionBuilder().apply {
-    registerLocationPermission()
+    registerLocationPermissionIfNotRegistered()
 }
 val permissions = Permissions(permissionBuilder)
 val locationPermission = Permission.Location(background=true, precise=true)
diff --git a/base/README.md b/base/README.md
index 2275d367f..101993650 100644
--- a/base/README.md
+++ b/base/README.md
@@ -16,18 +16,18 @@ dependencies {
 }
 ```
 
-### Threading
+## Threading
 You can run code on the OS Main Thread by using `runOnMain`. Use the `MainQueueDispatcher` to access the Main queue of the OS.
 
-### Data Accessors
+## Data Accessors
 - Use `byOrdinalOrDefault` to get an Enum value by ordinal or the default value if no such value exists.
 - (Android Only) Use the `ApplicationHolder` class to get and set the current `Application`. This is useful for default access to the ApplicationContext
 
-### Data Converters
+## Data Converters
 - Convert a `ByteArray` to a hexadecimal String using `toHexString()`
 - (iOS Only) Convert `NSData` to `ByteArray` and vice versa using `toByteArray()` and `toNSData()` respectively.
 
-### State
+## State
 The Kaluga library offers usage of State Machines.
 
 The `StateRepo` functions as a `Flow` to manage a state machine.
@@ -71,7 +71,7 @@ During transition the following callbacks may be implemented. The callbacks are
 
 If an atomic action is required on the state `useState()` can be called. When called, the state is guaranteed not to change for the duration of the action.
 
-#### Hot and Cold State Repos
+### Hot and Cold State Repos
 StateRepo may have a variable number of flows observing them.
 Thus they may at some point (temporarily) lose all observers.
 To determine what should happen when no observers are available, both flowable and stateRepo can be marked as either stateful (Hot) or stateless (Cold).
@@ -86,7 +86,7 @@ The initializer will be called if the number of flows observing changes from 0 t
 The deinitializer will be called when the number of flows observing changes drops to 0.
 Use `ColdStateRepo` for this behaviour.
 
-### Date
+## Date
 Kaluga includes a `Date` class to manage and compare time.
 Dates can be created using either `Date.now()` or `Date.epoch()`.
 Dates are mutable be default and can be compared.
@@ -99,14 +99,14 @@ val tomorrow = today.copy().apply {
 assertTrue(today < tomorrow)
 ```
 
-### Decimal
+## Decimal
 
 Kaluga includes a `Decimal` class to manage decimal numbers with high precision.
 Decimal can be created from any `Number` using `toDecimal()` or back to a `Double`/`Int` using `toDouble()`/`toInt()` respectively.
 
 Use Decimals to do standard arithmetic operations. A Rounding mode or scale can be provided for these calculations.
 
-### Formating
+## Formating
 
 It's possible to format to and from some data types using Kaluga.
 
diff --git a/beacons/README.md b/beacons/README.md
index 1499cd104..7817800da 100644
--- a/beacons/README.md
+++ b/beacons/README.md
@@ -1,4 +1,4 @@
-## Beacons
+# Beacons
 
 This library provides support for out-of-the-box access to Beacons.
 Currently only the [Eddystone protocol](https://github.com/google/eddystone/blob/master/protocol-specification.md) is supported
@@ -18,7 +18,7 @@ dependencies {
 }
 ```
 
-### Usage
+## Usage
 Create a `DefaultBeacons` object. This gives you access to a `Flow` of `Set<BeaconInfo>`. To monitor for beacons simply call:
 
 ```kotlin
@@ -34,4 +34,3 @@ launch {
 ///
 beacons.stopMonitoring()
 ```
-
diff --git a/bluetooth-permissions/README.md b/bluetooth-permissions/README.md
index c9fac5e37..99c60ba14 100644
--- a/bluetooth-permissions/README.md
+++ b/bluetooth-permissions/README.md
@@ -1,5 +1,5 @@
-## Bluetooth Permissions
-Adds a `BluetoothPermission`. Register this permission by calling `PermissionsBuilder.registerBluetoothPermission`.
+# Bluetooth Permissions
+Adds a `BluetoothPermission` to `Permissions`. Register this permission by calling `PermissionsBuilder.registerBluetoothPermission()`/`PermissionsBuilder.registerBluetoothPermissionIfNotRegistered()`.
 
 ## Installing
 This library is available on Maven Central. You can import Kaluga Permissions Bluetooth as follows:
diff --git a/bluetooth/README.md b/bluetooth/README.md
index 4cb111bc7..9f74d41cb 100644
--- a/bluetooth/README.md
+++ b/bluetooth/README.md
@@ -1,4 +1,4 @@
-## Bluetooth
+# Bluetooth
 
 This library provides support for out-of-the-box access to Bluetooth.
 
@@ -17,7 +17,7 @@ dependencies {
 }
 ```
 
-### Usage
+## Usage
 Create a `Bluetooth` object through the `BluetoothBuilder`. This gives you access to a `Flow` of Bluetooth devices. To scan for devices simply call
 
 ```kotlin
@@ -57,54 +57,52 @@ bluetooth.devices()[someUUID].disconnect()
 ### Android
 You may notice that when you ask for Kaluga's `Permission.Bluetooth` the android request alert will prompt `Location` permission. This behaviour is encountered because Android system requires Location to access the hardware identifiers of nearby external devices via Bluetooth.
 
-### Setup
-In order to setup a bluetooth repo you need to do the following:
+## Setup
+In order to setup a bluetooth repo you need to create a `Bluetooth` object using a `BluetoothBuilder`.
 
 ```kotlin
-// Somewhere in Android code
-val permissions = Permissions(
-    PermissionsBuilder().apply {
-        registerBluetoothPermission()
-        registerLocationPermission()
-    }
-)
+class CommonViewModel(bltBuilder: BluetoothBuilder) : BaseLifecycleViewModel() {
+    private val repo: Bluetooth = bltBuilder.create(
+        scannerSettingsBuilder = { permissions ->
+            BaseScanner.Settings(
+                permissions = permissions,
+                autoRequestPermission = false
+            )
+         },
+        connectionSettings = ConnectionSettings(
+            ConnectionSettings.ReconnectionSettings.Never
+        )
+    )
+}
+```
 
+The `BluetoothBuilder` is created on the platform
+
+### Android
+```kotlin
+// Somewhere in Android code
 val scanSettings = ScanSettings.Builder()
     .setScanMode(..)
     .setNumOfMatches(..)
     .build()
 
-val scannerBuilder = Scanner.Builder(scanSettings = scanSettings,..)
+val scannerBuilder = DefaultScanner.Builder(scanSettings = scanSettings,..)
 
-val bluetoothBuilder = BluetoothBuilder(permissions = permissions)
+val bluetoothBuilder = BluetoothBuilder(
+    scannerBuilder = scannerBuilder
+)
 CommonViewModel(bluetoothBuilder)
-...
+```
 
+### iOS
+```kotlin
 // Somewhere in iOS code
-val permissions = Permissions(
-    PermissionsBuilder().apply {
-        registerBluetoothPermission()
-        registerLocationPermission()
-    }
-)
-
 val scanSettings = ScanSettings(allowDuplicateKeys, solicitedServiceUUIDsKey)
 
-val scannerBuilder = Scanner.Builder(scanSettings)
+val scannerBuilder = DefaultScanner.Builder(scanSettings)
 
-val bluetoothBuilder = BluetoothBuilder(permissions = permissions, scannerBuilder = scannerBuilder)
+val bluetoothBuilder = BluetoothBuilder(scannerBuilder = scannerBuilder)
 CommonViewModel(bluetoothBuilder)
-...
-
-// Common code
-class CommonViewModel(bltBuilder: BluetoothBuilder) : BaseLifecycleViewModel() {
-    private val repo: Bluetooth = bltBuilder.create(
-        connectionSettings = ConnectionSettings(
-            ConnectionSettings.ReconnectionSettings.Never
-        ),
-        autoRequestPermission = false
-    )
-} 
 ```
 
 ### Notes
diff --git a/calendar-permissions/README.md b/calendar-permissions/README.md
index e128fcf41..0d4b26395 100644
--- a/calendar-permissions/README.md
+++ b/calendar-permissions/README.md
@@ -1,5 +1,5 @@
-## Calendar Permissions
-Adds a `CalendarPermission`. Register this permission by calling `PermissionsBuilder.registerCalendarPermission`.
+# Calendar Permissions
+Adds a `CalendarPermission` to `Permissions`. Register this permission by calling `PermissionsBuilder.registerCalendarPermission`()/`PermissionsBuilder.registerCalendarPermissionIfNotRegistered()`.
 
 ## Installing
 This library is available on Maven Central. You can import Kaluga Calendar Permissions as follows:
diff --git a/camera-permissions/README.md b/camera-permissions/README.md
index e4ccbe5ca..377adf402 100644
--- a/camera-permissions/README.md
+++ b/camera-permissions/README.md
@@ -1,5 +1,5 @@
-## Camera Permissions
-Adds a `CameraPermission`. Register this permission by calling `PermissionsBuilder.registerCameraPermission`.
+# Camera Permissions
+Adds a `CameraPermission` to `Permissions`. Register this permission by calling `PermissionsBuilder.registerCameraPermission`()/`PermissionsBuilder.registerCameraPermissionIfNotRegistered()`.
 
 ## Installing
 This library is available on Maven Central. You can import Kaluga Camera Permissions as follows:
@@ -16,4 +16,4 @@ This library is available on Maven Central. You can import Kaluga Camera Permiss
  }
  ```
 
-## Please check [general permissions documentation](../base-permissions) for full documentation
\ No newline at end of file
+## Please check [general permissions documentation](../base-permissions) for full documentation
diff --git a/contacts-permissions/README.md b/contacts-permissions/README.md
index be1408802..f85a61485 100644
--- a/contacts-permissions/README.md
+++ b/contacts-permissions/README.md
@@ -1,5 +1,5 @@
-## Contacts Permissions
-Adds a `ContactsPermission`. Register this permission by calling `PermissionsBuilder.registerContactsPermission`.
+# Contacts Permissions
+Adds a `ContactsPermission` to `Permissions`. Register this permission by calling `PermissionsBuilder.registerContactsPermission`()/`PermissionsBuilder.registerContactsPermissionIfNotRegistered()`.
 
 ## Installing
 This library is available on Maven Central. You can import Kaluga Contacts Permissions as follows:
@@ -16,4 +16,4 @@ This library is available on Maven Central. You can import Kaluga Contacts Permi
  }
  ```
 
-## Please check [general permissions documentation](../base-permissions) for full documentation
\ No newline at end of file
+## Please check [general permissions documentation](../base-permissions) for full documentation
diff --git a/date-time-picker/README.md b/date-time-picker/README.md
index 714cdc8f7..0f616a79c 100644
--- a/date-time-picker/README.md
+++ b/date-time-picker/README.md
@@ -18,16 +18,20 @@ dependencies {
 ```
 
 ## Usage
-
-Using DateTimePicker ts is very simple. You can show a date Picker from shared code like this:
+You can show a date Picker from shared code like this:
 
 ```kotlin
 // Shared code
-fun showAlert(builder: DateTimePickerPresenter.Builder) = MainScope().launch {
-    // Create an Alert with title, message and actions
-    val datePicker = builder.buildDatePicker(this) {
+fun showDatePicker(builder: DateTimePickerPresenter.Builder) = MainScope().launch {
+    // Create a Date Picker that allows a date to be picked between January 1st 1970 and the current date
+    val datePicker = builder.buildDatePicker(
+        this,
+        earliestDate = DefaultKalugaDate.epoch(),
+        latestDate = DefaultKalugaDate.now(),
+    ) {
         setConfirmButtonTitle("OK")
         setCancelButtonTitle("Cancel")
+        setSelectedDate(DefaultKalugaDate.now())
     }
 
     datePicker.show()?.let {
@@ -40,11 +44,12 @@ fun showAlert(builder: DateTimePickerPresenter.Builder) = MainScope().launch {
 And a Time Picker like this:
 ```kotlin
 // Shared code
-fun showAlert(builder: DateTimePickerPresenter.Builder) = MainScope().launch {
-    // Create an Alert with title, message and actions
+fun showTimePicker(builder: DateTimePickerPresenter.Builder) = MainScope().launch {
+    // Create a Time Picker
     val timePicker = builder.buildTimePicker(this) {
         setConfirmButtonTitle("OK")
         setCancelButtonTitle("Cancel")
+        setSelectedDate(DefaultKalugaDate.now())
     }
 
     timePicker.show()?.let {
@@ -60,14 +65,36 @@ The `DateTimePickerPresenter.Builder` class can be used to build Date and Time P
 The can be shown using either `suspend fun show(animated: Boolean = true): Date?` or `fun showAsync(animated: Boolean = true, completion: (Date?) -> Unit = {})`.
 Both methods for showing return the initial selectedDate passed through the builder, modified by the selected date, or null if the date selection was cancelled.
 
+### Build Date Picker
+To create `BaseDateTimePickerPresenter` that selects a Date, thread-safe, use.
+```
+buildDatePicker(coroutineScope: CoroutineScope, earliestDate: Date?, latestDate: Date?, initialize: DateTimePicker.Builder.() -> Unit): BaseDateTimePickerPresenter
+```
+
+Passing the earliest/latest Date will limit the range of dates to select.
+
+### Build Time Picker
+To create `BaseDateTimePickerPresenter` that selects a Time, thread-safe
+```
+buildTimePicker(coroutineScope: CoroutineScope, initialize: DateTimePicker.Builder.() -> Unit): BaseDateTimePickerPresenter
+```
+
+## Platform Specific Building
+The `DateTimePickerPresenter.Builder` object should be created from the platform side.
+
 ### Android
 On Android the builder is an `ActivityLifecycleSubscribable` (see Architecture) that needs an `ActivityLifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the date/time picker.
 For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
 
 ```kotlin
-class DatePickerViewModel: LifecycleViewModel() {
+class DatePickerViewModel: BaseLifecycleViewModel() {
 
     val builder = DateTimePickerPresenter.Builder()
+    
+    init {
+        addLifecycleSubscribables(builder)
+    }
+    
     fun show() {
             coroutineScope.launch {
                 val time = builder.buildTimePicker(this) {
@@ -92,7 +119,7 @@ class MyActivity: KalugaViewModelActivity<DatePickerViewModel>() {
  }
 ```
 
-For other usages, make sure to call `LifecycleSubscriber.subscribe` and `LifecycleSubscriber.unsubscribe` to manage the lifecycle manually.
+For other usages, make sure to call `ActivityLifecycleSubscribable.subscribe` and `ActivityLifecycleSubscribable.unsubscribe` to manage the lifecycle manually.
 
 ```kotlin
 // Android specific
@@ -105,8 +132,6 @@ MainScope().launch {
 }
 ```
 
-You can use the `AppCompatActivity.datePickerPresenterBuilder` convenience method to get a builder that is valid during the lifespan of the Activity it belongs to.
-
 The Date/Time Picker shown will use the default theme automatically. Pass the Theme Resource ID in the builder constructor to apply a custom theme.
 
 ### iOS
@@ -116,16 +141,8 @@ On iOS the builder should be passed the `UIViewController` responsible for displ
 let builder = DateTimePickerPresenter.Builder(viewController)
 ```
 
-### Build Date Picker
-To create `DateTimePickerPresenter` that selects a Date, thread-safe, use.
-```
-buildDatePicker(coroutineScope: CoroutineScope, earliestDate: Date?, latestDate: Date?, initialize: BaseDateTimePickerPresenter.Builder.() -> Unit): DateTimePickerPresenter
-```
+Since a `UIViewController` is required, for SwiftUI the `View` displaying the DateTimePicker should have a `UIViewControllerRepresentable` wrapping the `UIViewController` associated with the `DateTimePickerPresenter.Builder` attached.
+The [Kaluga SwiftUI scripts](https://github.com/splendo/kaluga-swiftui) provide a `ContainerView` that offers this functionality out of the box (if the `includeDatePicker` setting is set to `true`)
 
-Passing the earliest/latest Date will limit the range of dates to select.
-
-### Build Time Picker
-To create `DateTimePickerPresenter` that selects a Time, thread-safe
-```
-buildTimePicker(coroutineScope: CoroutineScope, initialize: BaseAlertPresenter.Builder.() -> Unit): DateTimePickerPresenter
-```
+## Testing
+Use the [`test-utils-date-time-picker` module](../test-utils-date-time-picker) to get a mockable DateTimePicker Presenter.
diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
index f861dfdc0..46b0561e2 160000
--- a/example/ios/Kaluga-SwiftUI
+++ b/example/ios/Kaluga-SwiftUI
@@ -1 +1 @@
-Subproject commit f861dfdc00af4aeaac22727dc74f953d4d990e43
+Subproject commit 46b0561e2195d43bcad4efb5c715096447692b84
diff --git a/hud/README.md b/hud/README.md
index 2719d5675..f6ea0f155 100644
--- a/hud/README.md
+++ b/hud/README.md
@@ -55,8 +55,13 @@ The `HUD` has methods to show and dismiss a loading indicator view:
 
 The `HUD.Builder` class can be used to build HUDs.
 
+- `build(coroutineScope: CoroutineScope, initialize: HudConfig.Builder.() -> Unit): BaseHUD` — builder to create `BaseHUD`, thread-safe
+- 
+## Platform Specific Building
+The `HUD.Builder` object should be created from the platform side.
+
 ### Android
-On Android the builder is an `ActivityLifecycleSubscribable` (see Architecture) that needs a `ActivityLifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the HUD.
+On Android the builder is an `ActivityLifecycleSubscribable` (see Architecture) that needs an `ActivityLifecycleSubscribable.LifecycleManager` object to provide the current context in which to display the HUD.
 For `BaseLifecycleViewModel`, the builder should be provided to `BaseLifecycleViewModel.activeLifecycleSubscribables` (using the constructor or `BaseLifecycleViewModel.addLifecycleSubscribables`) and bound to a `KalugaViewModelLifecycleObserver` or `ViewModelComposable`.
 
 ```kotlin
@@ -64,6 +69,10 @@ class HudViewModel: BaseLifecycleViewModel() {
 
     val builder = HUD.Builder()
 
+    init {
+        addLifecycleSubscribables(builder)
+    }
+
     fun present() {
         coroutineScope.launch {
             viewModel.builder.build(this) {
@@ -91,7 +100,7 @@ class MyActivity: KalugaViewModelActivity<HudViewModel>() {
 }
 ```
 
-For other usages, make sure to call `LifecycleSubscriber.subscribe` and `LifecycleSubscriber.unsubscribe` to manage the lifecycle manually.
+For other usages, make sure to call `ActivityLifecycleSubscribable.subscribe` and `ActivityLifecycleSubscribable.unsubscribe` to manage the lifecycle manually.
 
 ```kotlin
 // Android specific
@@ -104,8 +113,6 @@ MainScope().launch {
 }
 ```
 
-You can use the `AppCompatActivity.hudBuilder` convenience method to get a builder that is valid during the lifespan of the Activity it belongs to.
-
 Define your custom colors inside `colors.xml` if using `.CUSTOM` style:
 
 ```xml
@@ -126,6 +133,9 @@ On iOS this builder should be instantiated with `UIViewController`:
 let builder = HUD.Builder(viewController)
 ```
 
+Since a `UIViewController` is required, for SwiftUI the `View` displaying the HUD should have a `UIViewControllerRepresentable` wrapping the `UIViewController` associated with the `HUD.Builder` attached.
+The [Kaluga SwiftUI scripts](https://github.com/splendo/kaluga-swiftui) provide a `ContainerView` that offers this functionality out of the box (if the `includeHud` setting is set to `true`)
+
 Define your Color Sets in project's assets if using `.CUSTOM` style:
 
 - `li_colorBackground` for surface color
diff --git a/keyboard-compose/README.md b/keyboard-compose/README.md
index 98b6a31f1..c774163e7 100644
--- a/keyboard-compose/README.md
+++ b/keyboard-compose/README.md
@@ -1,4 +1,4 @@
-## Keyboard-compose
+# Keyboard Compose
 This Android library contains composable functions to work with Kaluga keyboard.
 
 ## Installing
@@ -23,8 +23,10 @@ Bind the ViewModel to your composable view using `ViewModelComposable`.
 
 To show the keyboard, add a `FocusRequester` to a view using
 ```kotlin
-modifier = Modifier
-    .focusRequester(focusRequester),
+TextField(
+    modifier = Modifier
+        .focusRequester(focusRequester)
+)
 ```
 
 And focus on it using `ComposeFocusHandler(focusRequester)`
diff --git a/keyboard/README.md b/keyboard/README.md
index ac4e22d62..7d319fb0e 100644
--- a/keyboard/README.md
+++ b/keyboard/README.md
@@ -72,7 +72,7 @@ class MyActivity: KalugaViewModelActivity<KeyboardViewModel>() {
 }
 ```
 
-For other usages, make sure to call `LifecycleSubscriber.subscribe` and `LifecycleSubscriber.unsubscribe` to manage the lifecycle manually.
+For other usages, make sure to call `ActivityLifecycleSubscribable.subscribe` and `ActivityLifecycleSubscribable.unsubscribe` to manage the lifecycle manually.
 
 ```kotlin
 // Android specific
@@ -86,26 +86,7 @@ MainScope().launch {
 You can use the `AppCompatActivity.keyboardManagerBuilder` convenience method to get a builder that is valid during the lifespan of the Activity it belongs to.
 
 ### Android compose-ui
-
-Use compose's implementation for `FocusHandler`.
-```kotlin
-
-@Composable
-fun SomeLayout() {
-    val focusHandler = ComposeFocusHandler(FocusRequester.Default)
-    TextField (
-        value = numberInput,
-        onValueChange = numberInputDelegate,
-        modifier = Modifier
-            .fillMaxWidth()
-            .focusRequester(FocusRequester.Default), // add this line to the TextField Modifier.
-    )
-    
-    Button( { viewModel.show(focusHandler) } ) {
-        Text("Button")
-    }
-}
-```
+Use the [`keyboard-compose` module](../keyboard-compose)
 
 ### iOS
 In iOS the builder is attached to a `UIApplication`. By default this will be ` UIApplication.sharedApplication`, but it can be overwritten by a custom Application. The `KeyboardHostingView` can be any `UIView` that `canBecomeFirstResponder`.
@@ -116,6 +97,43 @@ val customBuilder = KeyboardManagerBuilder(application)
 val keyboardHostingView = UITextField()
 ```
 
+For SwiftUI, the [Kaluga SwiftUI scripts](https://github.com/splendo/kaluga-swiftui) contain a `SwiftUIKeyboardManagerBuilder` if the `includeKeyboard` setting is set to true.
+Use it as follows:
+
+```swift
+struct SomeView: View {
+    
+    // Create a Hashable enum to identify fields to focus on
+    enum Field: String, Hashable {
+        case textField
+    }
+    
+    // Observe a SwiftUIKeyboardManagerBuilder
+    @ObservedObject var keyboardManagerBuilder: SwiftUIKeyboardManagerBuilder<Field>
+    
+    // Expose the current field with an @FocusState
+    @FocusState private var focusedField: Field?
+    
+    init {
+        keyboardManagerBuilder = SwiftUIKeyboardManagerBuilder<Field>()
+        // Provide keyboardManagerBuilder to shared code
+    }
+    
+    var body: some View {
+       // Create View and bind the keyboard manager
+       VStack{
+            TextField("", text: _text.projectedValue)
+                .focused($focusedField, equals: Field.textField)
+        }
+       .bindKeyboardManager(
+            keyboardManagerBuilder: keyboardManagerBuilder,
+            focusState: _focusedField.projectedValue
+        )
+    }
+}
+```
+
+Then create a `ValueFocusHandler` for `Field` using `swiftUIFocusHandler(value: Field.textField)`
+
 ## Testing
 Use the [`test-utils-keyboard` module](../test-utils-keyboard) to get a mockable `KeyboardManager`.
-
diff --git a/links/README.md b/links/README.md
index d330249c7..65e57d679 100644
--- a/links/README.md
+++ b/links/README.md
@@ -17,7 +17,7 @@ dependencies {
 }
 ```
 
-### Usage
+## Usage
 This library can be used to process an incoming URL into an object. This is useful when handling an App Link, Universal Link or Deep Link
 
 ```kotlin
@@ -39,7 +39,7 @@ data class Aliment(val name: String)
 data class Recipe(val name: String, val ingredients: List<Aliment>)
 
 // Somewhere in the code
-val ur = "https://kaluga.splendo.com/?name=Carbonara&size=3&ingredients=Spaghetti&ingredients=Bacon&ingredients=Egg"
+val url = "https://kaluga.splendo.com/?name=Carbonara&size=3&ingredients=Spaghetti&ingredients=Bacon&ingredients=Egg"
 
 ```
 
diff --git a/location-permissions/README.md b/location-permissions/README.md
index 39ca3fbff..b9cb250b7 100644
--- a/location-permissions/README.md
+++ b/location-permissions/README.md
@@ -1,5 +1,5 @@
-## Location Permissions
-Adds a `LocationPermission`. Register this permission by calling `PermissionsBuilder.registerLocationPermission`.
+# Location Permissions
+Adds a `LocationPermission` to `Permissions`. Register this permission by calling `PermissionsBuilder.registerLocationPermission`()/`PermissionsBuilder.registerLocationPermissionIfNotRegistered()`.
 
 The `LocationPermission` can be set to acquire location data more accurately or while the app is the background.
 
@@ -18,4 +18,4 @@ This library is available on Maven Central. You can import Kaluga Location Permi
  }
  ```
 
-## Please check [general permissions documentation](../base-permissions) for full documentation
\ No newline at end of file
+## Please check [general permissions documentation](../base-permissions) for full documentation
diff --git a/location/README.md b/location/README.md
index 68b80116a..fb0a2281e 100644
--- a/location/README.md
+++ b/location/README.md
@@ -1,4 +1,4 @@
-## Location
+# Location
 
 This library allows you to receive user's location.
 
@@ -17,7 +17,7 @@ dependencies {
 }
 ```
 
-### Usage
+## Usage
 The `LocationState` is available through a `LocationStateRepo` that will automatically detect whether the user has given permission to access Location and has Location enabled.
 Each `LocationState` contains either a `KnownLocation` or an `UnknownLocation`.
 
@@ -36,7 +36,10 @@ locationStateRepo.flow().location().collect { location ->
 ```
 
 ### Android Specific Usage
-Android handles fetching the location differently depending on how `Permission.Location.background` is set. If `false`, the location service is optimised for use in the foreground, but may not work when called from a `Service` class. If set to `true` however, the request is optimised for usage in a `Service`. Like with any Location service on Android, the `Service` should call `startForeground()` to function properly.
+Android handles fetching the location differently depending on how `Permission.Location.background` is set.
+If `false`, the location service is optimised for use in the foreground, but may not work when called from a `Service` class.
+If set to `true` however, the request is optimised for usage in a `Service`.
+Like with any Location service on Android, the `Service` should call `startForeground()` to function properly.
 
 ## Testing
 Use the [`test-utils-location` module](../test-utils-location) to get a mockable `LocationManager`, `LocationMonitor`, or `LocationStateRepo`.
diff --git a/logging/README.md b/logging/README.md
index 670a096a0..edb8b57de 100644
--- a/logging/README.md
+++ b/logging/README.md
@@ -17,17 +17,15 @@ dependencies {
 }
 ```
 
-### How to
+## Usage
+Logging is done using a `Logger`. By default Kaluga provides an application wide logger via `com.splendo.kaluga.logging.logger`. When logging directly, this `Logger` is used.
+Create a custom `Logger` to get more control over what logging occurs.
 
-#### Initialization
+This library includes a `defaultLogger`, `NappierLogger`, and a `RestrictedLogger`. The latter supports restricting logging to specific `LogLevel`.
 
-*Optionally* call `initLogger(logger: Logger): Logger` with instance of `Logger`. 
+### Logging
 
-If you need to get logger that was used for initialisation, then you can call `logger(): Logger`
-
-#### Usage
-
-Here's a list of functions available for usage:
+Here's a list of functions available for usage. These can be called either directly or on on a `Logger`. When called directly the platform logger will be used. 
 
 * `debug(message)` \\ `debug(tag, message)` \\ `debug(exception)` \\ `debug(tag, exception)` \\ `debug(tag, () -> String)`
 * `info(message)` \\ `info(tag, message)` \\ `info(exception)` \\ `info(tag, exception)` \\ `info(tag, () -> String)`
@@ -35,9 +33,9 @@ Here's a list of functions available for usage:
 * `warn(message)` \\ `warn(tag, message)` \\ `warn(exception)` \\ `warn(tag, exception)` \\ `warn(tag, () -> String)`
 * `log(level, message)` \\ `log(level, tag, message)` \\`log(level, tag, () -> String)`
 
-##### Message or `()->String`?
+#### Message or `()->String`?
 
-In case of string template usage consider using `()->String`. If logging call will be filtered out, then function providing message will not be called, there for string will not be evaluated. For example:
+In case of string template usage consider using `() -> String`. If logging call will be filtered out, then function providing message will not be called, there for string will not be evaluated. For example:
 
 ```debug("This is a string with evaluation ${iterator.concatenate().allTheItems()}")``` - this will evaluate call and create the string before calling `debug()``.
 
diff --git a/microphone-permissions/README.md b/microphone-permissions/README.md
index 898f83304..99c85097a 100644
--- a/microphone-permissions/README.md
+++ b/microphone-permissions/README.md
@@ -1,5 +1,5 @@
-## Microphone Permissions
-Adds a `MicrophonePermission`. Register this permission by calling `PermissionsBuilder.registerMicrophonePermission`.
+# Microphone Permissions
+Adds a `MicrophonePermission` to `Permissions`. Register this permission by calling `PermissionsBuilder.registerMicrophonePermission`()/`PermissionsBuilder.registerMicrophonePermissionIfNotRegistered()`.
 
 ## Installing
 This library is available on Maven Central. You can import Kaluga Microphone Permissions as follows:
@@ -16,4 +16,4 @@ This library is available on Maven Central. You can import Kaluga Microphone Per
  }
  ```
 
-## Please check [general permissions documentation](../base-permissions) for full documentation
\ No newline at end of file
+## Please check [general permissions documentation](../base-permissions) for full documentation
diff --git a/notifications-permissions/README.md b/notifications-permissions/README.md
index 615bcff95..d39c1eb06 100644
--- a/notifications-permissions/README.md
+++ b/notifications-permissions/README.md
@@ -1,5 +1,5 @@
-## Notifications Permissions
-Adds a `NotificationsPermission`. Register this permission by calling `PermissionsBuilder.registerNotificationsPermission`.
+# Notifications Permissions
+Adds a `NotificationsPermission` to `Permissions`. Register this permission by calling `PermissionsBuilder.registerNotificationsPermission`()/`PermissionsBuilder.registerNotificationsPermissionIfNotRegistered()`.
 
 On Android this permission will be granted automatically for devices running API 32 or lower.
 
@@ -18,4 +18,4 @@ This library is available on Maven Central. You can import Kaluga Notifications
  }
  ```
 
-## Please check [general permissions documentation](../base-permissions) for full documentation
\ No newline at end of file
+## Please check [general permissions documentation](../base-permissions) for full documentation
diff --git a/permissions/README.md b/permissions/README.md
index c274cc612..657116717 100644
--- a/permissions/README.md
+++ b/permissions/README.md
@@ -1,6 +1,21 @@
-## Permissions
-Adds all supported permissions. Register permissions using `PermissionBuilder.registerAllPermissions()`
+# Permissions
+Adds all supported permissions. Register permissions using `PermissionBuilder.registerAllPermissions()`/`PermissonBuilder.registerAllPermissionsNotRegistered()`
 
 NOTE: This will add all permissions to the Manifest/Info.plist of the app. Usage is not recommended for production apps.
 
-## Please check [general permissions documentation](../base-permissions) for full documentation
\ No newline at end of file
+## Installing
+This library is available on Maven Central. You can import Kaluga Permissions as follows:
+
+ ```kotlin
+ repositories {
+     // ...
+     mavenCentral()
+ }
+ // ...
+ dependencies {
+     // ...
+     implementation("com.splendo.kaluga:permissions:$kalugaVersion")
+ }
+ ```
+
+## Please check [general permissions documentation](../base-permissions) for full documentation
diff --git a/resources-compose/README.md b/resources-compose/README.md
index e0c25c8a0..18b55f064 100644
--- a/resources-compose/README.md
+++ b/resources-compose/README.md
@@ -1,8 +1,27 @@
-# Resources-compose
+# Resources Compose
 Compose extensions for [Resources](../resources)
 
-## Color
-Convert a Kaluga `Color` to a composable color using `Color.composable()`
+## Installing
+This library is available on Maven Central. You can import Kaluga Resources Compose as follows:
+
+```kotlin
+repositories {
+    // ...
+    mavenCentral()
+}
+// ...
+dependencies {
+    // ...
+    implementation("com.splendo.kaluga:resources-compose:$kalugaVersion")
+}
+```
+
+## KalugaColor
+Convert a `KalugaColor` to a composable color using `KalugaColor.composable`
+
+## KalugaImage
+Convert a `KalugaImage` to a composable image using `KalugaImage.Composable(String?, Modifier, Alignment, ContentScale, Float, ColorFilter?)`
+Convert a `TintedImage` to a composable image using `TintedImage.Composable(String?, Modifier, Alignment, ContentScale, Float)`
 
 ## KalugaLabel
 To use a `KalugaLabel` in compose, simply call `KalugaLabel.Composable(Modifier)` in your UI code.
diff --git a/resources-databinding/README.md b/resources-databinding/README.md
index 88edfda23..bdaf6cef8 100644
--- a/resources-databinding/README.md
+++ b/resources-databinding/README.md
@@ -1,12 +1,27 @@
-# Resources-compose
+# Resources Data Binding
 [Android Data Binding](https://developer.android.com/topic/libraries/data-binding) extensions for [Resources](../resources)
 
 This module requires the Android project using it declaring the [Kapt plugin](https://kotlinlang.org/docs/kapt.html).
 
-## KalugaLabel ad TextStyle
+## Installing
+This library is available on Maven Central. You can import Kaluga Resources Data Binding as follows:
+
+```kotlin
+repositories {
+    // ...
+    mavenCentral()
+}
+// ...
+dependencies {
+    // ...
+    implementation("com.splendo.kaluga:resources-databinding:$kalugaVersion")
+}
+```
+
+## KalugaLabel ad KalugaTextStyle
 Use `app:kalugaLabel` to bind a `KalugaLabel` to a `TextView`.
 
-`TextStyle` can be applied using `app:textStyle` as well. To support autosize text, use
+`KalugaTextStyle` can be applied using `app:textStyle` as well. To support autosize text, use
 
 ```
 app:autoTextStyle=textStyle
@@ -19,5 +34,6 @@ Use `app:backgroundStyle` to bind a `KalugaBackgroundStyle` to a `View`
 ## KalugaButton
 Use `app:kalugaButton` to bind a `KalugaButton` to a `Button`
 
-## Image
-Use `app:image` to bind an `Image` to an `ImageView` 
+## KalugaImage
+Use `app:image` to bind a `KalugaImage` to an `ImageView`
+Use `app:tintedImage` to bind a `TintedImage` to an `ImageView` 
diff --git a/resources/README.md b/resources/README.md
index 3a8e39fce..783c23763 100644
--- a/resources/README.md
+++ b/resources/README.md
@@ -1,4 +1,4 @@
-## Resources
+# Resources
 This Resource Library for Kaluga contains methods for loading various resources from the platform.
 Resources are grabbed using a `String` key associated with a resource type.
 Making these resources available on the platform is the responsibility of the platform.
@@ -18,45 +18,67 @@ dependencies {
 }
 ```
 
-## Usage
+## Resources
 
 ### String
 You can treat any `String` as a key to a localized `String` value.
 By default, this loads the String in the `Localizable.strings` (iOS) or `strings.xml` (Android) files declared in the main project scope.
 A `StringLoader` class is provided to overwrite this behaviour.
 
-### Color
-The `Color` class is associated with `UIColor` (iOS) and `@ColorRes Int` (Android).
-You can treat any `String` as a key to a `Color` value.
+### StyledString
+Strings can be styled with `StringStyleAttribute` using the `styled` methods. This requires a platform specific `StyledStringBuilder.Provider`
+
+```kotlin
+val styledStringBuilderProvider: StyledStringBuilder.Provider // provide from platform
+val styledString = "Partial Styled text".styled(
+    styledStringBuilderProvider,
+    defaultTextStyle,
+    { Pair(StringStyleAttribute.CharacterStyleAttribute.TextStyle(TextStyle(defaultFont, DefaultColors.red, 12.0f)), IntRange(0, 13)) }
+)
+```
+
+### KalugaColor
+The `KalugaColor` class is associated with `UIColor` (iOS) and `@ColorRes Int` (Android).
+You can treat any `String` as a key to a `KalugaColor` value.
 By default, this loads the Color in the `Color Assets` (iOS) or `color.xml` (Android) files declared in the main project scope.
-A `ColorLoader` class is provided to overwrite this behaviour.
+A `KalugaColorLoader` class is provided to overwrite this behaviour.
 
 Default web colors are available through `DefaultColors`
 
 Colors can also be modified easily. Blend colors by using blend methods such as `backdropColor burn sourceColor ` or change their luminance using `darkenBy` or `lightenBy`. Use `hsl` to get a `HSLColor` instance of the color.
 
-### Image
-The `Image` class is associated with `UIImage` (iOS) and `Drawable` (Android).
-You can treat any `String` as a key to a `Image` value.
+### KalugaImage
+The `KalugaImage` class is associated with `UIImage` (iOS) and `Drawable` (Android).
+You can treat any `String` as a key to a `KalugaImage` value.
 By default, this loads the Image with the corresponding name declared in the main project scope.
 An `ImageLoader` class is provided to overwrite this behaviour.
 
-### Font
-The `Font` class is associated with `UIFont` (iOS) and `Typeface` (Android).
-You can treat any `String` as a key to a `Font` value.
+#### TintedImage
+Create a `TintedImage` from a `KalugaImage` and a `KalugaColor` using `KalugaImage.tinted(color)`.
+To get a platform specific image:
+
+- On Android call `TintedImage.drawable`. For compose use the [Resources Compose library](../resources-compose)
+- On iOS, create a UIImage using `TintedImage.uiImage`
+> UIImage cannot be Tinted on SwiftUI. To use TintedImage from a SwiftUI View, import the [Kaluga SwiftUI scripts](https://github.com/splendo/kaluga-swiftui) with the `includeResources` setting and call `TintedImage.swiftUI`/`TintedImage.resizableSwiftUI`
+
+### KalugaFont
+The `KalugaFont` class is associated with `UIFont` (iOS) and `Typeface` (Android).
+You can treat any `String` as a key to a `KalugaFont` value.
 By default, this loads the Font with the same name on iOS and the font resource declared in `font.xml` on Android, as declared in the main project scope.
 A `FontLoader` class is provided to overwrite this behaviour.
 
 Unlike the other resources, Font loading may be suspended.
 
-### KalugaLabel and TextStyle
+## Styling
+
+### KalugaLabel and KalugaTextStyle
 Create a text style with custom font, size and color to share style texts across applications:
 
 ```kotlin
-val defaultTextStyle = TextStyle(defaultFont, DefaultColors.dimGray, 12.0f)
+val defaultTextStyle = KalugaTextStyle(defaultFont, DefaultColors.dimGray, 12.0f)
 ```
 
-TextStyles can be used to create a `KalugaLabel` that can easily be converted to platform specific labels. In addition to a `KalugaLabel.Plain` you cna also create styled labels using `KalugaLabel.Styled`.
+KalugaTextStyles can be used to create a `KalugaLabel` that can easily be converted to platform specific labels. In addition to a `KalugaLabel.Plain` you cna also create styled labels using `KalugaLabel.Styled`.
 The latter requires a `StyledStringBuilder.Provider`.
 
 ```kotlin
@@ -105,14 +127,14 @@ Apply a `KalugaBackgroundStyle` to any `View` using `View.applyBackgroundStyle(b
 
 Apply a `KalugaBackgroundStyle` to any `UIView` using `UIView.applyBackgroundStyle(backgroundStyle)` or to a `CALayer` using `CALayer.applyBackgroundStyle(backgroundStyle, bounds)`
 
-### KalugaButton and ButtonStyle
-Like `TextStyle` for a Label, a `ButtonStyle` can be created for a button.
+### KalugaButton and KalugaButtonStyle
+Like `KalugaTextStyle` for a Label, a `KalugaButtonStyle` can be created for a button.
 
-A `ButtonStyle` takes a font, textSize, text alignment and a `ButtonStateStyle` for its default, pressed, and disabled states.
+A `KalugaButtonStyle` takes a font, textSize, text alignment and a `ButtonStateStyle` for its default, pressed, and disabled states.
 The `ButtonStateStyle` consists of a text color and a `KalugaBackgroundStyle` describing the background of the button.
 
 ```kotlin
-ButtonStyle(
+KalugaButtonStyle(
     defaultFont,
     12.0f,
     defaultStyle = ButtonStateStyle(DefaultColors.white, DefaultColors.deepSkyBlue, KalugaBackgroundStyle.Shape.Rectangle(10.0f, setOf(KalugaBackgroundStyle.Shape.Rectangle.Corner.TOP_LEFT, KalugaBackgroundStyle.Shape.Rectangle.Corner.BOTTOM_LEFT))),
@@ -124,14 +146,14 @@ ButtonStyle(
 Convenience methods exist to create plain colored buttons or even just textButtons
 
 ```
-val redBackgroundButtonStyle = ButtonStyle(
+val redBackgroundButtonStyle = KalugaButtonStyle(
     defaultTextStyle,
     backgroundColor = DefaultColors.red,
     pressedBackgroundColor = DefaultColors.maroon,
     disabledBackgroundColor = DefaultColors.lightGray
 )
 
-val defaultButtonStyle = ButtonStyle(defaultTextStyle)
+val defaultButtonStyle = KalugaButtonStyle(defaultTextStyle)
 ```
 
 Like `KalugaLabel` a `KalugaButton` exists to support converting to platform specific UI. Similar to the label a `KalugaButton` can be either `Plain` or `Styled` and takes a closure to determine its action
@@ -155,10 +177,13 @@ KalugaButton.Styled(
 *For compose use the [Resources Compose library](../resources-compose)*
 
 Bind a `KalugaButton` to a `Button` by using `Button.bindButton(kalugaButton)`
-It is also possible to apply a `ButtonStyle` using `Button.applyButtonStyle(style)`. This method also allows you to pass a `RippleStyle` to modify the ripple behaviour.
+It is also possible to apply a `KalugaButtonStyle` using `Button.applyButtonStyle(style)`. This method also allows you to pass a `RippleStyle` to modify the ripple behaviour.
 
 #### iOS
 *For SwiftUI see [Kaluga SwiftUI](https://github.com/splendo/kaluga-swiftui)*
 
 Bind a `KalugaButton` to a `UIButton` by using `UIButton.bindButton(kalugaButton)`
 It is also possible to apply a `ButtonStyle` using `UIButton.applyStyle(style)`
+
+## Testing
+Use the [`test-utils-resources` module](../test-utils-resources) to get mockable Resources.
diff --git a/review/README.md b/review/README.md
index d144450e7..8b5382ece 100644
--- a/review/README.md
+++ b/review/README.md
@@ -1,4 +1,4 @@
-## Review
+# Review
 This Library for Kaluga contains methods for requesting the user to review the app.
 Both Android and iOS will limit the amount of times this dialog is actually shown.
 As such, this library will only guarantee that an attempt will be made to show the request review dialog.
@@ -67,7 +67,7 @@ class MyActivity: KalugaViewModelActivity<ReviewViewModel>() {
 }
 ```
 
-For other usages, make sure to call `LifecycleSubscriber.subscribe` and `LifecycleSubscriber.unsubscribe` to manage the lifecycle manually.
+For other usages, make sure to call `ActivityLifecycleSubscribable.subscribe` and `ActivityLifecycleSubscribable.unsubscribe` to manage the lifecycle manually.
 
 ```kotlin
 // Android specific
@@ -78,8 +78,6 @@ MainScope().launch {
 }
 ```
 
-You can use the `AppCompatActivity.reviewManager()` convenience method to get a builder that is valid during the lifespan of the Activity it belongs to.
-
 ### iOS
 On iOS simply create the builder
 
diff --git a/scientific/README.md b/scientific/README.md
index 442975b8c..e22a855ad 100644
--- a/scientific/README.md
+++ b/scientific/README.md
@@ -1,4 +1,4 @@
-## Scientific
+# Scientific
 This Scientific Library for Kaluga contains methods for converting values to and from different scientific units.
 
 ## Installing
@@ -131,5 +131,4 @@ ScientificArray can be modied using some methods:
   val listOfDefaultBPM = bpmArray.split()
   val listOfHeartRate = heartRateArray.split(::HeartRateValue)
   ```
-
   
\ No newline at end of file
diff --git a/service/README.md b/service/README.md
index da595ade7..ea82160ee 100644
--- a/service/README.md
+++ b/service/README.md
@@ -1,4 +1,4 @@
-## Service
+# Service
 Basic utilities for adding new services to Kaluga. Services are platform features that can be enabled/disabled by the user or OS.
 
 ## Installing
diff --git a/storage-permissions/README.md b/storage-permissions/README.md
index fba959112..5e60ddf59 100644
--- a/storage-permissions/README.md
+++ b/storage-permissions/README.md
@@ -1,5 +1,5 @@
-## Storage Permissions
-Adds a `StoragePermission`. Register this permission by calling `PermissionsBuilder.registerStoragePermission`.
+# Storage Permissions
+Adds a `StoragePermission` to `Permissions`. Register this permission by calling `PermissionsBuilder.registerStoragePermission()`/`PermissionsBuilder.registerStoragePermissionIfNotRegistered()`.
 
 ## Installing
 This library is available on Maven Central. You can import Kaluga Storage Permissions as follows:
@@ -16,4 +16,4 @@ This library is available on Maven Central. You can import Kaluga Storage Permis
  }
  ```
 
-## Please check [general permissions documentation](../base-permissions) for full documentation
\ No newline at end of file
+## Please check [general permissions documentation](../base-permissions) for full documentation
diff --git a/system/README.md b/system/README.md
index 84cff8fe6..903b24bcb 100644
--- a/system/README.md
+++ b/system/README.md
@@ -1,4 +1,3 @@
-
 # System
 
 This module aim to cover system APIs such as network, audio, battery etc...
@@ -68,3 +67,6 @@ fun bar(networkStateRepoBuilder: NetworkStateRepoBuilder) {
 	}
 }
 ```
+
+## Testing
+Use the [`test-utils-system` module](../test-utils-system) to get mockable System classes.
diff --git a/test-utils-architecture/README.md b/test-utils-architecture/README.md
index c039c042e..6a6082b56 100644
--- a/test-utils-architecture/README.md
+++ b/test-utils-architecture/README.md
@@ -1,5 +1,4 @@
 # Test Utils Architecture
-
 This library adds support for testing the [`architecture` module](../architecture) to [`test-utils`](../test-utils-base)
 
 ## Installing
@@ -19,7 +18,7 @@ dependencies {
 
 ## Testing a ViewModel when testing from the background
 
-It's also possible use the UI Thread context to create a kaluga ViewModel. 
+It's also possible use the UI Thread context to create a Kaluga ViewModel. 
 This can be done by extending `BaseUIThreadViewModelTest` or `UIThreadViewModelTest`.
 
 ```kotlin
diff --git a/test-utils-base/README.md b/test-utils-base/README.md
index 1b274e70a..383e21ccd 100644
--- a/test-utils-base/README.md
+++ b/test-utils-base/README.md
@@ -1,4 +1,6 @@
 # Test Utils Base
+This library adds support for testing the [`base` module](../base) and provides functionality for testing on threads.
+The library contains support for mocking methods.
 
 ## Installing
 This library is available on Maven Central. You can import Kaluga Test Utils Base as follows:
diff --git a/test-utils-koin/README.md b/test-utils-koin/README.md
index 4dc6b5b46..86299f5a4 100644
--- a/test-utils-koin/README.md
+++ b/test-utils-koin/README.md
@@ -61,4 +61,3 @@ override val viewModel by lazy { MyViewModel(myArgs) }
 ## Testing flows
 
 `BaseKoinFlowTest` or `KoinFlowTest` can be used to test Flows in a cross thread manner while maintaining access to Koin.
-
diff --git a/test-utils-resources/README.md b/test-utils-resources/README.md
index 636fc6add..30b16e486 100644
--- a/test-utils-resources/README.md
+++ b/test-utils-resources/README.md
@@ -20,4 +20,4 @@ dependencies {
 ## Mocks
 This library contains mock classes for `StringLoader`, `FontLoader`, `KalugaColorLoader` and `ImageLoader`.
 
-Call `mockColor`, `mockFont`, or `mockImage` to generate mocks for `KalugaColor`, `Font`, or `Image` respectively.
+Call `mockColor`, `mockFont`, or `mockImage` to generate mocks for `KalugaColor`, `KalugaFont`, or `KalugaImage` respectively.
diff --git a/test-utils-service/README.md b/test-utils-service/README.md
new file mode 100644
index 000000000..24604f519
--- /dev/null
+++ b/test-utils-service/README.md
@@ -0,0 +1,21 @@
+# Test Utils System
+
+This library adds support for testing the [`service` module](../service) to [`test-utils`](../test-utils-base)
+
+## Installing
+This library is available on Maven Central. You can import Kaluga Test Utils Resources as follows:
+
+```kotlin
+repositories {
+    // ...
+    mavenCentral()
+}
+// ...
+dependencies {
+    // ...
+    implementation("com.splendo.kaluga:test-utils-service:$kalugaVersion")
+}
+```
+
+## Mocks
+This library contains mock classes for `ServiceMonitor`
diff --git a/test-utils-system/README.md b/test-utils-system/README.md
new file mode 100644
index 000000000..35137a9e4
--- /dev/null
+++ b/test-utils-system/README.md
@@ -0,0 +1,21 @@
+# Test Utils System
+
+This library adds support for testing the [`system` module](../system) to [`test-utils`](../test-utils-base)
+
+## Installing
+This library is available on Maven Central. You can import Kaluga Test Utils Resources as follows:
+
+```kotlin
+repositories {
+    // ...
+    mavenCentral()
+}
+// ...
+dependencies {
+    // ...
+    implementation("com.splendo.kaluga:test-utils-system:$kalugaVersion")
+}
+```
+
+## Mocks
+This library contains mock classes for `NetworkManager`, and `BaseNetworkStateRepoBuilder`

From 2acf0190ec8ccdc7d604636826899d5eef76ae4e Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 24 Feb 2023 10:35:20 +0100
Subject: [PATCH 218/227] Fixed issues with Compose navigation for optional
 arguments&empty string

---
 .../compose/navigation/NavGraphBuilder.kt      |  2 +-
 .../architecture/compose/navigation/Route.kt   | 18 ++++++++++++------
 .../kotlin/navigation/NavigationBundleSpec.kt  |  2 +-
 .../architecture/compose/ArchitectureLayout.kt |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt
index 7b6c4ac3c..826e42101 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavGraphBuilder.kt
@@ -76,7 +76,7 @@ fun <SpecType : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecType>>
     composable(
         route(actionClass, spec),
         arguments = spec.rows.mapNotNull {
-            if (it.associatedType is NavigationBundleSpecType.OptionalType<*>) {
+            if (!it.associatedType.isRequired) {
                 navArgument(it.argumentKey) { nullable = true }
             } else {
                 null
diff --git a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
index bb0ae8247..55fd3dfa5 100644
--- a/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
+++ b/architecture-compose/src/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/Route.kt
@@ -73,8 +73,7 @@ fun <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> r
         val key = row.argumentKey
         when (row.associatedType) {
             is NavigationBundleSpecType.UnitType -> null
-            is NavigationBundleSpecType.OptionalType<*> -> RouteArgument(key, "{$key}", false)
-            else -> RouteArgument(key, "{$key}", true)
+            else -> RouteArgument(key, "{$key}", row.associatedType.isRequired)
         }
     }
     return route(actionClass, *arguments.toTypedArray())
@@ -91,21 +90,21 @@ fun <SpecRow : NavigationBundleSpecRow<*>> NavigationAction<SpecRow>.route(): St
             RouteArgument(
                 row.argumentKey,
                 it,
-                value !is NavigationBundleValue.OptionalValue
+                row.associatedType.isRequired
             )
         }
     } ?: emptyList()
     return route(this::class, *arguments.toTypedArray())
 }
 
-private data class RouteArgument(val key: String, val value: String, val isOptional: Boolean)
+private data class RouteArgument(val key: String, val value: String, val isRequired: Boolean)
 
 private fun route(
     navigationActionClass: KClass<out NavigationAction<*>>,
     vararg arguments: RouteArgument
 ): String {
     val allArguments = arguments.toList()
-        .groupBy(keySelector = { it.isOptional }, valueTransform = { it.key to it.value })
+        .groupBy(keySelector = { it.isRequired }, valueTransform = { it.key to it.value })
     val requiredArguments = allArguments[true] ?: emptyList()
     val optionalArguments = allArguments[false] ?: emptyList()
     val baseRoute = navigationActionClass.simpleName!!
@@ -115,7 +114,7 @@ private fun route(
         ?.joinToString(
             "&",
             prefix = "$routeWithRequiredArguments?"
-        ) { "${it.first}={${it.second}}" }
+        ) { "${it.first}=${it.second}" }
         ?: routeWithRequiredArguments
 }
 
@@ -368,3 +367,10 @@ val <SpecRow : NavigationBundleSpecRow<*>, Action : NavigationAction<SpecRow>> A
     get() = Route.Back(
         bundle?.let { Route.Result.Data(it) } ?: Route.Result.Empty
     )
+
+internal val <T> NavigationBundleSpecType<T>.isRequired: Boolean get() = when (this) {
+    is NavigationBundleSpecType.CharSequenceType,
+    is NavigationBundleSpecType.OptionalType<*>,
+    is NavigationBundleSpecType.StringType -> false
+    else -> true
+}
diff --git a/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt b/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
index 453599515..88d2fde42 100644
--- a/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
+++ b/architecture/src/commonMain/kotlin/navigation/NavigationBundleSpec.kt
@@ -292,7 +292,7 @@ sealed class NavigationBundleSpecType<T> {
     }
 
     /**
-     * A [NonNullableNavigationBundleSpecType] that represents a List of[KalugaDate]
+     * A [NonNullableNavigationBundleSpecType] that represents a List of [KalugaDate]
      */
     object DateArrayType : NonNullableNavigationBundleSpecType<List<KalugaDate>>() {
         override fun convertValue(value: List<KalugaDate>): NavigationBundleValue.DateArrayValue {
diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
index 50d11507a..cab8ef1f9 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
@@ -94,7 +94,7 @@ fun ArchitectureLayout() {
                     ),
                     contentBuilder = { bottomSheetNavigationState ->
                         composable<InputDetails, ArchitectureNavigationAction.Details>(
-                            type = NavigationBundleSpecType.SerializedType(InputDetails.serializer())
+                            InputDetails.serializer()
                         ) { inputDetails ->
                             ArchitectureDetailsLayout(inputDetails, bottomSheetNavigationState)
                         }

From 9e90a1f8acd4234bbadf76913a8719a288e9c202 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 24 Feb 2023 10:45:58 +0100
Subject: [PATCH 219/227] PR remarks

---
 bluetooth/README.md        | 1 +
 date-time-picker/README.md | 6 ++++--
 date-time/README.md        | 1 +
 location/README.md         | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bluetooth/README.md b/bluetooth/README.md
index 9f74d41cb..aa48b5df5 100644
--- a/bluetooth/README.md
+++ b/bluetooth/README.md
@@ -28,6 +28,7 @@ launch {
 ///
 bluetooth.stopScanning()
 ```
+
 Bluetooth Scanning is managed by a state machine that will keep running as long as it is observed. It will automatically handle Permissions and Enabling/Disabling bluetooth on the device, although this behaviour can be disabled via the `BluetoothBuilder`
 Devices are returned as a flow of `Device` objects, which manages the connection state of each device.
 
diff --git a/date-time-picker/README.md b/date-time-picker/README.md
index 0f616a79c..755fb9172 100644
--- a/date-time-picker/README.md
+++ b/date-time-picker/README.md
@@ -67,7 +67,8 @@ Both methods for showing return the initial selectedDate passed through the buil
 
 ### Build Date Picker
 To create `BaseDateTimePickerPresenter` that selects a Date, thread-safe, use.
-```
+
+```kotlin
 buildDatePicker(coroutineScope: CoroutineScope, earliestDate: Date?, latestDate: Date?, initialize: DateTimePicker.Builder.() -> Unit): BaseDateTimePickerPresenter
 ```
 
@@ -75,7 +76,8 @@ Passing the earliest/latest Date will limit the range of dates to select.
 
 ### Build Time Picker
 To create `BaseDateTimePickerPresenter` that selects a Time, thread-safe
-```
+
+```kotlin
 buildTimePicker(coroutineScope: CoroutineScope, initialize: DateTimePicker.Builder.() -> Unit): BaseDateTimePickerPresenter
 ```
 
diff --git a/date-time/README.md b/date-time/README.md
index 9b8cf666e..4f7bdbac6 100644
--- a/date-time/README.md
+++ b/date-time/README.md
@@ -49,6 +49,7 @@ A running timer automatically changes to a [Finished] state once [duration] elap
 The elapsed time is always within [0, duration] range and equal to [duration] in [Finished] state. 
 
 So the output might look the following way:
+
 ```kotlin
 12 ms  // an initial "warm up delay" 
 1001 ms // overshoot by 1 ms
diff --git a/location/README.md b/location/README.md
index fb0a2281e..112ad502d 100644
--- a/location/README.md
+++ b/location/README.md
@@ -28,6 +28,7 @@ The `Permission.Location` provided to the `LocationStateRepo` will determine the
 By default the user will be automatically prompted to consent to the required `Permissions` and to enable location services. This can be disabled by setting `autoRequestPermission=false` and `autoEnableLocations=false` respectively.
 
 Sample code:
+
 ```kotlin
 val locationStateRepo = LocationStateRepoBuilder().create(Permissions.Location(background=false, precise=true))
 locationStateRepo.flow().location().collect { location ->

From 918f99aadbdbca51509ca98c0341476ecaedb4a9 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 24 Feb 2023 10:49:49 +0100
Subject: [PATCH 220/227] Fixed test

---
 .../com/splendo/kaluga/architecture/compose/RouteTests.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt b/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
index 7c0c1f4bc..ccb50bb38 100644
--- a/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
+++ b/architecture-compose/src/test/kotlin/com/splendo/kaluga/architecture/compose/RouteTests.kt
@@ -89,6 +89,6 @@ class RouteTests {
             }
         }
         val action = TestNavigationAction(bundle)
-        assertEquals("TestNavigationAction/string/true/0.5/{\"value\":\"Mock\"}/{\"value\":\"OptionalMock\"}/${KalugaDateFormatter.iso8601Pattern().format(time)}?OptionalString={optional}", action.route())
+        assertEquals("TestNavigationAction/true/0.5/{\"value\":\"Mock\"}/{\"value\":\"OptionalMock\"}/${KalugaDateFormatter.iso8601Pattern().format(time)}?StringSpecRow=string&OptionalString=optional", action.route())
     }
 }

From 09d37c9804ebb034bfa7c9a96e5720cf82c79a78 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 24 Feb 2023 10:54:30 +0100
Subject: [PATCH 221/227] Raise Android MinSdk to 23

---
 bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt | 6 +-----
 kaluga-library-components/src/main/kotlin/Library.kt        | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt b/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt
index 5711a007c..4ab17a0a0 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt
@@ -98,11 +98,7 @@ class DefaultDeviceWrapper(override val device: BluetoothDevice) : DeviceWrapper
         }
 
     override fun connectGatt(context: Context, autoConnect: Boolean, callback: BluetoothGattCallback): BluetoothGattWrapper {
-        val gatt = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            device.connectGatt(context, autoConnect, callback, BluetoothDevice.TRANSPORT_LE)
-        } else {
-            device.connectGatt(context, autoConnect, callback)
-        }
+        val gatt = device.connectGatt(context, autoConnect, callback, BluetoothDevice.TRANSPORT_LE)
         return DefaultBluetoothGattWrapper(gatt)
     }
 
diff --git a/kaluga-library-components/src/main/kotlin/Library.kt b/kaluga-library-components/src/main/kotlin/Library.kt
index 3f0f5ac83..64062b97a 100644
--- a/kaluga-library-components/src/main/kotlin/Library.kt
+++ b/kaluga-library-components/src/main/kotlin/Library.kt
@@ -54,7 +54,7 @@ class LibraryImpl(project: Project) {
     }
 
     object Android {
-        const val minSdk = 21
+        const val minSdk = 23
         const val compileSdk = 33
         const val targetSdk = 33
         const val buildTools = "33.0.1"

From 649e9f1b5ae4c7758e2c3b70ea30131035d2aa33 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 24 Feb 2023 14:32:58 +0100
Subject: [PATCH 222/227] Lint fix

---
 .../kaluga/example/architecture/compose/ArchitectureLayout.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
index cab8ef1f9..78bd2f4d6 100644
--- a/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
+++ b/example/android/src/main/java/com/splendo/kaluga/example/architecture/compose/ArchitectureLayout.kt
@@ -53,7 +53,6 @@ import com.splendo.kaluga.architecture.compose.navigation.route
 import com.splendo.kaluga.architecture.compose.state
 import com.splendo.kaluga.architecture.compose.viewModel.LocalAppCompatActivity
 import com.splendo.kaluga.architecture.compose.viewModel.ViewModelComposable
-import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.example.compose.Constants
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureNavigationAction
 import com.splendo.kaluga.example.shared.viewmodel.architecture.ArchitectureViewModel

From 0a44d029c164b42039df4862a70598fcc2aab9f5 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 24 Feb 2023 14:34:57 +0100
Subject: [PATCH 223/227] Lint fix

---
 bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt b/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt
index 4ab17a0a0..4278641c4 100644
--- a/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt
+++ b/bluetooth/src/androidLibMain/kotlin/device/DeviceWrapper.kt
@@ -21,7 +21,6 @@ import android.annotation.SuppressLint
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGattCallback
 import android.content.Context
-import android.os.Build
 
 /**
  * Accessor to the [BluetoothDevice]

From c3640672f79730771d7f66b29b811f9c22013af6 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Fri, 24 Feb 2023 19:36:13 +0100
Subject: [PATCH 224/227] Fixed Architecure test

---
 .../kotlin/navigation/AndroidNavigationBundleTest.kt       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/architecture/src/androidLibInstrumentedTest/kotlin/navigation/AndroidNavigationBundleTest.kt b/architecture/src/androidLibInstrumentedTest/kotlin/navigation/AndroidNavigationBundleTest.kt
index 1e79e146b..ea0ee3f1b 100644
--- a/architecture/src/androidLibInstrumentedTest/kotlin/navigation/AndroidNavigationBundleTest.kt
+++ b/architecture/src/androidLibInstrumentedTest/kotlin/navigation/AndroidNavigationBundleTest.kt
@@ -22,6 +22,7 @@ import com.splendo.kaluga.base.utils.DefaultKalugaDate
 import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
+import kotlin.time.Duration.Companion.milliseconds
 
 class AndroidNavigationBundleTest {
 
@@ -38,10 +39,10 @@ class AndroidNavigationBundleTest {
         }
         val optionalString: String? = "Some String"
         val optionalFloat: Float? = null
-        val dateValue = DefaultKalugaDate.epoch(offsetInMilliseconds = 1606204800000)
+        val dateValue = DefaultKalugaDate.epoch(offset = 1606204800000.milliseconds)
         val dateArray = listOf(
-            DefaultKalugaDate.epoch(offsetInMilliseconds = 1606204800001),
-            DefaultKalugaDate.epoch(offsetInMilliseconds = 1606204800002)
+            DefaultKalugaDate.epoch(offset = 1606204800001.milliseconds),
+            DefaultKalugaDate.epoch(offset = 1606204800002.milliseconds)
         )
 
         val mockSpec = MockSpec()

From 630f3a7591a21e6b7b2e0d65d307c2c616cc37eb Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Sat, 25 Feb 2023 21:24:56 +0100
Subject: [PATCH 225/227] Attempting to fix flaky tests

---
 .github/workflows/emulator.yaml                              | 1 +
 location/src/commonTest/kotlin/location/LocationStateTest.kt | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/emulator.yaml b/.github/workflows/emulator.yaml
index 5456f9754..d7824dd71 100644
--- a/.github/workflows/emulator.yaml
+++ b/.github/workflows/emulator.yaml
@@ -4,6 +4,7 @@ on: pull_request
 env:
   GRADLE_OPTS: "-Dorg.gradle.jvmargs=\"-Xmx8G -XX:MaxMetaspaceSize=512m -Dorg.gradle.daemon=false -Dkotlin.incremental=false\" -Dorg.gradle.daemon=false -Dkotlin.incremental=false -Dkotlin.daemon.jvm.options=-Xmx8G,-XX:MaxMetaspaceSize=512m,-Dorg.gradle.daemon=false,-Dkotlin.incremental=false"
   JAVA_OPTS: "-Xmx8G -XX:MaxMetaspaceSize=512m -Dorg.gradle.daemon=false -Dkotlin.incremental=false"
+  ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL: 120
 
 jobs:
   build:
diff --git a/location/src/commonTest/kotlin/location/LocationStateTest.kt b/location/src/commonTest/kotlin/location/LocationStateTest.kt
index 6a0cca909..8d4f59cf8 100644
--- a/location/src/commonTest/kotlin/location/LocationStateTest.kt
+++ b/location/src/commonTest/kotlin/location/LocationStateTest.kt
@@ -431,7 +431,7 @@ class LocationStateTest :
             permissionStateRepo.takeAndChangeState { state ->
                 (state as MockPermissionState<LocationPermission>).lock
             }
-            yieldMultiple(2)
+            yieldMultiple(3)
         }
         test {
             locationManager.stopMonitoringLocationEnabledMock.verify()
@@ -480,7 +480,7 @@ class LocationStateTest :
         }
         mainAction {
             locationManager.locationEnabled.value = false
-            yieldMultiple(2)
+            yieldMultiple(3)
         }
         test {
             locationManager.requestEnableLocationMock.verify()

From 1d6e28e04832d397191550eea968382df1314f2c Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Sun, 26 Feb 2023 01:21:55 +0100
Subject: [PATCH 226/227] Attempt to fix flaky tests on System module

---
 system/src/commonTest/kotlin/network/NetworkStateTest.kt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/src/commonTest/kotlin/network/NetworkStateTest.kt b/system/src/commonTest/kotlin/network/NetworkStateTest.kt
index 2fe846327..436742c54 100644
--- a/system/src/commonTest/kotlin/network/NetworkStateTest.kt
+++ b/system/src/commonTest/kotlin/network/NetworkStateTest.kt
@@ -21,6 +21,7 @@ import com.splendo.kaluga.base.flow.filterOnlyImportant
 import com.splendo.kaluga.system.network.state.NetworkState
 import com.splendo.kaluga.system.network.state.NetworkStateRepo
 import com.splendo.kaluga.test.base.mock.verify
+import com.splendo.kaluga.test.base.yieldMultiple
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.yield
 import kotlin.test.Test
@@ -44,6 +45,7 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
 
         action {
             resetFlow()
+            yieldMultiple(4)
         }
 
         mainAction {
@@ -181,6 +183,7 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
 
         action {
             resetFlow()
+            yield()
         }
 
         test {
@@ -190,6 +193,7 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
 
         mainAction {
             networkManager.network.value = NetworkConnectionType.Known.Absent
+            yield()
         }
 
         test {

From f191568c8f24c7669bccf1f5a87f3b04e8249148 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 27 Feb 2023 12:50:39 +0100
Subject: [PATCH 227/227] Attempting to improve Android UI tests

---
 .github/workflows/emulator.yaml               |  2 +-
 .../kotlin/AndroidAlertPresenterTest.kt       | 40 ++++++-----
 alerts/src/commonMain/kotlin/Alerts.kt        | 14 +++-
 .../AndroidDateTimePickerPresenterTest.kt     | 70 ++++++++++++-------
 .../src/commonMain/kotlin/DateTimePicker.kt   | 11 ++-
 .../kotlin/AndroidHUDTests.kt                 | 42 ++++++-----
 .../kotlin/network/NetworkStateTest.kt        |  6 +-
 7 files changed, 115 insertions(+), 70 deletions(-)

diff --git a/.github/workflows/emulator.yaml b/.github/workflows/emulator.yaml
index d7824dd71..9db27bb1b 100644
--- a/.github/workflows/emulator.yaml
+++ b/.github/workflows/emulator.yaml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        api-level: [23, 32]
+        api-level: [23, 33]
         # some custom gradle magic makes tests run grouped for `$module-*` and `*-$module` on CI so there is no need to add these to the matrix
         module: [
           "base",
diff --git a/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt b/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
index c07b7b4c5..92a998710 100644
--- a/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
+++ b/alerts/src/androidLibInstrumentedTest/kotlin/AndroidAlertPresenterTest.kt
@@ -23,8 +23,8 @@ import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.Until
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -54,14 +54,13 @@ class AndroidAlertPresenterTest : AlertPresenterTests() {
     override val builder get() = activity!!.viewModel.alertBuilder
 
     companion object {
-        val DEFAULT_TIMEOUT = 20.seconds.inWholeMilliseconds
+        val DEFAULT_TIMEOUT = 30.seconds.inWholeMilliseconds
     }
 
     @Test
     fun testBuilderReuse() = runBlocking {
-
-        launch(Dispatchers.Main) {
-            builder.buildAlert(MainScope()) {
+        val job1 = launch(Dispatchers.Main.immediate) {
+            builder.buildAlert(this) {
                 setTitle("Test")
                 setPositiveButton("OK")
             }.show()
@@ -70,9 +69,10 @@ class AndroidAlertPresenterTest : AlertPresenterTests() {
         device.wait(Until.findObject(By.text("Test")), DEFAULT_TIMEOUT)
         device.wait(Until.findObject(By.text("OK")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("Test")), DEFAULT_TIMEOUT))
+        job1.cancel()
 
-        launch(Dispatchers.Main) {
-            builder.buildAlert(MainScope()) {
+        val job2 = launch(Dispatchers.Main.immediate) {
+            builder.buildAlert(this) {
                 setTitle("Hello")
                 setNegativeButton("CANCEL") // sometimes this ends up uppercased in the dialog
             }.show()
@@ -81,16 +81,17 @@ class AndroidAlertPresenterTest : AlertPresenterTests() {
         device.wait(Until.findObject(By.text("Hello")), DEFAULT_TIMEOUT)
         device.wait(Until.findObject(By.text("CANCEL")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("Hello")), DEFAULT_TIMEOUT))
+        job2.cancel()
     }
 
     @Test
     fun testConcurrentBuilders() = runBlocking {
         val alerts = Array(10) { CompletableDeferred<BaseAlertPresenter>() }
 
-        (0..9).forEach { i ->
+        val jobs = (0..9).map { i ->
             launch(Dispatchers.Default) {
                 alerts[i].complete(
-                    builder.buildAlert(MainScope()) {
+                    builder.buildAlert(CoroutineScope(coroutineContext + Dispatchers.Main.immediate)) {
                         setTitle("Alert$i")
                         setPositiveButton("OK$i")
                     }
@@ -98,19 +99,21 @@ class AndroidAlertPresenterTest : AlertPresenterTests() {
             }
         }
         (0..9).forEach { i ->
-            launch(Dispatchers.Main) {
+            val job = launch(Dispatchers.Main.immediate) {
                 alerts[i].await().show()
             }
             device.wait(Until.findObject(By.text("Alert$i")), DEFAULT_TIMEOUT)
             device.wait(Until.findObject(By.text("OK$i")), DEFAULT_TIMEOUT).click()
             assertTrue(device.wait(Until.gone(By.text("Alert$i")), DEFAULT_TIMEOUT))
+            job.cancel()
         }
+        jobs.forEach { it.cancel() }
     }
 
     @Test
     fun testAlertShow() = runBlocking {
-        launch(Dispatchers.Main) {
-            builder.buildAlert(MainScope()) {
+        val job = launch(Dispatchers.Main.immediate) {
+            builder.buildAlert(this) {
                 setTitle("Hello")
                 setPositiveButton("OK")
             }.show()
@@ -118,13 +121,14 @@ class AndroidAlertPresenterTest : AlertPresenterTests() {
         device.wait(Until.findObject(By.text("Hello")), DEFAULT_TIMEOUT)
         device.wait(Until.findObject(By.text("OK")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("Hello")), DEFAULT_TIMEOUT))
+        job.cancel()
     }
 
     @Test
     fun testAlertFlowWithCoroutines() = runBlocking {
-        launch(Dispatchers.Main) {
+        val job = launch(Dispatchers.Main.immediate) {
             val action = Alert.Action("OK")
-            val presenter = builder.buildAlert(MainScope()) {
+            val presenter = builder.buildAlert(this) {
                 setTitle("Hello")
                 addActions(listOf(action))
             }
@@ -135,12 +139,13 @@ class AndroidAlertPresenterTest : AlertPresenterTests() {
         device.wait(Until.findObject(By.text("Hello")), DEFAULT_TIMEOUT)
         device.wait(Until.findObject(By.text("OK")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("Hello")), DEFAULT_TIMEOUT))
+        job.cancel()
     }
 
     @Test
     @Ignore("test framework for rotation is unstable")
     fun rotateActivity() = runBlocking {
-        val job = launch(Dispatchers.Main) {
+        val job = launch(Dispatchers.Main.immediate) {
             val presenter = builder.buildAlert(this) {
                 setTitle("Hello")
                 setPositiveButton("OK")
@@ -165,8 +170,9 @@ class AndroidAlertPresenterTest : AlertPresenterTests() {
     }
 
     @Test
-    fun testBuilderFromActivity() {
-        MainScope().launch { activity?.showAlert() }
+    fun testBuilderFromActivity() = runBlocking {
+        val job = launch(Dispatchers.Main.immediate) { activity?.showAlert() }
         device.wait(Until.findObject(By.text("Activity")), DEFAULT_TIMEOUT)
+        job.cancel()
     }
 }
diff --git a/alerts/src/commonMain/kotlin/Alerts.kt b/alerts/src/commonMain/kotlin/Alerts.kt
index a61be22da..8901b0be2 100644
--- a/alerts/src/commonMain/kotlin/Alerts.kt
+++ b/alerts/src/commonMain/kotlin/Alerts.kt
@@ -21,7 +21,6 @@ package com.splendo.kaluga.alerts
 import com.splendo.kaluga.architecture.lifecycle.LifecycleSubscribable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlin.coroutines.resume
 
 typealias AlertActionHandler = () -> Unit
 typealias AlertTextObserver = (String) -> Unit
@@ -321,9 +320,18 @@ abstract class BaseAlertPresenter(private val alert: Alert) : AlertActions {
         suspendCancellableCoroutine { continuation ->
             continuation.invokeOnCancellation {
                 dismissAlert(animated)
-                continuation.resume(null)
+                continuation.tryResume(null)?.let {
+                    continuation.completeResume(it)
+                }
             }
-            showAlert(animated, afterHandler = { continuation.resume(it) })
+            showAlert(
+                animated,
+                afterHandler = { action ->
+                    continuation.tryResume(action)?.let {
+                        continuation.completeResume(it)
+                    }
+                }
+            )
         }
 
     override fun dismiss(animated: Boolean) {
diff --git a/date-time-picker/src/androidLibInstrumentedTest/kotlin/AndroidDateTimePickerPresenterTest.kt b/date-time-picker/src/androidLibInstrumentedTest/kotlin/AndroidDateTimePickerPresenterTest.kt
index 01f68e4f7..17d442ec6 100644
--- a/date-time-picker/src/androidLibInstrumentedTest/kotlin/AndroidDateTimePickerPresenterTest.kt
+++ b/date-time-picker/src/androidLibInstrumentedTest/kotlin/AndroidDateTimePickerPresenterTest.kt
@@ -25,8 +25,8 @@ import androidx.test.uiautomator.Until
 import com.splendo.kaluga.base.utils.DefaultKalugaDate.Companion.epoch
 import com.splendo.kaluga.test.DateTimePickerPresenterTests
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -56,26 +56,31 @@ class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
     override val builder get() = activity!!.viewModel.dateTimePickerBuilder
 
     companion object {
-        val DEFAULT_TIMEOUT = 20.seconds.inWholeMilliseconds
+        val DEFAULT_TIMEOUT = 30.seconds.inWholeMilliseconds
     }
 
     @Test
     fun testBuilderReuse() = runBlocking {
 
-        launch(Dispatchers.Main) {
-            builder.buildTimePicker(MainScope()) {
+        val deferredPickerPresenter = CompletableDeferred<BaseDateTimePickerPresenter>()
+        val job1 = launch(Dispatchers.Main.immediate) {
+            val pickerPresenter = builder.buildTimePicker(this) {
                 setMessage("Message")
                 setConfirmButtonTitle("OK")
                 setCancelButtonTitle("Cancel")
-            }.show()
+            }
+            deferredPickerPresenter.complete(pickerPresenter)
+            pickerPresenter.show()
         }
 
         device.wait(Until.findObject(By.text("Message")), DEFAULT_TIMEOUT)
         device.wait(Until.findObject(By.text("OK")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("Message")), DEFAULT_TIMEOUT))
+        deferredPickerPresenter.await().dismiss(false)
+        job1.cancel()
 
-        launch(Dispatchers.Main) {
-            builder.buildDatePicker(MainScope()) {
+        val job2 = launch(Dispatchers.Main.immediate) {
+            builder.buildDatePicker(this) {
                 setConfirmButtonTitle("OK")
                 setCancelButtonTitle("CANCEL")
             }.show()
@@ -83,16 +88,17 @@ class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
 
         device.wait(Until.findObject(By.text("CANCEL")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("CANCEL")), DEFAULT_TIMEOUT))
+        job2.cancel()
     }
 
     @Test
     fun testConcurrentBuilders() = runBlocking {
         val alerts = Array(10) { CompletableDeferred<BaseDateTimePickerPresenter>() }
 
-        (0..9).forEach { i ->
+        val jobs = (0..9).map { i ->
             launch(Dispatchers.Default) {
                 alerts[i].complete(
-                    builder.buildTimePicker(MainScope()) {
+                    builder.buildTimePicker(CoroutineScope(coroutineContext + Dispatchers.Main.immediate)) {
                         setMessage("DateTimePicker$i")
                         setConfirmButtonTitle("OK$i")
                         setCancelButtonTitle("CANCEL$i")
@@ -101,31 +107,34 @@ class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
             }
         }
         (0..9).forEach { i ->
-            launch(Dispatchers.Main) {
+            val job = launch(Dispatchers.Main.immediate) {
                 alerts[i].await().show()
             }
             device.wait(Until.findObject(By.text("DateTimePicker$i")), DEFAULT_TIMEOUT)
             device.wait(Until.findObject(By.text("OK$i")), DEFAULT_TIMEOUT).click()
             assertTrue(device.wait(Until.gone(By.text("DateTimePicker$i")), DEFAULT_TIMEOUT))
+            job.cancel()
         }
+        jobs.forEach { it.cancel() }
     }
 
     @Test
     fun testDatePickerShow() = runBlocking {
-        launch(Dispatchers.Main) {
-            builder.buildDatePicker(MainScope()) {
+        val job = launch(Dispatchers.Main.immediate) {
+            builder.buildDatePicker(this) {
                 setConfirmButtonTitle("OK")
                 setCancelButtonTitle("CANCEL")
             }.show()
         }
         device.wait(Until.findObject(By.text("OK")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("OK")), DEFAULT_TIMEOUT))
+        job.cancel()
     }
 
     @Test
     fun testTimePickerShow() = runBlocking {
-        launch(Dispatchers.Main) {
-            builder.buildTimePicker(MainScope()) {
+        val job = launch(Dispatchers.Main.immediate) {
+            builder.buildTimePicker(this) {
                 setMessage("Message")
                 setConfirmButtonTitle("OK")
                 setCancelButtonTitle("CANCEL")
@@ -134,16 +143,17 @@ class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
         device.wait(Until.findObject(By.text("Message")), DEFAULT_TIMEOUT)
         device.wait(Until.findObject(By.text("OK")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("Message")), DEFAULT_TIMEOUT))
+        job.cancel()
     }
 
     @Test
     fun testTimePickerFlowWithCoroutines() = runBlocking {
-        launch(Dispatchers.Main) {
+        val job = launch(Dispatchers.Main.immediate) {
             val selectedTime = epoch().apply {
                 hour = 23
                 minute = 42
             }
-            val presenter = builder.buildTimePicker(MainScope()) {
+            val presenter = builder.buildTimePicker(this) {
                 setMessage("Message")
                 setConfirmButtonTitle("OK")
                 setCancelButtonTitle("CANCEL")
@@ -156,12 +166,13 @@ class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
         device.wait(Until.findObject(By.text("Message")), DEFAULT_TIMEOUT)
         device.wait(Until.findObject(By.text("OK")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("Message")), DEFAULT_TIMEOUT))
+        job.cancel()
     }
 
     @Test
     fun testTimePickerFlowCancelledWithCoroutines() = runBlocking {
-        launch(Dispatchers.Main) {
-            val presenter = builder.buildTimePicker(MainScope()) {
+        val job = launch(Dispatchers.Main.immediate) {
+            val presenter = builder.buildTimePicker(this) {
                 setMessage("Message")
                 setConfirmButtonTitle("OK")
                 setCancelButtonTitle("CANCEL")
@@ -173,17 +184,18 @@ class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
         device.wait(Until.findObject(By.text("Message")), DEFAULT_TIMEOUT)
         device.wait(Until.findObject(By.text("CANCEL")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("Message")), DEFAULT_TIMEOUT))
+        job.cancel()
     }
 
     @Test
     fun testDatePickerFlowWithCoroutines() = runBlocking {
-        launch(Dispatchers.Main) {
+        val job = launch(Dispatchers.Main.immediate) {
             val selectedDate = epoch().apply {
                 year = 2000
                 month = 5
                 day = 23
             }
-            val presenter = builder.buildDatePicker(MainScope()) {
+            val presenter = builder.buildDatePicker(this) {
                 setConfirmButtonTitle("OK")
                 setCancelButtonTitle("CANCEL")
                 setSelectedDate(selectedDate)
@@ -194,12 +206,13 @@ class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
         }
         device.wait(Until.findObject(By.text("OK")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("OK")), DEFAULT_TIMEOUT))
+        job.cancel()
     }
 
     @Test
     fun testDatePickerFlowCancelledWithCoroutines() = runBlocking {
-        launch(Dispatchers.Main) {
-            val presenter = builder.buildTimePicker(MainScope()) {
+        val job = launch(Dispatchers.Main.immediate) {
+            val presenter = builder.buildTimePicker(this) {
                 setMessage("Message")
                 setConfirmButtonTitle("OK")
                 setCancelButtonTitle("CANCEL")
@@ -211,12 +224,13 @@ class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
         device.wait(Until.findObject(By.text("Message")), DEFAULT_TIMEOUT)
         device.wait(Until.findObject(By.text("CANCEL")), DEFAULT_TIMEOUT).click()
         assertTrue(device.wait(Until.gone(By.text("Message")), DEFAULT_TIMEOUT))
+        job.cancel()
     }
 
     @Test
     @Ignore("test framework for rotation is unstable")
     fun rotateActivity() = runBlocking {
-        val job = launch(Dispatchers.Main) {
+        val job = launch(Dispatchers.Main.immediate) {
             val presenter = builder.buildTimePicker(this) {
                 setMessage("Message")
                 setConfirmButtonTitle("OK")
@@ -241,14 +255,16 @@ class AndroidDateTimePickerPresenterTest : DateTimePickerPresenterTests() {
     }
 
     @Test
-    fun testDateBuilderFromActivity() {
-        MainScope().launch { activity?.showDatePicker() }
+    fun testDateBuilderFromActivity() = runBlocking {
+        val job = launch(Dispatchers.Main.immediate) { activity?.showDatePicker() }
         device.wait(Until.findObject(By.text("Activity")), DEFAULT_TIMEOUT)
+        job.cancel()
     }
 
     @Test
-    fun testTimeBuilderFromActivity() {
-        MainScope().launch { activity?.showTimePicker() }
+    fun testTimeBuilderFromActivity() = runBlocking {
+        val job = launch(Dispatchers.Main.immediate) { activity?.showTimePicker() }
         device.wait(Until.findObject(By.text("Activity")), DEFAULT_TIMEOUT)
+        job.cancel()
     }
 }
diff --git a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
index 196026e33..0731623db 100644
--- a/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
+++ b/date-time-picker/src/commonMain/kotlin/DateTimePicker.kt
@@ -25,7 +25,6 @@ import com.splendo.kaluga.base.utils.KalugaLocale
 import com.splendo.kaluga.base.utils.KalugaLocale.Companion.defaultLocale
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlin.coroutines.resume
 
 /**
  * An object that represents a date-time picker view
@@ -221,9 +220,15 @@ abstract class BaseDateTimePickerPresenter(protected open val dateTimePicker: Da
         suspendCancellableCoroutine { continuation ->
             continuation.invokeOnCancellation {
                 dismissDateTimePicker(animated)
-                continuation.resume(null)
+                continuation.tryResume(null)?.let {
+                    continuation.completeResume(it)
+                }
+            }
+            showDateTimePicker(animated) { pickedDate ->
+                continuation.tryResume(pickedDate)?.let {
+                    continuation.completeResume(it)
+                }
             }
-            showDateTimePicker(animated) { continuation.resume(it) }
         }
 
     override fun dismiss(animated: Boolean) {
diff --git a/hud/src/androidLibInstrumentedTest/kotlin/AndroidHUDTests.kt b/hud/src/androidLibInstrumentedTest/kotlin/AndroidHUDTests.kt
index fd9706621..02449b4be 100644
--- a/hud/src/androidLibInstrumentedTest/kotlin/AndroidHUDTests.kt
+++ b/hud/src/androidLibInstrumentedTest/kotlin/AndroidHUDTests.kt
@@ -31,9 +31,9 @@ import com.splendo.kaluga.hud.AndroidHUDTests.AndroidHUDTestContext
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.junit.Rule
 import kotlin.test.BeforeTest
@@ -44,7 +44,7 @@ import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 import kotlin.time.Duration.Companion.seconds
 
-val DEFAULT_TIMEOUT = 20.seconds.inWholeMilliseconds
+val DEFAULT_TIMEOUT = 30.seconds.inWholeMilliseconds
 
 fun UiDevice.assertTextAppears(text: String) {
     waitForIdle()
@@ -89,7 +89,7 @@ class AndroidHUDTests : HUDTests<AndroidHUDTestContext>() {
 
     @Test
     fun indicatorShow() = testOnUIThread(cancelScopeAfterTest = true) {
-        val indicator = builder.build(MainScope()) {
+        val indicator = builder.build(this) {
             setTitle(LOADING)
         }
         launch {
@@ -149,22 +149,28 @@ class AndroidHUDTests : HUDTests<AndroidHUDTestContext>() {
         val loading2 = EmptyCompletableDeferred()
         val processing = EmptyCompletableDeferred()
 
-        val indicatorLoading = builder.build(MainScope()) {
-            setTitle(LOADING)
-        }
+        val deferredIndicatorLoading = CompletableDeferred<BaseHUD>()
         val indicatorProcessing = CompletableDeferred<BaseHUD>()
-        launch {
+        val job = launch(Dispatchers.Main.immediate) {
+            val indicatorLoading = builder.build(this) {
+                setTitle(LOADING)
+            }
+            deferredIndicatorLoading.complete(indicatorLoading)
             indicatorLoading.presentDuring {
                 presenting.complete()
                 loading1.await()
-                val processingDialog = builder.build(MainScope()) {
-                    setTitle(PROCESSING)
-                }
-                indicatorProcessing.complete(processingDialog)
-                processingDialog.presentDuring {
-                    processing.await()
+                val test = launch {
+                    val processingDialog = builder.build(this) {
+                        setTitle(PROCESSING)
+                    }
+                    indicatorProcessing.complete(processingDialog)
+                    processingDialog.presentDuring {
+                        processing.await()
+                    }
                 }
+
                 loading2.await()
+                test.cancel()
             }
         }
 
@@ -173,7 +179,7 @@ class AndroidHUDTests : HUDTests<AndroidHUDTestContext>() {
 
         withContext(Dispatchers.Default) {
             device.assertTextAppears(LOADING)
-            assertTrue(indicatorLoading.isVisible)
+            assertTrue(deferredIndicatorLoading.await().isVisible)
             loading1.complete()
 
             // check the Processing dialog is popped on top
@@ -187,12 +193,13 @@ class AndroidHUDTests : HUDTests<AndroidHUDTestContext>() {
             device.assertTextAppears(LOADING)
             loading2.complete()
         }
+        job.cancel()
     }
 
     @Test
     @Ignore("Rotating in test framework is unstable")
     fun rotateActivity() = testOnUIThread {
-        val indicator = builder.build(MainScope()) {
+        val indicator = builder.build(this) {
             setTitle(LOADING)
         }
         launch {
@@ -226,9 +233,10 @@ class AndroidHUDTests : HUDTests<AndroidHUDTestContext>() {
     }
 
     @Test
-    fun testBuilderFromActivity() {
-        MainScope().launch { activity.showHUD() }
+    fun testBuilderFromActivity() = runBlocking {
+        val job = launch(Dispatchers.Main.immediate) { activity.showHUD() }
         device.assertTextAppears("Activity")
+        job.cancel()
     }
 
     override val createTestContext: suspend (scope: CoroutineScope) -> AndroidHUDTestContext = { AndroidHUDTestContext(it) }
diff --git a/system/src/commonTest/kotlin/network/NetworkStateTest.kt b/system/src/commonTest/kotlin/network/NetworkStateTest.kt
index 436742c54..af301021a 100644
--- a/system/src/commonTest/kotlin/network/NetworkStateTest.kt
+++ b/system/src/commonTest/kotlin/network/NetworkStateTest.kt
@@ -45,10 +45,11 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
 
         action {
             resetFlow()
-            yieldMultiple(4)
+            yield()
         }
 
         mainAction {
+            yieldMultiple(4)
             networkManager.stopMonitoringMock.verify()
         }
     }
@@ -174,6 +175,7 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
 
         mainAction {
             networkManager.network.value = NetworkConnectionType.Known.Wifi()
+            yieldMultiple(4)
         }
 
         test {
@@ -193,7 +195,7 @@ class NetworkStateTest : BaseNetworkStateTest<NetworkState, NetworkStateRepo>()
 
         mainAction {
             networkManager.network.value = NetworkConnectionType.Known.Absent
-            yield()
+            yieldMultiple(4)
         }
 
         test {